Changeset 3fafe5e0 in mainline for uspace/drv/bus

Timestamp:

2018-04-27T14:15:03Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7148abf

Parents:

a2eb85d

git-author:

Jiri Svoboda <jiri@…> (2018-04-26 17:14:26)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-27 14:15:03)

Message:

Fix incorrectly indented double-slash comments.

Location:

uspace/drv/bus/usb

Files:

• ehci/hw_struct/queue_head.c (modified) (1 diff)
• uhci/uhci_rh.c (modified) (1 diff)
• xhci/hw_struct/trb.h (modified) (3 diffs)

uspace/drv/bus/usb/ehci/hw_struct/queue_head.c

@@ -55 +55 @@
 
         EHCI_MEM32_WR(instance->horizontal, LINK_POINTER_TERM);
-//      EHCI_MEM32_WR(instance->current, LINK_POINTER_TERM);
+#if 0
+        EHCI_MEM32_WR(instance->current, LINK_POINTER_TERM);
+#endif
         EHCI_MEM32_WR(instance->next, LINK_POINTER_TERM);
         EHCI_MEM32_WR(instance->alternate, LINK_POINTER_TERM);

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

@@ -246 +246 @@
             UHCI2USB(val, STATUS_CONNECTED_CHANGED, USB_HUB_PORT_STATUS_C_CONNECTION) |
             UHCI2USB(val, STATUS_ENABLED_CHANGED, USB2_HUB_PORT_STATUS_C_ENABLE) |
-//          UHCI2USB(val, STATUS_SUSPEND, USB2_HUB_PORT_STATUS_C_SUSPEND) |
+#if 0
+            UHCI2USB(val, STATUS_SUSPEND, USB2_HUB_PORT_STATUS_C_SUSPEND) |
+#endif
             (hub->reset_changed[port] ?  USB_HUB_PORT_STATUS_C_RESET : 0));
         RH_DEBUG(hub, port, "Port status %" PRIx32 " (source %" PRIx16

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

@@ -48 +48 @@
         XHCI_TRB_TYPE_RESERVED = 0,
 
-// Transfer ring:
+        /*
+         * Transfer ring:
+         */
         XHCI_TRB_TYPE_NORMAL,
         XHCI_TRB_TYPE_SETUP_STAGE,
@@ -58 +60 @@
         XHCI_TRB_TYPE_NO_OP,
 
-// Command ring:
+        /*
+         * Command ring:
+         */
         XHCI_TRB_TYPE_ENABLE_SLOT_CMD,
         XHCI_TRB_TYPE_DISABLE_SLOT_CMD,
@@ -74 +78 @@
         XHCI_TRB_TYPE_FORCE_HEADER_CMD,
         XHCI_TRB_TYPE_NO_OP_CMD,
-// Reserved: 24-31
-
-// Event ring:
+        /*
+         * Reserved: 24-31
+        */
+
+        /*
+         * Event ring:
+         */
         XHCI_TRB_TYPE_TRANSFER_EVENT = 32,
         XHCI_TRB_TYPE_COMMAND_COMPLETION_EVENT,