From 6d38e8b3060e4408ce493aee259048e5cf55dbb0 Mon Sep 17 00:00:00 2001 From: Magnus Nordlander Date: Tue, 5 Aug 2025 09:34:09 +0200 Subject: Remove regs since it doesn’t really make sense to return the QMI peripheral from QMI CS1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- embassy-rp/src/psram.rs | 9 +++++---- embassy-rp/src/qmi_cs1.rs | 13 ++----------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/embassy-rp/src/psram.rs b/embassy-rp/src/psram.rs index 190a7eb09..6da852b26 100644 --- a/embassy-rp/src/psram.rs +++ b/embassy-rp/src/psram.rs @@ -10,11 +10,12 @@ #![cfg(feature = "_rp235x")] -use crate::qmi_cs1::QmiCs1; -use crate::{pac, peripherals}; use critical_section::{acquire, release, CriticalSection, RestoreState}; use embassy_hal_internal::Peri; +use crate::qmi_cs1::QmiCs1; +use crate::{pac, peripherals}; + /// PSRAM errors. #[derive(Debug, Clone, Copy, PartialEq, Eq)] #[cfg_attr(feature = "defmt", derive(defmt::Format))] @@ -204,6 +205,7 @@ impl Config { /// PSRAM driver. pub struct Psram<'d> { + #[allow(dead_code)] qmi_cs1: QmiCs1<'d>, size: usize, } @@ -218,8 +220,7 @@ impl<'d> Psram<'d> { config: Config, ) -> Result { let qmi_cs1 = QmiCs1::new(qmi_cs1_peripheral, cs1); - let qmi = qmi_cs1.regs(); - + let qmi = pac::QMI; let xip = pac::XIP_CTRL; // Verify PSRAM device if requested diff --git a/embassy-rp/src/qmi_cs1.rs b/embassy-rp/src/qmi_cs1.rs index 4e2dc0dbf..ada420432 100644 --- a/embassy-rp/src/qmi_cs1.rs +++ b/embassy-rp/src/qmi_cs1.rs @@ -34,17 +34,10 @@ impl<'d> QmiCs1<'d> { Self { _inner: qmi_cs1 } } - - /// Get access to the QMI peripheral registers. - /// - /// This allows low-level access to configure the QMI controller for specific memory devices. - pub fn regs(&self) -> pac::qmi::Qmi { - pac::QMI - } } trait SealedInstance { - fn regs(&self) -> pac::qmi::Qmi; + } /// QMI CS1 instance trait. @@ -52,9 +45,7 @@ trait SealedInstance { pub trait Instance: SealedInstance + PeripheralType {} impl SealedInstance for peripherals::QMI_CS1 { - fn regs(&self) -> pac::qmi::Qmi { - pac::QMI - } + } impl Instance for peripherals::QMI_CS1 {} -- cgit