mirror of
https://github.com/hathach/tinyusb.git
synced 2025-10-29 19:49:07 +00:00
Fix copilot issues
Signed-off-by: Mengsk <admin@hifiphile.com>
This commit is contained in:
parent
27415e6114
commit
30132e8e6d
@ -1 +0,0 @@
|
||||
Subproject commit 675543bcc9baa8170f868ab7ba316d418dbcf41f
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit 3c77349ce04c8af401454cc51f85ea9a50e34fc1
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit b6f0ed3829f3829eb358a2e7417d80bba1a42db7
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit 2b7495b8535bdcb306dac29b9ded4cfb679d7e5c
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit cc0e0707c0c748713485b870bb980852b210877f
|
||||
1
lib/lwip
1
lib/lwip
@ -1 +0,0 @@
|
||||
Subproject commit 159e31b689577dbf69cf0683bbaffbd71fa5ee10
|
||||
@ -520,10 +520,10 @@ static bool audiod_rx_xfer_isr(uint8_t rhport, audiod_function_t* audio, uint16_
|
||||
TU_VERIFY(tu_fifo_write_n(&audio->ep_out_ff, audio->lin_buf_out, n_bytes_received));
|
||||
|
||||
// Schedule for next receive
|
||||
TU_VERIFY(usbd_edpt_xfer(rhport, audio->ep_out, audio->lin_buf_out, audio->ep_out_sz, true), false);
|
||||
TU_VERIFY(usbd_edpt_xfer(rhport, audio->ep_out, audio->lin_buf_out, audio->ep_out_sz, true));
|
||||
#else
|
||||
// Data is already placed in EP FIFO, schedule for next receive
|
||||
TU_VERIFY(usbd_edpt_xfer_fifo(rhport, audio->ep_out, &audio->ep_out_ff, audio->ep_out_sz, true), false);
|
||||
TU_VERIFY(usbd_edpt_xfer_fifo(rhport, audio->ep_out, &audio->ep_out_ff, audio->ep_out_sz, true));
|
||||
#endif
|
||||
|
||||
#if CFG_TUD_AUDIO_ENABLE_FEEDBACK_EP
|
||||
@ -607,7 +607,7 @@ bool tud_audio_int_n_write(uint8_t func_id, const audio_interrupt_data_t *data)
|
||||
// Check length
|
||||
if (tu_memcpy_s(int_ep_buf[func_id].buf, sizeof(int_ep_buf[func_id].buf), data, sizeof(audio_interrupt_data_t)) == 0) {
|
||||
// Schedule transmit
|
||||
TU_ASSERT(usbd_edpt_xfer(_audiod_fct[func_id].rhport, _audiod_fct[func_id].ep_int, int_ep_buf[func_id].buf, sizeof(int_ep_buf[func_id].buf)), 0);
|
||||
TU_ASSERT(usbd_edpt_xfer(_audiod_fct[func_id].rhport, _audiod_fct[func_id].ep_int, int_ep_buf[func_id].buf, sizeof(int_ep_buf[func_id].buf), false));
|
||||
} else {
|
||||
// Release endpoint since we don't make any transfer
|
||||
usbd_edpt_release(_audiod_fct[func_id].rhport, _audiod_fct[func_id].ep_int);
|
||||
@ -619,7 +619,7 @@ bool tud_audio_int_n_write(uint8_t func_id, const audio_interrupt_data_t *data)
|
||||
|
||||
#if CFG_TUD_AUDIO_ENABLE_EP_OUT && CFG_TUD_AUDIO_ENABLE_FEEDBACK_EP
|
||||
// This function is called once a transmit of a feedback packet was successfully completed. Here, we get the next feedback value to be sent
|
||||
static inline bool audiod_fb_send(audiod_function_t *audio) {
|
||||
static inline bool audiod_fb_send(audiod_function_t *audio, bool is_isr) {
|
||||
bool apply_correction = (TUSB_SPEED_FULL == tud_speed_get()) && audio->feedback.format_correction;
|
||||
// Format the feedback value
|
||||
if (apply_correction) {
|
||||
@ -647,7 +647,7 @@ static inline bool audiod_fb_send(audiod_function_t *audio) {
|
||||
// 10.14 3 3 Linux, OSX
|
||||
//
|
||||
// We send 3 bytes since sending packet larger than wMaxPacketSize is pretty ugly
|
||||
return usbd_edpt_xfer(audio->rhport, audio->ep_fb, (uint8_t *) audio->fb_buf, apply_correction ? 3 : 4);
|
||||
return usbd_edpt_xfer(audio->rhport, audio->ep_fb, (uint8_t *) audio->fb_buf, apply_correction ? 3 : 4, is_isr);
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1133,10 +1133,10 @@ static bool audiod_set_interface(uint8_t rhport, tusb_control_request_t const *p
|
||||
#endif
|
||||
// Schedule first transmit if alternate interface is not zero, as sample data is available a ZLP is loaded
|
||||
#if USE_LINEAR_BUFFER_TX
|
||||
TU_VERIFY(usbd_edpt_xfer(rhport, audio->ep_in, audio->lin_buf_in, 0));
|
||||
TU_VERIFY(usbd_edpt_xfer(rhport, audio->ep_in, audio->lin_buf_in, 0, false));
|
||||
#else
|
||||
// Send everything in ISO EP FIFO
|
||||
TU_VERIFY(usbd_edpt_xfer_fifo(rhport, audio->ep_in, &audio->ep_in_ff, 0));
|
||||
TU_VERIFY(usbd_edpt_xfer_fifo(rhport, audio->ep_in, &audio->ep_in_ff, 0, false));
|
||||
#endif
|
||||
}
|
||||
#endif// CFG_TUD_AUDIO_ENABLE_EP_IN
|
||||
@ -1152,9 +1152,9 @@ static bool audiod_set_interface(uint8_t rhport, tusb_control_request_t const *p
|
||||
|
||||
// Prepare for incoming data
|
||||
#if USE_LINEAR_BUFFER_RX
|
||||
TU_VERIFY(usbd_edpt_xfer(rhport, audio->ep_out, audio->lin_buf_out, audio->ep_out_sz), false);
|
||||
TU_VERIFY(usbd_edpt_xfer(rhport, audio->ep_out, audio->lin_buf_out, audio->ep_out_sz, false));
|
||||
#else
|
||||
TU_VERIFY(usbd_edpt_xfer_fifo(rhport, audio->ep_out, &audio->ep_out_ff, audio->ep_out_sz), false);
|
||||
TU_VERIFY(usbd_edpt_xfer_fifo(rhport, audio->ep_out, &audio->ep_out_ff, audio->ep_out_sz, false));
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -1164,7 +1164,7 @@ static bool audiod_set_interface(uint8_t rhport, tusb_control_request_t const *p
|
||||
audio->ep_fb = ep_addr;
|
||||
audio->feedback.frame_shift = desc_ep->bInterval - 1;
|
||||
// Schedule first feedback transmit
|
||||
audiod_fb_send(audio);
|
||||
audiod_fb_send(audio, false);
|
||||
}
|
||||
#endif
|
||||
#endif// CFG_TUD_AUDIO_ENABLE_EP_OUT
|
||||
@ -1472,7 +1472,7 @@ bool audiod_xfer_isr(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint
|
||||
if (audio->ep_fb == ep_addr) {
|
||||
// Schedule a transmit with the new value if EP is not busy
|
||||
// Schedule next transmission - value is changed bytud_audio_n_fb_set() in the meantime or the old value gets sent
|
||||
audiod_fb_send(audio);
|
||||
audiod_fb_send(audio, true);
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -196,7 +196,7 @@ bool tud_cdc_n_notify_uart_state (uint8_t itf, const cdc_notify_uart_state_t *st
|
||||
notify_msg->request.wLength = sizeof(cdc_notify_uart_state_t);
|
||||
notify_msg->serial_state = *state;
|
||||
|
||||
return usbd_edpt_xfer(p_cdc->rhport, p_cdc->ep_notify, (uint8_t *, false)notify_msg, 8 + sizeof(cdc_notify_uart_state_t));
|
||||
return usbd_edpt_xfer(p_cdc->rhport, p_cdc->ep_notify, (uint8_t *)notify_msg, 8 + sizeof(cdc_notify_uart_state_t), false);
|
||||
}
|
||||
|
||||
bool tud_cdc_n_notify_conn_speed_change(uint8_t itf, const cdc_notify_conn_speed_change_t* conn_speed_change) {
|
||||
@ -213,7 +213,7 @@ bool tud_cdc_n_notify_conn_speed_change(uint8_t itf, const cdc_notify_conn_speed
|
||||
notify_msg->request.wLength = sizeof(cdc_notify_conn_speed_change_t);
|
||||
notify_msg->conn_speed_change = *conn_speed_change;
|
||||
|
||||
return usbd_edpt_xfer(p_cdc->rhport, p_cdc->ep_notify, (uint8_t *, false)notify_msg, 8 + sizeof(cdc_notify_conn_speed_change_t));
|
||||
return usbd_edpt_xfer(p_cdc->rhport, p_cdc->ep_notify, (uint8_t *)notify_msg, 8 + sizeof(cdc_notify_conn_speed_change_t), false);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@ -251,7 +251,7 @@ bool tud_mtp_event_send(mtp_event_t* event) {
|
||||
TU_VERIFY(p_mtp->ep_event != 0);
|
||||
_mtpd_epbuf.buf_event = *event;
|
||||
TU_VERIFY(usbd_edpt_claim(p_mtp->rhport, p_mtp->ep_event)); // Claim the endpoint
|
||||
return usbd_edpt_xfer(p_mtp->rhport, p_mtp->ep_event, (uint8_t*, false) &_mtpd_epbuf.buf_event, sizeof(mtp_event_t));
|
||||
return usbd_edpt_xfer(p_mtp->rhport, p_mtp->ep_event, (uint8_t*) &_mtpd_epbuf.buf_event, sizeof(mtp_event_t), false);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------+
|
||||
|
||||
@ -205,7 +205,7 @@ static void notification_xmit(uint8_t rhport, bool force_next) {
|
||||
|
||||
uint16_t notif_len = sizeof(notify_speed_change.header) + notify_speed_change.header.wLength;
|
||||
ncm_epbuf.epnotif = notify_speed_change;
|
||||
usbd_edpt_xfer(rhport, ncm_interface.ep_notif, (uint8_t*, false) &ncm_epbuf.epnotif, notif_len);
|
||||
usbd_edpt_xfer(rhport, ncm_interface.ep_notif, (uint8_t*) &ncm_epbuf.epnotif, notif_len, false);
|
||||
|
||||
ncm_interface.notification_xmit_state = NOTIFICATION_CONNECTED;
|
||||
ncm_interface.notification_xmit_is_running = true;
|
||||
@ -227,7 +227,7 @@ static void notification_xmit(uint8_t rhport, bool force_next) {
|
||||
|
||||
uint16_t notif_len = sizeof(notify_connected.header) + notify_connected.header.wLength;
|
||||
ncm_epbuf.epnotif = notify_connected;
|
||||
usbd_edpt_xfer(rhport, ncm_interface.ep_notif, (uint8_t *, false) &ncm_epbuf.epnotif, notif_len);
|
||||
usbd_edpt_xfer(rhport, ncm_interface.ep_notif, (uint8_t *) &ncm_epbuf.epnotif, notif_len, false);
|
||||
|
||||
ncm_interface.notification_xmit_state = NOTIFICATION_DONE;
|
||||
ncm_interface.notification_xmit_is_running = true;
|
||||
|
||||
@ -841,7 +841,7 @@ bool usbtmcd_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_request
|
||||
},
|
||||
.StatusByte = tud_usbtmc_get_stb_cb(&(rsp.USBTMC_status))};
|
||||
// Must be queued before control request response sent (USB488v1.0 4.3.1.2)
|
||||
usbd_edpt_xfer(rhport, usbtmc_state.ep_int_in, (void *, false) &intMsg, sizeof(intMsg));
|
||||
usbd_edpt_xfer(rhport, usbtmc_state.ep_int_in, (void *) &intMsg, sizeof(intMsg), false);
|
||||
}
|
||||
} else {
|
||||
rsp.statusByte = tud_usbtmc_get_stb_cb(&(rsp.USBTMC_status));
|
||||
|
||||
@ -132,7 +132,7 @@ static void prepare_next_setup_packet(uint8_t rhport)
|
||||
_dcd.bdt[0][1][in_odd].data = 1;
|
||||
_dcd.bdt[0][1][in_odd ^ 1].data = 0;
|
||||
dcd_edpt_xfer(rhport, tu_edpt_addr(0, TUSB_DIR_OUT),
|
||||
_dcd.setup_packet, sizeof(_dcd.setup_packet));
|
||||
_dcd.setup_packet, sizeof(_dcd.setup_packet), false);
|
||||
}
|
||||
|
||||
static void process_stall(uint8_t rhport)
|
||||
|
||||
@ -128,7 +128,7 @@ static void prepare_next_setup_packet(uint8_t rhport)
|
||||
_dcd.bdt[0][1][in_odd].data = 1;
|
||||
_dcd.bdt[0][1][in_odd ^ 1].data = 0;
|
||||
dcd_edpt_xfer(rhport, tu_edpt_addr(0, TUSB_DIR_OUT),
|
||||
_dcd.setup_packet, sizeof(_dcd.setup_packet));
|
||||
_dcd.setup_packet, sizeof(_dcd.setup_packet), false);
|
||||
}
|
||||
|
||||
static void process_stall(uint8_t rhport)
|
||||
|
||||
@ -130,7 +130,7 @@ static void prepare_next_setup_packet(uint8_t rhport)
|
||||
_dcd.bdt[0][1][in_odd].data = 1;
|
||||
_dcd.bdt[0][1][in_odd ^ 1].data = 0;
|
||||
dcd_edpt_xfer(rhport, tu_edpt_addr(0, TUSB_DIR_OUT),
|
||||
_dcd.setup_packet, sizeof(_dcd.setup_packet));
|
||||
_dcd.setup_packet, sizeof(_dcd.setup_packet), false);
|
||||
}
|
||||
|
||||
static void process_stall(uint8_t rhport)
|
||||
|
||||
@ -488,7 +488,6 @@ bool dcd_edpt_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t * buffer, uint16_t t
|
||||
//--------------------------------------------------------------------+
|
||||
static void bus_reset(uint8_t rhport)
|
||||
{
|
||||
(void) is_isr;
|
||||
tu_memclr(&_dcd, sizeof(dcd_data_t));
|
||||
edpt_reset_all(rhport);
|
||||
|
||||
|
||||
@ -104,7 +104,7 @@ void dcd_set_address(uint8_t rhport, uint8_t dev_addr) {
|
||||
UNUSED(rhport);
|
||||
state.address = dev_addr;
|
||||
// Respond with status.
|
||||
dcd_edpt_xfer(rhport, tu_edpt_addr(0, TUSB_DIR_IN), NULL, 0);
|
||||
dcd_edpt_xfer(rhport, tu_edpt_addr(0, TUSB_DIR_IN), NULL, 0, false);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -160,10 +160,11 @@ void dcd_edpt_close(uint8_t rhport, uint8_t ep_addr) {
|
||||
// Submit a transfer, When complete dcd_event_xfer_complete() is invoked to
|
||||
// notify the stack
|
||||
bool dcd_edpt_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t *buffer,
|
||||
uint16_t total_bytes) {
|
||||
uint16_t total_bytes, bool is_isr) {
|
||||
UNUSED(rhport);
|
||||
UNUSED(buffer);
|
||||
UNUSED(total_bytes);
|
||||
UNUSED(is_isr);
|
||||
|
||||
uint8_t const dir = tu_edpt_dir(ep_addr);
|
||||
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit c594542b2faa01cc33a2b97c9fbebc38549df80a
|
||||
Loading…
x
Reference in New Issue
Block a user