From 971314bad05fc8cabd3be4f3522c94c8bdd741c5 Mon Sep 17 00:00:00 2001 From: joyel24 Date: Sat, 25 Jan 2025 02:05:41 +0100 Subject: [PATCH 01/11] xtensa-lx to 0.10.0 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 98bb2d3..53a8e9b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ embedded-hal = { version = "0.2.3", features = ["unproven"] } nb = "1.0.0" once_cell = { version = "1.4.0", optional = true } cortex-m = { version = "0.7.7", optional = true } -xtensa-lx = { version = "0.8.0", optional = true, features = ["spin"] } +xtensa-lx = { version = "0.10.0", optional = true, features = ["spin"] } spin = { version = "0.9.8", optional = true } atomic-polyfill = { version = "1.0.1", optional = true } From 1cd4c82ee939d832ddcc1bb42d0a251d14f82095 Mon Sep 17 00:00:00 2001 From: joyel24 Date: Sat, 25 Jan 2025 02:08:45 +0100 Subject: [PATCH 02/11] remove xtensa-lx features --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 53a8e9b..4dc7b8e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ embedded-hal = { version = "0.2.3", features = ["unproven"] } nb = "1.0.0" once_cell = { version = "1.4.0", optional = true } cortex-m = { version = "0.7.7", optional = true } -xtensa-lx = { version = "0.10.0", optional = true, features = ["spin"] } +xtensa-lx = { version = "0.10.0", optional = true} spin = { version = "0.9.8", optional = true } atomic-polyfill = { version = "1.0.1", optional = true } From 18849f29319fc9c89bd1c8b19b02ad924a568e57 Mon Sep 17 00:00:00 2001 From: joyel24 Date: Sat, 25 Jan 2025 02:17:58 +0100 Subject: [PATCH 03/11] test fix xtensa_lx::interrupt::free --- src/mutex.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mutex.rs b/src/mutex.rs index 3271f25..d3bd36e 100644 --- a/src/mutex.rs +++ b/src/mutex.rs @@ -143,7 +143,8 @@ impl BusMutex for XtensaMutex { } fn lock R>(&self, f: F) -> R { - xtensa_lx::interrupt::free(|_| f(&mut (*self.0.lock()))) + //xtensa_lx::interrupt::free(|_| f(&mut (*self.0.lock()))) + xtensa_lx::interrupt::free(|_| lock()) } } From b686e8cc1bc83eb512e199f27da96149b27852b5 Mon Sep 17 00:00:00 2001 From: joyel24 Date: Sat, 25 Jan 2025 02:25:39 +0100 Subject: [PATCH 04/11] Update mutex.rs self.lock --- src/mutex.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mutex.rs b/src/mutex.rs index d3bd36e..46499d8 100644 --- a/src/mutex.rs +++ b/src/mutex.rs @@ -144,7 +144,7 @@ impl BusMutex for XtensaMutex { fn lock R>(&self, f: F) -> R { //xtensa_lx::interrupt::free(|_| f(&mut (*self.0.lock()))) - xtensa_lx::interrupt::free(|_| lock()) + xtensa_lx::interrupt::free(|_| self.lock()) } } From 33b70b8a9bee1f9fd3a5657864797d8720f67299 Mon Sep 17 00:00:00 2001 From: joyel24 Date: Sat, 25 Jan 2025 02:36:19 +0100 Subject: [PATCH 05/11] Update mutex.rs tests xtensa-lx free --- src/mutex.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mutex.rs b/src/mutex.rs index 46499d8..c0b0e46 100644 --- a/src/mutex.rs +++ b/src/mutex.rs @@ -144,7 +144,7 @@ impl BusMutex for XtensaMutex { fn lock R>(&self, f: F) -> R { //xtensa_lx::interrupt::free(|_| f(&mut (*self.0.lock()))) - xtensa_lx::interrupt::free(|_| self.lock()) + xtensa_lx::interrupt::free(|_| f()) } } From c483d79bb3929a38363e028344391df7273a3125 Mon Sep 17 00:00:00 2001 From: joyel24 Date: Sat, 25 Jan 2025 02:42:27 +0100 Subject: [PATCH 06/11] Update mutex.rs tests --- src/mutex.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mutex.rs b/src/mutex.rs index c0b0e46..9f86519 100644 --- a/src/mutex.rs +++ b/src/mutex.rs @@ -144,7 +144,7 @@ impl BusMutex for XtensaMutex { fn lock R>(&self, f: F) -> R { //xtensa_lx::interrupt::free(|_| f(&mut (*self.0.lock()))) - xtensa_lx::interrupt::free(|_| f()) + xtensa_lx::interrupt::free(|_| f(&mut (self.lock()) ) } } From 2f7cdfd71b9999863691d0af06df74ee8cf79efb Mon Sep 17 00:00:00 2001 From: joyel24 Date: Sat, 25 Jan 2025 02:43:22 +0100 Subject: [PATCH 07/11] Update mutex.rs tests --- src/mutex.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mutex.rs b/src/mutex.rs index 9f86519..f2f943e 100644 --- a/src/mutex.rs +++ b/src/mutex.rs @@ -144,7 +144,7 @@ impl BusMutex for XtensaMutex { fn lock R>(&self, f: F) -> R { //xtensa_lx::interrupt::free(|_| f(&mut (*self.0.lock()))) - xtensa_lx::interrupt::free(|_| f(&mut (self.lock()) ) + xtensa_lx::interrupt::free(|_| f(&mut (self.lock()))) } } From 128f0df9a5635956c8474133d2e0c252da29bc95 Mon Sep 17 00:00:00 2001 From: joyel24 Date: Sat, 25 Jan 2025 02:44:09 +0100 Subject: [PATCH 08/11] Update mutex.rs --- src/mutex.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mutex.rs b/src/mutex.rs index f2f943e..b062906 100644 --- a/src/mutex.rs +++ b/src/mutex.rs @@ -144,7 +144,7 @@ impl BusMutex for XtensaMutex { fn lock R>(&self, f: F) -> R { //xtensa_lx::interrupt::free(|_| f(&mut (*self.0.lock()))) - xtensa_lx::interrupt::free(|_| f(&mut (self.lock()))) + xtensa_lx::interrupt::free(|_| f(&mut (*self.lock()))) } } From b284013a5ce1d051631dddca242e8d1d3e36a3c8 Mon Sep 17 00:00:00 2001 From: joyel24 Date: Sat, 25 Jan 2025 02:44:59 +0100 Subject: [PATCH 09/11] Update mutex.rs --- src/mutex.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mutex.rs b/src/mutex.rs index b062906..faf5e4e 100644 --- a/src/mutex.rs +++ b/src/mutex.rs @@ -144,7 +144,7 @@ impl BusMutex for XtensaMutex { fn lock R>(&self, f: F) -> R { //xtensa_lx::interrupt::free(|_| f(&mut (*self.0.lock()))) - xtensa_lx::interrupt::free(|_| f(&mut (*self.lock()))) + xtensa_lx::interrupt::free(|_| f(&mut (*self.0.lock()))) } } From a384d4f940175f6979acbb074902b86fb06be780 Mon Sep 17 00:00:00 2001 From: joyel24 Date: Sat, 25 Jan 2025 02:48:06 +0100 Subject: [PATCH 10/11] Update Cargo.toml xtensa-lx 0.9.0 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 4dc7b8e..b9ea117 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ embedded-hal = { version = "0.2.3", features = ["unproven"] } nb = "1.0.0" once_cell = { version = "1.4.0", optional = true } cortex-m = { version = "0.7.7", optional = true } -xtensa-lx = { version = "0.10.0", optional = true} +xtensa-lx = { version = "0.9.0", optional = true} spin = { version = "0.9.8", optional = true } atomic-polyfill = { version = "1.0.1", optional = true } From fd2b3de3667f231836ff355abc7176a82bdcd15e Mon Sep 17 00:00:00 2001 From: joyel24 Date: Sun, 16 Feb 2025 22:53:31 +0100 Subject: [PATCH 11/11] clean --- src/mutex.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mutex.rs b/src/mutex.rs index faf5e4e..3271f25 100644 --- a/src/mutex.rs +++ b/src/mutex.rs @@ -143,7 +143,6 @@ impl BusMutex for XtensaMutex { } fn lock R>(&self, f: F) -> R { - //xtensa_lx::interrupt::free(|_| f(&mut (*self.0.lock()))) xtensa_lx::interrupt::free(|_| f(&mut (*self.0.lock()))) } }