diff options
| author | Dario Nieuwenhuis <[email protected]> | 2024-11-24 20:58:48 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-11-24 20:58:48 +0100 |
| commit | aaad8450e990f74c6b398aca9a6ec495720bf845 (patch) | |
| tree | 17452428d53110cf07e9ee06ec0c3b372a1dc02f /embassy-time/src | |
| parent | b9408f051080398f38e03f7d0d20bba860213064 (diff) | |
Use inline const for initializing arrays. (#3567)
Diffstat (limited to 'embassy-time/src')
| -rw-r--r-- | embassy-time/src/driver_std.rs | 4 | ||||
| -rw-r--r-- | embassy-time/src/driver_wasm.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/embassy-time/src/driver_std.rs b/embassy-time/src/driver_std.rs index d182f8331..cbef7aae1 100644 --- a/embassy-time/src/driver_std.rs +++ b/embassy-time/src/driver_std.rs | |||
| @@ -43,7 +43,6 @@ struct TimeDriver { | |||
| 43 | signaler: UninitCell<Signaler>, | 43 | signaler: UninitCell<Signaler>, |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | const ALARM_NEW: AlarmState = AlarmState::new(); | ||
| 47 | embassy_time_driver::time_driver_impl!(static DRIVER: TimeDriver = TimeDriver { | 46 | embassy_time_driver::time_driver_impl!(static DRIVER: TimeDriver = TimeDriver { |
| 48 | alarm_count: AtomicU8::new(0), | 47 | alarm_count: AtomicU8::new(0), |
| 49 | 48 | ||
| @@ -56,7 +55,8 @@ embassy_time_driver::time_driver_impl!(static DRIVER: TimeDriver = TimeDriver { | |||
| 56 | impl TimeDriver { | 55 | impl TimeDriver { |
| 57 | fn init(&self) { | 56 | fn init(&self) { |
| 58 | self.once.call_once(|| unsafe { | 57 | self.once.call_once(|| unsafe { |
| 59 | self.alarms.write(CsMutex::new(RefCell::new([ALARM_NEW; ALARM_COUNT]))); | 58 | self.alarms |
| 59 | .write(CsMutex::new(RefCell::new([const { AlarmState::new() }; ALARM_COUNT]))); | ||
| 60 | self.zero_instant.write(StdInstant::now()); | 60 | self.zero_instant.write(StdInstant::now()); |
| 61 | self.signaler.write(Signaler::new()); | 61 | self.signaler.write(Signaler::new()); |
| 62 | 62 | ||
diff --git a/embassy-time/src/driver_wasm.rs b/embassy-time/src/driver_wasm.rs index ad884f060..d65629e49 100644 --- a/embassy-time/src/driver_wasm.rs +++ b/embassy-time/src/driver_wasm.rs | |||
| @@ -40,7 +40,6 @@ struct TimeDriver { | |||
| 40 | zero_instant: UninitCell<StdInstant>, | 40 | zero_instant: UninitCell<StdInstant>, |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | const ALARM_NEW: AlarmState = AlarmState::new(); | ||
| 44 | embassy_time_driver::time_driver_impl!(static DRIVER: TimeDriver = TimeDriver { | 43 | embassy_time_driver::time_driver_impl!(static DRIVER: TimeDriver = TimeDriver { |
| 45 | alarm_count: AtomicU8::new(0), | 44 | alarm_count: AtomicU8::new(0), |
| 46 | once: Once::new(), | 45 | once: Once::new(), |
| @@ -51,7 +50,8 @@ embassy_time_driver::time_driver_impl!(static DRIVER: TimeDriver = TimeDriver { | |||
| 51 | impl TimeDriver { | 50 | impl TimeDriver { |
| 52 | fn init(&self) { | 51 | fn init(&self) { |
| 53 | self.once.call_once(|| unsafe { | 52 | self.once.call_once(|| unsafe { |
| 54 | self.alarms.write(Mutex::new([ALARM_NEW; ALARM_COUNT])); | 53 | self.alarms |
| 54 | .write(Mutex::new([const { AlarmState::new() }; ALARM_COUNT])); | ||
| 55 | self.zero_instant.write(StdInstant::now()); | 55 | self.zero_instant.write(StdInstant::now()); |
| 56 | }); | 56 | }); |
| 57 | } | 57 | } |
