Updated build structure to use the shared AAsmModule makefile.

  Updated to build using objasm instead of aasm.
  Sources changed to be objasm-compatible.
Admin:
  Requires Library 0.71 or later.
  Requires BuildSys 3.06 or later.
  Requires Env 0.65 or later.

Version 1.14. Tagged as 'Percussion-1_14'

Makefile

@@ -19,50 +19,12 @@
 # ***********************************
 # Date       Name         Description
 # ----       ----         -----------
-# 25-May-94  AMcC         Created.
+# 07-Mar-01  SNB          Recreated
 #
 
-#
-# Generic options:
-#
-MKDIR   = cdir
-AS      = aasm
-CP      = copy
-RM      = remove
-CCFLAGS = -c -depend !Depend -IC:
-ASFLAGS = -depend !Depend -Stamp -quit -module -To $@ -From
-CPFLAGS = ~cfr~v
-
-#
-# Program specific options:
-#
 COMPONENT = Percussion
-SOURCE    = s.Percussion
-TARGET    = rm.Percussion
-
-#
-# Generic rules:
-#
-rom: ${TARGET}
-	@echo ${COMPONENT}: rom module built
-
-export: 
-	@echo ${COMPONENT}: export complete
-
-install_rom: ${TARGET}
-	${CP} ${TARGET} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
-	@echo ${COMPONENT}: rom module installed
-
-clean:
-	${RM} ${TARGET}
-	@echo ${COMPONENT}: cleaned
-
-resources:
-	${MKDIR} ${RESDIR}.${COMPONENT}
-	${CP} Resources.${LOCALE}.Messages  ${RESDIR}.${COMPONENT}.Messages  ${CPFLAGS}
-	@echo ${COMPONENT}: resource files copied
 
-${TARGET}: ${SOURCE}
-	${AS} ${ASFLAGS} ${SOURCE}
+include StdTools
+include AAsmModule
 
 # Dynamic dependencies:

MkClean,fd7

@@ -14,3 +14,4 @@
 |
 Dir <Obey$Dir>
 amu_machine clean
+stripdepnd Makefile

VersionASM

@@ -6,9 +6,19 @@
                         GBLS    Module_MinorVersion
                         GBLS    Module_Date
                         GBLS    Module_FullVersion
-Module_MajorVersion     SETS    "1.13"
-Module_Version          SETA    113
+                        GBLS    Module_ApplicationDate2
+                        GBLS    Module_ApplicationDate4
+                        GBLS    Module_HelpVersion
+                        GBLS    Module_ComponentName
+                        GBLS    Module_ComponentPath
+Module_MajorVersion     SETS    "1.14"
+Module_Version          SETA    114
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "08 Dec 1999"
-Module_FullVersion      SETS    "1.13"
+Module_Date             SETS    "16 Mar 2001"
+Module_ApplicationDate2 SETS    "16-Mar-01"
+Module_ApplicationDate4 SETS    "16-Mar-2001"
+Module_ComponentName    SETS    "Percussion"
+Module_ComponentPath    SETS    "RiscOS/Sources/HWSupport/Sound/Voices/Percussion"
+Module_FullVersion      SETS    "1.14"
+Module_HelpVersion      SETS    "1.14 (16 Mar 2001)"
                         END

VersionNum

-/* (1.13)
+/* (1.14)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG        1.13
+#define Module_MajorVersion_CMHG        1.14
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                08 Dec 1999
+#define Module_Date_CMHG                16 Mar 2001
 
-#define Module_MajorVersion             "1.13"
-#define Module_Version                  113
+#define Module_MajorVersion             "1.14"
+#define Module_Version                  114
 #define Module_MinorVersion             ""
-#define Module_Date                     "08 Dec 1999"
+#define Module_Date                     "16 Mar 2001"
 
-#define Module_FullVersion              "1.13"
+#define Module_ApplicationDate2         "16-Mar-01"
+#define Module_ApplicationDate4         "16-Mar-2001"
+
+#define Module_ComponentName            "Percussion"
+#define Module_ComponentPath            "RiscOS/Sources/HWSupport/Sound/Voices/Percussion"
+
+#define Module_FullVersion              "1.14"
+#define Module_HelpVersion              "1.14 (16 Mar 2001)"

s/MsgCode

@@ -25,7 +25,7 @@
 ;        R11 -> message file block
 ; Exit:  R0 -> String or V set error return
 
-lookup_zero_file_r11 ENTRY "r1-r7"
+lookup_zero_file_r11 Entry "r1-r7"
         MOV     r1, r0                          ; Token
         SUBS    r0, r11, #0                     ; File handle (clears V!)
         EXIT    EQ                              ; No file so return zero
@@ -48,7 +48,7 @@ message_filename
 ; Open the message file, using the 16 byte block passed in R11.
 ; Preserves all registers, if error then R0->error block, V set.
 
-open_message_file_r11 ENTRY "r0-r2"
+open_message_file_r11 Entry "r0-r2"
         MOV     r0, r11                         ; Block passed for file
         ADR     r1, message_filename
         MOV     r2, #0
@@ -61,7 +61,7 @@ open_message_file_r11 ENTRY "r0-r2"
 ; Close the message file block passed in R11 (or ignore if 0).
 ; Preserves all registers, if error then R0->error block, V set.
 
-close_message_file_r11 ENTRY "r0"
+close_message_file_r11 Entry "r0"
         SUBS    r0, r11, #0                     ; File handle (clears V!)
         EXIT    EQ                              ; No file so return zero
 

s/Percussion

@@ -55,7 +55,7 @@
 
 ; Now we can start the module
 
-   LEADR Module_LoadAddr    ; give output the right addresses
+   AREA |Percussion$$Code|, CODE, READONLY, PIC
 
 Module_Base                ; label for calculating offsets
         &       0 ; not application
@@ -79,20 +79,17 @@ Module_Name = "Percussion", 0
 Help_String
         =       "Percussion"
         =       9
-        DCB     "$Module_MajorVersion ($Module_Date)"
-      [ Module_MinorVersion <> ""
-        DCB     " $Module_MinorVersion"
-      ]
+        DCB     "$Module_HelpVersion"
         DCB     0
         ALIGN
 
  [ :LNOT: No32bitCode
 Module_Flags
-   DCD     1           ; 32-bit OK
+   DCD     ModuleFlag_32bit           ; 32-bit OK
  ]
 
 ; the initialisation :
-Initialise_Module ENTRY "r11",16        ; MessageTrans file block on stack
+Initialise_Module Entry "r11",16        ; MessageTrans file block on stack
         MOV     r11, sp                      ; held in r11
         LDR     R3, WorkSpaceSize
         LDR     R2, [R12]     ; check for reinitialisation
@@ -227,7 +224,7 @@ Intercept_Services
         TEQ     r1, #Service_ResourceFSStarted
         MOVNE   pc, r14
 UService
-change_names ENTRY "r0-r3, r11", 16     ; MessageTrans file block on
+change_names Entry "r0-r3, r11", 16     ; MessageTrans file block on
         MOV     r11, sp                 ; stack held in r11.
         BL      open_message_file_r11
         EXIT    VS                      ; Give up if no file.