Adapt examples to RISC-V rework

Author: romancardenas

e310x-hal/Cargo.toml

@@ -17,7 +17,7 @@ embedded-io = "0.6.1"
 e310x = { path = "../e310x", version = "0.12.0", features = ["rt", "critical-section"] }
 nb = "1.0.0"
 portable-atomic = { version = "1.9", default-features = false}
-riscv = { version = "0.12.1", features = ["critical-section-single-hart"] }
+riscv = { version = "0.14.0", features = ["critical-section-single-hart"] }
 
 [features]
 g002 = ["e310x/g002"]

e310x/Cargo.toml

@@ -12,12 +12,9 @@ edition = "2021"
 
 [dependencies]
 critical-section = { version = "1.2.0", optional = true }
-riscv = { git = "https://github.com/rust-embedded/riscv.git", branch = "riscv-peripheral-rework" }
-riscv-peripheral = { git = "https://github.com/rust-embedded/riscv.git", branch = "riscv-peripheral-rework" }
-riscv-rt = { git = "https://github.com/rust-embedded/riscv.git", branch = "riscv-peripheral-rework", features = ["no-interrupts"], optional = true }
-# riscv = "0.13.0"
-# riscv-peripheral = "0.2.0"
-# riscv-rt = { version = "0.14.0", features = ["no-interrupts"], optional = true }
+riscv = "0.14.0"
+riscv-peripheral = "0.3.0"
+riscv-rt = { version = "0.15.0", features = ["no-interrupts"], optional = true }
 vcell = "0.1.3"
 
 [features]

hifive1-examples/Cargo.toml

@@ -15,12 +15,11 @@ rust-version = "1.72"
 [dependencies]
 critical-section = { version = "1.2.0" }
 hifive1 = { path = "../hifive1", version = "0.13.0", features = ["board-hifive1-revb"] } # Change to your board
-riscv = { version = "0.13.0" }
-riscv-rt = { version = "0.14.0", features = ["single-hart"] }
+riscv = { version = "0.14.0" }
+riscv-rt = { version = "0.15.0", features = ["single-hart"] }
 panic-halt = "1.0.0"
 semihosting = { version = "0.1",  features = ["stdio", "panic-handler"] }
-# max3010x = "0.2.0" # TODO uncomment when the driver is published
-max3010x = { git = "https://github.com/eldruin/max3010x-rs.git" }
+max3010x = "0.2.0"
 mfrc522 = "0.8.0"
 
 [features]

hifive1-examples/examples/button_poll.rs

@@ -1,4 +1,4 @@
-//! Example of polling a button and turning on a LED when the button is pressed.
+//! Example of polling a button and turning on an LED when the button is pressed.
 //!
 //! # Hardware
 //!
@@ -10,22 +10,23 @@
 
 use hifive1::{
     clock,
-    hal::{e310x::CLINT, prelude::*, DeviceResources},
-    pin, sprintln, Led,
+    hal::{prelude::*, DeviceResources},
+    pin, sprintln, stdout, Led,
 };
 extern crate panic_halt;
 
 #[riscv_rt::entry]
 fn main() -> ! {
     let dr = DeviceResources::take().unwrap();
+    let cp = dr.core_peripherals;
     let p = dr.peripherals;
     let pins = dr.pins;
 
     // Configure clocks
     let clocks = clock::configure(p.PRCI, p.AONCLK, 320.mhz().into());
 
     // Configure UART for stdout
-    hifive1::stdout::configure(
+    stdout::configure(
         p.UART0,
         pin!(pins, uart0_tx),
         pin!(pins, uart0_rx),
@@ -40,8 +41,8 @@ fn main() -> ! {
     let pin = pin!(pins, led_blue);
     let mut led = pin.into_inverted_output();
 
-    // Get the sleep struct from CLINT
-    let mut sleep = CLINT::delay();
+    // Get the MTIMER peripheral from CLINT
+    let mut mtimer = cp.clint.mtimer();
 
     const STEP: u32 = 1000; // 1s
     loop {
@@ -53,6 +54,6 @@ fn main() -> ! {
             led.off();
         }
         sprintln!("LED is on: {}", led.is_on());
-        sleep.delay_ms(STEP);
+        mtimer.delay_ms(STEP);
     }
 }

hifive1-examples/examples/hello_world.rs

@@ -1,15 +1,13 @@
-//! Prints "hello world!" to the host console.
-//!
-//! If "semihosting" feature is enabled, the message is printed using semihosting.
-//! Otherwise, the message is printed using the UART0 peripheral.
+//! Prints "hello world!" to the host console using the UART0 peripheral.
 
 #![no_std]
 #![no_main]
 
 extern crate panic_halt;
 use hifive1::{
+    clock,
     hal::{prelude::*, DeviceResources},
-    pin, sprintln as println,
+    pin, sprintln, stdout,
 };
 
 #[riscv_rt::entry]
@@ -19,18 +17,18 @@ fn main() -> ! {
     let pins = dr.pins;
 
     // Configure clocks
-    let clocks = hifive1::clock::configure(p.PRCI, p.AONCLK, 320.mhz().into());
+    let clocks = clock::configure(p.PRCI, p.AONCLK, 320.mhz().into());
 
     // Configure UART for stdout
-    hifive1::stdout::configure(
+    stdout::configure(
         p.UART0,
         pin!(pins, uart0_tx),
         pin!(pins, uart0_rx),
         115_200.bps(),
         clocks,
     );
 
-    println!("Hello, world!");
+    sprintln!("Hello, world!");
     loop {
         riscv::asm::wfi();
     }

hifive1-examples/examples/i2c_max3010x.rs

@@ -7,7 +7,6 @@
 use hifive1::{
     clock,
     hal::{
-        e310x::CLINT,
         i2c::{I2c, Speed},
         prelude::*,
         DeviceResources,
@@ -20,6 +19,7 @@ extern crate panic_halt;
 #[riscv_rt::entry]
 fn main() -> ! {
     let dr = DeviceResources::take().unwrap();
+    let cp = dr.core_peripherals;
     let p = dr.peripherals;
     let pins = dr.pins;
 
@@ -50,12 +50,12 @@ fn main() -> ! {
 
     let mut data = [0; 3];
 
-    // Get the sleep struct from CLINT
-    let mut sleep = CLINT::delay();
+    // Get the MTIMER peripheral from CLINT
+    let mut mtimer = cp.clint.mtimer();
     const STEP: u32 = 1000; // 1s
     loop {
         let samples_read = sensor.read_fifo(&mut data).unwrap();
         sprintln!("Samples read: {}", samples_read);
-        sleep.delay_ms(STEP);
+        mtimer.delay_ms(STEP);
     }
 }

hifive1-examples/examples/led_blink.rs

@@ -1,27 +1,28 @@
-//! Basic blinking LEDs example using mtime/mtimecmp registers for "sleep" in a loop.
-//! Blinks each led once and goes to the next one.
+//! Basic blinking LED example using mtime/mtimecmp registers for "sleep" in a loop.
+//! Blinks the blue LED of RED-V board.
 
 #![no_std]
 #![no_main]
 
 use hifive1::{
     clock,
-    hal::{e310x::CLINT, prelude::*, DeviceResources},
-    pin, sprintln, Led,
+    hal::{prelude::*, DeviceResources},
+    pin, sprintln, stdout, Led,
 };
 extern crate panic_halt;
 
 #[riscv_rt::entry]
 fn main() -> ! {
     let dr = DeviceResources::take().unwrap();
+    let cp = dr.core_peripherals;
     let p = dr.peripherals;
     let pins = dr.pins;
 
     // Configure clocks
     let clocks = clock::configure(p.PRCI, p.AONCLK, 320.mhz().into());
 
     // Configure UART for stdout
-    hifive1::stdout::configure(
+    stdout::configure(
         p.UART0,
         pin!(pins, uart0_tx),
         pin!(pins, uart0_rx),
@@ -33,13 +34,13 @@ fn main() -> ! {
     let pin = pin!(pins, led_blue);
     let mut led = pin.into_inverted_output();
 
-    // Get the sleep struct from CLINT
-    let mut sleep = CLINT::delay();
+    // Get the MTIMER peripheral from CLINT
+    let mut mtimer = cp.clint.mtimer();
 
     const STEP: u32 = 1000; // 1s
     loop {
         Led::toggle(&mut led);
         sprintln!("LED toggled. New state: {}", led.is_on());
-        sleep.delay_ms(STEP);
+        mtimer.delay_ms(STEP);
     }
 }

hifive1-examples/examples/led_pwm.rs

@@ -9,22 +9,23 @@
 
 use hifive1::{
     clock,
-    hal::{e310x::CLINT, prelude::*, DeviceResources},
-    pin, sprintln,
+    hal::{prelude::*, DeviceResources},
+    pin, sprintln, stdout,
 };
 extern crate panic_halt;
 
 #[riscv_rt::entry]
 fn main() -> ! {
     let dr = DeviceResources::take().unwrap();
+    let cp = dr.core_peripherals;
     let p = dr.peripherals;
     let pins = dr.pins;
 
     // Configure clocks
     let clocks = clock::configure(p.PRCI, p.AONCLK, 320.mhz().into());
 
     // Configure UART for stdout
-    hifive1::stdout::configure(
+    stdout::configure(
         p.UART0,
         pin!(pins, uart0_tx),
         pin!(pins, uart0_rx),
@@ -40,8 +41,8 @@ fn main() -> ! {
 
     let mut channel = pwm0.channel(pin);
 
-    // Get the sleep struct from CLINT
-    let mut sleep = CLINT::delay();
+    // Get the MTIMER peripheral from CLINT
+    let mut mtimer = cp.clint.mtimer();
 
     const STEP: u32 = 1000; // 1s
     const DUTY_DELTA: u8 = 32;
@@ -52,6 +53,6 @@ fn main() -> ! {
         channel.set_duty_cycle(duty as u16).unwrap();
         duty = duty.wrapping_add(DUTY_DELTA);
 
-        sleep.delay_ms(STEP);
+        mtimer.delay_ms(STEP);
     }
 }

hifive1-examples/examples/rgb_blink.rs

@@ -6,22 +6,23 @@
 
 use hifive1::{
     clock,
-    hal::{e310x::CLINT, prelude::*, DeviceResources},
-    pin, pins, sprintln, Led,
+    hal::{prelude::*, DeviceResources},
+    pin, pins, sprintln, stdout, Led,
 };
 extern crate panic_halt;
 
 #[riscv_rt::entry]
 fn main() -> ! {
     let dr = DeviceResources::take().unwrap();
+    let cp = dr.core_peripherals;
     let p = dr.peripherals;
     let pins = dr.pins;
 
     // Configure clocks
     let clocks = clock::configure(p.PRCI, p.AONCLK, 320.mhz().into());
 
     // Configure UART for stdout
-    hifive1::stdout::configure(
+    stdout::configure(
         p.UART0,
         pin!(pins, uart0_tx),
         pin!(pins, uart0_rx),
@@ -35,15 +36,15 @@ fn main() -> ! {
     // get leds as the Led trait in an array so we can index them
     let mut ileds: [&mut dyn Led; 3] = [&mut tleds.0, &mut tleds.1, &mut tleds.2];
 
-    // Get the sleep struct from CLINT
-    let mut sleep = CLINT::delay();
+    // Get the MTIMER peripheral from CLINT
+    let mut mtimer = cp.clint.mtimer();
 
     const STEP: u32 = 1000; // 1s
     loop {
         for (i, led) in ileds.iter_mut().enumerate() {
             led.toggle().unwrap();
             sprintln!("LED {} toggled. New state: {}", i, led.is_on());
-            sleep.delay_ms(STEP);
+            mtimer.delay_ms(STEP);
         }
     }
 }

hifive1-examples/examples/sh_led_blink.rs

@@ -6,26 +6,27 @@
 
 use hifive1::{
     clock,
-    hal::{e310x::CLINT, prelude::*, DeviceResources},
+    hal::{prelude::*, DeviceResources},
     pin, Led,
 };
 use semihosting::{println, process::exit};
 
 #[riscv_rt::entry]
 fn main() -> ! {
     let dr = DeviceResources::take().unwrap();
+    let cp = dr.core_peripherals;
     let p = dr.peripherals;
     let pins = dr.pins;
 
     // Configure clocks
-    let clocks = clock::configure(p.PRCI, p.AONCLK, 320.mhz().into());
+    clock::configure(p.PRCI, p.AONCLK, 320.mhz().into());
 
     // get all 3 led pins in a tuple (each pin is it's own type here)
     let pin = pin!(pins, led_blue);
     let mut led = pin.into_inverted_output();
 
-    // Get the sleep struct from CLINT
-    let mut sleep = CLINT::delay();
+    // Get the MTIMER peripheral from CLINT
+    let mut mtimer = cp.clint.mtimer();
 
     const N_TOGGLE: usize = 4;
     const STEP: u32 = 500; // 500 ms
@@ -34,7 +35,7 @@ fn main() -> ! {
     for _ in 0..N_TOGGLE {
         Led::toggle(&mut led);
         println!("LED toggled. New state: {}", led.is_on());
-        sleep.delay_ms(STEP);
+        mtimer.delay_ms(STEP);
     }
     println!("Done toggling LED");
     exit(0);