Skip to content

GitLab

Commit 5a0a4b96 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix overriding of default CMOS settings. Reserve HAL device ID for the... 

Fix overriding of default CMOS settings. Reserve HAL device ID for the official Raspberry Pi touchscreen/display.

Detail:
  s/PMF/i2cutils - Move $CMOS_Override to the start of DefaultCMOSTable, so that it can be used to override values which are already in the table (since NVMemory_ResetValue stops its search on the first address match)
  hdr/HALDevice - Add new Touchscreen device type and reserve an ID for the official Pi touchscreen controller
Admin:
  Tested on Raspberry Pi
  Fixes filesystem incorrectly defaulting to ADFS


Version 5.35, 4.79.2.299. Tagged as 'Kernel-5_35-4_79_2_299'
parent e3c0cd6d
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 15 deletions
VersionASM
View file @ 5a0a4b96
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.298"
Module_Date SETS "08 Nov 2015"
Module_ApplicationDate SETS "08-Nov-15"
Module_MinorVersion SETS "4.79.2.299"
Module_Date SETS "14 Nov 2015"
Module_ApplicationDate SETS "14-Nov-15"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.35 (4.79.2.298)"
Module_HelpVersion SETS "5.35 (08 Nov 2015) 4.79.2.298"
Module_FullVersion SETS "5.35 (4.79.2.299)"
Module_HelpVersion SETS "5.35 (14 Nov 2015) 4.79.2.299"
END
VersionNum
View file @ 5a0a4b96
......@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.298
#define Module_Date_CMHG 08 Nov 2015
#define Module_MinorVersion_CMHG 4.79.2.299
#define Module_Date_CMHG 14 Nov 2015
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion "4.79.2.298"
#define Module_Date "08 Nov 2015"
#define Module_MinorVersion "4.79.2.299"
#define Module_Date "14 Nov 2015"
#define Module_ApplicationDate "08-Nov-15"
#define Module_ApplicationDate "14-Nov-15"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
#define Module_FullVersion "5.35 (4.79.2.298)"
#define Module_HelpVersion "5.35 (08 Nov 2015) 4.79.2.298"
#define Module_FullVersion "5.35 (4.79.2.299)"
#define Module_HelpVersion "5.35 (14 Nov 2015) 4.79.2.299"
#define Module_LibraryVersionInfo "5:35"
hdr/HALDevice
View file @ 5a0a4b96
......@@ -80,6 +80,7 @@ HALDeviceExpCtl_AHCI # 1 ; AHCI SATA bus interface
HALDeviceType_HID * 6 :SHL: 8
^ 1
HALDeviceHID_Keyboard # 1 ; Standard data entry keyboard
HALDeviceHID_Touchscreen # 1
HALDeviceBus_Pro * 0 :SHL: 28
......@@ -219,6 +220,9 @@ HALDeviceID_SDIO_SDHCI # 1
^ 0
HALDeviceID_Keyboard_Pandora # 1
^ 0
HALDeviceID_Touchscreen_FT5406 # 1
^ 0
HALDeviceID_AHCI_IMX6 # 1
HALDeviceID_AHCI_SynopsisDWC # 1
......
s/PMF/i2cutils
View file @ 5a0a4b96
......@@ -1803,6 +1803,9 @@ DefaultCMOSTable
|
DefaultCMOSTable
; Normal table
[ :DEF: CMOS_Override
$CMOS_Override
]
DCB KeyDelCMOS, 32
DCB FileLangCMOS, fsnumber_adfs ; ADFS
DCB FontCMOS, 64 ; KJB 13-Dec-02: Changed to 256K from 64K
......@@ -1895,9 +1898,6 @@ DefaultCMOSTable
DCB NetworkFlags, LanManFStransport ; LMTransport is NetBIOS over IP
DCB WimpDragMoveLimitCMOS, (1:SHL:7) ; WimpIconiseButton
DCB CDROMFSCMOS, &C1 ; drives = 1, buffer size = 256K
]
[ :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