Minor bugfixes.

Detail:
  * Fixed some assumptions about flag preservation in CD_ SWIs
  * Standardised spelling of CD-ROM in messages files (not CD ROM)
  * Fixed pathname of messages file to include $
Admin:
  Tested on Tungsten.

Version 2.39. Tagged as 'CDFSDriver-2_39'

Resources/UK/Messages

 #{DictTokens}
-NoConfD:No CD ROM drives configured
+NoConfD:No CD-ROM drives configured
 NoAlign:Area not word aligned
 DrvNSup:CD-ROM drive not supported
 ModNSup:CD mode not supported

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "2.38"
-Module_Version          SETA    238
+Module_MajorVersion     SETS    "2.39"
+Module_Version          SETA    239
 Module_MinorVersion     SETS    ""
 Module_Date             SETS    "22 Nov 2002"
 Module_ApplicationDate  SETS    "22-Nov-02"
 Module_ComponentName    SETS    "CDFSDriver"
 Module_ComponentPath    SETS    "RiscOS/Sources/HWSupport/CD/CDFSDriver"
-Module_FullVersion      SETS    "2.38"
-Module_HelpVersion      SETS    "2.38 (22 Nov 2002)"
+Module_FullVersion      SETS    "2.39"
+Module_HelpVersion      SETS    "2.39 (22 Nov 2002)"
                         END

VersionNum

-/* (2.38)
+/* (2.39)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.68.
  *
  */
-#define Module_MajorVersion_CMHG        2.38
+#define Module_MajorVersion_CMHG        2.39
 #define Module_MinorVersion_CMHG        
 #define Module_Date_CMHG                22 Nov 2002
 
-#define Module_MajorVersion             "2.38"
-#define Module_Version                  238
+#define Module_MajorVersion             "2.39"
+#define Module_Version                  239
 #define Module_MinorVersion             ""
 #define Module_Date                     "22 Nov 2002"
 
@@ -18,6 +18,6 @@
 #define Module_ComponentName            "CDFSDriver"
 #define Module_ComponentPath            "RiscOS/Sources/HWSupport/CD/CDFSDriver"
 
-#define Module_FullVersion              "2.38"
-#define Module_HelpVersion              "2.38 (22 Nov 2002)"
-#define Module_LibraryVersionInfo       "2:38"
+#define Module_FullVersion              "2.39"
+#define Module_HelpVersion              "2.39 (22 Nov 2002)"
+#define Module_LibraryVersionInfo       "2:39"

s/CD_Routs

@@ -213,10 +213,13 @@ cd_readdata ROUT
 ;-----------------------------------------------
  LDR       r14, =Busy
  TEQ       r6, r14
- Push      "r1-r5", EQ
- SWIEQ     XCD_StopDisc
- LDMEQFD   r13, { r0 - r4 }
- BEQ       %BT01
+ BNE       %FT80
+ Push      "r1-r5"
+ SWI       XCD_StopDisc
+ LDMFD     r13, { r0 - r4 }
+ B         %BT01
+
+80
 
 ;-----------------------------------------------
 ; If the error is "Illegal Request", "DataProtect" or "Blank check"
@@ -306,14 +309,11 @@ cd_seekto ROUT
  LDR       r14, =Busy
  LDR       r6, [ r0 ]
  TEQ       r6, r14
- Push      "r1-r2", EQ
- SWIEQ     XCD_StopDisc
- LDMEQFD   r13, { r0 - r1 }
- BEQ       %BT01
-
-;-----------------------------------------------
-
- B         error_handler
+ BNE       error_handler
+ Push      "r1-r2"
+ SWI       XCD_StopDisc
+ LDMFD     r13, { r0 - r1 }
+ B         %BT01
 
 ;-----------------------------------------------------------------------------------------------
 cd_inquiry ROUT

s/OnError

@@ -49,7 +49,7 @@
 
 
 message_file_name
-        DCB     "Resources:Resources.CDFSDriver.CDFSDriver.Messages",0
+        DCB     "Resources:$.Resources.CDFSDriver.CDFSDriver.Messages",0
         ALIGN
 
 ;-----------------------------------------------------------------------------------------------