changed syscall return value from i64 to isize

os/kernel/src/syscall/sys_naming.rs

@@ -21,7 +21,7 @@ pub fn sys_mkentry(
     name_buff: *const u8,
     name_buff_len: usize,
     data: usize,
-) -> i64 {
+) -> isize {
     let path = from_utf8(unsafe {
         slice_from_raw_parts(path_buff, path_buff_len)
             .as_ref()

os/library/naming/src/lib.rs

@@ -10,7 +10,7 @@
 
 use syscall::{return_vals::Errno, syscall, SystemCall};
 
-pub fn mkentry(path: &str, name: &str, data: usize) -> Result<u64, Errno> {
+pub fn mkentry(path: &str, name: &str, data: usize) -> Result<usize, Errno> {
     // Check if params are valid
     if path.is_empty() || name.is_empty() {
         Err(Errno::EINVAL) // Abort, if not

os/library/syscall/src/lib.rs

@@ -3,7 +3,7 @@
    ╟─────────────────────────────────────────────────────────────────────────╢
    ║ Descr.: Syscall interface in user mode.                                 ║
    ╟─────────────────────────────────────────────────────────────────────────╢
-   ║ Author: Fabian Ruhland, Michael Schoettner, 30.8.2024, HHU              ║
+   ║ Author: Fabian Ruhland, Michael Schoettner, 10.09.2024, HHU             ║
    ╚═════════════════════════════════════════════════════════════════════════╝
 */
 #![no_std]
@@ -49,7 +49,7 @@ pub const NUM_SYSCALLS: usize = SystemCall::LastEntryMarker as usize;
 ///    success >= 0 \
 ///    error, codes defined in consts.rs 
 pub fn syscall(call: SystemCall, args: &[usize]) -> SyscallResult {
-    let ret_code: i64;
+    let ret_code: isize;
 
     if args.len() > 6 {
         panic!("System calls with more than 6 params are not supported.");
@@ -77,5 +77,5 @@ pub fn syscall(call: SystemCall, args: &[usize]) -> SyscallResult {
             clobber_abi("system"));
     }
 
-    convert_ret_code_to_syscall_result(ret_code)
+    convert_ret_code_to_syscall_result(ret_code.try_into().unwrap())
 }

os/library/syscall/src/return_vals.rs

@@ -3,7 +3,7 @@
    ╟─────────────────────────────────────────────────────────────────────────╢
    ║ Descr.: Consts and types for syscall return values.                     ║
    ╟─────────────────────────────────────────────────────────────────────────╢
-   ║ Author: Michael Schoettner, 31.8.2024, HHU                              ║
+   ║ Author: Michael Schoettner, 10.09.2024, HHU                             ║
    ╚═════════════════════════════════════════════════════════════════════════╝
 */
 
@@ -22,23 +22,23 @@ pub enum Errno {
     ENOTEMPTY = -90,    // Directory not empty
 }
 
-pub type SyscallResult = ::core::result::Result<u64, Errno>;
+pub type SyscallResult = ::core::result::Result<usize, Errno>;
 
 pub fn convert_ret_code_to_syscall_result(ret_code: i64) -> SyscallResult {
     if ret_code < 0 {
         return Err(Errno::from(ret_code));
     } else {
-        return Ok(ret_code as u64);
+        return Ok(ret_code as usize);
     }
 }
 
-pub fn convert_syscall_result_to_ret_code(syscall_result: SyscallResult) -> i64 {
+pub fn convert_syscall_result_to_ret_code(syscall_result: SyscallResult) -> isize {
     let ret_val: i64;
     match syscall_result {
         Ok(t) => ret_val = t as i64,
         Err(e) => ret_val = e.into(),
     }
-    ret_val
+    ret_val as isize
 }