Changeset 7c3fb9b in mainline for uspace/drv/bus/usb/uhci

Timestamp:

2018-05-17T08:29:01Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ff23ff

Parents:

fac0ac7

git-author:

Jiri Svoboda <jiri@…> (2018-05-16 17:28:17)

git-committer:

Jiri Svoboda <jiri@…> (2018-05-17 08:29:01)

Message:

Fix block comment formatting (ccheck).

Location:

uspace/drv/bus/usb/uhci

Files:

• hw_struct/queue_head.h (modified) (2 diffs)
• hw_struct/transfer_descriptor.c (modified) (2 diffs)
• hw_struct/transfer_descriptor.h (modified) (1 diff)
• main.c (modified) (1 diff)
• uhci_batch.c (modified) (1 diff)
• uhci_rh.c (modified) (5 diffs)

uspace/drv/bus/usb/uhci/hw_struct/queue_head.h

@@ -78 +78 @@
 static inline void qh_set_next_qh(qh_t *instance, qh_t *next)
 {
-        /* Physical address has to be below 4GB,
+        /*
+         * Physical address has to be below 4GB,
          * it is an UHCI limitation and malloc32
-         * should guarantee this */
+         * should guarantee this
+         */
         const uint32_t pa = addr_to_phys(next);
         if (pa) {
@@ -98 +100 @@
 static inline void qh_set_element_td(qh_t *instance, td_t *td)
 {
-        /* Physical address has to be below 4GB,
+        /*
+         * Physical address has to be below 4GB,
          * it is an UHCI limitation and malloc32
-         * should guarantee this */
+         * should guarantee this
+         */
         const uint32_t pa = addr_to_phys(td);
         if (pa) {

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

@@ -127 +127 @@
                 return EIO;
 
-        /* CRC or timeout error, like device not present or bad data,
-         * it won't be reported unless err count reached zero */
+        /*
+         * CRC or timeout error, like device not present or bad data,
+         * it won't be reported unless err count reached zero
+         */
         if ((instance->status & TD_STATUS_ERROR_CRC) != 0)
                 return EBADCHECKSUM;
@@ -144 +146 @@
                 return EIO;
 
-        /* Stall might represent err count reaching zero or stall response from
-         * the device. If err count reached zero, one of the above is reported*/
+        /*
+         * Stall might represent err count reaching zero or stall response from
+         * the device. If err count reached zero, one of the above is reported
+         */
         if ((instance->status & TD_STATUS_ERROR_STALLED) != 0)
                 return ESTALL;

uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h

@@ -90 +90 @@
         volatile uint32_t buffer_ptr;
 
-        /* According to UHCI design guide, there is 16 bytes of
+        /*
+         * According to UHCI design guide, there is 16 bytes of
          * data available here.
          * According to Linux kernel the hardware does not care,

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

@@ -76 +76 @@
                 return ENOMEM;
 
-        /* See UHCI design guide page 45 for these values.
-         * Write all WC bits in USB legacy register */
+        /*
+         * See UHCI design guide page 45 for these values.
+         * Write all WC bits in USB legacy register
+         */
         return pci_config_space_write_16(parent_sess, 0xc0, 0xaf00);
 }

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

@@ -87 +87 @@
 }
 
-/* Prepares batch for commiting.
+/*
+ * Prepares batch for committing.
  *
  * Determines the number of needed transfer descriptors (TDs).

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

@@ -153 +153 @@
         while ((port_status = pio_read_16(port)) & STATUS_IN_RESET)
                 ;
-        /* PIO delay, should not be longer than 3ms as the device might
-         * enter suspend state. */
+        /*
+         * PIO delay, should not be longer than 3ms as the device might
+         * enter suspend state.
+         */
         udelay(10);
-        /* Drop ConnectionChange as some UHCI hw
-         * sets this bit after reset, that is incorrect */
+        /*
+         * Drop ConnectionChange as some UHCI hw
+         * sets this bit after reset, that is incorrect
+         */
         port_status &= ~STATUS_WC_BITS;
         pio_write_16(port, port_status | STATUS_ENABLED | STATUS_CONNECTED_CHANGED);
@@ -376 +380 @@
                 RH_DEBUG(hub, port, "Set port change flag (status %" PRIx16
                     ")", status);
-                /* These are voluntary and don't have to be set
-                 * there is no way we could do it on UHCI anyway */
+                /*
+                 * These are voluntary and don't have to be set
+                 * there is no way we could do it on UHCI anyway
+                 */
                 break;
         default:
@@ -459 +465 @@
                 CLASS_REQ_OUT(USB_REQUEST_RECIPIENT_DEVICE, USB_HUB_REQUEST_CLEAR_FEATURE),
                 .name = "ClearHubFeature",
-                /* Hub features are overcurrent and supply good,
-                 * this request may only clear changes that we never report*/
+                /*
+                 * Hub features are overcurrent and supply good,
+                 * this request may only clear changes that we never report
+                 */
                 .callback = req_nop,
         },
@@ -471 +479 @@
                 CLASS_REQ_IN(USB_REQUEST_RECIPIENT_DEVICE, USB_HUB_REQUEST_GET_STATUS),
                 .name = "GetHubStatus",
-                /* UHCI can't report OC condition or,
-                 * lose power source */
+                /*
+                 * UHCI can't report OC condition or,
+                 * lose power source
+                 */
                 .callback = virthub_base_get_null_status,
         },
@@ -483 +493 @@
                 CLASS_REQ_OUT(USB_REQUEST_RECIPIENT_DEVICE, USB_HUB_REQUEST_SET_FEATURE),
                 .name = "SetHubFeature",
-                /* Hub features are overcurrent and supply good,
-                 * this request may only set changes that we never report*/
+                /*
+                 * Hub features are overcurrent and supply good,
+                 * this request may only set changes that we never report
+                 */
                 .callback = req_nop,
         },