X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjoystick.cpp;fp=src%2Fjoystick.cpp;h=86940fc80dc1ae2d13f933784565fa9cfe6f8a79;hb=10d7ab1fb217c01030a0b637f9a571c1faf61ede;hp=208b58b2be51cb5ecbfca18f5206312c2455772e;hpb=376c605508b0c1903dee5357a6d95499c940d258;p=virtualjaguar diff --git a/src/joystick.cpp b/src/joystick.cpp index 208b58b..86940fc 100644 --- a/src/joystick.cpp +++ b/src/joystick.cpp @@ -15,8 +15,9 @@ #include "joystick.h" -#include -#include +//#include +//#include +#include // For memset() #include "gpu.h" #include "jaguar.h" #include "log.h" @@ -24,16 +25,14 @@ // Global vars -static uint8 joystick_ram[4]; -uint8 joypad_0_buttons[21]; -uint8 joypad_1_buttons[21]; +static uint8_t joystick_ram[4]; +uint8_t joypad_0_buttons[21]; +uint8_t joypad_1_buttons[21]; bool keyBuffer[21]; -SDL_Joystick * joystick1; +//SDL_Joystick * joystick1; -//extern bool finished; -////extern bool showGUI; bool GUIKeyHeld = false; extern int start_logging; int gpu_start_log = 0; @@ -52,269 +51,23 @@ bool blitterSingleStep = false; bool bssGo = false; bool bssHeld = false; + void JoystickInit(void) { JoystickReset(); } + void JoystickExec(void) { -// uint8 * keystate = SDL_GetKeyState(NULL); - -// memset(joypad_0_buttons, 0, 21); -// memset(joypad_1_buttons, 0, 21); gpu_start_log = 0; // Only log while key down! effect_start = 0; effect_start2 = effect_start3 = effect_start4 = effect_start5 = effect_start6 = 0; blit_start_log = 0; iLeft = iRight = false; - -#if 0 - if ((keystate[SDLK_LALT] || keystate[SDLK_RALT]) & keystate[SDLK_RETURN]) - ToggleFullscreen(); - - // Keybindings in order of U, D, L, R, C, B, A, Op, Pa, 0-9, #, * -// vjs.p1KeyBindings[0] = sdlemu_getval_int("p1k_up", SDLK_UP); - -#if 0 - if (keystate[vjs.p1KeyBindings[0]]) - joypad_0_buttons[BUTTON_U] = 0x01; - if (keystate[vjs.p1KeyBindings[1]]) - joypad_0_buttons[BUTTON_D] = 0x01; - if (keystate[vjs.p1KeyBindings[2]]) - joypad_0_buttons[BUTTON_L] = 0x01; - if (keystate[vjs.p1KeyBindings[3]]) - joypad_0_buttons[BUTTON_R] = 0x01; - // The buttons are labelled C,B,A on the controller (going from left to right) - if (keystate[vjs.p1KeyBindings[4]]) - joypad_0_buttons[BUTTON_C] = 0x01; - if (keystate[vjs.p1KeyBindings[5]]) - joypad_0_buttons[BUTTON_B] = 0x01; - if (keystate[vjs.p1KeyBindings[6]]) - joypad_0_buttons[BUTTON_A] = 0x01; -//I may yet move these to O and P... - if (keystate[vjs.p1KeyBindings[7]]) - joypad_0_buttons[BUTTON_OPTION] = 0x01; - if (keystate[vjs.p1KeyBindings[8]]) - joypad_0_buttons[BUTTON_PAUSE] = 0x01; - - if (keystate[vjs.p1KeyBindings[9]]) - joypad_0_buttons[BUTTON_0] = 0x01; - if (keystate[vjs.p1KeyBindings[10]]) - joypad_0_buttons[BUTTON_1] = 0x01; - if (keystate[vjs.p1KeyBindings[11]]) - joypad_0_buttons[BUTTON_2] = 0x01; - if (keystate[vjs.p1KeyBindings[12]]) - joypad_0_buttons[BUTTON_3] = 0x01; - if (keystate[vjs.p1KeyBindings[13]]) - joypad_0_buttons[BUTTON_4] = 0x01; - if (keystate[vjs.p1KeyBindings[14]]) - joypad_0_buttons[BUTTON_5] = 0x01; - if (keystate[vjs.p1KeyBindings[15]]) - joypad_0_buttons[BUTTON_6] = 0x01; - if (keystate[vjs.p1KeyBindings[16]]) - joypad_0_buttons[BUTTON_7] = 0x01; - if (keystate[vjs.p1KeyBindings[17]]) - joypad_0_buttons[BUTTON_8] = 0x01; - if (keystate[vjs.p1KeyBindings[18]]) - joypad_0_buttons[BUTTON_9] = 0x01; - if (keystate[vjs.p1KeyBindings[19]]) - joypad_0_buttons[BUTTON_s] = 0x01; - if (keystate[vjs.p1KeyBindings[20]]) - joypad_0_buttons[BUTTON_d] = 0x01; -#else - if (keyBuffer[0]) - joypad_0_buttons[BUTTON_U] = 0x01; - if (keyBuffer[1]) - joypad_0_buttons[BUTTON_D] = 0x01; - if (keyBuffer[2]) - joypad_0_buttons[BUTTON_L] = 0x01; - if (keyBuffer[3]) - joypad_0_buttons[BUTTON_R] = 0x01; - // The buttons are labelled C,B,A on the controller (going from left to right) - if (keyBuffer[4]) - joypad_0_buttons[BUTTON_C] = 0x01; - if (keyBuffer[5]) - joypad_0_buttons[BUTTON_B] = 0x01; - if (keyBuffer[6]) - joypad_0_buttons[BUTTON_A] = 0x01; -//I may yet move these to O and P... - if (keyBuffer[7]) - joypad_0_buttons[BUTTON_OPTION] = 0x01; - if (keyBuffer[8]) - joypad_0_buttons[BUTTON_PAUSE] = 0x01; - - if (keyBuffer[9]) - joypad_0_buttons[BUTTON_0] = 0x01; - if (keyBuffer[10]) - joypad_0_buttons[BUTTON_1] = 0x01; - if (keyBuffer[11]) - joypad_0_buttons[BUTTON_2] = 0x01; - if (keyBuffer[12]) - joypad_0_buttons[BUTTON_3] = 0x01; - if (keyBuffer[13]) - joypad_0_buttons[BUTTON_4] = 0x01; - if (keyBuffer[14]) - joypad_0_buttons[BUTTON_5] = 0x01; - if (keyBuffer[15]) - joypad_0_buttons[BUTTON_6] = 0x01; - if (keyBuffer[16]) - joypad_0_buttons[BUTTON_7] = 0x01; - if (keyBuffer[17]) - joypad_0_buttons[BUTTON_8] = 0x01; - if (keyBuffer[18]) - joypad_0_buttons[BUTTON_9] = 0x01; - if (keyBuffer[19]) - joypad_0_buttons[BUTTON_s] = 0x01; - if (keyBuffer[20]) - joypad_0_buttons[BUTTON_d] = 0x01; -#endif - -#warning "!!! FIX !!! (debounceRunKey)" -// extern bool debounceRunKey; - bool debounceRunKey; - if (keystate[SDLK_ESCAPE]) - { - if (!debounceRunKey) -#warning "!!! FIX !!! (finished = true)" -;// finished = true; - } - else - debounceRunKey = false; - - if (keystate[SDLK_TAB]) - { - if (!GUIKeyHeld) -#warning "!!! FIX !!! (showGUI = !showGUI, ...)" -;// showGUI = !showGUI, GUIKeyHeld = true; - } - else - GUIKeyHeld = false; - - if (keystate[SDLK_q]) - start_logging = 1; - if (keystate[SDLK_w]) - GPUResetStats(); -// if (keystate[SDLK_u]) jaguar_long_write(0xf1c384,jaguar_long_read(0xf1c384)+1); - if (keystate[SDLK_d]) - DumpMainMemory(); - if (keystate[SDLK_l]) - gpu_start_log = 1; - if (keystate[SDLK_o]) - op_start_log = 1; - if (keystate[SDLK_b]) - blit_start_log = 1; - - if (keystate[SDLK_1]) - effect_start = 1; - if (keystate[SDLK_2]) - effect_start2 = 1; - if (keystate[SDLK_3]) - effect_start3 = 1; - if (keystate[SDLK_4]) - effect_start4 = 1; - if (keystate[SDLK_5]) - effect_start5 = 1; - if (keystate[SDLK_6]) - effect_start6 = 1; - - if (keystate[SDLK_i]) - interactiveMode = true; - - if (keystate[SDLK_8] && interactiveMode) - { - if (!keyHeld1) - objectPtr--, keyHeld1 = true; - } - else - keyHeld1 = false; - - if (keystate[SDLK_0] && interactiveMode) - { - if (!keyHeld2) - objectPtr++, keyHeld2 = true; - } - else - keyHeld2 = false; - - if (keystate[SDLK_9] && interactiveMode) - { - if (!keyHeld3) - iToggle = !iToggle, keyHeld3 = true; - } - else - keyHeld3 = false; - - if (keystate[SDLK_e]) - startMemLog = true; - if (keystate[SDLK_r]) - WriteLog("\n--------> MARK!\n\n"); - if (keystate[SDLK_t]) - doDSPDis = true; - if (keystate[SDLK_y]) - doGPUDis = true; - - // BLITTER single step - if (keystate[SDLK_F5]) - blitterSingleStep = true; - - if (keystate[SDLK_F6]) - { - if (!bssHeld) - { - bssHeld = true; - bssGo = true; - } - } - else - bssHeld = false; -#endif - // We need to ensure that illegal combinations are not possible. - // So, we do a simple minded way here... - // It would be better to check to see which one was pressed last - // and discard that one, but for now... -//This didn't work... Was still able to do bad combination. -//It's because the GUI is changing this *after* we fix it here. -#if 0 - if (joypad_0_buttons[BUTTON_R] && joypad_0_buttons[BUTTON_L]) - joypad_0_buttons[BUTTON_L] = 0; - - if (joypad_0_buttons[BUTTON_U] && joypad_0_buttons[BUTTON_D]) - joypad_0_buttons[BUTTON_D] = 0; -#endif - -// This is handled by the GUI layer, as it should -#if 0 - // Joystick support [nwagenaar] - - if (vjs.useJoystick) - { - extern SDL_Joystick * joystick1; - int16 x = SDL_JoystickGetAxis(joystick1, 0), - y = SDL_JoystickGetAxis(joystick1, 1); - - if (x > 16384) - joypad_0_buttons[BUTTON_R] = 0x01; - if (x < -16384) - joypad_0_buttons[BUTTON_L] = 0x01; - if (y > 16384) - joypad_0_buttons[BUTTON_D] = 0x01; - if (y < -16384) - joypad_0_buttons[BUTTON_U] = 0x01; - - if (SDL_JoystickGetButton(joystick1, 0) == SDL_PRESSED) - joypad_0_buttons[BUTTON_A] = 0x01; - if (SDL_JoystickGetButton(joystick1, 1) == SDL_PRESSED) - joypad_0_buttons[BUTTON_B] = 0x01; - if (SDL_JoystickGetButton(joystick1, 2) == SDL_PRESSED) - joypad_0_buttons[BUTTON_C] = 0x01; - } - - // Needed to ensure that the events queue is empty [nwagenaar] - SDL_PumpEvents(); -#endif } + void JoystickReset(void) { memset(joystick_ram, 0x00, 4); @@ -322,11 +75,13 @@ void JoystickReset(void) memset(joypad_1_buttons, 0, 21); } + void JoystickDone(void) { } -uint8 JoystickReadByte(uint32 offset) + +uint8_t JoystickReadByte(uint32_t offset) { // For now, until we can fix the 2nd controller... :-P //memset(joypad_1_buttons, 0, 21); @@ -337,7 +92,7 @@ uint8 JoystickReadByte(uint32 offset) if (offset == 0) { - uint8 data = 0x00; + uint8_t data = 0x00; int pad0Index = joystick_ram[1] & 0x0F; int pad1Index = (joystick_ram[1] >> 4) & 0x0F; @@ -381,7 +136,7 @@ uint8 JoystickReadByte(uint32 offset) else if (offset == 3) { // Hardware ID returns NTSC/PAL identification bit here - uint8 data = 0x2F | (vjs.hardwareTypeNTSC ? 0x10 : 0x00); + uint8_t data = 0x2F | (vjs.hardwareTypeNTSC ? 0x10 : 0x00); int pad0Index = joystick_ram[1] & 0x0F; int pad1Index = (joystick_ram[1] >> 4) & 0x0F; @@ -440,20 +195,24 @@ uint8 JoystickReadByte(uint32 offset) return joystick_ram[offset]; } -uint16 JoystickReadWord(uint32 offset) + +uint16_t JoystickReadWord(uint32_t offset) { - return ((uint16)JoystickReadByte((offset + 0) & 0x03) << 8) | JoystickReadByte((offset + 1) & 0x03); + return ((uint16_t)JoystickReadByte((offset + 0) & 0x03) << 8) | JoystickReadByte((offset + 1) & 0x03); } -void JoystickWriteByte(uint32 offset, uint8 data) + +void JoystickWriteByte(uint32_t offset, uint8_t data) { joystick_ram[offset & 0x03] = data; } -void JoystickWriteWord(uint32 offset, uint16 data) + +void JoystickWriteWord(uint32_t offset, uint16_t data) { #warning "No bounds checking done for JoystickWriteWord!" offset &= 0x03; joystick_ram[offset + 0] = (data >> 8) & 0xFF; joystick_ram[offset + 1] = data & 0xFF; } +