Changeset 95c675b in mainline for uspace/drv/bus/usb

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

Location:

uspace/drv/bus/usb

Files:

• ehci/res.c (modified) (2 diffs)
• ohci/hw_struct/transfer_descriptor.c (modified) (1 diff)
• ohci/ohci_rh.c (modified) (2 diffs)
• uhci/main.c (modified) (2 diffs)
• usbhub/status.h (modified) (1 diff)
• usbhub/usbhub.h (modified) (2 diffs)
• usbmid/explore.c (modified) (1 diff)

uspace/drv/bus/usb/ehci/res.c

@@ -39 +39 @@
 #include <str_error.h>
 #include <assert.h>
-#include <devman.h>
+#include <ddf/driver.h>
 #include <ddi.h>
 #include <usb/debug.h>
@@ -176 +176 @@
         assert(device);
 
-        async_sess_t *parent_sess = devman_parent_device_connect(
-            ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
-        if (!parent_sess)
+        async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
+        if (parent_sess == NULL)
                 return ENOMEM;
 

uspace/drv/bus/usb/ohci/hw_struct/transfer_descriptor.c

@@ -78 +78 @@
 
         /* Allow less data on input. */
-        if (dir == USB_DIRECTION_IN) {
+        if (direction == USB_DIRECTION_IN) {
                 OHCI_MEM32_SET(instance->status, TD_STATUS_ROUND_FLAG);
         }

uspace/drv/bus/usb/ohci/ohci_rh.c

@@ -361 +361 @@
         case USB_HUB_FEATURE_C_PORT_RESET:        /*20*/
                 usb_log_debug2("Clearing port C_CONNECTION, C_ENABLE, "
-                    "C_SUSPEND, C_OC or C_RESET on port %"PRIu16".\n", port);
+                    "C_SUSPEND, C_OC or C_RESET on port %u.\n", port);
                 /* Bit offsets correspond to the feature number */
                 OHCI_WR(hub->registers->rh_port_status[port],
@@ -410 +410 @@
         case USB_HUB_FEATURE_PORT_RESET:   /*4*/
                 usb_log_debug2("Setting port POWER, ENABLE, SUSPEND or RESET "
-                    "on port %"PRIu16".\n", port);
+                    "on port %u.\n", port);
                 /* Bit offsets correspond to the feature number */
                 OHCI_WR(hub->registers->rh_port_status[port], 1 << feature);

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

@@ -36 +36 @@
 #include <assert.h>
 #include <ddf/driver.h>
-#include <devman.h>
 #include <errno.h>
 #include <io/log.h>
@@ -123 +122 @@
         assert(device);
 
-        async_sess_t *parent_sess = devman_parent_device_connect(
-            ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
-        if (!parent_sess)
+        async_sess_t *parent_sess = ddf_dev_parent_sess_get(device);
+        if (parent_sess == NULL)
                 return ENOMEM;
 
         /* See UHCI design guide page 45 for these values.
          * Write all WC bits in USB legacy register */
-        const int rc = pci_config_space_write_16(parent_sess, 0xc0, 0xaf00);
-
-        async_hangup(parent_sess);
-        return rc;
+        return pci_config_space_write_16(parent_sess, 0xc0, 0xaf00);
 }
 

uspace/drv/bus/usb/usbhub/status.h

@@ -35 +35 @@
 #define HUB_STATUS_H
 
-#include <stdbool.h>
-#include <stdint.h>
 #include <usb/dev/request.h>
 

uspace/drv/bus/usb/usbhub/usbhub.h

@@ -38 +38 @@
 #define DRV_USBHUB_USBHUB_H
 
-#include <ipc/devman.h>
 #include <ddf/driver.h>
 
@@ -72 +71 @@
         /** Condition variable for pending_ops_count. */
         fibril_condvar_t pending_ops_cv;
-        /** Pointer to devman usbhub function. */
+        /** Pointer to usbhub function. */
         ddf_fun_t *hub_fun;
         /** Status indicator */

uspace/drv/bus/usb/usbmid/explore.c

@@ -132 +132 @@
  *
  * @param dev Device to be explored.
- * @return Whether to accept this device from devman.
+ * @return Whether to accept this device.
  */
 int usbmid_explore_device(usb_device_t *dev)