diff --git a/xous-rs/src/arch/native.rs b/xous-rs/src/arch/native.rs index 7513a272c..bcebc89dd 100644 --- a/xous-rs/src/arch/native.rs +++ b/xous-rs/src/arch/native.rs @@ -202,7 +202,7 @@ where } pub fn create_thread_2_pre( - f: &fn(usize) -> U, + f: &fn(usize, usize) -> U, arg1: &usize, arg2: &usize, ) -> core::result::Result @@ -214,7 +214,7 @@ where } pub fn create_thread_2_post( - f: fn(usize) -> U, + f: fn(usize, usize) -> U, arg1: usize, arg2: usize, thread_id: TID, @@ -227,7 +227,7 @@ where } pub fn create_thread_3_pre( - f: &fn(usize) -> U, + f: &fn(usize, usize, usize) -> U, arg1: &usize, arg2: &usize, arg3: &usize, @@ -240,7 +240,7 @@ where } pub fn create_thread_3_post( - f: fn(usize) -> U, + f: fn(usize, usize, usize) -> U, arg1: usize, arg2: usize, arg3: usize, @@ -254,7 +254,7 @@ where } pub fn create_thread_4_pre( - f: &fn(usize) -> U, + f: &fn(usize, usize, usize, usize) -> U, arg1: &usize, arg2: &usize, arg3: &usize, @@ -268,7 +268,7 @@ where } pub fn create_thread_4_post( - f: fn(usize) -> U, + f: fn(usize, usize, usize, usize) -> U, arg1: usize, arg2: usize, arg3: usize, diff --git a/xous-rs/src/syscall.rs b/xous-rs/src/syscall.rs index d9f291ce1..bb3baed90 100644 --- a/xous-rs/src/syscall.rs +++ b/xous-rs/src/syscall.rs @@ -1336,9 +1336,7 @@ where }) } -pub fn create_thread_0( - f: fn() -> T, -) -> core::result::Result, Error> +pub fn create_thread_0(f: fn() -> T) -> core::result::Result, Error> where T: Send + 'static, { @@ -1370,7 +1368,7 @@ where } pub fn create_thread_2( - f: fn(usize) -> T, + f: fn(usize, usize) -> T, arg1: usize, arg2: usize, ) -> core::result::Result, Error> @@ -1388,7 +1386,7 @@ where } pub fn create_thread_3( - f: fn(usize) -> T, + f: fn(usize, usize, usize) -> T, arg1: usize, arg2: usize, arg3: usize, @@ -1407,7 +1405,7 @@ where } pub fn create_thread_4( - f: fn(usize) -> T, + f: fn(usize, usize, usize, usize) -> T, arg1: usize, arg2: usize, arg3: usize,