use intset intclear now they are recognized by llvm (esp-rs#248)

* use intset intclear now they are recognized by llvm * Bump readme MSRV * Remove comment
bjoernQ · May 23, 2024 · 277aeb8 · 277aeb8
1 parent 43c93c6
commit 277aeb8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/esp-wifi/src/ble/btdm.rs b/esp-wifi/src/ble/btdm.rs
@@ -334,7 +334,7 @@ unsafe extern "C" fn cause_sw_intr_to_core(_core: i32, _intr_no: i32) -> i32 {
     {
         log::trace!("cause_sw_intr_to_core {} {}", _core, _intr_no);
         let intr = 1 << _intr_no;
-        core::arch::asm!("wsr.226  {0}", in(reg) intr, options(nostack)); // 226 = "intset"
+        core::arch::asm!("wsr.intset  {0}", in(reg) intr, options(nostack)); 
         0
     }
 }

diff --git a/esp-wifi/src/timer_esp32.rs b/esp-wifi/src/timer_esp32.rs
@@ -185,7 +185,7 @@ fn TG1_T0_LEVEL(context: &mut Context) {
 fn Software1(_level: u32, context: &mut Context) {
     let intr = 1 << 29;
     unsafe {
-        core::arch::asm!("wsr.227  {0}", in(reg) intr, options(nostack)); // 227 = "intclear"
+        core::arch::asm!("wsr.intclear  {0}", in(reg) intr, options(nostack));
     }
 
     task_switch(context);
@@ -203,6 +203,6 @@ fn Software1(_level: u32, context: &mut Context) {
 pub fn yield_task() {
     let intr = 1 << 29;
     unsafe {
-        core::arch::asm!("wsr.226  {0}", in(reg) intr, options(nostack)); // 226 = "intset"
+        core::arch::asm!("wsr.intset  {0}", in(reg) intr, options(nostack));
     }
 }
diff --git a/esp-wifi/src/timer_esp32s2.rs b/esp-wifi/src/timer_esp32s2.rs
@@ -137,7 +137,7 @@ fn TG1_T0_LEVEL(context: &mut Context) {
 fn Software1(_level: u32, context: &mut Context) {
     let intr = 1 << 29;
     unsafe {
-        core::arch::asm!("wsr.227  {0}", in(reg) intr, options(nostack)); // 227 = "intclear"
+        core::arch::asm!("wsr.intclear  {0}", in(reg) intr, options(nostack));
     }
 
     task_switch(context);
@@ -155,6 +155,6 @@ fn Software1(_level: u32, context: &mut Context) {
 pub fn yield_task() {
     let intr = 1 << 29;
     unsafe {
-        core::arch::asm!("wsr.226  {0}", in(reg) intr, options(nostack)); // 226 = "intset"
+        core::arch::asm!("wsr.intset  {0}", in(reg) intr, options(nostack));
     }
 }
diff --git a/esp-wifi/src/timer_esp32s3.rs b/esp-wifi/src/timer_esp32s3.rs
@@ -175,7 +175,7 @@ fn TG1_T0_LEVEL(context: &mut TrapFrame) {
 fn Software1(_level: u32, context: &mut TrapFrame) {
     let intr = 1 << 29;
     unsafe {
-        core::arch::asm!("wsr.227  {0}", in(reg) intr, options(nostack)); // 227 = "intclear"
+        core::arch::asm!("wsr.intclear  {0}", in(reg) intr, options(nostack));
     }
 
     task_switch(context);
@@ -193,6 +193,6 @@ fn Software1(_level: u32, context: &mut TrapFrame) {
 pub fn yield_task() {
     let intr = 1 << 29;
     unsafe {
-        core::arch::asm!("wsr.226  {0}", in(reg) intr, options(nostack)); // 226 = "intset"
+        core::arch::asm!("wsr.intset  {0}", in(reg) intr, options(nostack));
     }
 }