Skip to content

GitLab

Source
...
Target
Commits (1)
  • Jeffrey Lee's avatar
    Update to work with zero page relocation · 166d7506
    Jeffrey Lee authored 
    Detail:
  s/SCSIDriver - Use OS_ReadEscapeState instead of checking ESC_Status manually
  hdr/SCSIEquates - Get rid of obsolete EscapeBit definition
Admin:
  Tested on rev A2 BB-xM


Version 1.15. Tagged as 'SCSIDriver-1_15'
    166d7506
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 29 deletions
VersionASM
View file @ 166d7506
; ;
; This file is automatically maintained by srccommit, do not edit manually. ; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.68. ; Last processed by srccommit version: 1.1.
; ;
GBLS Module_MajorVersion GBLS Module_MajorVersion
GBLA Module_Version GBLA Module_Version
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
GBLS Module_HelpVersion GBLS Module_HelpVersion
GBLS Module_ComponentName GBLS Module_ComponentName
GBLS Module_ComponentPath GBLS Module_ComponentPath
Module_MajorVersion SETS "1.14" Module_MajorVersion SETS "1.15"
Module_Version SETA 114 Module_Version SETA 115
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "16 Jun 2003" Module_Date SETS "04 Aug 2011"
Module_ApplicationDate SETS "16-Jun-03" Module_ApplicationDate SETS "04-Aug-11"
Module_ComponentName SETS "SCSIDriver" Module_ComponentName SETS "SCSIDriver"
Module_ComponentPath SETS "RiscOS/Sources/HWSupport/SCSI/SCSIDriver" Module_ComponentPath SETS "castle/RiscOS/Sources/HWSupport/SCSI/SCSIDriver"
Module_FullVersion SETS "1.14" Module_FullVersion SETS "1.15"
Module_HelpVersion SETS "1.14 (16 Jun 2003)" Module_HelpVersion SETS "1.15 (04 Aug 2011)"
END END
VersionNum
View file @ 166d7506
/* (1.14) /* (1.15)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68. * Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 1.14 #define Module_MajorVersion_CMHG 1.15
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 16 Jun 2003 #define Module_Date_CMHG 04 Aug 2011
#define Module_MajorVersion "1.14" #define Module_MajorVersion "1.15"
#define Module_Version 114 #define Module_Version 115
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "16 Jun 2003" #define Module_Date "04 Aug 2011"
#define Module_ApplicationDate "16-Jun-03" #define Module_ApplicationDate "04-Aug-11"
#define Module_ComponentName "SCSIDriver" #define Module_ComponentName "SCSIDriver"
#define Module_ComponentPath "RiscOS/Sources/HWSupport/SCSI/SCSIDriver" #define Module_ComponentPath "castle/RiscOS/Sources/HWSupport/SCSI/SCSIDriver"
#define Module_FullVersion "1.14" #define Module_FullVersion "1.15"
#define Module_HelpVersion "1.14 (16 Jun 2003)" #define Module_HelpVersion "1.15 (04 Aug 2011)"
#define Module_LibraryVersionInfo "1:14" #define Module_LibraryVersionInfo "1:15"
hdr/SCSIEquates
View file @ 166d7506
...@@ -53,8 +53,6 @@ LF * 10 ...@@ -53,8 +53,6 @@ LF * 10
CR * 13 CR * 13
SPACE * 32 SPACE * 32
EscapeBit EQU &40 ;This bit indicates escape pressed
IDLE EQU &00000000 IDLE EQU &00000000
RUNNING EQU &00000004 RUNNING EQU &00000004
STALLED EQU &00000008 STALLED EQU &00000008
......
s/SCSIDriver
View file @ 166d7506
...@@ -6772,15 +6772,12 @@ DoForEac_20 ...@@ -6772,15 +6772,12 @@ DoForEac_20
; R0 = R0 ORed with CTL_DOINGESCAPEDEVICE ; R0 = R0 ORed with CTL_DOINGESCAPEDEVICE
; ;
TestEscapeStatus TestEscapeStatus
Push R1 Push LR
MOV R1,#0 SWI XOS_ReadEscapeState
LDRB R1,[R1,#ESC_Status] Pull PC,CC ;Escape not pressed, so return
TSTS R1,#EscapeBit
Pull R1
MOVEQ PC,Link ;Escape not pressed, so return
ORR R0,R0,#CTL_DOINGESCAPEDEVICE ORR R0,R0,#CTL_DOINGESCAPEDEVICE
Push "R0,R1,R2,Link" Push "R0,R1,R2"
MOV R1,#CTL_DOINGESCAPEDEVICE ;Try to abort, MOV R1,#CTL_DOINGESCAPEDEVICE ;Try to abort,
BL RaiseATN ; if it works, report esacpe BL RaiseATN ; if it works, report esacpe
Pull "R0,R1,R2,PC" Pull "R0,R1,R2,PC"
......