Commit 6c9ac427 authored by Steve Revill's avatar Steve Revill
Browse files

Changed Boot$Error box to only have "Retry" button on STB builds.

Detail:
When Boot$Error is set to a non-empty string on exit to this module,
an error box is displayed. For STB's, this error box only has one
button, 'Retry'.
Selecting the 'Retry' button will reboot the box. Usefully, if you
select 'Retry' and hold down (return), you will enter the
Engineering menu.
Admin:
Untested (but looks like it should work).

Version 2.57. Tagged as 'Desktop-2_57'
parent 90af2706
......@@ -14,3 +14,4 @@ Printers:%Run Resources:$.Apps.!Printers
Desktop:Desktop
BootErr:Machine startup has not completed successfully: '%0'
ErrButt:Retry,Cancel,Floppy boot
ErrButtSTB:Retry
;
; This file is automatically maintained by srccommit, do not edit manually.
;
GBLS Module_MajorVersion
GBLA Module_Version
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
Module_MajorVersion SETS "2.56"
Module_Version SETA 256
Module_MinorVersion SETS ""
Module_Date SETS "15 Nov 1999"
Module_FullVersion SETS "2.56"
GBLS Module_MajorVersion
GBLA Module_Version
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
Module_MajorVersion SETS "2.57"
Module_Version SETA 257
Module_MinorVersion SETS ""
Module_Date SETS "03 Mar 2000"
Module_FullVersion SETS "2.57"
END
/* (2.56)
/* (2.57)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 2.56
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 15 Nov 1999
#define Module_MajorVersion_CMHG 2.57
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 03 Mar 2000
#define Module_MajorVersion "2.56"
#define Module_Version 256
#define Module_MinorVersion ""
#define Module_Date "15 Nov 1999"
#define Module_MajorVersion "2.57"
#define Module_Version 257
#define Module_MinorVersion ""
#define Module_Date "03 Mar 2000"
#define Module_FullVersion "2.56"
#define Module_FullVersion "2.57"
......@@ -18,36 +18,37 @@
; *** C h a n g e L i s t ***
; *********************************
; Date Description
; ---- -----------
; 9-Feb-90 File created from old Desktop 2.23
; 22-Feb-90 Changed to use Resources:
; 2.24 Filer_Boot's files in Resources:$.Apps
; 27-Feb-90 2.25 Removed desktop files for Filer/Act
; 28-Feb-90 Removed desktop files for !Configure,!Draw,!Edit,TinyDirs
; 2.26 Removed all references to Wimp$Path
; 1-Mar-90 2.27 Removed all references to ResourceFS
; 29-Apr-91 2.28 Corrected list of auto start applications
; 29-May-91 2.29 Added startup screen and Service_DesktopWelcome
; 18-Jan-92 General tinkering about with the module
; 17-Feb-92 2.36 Pump startup through NULL events
; Pass strings through MessageTrans
; Allocate workspace during startup only.
; 26-Feb-92 2.37 Fix bug preventing restart from working.
; 28-Feb-92 2.40 Remove check for workspace presence to enable
; multiple *Desktop commands to be active at once
; (prevents breakage of some deskboot files).
; 11-Mar-92 2.41 OSS Look auto-start strings etc. up in Messages file.
; Allows ROM app names to be localised, part of
; fix to RP-0716.
; 02-Apr-92 2.43 LRust Re-introduce check for exec file open on desktop startup.
; Allows *Exec !boot files to work correctly on shift-break
; and fixes RP-2176
; 12-Jul-93 BCockburn Removed GET of Hdr:Compress
; 26-Jul-93 JRoach If OS_GBPB on Resources:$.Apps gives trouble then stop pumping
; ROM apps rather than giving an error
; 26-Jan-95 JRH Quick hack to stop filer_booting files in Resources:$.Apps
; 15-May-95 RWB Make welcome banner not appear
; Date Description
; ---- -----------
; 9-Feb-90 File created from old Desktop 2.23
; 22-Feb-90 Changed to use Resources:
; 2.24 Filer_Boot's files in Resources:$.Apps
; 27-Feb-90 2.25 Removed desktop files for Filer/Act
; 28-Feb-90 Removed desktop files for !Configure,!Draw,!Edit,TinyDirs
; 2.26 Removed all references to Wimp$Path
; 1-Mar-90 2.27 Removed all references to ResourceFS
; 29-Apr-91 2.28 Corrected list of auto start applications
; 29-May-91 2.29 Added startup screen and Service_DesktopWelcome
; 18-Jan-92 General tinkering about with the module
; 17-Feb-92 2.36 Pump startup through NULL events
; Pass strings through MessageTrans
; Allocate workspace during startup only.
; 26-Feb-92 2.37 Fix bug preventing restart from working.
; 28-Feb-92 2.40 Remove check for workspace presence to enable
; multiple *Desktop commands to be active at once
; (prevents breakage of some deskboot files).
; 11-Mar-92 2.41 OSS Look auto-start strings etc. up in Messages file.
; Allows ROM app names to be localised, part of
; fix to RP-0716.
; 02-Apr-92 2.43 LRust Re-introduce check for exec file open on desktop startup.
; Allows *Exec !boot files to work correctly on shift-break
; and fixes RP-2176
; 12-Jul-93 BCockburn Removed GET of Hdr:Compress
; 26-Jul-93 JRoach If OS_GBPB on Resources:$.Apps gives trouble then stop pumping
; ROM apps rather than giving an error
; 26-Jan-95 JRH Quick hack to stop filer_booting files in Resources:$.Apps
; 15-May-95 RWB Make welcome banner not appear
; 03-Mar-2000 SAR Change Boot$Error box to only have a 'Reboot' button on STBs
;NK version, uses template for welcome banner
......@@ -470,8 +471,12 @@ StartAsTask
SWI XWimp_ReportError
BVS Exit
[ STB
SWI XOS_Reset ; The only button on STB's error box is 'Retry'
|
CMP R1, #4
SWICC XOS_Reset ; Retry selected: don't expect to return from this!
]
BEQ ClearScreen ; Cancel selected.
MOV r0, #0 ; Floppy boot selected
......@@ -497,7 +502,11 @@ StartAsTask
str_floppyboot DCB "Run ADFS::0.$.!Boot",0
str_booterror DCB "Boot$Error",0
token_booterror DCB "BootErr",0
[ STB
token_errorbuttons DCB "ErrButtSTB",0
|
token_errorbuttons DCB "ErrButt",0
]
ALIGN
ClearScreen
......
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