[board] small fix and code cleanup for 100ask-d1-h-rs

Signed-off-by: DongQing <placebo27@hust.edu.cn>
YuzukiHD · Sep 24, 2024 · ef24c9f · ef24c9f
1 parent 42b2edd
commit ef24c9f
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,8 @@
 [workspace]
 resolver = "2"
-members = ["board/100ask-d1-h-rs", "board/100ask-d1-h-rs/xtask"]
+members = [
+    "board/100ask-d1-h-rs",
+    "board/100ask-d1-h-rs/macros",
+    "board/100ask-d1-h-rs/xtask",
+]
 default-members = ["board/100ask-d1-h-rs/xtask"]
diff --git a/board/100ask-d1-h-rs/src/bin/init-dram.rs b/board/100ask-d1-h-rs/src/bin/init-dram.rs
@@ -1,7 +1,7 @@
 #![no_std]
 #![no_main]
 use panic_halt as _;
-use syterkit_100ask_d1_h::{mctl, println, entry, Clocks, Peripherals};
+use syterkit_100ask_d1_h::{entry, mctl, println, Clocks, Peripherals};
 
 #[entry]
 fn main(p: Peripherals, c: Clocks) {

diff --git a/board/100ask-d1-h-rs/src/lib.rs b/board/100ask-d1-h-rs/src/lib.rs
@@ -79,7 +79,7 @@ macro_rules! print {
 
 #[macro_export]
 macro_rules! println {
-    () => ($crate::print!("\n"));
+    () => ($crate::print!("\r\n"));
     ($($arg:tt)*) => {{
         $crate::_print(core::format_args!($($arg)*));
         $crate::println!();