Merge pull request #132 from rust-wii/feat/ios/fs

✨ IOS Filesystem Ioctls and Helpers

Author: ProfElements

examples/ios/Cargo.lock

@@ -1,47 +1,31 @@
 #![no_std]
-#![feature(start)]
+#![no_main]
 
 use alloc::vec;
 use ogc_rs::{
     ios::{self, Mode, SeekMode},
     print, println,
 };
-
 extern crate alloc;
 
-#[start]
-fn main(_argc: isize, _argv: *const *const u8) -> isize {
-    // Try to open SYSCONF
+#[no_mangle]
+extern "C" fn main() {
     if let Ok(fd) = ios::open(c"/shared2/sys/SYSCONF", Mode::Read) {
-        // Try to grab size or default to 0;
-        const GET_FILE_STATS: i32 = 11;
-        let mut out_buf = [0u8; 8];
-        let (size, seek_pos) = if ios::ioctl(fd, GET_FILE_STATS, &[], &mut out_buf).is_ok() {
-            (
-                usize::try_from(u32::from_be_bytes(out_buf[0..4].try_into().unwrap())).unwrap(),
-                usize::try_from(u32::from_be_bytes(out_buf[4..8].try_into().unwrap())).unwrap(),
-            )
-        } else {
-            (0usize, 0usize)
-        };
-        println!("{:?}, {:?}", size, seek_pos);
-
-        if seek_pos != 0 {
-            // Try to seek to the start
-            let _ = ios::seek(fd, 0, SeekMode::Start);
-        }
+        if let Ok(metadata) = ios::fs::get_file_stats_from_fd(fd) {
+            if metadata.offset() != 0 {
+                let _ = ios::seek(fd, 0, SeekMode::Start);
+            }
 
-        let mut bytes = vec![0; size];
-        if let Ok(bytes_read) = ios::read(fd, &mut bytes) {
-            // SAFETY:  I read this much bytes
-            unsafe { bytes.set_len(bytes_read.try_into().unwrap()) };
-        };
+            let mut bytes = vec![0; metadata.size()];
+            if let Ok(bytes_read) = ios::read(fd, &mut bytes) {
+                unsafe { bytes.set_len(bytes_read.try_into().unwrap()) };
+            }
 
-        println!("{:?}", bytes);
+            println!("{:?}", bytes);
 
-        let _ = ios::close(fd);
+            let _ = ios::close(fd);
+        }
     }
-
     loop {
         core::hint::spin_loop();
     }

examples/ios/src/main.rs

@@ -9,6 +9,11 @@ use core::{ffi::CStr, fmt::Display};
 /// This is only on the system when running the Dolphin Emulator
 pub mod dolphin;
 
+/// Filesystem IOS Device
+///
+/// '/dev/fs'' device helper functions.
+pub mod fs;
+
 #[repr(u32)]
 /// Interprocess Control / IOS File Mode
 pub enum Mode {
@@ -35,6 +40,30 @@ impl From<Mode> for u32 {
     }
 }
 
+impl From<Mode> for u8 {
+    fn from(value: Mode) -> Self {
+        match value {
+            Mode::None => 0,
+            Mode::Read => 1,
+            Mode::Write => 2,
+            Mode::ReadWrite => 3,
+        }
+    }
+}
+
+impl TryFrom<u8> for Mode {
+    type Error = ();
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
+        match value {
+            0 => Ok(Mode::None),
+            1 => Ok(Mode::Read),
+            2 => Ok(Mode::Write),
+            3 => Ok(Mode::ReadWrite),
+            _ => Err(()),
+        }
+    }
+}
+
 #[repr(i32)]
 #[derive(Copy, Clone, Debug)]
 /// Interprocess Control / IOS Errors