X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjoystick.cpp;h=2de43cecfabd054952d95b013381141a014acf98;hb=f0e50fb1d23805881b72d51ea603be78b645ec97;hp=5d969d0fd26d0d7b122c30d0ea2d07103968b0f5;hpb=f3e5bb2807319c210d124d6150e019130c54867b;p=virtualjaguar diff --git a/src/joystick.cpp b/src/joystick.cpp index 5d969d0..2de43ce 100644 --- a/src/joystick.cpp +++ b/src/joystick.cpp @@ -4,16 +4,23 @@ // by cal2 // GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS) // Cleanups/fixes by James L. Hammons +// (C) 2010 Underground Software +// +// JLH = James L. Hammons +// +// Who When What +// --- ---------- ------------------------------------------------------------- +// JLH 01/16/2010 Created this log ;-) // #include "joystick.h" -#include #include +#include +#include "gpu.h" +//#include "gui.h" #include "jaguar.h" #include "log.h" -#include "gpu.h" -#include "gui.h" #include "settings.h" #include "video.h" @@ -45,6 +52,9 @@ static uint8 joystick_ram[4]; static uint8 joypad_0_buttons[21]; static uint8 joypad_1_buttons[21]; + +bool keyBuffer[21]; + //extern bool finished; ////extern bool showGUI; bool GUIKeyHeld = false; @@ -72,7 +82,6 @@ void JoystickInit(void) void JoystickExec(void) { -// extern bool useJoystick; uint8 * keystate = SDL_GetKeyState(NULL); memset(joypad_0_buttons, 0, 21); @@ -89,6 +98,7 @@ void JoystickExec(void) // 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]]) @@ -104,6 +114,23 @@ void JoystickExec(void) joypad_0_buttons[BUTTON_B] = 0x01; if (keystate[vjs.p1KeyBindings[6]]) joypad_0_buttons[BUTTON_A] = 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; +#endif //I may yet move these to O and P... if (keystate[vjs.p1KeyBindings[7]]) joypad_0_buttons[BUTTON_OPTION] = 0x01; @@ -135,11 +162,14 @@ void JoystickExec(void) if (keystate[vjs.p1KeyBindings[20]]) joypad_0_buttons[BUTTON_d] = 0x01; - extern bool debounceRunKey; +#warning "!!! FIX !!! (debounceRunKey)" +// extern bool debounceRunKey; + bool debounceRunKey; if (keystate[SDLK_ESCAPE]) { if (!debounceRunKey) - finished = true; +#warning "!!! FIX !!! (finished = true)" +;// finished = true; } else debounceRunKey = false; @@ -147,7 +177,8 @@ void JoystickExec(void) if (keystate[SDLK_TAB]) { if (!GUIKeyHeld) - showGUI = !showGUI, GUIKeyHeld = true; +#warning "!!! FIX !!! (showGUI = !showGUI, ...)" +;// showGUI = !showGUI, GUIKeyHeld = true; } else GUIKeyHeld = false; @@ -155,7 +186,7 @@ void JoystickExec(void) if (keystate[SDLK_q]) start_logging = 1; if (keystate[SDLK_w]) - gpu_reset_stats(); + GPUResetStats(); // if (keystate[SDLK_u]) jaguar_long_write(0xf1c384,jaguar_long_read(0xf1c384)+1); if (keystate[SDLK_d]) DumpMainMemory(); @@ -234,9 +265,9 @@ void JoystickExec(void) if (vjs.useJoystick) { - extern SDL_Joystick * joystick; - int16 x = SDL_JoystickGetAxis(joystick, 0), - y = SDL_JoystickGetAxis(joystick, 1); + extern SDL_Joystick * joystick1; + int16 x = SDL_JoystickGetAxis(joystick1, 0), + y = SDL_JoystickGetAxis(joystick1, 1); if (x > 16384) joypad_0_buttons[BUTTON_R] = 0x01; @@ -247,11 +278,11 @@ void JoystickExec(void) if (y < -16384) joypad_0_buttons[BUTTON_U] = 0x01; - if (SDL_JoystickGetButton(joystick, 0) == SDL_PRESSED) + if (SDL_JoystickGetButton(joystick1, 0) == SDL_PRESSED) joypad_0_buttons[BUTTON_A] = 0x01; - if (SDL_JoystickGetButton(joystick, 1) == SDL_PRESSED) + if (SDL_JoystickGetButton(joystick1, 1) == SDL_PRESSED) joypad_0_buttons[BUTTON_B] = 0x01; - if (SDL_JoystickGetButton(joystick, 2) == SDL_PRESSED) + if (SDL_JoystickGetButton(joystick1, 2) == SDL_PRESSED) joypad_0_buttons[BUTTON_C] = 0x01; } @@ -272,7 +303,7 @@ void JoystickDone(void) uint8 JoystickReadByte(uint32 offset) { -#warning No bounds checking done in JoystickReadByte! +#warning "No bounds checking done in JoystickReadByte!" // extern bool hardwareTypeNTSC; offset &= 0x03; @@ -283,6 +314,10 @@ uint8 JoystickReadByte(uint32 offset) 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)) @@ -319,6 +354,7 @@ uint8 JoystickReadByte(uint32 offset) int pad0Index = joystick_ram[1] & 0x0F; //unused int pad1Index = (joystick_ram[1] >> 4) & 0x0F; +//WTF is this shit? if (!(pad0Index & 0x01)) { if (joypad_0_buttons[BUTTON_PAUSE]) @@ -341,6 +377,7 @@ uint8 JoystickReadByte(uint32 offset) if (joypad_0_buttons[BUTTON_OPTION]) data ^= 0x02; } + return data; } @@ -359,7 +396,7 @@ void JoystickWriteByte(uint32 offset, uint8 data) void JoystickWriteWord(uint32 offset, uint16 data) { -#warning No bounds checking done for JoystickWriteWord! +#warning "No bounds checking done for JoystickWriteWord!" offset &= 0x03; joystick_ram[offset + 0] = (data >> 8) & 0xFF; joystick_ram[offset + 1] = data & 0xFF;