aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2022-02-23 18:56:06 +0100
committerDario Nieuwenhuis <[email protected]>2022-02-23 19:16:37 +0100
commit2c8fee59d6e663a9f6825b6c02cb58090fb160a5 (patch)
treedd52a905209c7821c6adc09b990882df46a7fcfe
parentb4abb1f5c23995fab13c2fd7a76daebb8ed5b45c (diff)
stm32-metapac: remove peripehral_dma_channels! macrotable.
-rw-r--r--stm32-metapac-gen/src/lib.rs35
1 files changed, 0 insertions, 35 deletions
diff --git a/stm32-metapac-gen/src/lib.rs b/stm32-metapac-gen/src/lib.rs
index 10d67869a..d167da49c 100644
--- a/stm32-metapac-gen/src/lib.rs
+++ b/stm32-metapac-gen/src/lib.rs
@@ -127,7 +127,6 @@ pub fn gen_chip(
127 let mut peripherals_table: Vec<Vec<String>> = Vec::new(); 127 let mut peripherals_table: Vec<Vec<String>> = Vec::new();
128 let mut peripheral_pins_table: Vec<Vec<String>> = Vec::new(); 128 let mut peripheral_pins_table: Vec<Vec<String>> = Vec::new();
129 let mut dma_channels_table: Vec<Vec<String>> = Vec::new(); 129 let mut dma_channels_table: Vec<Vec<String>> = Vec::new();
130 let mut peripheral_dma_channels_table: Vec<Vec<String>> = Vec::new();
131 let mut peripheral_counts: BTreeMap<String, u8> = BTreeMap::new(); 130 let mut peripheral_counts: BTreeMap<String, u8> = BTreeMap::new();
132 let mut dma_channel_counts: BTreeMap<String, u8> = BTreeMap::new(); 131 let mut dma_channel_counts: BTreeMap<String, u8> = BTreeMap::new();
133 let mut dbgmcu_table: Vec<Vec<String>> = Vec::new(); 132 let mut dbgmcu_table: Vec<Vec<String>> = Vec::new();
@@ -198,35 +197,6 @@ pub fn gen_chip(
198 interrupt_table.push(row) 197 interrupt_table.push(row)
199 } 198 }
200 199
201 for ch in &p.dma_channels {
202 let mut row = Vec::new();
203 row.push(p.name.clone());
204 row.push(bi.kind.clone());
205 row.push(bi.block.clone());
206 row.push(ch.signal.clone());
207 row.push(if let Some(channel) = &ch.channel {
208 format!("{{channel: {}}}", channel)
209 } else if let Some(dmamux) = &ch.dmamux {
210 format!("{{dmamux: {}}}", dmamux)
211 } else {
212 unreachable!();
213 });
214
215 row.push(if let Some(request) = ch.request {
216 request.to_string()
217 } else {
218 "()".to_string()
219 });
220
221 if peripheral_dma_channels_table
222 .iter()
223 .find(|a| a[..a.len() - 1] == row[..row.len() - 1])
224 .is_none()
225 {
226 peripheral_dma_channels_table.push(row);
227 }
228 }
229
230 let mut peripheral_row = Vec::new(); 200 let mut peripheral_row = Vec::new();
231 peripheral_row.push(bi.kind.clone()); 201 peripheral_row.push(bi.kind.clone());
232 peripheral_row.push(p.name.clone()); 202 peripheral_row.push(p.name.clone());
@@ -388,11 +358,6 @@ pub fn gen_chip(
388 make_table(&mut data, "peripherals", &peripherals_table); 358 make_table(&mut data, "peripherals", &peripherals_table);
389 make_table(&mut data, "peripheral_versions", &peripheral_version_table); 359 make_table(&mut data, "peripheral_versions", &peripheral_version_table);
390 make_table(&mut data, "peripheral_pins", &peripheral_pins_table); 360 make_table(&mut data, "peripheral_pins", &peripheral_pins_table);
391 make_table(
392 &mut data,
393 "peripheral_dma_channels",
394 &peripheral_dma_channels_table,
395 );
396 make_table(&mut data, "dma_channels", &dma_channels_table); 361 make_table(&mut data, "dma_channels", &dma_channels_table);
397 make_table(&mut data, "dbgmcu", &dbgmcu_table); 362 make_table(&mut data, "dbgmcu", &dbgmcu_table);
398 make_peripheral_counts(&mut data, &peripheral_counts); 363 make_peripheral_counts(&mut data, &peripheral_counts);