From 23744498eeff3973d8bd07e743f38ac08eec1b9f Mon Sep 17 00:00:00 2001 From: Kevin Bracey <kbracey@gitlab.riscosopen.org> Date: Wed, 26 Jan 2000 13:55:14 +0000 Subject: [PATCH] POST now uses option from Hdr:Machine.<Machine> to determine whether or not to flash the front panel LEDs (Lazarus doesn't want this function). Version 5.12. Tagged as 'Kernel-5_12' --- TestSrc/Begin | 13 +++++-------- VersionASM | 6 +++--- VersionNum | 10 +++++----- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/TestSrc/Begin b/TestSrc/Begin index bbc46c57..7d76810f 100644 --- a/TestSrc/Begin +++ b/TestSrc/Begin @@ -1779,7 +1779,7 @@ ts_failmsg ts_R00 & 00 - [ STB :LAND: (((IOMD_C_FrontPanelLED <> 0) :LOR: ((IOMD_C_FrontPanelRightLED <> 0) :LAND: (IOMD_C_FrontPanelLeftLED <> 0)))) + [ STB :LAND: POSTFlashesFrontPanelLEDs ; Define Long, Equal and short flash delays ts_Long_Flash * &03 ; Number of 1/4 Sec delays for a long flash ts_Short_Flash * &01 ; Number of 1/4 Sec delays for a short flash @@ -1791,7 +1791,7 @@ IOMD_LED_GREENLED * IOMD_C_FrontPanelRightLED ; The ri IOMD_LED_REDLED * IOMD_C_FrontPanelLeftLED ; The left LED should be the RED LED IOMD_LED_BOTH * IOMD_LED_REDLED :OR: IOMD_LED_GREENLED ; - ] ; Endif ((IOMD_C_FrontPanelLED <> 0) :LOR: ((IOMD_C_FrontPanelRightLED <> 0) :LAND: (IOMD_C_FrontPanelLeftLED <> 0))) + ] ; Endif (POSTFlashesFrontPanelLEDs) ts_Report ROUT MOV_fiq r7,r12_fiq ; check for fault bits set @@ -1837,10 +1837,7 @@ ts_Report_wait ROUT ; ; Here if a Display or other type of adaptor found. ; - [ STB :LAND: (((IOMD_C_FrontPanelLED <> 0) :LOR: ((IOMD_C_FrontPanelRightLED <> 0) :LAND: (IOMD_C_FrontPanelLeftLED <> 0)))) - ; - ; IOMD_C_FrontPanelLED <> 0 OR ((IOMD_C_FrontPanelRightLED <> 0) :AND: IOMD_C_FrontPanelLeftLED <> 0)) - ; Thus we have some FP Leds to play with ! + [ STB :LAND: POSTFlashesFrontPanelLEDs) ; ; Check to see if we are a PASS or FAIL ; @@ -2012,7 +2009,7 @@ ts_led_bothoff ; | ; else ; - ; ((IOMD_C_FrontPanelLED <> 0) :LOR: ((IOMD_C_FrontPanelRightLED <> 0) :LAND: (IOMD_C_FrontPanelLeftLED <> 0))) + ; :LNOT: POSTFlashesFrontPanelLEDs ; Thus we use the old way of flashing the LED etc .... ; ; Indicate fault found : Set the border to fault colour and flash @@ -2107,7 +2104,7 @@ ts_665LEDaddr * (ts_PCaddress :OR: (&3f2 :SHL: 2)) ANDS r2,r2,r2 ; all the bits displayed now ? BNE %02 MOV_fiq r0,r12_fiq ; restore the faultcode bits - ] ; Endif ((IOMD_C_FrontPanelLED <> 0) :LOR: ((IOMD_C_FrontPanelRightLED <> 0) :LAND: (IOMD_C_FrontPanelLeftLED <> 0))) + ] ; Endif (POSTFlashesFrontPanelLEDs) ; MOV_fiq r0,r12_fiq ; restore the faultcode bits ; Uncomment the following line if the POST code is to loop when the POST diff --git a/VersionASM b/VersionASM index 56d2cc5f..8e37ae6c 100644 --- a/VersionASM +++ b/VersionASM @@ -6,9 +6,9 @@ GBLS Module_MinorVersion GBLS Module_Date GBLS Module_FullVersion -Module_MajorVersion SETS "5.11" -Module_Version SETA 511 +Module_MajorVersion SETS "5.12" +Module_Version SETA 512 Module_MinorVersion SETS "" Module_Date SETS "26 Jan 2000" -Module_FullVersion SETS "5.11" +Module_FullVersion SETS "5.12" END diff --git a/VersionNum b/VersionNum index c4ee4dcc..fe8c2466 100644 --- a/VersionNum +++ b/VersionNum @@ -1,15 +1,15 @@ -/* (5.11) +/* (5.12) * * This file is automatically maintained by srccommit, do not edit manually. * */ -#define Module_MajorVersion_CMHG 5.11 +#define Module_MajorVersion_CMHG 5.12 #define Module_MinorVersion_CMHG #define Module_Date_CMHG 26 Jan 2000 -#define Module_MajorVersion "5.11" -#define Module_Version 511 +#define Module_MajorVersion "5.12" +#define Module_Version 512 #define Module_MinorVersion "" #define Module_Date "26 Jan 2000" -#define Module_FullVersion "5.11" +#define Module_FullVersion "5.12" -- GitLab