PERFORCE change 158981 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=158981

Change 158981 by hselasky at hselasky_laptop001 on 2009/03/10 08:38:54

	
	USB controller: Add some missing ATMEGA DCI parts.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#2 (text+ko) ====

@@ -27,8 +27,9 @@
  */
 
 /*
- * This file contains the driver for the ATMEGA series USB Device
- * Controller
+ * This file contains the driver for the ATMEGA series USB OTG
+ * Controller. This driver currently only supports the DCI mode of the
+ * USB hardware.
  */
 
 /*
@@ -1277,6 +1278,11 @@
 
 	atmegadci_clocks_off(sc);
 
+	/* read initial VBUS state */
+
+	n = ATMEGA_READ_1(sc, ATMEGA_USBSTA);
+	atmegadci_vbus_interrupt(sc, n & ATMEGA_USBSTA_VBUS);
+
 	USB_BUS_UNLOCK(&sc->sc_bus);
 
 	/* catch any lost interrupts */

==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 (text+ko) ====

@@ -25,3 +25,191 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+
+#include <dev/usb/usb_defs.h>
+#include <dev/usb/usb.h>
+
+#include <dev/usb/usb_core.h>
+#include <dev/usb/usb_busdma.h>
+#include <dev/usb/usb_process.h>
+#include <dev/usb/usb_sw_transfer.h>
+#include <dev/usb/usb_util.h>
+
+#include <dev/usb/usb_controller.h>
+#include <dev/usb/usb_bus.h>
+#include <dev/usb/controller/atmegadci.h>
+
+#include <sys/rman.h>
+
+static device_probe_t atmegadci_probe;
+static device_attach_t atmegadci_attach;
+static device_detach_t atmegadci_detach;
+static device_shutdown_t atmegadci_shutdown;
+
+struct atmegadci_super_softc {
+	struct atmegadci_softc sc_otg;	/* must be first */
+};
+
+static void
+atmegadci_clocks_on(struct usb2_bus *bus)
+{
+	/* TODO */
+}
+
+static void
+atmegadci_clocks_off(struct usb2_bus *bus)
+{
+	/* TODO */
+}
+
+static int
+atmegadci_probe(device_t dev)
+{
+	device_set_desc(dev, "ATMEL OTG integrated USB controller");
+	return (0);
+}
+
+static int
+atmegadci_attach(device_t dev)
+{
+	struct atmegadci_super_softc *sc = device_get_softc(dev);
+	int err;
+	int rid;
+
+	/* setup MUSB OTG USB controller interface softc */
+	sc->sc_otg.sc_clocks_on = &atmegadci_clocks_on;
+	sc->sc_otg.sc_clocks_off = &atmegadci_clocks_off;
+
+	/* initialise some bus fields */
+	sc->sc_otg.sc_bus.parent = dev;
+	sc->sc_otg.sc_bus.devices = sc->sc_otg.sc_devices;
+	sc->sc_otg.sc_bus.devices_max = ATMEGA_MAX_DEVICES;
+
+	/* get all DMA memory */
+	if (usb2_bus_mem_alloc_all(&sc->sc_otg.sc_bus,
+	    USB_GET_DMA_TAG(dev), NULL)) {
+		return (ENOMEM);
+	}
+	rid = 0;
+	sc->sc_otg.sc_io_res =
+	    bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
+
+	if (!(sc->sc_otg.sc_io_res)) {
+		err = ENOMEM;
+		goto error;
+	}
+	sc->sc_otg.sc_io_tag = rman_get_bustag(sc->sc_otg.sc_io_res);
+	sc->sc_otg.sc_io_hdl = rman_get_bushandle(sc->sc_otg.sc_io_res);
+
+	rid = 0;
+	sc->sc_otg.sc_irq_res =
+	    bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE);
+	if (!(sc->sc_otg.sc_irq_res)) {
+		goto error;
+	}
+	sc->sc_otg.sc_bus.bdev = device_add_child(dev, "usbus", -1);
+	if (!(sc->sc_otg.sc_bus.bdev)) {
+		goto error;
+	}
+	device_set_ivars(sc->sc_otg.sc_bus.bdev, &sc->sc_otg.sc_bus);
+
+	err = bus_setup_intr(dev, sc->sc_otg.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
+	    NULL, (void *)atmegadci_interrupt, sc, &sc->sc_otg.sc_intr_hdl);
+	if (err) {
+		sc->sc_otg.sc_intr_hdl = NULL;
+		goto error;
+	}
+	err = atmegadci_init(&sc->sc_otg);
+	if (!err) {
+		err = device_probe_and_attach(sc->sc_otg.sc_bus.bdev);
+	}
+	if (err) {
+		goto error;
+	}
+	return (0);
+
+error:
+	atmegadci_detach(dev);
+	return (ENXIO);
+}
+
+static int
+atmegadci_detach(device_t dev)
+{
+	struct atmegadci_super_softc *sc = device_get_softc(dev);
+	device_t bdev;
+	int err;
+
+	if (sc->sc_otg.sc_bus.bdev) {
+		bdev = sc->sc_otg.sc_bus.bdev;
+		device_detach(bdev);
+		device_delete_child(dev, bdev);
+	}
+	/* during module unload there are lots of children leftover */
+	device_delete_all_children(dev);
+
+	if (sc->sc_otg.sc_irq_res && sc->sc_otg.sc_intr_hdl) {
+		/*
+		 * only call atmegadci_uninit() after atmegadci_init()
+		 */
+		atmegadci_uninit(&sc->sc_otg);
+
+		err = bus_teardown_intr(dev, sc->sc_otg.sc_irq_res,
+		    sc->sc_otg.sc_intr_hdl);
+		sc->sc_otg.sc_intr_hdl = NULL;
+	}
+	/* free IRQ channel, if any */
+	if (sc->sc_otg.sc_irq_res) {
+		bus_release_resource(dev, SYS_RES_IRQ, 0,
+		    sc->sc_otg.sc_irq_res);
+		sc->sc_otg.sc_irq_res = NULL;
+	}
+	/* free memory resource, if any */
+	if (sc->sc_otg.sc_io_res) {
+		bus_release_resource(dev, SYS_RES_MEMORY, 0,
+		    sc->sc_otg.sc_io_res);
+		sc->sc_otg.sc_io_res = NULL;
+	}
+	usb2_bus_mem_free_all(&sc->sc_otg.sc_bus, NULL);
+
+	return (0);
+}
+
+static int
+atmegadci_shutdown(device_t dev)
+{
+	struct atmegadci_super_softc *sc = device_get_softc(dev);
+	int err;
+
+	err = bus_generic_shutdown(dev);
+	if (err)
+		return (err);
+
+	atmegadci_uninit(&sc->sc_otg);
+
+	return (0);
+}
+
+static device_method_t atmegadci_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe, atmegadci_probe),
+	DEVMETHOD(device_attach, atmegadci_attach),
+	DEVMETHOD(device_detach, atmegadci_detach),
+	DEVMETHOD(device_shutdown, atmegadci_shutdown),
+
+	/* Bus interface */
+	DEVMETHOD(bus_print_child, bus_generic_print_child),
+
+	{0, 0}
+};
+
+static driver_t atmegadci_driver = {
+	"atmegadci",
+	atmegadci_methods,
+	sizeof(struct atmegadci_super_softc),
+};
+
+static devclass_t atmegadci_devclass;
+
+DRIVER_MODULE(atmegadci, atmelarm, atmegadci_driver, atmegadci_devclass, 0, 0);
+MODULE_DEPEND(atmegadci, usb, 1, 1, 1);