mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-21 06:56:11 -04:00
refactor(usb/host): reformat code with astyle_py
This commit is contained in:
parent
1e2c271bd0
commit
3964fb2d04
@ -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
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@ -137,21 +137,21 @@ void mock_msc_scsi_init_reference_descriptors(void)
|
|||||||
// String descriptors
|
// String descriptors
|
||||||
const char *str = MOCK_MSC_SCSI_STRING_1;
|
const char *str = MOCK_MSC_SCSI_STRING_1;
|
||||||
uint8_t chr_count = strlen(str);
|
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++) {
|
for (uint8_t i = 0; i < chr_count; i++) {
|
||||||
mock_msc_scsi_str_desc_manu[1 + i] = str[i];
|
mock_msc_scsi_str_desc_manu[1 + i] = str[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
str = MOCK_MSC_SCSI_STRING_2;
|
str = MOCK_MSC_SCSI_STRING_2;
|
||||||
chr_count = strlen(str);
|
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++) {
|
for (uint8_t i = 0; i < chr_count; i++) {
|
||||||
mock_msc_scsi_str_desc_prod[1 + i] = str[i];
|
mock_msc_scsi_str_desc_prod[1 + i] = str[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
str = MOCK_MSC_SCSI_STRING_3;
|
str = MOCK_MSC_SCSI_STRING_3;
|
||||||
chr_count = strlen(str);
|
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++) {
|
for (uint8_t i = 0; i < chr_count; i++) {
|
||||||
mock_msc_scsi_str_desc_ser_num[1 + i] = str[i];
|
mock_msc_scsi_str_desc_ser_num[1 + i] = str[i];
|
||||||
}
|
}
|
||||||
|
@ -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
|
* 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; \
|
(setup_pkt_ptr)->wLength = 0; \
|
||||||
})
|
})
|
||||||
|
|
||||||
typedef struct __attribute__((packed)) {
|
typedef struct __attribute__((packed))
|
||||||
|
{
|
||||||
uint8_t opcode; //0x28 = read(10), 0x2A=write(10)
|
uint8_t opcode; //0x28 = read(10), 0x2A=write(10)
|
||||||
uint8_t flags;
|
uint8_t flags;
|
||||||
uint8_t lba_3;
|
uint8_t lba_3;
|
||||||
@ -125,7 +126,8 @@ typedef struct __attribute__((packed)) {
|
|||||||
uint8_t control;
|
uint8_t control;
|
||||||
} mock_scsi_cmd10_t;
|
} mock_scsi_cmd10_t;
|
||||||
|
|
||||||
typedef struct __attribute__((packed)) {
|
typedef struct __attribute__((packed))
|
||||||
|
{
|
||||||
uint32_t dCBWSignature;
|
uint32_t dCBWSignature;
|
||||||
uint32_t dCBWTag;
|
uint32_t dCBWTag;
|
||||||
uint32_t dCBWDataTransferLength;
|
uint32_t dCBWDataTransferLength;
|
||||||
@ -137,7 +139,8 @@ typedef struct __attribute__((packed)) {
|
|||||||
} mock_msc_bulk_cbw_t;
|
} mock_msc_bulk_cbw_t;
|
||||||
|
|
||||||
// USB Bulk Transfer Command Status Wrapper data
|
// USB Bulk Transfer Command Status Wrapper data
|
||||||
typedef struct __attribute__((packed)) {
|
typedef struct __attribute__((packed))
|
||||||
|
{
|
||||||
uint32_t dCSWSignature;
|
uint32_t dCSWSignature;
|
||||||
uint32_t dCSWTag;
|
uint32_t dCSWTag;
|
||||||
uint32_t dCSWDataResidue;
|
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_NUM 2
|
||||||
#define MOCK_ISOC_EP_MPS 512
|
#define MOCK_ISOC_EP_MPS 512
|
||||||
|
|
||||||
|
|
||||||
static const usb_ep_desc_t mock_isoc_out_ep_desc = {
|
static const usb_ep_desc_t mock_isoc_out_ep_desc = {
|
||||||
.bLength = sizeof(usb_ep_desc_t),
|
.bLength = sizeof(usb_ep_desc_t),
|
||||||
.bDescriptorType = USB_B_DESCRIPTOR_TYPE_ENDPOINT,
|
.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
|
.bInterval = 1, //Isoc interval is (2 ^ (bInterval - 1)) which means an interval of 1ms
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -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
|
* 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_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);
|
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));
|
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);
|
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_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);
|
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));
|
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);
|
printf("Config Desc wTotalLength %d\n", config_desc->wTotalLength);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -274,7 +274,7 @@ TEST_CASE("Test HCD control pipe runtime halt and clear", "[ctrl][low_speed][ful
|
|||||||
TEST_ASSERT_GREATER_OR_EQUAL(sizeof(usb_setup_packet_t), urb->transfer.actual_num_bytes);
|
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);
|
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));
|
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);
|
printf("Config Desc wTotalLength %d\n", config_desc->wTotalLength);
|
||||||
} else {
|
} else {
|
||||||
//A failed transfer should 0 actual number of bytes transmitted
|
//A failed transfer should 0 actual number of bytes transmitted
|
||||||
|
@ -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
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@ -100,7 +100,7 @@ void ctrl_client_async_seq_task(void *arg)
|
|||||||
.max_num_event_msg = CTRL_CLIENT_MAX_EVENT_MSGS,
|
.max_num_event_msg = CTRL_CLIENT_MAX_EVENT_MSGS,
|
||||||
.async = {
|
.async = {
|
||||||
.client_event_callback = ctrl_client_event_cb,
|
.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));
|
TEST_ASSERT_EQUAL(ESP_OK, usb_host_client_register(&client_config, &ctrl_obj.client_hdl));
|
||||||
|
@ -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
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@ -133,7 +133,7 @@ void msc_client_async_dconn_task(void *arg)
|
|||||||
.max_num_event_msg = MSC_ASYNC_CLIENT_MAX_EVENT_MSGS,
|
.max_num_event_msg = MSC_ASYNC_CLIENT_MAX_EVENT_MSGS,
|
||||||
.async = {
|
.async = {
|
||||||
.client_event_callback = msc_client_event_cb,
|
.client_event_callback = msc_client_event_cb,
|
||||||
.callback_arg = (void *)&msc_obj,
|
.callback_arg = (void *) &msc_obj,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
TEST_ASSERT_EQUAL(ESP_OK, usb_host_client_register(&client_config, &msc_obj.client_hdl));
|
TEST_ASSERT_EQUAL(ESP_OK, usb_host_client_register(&client_config, &msc_obj.client_hdl));
|
||||||
|
@ -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
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@ -81,7 +81,7 @@ void msc_client_async_enum_task(void *arg)
|
|||||||
.max_num_event_msg = MSC_ASYNC_CLIENT_MAX_EVENT_MSGS,
|
.max_num_event_msg = MSC_ASYNC_CLIENT_MAX_EVENT_MSGS,
|
||||||
.async = {
|
.async = {
|
||||||
.client_event_callback = msc_client_event_cb,
|
.client_event_callback = msc_client_event_cb,
|
||||||
.callback_arg = (void *)&msc_obj,
|
.callback_arg = (void *) &msc_obj,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
TEST_ASSERT_EQUAL(ESP_OK, usb_host_client_register(&client_config, &msc_obj.client_hdl));
|
TEST_ASSERT_EQUAL(ESP_OK, usb_host_client_register(&client_config, &msc_obj.client_hdl));
|
||||||
@ -149,8 +149,8 @@ void msc_client_async_enum_task(void *arg)
|
|||||||
TEST_ASSERT_EQUAL(manu_str_desc_ref->bLength, dev_info.str_desc_manufacturer->bLength);
|
TEST_ASSERT_EQUAL(manu_str_desc_ref->bLength, dev_info.str_desc_manufacturer->bLength);
|
||||||
TEST_ASSERT_EQUAL(product_str_desc_ref->bLength, dev_info.str_desc_product->bLength);
|
TEST_ASSERT_EQUAL(product_str_desc_ref->bLength, dev_info.str_desc_product->bLength);
|
||||||
TEST_ASSERT_EQUAL(ser_num_str_desc_ref->bLength, dev_info.str_desc_serial_num->bLength);
|
TEST_ASSERT_EQUAL(ser_num_str_desc_ref->bLength, dev_info.str_desc_serial_num->bLength);
|
||||||
TEST_ASSERT_EQUAL_MEMORY_MESSAGE(manu_str_desc_ref, dev_info.str_desc_manufacturer , manu_str_desc_ref->bLength, "Manufacturer string descriptors do not match.");
|
TEST_ASSERT_EQUAL_MEMORY_MESSAGE(manu_str_desc_ref, dev_info.str_desc_manufacturer, manu_str_desc_ref->bLength, "Manufacturer string descriptors do not match.");
|
||||||
TEST_ASSERT_EQUAL_MEMORY_MESSAGE(product_str_desc_ref, dev_info.str_desc_product , manu_str_desc_ref->bLength, "Product string descriptors do not match.");
|
TEST_ASSERT_EQUAL_MEMORY_MESSAGE(product_str_desc_ref, dev_info.str_desc_product, manu_str_desc_ref->bLength, "Product string descriptors do not match.");
|
||||||
//TEST_ASSERT_EQUAL_MEMORY_MESSAGE(ser_num_str_desc_ref, dev_info.str_desc_serial_num , manu_str_desc_ref->bLength, "Serial number string descriptors do not match.");
|
//TEST_ASSERT_EQUAL_MEMORY_MESSAGE(ser_num_str_desc_ref, dev_info.str_desc_serial_num , manu_str_desc_ref->bLength, "Serial number string descriptors do not match.");
|
||||||
//Get dev info and compare
|
//Get dev info and compare
|
||||||
msc_obj.next_stage = TEST_STAGE_DEV_CLOSE;
|
msc_obj.next_stage = TEST_STAGE_DEV_CLOSE;
|
||||||
|
@ -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
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@ -132,7 +132,7 @@ void msc_client_async_seq_task(void *arg)
|
|||||||
.max_num_event_msg = MSC_ASYNC_CLIENT_MAX_EVENT_MSGS,
|
.max_num_event_msg = MSC_ASYNC_CLIENT_MAX_EVENT_MSGS,
|
||||||
.async = {
|
.async = {
|
||||||
.client_event_callback = msc_client_event_cb,
|
.client_event_callback = msc_client_event_cb,
|
||||||
.callback_arg = (void *)&msc_obj,
|
.callback_arg = (void *) &msc_obj,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
TEST_ASSERT_EQUAL(ESP_OK, usb_host_client_register(&client_config, &msc_obj.client_hdl));
|
TEST_ASSERT_EQUAL(ESP_OK, usb_host_client_register(&client_config, &msc_obj.client_hdl));
|
||||||
|
@ -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
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@ -197,7 +197,7 @@ TEST_CASE("Test USB Host async API", "[usb_host][full_speed][low_speed]")
|
|||||||
.max_num_event_msg = 5,
|
.max_num_event_msg = 5,
|
||||||
.async = {
|
.async = {
|
||||||
.client_event_callback = test_async_client_cb,
|
.client_event_callback = test_async_client_cb,
|
||||||
.callback_arg = (void *)&client0_stage,
|
.callback_arg = (void *) &client0_stage,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
usb_host_client_handle_t client0_hdl;
|
usb_host_client_handle_t client0_hdl;
|
||||||
|
@ -1081,7 +1081,7 @@ esp_err_t usbh_ep_enqueue_urb(usbh_ep_handle_t ep_hdl, urb_t *urb)
|
|||||||
|
|
||||||
endpoint_t *ep_obj = (endpoint_t *)ep_hdl;
|
endpoint_t *ep_obj = (endpoint_t *)ep_hdl;
|
||||||
|
|
||||||
USBH_CHECK( transfer_check_usb_compliance(&(urb->transfer),
|
USBH_CHECK(transfer_check_usb_compliance(&(urb->transfer),
|
||||||
USB_EP_DESC_GET_XFERTYPE(ep_obj->constant.ep_desc),
|
USB_EP_DESC_GET_XFERTYPE(ep_obj->constant.ep_desc),
|
||||||
USB_EP_DESC_GET_MPS(ep_obj->constant.ep_desc),
|
USB_EP_DESC_GET_MPS(ep_obj->constant.ep_desc),
|
||||||
USB_EP_DESC_GET_EP_DIR(ep_obj->constant.ep_desc)),
|
USB_EP_DESC_GET_EP_DIR(ep_obj->constant.ep_desc)),
|
||||||
|
@ -109,7 +109,6 @@ components_not_formatted_temporary:
|
|||||||
- "/components/touch_element/"
|
- "/components/touch_element/"
|
||||||
- "/components/ulp/"
|
- "/components/ulp/"
|
||||||
- "/components/unity/"
|
- "/components/unity/"
|
||||||
- "/components/usb/"
|
|
||||||
- "/components/vfs/"
|
- "/components/vfs/"
|
||||||
- "/components/wear_levelling/"
|
- "/components/wear_levelling/"
|
||||||
- "/components/wifi_provisioning/"
|
- "/components/wifi_provisioning/"
|
||||||
|
Loading…
Reference in New Issue
Block a user