Skip to content

Commit 3c5ebfe

Browse files
burrbullburrbull
committed
format
1 parent 6558548 commit 3c5ebfe

File tree

1 file changed

+39
-219
lines changed

1 file changed

+39
-219
lines changed

‎src/dma/traits.rs

Lines changed: 39 additions & 219 deletions
Original file line numberDiff line numberDiff line change
@@ -518,150 +518,30 @@ dma_map!(
518518
(Stream7<DMA2>, 4, Tx<pac::USART1>, MemoryToPeripheral), //USART1_TX
519519
(Stream7<DMA2>, 5, pac::USART6, MemoryToPeripheral), //USART6_TX
520520
(Stream7<DMA2>, 5, Tx<pac::USART6>, MemoryToPeripheral), //USART6_TX
521-
(
522-
Stream0<DMA2>,
523-
0,
524-
MemoryToMemory<u8>,
525-
MemoryToMemory<u8>
526-
),
527-
(
528-
Stream1<DMA2>,
529-
0,
530-
MemoryToMemory<u8>,
531-
MemoryToMemory<u8>
532-
),
533-
(
534-
Stream2<DMA2>,
535-
0,
536-
MemoryToMemory<u8>,
537-
MemoryToMemory<u8>
538-
),
539-
(
540-
Stream3<DMA2>,
541-
0,
542-
MemoryToMemory<u8>,
543-
MemoryToMemory<u8>
544-
),
545-
(
546-
Stream4<DMA2>,
547-
0,
548-
MemoryToMemory<u8>,
549-
MemoryToMemory<u8>
550-
),
551-
(
552-
Stream5<DMA2>,
553-
0,
554-
MemoryToMemory<u8>,
555-
MemoryToMemory<u8>
556-
),
557-
(
558-
Stream6<DMA2>,
559-
0,
560-
MemoryToMemory<u8>,
561-
MemoryToMemory<u8>
562-
),
563-
(
564-
Stream7<DMA2>,
565-
0,
566-
MemoryToMemory<u8>,
567-
MemoryToMemory<u8>
568-
),
569-
(
570-
Stream0<DMA2>,
571-
0,
572-
MemoryToMemory<u16>,
573-
MemoryToMemory<u16>
574-
),
575-
(
576-
Stream1<DMA2>,
577-
0,
578-
MemoryToMemory<u16>,
579-
MemoryToMemory<u16>
580-
),
581-
(
582-
Stream2<DMA2>,
583-
0,
584-
MemoryToMemory<u16>,
585-
MemoryToMemory<u16>
586-
),
587-
(
588-
Stream3<DMA2>,
589-
0,
590-
MemoryToMemory<u16>,
591-
MemoryToMemory<u16>
592-
),
593-
(
594-
Stream4<DMA2>,
595-
0,
596-
MemoryToMemory<u16>,
597-
MemoryToMemory<u16>
598-
),
599-
(
600-
Stream5<DMA2>,
601-
0,
602-
MemoryToMemory<u16>,
603-
MemoryToMemory<u16>
604-
),
605-
(
606-
Stream6<DMA2>,
607-
0,
608-
MemoryToMemory<u16>,
609-
MemoryToMemory<u16>
610-
),
611-
(
612-
Stream7<DMA2>,
613-
0,
614-
MemoryToMemory<u16>,
615-
MemoryToMemory<u16>
616-
),
617-
(
618-
Stream0<DMA2>,
619-
0,
620-
MemoryToMemory<u32>,
621-
MemoryToMemory<u32>
622-
),
623-
(
624-
Stream1<DMA2>,
625-
0,
626-
MemoryToMemory<u32>,
627-
MemoryToMemory<u32>
628-
),
629-
(
630-
Stream2<DMA2>,
631-
0,
632-
MemoryToMemory<u32>,
633-
MemoryToMemory<u32>
634-
),
635-
(
636-
Stream3<DMA2>,
637-
0,
638-
MemoryToMemory<u32>,
639-
MemoryToMemory<u32>
640-
),
641-
(
642-
Stream4<DMA2>,
643-
0,
644-
MemoryToMemory<u32>,
645-
MemoryToMemory<u32>
646-
),
647-
(
648-
Stream5<DMA2>,
649-
0,
650-
MemoryToMemory<u32>,
651-
MemoryToMemory<u32>
652-
),
653-
(
654-
Stream6<DMA2>,
655-
0,
656-
MemoryToMemory<u32>,
657-
MemoryToMemory<u32>
658-
),
659-
(
660-
Stream7<DMA2>,
661-
0,
662-
MemoryToMemory<u32>,
663-
MemoryToMemory<u32>
664-
),
521+
(Stream0<DMA2>, 0, MemoryToMemory<u8>, MemoryToMemory<u8>),
522+
(Stream1<DMA2>, 0, MemoryToMemory<u8>, MemoryToMemory<u8>),
523+
(Stream2<DMA2>, 0, MemoryToMemory<u8>, MemoryToMemory<u8>),
524+
(Stream3<DMA2>, 0, MemoryToMemory<u8>, MemoryToMemory<u8>),
525+
(Stream4<DMA2>, 0, MemoryToMemory<u8>, MemoryToMemory<u8>),
526+
(Stream5<DMA2>, 0, MemoryToMemory<u8>, MemoryToMemory<u8>),
527+
(Stream6<DMA2>, 0, MemoryToMemory<u8>, MemoryToMemory<u8>),
528+
(Stream7<DMA2>, 0, MemoryToMemory<u8>, MemoryToMemory<u8>),
529+
(Stream0<DMA2>, 0, MemoryToMemory<u16>, MemoryToMemory<u16>),
530+
(Stream1<DMA2>, 0, MemoryToMemory<u16>, MemoryToMemory<u16>),
531+
(Stream2<DMA2>, 0, MemoryToMemory<u16>, MemoryToMemory<u16>),
532+
(Stream3<DMA2>, 0, MemoryToMemory<u16>, MemoryToMemory<u16>),
533+
(Stream4<DMA2>, 0, MemoryToMemory<u16>, MemoryToMemory<u16>),
534+
(Stream5<DMA2>, 0, MemoryToMemory<u16>, MemoryToMemory<u16>),
535+
(Stream6<DMA2>, 0, MemoryToMemory<u16>, MemoryToMemory<u16>),
536+
(Stream7<DMA2>, 0, MemoryToMemory<u16>, MemoryToMemory<u16>),
537+
(Stream0<DMA2>, 0, MemoryToMemory<u32>, MemoryToMemory<u32>),
538+
(Stream1<DMA2>, 0, MemoryToMemory<u32>, MemoryToMemory<u32>),
539+
(Stream2<DMA2>, 0, MemoryToMemory<u32>, MemoryToMemory<u32>),
540+
(Stream3<DMA2>, 0, MemoryToMemory<u32>, MemoryToMemory<u32>),
541+
(Stream4<DMA2>, 0, MemoryToMemory<u32>, MemoryToMemory<u32>),
542+
(Stream5<DMA2>, 0, MemoryToMemory<u32>, MemoryToMemory<u32>),
543+
(Stream6<DMA2>, 0, MemoryToMemory<u32>, MemoryToMemory<u32>),
544+
(Stream7<DMA2>, 0, MemoryToMemory<u32>, MemoryToMemory<u32>),
665545
);
666546

667547
#[cfg(any(
@@ -818,7 +698,7 @@ dma_map!(
818698
(Stream0<DMA1>, 4, pac::UART5, PeripheralToMemory), //UART5_RX
819699
(Stream2<DMA1>, 4, pac::UART4, PeripheralToMemory), //UART4_RX
820700
(Stream4<DMA1>, 4, pac::UART4, MemoryToPeripheral), //UART4_TX
821-
//(Stream6<DMA1>, 7, pac::DAC2, MemoryToPeripheral), //DAC2
701+
//(Stream6<DMA1>, 7, pac::DAC2, MemoryToPeripheral), //DAC2
822702
);
823703

824704
#[cfg(any(
@@ -1184,78 +1064,18 @@ address!((pac::DFSDM, dr),);
11841064
11851065
#[cfg(any(feature = "stm32f413", feature = "stm32f423"))]
11861066
dma_map!(
1187-
(
1188-
Stream0<pac::DMA2>,
1189-
7,
1190-
pac::DFSDM1,
1191-
PeripheralToMemory
1192-
), //DFSDM1_FLT0
1193-
(
1194-
Stream1<pac::DMA2>,
1195-
3,
1196-
pac::DFSDM1,
1197-
PeripheralToMemory
1198-
), //DFSDM1_FLT1
1199-
(
1200-
Stream4<pac::DMA2>,
1201-
3,
1202-
pac::DFSDM1,
1203-
PeripheralToMemory
1204-
), //DFSDM1_FLT1
1205-
(
1206-
Stream6<pac::DMA2>,
1207-
3,
1208-
pac::DFSDM1,
1209-
PeripheralToMemory
1210-
), //DFSDM1_FLT0:DMA_CHANNEL_3
1211-
(
1212-
Stream0<pac::DMA2>,
1213-
8,
1214-
pac::DFSDM2,
1215-
PeripheralToMemory
1216-
), //DFSDM2_FLT0
1217-
(
1218-
Stream1<pac::DMA2>,
1219-
8,
1220-
pac::DFSDM2,
1221-
PeripheralToMemory
1222-
), //DFSDM2_FLT1
1223-
(
1224-
Stream2<pac::DMA2>,
1225-
8,
1226-
pac::DFSDM2,
1227-
PeripheralToMemory
1228-
), //DFSDM2_FLT2
1229-
(
1230-
Stream3<pac::DMA2>,
1231-
8,
1232-
pac::DFSDM2,
1233-
PeripheralToMemory
1234-
), //DFSDM2_FLT3
1235-
(
1236-
Stream4<pac::DMA2>,
1237-
8,
1238-
pac::DFSDM2,
1239-
PeripheralToMemory
1240-
), //DFSDM2_FLT0
1241-
(
1242-
Stream5<pac::DMA2>,
1243-
8,
1244-
pac::DFSDM2,
1245-
PeripheralToMemory
1246-
), //DFSDM2_FLT1
1247-
(
1248-
Stream6<pac::DMA2>,
1249-
8,
1250-
pac::DFSDM2,
1251-
PeripheralToMemory
1252-
), //DFSDM2_FLT2
1253-
(
1254-
Stream7<pac::DMA2>,
1255-
8,
1256-
pac::DFSDM2,
1257-
PeripheralToMemory
1258-
), //DFSDM2_FLT3
1067+
(Stream0<pac::DMA2>, 7, pac::DFSDM1, PeripheralToMemory), //DFSDM1_FLT0
1068+
(Stream1<pac::DMA2>, 3, pac::DFSDM1, PeripheralToMemory), //DFSDM1_FLT1
1069+
(Stream4<pac::DMA2>, 3, pac::DFSDM1, PeripheralToMemory), //DFSDM1_FLT1
1070+
(Stream6<pac::DMA2>, 3, pac::DFSDM1, PeripheralToMemory), //DFSDM1_FLT0:DMA_CHANNEL_3
1071+
(Stream0<pac::DMA2>, 8, pac::DFSDM2, PeripheralToMemory), //DFSDM2_FLT0
1072+
(Stream1<pac::DMA2>, 8, pac::DFSDM2, PeripheralToMemory), //DFSDM2_FLT1
1073+
(Stream2<pac::DMA2>, 8, pac::DFSDM2, PeripheralToMemory), //DFSDM2_FLT2
1074+
(Stream3<pac::DMA2>, 8, pac::DFSDM2, PeripheralToMemory), //DFSDM2_FLT3
1075+
(Stream4<pac::DMA2>, 8, pac::DFSDM2, PeripheralToMemory), //DFSDM2_FLT0
1076+
(Stream5<pac::DMA2>, 8, pac::DFSDM2, PeripheralToMemory), //DFSDM2_FLT1
1077+
(Stream6<pac::DMA2>, 8, pac::DFSDM2, PeripheralToMemory), //DFSDM2_FLT2
1078+
(Stream7<pac::DMA2>, 8, pac::DFSDM2, PeripheralToMemory), //DFSDM2_FLT3
12591079
);
12601080
#[cfg(any(feature = "stm32f413", feature = "stm32f423"))]
12611081
address!((pac::DFSDM1, dr), (pac::DFSDM2, dr),);
@@ -1322,8 +1142,8 @@ dma_map!(
13221142
(Stream5<DMA2>, 9, pac::UART10, MemoryToPeripheral), //UART10_TX
13231143
(Stream7<DMA2>, 0, pac::UART9, PeripheralToMemory), //UART9_RX
13241144
(Stream7<DMA2>, 6, pac::UART10, MemoryToPeripheral), //UART10_TX:DMA_CHANNEL_6
1325-
//(pac::DMA2, Stream6, 2, IN<pac::AES>, MemoryToPeripheral), //AES_IN
1326-
//(pac::DMA2, Stream5, 2, OUT<pac::AES>, PeripheralToMemory), //AES_OUT
1145+
//(pac::DMA2, Stream6, 2, IN<pac::AES>, MemoryToPeripheral), //AES_IN
1146+
//(pac::DMA2, Stream5, 2, OUT<pac::AES>, PeripheralToMemory), //AES_OUT
13271147
);
13281148

13291149
#[cfg(any(feature = "stm32f413", feature = "stm32f423",))]

0 commit comments

Comments
 (0)