GPIO test functions moved out of main.

Author: lxuxx

src/main.rs

@@ -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,7 +15,6 @@ 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;
@@ -98,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);
 
@@ -193,7 +171,7 @@ fn main() -> ! {
         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

src/tests/functional/gpio_test.rs

@@ -55,8 +55,8 @@ pub fn test_gpioa(uart: &mut UartController<'_>) {
             .unwrap();
     }
 }
-#[allow(dead_code)]
-fn test_gpio_flash_power(uart: &mut UartController<'_>) {
+
+pub fn test_gpio_flash_power(uart: &mut UartController<'_>) {
     let mut delay = DummyDelay {};
     if true {
         /* Older demo board required this */
@@ -76,7 +76,7 @@ fn test_gpio_flash_power(uart: &mut UartController<'_>) {
     }
 }
 #[allow(dead_code)]
-fn test_gpio_bmc_reset(uart: &mut UartController<'_>) {
+pub fn test_gpio_bmc_reset(uart: &mut UartController<'_>) {
     {
         let peripherals = unsafe { Peripherals::steal() };
         let gpio = peripherals.gpio;