Skip to content

Commit c517552

Browse files
blmorrisdpgeorge
blmorris
authored and
dpgeorge
committed
stmhal/dma.c: Modify dma_init() to accept init struct as an argument
This removes hard-coded DMA init params from dma_init(), instead defining these parameters in a DMA_InitTypeDef struct that gets passed as an argument to dma_init() This makes dma_init more generic so it can be used for I2S and SD Card, which require different initialization parameters.
1 parent 3299f68 commit c517552

4 files changed

Lines changed: 33 additions & 25 deletions

File tree

‎stmhal/dma.c‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,23 @@ static const uint8_t dma_irqn[NSTREAM] = {
5252
DMA2_Stream7_IRQn,
5353
};
5454

55+
// Default parameters to dma_init() shared by spi and i2c; Channel and Direction
56+
// vary depending on the peripheral instance so they get passed separately
57+
const DMA_InitTypeDef dma_init_struct_spi_i2c = {
58+
.Channel = 0,
59+
.Direction = 0,
60+
.PeriphInc = DMA_PINC_DISABLE,
61+
.MemInc = DMA_MINC_ENABLE,
62+
.PeriphDataAlignment = DMA_PDATAALIGN_BYTE,
63+
.MemDataAlignment = DMA_MDATAALIGN_BYTE,
64+
.Mode = DMA_NORMAL,
65+
.Priority = DMA_PRIORITY_LOW,
66+
.FIFOMode = DMA_FIFOMODE_DISABLE,
67+
.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL,
68+
.MemBurst = DMA_MBURST_INC4,
69+
.PeriphBurst = DMA_PBURST_INC4
70+
};
71+
5572
static DMA_HandleTypeDef *dma_handle[NSTREAM] = {NULL};
5673
static uint32_t dma_last_channel[NSTREAM];
5774

@@ -80,7 +97,7 @@ static int get_dma_id(DMA_Stream_TypeDef *dma_stream) {
8097
}
8198
}
8299

83-
void dma_init(DMA_HandleTypeDef *dma, DMA_Stream_TypeDef *dma_stream, uint32_t dma_channel, uint32_t direction, void *data) {
100+
void dma_init(DMA_HandleTypeDef *dma, DMA_Stream_TypeDef *dma_stream, const DMA_InitTypeDef *dma_init, uint32_t dma_channel, uint32_t direction, void *data) {
84101
int dma_id = get_dma_id(dma_stream);
85102
//printf("dma_init(%p, %p(%d), 0x%x, 0x%x, %p)\n", dma, dma_stream, dma_id, (uint)dma_channel, (uint)direction, data);
86103

@@ -90,9 +107,11 @@ void dma_init(DMA_HandleTypeDef *dma, DMA_Stream_TypeDef *dma_stream, uint32_t d
90107
// set global pointer for IRQ handler
91108
dma_handle[dma_id] = dma;
92109

93-
// initialise critical parameters
110+
// initialise parameters
94111
dma->Instance = dma_stream;
112+
dma->Init = *dma_init;
95113
dma->Init.Direction = direction;
114+
dma->Init.Channel = dma_channel;
96115

97116
// half of __HAL_LINKDMA(data, xxx, *dma)
98117
// caller must implement other half by doing: data->xxx = dma
@@ -105,19 +124,6 @@ void dma_init(DMA_HandleTypeDef *dma, DMA_Stream_TypeDef *dma_stream, uint32_t d
105124
}
106125
dma_last_channel[dma_id] = dma_channel;
107126

108-
// set DMA parameters (these are only used by HAL_DMA_Init)
109-
dma->Init.Channel = dma_channel;
110-
dma->Init.PeriphInc = DMA_PINC_DISABLE;
111-
dma->Init.MemInc = DMA_MINC_ENABLE;
112-
dma->Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
113-
dma->Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
114-
dma->Init.Mode = DMA_NORMAL;
115-
dma->Init.Priority = DMA_PRIORITY_LOW;
116-
dma->Init.FIFOMode = DMA_FIFOMODE_DISABLE;
117-
dma->Init.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL;
118-
dma->Init.MemBurst = DMA_MBURST_INC4;
119-
dma->Init.PeriphBurst = DMA_PBURST_INC4;
120-
121127
// enable clock for needed DMA peripheral
122128
if (dma_id <= 7) {
123129
__DMA1_CLK_ENABLE();

‎stmhal/dma.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
void dma_init(DMA_HandleTypeDef *dma, DMA_Stream_TypeDef *dma_stream, uint32_t dma_channel, uint32_t direction, void *data);
27+
extern const DMA_InitTypeDef dma_init_struct_spi_i2c;
28+
29+
void dma_init(DMA_HandleTypeDef *dma, DMA_Stream_TypeDef *dma_stream, const DMA_InitTypeDef *dma_init, uint32_t dma_channel, uint32_t direction, void *data);
2830
void dma_deinit(DMA_HandleTypeDef *dma);
2931
void dma_invalidate_channel(DMA_Stream_TypeDef *dma_stream, uint32_t dma_channel);

‎stmhal/i2c.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ STATIC mp_obj_t pyb_i2c_send(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_
471471
// if IRQs are enabled then we can use DMA
472472
DMA_HandleTypeDef tx_dma;
473473
if (query_irq() == IRQ_STATE_ENABLED) {
474-
dma_init(&tx_dma, self->tx_dma_stream, self->tx_dma_channel, DMA_MEMORY_TO_PERIPH, self->i2c);
474+
dma_init(&tx_dma, self->tx_dma_stream, &dma_init_struct_spi_i2c, self->tx_dma_channel, DMA_MEMORY_TO_PERIPH, self->i2c);
475475
self->i2c->hdmatx = &tx_dma;
476476
self->i2c->hdmarx = NULL;
477477
}
@@ -545,7 +545,7 @@ STATIC mp_obj_t pyb_i2c_recv(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_
545545
// if IRQs are enabled then we can use DMA
546546
DMA_HandleTypeDef rx_dma;
547547
if (query_irq() == IRQ_STATE_ENABLED) {
548-
dma_init(&rx_dma, self->rx_dma_stream, self->rx_dma_channel, DMA_PERIPH_TO_MEMORY, self->i2c);
548+
dma_init(&rx_dma, self->rx_dma_stream, &dma_init_struct_spi_i2c, self->rx_dma_channel, DMA_PERIPH_TO_MEMORY, self->i2c);
549549
self->i2c->hdmatx = NULL;
550550
self->i2c->hdmarx = &rx_dma;
551551
}
@@ -639,7 +639,7 @@ STATIC mp_obj_t pyb_i2c_mem_read(mp_uint_t n_args, const mp_obj_t *pos_args, mp_
639639
status = HAL_I2C_Mem_Read(self->i2c, i2c_addr, mem_addr, mem_addr_size, (uint8_t*)vstr.buf, vstr.len, args[3].u_int);
640640
} else {
641641
DMA_HandleTypeDef rx_dma;
642-
dma_init(&rx_dma, self->rx_dma_stream, self->rx_dma_channel, DMA_PERIPH_TO_MEMORY, self->i2c);
642+
dma_init(&rx_dma, self->rx_dma_stream, &dma_init_struct_spi_i2c, self->rx_dma_channel, DMA_PERIPH_TO_MEMORY, self->i2c);
643643
self->i2c->hdmatx = NULL;
644644
self->i2c->hdmarx = &rx_dma;
645645
status = HAL_I2C_Mem_Read_DMA(self->i2c, i2c_addr, mem_addr, mem_addr_size, (uint8_t*)vstr.buf, vstr.len);
@@ -703,7 +703,7 @@ STATIC mp_obj_t pyb_i2c_mem_write(mp_uint_t n_args, const mp_obj_t *pos_args, mp
703703
status = HAL_I2C_Mem_Write(self->i2c, i2c_addr, mem_addr, mem_addr_size, bufinfo.buf, bufinfo.len, args[3].u_int);
704704
} else {
705705
DMA_HandleTypeDef tx_dma;
706-
dma_init(&tx_dma, self->tx_dma_stream, self->tx_dma_channel, DMA_MEMORY_TO_PERIPH, self->i2c);
706+
dma_init(&tx_dma, self->tx_dma_stream, &dma_init_struct_spi_i2c, self->tx_dma_channel, DMA_MEMORY_TO_PERIPH, self->i2c);
707707
self->i2c->hdmatx = &tx_dma;
708708
self->i2c->hdmarx = NULL;
709709
status = HAL_I2C_Mem_Write_DMA(self->i2c, i2c_addr, mem_addr, mem_addr_size, bufinfo.buf, bufinfo.len);

‎stmhal/spi.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ STATIC mp_obj_t pyb_spi_send(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_
458458
status = HAL_SPI_Transmit(self->spi, bufinfo.buf, bufinfo.len, args[1].u_int);
459459
} else {
460460
DMA_HandleTypeDef tx_dma;
461-
dma_init(&tx_dma, self->tx_dma_stream, self->tx_dma_channel, DMA_MEMORY_TO_PERIPH, self->spi);
461+
dma_init(&tx_dma, self->tx_dma_stream, &dma_init_struct_spi_i2c, self->tx_dma_channel, DMA_MEMORY_TO_PERIPH, self->spi);
462462
self->spi->hdmatx = &tx_dma;
463463
self->spi->hdmarx = NULL;
464464
status = HAL_SPI_Transmit_DMA(self->spi, bufinfo.buf, bufinfo.len);
@@ -511,12 +511,12 @@ STATIC mp_obj_t pyb_spi_recv(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_
511511
DMA_HandleTypeDef tx_dma, rx_dma;
512512
if (self->spi->Init.Mode == SPI_MODE_MASTER) {
513513
// in master mode the HAL actually does a TransmitReceive call
514-
dma_init(&tx_dma, self->tx_dma_stream, self->tx_dma_channel, DMA_MEMORY_TO_PERIPH, self->spi);
514+
dma_init(&tx_dma, self->tx_dma_stream, &dma_init_struct_spi_i2c, self->tx_dma_channel, DMA_MEMORY_TO_PERIPH, self->spi);
515515
self->spi->hdmatx = &tx_dma;
516516
} else {
517517
self->spi->hdmatx = NULL;
518518
}
519-
dma_init(&rx_dma, self->rx_dma_stream, self->rx_dma_channel, DMA_PERIPH_TO_MEMORY, self->spi);
519+
dma_init(&rx_dma, self->rx_dma_stream, &dma_init_struct_spi_i2c, self->rx_dma_channel, DMA_PERIPH_TO_MEMORY, self->spi);
520520
self->spi->hdmarx = &rx_dma;
521521

522522
status = HAL_SPI_Receive_DMA(self->spi, (uint8_t*)vstr.buf, vstr.len);
@@ -604,9 +604,9 @@ STATIC mp_obj_t pyb_spi_send_recv(mp_uint_t n_args, const mp_obj_t *pos_args, mp
604604
status = HAL_SPI_TransmitReceive(self->spi, bufinfo_send.buf, bufinfo_recv.buf, bufinfo_send.len, args[2].u_int);
605605
} else {
606606
DMA_HandleTypeDef tx_dma, rx_dma;
607-
dma_init(&tx_dma, self->tx_dma_stream, self->tx_dma_channel, DMA_MEMORY_TO_PERIPH, self->spi);
607+
dma_init(&tx_dma, self->tx_dma_stream, &dma_init_struct_spi_i2c, self->tx_dma_channel, DMA_MEMORY_TO_PERIPH, self->spi);
608608
self->spi->hdmatx = &tx_dma;
609-
dma_init(&rx_dma, self->rx_dma_stream, self->rx_dma_channel, DMA_PERIPH_TO_MEMORY, self->spi);
609+
dma_init(&rx_dma, self->rx_dma_stream, &dma_init_struct_spi_i2c, self->rx_dma_channel, DMA_PERIPH_TO_MEMORY, self->spi);
610610
self->spi->hdmarx = &rx_dma;
611611
status = HAL_SPI_TransmitReceive_DMA(self->spi, bufinfo_send.buf, bufinfo_recv.buf, bufinfo_send.len);
612612
if (status == HAL_OK) {

0 commit comments

Comments
 (0)