fix: remove myfs and fix some ci problem

Author: Josen-B

Cargo.lock

@@ -22,7 +22,6 @@ fs = ["dep:axfs", "dep:axdriver", "axfeat/fs"]
 net = ["dep:axnet", "dep:axdriver", "axfeat/net"]
 display = ["dep:axdisplay", "dep:axdriver", "axfeat/display"]
 
-myfs = ["axfeat/fs"]
 
 # Use dummy functions if the feature is not enabled
 dummy-if-not-enabled = []

api/arceos_api/Cargo.toml

@@ -9,8 +9,6 @@ pub use axfs::fops::FileType as AxFileType;
 pub use axfs::fops::OpenOptions as AxOpenOptions;
 pub use axio::SeekFrom as AxSeekFrom;
 
-#[cfg(feature = "myfs")]
-pub use axfs::dev::Disk as AxDisk;
 
 /// A handle to an opened file.
 pub struct AxFileHandle(File);

api/arceos_api/src/imp/fs.rs

@@ -192,8 +192,6 @@ pub mod fs {
         pub type AxFilePerm;
         pub type AxDirEntry;
         pub type AxSeekFrom;
-        #[cfg(feature = "myfs")]
-        pub type AxDisk;
     }
 
     define_api! {

api/arceos_api/src/lib.rs

@@ -22,7 +22,6 @@
 //!     - `sched-cfs`: Use the Completely Fair Scheduler (CFS) preemptive scheduler.
 //! - Upperlayer stacks (fs, net, display)
 //!     - `fs`: Enable file system support.
-//!     - `myfs`: Allow users to define their custom filesystems to override the default.
 //!     - `net`: Enable networking support.
 //!     - `display`: Enable graphics support.
 //! - Device drivers

api/axfeat/src/lib.rs

@@ -7,16 +7,7 @@ authors = ["Yuekai Jia <equation618@gmail.com>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
-use-ramfs = [
-    "axstd/myfs",
-    "dep:axfs_vfs",
-    "dep:axfs_ramfs",
-    "dep:crate_interface",
-]
 default = []
 
 [dependencies]
-axfs_vfs = { version = "0.1", optional = true }
-axfs_ramfs = { version = "0.1", optional = true }
-crate_interface = { workspace = true, optional = true }
-axstd = { workspace = true, features = ["alloc", "fs"], optional = true }
+axstd = { workspace = true, features = ["alloc", "fs"], optional = true }

examples/shell/Cargo.toml

@@ -302,4 +302,4 @@ fn split_whitespace(str: &str) -> (&str, &str) {
     let str = str.trim();
     str.find(char::is_whitespace)
         .map_or((str, ""), |n| (&str[..n], str[n + 1..].trim()))
-}
+}

examples/shell/src/cmd.rs

@@ -17,9 +17,6 @@ fn path_to_str(path: &str) -> &str {
 
 mod cmd;
 
-#[cfg(feature = "use-ramfs")]
-mod ramfs;
-
 use std::io::prelude::*;
 
 const LF: u8 = b'\n';
@@ -79,4 +76,4 @@ fn main() {
             }
         }
     }
-}
+}

examples/shell/src/main.rs

@@ -74,7 +74,7 @@ pub fn init_filesystems(mut blk_devs: AxDeviceContainer<AxBlockDevice>, bootargs
 
 #[cfg(feature = "monolitic")]
 /// Initializes filesystems in monolithic mode.
-pub fn init_filesystems(mut block_devs: AxDeviceContainer<AxBlockDevice>) {
+pub fn init_filesystems(mut block_devs: AxDeviceContainer<AxBlockDevice>, _bootargs: Option<&str>) {
     info!("Initialize filesystem subsystem...");
 
     let dev = block_devs.take_one().expect("No block device found!");