Skip to content

Commit

Permalink
Fix clippy warning in esp-wifi, remove Cargo patch and update `semi…
Browse files Browse the repository at this point in the history
…hosting` dependency (#1778)

* Update `semihosting` dependency and remove Cargo patch

* Fix clippy error in `esp-wifi`
  • Loading branch information
jessebraham authored Jul 9, 2024
1 parent a5be31f commit eb9bfd5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion esp-backtrace/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ features = ["esp32c3", "panic-handler", "exception-handler", "println", "e
[dependencies]
defmt = { version = "0.3.8", optional = true }
esp-println = { version = "0.9.1", optional = true, default-features = false, path = "../esp-println" }
semihosting = { version = "0.1.10", optional = true }
semihosting = { version = "0.1.12", optional = true }

[build-dependencies]
esp-build = { version = "0.1.0", path = "../esp-build" }
Expand Down
6 changes: 2 additions & 4 deletions esp-wifi/src/timer/riscv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,8 @@ pub fn setup_timer(mut alarm0: TimeBase) -> Result<(), esp_hal::timer::Error> {
// make sure the scheduling won't start before everything is setup
riscv::interrupt::disable();

alarm0.set_interrupt_handler(InterruptHandler::new(
unsafe { core::mem::transmute(handler as *const ()) },
interrupt::Priority::Priority1,
));
let cb: extern "C" fn() = unsafe { core::mem::transmute(handler as *const ()) };
alarm0.set_interrupt_handler(InterruptHandler::new(cb, interrupt::Priority::Priority1));
alarm0.start(TIMESLICE_FREQUENCY.into_duration())?;
critical_section::with(|cs| {
alarm0.enable_interrupt(true);
Expand Down
3 changes: 0 additions & 3 deletions hil-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,6 @@ nb = "1.1.0"
p192 = { version = "0.13.0", default-features = false, features = ["arithmetic"] }
p256 = { version = "0.13.2", default-features = false, features = ["arithmetic"] }

[patch.crates-io]
semihosting = { git = "https://github.com/taiki-e/semihosting", tag = "v0.1.10" }

[features]
default = ["async", "embassy"]

Expand Down

0 comments on commit eb9bfd5

Please sign in to comment.