Commit 7380897b authored by Ben Avison's avatar Ben Avison
Browse files

Make HAL report keyboard present during boot

Detail:
  Given the complexity of the USB system on the BCM2835, it seems unlikely
  that the HAL keyboard scan will ever be implemented. Not only does this
  mean it doesn't honour any of the CMOS reset or monitor configuration keys,
  but it means the kernel will always attempt to boot the configured
  filing system and drive, irrespective of the *Configure [No]Boot setting,
  after printing "No keyboard present - autobooting". By changing the HAL
  to report a keyboard present but with no keys held down, we at least get
  the [No]Boot option honoured again (even if the Shift key can't be used
  to invert its sense), and have the message suppressed.
Admin:
  Tested on a Raspberry Pi.

Version 0.33. Tagged as 'BCM2835-0_33'
parent a0e6ef45
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
GBLS Module_HelpVersion GBLS Module_HelpVersion
GBLS Module_ComponentName GBLS Module_ComponentName
GBLS Module_ComponentPath GBLS Module_ComponentPath
Module_MajorVersion SETS "0.32" Module_MajorVersion SETS "0.33"
Module_Version SETA 32 Module_Version SETA 33
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "13 Apr 2014" Module_Date SETS "29 Apr 2014"
Module_ApplicationDate SETS "13-Apr-14" Module_ApplicationDate SETS "29-Apr-14"
Module_ComponentName SETS "BCM2835" Module_ComponentName SETS "BCM2835"
Module_ComponentPath SETS "mixed/RiscOS/Sources/HAL/BCM2835" Module_ComponentPath SETS "mixed/RiscOS/Sources/HAL/BCM2835"
Module_FullVersion SETS "0.32" Module_FullVersion SETS "0.33"
Module_HelpVersion SETS "0.32 (13 Apr 2014)" Module_HelpVersion SETS "0.33 (29 Apr 2014)"
END END
/* (0.32) /* (0.33)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1. * Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 0.32 #define Module_MajorVersion_CMHG 0.33
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 13 Apr 2014 #define Module_Date_CMHG 29 Apr 2014
#define Module_MajorVersion "0.32" #define Module_MajorVersion "0.33"
#define Module_Version 32 #define Module_Version 33
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "13 Apr 2014" #define Module_Date "29 Apr 2014"
#define Module_ApplicationDate "13-Apr-14" #define Module_ApplicationDate "29-Apr-14"
#define Module_ComponentName "BCM2835" #define Module_ComponentName "BCM2835"
#define Module_ComponentPath "mixed/RiscOS/Sources/HAL/BCM2835" #define Module_ComponentPath "mixed/RiscOS/Sources/HAL/BCM2835"
#define Module_FullVersion "0.32" #define Module_FullVersion "0.33"
#define Module_HelpVersion "0.32 (13 Apr 2014)" #define Module_HelpVersion "0.33 (29 Apr 2014)"
#define Module_LibraryVersionInfo "0:32" #define Module_LibraryVersionInfo "0:33"
...@@ -62,7 +62,7 @@ HAL_KbdScanSetup ...@@ -62,7 +62,7 @@ HAL_KbdScanSetup
HAL_KbdScan HAL_KbdScan
HALStub "HAL_KbdScan" HALStub "HAL_KbdScan"
MOV a1,#KbdFlag_Done ; signal keyboard scan complete MOV a1,#KbdFlag_Present :OR: KbdFlag_Done ; signal keyboard scan complete
MOV pc,lr MOV pc,lr
HAL_KbdScanFinish HAL_KbdScanFinish
......
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