1 files changed, 12 insertions, 58 deletions
diff --git a/src/raw/mod.rs b/src/raw/mod.rs
index d02165f..7067371 100644
--- a/src/raw/mod.rs
+++ b/src/raw/mod.rs
@@ -1,20 +1,21 @@
 #![allow(non_camel_case_types)]
 #![allow(overflowing_literals)]
 
+pub mod console;
+pub mod gfx;
+pub mod linear;
+pub mod os;
+pub mod sdmc;
 pub mod srv;
 pub mod svc;
+pub mod types;
 
-#[repr(C)]
-pub enum mediatypes_enum {
-    mediatype_NAND,
-    mediatype_SDMC,
-    mediatype_GAMECARD
-}
+pub mod services;
+
+pub use self::types::*;
 
-pub type s8 = i8;
-pub type s16 = i16;
-pub type s32 = i32;
-pub type s64 = i64;
+extern crate core;
+use core::option::Option;
 
 #[repr(u8)]
 pub enum c_void {
@@ -22,51 +23,4 @@ pub enum c_void {
     __variant2
 }
 
-#[repr(C)]
-pub enum MemOp {
-    MEMOP_FREE = 1,
-    MEMOP_ALLOC = 3,
-    MEMOP_MAP = 4,
-    MEMOP_UNMAP = 5,
-    MEMOP_PROT = 6,
-
-    MEMOP_ALLOC_LINEAR = 0x10003,
-}
-
-#[repr(C)]
-pub enum MemState {
-	MEMSTATE_FREE       = 0,
-	MEMSTATE_RESERVED   = 1,
-	MEMSTATE_IO         = 2,
-	MEMSTATE_STATIC     = 3,
-	MEMSTATE_CODE       = 4,
-	MEMSTATE_PRIVATE    = 5,
-	MEMSTATE_SHARED     = 6,
-	MEMSTATE_CONTINUOUS = 7,
-	MEMSTATE_ALIASED    = 8,
-	MEMSTATE_ALIAS      = 9,
-	MEMSTATE_ALIASCODE  = 10,
-	MEMSTATE_LOCKED     = 11
-}
-
-#[repr(C)]
-pub enum MemPerm {
-	MEMPERM_READ     = 1,
-	MEMPERM_WRITE    = 2,
-	MEMPERM_EXECUTE  = 4,
-	MEMPERM_DONTCARE = 0x10000000,
-	MEMPERM_MAX      = 0xFFFFFFFF //force 4-byte
-}
-
-#[repr(C)]
-pub struct MemInfo {
-    pub base_addr: u32,
-    pub size: u32,
-    pub perm: u32,
-    pub state: u32,
-}
-
-#[repr(C)]
-pub struct PageInfo {
-    flags: u32,
-}
+pub type ThreadFunc = Option<extern "C" fn(arg1: *mut c_void) -> ()>;