NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge #1005

Browse source 
1005: Expose Pin::pin() and Pin::bank() as public r=lulf a=mkj



Co-authored-by: Matt Johnston <matt@ucc.asn.au>
This commit is contained in:
bors[bot] 2022-10-10 06:49:34 +00:00 committed by GitHub
commit 9d5b524bb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
embassy-rp/src/gpio.rs
View file

@ -599,12 +599,12 @@ pub(crate) mod sealed {
fn pin_bank(&self) -> u8; fn pin_bank(&self) -> u8;
#[inline] #[inline]
fn pin(&self) -> u8 { fn _pin(&self) -> u8 {
self.pin_bank() & 0x1f self.pin_bank() & 0x1f
} }
#[inline] #[inline]
fn bank(&self) -> Bank { fn _bank(&self) -> Bank {
if self.pin_bank() & 0x20 == 0 { if self.pin_bank() & 0x20 == 0 {
Bank::Bank0 Bank::Bank0
} else { } else {
@ -613,35 +613,35 @@ pub(crate) mod sealed {
} }
fn io(&self) -> pac::io::Gpio { fn io(&self) -> pac::io::Gpio {
let block = match self.bank() { let block = match self._bank() {
Bank::Bank0 => crate::pac::IO_BANK0, Bank::Bank0 => crate::pac::IO_BANK0,
Bank::Qspi => crate::pac::IO_QSPI, Bank::Qspi => crate::pac::IO_QSPI,
}; };
block.gpio(self.pin() as _) block.gpio(self._pin() as _)
} }
fn pad_ctrl(&self) -> Reg<pac::pads::regs::GpioCtrl, RW> { fn pad_ctrl(&self) -> Reg<pac::pads::regs::GpioCtrl, RW> {
let block = match self.bank() { let block = match self._bank() {
Bank::Bank0 => crate::pac::PADS_BANK0, Bank::Bank0 => crate::pac::PADS_BANK0,
Bank::Qspi => crate::pac::PADS_QSPI, Bank::Qspi => crate::pac::PADS_QSPI,
}; };
block.gpio(self.pin() as _) block.gpio(self._pin() as _)
} }
fn sio_out(&self) -> pac::sio::Gpio { fn sio_out(&self) -> pac::sio::Gpio {
SIO.gpio_out(self.bank() as _) SIO.gpio_out(self._bank() as _)
} }
fn sio_oe(&self) -> pac::sio::Gpio { fn sio_oe(&self) -> pac::sio::Gpio {
SIO.gpio_oe(self.bank() as _) SIO.gpio_oe(self._bank() as _)
} }
fn sio_in(&self) -> Reg<u32, RW> { fn sio_in(&self) -> Reg<u32, RW> {
SIO.gpio_in(self.bank() as _) SIO.gpio_in(self._bank() as _)
} }
fn int_proc(&self) -> pac::io::Int { fn int_proc(&self) -> pac::io::Int {
let io_block = match self.bank() { let io_block = match self._bank() {
Bank::Bank0 => crate::pac::IO_BANK0, Bank::Bank0 => crate::pac::IO_BANK0,
Bank::Qspi => crate::pac::IO_QSPI, Bank::Qspi => crate::pac::IO_QSPI,
}; };
@ -658,6 +658,18 @@ pub trait Pin: Peripheral<P = Self> + Into<AnyPin> + sealed::Pin + Sized + 'stat
pin_bank: self.pin_bank(), pin_bank: self.pin_bank(),
} }
} }
/// Returns the pin number within a bank
#[inline]
fn pin(&self) -> u8 {
self._pin()
}
/// Returns the bank of this pin
#[inline]
fn bank(&self) -> Bank {
self._bank()
}
} }
pub struct AnyPin { pub struct AnyPin {