Skip to content

GitLab

Source
...
Target
Commits (1)
  • Robert Sprowson's avatar
    Free up some command namespace · 25973708
    Robert Sprowson authored 
    Change command to *ScsiDevices to match the other similar ones (IIC, SDIO, GPIO, SPI, SATA etc) with the intention that *Devices can in future be repurposed to list all subsets.
For now, alias one to the other during the transition.

Version 1.19. Tagged as 'SCSIDriver-1_19'
    25973708
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 29 deletions
VersionASM
View file @ 25973708
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.18"
Module_Version SETA 118
Module_MajorVersion SETS "1.19"
Module_Version SETA 119
Module_MinorVersion SETS ""
Module_Date SETS "24 Aug 2013"
Module_ApplicationDate SETS "24-Aug-13"
Module_Date SETS "11 Jan 2018"
Module_ApplicationDate SETS "11-Jan-18"
Module_ComponentName SETS "SCSIDriver"
Module_ComponentPath SETS "castle/RiscOS/Sources/HWSupport/SCSI/SCSIDriver"
Module_FullVersion SETS "1.18"
Module_HelpVersion SETS "1.18 (24 Aug 2013)"
Module_FullVersion SETS "1.19"
Module_HelpVersion SETS "1.19 (11 Jan 2018)"
END
VersionNum
View file @ 25973708
/* (1.18)
/* (1.19)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.18
#define Module_MajorVersion_CMHG 1.19
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 24 Aug 2013
#define Module_Date_CMHG 11 Jan 2018
#define Module_MajorVersion "1.18"
#define Module_Version 118
#define Module_MajorVersion "1.19"
#define Module_Version 119
#define Module_MinorVersion ""
#define Module_Date "24 Aug 2013"
#define Module_Date "11 Jan 2018"
#define Module_ApplicationDate "24-Aug-13"
#define Module_ApplicationDate "11-Jan-18"
#define Module_ComponentName "SCSIDriver"
#define Module_ComponentPath "castle/RiscOS/Sources/HWSupport/SCSI/SCSIDriver"
#define Module_FullVersion "1.18"
#define Module_HelpVersion "1.18 (24 Aug 2013)"
#define Module_LibraryVersionInfo "1:18"
#define Module_FullVersion "1.19"
#define Module_HelpVersion "1.19 (11 Jan 2018)"
#define Module_LibraryVersionInfo "1:19"
doc/Spec
View file @ 25973708
......@@ -89,7 +89,7 @@ SCSI_TargetControl 403C9 603C9
and the following * commands:
*Devices
*ScsiDevices
*ScsiBlock (N.B. NOT IMPLEMENTED BY ACORN SCSIdriver)
......@@ -166,7 +166,7 @@ The Bitset of software features is defined as follows;
Bit 26 Supports *ScsiBlock
Bits 25..16 Reserved must be 0
Bits 15..7 Reserved must be 1
Bit 6 Supports *Devices
Bit 6 Supports *ScsiDevices
Bit 5 Supports scatter list for SWI SCSI_Op
Bit 4 Supports messaging
Bit 3 Supports automatic "Request Sense"
......@@ -292,7 +292,7 @@ entry:
R3 buffer size
The data returned is a zero terminated string of the same form as that
printed by *devices, ie
printed by *ScsiDevices, ie
"ddd ttttttttttttttttt cccc Mbytes vvvvvvvv pppppppppppppppp rrrr"
......@@ -1007,10 +1007,10 @@ NOTE Bit 23 of R1 always indicates data-in-R2-is-valid, as it is either the
The * commands
==============
*Devices
========
*ScsiDevices
============
*Devices displays information on the devices attached to the SCSI
*ScsiDevices displays information on the devices attached to the SCSI
bus(es). The resulting display shows the type of each device this can be
either "Direct-access", "Sequential-access", "Printer", "Processor", "WORM",
"Read-only", "Scanner", "Optical memory", "Changer", Communications",
......
s/SCSIDriver
View file @ 25973708
......@@ -157,6 +157,7 @@ Module_BaseAddr
GET Hdr:HALEntries
GET Hdr:SCSI
GET Hdr:SCSIErr
GET Hdr:Variables
GET hdr.SCSIMacros
GET VersionASM
GET hdr.SCSIEquates
......@@ -217,23 +218,23 @@ ModFlags
[ :LNOT:soft
HC_Table
Command Devices, 0,0
Command SCSIDevices, 0,0
DCD 0
; ------------------------------------------------------------
; GET TokHelpSrc. For now, have inline non tokenised help text
Devices_Help
DCB "*Devices lists type, capacity and vendor details of "
SCSIDevices_Help
DCB "*SCSIDevices lists type, capacity and vendor details of "
DCB "attached SCSI devices"
DCB 13
Devices_Syntax
DCB "Syntax: *Devices"
SCSIDevices_Syntax
DCB "Syntax: *SCSIDevices"
DCB 0
ALIGN
Devices_Code
SCSIDevices_Code
Entry
LDR WsPtr,[R12]
......@@ -316,7 +317,7 @@ Devices_Co_40
EXIT
;
; Format of display by *Devices
; Format of display by *SCSIDevices
; 1 2 3 4 5 6 7
; 01234567890123456789012345678901234567890123456789012345678901234567890
;
......@@ -420,6 +421,11 @@ LenTextCapacityUnknown EQU (.-TextCapacityUnknown)
ALIGN
AliasFrom DCB "Alias$Devices", 0
AliasTo DCB "%SCSIDevices"
ALIGN
] ; :LNOT:soft
......@@ -456,6 +462,14 @@ ModInit
MOVNE WsPtr,R2 ; Already got our workspace (ie this is a
BNE GotWorkSpace ; reinitialise entry)
[ :LNOT:soft
ADR R0,AliasFrom
ADR R1,AliasTo ; Transitionary
MOV R2,#?AliasTo
MOV R3,#0
MOV R4,#VarType_LiteralString
SWI XOS_SetVarVal
]
CMP R11,#&03000000 ; Loaded from a podule,
BHS ModIn_20 ; R11 is podule base address
CMP R11,#0
......