X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjoystick.cpp;h=1768ce91dc63dfa3498ec72ba8bf629ed92107b3;hb=ed33f22a3c3f3ff6be4a9a7156cb36b23e1b4f31;hp=146c15d9e29c547ca5a77efecd58fad27abfb4d9;hpb=966763ef56b837b82cc3727dd95246ba6ae155ce;p=virtualjaguar diff --git a/src/joystick.cpp b/src/joystick.cpp index 146c15d..1768ce9 100644 --- a/src/joystick.cpp +++ b/src/joystick.cpp @@ -3,10 +3,10 @@ // // by cal2 // GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS) -// Cleanups/fixes by James L. Hammons -// (C) 2010 Underground Software +// Extensive rewrite by James Hammons +// (C) 2013 Underground Software // -// JLH = James L. Hammons +// JLH = James Hammons // // Who When What // --- ---------- ------------------------------------------------------------- @@ -14,9 +14,7 @@ // #include "joystick.h" - -#include -#include +#include // For memset() #include "gpu.h" #include "jaguar.h" #include "log.h" @@ -24,16 +22,13 @@ // Global vars -static uint8 joystick_ram[4]; -uint8 joypad_0_buttons[21]; -uint8 joypad_1_buttons[21]; - -bool keyBuffer[21]; +static uint8_t joystick_ram[4]; +uint8_t joypad0Buttons[21]; +uint8_t joypad1Buttons[21]; +bool audioEnabled = false; +bool joysticksEnabled = false; -SDL_Joystick * joystick1; -//extern bool finished; -////extern bool showGUI; bool GUIKeyHeld = false; extern int start_logging; int gpu_start_log = 0; @@ -52,402 +47,136 @@ 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 - - // 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(); } + void JoystickReset(void) { memset(joystick_ram, 0x00, 4); - memset(joypad_0_buttons, 0, 21); - memset(joypad_1_buttons, 0, 21); + memset(joypad0Buttons, 0, 21); + memset(joypad1Buttons, 0, 21); } + void JoystickDone(void) { } -uint8 JoystickReadByte(uint32 offset) + +uint16_t JoystickReadWord(uint32_t offset) { -// For now, until we can fix the 2nd controller... :-P -//memset(joypad_1_buttons, 0, 21); + // E, D, B, 7 + uint8_t joypad0Offset[16] = { + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0C, 0xFF, 0xFF, 0xFF, 0x08, 0xFF, 0x04, 0x00, 0xFF + }; + uint8_t joypad1Offset[16] = { + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x04, 0xFF, 0x08, 0x0C, 0xFF + }; #warning "No bounds checking done in JoystickReadByte!" -// extern bool hardwareTypeNTSC; offset &= 0x03; if (offset == 0) { - uint8 data = 0x00; - int pad0Index = joystick_ram[1] & 0x0F; - int pad1Index = (joystick_ram[1] >> 4) & 0x0F; - -// This is bad--we're assuming that a bit is set in the last case. Might not be so! -// NOTE: values $7, B, D, & E are only legal ones for pad 0, (rows 3 to 0, in both cases) -// $E, D, B, & 7 are only legal ones for pad 1 -// So the following code is WRONG! - - if (!(pad0Index & 0x01)) - pad0Index = 0; - else if (!(pad0Index & 0x02)) - pad0Index = 1; - else if (!(pad0Index & 0x04)) - pad0Index = 2; - else if (!(pad0Index & 0x08)) - pad0Index = 3; - - if (!(pad1Index & 0x01)) - pad1Index = 3; - else if (!(pad1Index & 0x02)) - pad1Index = 2; - else if (!(pad1Index & 0x04)) - pad1Index = 1; - else if (!(pad1Index & 0x08)) - pad1Index = 0; - - if (joypad_0_buttons[(pad0Index << 2) + 0]) data |= 0x01; - if (joypad_0_buttons[(pad0Index << 2) + 1]) data |= 0x02; - if (joypad_0_buttons[(pad0Index << 2) + 2]) data |= 0x04; - if (joypad_0_buttons[(pad0Index << 2) + 3]) data |= 0x08; - if (joypad_1_buttons[(pad1Index << 2) + 0]) data |= 0x10; - if (joypad_1_buttons[(pad1Index << 2) + 1]) data |= 0x20; - if (joypad_1_buttons[(pad1Index << 2) + 2]) data |= 0x40; - if (joypad_1_buttons[(pad1Index << 2) + 3]) data |= 0x80; - - return ~data; - } - else if (offset == 3) - { - // Hardware ID returns NTSC/PAL identification bit here - uint8 data = 0x2F | (vjs.hardwareTypeNTSC ? 0x10 : 0x00); - int pad0Index = joystick_ram[1] & 0x0F; - int pad1Index = (joystick_ram[1] >> 4) & 0x0F; - -//This is more stuff to add to the button reading, as the preceeding only -//yields 16 buttons... -#warning "!!! This reports TeamTap incorrectly when PAUSE pressed on controller #1 or #2 !!!" - if (!(pad0Index & 0x01)) - { - if (joypad_0_buttons[BUTTON_PAUSE]) - data ^= 0x01; - if (joypad_0_buttons[BUTTON_A]) - data ^= 0x02; - } - else if (!(pad0Index & 0x02)) - { - if (joypad_0_buttons[BUTTON_B]) - data ^= 0x02; - } - else if (!(pad0Index & 0x04)) - { - if (joypad_0_buttons[BUTTON_C]) - data ^= 0x02; - } - else if (!(pad0Index & 0x08)) - { - if (joypad_0_buttons[BUTTON_OPTION]) - data ^= 0x02; - } + if (!joysticksEnabled) + return 0xFFFF; - if (!(pad1Index & 0x08)) + // Joystick data returns active low for buttons pressed, high for non- + // pressed. + uint16_t data = 0xFFFF; + uint8_t offset0 = joypad0Offset[joystick_ram[1] & 0x0F]; + uint8_t offset1 = joypad1Offset[(joystick_ram[1] >> 4) & 0x0F]; + + if (offset0 != 0xFF) { - if (joypad_1_buttons[BUTTON_PAUSE]) - data ^= 0x04; - if (joypad_1_buttons[BUTTON_A]) - data ^= 0x08; + uint16_t mask[4] = { 0xFEFF, 0xFDFF, 0xFBFF, 0xF7FF }; + uint16_t msk2[4] = { 0xFFFF, 0xFFFD, 0xFFFB, 0xFFF7 }; + + for(uint8_t i=0; i<4; i++) + data &= (joypad0Buttons[offset0 + i] ? mask[i] : 0xFFFF); + + data &= msk2[offset0 / 4]; } - else if (!(pad1Index & 0x04)) + + if (offset1 != 0xFF) { - if (joypad_1_buttons[BUTTON_B]) - data ^= 0x08; + uint16_t mask[4] = { 0xEFFF, 0xDFFF, 0xBFFF, 0x7FFF }; + uint16_t msk2[4] = { 0xFF7F, 0xFFBF, 0xFFDF, 0xFFEF }; + + for(uint8_t i=0; i<4; i++) + data &= (joypad1Buttons[offset1 + i] ? mask[i] : 0xFFFF); + + data &= msk2[offset1 / 4]; } - else if (!(pad1Index & 0x02)) + + return data; + } + else if (offset == 2) + { + // Hardware ID returns NTSC/PAL identification bit here + // N.B.: On real H/W, bit 7 is *always* zero...! + uint16_t data = 0xFF6F | (vjs.hardwareTypeNTSC ? 0x10 : 0x00); + + if (!joysticksEnabled) + return data; + + // Joystick data returns active low for buttons pressed, high for non- + // pressed. + uint8_t offset0 = joypad0Offset[joystick_ram[1] & 0x0F]; + uint8_t offset1 = joypad1Offset[(joystick_ram[1] >> 4) & 0x0F]; + + if (offset0 != 0xFF) { - if (joypad_1_buttons[BUTTON_C]) - data ^= 0x08; + offset0 /= 4; // Make index 0, 1, 2, 3 instead of 0, 4, 8, 12 + uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, 0xFF }, { BUTTON_C, 0xFF }, { BUTTON_OPTION, 0xFF } }; + data &= (joypad0Buttons[mask[offset0][0]] ? 0xFFFD : 0xFFFF); + + if (mask[offset0][1] != 0xFF) + data &= (joypad0Buttons[mask[offset0][1]] ? 0xFFFE : 0xFFFF); } - else if (!(pad1Index & 0x01)) + + if (offset1 != 0xFF) { - if (joypad_1_buttons[BUTTON_OPTION]) - data ^= 0x08; + offset1 /= 4; // Make index 0, 1, 2, 3 instead of 0, 4, 8, 12 + uint8_t mask[4][2] = { { BUTTON_A, BUTTON_PAUSE }, { BUTTON_B, 0xFF }, { BUTTON_C, 0xFF }, { BUTTON_OPTION, 0xFF } }; + data &= (joypad1Buttons[mask[offset1][0]] ? 0xFFF7 : 0xFFFF); + + if (mask[offset1][1] != 0xFF) + data &= (joypad1Buttons[mask[offset1][1]] ? 0xFFFB : 0xFFFF); } return data; } - return joystick_ram[offset]; + return 0xFFFF; } -uint16 JoystickReadWord(uint32 offset) -{ - return ((uint16)JoystickReadByte((offset + 0) & 0x03) << 8) | JoystickReadByte((offset + 1) & 0x03); -} -void JoystickWriteByte(uint32 offset, uint8 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; + + if (offset == 0) + { + audioEnabled = (data & 0x0100 ? true : false); + joysticksEnabled = (data & 0x8000 ? true : false); + } } +