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

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

Files:

• ehci_batch.c (modified) (3 diffs)
• ehci_rh.c (modified) (3 diffs)
• hc.c (modified) (2 diffs)
• hw_struct/queue_head.c (modified) (3 diffs)
• res.c (modified) (2 diffs)

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

@@ -47 +47 @@
 #include "ehci_bus.h"
 
-/* The buffer pointer list in the qTD is long enough to support a maximum
+/*
+ * The buffer pointer list in the qTD is long enough to support a maximum
  * transfer size of 20K bytes. This case occurs when all five buffer pointers
  * are used and the first offset is zero. A qTD handles a 16Kbyte buffer
- * with any starting buffer alignment. EHCI specs p. 87 (pdf p. 97) */
+ * with any starting buffer alignment. EHCI specs p. 87 (pdf p. 97)
+ */
 #define EHCI_TD_MAX_TRANSFER   (16 * 1024)
 
@@ -177 +179 @@
                 return false;
 
-        /* Now we may be sure that either the ED is inactive because of errors
-         * or all transfer descriptors completed successfully */
+        /*
+         * Now we may be sure that either the ED is inactive because of errors
+         * or all transfer descriptors completed successfully
+         */
 
         /* Assume all data got through */
@@ -192 +196 @@
                 ehci_batch->base.error = td_error(&ehci_batch->tds[i]);
                 if (ehci_batch->base.error == EOK) {
-                        /* If the TD got all its data through, it will report
+                        /*
+                         * If the TD got all its data through, it will report
                          * 0 bytes remain, the sole exception is INPUT with
                          * data rounding flag (short), i.e. every INPUT.

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

@@ -72 +72 @@
         instance->hub_descriptor.header.descriptor_type = USB_DESCTYPE_HUB;
         instance->hub_descriptor.header.port_count = instance->port_count;
-        /* Bits 0,1 indicate power switching mode
+        /*
+         * Bits 0,1 indicate power switching mode
          * Bit 2 indicates device type (compound device)
-         * Bits 3,4 indicate over-current protection mode */
+         * Bits 3,4 indicate over-current protection mode
+         */
         instance->hub_descriptor.header.characteristics = 0 |
             ((hcs & EHCI_CAPS_HCS_PPC_FLAG) ? 0x09 : 0x12) |
@@ -313 +315 @@
             EHCI2USB(reg, USB_PORTSC_OC_CHANGE_FLAG, USB_HUB_PORT_STATUS_C_OC) |
             (hub->reset_flag[port] ? USB_HUB_PORT_STATUS_C_RESET : 0));
-        /* Note feature numbers for test and indicator feature do not
-         * correspond to the port status bit locations */
+        /*
+         * Note feature numbers for test and indicator feature do not
+         * correspond to the port status bit locations
+         */
         usb_log_debug2("RH(%p-%u) port status: %" PRIx32 "(%" PRIx32 ")", hub, port,
             status, reg);
@@ -340 +344 @@
         }
         usb_log_debug("RH(%p-%u): Reset complete", job->hub, job->port);
-        /* Handle port ownership, if the port is not enabled
-         * after reset it's a full speed device */
+        /*
+         * Handle port ownership, if the port is not enabled
+         * after reset it's a full speed device
+         */
         if (!(EHCI_RD(job->hub->registers->portsc[job->port]) &
             USB_PORTSC_ENABLED_FLAG)) {

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

@@ -395 +395 @@
         usb_log_debug("HC(%p): Starting HW.", instance);
 
-        /* Turn off the HC if it's running, Reseting a running device is
-         * undefined */
+        /*
+         * Turn off the HC if it's running, Reseting a running device is
+         * undefined
+         */
         if (!(EHCI_RD(instance->registers->usbsts) & USB_STS_HC_HALTED_FLAG)) {
                 /* disable all interrupts */
@@ -487 +489 @@
                 return ret;
         }
-        /* Specs say "Software must set queue head horizontal pointer T-bits to
+        /*
+         * Specs say "Software must set queue head horizontal pointer T-bits to
          * a zero for queue heads in the asynchronous schedule" (4.4.0).
          * So we must maintain circular buffer (all horizontal pointers
-         * have to be valid */
+         * have to be valid
+         */
         endpoint_list_chain(&instance->async_list, &instance->async_list);
 

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

@@ -61 +61 @@
         EHCI_MEM32_WR(instance->alternate, LINK_POINTER_TERM);
         if (ep == NULL) {
-                /* Mark as halted and list head,
-                 * used by endpoint lists as dummy */
+                /*
+                 * Mark as halted and list head,
+                 * used by endpoint lists as dummy
+                 */
                 EHCI_MEM32_WR(instance->ep_char, QH_EP_CHAR_H_FLAG);
                 EHCI_MEM32_WR(instance->status, QH_STATUS_HALTED_FLAG);
@@ -76 +78 @@
                 if (ep->device->speed != USB_SPEED_HIGH)
                         EHCI_MEM32_SET(instance->ep_char, QH_EP_CHAR_C_FLAG);
-                /* Let BULK and INT use queue head managed toggle,
-                 * CONTROL needs special toggle handling anyway */
+                /*
+                 * Let BULK and INT use queue head managed toggle,
+                 * CONTROL needs special toggle handling anyway
+                 */
                 EHCI_MEM32_SET(instance->ep_char, QH_EP_CHAR_DTC_FLAG);
         }
@@ -96 +100 @@
         EHCI_MEM32_WR(instance->ep_cap, ep_cap);
 
-        /* The rest of the fields are transfer working area, it should be ok to
-         * leave it NULL */
+        /*
+         * The rest of the fields are transfer working area, it should be ok to
+         * leave it NULL
+         */
 }
 

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

@@ -80 +80 @@
         usb_log_debug2("USBLEGSUP: %" PRIx32 ".", usblegsup);
 
-        /* Request control from firmware/BIOS by writing 1 to highest
-         * byte. (OS Control semaphore)*/
+        /*
+         * Request control from firmware/BIOS by writing 1 to highest
+         * byte. (OS Control semaphore)
+         */
         usb_log_debug("Requesting OS control.");
         ret = pci_config_space_write_8(parent_sess,
@@ -187 +189 @@
         usb_log_debug2("Value of hcc params register: %x.", hcc_params);
 
-        /* Read value of EHCI Extended Capabilities Pointer
-         * position of EEC registers (points to PCI config space) */
+        /*
+         * Read value of EHCI Extended Capabilities Pointer
+         * position of EEC registers (points to PCI config space)
+         */
         const uint32_t eecp =
             (hcc_params >> EHCI_CAPS_HCC_EECP_SHIFT) & EHCI_CAPS_HCC_EECP_MASK;