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

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/ohci

Files:

• hw_struct/transfer_descriptor.c (modified) (1 diff)
• ohci_rh.c (modified) (2 diffs)

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);