Commit cf7c1535 authored by Ben Avison's avatar Ben Avison

Resync with allocations database.

Detail:
  * Documented ADFS's and SCSIFS's CMOS use better in Hdr:CMOS.
  * Fixed typo in Hdr:NewErrors that causes asasm to emit a warning.
  * Fixed Hdr:OsBytes so that it doesn't trip up Hdr2H. Also listed hex and
    decimal OS_Byte numbers in comments for ease of reference.
  * Fixed some formatting in Hdr:CMOS and Hdr:NewErrors.

Version 2.05. Tagged as 'HdrSrc-2_05'
parent 26325284
/* (2.04)
/* (2.05)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 2.04
#define Module_MajorVersion_CMHG 2.05
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 20 Mar 2012
#define Module_Date_CMHG 24 Mar 2012
#define Module_MajorVersion "2.04"
#define Module_Version 204
#define Module_MajorVersion "2.05"
#define Module_Version 205
#define Module_MinorVersion ""
#define Module_Date "20 Mar 2012"
#define Module_Date "24 Mar 2012"
#define Module_ApplicationDate "20-Mar-12"
#define Module_ApplicationDate "24-Mar-12"
#define Module_ComponentName "HdrSrc"
#define Module_ComponentPath "castle/RiscOS/Sources/Programmer/HdrSrc"
#define Module_FullVersion "2.04"
#define Module_HelpVersion "2.04 (20 Mar 2012)"
#define Module_LibraryVersionInfo "2:4"
#define Module_FullVersion "2.05"
#define Module_HelpVersion "2.05 (24 Mar 2012)"
#define Module_LibraryVersionInfo "2:5"
......@@ -35,18 +35,18 @@ FrugalCMOS * &06 ; Two bytes
EDITCMOS * &08 ; One byte was used by Acorn Screen Editor ROM for BBC Master
Unplug12CMOS * &09 ; One byte
MODETVCMOS * &0A ; One byte
; Bits 0-3 were screen mode on BBC Master
; Bit 4 = TV interlace
; 0 = off
; 1 = on
; Bits 5-7 = TV vertical adjust (signed 3-bit number)
; Bits 0-3 were screen mode on BBC Master
; Bit 4 = TV interlace
; 0 = off
; 1 = on
; Bits 5-7 = TV vertical adjust (signed 3-bit number)
StartCMOS * &0B ; One byte
; Bits 0-2 = ADFS drive
; Bits 3-5 = Caps mode
; 001 = Shift caps
; 010 = No caps
; 100 = Caps
; Bit 6 = Loads directory on switch on
; Bit 6 = Loads directory on switch on (no effect after RISC OS 2)
; 0 = Directory
; 1 = No directory
; Bit 7 = Standby mode (allocated for Online Media)
......@@ -64,20 +64,20 @@ PSITCMOS * &0F ; One byte
; Bits 2-4 = baud rate
; Bits 5-7 = printer destination
DBTBCMOS * &10 ; One byte
; Bit 0 = AutoDST
; 0 = manual DST changes
; 1 = DST changes handled automatically by territory module
; Bit 1 = speaker volume
; 0 = Quiet
; 1 = Loud
; Bit 2 was ExTube (1) / InTube (0) on BBC Master
; Bit 3 = scroll enable
; 0 = Scroll
; 1 = NoScroll
; Bit 4 = boot enable
; 0 = NoBoot
; 1 = Boot
; Bits 5-7 = serial data format
; Bit 0 = AutoDST
; 0 = manual DST changes
; 1 = DST changes handled automatically by territory module
; Bit 1 = speaker volume
; 0 = Quiet
; 1 = Loud
; Bit 2 was ExTube (1) / InTube (0) on BBC Master
; Bit 3 = scroll enable
; 0 = Scroll
; 1 = NoScroll
; Bit 4 = boot enable
; 0 = NoBoot
; 1 = Boot
; Bits 5-7 = serial data format
NetFilerCMOS * &11 ; One byte
; Bit 0 = NetFiler FS list sorting mode
; 0 = sort by name
......@@ -354,7 +354,28 @@ MonitorTypeF * &3C
MonitorTypeAuto * &7C
SyncAutoBit * &80
FontCMOS # 1 ; &86 units of 4K
NewADFSCMOS # 3 ; &87 Three bytes (consult Nick)
NewADFSCMOS # 0 ; &87 Three bytes, as follows:
ADFSDrivesCMOS # 1 ; &87
; Bits 0-3 = floppy disc drives, 0...4
; Bits 3-5 were ST506 hard disc drives, 0...2
; Bits 6-7 were IDE hard disc drives, 0...2
ADFSStepDelayCMOS # 1 ; &88
; Bits 0-1 = floppy disc drive 0 step delay:
; 0: 6
; 1: 12
; 2: 2
; 3: 3
; Bits 2-3 = floppy disc drive 1 step delay (same encoding as drive 0)
; Bits 4-5 = floppy disc drive 2 step delay (same encoding as drive 0)
; Bits 6-7 = floppy disc drive 3 step delay (same encoding as drive 0)
ADFSFileCacheCMOS # 1 ; &89
; 0: no file cache
; 1: default size file cache, depending upon total RAM size:
; 1K for 512K machines
; 2K for 1MB machines
; RAM size / 256 for machines with >= 2MB and < 64MB
; 255K for machines with 64MB or more
; 2...255: file cache size in K
CDROMFSCMOS # 1 ; &8A Next Technology
TimeZoneCMOS # 1 ; &8B
......@@ -432,7 +453,7 @@ Misc1CMOS # 1 ; &BC
; Bit 6 => Should screen blanking ignore Wrch, 0=>Ignore Wrch, 1=>Wrch un-blanks
; (this is non-functional in 3.7+)
; Bit 7 => Hardware test disable, 1=>Disable long tests at power up
WinniSizeCMOS # 4 ; &BD
WinniSizeCMOS # 4 ; &BD ; unused since RISC OS 5.00
ProtectionCMOS # 1 ; &C1 ; Protection state
; Bit 0 => &81 Peek
; Bit 1 => &82 Poke
......@@ -483,7 +504,13 @@ DesktopCMOS # 1 ; &C6 ; some state for Desktop Utils
; Bit 7 = Newer option (Filer)
; 0 = When looking, just look
; 1 = When looking, look newer
ADFSDirCacheCMOS # 1 ; &C7 0=>default
ADFSDirCacheCMOS # 1 ; &C7
; 0: default size directory cache, depending upon total RAM size:
; 1K for 512K machines
; 2K for 1MB machines
; RAM size / 256 for machines with >= 2MB and < 64MB
; 255K for machines with 64MB or more
; 1...255: directory cache size in K
FontMaxCMOS # 1 ; &C8
FontMax1CMOS # 1 ; &C9
FontMax2CMOS # 1 ; &CA
......@@ -492,7 +519,23 @@ FontMax4CMOS # 1 ; &CC
FontMax5CMOS # 1 ; &CD
FontMax6CMOS # 1 ; &CE
FontMax7CMOS # 1 ; &CF
ScsiFsCMOS # 7 ; &D0-&D6
ScsiFsCMOS # 0 ; &D0-&D6 Seven bytes, as follows:
SCSIFSDrivesCMOS # 1 ; &D0
; Bits 0-2 were SCSI hard disc drives, 0...4 before SCSIFS 1.11
; Bits 3-5 = default SCSI drive number; was (drive number - 4) before SCSIFS 1.11
; Bits 6-7 were reserved for SCSI floppy disc drives, 0...3, but never actually used
SCSIFSbuffersCMOS # 1 ; &D1 (reserved but has never actually been used)
; 0: no file cache
; 1: default size file cache, depending upon total RAM size:
; RAM size / 256 for machines with < 64MB
; 255K for machines with 64MB or more
; 2...255: file cache size in K
SCSIFSDirCacheCMOS # 1 ; &D2
; 0: default size directory cache, depending upon total RAM size:
; RAM size / 256 for machines with < 64MB
; 255K for machines with 64MB or more
; 1...255: directory cache size in K
SCSIFSWinniSizeCMOS # 4 ; &D3-&D6 no longer used from SCSIFS 1.25 onwards
DeskbootCMOS # 1 ; &D7 (for auto-booting ROM applications)
Deskboot2CMOS # 1 ; &D8 (for auto-booting ROM applications)
; Bits within DeskbootCMOS and Deskboot2CMOS are allocated thus:-
......
......@@ -949,7 +949,7 @@ ErrorBase_NetFS * &00010000 + ( fsnumber_net :SHL: 8 ) ; fs 5
AddError InsufficientNetFSAccess, "Insufficient access", ErrorBase_NetFS + ErrorNumber_AccessViolation ; &BD
AddError NotLoggedOn, "Not logged on", ErrorBase_NetFS + &BF
AddError BadNetFSOption, "Bad option value", ErrorBase_NetFS + &CB
AddError BadNetFSFilename, $ErrorString_BadFilename, ErrorBase_NetFS + ErrorNumber_BadFileName ; &CC
AddError BadNetFSFilename, $ErrorString_BadFileName, ErrorBase_NetFS + ErrorNumber_BadFileName ; &CC
AddError DiscAndFileServerDontMatch, "Specified disc not on specified file server", ErrorBase_NetFS + &D4
AddError NetFSFileNotFound, $ErrorString_FileNotFound, ErrorBase_NetFS + ErrorNumber_FileNotFound ; &D6
AddError BadNetFSHandle, "Bad handle", ErrorBase_NetFS + ErrorNumber_Channel ; &DE
......@@ -1277,7 +1277,7 @@ ErrorBase_ColourPicker # &100 ;&20D00
^ &20E00
ErrorBase_DCI4 # &100
ErrorBase_Joystick * &43F40 ;incorrectly uses SWI chunk
ErrorBase_Joystick * &43F40 ;incorrectly uses SWI chunk
ErrorBase_ANT * &4A580 ;(32) formalising a bit of stupidity
......
This diff is collapsed.
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