Skip to content

Commit 705132b

Browse files
committed
[dfg] DMA signal de-duplication
1 parent 7e6dc4a commit 705132b

File tree

9 files changed

+9
-13
lines changed

9 files changed

+9
-13
lines changed

devices/stm32/stm32f0-70.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@
200200
</signal>
201201
<signal driver="tim" instance="1" name="ch3"/>
202202
<signal driver="tim" instance="1" name="up"/>
203-
<signal device-size="b" driver="tim" instance="1" name="up"/>
204203
<signal device-size="b" driver="tim" instance="15" name="ch1"/>
205204
<signal device-size="b" driver="tim" instance="15" name="com"/>
206205
<signal device-size="b" driver="tim" instance="15" name="trig"/>

devices/stm32/stm32f0-71.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@
237237
</signal>
238238
<signal driver="tim" instance="1" name="ch3"/>
239239
<signal driver="tim" instance="1" name="up"/>
240-
<signal driver="tim" instance="1" name="up"/>
241240
<signal driver="tim" instance="15" name="ch1"/>
242241
<signal driver="tim" instance="15" name="com"/>
243242
<signal driver="tim" instance="15" name="trig"/>

devices/stm32/stm32f0-72.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@
248248
</signal>
249249
<signal driver="tim" instance="1" name="ch3"/>
250250
<signal driver="tim" instance="1" name="up"/>
251-
<signal driver="tim" instance="1" name="up"/>
252251
<signal driver="tim" instance="15" name="ch1"/>
253252
<signal driver="tim" instance="15" name="com"/>
254253
<signal driver="tim" instance="15" name="trig"/>

devices/stm32/stm32f0-78.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@
231231
</signal>
232232
<signal driver="tim" instance="1" name="ch3"/>
233233
<signal driver="tim" instance="1" name="up"/>
234-
<signal driver="tim" instance="1" name="up"/>
235234
<signal driver="tim" instance="15" name="ch1"/>
236235
<signal driver="tim" instance="15" name="com"/>
237236
<signal driver="tim" instance="15" name="trig"/>

devices/stm32/stm32f1-00-4_6.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@
144144
<signal driver="tim" instance="1" name="ch1"/>
145145
<signal driver="tim" instance="1" name="ch2"/>
146146
<signal driver="tim" instance="1" name="ch3"/>
147-
<signal driver="tim" instance="1" name="ch3"/>
148147
<signal driver="tim" instance="16" name="ch1"/>
149148
<signal driver="tim" instance="16" name="up"/>
150149
<signal driver="tim" instance="3" name="ch1"/>

devices/stm32/stm32f1-00-8_b.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@
159159
<signal driver="tim" instance="1" name="ch1"/>
160160
<signal driver="tim" instance="1" name="ch2"/>
161161
<signal driver="tim" instance="1" name="ch3"/>
162-
<signal driver="tim" instance="1" name="ch3"/>
163162
<signal driver="tim" instance="16" name="ch1"/>
164163
<signal driver="tim" instance="16" name="up"/>
165164
<signal driver="tim" instance="3" name="ch1"/>

devices/stm32/stm32f1-00-c_d_e.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@
179179
<signal driver="tim" instance="1" name="ch1"/>
180180
<signal driver="tim" instance="1" name="ch2"/>
181181
<signal driver="tim" instance="1" name="ch3"/>
182-
<signal driver="tim" instance="1" name="ch3"/>
183182
<signal driver="tim" instance="16" name="ch1"/>
184183
<signal driver="tim" instance="16" name="up"/>
185184
<signal driver="tim" instance="3" name="ch1"/>

devices/stm32/stm32f3-73_78.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -277,12 +277,6 @@
277277
<signal driver="tim" instance="17" name="ch1">
278278
<remap position="12" mask="1" id="1"/>
279279
</signal>
280-
<signal driver="tim" instance="17" name="ch1">
281-
<remap position="12" mask="1" id="1"/>
282-
</signal>
283-
<signal driver="tim" instance="17" name="up">
284-
<remap position="12" mask="1" id="1"/>
285-
</signal>
286280
<signal driver="tim" instance="17" name="up">
287281
<remap position="12" mask="1" id="1"/>
288282
</signal>

tools/generator/dfg/stm32/stm_device_tree.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,15 @@ def rv(param, default=[]):
335335
dma_streams['1'].pop('6')
336336
dma_streams['1'].pop('7')
337337

338+
# De-duplicate DMA signal entries
339+
def deduplicate_list(l):
340+
return [i for n, i in enumerate(l) if i not in l[n + 1:]]
341+
for stream in dma_streams:
342+
for channel in dma_streams[stream]:
343+
for signal in dma_streams[stream][channel]:
344+
dma_streams[stream][channel][signal] = deduplicate_list(
345+
dma_streams[stream][channel][signal])
346+
338347
# if p["dma_naming"][1] == "request":
339348
# print(did, dmaFile.filename)
340349
p["dma"] = dma_streams

0 commit comments

Comments
 (0)