Skip to content

[BUG] Fix busy status when callback not set #31

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

Merged
merged 2 commits into from
Oct 10, 2025
Merged

[BUG] Fix busy status when callback not set #31

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a3f641
Use real status for conditionals
Lorilandly Oct 8, 2025
3457a38
Run clang format
Lorilandly Oct 9, 2025
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
20 changes: 16 additions & 4 deletions Adafruit_ZeroDMA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,11 @@ ZeroDMAstatus Adafruit_ZeroDMA::free(void) {

cpu_irq_enter_critical(); // jobStatus is volatile

if (jobStatus == DMA_STATUS_BUSY) {
#ifdef __SAMD51__
if (DMAC->Channel[channel].CHSTATUS.reg & DMAC_CHSTATUS_BUSY) {
#else
if (DMAC->CHSTATUS.reg & DMAC_CHSTATUS_BUSY) {
#endif
status = DMA_STATUS_BUSY; // Can't leave when busy
} else if ((channel < DMAC_CH_NUM) && (_channelMask & (1 << channel))) {
// Valid in-use channel; release it
Expand Down Expand Up @@ -341,7 +345,11 @@ ZeroDMAstatus Adafruit_ZeroDMA::startJob(void) {

cpu_irq_enter_critical(); // Job status is volatile

if (jobStatus == DMA_STATUS_BUSY) {
#ifdef __SAMD51__
if (DMAC->Channel[channel].CHSTATUS.reg & DMAC_CHSTATUS_BUSY) {
#else
if (DMAC->CHSTATUS.reg & DMAC_CHSTATUS_BUSY) {
#endif
status = DMA_STATUS_BUSY; // Resource is busy
} else if (channel >= DMAC_CH_NUM) {
status = DMA_STATUS_ERR_NOT_INITIALIZED; // Channel not in use
Expand Down Expand Up @@ -494,8 +502,12 @@ DmacDescriptor *Adafruit_ZeroDMA::addDescriptor(void *src, void *dst,
if (channel >= DMAC_CH_NUM)
return NULL;

// Can't do while job's busy
if (jobStatus == DMA_STATUS_BUSY)
// Can't do while job's busy
#ifdef __SAMD51__
if (DMAC->Channel[channel].CHSTATUS.reg & DMAC_CHSTATUS_BUSY)
#else
if (DMAC->CHSTATUS.reg & DMAC_CHSTATUS_BUSY)
#endif
return NULL;

DmacDescriptor *desc;
Expand Down