diff options
| author | Frostie314159 <[email protected]> | 2024-03-31 20:48:05 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-03-31 20:48:05 +0200 |
| commit | 67c9cc2c4b886e6962ecdd6eff8794b14c1accdc (patch) | |
| tree | f176ab269949d26f48e04c950cebc5489bae8c56 /embassy-time/src/driver_std.rs | |
| parent | a2f9aa592ec61beb247065003016515f0d423c13 (diff) | |
| parent | 6634cc90bcd3eb25b64712688920f383584b2964 (diff) | |
Merge branch 'embassy-rs:main' into ticker_send_sync
Diffstat (limited to 'embassy-time/src/driver_std.rs')
| -rw-r--r-- | embassy-time/src/driver_std.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/embassy-time/src/driver_std.rs b/embassy-time/src/driver_std.rs index 32db47a37..d182f8331 100644 --- a/embassy-time/src/driver_std.rs +++ b/embassy-time/src/driver_std.rs | |||
| @@ -6,8 +6,7 @@ use std::time::{Duration as StdDuration, Instant as StdInstant}; | |||
| 6 | use std::{mem, ptr, thread}; | 6 | use std::{mem, ptr, thread}; |
| 7 | 7 | ||
| 8 | use critical_section::Mutex as CsMutex; | 8 | use critical_section::Mutex as CsMutex; |
| 9 | 9 | use embassy_time_driver::{AlarmHandle, Driver}; | |
| 10 | use crate::driver::{AlarmHandle, Driver}; | ||
| 11 | 10 | ||
| 12 | const ALARM_COUNT: usize = 4; | 11 | const ALARM_COUNT: usize = 4; |
| 13 | 12 | ||
| @@ -45,7 +44,7 @@ struct TimeDriver { | |||
| 45 | } | 44 | } |
| 46 | 45 | ||
| 47 | const ALARM_NEW: AlarmState = AlarmState::new(); | 46 | const ALARM_NEW: AlarmState = AlarmState::new(); |
| 48 | crate::time_driver_impl!(static DRIVER: TimeDriver = TimeDriver { | 47 | embassy_time_driver::time_driver_impl!(static DRIVER: TimeDriver = TimeDriver { |
| 49 | alarm_count: AtomicU8::new(0), | 48 | alarm_count: AtomicU8::new(0), |
| 50 | 49 | ||
| 51 | once: Once::new(), | 50 | once: Once::new(), |
