Commit 8dd5e237 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Tidy up pass

ADFS.s:
  Redundant header files trimmed
  Get OsWords and OsBytes
  Switches rationalised
ADFS_SA.a
  Removed ARM810 support
Adfs00.s:
  Unused MEMC flag removed
Adfs05.s/Adfs12.s/Adfs13.s/Adfs14.s/Adfs15.s/Adfs19.s:
  Use defines instead of magic numbers
  Make use of FileCore exported bit fields
Adfs17.s/Adfs18.s/ConstIDE:
  {TRUE} and {FALSE} used with objasm
Adfs20.s
  Use AND of the opmask instead of BIC of all the flags except the opmask
Adfs50.s
  Unused MEMC flag no longer initialised
  Make use of FileCore exported bit fields
  Service call table reordered so the Ursula despatch doesn't incur a branch
  OsByte defines used
Consts:
  Removed those definitions now duplicating FileCore's exports
DebugOpts/Fixes:
  All options brought under one roof
ModHeader:
  Now uses VersionNum directly
Ver/*:
  Redundant switches deleted
  Removed used of 'Version' header


Version 3.45. Tagged as 'ADFS-3_45'
parent 138040d0
;>DevVersion
;this declares the development version number, incremented at each assembly
GBLS DevVersion
DevVersion SETS "2.11544"
END
ADFS:*ADFS selects the ADFS as the current filing system.|MSyntax: *ADFS
ADFSbuffers:*Configure ADFSBuffers sets the number of extra 1024 byte file buffers taken by the ADFS to speed up operations on open files. A value of 1 selects the default number of buffers for the RAM size, and 0 disables fast buffering.|MSyntax: *Configure ADFSBuffers <buffers>
ADFSDirCache:*Configure ADFSDirCache sets the size of the directory cache (in Kbytes) used by the ADFS. A value of 0 selects a default value which depends on RAM size.|MSyntax: *Configure ADFSDirCache <size>[K]
Drive:*Configure Drive sets the value the default drive is initialised to.|MSyntax: *Configure Drive <drive>
Floppies:*Configure Floppies sets the number of floppy disc drives attached.|MSyntax: *Configure Floppies <floppies>
HardDiscs:*Configure HardDiscs sets the number of hard discs attached.|MSyntax: *Configure HardDiscs <hard discs>
IDEDiscs:*Configure IDEDiscs sets the number of IDE hard discs attached.|MSyntax: *Configure IDEDiscs <IDE hard discs>
Step:*Configure Step sets the step rate of one or all floppy disc drives.|MSyntax: *Configure Step <step delay> [<drive>]
ADFS:Syntax: *ADFS
Format:Syntax: *Format <drive> [<format> [Disc name]] [Y]
ADFSbuffers:Syntax: *Configure ADFSBuffers <buffers>
ADFSDirCache:Syntax: *Configure ADFSDirCache <size>[K]
Drive:Syntax: *Configure Drive <drive>
Floppies:Syntax: *Configure Floppies <floppies>
HardDiscs:Syntax: *Configure HardDiscs <hard discs>
IDEDiscs:Syntax: *Configure IDEDiscs <IDE hard discs>
Step:Syntax: *Configure Step <step delay> [<drive>]
GET Version
PCI SETL {FALSE}
Support1772 SETL {FALSE}
ByteAddressedHW SETL {FALSE}
ByteAddressedHW SETL {FALSE}
A1 SETL {TRUE}
Top16Write SETL {FALSE}
IOMD SETL {TRUE}
TwinIDEHardware SETL {FALSE}
NewTransferCode SETL {FALSE}
FloppyPodule SETL {FALSE}
FloppyPCI SETL {FALSE}
NewTransferCode SETL {FALSE}
FloppyPodule SETL {FALSE}
FloppyPCI SETL {FALSE}
UseDiscOp64 SETL {TRUE}
IDEDMA SETL {FALSE}
......
GET Version
A1 SETL {TRUE}
Top16Write SETL {TRUE}
IOMD SETL {FALSE}
END
GET Version
A1 SETL {FALSE}
Top16Write SETL {TRUE}
IOMD SETL {FALSE}
END
GET Version
A1 SETL {TRUE}
Top16Write SETL {FALSE}
IOMD SETL {TRUE}
END
GET Version
A1 SETL {TRUE}
Top16Write SETL {FALSE}
IOMD SETL {TRUE}
END
GET Version
A1 SETL {TRUE}
Top16Write SETL {FALSE}
IOMD SETL {TRUE}
END
GET Version
A1 SETL {TRUE}
Top16Write SETL {FALSE}
IOMD SETL {TRUE}
END
GET Version
MOS_Version SETA 211 ; V2.11+ setup 82C710 if present
A1 SETL {TRUE}
HasASICB SETL {FALSE}
Proc32bit SETL {FALSE}
Top16Write SETL {TRUE}
IOMD SETL {FALSE}
END
GET Version
PCI SETL {FALSE}
Support1772 SETL {FALSE}
ByteAddressedHW SETL {TRUE}
ByteAddressedHW SETL {TRUE}
A1 SETL {TRUE}
Top16Write SETL {FALSE}
IOMD SETL {TRUE}
TwinIDEHardware SETL {TRUE}
NewTransferCode SETL {TRUE}
FloppyPodule SETL {FALSE}
FloppyPCI SETL :LNOT:FloppyPodule
NewTransferCode SETL {TRUE}
FloppyPodule SETL {FALSE}
FloppyPCI SETL :LNOT:FloppyPodule
UseDiscOp64 SETL {TRUE}
IDEDMA SETL {TRUE}
......
GET Version
MOS_Version SETA 211 ; V2.11+ setup 82C710 if present
A1 SETL {TRUE}
HasASICB SETL {TRUE}
Proc32bit SETL {TRUE}
Top16Write SETL {TRUE}
IOMD SETL {FALSE}
END
GET Version
MOS_Version SETA 211 ; V2.11+ setup 82C710 if present
A1 SETL {TRUE}
HasASICB SETL {TRUE}
......
; Version number file > version
GET VersionASM
GBLS version
version SETS Module_MajorVersion
GBLS date
date SETS Module_Date
GBLA max_fix
max_fix SETA 12
GBLL test_version
test_version SETL {FALSE}
;test_version SETL {TRUE}
GBLL A1
GBLL Top16Write
GBLL Support1772
GBLL IOMD
GBLL PCI
GBLL TwinIDEHardware
GBLL NewTransferCode
GBLL ByteAddressedHW
GBLA Override_PDevNo
GBLL FloppyPodule
GBLL FloppyPCI
GBLL UseDiscOp64
GBLL IDEDMA
END
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "3.44"
Module_Version SETA 344
Module_MajorVersion SETS "3.45"
Module_Version SETA 345
Module_MinorVersion SETS ""
Module_Date SETS "14 Apr 2012"
Module_ApplicationDate SETS "14-Apr-12"
Module_Date SETS "21 Oct 2012"
Module_ApplicationDate SETS "21-Oct-12"
Module_ComponentName SETS "ADFS"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/ADFS/ADFS"
Module_FullVersion SETS "3.44"
Module_HelpVersion SETS "3.44 (14 Apr 2012)"
Module_FullVersion SETS "3.45"
Module_HelpVersion SETS "3.45 (21 Oct 2012)"
END
/* (3.44)
/* (3.45)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 3.44
#define Module_MajorVersion_CMHG 3.45
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 14 Apr 2012
#define Module_Date_CMHG 21 Oct 2012
#define Module_MajorVersion "3.44"
#define Module_Version 344
#define Module_MajorVersion "3.45"
#define Module_Version 345
#define Module_MinorVersion ""
#define Module_Date "14 Apr 2012"
#define Module_Date "21 Oct 2012"
#define Module_ApplicationDate "14-Apr-12"
#define Module_ApplicationDate "21-Oct-12"
#define Module_ComponentName "ADFS"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/ADFS/ADFS"
#define Module_FullVersion "3.44"
#define Module_HelpVersion "3.44 (14 Apr 2012)"
#define Module_LibraryVersionInfo "3:44"
#define Module_FullVersion "3.45"
#define Module_HelpVersion "3.45 (21 Oct 2012)"
#define Module_LibraryVersionInfo "3:45"
......@@ -14,24 +14,32 @@
;
; ADFS
GBLL StrongARM
GBLL ARM810support
StrongARM SETL {TRUE}
ARM810support SETL {FALSE}
GBLL StrongARM
GBLL A1
GBLL Top16Write
GBLL Support1772
GBLL TwinIDEHardware
GBLL NewTransferCode
GBLL ByteAddressedHW
GBLA Override_PDevNo
GBLL FloppyPodule
GBLL FloppyPCI
GBLL UseDiscOp64
GBLL IDEDMA
AREA |!!!Module|,CODE,READONLY,PIC
AREA |!!!ADFSModule|,CODE,READONLY,PIC
StrongARM SETL {TRUE}
GET DebugOpts.s
GET Ver.<Machine>
GET Fixes.s
GET DevVersion
GET Hdr:ListOpts
GET Hdr:Macros
GET Hdr:System
GET Hdr:DevNos
GET Hdr:Machine.<Machine>
GET Hdr:IO.IOEB
$GetIO
GET Hdr:Machine.<Machine>
$GetIO
GET Hdr:CMOS
GET Hdr:Services
GET Hdr:ModHand
......@@ -39,6 +47,8 @@ ARM810support SETL {FALSE}
GET Hdr:Tokens
GET Hdr:UpCall
GET Hdr:FSNumbers
GET Hdr:OsWords
GET Hdr:OsBytes
GET Hdr:HighFSI
GET Hdr:MultiFS
GET Hdr:FileCore
......@@ -54,11 +64,11 @@ ARM810support SETL {FALSE}
GET Hdr:DMA
GET Hdr:DMADevice
GET Hdr:OSRSI6
GET VersionASM
GET NewBits.s
GET ADFSMacros.s
GET Consts.s
GET DebugOpts.s
GET ModHeader.s
GET ADFSErrors.s
GET ADFS00.s
......@@ -80,7 +90,6 @@ ARM810support SETL {FALSE}
[ IDEDMA
GET BusMaster.s
]
GET ADFS_SA.s
END
......@@ -74,13 +74,8 @@ ADFSsync ROUT
MCR ARM_config_cp,0,R0,ARM8A_cache_reg,C5,0 ;flush IC
MOV r0,r0
MOV r0,r0
[ ARM810support
02
SUB pc,pc,#4 ;flushes branch predict if ARM810 (harmless otherwise)
|
MOV r0,r0
02
]
MOV pc,lr
] ;HAL
......
......@@ -494,8 +494,7 @@ StepRates # 1 ;copy of CMOS step rate byte
FiqCtr # 1 ;# threads using fiq work space
StartSector # 1
Sector # 1
MEMCflag # 1
# 1 ;padding
GET StaticsFDC.s
......
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