aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Vahter <[email protected]>2023-10-24 09:54:17 +0300
committerAndres Vahter <[email protected]>2023-10-24 09:54:17 +0300
commit1e362c750baca264e1ab199adb0f18f2098fa236 (patch)
treef2144f93758e3b90d45b6dbd6113d9c9fa7345db
parent7f72dbdaf2dc43872c647086d7199769a88b5289 (diff)
stm32 uart: use ConfigError instead of () as error
-rw-r--r--embassy-stm32/src/usart/buffered.rs18
-rw-r--r--embassy-stm32/src/usart/mod.rs20
-rw-r--r--embassy-stm32/src/usart/ringbuffered.rs6
3 files changed, 22 insertions, 22 deletions
diff --git a/embassy-stm32/src/usart/buffered.rs b/embassy-stm32/src/usart/buffered.rs
index 1c0a6d697..0e314c1d3 100644
--- a/embassy-stm32/src/usart/buffered.rs
+++ b/embassy-stm32/src/usart/buffered.rs
@@ -116,28 +116,28 @@ pub struct BufferedUartRx<'d, T: BasicInstance> {
116 116
117impl<'d, T: BasicInstance> SetConfig for BufferedUart<'d, T> { 117impl<'d, T: BasicInstance> SetConfig for BufferedUart<'d, T> {
118 type Config = Config; 118 type Config = Config;
119 type ConfigError = (); 119 type ConfigError = ConfigError;
120 120
121 fn set_config(&mut self, config: &Self::Config) -> Result<(), ()> { 121 fn set_config(&mut self, config: &Self::Config) -> Result<(), Self::ConfigError> {
122 self.set_config(config).map_err(|_| ()) 122 self.set_config(config)
123 } 123 }
124} 124}
125 125
126impl<'d, T: BasicInstance> SetConfig for BufferedUartRx<'d, T> { 126impl<'d, T: BasicInstance> SetConfig for BufferedUartRx<'d, T> {
127 type Config = Config; 127 type Config = Config;
128 type ConfigError = (); 128 type ConfigError = ConfigError;
129 129
130 fn set_config(&mut self, config: &Self::Config) -> Result<(), ()> { 130 fn set_config(&mut self, config: &Self::Config) -> Result<(), Self::ConfigError> {
131 self.set_config(config).map_err(|_| ()) 131 self.set_config(config)
132 } 132 }
133} 133}
134 134
135impl<'d, T: BasicInstance> SetConfig for BufferedUartTx<'d, T> { 135impl<'d, T: BasicInstance> SetConfig for BufferedUartTx<'d, T> {
136 type Config = Config; 136 type Config = Config;
137 type ConfigError = (); 137 type ConfigError = ConfigError;
138 138
139 fn set_config(&mut self, config: &Self::Config) -> Result<(), ()> { 139 fn set_config(&mut self, config: &Self::Config) -> Result<(), Self::ConfigError> {
140 self.set_config(config).map_err(|_| ()) 140 self.set_config(config)
141 } 141 }
142} 142}
143 143
diff --git a/embassy-stm32/src/usart/mod.rs b/embassy-stm32/src/usart/mod.rs
index 8c4df375a..60b504da1 100644
--- a/embassy-stm32/src/usart/mod.rs
+++ b/embassy-stm32/src/usart/mod.rs
@@ -182,11 +182,11 @@ pub struct Uart<'d, T: BasicInstance, TxDma = NoDma, RxDma = NoDma> {
182 182
183impl<'d, T: BasicInstance, TxDma, RxDma> SetConfig for Uart<'d, T, TxDma, RxDma> { 183impl<'d, T: BasicInstance, TxDma, RxDma> SetConfig for Uart<'d, T, TxDma, RxDma> {
184 type Config = Config; 184 type Config = Config;
185 type ConfigError = (); 185 type ConfigError = ConfigError;
186 186
187 fn set_config(&mut self, config: &Self::Config) -> Result<(), ()> { 187 fn set_config(&mut self, config: &Self::Config) -> Result<(), Self::ConfigError> {
188 self.tx.set_config(config).map_err(|_| ())?; 188 self.tx.set_config(config)?;
189 self.rx.set_config(config).map_err(|_| ()) 189 self.rx.set_config(config)
190 } 190 }
191} 191}
192 192
@@ -197,10 +197,10 @@ pub struct UartTx<'d, T: BasicInstance, TxDma = NoDma> {
197 197
198impl<'d, T: BasicInstance, TxDma> SetConfig for UartTx<'d, T, TxDma> { 198impl<'d, T: BasicInstance, TxDma> SetConfig for UartTx<'d, T, TxDma> {
199 type Config = Config; 199 type Config = Config;
200 type ConfigError = (); 200 type ConfigError = ConfigError;
201 201
202 fn set_config(&mut self, config: &Self::Config) -> Result<(), ()> { 202 fn set_config(&mut self, config: &Self::Config) -> Result<(), Self::ConfigError> {
203 self.set_config(config).map_err(|_| ()) 203 self.set_config(config)
204 } 204 }
205} 205}
206 206
@@ -214,10 +214,10 @@ pub struct UartRx<'d, T: BasicInstance, RxDma = NoDma> {
214 214
215impl<'d, T: BasicInstance, RxDma> SetConfig for UartRx<'d, T, RxDma> { 215impl<'d, T: BasicInstance, RxDma> SetConfig for UartRx<'d, T, RxDma> {
216 type Config = Config; 216 type Config = Config;
217 type ConfigError = (); 217 type ConfigError = ConfigError;
218 218
219 fn set_config(&mut self, config: &Self::Config) -> Result<(), ()> { 219 fn set_config(&mut self, config: &Self::Config) -> Result<(), Self::ConfigError> {
220 self.set_config(config).map_err(|_| ()) 220 self.set_config(config)
221 } 221 }
222} 222}
223 223
diff --git a/embassy-stm32/src/usart/ringbuffered.rs b/embassy-stm32/src/usart/ringbuffered.rs
index 55489f2e0..eceabbe9a 100644
--- a/embassy-stm32/src/usart/ringbuffered.rs
+++ b/embassy-stm32/src/usart/ringbuffered.rs
@@ -18,10 +18,10 @@ pub struct RingBufferedUartRx<'d, T: BasicInstance, RxDma: super::RxDma<T>> {
18 18
19impl<'d, T: BasicInstance, RxDma: super::RxDma<T>> SetConfig for RingBufferedUartRx<'d, T, RxDma> { 19impl<'d, T: BasicInstance, RxDma: super::RxDma<T>> SetConfig for RingBufferedUartRx<'d, T, RxDma> {
20 type Config = Config; 20 type Config = Config;
21 type ConfigError = (); 21 type ConfigError = ConfigError;
22 22
23 fn set_config(&mut self, config: &Self::Config) -> Result<(), ()> { 23 fn set_config(&mut self, config: &Self::Config) -> Result<(), Self::ConfigError> {
24 self.set_config(config).map_err(|_| ()) 24 self.set_config(config)
25 } 25 }
26} 26}
27 27