refactor(usb/host): reformat code with astyle

Author: Dazza0

components/usb/hcd_dwc.c

@@ -668,20 +668,20 @@ static bool _internal_pipe_event_notify(pipe_t *pipe, bool from_isr)
 static usb_speed_t get_usb_port_speed(usb_dwc_speed_t priv)
 {
     switch (priv) {
-        case USB_DWC_SPEED_LOW: return USB_SPEED_LOW;
-        case USB_DWC_SPEED_FULL: return USB_SPEED_FULL;
-        case USB_DWC_SPEED_HIGH: return USB_SPEED_HIGH;
-        default: abort();
+    case USB_DWC_SPEED_LOW: return USB_SPEED_LOW;
+    case USB_DWC_SPEED_FULL: return USB_SPEED_FULL;
+    case USB_DWC_SPEED_HIGH: return USB_SPEED_HIGH;
+    default: abort();
     }
 }
 
 static usb_hal_fifo_bias_t get_hal_fifo_bias(hcd_port_fifo_bias_t public)
 {
     switch (public) {
-        case HCD_PORT_FIFO_BIAS_BALANCED: return USB_HAL_FIFO_BIAS_DEFAULT;
-        case HCD_PORT_FIFO_BIAS_RX: return USB_HAL_FIFO_BIAS_RX;
-        case HCD_PORT_FIFO_BIAS_PTX: return USB_HAL_FIFO_BIAS_PTX;
-        default: abort();
+    case HCD_PORT_FIFO_BIAS_BALANCED: return USB_HAL_FIFO_BIAS_DEFAULT;
+    case HCD_PORT_FIFO_BIAS_RX: return USB_HAL_FIFO_BIAS_RX;
+    case HCD_PORT_FIFO_BIAS_PTX: return USB_HAL_FIFO_BIAS_PTX;
+    default: abort();
     }
 }
 
@@ -2130,7 +2130,7 @@ static void _buffer_fill(pipe_t *pipe)
                 start_idx = (next_interval_idx_no_offset + pipe->ep_char.periodic.phase_offset_frames) & (XFER_LIST_LEN_ISOC - 1);
             } else {
                 // Not enough time until the next schedule, add another interval to it.
-                start_idx =  (next_interval_idx_no_offset + pipe->ep_char.periodic.interval + pipe->ep_char.periodic.phase_offset_frames) & (XFER_LIST_LEN_ISOC - 1);
+                start_idx = (next_interval_idx_no_offset + pipe->ep_char.periodic.interval + pipe->ep_char.periodic.phase_offset_frames) & (XFER_LIST_LEN_ISOC - 1);
             }
         } else {
             // Start index is based on previously filled buffer

components/usb/test_apps/common/test_usb_mock_msc.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -137,21 +137,21 @@ void mock_msc_scsi_init_reference_descriptors(void)
     // String descriptors
     const char *str = MOCK_MSC_SCSI_STRING_1;
     uint8_t chr_count = strlen(str);
-    mock_msc_scsi_str_desc_manu[0] = (USB_B_DESCRIPTOR_TYPE_STRING << 8 ) | (2 * chr_count + 2); // first byte is length (including header), second byte is string type
+    mock_msc_scsi_str_desc_manu[0] = (USB_B_DESCRIPTOR_TYPE_STRING << 8) | (2 * chr_count + 2);  // first byte is length (including header), second byte is string type
     for (uint8_t i = 0; i < chr_count; i++) {
         mock_msc_scsi_str_desc_manu[1 + i] = str[i];
     }
 
     str = MOCK_MSC_SCSI_STRING_2;
     chr_count = strlen(str);
-    mock_msc_scsi_str_desc_prod[0] = (USB_B_DESCRIPTOR_TYPE_STRING << 8 ) | (2 * chr_count + 2); // first byte is length (including header), second byte is string type
+    mock_msc_scsi_str_desc_prod[0] = (USB_B_DESCRIPTOR_TYPE_STRING << 8) | (2 * chr_count + 2);  // first byte is length (including header), second byte is string type
     for (uint8_t i = 0; i < chr_count; i++) {
         mock_msc_scsi_str_desc_prod[1 + i] = str[i];
     }
 
     str = MOCK_MSC_SCSI_STRING_3;
     chr_count = strlen(str);
-    mock_msc_scsi_str_desc_ser_num[0] = (USB_B_DESCRIPTOR_TYPE_STRING << 8 ) | (2 * chr_count + 2); // first byte is length (including header), second byte is string type
+    mock_msc_scsi_str_desc_ser_num[0] = (USB_B_DESCRIPTOR_TYPE_STRING << 8) | (2 * chr_count + 2);  // first byte is length (including header), second byte is string type
     for (uint8_t i = 0; i < chr_count; i++) {
         mock_msc_scsi_str_desc_ser_num[1 + i] = str[i];
     }

components/usb/test_apps/common/test_usb_mock_msc.h

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -112,7 +112,8 @@ extern const usb_ep_desc_t mock_msc_scsi_bulk_in_ep_desc;
     (setup_pkt_ptr)->wLength = 0;    \
 })
 
-typedef struct __attribute__((packed)) {
+typedef struct __attribute__((packed))
+{
     uint8_t opcode; //0x28 = read(10), 0x2A=write(10)
     uint8_t flags;
     uint8_t lba_3;
@@ -125,7 +126,8 @@ typedef struct __attribute__((packed)) {
     uint8_t control;
 } mock_scsi_cmd10_t;
 
-typedef struct __attribute__((packed)) {
+typedef struct __attribute__((packed))
+{
     uint32_t dCBWSignature;
     uint32_t dCBWTag;
     uint32_t dCBWDataTransferLength;
@@ -137,7 +139,8 @@ typedef struct __attribute__((packed)) {
 } mock_msc_bulk_cbw_t;
 
 // USB Bulk Transfer Command Status Wrapper data
-typedef struct __attribute__((packed)) {
+typedef struct __attribute__((packed))
+{
     uint32_t dCSWSignature;
     uint32_t dCSWTag;
     uint32_t dCSWDataResidue;
@@ -180,7 +183,6 @@ ISOC, transferring to a non-existent endpoint should work. The non-existent endp
 #define MOCK_ISOC_EP_NUM        2
 #define MOCK_ISOC_EP_MPS        512
 
-
 static const usb_ep_desc_t mock_isoc_out_ep_desc = {
     .bLength = sizeof(usb_ep_desc_t),
     .bDescriptorType = USB_B_DESCRIPTOR_TYPE_ENDPOINT,
@@ -190,7 +192,6 @@ static const usb_ep_desc_t mock_isoc_out_ep_desc = {
     .bInterval = 1,     //Isoc interval is (2 ^ (bInterval - 1)) which means an interval of 1ms
 };
 
-
 #ifdef __cplusplus
 }
 #endif

components/usb/test_apps/hcd/main/test_hcd_ctrl.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -68,7 +68,7 @@ TEST_CASE("Test HCD control pipe URBs", "[ctrl][low_speed][full_speed]")
         TEST_ASSERT_GREATER_OR_EQUAL(sizeof(usb_setup_packet_t), urb->transfer.actual_num_bytes);
         TEST_ASSERT_LESS_OR_EQUAL(urb->transfer.num_bytes, urb->transfer.actual_num_bytes);
         usb_config_desc_t *config_desc = (usb_config_desc_t *)(urb->transfer.data_buffer + sizeof(usb_setup_packet_t));
-        TEST_ASSERT_EQUAL(USB_B_DESCRIPTOR_TYPE_CONFIGURATION , config_desc->bDescriptorType);
+        TEST_ASSERT_EQUAL(USB_B_DESCRIPTOR_TYPE_CONFIGURATION, config_desc->bDescriptorType);
         printf("Config Desc wTotalLength %d\n", config_desc->wTotalLength);
     }
 
@@ -201,7 +201,7 @@ TEST_CASE("Test HCD control pipe STALL", "[ctrl][full_speed]")
         TEST_ASSERT_GREATER_OR_EQUAL(sizeof(usb_setup_packet_t), urb->transfer.actual_num_bytes);
         TEST_ASSERT_LESS_OR_EQUAL(urb->transfer.num_bytes, urb->transfer.actual_num_bytes);
         usb_config_desc_t *config_desc = (usb_config_desc_t *)(urb->transfer.data_buffer + sizeof(usb_setup_packet_t));
-        TEST_ASSERT_EQUAL(USB_B_DESCRIPTOR_TYPE_CONFIGURATION , config_desc->bDescriptorType);
+        TEST_ASSERT_EQUAL(USB_B_DESCRIPTOR_TYPE_CONFIGURATION, config_desc->bDescriptorType);
         printf("Config Desc wTotalLength %d\n", config_desc->wTotalLength);
     }
 
@@ -270,11 +270,11 @@ TEST_CASE("Test HCD control pipe runtime halt and clear", "[ctrl][low_speed][ful
         TEST_ASSERT_EQUAL_PTR(urb_list[i], urb);
         TEST_ASSERT(urb->transfer.status == USB_TRANSFER_STATUS_COMPLETED || urb->transfer.status == USB_TRANSFER_STATUS_CANCELED);
         if (urb->transfer.status == USB_TRANSFER_STATUS_COMPLETED) {
-             //We must have transmitted at least the setup packet, but device may return less than bytes requested
+            //We must have transmitted at least the setup packet, but device may return less than bytes requested
             TEST_ASSERT_GREATER_OR_EQUAL(sizeof(usb_setup_packet_t), urb->transfer.actual_num_bytes);
             TEST_ASSERT_LESS_OR_EQUAL(urb->transfer.num_bytes, urb->transfer.actual_num_bytes);
             usb_config_desc_t *config_desc = (usb_config_desc_t *)(urb->transfer.data_buffer + sizeof(usb_setup_packet_t));
-            TEST_ASSERT_EQUAL(USB_B_DESCRIPTOR_TYPE_CONFIGURATION , config_desc->bDescriptorType);
+            TEST_ASSERT_EQUAL(USB_B_DESCRIPTOR_TYPE_CONFIGURATION, config_desc->bDescriptorType);
             printf("Config Desc wTotalLength %d\n", config_desc->wTotalLength);
         } else {
             //A failed transfer should 0 actual number of bytes transmitted

components/usb/test_apps/usb_host/main/ctrl_client_async_seq.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -76,14 +76,14 @@ static void ctrl_client_event_cb(const usb_host_client_event_msg_t *event_msg, v
 {
     ctrl_client_obj_t *ctrl_obj = (ctrl_client_obj_t *)arg;
     switch (event_msg->event) {
-        case USB_HOST_CLIENT_EVENT_NEW_DEV:
-            TEST_ASSERT_EQUAL(TEST_STAGE_WAIT_CONN, ctrl_obj->cur_stage);
-            ctrl_obj->next_stage = TEST_STAGE_DEV_OPEN;
-            ctrl_obj->dev_addr_to_open = event_msg->new_dev.address;
-            break;
-        default:
-            abort();    //Should never occur in this test
-            break;
+    case USB_HOST_CLIENT_EVENT_NEW_DEV:
+        TEST_ASSERT_EQUAL(TEST_STAGE_WAIT_CONN, ctrl_obj->cur_stage);
+        ctrl_obj->next_stage = TEST_STAGE_DEV_OPEN;
+        ctrl_obj->dev_addr_to_open = event_msg->new_dev.address;
+        break;
+    default:
+        abort();    //Should never occur in this test
+        break;
     }
 }
 
@@ -100,7 +100,7 @@ void ctrl_client_async_seq_task(void *arg)
         .max_num_event_msg = CTRL_CLIENT_MAX_EVENT_MSGS,
         .async = {
             .client_event_callback = ctrl_client_event_cb,
-            .callback_arg = (void *)&ctrl_obj,
+            .callback_arg = (void *) &ctrl_obj,
         },
     };
     TEST_ASSERT_EQUAL(ESP_OK, usb_host_client_register(&client_config, &ctrl_obj.client_hdl));
@@ -130,52 +130,52 @@ void ctrl_client_async_seq_task(void *arg)
         ctrl_obj.cur_stage = ctrl_obj.next_stage;
 
         switch (ctrl_obj.next_stage) {
-            case TEST_STAGE_DEV_OPEN: {
-                ESP_LOGD(CTRL_CLIENT_TAG, "Open");
-                //Open the device
-                TEST_ASSERT_EQUAL_MESSAGE(ESP_OK, usb_host_device_open(ctrl_obj.client_hdl, ctrl_obj.dev_addr_to_open, &ctrl_obj.dev_hdl), "Failed to open the device");
-                //Target our transfers to the device
-                for (int i = 0; i < NUM_TRANSFER_OBJ; i++) {
-                    ctrl_xfer[i]->device_handle = ctrl_obj.dev_hdl;
-                }
-                //Check the VID/PID of the opened device
-                const usb_device_desc_t *device_desc;
-                TEST_ASSERT_EQUAL(ESP_OK, usb_host_get_device_descriptor(ctrl_obj.dev_hdl, &device_desc));
-                TEST_ASSERT_EQUAL(ctrl_obj.test_param.idVendor, device_desc->idVendor);
-                TEST_ASSERT_EQUAL(ctrl_obj.test_param.idProduct, device_desc->idProduct);
-                //Cache the active configuration descriptor for later comparison
-                TEST_ASSERT_EQUAL(ESP_OK, usb_host_get_active_config_descriptor(ctrl_obj.dev_hdl, &ctrl_obj.config_desc_cached));
-                ctrl_obj.next_stage = TEST_STAGE_CTRL_XFER;
-                skip_event_handling = true;
-                break;
-            }
-            case TEST_STAGE_CTRL_XFER: {
-                ESP_LOGD(CTRL_CLIENT_TAG, "Transfer");
-                //Send a control transfer to get the device's configuration descriptor
-                usb_transfer_t *transfer = ctrl_xfer[ctrl_obj.num_xfer_sent % NUM_TRANSFER_OBJ];
-                USB_SETUP_PACKET_INIT_GET_CONFIG_DESC((usb_setup_packet_t *)transfer->data_buffer, 0, MAX_TRANSFER_BYTES);
-                transfer->num_bytes = sizeof(usb_setup_packet_t) + MAX_TRANSFER_BYTES;
-                transfer->bEndpointAddress = 0x80;
-                TEST_ASSERT_EQUAL(ESP_OK, usb_host_transfer_submit_control(ctrl_obj.client_hdl, transfer));
-                ctrl_obj.num_xfer_sent++;
-                ctrl_obj.next_stage = TEST_STAGE_CTRL_XFER_WAIT;
-                skip_event_handling = true;
-                break;
+        case TEST_STAGE_DEV_OPEN: {
+            ESP_LOGD(CTRL_CLIENT_TAG, "Open");
+            //Open the device
+            TEST_ASSERT_EQUAL_MESSAGE(ESP_OK, usb_host_device_open(ctrl_obj.client_hdl, ctrl_obj.dev_addr_to_open, &ctrl_obj.dev_hdl), "Failed to open the device");
+            //Target our transfers to the device
+            for (int i = 0; i < NUM_TRANSFER_OBJ; i++) {
+                ctrl_xfer[i]->device_handle = ctrl_obj.dev_hdl;
             }
-            case TEST_STAGE_CTRL_XFER_WAIT: {
-                //Nothing to do but wait
-                break;
-            }
-            case TEST_STAGE_DEV_CLOSE: {
-                ESP_LOGD(CTRL_CLIENT_TAG, "Close");
-                vTaskDelay(10); // Give USB Host Lib some time to process all trnsfers
-                TEST_ASSERT_EQUAL(ESP_OK, usb_host_device_close(ctrl_obj.client_hdl, ctrl_obj.dev_hdl));
-                exit_loop = true;
-                break;
-            }
-            default:
-                abort();
-                break;
+            //Check the VID/PID of the opened device
+            const usb_device_desc_t *device_desc;
+            TEST_ASSERT_EQUAL(ESP_OK, usb_host_get_device_descriptor(ctrl_obj.dev_hdl, &device_desc));
+            TEST_ASSERT_EQUAL(ctrl_obj.test_param.idVendor, device_desc->idVendor);
+            TEST_ASSERT_EQUAL(ctrl_obj.test_param.idProduct, device_desc->idProduct);
+            //Cache the active configuration descriptor for later comparison
+            TEST_ASSERT_EQUAL(ESP_OK, usb_host_get_active_config_descriptor(ctrl_obj.dev_hdl, &ctrl_obj.config_desc_cached));
+            ctrl_obj.next_stage = TEST_STAGE_CTRL_XFER;
+            skip_event_handling = true;
+            break;
+        }
+        case TEST_STAGE_CTRL_XFER: {
+            ESP_LOGD(CTRL_CLIENT_TAG, "Transfer");
+            //Send a control transfer to get the device's configuration descriptor
+            usb_transfer_t *transfer = ctrl_xfer[ctrl_obj.num_xfer_sent % NUM_TRANSFER_OBJ];
+            USB_SETUP_PACKET_INIT_GET_CONFIG_DESC((usb_setup_packet_t *)transfer->data_buffer, 0, MAX_TRANSFER_BYTES);
+            transfer->num_bytes = sizeof(usb_setup_packet_t) + MAX_TRANSFER_BYTES;
+            transfer->bEndpointAddress = 0x80;
+            TEST_ASSERT_EQUAL(ESP_OK, usb_host_transfer_submit_control(ctrl_obj.client_hdl, transfer));
+            ctrl_obj.num_xfer_sent++;
+            ctrl_obj.next_stage = TEST_STAGE_CTRL_XFER_WAIT;
+            skip_event_handling = true;
+            break;
+        }
+        case TEST_STAGE_CTRL_XFER_WAIT: {
+            //Nothing to do but wait
+            break;
+        }
+        case TEST_STAGE_DEV_CLOSE: {
+            ESP_LOGD(CTRL_CLIENT_TAG, "Close");
+            vTaskDelay(10); // Give USB Host Lib some time to process all trnsfers
+            TEST_ASSERT_EQUAL(ESP_OK, usb_host_device_close(ctrl_obj.client_hdl, ctrl_obj.dev_hdl));
+            exit_loop = true;
+            break;
+        }
+        default:
+            abort();
+            break;
         }
     }
     //Free transfers and deregister client