You need to sign in or sign up before continuing.
Commit ff0710fa authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Bring HAL branch of hdr/HALDevice, h/HALDevice in line with Cortex branch

Detail:
  A fair number of bus/device types and IDs have been added to the Cortex branch since the branch was created.
  Now that the ClearIRQ entry has also been added, it's about time that the HAL branch was brought up to date.
Admin:
  Untested, but should be fine.


Version 5.35, 4.79.2.111. Tagged as 'Kernel-5_35-4_79_2_111'
parent a6492b14
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.110"
Module_Date SETS "20 Feb 2010"
Module_ApplicationDate SETS "20-Feb-10"
Module_MinorVersion SETS "4.79.2.111"
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.110)"
Module_HelpVersion SETS "5.35 (20 Feb 2010) 4.79.2.110"
Module_FullVersion SETS "5.35 (4.79.2.111)"
Module_HelpVersion SETS "5.35 (20 Mar 2010) 4.79.2.111"
END
......@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.110
#define Module_Date_CMHG 20 Feb 2010
#define Module_MinorVersion_CMHG 4.79.2.111
#define Module_Date_CMHG 20 Mar 2010
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion "4.79.2.110"
#define Module_Date "20 Feb 2010"
#define Module_MinorVersion "4.79.2.111"
#define Module_Date "20 Mar 2010"
#define Module_ApplicationDate "20-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.110)"
#define Module_HelpVersion "5.35 (20 Feb 2010) 4.79.2.110"
#define Module_FullVersion "5.35 (4.79.2.111)"
#define Module_HelpVersion "5.35 (20 Mar 2010) 4.79.2.111"
#define Module_LibraryVersionInfo "5:35"
......@@ -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
......
......@@ -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: @
......@@ -56,10 +57,12 @@ HALDeviceSysPeri_IntC # 1 ; Interrupt controller
HALDeviceSysPeri_DMAC # 1 ; DMA controller
HALDeviceSysPeri_DMAB # 1 ; DMA channel - buffer type
HALDeviceSysPeri_DMAL # 1 ; DMA channel - list type
HALDeviceSysPeri_RTC # 1 ; RTCDevice
HALDeviceType_Comms * 4 :SHL: 8
^ 1
HALDeviceComms_UART # 1 ; UART
HALDeviceComms_EtherNIC # 1 ; Ethernet NIC
HALDeviceBus_Pro * 0 :SHL: 28
......@@ -76,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
......@@ -86,24 +90,43 @@ HALDeviceExpBus_PCI * 2 :SHL: 24
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
^ 0
HALDeviceID_Mixer_STAC9750 # 1
HALDeviceID_Mixer_TPS65950 # 1
^ 0
HALDeviceID_DMAC_M1535 # 1
HALDeviceID_DMAC_M5229 # 1
HALDeviceID_DMAC_OMAP3 # 1
^ 0
HALDeviceID_DMAB_M1535 # 1
HALDeviceID_DMAB_OMAP3 # 1
^ 0
HALDeviceID_DMAL_M5229 # 1
^ 0
HALDeviceID_RTC_TPS65950 # 1
^ 0
HALDeviceID_VDU_OMAP3 # 1
^ 0
HALDeviceID_EtherNIC_SMSC9221 # 1
HALDeviceID_EtherNIC_DM9000 # 1
]
OPT OldOpt
......
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