From c168f14ba19cdf29f9f14f85f95dd8fd10a787b7 Mon Sep 17 00:00:00 2001
From: Robert Sprowson <rsprowson@gitlab.riscosopen.org>
Date: Sat, 6 Dec 2014 10:43:11 +0000
Subject: [PATCH] Change over to reassigned bus types
Version 1.00. Tagged as 'OMAP3-1_00'
---
VersionNum | 20 ++++++++++----------
s/CPUClk | 2 +-
s/GPIO | 2 +-
s/NIC | 4 ++--
s/SDIO | 2 +-
s/SDMA | 4 ++--
s/SR37x | 2 +-
s/Video | 2 +-
8 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/VersionNum b/VersionNum
index 1a8df70..a240a94 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,23 @@
-/* (0.99)
+/* (1.00)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
-#define Module_MajorVersion_CMHG 0.99
+#define Module_MajorVersion_CMHG 1.00
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 30 Oct 2014
+#define Module_Date_CMHG 06 Dec 2014
-#define Module_MajorVersion "0.99"
-#define Module_Version 99
+#define Module_MajorVersion "1.00"
+#define Module_Version 100
#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 "OMAP3"
#define Module_ComponentPath "castle/RiscOS/Sources/HAL/OMAP3"
-#define Module_FullVersion "0.99"
-#define Module_HelpVersion "0.99 (30 Oct 2014)"
-#define Module_LibraryVersionInfo "0:99"
+#define Module_FullVersion "1.00"
+#define Module_HelpVersion "1.00 (06 Dec 2014)"
+#define Module_LibraryVersionInfo "1:0"
diff --git a/s/CPUClk b/s/CPUClk
index d3d78f6..1567014 100644
--- a/s/CPUClk
+++ b/s/CPUClk
@@ -226,7 +226,7 @@ CPUList
CPUClkDevTemplate
DCW HALDeviceType_SysPeri + HALDeviceSysPeri_CPUClk
DCW HALDeviceID_CPUClk_OMAP3
- DCD HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L4
+ DCD HALDeviceBus_Peri + HALDevicePeriBus_Sonics3220
DCD 0 ; API version
DCD CPUClk_Desc ; Description
DCD 0 ; Address - unused
diff --git a/s/GPIO b/s/GPIO
index 8150357..5ad33fb 100644
--- a/s/GPIO
+++ b/s/GPIO
@@ -273,7 +273,7 @@ GPIO_InitDevice
GPIOTemplate
DCW HALDeviceType_Comms + HALDeviceComms_GPIO
DCW HALDeviceID_GPIO_OMAP3
- DCD HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L4
+ DCD HALDeviceBus_Peri + HALDevicePeriBus_Sonics3220
DCD 0 ; API version
DCD GPIODesc ; Description
DCD 0 ; Address (none)
diff --git a/s/NIC b/s/NIC
index bae7506..7f5bcf1 100644
--- a/s/NIC
+++ b/s/NIC
@@ -92,7 +92,7 @@ NIC_GPMC_Config_DevKit
NIC_SMSC
DCW HALDeviceType_Comms + HALDeviceComms_EtherNIC
DCW HALDeviceID_EtherNIC_SMSC9221
- DCD HALDeviceBus_Peri + HALDevicePeriBus_GPMC
+ DCD HALDeviceBus_Exp + HALDeviceExpBus_GPMC
DCD 0 ; API version
DCD SMSCDesc ; Description
DCD 0 ; Address - filled in later
@@ -115,7 +115,7 @@ NIC_SMSC
NIC_DM9000
DCW HALDeviceType_Comms + HALDeviceComms_EtherNIC
DCW HALDeviceID_EtherNIC_DM9000
- DCD HALDeviceBus_Peri + HALDevicePeriBus_GPMC
+ DCD HALDeviceBus_Exp + HALDeviceExpBus_GPMC
DCD 0 ; API version
DCD DM9000Desc ; Description
DCD 0 ; Address - filled in later
diff --git a/s/SDIO b/s/SDIO
index 4497303..2a23271 100644
--- a/s/SDIO
+++ b/s/SDIO
@@ -300,7 +300,7 @@ Template
0
HALDeviceField Type, HALDeviceType_ExpCtl + HALDeviceExpCtl_SDIO
HALDeviceField ID, HALDeviceID_SDIO_SDHCI
- HALDeviceField Location, HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L4
+ HALDeviceField Location, HALDeviceBus_Peri + HALDevicePeriBus_Sonics3220
HALDeviceField Version, 0
HALDeviceField Description
HALDeviceField Address, 0 ; patched up at initialisation
diff --git a/s/SDMA b/s/SDMA
index a309406..0f7ceb5 100644
--- a/s/SDMA
+++ b/s/SDMA
@@ -193,7 +193,7 @@ SDMA_Init
ControllerTemplate
DCW HALDeviceType_SysPeri + HALDeviceSysPeri_DMAC
DCW HALDeviceID_DMAC_OMAP3
- DCD HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L3
+ DCD HALDeviceBus_Sys + HALDeviceSysBus_SonicsMX
DCD &10000 ; API version - 1.0
DCD SDMACDesc
DCD 0 ; Address - N/A
@@ -225,7 +225,7 @@ ChannelTemplate
; Public interface
DCW HALDeviceType_SysPeri + HALDeviceSysPeri_DMAB
DCW HALDeviceID_DMAB_OMAP3
- DCD HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L3
+ DCD HALDeviceBus_Sys + HALDeviceSysBus_SonicsMX
DCD &10000 ; API version - 1.0
DCD 0 ; Description
DCD 0 ; Address - N/A
diff --git a/s/SR37x b/s/SR37x
index a8a4a90..dc571ab 100644
--- a/s/SR37x
+++ b/s/SR37x
@@ -529,7 +529,7 @@ End_SR37x_OPPTbl_AMDM37x_VDD2
SR37xDevTemplate
DCW HALDeviceType_SysPeri + HALDeviceSysPeri_CPUClk
DCW HALDeviceID_CPUClk_AMDM37x_SR
- DCD HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L4
+ DCD HALDeviceBus_Peri + HALDevicePeriBus_Sonics3220
DCD 0 ; API version
DCD SR37x_Desc ; Description
DCD 0 ; Address - unused
diff --git a/s/Video b/s/Video
index 4b86f0e..490d2a7 100644
--- a/s/Video
+++ b/s/Video
@@ -112,7 +112,7 @@ VideoDevice_Init
VideoDeviceTemplate
DCW HALDeviceType_Video + HALDeviceVideo_VDU
DCW HALDeviceID_VDU_OMAP3
- DCD HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L3
+ DCD HALDeviceBus_Sys + HALDeviceSysBus_SonicsMX
DCD 0 ; API version 0
DCD VideoDevice_Desc
DCD 0 ; Address - filled in later
--
GitLab