diff options
| author | Ulf Lilleengen <[email protected]> | 2025-09-29 14:53:24 +0200 |
|---|---|---|
| committer | Ulf Lilleengen <[email protected]> | 2025-09-29 14:53:59 +0200 |
| commit | b8f78c4f7c1f13beb4af8ef50f992f62c0ab53f6 (patch) | |
| tree | 2029e7ef14e5d239eb27b8a879d07415bd7b8cec | |
| parent | 5fc197529e4260196f99e8d6341a37d7e623c9f6 (diff) | |
fix: remove instance generic for multiwrite implementation
| -rw-r--r-- | embassy-nrf/Cargo.toml | 1 | ||||
| -rwxr-xr-x | embassy-nrf/src/qspi.rs | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/embassy-nrf/Cargo.toml b/embassy-nrf/Cargo.toml index 1af633500..e2580a36e 100644 --- a/embassy-nrf/Cargo.toml +++ b/embassy-nrf/Cargo.toml | |||
| @@ -34,6 +34,7 @@ build = [ | |||
| 34 | {target = "thumbv7em-none-eabi", features = ["defmt", "gpiote", "nrf52840", "time"]}, | 34 | {target = "thumbv7em-none-eabi", features = ["defmt", "gpiote", "nrf52840", "time"]}, |
| 35 | {target = "thumbv7em-none-eabi", features = ["defmt", "gpiote", "nrf52840", "time-driver-rtc1"]}, | 35 | {target = "thumbv7em-none-eabi", features = ["defmt", "gpiote", "nrf52840", "time-driver-rtc1"]}, |
| 36 | {target = "thumbv7em-none-eabi", features = ["defmt", "gpiote", "nrf52840", "time", "time-driver-rtc1"]}, | 36 | {target = "thumbv7em-none-eabi", features = ["defmt", "gpiote", "nrf52840", "time", "time-driver-rtc1"]}, |
| 37 | {target = "thumbv7em-none-eabi", features = ["defmt", "gpiote", "nrf52840", "time", "time-driver-rtc1","qspi-multiwrite-flash"]}, | ||
| 37 | {target = "thumbv6m-none-eabi", features = ["defmt", "nrf51", "time", "time-driver-rtc1"]}, | 38 | {target = "thumbv6m-none-eabi", features = ["defmt", "nrf51", "time", "time-driver-rtc1"]}, |
| 38 | {target = "thumbv6m-none-eabi", features = ["defmt", "nrf51", "time"]}, | 39 | {target = "thumbv6m-none-eabi", features = ["defmt", "nrf51", "time"]}, |
| 39 | {target = "thumbv6m-none-eabi", features = ["nrf51", "time"]}, | 40 | {target = "thumbv6m-none-eabi", features = ["nrf51", "time"]}, |
diff --git a/embassy-nrf/src/qspi.rs b/embassy-nrf/src/qspi.rs index 94ad3f0d6..6f4524716 100755 --- a/embassy-nrf/src/qspi.rs +++ b/embassy-nrf/src/qspi.rs | |||
| @@ -599,7 +599,7 @@ impl<'d> NorFlash for Qspi<'d> { | |||
| 599 | } | 599 | } |
| 600 | 600 | ||
| 601 | #[cfg(feature = "qspi-multiwrite-flash")] | 601 | #[cfg(feature = "qspi-multiwrite-flash")] |
| 602 | impl<'d, T: Instance> embedded_storage::nor_flash::MultiwriteNorFlash for Qspi<'d, T> {} | 602 | impl<'d> embedded_storage::nor_flash::MultiwriteNorFlash for Qspi<'d> {} |
| 603 | 603 | ||
| 604 | mod _eh1 { | 604 | mod _eh1 { |
| 605 | use embedded_storage_async::nor_flash::{NorFlash as AsyncNorFlash, ReadNorFlash as AsyncReadNorFlash}; | 605 | use embedded_storage_async::nor_flash::{NorFlash as AsyncNorFlash, ReadNorFlash as AsyncReadNorFlash}; |
| @@ -634,7 +634,7 @@ mod _eh1 { | |||
| 634 | } | 634 | } |
| 635 | 635 | ||
| 636 | #[cfg(feature = "qspi-multiwrite-flash")] | 636 | #[cfg(feature = "qspi-multiwrite-flash")] |
| 637 | impl<'d, T: Instance> embedded_storage_async::nor_flash::MultiwriteNorFlash for Qspi<'d, T> {} | 637 | impl<'d> embedded_storage_async::nor_flash::MultiwriteNorFlash for Qspi<'d> {} |
| 638 | } | 638 | } |
| 639 | 639 | ||
| 640 | /// Peripheral static state | 640 | /// Peripheral static state |
