aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2021-08-05 19:19:47 +0200
committerDario Nieuwenhuis <[email protected]>2021-08-05 19:19:47 +0200
commit05e50e1f4a2549a13491e8bb865c3e6d2038f875 (patch)
treef5b496e5ac141fb0914413ceed34c89d14d5d2c1
parentb1d631d63941e0bca49ec349147c041f04f3eafb (diff)
time_driver: use regular fn ptr -> raw ptr casts
-rw-r--r--embassy-nrf/src/time_driver.rs5
-rw-r--r--embassy-stm32/src/time_driver.rs5
2 files changed, 2 insertions, 8 deletions
diff --git a/embassy-nrf/src/time_driver.rs b/embassy-nrf/src/time_driver.rs
index 7815427ee..f3d07e98d 100644
--- a/embassy-nrf/src/time_driver.rs
+++ b/embassy-nrf/src/time_driver.rs
@@ -208,10 +208,7 @@ impl State {
208 critical_section::with(|cs| { 208 critical_section::with(|cs| {
209 let alarm = self.get_alarm(cs, alarm); 209 let alarm = self.get_alarm(cs, alarm);
210 210
211 // safety: it's OK to transmute a fn pointer into a raw pointer 211 alarm.callback.set(callback as *const ());
212 let callback_ptr: *const () = unsafe { mem::transmute(callback) };
213
214 alarm.callback.set(callback_ptr);
215 alarm.ctx.set(ctx); 212 alarm.ctx.set(ctx);
216 }) 213 })
217 } 214 }
diff --git a/embassy-stm32/src/time_driver.rs b/embassy-stm32/src/time_driver.rs
index 226e5e39c..3ae4b1c4d 100644
--- a/embassy-stm32/src/time_driver.rs
+++ b/embassy-stm32/src/time_driver.rs
@@ -232,10 +232,7 @@ impl State {
232 critical_section::with(|cs| { 232 critical_section::with(|cs| {
233 let alarm = self.get_alarm(cs, alarm); 233 let alarm = self.get_alarm(cs, alarm);
234 234
235 // safety: it's OK to transmute a fn pointer into a raw pointer 235 alarm.callback.set(callback as *const ());
236 let callback_ptr: *const () = unsafe { mem::transmute(callback) };
237
238 alarm.callback.set(callback_ptr);
239 alarm.ctx.set(ctx); 236 alarm.ctx.set(ctx);
240 }) 237 })
241 } 238 }