diff options
Diffstat (limited to 'src')
39 files changed, 52 insertions, 2340 deletions
@@ -1,4 +1,4 @@ -use ::raw::gfx; +use libctru::gfx; use core::default::Default; use core::marker::PhantomData; @@ -25,7 +25,7 @@ pub enum Side { impl From<gfx::gfxScreen_t> for Screen { #[inline] fn from(g: gfx::gfxScreen_t) -> Screen { - use ::raw::gfx::gfxScreen_t::*; + use libctru::gfx::gfxScreen_t::*; use self::Screen::*; match g { GFX_TOP => Top, @@ -36,7 +36,7 @@ impl From<gfx::gfxScreen_t> for Screen { impl From<Screen> for gfx::gfxScreen_t { #[inline] fn from(g: Screen) -> gfx::gfxScreen_t { - use ::raw::gfx::gfxScreen_t::*; + use libctru::gfx::gfxScreen_t::*; use self::Screen::*; match g { Top => GFX_TOP, @@ -47,7 +47,7 @@ impl From<Screen> for gfx::gfxScreen_t { impl From<gfx::gfx3dSide_t> for Side { #[inline] fn from(s: gfx::gfx3dSide_t) -> Side { - use ::raw::gfx::gfx3dSide_t::*; + use libctru::gfx::gfx3dSide_t::*; use self::Side::*; match s { GFX_LEFT => Left, @@ -58,7 +58,7 @@ impl From<gfx::gfx3dSide_t> for Side { impl From<Side> for gfx::gfx3dSide_t { #[inline] fn from(s: Side) -> gfx::gfx3dSide_t { - use ::raw::gfx::gfx3dSide_t::*; + use libctru::gfx::gfx3dSide_t::*; use self::Side::*; match s { Left => GFX_LEFT, @@ -1,13 +1,9 @@ -#![feature(no_std)] -#![feature(lang_items)] #![no_std] +#![feature(lang_items)] #![crate_type = "rlib"] #![crate_name = "ctru"] -pub mod raw; - -pub type Result = i32; -pub type Handle = u32; +extern crate ctru_sys as libctru; pub mod srv; pub mod gfx; @@ -19,6 +15,5 @@ pub use srv::Srv; pub use gfx::Gfx; pub use sdmc::Sdmc; -#[lang = "stack_exhausted"] extern fn stack_exhausted() {} #[lang = "eh_personality"] extern fn eh_personality() {} #[lang = "panic_fmt"] fn panic_fmt() -> ! { loop {} } diff --git a/src/raw/console.rs b/src/raw/console.rs deleted file mode 100644 index 8871c7f..0000000 --- a/src/raw/console.rs +++ /dev/null @@ -1,64 +0,0 @@ -use super::c_void; - -use super::gfx::*; - -#[repr(C)] -#[derive(Clone, Copy)] -pub struct ConsoleFont { - pub gfx: *mut u8, - pub asciiOffset: u16, - pub numChars: u16, -} - -#[repr(C)] -pub type ConsolePrint = extern "C" fn(con: *mut c_void, c: i32) -> u8; - -#[repr(C)] -#[derive(Clone, Copy)] -pub struct PrintConsole { - pub font: ConsoleFont, - pub frameBuffer: *mut u16, - pub cursorX: i32, - pub cursorY: i32, - pub prevCursorX: i32, - pub prevCursorY: i32, - pub consoleWidth: i32, - pub consoleHeight: i32, - pub windowX: i32, - pub windowY: i32, - pub windowWidth: i32, - pub windowHeight: i32, - pub tabSize: i32, - pub fg: i32, - pub bg: i32, - pub flags: i32, - pub PrintChar: ConsolePrint, - pub consoleInitialised: u8, -} - -pub const CONSOLE_COLOR_BOLD: i32 = 1; -pub const CONSOLE_COLOR_FAINT: i32 = 2; -pub const CONSOLE_ITALIC: i32 = 4; -pub const CONSOLE_UNDERLINE: i32 = 8; -pub const CONSOLE_BLINK_SLOW: i32 = 16; -pub const CONSOLE_BLINK_FAST: i32 = 32; -pub const CONSOLE_COLOR_REVERSE: i32 = 64; -pub const CONSOLE_CONCEAL: i32 = 128; - -#[repr(C)] -pub enum debugDevice { - NULL = 0, - _3DMOO = 1, - CONSOLE = 2, -} - - -extern "C" { - pub fn consoleSetFont(console: *mut PrintConsole, font: *mut ConsoleFont) -> (); - pub fn consoleSetWindow(console: *mut PrintConsole, x: i32, y: i32, width: i32, height: i32) -> (); - pub fn consoleGetDefault() -> *mut PrintConsole; - pub fn consoleSelect(console: *mut PrintConsole) -> *mut PrintConsole; - pub fn consoleInit(screen: gfxScreen_t, console: *mut PrintConsole) -> *mut PrintConsole; - pub fn consoleDebugInit(device: debugDevice) -> (); - pub fn consoleClear() -> (); -} diff --git a/src/raw/gfx.rs b/src/raw/gfx.rs deleted file mode 100644 index 4a20028..0000000 --- a/src/raw/gfx.rs +++ /dev/null @@ -1,44 +0,0 @@ - -use super::services::gsp::*; - -#[inline] -pub fn RGB565(r: u32, g: u32, b: u32) { - (((b)&0x1f)|(((g)&0x3f)<<5)|(((r)&0x1f)<<11)); -} - -#[inline] -pub fn RGB8_to_565(r: u32, g: u32, b: u32) { - (((b)>>3)&0x1f)|((((g)>>2)&0x3f)<<5)|((((r)>>3)&0x1f)<<11); -} - -#[repr(C)] -pub enum gfxScreen_t { - GFX_TOP = 0, - GFX_BOTTOM = 1 -} - -#[repr(C)] -pub enum gfx3dSide_t { - GFX_LEFT = 0, - GFX_RIGHT = 1 -} - - -extern "C" { - pub static mut gfxTopLeftFramebuffers: [*mut u8; 2usize]; - pub static mut gfxTopRightFramebuffers: [*mut u8; 2usize]; - pub static mut gfxBottomFramebuffers: [*mut u8; 2usize]; - pub static mut gxCmdBuf: *mut u32; - - pub fn gfxInitDefault() -> (); - pub fn gfxInit(topFormat: GSP_FramebufferFormats, bottomFormat: GSP_FramebufferFormats, vrambuffers: u8) -> (); - pub fn gfxExit() -> (); - pub fn gfxSet3D(enable: u8) -> (); - pub fn gfxSetScreenFormat(screen: gfxScreen_t, format: GSP_FramebufferFormats) -> (); - pub fn gfxGetScreenFormat(screen: gfxScreen_t) -> GSP_FramebufferFormats; - pub fn gfxSetDoubleBuffering(screen: gfxScreen_t, doubleBuffering: u8) -> (); - pub fn gfxFlushBuffers() -> (); - pub fn gfxSwapBuffers() -> (); - pub fn gfxSwapBuffersGpu() -> (); - pub fn gfxGetFramebuffer(screen: gfxScreen_t, side: gfx3dSide_t, width: *mut u16, height: *mut u16) -> *mut u8; -} diff --git a/src/raw/gpu/gpu.rs b/src/raw/gpu/gpu.rs deleted file mode 100644 index 24f2f90..0000000 --- a/src/raw/gpu/gpu.rs +++ /dev/null @@ -1,294 +0,0 @@ -use ctru::Handle; - -#[inline] -pub fn GPUCMD_HEADER(incremental: i32, mask: i32, reg: i32) { - (((incremental)<<31)|(((mask)&0xF)<<16)|((reg)&0x3FF)); -} - -#[inline] -pub fn GPU_TEXTURE_MAG_FILTER(v: i32) { - (((v)&0x1)<<1); //takes a GPU_TEXTURE_FILTER_PARAM -} - -#[inline] -pub fn GPU_TEXTURE_MIN_FILTER(v: i32) { - (((v)&0x1)<<2); //takes a GPU_TEXTURE_FILTER_PARAM -} - -#[inline] -pub fn GPU_TEXTURE_WRAP_S(v: i32) { - (((v)&0x3)<<8); //takes a GPU_TEXTURE_WRAP_PARAM -} - -#[inline] -pub fn GPU_TEXTURE_WRAP_T(v: i32) { - (((v)&0x3)<<12); //takes a GPU_TEXTURE_WRAP_PARAM -} - -#[repr(C)] -pub enum GPU_TEXTURE_FILTER_PARAM { - GPU_NEAREST = 0x0, - GPU_LINEAR = 0x1 -} - -#[repr(C)] -pub enum GPU_TEXTURE_WRAP_PARAM { - GPU_CLAMP_TO_EDGE = 0x0, - GPU_REPEAT = 0x1 -} - -#[repr(C)] -pub enum GPU_TEXUNIT { - GPU_TEXUNIT0 = 0x1, - GPU_TEXUNIT1 = 0x2, - GPU_TEXUNIT2 = 0x4 -} - -#[repr(C)] -pub enum GPU_TEXCOLOR { - GPU_RGBA8=0x0, - GPU_RGB8=0x1, - GPU_RGBA5551=0x2, - GPU_RGB565=0x3, - GPU_RGBA4=0x4, - GPU_LA8=0x5, - GPU_HILO8=0x6, - GPU_L8=0x7, - GPU_A8=0x8, - GPU_LA4=0x9, - GPU_L4=0xA, - GPU_ETC1=0xB, - GPU_ETC1A4=0xC -} - -#[repr(C)] -pub enum GPU_TESTFUNC { - GPU_NEVER = 0, - GPU_ALWAYS = 1, - GPU_EQUAL = 2, - GPU_NOTEQUAL = 3, - GPU_LESS = 4, - GPU_LEQUAL = 5, - GPU_GREATER = 6, - GPU_GEQUAL = 7 -} - -#[repr(C)] -pub enum GPU_SCISSORMODE { - GPU_SCISSOR_DISABLE = 0, // disable scissor test - GPU_SCISSOR_INVERT = 1, // exclude pixels inside the scissor box - // 2 is the same as 0 - GPU_SCISSOR_NORMAL = 3, // exclude pixels outside of the scissor box -} - -#[repr(C)] -pub enum GPU_STENCILOP { - GPU_KEEP = 0, // keep destination value - GPU_AND_NOT = 1, // destination & ~source - GPU_XOR = 5, // destination ^ source - // 2 is the same as 1. Other values are too weird to even be usable. -} - -#[repr(C)] -pub enum GPU_WRITEMASK { - GPU_WRITE_RED = 0x01, - GPU_WRITE_GREEN = 0x02, - GPU_WRITE_BLUE = 0x04, - GPU_WRITE_ALPHA = 0x08, - GPU_WRITE_DEPTH = 0x10, - - GPU_WRITE_COLOR = 0x0F, - GPU_WRITE_ALL = 0x1F -} - -#[repr(C)] -pub enum GPU_BLENDEQUATION { - GPU_BLEND_ADD = 0, - GPU_BLEND_SUBTRACT = 1, - GPU_BLEND_REVERSE_SUBTRACT = 2, - GPU_BLEND_MIN = 3, - GPU_BLEND_MAX = 4 -} - -#[repr(C)] -pub enum GPU_BLENDFACTOR { - GPU_ZERO = 0, - GPU_ONE = 1, - GPU_SRC_COLOR = 2, - GPU_ONE_MINUS_SRC_COLOR = 3, - GPU_DST_COLOR = 4, - GPU_ONE_MINUS_DST_COLOR = 5, - GPU_SRC_ALPHA = 6, - GPU_ONE_MINUS_SRC_ALPHA = 7, - GPU_DST_ALPHA = 8, - GPU_ONE_MINUS_DST_ALPHA = 9, - GPU_CONSTANT_COLOR = 10, - GPU_ONE_MINUS_CONSTANT_COLOR = 11, - GPU_CONSTANT_ALPHA = 12, - GPU_ONE_MINUS_CONSTANT_ALPHA = 13, - GPU_SRC_ALPHA_SATURATE = 14 -} - -#[repr(C)] -pub enum GPU_LOGICOP { - GPU_LOGICOP_CLEAR = 0, - GPU_LOGICOP_AND = 1, - GPU_LOGICOP_AND_REVERSE = 2, - GPU_LOGICOP_COPY = 3, - GPU_LOGICOP_SET = 4, - GPU_LOGICOP_COPY_INVERTED = 5, - GPU_LOGICOP_NOOP = 6, - GPU_LOGICOP_INVERT = 7, - GPU_LOGICOP_NAND = 8, - GPU_LOGICOP_OR = 9, - GPU_LOGICOP_NOR = 10, - GPU_LOGICOP_XOR = 11, - GPU_LOGICOP_EQUIV = 12, - GPU_LOGICOP_AND_INVERTED = 13, - GPU_LOGICOP_OR_REVERSE = 14, - GPU_LOGICOP_OR_INVERTED = 15 -} - -#[repr(C)] -pub enum GPU_FORMATS { - GPU_BYTE = 0, - GPU_UNSIGNED_BYTE = 1, - GPU_SHORT = 2, - GPU_FLOAT = 3 -} - -//defines for CW ? -#[repr(C)] -pub enum GPU_CULLMODE { - GPU_CULL_NONE = 0, - GPU_CULL_FRONT_CCW = 1, - GPU_CULL_BACK_CCW = 2 -} - -#[inline] -pub fn GU_ATTRIBFMT(i: i32, n: i32, f: i32) { - (((((n)-1)<<2)|((f)&3))<<((i)*4)); -} - -/** -* Texture combiners sources -*/ -#[repr(C)] -pub enum GPU_TEVSRC{ - GPU_PRIMARY_COLOR = 0x00, - GPU_TEXTURE0 = 0x03, - GPU_TEXTURE1 = 0x04, - GPU_TEXTURE2 = 0x05, - GPU_TEXTURE3 = 0x06, - GPU_CONSTANT = 0x0E, - GPU_PREVIOUS = 0x0F, -} - -/** -* Texture RGB combiners operands -*/ -#[repr(C)] -pub enum GPU_TEVOP_RGB{ - GPU_TEVOP_RGB_SRC_COLOR = 0x00, - GPU_TEVOP_RGB_ONE_MINUS_SRC_COLOR = 0x01, - GPU_TEVOP_RGB_SRC_ALPHA = 0x02, - GPU_TEVOP_RGB_ONE_MINUS_SRC_ALPHA = 0x03, - GPU_TEVOP_RGB_SRC0_RGB = 0x04, - GPU_TEVOP_RGB_0x05 = 0x05, - GPU_TEVOP_RGB_0x06 = 0x06, - GPU_TEVOP_RGB_0x07 = 0x07, - GPU_TEVOP_RGB_SRC1_RGB = 0x08, - GPU_TEVOP_RGB_0x09 = 0x09, - GPU_TEVOP_RGB_0x0A = 0x0A, - GPU_TEVOP_RGB_0x0B = 0x0B, - GPU_TEVOP_RGB_SRC2_RGB = 0x0C, - GPU_TEVOP_RGB_0x0D = 0x0D, - GPU_TEVOP_RGB_0x0E = 0x0E, - GPU_TEVOP_RGB_0x0F = 0x0F, -}; - -/** -* Texture ALPHA combiners operands -*/ -#[repr(C)] -pub enum GPU_TEVOP_A { - GPU_TEVOP_A_SRC_ALPHA = 0x00, - GPU_TEVOP_A_ONE_MINUS_SRC_ALPHA = 0x01, - GPU_TEVOP_A_SRC0_RGB = 0x02, - GPU_TEVOP_A_SRC1_RGB = 0x04, - GPU_TEVOP_A_SRC2_RGB = 0x06, -} - -/** -* Texture combiner functions -*/ -pub enum GPU_COMBINEFUNC { - GPU_REPLACE = 0x00, - GPU_MODULATE = 0x01, - GPU_ADD = 0x02, - GPU_ADD_SIGNED = 0x03, - GPU_INTERPOLATE = 0x04, - GPU_SUBTRACT = 0x05, - GPU_DOT3_RGB = 0x06 //RGB only -} - -#[inline] -pub fn GPU_TEVSOURCES(a, b, c) { - (((a))|((b)<<4)|((c)<<8)); -} - -#[inline] -pub fn GPU_TEVOPERANDS(a, b, c) { - (((a))|((b)<<4)|((c)<<8)); -} - -#[repr(C)] -pub enum GPU_Primitive_t { - GPU_TRIANGLES = 0x0000, - GPU_TRIANGLE_STRIP = 0x0100, - GPU_TRIANGLE_FAN = 0x0200, - GPU_UNKPRIM = 0x0300 // ? -} - -#[repr(C)] -pub enum GPU_SHADER_TYPE { - GPU_VERTEX_SHADER=0x0, - GPU_GEOMETRY_SHADER=0x1 -} - - -extern "C" { - pub fn GPU_Init(gsphandle: *mut Handle) -> (); - pub fn GPU_Reset(gxbuf: *mut u32, gpuBuf: *mut u32, gpuBufSize: u32) -> (); - - pub fn GPUCMD_SetBuffer(adr: *mut u32, size: u32, offset: u32) -> (); - pub fn GPUCMD_SetBufferOffset(offset: u32) -> (); - pub fn GPUCMD_GetBuffer(adr: *mut *mut u32, size: *mut u32, offset: *mut u32) -> (); - pub fn GPUCMD_AddRawCommands(cmd: *mut u32, size: u32) -> (); - pub fn GPUCMD_Run(gxbuf: *mut u32) -> (); - pub fn GPUCMD_FlushAndRun(gxbuf: *mut u32) -> (); - pub fn GPUCMD_Add(header: u32, param: *mut u32, paramlength: u32) -> (); - pub fn GPUCMD_Finalize() -> (); - pub fn GPU_SetFloatUniform(_type: GPU_SHADER_TYPE, startreg: u32, data: *mut u32, numreg: u32) -> (); - pub fn GPU_SetViewport(depthBuffer: *mut u32, colorBuffer: *mut u32, x: u32, y: u32, w: u32, h: u32) -> (); - pub fn GPU_SetScissorTest(mode: GPU_SCISSORMODE, x: u32, y: u32, w: u32, h: u32) -> (); - pub fn GPU_DepthMap(zScale: f32, zOffset: f32) -> (); - pub fn GPU_SetAlphaTest(enable: u8, function: GPU_TESTFUNC, _ref: u8) -> (); - pub fn GPU_SetDepthTestAndWriteMask(enable: u8, function: GPU_TESTFUNC, writemask: GPU_WRITEMASK) -> (); - pub fn GPU_SetStencilTest(enable: u8, function: GPU_TESTFUNC, _ref: _u8, mask: _u8, replace: _u8) -> (); - pub fn GPU_SetStencilOp(sfail: GPU_STENCILOP, dfail: GPU_STENCILOP, pass: GPU_STENCILOP) -> (); - pub fn GPU_SetFaceCulling(mode: GPU_CULLMODE) -> (); - pub fn GPU_SetAlphaBlending(colorEquation: GPU_BLENDEQUATION, alphaEquation: GPU_BLENDEQUATION, colorSrc: GPU_BLENDFACTOR, colorDst: GPU_BLENDFACTOR, alphaSrc: GPU_BLENDFACTOR, alphaDst: GPU_BLENDFACTOR) -> (); - pub fn GPU_SetColorLogicOp(op: GPU_LOGICOP) -> (); - pub fn GPU_SetBlendingColor(r: u8, g: u8, b: u8, a: u8) -> (); - pub fn GPU_SetAttributeBuffers(totalAttributes: u8, baseAddress: *mut u32, attributeFormats: u64, attributeMask: u16, attributePermutation: u64, numBuffers: u8, bufferOffsets: *mut u32, bufferPermutations: *mut u64, bufferNumAttributes: *mut u8) -> (); - pub fn GPU_SetTextureEnable(units: GPU_TEXUNIT) -> (); - pub fn GPU_SetTexture(unit: GPU_TEXUNIT, data: *mut u32, width: u16, height: u16, param: u32, colorType: GPU_TEXCOLOR) -> (); - pub fn GPU_SetTexEnv(id: u8, rgbSources: u16, alphaSources: u16, rgbOperands: u16, alphaOperands: u16, rgbCombine: GPU_COMBINEFUNC, alphaCombine: GPU_COMBINEFUNC, constantColor: u32) -> (); - pub fn GPU_DrawArray(primitive: GPU_Primitive_t, n: u32) -> (); - pub fn GPU_DrawElements(primitive: GPU_Primitive_t, indexArray: *mut u32, n: u32) -> (); - pub fn GPU_FinishDrawing() -> (); - pub fn GPU_SetShaderOutmap(outmapData: *mut u32) -> (); - pub fn GPU_SendShaderCode(_type: GPU_SHADER_TYPE, data: *mut u32, offset: u16, length: u16) -> (); - pub fn GPU_SendOperandDescriptors(_type: GPU_SHADER_TYPE, data: *mut u32, offset: u16, length: u16) -> (); -} diff --git a/src/raw/gpu/gx.rs b/src/raw/gpu/gx.rs deleted file mode 100644 index d26c9ab..0000000 --- a/src/raw/gpu/gx.rs +++ /dev/null @@ -1,73 +0,0 @@ -#[inline] -pub fn GX_BUFFER_DIM(w: u32, h: u32) { - (((h)<<16)|((w)&0xFFFF)); -} - -#[repr(C)] -pub enum GX_TRANSFER_FORMAT -{ - GX_TRANSFER_FMT_RGBA8 = 0, - GX_TRANSFER_FMT_RGB8 = 1, - GX_TRANSFER_FMT_RGB565 = 2, - GX_TRANSFER_FMT_RGB5A1 = 3, - GX_TRANSFER_FMT_RGBA4 = 4 -} - -#[repr(C)] -pub enum GX_TRANSFER_SCALE -{ - GX_TRANSFER_SCALE_NO = 0, - GX_TRANSFER_SCALE_X = 1, - GX_TRANSFER_SCALE_Y = 2 -} - -#[repr(C)] -pub enum GX_FILL_CONTROL { - GX_FILL_TRIGGER = 0x001, - GX_FILL_FINISHED = 0x002, - GX_FILL_16BIT_DEPTH = 0x000, - GX_FILL_24BIT_DEPTH = 0x100, - GX_FILL_32BIT_DEPTH = 0x200, -} - -#[inline] -pub fn GX_TRANSFER_FLIP_VERT(x) { - ((x)<<0); -} - -#[inline] -pub fn GX_TRANSFER_OUT_TILED(x) { - ((x)<<1); -} - -#[inline] -pub fn GX_TRANSFER_RAW_COPY(x) { - ((x)<<3) -} - -#[inline] -pub fn GX_TRANSFER_IN_FORMAT(x) { - ((x)<<8); -} - -#[inline] -pub fn GX_TRANSFER_OUT_FORMAT(x) { - ((x)<<12) -} - -#[inline] -pub fn GX_TRANSFER_SCALING(x) { - ((x)<<24); -} - -use ctru::Result; - - -extern "C" { - pub fn GX_RequestDma(gxbuf: *mut u32, src: *mut u32, dst: *mut u32, length: u32) -> Result; - pub fn GX_SetCommandList_Last(gxbuf: *mut u32, buf0a: *mut u32, buf0s: u32, flags: u8) -> Result; - pub fn GX_SetMemoryFill(gxbuf: *mut u32, buf0a: *mut u32, buf0v: u32, buf0e: *mut u32, width0: u16, buf1a: *mut u32, buf1v: u32, buf1e: *mut u32, width1: u16) -> Result; - pub fn GX_SetDisplayTransfer(gxbuf: *mut u32, inadr: *mut u32, indim: u32, outadr: *mut u32, outdim: u32, flags: u32) -> Result; - pub fn GX_SetTextureCopy(gxbuf: *mut u32, inadr: *mut u32, indim: u32, outadr: *mut u32, outdim: u32, size: u32, flags: u32) -> Result; - pub fn GX_SetCommandList_First(gxbuf: *mut u32, buf0a: *mut u32, buf0s: u32, buf1a: *mut u32, buf1s: u32, buf2a: *mut u32, buf2s: u32) -> Result; -} diff --git a/src/raw/gpu/mod.rs b/src/raw/gpu/mod.rs deleted file mode 100644 index 8d71046..0000000 --- a/src/raw/gpu/mod.rs +++ /dev/null @@ -1,11 +0,0 @@ -pub mod gpu; -pub mod gx; -pub mod registers; -pub mod shader_program; -pub mod shbin; - -use self::gpu::*; -use self::gx::*; -use self::registers::*; -use self::shader_program::*; -use self::shbin::*; diff --git a/src/raw/gpu/registers.rs b/src/raw/gpu/registers.rs deleted file mode 100644 index 739a50a..0000000 --- a/src/raw/gpu/registers.rs +++ /dev/null @@ -1,726 +0,0 @@ -pub const GPUREG_0000: i32 = 0x0000; -pub const GPUREG_0001: i32 = 0x0001; -pub const GPUREG_0002: i32 = 0x0002; -pub const GPUREG_0003: i32 = 0x0003; -pub const GPUREG_0004: i32 = 0x0004; -pub const GPUREG_0005: i32 = 0x0005; -pub const GPUREG_0006: i32 = 0x0006; -pub const GPUREG_0007: i32 = 0x0007; -pub const GPUREG_0008: i32 = 0x0008; -pub const GPUREG_0009: i32 = 0x0009; -pub const GPUREG_000A: i32 = 0x000A; -pub const GPUREG_000B: i32 = 0x000B; -pub const GPUREG_000C: i32 = 0x000C; -pub const GPUREG_000D: i32 = 0x000D; -pub const GPUREG_000E: i32 = 0x000E; -pub const GPUREG_000F: i32 = 0x000F; -pub const GPUREG_FINALIZE: i32 = 0x0010; -pub const GPUREG_0011: i32 = 0x0011; -pub const GPUREG_0012: i32 = 0x0012; -pub const GPUREG_0013: i32 = 0x0013; -pub const GPUREG_0014: i32 = 0x0014; -pub const GPUREG_0015: i32 = 0x0015; -pub const GPUREG_0016: i32 = 0x0016; -pub const GPUREG_0017: i32 = 0x0017; -pub const GPUREG_0018: i32 = 0x0018; -pub const GPUREG_0019: i32 = 0x0019; -pub const GPUREG_001A: i32 = 0x001A; -pub const GPUREG_001B: i32 = 0x001B; -pub const GPUREG_001C: i32 = 0x001C; -pub const GPUREG_001D: i32 = 0x001D; -pub const GPUREG_001E: i32 = 0x001E; -pub const GPUREG_001F: i32 = 0x001F; -pub const GPUREG_0020: i32 = 0x0020; -pub const GPUREG_0021: i32 = 0x0021; -pub const GPUREG_0022: i32 = 0x0022; -pub const GPUREG_0023: i32 = 0x0023; -pub const GPUREG_0024: i32 = 0x0024; -pub const GPUREG_0025: i32 = 0x0025; -pub const GPUREG_0026: i32 = 0x0026; -pub const GPUREG_0027: i32 = 0x0027; -pub const GPUREG_0028: i32 = 0x0028; -pub const GPUREG_0029: i32 = 0x0029; -pub const GPUREG_002A: i32 = 0x002A; -pub const GPUREG_002B: i32 = 0x002B; -pub const GPUREG_002C: i32 = 0x002C; -pub const GPUREG_002D: i32 = 0x002D; -pub const GPUREG_002E: i32 = 0x002E; -pub const GPUREG_002F: i32 = 0x002F; -pub const GPUREG_0030: i32 = 0x0030; -pub const GPUREG_0031: i32 = 0x0031; -pub const GPUREG_0032: i32 = 0x0032; -pub const GPUREG_0033: i32 = 0x0033; -pub const GPUREG_0034: i32 = 0x0034; -pub const GPUREG_0035: i32 = 0x0035; -pub const GPUREG_0036: i32 = 0x0036; -pub const GPUREG_0037: i32 = 0x0037; -pub const GPUREG_0038: i32 = 0x0038; -pub const GPUREG_0039: i32 = 0x0039; -pub const GPUREG_003A: i32 = 0x003A; -pub const GPUREG_003B: i32 = 0x003B; -pub const GPUREG_003C: i32 = 0x003C; -pub const GPUREG_003D: i32 = 0x003D; -pub const GPUREG_003E: i32 = 0x003E; -pub const GPUREG_003F: i32 = 0x003F; -pub const GPUREG_FACECULLING_CONFIG: i32 = 0x0040; -pub const GPUREG_0041: i32 = 0x0041; -pub const GPUREG_0042: i32 = 0x0042; -pub const GPUREG_0043: i32 = 0x0043; -pub const GPUREG_0044: i32 = 0x0044; -pub const GPUREG_0045: i32 = 0x0045; -pub const GPUREG_0046: i32 = 0x0046; -pub const GPUREG_0047: i32 = 0x0047; -pub const GPUREG_0048: i32 = 0x0048; -pub const GPUREG_0049: i32 = 0x0049; -pub const GPUREG_004A: i32 = 0x004A; -pub const GPUREG_004B: i32 = 0x004B; -pub const GPUREG_004C: i32 = 0x004C; -pub const GPUREG_DEPTHMAP_SCALE: i32 = 0x004D; -pub const GPUREG_DEPTHMAP_OFFSET: i32 = 0x004E; -pub const GPUREG_SH_OUTMAP_TOTAL: i32 = 0x004F; -pub const GPUREG_SH_OUTMAP_O0: i32 = 0x0050; -pub const GPUREG_SH_OUTMAP_O1: i32 = 0x0051; -pub const GPUREG_SH_OUTMAP_O2: i32 = 0x0052; -pub const GPUREG_SH_OUTMAP_O3: i32 = 0x0053; -pub const GPUREG_SH_OUTMAP_O4: i32 = 0x0054; -pub const GPUREG_SH_OUTMAP_O5: i32 = 0x0055; -pub const GPUREG_SH_OUTMAP_O6: i32 = 0x0056; -pub const GPUREG_0057: i32 = 0x0057; -pub const GPUREG_0058: i32 = 0x0058; -pub const GPUREG_0059: i32 = 0x0059; -pub const GPUREG_005A: i32 = 0x005A; -pub const GPUREG_005B: i32 = 0x005B; -pub const GPUREG_005C: i32 = 0x005C; -pub const GPUREG_005D: i32 = 0x005D; -pub const GPUREG_005E: i32 = 0x005E; -pub const GPUREG_005F: i32 = 0x005F; -pub const GPUREG_0060: i32 = 0x0060; -pub const GPUREG_0061: i32 = 0x0061; -pub const GPUREG_0062: i32 = 0x0062; -pub const GPUREG_0063: i32 = 0x0063; -pub const GPUREG_0064: i32 = 0x0064; -pub const GPUREG_SCISSORTEST_MODE: i32 = 0x0065; -pub const GPUREG_SCISSORTEST_POS: i32 = 0x0066; -pub const GPUREG_SCISSORTEST_DIM: i32 = 0x0067; -pub const GPUREG_0068: i32 = 0x0068; -pub const GPUREG_0069: i32 = 0x0069; -pub const GPUREG_006A: i32 = 0x006A; -pub const GPUREG_006B: i32 = 0x006B; -pub const GPUREG_006C: i32 = 0x006C; -pub const GPUREG_006D: i32 = 0x006D; -pub const GPUREG_006E: i32 = 0x006E; -pub const GPUREG_006F: i32 = 0x006F; -pub const GPUREG_0070: i32 = 0x0070; -pub const GPUREG_0071: i32 = 0x0071; -pub const GPUREG_0072: i32 = 0x0072; -pub const GPUREG_0073: i32 = 0x0073; -pub const GPUREG_0074: i32 = 0x0074; -pub const GPUREG_0075: i32 = 0x0075; -pub const GPUREG_0076: i32 = 0x0076; -pub const GPUREG_0077: i32 = 0x0077; -pub const GPUREG_0078: i32 = 0x0078; -pub const GPUREG_0079: i32 = 0x0079; -pub const GPUREG_007A: i32 = 0x007A; -pub const GPUREG_007B: i32 = 0x007B; -pub const GPUREG_007C: i32 = 0x007C; -pub const GPUREG_007D: i32 = 0x007D; -pub const GPUREG_007E: i32 = 0x007E; -pub const GPUREG_007F: i32 = 0x007F; -pub const GPUREG_TEXUNITS_CONFIG: i32 = 0x0080; -pub const GPUREG_0081: i32 = 0x0081; -pub const GPUREG_TEXUNIT0_DIM: i32 = 0x0082; -pub const GPUREG_TEXUNIT0_PARAM: i32 = 0x0083; -pub const GPUREG_0084: i32 = 0x0084; -pub const GPUREG_TEXUNIT0_LOC: i32 = 0x0085; -pub const GPUREG_0086: i32 = 0x0086; -pub const GPUREG_0087: i32 = 0x0087; -pub const GPUREG_0088: i32 = 0x0088; -pub const GPUREG_0089: i32 = 0x0089; -pub const GPUREG_008A: i32 = 0x008A; -pub const GPUREG_008B: i32 = 0x008B; -pub const GPUREG_008C: i32 = 0x008C; -pub const GPUREG_008D: i32 = 0x008D; -pub const GPUREG_TEXUNIT0_TYPE: i32 = 0x008E; -pub const GPUREG_008F: i32 = 0x008F; -pub const GPUREG_0090: i32 = 0x0090; -pub const GPUREG_0091: i32 = 0x0091; -pub const GPUREG_TEXUNIT1_DIM: i32 = 0x0092; -pub const GPUREG_TEXUNIT1_PARAM: i32 = 0x0093; -pub const GPUREG_0094: i32 = 0x0094; -pub const GPUREG_TEXUNIT1_LOC: i32 = 0x0095; -pub const GPUREG_TEXUNIT1_TYPE: i32 = 0x0096; -pub const GPUREG_0097: i32 = 0x0097; -pub const GPUREG_0098: i32 = 0x0098; -pub const GPUREG_0099: i32 = 0x0099; -pub const GPUREG_TEXUNIT2_DIM: i32 = 0x009A; -pub const GPUREG_TEXUNIT2_PARAM: i32 = 0x009B; -pub const GPUREG_009C: i32 = 0x009C; -pub const GPUREG_TEXUNIT2_LOC: i32 = 0x009D; -pub const GPUREG_TEXUNIT2_TYPE: i32 = 0x009E; -pub const GPUREG_009F: i32 = 0x009F; -pub const GPUREG_00A0: i32 = 0x00A0; -pub const GPUREG_00A1: i32 = 0x00A1; -pub const GPUREG_00A2: i32 = 0x00A2; -pub const GPUREG_00A3: i32 = 0x00A3; -pub const GPUREG_00A4: i32 = 0x00A4; -pub const GPUREG_00A5: i32 = 0x00A5; -pub const GPUREG_00A6: i32 = 0x00A6; -pub const GPUREG_00A7: i32 = 0x00A7; -pub const GPUREG_00A8: i32 = 0x00A8; -pub const GPUREG_00A9: i32 = 0x00A9; -pub const GPUREG_00AA: i32 = 0x00AA; -pub const GPUREG_00AB: i32 = 0x00AB; -pub const GPUREG_00AC: i32 = 0x00AC; -pub const GPUREG_00AD: i32 = 0x00AD; -pub const GPUREG_00AE: i32 = 0x00AE; -pub const GPUREG_00AF: i32 = 0x00AF; -pub const GPUREG_00B0: i32 = 0x00B0; -pub const GPUREG_00B1: i32 = 0x00B1; -pub const GPUREG_00B2: i32 = 0x00B2; -pub const GPUREG_00B3: i32 = 0x00B3; -pub const GPUREG_00B4: i32 = 0x00B4; -pub const GPUREG_00B5: i32 = 0x00B5; -pub const GPUREG_00B6: i32 = 0x00B6; -pub const GPUREG_00B7: i32 = 0x00B7; -pub const GPUREG_00B8: i32 = 0x00B8; -pub const GPUREG_00B9: i32 = 0x00B9; -pub const GPUREG_00BA: i32 = 0x00BA; -pub const GPUREG_00BB: i32 = 0x00BB; -pub const GPUREG_00BC: i32 = 0x00BC; -pub const GPUREG_00BD: i32 = 0x00BD; -pub const GPUREG_00BE: i32 = 0x00BE; -pub const GPUREG_00BF: i32 = 0x00BF; -pub const GPUREG_TEXENV0_CONFIG0: i32 = 0x00C0; -pub const GPUREG_TEXENV0_CONFIG1: i32 = 0x00C1; -pub const GPUREG_TEXENV0_CONFIG2: i32 = 0x00C2; -pub const GPUREG_TEXENV0_CONFIG3: i32 = 0x00C3; -pub const GPUREG_TEXENV0_CONFIG4: i32 = 0x00C4; -pub const GPUREG_00C5: i32 = 0x00C5; -pub const GPUREG_00C6: i32 = 0x00C6; -pub const GPUREG_00C7: i32 = 0x00C7; -pub const GPUREG_TEXENV1_CONFIG0: i32 = 0x00C8; -pub const GPUREG_TEXENV1_CONFIG1: i32 = 0x00C9; -pub const GPUREG_TEXENV1_CONFIG2: i32 = 0x00CA; -pub const GPUREG_TEXENV1_CONFIG3: i32 = 0x00CB; -pub const GPUREG_TEXENV1_CONFIG4: i32 = 0x00CC; -pub const GPUREG_00CD: i32 = 0x00CD; -pub const GPUREG_00CE: i32 = 0x00CE; -pub const GPUREG_00CF: i32 = 0x00CF; -pub const GPUREG_TEXENV2_CONFIG0: i32 = 0x00D0; -pub const GPUREG_TEXENV2_CONFIG1: i32 = 0x00D1; -pub const GPUREG_TEXENV2_CONFIG2: i32 = 0x00D2; -pub const GPUREG_TEXENV2_CONFIG3: i32 = 0x00D3; -pub const GPUREG_TEXENV2_CONFIG4: i32 = 0x00D4; -pub const GPUREG_00D5: i32 = 0x00D5; -pub const GPUREG_00D6: i32 = 0x00D6; -pub const GPUREG_00D7: i32 = 0x00D7; -pub const GPUREG_TEXENV3_CONFIG0: i32 = 0x00D8; -pub const GPUREG_TEXENV3_CONFIG1: i32 = 0x00D9; -pub const GPUREG_TEXENV3_CONFIG2: i32 = 0x00DA; -pub const GPUREG_TEXENV3_CONFIG3: i32 = 0x00DB; -pub const GPUREG_TEXENV3_CONFIG4: i32 = 0x00DC; -pub const GPUREG_00DD: i32 = 0x00DD; -pub const GPUREG_00DE: i32 = 0x00DE; -pub const GPUREG_00DF: i32 = 0x00DF; -pub const GPUREG_00E0: i32 = 0x00E0; -pub const GPUREG_00E1: i32 = 0x00E1; -pub const GPUREG_00E2: i32 = 0x00E2; -pub const GPUREG_00E3: i32 = 0x00E3; -pub const GPUREG_00E4: i32 = 0x00E4; -pub const GPUREG_00E5: i32 = 0x00E5; -pub const GPUREG_00E6: i32 = 0x00E6; -pub const GPUREG_00E7: i32 = 0x00E7; -pub const GPUREG_00E8: i32 = 0x00E8; -pub const GPUREG_00E9: i32 = 0x00E9; -pub const GPUREG_00EA: i32 = 0x00EA; -pub const GPUREG_00EB: i32 = 0x00EB; -pub const GPUREG_00EC: i32 = 0x00EC; -pub const GPUREG_00ED: i32 = 0x00ED; -pub const GPUREG_00EE: i32 = 0x00EE; -pub const GPUREG_00EF: i32 = 0x00EF; -pub const GPUREG_TEXENV4_CONFIG0: i32 = 0x00F0; -pub const GPUREG_TEXENV4_CONFIG1: i32 = 0x00F1; -pub const GPUREG_TEXENV4_CONFIG2: i32 = 0x00F2; -pub const GPUREG_TEXENV4_CONFIG3: i32 = 0x00F3; -pub const GPUREG_TEXENV4_CONFIG4: i32 = 0x00F4; -pub const GPUREG_00F5: i32 = 0x00F5; -pub const GPUREG_00F6: i32 = 0x00F6; -pub const GPUREG_00F7: i32 = 0x00F7; -pub const GPUREG_TEXENV5_CONFIG0: i32 = 0x00F8; -pub const GPUREG_TEXENV5_CONFIG1: i32 = 0x00F9; -pub const GPUREG_TEXENV5_CONFIG2: i32 = 0x00FA; -pub const GPUREG_TEXENV5_CONFIG3: i32 = 0x00FB; -pub const GPUREG_TEXENV5_CONFIG4: i32 = 0x00FC; -pub const GPUREG_00FD: i32 = 0x00FD; -pub const GPUREG_00FE: i32 = 0x00FE; -pub const GPUREG_00FF: i32 = 0x00FF; -pub const GPUREG_COLOROUTPUT_CONFIG: i32 = 0x0100; -pub const GPUREG_BLEND_CONFIG: i32 = 0x0101; -pub const GPUREG_COLORLOGICOP_CONFIG: i32 = 0x0102; -pub const GPUREG_BLEND_COLOR: i32 = 0x0103; -pub const GPUREG_ALPHATEST_CONFIG: i32 = 0x0104; -pub const GPUREG_STENCILTEST_CONFIG: i32 = 0x0105; -pub const GPUREG_STENCILOP_CONFIG: i32 = 0x0106; -pub const GPUREG_DEPTHTEST_CONFIG: i32 = 0x0107; -pub const GPUREG_0108: i32 = 0x0108; -pub const GPUREG_0109: i32 = 0x0109; -pub const GPUREG_010A: i32 = 0x010A; -pub const GPUREG_010B: i32 = 0x010B; -pub const GPUREG_010C: i32 = 0x010C; -pub const GPUREG_010D: i32 = 0x010D; -pub const GPUREG_010E: i32 = 0x010E; -pub const GPUREG_010F: i32 = 0x010F; -pub const GPUREG_0110: i32 = 0x0110; -pub const GPUREG_0111: i32 = 0x0111; -pub const GPUREG_0112: i32 = 0x0112; -pub const GPUREG_0113: i32 = 0x0113; -pub const GPUREG_0114: i32 = 0x0114; -pub const GPUREG_0115: i32 = 0x0115; -pub const GPUREG_DEPTHBUFFER_FORMAT: i32 = 0x0116; -pub const GPUREG_COLORBUFFER_FORMAT: i32 = 0x0117; -pub const GPUREG_0118: i32 = 0x0118; -pub const GPUREG_0119: i32 = 0x0119; -pub const GPUREG_011A: i32 = 0x011A; -pub const GPUREG_011B: i32 = 0x011B; -pub const GPUREG_DEPTHBUFFER_LOC: i32 = 0x011C; -pub const GPUREG_COLORBUFFER_LOC: i32 = 0x011D; -pub const GPUREG_OUTBUFFER_DIM: i32 = 0x011E; -pub const GPUREG_011F: i32 = 0x011F; -pub const GPUREG_0120: i32 = 0x0120; -pub const GPUREG_0121: i32 = 0x0121; -pub const GPUREG_0122: i32 = 0x0122; -pub const GPUREG_0123: i32 = 0x0123; -pub const GPUREG_0124: i32 = 0x0124; -pub const GPUREG_0125: i32 = 0x0125; -pub const GPUREG_0126: i32 = 0x0126; -pub const GPUREG_0127: i32 = 0x0127; -pub const GPUREG_0128: i32 = 0x0128; -pub const GPUREG_0129: i32 = 0x0129; -pub const GPUREG_012A: i32 = 0x012A; -pub const GPUREG_012B: i32 = 0x012B; -pub const GPUREG_012C: i32 = 0x012C; -pub const GPUREG_012D: i32 = 0x012D; -pub const GPUREG_012E: i32 = 0x012E; -pub const GPUREG_012F: i32 = 0x012F; -pub const GPUREG_0130: i32 = 0x0130; -pub const GPUREG_0131: i32 = 0x0131; -pub const GPUREG_0132: i32 = 0x0132; -pub const GPUREG_0133: i32 = 0x0133; -pub const GPUREG_0134: i32 = 0x0134; -pub const GPUREG_0135: i32 = 0x0135; -pub const GPUREG_0136: i32 = 0x0136; -pub const GPUREG_0137: i32 = 0x0137; -pub const GPUREG_0138: i32 = 0x0138; -pub const GPUREG_0139: i32 = 0x0139; -pub const GPUREG_013A: i32 = 0x013A; -pub const GPUREG_013B: i32 = 0x013B; -pub const GPUREG_013C: i32 = 0x013C; -pub const GPUREG_013D: i32 = 0x013D; -pub const GPUREG_013E: i32 = 0x013E; -pub const GPUREG_013F: i32 = 0x013F; -pub const GPUREG_0140: i32 = 0x0140; -pub const GPUREG_0141: i32 = 0x0141; -pub const GPUREG_0142: i32 = 0x0142; -pub const GPUREG_0143: i32 = 0x0143; -pub const GPUREG_0144: i32 = 0x0144; -pub const GPUREG_0145: i32 = 0x0145; -pub const GPUREG_0146: i32 = 0x0146; -pub const GPUREG_0147: i32 = 0x0147; -pub const GPUREG_0148: i32 = 0x0148; -pub const GPUREG_0149: i32 = 0x0149; -pub const GPUREG_014A: i32 = 0x014A; -pub const GPUREG_014B: i32 = 0x014B; -pub const GPUREG_014C: i32 = 0x014C; -pub const GPUREG_014D: i32 = 0x014D; -pub const GPUREG_014E: i32 = 0x014E; -pub const GPUREG_014F: i32 = 0x014F; -pub const GPUREG_0150: i32 = 0x0150; -pub const GPUREG_0151: i32 = 0x0151; -pub const GPUREG_0152: i32 = 0x0152; -pub const GPUREG_0153: i32 = 0x0153; -pub const GPUREG_0154: i32 = 0x0154; -pub const GPUREG_0155: i32 = 0x0155; -pub const GPUREG_0156: i32 = 0x0156; -pub const GPUREG_0157: i32 = 0x0157; -pub const GPUREG_0158: i32 = 0x0158; -pub const GPUREG_0159: i32 = 0x0159; -pub const GPUREG_015A: i32 = 0x015A; -pub const GPUREG_015B: i32 = 0x015B; -pub const GPUREG_015C: i32 = 0x015C; -pub const GPUREG_015D: i32 = 0x015D; -pub const GPUREG_015E: i32 = 0x015E; -pub const GPUREG_015F: i32 = 0x015F; -pub const GPUREG_0160: i32 = 0x0160; -pub const GPUREG_0161: i32 = 0x0161; -pub const GPUREG_0162: i32 = 0x0162; -pub const GPUREG_0163: i32 = 0x0163; -pub const GPUREG_0164: i32 = 0x0164; -pub const GPUREG_0165: i32 = 0x0165; -pub const GPUREG_0166: i32 = 0x0166; -pub const GPUREG_0167: i32 = 0x0167; -pub const GPUREG_0168: i32 = 0x0168; -pub const GPUREG_0169: i32 = 0x0169; -pub const GPUREG_016A: i32 = 0x016A; -pub const GPUREG_016B: i32 = 0x016B; -pub const GPUREG_016C: i32 = 0x016C; -pub const GPUREG_016D: i32 = 0x016D; -pub const GPUREG_016E: i32 = 0x016E; -pub const GPUREG_016F: i32 = 0x016F; -pub const GPUREG_0170: i32 = 0x0170; -pub const GPUREG_0171: i32 = 0x0171; -pub const GPUREG_0172: i32 = 0x0172; -pub const GPUREG_0173: i32 = 0x0173; -pub const GPUREG_0174: i32 = 0x0174; -pub const GPUREG_0175: i32 = 0x0175; -pub const GPUREG_0176: i32 = 0x0176; -pub const GPUREG_0177: i32 = 0x0177; -pub const GPUREG_0178: i32 = 0x0178; -pub const GPUREG_0179: i32 = 0x0179; -pub const GPUREG_017A: i32 = 0x017A; -pub const GPUREG_017B: i32 = 0x017B; -pub const GPUREG_017C: i32 = 0x017C; -pub const GPUREG_017D: i32 = 0x017D; -pub const GPUREG_017E: i32 = 0x017E; -pub const GPUREG_017F: i32 = 0x017F; -pub const GPUREG_0180: i32 = 0x0180; -pub const GPUREG_0181: i32 = 0x0181; -pub const GPUREG_0182: i32 = 0x0182; -pub const GPUREG_0183: i32 = 0x0183; -pub const GPUREG_0184: i32 = 0x0184; -pub const GPUREG_0185: i32 = 0x0185; -pub const GPUREG_0186: i32 = 0x0186; -pub const GPUREG_0187: i32 = 0x0187; -pub const GPUREG_0188: i32 = 0x0188; -pub const GPUREG_0189: i32 = 0x0189; -pub const GPUREG_018A: i32 = 0x018A; -pub const GPUREG_018B: i32 = 0x018B; -pub const GPUREG_018C: i32 = 0x018C; -pub const GPUREG_018D: i32 = 0x018D; -pub const GPUREG_018E: i32 = 0x018E; -pub const GPUREG_018F: i32 = 0x018F; -pub const GPUREG_0190: i32 = 0x0190; -pub const GPUREG_0191: i32 = 0x0191; -pub const GPUREG_0192: i32 = 0x0192; -pub const GPUREG_0193: i32 = 0x0193; -pub const GPUREG_0194: i32 = 0x0194; -pub const GPUREG_0195: i32 = 0x0195; -pub const GPUREG_0196: i32 = 0x0196; -pub const GPUREG_0197: i32 = 0x0197; -pub const GPUREG_0198: i32 = 0x0198; -pub const GPUREG_0199: i32 = 0x0199; -pub const GPUREG_019A: i32 = 0x019A; -pub const GPUREG_019B: i32 = 0x019B; -pub const GPUREG_019C: i32 = 0x019C; -pub const GPUREG_019D: i32 = 0x019D; -pub const GPUREG_019E: i32 = 0x019E; -pub const GPUREG_019F: i32 = 0x019F; -pub const GPUREG_01A0: i32 = 0x01A0; -pub const GPUREG_01A1: i32 = 0x01A1; -pub const GPUREG_01A2: i32 = 0x01A2; -pub const GPUREG_01A3: i32 = 0x01A3; -pub const GPUREG_01A4: i32 = 0x01A4; -pub const GPUREG_01A5: i32 = 0x01A5; -pub const GPUREG_01A6: i32 = 0x01A6; -pub const GPUREG_01A7: i32 = 0x01A7; -pub const GPUREG_01A8: i32 = 0x01A8; -pub const GPUREG_01A9: i32 = 0x01A9; -pub const GPUREG_01AA: i32 = 0x01AA; -pub const GPUREG_01AB: i32 = 0x01AB; -pub const GPUREG_01AC: i32 = 0x01AC; -pub const GPUREG_01AD: i32 = 0x01AD; -pub const GPUREG_01AE: i32 = 0x01AE; -pub const GPUREG_01AF: i32 = 0x01AF; -pub const GPUREG_01B0: i32 = 0x01B0; -pub const GPUREG_01B1: i32 = 0x01B1; -pub const GPUREG_01B2: i32 = 0x01B2; -pub const GPUREG_01B3: i32 = 0x01B3; -pub const GPUREG_01B4: i32 = 0x01B4; -pub const GPUREG_01B5: i32 = 0x01B5; -pub const GPUREG_01B6: i32 = 0x01B6; -pub const GPUREG_01B7: i32 = 0x01B7; -pub const GPUREG_01B8: i32 = 0x01B8; -pub const GPUREG_01B9: i32 = 0x01B9; -pub const GPUREG_01BA: i32 = 0x01BA; -pub const GPUREG_01BB: i32 = 0x01BB; -pub const GPUREG_01BC: i32 = 0x01BC; -pub const GPUREG_01BD: i32 = 0x01BD; -pub const GPUREG_01BE: i32 = 0x01BE; -pub const GPUREG_01BF: i32 = 0x01BF; -pub const GPUREG_01C0: i32 = 0x01C0; -pub const GPUREG_01C1: i32 = 0x01C1; -pub const GPUREG_01C2: i32 = 0x01C2; -pub const GPUREG_01C3: i32 = 0x01C3; -pub const GPUREG_01C4: i32 = 0x01C4; -pub const GPUREG_01C5: i32 = 0x01C5; -pub const GPUREG_01C6: i32 = 0x01C6; -pub const GPUREG_01C7: i32 = 0x01C7; -pub const GPUREG_01C8: i32 = 0x01C8; -pub const GPUREG_01C9: i32 = 0x01C9; -pub const GPUREG_01CA: i32 = 0x01CA; -pub const GPUREG_01CB: i32 = 0x01CB; -pub const GPUREG_01CC: i32 = 0x01CC; -pub const GPUREG_01CD: i32 = 0x01CD; -pub const GPUREG_01CE: i32 = 0x01CE; -pub const GPUREG_01CF: i32 = 0x01CF; -pub const GPUREG_01D0: i32 = 0x01D0; -pub const GPUREG_01D1: i32 = 0x01D1; -pub const GPUREG_01D2: i32 = 0x01D2; -pub const GPUREG_01D3: i32 = 0x01D3; -pub const GPUREG_01D4: i32 = 0x01D4; -pub const GPUREG_01D5: i32 = 0x01D5; -pub const GPUREG_01D6: i32 = 0x01D6; -pub const GPUREG_01D7: i32 = 0x01D7; -pub const GPUREG_01D8: i32 = 0x01D8; -pub const GPUREG_01D9: i32 = 0x01D9; -pub const GPUREG_01DA: i32 = 0x01DA; -pub const GPUREG_01DB: i32 = 0x01DB; -pub const GPUREG_01DC: i32 = 0x01DC; -pub const GPUREG_01DD: i32 = 0x01DD; -pub const GPUREG_01DE: i32 = 0x01DE; -pub const GPUREG_01DF: i32 = 0x01DF; -pub const GPUREG_01E0: i32 = 0x01E0; -pub const GPUREG_01E1: i32 = 0x01E1; -pub const GPUREG_01E2: i32 = 0x01E2; -pub const GPUREG_01E3: i32 = 0x01E3; -pub const GPUREG_01E4: i32 = 0x01E4; -pub const GPUREG_01E5: i32 = 0x01E5; -pub const GPUREG_01E6: i32 = 0x01E6; -pub const GPUREG_01E7: i32 = 0x01E7; -pub const GPUREG_01E8: i32 = 0x01E8; -pub const GPUREG_01E9: i32 = 0x01E9; -pub const GPUREG_01EA: i32 = 0x01EA; -pub const GPUREG_01EB: i32 = 0x01EB; -pub const GPUREG_01EC: i32 = 0x01EC; -pub const GPUREG_01ED: i32 = 0x01ED; -pub const GPUREG_01EE: i32 = 0x01EE; -pub const GPUREG_01EF: i32 = 0x01EF; -pub const GPUREG_01F0: i32 = 0x01F0; -pub const GPUREG_01F1: i32 = 0x01F1; -pub const GPUREG_01F2: i32 = 0x01F2; -pub const GPUREG_01F3: i32 = 0x01F3; -pub const GPUREG_01F4: i32 = 0x01F4; -pub const GPUREG_01F5: i32 = 0x01F5; -pub const GPUREG_01F6: i32 = 0x01F6; -pub const GPUREG_01F7: i32 = 0x01F7; -pub const GPUREG_01F8: i32 = 0x01F8; -pub const GPUREG_01F9: i32 = 0x01F9; -pub const GPUREG_01FA: i32 = 0x01FA; -pub const GPUREG_01FB: i32 = 0x01FB; -pub const GPUREG_01FC: i32 = 0x01FC; -pub const GPUREG_01FD: i32 = 0x01FD; -pub const GPUREG_01FE: i32 = 0x01FE; -pub const GPUREG_01FF: i32 = 0x01FF; -pub const GPUREG_ATTRIBBUFFERS_LOC: i32 = 0x0200; -pub const GPUREG_ATTRIBBUFFERS_FORMAT_LOW: i32 = 0x0201; -pub const GPUREG_ATTRIBBUFFERS_FORMAT_HIGH: i32 = 0x0202; -pub const GPUREG_ATTRIBBUFFER0_CONFIG0: i32 = 0x0203; -pub const GPUREG_ATTRIBBUFFER0_CONFIG1: i32 = 0x0204; -pub const GPUREG_ATTRIBBUFFER0_CONFIG2: i32 = 0x0205; -pub const GPUREG_ATTRIBBUFFER1_CONFIG0: i32 = 0x0206; -pub const GPUREG_ATTRIBBUFFER1_CONFIG1: i32 = 0x0207; -pub const GPUREG_ATTRIBBUFFER1_CONFIG2: i32 = 0x0208; -pub const GPUREG_ATTRIBBUFFER2_CONFIG0: i32 = 0x0209; -pub const GPUREG_ATTRIBBUFFER2_CONFIG1: i32 = 0x020A; -pub const GPUREG_ATTRIBBUFFER2_CONFIG2: i32 = 0x020B; -pub const GPUREG_ATTRIBBUFFER3_CONFIG0: i32 = 0x020C; -pub const GPUREG_ATTRIBBUFFER3_CONFIG1: i32 = 0x020D; -pub const GPUREG_ATTRIBBUFFER3_CONFIG2: i32 = 0x020E; -pub const GPUREG_ATTRIBBUFFER4_CONFIG0: i32 = 0x020F; -pub const GPUREG_ATTRIBBUFFER4_CONFIG1: i32 = 0x0210; -pub const GPUREG_ATTRIBBUFFER4_CONFIG2: i32 = 0x0211; -pub const GPUREG_ATTRIBBUFFER5_CONFIG0: i32 = 0x0212; -pub const GPUREG_ATTRIBBUFFER5_CONFIG1: i32 = 0x0213; -pub const GPUREG_ATTRIBBUFFER5_CONFIG2: i32 = 0x0214; -pub const GPUREG_ATTRIBBUFFER6_CONFIG0: i32 = 0x0215; -pub const GPUREG_ATTRIBBUFFER6_CONFIG1: i32 = 0x0216; -pub const GPUREG_ATTRIBBUFFER6_CONFIG2: i32 = 0x0217; -pub const GPUREG_ATTRIBBUFFER7_CONFIG0: i32 = 0x0218; -pub const GPUREG_ATTRIBBUFFER7_CONFIG1: i32 = 0x0219; -pub const GPUREG_ATTRIBBUFFER7_CONFIG2: i32 = 0x021A; -pub const GPUREG_ATTRIBBUFFER8_CONFIG0: i32 = 0x021B; -pub const GPUREG_ATTRIBBUFFER8_CONFIG1: i32 = 0x021C; -pub const GPUREG_ATTRIBBUFFER8_CONFIG2: i32 = 0x021D; -pub const GPUREG_ATTRIBBUFFER9_CONFIG0: i32 = 0x021E; -pub const GPUREG_ATTRIBBUFFER9_CONFIG1: i32 = 0x021F; -pub const GPUREG_ATTRIBBUFFER9_CONFIG2: i32 = 0x0220; -pub const GPUREG_ATTRIBBUFFERA_CONFIG0: i32 = 0x0221; -pub const GPUREG_ATTRIBBUFFERA_CONFIG1: i32 = 0x0222; -pub const GPUREG_ATTRIBBUFFERA_CONFIG2: i32 = 0x0223; -pub const GPUREG_ATTRIBBUFFERB_CONFIG0: i32 = 0x0224; -pub const GPUREG_ATTRIBBUFFERB_CONFIG1: i32 = 0x0225; -pub const GPUREG_ATTRIBBUFFERB_CONFIG2: i32 = 0x0226; -pub const GPUREG_INDEXBUFFER_CONFIG: i32 = 0x0227; -pub const GPUREG_NUMVERTICES: i32 = 0x0228; -pub const GPUREG_GEOSTAGE_CONFIG: i32 = 0x0229; -pub const GPUREG_022A: i32 = 0x022A; -pub const GPUREG_022B: i32 = 0x022B; -pub const GPUREG_022C: i32 = 0x022C; -pub const GPUREG_022D: i32 = 0x022D; -pub const GPUREG_DRAWARRAYS: i32 = 0x022E; -pub const GPUREG_DRAWELEMENTS: i32 = 0x022F; -pub const GPUREG_0230: i32 = 0x0230; -pub const GPUREG_0231: i32 = 0x0231; -pub const GPUREG_0232: i32 = 0x0232; -pub const GPUREG_0233: i32 = 0x0233; -pub const GPUREG_0234: i32 = 0x0234; -pub const GPUREG_0235: i32 = 0x0235; -pub const GPUREG_0236: i32 = 0x0236; -pub const GPUREG_0237: i32 = 0x0237; -pub const GPUREG_0238: i32 = 0x0238; -pub const GPUREG_0239: i32 = 0x0239; -pub const GPUREG_023A: i32 = 0x023A; -pub const GPUREG_023B: i32 = 0x023B; -pub const GPUREG_023C: i32 = 0x023C; -pub const GPUREG_023D: i32 = 0x023D; -pub const GPUREG_023E: i32 = 0x023E; -pub const GPUREG_023F: i32 = 0x023F; -pub const GPUREG_0240: i32 = 0x0240; -pub const GPUREG_0241: i32 = 0x0241; -pub const GPUREG_0242: i32 = 0x0242; -pub const GPUREG_0243: i32 = 0x0243; -pub const GPUREG_0244: i32 = 0x0244; -pub const GPUREG_0245: i32 = 0x0245; -pub const GPUREG_0246: i32 = 0x0246; -pub const GPUREG_0247: i32 = 0x0247; -pub const GPUREG_0248: i32 = 0x0248; -pub const GPUREG_0249: i32 = 0x0249; -pub const GPUREG_024A: i32 = 0x024A; -pub const GPUREG_024B: i32 = 0x024B; -pub const GPUREG_024C: i32 = 0x024C; -pub const GPUREG_024D: i32 = 0x024D; -pub const GPUREG_024E: i32 = 0x024E; -pub const GPUREG_024F: i32 = 0x024F; -pub const GPUREG_0250: i32 = 0x0250; -pub const GPUREG_0251: i32 = 0x0251; -pub const GPUREG_0252: i32 = 0x0252; -pub const GPUREG_0253: i32 = 0x0253; -pub const GPUREG_0254: i32 = 0x0254; -pub const GPUREG_0255: i32 = 0x0255; -pub const GPUREG_0256: i32 = 0x0256; -pub const GPUREG_0257: i32 = 0x0257; -pub const GPUREG_0258: i32 = 0x0258; -pub const GPUREG_0259: i32 = 0x0259; -pub const GPUREG_025A: i32 = 0x025A; -pub const GPUREG_025B: i32 = 0x025B; -pub const GPUREG_025C: i32 = 0x025C; -pub const GPUREG_025D: i32 = 0x025D; -pub const GPUREG_PRIMITIVE_CONFIG: i32 = 0x025E; -pub const GPUREG_025F: i32 = 0x025F; -pub const GPUREG_0260: i32 = 0x0260; -pub const GPUREG_0261: i32 = 0x0261; -pub const GPUREG_0262: i32 = 0x0262; -pub const GPUREG_0263: i32 = 0x0263; -pub const GPUREG_0264: i32 = 0x0264; -pub const GPUREG_0265: i32 = 0x0265; -pub const GPUREG_0266: i32 = 0x0266; -pub const GPUREG_0267: i32 = 0x0267; -pub const GPUREG_0268: i32 = 0x0268; -pub const GPUREG_0269: i32 = 0x0269; -pub const GPUREG_026A: i32 = 0x026A; -pub const GPUREG_026B: i32 = 0x026B; -pub const GPUREG_026C: i32 = 0x026C; -pub const GPUREG_026D: i32 = 0x026D; -pub const GPUREG_026E: i32 = 0x026E; -pub const GPUREG_026F: i32 = 0x026F; -pub const GPUREG_0270: i32 = 0x0270; -pub const GPUREG_0271: i32 = 0x0271; -pub const GPUREG_0272: i32 = 0x0272; -pub const GPUREG_0273: i32 = 0x0273; -pub const GPUREG_0274: i32 = 0x0274; -pub const GPUREG_0275: i32 = 0x0275; -pub const GPUREG_0276: i32 = 0x0276; -pub const GPUREG_0277: i32 = 0x0277; -pub const GPUREG_0278: i32 = 0x0278; -pub const GPUREG_0279: i32 = 0x0279; -pub const GPUREG_027A: i32 = 0x027A; -pub const GPUREG_027B: i32 = 0x027B; -pub const GPUREG_027C: i32 = 0x027C; -pub const GPUREG_027D: i32 = 0x027D; -pub const GPUREG_027E: i32 = 0x027E; -pub const GPUREG_027F: i32 = 0x027F; -pub const GPUREG_GSH_BOOLUNIFORM: i32 = 0x0280; -pub const GPUREG_GSH_INTUNIFORM_I0: i32 = 0x0281; -pub const GPUREG_GSH_INTUNIFORM_I1: i32 = 0x0282; -pub const GPUREG_GSH_INTUNIFORM_I2: i32 = 0x0283; -pub const GPUREG_GSH_INTUNIFORM_I3: i32 = 0x0284; -pub const GPUREG_0285: i32 = 0x0285; -pub const GPUREG_0286: i32 = 0x0286; -pub const GPUREG_0287: i32 = 0x0287; -pub const GPUREG_0288: i32 = 0x0288; -pub const GPUREG_GSH_INPUTBUFFER_CONFIG: i32 = 0x0289; -pub const GPUREG_GSH_ENTRYPOINT: i32 = 0x028A; -pub const GPUREG_GSH_ATTRIBUTES_PERMUTATION_LOW: i32 = 0x028B; -pub const GPUREG_GSH_ATTRIBUTES_PERMUTATION_HIGH: i32 = 0x028C; -pub const GPUREG_GSH_OUTMAP_MASK: i32 = 0x028D; -pub const GPUREG_028E: i32 = 0x028E; -pub const GPUREG_GSH_CODETRANSFER_END: i32 = 0x028F; -pub const GPUREG_GSH_FLOATUNIFORM_CONFIG: i32 = 0x0290; -pub const GPUREG_GSH_FLOATUNIFORM_DATA: i32 = 0x0291; -pub const GPUREG_0299: i32 = 0x0299; -pub const GPUREG_029A: i32 = 0x029A; -pub const GPUREG_GSH_CODETRANSFER_CONFIG: i32 = 0x029B; -pub const GPUREG_GSH_CODETRANSFER_DATA: i32 = 0x029C; -pub const GPUREG_02A4: i32 = 0x02A4; -pub const GPUREG_GSH_OPDESCS_CONFIG: i32 = 0x02A5; -pub const GPUREG_GSH_OPDESCS_DATA: i32 = 0x02A6; -pub const GPUREG_02AE: i32 = 0x02AE; -pub const GPUREG_02AF: i32 = 0x02AF; -pub const GPUREG_VSH_BOOLUNIFORM: i32 = 0x02B0; -pub const GPUREG_VSH_INTUNIFORM_I0: i32 = 0x02B1; -pub const GPUREG_VSH_INTUNIFORM_I1: i32 = 0x02B2; -pub const GPUREG_VSH_INTUNIFORM_I2: i32 = 0x02B3; -pub const GPUREG_VSH_INTUNIFORM_I3: i32 = 0x02B4; -pub const GPUREG_02B5: i32 = 0x02B5; -pub const GPUREG_02B6: i32 = 0x02B6; -pub const GPUREG_02B7: i32 = 0x02B7; -pub const GPUREG_02B8: i32 = 0x02B8; -pub const GPUREG_VSH_INPUTBUFFER_CONFIG: i32 = 0x02B9; -pub const GPUREG_VSH_ENTRYPOINT: i32 = 0x02BA; -pub const GPUREG_VSH_ATTRIBUTES_PERMUTATION_LOW: i32 = 0x02BB; -pub const GPUREG_VSH_ATTRIBUTES_PERMUTATION_HIGH: i32 = 0x02BC; -pub const GPUREG_VSH_OUTMAP_MASK: i32 = 0x02BD; -pub const GPUREG_02BE: i32 = 0x02BE; -pub const GPUREG_VSH_CODETRANSFER_END: i32 = 0x02BF; -pub const GPUREG_VSH_FLOATUNIFORM_CONFIG: i32 = 0x02C0; -pub const GPUREG_VSH_FLOATUNIFORM_DATA: i32 = 0x02C1; -pub const GPUREG_02C9: i32 = 0x02C9; -pub const GPUREG_02CA: i32 = 0x02CA; -pub const GPUREG_VSH_CODETRANSFER_CONFIG: i32 = 0x02CB; -pub const GPUREG_VSH_CODETRANSFER_DATA: i32 = 0x02CC; -pub const GPUREG_02D4: i32 = 0x02D4; -pub const GPUREG_VSH_OPDESCS_CONFIG: i32 = 0x02D5; -pub const GPUREG_VSH_OPDESCS_DATA: i32 = 0x02D6; -pub const GPUREG_02DE: i32 = 0x02DE; -pub const GPUREG_02DF: i32 = 0x02DF; -pub const GPUREG_02E0: i32 = 0x02E0; -pub const GPUREG_02E1: i32 = 0x02E1; -pub const GPUREG_02E2: i32 = 0x02E2; -pub const GPUREG_02E3: i32 = 0x02E3; -pub const GPUREG_02E4: i32 = 0x02E4; -pub const GPUREG_02E5: i32 = 0x02E5; -pub const GPUREG_02E6: i32 = 0x02E6; -pub const GPUREG_02E7: i32 = 0x02E7; -pub const GPUREG_02E8: i32 = 0x02E8; -pub const GPUREG_02E9: i32 = 0x02E9; -pub const GPUREG_02EA: i32 = 0x02EA; -pub const GPUREG_02EB: i32 = 0x02EB; -pub const GPUREG_02EC: i32 = 0x02EC; -pub const GPUREG_02ED: i32 = 0x02ED; -pub const GPUREG_02EE: i32 = 0x02EE; -pub const GPUREG_02EF: i32 = 0x02EF; -pub const GPUREG_02F0: i32 = 0x02F0; -pub const GPUREG_02F1: i32 = 0x02F1; -pub const GPUREG_02F2: i32 = 0x02F2; -pub const GPUREG_02F3: i32 = 0x02F3; -pub const GPUREG_02F4: i32 = 0x02F4; -pub const GPUREG_02F5: i32 = 0x02F5; -pub const GPUREG_02F6: i32 = 0x02F6; -pub const GPUREG_02F7: i32 = 0x02F7; -pub const GPUREG_02F8: i32 = 0x02F8; -pub const GPUREG_02F9: i32 = 0x02F9; -pub const GPUREG_02FA: i32 = 0x02FA; -pub const GPUREG_02FB: i32 = 0x02FB; -pub const GPUREG_02FC: i32 = 0x02FC; -pub const GPUREG_02FD: i32 = 0x02FD; -pub const GPUREG_02FE: i32 = 0x02FE; -pub const GPUREG_02FF: i32 = 0x02FF diff --git a/src/raw/gpu/shader_program.rs b/src/raw/gpu/shader_program.rs deleted file mode 100644 index bf373e1..0000000 --- a/src/raw/gpu/shader_program.rs +++ /dev/null @@ -1,42 +0,0 @@ -use super::shbin::*; - -#[repr(C)] -#[derive(Copy)] -pub struct float24Uniform_s { - id: u32, - data: [u32; 3usize] -} - -#[repr(C)] -#[derive(Copy)] -pub struct shaderInstance_s { - pub dvle: *mut DVLE_s; - pub boolUniforms: u16, - pub intUniforms: [u32; 4usize], - pub float24Uniforms: *mut float24Uniform_s, - pub numFloat24Uniforms: u8, -} - -#[repr(C)] -#[derive(Copy)] -pub struct shaderProgram_s { - pub vertexShader: *mut shaderInstance_s, - pub geometryShader: *mut shaderInstance_s, - pub geometryShaderInputStride: u8, -} - -use ctru::Result; - - -extern "C" { - pub fn shaderInstanceInit(si: *mut shaderInstance_s, dvle: *mut DVLE_s) -> Result; - pub fn shaderInstanceFree(si: *mut shaderInstance_s) -> Result; - pub fn shaderInstanceSetBool(si: *mut shaderInstance_s, id: ::libc::c_int, value: u8) -> Result; - pub fn shaderInstanceGetBool(si: *mut shaderInstance_s, id: ::libc::c_int, value: *mut u8) -> Result; - pub fn shaderInstanceGetUniformLocation(si: *mut shaderInstance_s, name: *const ::libc::c_char) -> Result; - pub fn shaderProgramInit(sp: *mut shaderProgram_s) -> Result; - pub fn shaderProgramFree(sp: *mut shaderProgram_s) -> Result; - pub fn shaderProgramSetVsh(sp: *mut shaderProgram_s, dvle: *mut DVLE_s) -> Result; - pub fn shaderProgramSetGsh(sp: *mut shaderProgram_s, dvle: *mut DVLE_s, stride: _u8) -> Result; - pub fn shaderProgramUse(sp: *mut shaderProgram_s) -> Result; -} diff --git a/src/raw/gpu/shbin.rs b/src/raw/gpu/shbin.rs deleted file mode 100644 index db400d9..0000000 --- a/src/raw/gpu/shbin.rs +++ /dev/null @@ -1,105 +0,0 @@ -typedef enum{ - VERTEX_SHDR=GPU_VERTEX_SHADER, - GEOMETRY_SHDR=GPU_GEOMETRY_SHADER -}DVLE_type; - -#[repr(C)] -pub enum DVLE_type { - VERTEX_SHDR=GPU_VERTEX_SHADER, - GEOMETRY_SHDR=GPU_GEOMETRY_SHADER, -} - -typedef enum{ - DVLE_CONST_BOOL=0x0, - DVLE_CONST_u8=0x1, - DVLE_CONST_FLOAT24=0x2, -}DVLE_constantType; - -#[repr(C)] -pub enum DVLE_constantType { - DVLE_CONST_BOOL = 0x0, - DVLE_CONST_u8 = 0x1, - DVLE_CONST_FLOAT24 = 0x2, -} - -#[repr(C)] -pub enum DVLE_outputAttribute_t { - RESULT_POSITION = 0x0, - RESULT_NORMALQUAT = 0x1, - RESULT_COLOR = 0x2, - RESULT_TEXCOORD0 = 0x3, - RESULT_TEXCOORD0W = 0x4, - RESULT_TEXCOORD1 = 0x5, - RESULT_TEXCOORD2 = 0x6, - RESULT_VIEW = 0x8 -} - -#[repr(C)] -#[derive(Copy)] -pub struct DVLP_s { - codeSize: u32, - codeData: *mut u32, - opdescSize: u32, - opcdescData: *mut u32 -} - -#[repr(C)] -#[derive(Copy)] -pub struct DVLE_constEntry_s { - type: u16, - id: u16, - data: [u32; 4usize] -} - -#[repr(C)] -#[derive(Copy)] -pub struct DVLE_outEntry_s { - type: u16, - regID: u16, - mask: u8, - unk: [u8; 3usize] -} - -#[repr(C)] -#[derive(Copy)] -pub struct DVLE_uniformEntry_s{ - symbolOffset: u32, - startReg: u16, - endReg: u16, -} - -#[repr(C)] -#[derive(Copy)] -pub struct DVLE_s { - DVLE_type type: DVLE_type, - DVLP_s* dvlp: *mut DVLP_s, - mainOffset: u32, - endmainOffset: u32, - constTableSize: u32, - constTableData: *mut DVLE_constEntry_s, - outTableSize: u32, - outTableData: *mut DVLE_outEntry_s, - uniformTableSize: u32, - uniformTableData: *mut DVLE_uniformEntry_s, - symbolTableData: *mut u8, - outmapMask: u8, - outmapData: [u32; 8usize] -} - -#[repr(C)] -#[derive(Copy)] -pub struct DVLB_s { - numDVLE: u32, - DVLP: DVLP_s, - DVLE: *mut DVLE_s -} - -use ctru::raw::types::*; - - -extern "C" { - pub fn DVLB_ParseFile(shbinData: *mut u32, shbinSize: u32) -> *mut DVLB_s; - pub fn DVLB_Free(dvlb: *mut DVLB_s) -> (); - pub fn DVLE_GetUniformRegister(dvle: *mut DVLE_s, name: *const u8) -> s8; - pub fn DVLE_GenerateOutmap(dvle: *mut DVLE_s) -> (); -} diff --git a/src/raw/linear.rs b/src/raw/linear.rs deleted file mode 100644 index 691baef..0000000 --- a/src/raw/linear.rs +++ /dev/null @@ -1,10 +0,0 @@ -use super::c_void; - - -extern "C" { - pub fn linearAlloc(size: i32) -> *mut c_void; - pub fn linearMemAlign(size: i32, alignment: i32) -> *mut c_void; - pub fn linearRealloc(mem: *mut c_void, size: i32) -> *mut c_void; - pub fn linearFree(mem: *mut c_void) -> (); - pub fn linearSpaceFree() -> u32; -} diff --git a/src/raw/mod.rs b/src/raw/mod.rs deleted file mode 100644 index f4947a7..0000000 --- a/src/raw/mod.rs +++ /dev/null @@ -1,25 +0,0 @@ -#![allow(non_camel_case_types)] -#![allow(non_snake_case)] -#![allow(overflowing_literals)] -#![allow(raw_pointer_derive)] - -pub mod console; -pub mod gfx; -pub mod linear; -pub mod os; -pub mod sdmc; -pub mod srv; -pub mod svc; -pub mod types; - -pub mod services; - -pub use self::types::*; - -#[repr(u8)] -pub enum c_void { - __variant1, - __variant2 -} - -pub type ThreadFunc = Option<extern "C" fn(arg1: *mut c_void) -> ()>; diff --git a/src/raw/os.rs b/src/raw/os.rs deleted file mode 100644 index 3ba7022..0000000 --- a/src/raw/os.rs +++ /dev/null @@ -1,15 +0,0 @@ - -#[inline] -pub fn SYSTEM_VERSION(major: i32, minor: i32, revision: i32) { - (((major)<<24)|((minor)<<16)|((revision)<<8)); -} - - -extern "C" { - pub fn osConvertVirtToPhys(vaddr: u32) -> u32; - pub fn osConvertOldLINEARMemToNew(addr: u32) -> u32; - pub fn osStrError(error: u32) -> *const u8; - pub fn osGetFirmVersion() -> u32; - pub fn osGetKernelVersion() -> u32; - pub fn osGetTime() -> u64; -} diff --git a/src/raw/sdmc.rs b/src/raw/sdmc.rs deleted file mode 100644 index 17b2cc8..0000000 --- a/src/raw/sdmc.rs +++ /dev/null @@ -1,7 +0,0 @@ -use super::super::Result; - - -extern "C" { - pub fn sdmcInit() -> Result; - pub fn sdmcExit() -> Result; -} diff --git a/src/raw/services/ac.rs b/src/raw/services/ac.rs deleted file mode 100644 index 0b07ec6..0000000 --- a/src/raw/services/ac.rs +++ /dev/null @@ -1,9 +0,0 @@ -use ::{Handle, Result}; - - -extern "C" { - pub fn acInit() -> Result; - pub fn acExit() -> Result; - pub fn ACU_GetWifiStatus(servhandle: *mut Handle, out: *mut u32) -> Result; - pub fn ACU_WaitInternetConnection() -> Result; -} diff --git a/src/raw/services/am.rs b/src/raw/services/am.rs deleted file mode 100644 index 69f0e17..0000000 --- a/src/raw/services/am.rs +++ /dev/null @@ -1,30 +0,0 @@ -use ::raw::c_void; -use ::{Result, Handle}; - -#[repr(C)] -#[derive(Clone, Copy)] -pub struct TitleList { - titleID: u64, - size: u64, - titleVersion: u16, - unknown2: [u8; 6usize] -} - - -extern "C" { - pub fn amInit() -> Result; - pub fn amExit() -> Result; - pub fn amGetSessionHandle() -> *mut Handle; - pub fn AM_GetTitleCount(mediatype: u8, count: *mut u32) -> Result; - pub fn AM_GetTitleIdList(mediatype: u8, count: u32, titleIDs: *mut u64) -> Result; - pub fn AM_GetDeviceId(deviceID: *mut u32) -> Result; - pub fn AM_ListTitles(mediatype: u8, titleCount: u32, titleIdList: *mut u64, titleList: *mut TitleList) -> Result; - pub fn AM_StartCiaInstall(mediatype: u8, ciaHandle: *mut Handle) -> Result; - pub fn AM_StartDlpChildCiaInstall(ciaHandle: *mut Handle) -> Result; - pub fn AM_CancelCIAInstall(ciaHandle: *mut Handle) -> Result; - pub fn AM_FinishCiaInstall(mediatype: u8, ciaHandle: *mut Handle) -> Result; - pub fn AM_DeleteTitle(mediatype: u8, titleID: u64) -> Result; - pub fn AM_DeleteAppTitle(mediatype: u8, titleID: u64) -> Result; - pub fn AM_InstallFIRM(titleID: u64) -> Result; - pub fn AM_GetTitleProductCode(mediatype: u8, titleID: u64, productCode: *mut c_void) -> Result; -} diff --git a/src/raw/services/apt.rs b/src/raw/services/apt.rs deleted file mode 100644 index 180c2dc..0000000 --- a/src/raw/services/apt.rs +++ /dev/null @@ -1,125 +0,0 @@ -use ::{Handle, Result}; -use ::raw::c_void; - -pub const RUNFLAG_APTWORKAROUND: u32 = 1; -pub const RUNFLAG_APTREINIT: u32 = 2; - -#[repr(C)] -pub enum NS_APPID { - APPID_HOMEMENU = 0x101, // Home Menu - APPID_CAMERA = 0x110, // Camera applet - APPID_FRIENDS_LIST = 0x112, // Friends List applet - APPID_GAME_NOTES = 0x113, // Game Notes applet - APPID_WEB = 0x114, // Internet Browser - APPID_INSTRUCTION_MANUAL = 0x115, // Instruction Manual applet - APPID_NOTIFICATIONS = 0x116, // Notifications applet - APPID_MIIVERSE = 0x117, // Miiverse applet - APPID_APPLICATION = 0x300, // Application - APPID_SOFTWARE_KEYBOARD = 0x401, // Software Keyboard - APPID_APPLETED = 0x402, // appletEd - APPID_PNOTE_AP = 0x404, // PNOTE_AP - APPID_SNOTE_AP = 0x405, // SNOTE_AP - APPID_ERROR = 0x406, // error - APPID_MINT = 0x407, // mint - APPID_EXTRAPAD = 0x408, // extrapad - APPID_MEMOLIB = 0x409, // memolib -} // cf http://3dbrew.org/wiki/NS_and_APT_Services#AppIDs - -#[repr(C)] -pub enum APP_STATUS { - APP_NOTINITIALIZED, - APP_RUNNING, - APP_SUSPENDED, - APP_EXITING, - APP_SUSPENDING, - APP_SLEEPMODE, - APP_PREPARE_SLEEPMODE, - APP_APPLETSTARTED, - APP_APPLETCLOSED -} - -#[repr(C)] -pub enum APTSIGNAL { - APTSIGNAL_HOMEBUTTON = 1, - // 2: sleep-mode related? - APTSIGNAL_PREPARESLEEP = 3, - // 4: triggered when ptm:s GetShellStatus() returns 5. - APTSIGNAL_ENTERSLEEP = 5, - APTSIGNAL_WAKEUP = 6, - APTSIGNAL_ENABLE = 7, - APTSIGNAL_POWERBUTTON = 8, - APTSIGNAL_UTILITY = 9, - APTSIGNAL_SLEEPSYSTEM = 10, - APTSIGNAL_ERROR = 11 -} - -#[repr(C)] -pub enum APTHOOK { - APTHOOK_ONSUSPEND = 0, - APTHOOK_ONRESTORE, - APTHOOK_ONSLEEP, - APTHOOK_ONWAKEUP, - APTHOOK_ONEXIT, - - APTHOOK_COUNT, -} - -type aptHookFn = Option<extern "C" fn(hook: i32, param: *mut c_void) -> ()>; - -#[repr(C)] -#[derive(Clone, Copy)] -pub struct aptHookCookie { - next: *mut aptHookCookie, - callback: aptHookFn, - param: *mut c_void, -} - - -extern "C" { - pub static mut aptEvents: [Handle; 3usize]; - - pub fn aptInit() -> Result; - pub fn aptExit() -> (); - pub fn aptOpenSession() -> (); - pub fn aptCloseSession() -> (); - pub fn aptSetStatus(status: APP_STATUS) -> (); - pub fn aptGetStatus() -> APP_STATUS; - pub fn aptGetStatusPower() -> u32; - pub fn aptSetStatusPower(status: u32) -> (); - pub fn aptReturnToMenu() -> (); - pub fn aptWaitStatusEvent() -> (); - pub fn aptSignalReadyForSleep() -> (); - pub fn aptGetMenuAppID() -> NS_APPID; - pub fn aptMainLoop() -> u8; - pub fn APT_GetLockHandle(handle: *mut Handle, flags: u16, lockHandle: *mut Handle) -> Result; - pub fn APT_Initialize(handle: *mut Handle, appId: NS_APPID, eventHandle1: *mut Handle, eventHandle2: *mut Handle) -> Result; - pub fn APT_HardwareResetAsync(handle: *mut Handle) -> Result; - pub fn APT_Enable(handle: *mut Handle, a: u32) -> Result; - pub fn APT_GetAppletManInfo(handle: *mut Handle, inval: u8, outval8: *mut u8, outval32: *mut u32, menu_appid: *mut NS_APPID, active_appid: *mut NS_APPID) -> Result; - pub fn APT_PrepareToJumpToHomeMenu(handle: *mut Handle) -> Result; - pub fn APT_JumpToHomeMenu(handle: *mut Handle, a: u32, b: u32, c: u32) -> Result; - pub fn APT_IsRegistered(handle: *mut Handle, appID: NS_APPID, out: *mut u8) -> Result; - pub fn APT_InquireNotification(handle: *mut Handle, appID: u32, signalType: *mut u8) -> Result; - pub fn APT_NotifyToWait(handle: *mut Handle, appID: NS_APPID) -> Result; - pub fn APT_AppletUtility(handle: *mut Handle, out: *mut u32, a: u32, size1: u32, buf1: *mut u8, size2: u32, buf2: *mut u8) -> Result; - pub fn APT_GlanceParameter(handle: *mut Handle, appID: NS_APPID, bufferSize: u32, buffer: *mut u32, actualSize: *mut u32, signalType: *mut u8) -> Result; - pub fn APT_ReceiveParameter(handle: *mut Handle, appID: NS_APPID, bufferSize: u32, buffer: *mut u32, actualSize: *mut u32, signalType: *mut u8) -> Result; - pub fn APT_SendParameter(handle: *mut Handle, src_appID: NS_APPID, dst_appID: NS_APPID, bufferSize: u32, buffer: *mut u32, paramhandle: Handle, signalType: u8) -> Result; - pub fn APT_SendCaptureBufferInfo(handle: *mut Handle, bufferSize: u32, buffer: *mut u32) -> Result; - pub fn APT_ReplySleepQuery(handle: *mut Handle, appID: NS_APPID, a: u32) -> Result; - pub fn APT_ReplySleepNotificationComplete(handle: *mut Handle, appID: NS_APPID) -> Result; - pub fn APT_PrepareToCloseApplication(handle: *mut Handle, a: u8) -> Result; - pub fn APT_CloseApplication(handle: *mut Handle, a: u32, b: u32, c: u32) -> Result; - pub fn APT_SetAppCpuTimeLimit(handle: *mut Handle, percent: u32) -> Result; - pub fn APT_GetAppCpuTimeLimit(handle: *mut Handle, percent: *mut u32) -> Result; - pub fn APT_CheckNew3DS_Application(handle: *mut Handle, out: *mut u8) -> Result; - pub fn APT_CheckNew3DS_System(handle: *mut Handle, out: *mut u8) -> Result; - pub fn APT_CheckNew3DS(handle: *mut Handle, out: *mut u8) -> Result; - pub fn APT_PrepareToDoAppJump(handle: *mut Handle, flags: u8, programID: u64, mediatype: u8) -> Result; - pub fn APT_DoAppJump(handle: *mut Handle, NSbuf0Size: u32, NSbuf1Size: u32, NSbuf0Ptr: *mut u8, NSbuf1Ptr: *mut u8) -> Result; - pub fn APT_PrepareToStartLibraryApplet(handle: *mut Handle, appID: NS_APPID) -> Result; - pub fn APT_StartLibraryApplet(handle: *mut Handle, appID: NS_APPID, inhandle: Handle, parambuf: *mut u32, parambufsize: u32) -> Result; - pub fn APT_LaunchLibraryApplet(appID: NS_APPID, inhandle: Handle, parambuf: *mut u32, parambufsize: u32) -> Result; - pub fn APT_PrepareToStartSystemApplet(handle: *mut Handle, appID: NS_APPID) -> Result; - pub fn APT_StartSystemApplet(handle: *mut Handle, appID: NS_APPID, bufSize: u32, applHandle: Handle, buf: *mut u8) -> Result; -} diff --git a/src/raw/services/cfgnor.rs b/src/raw/services/cfgnor.rs deleted file mode 100644 index 1993267..0000000 --- a/src/raw/services/cfgnor.rs +++ /dev/null @@ -1,11 +0,0 @@ -use ::Result; - - -extern "C" { - pub fn CFGNOR_Initialize(value: u8) -> Result; - pub fn CFGNOR_Shutdown() -> Result; - pub fn CFGNOR_ReadData(offset: u32, buf: *mut u32, size: u32) -> Result; - pub fn CFGNOR_WriteData(offset: u32, buf: *mut u32, size: u32) -> Result; - pub fn CFGNOR_DumpFlash(buf: *mut u32, size: u32) -> Result; - pub fn CFGNOR_WriteFlash(buf: *mut u32, size: u32) -> Result; -} diff --git a/src/raw/services/cfgu.rs b/src/raw/services/cfgu.rs deleted file mode 100644 index 6adccf1..0000000 --- a/src/raw/services/cfgu.rs +++ /dev/null @@ -1,16 +0,0 @@ -use ::Result; - - -extern "C" { - pub fn initCfgu() -> Result; - pub fn exitCfgu() -> Result; - pub fn CFGU_SecureInfoGetRegion(region: *mut u8) -> Result; - pub fn CFGU_GenHashConsoleUnique(appIDSalt: u32, hash: *mut u64) -> Result; - pub fn CFGU_GetRegionCanadaUSA(value: *mut u8) -> Result; - pub fn CFGU_GetSystemModel(model: *mut u8) -> Result; - pub fn CFGU_GetModelNintendo2DS(value: *mut u8) -> Result; - pub fn CFGU_GetCountryCodeString(code: u16, string: *mut u16) -> Result; - pub fn CFGU_GetCountryCodeID(string: u16, code: *mut u16) -> Result; - pub fn CFGU_GetConfigInfoBlk2(size: u32, blkID: u32, outData: *mut u8) -> Result; - pub fn CFGU_GetSystemLanguage(language: *mut u8) -> Result; -} diff --git a/src/raw/services/gsp.rs b/src/raw/services/gsp.rs deleted file mode 100644 index 7a4fd8c..0000000 --- a/src/raw/services/gsp.rs +++ /dev/null @@ -1,83 +0,0 @@ -use super::super::types::*; - -#[inline] -pub fn GSP_REBASE_REG(r: u32) { - ((r)-0x1EB00000); -} - -#[repr(C)] -#[derive(Clone, Copy)] -pub struct GSP_FramebufferInfo { - active_framebuf: u32, //"0=first, 1=second" - framebuf0_vaddr: *mut u32, //"Framebuffer virtual address, for the main screen this is the 3D left framebuffer" - framebuf1_vaddr: *mut u32,//"For the main screen: 3D right framebuffer address" - framebuf_widthbytesize: u32, //"Value for 0x1EF00X90, controls framebuffer width" - format: u32,//"Framebuffer format, this u16 is written to the low u16 for LCD register 0x1EF00X70." - framebuf_dispselect: u32, //"Value for 0x1EF00X78, controls which framebuffer is displayed" - unk: u32 //"?" -} - -#[repr(C)] -#[derive(Clone, Copy)] -pub enum GSP_FramebufferFormats { - GSP_RGBA8_OES=0, //pixel_size = 4-bytes - GSP_BGR8_OES=1, //pixel_size = 3-bytes - GSP_RGB565_OES=2, //pixel_size = 2-bytes - GSP_RGB5_A1_OES=3, //pixel_size = 2-bytes - GSP_RGBA4_OES=4 //pixel_size = 2-bytes -} - -#[repr(C)] -#[derive(Clone, Copy)] -pub struct GSP_CaptureInfoEntry { //See this for GSP_CaptureInfoEntry and GSP_CaptureInfo: http://3dbrew.org/wiki/GSPGPU:ImportDisplayCaptureInfo - framebuf0_vaddr: *mut u32, - framebuf1_vaddr: *mut u32, - format: u32, - framebuf_widthbytesize: u32, -} - -#[repr(C)] -#[derive(Clone, Copy)] -pub struct GSP_CaptureInfo { - screencapture: [GSP_CaptureInfoEntry; 2usize] -} - -#[repr(C)] -pub enum GSP_Event { - GSPEVENT_PSC0 = 0, // memory fill completed - GSPEVENT_PSC1, - GSPEVENT_VBlank0, - GSPEVENT_VBlank1, - GSPEVENT_PPF, // display transfer finished - GSPEVENT_P3D, // command list processing finished - GSPEVENT_DMA, - - GSPEVENT_MAX, // used to know how many events there are -} - -use super::super::super::{Result, Handle}; - - -extern "C" { - pub fn gspInit() -> Result; - pub fn gspExit() -> (); - pub fn gspInitEventHandler(gspEvent: Handle, gspSharedMem: *mut vu8, gspThreadId: u8) -> Result; - pub fn gspExitEventHandler() -> (); - pub fn gspWaitForEvent(id: GSP_Event, nextEvent: u8) -> (); - pub fn GSPGPU_AcquireRight(handle: *mut Handle, flags: u8) -> Result; - pub fn GSPGPU_ReleaseRight(handle: *mut Handle) -> Result; - pub fn GSPGPU_ImportDisplayCaptureInfo(handle: *mut Handle, captureinfo: *mut GSP_CaptureInfo) -> Result; - pub fn GSPGPU_SaveVramSysArea(handle: *mut Handle) -> Result; - pub fn GSPGPU_RestoreVramSysArea(handle: *mut Handle) -> Result; - pub fn GSPGPU_SetLcdForceBlack(handle: *mut Handle, flags: u8) -> Result; - pub fn GSPGPU_SetBufferSwap(handle: *mut Handle, screenid: u32, framebufinfo: *mut GSP_FramebufferInfo) -> Result; - pub fn GSPGPU_FlushDataCache(handle: *mut Handle, adr: *mut u8, size: u32) -> Result; - pub fn GSPGPU_InvalidateDataCache(handle: *mut Handle, adr: *mut u8, size: u32) -> Result; - pub fn GSPGPU_WriteHWRegs(handle: *mut Handle, regAddr: u32, data: *mut u32, size: u8) -> Result; - pub fn GSPGPU_WriteHWRegsWithMask(handle: *mut Handle, regAddr: u32, data: *mut u32, datasize: u8, maskdata: *mut u32, masksize: u8) -> Result; - pub fn GSPGPU_ReadHWRegs(handle: *mut Handle, regAddr: u32, data: *mut u32, size: u8) -> Result; - pub fn GSPGPU_RegisterInterruptRelayQueue(handle: *mut Handle, eventHandle: Handle, flags: u32, outMemHandle: *mut Handle, threadID: *mut u8) -> Result; - pub fn GSPGPU_UnregisterInterruptRelayQueue(handle: *mut Handle) -> Result; - pub fn GSPGPU_TriggerCmdReqQueue(handle: *mut Handle) -> Result; - pub fn GSPGPU_SubmitGxCommand(sharedGspCmdBuf: *mut u32, gxCommand: *mut u32, handle: *mut Handle) -> Result; -} diff --git a/src/raw/services/hb.rs b/src/raw/services/hb.rs deleted file mode 100644 index c2a23a6..0000000 --- a/src/raw/services/hb.rs +++ /dev/null @@ -1,11 +0,0 @@ -use ::Result; -use ::raw::c_void; - - -extern "C" { - pub fn hbInit() -> Result; - pub fn hbExit() -> (); - pub fn HB_FlushInvalidateCache() -> Result; - pub fn HB_GetBootloaderAddresses(load3dsx: *mut *mut c_void, setArgv: *mut *mut c_void) -> Result; - pub fn HB_ReprotectMemory(addr: *mut u32, pages: u32, mode: u32, reprotectedPages: *mut u32) -> Result; -} diff --git a/src/raw/services/hid.rs b/src/raw/services/hid.rs deleted file mode 100644 index 28bc672..0000000 --- a/src/raw/services/hid.rs +++ /dev/null @@ -1,103 +0,0 @@ -use ::raw::types::*; -use ::{Result, Handle}; - -pub const HID_SHAREDMEM_DEFAULT: u32 = 0x10000000; - -#[repr(C)] -pub enum PAD_KEY { - KEY_A = 1, - KEY_B = 2, - KEY_SELECT = 4, - KEY_START = 8, - KEY_DRIGHT = 16, - KEY_DLEFT = 32, - KEY_DUP = 64, - KEY_DDOWN = 128, - KEY_R = 256, - KEY_L = 512, - KEY_X = 1024, - KEY_Y = 2048, - KEY_ZL = 4096, // (new 3DS only) - KEY_ZR = 8192, // (new 3DS only) - KEY_TOUCH = 1048576, // Not actually provided by HID - KEY_CSTICK_RIGHT = 16777216, // c-stick (new 3DS only) - KEY_CSTICK_LEFT = 33554432, // c-stick (new 3DS only) - KEY_CSTICK_UP = 67108864, // c-stick (new 3DS only) - KEY_CSTICK_DOWN = 134217728, // c-stick (new 3DS only) - KEY_CPAD_RIGHT = 268435456, // circle pad - KEY_CPAD_LEFT = 536870912, // circle pad - KEY_CPAD_UP = 1073741824, // circle pad - KEY_CPAD_DOWN = 2147483648, // circle pad - - // Generic catch-all directions - /*KEY_UP = KEY_DUP | KEY_CPAD_UP, - KEY_DOWN = KEY_DDOWN | KEY_CPAD_DOWN, - KEY_LEFT = KEY_DLEFT | KEY_CPAD_LEFT, - KEY_RIGHT = KEY_DRIGHT | KEY_CPAD_RIGHT,*/ -} - -#[repr(C)] -#[derive(Clone, Copy)] -pub struct touchPosition { - px: u16, - py: u16, -} - -#[repr(C)] -#[derive(Clone, Copy)] -pub struct circlePosition { - dx: s16, - dy: s16, -} - -#[repr(C)] -#[derive(Clone, Copy)] -pub struct accelVector { - x: s16, - y: s16, - z: s16 -} - -#[repr(C)] -#[derive(Clone, Copy)] -pub struct angularRate { - x: s16, //roll - z: s16, //yaw - y: s16, //pitch -} - -#[repr(C)] -pub enum HID_Event { - HIDEVENT_PAD0 = 0, //"Event signaled by HID-module, when the sharedmem+0(PAD/circle-pad)/+0xA8(touch-screen) region was updated." - HIDEVENT_PAD1, //"Event signaled by HID-module, when the sharedmem+0(PAD/circle-pad)/+0xA8(touch-screen) region was updated." - HIDEVENT_Accel, //"Event signaled by HID-module, when the sharedmem accelerometer state was updated." - HIDEVENT_Gyro, //"Event signaled by HID-module, when the sharedmem gyroscope state was updated." - HIDEVENT_DebugPad, //"Event signaled by HID-module, when the sharedmem DebugPad state was updated." - - HIDEVENT_MAX, // used to know how many events there are -} - - -extern "C" { - pub static hidMemHandle: Handle; - pub static hidSharedMem: *mut vu32; - - pub fn hidInit(sharedMem: *mut u32) -> Result; - pub fn hidExit() -> (); - pub fn hidScanInput() -> (); - pub fn hidKeysHeld() -> u32; - pub fn hidKeysDown() -> u32; - pub fn hidKeysUp() -> u32; - pub fn hidTouchRead(pos: *mut touchPosition) -> (); - pub fn hidCircleRead(pos: *mut circlePosition) -> (); - pub fn hidAccelRead(vector: *mut accelVector) -> (); - pub fn hidGyroRead(rate: *mut angularRate) -> (); - pub fn hidWaitForEvent(id: HID_Event, nextEvent: u8) -> (); - pub fn HIDUSER_GetHandles(outMemHandle: *mut Handle, eventpad0: *mut Handle, eventpad1: *mut Handle, eventaccel: *mut Handle, eventgyro: *mut Handle, eventdebugpad: *mut Handle) -> Result; - pub fn HIDUSER_EnableAccelerometer() -> Result; - pub fn HIDUSER_DisableAccelerometer() -> Result; - pub fn HIDUSER_EnableGyroscope() -> Result; - pub fn HIDUSER_DisableGyroscope() -> Result; - pub fn HIDUSER_GetGyroscopeRawToDpsCoefficient(coeff: *mut f32) -> Result; - pub fn HIDUSER_GetSoundVolume(volume: *mut u8) -> Result; -} diff --git a/src/raw/services/ir.rs b/src/raw/services/ir.rs deleted file mode 100644 index 3affb65..0000000 --- a/src/raw/services/ir.rs +++ /dev/null @@ -1,14 +0,0 @@ -use ::{Result, Handle}; - - -extern "C" { - pub fn IRU_Initialize(sharedmem_addr: *mut u32, sharedmem_size: u32) -> Result; - pub fn IRU_Shutdown() -> Result; - pub fn IRU_GetServHandle() -> Handle; - pub fn IRU_SendData(buf: *mut u8, size: u32, wait: u32) -> Result; - pub fn IRU_RecvData(buf: *mut u8, size: u32, flag: u8, transfercount: *mut u32, wait: u32) -> Result; - pub fn IRU_SetBitRate(value: u8) -> Result; - pub fn IRU_GetBitRate(out: *mut u8) -> Result; - pub fn IRU_SetIRLEDState(value: u32) -> Result; - pub fn IRU_GetIRLEDRecvState(out: *mut u32) -> Result; -} diff --git a/src/raw/services/irrst.rs b/src/raw/services/irrst.rs deleted file mode 100644 index 4187260..0000000 --- a/src/raw/services/irrst.rs +++ /dev/null @@ -1,21 +0,0 @@ -use ::{Result, Handle}; -use ::raw::types::*; - -use super::hid::circlePosition; - - -extern "C" { - pub static irrstMemHandle: Handle; - pub static irrstSharedMem: *mut vu32; - - pub fn irrstInit(sharedMem: *mut u32) -> Result; - pub fn irrstExit() -> (); - pub fn irrstScanInput() -> (); - pub fn irrstKeysHeld() -> u32; - pub fn irrstCstickRead(pos: *mut circlePosition) -> (); - pub fn irrstWaitForEvent(nextEvent: u8) -> (); - pub fn IRRST_GetHandles(outMemHandle: *mut Handle, - outEventHandle: *mut Handle) -> Result; - pub fn IRRST_Initialize(unk1: u32, unk2: u8) -> Result; - pub fn IRRST_Shutdown() -> Result; -} diff --git a/src/raw/services/mic.rs b/src/raw/services/mic.rs deleted file mode 100644 index 64e7746..0000000 --- a/src/raw/services/mic.rs +++ /dev/null @@ -1,19 +0,0 @@ -use ::{Result, Handle}; - - -extern "C" { - pub fn MIC_Initialize(sharedmem: *mut u32, sharedmem_size: u32, control: u8, recording: u8, unk0: u8, unk1: u8, unk2: u8) -> Result; - pub fn MIC_Shutdown() -> Result; - pub fn MIC_GetSharedMemOffsetValue() -> u32; - pub fn MIC_ReadAudioData(outbuf: *mut u8, readsize: u32, waitforevent: u32) -> u32; - pub fn MIC_MapSharedMem(handle: Handle, size: u32) -> Result; - pub fn MIC_UnmapSharedMem() -> Result; - pub fn MIC_cmd3_Initialize(unk0: u8, unk1: u8, sharedmem_baseoffset: u32, sharedmem_endoffset: u32, unk2: u8) -> Result; - pub fn MIC_cmd5() -> Result; - pub fn MIC_GetCNTBit15(out: *mut u8) -> Result; - pub fn MIC_GetEventHandle(handle: *mut Handle) -> Result; - pub fn MIC_SetControl(value: u8) -> Result; - pub fn MIC_GetControl(value: *mut u8) -> Result; - pub fn MIC_SetRecording(value: u8) -> Result; - pub fn MIC_IsRecoding(value: *mut u8) -> Result; -} diff --git a/src/raw/services/mod.rs b/src/raw/services/mod.rs deleted file mode 100644 index ec2d270..0000000 --- a/src/raw/services/mod.rs +++ /dev/null @@ -1,15 +0,0 @@ -pub mod ac; -pub mod am; -pub mod apt; -pub mod cfgnor; -pub mod cfgu; -pub mod gsp; -pub mod hb; -pub mod hid; -pub mod ir; -pub mod irrst; -pub mod mic; -pub mod ns; -pub mod pm; -pub mod ptm; -pub mod soc; diff --git a/src/raw/services/ns.rs b/src/raw/services/ns.rs deleted file mode 100644 index 68a58c2..0000000 --- a/src/raw/services/ns.rs +++ /dev/null @@ -1,9 +0,0 @@ -use ::Result; - - -extern "C" { - pub fn nsInit() -> Result; - pub fn nsExit() -> Result; - pub fn NS_LaunchTitle(titleid: u64, launch_flags: u32, procid: *mut u32) -> Result; - pub fn NS_RebootToTitle(mediatype: u8, titleid: u64) -> Result; -} diff --git a/src/raw/services/pm.rs b/src/raw/services/pm.rs deleted file mode 100644 index 78eb3fd..0000000 --- a/src/raw/services/pm.rs +++ /dev/null @@ -1,12 +0,0 @@ -use ::Result; - - -extern "C" { - pub fn pmInit() -> Result; - pub fn pmExit() -> Result; - pub fn PM_LaunchTitle(mediatype: u8, titleid: u64, launch_flags: u32) -> Result; - pub fn PM_GetTitleExheaderFlags(mediatype: u8, titleid: u64, out: *mut u8) -> Result; - pub fn PM_SetFIRMLaunchParams(size: u32, _in: *mut u8) -> Result; - pub fn PM_GetFIRMLaunchParams(size: u32, out: *mut u8) -> Result; - pub fn PM_LaunchFIRMSetParams(firm_titleid_low: u32, size: u32, _in: *mut u8) -> Result; -} diff --git a/src/raw/services/ptm.rs b/src/raw/services/ptm.rs deleted file mode 100644 index 2743648..0000000 --- a/src/raw/services/ptm.rs +++ /dev/null @@ -1,12 +0,0 @@ -use ::{Result, Handle}; - - -extern "C" { - pub fn ptmInit() -> Result; - pub fn ptmExit() -> Result; - pub fn PTMU_GetShellState(servhandle: *mut Handle, out: *mut u8) -> Result; - pub fn PTMU_GetBatteryLevel(servhandle: *mut Handle, out: *mut u8) -> Result; - pub fn PTMU_GetBatteryChargeState(servhandle: *mut Handle, out: *mut u8) -> Result; - pub fn PTMU_GetPedometerState(servhandle: *mut Handle, out: *mut u8) -> Result; - pub fn PTMU_GetTotalStepCount(servhandle: *mut Handle, steps: *mut u32) -> Result; -} diff --git a/src/raw/services/soc.rs b/src/raw/services/soc.rs deleted file mode 100644 index aff4f1d..0000000 --- a/src/raw/services/soc.rs +++ /dev/null @@ -1,7 +0,0 @@ -use ::Result; - - -extern "C" { - pub fn SOC_Initialize(context_addr: *mut u32, context_size: u32) -> Result; - pub fn SOC_Shutdown() -> Result; -} diff --git a/src/raw/srv.rs b/src/raw/srv.rs deleted file mode 100644 index c327973..0000000 --- a/src/raw/srv.rs +++ /dev/null @@ -1,15 +0,0 @@ -use ::raw::*; -use ::{Result, Handle}; - -extern "C" { - pub fn srvInit() -> Result; - pub fn srvExit() -> Result; - pub fn srvGetSessionHandle() -> * const Handle; - pub fn srvRegisterClient() -> Result; - pub fn srvGetServiceHandle(out: *mut Handle, name: * const u8) -> Result; - pub fn srvRegisterService(out: *mut Handle, name: * const u8) -> Result; - pub fn srvUnregisterService(name: * const u8) -> Result; - pub fn srvPmInit() -> Result; - pub fn srvRegisterProcess(procid: u32, count: u32, serviceaccesscontrol: *mut c_void) -> Result; - pub fn srvUnregisterProcess(procid: u32) -> Result; -} diff --git a/src/raw/svc.rs b/src/raw/svc.rs deleted file mode 100644 index 6fcce62..0000000 --- a/src/raw/svc.rs +++ /dev/null @@ -1,310 +0,0 @@ -use super::*; -use super::super::{Handle, Result}; - -#[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)] -#[derive(Clone, Copy)] -pub struct PageInfo { - pub flags: u32, -} - -#[repr(C)] -pub enum ArbitrationType { - ARBITER_FREE =0, - ARBITER_ACQUIRE =1, - ARBITER_KERNEL2 =2, - ARBITER_ACQUIRE_TIMEOUT=3, - ARBITER_KERNEL4 =4, -} - -#[repr(C)] -pub enum DebugEventType { - DBG_EVENT_PROCESS = 0, - DBG_EVENT_CREATE_THREAD = 1, - DBG_EVENT_EXIT_THREAD = 2, - DBG_EVENT_EXIT_PROCESS = 3, - DBG_EVENT_EXCEPTION = 4, - DBG_EVENT_DLL_LOAD = 5, - DBG_EVENT_DLL_UNLOAD = 6, - DBG_EVENT_SCHEDULE_IN = 7, - DBG_EVENT_SCHEDULE_OUT = 8, - DBG_EVENT_SYSCALL_IN = 9, - DBG_EVENT_SYSCALL_OUT = 10, - DBG_EVENT_OUTPUT_STRING = 11, - DBG_EVENT_MAP = 12 -} - -#[repr(C)] -pub enum ProcessEventReason { - REASON_CREATE = 1, - REASON_ATTACH = 2 -} - -#[repr(C)] -#[derive(Copy)] -pub struct ProcessEvent { - pub program_id: u64, - pub process_name: [u8; 8usize], - pub process_id: u32, - pub reason: u32 -} - -impl Clone for ProcessEvent { - fn clone(&self) -> Self { *self } -} - -#[repr(C)] -#[derive(Copy)] -pub struct CreateThreadEvent { - pub creator_thread_id: u32, - pub base_addr: u32, - pub entry_point: u32 -} - -impl Clone for CreateThreadEvent { - fn clone(&self) -> Self { *self } -} - -#[repr(C)] -pub enum ExitThreadEventReason { - EXITTHREAD_EVENT_NONE = 0, - EXITTHREAD_EVENT_TERMINATE = 1, - EXITTHREAD_EVENT_UNHANDLED_EXC = 2, - EXITTHREAD_EVENT_TERMINATE_PROCESS = 3 -} - -#[repr(C)] -pub enum ExitProcessEventReason { - EXITPROCESS_EVENT_NONE = 0, - EXITPROCESS_EVENT_TERMINATE = 1, - EXITPROCESS_EVENT_UNHANDLED_EXCEPTION = 2 -} - -#[repr(C)] -#[derive(Copy)] -pub struct ExitProcessEvent { - pub reason: u32 -} - -impl Clone for ExitProcessEvent { - fn clone(&self) -> Self { *self } -} - -#[repr(C)] -#[derive(Copy)] -pub struct ExitThreadEvent { - pub reason: u32 -} - -impl Clone for ExitThreadEvent { - fn clone(&self) -> Self { *self } -} - -#[repr(C)] -#[derive(Copy)] -pub struct ExceptionEvent { - pub _type: u32, - pub address: u32, - pub argument: u32 -} - -impl Clone for ExceptionEvent { - fn clone(&self) -> Self { *self } -} - -#[repr(C)] -pub enum ExceptionEventType { - EXC_EVENT_UNDEFINED_INSTRUCTION = 0, // arg: (None) - EXC_EVENT_UNKNOWN1 = 1, // arg: (None) - EXC_EVENT_UNKNOWN2 = 2, // arg: address - EXC_EVENT_UNKNOWN3 = 3, // arg: address - EXC_EVENT_ATTACH_BREAK = 4, // arg: (None) - EXC_EVENT_BREAKPOINT = 5, // arg: (None) - EXC_EVENT_USER_BREAK = 6, // arg: user break type - EXC_EVENT_DEBUGGER_BREAK = 7, // arg: (None) - EXC_EVENT_UNDEFINED_SYSCALL = 8 // arg: attempted syscall -} - -#[repr(C)] -pub enum UserBreakType { - USERBREAK_PANIC = 0, - USERBREAK_ASSERT = 1, - USERBREAK_USER = 2 -} - -/** -* Type of the query for svcGetThreadInfo -*/ -#[repr(C)] -pub enum ThreadInfoType { - THREADINFO_TYPE_UNKNOWN = 0, - VARIANT2 = 1, // needed because enums must have 2+ variants for C representation -} - -#[repr(C)] -#[derive(Copy)] -pub struct SchedulerInOutEvent { - pub clock_tick: u64 -} - -impl Clone for SchedulerInOutEvent { - fn clone(&self) -> Self { *self } -} - -#[repr(C)] -#[derive(Copy)] -pub struct SyscallInOutEvent { - pub clock_tick: u64, - pub syscall: u32, -} - -impl Clone for SyscallInOutEvent { - fn clone(&self) -> Self { *self } -} - -#[repr(C)] -#[derive(Copy)] -pub struct OutputStringEvent { - pub string_addr: u32, - pub string_size: u32 -} - -impl Clone for OutputStringEvent { - fn clone(&self) -> Self { *self } -} - -#[repr(C)] -#[derive(Copy)] -pub struct MapEvent { - pub mapped_addr: u32, - pub mapped_size: u32, - pub memperm: u32, - pub memstate: u32 -} - -impl Clone for MapEvent { - fn clone(&self) -> Self { *self } -} - -#[repr(C)] -#[derive(Copy)] -pub struct DebugEventInfo { - pub _type: u32, - pub thread_id: u32, - pub unknown: [u32; 2usize], - pub eventUnion: [u64; 3usize], // must use transmutes to access contents - // union { - // ProcessEvent process; - // CreateThreadEvent create_thread; - // ExitThreadEvent exit_thread; - // ExitProcessEvent exit_process; - // ExceptionEvent exception; - // /* TODO: DLL_LOAD */ - // /* TODO: DLL_UNLOAD */ - // SchedulerInOutEvent scheduler; - // SyscallInOutEvent syscall; - // OutputStringEvent output_string; - // MapEvent map; - // }; -} - -impl Clone for DebugEventInfo { - fn clone(&self) -> Self { *self } -} - -// getLocalThreadStorage and getThreadCommandBuffer can't be implemented -// due to asm. Custom build step may be necessary. - -extern "C" { - pub fn svcControlMemory(addr_out: *mut u32, addr0: u32, addr1: u32, size: u32, op: MemOp, perm: MemPerm) -> s32; - pub fn svcQueryMemory(info: *mut MemInfo, out: *mut PageInfo, addr: u32) -> s32; - pub fn svcExitProcess() -> (); - pub fn svcCreateThread(thread: *mut Handle, entrypoint: ThreadFunc, arg: u32, stack_top: *mut u32, thread_priority: s32, processor_id: s32) -> s32; - pub fn svcExitThread() -> (); - pub fn svcSleepThread(ns: s64) -> (); - pub fn svcSetThreadPriority(thread: Handle, prio: s32) -> s32; - pub fn svcCreateMutex(mutex: *mut Handle, initially_locked: u8) -> s32; - pub fn svcReleaseMutex(handle: Handle) -> s32; - pub fn svcCreateSemaphore(semaphore: *mut Handle, initial_count: s32, max_count: s32) -> s32; - pub fn svcReleaseSemaphore(count: *mut s32, semaphore: Handle, release_count: s32) -> s32; - pub fn svcCreateEvent(event: *mut Handle, reset_type: u8) -> s32; - pub fn svcSignalEvent(handle: Handle) -> s32; - pub fn svcClearEvent(handle: Handle) -> s32; - pub fn svcCreateTimer(timer: *mut Handle, reset_type: u8) -> s32; - pub fn svcSetTimer(timer: Handle, initial: s64, interval: s64) -> s32; - pub fn svcCancelTimer(timer: Handle) -> s32; - pub fn svcClearTimer(timer: Handle) -> s32; - pub fn svcCreateMemoryBlock(memblock: *mut Handle, addr: u32, size: u32, my_perm: MemPerm, other_perm: MemPerm) -> s32; - pub fn svcMapMemoryBlock(memblock: Handle, addr: u32, my_perm: MemPerm, other_perm: MemPerm) -> s32; - pub fn svcUnmapMemoryBlock(memblock: Handle, addr: u32) -> s32; - pub fn svcCreateAddressArbiter(arbiter: *mut Handle) -> s32; - pub fn svcArbitrateAddress(arbiter: Handle, addr: u32, _type: ArbitrationType, value: s32, nanoseconds: s64) -> s32; - pub fn svcWaitSynchronization(handle: Handle, nanoseconds: s64) -> s32; - pub fn svcWaitSynchronizationN(out: *mut s32, handles: *mut Handle, handles_num: s32, wait_all: u8, nanoseconds: s64) -> s32; - pub fn svcCloseHandle(handle: Handle) -> s32; - pub fn svcDuplicateHandle(out: *mut Handle, original: Handle) -> s32; - pub fn svcGetSystemTick() -> u64; - pub fn svcGetSystemInfo(out: *mut s64, _type: u32, param: s32) -> s32; - pub fn svcGetProcessInfo(out: *mut s64, process: Handle, _type: u32) -> s32; - pub fn svcConnectToPort(out: *mut Handle, portName: *const u8) -> s32; - pub fn svcSendSyncRequest(session: Handle) -> s32; - pub fn svcOpenProcess(process: *mut Handle, processId: u32) -> Result; - pub fn svcGetProcessId(out: *mut u32, handle: Handle) -> s32; - pub fn svcGetThreadId(out: *mut u32, handle: Handle) -> s32; - pub fn svcOutputDebugString(string: *const u8, length: i32) -> s32; - pub fn svcCreatePort(portServer: *mut Handle, portClient: *mut Handle, name: *const u8, maxSessions: s32) -> Result; - pub fn svcDebugActiveProcess(debug: *mut Handle, processId: u32) -> Result; - pub fn svcBreakDebugProcess(debug: Handle) -> Result; - pub fn svcTerminateDebugProcess(debug: Handle) -> Result; - pub fn svcGetProcessDebugEvent(info: *mut DebugEventInfo, debug: Handle) -> Result; - pub fn svcContinueDebugEvent(debug: Handle, flags: u32) -> Result; - pub fn svcGetProcessList(processCount: *mut s32, processIds: *mut u32, processIdMaxCount: s32) -> Result; - pub fn svcReadProcessMemory(buffer: *mut u8, debug: Handle, addr: u32, size: u32) -> Result; - pub fn svcMapProcessMemory(process: Handle, startAddr: u32, endAddr: u32) -> Result; - pub fn svcUnmapProcessMemory(process: Handle, startAddr: u32, endAddr: u32) -> Result; - pub fn svcQueryProcessMemory(info: *mut MemInfo, out: *mut PageInfo, process: Handle, addr: u32) -> Result; - pub fn svcGetProcessorID() -> s32; -} diff --git a/src/raw/types.rs b/src/raw/types.rs deleted file mode 100644 index 3861e72..0000000 --- a/src/raw/types.rs +++ /dev/null @@ -1,35 +0,0 @@ -#[repr(C)] -pub enum mediatypes_enum { - mediatype_NAND = 0, - mediatype_SDMC = 1, - mediatype_GAMECARD = 2, -} - -pub type s8 = i8; -pub type s16 = i16; -pub type s32 = i32; -pub type s64 = i64; - -// UHH, DUNNO HOW TO USE VOLATILES ???? -pub type vu8 = u8; -pub type vu32 = u32; - -// typedef uint8_t u8; -// typedef uint16_t u16; -// typedef uint32_t u32; -// typedef uint64_t u64; -// -// typedef int8_t s8; -// typedef int16_t s16; -// typedef int32_t s32; -// typedef int64_t s64; -// -// typedef volatile u8 vu8; -// typedef volatile u16 vu16; -// typedef volatile u32 vu32; -// typedef volatile u64 vu64; -// -// typedef volatile s8 vs8; -// typedef volatile s16 vs16; -// typedef volatile s32 vs32; -// typedef volatile s64 vs64; diff --git a/src/raw/vram.rs b/src/raw/vram.rs deleted file mode 100644 index 2de9e2f..0000000 --- a/src/raw/vram.rs +++ /dev/null @@ -1,10 +0,0 @@ -use super::types::*; - - -extern "C" { - pub fn vramAlloc(size: isize) -> *mut c_void; - pub fn vramMemAlign(size: isize, alignment: isize) -> *mut c_void; - pub fn vramRealloc(mem: *mut isize, size: isize) -> *mut c_void; - pub fn vramFree(mem: *mut c_void) -> (); - pub fn vramSpaceFree() -> u32; -} diff --git a/src/sdmc.rs b/src/sdmc.rs index e023010..4579789 100644 --- a/src/sdmc.rs +++ b/src/sdmc.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use ::raw::sdmc::*; +use libctru::sdmc::*; pub struct Sdmc { pd: PhantomData<i32> diff --git a/src/services/apt.rs b/src/services/apt.rs index c37ac23..5d3f04f 100644 --- a/src/services/apt.rs +++ b/src/services/apt.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use ::raw::services::apt; +use libctru::services::apt; pub enum AppStatus { NotInitialized, @@ -14,36 +14,36 @@ pub enum AppStatus { AppletClosed } -impl From<AppStatus> for apt::APP_STATUS { - fn from(a: AppStatus) -> apt::APP_STATUS { +impl From<AppStatus> for apt::APT_AppStatus { + fn from(a: AppStatus) -> apt::APT_AppStatus { use self::AppStatus::*; match a { - NotInitialized => apt::APP_STATUS::APP_NOTINITIALIZED, - Running => apt::APP_STATUS::APP_RUNNING, - Suspended => apt::APP_STATUS::APP_SUSPENDED, - Exiting => apt::APP_STATUS::APP_EXITING, - Suspending => apt::APP_STATUS::APP_SUSPENDING, - SleepMode => apt::APP_STATUS::APP_SLEEPMODE, - PrepareSleepMode => apt::APP_STATUS::APP_PREPARE_SLEEPMODE, - AppletStarted => apt::APP_STATUS::APP_APPLETSTARTED, - AppletClosed => apt::APP_STATUS::APP_APPLETCLOSED, + NotInitialized => apt::APT_AppStatus::APP_NOTINITIALIZED, + Running => apt::APT_AppStatus::APP_RUNNING, + Suspended => apt::APT_AppStatus::APP_SUSPENDED, + Exiting => apt::APT_AppStatus::APP_EXITING, + Suspending => apt::APT_AppStatus::APP_SUSPENDING, + SleepMode => apt::APT_AppStatus::APP_SLEEPMODE, + PrepareSleepMode => apt::APT_AppStatus::APP_PREPARE_SLEEPMODE, + AppletStarted => apt::APT_AppStatus::APP_APPLETSTARTED, + AppletClosed => apt::APT_AppStatus::APP_APPLETCLOSED, } } } -impl From<apt::APP_STATUS> for AppStatus { - fn from(a: apt::APP_STATUS) -> AppStatus { +impl From<apt::APT_AppStatus> for AppStatus { + fn from(a: apt::APT_AppStatus) -> AppStatus { use self::AppStatus::*; match a { - apt::APP_STATUS::APP_NOTINITIALIZED => NotInitialized, - apt::APP_STATUS::APP_RUNNING => Running, - apt::APP_STATUS::APP_SUSPENDED => Suspended, - apt::APP_STATUS::APP_EXITING => Exiting, - apt::APP_STATUS::APP_SUSPENDING => Suspending, - apt::APP_STATUS::APP_SLEEPMODE => SleepMode, - apt::APP_STATUS::APP_PREPARE_SLEEPMODE => PrepareSleepMode, - apt::APP_STATUS::APP_APPLETSTARTED => AppletStarted, - apt::APP_STATUS::APP_APPLETCLOSED => AppletClosed + apt::APT_AppStatus::APP_NOTINITIALIZED => NotInitialized, + apt::APT_AppStatus::APP_RUNNING => Running, + apt::APT_AppStatus::APP_SUSPENDED => Suspended, + apt::APT_AppStatus::APP_EXITING => Exiting, + apt::APT_AppStatus::APP_SUSPENDING => Suspending, + apt::APT_AppStatus::APP_SLEEPMODE => SleepMode, + apt::APT_AppStatus::APP_PREPARE_SLEEPMODE => PrepareSleepMode, + apt::APT_AppStatus::APP_APPLETSTARTED => AppletStarted, + apt::APT_AppStatus::APP_APPLETCLOSED => AppletClosed } } } diff --git a/src/services/gsp.rs b/src/services/gsp.rs index fb5b6fe..722bab6 100644 --- a/src/services/gsp.rs +++ b/src/services/gsp.rs @@ -1,4 +1,4 @@ -use ::raw::services::gsp; +use libctru::services::gspgpu; use core::convert::From; @@ -34,9 +34,9 @@ impl FramebufferFormat { } } -impl From<gsp::GSP_FramebufferFormats> for FramebufferFormat { - #[inline] fn from(g: gsp::GSP_FramebufferFormats) -> FramebufferFormat { - use ::raw::services::gsp::GSP_FramebufferFormats::*; +impl From<gspgpu::GSPGPU_FramebufferFormats> for FramebufferFormat { + #[inline] fn from(g: gspgpu::GSPGPU_FramebufferFormats) -> FramebufferFormat { + use libctru::services::gspgpu::GSPGPU_FramebufferFormats::*; use self::FramebufferFormat::*; match g { GSP_RGBA8_OES => Rgba8, @@ -48,9 +48,9 @@ impl From<gsp::GSP_FramebufferFormats> for FramebufferFormat { } } -impl From<FramebufferFormat> for gsp::GSP_FramebufferFormats { - #[inline] fn from(g: FramebufferFormat) -> gsp::GSP_FramebufferFormats { - use ::raw::services::gsp::GSP_FramebufferFormats::*; +impl From<FramebufferFormat> for gspgpu::GSPGPU_FramebufferFormats { + #[inline] fn from(g: FramebufferFormat) -> gspgpu::GSPGPU_FramebufferFormats { + use libctru::services::gspgpu::GSPGPU_FramebufferFormats::*; use self::FramebufferFormat::*; match g { Rgba8 => GSP_RGBA8_OES, @@ -62,18 +62,18 @@ impl From<FramebufferFormat> for gsp::GSP_FramebufferFormats { } } -fn to_raw_event(ev: Event) -> gsp::GSP_Event { - use ::raw::services::gsp::GSP_Event::*; +fn to_raw_event(ev: Event) -> gspgpu::GSPGPU_Event { + use libctru::services::gspgpu::GSPGPU_Event::*; use self::Event::*; match ev { - Psc0 => GSPEVENT_PSC0, - Psc1 => GSPEVENT_PSC1, - VBlank0 => GSPEVENT_VBlank0, - VBlank1 => GSPEVENT_VBlank1, - PPF => GSPEVENT_PPF, - P3D => GSPEVENT_P3D, - DMA => GSPEVENT_DMA + Psc0 => GSPGPU_EVENT_PSC0, + Psc1 => GSPGPU_EVENT_PSC1, + VBlank0 => GSPGPU_EVENT_VBlank0, + VBlank1 => GSPGPU_EVENT_VBlank1, + PPF => GSPGPU_EVENT_PPF, + P3D => GSPGPU_EVENT_P3D, + DMA => GSPGPU_EVENT_DMA } } @@ -91,6 +91,6 @@ fn to_raw_event(ev: Event) -> gsp::GSP_Event { pub fn wait_for_event(ev: Event) -> () { unsafe { // TODO second argument? - gsp::gspWaitForEvent(to_raw_event(ev), 0); + gspgpu::gspWaitForEvent(to_raw_event(ev), 0); } } diff --git a/src/services/hid.rs b/src/services/hid.rs index c0f1ed7..cb96c3a 100644 --- a/src/services/hid.rs +++ b/src/services/hid.rs @@ -1,7 +1,7 @@ use core::convert::Into; use core::marker::PhantomData; -use ::raw::services::hid; +use libctru::services::hid; pub enum PadKey { A, @@ -37,7 +37,7 @@ pub enum PadKey { impl From<PadKey> for u32 { fn from(p: PadKey) -> u32 { - use ::raw::services::hid::PAD_KEY::*; + use libctru::services::hid::PAD_KEY::*; use self::PadKey::*; match p { @@ -80,7 +80,7 @@ pub struct Hid { impl Hid { pub fn new() -> Result<Hid, i32> { unsafe { - let r = hid::hidInit(hid::HID_SHAREDMEM_DEFAULT as *mut u32); + let r = hid::hidInit(); if r < 0 { Err(r) } else { @@ -1,4 +1,4 @@ -use ::raw::srv::*; +use libctru::srv::*; use core::marker::PhantomData; |