Changeset 278bc93 in rtems-libbsd for rtemsbsd/sys

Timestamp:

03/16/15 20:39:14 (9 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, 5-freebsd-12, 6-freebsd-12, freebsd-9.3, master

Children:

4dab3a0

Parents:

a0828f9

git-author:

Sebastian Huber <sebastian.huber@…> (03/16/15 20:39:14)

git-committer:

Sebastian Huber <sebastian.huber@…> (05/15/15 13:40:55)

Message:

usb: Import USB support from libusb

Location:

rtemsbsd/sys/dev/usb

Files:

• controller/ehci_mpc83xx.c (modified) (4 diffs)
• controller/ohci_lpc.c (added)
• controller/ohci_lpc24xx.c (deleted)
• controller/ohci_lpc32xx.c (deleted)
• controller/usb_otg_transceiver.c (added)
• controller/usb_otg_transceiver_dump.c (added)
• usb_otg_transceiver.h (added)

rtemsbsd/sys/dev/usb/controller/ehci_mpc83xx.c

@@ -88 +88 @@
 static device_attach_t ehci_mpc83xx_attach;
 static device_detach_t ehci_mpc83xx_detach;
+static device_suspend_t ehci_mpc83xx_suspend;
+static device_resume_t ehci_mpc83xx_resume;
+
+static int
+ehci_mpc83xx_suspend(device_t self)
+{
+        ehci_softc_t *e = device_get_softc(self);
+        int eno = bus_generic_suspend(self);
+
+        if (eno != 0) {
+                return (eno);
+        }
+
+        ehci_suspend(e);
+
+        return (0);
+}
+
+static int
+ehci_mpc83xx_resume(device_t self)
+{
+        ehci_softc_t *e = device_get_softc(self);
+
+        ehci_resume(e);
+
+        bus_generic_resume(self);
+
+        return (0);
+}
+
 
 static int
@@ -117 +147 @@
         volatile uint32_t *control = &mpc83xx.usb_dr.control;
 
+#ifdef BSP_USB_EHCI_MPC83XX_HAS_ULPI
+        *control = CONTROL_PHY_CLOCK_SEL;
+#else
         *control = CONTROL_PLL_RESET | CONTROL_REFSEL(0x2U);
         *control = CONTROL_UTMI_PHY_EN | CONTROL_REFSEL(0x2U);
+#endif
 
         while ((*control & CONTROL_PHY_CLK_VALID) == 0) {
@@ -147 +181 @@
         mpc83xx.usb_dr.snoop1 = SNOOP_ADDR(0x0) | SNOOP_SIZE_2GB;
         mpc83xx.usb_dr.snoop2 = SNOOP_ADDR(0x80000) | SNOOP_SIZE_2GB;
+#ifdef BSP_USB_EHCI_MPC83XX_HAS_ULPI
+        mpc83xx.usb_dr.control = CONTROL_PHY_CLOCK_SEL | CONTROL_USB_EN;
+        mpc83xx.usb_dr.portsc1 = htole32(PORTSC_PTS_ULPI);
+#else
         mpc83xx.usb_dr.control = CONTROL_UTMI_PHY_EN | CONTROL_REFSEL(0x2) | CONTROL_USB_EN;
         mpc83xx.usb_dr.portsc1 = htole32(PORTSC_PTS_UTMI);
+#endif
 #if 0
         mpc83xx.usb_dr.pri_ctrl = 0xcU;
@@ -251 +290 @@
         DEVMETHOD(device_attach, ehci_mpc83xx_attach),
         DEVMETHOD(device_detach, ehci_mpc83xx_detach),
-        DEVMETHOD(device_suspend,bus_generic_suspend),
-        DEVMETHOD(device_resume, bus_generic_resume),
+        DEVMETHOD(device_suspend, ehci_mpc83xx_suspend),
+        DEVMETHOD(device_resume, ehci_mpc83xx_resume),
         DEVMETHOD(device_shutdown, bus_generic_shutdown),