From f577370ee7ec5f097668d662d663def8472835d5 Mon Sep 17 00:00:00 2001
From: Paul Pan <i@0x7f.app>
Date: Sun, 5 May 2024 21:28:34 +0800
Subject: [PATCH] chore: rename api to uapi

---
 Cargo.lock                    | 18 +++++++++---------
 Cargo.toml                    |  2 +-
 kernel/Cargo.toml             |  2 +-
 kernel/src/objects/cap.rs     |  2 +-
 kernel/src/objects/cnode.rs   |  2 +-
 kernel/src/objects/mod.rs     |  8 ++++----
 kernel/src/objects/null.rs    |  2 +-
 kernel/src/objects/untyped.rs |  4 ++--
 {api => uapi}/Cargo.toml      |  2 +-
 {api => uapi}/src/cap.rs      |  0
 {api => uapi}/src/error.rs    |  0
 {api => uapi}/src/lib.rs      |  0
 12 files changed, 21 insertions(+), 21 deletions(-)
 rename {api => uapi}/Cargo.toml (90%)
 rename {api => uapi}/src/cap.rs (100%)
 rename {api => uapi}/src/error.rs (100%)
 rename {api => uapi}/src/lib.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index e0ecf01..11e9542 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -18,14 +18,6 @@ dependencies = [
  "vspace",
 ]
 
-[[package]]
-name = "api"
-version = "0.1.0"
-dependencies = [
- "num-derive",
- "num-traits",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.2.0"
@@ -105,7 +97,6 @@ name = "kernel"
 version = "0.1.0"
 dependencies = [
  "allocator",
- "api",
  "bitflags 2.5.0",
  "cfg-if",
  "fdt",
@@ -116,6 +107,7 @@ dependencies = [
  "sbi-rt",
  "spin",
  "static_assertions",
+ "uapi",
  "uart_16550",
  "utils",
  "vspace",
@@ -256,6 +248,14 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "uapi"
+version = "0.1.0"
+dependencies = [
+ "num-derive",
+ "num-traits",
+]
+
 [[package]]
 name = "uart_16550"
 version = "0.3.0"
diff --git a/Cargo.toml b/Cargo.toml
index e6587af..e969c41 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["api", "kernel", "lib/*"]
+members = ["kernel", "lib/*", "uapi"]
 
 [profile.dev]
 panic = "abort"
diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
index 7d5f8b9..467fbaa 100644
--- a/kernel/Cargo.toml
+++ b/kernel/Cargo.toml
@@ -20,8 +20,8 @@ riscv = []
 "riscv.board.virt" = ["riscv.riscv64"]
 
 [dependencies]
+uapi = { path = "../uapi" }
 allocator = { path = "../lib/allocator" }
-api = { path = "../api" }
 utils = { path = "../lib/utils", default-features = false }
 vspace = { path = "../lib/vspace", default-features = false }
 
diff --git a/kernel/src/objects/cap.rs b/kernel/src/objects/cap.rs
index 5fc2330..53610f4 100644
--- a/kernel/src/objects/cap.rs
+++ b/kernel/src/objects/cap.rs
@@ -1,6 +1,6 @@
 use crate::objects::null::NullCap;
-use api::cap::ObjectType;
 use core::cell::Cell;
+use uapi::cap::ObjectType;
 use utils::{
     linked_list::{Link, LinkHelper},
     LinkHelperImpl,
diff --git a/kernel/src/objects/cnode.rs b/kernel/src/objects/cnode.rs
index f810946..11fea75 100644
--- a/kernel/src/objects/cnode.rs
+++ b/kernel/src/objects/cnode.rs
@@ -3,7 +3,7 @@ use super::{
     Cap, KernelObject,
 };
 use crate::arch::layout::mmap_phys_to_virt;
-use api::{cap::ObjectType, error::CapFault};
+use uapi::{cap::ObjectType, error::CapFault};
 use utils::MASK;
 use vspace::addr::{AddressOps, PhysAddr};
 
diff --git a/kernel/src/objects/mod.rs b/kernel/src/objects/mod.rs
index cc518e4..cb5c4e8 100644
--- a/kernel/src/objects/mod.rs
+++ b/kernel/src/objects/mod.rs
@@ -14,12 +14,12 @@
 
 */
 
-use api::{
+use cap::CapEntry;
+use core::{marker::PhantomData, ptr::NonNull};
+use uapi::{
     cap::ObjectType,
     error::{SysError, SysResult},
 };
-use cap::CapEntry;
-use core::{marker::PhantomData, ptr::NonNull};
 
 pub mod cap;
 pub mod cnode;
@@ -51,7 +51,7 @@ impl<'a, T: KernelObject + ?Sized> TryFrom<&'a CapEntry> for Cap<'a, T> {
 
 impl<'a, T: KernelObject + ?Sized> Cap<'a, T> {
     pub fn append(&mut self, new: &mut CapEntry) {
-        let next = self.cte.link.next();
+        let next = self.cte.link.next_raw();
 
         // update new cap's link
         new.link.set_prev(Some(NonNull::from(self.cte)));
diff --git a/kernel/src/objects/null.rs b/kernel/src/objects/null.rs
index 858428a..ac81401 100644
--- a/kernel/src/objects/null.rs
+++ b/kernel/src/objects/null.rs
@@ -1,6 +1,6 @@
 use super::cap::RawCap;
 use super::{Cap, KernelObject};
-use api::cap::ObjectType;
+use uapi::cap::ObjectType;
 use vspace::addr::PhysAddr;
 
 /// NullObject is used as empty (capability) slot
diff --git a/kernel/src/objects/untyped.rs b/kernel/src/objects/untyped.rs
index ae32717..e8b2082 100644
--- a/kernel/src/objects/untyped.rs
+++ b/kernel/src/objects/untyped.rs
@@ -2,8 +2,8 @@ use super::cap::RawCap;
 use super::cnode::{CNodeCap, CNodeObject};
 use super::null::NullCap;
 use super::{Cap, KernelObject};
-use api::cap::ObjectType;
-use api::error::{SysError, SysResult};
+use uapi::cap::ObjectType;
+use uapi::error::{SysError, SysResult};
 use utils::then::Then;
 use utils::MASK;
 use vspace::addr::{align_up, PhysAddr};
diff --git a/api/Cargo.toml b/uapi/Cargo.toml
similarity index 90%
rename from api/Cargo.toml
rename to uapi/Cargo.toml
index d99c64d..4e9f8fb 100644
--- a/api/Cargo.toml
+++ b/uapi/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "api"
+name = "uapi"
 version = "0.1.0"
 edition = "2021"
 
diff --git a/api/src/cap.rs b/uapi/src/cap.rs
similarity index 100%
rename from api/src/cap.rs
rename to uapi/src/cap.rs
diff --git a/api/src/error.rs b/uapi/src/error.rs
similarity index 100%
rename from api/src/error.rs
rename to uapi/src/error.rs
diff --git a/api/src/lib.rs b/uapi/src/lib.rs
similarity index 100%
rename from api/src/lib.rs
rename to uapi/src/lib.rs