michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: usb_dc_kinetis: fix usb_dc_ep_read_continue

Browse source 
usb_dc_ep_read_continue can be called without usb_dc_ep_read_wait,
check if the current buffer is claimed by the controller
(transfer not finished) to prevent a faulty behavior.

Signed-off-by: Johann Fischer <j.fischer@phytec.de>
This commit is contained in:
Johann Fischer 2018-05-28 01:28:25 +02:00 • committed by Maureen Helm
commit 4d0a1912a6
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/usb/device/usb_dc_kinetis.c
View file

@ -675,8 +675,7 @@ int usb_dc_ep_read_wait(u8_t ep, u8_t *data, u32_t max_data_len,
int usb_dc_ep_read_continue(u8_t ep)
{
u8_t ep_idx = EP_ADDR2IDX(ep);
/* select the index of the next endpoint buffer */
u8_t bd_idx = get_bdt_idx(ep, ~dev_data.ep_ctrl[ep_idx].status.out_odd);
u8_t bd_idx = get_bdt_idx(ep, dev_data.ep_ctrl[ep_idx].status.out_odd);
if (ep_idx > (NUM_OF_EP_MAX - 1)) {
SYS_LOG_ERR("Wrong endpoint index/address");
@ -688,6 +687,14 @@ int usb_dc_ep_read_continue(u8_t ep)
return -EINVAL;
}
if (bdt[bd_idx].get.own) {
/* May occur when usb_transfer initializes the OUT transfer */
SYS_LOG_WRN("Current buffer is claimed by the controller");
return 0;
}
/* select the index of the next endpoint buffer */
bd_idx = get_bdt_idx(ep, ~dev_data.ep_ctrl[ep_idx].status.out_odd);
/* Update next toggle bit */
dev_data.ep_ctrl[ep_idx].status.out_data1 ^= 1;
bdt[bd_idx].set.bc = dev_data.ep_ctrl[ep_idx].mps_out;