 @@ -1,14 +1,14 @@
-/* $Id: if_ae.c,v 1.11 2008/01/23 05:24:28 dyoung Exp $ */
+/* $Id: if_ae.c,v 1.12 2008/03/11 23:19:03 dyoung Exp $ */
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * This code was written by Garrett D'Amore for the Champaign-Urbana
  * Community Wireless Network Project.
+ *
  * 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.
 @@ -95,27 +95,27 @@
+ *
  * 1) Find out about BUS_MODE_ALIGN16B.  This chip can apparently align
  *    inbound packets on a half-word boundary, which would make life easier
  *    for TCP/IP.  (Aligning IP headers on a word.)
+ *
  * 2) There is stuff in original tulip to shut down the device when reacting
  *    to a a change in link status.  Is that needed.
+ *
  * 3) Test with variety of 10/100 HDX/FDX scenarios.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.11 2008/01/23 05:24:28 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.12 2008/03/11 23:19:03 dyoung Exp $");
 #include "bpfilter.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.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>
 @@ -146,103 +146,103 @@ __KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.
 static const struct {
 	u_int32_t txth_opmode;		/* OPMODE bits */
 	const char *txth_name;		/* name of mode */
 } ae_txthresh[] = {
 	{ OPMODE_TR_32,		"32 words" },
 	{ OPMODE_TR_64,		"64 words" },
 	{ OPMODE_TR_128,	"128 words" },
 	{ OPMODE_TR_256,	"256 words" },
 	{ OPMODE_SF,		"store and forward mode" },
 	{ 0,			NULL },
 };
-static int 	ae_match(struct device *, struct cfdata *, void *);
+static int 	ae_match(device_t, struct cfdata *, void *);
-static void	ae_attach(struct device *, struct device *, void *);
+static void	ae_attach(device_t, device_t, void *);
-static int	ae_detach(struct device *, int);
+static int	ae_detach(device_t, int);
-static int	ae_activate(struct device *, enum devact);
+static int	ae_activate(device_t, enum devact);
 static void	ae_reset(struct ae_softc *);
 static void	ae_idle(struct ae_softc *, u_int32_t);
 static void	ae_start(struct ifnet *);
 static void	ae_watchdog(struct ifnet *);
 static int	ae_ioctl(struct ifnet *, u_long, void *);
 static int	ae_init(struct ifnet *);
 static void	ae_stop(struct ifnet *, int);
 static void	ae_shutdown(void *);
 static void	ae_rxdrain(struct ae_softc *);
 static int	ae_add_rxbuf(struct ae_softc *, int);
 static int	ae_enable(struct ae_softc *);
 static void	ae_disable(struct ae_softc *);
 static void	ae_power(int, void *);
 static void	ae_filter_setup(struct ae_softc *);
 static int	ae_intr(void *);
 static void	ae_rxintr(struct ae_softc *);
 static void	ae_txintr(struct ae_softc *);
 static void	ae_mii_tick(void *);
-static void	ae_mii_statchg(struct device *);
+static void	ae_mii_statchg(device_t);
-static int	ae_mii_readreg(struct device *, int, int);
+static int	ae_mii_readreg(device_t, int, int);
-static void	ae_mii_writereg(struct device *, int, int, int);
+static void	ae_mii_writereg(device_t, int, int, int);
 #ifdef AE_DEBUG
 #define	DPRINTF(sc, x)	if ((sc)->sc_ethercom.ec_if.if_flags & IFF_DEBUG) \
 				printf x
 #else
 #define	DPRINTF(sc, x)	/* nothing */
 #endif
 #ifdef AE_STATS
 static void	ae_print_stats(struct ae_softc *);
 #endif
 CFATTACH_DECL(ae, sizeof(struct ae_softc),
     ae_match, ae_attach, ae_detach, ae_activate);
 /*
  * ae_match:
+ *
  *	Check for a device match.
  */
 int
-ae_match(struct device *parent, struct cfdata *cf, void *aux)
+ae_match(device_t parent, struct cfdata *cf, void *aux)
+{
 	struct arbus_attach_args *aa = aux;
 	if (strcmp(aa->aa_name, cf->cf_name) == 0)
 		return 1;
 	return 0;
+}
 /*
  * ae_attach:
+ *
  *	Attach an ae interface to the system.
  */
 void
-ae_attach(struct device *parent, struct device *self, void *aux)
+ae_attach(device_t parent, device_t self, void *aux)
+{
 	const uint8_t *enaddr;
 	prop_data_t ea;
-	struct ae_softc *sc = (void *)self;
+	struct ae_softc *sc = device_private(self);
 	struct arbus_attach_args *aa = aux;
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	int i, error;
 	callout_init(&sc->sc_tick_callout, 0);
 	printf(": Atheros AR531X 10/100 Ethernet\n");
 	/*
 	 * Try to get MAC address.
 	 */
 	ea = prop_dictionary_get(device_properties(&sc->sc_dev), "mac-addr");
 	if (ea == NULL) {
 @@ -445,56 +445,56 @@ ae_attach(struct device *parent, struct
 	bus_dmamem_free(sc->sc_dmat, &sc->sc_cdseg, sc->sc_cdnseg);
  fail_1:
 	bus_space_unmap(sc->sc_st, sc->sc_sh, sc->sc_size);
  fail_0:
 	return;
+}
 /*
  * ae_activate:
+ *
  *	Handle device activation/deactivation requests.
  */
 int
-ae_activate(struct device *self, enum devact act)
+ae_activate(device_t self, enum devact act)
+{
-	struct ae_softc *sc = (void *) self;
+	struct ae_softc *sc = device_private(self);
 	int s, error = 0;
 	s = splnet();
 	switch (act) {
 	case DVACT_ACTIVATE:
 		error = EOPNOTSUPP;
 		break;
 	case DVACT_DEACTIVATE:
 		mii_activate(&sc->sc_mii, act, MII_PHY_ANY, MII_OFFSET_ANY);
 		if_deactivate(&sc->sc_ethercom.ec_if);
 		break;
+	}
 	splx(s);
 	return (error);
+}
 /*
  * ae_detach:
+ *
  *	Detach a device interface.
  */
 int
-ae_detach(struct device *self, int flags)
+ae_detach(device_t self, int flags)
+{
-	struct ae_softc *sc = (void *)self;
+	struct ae_softc *sc = device_private(self);
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	struct ae_rxsoft *rxs;
 	struct ae_txsoft *txs;
 	int i;
 	/*
 	 * Succeed now if there isn't any work to do.
 	 */
 	if ((sc->sc_flags & AE_ATTACHED) == 0)
 		return (0);
 	/* Unhook our tick handler. */
 	if (sc->sc_tick)
 @@ -1862,29 +1862,29 @@ ae_mii_tick(void *arg)
 	s = splnet();
 	mii_tick(&sc->sc_mii);
 	splx(s);
 	callout_reset(&sc->sc_tick_callout, hz, sc->sc_tick, sc);
+}
 /*
  * ae_mii_statchg:	[mii interface function]
+ *
  *	Callback from PHY when media changes.
  */
 static void
-ae_mii_statchg(struct device *self)
+ae_mii_statchg(device_t self)
+{
-	struct ae_softc *sc = (struct ae_softc *)self;
+	struct ae_softc *sc = device_private(self);
 	uint32_t	macctl, flowc;
 	//opmode = AE_READ(sc, CSR_OPMODE);
 	macctl = AE_READ(sc, CSR_MACCTL);
 	/* XXX: do we need to do this? */
 	/* Idle the transmit and receive processes. */
 	//ae_idle(sc, OPMODE_ST|OPMODE_SR);
 	if (sc->sc_mii.mii_media_active & IFM_FDX) {
 		flowc = FLOWC_FCE;
 		macctl &= ~MACCTL_DRO;
 		macctl |= MACCTL_FDX;
 @@ -1898,52 +1898,52 @@ ae_mii_statchg(struct device *self)
 	AE_WRITE(sc, CSR_MACCTL, macctl);
 	/* restore operational mode */
 	//AE_WRITE(sc, CSR_OPMODE, opmode);
 	AE_BARRIER(sc);
+}
 /*
  * ae_mii_readreg:
+ *
  *	Read a PHY register.
  */
 static int
-ae_mii_readreg(struct device *self, int phy, int reg)
+ae_mii_readreg(device_t self, int phy, int reg)
+{
-	struct ae_softc	*sc = (struct ae_softc *)self;
+	struct ae_softc	*sc = device_private(self);
 	uint32_t	addr;
 	int		i;
 	addr = (phy << MIIADDR_PHY_SHIFT) | (reg << MIIADDR_REG_SHIFT);
 	AE_WRITE(sc, CSR_MIIADDR, addr);
 	AE_BARRIER(sc);
 	for (i = 0; i < 100000000; i++) {
 		if ((AE_READ(sc, CSR_MIIADDR) & MIIADDR_BUSY) == 0)
 			break;
+	}
 	return (AE_READ(sc, CSR_MIIDATA) & 0xffff);
+}
 /*
  * ae_mii_writereg:
+ *
  *	Write a PHY register.
  */
 static void
-ae_mii_writereg(struct device *self, int phy, int reg, int val)
+ae_mii_writereg(device_t self, int phy, int reg, int val)
+{
-	struct ae_softc *sc = (struct ae_softc *)self;
+	struct ae_softc *sc = device_private(self);
 	uint32_t	addr;
 	int		i;
 	/* write the data register */
 	AE_WRITE(sc, CSR_MIIDATA, val);
 	/* write the address to latch it in */
 	addr = (phy << MIIADDR_PHY_SHIFT) | (reg << MIIADDR_REG_SHIFT) |
 	    MIIADDR_WRITE;
 	AE_WRITE(sc, CSR_MIIADDR, addr);
 	AE_BARRIER(sc);
 	for (i = 0; i < 100000000; i++) {