Tweak debug code

Detail:
  hdr/80321 - Improved notes about debug options.
  s/Boot - Don't reinit UART 3 if it's already in use for debugging
  s/Top, hdr/80321 - Use new FlashCheckInDebug option to help work out whether flash check failure code is called
  s/UART - Disable HAL UART API if UART 3 is in use for debugging
Admin:
  Tested in ROM softload


Version 0.29. Tagged as 'Tungsten-0_29'

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "0.28"
-Module_Version          SETA    28
+Module_MajorVersion     SETS    "0.29"
+Module_Version          SETA    29
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "19 Jan 2010"
-Module_ApplicationDate  SETS    "19-Jan-10"
+Module_Date             SETS    "08 Aug 2011"
+Module_ApplicationDate  SETS    "08-Aug-11"
 Module_ComponentName    SETS    "Tungsten"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/HAL/Tungsten"
-Module_FullVersion      SETS    "0.28"
-Module_HelpVersion      SETS    "0.28 (19 Jan 2010)"
+Module_FullVersion      SETS    "0.29"
+Module_HelpVersion      SETS    "0.29 (08 Aug 2011)"
                         END

VersionNum

-/* (0.28)
+/* (0.29)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        0.28
+#define Module_MajorVersion_CMHG        0.29
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                19 Jan 2010
+#define Module_Date_CMHG                08 Aug 2011
 
-#define Module_MajorVersion             "0.28"
-#define Module_Version                  28
+#define Module_MajorVersion             "0.29"
+#define Module_Version                  29
 #define Module_MinorVersion             ""
-#define Module_Date                     "19 Jan 2010"
+#define Module_Date                     "08 Aug 2011"
 
-#define Module_ApplicationDate          "19-Jan-10"
+#define Module_ApplicationDate          "08-Aug-11"
 
 #define Module_ComponentName            "Tungsten"
 #define Module_ComponentPath            "castle/RiscOS/Sources/HAL/Tungsten"
 
-#define Module_FullVersion              "0.28"
-#define Module_HelpVersion              "0.28 (19 Jan 2010)"
-#define Module_LibraryVersionInfo       "0:28"
+#define Module_FullVersion              "0.29"
+#define Module_HelpVersion              "0.29 (08 Aug 2011)"
+#define Module_LibraryVersionInfo       "0:29"

hdr/80321

@@ -16,9 +16,17 @@
           GBLL    RevB
 RevB      SETL    {TRUE}
 
-          ; Debugging in the serial port,and the choice of UART (1 or 3)
+          ; Debugging in the serial port (HAL_DebugTX, HAL_DebugRX)
           GBLL    Debug
 Debug     SETL    {FALSE}
+
+          ; Choice of debug UART (1 or 3)
+          ; UART 1 = backplate port 1, shared with Serial module
+          ; UART 3 = backplate port 2. Ordinarily used by DualSerial module
+          ; (via HAL UART API). But if (Debug :LAND: (DebugPort=3)), HAL debug
+          ; code will be sole user.
+          ; Note that this option also selects the port used by the FlashCheck
+          ; code
           GBLA    DebugPort
 DebugPort SETA    1
 
@@ -34,6 +42,11 @@ DisableUSB SETL   {TRUE}
           GBLL    FlashCheck
 FlashCheck SETL   {TRUE} :LAND: RevB
 
+          ; Should flash checking be enabled, even if debug is
+          ; (must be true for current softload tool to load debug images)
+          GBLL    FlashCheckInDebug
+FlashCheckInDebug SETL {TRUE}
+
           ; Should the I cache be off when the MMU is
           GBLL    CacheOff
 CacheOff  SETL    {FALSE}

s/Boot

@@ -434,8 +434,10 @@ HAL_Init
 
         BL      ATA_Init
 
+   [ :LNOT: (Debug :LAND: (DebugPort = 3))
         MOV     a1,#0
         BL      HAL_UARTStartUp
+   ]
 ;        MOV     a1,#1
 ;        BL      HAL_UARTStartUp
 ;        MOV     a1,#2

s/Top

@@ -255,7 +255,7 @@ wait_for_aau
 
 ; now back up to ROM
 
- [ FlashCheck :LAND: :LNOT: Debug
+ [ FlashCheck :LAND: (FlashCheckInDebug :LOR: :LNOT: Debug)
         ; Is the ROM valid?
         TEQ     v4, #0
         ; if not signal the failure on the floppy drive light and

s/UART

@@ -61,7 +61,11 @@ $label  BaseAddr
 ;   Return array of UART port physical addresses.
 ;
 HAL_UARTPorts
+   [ Debug :LAND: (DebugPort = 3)
+        MOV     a1, #0
+   |
         MOV     a1, #1
+   ]
         MOV     pc, lr
 
 ; void StartUp(int port)