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);