summaryrefslogtreecommitdiffstats
path: root/sys/dev/ep/if_ep_pccard.c
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2003-10-26 22:28:20 +0000
committerimp <imp@FreeBSD.org>2003-10-26 22:28:20 +0000
commit33cc34743ea9ca91d5de1cceadf6ad149c3d8619 (patch)
tree1063c84573471cbd07d95632b7f60fb4fe176e82 /sys/dev/ep/if_ep_pccard.c
parent926420ae447a469f30852ed262cc6283208eb4a8 (diff)
downloadFreeBSD-src-33cc34743ea9ca91d5de1cceadf6ad149c3d8619.zip
FreeBSD-src-33cc34743ea9ca91d5de1cceadf6ad149c3d8619.tar.gz
Pass sc to GO_WINDOW macro.
Use SET_IRQ for pccard case, rather than exapnding it inline. Requested by: mdodd
Diffstat (limited to 'sys/dev/ep/if_ep_pccard.c')
-rw-r--r--sys/dev/ep/if_ep_pccard.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/ep/if_ep_pccard.c b/sys/dev/ep/if_ep_pccard.c
index 4b9cefb..e54a5eb 100644
--- a/sys/dev/ep/if_ep_pccard.c
+++ b/sys/dev/ep/if_ep_pccard.c
@@ -208,17 +208,15 @@ ep_pccard_attach(device_t dev)
/* ROM size = 0, ROM base = 0 */
/* For now, ignore AUTO SELECT feature of 3C589B and later. */
CSR_WRITE_2(sc, EP_W0_ADDRESS_CFG, result & 0xc000);
-
/* Fake IRQ must be 3 */
- CSR_WRITE_2(sc, EP_W0_RESOURCE_CFG, (sc->epb.res_cfg & 0x0fff) | 0x3000);
-
+ SET_IRQ(sc, 3);
CSR_WRITE_2(sc, EP_W0_PRODUCT_ID, sc->epb.prod_id);
if (sc->epb.mii_trans) {
/*
* turn on the MII transciever
*/
- GO_WINDOW(3);
+ GO_WINDOW(sc, 3);
CSR_WRITE_2(sc, EP_W3_OPTIONS, 0x8040);
DELAY(1000);
CSR_WRITE_2(sc, EP_W3_OPTIONS, 0xc040);
OpenPOWER on IntegriCloud