Resources phase now works properly again, for both ADFSFiler and SCSIFiler.

Now hourglasses round the [AD|SCSI]FS_DescribeDisc that causes the initial
mount of a new disc.

Version 0.97. Tagged as 'ADFSFiler-0_97'

Makefile

@@ -24,14 +24,18 @@
 
 COMPONENT ?= ADFSFiler
 ROM_SOURCE = s.ADFSFiler
-RESOURCEEXTRAADFSFiler = resources_templates
-RESOURCEEXTRASCSIFiler =
-RESOURCEEXTRA = RESOURCEEXTRA${COMPONENT}
+RESOURCEEXTRA = resources_${COMPONENT}
 PRIVATEMSGS = yes
 
 include StdTools
 include AAsmModule
 
+resources_ADFSFiler: resources_templates
+	@|
+
+resources_SCSIFiler: ${MERGEDMSGS}
+	${CP} ${MERGEDMSGS} ${RESFSDIR}.Messages ${CPFLAGS}
+
 o.${MACHINE}._Messages_.ADFSFiler:
 	${MKDIR} ${MERGEDMDIR}
 	${TOUCH} $@

VersionASM

@@ -11,13 +11,13 @@
                         GBLS    Module_HelpVersion
                         GBLS    Module_ComponentName
                         GBLS    Module_ComponentPath
-Module_MajorVersion     SETS    "0.96"
-Module_Version          SETA    96
+Module_MajorVersion     SETS    "0.97"
+Module_Version          SETA    97
 Module_MinorVersion     SETS    ""
-Module_Date             SETS    "03 Jun 2003"
-Module_ApplicationDate  SETS    "03-Jun-03"
+Module_Date             SETS    "05 Jun 2003"
+Module_ApplicationDate  SETS    "05-Jun-03"
 Module_ComponentName    SETS    "ADFSFiler"
 Module_ComponentPath    SETS    "RiscOS/Sources/FileSys/ADFS/ADFSFiler"
-Module_FullVersion      SETS    "0.96"
-Module_HelpVersion      SETS    "0.96 (03 Jun 2003)"
+Module_FullVersion      SETS    "0.97"
+Module_HelpVersion      SETS    "0.97 (05 Jun 2003)"
                         END

VersionNum

-/* (0.96)
+/* (0.97)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.68.
  *
  */
-#define Module_MajorVersion_CMHG        0.96
+#define Module_MajorVersion_CMHG        0.97
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                03 Jun 2003
+#define Module_Date_CMHG                05 Jun 2003
 
-#define Module_MajorVersion             "0.96"
-#define Module_Version                  96
+#define Module_MajorVersion             "0.97"
+#define Module_Version                  97
 #define Module_MinorVersion             ""
-#define Module_Date                     "03 Jun 2003"
+#define Module_Date                     "05 Jun 2003"
 
-#define Module_ApplicationDate          "03-Jun-03"
+#define Module_ApplicationDate          "05-Jun-03"
 
 #define Module_ComponentName            "ADFSFiler"
 #define Module_ComponentPath            "RiscOS/Sources/FileSys/ADFS/ADFSFiler"
 
-#define Module_FullVersion              "0.96"
-#define Module_HelpVersion              "0.96 (03 Jun 2003)"
-#define Module_LibraryVersionInfo       "0:96"
+#define Module_FullVersion              "0.97"
+#define Module_HelpVersion              "0.97 (05 Jun 2003)"
+#define Module_LibraryVersionInfo       "0:97"

s/ADFSFiler

@@ -215,6 +215,7 @@ Module_BaseAddr
         GET     Hdr:ResourceFS
         GET     Hdr:ShareD
         GET     Hdr:ExtraLong
+        GET     Hdr:Hourglass
 
         GET     VersionASM
 
@@ -2927,6 +2928,7 @@ checkambiguous Entry "r1-r5"
 
 GetMediaName_nochecks Entry "r1-r7"
 
+        SWI     XHourglass_On
         MOV     r0, r1
         ADR     r1, userdata + &80
       [ SCSI
@@ -2934,7 +2936,8 @@ GetMediaName_nochecks Entry "r1-r7"
       |
         SWI     XADFS_DescribeDisc
       ]
-        EXIT    VS
+        BVS     %FT99
+        SWI     XHourglass_Off
         MOV     r14, #0
         STRB    r14, [r1, #32]          ; ensure name is terminated
 
@@ -2967,6 +2970,11 @@ GetMediaName_nochecks Entry "r1-r7"
 
         EXIT
 
+99
+        SWI     XHourglass_Off
+        SETV
+        EXIT
+
 
 ; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ; Out   cx0, cy0 = coords of mouse pointer