Fix HAL_UARTModemControl

Detail:
  s/UART - Fixed HAL_UARTModemControl to pay attention to the 'mask' parameter
Admin:
  Tested in Iyonix ROM softload


Version 0.31. Tagged as 'Tungsten-0_31'

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "0.30"
-Module_Version          SETA    30
+Module_MajorVersion     SETS    "0.31"
+Module_Version          SETA    31
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "26 Nov 2011"
-Module_ApplicationDate  SETS    "26-Nov-11"
+Module_Date             SETS    "04 Dec 2011"
+Module_ApplicationDate  SETS    "04-Dec-11"
 Module_ComponentName    SETS    "Tungsten"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/HAL/Tungsten"
-Module_FullVersion      SETS    "0.30"
-Module_HelpVersion      SETS    "0.30 (26 Nov 2011)"
+Module_FullVersion      SETS    "0.31"
+Module_HelpVersion      SETS    "0.31 (04 Dec 2011)"
                         END

VersionNum

-/* (0.30)
+/* (0.31)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        0.30
+#define Module_MajorVersion_CMHG        0.31
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                26 Nov 2011
+#define Module_Date_CMHG                04 Dec 2011
 
-#define Module_MajorVersion             "0.30"
-#define Module_Version                  30
+#define Module_MajorVersion             "0.31"
+#define Module_Version                  31
 #define Module_MinorVersion             ""
-#define Module_Date                     "26 Nov 2011"
+#define Module_Date                     "04 Dec 2011"
 
-#define Module_ApplicationDate          "26-Nov-11"
+#define Module_ApplicationDate          "04-Dec-11"
 
 #define Module_ComponentName            "Tungsten"
 #define Module_ComponentPath            "castle/RiscOS/Sources/HAL/Tungsten"
 
-#define Module_FullVersion              "0.30"
-#define Module_HelpVersion              "0.30 (26 Nov 2011)"
-#define Module_LibraryVersionInfo       "0:30"
+#define Module_FullVersion              "0.31"
+#define Module_HelpVersion              "0.31 (04 Dec 2011)"
+#define Module_LibraryVersionInfo       "0:31"

s/UART

@@ -394,16 +394,16 @@ HAL_UARTBreak
 
 HAL_UARTModemControl
         BaseAddr
-        PHPSEI  ip, a3
-        LDRB    a3, [a1, #UART_MCR]
+        PHPSEI  ip, a4
+        LDRB    a4, [a1, #UART_MCR]
         CMP     a2, #-1
-        AND     a4, a3, #DTR+RTS                ; a4 = relevant bits of current MCR
-        BIC     a3, a3, #DTR+RTS                ; a3 = other bits of current MCR
-        ANDNE   a2, a2, #DTR+RTS                ; a2 = relevant bits on entry
-        ORRNE   a2, a2, a3
-        STRNEB  a2, [a1, #UART_MCR]
+        ORR     a3, a3, #256-(DTR+RTS) ; Only allow DTR+RTS to be modified
+        AND     a2, a2, #DTR+RTS
+        ANDNE   a3, a3, a4
+        EORNE   a3, a3, a2
+        STRNEB  a3, [a1, #UART_MCR]
         PLP     ip
-        MOV     a1, a4
+        AND     a1, a4, #DTR+RTS
         MOV     pc, lr