Flatten imports in gu.rs

Fix style errors

Author: overdrivenpotato

src/psp/audio.rs

@@ -46,30 +46,67 @@ pub enum AudioInputFrequency {
     Khz11_025 = 11025,
 }
 
-extern {
-    pub fn sceAudioChReserve(channel: i32, sample_count: i32, format: AudioFormat) -> i32;
+extern "C" {
+    pub fn sceAudioChReserve(
+        channel: i32,
+        sample_count: i32,
+        format: AudioFormat,
+    ) -> i32;
     pub fn sceAudioChRelease(channel: i32) -> i32;
     pub fn sceAudioOutput(channel: i32, vol: i32, buf: *mut c_void) -> i32;
-    pub fn sceAudioOutputBlocking(channel: i32, vol: i32, buf: *mut c_void) -> i32;
-    pub fn sceAudioOutputPanned(channel: i32, left_vol: i32, right_vol: i32, buf: *mut c_void) -> i32;
-    pub fn sceAudioOutputPannedBlocking(channel: i32, left_vol: i32, right_vol: i32, buf: *mut c_void) -> i32;
+    pub fn sceAudioOutputBlocking(
+        channel: i32,
+        vol: i32,
+        buf: *mut c_void,
+    ) -> i32;
+    pub fn sceAudioOutputPanned(
+        channel: i32,
+        left_vol: i32,
+        right_vol: i32,
+        buf: *mut c_void,
+    ) -> i32;
+    pub fn sceAudioOutputPannedBlocking(
+        channel: i32,
+        left_vol: i32,
+        right_vol: i32,
+        buf: *mut c_void,
+    ) -> i32;
     pub fn sceAudioGetChannelRestLen(channel: i32) -> i32;
     pub fn sceAudioGetChannelRestLength(channel: i32) -> i32;
     pub fn sceAudioSetChannelDataLen(channel: i32, sample_count: i32) -> i32;
-    pub fn sceAudioChangeChannelConfig(channel: i32, format: AudioFormat) -> i32;
-    pub fn sceAudioChangeChannelVolume(channel:i32, left_vol: i32, right_vol:i32) -> i32;
+    pub fn sceAudioChangeChannelConfig(
+        channel: i32,
+        format: AudioFormat,
+    ) -> i32;
+    pub fn sceAudioChangeChannelVolume(
+        channel: i32,
+        left_vol: i32,
+        right_vol: i32,
+    ) -> i32;
     pub fn sceAudioOutput2Reserve(sample_count: i32) -> i32;
     pub fn sceAudioOutput2Release() -> i32;
     pub fn sceAudioOutput2ChangeLength(sample_count: i32) -> i32;
     pub fn sceAudioOutput2OutputBlocking(vol: i32, buf: *mut c_void) -> i32;
     pub fn sceAudioOutput2GetRestSample() -> i32;
-    pub fn sceAudioSRCChReserve(sample_count: i32, freq: AudioOutputFrequency, channels: i32) -> i32;
+    pub fn sceAudioSRCChReserve(
+        sample_count: i32,
+        freq: AudioOutputFrequency,
+        channels: i32,
+    ) -> i32;
     pub fn sceAudioSRCChRelease() -> i32;
     pub fn sceAudioSRCOutputBlocking(vol: i32, buf: *mut c_void) -> i32;
     pub fn sceAudioInputInit(unknown1: i32, gain: i32, unknown2: i32) -> i32;
     pub fn sceAudioInputInitEx(params: *mut AudioInputParams) -> i32;
-    pub fn sceAudioInputBlocking(sample_count: i32, freq: AudioInputFrequency, buf: *mut c_void);
-    pub fn sceAudioInput(sample_count: i32, freq: AudioInputFrequency, buf: *mut c_void);
+    pub fn sceAudioInputBlocking(
+        sample_count: i32,
+        freq: AudioInputFrequency,
+        buf: *mut c_void,
+    );
+    pub fn sceAudioInput(
+        sample_count: i32,
+        freq: AudioInputFrequency,
+        buf: *mut c_void,
+    );
     pub fn sceAudioGetInputLength() -> i32;
     pub fn sceAudioWaitInputEnd() -> i32;
     pub fn sceAudioPollInputEnd() -> i32;

src/psp/ctrl.rs

@@ -24,7 +24,7 @@ pub const PSP_CTRL_MS: i32 = 0x2000000;
 #[repr(u32)]
 pub enum CtrlMode {
     Digital = 0,
-    Analaog
+    Analaog,
 }
 
 #[derive(Copy, Clone)]
@@ -34,8 +34,7 @@ pub struct SceCtrlData {
     pub buttons: i32,
     pub lx: u8,
     pub ly: u8,
-    pub rsrv: [u8;
-6],
+    pub rsrv: [u8; 6],
 }
 
 #[derive(Copy, Clone)]
@@ -47,17 +46,33 @@ pub struct SceCtrlLatch {
     pub ui_release: u32,
 }
 
-extern {
+extern "C" {
     pub fn sceCtrlSetSamplingCycle(cycle: i32) -> i32;
     pub fn sceCtrlGetSamplingCycle(pcycle: *mut i32) -> i32;
     pub fn sceCtrlSetSamplingMode(mode: CtrlMode) -> i32;
     pub fn sceCtrlGetSamplingMode(pmode: *mut i32) -> i32;
-    pub fn sceCtrlPeekBufferPositive(pad_data: *mut SceCtrlData, count: i32) -> i32;
-    pub fn sceCtrlPeekBufferNegative(pad_data: *mut SceCtrlData, count: i32) -> i32;
-    pub fn sceCtrlReadBufferPositive(pad_data: *mut SceCtrlData, count: i32) -> i32;
-    pub fn sceCtrlReadBufferNegative(pad_data: *mut SceCtrlData, count: i32) -> i32;
+    pub fn sceCtrlPeekBufferPositive(
+        pad_data: *mut SceCtrlData,
+        count: i32,
+    ) -> i32;
+    pub fn sceCtrlPeekBufferNegative(
+        pad_data: *mut SceCtrlData,
+        count: i32,
+    ) -> i32;
+    pub fn sceCtrlReadBufferPositive(
+        pad_data: *mut SceCtrlData,
+        count: i32,
+    ) -> i32;
+    pub fn sceCtrlReadBufferNegative(
+        pad_data: *mut SceCtrlData,
+        count: i32,
+    ) -> i32;
     pub fn sceCtrlPeekLatch(latch_data: *mut SceCtrlLatch) -> i32;
     pub fn sceCtrlReadLatch(latch_data: *mut SceCtrlLatch) -> i32;
-    pub fn sceCtrlSetIdleCancelThreshold(idlereset: i32, idleback: i32) -> i32;
-    pub fn sceCtrlGetIdleCancelThreshold(idlereset: *mut i32, idleback: *mut i32) -> i32;
+    pub fn sceCtrlSetIdleCancelThreshold(idlereset: i32, idleback: i32)
+        -> i32;
+    pub fn sceCtrlGetIdleCancelThreshold(
+        idlereset: *mut i32,
+        idleback: *mut i32,
+    ) -> i32;
 }

src/psp/display.rs

@@ -22,9 +22,17 @@ pub enum DisplaySetBufSync {
     NextFrame = 1,
 }
 
-extern {
-    pub fn sceDisplaySetMode(mode: DisplayMode, width: usize, height: usize) -> u32;
-    pub fn sceDisplayGetMode(pmode: *mut i32, pwidth: *mut i32, pheight: *mut i32) -> i32;
+extern "C" {
+    pub fn sceDisplaySetMode(
+        mode: DisplayMode,
+        width: usize,
+        height: usize,
+    ) -> u32;
+    pub fn sceDisplayGetMode(
+        pmode: *mut i32,
+        pwidth: *mut i32,
+        pheight: *mut i32,
+    ) -> i32;
     pub fn sceDisplaySetFrameBuf(
         top_addr: *const u8,
         buffer_width: usize,

src/psp/ge.rs

@@ -9,15 +9,15 @@ pub struct GeContext {
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub struct GeStack {
-    pub stack: [u32;8]
+    pub stack: [u32; 8],
 }
 
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub struct GeCallbackData {
-    pub signal_func: Option<extern fn(id: i32, arg: *mut c_void)>,
+    pub signal_func: Option<extern "C" fn(id: i32, arg: *mut c_void)>,
     pub signal_arg: *mut c_void,
-    pub finish_func: Option<extern fn(id: i32, arg: *mut c_void)>,
+    pub finish_func: Option<extern "C" fn(id: i32, arg: *mut c_void)>,
     pub finish_arg: *mut c_void,
 }
 
@@ -33,7 +33,7 @@ pub struct GeListArgs {
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub struct GeBreakParam {
-    pub buf: [u32;4]
+    pub buf: [u32; 4],
 }
 
 #[derive(Copy, Clone)]
@@ -325,7 +325,7 @@ pub enum GeCommand {
     NopFF = 0xff,
 }
 
-extern {
+extern "C" {
     pub fn sceGeEdramGetSize() -> u32;
     pub fn sceGeEdramGetAddr() -> *mut u8;
     pub fn sceGeEdramSetAddrTranslation(width: i32) -> i32;
@@ -335,12 +335,17 @@ extern {
     pub fn sceGeSaveContext(context: *mut GeContext) -> i32;
     pub fn sceGeRestoreContext(context: *const GeContext) -> i32;
     pub fn sceGeListEnQueue(
-       list: *const c_void,
-       stall: *mut c_void,
-       cbid: i32,
-       arg: *mut GeListArgs,
+        list: *const c_void,
+        stall: *mut c_void,
+        cbid: i32,
+        arg: *mut GeListArgs,
+    ) -> i32;
+    pub fn sceGeListEnQueueHead(
+        list: *const c_void,
+        stall: *mut c_void,
+        cbid: i32,
+        arg: *mut GeListArgs,
     ) -> i32;
-    pub fn sceGeListEnQueueHead(list: *const c_void, stall: *mut c_void, cbid: i32, arg: *mut GeListArgs) -> i32;
     pub fn sceGeListDeQueue(qid: i32) -> i32;
     pub fn sceGeListUpdateStallAddr(qid: i32, stall: *mut c_void) -> i32;
     pub fn sceGeListSync(qid: i32, sync_type: i32) -> GeListState;

src/psp/gu.rs

@@ -1,10 +1,12 @@
 use super::{
-    c_void,
-    ge::{GeContext, GeCommand, GeListState},
-    display::DisplayPixelFormat,
-    types::{ScePspFMatrix4, ScePspFVector3, ScePspIMatrix4},
+    c_void, DisplayPixelFormat, GeCommand, GeContext, GeListState,
+    ScePspFMatrix4, ScePspFVector3, ScePspIMatrix4,
 };
 
+pub type GuCallback = Option<extern "C" fn(id: i32, arg: *mut c_void)>;
+pub type GuSwapBuffersCallback =
+    Option<extern "C" fn(display: *mut *mut c_void, render: *mut *mut c_void)>;
+
 pub const GU_PI: f32 = 3.141593;
 
 #[repr(u32)]
@@ -411,14 +413,24 @@ pub enum ClutPixelFormat {
     Psm8888 = 3,
 }
 
-pub type GuCallback = Option<extern fn(id: i32, arg: *mut c_void)>;
-pub type GuSwapBuffersCallback = Option<extern fn(display: *mut *mut c_void, render: *mut *mut c_void)>;
-
-extern {
+extern "C" {
     pub fn sceGuDepthBuffer(zbp: *mut c_void, zbw: i32);
-    pub fn sceGuDispBuffer(width: i32, height: i32, dispbp: *mut c_void, dispbw: i32);
-    pub fn sceGuDrawBuffer(psm: DisplayPixelFormat, fbp: *mut c_void, fbw: i32);
-    pub fn sceGuDrawBufferList(psm: DisplayPixelFormat, fbp: *mut c_void, fbw: i32);
+    pub fn sceGuDispBuffer(
+        width: i32,
+        height: i32,
+        dispbp: *mut c_void,
+        dispbw: i32,
+    );
+    pub fn sceGuDrawBuffer(
+        psm: DisplayPixelFormat,
+        fbp: *mut c_void,
+        fbw: i32,
+    );
+    pub fn sceGuDrawBufferList(
+        psm: DisplayPixelFormat,
+        fbp: *mut c_void,
+        fbw: i32,
+    );
     pub fn sceGuDisplay(state: bool) -> bool;
     pub fn sceGuDepthFunc(function: DepthFunc);
     pub fn sceGuDepthMask(mask: i32);
@@ -446,9 +458,16 @@ extern {
     pub fn sceGuCallList(list: *const c_void);
     pub fn sceGuCallMode(mode: i32);
     pub fn sceGuCheckList() -> i32;
-    pub fn sceGuSendList(mode: GuQueueMode, list: *const c_void, context: *mut GeContext);
+    pub fn sceGuSendList(
+        mode: GuQueueMode,
+        list: *const c_void,
+        context: *mut GeContext,
+    );
     pub fn sceGuSwapBuffers() -> *mut c_void;
-    pub fn sceGuSync(mode: GuSyncMode, behavior: GuSyncBehavior) -> GeListState;
+    pub fn sceGuSync(
+        mode: GuSyncMode,
+        behavior: GuSyncBehavior,
+    ) -> GeListState;
     pub fn sceGuDrawArray(
         prim: GuPrimitive,
         vtype: i32,
@@ -478,7 +497,12 @@ extern {
     pub fn sceGuLightAtt(light: i32, atten0: f32, atten1: f32, atten2: f32);
     pub fn sceGuLightColor(light: i32, component: i32, color: u32);
     pub fn sceGuLightMode(mode: LightMode);
-    pub fn sceGuLightSpot(light: i32, direction: &ScePspFVector3, exponent: f32, cutoff: f32);
+    pub fn sceGuLightSpot(
+        light: i32,
+        direction: &ScePspFVector3,
+        exponent: f32,
+        cutoff: f32,
+    );
     pub fn sceGuClear(flags: i32);
     pub fn sceGuClearColor(color: u32);
     pub fn sceGuClearDepth(depth: u32);
@@ -500,7 +524,12 @@ extern {
         dest_fix: u32,
     );
     pub fn sceGuMaterial(components: i32, color: u32);
-    pub fn sceGuModelColor(emissive: u32, ambient: u32, diffuse: u32, specular: u32);
+    pub fn sceGuModelColor(
+        emissive: u32,
+        ambient: u32,
+        diffuse: u32,
+        specular: u32,
+    );
     pub fn sceGuStencilFunc(func: StencilFunc, ref_: i32, mask: i32);
     pub fn sceGuStencilOp(
         fail: StencilOperation,
@@ -529,10 +558,21 @@ extern {
     pub fn sceGuTexFilter(min: TextureFilter, mag: TextureFilter);
     pub fn sceGuTexFlush();
     pub fn sceGuTexFunc(tfx: TextureEffect, tcc: TextureColorComponent);
-    pub fn sceGuTexImage(mipmap: MipmapLevel, width: i32, height: i32, tbw: i32, tbp: *const c_void);
+    pub fn sceGuTexImage(
+        mipmap: MipmapLevel,
+        width: i32,
+        height: i32,
+        tbw: i32,
+        tbp: *const c_void,
+    );
     pub fn sceGuTexLevelMode(mode: TextureLevelMode, bias: f32);
     pub fn sceGuTexMapMode(mode: TextureMapMode, a1: u32, a2: u32);
-    pub fn sceGuTexMode(tpsm: TexturePixelFormat, maxmips: i32, a2: i32, swizzle: i32);
+    pub fn sceGuTexMode(
+        tpsm: TexturePixelFormat,
+        maxmips: i32,
+        a2: i32,
+        swizzle: i32,
+    );
     pub fn sceGuTexOffset(u: f32, v: f32);
     pub fn sceGuTexProjMapMode(mode: TextureProjectionMapMode);
     pub fn sceGuTexScale(u: f32, v: f32);
@@ -541,7 +581,12 @@ extern {
     pub fn sceGuTexSync();
     pub fn sceGuTexWrap(u: GuTexWrapMode, v: GuTexWrapMode);
     pub fn sceGuClutLoad(num_blocks: i32, cbp: *const c_void);
-    pub fn sceGuClutMode(cpsm: ClutPixelFormat, shift: u32, mask: u32, a3: u32);
+    pub fn sceGuClutMode(
+        cpsm: ClutPixelFormat,
+        shift: u32,
+        mask: u32,
+        a3: u32,
+    );
     pub fn sceGuOffset(x: u32, y: u32);
     pub fn sceGuScissor(x: i32, y: i32, w: i32, h: i32);
     pub fn sceGuViewport(cx: i32, cy: i32, width: i32, height: i32);

src/psp/gum.rs

@@ -1,6 +1,6 @@
-use super::{c_void, ScePspFMatrix4, ScePspFVector3, MatrixMode, GuPrimitive};
+use super::{c_void, GuPrimitive, MatrixMode, ScePspFMatrix4, ScePspFVector3};
 
-extern {
+extern "C" {
     pub fn sceGumDrawArray(
         prim: GuPrimitive,
         v_type: i32,
@@ -40,7 +40,11 @@ extern {
     pub fn sceGumFullInverse();
     pub fn sceGumLoadIdentity();
     pub fn sceGumLoadMatrix(m: &ScePspFMatrix4);
-    pub fn sceGumLookAt(eye: &ScePspFVector3, center: &ScePspFVector3, up: &ScePspFVector3);
+    pub fn sceGumLookAt(
+        eye: &ScePspFVector3,
+        center: &ScePspFVector3,
+        up: &ScePspFVector3,
+    );
     pub fn sceGumMatrixMode(mode: MatrixMode);
     pub fn sceGumMultMatrix(m: &ScePspFMatrix4);
     pub fn sceGumOrtho(
@@ -49,7 +53,7 @@ extern {
         bottom: f32,
         top: f32,
         near: f32,
-        far: f32
+        far: f32,
     );
     pub fn sceGumPerspective(fovy: f32, aspect: f32, near: f32, far: f32);
     pub fn sceGumPopMatrix();