diff options
-rw-r--r-- | cpu.h | 30 | ||||
-rw-r--r-- | input.h | 24 | ||||
-rw-r--r-- | main.h | 4 |
3 files changed, 27 insertions, 31 deletions
@@ -50,21 +50,21 @@ typedef enum typedef enum { - IRQ_NONE = 0x0000, - IRQ_VBLANK = 0x0001, - IRQ_HBLANK = 0x0002, - IRQ_VCOUNT = 0x0004, - IRQ_TIMER0 = 0x0008, - IRQ_TIMER1 = 0x0010, - IRQ_TIMER2 = 0x0020, - IRQ_TIMER3 = 0x0040, - IRQ_SERIAL = 0x0080, - IRQ_DMA0 = 0x0100, - IRQ_DMA1 = 0x0200, - IRQ_DMA2 = 0x0400, - IRQ_DMA3 = 0x0800, - IRQ_KEYPAD = 0x1000, - IRQ_GAMEPAK = 0x2000, + IRQ_NONE = 0x0000, + IRQ_VBLANK = 0x0001, + IRQ_HBLANK = 0x0002, + IRQ_VCOUNT = 0x0004, + IRQ_TIMER0 = 0x0008, + IRQ_TIMER1 = 0x0010, + IRQ_TIMER2 = 0x0020, + IRQ_TIMER3 = 0x0040, + IRQ_SERIAL = 0x0080, + IRQ_DMA0 = 0x0100, + IRQ_DMA1 = 0x0200, + IRQ_DMA2 = 0x0400, + IRQ_DMA3 = 0x0800, + IRQ_KEYPAD = 0x1000, + IRQ_GAMEPAK = 0x2000 } irq_type; typedef enum @@ -24,17 +24,17 @@ typedef enum { - BUTTON_L = 0x200, - BUTTON_R = 0x100, - BUTTON_DOWN = 0x80, - BUTTON_UP = 0x40, - BUTTON_LEFT = 0x20, - BUTTON_RIGHT = 0x10, - BUTTON_START = 0x08, + BUTTON_L = 0x200, + BUTTON_R = 0x100, + BUTTON_DOWN = 0x80, + BUTTON_UP = 0x40, + BUTTON_LEFT = 0x20, + BUTTON_RIGHT = 0x10, + BUTTON_START = 0x08, BUTTON_SELECT = 0x04, - BUTTON_B = 0x02, - BUTTON_A = 0x01, - BUTTON_NONE = 0x00 + BUTTON_B = 0x02, + BUTTON_A = 0x01, + BUTTON_NONE = 0x00 } input_buttons_type; typedef struct @@ -56,8 +56,8 @@ static const map btn_map[] = { { RETRO_DEVICE_ID_JOYPAD_A, BUTTON_A } }; -void init_input(); -u32 update_input(); +void init_input(void); +u32 update_input(void); void input_write_savestate(void); void input_read_savestate(void); @@ -84,13 +84,9 @@ void main_read_savestate(void); #ifdef PSP_BUILD - u32 file_length(char *filename, s32 dummy); - #else - u32 file_length(const char *dummy, FILE *fp); - #endif extern u32 real_frame_count; |