 @@ -1,14 +1,14 @@
-/* $NetBSD: if_rtw_cardbus.c,v 1.27 2008/06/24 19:44:52 drochner Exp $ */
+/* $NetBSD: if_rtw_cardbus.c,v 1.28 2009/02/06 01:55:19 dyoung Exp $ */
 /*-
  * Copyright (c) 2004, 2005 David Young.  All rights reserved.
+ *
  * Adapted for the RTL8180 by David Young.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -57,27 +57,27 @@
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Cardbus front-end for the Realtek RTL8180 802.11 MAC/BBP driver.
+ *
  * TBD factor with atw, tlp Cardbus front-ends?
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.27 2008/06/24 19:44:52 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.28 2009/02/06 01:55:19 dyoung Exp $");
 #include "opt_inet.h"
 #include "bpfilter.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 @@ -187,32 +187,26 @@ rtw_cardbus_lookup(const struct cardbus_
 int
 rtw_cardbus_match(device_t parent, struct cfdata *match, void *aux)
+{
 	struct cardbus_attach_args *ca = aux;
 	if (rtw_cardbus_lookup(ca) != NULL)
 		return 1;
 	return 0;
+}
 static void
 rtw_cardbus_intr_ack(struct rtw_regs *regs)
 	RTW_WRITE(regs, RTW_FER, RTW_FER_INTR);
 static void
 rtw_cardbus_funcregen(struct rtw_regs *regs, int enable)
+{
 	u_int32_t reg;
 	rtw_config0123_enable(regs, 1);
 	reg = RTW_READ(regs, RTW_CONFIG3);
 	if (enable)
 		RTW_WRITE(regs, RTW_CONFIG3, reg | RTW_CONFIG3_FUNCREGEN);
 	else
 		RTW_WRITE(regs, RTW_CONFIG3, reg & ~RTW_CONFIG3_FUNCREGEN);
 	rtw_config0123_enable(regs, 0);
+}
 void
 @@ -228,28 +222,26 @@ rtw_cardbus_attach(device_t parent, devi
 	int rev;
 	sc->sc_dev = self;
 	sc->sc_dmat = ca->ca_dmat;
 	csc->sc_ct = ct;
 	csc->sc_tag = ca->ca_tag;
 	rcp = rtw_cardbus_lookup(ca);
 	if (rcp == NULL) {
 		printf("\n");
 		panic("rtw_cardbus_attach: impossible");
+	}
 	sc->sc_intr_ack = rtw_cardbus_intr_ack;
 	/* Get revision info. */
 	rev = PCI_REVISION(ca->ca_class);
 	printf(": %s\n", rcp->rcp_product_name);
 	RTW_DPRINTF(RTW_DEBUG_ATTACH,
 	    ("%s: pass %d.%d signature %08x\n", device_xname(self),
 	     (rev >> 4) & 0xf, rev & 0xf,
 	     cardbus_conf_read(ct->ct_cc, ct->ct_cf, csc->sc_tag, 0x80)));
 	/*
 	 * Map the device.
 	 */
 @@ -291,28 +283,28 @@ rtw_cardbus_attach(device_t parent, devi
 	 */
 	rtw_cardbus_setup(csc);
 	/* Remember which interrupt line. */
 	csc->sc_intrline = ca->ca_intrline;
 	/*
 	 * Finish off the attach.
 	 */
 	rtw_attach(sc);
 	rtw_cardbus_funcregen(regs, 1);
-	RTW_WRITE(regs, RTW_FEMR, RTW_FEMR_INTR);
+	RTW_WRITE(regs, RTW_FEMR, 0);
-	RTW_WRITE(regs, RTW_FER, RTW_FER_INTR);
+	RTW_WRITE(regs, RTW_FER, RTW_READ(regs, RTW_FER));
 	if (!pmf_device_register(self, rtw_cardbus_suspend, rtw_cardbus_resume))
 		aprint_error_dev(self, "couldn't establish power handler\n");
 	else {
 		pmf_class_network_register(self, &sc->sc_if);
 		/*
 		 * Power down the socket.
 		 */
 		pmf_device_suspend_self(self);
+	}
+}
 int