Merged Spinner and Ursula branches. Placed unser srccommit control.

Detail:
	Merged Spinner branch (no changes) and Ursula branch (makefile
tidied). Placed the whole component under srccommit control.

Admin:
	Tested on a RiscPC.

Version 2.34. Tagged as 'CDFSDriver-2_34'

VersionASM

@@ -6,9 +6,9 @@
 			GBLS	Module_MinorVersion
 			GBLS	Module_Date
 			GBLS	Module_FullVersion
-Module_MajorVersion	SETS    "2.33"
-Module_Version          SETA    233
+Module_MajorVersion	SETS    "2.34"
+Module_Version          SETA    234
 Module_MinorVersion	SETS	""
 Module_Date		SETS    "05 Nov 1999"
-Module_FullVersion      SETS    "2.33"
+Module_FullVersion      SETS    "2.34"
                         END

VersionNum

-/* (2.33)
+/* (2.34)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG     	2.33
+#define Module_MajorVersion_CMHG     	2.34
 #define Module_MinorVersion_CMHG	
 #define Module_Date_CMHG      		05 Nov 1999
 
-#define Module_MajorVersion     	"2.33"
-#define Module_Version                  233
+#define Module_MajorVersion     	"2.34"
+#define Module_Version                  234
 #define Module_MinorVersion		""
 #define Module_Date      		"05 Nov 1999"
 
-#define Module_FullVersion              "2.33"
+#define Module_FullVersion              "2.34"

s/CD_Routs

@@ -81,8 +81,8 @@ cd_version ROUT
  ADR       r0, VersionMessage
  BICS      pc, r14, #Overflow_Flag
 
-VersionMessage DCD Version
-                 = "$VString", " CD_SWI control module by Eesox", 0
+VersionMessage DCD Module_Version
+                 = "$Module_FullVersion", " CD_SWI control module by Eesox", 0
  ALIGN
 
 ;-----------------------------------------------------------------------------------------------

s/Main

@@ -84,7 +84,7 @@ startofheader
  GET hdr.Hashes     ; all hashes (incl. configuration flags)
  GET hdr.CDMacros   ; local macros
 
- GET Version    ; date/version number
+ GET VersionASM    ; date/version number
 
  GET S.Strings    ; contains errors and strings
  GET S.Tables     ; contains info for setting up blocks
@@ -302,7 +302,7 @@ SWIentry_after_wp
  BEQ       cd_checkdrive
 
 ; Make sure that CD_Get/SetAudioParms supported if its being called
- [ Version >= 232
+ [ Module_Version >= 232
  TEQ       r11, # DRIVER__GetAudioParms
  TEQNE     r11, # DRIVER__SetAudioParms
  BNE       IDC_Go

s/Strings

@@ -88,7 +88,7 @@ driver_not_present_error
  addr      r0, driver_not_present
  B         error_handler_lookup
 
-help = "CDFSdriver",9, "$VString ($Date)", 0
+help = "CDFSdriver",9, "$Module_FullVersion ($Module_Date)", 0
 
  ALIGN
      = " by Eesox", 0

s/Tables

@@ -73,7 +73,7 @@ tableofswinames              ; List of SWI names
   = "ReadUserData", 0        ; 39
   = "SeekUserData", 0        ; 40
 
- [ Version >= 232
+ [ Module_Version >= 232
   = "GetAudioParms", 0       ; 41
   = "SetAudioParms", 0       ; 42