Spinner and Ursula branches merged.

Changed to use srccommit.

Version 1.32. Tagged as 'Sound1-1_32'

Makefile

@@ -58,11 +58,21 @@ clean:
 	${RM} s.TokHelpSrc
 	@echo ${COMPONENT}: cleaned
 
-resources:
-	${MKDIR} ${RESDIR}.SoundChann
-	${CP} Resources.${LOCALE}.Messages  ${RESDIR}.SoundChann.Messages  ${CPFLAGS}
+resources: resources-${CMDHELP}
 	@echo ${COMPONENT}: resource files copied
 
+resources_common:
+	${MKDIR} ${RESDIR}.SoundChann
+	TokenCheck LocalRes:Messages
+	${CP} LocalRes:Messages  ${RESDIR}.SoundChann.Messages  ${CPFLAGS}
+
+resources-None: resources_common
+	@
+
+resources-: resources_common
+	TokenCheck LocalRes:CmdHelp
+	print LocalRes:CmdHelp { >> ${RESDIR}.SoundChann.Messages }
+
 ${TARGET}: ${SOURCE} s.TokHelpSrc
 	${MKDIR} rm.${MACHINE}
 	${AS} ${ASFLAGS} ${SOURCE}

Resources/Germany/Messages

+M00:Die Parameter des Sound-Kommandos sind ungültig.
+M01:Die Nummer des Sound-Kanals muß im Bereich 1-8 liegen.
+M02:Die Stimme muß im Bereich 0-32 angegeben werden.
+M03:         Stimme     Name
+M04:^^^^^^^^ Kanalverteilungsübersicht
+M05:SoundDefault <Lautsprecher> <Lautstärke> <Stimme>
+M06:SoundDefault 
+M07:Der Stimmenindex ist unzulässig.

Version

-                SUBT    > <wini>arm.Sound1.Version
-
-                GBLS    Version
-Version         SETS    "1.30"
-
-                GBLS    CurrentDate
-CurrentDate     SETS    "09 Oct 1995"
-
-                END

VersionASM

@@ -6,9 +6,9 @@
 			GBLS	Module_MinorVersion
 			GBLS	Module_Date
 			GBLS	Module_FullVersion
-Module_MajorVersion	SETS    "1.31"
-Module_Version          SETA    131
+Module_MajorVersion	SETS    "1.32"
+Module_Version          SETA    132
 Module_MinorVersion	SETS	""
 Module_Date		SETS    "16 Aug 1999"
-Module_FullVersion      SETS    "1.31"
+Module_FullVersion      SETS    "1.32"
                         END

VersionNum

-/* (1.31)
+/* (1.32)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG     	1.31
+#define Module_MajorVersion_CMHG     	1.32
 #define Module_MinorVersion_CMHG	
 #define Module_Date_CMHG      		16 Aug 1999
 
-#define Module_MajorVersion     	"1.31"
-#define Module_Version                  131
+#define Module_MajorVersion     	"1.32"
+#define Module_Version                  132
 #define Module_MinorVersion		""
 #define Module_Date      		"16 Aug 1999"
 
-#define Module_FullVersion              "1.31"
+#define Module_FullVersion              "1.32"

s/Sound1

@@ -88,7 +88,7 @@
         OPT     OptPage
 
         GET     Hdr:Sound
-        GET     Version
+        GET     VersionASM
 
         GBLL    debug
 debug   SETL    False
@@ -144,7 +144,11 @@ Module_Name
 Help_String
         DCB     "SoundChannels"
         DCB     9
-        DCB     "$Version ($CurrentDate)", 0
+        DCB     "$Module_MajorVersion ($Module_Date)"
+ [ Module_MinorVersion <> ""
+        DCB     " $Module_MinorVersion"
+ ]
+        DCB     0
 
 Module_SWIDecodeBase
         DCB     "Sound",0
@@ -1734,11 +1738,19 @@ Finalise_Module ENTRY
 
 ; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+;Ursula format
+;
+UServTab
+        DCD     0
+        DCD     UService - Module_Base
+        DCD     Service_Reset
+        DCD     0
+        DCD     UServTab - Module_Base
 Intercept_Services ROUT
-
+        MOV     r0,r0
         CMP     r1, #Service_Reset
         MOVNE   pc, lr
-
+UService
         ENTRY   "r0-r2"                              ; Flush out all channels
         MOV     r0, #SoundChannelForceFlush
         MOV     r1, #SoundPhysChannels-1             ; channel counter