Commit 7c1754c9 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Zap both the LoadModeFile command and the WimpMode command on CMOS reset

Detail:
  Source/ClrMonitor/c/main - On CMOS reset, zap both lines in the monitor configuration file instead of just the LoadModeFile line
  Will prevent the boot sequence terminating early after a CMOS reset when running Wimp 5.40, under which WimpMode will correctly error when given a bad mode
Admin:
  Tested on Raspberry Pi


Version 1.20. Tagged as 'Boot-1_20'
parent c563ce28
......@@ -37,14 +37,18 @@ int main (void)
do
{
if ( inchar == '\n' ) --dcount;
if ( dcount == 0 )
if ( inchar == '\n' )
{
fseek( ufile, 0, SEEK_CUR );
fputc( '|', ufile );
--dcount;
if ( dcount <= 0 )
{
fseek( ufile, 0, SEEK_CUR );
fputc( '|', ufile );
fseek( ufile, 0, SEEK_CUR );
}
}
}
while ( (dcount > 0) && ((inchar = fgetc( ufile )) != EOF) );
while ( (dcount > -1) && ((inchar = fgetc( ufile )) != EOF) );
fclose( ufile );
}
#if 0
......
/* (1.19)
/* (1.20)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.19
#define Module_MajorVersion_CMHG 1.20
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 21 Nov 2013
#define Module_Date_CMHG 18 Apr 2014
#define Module_MajorVersion "1.19"
#define Module_Version 119
#define Module_MajorVersion "1.20"
#define Module_Version 120
#define Module_MinorVersion ""
#define Module_Date "21 Nov 2013"
#define Module_Date "18 Apr 2014"
#define Module_ApplicationDate "21-Nov-13"
#define Module_ApplicationDate "18-Apr-14"
#define Module_ComponentName "Boot"
#define Module_ComponentPath "castle/RiscOS/Sources/SystemRes/Boot"
#define Module_FullVersion "1.19"
#define Module_HelpVersion "1.19 (21 Nov 2013)"
#define Module_LibraryVersionInfo "1:19"
#define Module_FullVersion "1.20"
#define Module_HelpVersion "1.20 (18 Apr 2014)"
#define Module_LibraryVersionInfo "1:20"
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