Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove/inline Pin::gpio_bank #2850

Merged
merged 1 commit into from
Dec 20, 2024
Merged

Remove/inline Pin::gpio_bank #2850

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 10 additions & 33 deletions esp-hal/src/gpio/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,7 @@ pub trait Pin: Sealed {
/// Enable or disable the GPIO pin output buffer.
#[doc(hidden)]
fn enable_output(&self, enable: bool, _: private::Internal) {
self.gpio_bank(private::Internal)
.write_out_en(self.mask(), enable);
GpioRegisterAccess::from(self.number() as usize).write_out_en(self.mask(), enable);
}

/// Enable input for the pin
Expand All @@ -392,9 +391,6 @@ pub trait Pin: Sealed {
#[doc(hidden)]
fn input_signals(&self, _: private::Internal) -> &[(AlternateFunction, InputSignal)];

#[doc(hidden)]
fn gpio_bank(&self, _: private::Internal) -> GpioRegisterAccess;

#[doc(hidden)]
fn pull_direction(&self, pull: Pull, _: private::Internal) {
let pull_up = pull == Pull::Up;
Expand Down Expand Up @@ -430,7 +426,7 @@ pub trait InputPin: Pin + Into<AnyPin> + 'static {
/// The current state of the input
#[doc(hidden)]
fn is_input_high(&self, _: private::Internal) -> bool {
self.gpio_bank(private::Internal).read_input() & self.mask() != 0
GpioRegisterAccess::from(self.number() as usize).read_input() & self.mask() != 0
}
}

Expand Down Expand Up @@ -483,8 +479,7 @@ pub trait OutputPin: Pin + Into<AnyPin> + 'static {
/// Set the pin's level to high or low
#[doc(hidden)]
fn set_output_high(&mut self, high: bool, _: private::Internal) {
self.gpio_bank(private::Internal)
.write_output(self.mask(), high);
GpioRegisterAccess::from(self.number() as usize).write_output(self.mask(), high);
}

/// Configure the [DriveStrength] of the pin
Expand Down Expand Up @@ -516,7 +511,7 @@ pub trait OutputPin: Pin + Into<AnyPin> + 'static {
/// Is the output set to high
#[doc(hidden)]
fn is_set_high(&self, _: private::Internal) -> bool {
self.gpio_bank(private::Internal).read_output() & self.mask() != 0
GpioRegisterAccess::from(self.number() as usize).read_output() & self.mask() != 0
}
}

Expand Down Expand Up @@ -1042,10 +1037,6 @@ macro_rules! gpio {
$crate::gpio::AnyPin(AnyPinInner::[< Gpio $gpionum >](unsafe { Self::steal() }))
}

fn gpio_bank(&self, _: $crate::private::Internal) -> $crate::gpio::GpioRegisterAccess {
$crate::gpio::GpioRegisterAccess::from($gpionum)
}

fn output_signals(&self, _: $crate::private::Internal) -> &[($crate::gpio::AlternateFunction, $crate::gpio::OutputSignal)] {
&[
$(
Expand Down Expand Up @@ -1976,17 +1967,14 @@ where
/// Clear the interrupt status bit for this Pin
#[inline]
pub fn clear_interrupt(&mut self) {
self.pin
.gpio_bank(private::Internal)
GpioRegisterAccess::from(self.pin.number() as usize)
.write_interrupt_status_clear(1 << (self.pin.number() % 32));
}

/// Checks if the interrupt status bit for this Pin is set
#[inline]
pub fn is_interrupt_set(&self) -> bool {
self.pin
.gpio_bank(private::Internal)
.read_interrupt_status()
GpioRegisterAccess::from(self.pin.number() as usize).read_interrupt_status()
& 1 << (self.pin.number() % 32)
!= 0
}
Expand Down Expand Up @@ -2094,7 +2082,6 @@ impl<P: Pin> Pin for Flex<'_, P> {
fn degrade_pin(&self, _internal: private::Internal) -> AnyPin;
fn output_signals(&self, _internal: private::Internal) -> &[(AlternateFunction, OutputSignal)];
fn input_signals(&self, _internal: private::Internal) -> &[(AlternateFunction, InputSignal)];
fn gpio_bank(&self, _internal: private::Internal) -> GpioRegisterAccess;
}
}
}
Expand Down Expand Up @@ -2168,12 +2155,6 @@ pub(crate) mod internal {
Pin::input_signals(target, private::Internal)
})
}

fn gpio_bank(&self, _: private::Internal) -> GpioRegisterAccess {
handle_gpio_input!(&self.0, target, {
Pin::gpio_bank(target, private::Internal)
})
}
}

impl InputPin for AnyPin {}
Expand Down Expand Up @@ -2373,9 +2354,7 @@ mod asynch {
// do our setup.

// Mark pin as async.
future
.pin
.gpio_bank(private::Internal)
GpioRegisterAccess::from(future.pin.number() as usize)
.async_operations()
.fetch_or(future.pin_mask(), Ordering::Relaxed);

Expand Down Expand Up @@ -2481,15 +2460,14 @@ mod asynch {

impl<P: InputPin> PinFuture<'_, P> {
fn pin_mask(&self) -> u32 {
let bank = self.pin.gpio_bank(private::Internal);
let bank = GpioRegisterAccess::from(self.pin.number() as usize);
1 << (self.pin.number() - bank.offset())
}

fn is_done(&self) -> bool {
// Only the interrupt handler should clear the async bit, and only if the
// specific pin is handling an interrupt.
self.pin
.gpio_bank(private::Internal)
GpioRegisterAccess::from(self.pin.number() as usize)
.async_operations()
.load(Ordering::Acquire)
& self.pin_mask()
Expand Down Expand Up @@ -2529,8 +2507,7 @@ mod asynch {
while self.pin.is_interrupt_set() {}

// Unmark pin as async
self.pin
.gpio_bank(private::Internal)
GpioRegisterAccess::from(self.pin.number() as usize)
.async_operations()
.fetch_and(!self.pin_mask(), Ordering::Relaxed);
}
Expand Down
Loading