Changeset d32d51d in mainline

Timestamp:

2017-08-20T12:01:35Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

07c08ea

Parents:

5ff9e1d

Message:

Updated RH implementation with virtual hub emulation structure.

Location:

uspace/drv/bus/usb/xhci

Files:

• Makefile (modified) (2 diffs)
• endpoint.c (modified) (1 diff)
• hc.c (modified) (4 diffs)
• hc.h (modified) (2 diffs)
• rh.c (modified) (2 diffs)
• rh.h (modified) (1 diff)

uspace/drv/bus/usb/xhci/Makefile

@@ -31 +31 @@
 LIBS = \
         $(LIBUSBHOST_PREFIX)/libusbhost.a \
+        $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
         $(LIBUSB_PREFIX)/libusb.a \
         $(LIBDRV_PREFIX)/libdrv.a
@@ -36 +37 @@
 EXTRA_CFLAGS += \
         -I$(LIBUSB_PREFIX)/include \
+        -I$(LIBUSBDEV_PREFIX)/include \
         -I$(LIBUSBHOST_PREFIX)/include \
+        -I$(LIBUSBVIRT_PREFIX)/include \
         -I$(LIBDRV_PREFIX)/include
 

uspace/drv/bus/usb/xhci/endpoint.c

@@ -55 +55 @@
 
         usb_log_debug("Endpoint %d:%d initialized.", ep->address, ep->endpoint);
+
         return EOK;
 }

uspace/drv/bus/usb/xhci/hc.c

@@ -220 +220 @@
                 goto err_event_ring;
 
-        return EOK;
-
+        if ((err = xhci_rh_init(&hc->rh)))
+                goto err_rh;
+
+        return EOK;
+
+err_rh:
+        xhci_rh_fini(&hc->rh);
 err_event_ring:
         xhci_event_ring_fini(&hc->event_ring);
@@ -362 +367 @@
         assert(batch);
 
+        /* Check for root hub communication */
+        /* FIXME: Zero is a very crude workaround. Detect RH better. */
+        if (batch->ep->address == 0) {
+                usb_log_debug("XHCI root hub request.\n");
+                return xhci_rh_schedule(&hc->rh, batch);
+        }
+
         usb_log_debug2("EP(%d:%d) started %s transfer of size %lu.",
                 batch->ep->address, batch->ep->endpoint,
@@ -386 +398 @@
         }
 
-        return ENAK;
+        return EOK;
 }
 
@@ -515 +527 @@
         hc_dcbaa_fini(hc);
         xhci_fini_commands(hc);
+        xhci_rh_fini(&hc->rh);
         pio_disable(hc->base, RNGSZ(hc->mmio_range));
         usb_log_info("HC(%p): Finalized.", hc);

uspace/drv/bus/usb/xhci/hc.h

@@ -42 +42 @@
 #include "scratchpad.h"
 #include "trb_ring.h"
+#include "rh.h"
 
 typedef struct xhci_virt_device_ctx {
@@ -75 +76 @@
         xhci_scratchpad_t *scratchpad;
 
+  /* Root hub emulation */
+        xhci_rh_t rh;
+
         /* Cached capabilities */
         xhci_port_speed_t speeds [16];

uspace/drv/bus/usb/xhci/rh.c

@@ -44 +44 @@
 #include "rh.h"
 
+int xhci_rh_init(xhci_rh_t *rh)
+{
+        /* TODO: Implement me! */
+        return EOK;
+}
+
 // TODO: Check device deallocation, we free device_ctx in hc.c, not
 //       sure about the other structs.
@@ -221 +227 @@
 }
 
+int xhci_rh_schedule(xhci_rh_t *rh, usb_transfer_batch_t *batch)
+{
+        /* TODO: Implement me! */
+        return EOK;
+}
+
+int xhci_rh_fini(xhci_rh_t *rh)
+{
+        /* TODO: Implement me! */
+        return EOK;
+}
+
 
 /**

uspace/drv/bus/usb/xhci/rh.h

@@ -37 +37 @@
 #define XHCI_RH_H
 
+#include <usb/host/usb_transfer_batch.h>
+#include <usbvirt/virthub_base.h>
+
+/* XHCI root hub instance */
+typedef struct {
+        /** Virtual hub instance */
+        virthub_base_t base;
+} xhci_rh_t;
+
+int xhci_rh_init(xhci_rh_t *);
+int xhci_rh_fini(xhci_rh_t *);
 int xhci_handle_port_status_change_event(xhci_hc_t *, xhci_trb_t *);
 int xhci_get_hub_port(xhci_trb_t *);
 int xhci_reset_hub_port(xhci_hc_t *, uint8_t);
+int xhci_rh_schedule(xhci_rh_t *, usb_transfer_batch_t *);
 
 #endif