136 integrate smoltcp stack

Cargo.toml

@@ -42,6 +42,7 @@ shared = { workspace = true, optional = true }
 synchronization = { workspace = true, optional = true }
 host_bindings = { workspace = true, optional = true }
 bootsplash = { workspace = true, optional = true }
+network = { workspace = true, optional = true }
 
 [features]
 default = []
@@ -68,6 +69,7 @@ host = [
   "dep:synchronization",
   "dep:bootsplash",
   "abi_definitions",
+  "dep:network",
 ]
 abi_definitions = ["dep:abi_definitions"]
 virtual_machine = ["dep:virtual_machine", "dep:host_bindings"]
@@ -138,7 +140,7 @@ embassy-futures = { version = "0.1" }
 embassy-sync = { version = "0.7" }
 embassy-time = { version = "0.5" }
 critical-section = { version = "1.2" }
-embassy-net = { version = "0.7", default-features = false }
+smoltcp = { version = "0.12" }
 linked_list_allocator = { version = "0.10", default-features = false, features = [
   "const_mut_refs",
 ] }

drivers/native/src/devices/window_screen/window.rs

@@ -40,7 +40,7 @@ impl<'a> Window<'a> {
     }
 
     pub fn paste(&mut self) -> Option<()> {
-        if let Some(text) = self.clipboard.get_text().ok() {
+        if let Ok(text) = self.clipboard.get_text() {
             for character in text.chars() {
                 let key = Key::Character(character as u8);
 

drivers/shared/src/devices/hash.rs

@@ -46,7 +46,7 @@ impl BaseOperations for HashDevice {
     fn read(&self, context: &mut Context, buffer: &mut [u8], _: Size) -> Result<usize> {
         let hash_context = context
             .get_private_data_mutable_of_type::<HashDeviceContext>()
-            .ok_or_else(|| file_system::Error::InvalidParameter)?;
+            .ok_or(file_system::Error::InvalidParameter)?;
 
         if buffer.len() < hash_context.hasher.output_size() {
             return Err(Error::InvalidParameter);
@@ -61,7 +61,7 @@ impl BaseOperations for HashDevice {
     fn write(&self, context: &mut Context, buffer: &[u8], _: Size) -> Result<usize> {
         let hash_context = context
             .get_private_data_mutable_of_type::<HashDeviceContext>()
-            .ok_or_else(|| file_system::Error::InvalidParameter)?;
+            .ok_or(file_system::Error::InvalidParameter)?;
 
         hash_context.hasher.update(buffer);
         Ok(buffer.len())
@@ -76,7 +76,7 @@ impl BaseOperations for HashDevice {
     ) -> Result<()> {
         let hash_context = context
             .get_private_data_mutable_of_type::<HashDeviceContext>()
-            .ok_or_else(|| file_system::Error::InvalidParameter)?;
+            .ok_or(file_system::Error::InvalidParameter)?;
 
         match command {
             hash::RESET::IDENTIFIER => {
@@ -96,7 +96,7 @@ impl BaseOperations for HashDevice {
     fn clone_context(&self, context: &Context) -> Result<Context> {
         let hash_context = context
             .get_private_data_of_type::<HashDeviceContext>()
-            .ok_or_else(|| file_system::Error::InvalidParameter)?;
+            .ok_or(file_system::Error::InvalidParameter)?;
 
         Ok(Context::new(Some(hash_context.clone())))
     }

drivers/std/Cargo.toml

@@ -23,6 +23,7 @@ embassy-executor = { workspace = true, default-features = false, features = [
   "arch-std",
   "executor-thread",
 ] }
+smoltcp = { workspace = true, features = ["phy-tuntap_interface"] }
 
 [dev-dependencies]
 little_fs = { workspace = true }

drivers/std/src/io.rs

@@ -5,7 +5,7 @@ pub fn map_error(error: io::Error) -> file_system::Error {
         io::ErrorKind::PermissionDenied => file_system::Error::PermissionDenied,
         io::ErrorKind::NotFound => file_system::Error::NotFound,
         io::ErrorKind::AlreadyExists => file_system::Error::AlreadyExists,
-        io::ErrorKind::InvalidInput => file_system::Error::InvalidPath,
+        io::ErrorKind::InvalidInput => file_system::Error::InvalidParameter,
         io::ErrorKind::InvalidData => file_system::Error::InvalidFile,
         _ => file_system::Error::Unknown,
     }

drivers/std/src/lib.rs

@@ -1,22 +1,14 @@
 #![cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
 
-pub mod network;
-
-pub mod memory;
-
-pub mod io;
-
-pub mod executor;
-
-pub mod log;
-
-pub mod loader;
-
-pub mod drive_file;
-
 pub mod console;
-
 pub mod devices;
+pub mod drive_file;
+pub mod executor;
+pub mod io;
+pub mod loader;
+pub mod log;
+pub mod memory;
+pub mod tuntap;
 
 pub extern crate memory as memory_exported;
 

drivers/std/src/loader.rs

@@ -24,8 +24,8 @@ impl From<io::Error> for Error {
 
 pub type Result<T> = core::result::Result<T, Error>;
 
-pub async fn load_to_virtual_file_system<'a>(
-    virtual_file_system: &'a VirtualFileSystem<'a>,
+pub async fn load_to_virtual_file_system(
+    virtual_file_system: &VirtualFileSystem,
     source_path: impl AsRef<path::Path>,
     destination_path: impl AsRef<Path>,
 ) -> Result<()> {
@@ -89,7 +89,6 @@ mod tests {
             users::get_instance(),
             time::get_instance(),
             file_system,
-            None,
         )
         .unwrap();
 

drivers/std/src/memory.rs

@@ -26,6 +26,12 @@ pub struct MemoryManager {
     regions: CriticalSectionMutex<RefCell<[Region; 2]>>,
 }
 
+impl Default for MemoryManager {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl MemoryManager {
     pub const fn new() -> Self {
         MemoryManager {

drivers/std/src/tuntap/controller.rs

@@ -0,0 +1,38 @@
+use file_system::{
+    ControlCommand, ControlCommandIdentifier, DirectBaseOperations, DirectCharacterDevice, Error,
+    MountOperations,
+};
+use network::{GET_KIND, InterfaceKind};
+use shared::AnyByLayout;
+
+pub struct TunTapControllerDevice;
+
+impl DirectBaseOperations for TunTapControllerDevice {
+    fn read(&self, _: &mut [u8], _: file_system::Size) -> file_system::Result<usize> {
+        Err(Error::UnsupportedOperation)
+    }
+
+    fn write(&self, _: &[u8], _: file_system::Size) -> file_system::Result<usize> {
+        Err(Error::UnsupportedOperation)
+    }
+
+    fn control(
+        &self,
+        command: ControlCommandIdentifier,
+        _: &AnyByLayout,
+        output: &mut AnyByLayout,
+    ) -> file_system::Result<()> {
+        match command {
+            GET_KIND::IDENTIFIER => {
+                let kind = GET_KIND::cast_output(output)?;
+                *kind = InterfaceKind::Ethernet;
+                Ok(())
+            }
+            _ => Err(Error::UnsupportedOperation),
+        }
+    }
+}
+
+impl MountOperations for TunTapControllerDevice {}
+
+impl DirectCharacterDevice for TunTapControllerDevice {}