Add more HAL USB definitions to hdr/HALEntries. Add debug option for calling...

Add more HAL USB definitions to hdr/HALEntries. Add debug option for calling HangWatch_Dump on serious errors.

Detail:
  hdr/HALEntries - Added definition of the struct returned by HAL_USBControllerInfo
  hdr/Options, s/Middle - Added the option to call HangWatch_Dump on serious errors
Admin:
  Tested on BB-xM


Version 5.35, 4.79.2.235. Tagged as 'Kernel-5_35-4_79_2_235'

VersionASM

@@ -13,11 +13,11 @@
                         GBLS    Module_ComponentPath
 Module_MajorVersion     SETS    "5.35"
 Module_Version          SETA    535
-Module_MinorVersion     SETS    "4.79.2.234"
-Module_Date             SETS    "17 Aug 2014"
-Module_ApplicationDate  SETS    "17-Aug-14"
+Module_MinorVersion     SETS    "4.79.2.235"
+Module_Date             SETS    "29 Aug 2014"
+Module_ApplicationDate  SETS    "29-Aug-14"
 Module_ComponentName    SETS    "Kernel"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/Kernel"
-Module_FullVersion      SETS    "5.35 (4.79.2.234)"
-Module_HelpVersion      SETS    "5.35 (17 Aug 2014) 4.79.2.234"
+Module_FullVersion      SETS    "5.35 (4.79.2.235)"
+Module_HelpVersion      SETS    "5.35 (29 Aug 2014) 4.79.2.235"
                         END

VersionNum

@@ -5,19 +5,19 @@
  *
  */
 #define Module_MajorVersion_CMHG        5.35
-#define Module_MinorVersion_CMHG        4.79.2.234
-#define Module_Date_CMHG                17 Aug 2014
+#define Module_MinorVersion_CMHG        4.79.2.235
+#define Module_Date_CMHG                29 Aug 2014
 
 #define Module_MajorVersion             "5.35"
 #define Module_Version                  535
-#define Module_MinorVersion             "4.79.2.234"
-#define Module_Date                     "17 Aug 2014"
+#define Module_MinorVersion             "4.79.2.235"
+#define Module_Date                     "29 Aug 2014"
 
-#define Module_ApplicationDate          "17-Aug-14"
+#define Module_ApplicationDate          "29-Aug-14"
 
 #define Module_ComponentName            "Kernel"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Kernel"
 
-#define Module_FullVersion              "5.35 (4.79.2.234)"
-#define Module_HelpVersion              "5.35 (17 Aug 2014) 4.79.2.234"
+#define Module_FullVersion              "5.35 (4.79.2.235)"
+#define Module_HelpVersion              "5.35 (29 Aug 2014) 4.79.2.235"
 #define Module_LibraryVersionInfo       "5:35"

hdr/HALEntries

@@ -241,9 +241,22 @@ KbdFlag_Done    * 1:SHL:31
 
 ; USB
 
+                                 ^ 0
+HALUSBControllerInfo_Type        # 4 ; As below
+HALUSBControllerInfo_Flags       # 4 ; As below
+HALUSBControllerInfo_HW          # 4 ; Hardware base address
+HALUSBControllerInfo_DevNo       # 4 ; IRQ device number
+HALUSBControllerInfo_SizeOf      # 0 ; Size of base structure
+
 HALUSBControllerType_OHCI        * 0
 HALUSBControllerType_EHCI        * 1
 HALUSBControllerType_MUSBMHDRC   * 2
 HALUSBControllerType_SynopsysDWC * 3
 
+HALUSBControllerFlag_HAL_USBPortPower  * 1 ; Use HAL_USBPortPower
+HALUSBControllerFlag_HAL_USBPortStatus * 2 ; Use HAL_USBPortStatus
+HALUSBControllerFlag_HAL_USBPortIRQ    * 4 ; Use HAL_USBPortIRQ
+HALUSBControllerFlag_32bit_Regs        * 8 ; Must use 32bit access for all registers
+HALUSBControllerFlag_EHCI_ETTF         * &80000000 ; EHCI controller has embedded TT
+
         END

hdr/Options

@@ -302,6 +302,9 @@ HiProcVecs      SETL    {FALSE} ; Leave off for now
                 GBLL    DebugForcedReset        ; debug forced hard resets
 DebugForcedReset SETL   {FALSE}
 
+                GBLL    HangWatch               ; Issue HangWatch_Dump on serious errors (data abort, etc.)
+HangWatch       SETL    {FALSE}
+
                 GBLA    FirstUnpluggableModule
 FirstUnpluggableModule  SETA 8                  ; Podule, FileSwitch, ResourceFS, Messages, MessageTrans,
                                                 ; TerritoryManager, UK. Moot now the keyboard and mouse aren't

s/Middle

@@ -702,11 +702,22 @@ DumpyTheRegisters  ROUT
 UNDEF2
         MSR     CPSR_c, #I32_bit+F32_bit+SVC32_mode ; into SVC mode
 
+      [ HangWatch
+        ; Preserve some registers for inclusion in the HangWatch dump
+        MOV     R2, R13
+        MOV     R3, R14
+        MRS     R5, SPSR
+      ]
+
         MOV     R14, R4                 ; corrupt R14_SVC (but already saved if we were in SVC)
 ; ... and fall into
 UNDEF1
         LDR     sp, =SVCSTK             ; Flatten superstack
 
+      [ HangWatch
+        SWI     &59283                  ; XHangWatch_Dump
+      ]
+
         ; Check that ExceptionDump is safe to use
         Push    "R14"                   ; Preserve error ptr
         LDR     R4, =ZeroPage