Skip to content

Commit c2d2302

Browse files
committed
fixed compliation errors after merging
1 parent 0419daa commit c2d2302

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

targets/TARGET_STM/qspi_api.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ static void qspi_init_dma(struct qspi_s * obj)
504504
dmaLink = &OSPIDMALinks[0];
505505
#endif
506506
// Initialize DMA channel
507-
DMAHandlePointer dmaHandle = stm_init_dma_link(dmaLink, DMA_PERIPH_TO_MEMORY, false, true, 1, 1);
507+
DMAHandlePointer dmaHandle = stm_init_dma_link(dmaLink, DMA_PERIPH_TO_MEMORY, false, true, 1, 1, DMA_NORMAL);
508508
if(dmaHandle.hdma == NULL)
509509
{
510510
mbed_error(MBED_ERROR_ALREADY_IN_USE, "DMA channel already used by something else!", 0, MBED_FILENAME, __LINE__);
@@ -700,7 +700,7 @@ static void qspi_init_dma(struct qspi_s * obj)
700700
DMALinkInfo const *dmaLink = &QSPIDMALinks[0];
701701

702702
// Initialize DMA channel
703-
DMAHandlePointer dmaHandle = stm_init_dma_link(dmaLink, DMA_PERIPH_TO_MEMORY, false, true, 1, 1);
703+
DMAHandlePointer dmaHandle = stm_init_dma_link(dmaLink, DMA_PERIPH_TO_MEMORY, false, true, 1, 1, DMA_NORMAL);
704704
if(dmaHandle.hdma == NULL)
705705
{
706706
mbed_error(MBED_ERROR_ALREADY_IN_USE, "DMA channel already used by something else!", 0, MBED_FILENAME, __LINE__);

targets/TARGET_STM/stm_dma_utils.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,68 +1227,68 @@ void DMA1_Ch4_5_DMAMUX1_OVR_IRQHandler(void)
12271227
void DMA1_Channel2_3_IRQHandler(void)
12281228
{
12291229
if(stmDMAHandles[0][1] != NULL) {
1230-
HAL_DMA_IRQHandler(stmDMAHandles[0][1]);
1230+
HAL_DMA_IRQHandler(stmDMAHandles[0][1].hdma);
12311231
}
12321232
if(stmDMAHandles[0][2] != NULL) {
1233-
HAL_DMA_IRQHandler(stmDMAHandles[0][2]);
1233+
HAL_DMA_IRQHandler(stmDMAHandles[0][2].hdma);
12341234
}
12351235
}
12361236

12371237
#ifdef DMA2
12381238
void DMA1_Ch4_7_DMA2_Ch1_5_DMAMUX_OVR_IRQHandler(void)
12391239
{
12401240
if(stmDMAHandles[0][3] != NULL) {
1241-
HAL_DMA_IRQHandler(stmDMAHandles[0][3]);
1241+
HAL_DMA_IRQHandler(stmDMAHandles[0][3].hdma);
12421242
}
12431243
if(stmDMAHandles[0][4] != NULL) {
1244-
HAL_DMA_IRQHandler(stmDMAHandles[0][4]);
1244+
HAL_DMA_IRQHandler(stmDMAHandles[0][4].hdma);
12451245
}
12461246
if(stmDMAHandles[0][5] != NULL) {
1247-
HAL_DMA_IRQHandler(stmDMAHandles[0][5]);
1247+
HAL_DMA_IRQHandler(stmDMAHandles[0][5].hdma);
12481248
}
12491249
if(stmDMAHandles[0][6] != NULL) {
1250-
HAL_DMA_IRQHandler(stmDMAHandles[0][6]);
1250+
HAL_DMA_IRQHandler(stmDMAHandles[0][6].hdma);
12511251
}
12521252
if(stmDMAHandles[1][0] != NULL) {
1253-
HAL_DMA_IRQHandler(stmDMAHandles[1][0]);
1253+
HAL_DMA_IRQHandler(stmDMAHandles[1][0].hdma);
12541254
}
12551255
if(stmDMAHandles[1][1] != NULL) {
1256-
HAL_DMA_IRQHandler(stmDMAHandles[1][1]);
1256+
HAL_DMA_IRQHandler(stmDMAHandles[1][1].hdma);
12571257
}
12581258
if(stmDMAHandles[1][2] != NULL) {
1259-
HAL_DMA_IRQHandler(stmDMAHandles[1][2]);
1259+
HAL_DMA_IRQHandler(stmDMAHandles[1][2].hdma);
12601260
}
12611261
if(stmDMAHandles[1][3] != NULL) {
1262-
HAL_DMA_IRQHandler(stmDMAHandles[1][3]);
1262+
HAL_DMA_IRQHandler(stmDMAHandles[1][3].hdma);
12631263
}
12641264
if(stmDMAHandles[1][4] != NULL) {
1265-
HAL_DMA_IRQHandler(stmDMAHandles[1][4]);
1265+
HAL_DMA_IRQHandler(stmDMAHandles[1][4].hdma);
12661266
}
12671267
}
12681268
#elif defined(DMA1_Channel7)
12691269
void DMA1_Ch4_7_DMAMUX_OVR_IRQHandler(void)
12701270
{
12711271
if(stmDMAHandles[0][3] != NULL) {
1272-
HAL_DMA_IRQHandler(stmDMAHandles[0][3]);
1272+
HAL_DMA_IRQHandler(stmDMAHandles[0][3].hdma);
12731273
}
12741274
if(stmDMAHandles[0][4] != NULL) {
1275-
HAL_DMA_IRQHandler(stmDMAHandles[0][4]);
1275+
HAL_DMA_IRQHandler(stmDMAHandles[0][4].hdma);
12761276
}
12771277
if(stmDMAHandles[0][5] != NULL) {
1278-
HAL_DMA_IRQHandler(stmDMAHandles[0][5]);
1278+
HAL_DMA_IRQHandler(stmDMAHandles[0][5].hdma);
12791279
}
12801280
if(stmDMAHandles[0][6] != NULL) {
1281-
HAL_DMA_IRQHandler(stmDMAHandles[0][6]);
1281+
HAL_DMA_IRQHandler(stmDMAHandles[0][6].hdma);
12821282
}
12831283
}
12841284
#else
12851285
void DMA1_Ch4_5_DMAMUX_OVR_IRQHandler(void)
12861286
{
12871287
if(stmDMAHandles[0][3] != NULL) {
1288-
HAL_DMA_IRQHandler(stmDMAHandles[0][3]);
1288+
HAL_DMA_IRQHandler(stmDMAHandles[0][3].hdma);
12891289
}
12901290
if(stmDMAHandles[0][4] != NULL) {
1291-
HAL_DMA_IRQHandler(stmDMAHandles[0][4]);
1291+
HAL_DMA_IRQHandler(stmDMAHandles[0][4].hdma);
12921292
}
12931293
}
12941294
#endif

0 commit comments

Comments
 (0)