std: move locks to sys on xous

Author: joboet

Diff for: library/std/src/sys/locks/condvar/mod.rs

@@ -26,5 +26,8 @@ cfg_if::cfg_if! {
     } else if #[cfg(target_os = "teeos")] {
         mod teeos;
         pub use teeos::Condvar;
+    } else if #[cfg(target_os = "xous")] {
+        mod xous;
+        pub use xous::Condvar;
     }
 }

Diff for: library/std/src/sys/pal/xous/locks/condvar.rs renamed to library/std/src/sys/locks/condvar/xous.rs

@@ -1,6 +1,6 @@
-use super::mutex::Mutex;
 use crate::os::xous::ffi::{blocking_scalar, scalar};
 use crate::os::xous::services::{ticktimer_server, TicktimerScalar};
+use crate::sys::locks::Mutex;
 use crate::time::Duration;
 use core::sync::atomic::{AtomicUsize, Ordering};
 

Diff for: library/std/src/sys/locks/mutex/mod.rs

@@ -27,6 +27,9 @@ cfg_if::cfg_if! {
         pub use sgx::Mutex;
     } else if #[cfg(target_os = "solid_asp3")] {
         mod itron;
-        pub use itron::Condvar;
+        pub use itron::Mutex;
+    } else if #[cfg(target_os = "xous")] {
+        mod xous;
+        pub use xous::Mutex;
     }
 }

Diff for: library/std/src/sys/pal/xous/locks/mutex.rs renamed to library/std/src/sys/locks/mutex/xous.rs

@@ -26,5 +26,8 @@ cfg_if::cfg_if! {
     } else if #[cfg(target_os = "teeos")] {
         mod teeos;
         pub use teeos::RwLock;
+    } else if #[cfg(target_os = "xous")] {
+        mod xous;
+        pub use xous::RwLock;
     }
 }

Diff for: library/std/src/sys/locks/rwlock/mod.rs

@@ -9,7 +9,6 @@ pub mod env;
 pub mod fs;
 #[path = "../unsupported/io.rs"]
 pub mod io;
-pub mod locks;
 pub mod net;
 pub mod os;
 #[path = "../unsupported/pipe.rs"]