[Zrouter-src-freebsd] [rt2860-in-ral] push by r... at ddteam.net - Fix nexus attachment. on 2012-03-13 22:11 GMT

Tue Mar 13 22:12:27 UTC 2012

Revision: 211df6d581b6
Author:   ray at terran.dlink.ua
Date:     Tue Mar 13 15:05:53 2012
Log:      Fix nexus attachment.
http://code.google.com/p/rt2860-in-ral/source/detail?r=211df6d581b6

Modified:
  /sys/dev/ral/if_ral_nexus.c

=======================================

--- /sys/dev/ral/if_ral_nexus.c	Tue Mar 13 13:43:32 2012
+++ /sys/dev/ral/if_ral_nexus.c	Tue Mar 13 15:05:53 2012
@@ -1,7 +1,8 @@
+/*	$FreeBSD$	*/

  /*-
- * Copyright (c) 2009-2010 Alexander Egorenkov <egorenar at gmail.com>
- * Copyright (c) 2009 Damien Bergamini <damien.bergamini at free.fr>
+ * Copyright (c) 2005, 2006
+ *	Damien Bergamini <damien.bergamini at free.fr>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
@@ -16,77 +17,226 @@
   * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */

-#include <dev/ral/rt2860_softc.h>
-#include <dev/ral/rt2860_reg.h>
-#include <dev/ral/rt2860_eeprom.h>
-#include <dev/ral/rt2860_txwi.h>
-#include <dev/ral/rt2860_rxwi.h>
-#include <dev/ral/rt2860_io.h>
-#include <dev/ral/rt2860_read_eeprom.h>
-#include <dev/ral/rt2860_led.h>
-#include <dev/ral/rt2860_rf.h>
-#include <dev/ral/rt2860_debug.h>
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

  /*
- * Static function prototypes
+ * Memory attachment for the Ralink RT2xxx wireless driver.
   */

-static int rt2860_nexus_probe(device_t dev);
-
-static int rt2860_nexus_attach(device_t dev);
-
-int rt2860_attach(device_t dev);
-
-int rt2860_detach(device_t dev);
-
-int rt2860_shutdown(device_t dev);
-
-int rt2860_suspend(device_t dev);
-
-int rt2860_resume(device_t dev);
-
-/*
- * rt2860_nexus_probe
- */
-static int rt2860_nexus_probe(device_t dev)
-{
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/sockio.h>
+#include <sys/mbuf.h>
+#include <sys/kernel.h>
+#include <sys/socket.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/bus.h>
+#include <sys/endian.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <sys/rman.h>
+
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/ethernet.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/if_types.h>
+
+#include <net80211/ieee80211_var.h>
+#include <net80211/ieee80211_radiotap.h>
+#include <net80211/ieee80211_amrr.h>
+
+#include <dev/ral/rt2560var.h>
+#include <dev/ral/rt2661var.h>
+#include <dev/ral/rt2860var.h>
+
+MODULE_DEPEND(ral, firmware, 1, 1, 1); /* XXX ??? */
+MODULE_DEPEND(ral, wlan, 1, 1, 1);
+MODULE_DEPEND(ral, wlan_amrr, 1, 1, 1);
+
+static struct ral_opns {
+	int	(*attach)(device_t, int);
+	int	(*detach)(void *);
+	void	(*shutdown)(void *);
+	void	(*suspend)(void *);
+	void	(*resume)(void *);
+	void	(*intr)(void *);
+}  ral_rt2560_opns = {
+	rt2560_attach,
+	rt2560_detach,
+	rt2560_stop,
+	rt2560_stop,
+	rt2560_resume,
+	rt2560_intr
+}, ral_rt2661_opns = {
+	rt2661_attach,
+	rt2661_detach,
+	rt2661_shutdown,
+	rt2661_suspend,
+	rt2661_resume,
+	rt2661_intr
+}, ral_rt2860_opns = {
+	rt2860_attach,
+	rt2860_detach,
+	rt2860_shutdown,
+	rt2860_suspend,
+	rt2860_resume,
+	rt2860_intr
+};
+
+struct ral_nexus_softc {
+	union {
+		struct rt2560_softc sc_rt2560;
+		struct rt2661_softc sc_rt2661;
+		struct rt2860_softc sc_rt2860;
+	} u;
+
+	struct ral_opns		*sc_opns;
+	int			irq_rid;
+	int			mem_rid;
+	struct resource		*irq;
+	struct resource		*mem;
+	void			*sc_ih;
+};
+
+static int ral_nexus_probe(device_t);
+static int ral_nexus_attach(device_t);
+static int ral_nexus_detach(device_t);
+static int ral_nexus_shutdown(device_t);
+static int ral_nexus_suspend(device_t);
+static int ral_nexus_resume(device_t);
+
+static device_method_t ral_nexus_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		ral_nexus_probe),
+	DEVMETHOD(device_attach,	ral_nexus_attach),
+	DEVMETHOD(device_detach,	ral_nexus_detach),
+	DEVMETHOD(device_shutdown,	ral_nexus_shutdown),
+	DEVMETHOD(device_suspend,	ral_nexus_suspend),
+	DEVMETHOD(device_resume,	ral_nexus_resume),
+
+	{ 0, 0 }
+};
+
+static driver_t ral_nexus_driver = {
+	"ral",
+	ral_nexus_methods,
+	sizeof (struct ral_nexus_softc)
+};
+
+static devclass_t ral_devclass;
+
+DRIVER_MODULE(ral, nexus, ral_nexus_driver, ral_devclass, 0, 0);
+
+static int
+ral_nexus_probe(device_t dev)
+{
+
  	device_set_desc(dev, "Ralink RT2860 802.11n MAC/BPP");
+	return (0);
+}
+
+static int
+ral_nexus_attach(device_t dev)
+{
+	struct ral_nexus_softc *psc = device_get_softc(dev);
+	struct rt2560_softc *sc = &psc->u.sc_rt2560;
+	int error;
+
+	/* Default to rt2860 driver */
+	psc->sc_opns = &ral_rt2860_opns;
+
+	psc->mem_rid = 0;
+	psc->mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &psc->mem_rid,
+	    RF_ACTIVE);
+	if (psc->mem == NULL) {
+		device_printf(dev, "could not allocate memory resource\n");
+		return ENXIO;
+	}
+
+	sc->sc_st = rman_get_bustag(psc->mem);
+	sc->sc_sh = rman_get_bushandle(psc->mem);
+	sc->sc_invalid = 1;
+
+	psc->irq_rid = 0;
+	psc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &psc->irq_rid,
+	    RF_ACTIVE | RF_SHAREABLE);
+	if (psc->irq == NULL) {
+		device_printf(dev, "could not allocate interrupt resource\n");
+		return ENXIO;
+	}
+
+	/* Emulate rt2860  */
+	error = (*psc->sc_opns->attach)(dev, 0x0601);
+	if (error != 0)
+		return error;
+
+	/*
+	 * Hook our interrupt after all initialization is complete.
+	 */
+	error = bus_setup_intr(dev, psc->irq, INTR_TYPE_NET | INTR_MPSAFE,
+	    NULL, psc->sc_opns->intr, psc, &psc->sc_ih);
+	if (error != 0) {
+		device_printf(dev, "could not set up interrupt\n");
+		return error;
+	}
+	sc->sc_invalid = 0;
+
  	return 0;
  }

-/*
- * rt2860_nexus_attach
- */
-static int rt2860_nexus_attach(device_t dev)
-{
-	struct rt2860_softc *sc;
-
-	sc = device_get_softc(dev);
-	sc->mem_rid = 0;
-
-	return (rt2860_attach(dev));
+static int
+ral_nexus_detach(device_t dev)
+{
+	struct ral_nexus_softc *psc = device_get_softc(dev);
+	struct rt2560_softc *sc = &psc->u.sc_rt2560;
+
+	/* check if device was removed */
+	sc->sc_invalid = !bus_child_present(dev);
+
+	(*psc->sc_opns->detach)(psc);
+
+	bus_generic_detach(dev);
+	bus_teardown_intr(dev, psc->irq, psc->sc_ih);
+	bus_release_resource(dev, SYS_RES_IRQ, psc->irq_rid, psc->irq);
+
+	bus_release_resource(dev, SYS_RES_MEMORY, psc->mem_rid, psc->mem);
+
+	return 0;
  }

-static device_method_t rt2860_nexus_dev_methods[] =
-{
-	DEVMETHOD(device_probe, rt2860_nexus_probe),
-	DEVMETHOD(device_attach, rt2860_nexus_attach),
-	DEVMETHOD(device_detach, rt2860_detach),
-	DEVMETHOD(device_shutdown, rt2860_shutdown),
-	DEVMETHOD(device_suspend, rt2860_suspend),
-	DEVMETHOD(device_resume, rt2860_resume),
-	{ 0, 0 }
-};
-
-static driver_t rt2860_nexus_driver =
-{
-	"rt2860",
-	rt2860_nexus_dev_methods,
-	sizeof(struct rt2860_softc)
-};
-
-static devclass_t rt2860_nexus_dev_class;
-
-DRIVER_MODULE(rt2860, nexus, rt2860_nexus_driver, rt2860_nexus_dev_class,  
0, 0);
-MODULE_DEPEND(rt2860, wlan, 1, 1, 1);
-
+static int
+ral_nexus_shutdown(device_t dev)
+{
+	struct ral_nexus_softc *psc = device_get_softc(dev);
+
+	(*psc->sc_opns->shutdown)(psc);
+
+	return 0;
+}
+
+static int
+ral_nexus_suspend(device_t dev)
+{
+	struct ral_nexus_softc *psc = device_get_softc(dev);
+
+	(*psc->sc_opns->suspend)(psc);
+
+	return 0;
+}
+
+static int
+ral_nexus_resume(device_t dev)
+{
+	struct ral_nexus_softc *psc = device_get_softc(dev);
+
+	(*psc->sc_opns->resume)(psc);
+
+	return 0;
+}
