diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-05-07 07:38:52 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-05-07 07:38:52 +0000 |
| commit | a18dd829375e446ca22af98dc283f34da965edbc (patch) | |
| tree | 0c5bbc9a1a0ce73f792bd62db356a18c8af92e32 /sys/dev/isa/seagate.c | |
| parent | c78ff01b45ca78d491b3e8db520c2cb877a273d4 (diff) | |
sync with 0504 -- prototypes and bus.h
Diffstat (limited to 'sys/dev/isa/seagate.c')
| -rw-r--r-- | sys/dev/isa/seagate.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c index 67e70d04696..d426bd3db8a 100644 --- a/sys/dev/isa/seagate.c +++ b/sys/dev/isa/seagate.c @@ -260,12 +260,14 @@ static const BiosSignature signatures[] = { #define nsignatures (sizeof(signatures) / sizeof(signatures[0])) +#ifdef notdef static const char *bases[] = { (char *) 0xc8000, (char *) 0xca000, (char *) 0xcc000, (char *) 0xce000, (char *) 0xdc000, (char *) 0xde000 }; #define nbases (sizeof(bases) / sizeof(bases[0])) +#endif int seaintr __P((void *)); int sea_scsi_cmd __P((struct scsi_xfer *)); @@ -383,7 +385,7 @@ seaprobe(parent, match, aux) break; default: #ifdef DIAGNOSTIC - printf("%s: board type unknown at address 0x%lx\n", + printf("%s: board type unknown at address %p\n", sea->sc_dev.dv_xname, sea->maddr); #endif return 0; @@ -629,8 +631,9 @@ sea_get_scb(sea, flags) break; } if (sea->numscbs < SEA_SCB_MAX) { - if (scb = (struct sea_scb *) malloc(sizeof(struct sea_scb), - M_TEMP, M_NOWAIT)) { + scb = (struct sea_scb *) malloc(sizeof(struct sea_scb), + M_TEMP, M_NOWAIT); + if (scb) { bzero(scb, sizeof(struct sea_scb)); sea->numscbs++; } else @@ -884,6 +887,7 @@ sea_reselect(sea) printf("%s: expecting IDENTIFY message, got 0x%x\n", sea->sc_dev.dv_xname, msg[0]); abort = 1; + scb = NULL; } else { lun = msg[0] & 0x07; |