Changeset ae3a941 in mainline for uspace/drv/bus/usb/ehci

Timestamp:

2018-02-26T16:51:40Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

e773f58

Parents:

3692678

Message:

usb: cstyle

Location:

uspace/drv/bus/usb/ehci

Files:

• ehci_batch.h (modified) (2 diffs)
• ehci_bus.c (modified) (2 diffs)
• ehci_bus.h (modified) (2 diffs)
• ehci_rh.h (modified) (1 diff)
• hc.h (modified) (1 diff)
• hw_struct/iso_transfer_descriptor.h (modified) (1 diff)
• hw_struct/queue_head.c (modified) (2 diffs)
• hw_struct/queue_head.h (modified) (1 diff)
• hw_struct/split_iso_transfer_descriptor.h (modified) (1 diff)

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

@@ -63 +63 @@
 } ehci_transfer_batch_t;
 
-ehci_transfer_batch_t * ehci_transfer_batch_create(endpoint_t *ep);
+ehci_transfer_batch_t *ehci_transfer_batch_create(endpoint_t *ep);
 int ehci_transfer_batch_prepare(ehci_transfer_batch_t *batch);
 void ehci_transfer_batch_commit(const ehci_transfer_batch_t *batch);
@@ -69 +69 @@
 void ehci_transfer_batch_destroy(ehci_transfer_batch_t *batch);
 
-static inline ehci_transfer_batch_t * ehci_transfer_batch_get(usb_transfer_batch_t *usb_batch)
+static inline ehci_transfer_batch_t *ehci_transfer_batch_get(
+    usb_transfer_batch_t *usb_batch)
 {
         assert(usb_batch);

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

@@ -54 +54 @@
         ehci_endpoint_t *instance = ehci_endpoint_get(ep);
         if (qh_toggle_from_td(instance->qh))
-                usb_log_warning("EP(%p): Resetting toggle bit for transfer directed EP", instance);
+                usb_log_warning("EP(%p): Resetting toggle bit for transfer "
+                    "directed EP", instance);
         qh_toggle_set(instance->qh, 0);
 }
@@ -72 +73 @@
 /** Creates new hcd endpoint representation.
  */
-static endpoint_t *ehci_endpoint_create(device_t *dev, const usb_endpoint_descriptors_t *desc)
+static endpoint_t *ehci_endpoint_create(device_t *dev,
+    const usb_endpoint_descriptors_t *desc)
 {
         assert(dev);

uspace/drv/bus/usb/ehci/ehci_bus.h

@@ -78 +78 @@
  * @return Pointer to assigned ehci endpoint structure
  */
-static inline ehci_endpoint_t * ehci_endpoint_get(const endpoint_t *ep)
+static inline ehci_endpoint_t *ehci_endpoint_get(const endpoint_t *ep)
 {
         assert(ep);
@@ -84 +84 @@
 }
 
-static inline ehci_endpoint_t * ehci_endpoint_list_instance(link_t *l)
+static inline ehci_endpoint_t *ehci_endpoint_list_instance(link_t *l)
 {
         return list_get_instance(l, ehci_endpoint_t, eplist_link);

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

@@ -80 +80 @@
 } ehci_rh_t;
 
-errno_t ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps, ehci_regs_t *regs,
-    fibril_mutex_t *guard, const char *name);
+errno_t ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps,
+    ehci_regs_t *regs, fibril_mutex_t *guard, const char *name);
 errno_t ehci_rh_schedule(ehci_rh_t *instance, usb_transfer_batch_t *batch);
 errno_t ehci_rh_interrupt(ehci_rh_t *instance);

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

@@ -104 +104 @@
 extern errno_t hc_start(hc_device_t *);
 extern errno_t hc_setup_roothub(hc_device_t *);
-extern errno_t hc_gen_irq_code(irq_code_t *, hc_device_t *, const hw_res_list_parsed_t *, int *);
+extern errno_t hc_gen_irq_code(irq_code_t *, hc_device_t *,
+    const hw_res_list_parsed_t *, int *);
 extern errno_t hc_gone(hc_device_t *);
 

uspace/drv/bus/usb/ehci/hw_struct/iso_transfer_descriptor.h

@@ -72 +72 @@
         /* 64 bit struct only */
         volatile uint32_t extended_bp[7];
-} __attribute__((packed,aligned(32))) itd_t;
+} __attribute__((packed, aligned(32))) itd_t;
 #endif
 /**

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

@@ -70 +70 @@
             QH_EP_CHAR_EP_SET(ep->endpoint) |
             speed[ep->device->speed] |
-            QH_EP_CHAR_MAX_LENGTH_SET(ep->max_packet_size)
-        );
+            QH_EP_CHAR_MAX_LENGTH_SET(ep->max_packet_size));
         if (ep->transfer_type == USB_TRANSFER_CONTROL) {
                 if (ep->device->speed != USB_SPEED_HIGH)
@@ -80 +79 @@
         }
         uint32_t ep_cap = QH_EP_CAP_C_MASK_SET(3 << 2) |
-                    QH_EP_CAP_MULTI_SET(ep->packets_per_uframe);
+            QH_EP_CAP_MULTI_SET(ep->packets_per_uframe);
         if (usb_speed_is_11(ep->device->speed)) {
                 assert(ep->device->tt.dev != NULL);

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

@@ -143 +143 @@
         /* 64 bit struct only */
         volatile uint32_t extended_bp[5];
-} __attribute__((packed,aligned(32))) qh_t;
+} __attribute__((packed, aligned(32))) qh_t;
 
 static inline void qh_append_qh(qh_t *qh, const qh_t *next)

uspace/drv/bus/usb/ehci/hw_struct/split_iso_transfer_descriptor.h

@@ -89 +89 @@
         /* 64 bit struct only */
         volatile uint32_t extended_bp[2];
-} __attribute__((packed,aligned(32))) sitd_t;
+} __attribute__((packed, aligned(32))) sitd_t;
 #endif
 /**