diff --git a/demos/host/host_os_none/.cproject b/demos/host/host_os_none/.cproject
index b6e58c291..6d264d965 100644
--- a/demos/host/host_os_none/.cproject
+++ b/demos/host/host_os_none/.cproject
@@ -82,7 +82,7 @@
-
+
@@ -1190,7 +1190,7 @@
-
+
@@ -2298,7 +2298,7 @@
-
+
@@ -3406,7 +3406,7 @@
-
+
@@ -4511,7 +4511,7 @@
-
+
diff --git a/demos/host/host_os_none/host_os_none.uvopt b/demos/host/host_os_none/host_os_none.uvopt
index 802b17479..e0da29232 100644
--- a/demos/host/host_os_none/host_os_none.uvopt
+++ b/demos/host/host_os_none/host_os_none.uvopt
@@ -142,10 +142,6 @@
ARMDBGFLAGS
-
- 0
- DLGUARM
-
0
JL2CM3
@@ -391,10 +387,10 @@
1
0
0
- 65
+ 40
0
- 10
- 16
+ 13
+ 22
0
..\src\main.c
main.c
@@ -439,10 +435,10 @@
1
0
0
- 0
+ 47
0
- 0
- 0
+ 61
+ 139
0
..\src\mouse_app.c
mouse_app.c
@@ -999,10 +995,10 @@
2
0
0
- 5
+ 12
0
- 0
- 0
+ 147
+ 150
0
..\..\bsp\lpc43xx\startup_keil\startup_LPC43xx.s
startup_LPC43xx.s
diff --git a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c
index 9ccd24404..91070f55c 100644
--- a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c
+++ b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c
@@ -70,6 +70,10 @@ extern rndish_data_t rndish_data[TUSB_CFG_HOST_DEVICE_MAX];
static cdch_data_t * p_cdc = &cdch_data[0];
static rndish_data_t * p_rndis = &rndish_data[0];
+enum {
+ bmrequest_send = 0x21,
+ bmrequest_get = 0xA1
+};
void stub_mutex_wait(osal_mutex_handle_t mutex_hdl, uint32_t msec, tusb_error_t *p_error, int num_call)
{
@@ -102,7 +106,7 @@ void tearDown(void)
}
-rndis_msg_initialize_t msg_init =
+static rndis_msg_initialize_t msg_init =
{
.type = RNDIS_MSG_INITIALIZE,
.length = sizeof(rndis_msg_initialize_t),
@@ -112,7 +116,7 @@ rndis_msg_initialize_t msg_init =
.max_xfer_size = 0x4000 // TODO mimic windows
};
-rndis_msg_initialize_cmplt_t msg_init_cmplt =
+static rndis_msg_initialize_cmplt_t msg_init_cmplt =
{
.type = RNDIS_MSG_INITIALIZE_CMPLT,
.length = sizeof(rndis_msg_initialize_cmplt_t),
@@ -127,7 +131,7 @@ rndis_msg_initialize_cmplt_t msg_init_cmplt =
.packet_alignment_factor = 5 // aligment of each RNDIS message (payload) = 2^factor
};
-rndis_msg_query_t msg_query_permanent_addr =
+static rndis_msg_query_t msg_query_permanent_addr =
{
.type = RNDIS_MSG_QUERY,
.length = sizeof(rndis_msg_query_t)+6,
@@ -138,7 +142,7 @@ rndis_msg_query_t msg_query_permanent_addr =
.oid_buffer = {0, 0, 0, 0, 0, 0}
};
-rndis_msg_query_cmplt_t msg_query_permanent_addr_cmplt =
+static rndis_msg_query_cmplt_t msg_query_permanent_addr_cmplt =
{
.type = RNDIS_MSG_QUERY_CMPLT,
.length = sizeof(rndis_msg_query_cmplt_t)+6,
@@ -149,17 +153,24 @@ rndis_msg_query_cmplt_t msg_query_permanent_addr_cmplt =
.oid_buffer = "CAFEBB"
};
-void test_rndis_send_initalize_failed(void)
+static rndis_msg_set_t msg_set_packet_filter =
{
- 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);
+ .type = RNDIS_MSG_SET,
+ .length = sizeof(rndis_msg_set_t)+4,
+ .request_id = 1,
+ .oid = OID_GEN_CURRENT_PACKET_FILTER,
+ .buffer_length = 4,
+ .buffer_offset = 20,
+ .oid_buffer = {NDIS_PACKET_TYPE_DIRECTED | NDIS_PACKET_TYPE_MULTICAST | NDIS_PACKET_TYPE_BROADCAST, 0, 0, 0}
+};
- tusbh_cdc_mounted_cb_Expect(dev_addr);
-
- //------------- Code Under Test -------------//
- TEST_ASSERT_EQUAL( TUSB_ERROR_NONE, cdch_open_subtask(dev_addr, p_comm_interface, &length) );
-}
+static rndis_msg_set_cmplt_t msg_set_packet_filter_cmplt =
+{
+ .type = RNDIS_MSG_SET_CMPLT,
+ .length = sizeof(rndis_msg_set_cmplt_t),
+ .request_id = 1,
+ .status = RNDIS_STATUS_SUCCESS
+};
static tusb_error_t stub_pipe_notification_xfer(pipe_handle_t pipe_hdl, uint8_t buffer[], uint16_t total_bytes, bool int_on_complete, int num_call)
{
@@ -185,10 +196,23 @@ void stub_sem_wait_timeout(osal_semaphore_handle_t const sem_hdl, uint32_t msec,
(*p_error) = TUSB_ERROR_OSAL_TIMEOUT;
}
+//------------- Test Code -------------//
+void test_rndis_send_initalize_failed(void)
+{
+ usbh_control_xfer_subtask_ExpectWithArrayAndReturn(
+ dev_addr, bmrequest_send, 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_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_initialization_notification_timeout(void)
{
usbh_control_xfer_subtask_ExpectWithArrayAndReturn(
- dev_addr, 0x21, SEND_ENCAPSULATED_COMMAND, 0, p_comm_interface->bInterfaceNumber,
+ dev_addr, bmrequest_send, SEND_ENCAPSULATED_COMMAND, 0, p_comm_interface->bInterfaceNumber,
sizeof(rndis_msg_initialize_t), (uint8_t*)&msg_init, sizeof(rndis_msg_initialize_t), TUSB_ERROR_NONE);
hcd_pipe_xfer_IgnoreAndReturn(TUSB_ERROR_NONE);
@@ -210,32 +234,49 @@ tusb_error_t stub_control_xfer(uint8_t addr, uint8_t bmRequestType, uint8_t bReq
switch(num_call)
{
- case 0: // initialize
- TEST_ASSERT_EQUAL(0x21, bmRequestType);
+ //------------- Initialize -------------//
+ case 0*2+0: // initialize
+ TEST_ASSERT_EQUAL(bmrequest_send, bmRequestType);
TEST_ASSERT_EQUAL(SEND_ENCAPSULATED_COMMAND, bRequest);
- TEST_ASSERT_EQUAL(0x18, wLength);
+ TEST_ASSERT_EQUAL(sizeof(rndis_msg_initialize_t), wLength);
TEST_ASSERT_EQUAL_HEX8_ARRAY(&msg_init, data, wLength);
break;
- case 1: // initialize complete
- TEST_ASSERT_EQUAL(0xA1, bmRequestType);
+ case 0*2+1: // initialize complete
+ TEST_ASSERT_EQUAL(bmrequest_get, bmRequestType);
TEST_ASSERT_EQUAL(GET_ENCAPSULATED_RESPONSE, bRequest);
TEST_ASSERT( wLength >= 0x0400 ); // Microsoft Specs
- memcpy(data, &msg_init_cmplt, 0x30);
+ memcpy(data, &msg_init_cmplt, sizeof(rndis_msg_initialize_cmplt_t));
break;
- case 2: // query for OID_802_3_PERMANENT_ADDRESS
- TEST_ASSERT_EQUAL(0x21, bmRequestType);
+ // query for OID_802_3_PERMANENT_ADDRESS
+ case 1*2+0:
+ TEST_ASSERT_EQUAL(bmrequest_send, bmRequestType);
TEST_ASSERT_EQUAL(SEND_ENCAPSULATED_COMMAND, bRequest);
- TEST_ASSERT_EQUAL(34, wLength); // sizeof(rndis_msg_query_t) + 6 MAC address
+ TEST_ASSERT_EQUAL(sizeof(rndis_msg_query_t) + 6, wLength); // 6 bytes for MAC address
TEST_ASSERT_EQUAL_HEX8_ARRAY(&msg_query_permanent_addr, data, wLength);
break;
- case 3: // query complete for OID_802_3_PERMANENT_ADDRESS
- TEST_ASSERT_EQUAL(0xA1, bmRequestType);
+ case 1*2+1: // query complete for OID_802_3_PERMANENT_ADDRESS
+ TEST_ASSERT_EQUAL(bmrequest_get, bmRequestType);
TEST_ASSERT_EQUAL(GET_ENCAPSULATED_RESPONSE, bRequest);
TEST_ASSERT( wLength >= 0x0400 ); // Microsoft Specs
- memcpy(data, &msg_query_permanent_addr_cmplt, 30);
+ memcpy(data, &msg_query_permanent_addr_cmplt, sizeof(rndis_msg_query_cmplt_t) + 6);
+ break;
+
+ // set OID_GEN_CURRENT_PACKET_FILTER to DIRECTED | MULTICAST | BROADCAST
+ case 2*2+0:
+ TEST_ASSERT_EQUAL(bmrequest_send, bmRequestType);
+ TEST_ASSERT_EQUAL(SEND_ENCAPSULATED_COMMAND, bRequest);
+ TEST_ASSERT_EQUAL(sizeof(rndis_msg_set_t)+4, wLength);
+ TEST_ASSERT_EQUAL_HEX8_ARRAY(&msg_set_packet_filter, data, wLength);
+ break;
+
+ case 2*2+1: // query complete for OID_802_3_PERMANENT_ADDRESS
+ TEST_ASSERT_EQUAL(bmrequest_get, bmRequestType);
+ TEST_ASSERT_EQUAL(GET_ENCAPSULATED_RESPONSE, bRequest);
+ TEST_ASSERT( wLength >= 0x0400 ); // Microsoft Specs
+ memcpy(data, &msg_set_packet_filter_cmplt, sizeof(rndis_msg_set_cmplt_t) );
break;
default:
@@ -251,6 +292,7 @@ void test_rndis_initialization_sequence_ok(void)
hcd_pipe_xfer_StubWithCallback(stub_pipe_notification_xfer);
osal_semaphore_wait_StubWithCallback(stub_sem_wait_success);
+ osal_semaphore_post_ExpectAndReturn(p_rndis->sem_notification_hdl, TUSB_ERROR_NONE);
osal_semaphore_post_ExpectAndReturn(p_rndis->sem_notification_hdl, TUSB_ERROR_NONE);
osal_semaphore_post_ExpectAndReturn(p_rndis->sem_notification_hdl, TUSB_ERROR_NONE);
diff --git a/tinyusb/class/cdc_rndis.h b/tinyusb/class/cdc_rndis.h
index ad667ab2e..334f6145d 100644
--- a/tinyusb/class/cdc_rndis.h
+++ b/tinyusb/class/cdc_rndis.h
@@ -64,6 +64,7 @@ typedef enum {
RNDIS_MSG_QUERY_CMPLT = 0x80000004UL,
RNDIS_MSG_SET = 0x00000005UL,
+ RNDIS_MSG_SET_CMPLT = 0x80000005UL,
RNDIS_MSG_RESET = 0x00000006UL,
RNDIS_MSG_RESET_CMPLT = 0x80000006UL,
diff --git a/tinyusb/class/cdc_rndis_host.c b/tinyusb/class/cdc_rndis_host.c
index 5ae808b68..98c0f3ed6 100644
--- a/tinyusb/class/cdc_rndis_host.c
+++ b/tinyusb/class/cdc_rndis_host.c
@@ -135,6 +135,39 @@ void rndish_close(uint8_t dev_addr)
osal_semaphore_reset( rndish_data[dev_addr-1].sem_notification_hdl );
}
+
+static rndis_msg_initialize_t const msg_init =
+{
+ .type = RNDIS_MSG_INITIALIZE,
+ .length = sizeof(rndis_msg_initialize_t),
+ .request_id = 1, // TODO should use some magic number
+ .major_version = 1,
+ .minor_version = 0,
+ .max_xfer_size = 0x4000 // TODO mimic windows
+};
+
+static rndis_msg_query_t const msg_query_permanent_addr =
+{
+ .type = RNDIS_MSG_QUERY,
+ .length = sizeof(rndis_msg_query_t)+6,
+ .request_id = 1,
+ .oid = OID_802_3_PERMANENT_ADDRESS,
+ .buffer_length = 6,
+ .buffer_offset = 20,
+ .oid_buffer = {0, 0, 0, 0, 0, 0}
+};
+
+static rndis_msg_set_t const msg_set_packet_filter =
+{
+ .type = RNDIS_MSG_SET,
+ .length = sizeof(rndis_msg_set_t)+4,
+ .request_id = 1,
+ .oid = OID_GEN_CURRENT_PACKET_FILTER,
+ .buffer_length = 4,
+ .buffer_offset = 20,
+ .oid_buffer = { (uint8_t) (NDIS_PACKET_TYPE_DIRECTED | NDIS_PACKET_TYPE_MULTICAST | NDIS_PACKET_TYPE_BROADCAST), 0, 0, 0}
+};
+
tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc)
{
tusb_error_t error;
@@ -142,16 +175,7 @@ tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc)
OSAL_SUBTASK_BEGIN
//------------- Message Initialize -------------//
- *((rndis_msg_initialize_t*) msg_payload) = (rndis_msg_initialize_t)
- {
- .type = RNDIS_MSG_INITIALIZE,
- .length = sizeof(rndis_msg_initialize_t),
- .request_id = 1, // TODO should use some magic number
- .major_version = 1,
- .minor_version = 0,
- .max_xfer_size = 0x4000 // TODO mimic windows
- };
-
+ memcpy(msg_payload, &msg_init, sizeof(rndis_msg_initialize_t));
OSAL_SUBTASK_INVOKED_AND_WAIT(
send_message_get_response_subtask( dev_addr, p_cdc,
msg_payload, sizeof(rndis_msg_initialize_t),
@@ -160,25 +184,14 @@ tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc)
);
if ( TUSB_ERROR_NONE != error ) SUBTASK_EXIT(error);
+ // TODO currently not support multiple data packets per xfer
rndis_msg_initialize_cmplt_t * const p_init_cmpt = (rndis_msg_initialize_cmplt_t *) msg_payload;
-
-
- // TODO currently not support multiple data packets per xfer
SUBTASK_ASSERT(p_init_cmpt->type == RNDIS_MSG_INITIALIZE_CMPLT && p_init_cmpt->status == RNDIS_STATUS_SUCCESS &&
p_init_cmpt->max_packet_per_xfer == 1 && p_init_cmpt->max_xfer_size <= RNDIS_MSG_PAYLOAD_MAX);
rndish_data[dev_addr-1].max_xfer_size = p_init_cmpt->max_xfer_size;
//------------- Message Query 802.3 Permanent Address -------------//
- *((rndis_msg_query_t*) msg_payload) = (rndis_msg_query_t)
- {
- .type = RNDIS_MSG_QUERY,
- .length = sizeof(rndis_msg_query_t) + 6, // size message and MAC address
- .request_id = 1, // TODO should use some magic number
- .oid = OID_802_3_PERMANENT_ADDRESS,
- .buffer_length = 6, // sizeof MAC address
- .buffer_offset = 20, // offset(rndis_msg_query_t, oid_buffer) - offset(rndis_msg_query_t, request_id)
- };
- memclr_( ((rndis_msg_query_t*) msg_payload)->oid_buffer, 6);
+ memcpy(msg_payload, &msg_query_permanent_addr, sizeof(rndis_msg_query_t) + 6); // 6 bytes for MAC address
OSAL_SUBTASK_INVOKED_AND_WAIT(
send_message_get_response_subtask( dev_addr, p_cdc,
@@ -192,6 +205,22 @@ tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc)
SUBTASK_ASSERT(p_query_cmpt->type == RNDIS_MSG_QUERY_CMPLT && p_query_cmpt->status == RNDIS_STATUS_SUCCESS);
memcpy(rndish_data[dev_addr-1].mac_address, msg_payload + 8 + p_query_cmpt->buffer_offset, 6);
+ //------------- Set OID_GEN_CURRENT_PACKET_FILTER to (DIRECTED | MULTICAST | BROADCAST) -------------//
+ memcpy(msg_payload, &msg_set_packet_filter, sizeof(rndis_msg_set_t) + 4); // 4 bytes for filter flags
+
+ OSAL_SUBTASK_INVOKED_AND_WAIT(
+ send_message_get_response_subtask( dev_addr, p_cdc,
+ msg_payload, sizeof(rndis_msg_set_t) + 4,
+ msg_payload),
+ error
+ );
+ if ( TUSB_ERROR_NONE != error ) SUBTASK_EXIT(error);
+
+ rndis_msg_set_cmplt_t * const p_set_cmpt = (rndis_msg_set_cmplt_t *) msg_payload;
+ SUBTASK_ASSERT(p_set_cmpt->type == RNDIS_MSG_SET_CMPLT && p_set_cmpt->status == RNDIS_STATUS_SUCCESS);
+
+
+ //
if ( tusbh_cdc_rndis_mounted_cb )
{
tusbh_cdc_rndis_mounted_cb(dev_addr);
@@ -211,27 +240,6 @@ void rndish_xfer_isr(cdch_data_t *p_cdc, pipe_handle_t pipe_hdl, tusb_event_t ev
//--------------------------------------------------------------------+
// INTERNAL & HELPER
//--------------------------------------------------------------------+
-//static tusb_error_t send_process_msg_initialize_subtask(uint8_t dev_addr, cdch_data_t *p_cdc)
-//{
-// tusb_error_t error;
-//
-// OSAL_SUBTASK_BEGIN
-//
-// *((rndis_msg_initialize_t*) msg_payload) = (rndis_msg_initialize_t)
-// {
-// .type = RNDIS_MSG_INITIALIZE,
-// .length = sizeof(rndis_msg_initialize_t),
-// .request_id = 1, // TODO should use some magic number
-// .major_version = 1,
-// .minor_version = 0,
-// .max_xfer_size = 0x4000 // TODO mimic windows
-// };
-//
-//
-//
-// OSAL_SUBTASK_END
-//}
-
static tusb_error_t send_message_get_response_subtask( uint8_t dev_addr, cdch_data_t *p_cdc,
uint8_t * p_mess, uint32_t mess_length,
uint8_t *p_response)
@@ -267,4 +275,24 @@ static tusb_error_t send_message_get_response_subtask( uint8_t dev_addr, cdch_da
OSAL_SUBTASK_END
}
+//static tusb_error_t send_process_msg_initialize_subtask(uint8_t dev_addr, cdch_data_t *p_cdc)
+//{
+// tusb_error_t error;
+//
+// OSAL_SUBTASK_BEGIN
+//
+// *((rndis_msg_initialize_t*) msg_payload) = (rndis_msg_initialize_t)
+// {
+// .type = RNDIS_MSG_INITIALIZE,
+// .length = sizeof(rndis_msg_initialize_t),
+// .request_id = 1, // TODO should use some magic number
+// .major_version = 1,
+// .minor_version = 0,
+// .max_xfer_size = 0x4000 // TODO mimic windows
+// };
+//
+//
+//
+// OSAL_SUBTASK_END
+//}
#endif