Index: branches/azimutz/Chazi/i386/libsaio/console.c =================================================================== --- branches/azimutz/Chazi/i386/libsaio/console.c (revision 1049) +++ branches/azimutz/Chazi/i386/libsaio/console.c (revision 1050) @@ -46,6 +46,7 @@ //#include "libsaio.h" #include "bootstruct.h" +#include extern int vprf(const char * fmt, va_list ap); @@ -66,7 +67,8 @@ char *msgbuf = 0; char *cursor = 0; -struct putc_info { //Azi: exists on printf.c & gui.c +struct putc_info //Azi: exists on gui.c & printf.c +{ char * str; char * last_str; }; @@ -89,6 +91,8 @@ msgbuf = malloc(BOOTER_LOG_SIZE); bzero(msgbuf, BOOTER_LOG_SIZE); cursor = msgbuf; + msglog("%s\n", "Chameleon " I386BOOT_CHAMELEONVERSION " (svn-r" I386BOOT_CHAMELEONREVISION ")" " [" I386BOOT_BUILDDATE "]"); + //Azi: shorten this } void msglog(const char * fmt, ...) @@ -260,5 +264,5 @@ void pause() { printf("Press a key to continue...\n"); - getchar(); // replace getchar() by pause() ?? + getchar(); // replace getchar() by pause() ?? were useful...? } Index: branches/azimutz/Chazi/i386/boot2/prompt.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/prompt.c (revision 1049) +++ branches/azimutz/Chazi/i386/boot2/prompt.c (revision 1050) @@ -32,9 +32,6 @@ "Build date: " I386BOOT_BUILDDATE "\n" "%dMB memory\n"; -char bootLogBanner[] = "\nChameleon v" I386BOOT_CHAMELEONVERSION " r" I386BOOT_CHAMELEONREVISION "\n" - "Build date: " I386BOOT_BUILDDATE "\n\n"; - char bootPrompt[] = "Press Enter to start up Darwin/x86 with no options, or you can:\n" " Type -v and press Enter to start up with diagnostic messages\n" Index: branches/azimutz/Chazi/i386/boot2/boot.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/boot.c (revision 1049) +++ branches/azimutz/Chazi/i386/boot2/boot.c (revision 1050) @@ -299,9 +299,6 @@ initKernBootStruct(); initBooterLog(); - - //Azi: log booter version, revision & build date, for bdmesg. - msglog(bootLogBanner); // Setup VGA text mode. // Not sure if it is safe to call setVideoMode() before the Index: branches/azimutz/Chazi/i386/boot2/boot.h =================================================================== --- branches/azimutz/Chazi/i386/boot2/boot.h (revision 1049) +++ branches/azimutz/Chazi/i386/boot2/boot.h (revision 1050) @@ -197,7 +197,6 @@ extern long gBootMode; extern bool sysConfigValid; extern char bootBanner[]; -extern char bootLogBanner[]; extern char bootPrompt[]; extern bool gOverrideKernel; extern char *gPlatformName; // disabled ?? Index: branches/azimutz/Chazi/i386/libsa/printf.c =================================================================== --- branches/azimutz/Chazi/i386/libsa/printf.c (revision 1049) +++ branches/azimutz/Chazi/i386/libsa/printf.c (revision 1050) @@ -28,14 +28,14 @@ #include "libsa.h" -struct putc_info //Azi: same as below +struct putc_info //Azi: exists on console.c & gui.c { char * str; char * last_str; }; static int -sputc(int c, struct putc_info * pi) //Azi: exists on console.c & gui.c +sputc(int c, struct putc_info * pi) //Azi: same as above { if (pi->last_str) if (pi->str == pi->last_str) { Index: branches/azimutz/Chazi/i386/libsa/zalloc.c =================================================================== --- branches/azimutz/Chazi/i386/libsa/zalloc.c (revision 1049) +++ branches/azimutz/Chazi/i386/libsa/zalloc.c (revision 1050) @@ -250,9 +250,9 @@ zcoalesce(); return; } -//Azi: enable static? not in trunk... -//static -void + +//Azi: keep an eye on this - me thinks modules related (kernelpatcher?) +static void zallocate(char * start,int size) { #if ZDEBUG