Merge pull request #4066 from Phil-hacker/executor_fix_avr

Fix the avr executor

2 files changed, 7 insertions, 2 deletions

diff --git a/embassy-executor/Cargo.toml b/embassy-executor/Cargo.toml
index 8d7cf715f..0f69d3c8a 100644
--- a/embassy-executor/Cargo.toml
+++ b/embassy-executor/Cargo.toml
@@ -50,7 +50,7 @@ wasm-bindgen = { version = "0.2.82", optional = true }
 js-sys = { version = "0.3", optional = true }
 
 # arch-avr dependencies
-avr-device = { version = "0.5.3", optional = true }
+avr-device = { version = "0.7.0", optional = true }
 
 [dev-dependencies]
 critical-section = { version = "1.1", features = ["std"] }
diff --git a/embassy-executor/src/raw/mod.rs b/embassy-executor/src/raw/mod.rs
index 56faa911d..88d839e07 100644
--- a/embassy-executor/src/raw/mod.rs
+++ b/embassy-executor/src/raw/mod.rs
@@ -28,9 +28,14 @@ use core::marker::PhantomData;
 use core::mem;
 use core::pin::Pin;
 use core::ptr::NonNull;
-use core::sync::atomic::{AtomicPtr, Ordering};
+#[cfg(not(feature = "arch-avr"))]
+use core::sync::atomic::AtomicPtr;
+use core::sync::atomic::Ordering;
 use core::task::{Context, Poll};
 
+#[cfg(feature = "arch-avr")]
+use portable_atomic::AtomicPtr;
+
 use self::run_queue::{RunQueue, RunQueueItem};
 use self::state::State;
 use self::util::{SyncUnsafeCell, UninitCell};