From 467f67d2c7182c34dfd7a0c9788bf61f17ef31f3 Mon Sep 17 00:00:00 2001
From: YdrMaster <ydrml@hotmail.com>
Date: Sat, 10 Feb 2024 21:09:57 +0800
Subject: [PATCH] build: remove sbi_spec from deps

Signed-off-by: YdrMaster <ydrml@hotmail.com>
---
 CHANGELOG.md                  |  4 +++-
 Cargo.lock                    |  1 -
 rustsbi-qemu/Cargo.toml       |  1 -
 rustsbi-qemu/src/clint.rs     |  2 +-
 rustsbi-qemu/src/dbcn.rs      |  5 +----
 rustsbi-qemu/src/qemu_test.rs | 11 ++++-------
 6 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1d0d76..25c8b9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,8 +15,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Modified
 
 - Use derive macro based RustSBI interface, with separate functions for legacy stdio
-- Update sbi-testing to version 0.0.1
+- Update rustsbi to version 0.4.0-alpha.1
 - Update sbi-spec to version 0.0.7
+- Update sbi-rt to version 0.0.3
+- Update sbi-testing to version 0.0.1
 - Use crate *fast-trap* version 0.0.1 in rustsbi-qemu for trap handling
 - Use crate *rcore-console* version 0.0.0 in rustsbi-qemu and test-kernel for `print!` and `println!`
 - Use crate *aclint* version 0.0.0 in rustsbi-qemu for aclint structs
diff --git a/Cargo.lock b/Cargo.lock
index c905e35..74925c7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -298,7 +298,6 @@ dependencies = [
  "rcore-console",
  "riscv 0.10.1",
  "rustsbi",
- "sbi-spec",
  "sifive-test-device",
  "spin",
  "uart16550",
diff --git a/rustsbi-qemu/Cargo.toml b/rustsbi-qemu/Cargo.toml
index 27797de..bfe6e97 100644
--- a/rustsbi-qemu/Cargo.toml
+++ b/rustsbi-qemu/Cargo.toml
@@ -18,7 +18,6 @@ edition = "2021"
 
 [dependencies]
 rustsbi = { version = "0.4.0-alpha.1", features = ["machine"] }
-sbi-spec = { version = "0.0.7", features = ["legacy"] }
 riscv = "0.10.1"
 spin = "0.9"
 rcore-console = "0.0.0"
diff --git a/rustsbi-qemu/src/clint.rs b/rustsbi-qemu/src/clint.rs
index a50919b..c106f3e 100644
--- a/rustsbi-qemu/src/clint.rs
+++ b/rustsbi-qemu/src/clint.rs
@@ -4,7 +4,7 @@ use core::{
     ptr::null_mut,
     sync::atomic::{AtomicPtr, Ordering},
 };
-use rustsbi::{spec::binary::SbiRet, HartMask, Ipi, Timer};
+use rustsbi::{HartMask, Ipi, SbiRet, Timer};
 
 pub(crate) struct Clint;
 
diff --git a/rustsbi-qemu/src/dbcn.rs b/rustsbi-qemu/src/dbcn.rs
index d3a21e9..fa96c43 100644
--- a/rustsbi-qemu/src/dbcn.rs
+++ b/rustsbi-qemu/src/dbcn.rs
@@ -1,9 +1,6 @@
 use crate::uart16550;
 use core::ops::Range;
-use rustsbi::{
-    spec::binary::{Physical, SbiRet},
-    Console,
-};
+use rustsbi::{Console, Physical, SbiRet};
 use spin::Once;
 
 pub(crate) struct DBCN(Range<usize>);
diff --git a/rustsbi-qemu/src/qemu_test.rs b/rustsbi-qemu/src/qemu_test.rs
index 532918c..e9ee7a4 100644
--- a/rustsbi-qemu/src/qemu_test.rs
+++ b/rustsbi-qemu/src/qemu_test.rs
@@ -1,12 +1,9 @@
 use rustsbi::{
-    spec::{
-        binary::SbiRet,
-        srst::{
-            RESET_REASON_NO_REASON, RESET_REASON_SYSTEM_FAILURE, RESET_TYPE_COLD_REBOOT,
-            RESET_TYPE_SHUTDOWN, RESET_TYPE_WARM_REBOOT,
-        },
+    spec::srst::{
+        RESET_REASON_NO_REASON, RESET_REASON_SYSTEM_FAILURE, RESET_TYPE_COLD_REBOOT,
+        RESET_TYPE_SHUTDOWN, RESET_TYPE_WARM_REBOOT,
     },
-    Reset,
+    Reset, SbiRet,
 };
 use sifive_test_device::SifiveTestDevice;
 use spin::Once;