From fe97a116df0e6efbc16b964099b28cfa4c6157c1 Mon Sep 17 00:00:00 2001 From: Berkus Decker Date: Sun, 30 Jul 2023 00:30:45 +0300 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=93=A6=20Rename=20GPIO=20regi?= =?UTF-8?q?sters?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- machine/src/platform/rpi3/device_driver/gpio.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/machine/src/platform/rpi3/device_driver/gpio.rs b/machine/src/platform/rpi3/device_driver/gpio.rs index e141d66..14ceb20 100644 --- a/machine/src/platform/rpi3/device_driver/gpio.rs +++ b/machine/src/platform/rpi3/device_driver/gpio.rs @@ -59,8 +59,8 @@ register_structs! { // (0x84 => __reserved_10), // (0x88 => pub AFEN: [ReadWrite; 2]), // (0x90 => __reserved_11), - (0x94 => pub PullUpDown: ReadWrite), // pull up down - (0x98 => pub PUDCLK: [ReadWrite; 2]), + (0x94 => pub PullUpDown: ReadWrite), + (0x98 => pub PullUpDownEnableClock: [ReadWrite; 2]), (0xa0 => @END), } } @@ -130,14 +130,14 @@ impl GPIO { loop_delay(2000); - self.registers.PUDCLK[0].set(0xffff_ffff); - self.registers.PUDCLK[1].set(0xffff_ffff); + self.registers.PullUpDownEnableClock[0].set(0xffff_ffff); + self.registers.PullUpDownEnableClock[1].set(0xffff_ffff); loop_delay(2000); // flush GPIO setup - self.registers.PUDCLK[0].set(0); - self.registers.PUDCLK[1].set(0); + self.registers.PullUpDownEnableClock[0].set(0); + self.registers.PullUpDownEnableClock[1].set(0); } #[cfg(feature = "rpi4")] @@ -217,7 +217,7 @@ impl Pin { loop_delay(2000); - self.registers.PUDCLK[bank].modify(FieldValue::::new( + self.registers.PullUpDownEnableClock[bank].modify(FieldValue::::new( 0b1, off, (pull == PullUpDown::Up).into(), @@ -226,7 +226,7 @@ impl Pin { loop_delay(2000); self.registers.PullUpDown.set(0); - self.registers.PUDCLK[bank].set(0); + self.registers.PullUpDownEnableClock[bank].set(0); } #[cfg(feature = "rpi4")]