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

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

Files:

• hub/hub.c (modified) (8 diffs)
• transfer.c (modified) (4 diffs)
• vhcd.h (modified) (1 diff)

uspace/drv/bus/usb/vhc/hub/hub.c

@@ -68 +68 @@
 
 /** Convert hub port state to a char. */
-char hub_port_state_to_char(hub_port_state_t state) {
+char hub_port_state_to_char(hub_port_state_t state)
+{
         switch (state) {
-                case HUB_PORT_STATE_NOT_CONFIGURED:
-                        return '-';
-                case HUB_PORT_STATE_POWERED_OFF:
-                        return 'O';
-                case HUB_PORT_STATE_DISCONNECTED:
-                        return 'X';
-                case HUB_PORT_STATE_DISABLED:
-                        return 'D';
-                case HUB_PORT_STATE_RESETTING:
-                        return 'R';
-                case HUB_PORT_STATE_ENABLED:
-                        return 'E';
-                case HUB_PORT_STATE_SUSPENDED:
-                        return 'S';
-                case HUB_PORT_STATE_RESUMING:
-                        return 'F';
-                default:
-                        return '?';
+        case HUB_PORT_STATE_NOT_CONFIGURED:
+                return '-';
+        case HUB_PORT_STATE_POWERED_OFF:
+                return 'O';
+        case HUB_PORT_STATE_DISCONNECTED:
+                return 'X';
+        case HUB_PORT_STATE_DISABLED:
+                return 'D';
+        case HUB_PORT_STATE_RESETTING:
+                return 'R';
+        case HUB_PORT_STATE_ENABLED:
+                return 'E';
+        case HUB_PORT_STATE_SUSPENDED:
+                return 'S';
+        case HUB_PORT_STATE_RESUMING:
+                return 'F';
+        default:
+                return '?';
         }
 }
@@ -234 +235 @@
 
         switch (state) {
-                case HUB_PORT_STATE_POWERED_OFF:
-                        clear_port_status_change(port, HUB_STATUS_C_PORT_CONNECTION);
-                        clear_port_status_change(port, HUB_STATUS_C_PORT_ENABLE);
-                        clear_port_status_change(port, HUB_STATUS_C_PORT_RESET);
-                        break;
-                case HUB_PORT_STATE_RESUMING:
-                        port->state = state;
-                        set_port_state_delayed(hub, port_index,
-                            10, state, HUB_PORT_STATE_ENABLED);
-                        break;
-                case HUB_PORT_STATE_RESETTING:
-                        port->state = state;
-                        set_port_state_delayed(hub, port_index,
-                            10, state, HUB_PORT_STATE_ENABLED);
-                        break;
-                case HUB_PORT_STATE_ENABLED:
-                        if (port->state == HUB_PORT_STATE_RESETTING) {
-                                set_port_status_change(port, HUB_STATUS_C_PORT_RESET);
-                        }
-                        break;
-                default:
-                        break;
+        case HUB_PORT_STATE_POWERED_OFF:
+                clear_port_status_change(port, HUB_STATUS_C_PORT_CONNECTION);
+                clear_port_status_change(port, HUB_STATUS_C_PORT_ENABLE);
+                clear_port_status_change(port, HUB_STATUS_C_PORT_RESET);
+                break;
+        case HUB_PORT_STATE_RESUMING:
+                port->state = state;
+                set_port_state_delayed(hub, port_index,
+                    10, state, HUB_PORT_STATE_ENABLED);
+                break;
+        case HUB_PORT_STATE_RESETTING:
+                port->state = state;
+                set_port_state_delayed(hub, port_index,
+                    10, state, HUB_PORT_STATE_ENABLED);
+                break;
+        case HUB_PORT_STATE_ENABLED:
+                if (port->state == HUB_PORT_STATE_RESETTING) {
+                        set_port_status_change(port, HUB_STATUS_C_PORT_RESET);
+                }
+                break;
+        default:
+                break;
         }
 
@@ -336 +337 @@
         }
 
-        uint32_t status;
-        status = MAKE_BYTE(
+        uint32_t status = MAKE_BYTE(
             /* Current connect status. */
             port->connected_device == NULL ? 0 : 1,
@@ -344 +344 @@
             /* Suspend. */
             (port->state == HUB_PORT_STATE_SUSPENDED)
-                || (port->state == HUB_PORT_STATE_RESUMING) ? 1 : 0,
+            || (port->state == HUB_PORT_STATE_RESUMING) ? 1 : 0,
             /* Over-current. */
             0,
@@ -350 +350 @@
             port->state == HUB_PORT_STATE_RESETTING ? 1 : 0,
             /* Reserved. */
-            0, 0, 0)
-
-            | (MAKE_BYTE(
+            0, 0, 0);
+
+        status |= MAKE_BYTE(
             /* Port power. */
             port->state == HUB_PORT_STATE_POWERED_OFF ? 0 : 1,
@@ -359 +359 @@
             /* Reserved. */
             0, 0, 0, 0, 0, 0
-            )) << 8;
+            ) << 8;
 
         status |= (port->status_change << 16);
@@ -463 +463 @@
 static errno_t set_port_state_delayed_fibril(void *arg)
 {
-        struct delay_port_state_change *change
-            = (struct delay_port_state_change *) arg;
+        struct delay_port_state_change *change =
+            (struct delay_port_state_change *) arg;
 
         async_usleep(change->delay);
@@ -500 +500 @@
     hub_port_state_t old_state, hub_port_state_t new_state)
 {
-        struct delay_port_state_change *change
-            = malloc(sizeof(struct delay_port_state_change));
+        struct delay_port_state_change *change =
+            malloc(sizeof(struct delay_port_state_change));
 
         change->hub = hub;

uspace/drv/bus/usb/vhc/transfer.c

@@ -50 +50 @@
                 return false;
         }
-        const usb_device_request_setup_packet_t *setup
-                = &transfer->batch.setup.packet;
+        const usb_device_request_setup_packet_t *setup =
+            &transfer->batch.setup.packet;
         if (setup->request_type != 0) {
                 return false;
@@ -139 +139 @@
         assert(!list_empty(&dev->transfer_queue));
 
-        vhc_transfer_t *transfer = list_get_instance(
-            list_first(&dev->transfer_queue), vhc_transfer_t, link);
+        vhc_transfer_t *transfer =
+            list_get_instance(list_first(&dev->transfer_queue),
+            vhc_transfer_t, link);
         list_remove(&transfer->link);
 
@@ -258 +259 @@
                             dev->dev_local, &data_transfer_size);
                 } else {
-                        usb_log_warning("Device has no remote phone nor local node.");
+                        usb_log_warning("Device has no remote phone "
+                            "nor local node.");
                         rc = ESTALL;
                 }
@@ -269 +271 @@
                         if (is_set_address_transfer(transfer)) {
                                 usb_device_request_setup_packet_t *setup =
-                                    (void*) transfer->batch.setup.buffer;
+                                    (void *) transfer->batch.setup.buffer;
                                 dev->address = setup->value;
                                 usb_log_debug2("Address changed to %d",

uspace/drv/bus/usb/vhc/vhcd.h

@@ -93 +93 @@
 errno_t vhc_virtdev_plug(vhc_data_t *, async_sess_t *, uintptr_t *);
 errno_t vhc_virtdev_plug_local(vhc_data_t *, usbvirt_device_t *, uintptr_t *);
-errno_t vhc_virtdev_plug_hub(vhc_data_t *, usbvirt_device_t *, uintptr_t *, usb_address_t address);
+errno_t vhc_virtdev_plug_hub(vhc_data_t *, usbvirt_device_t *, uintptr_t *,
+    usb_address_t address);
 void vhc_virtdev_unplug(vhc_data_t *, uintptr_t);