Commit e58961bc authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Change over to reassigned bus types

Note, the SDIO controller was previously misreported as being on L4, when in fact it's on L3.

Version 0.39. Tagged as 'OMAP4-0_39'
parent 6e2c337d
/* (0.38) /* (0.39)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1. * Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 0.38 #define Module_MajorVersion_CMHG 0.39
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 30 Oct 2014 #define Module_Date_CMHG 06 Dec 2014
#define Module_MajorVersion "0.38" #define Module_MajorVersion "0.39"
#define Module_Version 38 #define Module_Version 39
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "30 Oct 2014" #define Module_Date "06 Dec 2014"
#define Module_ApplicationDate "30-Oct-14" #define Module_ApplicationDate "06-Dec-14"
#define Module_ComponentName "OMAP4" #define Module_ComponentName "OMAP4"
#define Module_ComponentPath "castle/RiscOS/Sources/HAL/OMAP4" #define Module_ComponentPath "castle/RiscOS/Sources/HAL/OMAP4"
#define Module_FullVersion "0.38" #define Module_FullVersion "0.39"
#define Module_HelpVersion "0.38 (30 Oct 2014)" #define Module_HelpVersion "0.39 (06 Dec 2014)"
#define Module_LibraryVersionInfo "0:38" #define Module_LibraryVersionInfo "0:39"
...@@ -129,7 +129,7 @@ GPIO_InitDevice ...@@ -129,7 +129,7 @@ GPIO_InitDevice
GPIOTemplate GPIOTemplate
DCW HALDeviceType_Comms + HALDeviceComms_GPIO DCW HALDeviceType_Comms + HALDeviceComms_GPIO
DCW HALDeviceID_GPIO_OMAP4 DCW HALDeviceID_GPIO_OMAP4
DCD HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L4 DCD HALDeviceBus_Peri + HALDevicePeriBus_Sonics3220
DCD 0 ; API version DCD 0 ; API version
DCD GPIODesc ; Description DCD GPIODesc ; Description
DCD 0 ; Address (none) DCD 0 ; Address (none)
......
...@@ -181,7 +181,7 @@ Template ...@@ -181,7 +181,7 @@ Template
0 0
HALDeviceField Type, HALDeviceType_ExpCtl + HALDeviceExpCtl_SDIO HALDeviceField Type, HALDeviceType_ExpCtl + HALDeviceExpCtl_SDIO
HALDeviceField ID, HALDeviceID_SDIO_SDHCI HALDeviceField ID, HALDeviceID_SDIO_SDHCI
HALDeviceField Location, HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L4 HALDeviceField Location, HALDeviceBus_Sys + HALDeviceSysBus_NoC
HALDeviceField Version, 0 HALDeviceField Version, 0
HALDeviceField Description HALDeviceField Description
HALDeviceField Address, 0 ; patched up at initialisation HALDeviceField Address, 0 ; patched up at initialisation
......
...@@ -158,7 +158,7 @@ SDMA_Init ...@@ -158,7 +158,7 @@ SDMA_Init
ControllerTemplate ControllerTemplate
DCW HALDeviceType_SysPeri + HALDeviceSysPeri_DMAC DCW HALDeviceType_SysPeri + HALDeviceSysPeri_DMAC
DCW HALDeviceID_DMAC_OMAP4 DCW HALDeviceID_DMAC_OMAP4
DCD HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L3 DCD HALDeviceBus_Sys + HALDeviceSysBus_NoC
DCD &10000 ; API version - 1.0 DCD &10000 ; API version - 1.0
DCD SDMACDesc DCD SDMACDesc
DCD 0 ; Address - N/A DCD 0 ; Address - N/A
...@@ -192,7 +192,7 @@ ChannelTemplate ...@@ -192,7 +192,7 @@ ChannelTemplate
; Public interface ; Public interface
DCW HALDeviceType_SysPeri + HALDeviceSysPeri_DMAB DCW HALDeviceType_SysPeri + HALDeviceSysPeri_DMAB
DCW HALDeviceID_DMAB_OMAP4 DCW HALDeviceID_DMAB_OMAP4
DCD HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L3 DCD HALDeviceBus_Sys + HALDeviceSysBus_NoC
DCD &10000 ; API version - 1.0 DCD &10000 ; API version - 1.0
DCD 0 ; Description DCD 0 ; Description
DCD 0 ; Address - N/A DCD 0 ; Address - N/A
......
...@@ -791,7 +791,7 @@ CPUList ...@@ -791,7 +791,7 @@ CPUList
SR44xDevTemplate SR44xDevTemplate
DCW HALDeviceType_SysPeri + HALDeviceSysPeri_CPUClk DCW HALDeviceType_SysPeri + HALDeviceSysPeri_CPUClk
DCW HALDeviceID_CPUClk_OMAP4 DCW HALDeviceID_CPUClk_OMAP4
DCD HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L4 DCD HALDeviceBus_Peri + HALDevicePeriBus_Sonics3220
DCD 1 ; API version (v0.1) DCD 1 ; API version (v0.1)
DCD SR44x_Desc ; Description DCD SR44x_Desc ; Description
DCD 0 ; Address - unused DCD 0 ; Address - unused
......
...@@ -188,7 +188,7 @@ VideoDevice_Init ...@@ -188,7 +188,7 @@ VideoDevice_Init
VideoDeviceTemplate VideoDeviceTemplate
DCW HALDeviceType_Video + HALDeviceVideo_VDU DCW HALDeviceType_Video + HALDeviceVideo_VDU
DCW HALDeviceID_VDU_OMAP4 DCW HALDeviceID_VDU_OMAP4
DCD HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L3 DCD HALDeviceBus_Sys + HALDeviceSysBus_NoC
DCD 0 ; API version 0 DCD 0 ; API version 0
DCD VideoDevice_Desc DCD VideoDevice_Desc
DCD 0 ; Address - filled in later DCD 0 ; Address - filled in later
......
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