Chameleon Commit Details - 614 - Chameleon open source boot loader project.

Date:

2010-10-25 18:57:08 (13 years 6 months ago)

Author:

Azimutz

Commit:

614

Parents:

613

Message:

Double the size of memory reserved for booter log. Fixes some problems while booting with -f argument (ignore boot caches).

Changes:

M	/branches/azimutz/Chazi/i386/libsaio/console.c
M	/branches/azimutz/Chazi/i386/libsa/zalloc.c

File differences

-53
54 54
55 55
56 
57 
56
57
58
59
60
61
58 62
59 63
60 64
+bool gErrors;␊
␊
/* Kabyl: BooterLog */␊
#define BOOTER_LOG_SIZE␉(64 * 1024)␊
#define SAFE_LOG_SIZE␉80␊
//Azi: Double log available size; this seems to fix some hangs and instant reboots caused by␊
// booting with -f (ignore caches). 96kb are enough to hold full log, booting with -f; even so,␊
// this depends on how much we "play" at the boot prompt and with what patches we're playing,␊
// depending on how much they print to the log.␊
#define BOOTER_LOG_SIZE␉(128 * 1024)␊
#define SAFE_LOG_SIZE␉134␊
␊
char *msgbuf = 0;␊
char *cursor = 0;␊
 bool gErrors;␊
 ␊
 /* Kabyl: BooterLog */␊
-#define BOOTER_LOG_SIZE␉(64 * 1024)␊
-#define SAFE_LOG_SIZE␉80␊
+//Azi: Double log available size; this seems to fix some hangs and instant reboots caused by␊
+// booting with -f (ignore caches). 96kb are enough to hold full log, booting with -f; even so,␊
+// this depends on how much we "play" at the boot prompt and with what patches we're playing,␊
+// depending on how much they print to the log.␊
+#define BOOTER_LOG_SIZE␉(128 * 1024)␊
+#define SAFE_LOG_SIZE␉134␊
 ␊
 char *msgbuf = 0;␊
 char *cursor = 0;␊

-30
31 31
32 32
33
34
33 35
34 36
35 37
38
39
36 40
37 41
38 42
+ */␊
␊
#include "libsa.h"␊
//#include "saio_internal.h" //Azi: needed for ZDEBUG (printf).␊
// Check other DEBUG's, i forgot those while messing with includes.␊
#include "memory.h"␊
␊
#define ZDEBUG 0␊
//Azi: this DEBUG is messed up; it hangs while "boot1: ..." with␊
// black screen on my branch and instant reboot on trunk.␊
␊
#if ZDEBUG␊
int zout;␊
  */␊
 ␊
 #include "libsa.h"␊
+//#include "saio_internal.h" //Azi: needed for ZDEBUG (printf).␊
+// Check other DEBUG's, i forgot those while messing with includes.␊
 #include "memory.h"␊
 ␊
 #define ZDEBUG 0␊
+//Azi: this DEBUG is messed up; it hangs while "boot1: ..." with␊
+// black screen on my branch and instant reboot on trunk.␊
 ␊
 #if ZDEBUG␊
 int zout;␊