diff --git a/src/sys/boot/boot2/boot2.c b/src/sys/boot/boot2/boot2.c index 214b4d4..be0201c 100755 --- a/src/sys/boot/boot2/boot2.c +++ b/src/sys/boot/boot2/boot2.c @@ -14,7 +14,7 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.28.2.6 2002/03/31 18:12:50 pb Exp $ + * $ID: src/sys/boot/i386/boot2/boot2.c,v 1.28.2.6 2002/03/31 18:12:50 pb Exp $ */ #include @@ -274,7 +274,7 @@ memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL)); } for (;;) { - printf(" \n>> FreeBSD/i386 BOOT\n" + printf(" \n>> UbixOS/i386 BOOT\n" "Default: %u:%s(%u,%c)%s\n" "boot: ", dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit, @@ -605,8 +605,10 @@ dsk.start = 0; if (drvread(sec, DOSBBSECTOR, 1)) return -1; + printf("w00t\n"); dp = (void *)(sec + DOSPARTOFF); sl = dsk.slice; + printf("sl: [%u]\n",sl); if (sl < BASE_SLICE) { for (i = 0; i < NDOSPART; i++) if (dp[i].dp_typ == DOSPTYP_386BSD && @@ -619,10 +621,13 @@ if (dsk.slice == WHOLE_DISK_SLICE) dsk.slice = sl; } + printf("dp_typ: [%u][%u][%u]\n",dp->dp_typ,WHOLE_DISK_SLICE,DOSPTYP_386BSD); if (sl != WHOLE_DISK_SLICE) { if (sl != COMPATIBILITY_SLICE) dp += sl - BASE_SLICE; + printf("dp_typ: [%u][%u][%u]\n",dp->dp_typ,WHOLE_DISK_SLICE,DOSPTYP_386BSD); if (dp->dp_typ != DOSPTYP_386BSD) { + printf("dp_typ: [%u][%u][%u]\n",dp->dp_typ,WHOLE_DISK_SLICE,DOSPTYP_386BSD); printf("Invalid %s\n", "slice"); return -1; } @@ -631,6 +636,7 @@ if (drvread(sec, dsk.start + LABELSECTOR, 1)) return -1; d = (void *)(sec + LABELOFFSET); + printf("d_magic: [%u][%s]\n",d->d_magic,sec); if (d->d_magic != DISKMAGIC || d->d_magic2 != DISKMAGIC) { if (dsk.part != RAW_PART) { printf("Invalid %s\n", "label"); @@ -740,7 +746,9 @@ { static unsigned c = 0x2d5c7c2f; - printf("%c\b", c = c << 8 | c >> 24); + //printf("%c\b", c = c << 8 | c >> 24); + //woot + printf("[%u](%u)",lba,nblk); v86.ctl = V86_ADDR | V86_CALLF | V86_FLAGS; v86.addr = XREADORG; /* call to xread in boot1 */ v86.es = VTOPSEG(buf);