Changes in / [f294926:69b1f3d] in mainline

Location:

uspace

Files:

• drv/uhci-rhd/port.c (modified) (10 diffs)
• drv/uhci-rhd/port.h (modified) (2 diffs)
• lib/usb/Makefile (modified) (2 diffs)
• lib/usb/include/usb/hub.h (deleted)
• lib/usb/include/usb/pipes.h (modified) (3 diffs)
• lib/usb/include/usb/usbdevice.h (deleted)
• lib/usb/src/hub.c (deleted)
• lib/usb/src/pipes.c (modified) (1 diff)
• lib/usb/src/usbdevice.c (deleted)

uspace/drv/uhci-rhd/port.c

@@ -36 +36 @@
 
 #include <usb/usb.h>    /* usb_address_t */
-#include <usb/usbdevice.h>
-#include <usb/hub.h>
-#include <usb/request.h>
+#include <usb/usbdrv.h> /* usb_drv_*     */
 #include <usb/debug.h>
 #include <usb/recognise.h>
@@ -60 +58 @@
         port->attached_device = 0;
         port->rh = rh;
-        int rc = usb_hc_connection_initialize_from_device(
-            &port->hc_connection, rh);
-        if (rc != EOK) {
-                usb_log_error("Failed to initialize connection to HC.");
-                return rc;
-        }
+        port->hc_phone = parent_phone;
 
         port->checker = fibril_create(uhci_port_check, port);
@@ -105 +98 @@
 
                 if (port_status & STATUS_CONNECTED_CHANGED) {
-                        int rc = usb_hc_connection_open(
-                            &port_instance->hc_connection);
-                        if (rc != EOK) {
-                                usb_log_error("Failed to connect to HC.");
-                                goto next;
-                        }
-
                         if (port_status & STATUS_CONNECTED) {
                                 /* new device */
@@ -118 +104 @@
                                 uhci_port_remove_device(port_instance);
                         }
-
-                        rc = usb_hc_connection_close(
-                            &port_instance->hc_connection);
-                        if (rc != EOK) {
-                                usb_log_error("Failed to disconnect from HC.");
-                                goto next;
-                        }
                 }
-        next:
                 async_usleep(port_instance->wait_period_usec);
         }
@@ -135 +113 @@
 {
         assert(port);
-        assert(usb_hc_connection_is_opened(&port->hc_connection));
+        assert(port->hc_phone);
 
         usb_log_info("Adding new device on port %d.\n", port->number);
 
         /* get address of the future device */
-        const usb_address_t usb_address = usb_hc_request_address(&port->hc_connection);
+        const usb_address_t usb_address = usb_drv_request_address(port->hc_phone);
 
         if (usb_address <= 0) {
@@ -150 +128 @@
 
         /* get default address */
-        int ret = usb_hc_reserve_default_address(&port->hc_connection);
+        int ret = usb_drv_reserve_default_address(port->hc_phone);
         if (ret != EOK) {
                 usb_log_error("Failed to reserve default address on port %d.\n",
                     port->number);
-                int ret2 = usb_hc_unregister_device(&port->hc_connection,
-                    usb_address);
+                int ret2 =
+                  usb_drv_release_address(port->hc_phone, usb_address);
                 if (ret2 != EOK) {
                         usb_log_fatal("Failed to return requested address on port %d.\n",
@@ -196 +174 @@
         }
 
-        /*
-         * Initialize connection to the device.
-         */
-        /* FIXME: check for errors. */
-        usb_device_connection_t new_dev_connection;
-        usb_endpoint_pipe_t new_dev_ctrl_pipe;
-        usb_device_connection_initialize_on_default_address(
-            &new_dev_connection, &port->hc_connection);
-        usb_endpoint_pipe_initialize_default_control(&new_dev_ctrl_pipe,
-            &new_dev_connection);
-
-        /*
-         * Assign new address to the device. This function updates
-         * the backing connection to still point to the same device.
-         */
-        /* FIXME: check for errors. */
-        usb_endpoint_pipe_start_session(&new_dev_ctrl_pipe);
-        ret = usb_request_set_address(&new_dev_ctrl_pipe, usb_address);
-        usb_endpoint_pipe_end_session(&new_dev_ctrl_pipe);
+        /* assign address to device */
+        ret = usb_drv_req_set_address(port->hc_phone, 0, usb_address);
 
         if (ret != EOK) { /* address assigning went wrong */
                 usb_log_error("Failed(%d) to assign address to the device.\n", ret);
                 uhci_port_set_enabled(port, false);
-                int release = usb_hc_release_default_address(&port->hc_connection);
+                int release = usb_drv_release_default_address(port->hc_phone);
                 if (release != EOK) {
                         usb_log_error("Failed to release default address on port %d.\n",
@@ -233 +194 @@
 
         /* release default address */
-        ret = usb_hc_release_default_address(&port->hc_connection);
+        ret = usb_drv_release_default_address(port->hc_phone);
         if (ret != EOK) {
                 usb_log_error("Failed to release default address on port %d.\n",
@@ -245 +206 @@
         assert(port->attached_device == 0);
 
-        ret = usb_device_register_child_in_devman(new_dev_connection.address,
-            new_dev_connection.hc_handle, port->rh, &port->attached_device);
-
+        devman_handle_t hc_handle;
+        ret = usb_drv_find_hc(port->rh, &hc_handle);
+        if (ret != EOK) {
+                usb_log_error("Failed to get handle of host controller: %s.\n",
+                    str_error(ret));
+                uhci_port_set_enabled(port, false);
+                return ENOMEM;
+        }
+
+        ret = usb_device_register_child_in_devman(usb_address, hc_handle,
+            port->rh, &port->attached_device);
         if (ret != EOK) { /* something went wrong */
                 usb_log_error("Failed(%d) in usb_drv_register_child.\n", ret);
@@ -256 +225 @@
                 port->number, usb_address, port->attached_device);
 
-        /*
-         * Register the device in the host controller.
-         */
-        usb_hc_attached_device_t new_device = {
-                .address = new_dev_connection.address,
-                .handle = port->attached_device
-        };
-
-        ret = usb_hc_register_device(&port->hc_connection, &new_device);
+        ret =
+          usb_drv_bind_address(port->hc_phone, usb_address, port->attached_device);
         // TODO: proper error check here
         assert(ret == EOK);

uspace/drv/uhci-rhd/port.h

@@ -38 +38 @@
 #include <driver.h> /* device_t */
 #include <stdint.h>
-#include <usb/usbdevice.h>
 
 #include "port_status.h"
@@ -47 +46 @@
         unsigned number;
         unsigned wait_period_usec;
-        usb_hc_connection_t hc_connection;
+        int hc_phone;
         device_t *rh;
         devman_handle_t attached_device;

uspace/lib/usb/Makefile

@@ -40 +40 @@
         src/dump.c \
         src/hidparser.c \
-        src/hub.c \
         src/pipes.c \
         src/pipesinit.c \
@@ -47 +46 @@
         src/request.c \
         src/usb.c \
-        src/usbdevice.c \
         src/usbdrvreq.c \
         src/usbdrv.c \

uspace/lib/usb/include/usb/pipes.h

@@ -31 +31 @@
  */
 /** @file
- * USB pipes representation.
+ * Communication between device drivers and host controller driver.
  */
 #ifndef LIBUSB_PIPES_H_
@@ -38 +38 @@
 #include <sys/types.h>
 #include <usb/usb.h>
-#include <usb/usbdevice.h>
 #include <usb/descriptor.h>
 #include <ipc/devman.h>
@@ -115 +114 @@
 } usb_endpoint_mapping_t;
 
-int usb_device_connection_initialize_on_default_address(
-    usb_device_connection_t *, usb_hc_connection_t *);
 int usb_device_connection_initialize_from_device(usb_device_connection_t *,
     device_t *);

uspace/lib/usb/src/pipes.c

@@ -102 +102 @@
 }
 
-/** Initialize connection to USB device on default address.
- *
- * @param dev_connection Device connection structure to be initialized.
- * @param hc_connection Initialized connection to host controller.
- * @return Error code.
- */
-int usb_device_connection_initialize_on_default_address(
-    usb_device_connection_t *dev_connection,
-    usb_hc_connection_t *hc_connection)
-{
-        assert(dev_connection);
-
-        if (hc_connection == NULL) {
-                return EBADMEM;
-        }
-
-        return usb_device_connection_initialize(dev_connection,
-            hc_connection->hc_handle, (usb_address_t) 0);
-}
-
 
 /** Start a session on the endpoint pipe.