Skip to content

Commit 7e6dc4a

Browse files
rlehrleh
committed
[dfg] Fix STM32F0 DMA conditions
1 parent 0bf0ab0 commit 7e6dc4a

File tree

3 files changed

+11
-261
lines changed

3 files changed

+11
-261
lines changed

‎devices/stm32/stm32f0-30.xml‎

Lines changed: 0 additions & 204 deletions
Original file line numberDiff line numberDiff line change
@@ -417,210 +417,6 @@
417417
<signal driver="usart" instance="6" name="rx"/>
418418
</request>
419419
</channel>
420-
<channel position="6">
421-
<request position="2">
422-
<signal driver="i2c" instance="1" name="tx">
423-
<remap position="27" mask="1" id="0"/>
424-
</signal>
425-
</request>
426-
<request position="3">
427-
<signal driver="spi" instance="2" name="rx"/>
428-
</request>
429-
<request position="4">
430-
<signal driver="tim" instance="1" name="ch1"/>
431-
<signal driver="tim" instance="1" name="ch2"/>
432-
<signal driver="tim" instance="1" name="ch3">
433-
<remap position="28" mask="1" id="0"/>
434-
</signal>
435-
</request>
436-
<request position="6">
437-
<signal driver="tim" instance="3" name="ch1">
438-
<remap position="30" mask="1" id="1"/>
439-
</signal>
440-
<signal driver="tim" instance="3" name="trig">
441-
<remap position="30" mask="1" id="1"/>
442-
</signal>
443-
</request>
444-
<request position="7">
445-
<signal driver="tim" instance="16" name="ch1"/>
446-
<signal driver="tim" instance="16" name="up"/>
447-
</request>
448-
<request position="8">
449-
<signal driver="usart" instance="1" name="rx"/>
450-
</request>
451-
<request position="9">
452-
<signal driver="usart" instance="2" name="rx"/>
453-
</request>
454-
<request position="10">
455-
<signal driver="usart" instance="3" name="rx"/>
456-
</request>
457-
<request position="11">
458-
<signal driver="usart" instance="4" name="rx"/>
459-
</request>
460-
<request position="12">
461-
<signal driver="usart" instance="5" name="rx"/>
462-
</request>
463-
<request position="13">
464-
<signal driver="usart" instance="6" name="rx"/>
465-
</request>
466-
</channel>
467-
<channel position="7">
468-
<request position="2">
469-
<signal driver="i2c" instance="1" name="rx"/>
470-
</request>
471-
<request position="3">
472-
<signal driver="spi" instance="2" name="tx"/>
473-
</request>
474-
<request position="7">
475-
<signal driver="tim" instance="17" name="ch1">
476-
<remap position="14" mask="1" id="1"/>
477-
</signal>
478-
<signal driver="tim" instance="17" name="up">
479-
<remap position="14" mask="1" id="1"/>
480-
</signal>
481-
</request>
482-
<request position="8">
483-
<signal driver="usart" instance="1" name="tx"/>
484-
</request>
485-
<request position="9">
486-
<signal driver="usart" instance="2" name="tx"/>
487-
</request>
488-
<request position="10">
489-
<signal driver="usart" instance="3" name="tx"/>
490-
</request>
491-
<request position="11">
492-
<signal driver="usart" instance="4" name="tx"/>
493-
</request>
494-
<request position="12">
495-
<signal driver="usart" instance="5" name="tx"/>
496-
</request>
497-
<request position="13">
498-
<signal driver="usart" instance="6" name="tx"/>
499-
</request>
500-
</channel>
501-
</channels>
502-
<channels instance="2">
503-
<channel position="1">
504-
<request position="2">
505-
<signal driver="i2c" instance="2" name="tx"/>
506-
</request>
507-
<request position="8">
508-
<signal driver="usart" instance="1" name="tx"/>
509-
</request>
510-
<request position="9">
511-
<signal driver="usart" instance="2" name="tx"/>
512-
</request>
513-
<request position="10">
514-
<signal driver="usart" instance="3" name="tx"/>
515-
</request>
516-
<request position="11">
517-
<signal driver="usart" instance="4" name="tx"/>
518-
</request>
519-
<request position="12">
520-
<signal driver="usart" instance="5" name="tx"/>
521-
</request>
522-
<request position="13">
523-
<signal driver="usart" instance="6" name="tx"/>
524-
</request>
525-
</channel>
526-
<channel position="2">
527-
<request position="2">
528-
<signal driver="i2c" instance="2" name="rx"/>
529-
</request>
530-
<request position="8">
531-
<signal driver="usart" instance="1" name="rx"/>
532-
</request>
533-
<request position="9">
534-
<signal driver="usart" instance="2" name="rx"/>
535-
</request>
536-
<request position="10">
537-
<signal driver="usart" instance="3" name="rx"/>
538-
</request>
539-
<request position="11">
540-
<signal driver="usart" instance="4" name="rx"/>
541-
</request>
542-
<request position="12">
543-
<signal driver="usart" instance="5" name="rx"/>
544-
</request>
545-
<request position="13">
546-
<signal driver="usart" instance="6" name="rx"/>
547-
</request>
548-
</channel>
549-
<channel position="3">
550-
<request position="1">
551-
<signal driver="tim" instance="6" name="up"/>
552-
</request>
553-
<request position="3">
554-
<signal driver="spi" instance="1" name="rx"/>
555-
</request>
556-
<request position="8">
557-
<signal driver="usart" instance="1" name="rx"/>
558-
</request>
559-
<request position="9">
560-
<signal driver="usart" instance="2" name="rx"/>
561-
</request>
562-
<request position="10">
563-
<signal driver="usart" instance="3" name="rx"/>
564-
</request>
565-
<request position="11">
566-
<signal driver="usart" instance="4" name="rx"/>
567-
</request>
568-
<request position="12">
569-
<signal driver="usart" instance="5" name="rx"/>
570-
</request>
571-
<request position="13">
572-
<signal driver="usart" instance="6" name="rx"/>
573-
</request>
574-
</channel>
575-
<channel position="4">
576-
<request position="1">
577-
<signal driver="tim" instance="7" name="up"/>
578-
</request>
579-
<request position="3">
580-
<signal driver="spi" instance="1" name="tx"/>
581-
</request>
582-
<request position="8">
583-
<signal driver="usart" instance="1" name="tx"/>
584-
</request>
585-
<request position="9">
586-
<signal driver="usart" instance="2" name="tx"/>
587-
</request>
588-
<request position="10">
589-
<signal driver="usart" instance="3" name="tx"/>
590-
</request>
591-
<request position="11">
592-
<signal driver="usart" instance="4" name="tx"/>
593-
</request>
594-
<request position="12">
595-
<signal driver="usart" instance="5" name="tx"/>
596-
</request>
597-
<request position="13">
598-
<signal driver="usart" instance="6" name="tx"/>
599-
</request>
600-
</channel>
601-
<channel position="5">
602-
<request position="1">
603-
<signal driver="adc"/>
604-
</request>
605-
<request position="8">
606-
<signal driver="usart" instance="1" name="tx"/>
607-
</request>
608-
<request position="9">
609-
<signal driver="usart" instance="2" name="tx"/>
610-
</request>
611-
<request position="10">
612-
<signal driver="usart" instance="3" name="tx"/>
613-
</request>
614-
<request position="11">
615-
<signal driver="usart" instance="4" name="tx"/>
616-
</request>
617-
<request position="12">
618-
<signal driver="usart" instance="5" name="tx"/>
619-
</request>
620-
<request position="13">
621-
<signal driver="usart" instance="6" name="tx"/>
622-
</request>
623-
</channel>
624420
</channels>
625421
</driver>
626422
<driver name="gpio" type="stm32">

‎devices/stm32/stm32f0-70.xml‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -212,63 +212,6 @@
212212
<remap position="25" mask="1" id="0"/>
213213
</signal>
214214
</channel>
215-
<channel device-size="b" position="6">
216-
<signal driver="i2c" instance="1" name="tx">
217-
<remap position="27" mask="1" id="1"/>
218-
</signal>
219-
<signal driver="spi" instance="2" name="rx">
220-
<remap position="24" mask="1" id="1"/>
221-
</signal>
222-
<signal driver="tim" instance="1" name="ch1">
223-
<remap position="28" mask="1" id="1"/>
224-
</signal>
225-
<signal driver="tim" instance="1" name="ch2">
226-
<remap position="28" mask="1" id="1"/>
227-
</signal>
228-
<signal driver="tim" instance="1" name="ch3">
229-
<remap position="28" mask="1" id="1"/>
230-
</signal>
231-
<signal driver="tim" instance="16" name="ch1">
232-
<remap position="13" mask="1" id="1"/>
233-
</signal>
234-
<signal driver="tim" instance="16" name="up">
235-
<remap position="13" mask="1" id="1"/>
236-
</signal>
237-
<signal driver="tim" instance="3" name="ch1">
238-
<remap position="30" mask="1" id="1"/>
239-
</signal>
240-
<signal driver="tim" instance="3" name="trig">
241-
<remap position="30" mask="1" id="1"/>
242-
</signal>
243-
<signal driver="usart" instance="2" name="rx">
244-
<remap position="25" mask="1" id="1"/>
245-
</signal>
246-
<signal driver="usart" instance="3" name="rx">
247-
<remap position="26" mask="1" id="0"/>
248-
</signal>
249-
<signal driver="usart" instance="4" name="rx"/>
250-
</channel>
251-
<channel device-size="b" position="7">
252-
<signal driver="i2c" instance="1" name="rx">
253-
<remap position="27" mask="1" id="1"/>
254-
</signal>
255-
<signal driver="spi" instance="2" name="tx">
256-
<remap position="24" mask="1" id="1"/>
257-
</signal>
258-
<signal driver="tim" instance="17" name="ch1">
259-
<remap position="14" mask="1" id="1"/>
260-
</signal>
261-
<signal driver="tim" instance="17" name="up">
262-
<remap position="14" mask="1" id="1"/>
263-
</signal>
264-
<signal driver="usart" instance="2" name="tx">
265-
<remap position="25" mask="1" id="1"/>
266-
</signal>
267-
<signal driver="usart" instance="3" name="tx">
268-
<remap position="26" mask="1" id="0"/>
269-
</signal>
270-
<signal driver="usart" instance="4" name="tx"/>
271-
</channel>
272215
</channels>
273216
</driver>
274217
<driver name="gpio" type="stm32">

‎tools/generator/dfg/stm32/stm_device_tree.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,17 @@ def rv(param, default=[]):
324324
# print(instance, stream, channel)
325325
# print(signal)
326326

327+
# Manually handle condition expressions from XML for
328+
# (STM32F030CCTx|STM32F030RCTx) and (STM32F070CBTx|STM32F070RBTx)
329+
if did.family in ['f0']:
330+
if (did.name == '30' and did.size == 'c'):
331+
dma_streams['1'].pop('6')
332+
dma_streams['1'].pop('7')
333+
dma_streams.pop('2')
334+
if (did.name == '70' and did.size == 'b'):
335+
dma_streams['1'].pop('6')
336+
dma_streams['1'].pop('7')
337+
327338
# if p["dma_naming"][1] == "request":
328339
# print(did, dmaFile.filename)
329340
p["dma"] = dma_streams

0 commit comments

Comments
 (0)