Skip to content

fix: WB32 DMA Fixes #435

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

Open
emolitor wants to merge 1 commit into
base: chibios-21.11.x
Choose a base branch
from
Open

fix: WB32 DMA Fixes #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions os/hal/ports/WB32/LLD/DMAv1/wb32_dma.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,11 @@ OSAL_IRQ_HANDLER(WB32_DMAC2_IRQ_VECTOR) {
dmaServeInterrupt(WB32_DMA2_STREAM1);
#endif

#if WB32_DMAC2_NUM_CHANNELS > 0
#if WB32_DMAC2_NUM_CHANNELS > 1
dmaServeInterrupt(WB32_DMA2_STREAM2);
#endif

#if WB32_DMAC2_NUM_CHANNELS > 0
#if WB32_DMAC2_NUM_CHANNELS > 2
dmaServeInterrupt(WB32_DMA2_STREAM3);
#endif

Expand All @@ -215,7 +215,7 @@ void dmaInit(void) {
dma.allocated_mask = 0U;
dma.isr_mask = 0U;

#if WB32_DMAC2_NUM_CHANNELS > 0
#if WB32_DMAC1_NUM_CHANNELS > 0
rccResetDMAC1();
#endif
#if WB32_DMAC2_NUM_CHANNELS > 0
Expand Down
9 changes: 5 additions & 4 deletions os/hal/ports/WB32/LLD/DMAv1/wb32_dma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
* @{
*/
#define WB32_DMAC_DST_AUTO_RELOAD_EN (0x1U << 31)
#define WB32_DMAC_DST_AUTO_RELOAD_DIS (0x0U << 30)
#define WB32_DMAC_DST_AUTO_RELOAD_DIS (0x0U << 31)
/**
* @}
*/
Expand Down Expand Up @@ -584,8 +584,9 @@ typedef struct {
*
* @special
*/
#define dmaStreamSetTransactionSize(dmastp, size) { \
(dmastp)->dmac->Ch[(dmastp)->channel].CTLH = (uint32_t)((size) & 0x1FF); \
#define dmaStreamSetTransactionSize(dmastp, size) { \
osalDbgAssert((size) <= 511U, "DMA BLOCK_TS max 511"); \
(dmastp)->dmac->Ch[(dmastp)->channel].CTLH = (uint32_t)((size) & WB32_DMA_CHCFG_SIZE_MASK); \
}

/**
Expand Down Expand Up @@ -858,7 +859,7 @@ typedef struct {
* @param[in] dmastp pointer to a wb32_dma_stream_t structure
*/
#define dmaWaitCompletion(dmastp) { \
while (((dmastp)->dmac->Ch[(dmastp)->channel].CTLH & 0x00000FFFU) > 0U) \
while (((dmastp)->dmac->Ch[(dmastp)->channel].CTLH & WB32_DMA_CHCFG_SIZE_MASK) > 0U) \
; \
dmaStreamDisable(dmastp); \
}
Expand Down