summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2006-01-09 21:19:49 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2006-01-09 21:19:49 +0000
commit4fb27973143f59ce36152403b7753b45da61e46f (patch)
treedef687c2cded60e4d7cf33cfca709b70115d213a /sys/dev/pci
parent49a48702134ba52fa189ddb45b5af9200dd50c54 (diff)
Move an(4) to a driver based on the NetBSD one.
This brings net80211 support and support for newer hardware. In addition ancontrol is no longer needed. This driver does not yet work on big endian archs like the previous one did. "do it" deraadt@
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/if_an_pci.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/pci/if_an_pci.c b/sys/dev/pci/if_an_pci.c
index d09988b8f3b..19fd57bbe63 100644
--- a/sys/dev/pci/if_an_pci.c
+++ b/sys/dev/pci/if_an_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_an_pci.c,v 1.13 2005/09/13 14:15:33 mickey Exp $ */
+/* $OpenBSD: if_an_pci.c,v 1.14 2006/01/09 21:19:48 jsg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -77,8 +77,8 @@
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
-#include <dev/ic/anvar.h>
#include <dev/ic/anreg.h>
+#include <dev/ic/anvar.h>
#define AN_PCI_PLX_LOIO 0x14 /* PLX chip iobase */
#define AN_PCI_LOIO 0x18 /* Aironet iobase */
@@ -127,8 +127,8 @@ an_pci_attach(parent, self, aux)
printf(": can't map I/O space\n");
return;
}
- sc->an_btag = iot;
- sc->an_bhandle = ioh;
+ sc->sc_iot = iot;
+ sc->sc_ioh = ioh;
/* Map and establish the interrupt. */
if (pci_intr_map(pa, &ih)) {
@@ -148,5 +148,7 @@ an_pci_attach(parent, self, aux)
}
printf(": %s", intrstr);
+ sc->sc_enabled = 1;
+
an_attach(sc);
}