fix stm_dma_utils compliation errors for MCUs with shared IRQs

wdx04 · wdx04 · commit 8fad66e3461d · 2025-04-28T21:05:34.000+08:00
diff --git a/targets/TARGET_STM/stm_dma_utils.c b/targets/TARGET_STM/stm_dma_utils.c
@@ -1080,20 +1080,20 @@ void DMA1_Channel1_IRQHandler(void)
 
 void DMA1_Channel2_3_IRQHandler(void)
 {
-    if(stmDMAHandles[0][1] != NULL) {
+    if(stmDMAHandles[0][1].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][1].hdma);
     }
-    if(stmDMAHandles[0][2] != NULL) {
+    if(stmDMAHandles[0][2].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][2].hdma);
     }
 }
 
 void DMA1_Channel4_5_IRQHandler(void)
 {
-    if(stmDMAHandles[0][3] != NULL) {
+    if(stmDMAHandles[0][3].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][3].hdma);
     }
-    if(stmDMAHandles[0][4] != NULL) {
+    if(stmDMAHandles[0][4].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][4].hdma);
     }
 }
@@ -1102,68 +1102,68 @@ void DMA1_Channel4_5_IRQHandler(void)
 
 void DMA1_Channel2_3_IRQHandler(void)
 {
-    if(stmDMAHandles[0][1] != NULL) {
+    if(stmDMAHandles[0][1].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][1].hdma);
     }
-    if(stmDMAHandles[0][2] != NULL) {
+    if(stmDMAHandles[0][2].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][2].hdma);
     }
 }
 
 #ifdef DMA2
 void DMA1_Ch4_7_DMA2_Ch1_5_DMAMUX1_OVR_IRQHandler(void)
 {
-    if(stmDMAHandles[0][3] != NULL) {
+    if(stmDMAHandles[0][3].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][3].hdma);
     }
-    if(stmDMAHandles[0][4] != NULL) {
+    if(stmDMAHandles[0][4].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][4].hdma);
     }
-    if(stmDMAHandles[0][5] != NULL) {
+    if(stmDMAHandles[0][5].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][5].hdma);
     }
-    if(stmDMAHandles[0][6] != NULL) {
+    if(stmDMAHandles[0][6].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][6].hdma);
     }
-    if(stmDMAHandles[1][0] != NULL) {
+    if(stmDMAHandles[1][0].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[1][0].hdma);
     }
-    if(stmDMAHandles[1][1] != NULL) {
+    if(stmDMAHandles[1][1].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[1][1].hdma);
     }
-    if(stmDMAHandles[1][2] != NULL) {
+    if(stmDMAHandles[1][2].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[1][2].hdma);
     }
-    if(stmDMAHandles[1][3] != NULL) {
+    if(stmDMAHandles[1][3].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[1][3].hdma);
     }
-    if(stmDMAHandles[1][4] != NULL) {
+    if(stmDMAHandles[1][4].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[1][4].hdma);
     }
 }
 #elif defined(DMA1_Channel7)
 void DMA1_Ch4_7_DMAMUX1_OVR_IRQHandler(void)
 {
-    if(stmDMAHandles[0][3] != NULL) {
+    if(stmDMAHandles[0][3].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][3].hdma);
     }
-    if(stmDMAHandles[0][4] != NULL) {
+    if(stmDMAHandles[0][4].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][4].hdma);
     }
-    if(stmDMAHandles[0][5] != NULL) {
+    if(stmDMAHandles[0][5].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][5].hdma);
     }
-    if(stmDMAHandles[0][6] != NULL) {
+    if(stmDMAHandles[0][6].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][6].hdma);
     }
 }
 #else
 void DMA1_Ch4_5_DMAMUX1_OVR_IRQHandler(void)
 {
-    if(stmDMAHandles[0][3] != NULL) {
+    if(stmDMAHandles[0][3].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][3].hdma);
     }
-    if(stmDMAHandles[0][4] != NULL) {
+    if(stmDMAHandles[0][4].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][4].hdma);
     }
 }
@@ -1173,26 +1173,26 @@ void DMA1_Ch4_5_DMAMUX1_OVR_IRQHandler(void)
 
 void DMA1_Channel2_3_IRQHandler(void)
 {
-    if(stmDMAHandles[0][1] != NULL) {
+    if(stmDMAHandles[0][1].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][1].hdma);
     }
-    if(stmDMAHandles[0][2] != NULL) {
+    if(stmDMAHandles[0][2].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][2].hdma);
     }
 }
 
 void DMA1_Channel4_5_6_7_IRQHandler(void)
 {
-    if(stmDMAHandles[0][3] != NULL) {
+    if(stmDMAHandles[0][3].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][3].hdma);
     }
-    if(stmDMAHandles[0][4] != NULL) {
+    if(stmDMAHandles[0][4].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][4].hdma);
     }
-    if(stmDMAHandles[0][5] != NULL) {
+    if(stmDMAHandles[0][5].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][5].hdma);
     }
-    if(stmDMAHandles[0][6] != NULL) {
+    if(stmDMAHandles[0][6].hdma != NULL) {
         HAL_DMA_IRQHandler(stmDMAHandles[0][6].hdma);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1080,20 +1080,20 @@ void DMA1_Channel1_IRQHandler(void)`
`1080`	`1080`
`1081`	`1081`	`void DMA1_Channel2_3_IRQHandler(void)`
`1082`	`1082`	`{`
`1083`		`- if(stmDMAHandles[0][1] != NULL) {`
	`1083`	`+ if(stmDMAHandles[0][1].hdma != NULL) {`
`1084`	`1084`	`HAL_DMA_IRQHandler(stmDMAHandles[0][1].hdma);`
`1085`	`1085`	`}`
`1086`		`- if(stmDMAHandles[0][2] != NULL) {`
	`1086`	`+ if(stmDMAHandles[0][2].hdma != NULL) {`
`1087`	`1087`	`HAL_DMA_IRQHandler(stmDMAHandles[0][2].hdma);`
`1088`	`1088`	`}`
`1089`	`1089`	`}`
`1090`	`1090`
`1091`	`1091`	`void DMA1_Channel4_5_IRQHandler(void)`
`1092`	`1092`	`{`
`1093`		`- if(stmDMAHandles[0][3] != NULL) {`
	`1093`	`+ if(stmDMAHandles[0][3].hdma != NULL) {`
`1094`	`1094`	`HAL_DMA_IRQHandler(stmDMAHandles[0][3].hdma);`
`1095`	`1095`	`}`
`1096`		`- if(stmDMAHandles[0][4] != NULL) {`
	`1096`	`+ if(stmDMAHandles[0][4].hdma != NULL) {`
`1097`	`1097`	`HAL_DMA_IRQHandler(stmDMAHandles[0][4].hdma);`
`1098`	`1098`	`}`
`1099`	`1099`	`}`
`@@ -1102,68 +1102,68 @@ void DMA1_Channel4_5_IRQHandler(void)`
`1102`	`1102`
`1103`	`1103`	`void DMA1_Channel2_3_IRQHandler(void)`
`1104`	`1104`	`{`
`1105`		`- if(stmDMAHandles[0][1] != NULL) {`
	`1105`	`+ if(stmDMAHandles[0][1].hdma != NULL) {`
`1106`	`1106`	`HAL_DMA_IRQHandler(stmDMAHandles[0][1].hdma);`
`1107`	`1107`	`}`
`1108`		`- if(stmDMAHandles[0][2] != NULL) {`
	`1108`	`+ if(stmDMAHandles[0][2].hdma != NULL) {`
`1109`	`1109`	`HAL_DMA_IRQHandler(stmDMAHandles[0][2].hdma);`
`1110`	`1110`	`}`
`1111`	`1111`	`}`
`1112`	`1112`
`1113`	`1113`	`#ifdef DMA2`
`1114`	`1114`	`void DMA1_Ch4_7_DMA2_Ch1_5_DMAMUX1_OVR_IRQHandler(void)`
`1115`	`1115`	`{`
`1116`		`- if(stmDMAHandles[0][3] != NULL) {`
	`1116`	`+ if(stmDMAHandles[0][3].hdma != NULL) {`
`1117`	`1117`	`HAL_DMA_IRQHandler(stmDMAHandles[0][3].hdma);`
`1118`	`1118`	`}`
`1119`		`- if(stmDMAHandles[0][4] != NULL) {`
	`1119`	`+ if(stmDMAHandles[0][4].hdma != NULL) {`
`1120`	`1120`	`HAL_DMA_IRQHandler(stmDMAHandles[0][4].hdma);`
`1121`	`1121`	`}`
`1122`		`- if(stmDMAHandles[0][5] != NULL) {`
	`1122`	`+ if(stmDMAHandles[0][5].hdma != NULL) {`
`1123`	`1123`	`HAL_DMA_IRQHandler(stmDMAHandles[0][5].hdma);`
`1124`	`1124`	`}`
`1125`		`- if(stmDMAHandles[0][6] != NULL) {`
	`1125`	`+ if(stmDMAHandles[0][6].hdma != NULL) {`
`1126`	`1126`	`HAL_DMA_IRQHandler(stmDMAHandles[0][6].hdma);`
`1127`	`1127`	`}`
`1128`		`- if(stmDMAHandles[1][0] != NULL) {`
	`1128`	`+ if(stmDMAHandles[1][0].hdma != NULL) {`
`1129`	`1129`	`HAL_DMA_IRQHandler(stmDMAHandles[1][0].hdma);`
`1130`	`1130`	`}`
`1131`		`- if(stmDMAHandles[1][1] != NULL) {`
	`1131`	`+ if(stmDMAHandles[1][1].hdma != NULL) {`
`1132`	`1132`	`HAL_DMA_IRQHandler(stmDMAHandles[1][1].hdma);`
`1133`	`1133`	`}`
`1134`		`- if(stmDMAHandles[1][2] != NULL) {`
	`1134`	`+ if(stmDMAHandles[1][2].hdma != NULL) {`
`1135`	`1135`	`HAL_DMA_IRQHandler(stmDMAHandles[1][2].hdma);`
`1136`	`1136`	`}`
`1137`		`- if(stmDMAHandles[1][3] != NULL) {`
	`1137`	`+ if(stmDMAHandles[1][3].hdma != NULL) {`
`1138`	`1138`	`HAL_DMA_IRQHandler(stmDMAHandles[1][3].hdma);`
`1139`	`1139`	`}`
`1140`		`- if(stmDMAHandles[1][4] != NULL) {`
	`1140`	`+ if(stmDMAHandles[1][4].hdma != NULL) {`
`1141`	`1141`	`HAL_DMA_IRQHandler(stmDMAHandles[1][4].hdma);`
`1142`	`1142`	`}`
`1143`	`1143`	`}`
`1144`	`1144`	`#elif defined(DMA1_Channel7)`
`1145`	`1145`	`void DMA1_Ch4_7_DMAMUX1_OVR_IRQHandler(void)`
`1146`	`1146`	`{`
`1147`		`- if(stmDMAHandles[0][3] != NULL) {`
	`1147`	`+ if(stmDMAHandles[0][3].hdma != NULL) {`
`1148`	`1148`	`HAL_DMA_IRQHandler(stmDMAHandles[0][3].hdma);`
`1149`	`1149`	`}`
`1150`		`- if(stmDMAHandles[0][4] != NULL) {`
	`1150`	`+ if(stmDMAHandles[0][4].hdma != NULL) {`
`1151`	`1151`	`HAL_DMA_IRQHandler(stmDMAHandles[0][4].hdma);`
`1152`	`1152`	`}`
`1153`		`- if(stmDMAHandles[0][5] != NULL) {`
	`1153`	`+ if(stmDMAHandles[0][5].hdma != NULL) {`
`1154`	`1154`	`HAL_DMA_IRQHandler(stmDMAHandles[0][5].hdma);`
`1155`	`1155`	`}`
`1156`		`- if(stmDMAHandles[0][6] != NULL) {`
	`1156`	`+ if(stmDMAHandles[0][6].hdma != NULL) {`
`1157`	`1157`	`HAL_DMA_IRQHandler(stmDMAHandles[0][6].hdma);`
`1158`	`1158`	`}`
`1159`	`1159`	`}`
`1160`	`1160`	`#else`
`1161`	`1161`	`void DMA1_Ch4_5_DMAMUX1_OVR_IRQHandler(void)`
`1162`	`1162`	`{`
`1163`		`- if(stmDMAHandles[0][3] != NULL) {`
	`1163`	`+ if(stmDMAHandles[0][3].hdma != NULL) {`
`1164`	`1164`	`HAL_DMA_IRQHandler(stmDMAHandles[0][3].hdma);`
`1165`	`1165`	`}`
`1166`		`- if(stmDMAHandles[0][4] != NULL) {`
	`1166`	`+ if(stmDMAHandles[0][4].hdma != NULL) {`
`1167`	`1167`	`HAL_DMA_IRQHandler(stmDMAHandles[0][4].hdma);`
`1168`	`1168`	`}`
`1169`	`1169`	`}`
`@@ -1173,26 +1173,26 @@ void DMA1_Ch4_5_DMAMUX1_OVR_IRQHandler(void)`
`1173`	`1173`
`1174`	`1174`	`void DMA1_Channel2_3_IRQHandler(void)`
`1175`	`1175`	`{`
`1176`		`- if(stmDMAHandles[0][1] != NULL) {`
	`1176`	`+ if(stmDMAHandles[0][1].hdma != NULL) {`
`1177`	`1177`	`HAL_DMA_IRQHandler(stmDMAHandles[0][1].hdma);`
`1178`	`1178`	`}`
`1179`		`- if(stmDMAHandles[0][2] != NULL) {`
	`1179`	`+ if(stmDMAHandles[0][2].hdma != NULL) {`
`1180`	`1180`	`HAL_DMA_IRQHandler(stmDMAHandles[0][2].hdma);`
`1181`	`1181`	`}`
`1182`	`1182`	`}`
`1183`	`1183`
`1184`	`1184`	`void DMA1_Channel4_5_6_7_IRQHandler(void)`
`1185`	`1185`	`{`
`1186`		`- if(stmDMAHandles[0][3] != NULL) {`
	`1186`	`+ if(stmDMAHandles[0][3].hdma != NULL) {`
`1187`	`1187`	`HAL_DMA_IRQHandler(stmDMAHandles[0][3].hdma);`
`1188`	`1188`	`}`
`1189`		`- if(stmDMAHandles[0][4] != NULL) {`
	`1189`	`+ if(stmDMAHandles[0][4].hdma != NULL) {`
`1190`	`1190`	`HAL_DMA_IRQHandler(stmDMAHandles[0][4].hdma);`
`1191`	`1191`	`}`
`1192`		`- if(stmDMAHandles[0][5] != NULL) {`
	`1192`	`+ if(stmDMAHandles[0][5].hdma != NULL) {`
`1193`	`1193`	`HAL_DMA_IRQHandler(stmDMAHandles[0][5].hdma);`
`1194`	`1194`	`}`
`1195`		`- if(stmDMAHandles[0][6] != NULL) {`
	`1195`	`+ if(stmDMAHandles[0][6].hdma != NULL) {`
`1196`	`1196`	`HAL_DMA_IRQHandler(stmDMAHandles[0][6].hdma);`
`1197`	`1197`	`}`
`1198`	`1198`	`}`