Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FSDEV fix/cleanup. #2574

Merged
merged 14 commits into from
Apr 11, 2024
Merged

FSDEV fix/cleanup. #2574

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
00db422
Cleanup ep/pma free, ISO ep should use alloc/activate.
HiFiPhile Apr 5, 2024
68b973a
Reduce uac2_headset max sample rate for better compatibility.
HiFiPhile Apr 5, 2024
bf3e9b8
Refactor edpt_xfer(), support double buffering in dcd_pma_alloc().
HiFiPhile Apr 9, 2024
41fb2b6
Rework macro according to ST driver.
HiFiPhile Apr 9, 2024
973d29a
Rework ISO double buffering.
HiFiPhile Apr 9, 2024
472996e
Ignore spurious RX interrupt.
HiFiPhile Apr 9, 2024
c082447
Enable double buffer only for PMA > 1024b
HiFiPhile Apr 9, 2024
146c3c6
Cleanup.
HiFiPhile Apr 9, 2024
402b084
Format doc.
HiFiPhile Apr 9, 2024
5f4d6ae
Fix STM32L0 IAR build.
HiFiPhile Apr 9, 2024
0d4465a
Optimize audio_4_channel_mic waveform data.
HiFiPhile Apr 9, 2024
3ecabe3
Fix stm32h573i_dk button & led.
HiFiPhile Apr 9, 2024
535571c
- remove redundant call of pcd_set_ep_rx_cnt()
hathach Apr 11, 2024
0f77563
rename, invert logic for iso_in_sending. Also limit its usage to ISO …
hathach Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ typedef struct {
uint16_t queued_len;
uint16_t max_packet_size;
uint8_t ep_idx; // index for USB_EPnR register
bool in_complete; // Workaround for ISO IN EP doesn't have interrupt mask
bool iso_in_sending; // Workaround for ISO IN EP doesn't have interrupt mask
hathach marked this conversation as resolved.
Show resolved Hide resolved
} xfer_ctl_t;

// EP allocator
Expand Down Expand Up @@ -502,13 +502,15 @@ static void dcd_ep_ctr_tx_handler(uint32_t wIstr)

xfer_ctl_t *xfer = xfer_ctl_ptr(ep_addr);

/* Ignore spurious int */
if (xfer->in_complete) {
return;
}
xfer->in_complete = true;

if ((wEPRegVal & USB_EP_TYPE_MASK) == USB_EP_ISOCHRONOUS) {
// Ignore spurious interrupts that we don't schedule
// host can send IN token while there is no data to send, since ISO does not have NAK
// this will result to zero length packet --> trigger interrupt (which cannot be masked)
if (!xfer->iso_in_sending) {
return;
}
xfer->iso_in_sending = false;

if (wEPRegVal & USB_EP_DTOG_TX) {
pcd_set_ep_tx_dbuf0_cnt(USB, EPindex, 0);
} else {
Expand Down Expand Up @@ -955,9 +957,10 @@ static void dcd_transmit_packet(xfer_ctl_t *xfer, uint16_t ep_ix)
}

uint16_t ep_reg = pcd_get_endpoint(USB, ep_ix);
bool const is_iso = (ep_reg & USB_EP_TYPE_MASK) == USB_EP_ISOCHRONOUS;
uint16_t addr_ptr;

if ((ep_reg & USB_EP_TYPE_MASK) == USB_EP_ISOCHRONOUS) {
if (is_iso) {
if (ep_reg & USB_EP_DTOG_TX) {
addr_ptr = pcd_get_ep_dbuf1_address(USB, ep_ix);
pcd_set_ep_tx_dbuf1_cnt(USB, ep_ix, len);
Expand All @@ -979,7 +982,9 @@ static void dcd_transmit_packet(xfer_ctl_t *xfer, uint16_t ep_ix)

dcd_int_disable(0);
pcd_set_ep_tx_status(USB, ep_ix, USB_EP_TX_VALID);
xfer->in_complete = false;
if (is_iso) {
xfer->iso_in_sending = true;
}
dcd_int_enable(0);
}

Expand Down
Loading