diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-04-18 07:40:04 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-04-18 07:40:04 +0000 |
| commit | 888b63e1743ef4b4277b88169301e0b5c1445e16 (patch) | |
| tree | 5b9d1c51879f3e1f909c17e6ec7c2f6050ac92e1 /sys/arch/i386/stand/libsa/diskprobe.c | |
| parent | c2ee71fae9cec63f4a94c921619dc28d1c5b5032 (diff) | |
i386 bootblocks that work for 2.3. A tale too long to tell
Diffstat (limited to 'sys/arch/i386/stand/libsa/diskprobe.c')
| -rw-r--r-- | sys/arch/i386/stand/libsa/diskprobe.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sys/arch/i386/stand/libsa/diskprobe.c b/sys/arch/i386/stand/libsa/diskprobe.c index 38ef5db6c4c..0aac07f7be4 100644 --- a/sys/arch/i386/stand/libsa/diskprobe.c +++ b/sys/arch/i386/stand/libsa/diskprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diskprobe.c,v 1.14 1998/02/24 22:06:50 weingart Exp $ */ +/* $OpenBSD: diskprobe.c,v 1.15 1998/04/18 07:39:50 deraadt Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -52,11 +52,12 @@ static int disksum __P((int)); /* List of disk devices we found/probed */ -static struct disklist_lh disklist; +struct disklist_lh disklist; /* Pointer to boot device */ struct diskinfo *bootdev_dip; +extern int debug; /* Probe for all BIOS floppies */ static void @@ -72,7 +73,8 @@ floppyprobe() if(bios_getdiskinfo(i, &dip->bios_info)) { #ifdef BIOS_DEBUG - printf(" <!fd%u>", i); + if (debug) + printf(" <!fd%u>", i); #endif free(dip, 0); break; @@ -108,7 +110,8 @@ hardprobe() if(bios_getdiskinfo(i, &dip->bios_info)) { #ifdef BIOS_DEBUG - printf(" <!hd%u>", i&0x7f); + if (debug) + printf(" <!hd%u>", i&0x7f); #endif free(dip, 0); break; @@ -155,6 +158,7 @@ hardprobe() /* Probe for all BIOS supported disks */ +u_int32_t bios_cksumlen; void diskprobe() { @@ -163,7 +167,6 @@ diskprobe() /* These get passed to kernel */ bios_diskinfo_t *bios_diskinfo; - static u_int32_t bios_cksumlen; /* Init stuff */ printf("disk:"); @@ -172,7 +175,8 @@ diskprobe() /* Do probes */ floppyprobe(); #ifdef BIOS_DEBUG - printf(";"); + if (debug) + printf(";"); #endif hardprobe(); @@ -256,7 +260,7 @@ bios_dklookup(dev) * Use the adler32() function from libz, * as it is quick, small, and available. */ -static int +int disksum(blk) int blk; { |