aboutsummaryrefslogtreecommitdiff
path: root/ctru-sys/src
diff options
context:
space:
mode:
authorFenrir <[email protected]>2016-06-09 03:19:42 -0700
committerFenrir <[email protected]>2016-06-20 20:41:58 -0700
commitb76009d0d5f2efc12888bd10b0404bb439797f82 (patch)
tree6196c45f3973955dc486ad3b0c6f8a9f4fa86b10 /ctru-sys/src
parentCorrect paths in README. (diff)
downloadctru-rs-b76009d0d5f2efc12888bd10b0404bb439797f82.tar.xz
ctru-rs-b76009d0d5f2efc12888bd10b0404bb439797f82.zip
moved system libs to sys folder
Diffstat (limited to 'ctru-sys/src')
-rw-r--r--ctru-sys/src/lib.rs14
-rw-r--r--ctru-sys/src/sys/libc.rs (renamed from ctru-sys/src/libc.rs)0
-rw-r--r--ctru-sys/src/sys/lock.rs (renamed from ctru-sys/src/lock.rs)2
-rw-r--r--ctru-sys/src/sys/mod.rs2
4 files changed, 8 insertions, 10 deletions
diff --git a/ctru-sys/src/lib.rs b/ctru-sys/src/lib.rs
index 6676277..15e4005 100644
--- a/ctru-sys/src/lib.rs
+++ b/ctru-sys/src/lib.rs
@@ -4,27 +4,25 @@
*/
#![no_std]
-#![allow(non_camel_case_types)]
-#![allow(non_snake_case)]
-#![allow(overflowing_literals)]
+#![feature(question_mark)]
+#![allow(non_camel_case_types, non_snake_case, overflowing_literals)]
pub mod console;
pub mod env;
pub mod gfx;
pub mod gpu;
pub mod ipc;
-pub mod lock;
-pub mod libc;
pub mod os;
pub mod sdmc;
-pub mod srv;
+pub mod services;
pub mod svc;
+pub mod srv;
+pub mod sys;
pub mod synchronization;
pub mod thread;
pub mod types;
-pub mod services;
-
+pub use self::sys::*;
pub use self::types::*;
pub type Result = i32;
diff --git a/ctru-sys/src/libc.rs b/ctru-sys/src/sys/libc.rs
index 95e37db..95e37db 100644
--- a/ctru-sys/src/libc.rs
+++ b/ctru-sys/src/sys/libc.rs
diff --git a/ctru-sys/src/lock.rs b/ctru-sys/src/sys/lock.rs
index 6a9bd1b..dcab2d7 100644
--- a/ctru-sys/src/lock.rs
+++ b/ctru-sys/src/sys/lock.rs
@@ -1,7 +1,5 @@
//<sys/lock.h> from devkitArm, needed for synchronization.rs to compile
-//TODO: I don't even know this thing looks really spooky
-
pub type _LOCK_T = i32;
#[repr(C)]
#[derive(Copy)]
diff --git a/ctru-sys/src/sys/mod.rs b/ctru-sys/src/sys/mod.rs
new file mode 100644
index 0000000..ca421e7
--- /dev/null
+++ b/ctru-sys/src/sys/mod.rs
@@ -0,0 +1,2 @@
+pub mod lock;
+pub mod libc;