From 293c4f50f0f5561061a3452727209e02d889e8f9 Mon Sep 17 00:00:00 2001 From: imp Date: Tue, 28 Dec 1999 01:07:16 +0000 Subject: Two nits and disable isa probe due to its overly agressive claiming of devices. o Return ENXIO from sn_isa_probe o Fix SN_DEBUG printf o Use IFQ_MAXLEN rather than 8 I'll fix the isa probe when I get access to a real isa attachment device to test against here in a few days. Overly agressive snagging behavior noticed by: phk --- sys/dev/sn/if_sn.c | 5 ++--- sys/dev/sn/if_sn_isa.c | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/dev/sn') diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c index 7f0750f..4bf1553 100644 --- a/sys/dev/sn/if_sn.c +++ b/sys/dev/sn/if_sn.c @@ -228,8 +228,7 @@ sn_attach(device_t dev) ifp->if_ioctl = snioctl; ifp->if_watchdog = snwatchdog; ifp->if_init = sninit; - ifp->if_snd.ifq_maxlen = 8; - + ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; ifp->if_timer = 0; if_attach(ifp); @@ -1287,7 +1286,7 @@ sn_activate(device_t dev) 0, ~0, 1, RF_ACTIVE); if (!sc->irq_res) { #ifdef SN_DEBUG - deivce_printf(dev, "Cannot allocate irq\n"); + device_printf(dev, "Cannot allocate irq\n"); #endif sn_deactivate(dev); return ENOMEM; diff --git a/sys/dev/sn/if_sn_isa.c b/sys/dev/sn/if_sn_isa.c index f6c549d..0922d44 100644 --- a/sys/dev/sn/if_sn_isa.c +++ b/sys/dev/sn/if_sn_isa.c @@ -60,9 +60,10 @@ static int sn_isa_attach (device_t); static int sn_isa_probe (device_t dev) { +#if 0 if (sn_probe(dev, 0) != 0) return (0); - +#endif return (ENXIO); } -- cgit v1.1