summaryrefslogtreecommitdiff
path: root/sys/dev/pci/if_gem_pci.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/pci/if_gem_pci.c')
-rw-r--r--sys/dev/pci/if_gem_pci.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c
index 14c238e7131..135576f4c1a 100644
--- a/sys/dev/pci/if_gem_pci.c
+++ b/sys/dev/pci/if_gem_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_gem_pci.c,v 1.6 2002/01/28 01:04:02 jason Exp $ */
+/* $OpenBSD: if_gem_pci.c,v 1.7 2002/02/22 20:15:28 jason Exp $ */
/* $NetBSD: if_gem_pci.c,v 1.1 2001/09/16 00:11:42 eeh Exp $ */
/*
@@ -127,7 +127,6 @@ gem_attach_pci(parent, self, aux)
#endif
const char *intrstr;
int type;
- char enaddr[ETHER_ADDR_LEN];
if (pa->pa_memt) {
type = PCI_MAPREG_TYPE_MEM;
@@ -152,18 +151,28 @@ gem_attach_pci(parent, self, aux)
sc->sc_bustag = gsc->gsc_memt;
sc->sc_h = gsc->gsc_memh;
+#if 0
+/* SBUS compatible stuff? */
+ sc->sc_seb = gsc->gsc_memh;
+ sc->sc_etx = gsc->gsc_memh + 0x2000;
+ sc->sc_erx = gsc->gsc_memh + 0x4000;
+ sc->sc_mac = gsc->gsc_memh + 0x6000;
+ sc->sc_mif = gsc->gsc_memh + 0x7000;
+#endif
#ifdef __sparc__
- myetheraddr(enaddr);
+ myetheraddr(sc->sc_enaddr);
#endif
#ifdef __powerpc__
- pci_ether_hw_addr(pa->pa_pc, enaddr);
+ pci_ether_hw_addr(pa->pa_pc, sc->sc_enaddr);
#endif
+ sc->sc_burst = 16; /* XXX */
+
printf("\n");
/*
* call the main configure
*/
- gem_attach(sc, enaddr);
+ gem_config(sc);
if (pci_intr_map(pa, &intrhandle) != 0) {
printf("%s: couldn't map interrupt\n",