Changeset 063dfe8 in mainline

Timestamp:

2017-10-13T13:04:26Z (7 years ago)

Author:

Petr Manek <petr.manek@…>

Branches:

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

Children:

dcf0597

Parents:

c10daa8

Message:

Moved initialization and polished some log messages.

Location:

uspace/drv/bus/usb/xhci

Files:

• bus.c (modified) (3 diffs)
• endpoint.c (modified) (3 diffs)
• endpoint.h (modified) (1 diff)

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

@@ -110 +110 @@
 }
 
-static int hashed_device_create(xhci_bus_t *bus, hashed_device_t **hashed_dev)
+static int hashed_device_create(xhci_bus_t *bus, hashed_device_t **hashed_dev, usb_address_t address)
 {
         int res;
@@ -119 +119 @@
         }
 
-        res = xhci_device_init(dev, bus);
+        res = xhci_device_init(dev, bus, address);
         if (res != EOK) {
                 goto err_xhci_dev_init;
         }
-
-        // TODO: Set device data.
 
         hashed_device_t *ret_dev = (hashed_device_t *) malloc(sizeof(hashed_device_t));
@@ -166 +164 @@
 
         if (res == ENOENT) {
-                res = hashed_device_create(bus, &hashed_dev);
+                res = hashed_device_create(bus, &hashed_dev, ep->target.address);
 
                 if (res != EOK)

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

@@ -52 +52 @@
         xhci_ep->device = NULL;
 
-        usb_log_debug("XHCI Endpoint %d:%d initialized.", ep->target.address, ep->target.endpoint);
+        usb_log_debug("Endpoint %d:%d initialized.", ep->target.address, ep->target.endpoint);
 
         return EOK;
@@ -65 +65 @@
         endpoint_t *ep = &xhci_ep->base;
 
-        usb_log_debug("XHCI Endpoint %d:%d destroyed.", ep->target.address, ep->target.endpoint);
+        usb_log_debug("Endpoint %d:%d destroyed.", ep->target.address, ep->target.endpoint);
 }
 
-int xhci_device_init(xhci_device_t *dev, xhci_bus_t *bus)
+int xhci_device_init(xhci_device_t *dev, xhci_bus_t *bus, usb_address_t address)
 {
         memset(&dev->endpoints, 0, sizeof(dev->endpoints));
         dev->active_endpoint_count = 0;
+        dev->address = address;
+        dev->slot_id = 0;
+
+        usb_log_debug("Device %d initialized.", dev->address);
         return EOK;
 }
@@ -78 +82 @@
 {
         // TODO: Check that all endpoints are dead.
+        usb_log_debug("Device %d destroyed.", dev->address);
 }
 

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

@@ -79 +79 @@
 void xhci_endpoint_fini(xhci_endpoint_t *);
 
-int xhci_device_init(xhci_device_t *, xhci_bus_t *);
+int xhci_device_init(xhci_device_t *, xhci_bus_t *, usb_address_t);
 void xhci_device_fini(xhci_device_t *);