Skip to content

Commit

Permalink
fix(spi): fixed undesired touching to DMA
Browse files Browse the repository at this point in the history
Closes #12241
  • Loading branch information
ginkgm committed Nov 8, 2023
1 parent 2bab3b3 commit 94a8591
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion components/hal/spi_hal.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ void spi_hal_init(spi_hal_context_t *hal, uint32_t host_id, const spi_hal_config
hal->dmadesc_n = config->dmadesc_n;

spi_ll_master_init(hw);
s_spi_hal_dma_init_config(hal);
if (config->dma_enabled) {
s_spi_hal_dma_init_config(hal);
}

//Force a transaction done interrupt. This interrupt won't fire yet because
//we initialized the SPI interrupt as disabled. This way, we can just
Expand Down
4 changes: 3 additions & 1 deletion components/hal/spi_slave_hal.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ void spi_slave_hal_init(spi_slave_hal_context_t *hal, const spi_slave_hal_config
hal->dma_in = hal_config->dma_in;
hal->dma_out = hal_config->dma_out;

s_spi_slave_hal_dma_init_config(hal);
if (hal->use_dma) {
s_spi_slave_hal_dma_init_config(hal);
}
spi_ll_slave_init(hal->hw);

//Force a transaction done interrupt. This interrupt won't fire yet because we initialized the SPI interrupt as
Expand Down
4 changes: 3 additions & 1 deletion components/hal/spi_slave_hd_hal.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ void spi_slave_hd_hal_init(spi_slave_hd_hal_context_t *hal, const spi_slave_hd_h
hal->rx_dma_head = &hal->rx_dummy_head;

//Configure slave
s_spi_slave_hd_hal_dma_init_config(hal);
if (hal_config->dma_enabled) {
s_spi_slave_hd_hal_dma_init_config(hal);
}

spi_ll_slave_hd_init(hw);
spi_ll_set_addr_bitlen(hw, hal_config->address_bits);
Expand Down

0 comments on commit 94a8591

Please sign in to comment.