Commit 3195d0dc authored by Kevin Bracey's avatar Kevin Bracey
Browse files

32 bit flag added

Fix for a pair of SWINE which caused verify to complain of "disc drive
not known" at every 512 Mbyte boundary.

Version 0.91. Tagged as 'ADFSFiler-0_91'
parent c9cf1e16
......@@ -22,48 +22,10 @@
# 25-May-94 AMcC Created.
#
#
# 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 = ADFSFiler
SOURCE = s.ADFSFiler
TARGET = rm.ADFSFiler
#
# 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}
${CP} Resources.${LOCALE}.Templates ${RESDIR}.${COMPONENT}.Templates ${CPFLAGS}
@echo ${COMPONENT}: resource files copied
RESOURCEEXTRA = resources_templates
${TARGET}: ${SOURCE}
${AS} ${ASFLAGS} ${SOURCE}
include StdTools
include AAsmModule
# Dynamic dependencies:
;
; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.68.
;
GBLS Module_MajorVersion
GBLA Module_Version
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
Module_MajorVersion SETS "0.90"
Module_Version SETA 90
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.91"
Module_Version SETA 91
Module_MinorVersion SETS ""
Module_Date SETS "14 Jul 2000"
Module_ApplicationDate2 SETS "14-Jul-00"
Module_ApplicationDate4 SETS "14-Jul-2000"
Module_FullVersion SETS "0.90"
Module_Date SETS "14 Nov 2002"
Module_ApplicationDate SETS "14-Nov-02"
Module_ComponentName SETS "ADFSFiler"
Module_ComponentPath SETS "RiscOS/Sources/FileSys/ADFS/ADFSFiler"
Module_FullVersion SETS "0.91"
Module_HelpVersion SETS "0.91 (14 Nov 2002)"
END
/* (0.90)
/* (0.91)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68.
*
*/
#define Module_MajorVersion_CMHG 0.90
#define Module_MajorVersion_CMHG 0.91
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 14 Jul 2000
#define Module_Date_CMHG 14 Nov 2002
#define Module_MajorVersion "0.90"
#define Module_Version 90
#define Module_MajorVersion "0.91"
#define Module_Version 91
#define Module_MinorVersion ""
#define Module_Date "14 Jul 2000"
#define Module_Date "14 Nov 2002"
#define Module_ApplicationDate2 "14-Jul-00"
#define Module_ApplicationDate4 "14-Jul-2000"
#define Module_ApplicationDate "14-Nov-02"
#define Module_FullVersion "0.90"
#define Module_ComponentName "ADFSFiler"
#define Module_ComponentPath "RiscOS/Sources/FileSys/ADFS/ADFSFiler"
#define Module_FullVersion "0.91"
#define Module_HelpVersion "0.91 (14 Nov 2002)"
#define Module_LibraryVersionInfo "0:91"
This diff is collapsed.
......@@ -407,14 +407,16 @@ BkpPollLoop
CMP r0,#2
SWIEQ XWimp_OpenWindow
MOVEQ PC,LR
BNE %FT02
SWI XWimp_OpenWindow
MOV PC,LR
CMP r0,#3
SWIEQ XWimp_CloseWindow
BEQ Task_closedown
02 CMP r0,#3
BNE %FT03
SWI XWimp_CloseWindow
B Task_closedown
CMP r0,#18
03 CMP r0,#18
CMPNE r0,#17
BEQ bkp_message
......@@ -1052,6 +1054,7 @@ bkp_copydismount
Pull "PC"
bkp_dismount DCB "ADFS:%Dismount :",0
ALIGN
[ chkbkpdefects
; SMC: complain if backup destination disc has defects
......
......@@ -202,7 +202,7 @@ fw_block_size * @-fw_next
; r8 -> data block
; Error: V set, r0 -> error block
format_verify_get_memory ENTRY "r1-r7" ; Do not stack r0 or r8
format_verify_get_memory Entry "r1-r7" ; Do not stack r0 or r8
ADRL r1, str_templatefile
SWI XWimp_OpenTemplate
EXIT VS
......@@ -275,7 +275,7 @@ format_verify_get_memory_error_free_close
; ** Drop through **
format_verify_get_memory_error_free
PullEnv ; Unstacks ENTRY stuff.
PullEnv ; Unstacks Entry stuff.
Push "lr" ; Get lr back on stack.
MOV r2, r8 ; Get data block into r2.
B format_verify_error_delete_window ; Assumes a stacked lr.
......@@ -1512,10 +1512,11 @@ VerifyTrack
BEQ %FT80
LDR r0,sectorop
CMP r0,#BigDiscSupport
SWINE XADFS_DiscOp ; call DiscOp or SectorDiscOp depending on the ADFS type
SWIEQ XADFS_SectorDiscOp
80
BIC r2,r2,#7 :SHL: 29 ; take the drive number off again
BEQ %FT78
SWI XADFS_DiscOp ; call DiscOp or SectorDiscOp depending on the ADFS type
B %FT80
78 SWI XADFS_SectorDiscOp
80 BIC r2,r2,#7 :SHL: 29 ; take the drive number off again
BVS %FT01
; r4 (bytes left to verify) should be 0 after successful DiscOp
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment