Skip to content

GitLab

Commit e3c0cd6d authored by Ben Avison's avatar Ben Avison
Browse files

New method to control default CMOS settings 

Detail:
  Rather than fill the Kernel sources with an ever-increasing number of
  platform-specific switches to control the default CMOS settings, this
  change introduces a variable which passes the requirements direct from
  the Components file to the Kernel. Since it uses a comma-separated list
  of address/value pairs, it is inherently extensible. All the symbolic
  names of addresses from Hdr:CMOS are available, and any valid objasm
  expression can be used for the value.
Admin:
  This removes the need for the EnforceSCSI4 switch, and leaves almost
  no uses of the Machine variable in the Kernel either.


Version 5.35, 4.79.2.298. Tagged as 'Kernel-5_35-4_79_2_298'
parent f50a7d61
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 42 deletions
VersionASM
View file @ e3c0cd6d
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.297"
Module_Date SETS "07 Nov 2015"
Module_ApplicationDate SETS "07-Nov-15"
Module_MinorVersion SETS "4.79.2.298"
Module_Date SETS "08 Nov 2015"
Module_ApplicationDate SETS "08-Nov-15"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.35 (4.79.2.297)"
Module_HelpVersion SETS "5.35 (07 Nov 2015) 4.79.2.297"
Module_FullVersion SETS "5.35 (4.79.2.298)"
Module_HelpVersion SETS "5.35 (08 Nov 2015) 4.79.2.298"
END
VersionNum
View file @ e3c0cd6d
......@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.297
#define Module_Date_CMHG 07 Nov 2015
#define Module_MinorVersion_CMHG 4.79.2.298
#define Module_Date_CMHG 08 Nov 2015
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion "4.79.2.297"
#define Module_Date "07 Nov 2015"
#define Module_MinorVersion "4.79.2.298"
#define Module_Date "08 Nov 2015"
#define Module_ApplicationDate "07-Nov-15"
#define Module_ApplicationDate "08-Nov-15"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
#define Module_FullVersion "5.35 (4.79.2.297)"
#define Module_HelpVersion "5.35 (07 Nov 2015) 4.79.2.297"
#define Module_FullVersion "5.35 (4.79.2.298)"
#define Module_HelpVersion "5.35 (08 Nov 2015) 4.79.2.298"
#define Module_LibraryVersionInfo "5:35"
hdr/Options
View file @ e3c0cd6d
......@@ -424,13 +424,6 @@ SVC2632 * SVC32_mode
|
USR2632 * USR26_mode
SVC2632 * SVC26_mode
]
; Switch to alter default CMOS settings for SCSI::4 as default drive
[ :LNOT: :DEF: EnforceSCSI4
GBLL EnforceSCSI4
EnforceSCSI4 SETL {FALSE}
]
END
s/PMF/i2cutils
View file @ e3c0cd6d
......@@ -1804,20 +1804,8 @@ DefaultCMOSTable
DefaultCMOSTable
; Normal table
DCB KeyDelCMOS, 32
[ "$Machine"="CortexA8" :LOR: "$Machine"="CortexA9"
DCB FileLangCMOS, fsnumber_SCSIFS ; SCSIFS for OMAP3, etc.
|
[ "$Machine"="ARM11ZF" :LOR: "$Machine"="RPi"
DCB FileLangCMOS, fsnumber_SDFS ; SDFS for Pi, etc.
|
DCB FileLangCMOS, fsnumber_adfs ; ADFS
]
]
[ EnforceSCSI4
DCB FontCMOS, 255 ; Changed to 1016k from 256K for modern machines
|
DCB FontCMOS, 64 ; KJB 13-Dec-02: Changed to 256K from 64K
]
DCB PigCMOS, 10
DCB KeyRepCMOS, 8
DCB RMASizeCMOS, 0
......@@ -1895,12 +1883,8 @@ DefaultCMOSTable
; FontMaxCMOS yes, omitting is deliberate!
DCB FontMax2CMOS, &2C ; 32 point
DCB FontMax3CMOS, &38 ; 32 point
|
[ EnforceSCSI4
DCB FontMaxCMOS, 255 ; 16380k
|
DCB FontMaxCMOS, 64 ; 4096k
]
DCB FontMax2CMOS, 36:EOR:12 ; 36 point
DCB FontMax3CMOS, 36:EOR:24 ; 36 point
DCB FontMax4CMOS, 16 ; 16 point
......@@ -1910,14 +1894,10 @@ DefaultCMOSTable
DCB SparrowMarker, FreewayNoAutoAddress ; Stop Freeway assigning addresses to interfaces
DCB NetworkFlags, LanManFStransport ; LMTransport is NetBIOS over IP
DCB WimpDragMoveLimitCMOS, (1:SHL:7) ; WimpIconiseButton
[ "$Machine"="CortexA8" :LOR: "$Machine"="CortexA9" :LOR: "$Machine"="ARM11ZF" :LOR: "$Machine"="RPi"
DCB CDROMFSCMOS, &C0 ; drives = 0, buffer size = 256K
|
DCB CDROMFSCMOS, &C1 ; drives = 1, buffer size = 256K
]
[ EnforceSCSI4
DCB SCSIFSDrivesCMOS, &20 ; default to SCSIFS Drive 4
]
]
[ :DEF: CMOS_Override
$CMOS_Override
]
DCB &FF
ALIGN
......
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