Commit e36a0e28 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Initialise IIC earlier in the startup sequence. Add ID for Pandora audio HAL device

Detail:
  s/HAL, s/NewReset - Moved IIC initialisation to just after timer initialisation, and crucially, before keyboard scan initialisation. This makes things a lot easier for the HAL if it wants to use IIC during the keyboard scan (previously IIC would be enabled inbetween HAL_KbdScanSetup and the first call to HAL_KbdScan)
  hdr/HALDevice - Added a device ID for the Pandora audio controller
Admin:
  Tested on Pandora


Version 5.35, 4.79.2.168. Tagged as 'Kernel-5_35-4_79_2_168'
parent d27714ee
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.167"
Module_MinorVersion SETS "4.79.2.168"
Module_Date SETS "30 Sep 2012"
Module_ApplicationDate SETS "30-Sep-12"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.35 (4.79.2.167)"
Module_HelpVersion SETS "5.35 (30 Sep 2012) 4.79.2.167"
Module_FullVersion SETS "5.35 (4.79.2.168)"
Module_HelpVersion SETS "5.35 (30 Sep 2012) 4.79.2.168"
END
......@@ -5,12 +5,12 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.167
#define Module_MinorVersion_CMHG 4.79.2.168
#define Module_Date_CMHG 30 Sep 2012
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion "4.79.2.167"
#define Module_MinorVersion "4.79.2.168"
#define Module_Date "30 Sep 2012"
#define Module_ApplicationDate "30-Sep-12"
......@@ -18,6 +18,6 @@
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
#define Module_FullVersion "5.35 (4.79.2.167)"
#define Module_HelpVersion "5.35 (30 Sep 2012) 4.79.2.167"
#define Module_FullVersion "5.35 (4.79.2.168)"
#define Module_HelpVersion "5.35 (30 Sep 2012) 4.79.2.168"
#define Module_LibraryVersionInfo "5:35"
......@@ -113,6 +113,7 @@ HALDeviceID_AudC_M5451 # 1
HALDeviceID_AudC_TPS65950 # 1
HALDeviceID_AudC_TWL6040 # 1
HALDeviceID_AudC_VCHIQ # 1
HALDeviceID_AudC_Pandora # 1
^ 0
HALDeviceID_Mixer_STAC9750 # 1
......
......@@ -890,6 +890,8 @@ MMUon_nol1ptoverlap
MOV a1, #0
CallHAL HAL_TimerSetPeriod
BL IICInit
LDR a1, =ZeroPage+InitIRQWs
MOV a2, #1
STRB a2, [a1, #KbdScanActive]
......
......@@ -557,8 +557,6 @@ Continue_after_HALInit
MSR CPSR_c, r0
]
BL IICInit
[ CacheCMOSRAM
DebugTX "InitCMOSCache entry"
BL InitCMOSCache ; initialise cache of CMOS RAM
......
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