Skip to content

Minor fixes for DMA #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 14, 2021
Merged

Minor fixes for DMA #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e6dc4a
[dfg] Fix STM32F0 DMA conditions
rleh Apr 6, 2021
705132b
[dfg] DMA signal de-duplication
rleh Apr 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
204 changes: 0 additions & 204 deletions devices/stm32/stm32f0-30.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,210 +417,6 @@
<signal driver="usart" instance="6" name="rx"/>
</request>
</channel>
<channel position="6">
<request position="2">
<signal driver="i2c" instance="1" name="tx">
<remap position="27" mask="1" id="0"/>
</signal>
</request>
<request position="3">
<signal driver="spi" instance="2" name="rx"/>
</request>
<request position="4">
<signal driver="tim" instance="1" name="ch1"/>
<signal driver="tim" instance="1" name="ch2"/>
<signal driver="tim" instance="1" name="ch3">
<remap position="28" mask="1" id="0"/>
</signal>
</request>
<request position="6">
<signal driver="tim" instance="3" name="ch1">
<remap position="30" mask="1" id="1"/>
</signal>
<signal driver="tim" instance="3" name="trig">
<remap position="30" mask="1" id="1"/>
</signal>
</request>
<request position="7">
<signal driver="tim" instance="16" name="ch1"/>
<signal driver="tim" instance="16" name="up"/>
</request>
<request position="8">
<signal driver="usart" instance="1" name="rx"/>
</request>
<request position="9">
<signal driver="usart" instance="2" name="rx"/>
</request>
<request position="10">
<signal driver="usart" instance="3" name="rx"/>
</request>
<request position="11">
<signal driver="usart" instance="4" name="rx"/>
</request>
<request position="12">
<signal driver="usart" instance="5" name="rx"/>
</request>
<request position="13">
<signal driver="usart" instance="6" name="rx"/>
</request>
</channel>
<channel position="7">
<request position="2">
<signal driver="i2c" instance="1" name="rx"/>
</request>
<request position="3">
<signal driver="spi" instance="2" name="tx"/>
</request>
<request position="7">
<signal driver="tim" instance="17" name="ch1">
<remap position="14" mask="1" id="1"/>
</signal>
<signal driver="tim" instance="17" name="up">
<remap position="14" mask="1" id="1"/>
</signal>
</request>
<request position="8">
<signal driver="usart" instance="1" name="tx"/>
</request>
<request position="9">
<signal driver="usart" instance="2" name="tx"/>
</request>
<request position="10">
<signal driver="usart" instance="3" name="tx"/>
</request>
<request position="11">
<signal driver="usart" instance="4" name="tx"/>
</request>
<request position="12">
<signal driver="usart" instance="5" name="tx"/>
</request>
<request position="13">
<signal driver="usart" instance="6" name="tx"/>
</request>
</channel>
</channels>
<channels instance="2">
<channel position="1">
<request position="2">
<signal driver="i2c" instance="2" name="tx"/>
</request>
<request position="8">
<signal driver="usart" instance="1" name="tx"/>
</request>
<request position="9">
<signal driver="usart" instance="2" name="tx"/>
</request>
<request position="10">
<signal driver="usart" instance="3" name="tx"/>
</request>
<request position="11">
<signal driver="usart" instance="4" name="tx"/>
</request>
<request position="12">
<signal driver="usart" instance="5" name="tx"/>
</request>
<request position="13">
<signal driver="usart" instance="6" name="tx"/>
</request>
</channel>
<channel position="2">
<request position="2">
<signal driver="i2c" instance="2" name="rx"/>
</request>
<request position="8">
<signal driver="usart" instance="1" name="rx"/>
</request>
<request position="9">
<signal driver="usart" instance="2" name="rx"/>
</request>
<request position="10">
<signal driver="usart" instance="3" name="rx"/>
</request>
<request position="11">
<signal driver="usart" instance="4" name="rx"/>
</request>
<request position="12">
<signal driver="usart" instance="5" name="rx"/>
</request>
<request position="13">
<signal driver="usart" instance="6" name="rx"/>
</request>
</channel>
<channel position="3">
<request position="1">
<signal driver="tim" instance="6" name="up"/>
</request>
<request position="3">
<signal driver="spi" instance="1" name="rx"/>
</request>
<request position="8">
<signal driver="usart" instance="1" name="rx"/>
</request>
<request position="9">
<signal driver="usart" instance="2" name="rx"/>
</request>
<request position="10">
<signal driver="usart" instance="3" name="rx"/>
</request>
<request position="11">
<signal driver="usart" instance="4" name="rx"/>
</request>
<request position="12">
<signal driver="usart" instance="5" name="rx"/>
</request>
<request position="13">
<signal driver="usart" instance="6" name="rx"/>
</request>
</channel>
<channel position="4">
<request position="1">
<signal driver="tim" instance="7" name="up"/>
</request>
<request position="3">
<signal driver="spi" instance="1" name="tx"/>
</request>
<request position="8">
<signal driver="usart" instance="1" name="tx"/>
</request>
<request position="9">
<signal driver="usart" instance="2" name="tx"/>
</request>
<request position="10">
<signal driver="usart" instance="3" name="tx"/>
</request>
<request position="11">
<signal driver="usart" instance="4" name="tx"/>
</request>
<request position="12">
<signal driver="usart" instance="5" name="tx"/>
</request>
<request position="13">
<signal driver="usart" instance="6" name="tx"/>
</request>
</channel>
<channel position="5">
<request position="1">
<signal driver="adc"/>
</request>
<request position="8">
<signal driver="usart" instance="1" name="tx"/>
</request>
<request position="9">
<signal driver="usart" instance="2" name="tx"/>
</request>
<request position="10">
<signal driver="usart" instance="3" name="tx"/>
</request>
<request position="11">
<signal driver="usart" instance="4" name="tx"/>
</request>
<request position="12">
<signal driver="usart" instance="5" name="tx"/>
</request>
<request position="13">
<signal driver="usart" instance="6" name="tx"/>
</request>
</channel>
</channels>
</driver>
<driver name="gpio" type="stm32">
Expand Down
58 changes: 0 additions & 58 deletions devices/stm32/stm32f0-70.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@
</signal>
<signal driver="tim" instance="1" name="ch3"/>
<signal driver="tim" instance="1" name="up"/>
<signal device-size="b" driver="tim" instance="1" name="up"/>
<signal device-size="b" driver="tim" instance="15" name="ch1"/>
<signal device-size="b" driver="tim" instance="15" name="com"/>
<signal device-size="b" driver="tim" instance="15" name="trig"/>
Expand All @@ -212,63 +211,6 @@
<remap position="25" mask="1" id="0"/>
</signal>
</channel>
<channel device-size="b" position="6">
<signal driver="i2c" instance="1" name="tx">
<remap position="27" mask="1" id="1"/>
</signal>
<signal driver="spi" instance="2" name="rx">
<remap position="24" mask="1" id="1"/>
</signal>
<signal driver="tim" instance="1" name="ch1">
<remap position="28" mask="1" id="1"/>
</signal>
<signal driver="tim" instance="1" name="ch2">
<remap position="28" mask="1" id="1"/>
</signal>
<signal driver="tim" instance="1" name="ch3">
<remap position="28" mask="1" id="1"/>
</signal>
<signal driver="tim" instance="16" name="ch1">
<remap position="13" mask="1" id="1"/>
</signal>
<signal driver="tim" instance="16" name="up">
<remap position="13" mask="1" id="1"/>
</signal>
<signal driver="tim" instance="3" name="ch1">
<remap position="30" mask="1" id="1"/>
</signal>
<signal driver="tim" instance="3" name="trig">
<remap position="30" mask="1" id="1"/>
</signal>
<signal driver="usart" instance="2" name="rx">
<remap position="25" mask="1" id="1"/>
</signal>
<signal driver="usart" instance="3" name="rx">
<remap position="26" mask="1" id="0"/>
</signal>
<signal driver="usart" instance="4" name="rx"/>
</channel>
<channel device-size="b" position="7">
<signal driver="i2c" instance="1" name="rx">
<remap position="27" mask="1" id="1"/>
</signal>
<signal driver="spi" instance="2" name="tx">
<remap position="24" mask="1" id="1"/>
</signal>
<signal driver="tim" instance="17" name="ch1">
<remap position="14" mask="1" id="1"/>
</signal>
<signal driver="tim" instance="17" name="up">
<remap position="14" mask="1" id="1"/>
</signal>
<signal driver="usart" instance="2" name="tx">
<remap position="25" mask="1" id="1"/>
</signal>
<signal driver="usart" instance="3" name="tx">
<remap position="26" mask="1" id="0"/>
</signal>
<signal driver="usart" instance="4" name="tx"/>
</channel>
</channels>
</driver>
<driver name="gpio" type="stm32">
Expand Down
1 change: 0 additions & 1 deletion devices/stm32/stm32f0-71.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@
</signal>
<signal driver="tim" instance="1" name="ch3"/>
<signal driver="tim" instance="1" name="up"/>
<signal driver="tim" instance="1" name="up"/>
<signal driver="tim" instance="15" name="ch1"/>
<signal driver="tim" instance="15" name="com"/>
<signal driver="tim" instance="15" name="trig"/>
Expand Down
1 change: 0 additions & 1 deletion devices/stm32/stm32f0-72.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@
</signal>
<signal driver="tim" instance="1" name="ch3"/>
<signal driver="tim" instance="1" name="up"/>
<signal driver="tim" instance="1" name="up"/>
<signal driver="tim" instance="15" name="ch1"/>
<signal driver="tim" instance="15" name="com"/>
<signal driver="tim" instance="15" name="trig"/>
Expand Down
1 change: 0 additions & 1 deletion devices/stm32/stm32f0-78.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@
</signal>
<signal driver="tim" instance="1" name="ch3"/>
<signal driver="tim" instance="1" name="up"/>
<signal driver="tim" instance="1" name="up"/>
<signal driver="tim" instance="15" name="ch1"/>
<signal driver="tim" instance="15" name="com"/>
<signal driver="tim" instance="15" name="trig"/>
Expand Down
1 change: 0 additions & 1 deletion devices/stm32/stm32f1-00-4_6.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@
<signal driver="tim" instance="1" name="ch1"/>
<signal driver="tim" instance="1" name="ch2"/>
<signal driver="tim" instance="1" name="ch3"/>
<signal driver="tim" instance="1" name="ch3"/>
<signal driver="tim" instance="16" name="ch1"/>
<signal driver="tim" instance="16" name="up"/>
<signal driver="tim" instance="3" name="ch1"/>
Expand Down
1 change: 0 additions & 1 deletion devices/stm32/stm32f1-00-8_b.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@
<signal driver="tim" instance="1" name="ch1"/>
<signal driver="tim" instance="1" name="ch2"/>
<signal driver="tim" instance="1" name="ch3"/>
<signal driver="tim" instance="1" name="ch3"/>
<signal driver="tim" instance="16" name="ch1"/>
<signal driver="tim" instance="16" name="up"/>
<signal driver="tim" instance="3" name="ch1"/>
Expand Down
1 change: 0 additions & 1 deletion devices/stm32/stm32f1-00-c_d_e.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@
<signal driver="tim" instance="1" name="ch1"/>
<signal driver="tim" instance="1" name="ch2"/>
<signal driver="tim" instance="1" name="ch3"/>
<signal driver="tim" instance="1" name="ch3"/>
<signal driver="tim" instance="16" name="ch1"/>
<signal driver="tim" instance="16" name="up"/>
<signal driver="tim" instance="3" name="ch1"/>
Expand Down
6 changes: 0 additions & 6 deletions devices/stm32/stm32f3-73_78.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,12 +277,6 @@
<signal driver="tim" instance="17" name="ch1">
<remap position="12" mask="1" id="1"/>
</signal>
<signal driver="tim" instance="17" name="ch1">
<remap position="12" mask="1" id="1"/>
</signal>
<signal driver="tim" instance="17" name="up">
<remap position="12" mask="1" id="1"/>
</signal>
<signal driver="tim" instance="17" name="up">
<remap position="12" mask="1" id="1"/>
</signal>
Expand Down
20 changes: 20 additions & 0 deletions tools/generator/dfg/stm32/stm_device_tree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,26 @@ def rv(param, default=[]):
# print(instance, stream, channel)
# print(signal)

# Manually handle condition expressions from XML for
# (STM32F030CCTx|STM32F030RCTx) and (STM32F070CBTx|STM32F070RBTx)
Copy link
Member

@salkinium salkinium Apr 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Horrible… I tried reverse-engineering that once but it's writting in Java and spread over many, many files. I got nowhere…

if did.family in ['f0']:
if (did.name == '30' and did.size == 'c'):
dma_streams['1'].pop('6')
dma_streams['1'].pop('7')
dma_streams.pop('2')
if (did.name == '70' and did.size == 'b'):
dma_streams['1'].pop('6')
dma_streams['1'].pop('7')

# De-duplicate DMA signal entries
def deduplicate_list(l):
return [i for n, i in enumerate(l) if i not in l[n + 1:]]
for stream in dma_streams:
for channel in dma_streams[stream]:
for signal in dma_streams[stream][channel]:
dma_streams[stream][channel][signal] = deduplicate_list(
dma_streams[stream][channel][signal])

# if p["dma_naming"][1] == "request":
# print(did, dmaFile.filename)
p["dma"] = dma_streams
Expand Down