diff options
| author | Magnus Nordlander <[email protected]> | 2025-08-05 09:53:16 +0200 |
|---|---|---|
| committer | Magnus Nordlander <[email protected]> | 2025-08-05 09:56:09 +0200 |
| commit | 8965a13da4149a6f1a56c5abcf879ff8ad822844 (patch) | |
| tree | 02840fff99801f534c7acdab907903d9dab9cb36 | |
| parent | 6d38e8b3060e4408ce493aee259048e5cf55dbb0 (diff) | |
Interface changes and added example
| -rw-r--r-- | embassy-rp/src/psram.rs | 7 | ||||
| -rw-r--r-- | examples/rp235x/src/bin/psram.rs | 49 |
2 files changed, 51 insertions, 5 deletions
diff --git a/embassy-rp/src/psram.rs b/embassy-rp/src/psram.rs index 6da852b26..a4d619565 100644 --- a/embassy-rp/src/psram.rs +++ b/embassy-rp/src/psram.rs | |||
| @@ -11,10 +11,9 @@ | |||
| 11 | #![cfg(feature = "_rp235x")] | 11 | #![cfg(feature = "_rp235x")] |
| 12 | 12 | ||
| 13 | use critical_section::{acquire, release, CriticalSection, RestoreState}; | 13 | use critical_section::{acquire, release, CriticalSection, RestoreState}; |
| 14 | use embassy_hal_internal::Peri; | ||
| 15 | 14 | ||
| 16 | use crate::qmi_cs1::QmiCs1; | 15 | use crate::qmi_cs1::QmiCs1; |
| 17 | use crate::{pac, peripherals}; | 16 | use crate::pac; |
| 18 | 17 | ||
| 19 | /// PSRAM errors. | 18 | /// PSRAM errors. |
| 20 | #[derive(Debug, Clone, Copy, PartialEq, Eq)] | 19 | #[derive(Debug, Clone, Copy, PartialEq, Eq)] |
| @@ -215,11 +214,9 @@ impl<'d> Psram<'d> { | |||
| 215 | /// | 214 | /// |
| 216 | /// This will detect the PSRAM device and configure it for memory-mapped access. | 215 | /// This will detect the PSRAM device and configure it for memory-mapped access. |
| 217 | pub fn new( | 216 | pub fn new( |
| 218 | qmi_cs1_peripheral: Peri<'d, peripherals::QMI_CS1>, | 217 | qmi_cs1: QmiCs1<'d>, |
| 219 | cs1: Peri<'d, impl crate::qmi_cs1::QmiCs1Pin>, | ||
| 220 | config: Config, | 218 | config: Config, |
| 221 | ) -> Result<Self, Error> { | 219 | ) -> Result<Self, Error> { |
| 222 | let qmi_cs1 = QmiCs1::new(qmi_cs1_peripheral, cs1); | ||
| 223 | let qmi = pac::QMI; | 220 | let qmi = pac::QMI; |
| 224 | let xip = pac::XIP_CTRL; | 221 | let xip = pac::XIP_CTRL; |
| 225 | 222 | ||
diff --git a/examples/rp235x/src/bin/psram.rs b/examples/rp235x/src/bin/psram.rs new file mode 100644 index 000000000..c0e41dd9e --- /dev/null +++ b/examples/rp235x/src/bin/psram.rs | |||
| @@ -0,0 +1,49 @@ | |||
| 1 | //! This example tests an APS6404L PSRAM chip connected to the RP235x | ||
| 2 | //! It fills the PSRAM with alternating patterns and reads back a value | ||
| 3 | //! | ||
| 4 | //! In this example, the PSRAM CS is connected to Pin 0. | ||
| 5 | |||
| 6 | #![no_std] | ||
| 7 | #![no_main] | ||
| 8 | |||
| 9 | use defmt::*; | ||
| 10 | use embassy_executor::Spawner; | ||
| 11 | use embassy_time::Timer; | ||
| 12 | use {defmt_rtt as _, panic_probe as _}; | ||
| 13 | use core::slice; | ||
| 14 | |||
| 15 | #[embassy_executor::main] | ||
| 16 | async fn main(_spawner: Spawner) { | ||
| 17 | let config = embassy_rp::config::Config::default(); | ||
| 18 | let p = embassy_rp::init(config); | ||
| 19 | let psram_config = embassy_rp::psram::Config::aps6404l(); | ||
| 20 | let psram = embassy_rp::psram::Psram::new(embassy_rp::qmi_cs1::QmiCs1::new(p.QMI_CS1, p.PIN_0), psram_config); | ||
| 21 | |||
| 22 | let Ok(psram) = psram else { | ||
| 23 | error!("PSRAM not found"); | ||
| 24 | loop { | ||
| 25 | Timer::after_secs(1).await; | ||
| 26 | }; | ||
| 27 | }; | ||
| 28 | |||
| 29 | let psram_slice = unsafe { | ||
| 30 | let psram_ptr = psram.base_address(); | ||
| 31 | let slice: &'static mut [u8] = | ||
| 32 | slice::from_raw_parts_mut(psram_ptr, psram.size() as usize); | ||
| 33 | slice | ||
| 34 | }; | ||
| 35 | |||
| 36 | loop { | ||
| 37 | psram_slice.fill(0x55); | ||
| 38 | info!("PSRAM filled with 0x55"); | ||
| 39 | let at_addr = psram_slice[0x100]; | ||
| 40 | info!("Read from PSRAM at address 0x100: 0x{:02x}", at_addr); | ||
| 41 | Timer::after_secs(1).await; | ||
| 42 | |||
| 43 | psram_slice.fill(0xAA); | ||
| 44 | info!("PSRAM filled with 0xAA"); | ||
| 45 | let at_addr = psram_slice[0x100]; | ||
| 46 | info!("Read from PSRAM at address 0x100: 0x{:02x}", at_addr); | ||
| 47 | Timer::after_secs(1).await; | ||
| 48 | } | ||
| 49 | } | ||
