@@ -103,7 +103,7 @@ impl<I2C: Instance> I2c<I2C> {
103
103
self ,
104
104
tx_stream : TX_STREAM ,
105
105
rx_stream : RX_STREAM ,
106
- ) -> I2CMasterDma < I2C , TxTransfer < I2C , TX_STREAM , TX_CH > , RxTransfer < I2C , RX_STREAM , RX_CH > >
106
+ ) -> I2CMasterDma < I2C , TxDMA < I2C , TX_STREAM , TX_CH > , RxDMA < I2C , RX_STREAM , RX_CH > >
107
107
where
108
108
TX_STREAM : Stream ,
109
109
ChannelX < TX_CH > : Channel ,
@@ -113,8 +113,8 @@ impl<I2C: Instance> I2c<I2C> {
113
113
ChannelX < RX_CH > : Channel ,
114
114
Rx < I2C > : DMASet < RX_STREAM , RX_CH , PeripheralToMemory > ,
115
115
{
116
- let tx = TxTransfer :: new ( tx_stream) ;
117
- let rx = RxTransfer :: new ( rx_stream) ;
116
+ let tx = TxDMA :: new ( tx_stream) ;
117
+ let rx = RxDMA :: new ( rx_stream) ;
118
118
119
119
I2CMasterDma {
120
120
hal_i2c : self ,
@@ -132,13 +132,13 @@ impl<I2C: Instance> I2c<I2C> {
132
132
pub fn use_dma_tx < TX_STREAM , const TX_CH : u8 > (
133
133
self ,
134
134
tx_stream : TX_STREAM ,
135
- ) -> I2CMasterDma < I2C , TxTransfer < I2C , TX_STREAM , TX_CH > , NoDMA >
135
+ ) -> I2CMasterDma < I2C , TxDMA < I2C , TX_STREAM , TX_CH > , NoDMA >
136
136
where
137
137
TX_STREAM : Stream ,
138
138
ChannelX < TX_CH > : Channel ,
139
139
Tx < I2C > : DMASet < TX_STREAM , TX_CH , MemoryToPeripheral > ,
140
140
{
141
- let tx = TxTransfer :: new ( tx_stream) ;
141
+ let tx = TxDMA :: new ( tx_stream) ;
142
142
let rx = NoDMA ;
143
143
144
144
I2CMasterDma {
@@ -157,14 +157,14 @@ impl<I2C: Instance> I2c<I2C> {
157
157
pub fn use_dma_rx < RX_STREAM , const RX_CH : u8 > (
158
158
self ,
159
159
rx_stream : RX_STREAM ,
160
- ) -> I2CMasterDma < I2C , NoDMA , RxTransfer < I2C , RX_STREAM , RX_CH > >
160
+ ) -> I2CMasterDma < I2C , NoDMA , RxDMA < I2C , RX_STREAM , RX_CH > >
161
161
where
162
162
RX_STREAM : Stream ,
163
163
ChannelX < RX_CH > : Channel ,
164
164
Rx < I2C > : DMASet < RX_STREAM , RX_CH , PeripheralToMemory > ,
165
165
{
166
166
let tx = NoDMA ;
167
- let rx = RxTransfer :: new ( rx_stream) ;
167
+ let rx = RxDMA :: new ( rx_stream) ;
168
168
169
169
I2CMasterDma {
170
170
hal_i2c : self ,
@@ -207,7 +207,7 @@ where
207
207
rx : RX_TRANSFER ,
208
208
}
209
209
210
- pub struct TxTransfer < I2C , TX_STREAM , const TX_CH : u8 >
210
+ pub struct TxDMA < I2C , TX_STREAM , const TX_CH : u8 >
211
211
where
212
212
I2C : Instance ,
213
213
TX_STREAM : Stream ,
@@ -217,7 +217,7 @@ where
217
217
tx_transfer : Option < Transfer < TX_STREAM , TX_CH , Tx < I2C > , MemoryToPeripheral , & ' static [ u8 ] > > ,
218
218
}
219
219
220
- impl < I2C , TX_STREAM , const TX_CH : u8 > TxTransfer < I2C , TX_STREAM , TX_CH >
220
+ impl < I2C , TX_STREAM , const TX_CH : u8 > TxDMA < I2C , TX_STREAM , TX_CH >
221
221
where
222
222
I2C : Instance ,
223
223
TX_STREAM : Stream ,
@@ -265,7 +265,7 @@ where
265
265
}
266
266
}
267
267
268
- pub struct RxTransfer < I2C , RX_STREAM , const RX_CH : u8 >
268
+ pub struct RxDMA < I2C , RX_STREAM , const RX_CH : u8 >
269
269
where
270
270
I2C : Instance ,
271
271
RX_STREAM : Stream ,
@@ -275,7 +275,7 @@ where
275
275
rx_transfer : Option < Transfer < RX_STREAM , RX_CH , Rx < I2C > , PeripheralToMemory , & ' static mut [ u8 ] > > ,
276
276
}
277
277
278
- impl < I2C , RX_STREAM , const RX_CH : u8 > RxTransfer < I2C , RX_STREAM , RX_CH >
278
+ impl < I2C , RX_STREAM , const RX_CH : u8 > RxDMA < I2C , RX_STREAM , RX_CH >
279
279
where
280
280
I2C : Instance ,
281
281
RX_STREAM : Stream ,
@@ -524,7 +524,7 @@ where
524
524
525
525
/// Only for TX DMA I2c
526
526
impl < I2C , TX_STREAM , const TX_CH : u8 , RX_TRANSFER >
527
- I2CMasterDma < I2C , TxTransfer < I2C , TX_STREAM , TX_CH > , RX_TRANSFER >
527
+ I2CMasterDma < I2C , TxDMA < I2C , TX_STREAM , TX_CH > , RX_TRANSFER >
528
528
where
529
529
I2C : Instance ,
530
530
@@ -542,7 +542,7 @@ where
542
542
}
543
543
544
544
impl < I2C , TX_STREAM , const TX_CH : u8 > I2CMasterHandleIT
545
- for I2CMasterDma < I2C , TxTransfer < I2C , TX_STREAM , TX_CH > , NoDMA >
545
+ for I2CMasterDma < I2C , TxDMA < I2C , TX_STREAM , TX_CH > , NoDMA >
546
546
where
547
547
I2C : Instance ,
548
548
@@ -592,7 +592,7 @@ where
592
592
}
593
593
594
594
impl < I2C , TX_STREAM , const TX_CH : u8 > I2CMasterFinishAndDestroyTransfers
595
- for I2CMasterDma < I2C , TxTransfer < I2C , TX_STREAM , TX_CH > , NoDMA >
595
+ for I2CMasterDma < I2C , TxDMA < I2C , TX_STREAM , TX_CH > , NoDMA >
596
596
where
597
597
I2C : Instance ,
598
598
@@ -611,7 +611,7 @@ where
611
611
612
612
/// Only for RX DMA I2c
613
613
impl < I2C , TX_TRANSFER , RX_STREAM , const RX_CH : u8 >
614
- I2CMasterDma < I2C , TX_TRANSFER , RxTransfer < I2C , RX_STREAM , RX_CH > >
614
+ I2CMasterDma < I2C , TX_TRANSFER , RxDMA < I2C , RX_STREAM , RX_CH > >
615
615
where
616
616
I2C : Instance ,
617
617
@@ -629,7 +629,7 @@ where
629
629
}
630
630
631
631
impl < I2C , RX_STREAM , const RX_CH : u8 > I2CMasterHandleIT
632
- for I2CMasterDma < I2C , NoDMA , RxTransfer < I2C , RX_STREAM , RX_CH > >
632
+ for I2CMasterDma < I2C , NoDMA , RxDMA < I2C , RX_STREAM , RX_CH > >
633
633
where
634
634
I2C : Instance ,
635
635
@@ -675,7 +675,7 @@ where
675
675
}
676
676
677
677
impl < I2C , RX_STREAM , const RX_CH : u8 > I2CMasterFinishAndDestroyTransfers
678
- for I2CMasterDma < I2C , NoDMA , RxTransfer < I2C , RX_STREAM , RX_CH > >
678
+ for I2CMasterDma < I2C , NoDMA , RxDMA < I2C , RX_STREAM , RX_CH > >
679
679
where
680
680
I2C : Instance ,
681
681
@@ -694,7 +694,7 @@ where
694
694
695
695
/// Only for both TX and RX DMA I2c
696
696
impl < I2C , TX_STREAM , const TX_CH : u8 , RX_STREAM , const RX_CH : u8 > I2CMasterHandleIT
697
- for I2CMasterDma < I2C , TxTransfer < I2C , TX_STREAM , TX_CH > , RxTransfer < I2C , RX_STREAM , RX_CH > >
697
+ for I2CMasterDma < I2C , TxDMA < I2C , TX_STREAM , TX_CH > , RxDMA < I2C , RX_STREAM , RX_CH > >
698
698
where
699
699
I2C : Instance ,
700
700
TX_STREAM : Stream ,
@@ -795,7 +795,7 @@ where
795
795
}
796
796
797
797
impl < I2C , TX_STREAM , const TX_CH : u8 , RX_STREAM , const RX_CH : u8 > I2CMasterFinishAndDestroyTransfers
798
- for I2CMasterDma < I2C , TxTransfer < I2C , TX_STREAM , TX_CH > , RxTransfer < I2C , RX_STREAM , RX_CH > >
798
+ for I2CMasterDma < I2C , TxDMA < I2C , TX_STREAM , TX_CH > , RxDMA < I2C , RX_STREAM , RX_CH > >
799
799
where
800
800
I2C : Instance ,
801
801
TX_STREAM : Stream ,
@@ -821,7 +821,7 @@ where
821
821
822
822
// Write DMA implementations for TX only and TX/RX I2C DMA
823
823
impl < I2C , TX_STREAM , const TX_CH : u8 > I2CMasterWriteDMA
824
- for I2CMasterDma < I2C , TxTransfer < I2C , TX_STREAM , TX_CH > , NoDMA >
824
+ for I2CMasterDma < I2C , TxDMA < I2C , TX_STREAM , TX_CH > , NoDMA >
825
825
where
826
826
I2C : Instance ,
827
827
TX_STREAM : Stream ,
@@ -856,7 +856,7 @@ where
856
856
}
857
857
858
858
impl < I2C , TX_STREAM , const TX_CH : u8 , RX_STREAM , const RX_CH : u8 > I2CMasterWriteDMA
859
- for I2CMasterDma < I2C , TxTransfer < I2C , TX_STREAM , TX_CH > , RxTransfer < I2C , RX_STREAM , RX_CH > >
859
+ for I2CMasterDma < I2C , TxDMA < I2C , TX_STREAM , TX_CH > , RxDMA < I2C , RX_STREAM , RX_CH > >
860
860
where
861
861
I2C : Instance ,
862
862
TX_STREAM : Stream ,
@@ -896,7 +896,7 @@ where
896
896
897
897
// Write DMA implementations for RX only and TX/RX I2C DMA
898
898
impl < I2C , RX_STREAM , const RX_CH : u8 > I2CMasterReadDMA
899
- for I2CMasterDma < I2C , NoDMA , RxTransfer < I2C , RX_STREAM , RX_CH > >
899
+ for I2CMasterDma < I2C , NoDMA , RxDMA < I2C , RX_STREAM , RX_CH > >
900
900
where
901
901
I2C : Instance ,
902
902
@@ -934,7 +934,7 @@ where
934
934
}
935
935
936
936
impl < I2C , TX_STREAM , const TX_CH : u8 , RX_STREAM , const RX_CH : u8 > I2CMasterReadDMA
937
- for I2CMasterDma < I2C , TxTransfer < I2C , TX_STREAM , TX_CH > , RxTransfer < I2C , RX_STREAM , RX_CH > >
937
+ for I2CMasterDma < I2C , TxDMA < I2C , TX_STREAM , TX_CH > , RxDMA < I2C , RX_STREAM , RX_CH > >
938
938
where
939
939
I2C : Instance ,
940
940
TX_STREAM : Stream ,
@@ -975,7 +975,7 @@ where
975
975
}
976
976
977
977
impl < I2C , TX_STREAM , const TX_CH : u8 , RX_STREAM , const RX_CH : u8 > I2CMasterWriteReadDMA
978
- for I2CMasterDma < I2C , TxTransfer < I2C , TX_STREAM , TX_CH > , RxTransfer < I2C , RX_STREAM , RX_CH > >
978
+ for I2CMasterDma < I2C , TxDMA < I2C , TX_STREAM , TX_CH > , RxDMA < I2C , RX_STREAM , RX_CH > >
979
979
where
980
980
I2C : Instance ,
981
981
TX_STREAM : Stream ,
0 commit comments