Chameleon

Chameleon Commit Details

Date:2011-06-24 12:45:04 (12 years 10 months ago)
Author:Azimutz
Commit:1050
Parents: 1049
Message:Replace my "bootLogBanner" by trunk's "add svn revision and build timestamp to booter log", r915. Match some more stuff...
Changes:
M/branches/azimutz/Chazi/i386/libsaio/console.c
M/branches/azimutz/Chazi/i386/boot2/prompt.c
M/branches/azimutz/Chazi/i386/boot2/boot.c
M/branches/azimutz/Chazi/i386/libsa/printf.c
M/branches/azimutz/Chazi/i386/boot2/boot.h
M/branches/azimutz/Chazi/i386/libsa/zalloc.c

File differences

branches/azimutz/Chazi/i386/libsaio/console.c
4646
4747
4848
49
4950
5051
5152
......
6667
6768
6869
69
70
71
7072
7173
7274
......
8991
9092
9193
94
95
9296
9397
9498
......
260264
261265
262266
263
267
264268
␊
//#include "libsaio.h"␊
#include "bootstruct.h"␊
#include <vers.h>␊
␊
extern int␉vprf(const char * fmt, va_list ap);␊
␊
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;␊
};␊
␉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, ...)␊
void pause() ␊
{␊
printf("Press a key to continue...\n");␊
getchar(); // replace getchar() by pause() ??␊
getchar(); // replace getchar() by pause() ?? were useful...?␊
}␊
branches/azimutz/Chazi/i386/boot2/prompt.c
3232
3333
3434
35
36
37
3835
3936
4037
"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"␊
branches/azimutz/Chazi/i386/boot2/boot.c
299299
300300
301301
302
303
304
305302
306303
307304
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␊
branches/azimutz/Chazi/i386/boot2/boot.h
197197
198198
199199
200
201200
202201
203202
extern long gBootMode;␊
extern bool sysConfigValid;␊
extern char bootBanner[];␊
extern char bootLogBanner[];␊
extern char bootPrompt[];␊
extern bool gOverrideKernel;␊
extern char *gPlatformName; // disabled ??␊
branches/azimutz/Chazi/i386/libsa/printf.c
2828
2929
3030
31
31
3232
3333
3434
3535
3636
3737
38
38
3939
4040
4141
␊
#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) {␊
branches/azimutz/Chazi/i386/libsa/zalloc.c
250250
251251
252252
253
254
255
253
254
255
256256
257257
258258
␉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␊

Archive Download the corresponding diff file

Revision: 1050