From 6fbca0ea8731b7f50a895ae5c62fc2bbedde2550 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 13 Mar 2014 18:25:20 +0700 Subject: remove legacy code of msc_device.c read10 & write10 clean up some warnings --- tinyusb/class/cdc_host.c | 7 +++---- tinyusb/class/msc_device.c | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'tinyusb/class') diff --git a/tinyusb/class/cdc_host.c b/tinyusb/class/cdc_host.c index fc93fe565..7bfa30371 100644 --- a/tinyusb/class/cdc_host.c +++ b/tinyusb/class/cdc_host.c @@ -155,8 +155,6 @@ void cdch_init(void) tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t const *p_interface_desc, uint16_t *p_length) { - tusb_error_t error; - OSAL_SUBTASK_BEGIN if ( CDC_COMM_SUBCLASS_ABSTRACT_CONTROL_MODEL != p_interface_desc->bInterfaceSubClass) return TUSB_ERROR_CDC_UNSUPPORTED_SUBCLASS; @@ -226,6 +224,8 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con //------------- RNDIS -------------// if ( 0xff == cdch_data[dev_addr-1].interface_protocol && pipehandle_is_valid(cdch_data[dev_addr-1].pipe_notification) ) { + tusb_error_t error; + cdch_data[dev_addr-1].is_rndis = true; // set as true at first OSAL_SUBTASK_INVOKED_AND_WAIT( rndish_open_subtask(dev_addr, &cdch_data[dev_addr-1]), error ); @@ -248,9 +248,8 @@ tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con void cdch_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes) { - cdch_data_t *p_cdc = &cdch_data[pipe_hdl.dev_addr - 1]; - #if TUSB_CFG_HOST_CDC_RNDIS + cdch_data_t *p_cdc = &cdch_data[pipe_hdl.dev_addr - 1]; if ( p_cdc->is_rndis ) { rndish_xfer_isr(p_cdc, pipe_hdl, event, xferred_bytes); diff --git a/tinyusb/class/msc_device.c b/tinyusb/class/msc_device.c index 77ce2edc8..265051606 100644 --- a/tinyusb/class/msc_device.c +++ b/tinyusb/class/msc_device.c @@ -199,10 +199,10 @@ tusb_error_t mscd_xfer_cb(endpoint_handle_t edpt_hdl, tusb_event_t event, uint32 //------------- Data Phase For READ10 & WRITE10 (can be executed several times) -------------// if ( (SCSI_CMD_READ_10 == p_cbw->command[0]) || (SCSI_CMD_WRITE_10 == p_cbw->command[0]) ) { - if (is_waiting_read10_write10) - { // continue with read10, write10 data transfer, interrupt must come from endpoint IN - ASSERT( endpointhandle_is_equal(p_msc->edpt_in, edpt_hdl) && event == TUSB_EVENT_XFER_COMPLETE, TUSB_ERROR_INVALID_PARA); - } +// if (is_waiting_read10_write10) +// { // continue with read10, write10 data transfer, interrupt must come from endpoint IN +// ASSERT( endpointhandle_is_equal(p_msc->edpt_in, edpt_hdl) && event == TUSB_EVENT_XFER_COMPLETE, TUSB_ERROR_INVALID_PARA); +// } is_waiting_read10_write10 = !read10_write10_data_xfer(p_msc); } -- cgit v1.3.1