diff --git a/VersionASM b/VersionASM
index c9f2267738b642c4addb8980135cb255c753b727..6511df638ed4f174c4a01b0115ad28f69217f6a3 100644
--- a/VersionASM
+++ b/VersionASM
@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
-Module_MinorVersion SETS "4.79.2.98.2.24"
-Module_Date SETS "28 Feb 2010"
-Module_ApplicationDate SETS "28-Feb-10"
+Module_MinorVersion SETS "4.79.2.98.2.25"
+Module_Date SETS "20 Mar 2010"
+Module_ApplicationDate SETS "20-Mar-10"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.98.2.24)"
-Module_HelpVersion SETS "5.35 (28 Feb 2010) 4.79.2.98.2.24"
+Module_FullVersion SETS "5.35 (4.79.2.98.2.25)"
+Module_HelpVersion SETS "5.35 (20 Mar 2010) 4.79.2.98.2.25"
END
diff --git a/VersionNum b/VersionNum
index 8bce507ca5d97e37f2b01ffc842faf43e3656ee0..d41a62fc0b1792ae964c35f0130786876a5970de 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.98.2.24
-#define Module_Date_CMHG 28 Feb 2010
+#define Module_MinorVersion_CMHG 4.79.2.98.2.25
+#define Module_Date_CMHG 20 Mar 2010
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.98.2.24"
-#define Module_Date "28 Feb 2010"
+#define Module_MinorVersion "4.79.2.98.2.25"
+#define Module_Date "20 Mar 2010"
-#define Module_ApplicationDate "28-Feb-10"
+#define Module_ApplicationDate "20-Mar-10"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.98.2.24)"
-#define Module_HelpVersion "5.35 (28 Feb 2010) 4.79.2.98.2.24"
+#define Module_FullVersion "5.35 (4.79.2.98.2.25)"
+#define Module_HelpVersion "5.35 (20 Mar 2010) 4.79.2.98.2.25"
#define Module_LibraryVersionInfo "5:35"
diff --git a/h/HALDevice b/h/HALDevice
index 3a979b683eb1f8f6637486717fce7393c1679b69..948acc61f6ff0b28b56f3fe74f0c39bd27d74420 100644
--- a/h/HALDevice
+++ b/h/HALDevice
@@ -32,7 +32,8 @@ struct device
int32_t (*Sleep)(struct device *, int32_t state);
int32_t devicenumber;
bool (*TestIRQ)(struct device *);
- uint32_t reserved2[2];
+ void (*ClearIRQ)(struct device *);
+ uint32_t reserved2[1];
};
#endif
diff --git a/hdr/HALDevice b/hdr/HALDevice
index b64e89ad608a31d45b64850bf74d1be93010aa49..8e4fb9ed1ea5b92c97cd6c5bfd9cc17b8de57f76 100644
--- a/hdr/HALDevice
+++ b/hdr/HALDevice
@@ -37,7 +37,8 @@ HALDevice_Reset # 4
HALDevice_Sleep # 4
HALDevice_Device # 4
HALDevice_TestIRQ # 4
-HALDevice_Reserved2 # 8
+HALDevice_ClearIRQ # 4
+HALDevice_Reserved2 # 4
HALDeviceSize * :INDEX: @
@@ -61,6 +62,7 @@ HALDeviceSysPeri_RTC # 1 ; RTCDevice
HALDeviceType_Comms * 4 :SHL: 8
^ 1
HALDeviceComms_UART # 1 ; UART
+HALDeviceComms_EtherNIC # 1 ; Ethernet NIC
HALDeviceBus_Pro * 0 :SHL: 28
@@ -77,6 +79,7 @@ HALDeviceSysBus_PXBus * 2 :SHL: 24
HALDeviceBus_Peri * 2 :SHL: 28
HALDevicePeriBus_APB * 0 :SHL: 24
+HALDevicePeriBus_GPMC * 1 :SHL: 24
HALDeviceBus_Exp * 3 :SHL: 28
@@ -89,6 +92,11 @@ HALDeviceBus_Ser * 4 :SHL: 28
HALDeviceSerBus_ACLink * 0 :SHL: 24
HALDeviceSerBus_IIC * 1 :SHL: 24
+HALDeviceBus_Interconnect * 5 :SHL: 28 ; Not really a bus type, but the OMAP stuff had to go somewhere!
+
+HALDeviceInterconnectBus_L3 * 0 :SHL: 24
+HALDeviceInterconnectBus_L4 * 1 :SHL: 24
+
^ 0
HALDeviceID_AudC_M5451 # 1
HALDeviceID_AudC_TPS65950 # 1
@@ -115,6 +123,10 @@ HALDeviceID_RTC_TPS65950 # 1
^ 0
HALDeviceID_VDU_OMAP3 # 1
+ ^ 0
+HALDeviceID_EtherNIC_SMSC9221 # 1
+HALDeviceID_EtherNIC_DM9000 # 1
+
]
OPT OldOpt