diff options
| author | xoviat <[email protected]> | 2021-03-29 09:21:34 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-03-29 09:21:34 -0500 |
| commit | 2bcd1aaebbf255de1ded97356c107df5bea04e57 (patch) | |
| tree | 4e30654984fae10112aa19e935826dee1c5fb734 /embassy-extras | |
| parent | 494c47808a7a83457bcf0cc59dad9c27317f12f3 (diff) | |
| parent | 32ca231fe6414bdf44cdb49527dea5617c9eb27e (diff) | |
Merge pull request #123 from xoviat/cleanup
take clocks on peripheral take and add embassy::main in more places
Diffstat (limited to 'embassy-extras')
| -rw-r--r-- | embassy-extras/src/macros.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/embassy-extras/src/macros.rs b/embassy-extras/src/macros.rs index e57b89ec7..5ce14a76d 100644 --- a/embassy-extras/src/macros.rs +++ b/embassy-extras/src/macros.rs | |||
| @@ -122,7 +122,7 @@ macro_rules! std_peripherals { | |||
| 122 | 122 | ||
| 123 | impl Peripherals { | 123 | impl Peripherals { |
| 124 | pub fn take() -> Option<(Peripherals, Clocks)> { | 124 | pub fn take() -> Option<(Peripherals, Clocks)> { |
| 125 | match unsafe {GLOBAL_CLOCKS} { | 125 | match unsafe {GLOBAL_CLOCKS.take()} { |
| 126 | Some(clocks) => { | 126 | Some(clocks) => { |
| 127 | let dp = unsafe { pac::Peripherals::steal() }; | 127 | let dp = unsafe { pac::Peripherals::steal() }; |
| 128 | let peripherals = Peripherals { | 128 | let peripherals = Peripherals { |