aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorEivind Eklund <eivind@FreeBSD.org>1999-01-12 00:27:43 +0000
committerEivind Eklund <eivind@FreeBSD.org>1999-01-12 00:27:43 +0000
commit0044fd3054fe3fdd89a7a97ed31aea9a31ed0832 (patch)
tree9051d1f1f623a45b2efa43480c2cf49ad8fee02a /sys/dev
parent6fa60716d1f6c542af470c947020d38b350a05f4 (diff)
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/cs/if_cs.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index 1eaf3dee496f..1ddfbca1888f 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -27,7 +27,7 @@
*/
/*
- * $Id: if_cs.c,v 1.6 1998/10/22 05:58:38 bde Exp $
+ * $Id: if_cs.c,v 1.7 1998/12/07 21:58:21 archie Exp $
*
* Device driver for Crystal Semiconductor CS8920 based ethernet
* adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
@@ -100,7 +100,9 @@ static struct cs_softc {
} cs_softc[NCS];
+#if NPNP > 0
static u_long cs_unit = NCS;
+#endif
static int cs_recv_delay = 570;
SYSCTL_INT(_machdep, OID_AUTO, cs_recv_delay, CTLFLAG_RW, &cs_recv_delay, 0, "");
@@ -1348,8 +1350,8 @@ cs_pnp_attach(u_long csn, u_long vend_id, char *name,
struct pnp_cinfo d;
int ldn = 0;
int iobase, unit, flags;
- u_short irq;
- short drq;
+ u_int irq;
+ int drq;
struct isa_device *dvp;
struct cs_softc *sc = malloc(sizeof *sc, M_DEVBUF, M_NOWAIT);
@@ -1365,7 +1367,7 @@ cs_pnp_attach(u_long csn, u_long vend_id, char *name,
irq = dev->id_irq = (1 << d.irq[0] );
drq = dev->id_drq = d.drq[0];
dev->id_maddr = 0;
- dev->id_intr = csintr_pnp;
+ dev->id_ointr = csintr_pnp;
flags = dev->id_flags = 0;
unit = dev->id_unit;