diff options
| -rw-r--r-- | sys/boot/pc98/boot2/boot.c | 8 | ||||
| -rw-r--r-- | sys/boot/pc98/boot2/disk.c | 2 | ||||
| -rw-r--r-- | sys/boot/pc98/loader/main.c | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/sys/boot/pc98/boot2/boot.c b/sys/boot/pc98/boot2/boot.c index df8e755..4dced19 100644 --- a/sys/boot/pc98/boot2/boot.c +++ b/sys/boot/pc98/boot2/boot.c @@ -258,7 +258,7 @@ loadprog(void) printf("Start address too low\n"); return; } - printf("text=0x%x ", head.a_text); + printf("text=0x%lx ", head.a_text); /********************************************************/ /* LOAD THE TEXT SEGMENT */ /********************************************************/ @@ -271,7 +271,7 @@ loadprog(void) while (addr & PAGE_MASK) *(char *)addr++ = 0; - printf("data=0x%x ", head.a_data); + printf("data=0x%lx ", head.a_data); xread((void *)addr, head.a_data); addr += head.a_data; @@ -279,7 +279,7 @@ loadprog(void) /* Skip over the uninitialised data */ /* (but clear it) */ /********************************************************/ - printf("bss=0x%x ", head.a_bss); + printf("bss=0x%lx ", head.a_bss); /* * XXX however, we should be checking that we don't load ... into @@ -306,7 +306,7 @@ loadprog(void) /********************************************************/ /* Load the symbol table */ /********************************************************/ - printf("symbols=[+0x%x+0x%x+0x%x", pad, sizeof(head.a_syms), + printf("symbols=[+0x%x+0x%x+0x%lx", pad, sizeof(head.a_syms), head.a_syms); xread((void *)addr, head.a_syms); addr += head.a_syms; diff --git a/sys/boot/pc98/boot2/disk.c b/sys/boot/pc98/boot2/disk.c index ad9d3ff..f264117 100644 --- a/sys/boot/pc98/boot2/disk.c +++ b/sys/boot/pc98/boot2/disk.c @@ -58,8 +58,8 @@ #ifdef DO_BAD144 static struct dkbad dkb; static int do_bad144; -#endif DO_BAD144 static int bsize; +#endif DO_BAD144 static int spt, spc; diff --git a/sys/boot/pc98/loader/main.c b/sys/boot/pc98/loader/main.c index 0fabadf..d941319 100644 --- a/sys/boot/pc98/loader/main.c +++ b/sys/boot/pc98/loader/main.c @@ -165,11 +165,12 @@ extract_currdev(void) * (ie. SCSI when IDE also exists). */ #ifdef PC98 - if ((biosdev == 0) && (B_TYPE(initial_bootdev) != 2)) /* biosdev doesn't match major */ + if ((biosdev == 0) && (B_TYPE(initial_bootdev) != 2)) { /* biosdev doesn't match major */ if (B_TYPE(initial_bootdev) == 6) biosdev = 0x30 + B_UNIT(initial_bootdev); else biosdev = (major << 3) + 0x80 + B_UNIT(initial_bootdev); + } #else if ((biosdev == 0) && (B_TYPE(initial_bootdev) != 2)) /* biosdev doesn't match major */ biosdev = 0x80 + B_UNIT(initial_bootdev); /* assume harddisk */ |
