mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-02-21 03:40:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

More warning fixes

Browse Source
This commit is contained in:
Mengsk 2023-01-04 10:19:34 +01:00
parent 82f105e32b
commit 8c591e2c45
1 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/class/usbtmc/usbtmc_device.c
View File

@ -364,7 +364,7 @@ bool tud_usbtmc_start_bus_read()
case STATE_RCV: case STATE_RCV:
break; break;
default: default:
TU_VERIFY(false); return false;
} }
TU_VERIFY(usbd_edpt_xfer(usbtmc_state.rhport, usbtmc_state.ep_bulk_out, usbtmc_state.ep_bulk_out_buf, (uint16_t)usbtmc_state.ep_bulk_out_wMaxPacketSize)); TU_VERIFY(usbd_edpt_xfer(usbtmc_state.rhport, usbtmc_state.ep_bulk_out, usbtmc_state.ep_bulk_out_buf, (uint16_t)usbtmc_state.ep_bulk_out_wMaxPacketSize));
return true; return true;
@ -466,53 +466,52 @@ bool usbtmcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint
switch(usbtmc_state.state) switch(usbtmc_state.state)
{ {
case STATE_IDLE: case STATE_IDLE:
TU_VERIFY(xferred_bytes >= sizeof(usbtmc_msg_generic_t)); {
msg = (usbtmc_msg_generic_t*)(usbtmc_state.ep_bulk_out_buf); TU_VERIFY(xferred_bytes >= sizeof(usbtmc_msg_generic_t));
uint8_t invInvTag = (uint8_t)~(msg->header.bTagInverse); msg = (usbtmc_msg_generic_t*)(usbtmc_state.ep_bulk_out_buf);
TU_VERIFY(msg->header.bTag == invInvTag); uint8_t invInvTag = (uint8_t)~(msg->header.bTagInverse);
TU_VERIFY(msg->header.bTag != 0x00); TU_VERIFY(msg->header.bTag == invInvTag);
TU_VERIFY(msg->header.bTag != 0x00);
switch(msg->header.MsgID) { switch(msg->header.MsgID) {
case USBTMC_MSGID_DEV_DEP_MSG_OUT: case USBTMC_MSGID_DEV_DEP_MSG_OUT:
if(!handle_devMsgOutStart(rhport, msg, xferred_bytes)) if(!handle_devMsgOutStart(rhport, msg, xferred_bytes))
{ {
usbd_edpt_stall(rhport, usbtmc_state.ep_bulk_out); usbd_edpt_stall(rhport, usbtmc_state.ep_bulk_out);
TU_VERIFY(false); return false;
} }
break; break;
case USBTMC_MSGID_DEV_DEP_MSG_IN: case USBTMC_MSGID_DEV_DEP_MSG_IN:
TU_VERIFY(handle_devMsgIn(msg, xferred_bytes)); TU_VERIFY(handle_devMsgIn(msg, xferred_bytes));
break; break;
#if (CFG_TUD_USBTMC_ENABLE_488) #if (CFG_TUD_USBTMC_ENABLE_488)
case USBTMC_MSGID_USB488_TRIGGER: case USBTMC_MSGID_USB488_TRIGGER:
// Spec says we halt the EP if we didn't declare we support it. // Spec says we halt the EP if we didn't declare we support it.
TU_VERIFY(usbtmc_state.capabilities->bmIntfcCapabilities488.supportsTrigger); TU_VERIFY(usbtmc_state.capabilities->bmIntfcCapabilities488.supportsTrigger);
TU_VERIFY(tud_usbtmc_msg_trigger_cb(msg)); TU_VERIFY(tud_usbtmc_msg_trigger_cb(msg));
break; break;
#endif #endif
case USBTMC_MSGID_VENDOR_SPECIFIC_MSG_OUT: case USBTMC_MSGID_VENDOR_SPECIFIC_MSG_OUT:
case USBTMC_MSGID_VENDOR_SPECIFIC_IN: case USBTMC_MSGID_VENDOR_SPECIFIC_IN:
default: default:
usbd_edpt_stall(rhport, usbtmc_state.ep_bulk_out); usbd_edpt_stall(rhport, usbtmc_state.ep_bulk_out);
TU_VERIFY(false); return false;
return false; }
return true;
} }
return true;
case STATE_RCV: case STATE_RCV:
if(!handle_devMsgOut(rhport, usbtmc_state.ep_bulk_out_buf, xferred_bytes, xferred_bytes)) if(!handle_devMsgOut(rhport, usbtmc_state.ep_bulk_out_buf, xferred_bytes, xferred_bytes))
{ {
usbd_edpt_stall(rhport, usbtmc_state.ep_bulk_out); usbd_edpt_stall(rhport, usbtmc_state.ep_bulk_out);
TU_VERIFY(false); return false;
} }
return true; return true;
case STATE_ABORTING_BULK_OUT: case STATE_ABORTING_BULK_OUT:
TU_VERIFY(false); return false;
return false; // Should be stalled by now, shouldn't have received a packet.
case STATE_TX_REQUESTED: case STATE_TX_REQUESTED:
case STATE_TX_INITIATED: case STATE_TX_INITIATED:
@ -520,7 +519,7 @@ bool usbtmcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint
case STATE_ABORTING_BULK_IN_SHORTED: case STATE_ABORTING_BULK_IN_SHORTED:
case STATE_ABORTING_BULK_IN_ABORTED: case STATE_ABORTING_BULK_IN_ABORTED:
default: default:
TU_VERIFY(false); return false;
} }
} }
else if(ep_addr == usbtmc_state.ep_bulk_in) else if(ep_addr == usbtmc_state.ep_bulk_in)
@ -569,7 +568,6 @@ bool usbtmcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint
default: default:
TU_ASSERT(false); TU_ASSERT(false);
return false;
} }
} }
else if (ep_addr == usbtmc_state.ep_int_in) { else if (ep_addr == usbtmc_state.ep_int_in) {
@ -873,16 +871,13 @@ bool usbtmcd_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request
case USB488_bREQUEST_LOCAL_LOCKOUT: case USB488_bREQUEST_LOCAL_LOCKOUT:
{ {
TU_VERIFY(request->bmRequestType == 0xA1); // in,class,interface TU_VERIFY(request->bmRequestType == 0xA1); // in,class,interface
TU_VERIFY(false);
return false; return false;
} }
#endif #endif
default: default:
TU_VERIFY(false);
return false; return false;
} }
TU_VERIFY(false);
} }
#endif /* CFG_TUD_TSMC */ #endif /* CFG_TUD_TSMC */