Commit 59434ba5 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Minor cleanups

* Upcall and OsByte symbols used from central headers
* T and F swapped for ObjAsm built in variables
* Deleted some unused CPU and hardware definitions
* Put unused files in the attic
Tested briefly, still worked.

Version 1.27. Tagged as 'SCSIFS-1_27'
parent 29bce293
......@@ -56,6 +56,5 @@ o.SCSIFSErr: s.SCSIFSErr
clean::
${WIPE} o ${WFLAGS}
${RM} hdr.SCSIFSErr
@@echo ${COMPONENT}: cleaned
# Dynamic dependencies:
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.26"
Module_Version SETA 126
Module_MajorVersion SETS "1.27"
Module_Version SETA 127
Module_MinorVersion SETS ""
Module_Date SETS "26 Jun 2012"
Module_ApplicationDate SETS "26-Jun-12"
Module_Date SETS "23 Aug 2013"
Module_ApplicationDate SETS "23-Aug-13"
Module_ComponentName SETS "SCSIFS"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/SCSIFS/SCSIFS"
Module_FullVersion SETS "1.26"
Module_HelpVersion SETS "1.26 (26 Jun 2012)"
Module_FullVersion SETS "1.27"
Module_HelpVersion SETS "1.27 (23 Aug 2013)"
END
/* (1.26)
/* (1.27)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.26
#define Module_MajorVersion_CMHG 1.27
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 26 Jun 2012
#define Module_Date_CMHG 23 Aug 2013
#define Module_MajorVersion "1.26"
#define Module_Version 126
#define Module_MajorVersion "1.27"
#define Module_Version 127
#define Module_MinorVersion ""
#define Module_Date "26 Jun 2012"
#define Module_Date "23 Aug 2013"
#define Module_ApplicationDate "26-Jun-12"
#define Module_ApplicationDate "23-Aug-13"
#define Module_ComponentName "SCSIFS"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/SCSIFS/SCSIFS"
#define Module_FullVersion "1.26"
#define Module_HelpVersion "1.26 (26 Jun 2012)"
#define Module_LibraryVersionInfo "1:26"
#define Module_FullVersion "1.27"
#define Module_HelpVersion "1.27 (23 Aug 2013)"
#define Module_LibraryVersionInfo "1:27"
; Copyright 1996 Acorn Computers Ltd
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
; You may obtain a copy of the License at
;
; http://www.apache.org/licenses/LICENSE-2.0
;
; Unless required by applicable law or agreed to in writing, software
; distributed under the License is distributed on an "AS IS" BASIS,
; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; See the License for the specific language governing permissions and
; limitations under the License.
;
;>CoreHdr
FileCoreSwiBase * Module_SWISystemBase + (Module_SWIChunkSize * FileCoreSWI)
^ FileCoreSwiBase :OR: (1 :SHL: 17)
XOS_FileCoreDiscOp # 1
XOS_FileCoreCreate # 1
XOS_FileCoreDrives # 1
XOS_FileCoreFreeSpace # 1
XOS_FileCoreFloppyStructure # 1
XOS_FileCoreDescribeDisc # 1
;Layout of create FileCore incarnation descriptor block
^ 0
Create_Flags # 3
WinnieNeedsFiq bit 0
FloppyNeedsFiq bit 1
NoBigBuf bit 3 ;set by RAM filing system, small data move buffer size
Create_Id # 1
Create_Title # 4
Create_BootText # 4
Create_LowLevel # 4
Create_Misc # 4
Create_Size # 0
; reason codes for misc call
^ 0
Misc_Mount # 1
Misc_PollChanged # 1
Misc_LockDrive # 1
Misc_UnlockDrive # 1
Misc_PollPeriod # 1
Misc_Unused # 0
; Poll changed status
Drv_NotChanged * 1 :SHL: 0
Drv_MaybeChanged * 1 :SHL: 1
Drv_Changed * 1 :SHL: 2
Drv_Empty * 1 :SHL: 3
Drv_EmptyWorks * 1 :SHL: 6
Drv_ChangedWorks * 1 :SHL: 7
NoDirBit * 1 :SHL: 6
END
; Copyright 1996 Acorn Computers Ltd
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
; You may obtain a copy of the License at
;
; http://www.apache.org/licenses/LICENSE-2.0
;
; Unless required by applicable law or agreed to in writing, software
; distributed under the License is distributed on an "AS IS" BASIS,
; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; See the License for the specific language governing permissions and
; limitations under the License.
;
;>DevVersion
;this declares the development version number, incremented at each assembly
GBLS DevVersion
DevVersion SETS "0.00213"
GET Hdr:ListOpts
GET Hdr:Macros
GET Hdr:System
GET Hdr:CMOS
GET Hdr:HighFSI
GET Hdr:FSNumbers
; GET Hdr:File
GET Hdr:FileCore
GET Hdr:Services
GET Hdr:ModHand
; GET Hdr:NewSpace
GET Hdr:PublicWS
GET Hdr:Tokens
GET Hdr:UpCall
GET Hdr:NewErrors
GET Hdr:MsgTrans
GET Hdr:SCSI
GET Hdr:SCSIErr
GET Hdr:OSRSI6
LNK s.ScsiFs00
......@@ -39,4 +39,4 @@ fix_$number SETL $state
applyfix 11,{TRUE}, Do not let SCSIDriver source padding data
LNK s.DevVersion
LNK s.ScsiFs00
......@@ -14,13 +14,26 @@
;
;>Hdr_1,10 Header file for SCSIFS V 1.10
GET VersionASM
GBLS version
version SETS Module_MajorVersion
GET Hdr:ListOpts
GET Hdr:Macros
GET Hdr:System
GET Hdr:CMOS
GET Hdr:HighFSI
GET Hdr:FSNumbers
GET Hdr:OsBytes
GET Hdr:FileCore
GET Hdr:Services
GET Hdr:ModHand
GET Hdr:PublicWS
GET Hdr:Tokens
GET Hdr:UpCall
GET Hdr:NewErrors
GET Hdr:MsgTrans
GET Hdr:SCSI
GET Hdr:SCSIErr
GET Hdr:OSRSI6
GBLS date
date SETS Module_Date
GET VersionASM
GBLL test_version
test_version SETL {FALSE}
......
......@@ -16,12 +16,6 @@
TTL "Declarations and workspace allocation"
GBLL T
T SETL {TRUE}
GBLL F
F SETL {FALSE}
GBLL OpticalMemorySupport
OpticalMemorySupport SETL fix_1
......@@ -35,44 +29,37 @@ UseSpecialScatterBlk SETL fix_11
FloppySupport SETL fix_10
GBLL MediaLocking
MediaLocking SETL T
MediaLocking SETL {TRUE}
GBLL DoBuffering
DoBuffering SETL F ;Read-ahead/write-behind not supported
DoBuffering SETL {FALSE} ;Read-ahead/write-behind not supported
GBLL SeekIsNOP
SeekIsNOP SETL T ;Because Rodime RO3000S objects to seek command
SeekIsNOP SETL {TRUE} ;Because Rodime RO3000S objects to seek command
GBLL CheckXferLen
CheckXferLen SETL T
; GBLL CheckSpareRMA ; check enough stack before op?
;CheckSpareRMA SETL F
;ExtraRMA * 1024 * 33 ; usb mak pkt of 32k, + 1k ???
CheckXferLen SETL {TRUE}
GBLL XferLenMax64K
XferLenMax64K SETL T
XferLenMax64K SETL {TRUE}
GBLL RetryIfBusy
RetryIfBusy SETL T
RetryIfBusy SETL {TRUE}
GBLL BigDisc
BigDisc SETL T
BigDisc SETL {TRUE}
GBLL AutoDetect
AutoDetect SETL T
AutoDetect SETL {TRUE}
GBLL HotPlug
HotPlug SETL AutoDetect :LAND: T
HotPlug SETL AutoDetect :LAND: {TRUE}
GBLL AllowPartitions
AllowPartitions SETL T
AllowPartitions SETL {TRUE}
GBLL Ejecting
Ejecting SETL F
GBLL LeftToDo ;marker for bits requiring further refinement
LeftToDo SETL F
Ejecting SETL {FALSE}
GBLL Dev
Dev SETL test_version
......@@ -80,11 +67,11 @@ Dev SETL test_version
;Debug message switches
[ Dev
GBLL Debug
Debug SETL T
Debug SETL {TRUE}
GBLL SpoolOff
SpoolOff SETL F ;T to disable spooling for debug messages
SpoolOff SETL {FALSE} ; True to disable spooling for debug messages
GBLL IrqDebug
IrqDebug SETL F
IrqDebug SETL {FALSE}
]
GBLL Debug1
......@@ -99,28 +86,22 @@ IrqDebug SETL F
MACRO
$a switch $b
[ Dev
[ T ;>>>RCM was F
$a SETL $b
|
$a SETL F
]
|
$a SETL F
$a SETL {FALSE}
]
MEND
Debug1 switch F ;Init/Die/Service entries
Debug2 switch F ;SCSI drivers
Debug3 switch T ;low level disc op
Debug4 switch T ;misc op
Debug5 switch F ;SCSI drivers border colours
Debug6 switch F ;SCSI drivers tube debug
Debug7 switch T ;autodetection
Debug9 switch F ;useful routines
Debug1 switch {FALSE} ;Init/Die/Service entries
Debug2 switch {FALSE} ;SCSI drivers
Debug3 switch {FALSE} ;low level disc op
Debug4 switch {FALSE} ;misc op
Debug5 switch {FALSE} ;SCSI drivers border colours
Debug6 switch {FALSE} ;SCSI drivers tube debug
Debug7 switch {FALSE} ;autodetection
Debug9 switch {FALSE} ;useful routines
GET hdr.MyMacros
; GET hdr.CoreHdr
bit0 bit 0
bit1 bit 1
......@@ -157,20 +138,9 @@ bit31 bit 31
EscapeBit bit 6 ;escape if this bit set in ESC_Status
; Hardware addresses
;IoChip * &03200000 ;IO controller
;IoControl * 0
;Cpu
K * 1024
M * K*K
PsrMask * &FC000003
NZCV * N_bit :OR: Z_bit :OR: C_bit :OR: V_bit
[ BigDisc
BigBit * CreateFlag_BigDiscSupport
NewErrorBit * CreateFlag_NewErrorSupport
......@@ -211,17 +181,6 @@ OpMask * 2_1111 ;ops 0-15
DiscBits * 2_111 :SHL: (32-3) ;In all disc addresses
Podule_DevNo * 13
; osbyte numbers
OsbyteReadCMOS * &A1
OsbyteWriteCMOS * &A2
OsbyteReadResetType * &FD
; osword numbers
OswordReadClock * 14
; CMOS allocation
^ ScsiFsCMOS
......@@ -241,8 +200,6 @@ Service_SCSIDetached * &20103
[ AllowPartitions
Service_SCSIMounting * &20104
]
Upcall_DriveAdded * 24
Upcall_DriveRemoved * 25
AREA |!!!Module|, CODE, READONLY
......@@ -285,9 +242,9 @@ CreateTitle
ScsiFsHelpString
= "SCSIFS",9,9
[ Dev
= DevVersion," DEVELOPMENT VERSION",0
= " DEVELOPMENT VERSION",0
|
= version," (",date,")",0
= Module_MajorVersion," (",Module_Date,")",0
]
ALIGN
......
......@@ -82,7 +82,7 @@ PHEXIT1
SpoolOff
Push "R0-R3,LR"
SavePSR R3
MOV R0, #3
MOV R0, #OsByte_SpecifyOutputStream
MOV R1, #&10
MOV R2, #&EF
SWI OS_Byte
......@@ -92,7 +92,7 @@ SpoolOff
SpoolOn
Push "R0-R3,LR"
SavePSR R3
MOV R0, #3
MOV R0, #OsByte_SpecifyOutputStream
MOV R1, #0
MOV R2, #&EF
SWI OS_Byte
......@@ -123,7 +123,7 @@ Mess1 ;R0,R1,LR stacked
]
MOV PC, R1
[ F
[ {FALSE}
TubeWrHexWord ROUT
SavePSR R4
MOV R3, LR
......@@ -240,7 +240,7 @@ Divide ROUT
]
ReadCMOSflags ROUT
Push "R1,LR"
MOV R0, #OsbyteReadCMOS
MOV R0, #OsByte_ReadCMOS
MOV R1, #CMOSflags
SWI XOS_Byte ;(R0-R2->R0-R2,V)
MOVVS R2, #2_01000001 ;default NoDir, one drive
......@@ -275,7 +275,7 @@ ReadCMOSflags ROUT
ReadMapSizeCMOS ROUT
Push "R1-R3,LR"
MOV R0, #OsbyteReadCMOS
MOV R0, #OsByte_ReadCMOS
MOV R3, #3*8
MOV R6, #0
10
......@@ -304,7 +304,7 @@ ReadMapSizeCMOS ROUT
ReadFileCMOS ROUT
Push "R1,R2,R4,LR"
MOV R0, #OsbyteReadCMOS
MOV R0, #OsByte_ReadCMOS
MOV R1, #FileCMOS
SWI XOS_Byte ;(R0-R2->R0-R2,V)
MOVVC R5, R2
......@@ -326,7 +326,7 @@ ReadFileCMOS ROUT
ReadDirCMOS
Push "R1,R2,LR"
MOV R0, #OsbyteReadCMOS
MOV R0, #OsByte_ReadCMOS
MOV R1, #DirCMOS
SWI XOS_Byte ;(R0-R2->R0-R2,V)
MOVVS R2, #0
......@@ -752,7 +752,7 @@ MapInDevice
BNE %FT60
STDevNo R1,R5, LR
MOV R1, R0
MOV R0, #Upcall_DriveAdded
MOV R0, #UpCall_DriveAdded
BL UpcallDrive ; issue an upcall
MOV R0, R1
TEQ PC,#0
......@@ -888,7 +888,7 @@ DoDetachedCallback
MOV R0, #2 ; release it (just in case)
MOV R8, R12
SWI XSCSI_Reserve
MOV R0, #Upcall_DriveRemoved
MOV R0, #UpCall_DriveRemoved
MOV R1, R3
BL UpcallDrive ; issue an upcall
Pull "R0,R1,R8"
......
......@@ -490,7 +490,7 @@ BadDrive
UpdateMapSize
Push "R0-R2,LR"
STRB R8, [R7,R2, LSR #(32-3)]
MOV R0, #OsbyteWriteCMOS
MOV R0, #OsByte_WriteCMOS
MOV R1, R2, LSR #(32-3)
[ Debug2
wrhex R1
......
......@@ -215,7 +215,7 @@ DieEntry
sbaddr R7, BlockSizes-4
01
[ HotPlug
MOV R0, #Upcall_DriveRemoved
MOV R0, #UpCall_DriveRemoved
MOV R1, R5
BL UpcallDrive
]
......@@ -306,7 +306,7 @@ ServiceEntry2
]
Push "R0-R5,R8,LR"
getSB
[ T
[ {TRUE}
;
;Reservations are lost over reset, so Re-reserve each device/drive with
; a non-zero BlockSize entry
......@@ -870,7 +870,7 @@ ConSCSIFSdiscs ROUT
] ; :LNOT:HotPlug
ConWrite
MOV R0, #OsbyteWriteCMOS
MOV R0, #OsByte_WriteCMOS
SWI XOS_Byte ;(R0-R2->R0-R2,V)
ConfigReturn
STRVS R0, [SP]
......
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