diff --git a/Makefile b/Makefile
index 2fcdbf4d04b81f953b117dc9a79d1654887b69f3..118cbe5850d8aaa6e4b99f96846e404dc4eaf77f 100644
--- a/Makefile
+++ b/Makefile
@@ -26,15 +26,13 @@ CUSTOMRES = custom
CUSTOMROM = custom
ROM_TARGET = custom
LNK_TARGET = custom
-AIFDBG = aif._OMAP3
+AIFDBG = aif._${TARGET}
GPADBG = gpa.GPA
-include StdTools
include CModule
CCFLAGS += -ff -APCS 3/32bit/nofp/noswst
ASFLAGS += -APCS 3/nofp/noswst
-AASMFLAGS += -APCS 3/nofp/noswst
ROM_LIBS += ${USBDIR}.o.MUSBDriver ${USBDIR}.o.EHCIDriver ${USBDIR}.o.USBDriver
resources:
diff --git a/VersionNum b/VersionNum
index 1b361f9e87b6ba551ad8106adab77ebd6a74aa7b..6d362e947a0315597d9b9a4c4954a8834d6578a4 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,23 @@
-/* (0.97)
+/* (0.98)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
-#define Module_MajorVersion_CMHG 0.97
+#define Module_MajorVersion_CMHG 0.98
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 20 Jul 2014
+#define Module_Date_CMHG 25 Oct 2014
-#define Module_MajorVersion "0.97"
-#define Module_Version 97
+#define Module_MajorVersion "0.98"
+#define Module_Version 98
#define Module_MinorVersion ""
-#define Module_Date "20 Jul 2014"
+#define Module_Date "25 Oct 2014"
-#define Module_ApplicationDate "20-Jul-14"
+#define Module_ApplicationDate "25-Oct-14"
#define Module_ComponentName "OMAP3"
#define Module_ComponentPath "castle/RiscOS/Sources/HAL/OMAP3"
-#define Module_FullVersion "0.97"
-#define Module_HelpVersion "0.97 (20 Jul 2014)"
-#define Module_LibraryVersionInfo "0:97"
+#define Module_FullVersion "0.98"
+#define Module_HelpVersion "0.98 (25 Oct 2014)"
+#define Module_LibraryVersionInfo "0:98"
diff --git a/hdr/StaticWS b/hdr/StaticWS
index 12e1a64c22fc9d949aec5dd8df46981c5f4e040b..154d28d02ed629c3e6f043290d2737f6bd8eda78 100644
--- a/hdr/StaticWS
+++ b/hdr/StaticWS
@@ -20,7 +20,7 @@
GET hdr.board
GET hdr.NIC
GET hdr.CPUClk
- GET <Lib$Dir>.USB.hdr.usbhal
+ GET <Lib$$Dir>.USB.hdr.usbhal
GET Hdr:GPIODevice
GET Hdr:SDHCIDevice
GET Hdr:BMUDevice
diff --git a/hdr/USB b/hdr/USB
index c3bb874372e637a23904ef5e2ca05b974a6173b1..95c1a8c8f05419ac178c124f922375fe80c81f8b 100644
--- a/hdr/USB
+++ b/hdr/USB
@@ -13,19 +13,6 @@
; limitations under the License.
;
-; usbinfo struct
- ^ 0
-USBINFO_TYPE # 4 ; 0=OHCI, 1=EHCI, 2=MUSBMHDRC
-USBINFO_FLAGS # 4 ; See below
-USBINFO_HW # 4 ; EHCI/OHCI base addr
-USBINFO_DEVNO # 4 ; IRQ number
-USBINFO_SIZEOF # 0 ; Size of struct
-
-USBINFO_FLAG_HAL_USBPortPower * 1 ; Use HAL_USBPortPower
-USBINFO_FLAG_HAL_USBPortStatus * 2 ; Use HAL_USBPortStatus
-USBINFO_FLAG_HAL_USBPortIRQ * 4 ; Use HAL_USBPortIRQ
-USBINFO_FLAG_32bit_Regs * 8 ; Must use 32bit access for all registers
-
; USBTLL registers - relative to L4_USBTLL
USBTLL_REVISION * &00
diff --git a/s/Boot b/s/Boot
index 7987817aaad0889960d18217513f2568fbfd796c..1054455aaa21a1cc2399f532e4969b981a8314cc 100644
--- a/s/Boot
+++ b/s/Boot
@@ -267,9 +267,6 @@ HALdescriptor DATA
IMPORT HAL_KbdScanInterrupt
IMPORT HAL_USBControllerInfo
- IMPORT HAL_USBPortPower
- IMPORT HAL_USBPortStatus
- IMPORT HAL_USBPortIRQ
HAL_EntryTable DATA
HALEntry HAL_Init
@@ -401,11 +398,11 @@ HAL_EntryTable DATA
HALEntry HAL_IRQMax
- NullEntry ;HALEntry HAL_VideoRender
+ NullEntry ; HAL_VideoRender
- HALEntry HAL_USBPortPower
- HALEntry HAL_USBPortStatus
- HALEntry HAL_USBPortIRQ
+ NullEntry ; HAL_USBPortPower
+ NullEntry ; HAL_USBPortStatus
+ NullEntry ; HAL_USBPortDevice
HALEntry HAL_VideoIICOp
diff --git a/s/USB b/s/USB
index f5783bfdea5596f8457e439cd60bc485bb7502e2..91173d109bcd5416baef9d7753ccd2ec6aef899d 100644
--- a/s/USB
+++ b/s/USB
@@ -35,9 +35,6 @@
EXPORT USB_Init
EXPORT HAL_USBControllerInfo
- EXPORT HAL_USBPortPower
- EXPORT HAL_USBPortStatus
- EXPORT HAL_USBPortIRQ
IMPORT HAL_CounterDelay
IMPORT DebugHALPrintReg
@@ -169,39 +166,31 @@ HAL_USBControllerInfo
MOVHI pc, lr
BEQ %FT10
; Fill in the usbinfo struct
- MOV a1, #1 ; EHCI
- STR a1, [a2, #USBINFO_TYPE]
- CMP a3, #USBINFO_SIZEOF
- MOV a1, #USBINFO_SIZEOF
+ MOV a1, #HALUSBControllerType_EHCI
+ STR a1, [a2, #HALUSBControllerInfo_Type]
+ CMP a3, #HALUSBControllerInfo_SizeOf
+ MOV a1, #HALUSBControllerInfo_SizeOf
MOVLO pc, lr
- MOV a4, #USBINFO_FLAG_32bit_Regs ; EHCI did seem to work OK without forcing 32bit register access, but it is technically needed so I'll leave it set.
- STR a4, [a2, #USBINFO_FLAGS]
+ MOV a4, #HALUSBControllerFlag_32bit_Regs ; EHCI did seem to work OK without forcing 32bit register access, but it is technically needed so I'll leave it set.
+ STR a4, [a2, #HALUSBControllerInfo_Flags]
LDR a4, L4_USB_Host_Log
ADD a4, a4, #EHCI_BASE
- STR a4, [a2, #USBINFO_HW]
+ STR a4, [a2, #HALUSBControllerInfo_HW]
MOV a4, #EHCI_IRQ
- STR a4, [a2, #USBINFO_DEVNO]
+ STR a4, [a2, #HALUSBControllerInfo_DevNo]
MOV pc, lr
10
- MOV a1, #2 ; MUSBMHDRC
- STR a1, [a2, #USBINFO_TYPE]
- CMP a3, #USBINFO_SIZEOF
- MOV a1, #USBINFO_SIZEOF
+ MOV a1, #HALUSBControllerType_MUSBMHDRC
+ STR a1, [a2, #HALUSBControllerInfo_Type]
+ CMP a3, #HALUSBControllerInfo_SizeOf
+ MOV a1, #HALUSBControllerInfo_SizeOf
MOVLO pc, lr
MOV a4, #0
- STR a4, [a2, #USBINFO_FLAGS]
+ STR a4, [a2, #HALUSBControllerInfo_Flags]
LDR a4, L4_USB_OTG_Log
- STR a4, [a2, #USBINFO_HW]
+ STR a4, [a2, #HALUSBControllerInfo_HW]
MOV a4, #MUSB_IRQ
- STR a4, [a2, #USBINFO_DEVNO]
- MOV pc, lr
-
-
- ; These are unused for EHCI/MUSB
-HAL_USBPortPower
-HAL_USBPortStatus
-HAL_USBPortIRQ
- MOV a1, #-1
+ STR a4, [a2, #HALUSBControllerInfo_DevNo]
MOV pc, lr
END