aboutsummaryrefslogtreecommitdiff
path: root/embassy-rp/src/uart/buffered.rs
diff options
context:
space:
mode:
authorMathias <[email protected]>2022-09-27 05:51:31 +0200
committerMathias <[email protected]>2022-09-27 05:51:31 +0200
commit65907204d64f104bfa5bf1ea9d1da8cb9cc09d19 (patch)
tree70e55c35ff56a5ff1173d883a26ba07ef90b547d /embassy-rp/src/uart/buffered.rs
parentcd539ba3a0140311dc24930b29877485347fcdd1 (diff)
Rename from {Rx,Tx}BufferedUart to BufferedUart{Rx,Tx} to be compliant with stm32 and nrf implementations
Diffstat (limited to 'embassy-rp/src/uart/buffered.rs')
-rw-r--r--embassy-rp/src/uart/buffered.rs26
1 files changed, 13 insertions, 13 deletions
diff --git a/embassy-rp/src/uart/buffered.rs b/embassy-rp/src/uart/buffered.rs
index 9c4fbfeb2..81ac61ee4 100644
--- a/embassy-rp/src/uart/buffered.rs
+++ b/embassy-rp/src/uart/buffered.rs
@@ -61,17 +61,17 @@ pub struct BufferedUart<'d, T: Instance> {
61 inner: PeripheralMutex<'d, FullStateInner<'d, T>>, 61 inner: PeripheralMutex<'d, FullStateInner<'d, T>>,
62} 62}
63 63
64pub struct RxBufferedUart<'d, T: Instance> { 64pub struct BufferedUartRx<'d, T: Instance> {
65 inner: PeripheralMutex<'d, RxStateInner<'d, T>>, 65 inner: PeripheralMutex<'d, RxStateInner<'d, T>>,
66} 66}
67 67
68pub struct TxBufferedUart<'d, T: Instance> { 68pub struct BufferedUartTx<'d, T: Instance> {
69 inner: PeripheralMutex<'d, TxStateInner<'d, T>>, 69 inner: PeripheralMutex<'d, TxStateInner<'d, T>>,
70} 70}
71 71
72impl<'d, T: Instance> Unpin for BufferedUart<'d, T> {} 72impl<'d, T: Instance> Unpin for BufferedUart<'d, T> {}
73impl<'d, T: Instance> Unpin for RxBufferedUart<'d, T> {} 73impl<'d, T: Instance> Unpin for BufferedUartRx<'d, T> {}
74impl<'d, T: Instance> Unpin for TxBufferedUart<'d, T> {} 74impl<'d, T: Instance> Unpin for BufferedUartTx<'d, T> {}
75 75
76impl<'d, T: Instance> BufferedUart<'d, T> { 76impl<'d, T: Instance> BufferedUart<'d, T> {
77 pub fn new<M: Mode>( 77 pub fn new<M: Mode>(
@@ -109,13 +109,13 @@ impl<'d, T: Instance> BufferedUart<'d, T> {
109 } 109 }
110} 110}
111 111
112impl<'d, T: Instance> RxBufferedUart<'d, T> { 112impl<'d, T: Instance> BufferedUartRx<'d, T> {
113 pub fn new<M: Mode>( 113 pub fn new<M: Mode>(
114 state: &'d mut RxState<'d, T>, 114 state: &'d mut RxState<'d, T>,
115 _uart: UartRx<'d, T, M>, 115 _uart: UartRx<'d, T, M>,
116 irq: impl Peripheral<P = T::Interrupt> + 'd, 116 irq: impl Peripheral<P = T::Interrupt> + 'd,
117 rx_buffer: &'d mut [u8], 117 rx_buffer: &'d mut [u8],
118 ) -> RxBufferedUart<'d, T> { 118 ) -> BufferedUartRx<'d, T> {
119 into_ref!(irq); 119 into_ref!(irq);
120 120
121 let r = T::regs(); 121 let r = T::regs();
@@ -137,13 +137,13 @@ impl<'d, T: Instance> RxBufferedUart<'d, T> {
137 } 137 }
138} 138}
139 139
140impl<'d, T: Instance> TxBufferedUart<'d, T> { 140impl<'d, T: Instance> BufferedUartTx<'d, T> {
141 pub fn new<M: Mode>( 141 pub fn new<M: Mode>(
142 state: &'d mut TxState<'d, T>, 142 state: &'d mut TxState<'d, T>,
143 _uart: UartTx<'d, T, M>, 143 _uart: UartTx<'d, T, M>,
144 irq: impl Peripheral<P = T::Interrupt> + 'd, 144 irq: impl Peripheral<P = T::Interrupt> + 'd,
145 tx_buffer: &'d mut [u8], 145 tx_buffer: &'d mut [u8],
146 ) -> TxBufferedUart<'d, T> { 146 ) -> BufferedUartTx<'d, T> {
147 into_ref!(irq); 147 into_ref!(irq);
148 148
149 let r = T::regs(); 149 let r = T::regs();
@@ -354,11 +354,11 @@ impl<'d, T: Instance> embedded_io::Io for BufferedUart<'d, T> {
354 type Error = Error; 354 type Error = Error;
355} 355}
356 356
357impl<'d, T: Instance> embedded_io::Io for RxBufferedUart<'d, T> { 357impl<'d, T: Instance> embedded_io::Io for BufferedUartRx<'d, T> {
358 type Error = Error; 358 type Error = Error;
359} 359}
360 360
361impl<'d, T: Instance> embedded_io::Io for TxBufferedUart<'d, T> { 361impl<'d, T: Instance> embedded_io::Io for BufferedUartTx<'d, T> {
362 type Error = Error; 362 type Error = Error;
363} 363}
364 364
@@ -383,7 +383,7 @@ impl<'d, T: Instance + 'd> embedded_io::asynch::Read for BufferedUart<'d, T> {
383 } 383 }
384} 384}
385 385
386impl<'d, T: Instance + 'd> embedded_io::asynch::Read for RxBufferedUart<'d, T> { 386impl<'d, T: Instance + 'd> embedded_io::asynch::Read for BufferedUartRx<'d, T> {
387 type ReadFuture<'a> = impl Future<Output = Result<usize, Self::Error>> 387 type ReadFuture<'a> = impl Future<Output = Result<usize, Self::Error>>
388 where 388 where
389 Self: 'a; 389 Self: 'a;
@@ -426,7 +426,7 @@ impl<'d, T: Instance + 'd> embedded_io::asynch::BufRead for BufferedUart<'d, T>
426 } 426 }
427} 427}
428 428
429impl<'d, T: Instance + 'd> embedded_io::asynch::BufRead for RxBufferedUart<'d, T> { 429impl<'d, T: Instance + 'd> embedded_io::asynch::BufRead for BufferedUartRx<'d, T> {
430 type FillBufFuture<'a> = impl Future<Output = Result<&'a [u8], Self::Error>> 430 type FillBufFuture<'a> = impl Future<Output = Result<&'a [u8], Self::Error>>
431 where 431 where
432 Self: 'a; 432 Self: 'a;
@@ -472,7 +472,7 @@ impl<'d, T: Instance + 'd> embedded_io::asynch::Write for BufferedUart<'d, T> {
472 } 472 }
473} 473}
474 474
475impl<'d, T: Instance + 'd> embedded_io::asynch::Write for TxBufferedUart<'d, T> { 475impl<'d, T: Instance + 'd> embedded_io::asynch::Write for BufferedUartTx<'d, T> {
476 type WriteFuture<'a> = impl Future<Output = Result<usize, Self::Error>> 476 type WriteFuture<'a> = impl Future<Output = Result<usize, Self::Error>>
477 where 477 where
478 Self: 'a; 478 Self: 'a;