Skip to content

Commit 31dd747

Browse files
committed
I2c DMA: unify transfer names:
TxTransfer -> TxDMA RxTransfer -> RxDMA
1 parent 6711c5f commit 31dd747

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

src/i2c/dma.rs

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ impl<I2C: Instance> I2c<I2C> {
103103
self,
104104
tx_stream: TX_STREAM,
105105
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>>
107107
where
108108
TX_STREAM: Stream,
109109
ChannelX<TX_CH>: Channel,
@@ -113,8 +113,8 @@ impl<I2C: Instance> I2c<I2C> {
113113
ChannelX<RX_CH>: Channel,
114114
Rx<I2C>: DMASet<RX_STREAM, RX_CH, PeripheralToMemory>,
115115
{
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);
118118

119119
I2CMasterDma {
120120
hal_i2c: self,
@@ -132,13 +132,13 @@ impl<I2C: Instance> I2c<I2C> {
132132
pub fn use_dma_tx<TX_STREAM, const TX_CH: u8>(
133133
self,
134134
tx_stream: TX_STREAM,
135-
) -> I2CMasterDma<I2C, TxTransfer<I2C, TX_STREAM, TX_CH>, NoDMA>
135+
) -> I2CMasterDma<I2C, TxDMA<I2C, TX_STREAM, TX_CH>, NoDMA>
136136
where
137137
TX_STREAM: Stream,
138138
ChannelX<TX_CH>: Channel,
139139
Tx<I2C>: DMASet<TX_STREAM, TX_CH, MemoryToPeripheral>,
140140
{
141-
let tx = TxTransfer::new(tx_stream);
141+
let tx = TxDMA::new(tx_stream);
142142
let rx = NoDMA;
143143

144144
I2CMasterDma {
@@ -157,14 +157,14 @@ impl<I2C: Instance> I2c<I2C> {
157157
pub fn use_dma_rx<RX_STREAM, const RX_CH: u8>(
158158
self,
159159
rx_stream: RX_STREAM,
160-
) -> I2CMasterDma<I2C, NoDMA, RxTransfer<I2C, RX_STREAM, RX_CH>>
160+
) -> I2CMasterDma<I2C, NoDMA, RxDMA<I2C, RX_STREAM, RX_CH>>
161161
where
162162
RX_STREAM: Stream,
163163
ChannelX<RX_CH>: Channel,
164164
Rx<I2C>: DMASet<RX_STREAM, RX_CH, PeripheralToMemory>,
165165
{
166166
let tx = NoDMA;
167-
let rx = RxTransfer::new(rx_stream);
167+
let rx = RxDMA::new(rx_stream);
168168

169169
I2CMasterDma {
170170
hal_i2c: self,
@@ -207,7 +207,7 @@ where
207207
rx: RX_TRANSFER,
208208
}
209209

210-
pub struct TxTransfer<I2C, TX_STREAM, const TX_CH: u8>
210+
pub struct TxDMA<I2C, TX_STREAM, const TX_CH: u8>
211211
where
212212
I2C: Instance,
213213
TX_STREAM: Stream,
@@ -217,7 +217,7 @@ where
217217
tx_transfer: Option<Transfer<TX_STREAM, TX_CH, Tx<I2C>, MemoryToPeripheral, &'static [u8]>>,
218218
}
219219

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>
221221
where
222222
I2C: Instance,
223223
TX_STREAM: Stream,
@@ -265,7 +265,7 @@ where
265265
}
266266
}
267267

268-
pub struct RxTransfer<I2C, RX_STREAM, const RX_CH: u8>
268+
pub struct RxDMA<I2C, RX_STREAM, const RX_CH: u8>
269269
where
270270
I2C: Instance,
271271
RX_STREAM: Stream,
@@ -275,7 +275,7 @@ where
275275
rx_transfer: Option<Transfer<RX_STREAM, RX_CH, Rx<I2C>, PeripheralToMemory, &'static mut [u8]>>,
276276
}
277277

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>
279279
where
280280
I2C: Instance,
281281
RX_STREAM: Stream,
@@ -524,7 +524,7 @@ where
524524

525525
/// Only for TX DMA I2c
526526
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>
528528
where
529529
I2C: Instance,
530530

@@ -542,7 +542,7 @@ where
542542
}
543543

544544
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>
546546
where
547547
I2C: Instance,
548548

@@ -592,7 +592,7 @@ where
592592
}
593593

594594
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>
596596
where
597597
I2C: Instance,
598598

@@ -611,7 +611,7 @@ where
611611

612612
/// Only for RX DMA I2c
613613
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>>
615615
where
616616
I2C: Instance,
617617

@@ -629,7 +629,7 @@ where
629629
}
630630

631631
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>>
633633
where
634634
I2C: Instance,
635635

@@ -675,7 +675,7 @@ where
675675
}
676676

677677
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>>
679679
where
680680
I2C: Instance,
681681

@@ -694,7 +694,7 @@ where
694694

695695
/// Only for both TX and RX DMA I2c
696696
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>>
698698
where
699699
I2C: Instance,
700700
TX_STREAM: Stream,
@@ -795,7 +795,7 @@ where
795795
}
796796

797797
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>>
799799
where
800800
I2C: Instance,
801801
TX_STREAM: Stream,
@@ -821,7 +821,7 @@ where
821821

822822
// Write DMA implementations for TX only and TX/RX I2C DMA
823823
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>
825825
where
826826
I2C: Instance,
827827
TX_STREAM: Stream,
@@ -856,7 +856,7 @@ where
856856
}
857857

858858
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>>
860860
where
861861
I2C: Instance,
862862
TX_STREAM: Stream,
@@ -896,7 +896,7 @@ where
896896

897897
// Write DMA implementations for RX only and TX/RX I2C DMA
898898
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>>
900900
where
901901
I2C: Instance,
902902

@@ -934,7 +934,7 @@ where
934934
}
935935

936936
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>>
938938
where
939939
I2C: Instance,
940940
TX_STREAM: Stream,
@@ -975,7 +975,7 @@ where
975975
}
976976

977977
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>>
979979
where
980980
I2C: Instance,
981981
TX_STREAM: Stream,

0 commit comments

Comments
 (0)