xous: fix create_thread_[2..4] arg count

These functions assumed there was only one argument, which was
incorrect.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2021-03-25 10:53:50 +08:00
parent cecd78fd61
commit 5410d62ef5
2 changed files with 10 additions and 12 deletions

View file

@ -202,7 +202,7 @@ where
} }
pub fn create_thread_2_pre<U>( pub fn create_thread_2_pre<U>(
f: &fn(usize) -> U, f: &fn(usize, usize) -> U,
arg1: &usize, arg1: &usize,
arg2: &usize, arg2: &usize,
) -> core::result::Result<ThreadInit, crate::Error> ) -> core::result::Result<ThreadInit, crate::Error>
@ -214,7 +214,7 @@ where
} }
pub fn create_thread_2_post<U>( pub fn create_thread_2_post<U>(
f: fn(usize) -> U, f: fn(usize, usize) -> U,
arg1: usize, arg1: usize,
arg2: usize, arg2: usize,
thread_id: TID, thread_id: TID,
@ -227,7 +227,7 @@ where
} }
pub fn create_thread_3_pre<U>( pub fn create_thread_3_pre<U>(
f: &fn(usize) -> U, f: &fn(usize, usize, usize) -> U,
arg1: &usize, arg1: &usize,
arg2: &usize, arg2: &usize,
arg3: &usize, arg3: &usize,
@ -240,7 +240,7 @@ where
} }
pub fn create_thread_3_post<U>( pub fn create_thread_3_post<U>(
f: fn(usize) -> U, f: fn(usize, usize, usize) -> U,
arg1: usize, arg1: usize,
arg2: usize, arg2: usize,
arg3: usize, arg3: usize,
@ -254,7 +254,7 @@ where
} }
pub fn create_thread_4_pre<U>( pub fn create_thread_4_pre<U>(
f: &fn(usize) -> U, f: &fn(usize, usize, usize, usize) -> U,
arg1: &usize, arg1: &usize,
arg2: &usize, arg2: &usize,
arg3: &usize, arg3: &usize,
@ -268,7 +268,7 @@ where
} }
pub fn create_thread_4_post<U>( pub fn create_thread_4_post<U>(
f: fn(usize) -> U, f: fn(usize, usize, usize, usize) -> U,
arg1: usize, arg1: usize,
arg2: usize, arg2: usize,
arg3: usize, arg3: usize,

View file

@ -1336,9 +1336,7 @@ where
}) })
} }
pub fn create_thread_0<T>( pub fn create_thread_0<T>(f: fn() -> T) -> core::result::Result<crate::arch::WaitHandle<T>, Error>
f: fn() -> T,
) -> core::result::Result<crate::arch::WaitHandle<T>, Error>
where where
T: Send + 'static, T: Send + 'static,
{ {
@ -1370,7 +1368,7 @@ where
} }
pub fn create_thread_2<T>( pub fn create_thread_2<T>(
f: fn(usize) -> T, f: fn(usize, usize) -> T,
arg1: usize, arg1: usize,
arg2: usize, arg2: usize,
) -> core::result::Result<crate::arch::WaitHandle<T>, Error> ) -> core::result::Result<crate::arch::WaitHandle<T>, Error>
@ -1388,7 +1386,7 @@ where
} }
pub fn create_thread_3<T>( pub fn create_thread_3<T>(
f: fn(usize) -> T, f: fn(usize, usize, usize) -> T,
arg1: usize, arg1: usize,
arg2: usize, arg2: usize,
arg3: usize, arg3: usize,
@ -1407,7 +1405,7 @@ where
} }
pub fn create_thread_4<T>( pub fn create_thread_4<T>(
f: fn(usize) -> T, f: fn(usize, usize, usize, usize) -> T,
arg1: usize, arg1: usize,
arg2: usize, arg2: usize,
arg3: usize, arg3: usize,