jesus/tinyusb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change usbh_control_xfer_subtask to use flat API instead of passing tusb_control_request_t struct

Browse Source
This commit is contained in:
hathach
2013-07-05 13:23:42 +07:00
parent c08c655fd1
commit 374aea7a11
14 changed files with 124 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c
+8 -27
View File
@@ -67,16 +67,6 @@ static pipe_handle_t pipe_int = { .dev_addr = 1, .xfer_type = TUSB_XFE
extern cdch_data_t cdch_data[TUSB_CFG_HOST_DEVICE_MAX];
static cdch_data_t * p_cdc = &cdch_data[0];
tusb_control_request_t req_send_cmd =
{
.bmRequestType = {
.direction = TUSB_DIR_HOST_TO_DEV,
.type = TUSB_REQUEST_TYPE_CLASS,
.recipient = TUSB_REQUEST_RECIPIENT_INTERFACE
},
.bRequest = SEND_ENCAPSULATED_COMMAND,
};
void stub_mutex_wait(osal_mutex_handle_t mutex_hdl, uint32_t msec, tusb_error_t *p_error, int num_call)
{
@@ -87,7 +77,6 @@ void setUp(void)
{
length = 0;
dev_addr = 1;
req_send_cmd.wIndex = p_comm_interface->bInterfaceNumber;
cdch_init();
@@ -115,25 +104,17 @@ rndis_msg_initialize_t msg_init =
.max_xfer_size = 0x4000 // TODO mimic windows
};
void test_rndis_send_initalize_failed(void)
{
req_send_cmd.wLength = sizeof(rndis_msg_initialize_t);
usbh_control_xfer_subtask_ExpectWithArrayAndReturn(dev_addr,
&req_send_cmd, 1,
(uint8_t*)&msg_init, sizeof(rndis_msg_initialize_t), TUSB_ERROR_OSAL_TIMEOUT);
tusbh_cdc_rndis_mounted_cb_Expect(dev_addr);
//------------- Code Under Test -------------//
TEST_ASSERT_EQUAL( TUSB_ERROR_NONE, cdch_open_subtask(dev_addr, p_comm_interface, &length) );
}
//void test_rndis_send_initalize_failed(void)
//{
//
//}
void test_rndis_send_initalize_ok(void)
{
req_send_cmd.wLength = sizeof(rndis_msg_initialize_t);
usbh_control_xfer_subtask_ExpectWithArrayAndReturn(dev_addr,
&req_send_cmd, 1,
(uint8_t*)&msg_init, sizeof(rndis_msg_initialize_t), TUSB_ERROR_OSAL_TIMEOUT);
usbh_control_xfer_subtask_ExpectWithArrayAndReturn(
dev_addr, 0x21, SEND_ENCAPSULATED_COMMAND, 0, p_comm_interface->bInterfaceNumber,
sizeof(rndis_msg_initialize_t), (uint8_t*)&msg_init, sizeof(rndis_msg_initialize_t), TUSB_ERROR_OSAL_TIMEOUT);
tusbh_cdc_rndis_mounted_cb_Expect(dev_addr);
tests/lpc18xx_43xx/test/host/ehci/test_ehci_usbh_hcd_integration.c
+2 -2
View File
@@ -100,7 +100,7 @@ void test_addr0_control_close(void)
TEST_ASSERT_STATUS( hcd_pipe_control_xfer(dev_addr,
&(tusb_control_request_t) {
.bmRequestType = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
.bmRequestType_bit = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
.bRequest = TUSB_REQUEST_SET_ADDRESS,
.wValue = 3 },
NULL) ) ;
@@ -125,7 +125,7 @@ void test_isr_disconnect_then_async_advance_control_pipe(void)
TEST_ASSERT_STATUS( hcd_pipe_control_xfer(dev_addr,
&(tusb_control_request_t) {
.bmRequestType = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
.bmRequestType_bit = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
.bRequest = TUSB_REQUEST_SET_ADDRESS,
.wValue = 3 },
NULL) );
tests/lpc18xx_43xx/test/host/ehci/test_pipe_control_xfer.c
+2 -2
View File
@@ -105,7 +105,7 @@ void tearDown(void)
//--------------------------------------------------------------------+
tusb_control_request_t request_get_dev_desc =
{
.bmRequestType = { .direction = TUSB_DIR_DEV_TO_HOST, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
.bmRequestType_bit = { .direction = TUSB_DIR_DEV_TO_HOST, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
.bRequest = TUSB_REQUEST_GET_DESCRIPTOR,
.wValue = (TUSB_DESC_TYPE_DEVICE << 8),
.wLength = 18
@@ -113,7 +113,7 @@ tusb_control_request_t request_get_dev_desc =
tusb_control_request_t request_set_dev_addr =
{
.bmRequestType = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
.bmRequestType_bit = { .direction = TUSB_DIR_HOST_TO_DEV, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
.bRequest = TUSB_REQUEST_SET_ADDRESS,
.wValue = 3
};
tests/lpc18xx_43xx/test/host/hid/test_hidh_keyboard.c
+3 -3
View File
@@ -124,9 +124,9 @@ static tusb_error_t stub_set_idle_request(uint8_t address, tusb_control_request_
//------------- expecting Set Idle with value = 0 -------------//
TEST_ASSERT_NOT_NULL( p_request );
TEST_ASSERT_EQUAL(TUSB_DIR_HOST_TO_DEV , p_request->bmRequestType.direction);
TEST_ASSERT_EQUAL(TUSB_REQUEST_TYPE_CLASS , p_request->bmRequestType.type);
TEST_ASSERT_EQUAL(TUSB_REQUEST_RECIPIENT_INTERFACE , p_request->bmRequestType.recipient);
TEST_ASSERT_EQUAL(TUSB_DIR_HOST_TO_DEV , p_request->bmRequestType_bit.direction);
TEST_ASSERT_EQUAL(TUSB_REQUEST_TYPE_CLASS , p_request->bmRequestType_bit.type);
TEST_ASSERT_EQUAL(TUSB_REQUEST_RECIPIENT_INTERFACE , p_request->bmRequestType_bit.recipient);
TEST_ASSERT_EQUAL(HID_REQUEST_CONTROL_SET_IDLE , p_request->bRequest);
TEST_ASSERT_EQUAL(0 , p_request->wValue);
TEST_ASSERT_EQUAL(p_kbd_interface_desc->bInterfaceNumber , p_request->wIndex);
tests/lpc18xx_43xx/test/host/hid/test_hidh_mouse.c
+3 -3
View File
@@ -113,9 +113,9 @@ static tusb_error_t stub_set_idle_request(uint8_t address, tusb_control_request_
//------------- expecting Set Idle with value = 0 -------------//
TEST_ASSERT_NOT_NULL( p_request );
TEST_ASSERT_EQUAL(TUSB_DIR_HOST_TO_DEV , p_request->bmRequestType.direction);
TEST_ASSERT_EQUAL(TUSB_REQUEST_TYPE_CLASS , p_request->bmRequestType.type);
TEST_ASSERT_EQUAL(TUSB_REQUEST_RECIPIENT_INTERFACE , p_request->bmRequestType.recipient);
TEST_ASSERT_EQUAL(TUSB_DIR_HOST_TO_DEV , p_request->bmRequestType_bit.direction);
TEST_ASSERT_EQUAL(TUSB_REQUEST_TYPE_CLASS , p_request->bmRequestType_bit.type);
TEST_ASSERT_EQUAL(TUSB_REQUEST_RECIPIENT_INTERFACE , p_request->bmRequestType_bit.recipient);
TEST_ASSERT_EQUAL(HID_REQUEST_CONTROL_SET_IDLE , p_request->bRequest);
TEST_ASSERT_EQUAL(0 , p_request->wValue);
TEST_ASSERT_EQUAL(p_mouse_interface_desc->bInterfaceNumber , p_request->wIndex);
tests/lpc18xx_43xx/test/host/usbh/test_enum_task.c
+5
View File
@@ -70,6 +70,7 @@ void setUp(void)
osal_queue_receive_StubWithCallback(queue_recv_stub);
osal_semaphore_wait_StubWithCallback(semaphore_wait_success_stub);
osal_semaphore_post_IgnoreAndReturn(TUSB_ERROR_NONE);
osal_mutex_wait_StubWithCallback(semaphore_wait_success_stub);
osal_mutex_release_IgnoreAndReturn(TUSB_ERROR_NONE);
hcd_pipe_control_xfer_StubWithCallback(control_xfer_stub);
@@ -160,6 +161,10 @@ tusb_error_t control_xfer_stub(uint8_t dev_addr, const tusb_control_request_t *
return TUSB_ERROR_OSAL_TIMEOUT;
}
usbh_xfer_isr(
(pipe_handle_t) { .dev_addr = (num_call > 1 ? 1 : 0), .xfer_type = TUSB_XFER_CONTROL },
0, TUSB_EVENT_XFER_COMPLETE, 0);
return TUSB_ERROR_NONE;
}
tests/lpc18xx_43xx/test/host/usbh/test_usbh.c
+18 -4
View File
@@ -181,18 +181,32 @@ static void mutex_wait_failed_stub(osal_mutex_handle_t const sem_hdl, uint32_t m
void test_usbh_control_xfer_mutex_failed(void)
{
tusb_control_request_t a_request;
tusb_control_request_t a_request =
{
.bmRequestType = 1,
.bRequest = 2,
.wValue = 3,
.wIndex = 4,
.wLength = 0
};
osal_mutex_wait_StubWithCallback(mutex_wait_failed_stub);
osal_mutex_release_ExpectAndReturn(usbh_devices[dev_addr].control.mutex_hdl, TUSB_ERROR_NONE);
//------------- Code Under Test -------------//
usbh_control_xfer_subtask(dev_addr, &a_request, NULL);
usbh_control_xfer_subtask(dev_addr, 1, 2, 3, 4, 0, NULL);
}
void test_usbh_control_xfer_ok(void)
{
tusb_control_request_t a_request;
tusb_control_request_t a_request =
{
.bmRequestType = 1,
.bRequest = 2,
.wValue = 3,
.wIndex = 4,
.wLength = 0
};
osal_mutex_wait_StubWithCallback(semaphore_wait_success_stub);
@@ -202,5 +216,5 @@ void test_usbh_control_xfer_ok(void)
osal_mutex_release_ExpectAndReturn(usbh_devices[dev_addr].control.mutex_hdl, TUSB_ERROR_NONE);
//------------- Code Under Test -------------//
usbh_control_xfer_subtask(dev_addr, &a_request, NULL);
usbh_control_xfer_subtask(dev_addr, 1, 2, 3, 4, 0, NULL);
}
tests/support/ehci_controller_fake.c
+1 -1
View File
@@ -73,7 +73,7 @@ void ehci_controller_control_xfer_proceed(uint8_t dev_addr, uint8_t p_data[])
tusb_control_request_t const *p_request = (tusb_control_request_t *) p_qtd_setup->buffer[0];
if (p_request->wLength > 0 && p_request->bmRequestType.direction == TUSB_DIR_DEV_TO_HOST)
if (p_request->wLength > 0 && p_request->bmRequestType_bit.direction == TUSB_DIR_DEV_TO_HOST)
{
memcpy(p_qtd_data, p_data, p_request->wLength);
}