summaryrefslogtreecommitdiff
path: root/tinyusb/device
diff options
context:
space:
mode:
authorhathach <[email protected]>2013-12-11 11:31:09 +0700
committerhathach <[email protected]>2013-12-11 11:31:09 +0700
commit8bd6440547520ebdc8e06a6a21e6277ec7181034 (patch)
tree522cb0b25b28f1b997a75427754af667b88ae5bf /tinyusb/device
parentb35acbdcb24babfff649a4db6775c260d9751e3e (diff)
fix error in dcd_lpc175x_6x (still has problem with control transfer)
fix build error for host start to add keil support for device opt out pca9532.c when ea4357 is not the selected board
Diffstat (limited to 'tinyusb/device')
-rw-r--r--tinyusb/device/dcd_lpc175x_6x.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/tinyusb/device/dcd_lpc175x_6x.c b/tinyusb/device/dcd_lpc175x_6x.c
index 680216248..d0b74ed20 100644
--- a/tinyusb/device/dcd_lpc175x_6x.c
+++ b/tinyusb/device/dcd_lpc175x_6x.c
@@ -355,6 +355,8 @@ static tusb_error_t pipe_control_xfer(uint8_t ep_id, uint8_t* p_buffer, uint16_t
dcd_data.control_dma.remaining_bytes -= packet_len;
dcd_data.control_dma.p_data += packet_len;
+
+ return TUSB_ERROR_NONE;
}
static tusb_error_t pipe_control_write(void const * buffer, uint16_t length)
@@ -428,7 +430,7 @@ tusb_error_t dcd_pipe_control_xfer(uint8_t coreid, tusb_direction_t dir, void *
dcd_data.control_dma.remaining_bytes = length;
// lpc17xx already received the first DATA OUT packet by now
- ASSERT_STATUS ( pipe_control_xfer(dir, p_buffer, length) );
+ ASSERT_STATUS ( pipe_control_xfer(ep_data, p_buffer, length) );
}
//------------- Status Phase (opposite direct to Data) -------------//
@@ -436,6 +438,8 @@ tusb_error_t dcd_pipe_control_xfer(uint8_t coreid, tusb_direction_t dir, void *
{ // only write for CONTROL OUT, CONTROL IN data will be retrieved in dcd_isr
ASSERT_STATUS ( pipe_control_write(NULL, 0) );
}
+// ASSERT_STATUS ( pipe_control_xfer(ep_status, NULL, 0) );
+
return TUSB_ERROR_NONE;
}