diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-04-21 22:33:19 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-04-21 22:33:19 +0000 |
| commit | 67d88b0a9910a68bb666b448d2dac29cb4d3d8c2 (patch) | |
| tree | 967b89f6e07398a22bd8c76d30179b648776542d /sys/arch/amiga/dev/if_le_zbus.c | |
| parent | ba95d3c1d69cdb251d15a12ebf70f50b0ea2019b (diff) | |
partial sync with netbsd 960418, more to come
Diffstat (limited to 'sys/arch/amiga/dev/if_le_zbus.c')
| -rw-r--r-- | sys/arch/amiga/dev/if_le_zbus.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/sys/arch/amiga/dev/if_le_zbus.c b/sys/arch/amiga/dev/if_le_zbus.c index 4979dd60ddd..75a0c5b694a 100644 --- a/sys/arch/amiga/dev/if_le_zbus.c +++ b/sys/arch/amiga/dev/if_le_zbus.c @@ -1,4 +1,5 @@ -/* $NetBSD: if_le.c,v 1.16 1995/12/27 07:09:37 chopps Exp $ */ +/* $OpenBSD: if_le_zbus.c,v 1.3 1996/04/21 22:15:28 deraadt Exp $ */ +/* $NetBSD: if_le.c,v 1.17 1996/03/17 01:17:35 thorpej Exp $ */ /*- * Copyright (c) 1995 Charles M. Hannum. All rights reserved. @@ -69,15 +70,19 @@ /* offsets for: ID, REGS, MEM */ int lestd[] = { 0, 0x4000, 0x8000 }; -#define LE_SOFTC(unit) lecd.cd_devs[unit] +#define LE_SOFTC(unit) le_cd.cd_devs[unit] #define LE_DELAY(x) DELAY(x) -int lematch __P((struct device *, void *, void *)); -void leattach __P((struct device *, struct device *, void *)); +int le_zbus_match __P((struct device *, void *, void *)); +void le_zbus_attach __P((struct device *, struct device *, void *)); int leintr __P((void *)); -struct cfdriver lecd = { - NULL, "le", lematch, leattach, DV_IFNET, sizeof(struct le_softc) +struct cfattach le_zbus_ca = { + sizeof(struct le_softc), le_zbus_match, le_zbus_attach +}; + +struct cfdriver le_cd = { + NULL, "le", DV_IFNET }; integrate void @@ -105,7 +110,7 @@ lerdcsr(sc, port) } int -lematch(parent, match, aux) +le_zbus_match(parent, match, aux) struct device *parent; void *match, *aux; { @@ -123,7 +128,7 @@ lematch(parent, match, aux) } void -leattach(parent, self, aux) +le_zbus_attach(parent, self, aux) struct device *parent, *self; void *aux; { @@ -177,7 +182,7 @@ leattach(parent, self, aux) sc->sc_arpcom.ac_enaddr[4] = (ser >> 8) & 0xff; sc->sc_arpcom.ac_enaddr[5] = (ser ) & 0xff; - sc->sc_arpcom.ac_if.if_name = lecd.cd_name; + sc->sc_arpcom.ac_if.if_name = le_cd.cd_name; leconfig(sc); sc->sc_isr.isr_intr = leintr; |