Changeset 5cbccd4 in mainline

Timestamp:

2017-06-15T17:26:44Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

48197c1

Parents:

f4eb6c93

Message:

xhci: register structures

Location:

uspace

Files:

• drv/bus/usb/xhci/Makefile (modified) (3 diffs)
• drv/bus/usb/xhci/debug.c (added)
• drv/bus/usb/xhci/debug.h (added)
• drv/bus/usb/xhci/hc.c (added)
• drv/bus/usb/xhci/hc.h (added)
• drv/bus/usb/xhci/hw_struct/context.h (modified) (3 diffs)
• drv/bus/usb/xhci/hw_struct/regs.h (added)
• drv/bus/usb/xhci/main.c (modified) (3 diffs)
• lib/c/include/byteorder.h (modified) (1 diff)
• lib/pcm/src/format.c (modified) (1 diff)
• lib/usbhost/src/ddf_helpers.c (modified) (1 diff)

uspace/drv/bus/usb/xhci/Makefile

@@ -30 +30 @@
 
 LIBS = \
+        $(LIBUSBHOST_PREFIX)/libusbhost.a \
         $(LIBUSB_PREFIX)/libusb.a \
         $(LIBDRV_PREFIX)/libdrv.a
@@ -35 +36 @@
 EXTRA_CFLAGS += \
         -I$(LIBUSB_PREFIX)/include \
+        -I$(LIBUSBHOST_PREFIX)/include \
         -I$(LIBDRV_PREFIX)/include
 
@@ -40 +42 @@
 
 SOURCES = \
+        hc.c \
+        debug.c \
         trb_ring.c \
         main.c

uspace/drv/bus/usb/xhci/hw_struct/context.h

@@ -67 +67 @@
 #define XHCI_EP_TR_DPTR(ctx)            XHCI_DWORD_EXTRACT((ctx).data[2], 63,  4)
 
-} ep_ctx_t;
+} ep_ctx_t __attribute__((packed));
 
 /**
@@ -93 +93 @@
 #define XHCI_SLOT_SLOT_STATE(ctx)       XHCI_DWORD_EXTRACT((ctx).data[3], 31, 27)
 
-} xhci_slot_ctx_t;
+} xhci_slot_ctx_t __attribute__((packed));
 
 /**
@@ -108 +108 @@
 typedef struct xhci_stream_ctx {
         uint64_t data [2];
-} xhci_stream_ctx_t;
+} xhci_stream_ctx_t __attribute__((packed));
 
 #endif

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

@@ -39 +39 @@
 #include <io/logctl.h>
 #include <usb/debug.h>
+#include <usb/host/ddf_helpers.h>
+
+#include "hc.h"
 
 #define NAME "xhci"
 
+static int xhci_driver_init(hcd_t *, const hw_res_list_parsed_t *, bool);
+static void xhci_driver_fini(hcd_t *);
+
+static const ddf_hc_driver_t xhci_ddf_hc_driver = {
+        .hc_speed = USB_SPEED_SUPER,
+        .irq_code_gen = xhci_hc_gen_irq_code,
+        .init = xhci_driver_init,
+        .fini = xhci_driver_fini,
+        .name = "XHCI-PCI",
+        .ops = {
+                .schedule       = xhci_hc_schedule,
+                .irq_hook       = xhci_hc_interrupt,
+                .status_hook    = xhci_hc_status,
+        }
+};
+
+static int xhci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res, bool irq)
+{
+        usb_log_info("Initializing");
+        return ENOTSUP;
+}
+
+static void xhci_driver_fini(hcd_t *hcd)
+{
+        usb_log_info("Finishing");
+        assert(hcd);
+}
 
 /** Initializes a new ddf driver instance of XHCI hcd.
@@ -50 +80 @@
 static int xhci_dev_add(ddf_dev_t *device)
 {
-        usb_log_info("Requested to add device %s", ddf_dev_get_name(device));
-        return ENOTSUP;
+        usb_log_info("Adding device %s", ddf_dev_get_name(device));
+        return hcd_ddf_add_hc(device, &xhci_ddf_hc_driver);
 }
 
@@ -76 +106 @@
 {
         log_init(NAME);
-        logctl_set_log_level(NAME, LVL_DEBUG);
+        logctl_set_log_level(NAME, LVL_DEBUG2);
         return ddf_driver_main(&xhci_driver);
 }

uspace/lib/c/include/byteorder.h

@@ -85 +85 @@
 #define ntohl(n)  uint32_t_be2host((n))
 
+#define uint8_t_be2host(n)  (n)
+#define uint8_t_le2host(n)  (n)
+#define host2uint8_t_be(n)  (n)
+#define host2uint8_t_le(n)  (n)
+
 static inline uint64_t uint64_t_byteorder_swap(uint64_t n)
 {

uspace/lib/pcm/src/format.c

@@ -41 +41 @@
 
 #include "format.h"
-
-#define uint8_t_le2host(x) (x)
-#define host2uint8_t_le(x) (x)
-#define uint8_t_be2host(x) (x)
-#define host2uint8_t_be(x) (x)
 
 #define int8_t_le2host(x) (x)

uspace/lib/usbhost/src/ddf_helpers.c

@@ -854 +854 @@
             [USB_SPEED_HIGH] = { .bw = BANDWIDTH_AVAILABLE_USB11,
                                  .bw_count = bandwidth_count_usb11 },
+            [USB_SPEED_SUPER] = { .bw = BANDWIDTH_AVAILABLE_USB11,
+                                 .bw_count = bandwidth_count_usb11 },
         };