diff --git a/sys/arch/sparc/dev/obio.c b/sys/arch/sparc/dev/obio.c index aba9d34b772e..92674491fec5 100644 --- a/sys/arch/sparc/dev/obio.c +++ b/sys/arch/sparc/dev/obio.c @@ -1,4 +1,4 @@ -/* $NetBSD: obio.c,v 1.7 1994/11/02 23:16:28 deraadt Exp $ */ +/* $NetBSD: obio.c,v 1.8 1994/11/05 09:28:06 deraadt Exp $ */ /* * Copyright (c) 1993, 1994 Theo de Raadt @@ -102,8 +102,6 @@ busprint(args, obio) if (obio) printf("[%s at %s]", ca->ca_ra.ra_name, obio); printf(" addr %x", ca->ca_ra.ra_paddr); - if (ca->ca_ra.ra_intr[0].int_pri != -1) - printf(" pri %d", ca->ca_ra.ra_intr[0].int_pri); if (ca->ca_ra.ra_intr[0].int_vec != -1) printf(" vec 0x%x", ca->ca_ra.ra_intr[0].int_vec); return (UNCONF); @@ -147,7 +145,7 @@ busattach(parent, self, args, bustype) if (bustype == BUS_VME16 || bustype == BUS_VME32) oca.ca_ra.ra_intr[0].int_vec = cf->cf_loc[2]; else - oca.ca_ra.ra_intr[0].int_vec = 0; + oca.ca_ra.ra_intr[0].int_vec = -1; oca.ca_ra.ra_nintr = 1; oca.ca_ra.ra_name = cf->cf_driver->cd_name; oca.ca_ra.ra_bp = ca->ca_ra.ra_bp; @@ -260,6 +258,9 @@ vmeintr_establish(vec, level, ih) { struct intrhand *ihs; + if (vec == -1) + panic("vmeintr_establish: uninitialized vec\n"); + if (vmeints[vec] == NULL) vmeints[vec] = ih; else { @@ -344,11 +345,11 @@ bus_untmp() void wzero(b, l) - char *b; + u_char *b; int l; { - register char *be = b + l; - register short *sp; + register u_char *be = b + l; + register u_short *sp; if (l <= 0) return;