Commit 32c1662a authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Disc name in backup given R2 validation.

Disc name in verify given R2 validation.
Disc name during formatting made shaded to show it's not editable.
Took the opportunity to fix the red/green bar length which fell off the
end of the box during backup,format,and verify.Someone had tried to fix
it in 1995 by moving the bar back a bit on the templates,but this just
meant it overlapped at both ends! Fix was to subtract an extra 4 from
the maxbarwidth (since there are borders at *both* ends).
Corrected templates for above fix (German ones were OK).
Moved Menus dir into the attic.

Version 0.92. Tagged as 'ADFSFiler-0_92'
parent 3195d0dc
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.91"
Module_Version SETA 91
Module_MajorVersion SETS "0.92"
Module_Version SETA 92
Module_MinorVersion SETS ""
Module_Date SETS "14 Nov 2002"
Module_ApplicationDate SETS "14-Nov-02"
Module_Date SETS "20 Nov 2002"
Module_ApplicationDate SETS "20-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)"
Module_FullVersion SETS "0.92"
Module_HelpVersion SETS "0.92 (20 Nov 2002)"
END
/* (0.91)
/* (0.92)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68.
*
*/
#define Module_MajorVersion_CMHG 0.91
#define Module_MajorVersion_CMHG 0.92
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 14 Nov 2002
#define Module_Date_CMHG 20 Nov 2002
#define Module_MajorVersion "0.91"
#define Module_Version 91
#define Module_MajorVersion "0.92"
#define Module_Version 92
#define Module_MinorVersion ""
#define Module_Date "14 Nov 2002"
#define Module_Date "20 Nov 2002"
#define Module_ApplicationDate "14-Nov-02"
#define Module_ApplicationDate "20-Nov-02"
#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"
#define Module_FullVersion "0.92"
#define Module_HelpVersion "0.92 (20 Nov 2002)"
#define Module_LibraryVersionInfo "0:92"
......@@ -207,7 +207,7 @@ ADFSBackup_Code
LDR r0, [r1, #i_bbx0] ; Icon's x0
LDR r2, [r1, #i_bbx1] ; Icon's x1
SUB r2, r2, r0
SUB r2, r2, #4 ; for border
SUB r2, r2, #8 ; for border
STR r2, [r8, #bkp_MaxFormatBarLength]
[ debug
dreg r2,"Max format bar length is "
......@@ -277,14 +277,20 @@ ADFSBackup_Code
DLINE "Action button set"
]
ADR r1,userdata
MOV r0,r2
STR r0,[r1]
STR r2,[r1,#0]
MOV r0,#2
STR r0,[r1,#4]
MOV r0,#0
SWI XWimp_GetIconState
LDR r1,[r1,#24+8]
LDR r0,=&00003252 ; "R2"
STR r0,[r1]
ADR r1,userdata
MOV r0,#2_0001 :SHL: 28 ; Get ready to set the background colour
STR r0,[r1,#8]
MOV r0,#&f :SHL: 12 ; Set button type to never
ORR r0,r0,#2_1111 :SHL: 28 ; background colour 1
STR r0,[r1,#12]
SWI XWimp_SetIconState
BVS %FT01
......@@ -814,9 +820,6 @@ TransferBytes Push "r1-r7,lr"
DREG r1, " op ",cc
DREG r4, " starting at "
]
ADD lr, r8, #bkp_discrecord
ORR r1, r1, lr, ASL #6
; Start with 1 track's worth of sectors
LDRB r7, [r8, #bkp_discrecord + drec_SecsPerTrk]
......@@ -859,7 +862,6 @@ TransferBytes_LoopStart
]
LDRB lr, [r8, #bkp_discrecord + drec_SectorSize]
MOV r2, r5, ASL lr
ORR r2, r2, r6, ASL #32-3 ; Combine with drive number
BL CountOnes
[ debugbkp
DREG r3, "1 stream length "
......@@ -877,6 +879,13 @@ TransferBytes_LoopStart
MOV r4, r3, ASL lr
LDR r3, [r8, #bkp_memrover]
ADD lr, r8, #bkp_discrecord
CMP lr, #&04000000
BHS %FT40
ORR r1, r1, lr, ASL #6
ORR r2, r2, r6, ASL #32-3 ; Combine with drive number
[ debugbkp
DREG r1, "XADFS_DiscOp(",cc
DREG r2,",",cc
......@@ -886,7 +895,19 @@ TransferBytes_LoopStart
]
SWI XADFS_DiscOp
B %FT60
40
Push "r5"
MOV r5, lr
STR r6, [sp, #-12]!
MOV lr, #0
STMIB sp, {r2, lr}
MOV r2, sp
SWI XADFS_DiscOp64
ADD sp, sp, #12
Pull "r5"
60
BVS TransferEnd
[ debugbkp
......
......@@ -238,7 +238,7 @@ format_verify_get_memory Entry "r1-r7" ; Do not stack r0 or r8
ADD r1, r8, #fw_windowbuffer
ADD r2, r8, #fw_indirectdata
ADD r3, r8, r3 ; Indirect limit = pointer + size
ADD r3, r8, r3 ; Indirect limit = pointer + size
MOV r4, #-1
ADRL r5, w_format
MOV r6, #0
......@@ -251,7 +251,7 @@ format_verify_get_memory Entry "r1-r7" ; Do not stack r0 or r8
LDR r0, [r1, #i_bbx0] ; Icon's x0
LDR r2, [r1, #i_bbx1] ; Icon's x1
SUB r2, r2, r0
SUB r2, r2, #4 ; for border
SUB r2, r2, #8 ; for border
STR r2, [r8, #fw_MaxFormatBarLength]
[ debug
dreg r2,"Max format bar length is "
......@@ -312,7 +312,7 @@ SetBar ROUT
Pull "r0-r4,PC",VS
LDR r14,[sp,#2*4] ; Get colour on entry
MOV r14,r14,ASL #4
MOV r14,r14,LSL #4
STRB r14,[r1,#19+8] ; Icon's background colour
LDR r14,[sp,#1*4] ; R14=length
......@@ -951,9 +951,10 @@ StartFormat ROUT
STR r0,[r1]
MOV r0,#2
STR r0,[r1,#4]
MOV r0,#0
MOV r0,#1 :SHL: 22 ; get ready to set bit 22,clear others
STR r0,[r1,#8]
MOV r0,#&f :SHL: 12 ; Set button type to never
ORR r0,r0,#1 :SHL: 22 ; shade the disc title icon
STR r0,[r1,#12]
SWI XWimp_SetIconState
Pull "r1,PC",VS
......@@ -1281,13 +1282,18 @@ Format_GoVerify
BLVC SetButton
ADRVC r1,userdata
MOVVC r0,r2
STRVC r0,[r1]
STRVC r2,[r1,#0]
MOVVC r0,#2
STRVC r0,[r1,#4]
MOVVC r0,#0
SWIVC XWimp_GetIconState
LDRVC r1,[r1,#24+8]
LDRVC r0,=&00003252 ; "R2"
STRVC r0,[r1]
ADRVC r1,userdata
MOVVC r0,#2_0001 :SHL: 28 ; Get ready to set the background colour
STRVC r0,[r1,#8]
MOVVC r0,#&f :SHL: 12 ; Set button type to never
ORRVC r0,r0,#2_1111 :SHL: 28 ; background colour 1
STRVC r0,[r1,#12]
SWIVC XWimp_SetIconState
......
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