From b72a17e3a2cc6d05846a6b2d43c17b9b8a416fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Colin=20G=C3=BCnther?= Date: Tue, 29 Dec 2009 17:57:24 +0000 Subject: [PATCH] * No need for a special interrupt reenabling routine, as this is done by the FreeBSD driver already. * Some coding style cleanups. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34806 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../drivers/network/wlan/iprowifi4965/glue.c | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c index 3ddbc79aa9..36f902efb8 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c +++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/glue.c @@ -21,6 +21,7 @@ HAIKU_FBSD_WLAN_DRIVER_GLUE(iprowifi4965, iwn, pci) NO_HAIKU_FBSD_MII_DRIVER(); +NO_HAIKU_REENABLE_INTERRUPTS(); HAIKU_DRIVER_REQUIREMENTS(FBSD_TASKQUEUES | FBSD_WLAN); HAIKU_FIRMWARE_VERSION(44417); @@ -35,31 +36,20 @@ HAIKU_CHECK_DISABLE_INTERRUPTS(device_t dev) r2 = IWN_READ(sc, IWN_INTR_STATUS); if (r1 == 0 && r2 == 0) { - /* not for us */ + // not for us IWN_WRITE(sc, IWN_MASK, IWN_INTR_MASK); return 0; } - if (r1 == 0xffffffff) { - /* hardware gone */ + if (r1 == 0xffffffff) + // hardware gone return 0; - } atomic_or((int32*)&sc->sc_intr_status_1, r1); atomic_or((int32*)&sc->sc_intr_status_2, r2); - /* disable interrupts */ IWN_WRITE(sc, IWN_MASK, 0); + // disable interrupts return 1; } - - -void -HAIKU_REENABLE_INTERRUPTS(device_t dev) -{ - struct iwn_softc* sc = (struct iwn_softc*)device_get_softc(dev); - - /* enable interrupts */ - IWN_WRITE(sc, IWN_MASK, IWN_INTR_MASK); -}