Merge pull request #9 from lxuxx/develop

Add gpio and its test.

Author: lxuxx

Cargo.lock

@@ -33,6 +33,7 @@ embedded-io = "0.6.1"
 fugit = "0.3.7"
 proposed-traits = { git = "https://github.com/rusty1968/proposed_traits.git", package = "proposed-traits", rev = "85641310df5a5276c67f81621b104322cff0286c" }
 hex-literal = "0.4"
+paste = "1.0"
 
 cortex-m = { version = "0.7.5" }
 cortex-m-rt = { version = "0.6.5", features = ["device"] }

Cargo.toml

@@ -3,7 +3,6 @@
 #![no_std]
 #![no_main]
 
-use aspeed_ddk::gpio::{gpiol, GpioExt};
 use core::sync::atomic::AtomicBool;
 // use core::arch::asm;
 use aspeed_ddk::uart::{Config, UartController};
@@ -16,10 +15,10 @@ use aspeed_ddk::hace_controller::HaceController;
 use aspeed_ddk::rsa::AspeedRsa;
 use aspeed_ddk::spi;
 use aspeed_ddk::syscon::{ClockId, ResetId, SysCon};
-use embedded_hal::digital::OutputPin;
 use fugit::MillisDurationU32 as MilliSeconds;
 
 use aspeed_ddk::tests::functional::ecdsa_test::run_ecdsa_tests;
+use aspeed_ddk::tests::functional::gpio_test;
 use aspeed_ddk::tests::functional::hash_test::run_hash_tests;
 use aspeed_ddk::tests::functional::hmac_test::run_hmac_tests;
 use aspeed_ddk::tests::functional::rsa_test::run_rsa_tests;
@@ -97,26 +96,6 @@ fn test_wdt(uart: &mut UartController<'_>) {
     }
 }
 
-fn test_gpio_flash_power(uart: &mut UartController<'_>) {
-    let mut delay = DummyDelay {};
-    if true {
-        /* Older demo board required this */
-        let peripherals = unsafe { Peripherals::steal() };
-        let gpio = peripherals.gpio;
-        let gpiol = gpiol::GPIOL::new(gpio).split();
-        uart.write_all(b"\r\n####### GPIO test #######\r\n")
-            .unwrap();
-
-        let mut pl2 = gpiol.pl2.into_push_pull_output();
-        pl2.set_high().unwrap();
-        uart.write_all(b"\r\nGPIOL2 set high\r\n").unwrap();
-        let mut pl3 = gpiol.pl3.into_push_pull_output();
-        pl3.set_high().unwrap();
-        uart.write_all(b"\r\nGPIOL3 set high\r\n").unwrap();
-        delay.delay_ns(1_000_000);
-    }
-}
-
 #[no_mangle]
 pub static HALT: AtomicBool = AtomicBool::new(true);
 
@@ -184,15 +163,15 @@ fn main() -> ! {
 
     let mut rsa = AspeedRsa::new(&secure, delay);
     run_rsa_tests(&mut uart_controller, &mut rsa);
-
+    gpio_test::test_gpioa(&mut uart_controller);
     test_wdt(&mut uart_controller);
 
     let test_spicontroller = false;
     if test_spicontroller {
         spi::spitest::test_fmc(&mut uart_controller);
         spi::spitest::test_spi(&mut uart_controller);
 
-        test_gpio_flash_power(&mut uart_controller);
+        gpio_test::test_gpio_flash_power(&mut uart_controller);
         spi::spitest::test_spi2(&mut uart_controller);
     }
     // Initialize the peripherals here if needed