Commit c8996882 authored by ROOL's avatar ROOL 🤖
Browse files

Add HAL_PlatformName implementation

Detail:
  Return the board name for this entry.
  Rename CPU temperature sensor register per datasheet.
Admin:
  Submission from Willi Theiss.
  Not tested.

Version 0.50. Tagged as 'OMAP4-0_50'
parent a2527ec0
/* (0.49)
/* (0.50)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.49
#define Module_MajorVersion_CMHG 0.50
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 02 Jan 2016
#define Module_Date_CMHG 16 Jan 2016
#define Module_MajorVersion "0.49"
#define Module_Version 49
#define Module_MajorVersion "0.50"
#define Module_Version 50
#define Module_MinorVersion ""
#define Module_Date "02 Jan 2016"
#define Module_Date "16 Jan 2016"
#define Module_ApplicationDate "02-Jan-16"
#define Module_ApplicationDate "16-Jan-16"
#define Module_ComponentName "OMAP4"
#define Module_ComponentPath "castle/RiscOS/Sources/HAL/OMAP4"
#define Module_FullVersion "0.49"
#define Module_HelpVersion "0.49 (02 Jan 2016)"
#define Module_LibraryVersionInfo "0:49"
#define Module_FullVersion "0.50"
#define Module_HelpVersion "0.50 (16 Jan 2016)"
#define Module_LibraryVersionInfo "0:50"
......@@ -138,7 +138,7 @@ OMAP44XX_CONTROL_FUSE_CORE_OPP100 * &0257
OMAP44XX_CONTROL_FUSE_CORE_OPP119 * &025A
; CPU die temperature related register - relative to L4_SYSCTRL_GENERAL_CORE
CONTROL_TEMP_SENSOR_MPU * &032C
CONTROL_TEMP_SENSOR * &032C
; IRQs
......
......@@ -285,29 +285,29 @@ HAL_EntryTable DATA
HALEntry HAL_IICTransfer
HALEntry HAL_IICMonitorTransfer
NullEntry ; HALEntry HAL_VideoFlybackDevice
NullEntry ; HALEntry HAL_VideoSetMode
NullEntry ; HALEntry HAL_VideoWritePaletteEntry
NullEntry ; HALEntry HAL_VideoWritePaletteEntries
NullEntry ; HALEntry HAL_VideoReadPaletteEntry
NullEntry ; HALEntry HAL_VideoSetInterlace
NullEntry ; HALEntry HAL_VideoSetBlank
NullEntry ; HALEntry HAL_VideoSetPowerSave
NullEntry ; HALEntry HAL_VideoUpdatePointer
NullEntry ; HALEntry HAL_VideoSetDAG
NullEntry ; HALEntry HAL_VideoVetMode
NullEntry ; HALEntry HAL_VideoPixelFormats
NullEntry ; HALEntry HAL_VideoFeatures
NullEntry ; HALEntry HAL_VideoBufferAlignment
NullEntry ; HALEntry HAL_VideoOutputFormat
NullEntry ; HALEntry HAL_MatrixColumns
NullEntry ; HALEntry HAL_MatrixScan
NullEntry ; HALEntry HAL_TouchscreenType
NullEntry ; HALEntry HAL_TouchscreenRead
NullEntry ; HALEntry HAL_TouchscreenMode
NullEntry ; HALEntry HAL_TouchscreenMeasure
NullEntry ; HAL_VideoFlybackDevice
NullEntry ; HAL_VideoSetMode
NullEntry ; HAL_VideoWritePaletteEntry
NullEntry ; HAL_VideoWritePaletteEntries
NullEntry ; HAL_VideoReadPaletteEntry
NullEntry ; HAL_VideoSetInterlace
NullEntry ; HAL_VideoSetBlank
NullEntry ; HAL_VideoSetPowerSave
NullEntry ; HAL_VideoUpdatePointer
NullEntry ; HAL_VideoSetDAG
NullEntry ; HAL_VideoVetMode
NullEntry ; HAL_VideoPixelFormats
NullEntry ; HAL_VideoFeatures
NullEntry ; HAL_VideoBufferAlignment
NullEntry ; HAL_VideoOutputFormat
NullEntry ; HAL_MatrixColumns
NullEntry ; HAL_MatrixScan
NullEntry ; HAL_TouchscreenType
NullEntry ; HAL_TouchscreenRead
NullEntry ; HAL_TouchscreenMode
NullEntry ; HAL_TouchscreenMeasure
HALEntry HAL_MachineID
......@@ -315,7 +315,7 @@ HAL_EntryTable DATA
HALEntry HAL_HardwareInfo
HALEntry HAL_SuperIOInfo
HALEntry HAL_PlatformInfo
NullEntry ; HALEntry HAL_CleanerSpace
NullEntry ; HAL_CleanerSpace
HALEntry HAL_UARTPorts
HALEntry HAL_UARTStartUp
......@@ -353,9 +353,9 @@ HAL_EntryTable DATA
NullEntry ; HAL_PCISlotTable
NullEntry ; HAL_PCIAddresses
NullEntry ; HAL_ATAControllerInfo
NullEntry ; HAL_ATASetModes
NullEntry ; HAL_ATACableID
HALEntry HAL_PlatformName
NullEntry ; Unused
NullEntry ; Unused
HALEntry HAL_InitDevices
......@@ -746,6 +746,10 @@ HAL_HardwareInfo
STR ip, [a3]
MOV pc, lr
HAL_PlatformName
ADD a1, sb, #BoardConfig_Name
MOV pc, lr
HAL_PlatformInfo
LDRB ip, [sb, #BoardConfig_BoardFlags]
STR ip, [a2]
......
......@@ -1269,7 +1269,7 @@ TEMP_CONST_A0 * -158373902
TEMP_CONST_A1 * 4609309
TEMP_CONST_A2 * -489
; bits in CONTROL_TEMP_SENSOR_MPU
; bits in CONTROL_TEMP_SENSOR
OMAP4430_EOCZ * (1 << 8) ; End Of Conversion
OMAP4430_SOC * (1 << 9) ; Start Of Conversion
OMAP4430_TEMPMASK * 0xFF
......@@ -1284,20 +1284,20 @@ SR44x_GetDieTempES
LDR sb, SR44xWorkspace
LDR a4, L4_Core_Log
ADD a4, a4, #(L4_SYSCTRL_GENERAL_CORE - L4_Core)
LDR a2, [a4, #CONTROL_TEMP_SENSOR_MPU]
LDR a2, [a4, #CONTROL_TEMP_SENSOR]
ORR a2, a2, #OMAP4460_SOC
STR a2, [a4, #CONTROL_TEMP_SENSOR_MPU]
STR a2, [a4, #CONTROL_TEMP_SENSOR]
; Wait until conversion starts
10
LDR a2, [a4, #CONTROL_TEMP_SENSOR_MPU]
LDR a2, [a4, #CONTROL_TEMP_SENSOR]
TST a2, #OMAP4460_EOCZ
BEQ %BT10
; Reset SOC bit
BIC a2, a2, #OMAP4460_SOC
STR a2, [a4, #CONTROL_TEMP_SENSOR_MPU]
STR a2, [a4, #CONTROL_TEMP_SENSOR]
; Wait until conversion is finished
20
LDR a2, [a4, #CONTROL_TEMP_SENSOR_MPU]
LDR a2, [a4, #CONTROL_TEMP_SENSOR]
TST a2, #OMAP4460_EOCZ
BNE %BT20
UBFX a2, a2, #0, #10 ; extract temperature ADC value
......@@ -1321,20 +1321,20 @@ SR44x_GetDieTemp
LDR sb, SR44xWorkspace
LDR a4, L4_Core_Log
ADD a4, a4, #(L4_SYSCTRL_GENERAL_CORE - L4_Core)
LDR a2, [a4, #CONTROL_TEMP_SENSOR_MPU]
LDR a2, [a4, #CONTROL_TEMP_SENSOR]
ORR a2, a2, #OMAP4430_SOC
STR a2, [a4, #CONTROL_TEMP_SENSOR_MPU]
STR a2, [a4, #CONTROL_TEMP_SENSOR]
; Wait until conversion starts
10
LDR a2, [a4, #CONTROL_TEMP_SENSOR_MPU]
LDR a2, [a4, #CONTROL_TEMP_SENSOR]
TST a2, #OMAP4430_EOCZ
BEQ %BT10
; Reset SOC bit
BIC a2, a2, #OMAP4430_SOC
STR a2, [a4, #CONTROL_TEMP_SENSOR_MPU]
STR a2, [a4, #CONTROL_TEMP_SENSOR]
; Wait until conversion is finished
20
LDR a2, [a4, #CONTROL_TEMP_SENSOR_MPU]
LDR a2, [a4, #CONTROL_TEMP_SENSOR]
TST a2, #OMAP4430_EOCZ
BNE %BT20
UBFX a2, a2, #0, #8 ; extract temperature ADC value
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment