X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjoystick.cpp;h=14b5ff784a8f737cd49b67daee9c06c36d996595;hb=dadebc1a7525d196d5ee406be7b9d804d5f9945d;hp=53d386effaea1f2bb23a7c7c90d5dbf797f2edd8;hpb=86bd0f2592c3cd674239532247276bd2d579a857;p=virtualjaguar diff --git a/src/joystick.cpp b/src/joystick.cpp index 53d386e..14b5ff7 100644 --- a/src/joystick.cpp +++ b/src/joystick.cpp @@ -1,264 +1,456 @@ -#ifndef __PORT__ -#include "include/stdafx.h" -#include -#endif -#include +// +// Joystick handler +// +// by cal2 +// GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS) +// Cleanups/fixes by James Hammons +// (C) 2010 Underground Software +// +// JLH = James Hammons +// +// Who When What +// --- ---------- ------------------------------------------------------------- +// JLH 01/16/2010 Created this log ;-) +// + +#include "joystick.h" + #include -#include "include/SDLptc.h" -#include "include/jaguar.h" - -void main_screen_switch(void); - - -#define BUTTON_U 0 -#define BUTTON_D 1 -#define BUTTON_L 2 -#define BUTTON_R 3 -#define BUTTON_1 4 -#define BUTTON_4 5 -#define BUTTON_7 6 -#define BUTTON_s 7 -#define BUTTON_0 8 -#define BUTTON_8 9 -#define BUTTON_5 10 -#define BUTTON_2 11 -#define BUTTON_d 12 -#define BUTTON_9 13 -#define BUTTON_6 14 -#define BUTTON_3 15 - - -#define BUTTON_A 16 -#define BUTTON_B 17 -#define BUTTON_C 18 -#define BUTTON_OPTION 19 -#define BUTTON_PAUSE 20 +#include +#include "gpu.h" +#include "jaguar.h" +#include "log.h" +#include "settings.h" + +// Global vars static uint8 joystick_ram[4]; -static uint8 joypad_0_buttons[21]; -static uint8 joypad_1_buttons[21]; -extern uint8 finished; +uint8 joypad_0_buttons[21]; +uint8 joypad_1_buttons[21]; + +bool keyBuffer[21]; + +SDL_Joystick * joystick1; + +//extern bool finished; +////extern bool showGUI; +bool GUIKeyHeld = false; extern int start_logging; +int gpu_start_log = 0; +int op_start_log = 0; +int blit_start_log = 0; +int effect_start = 0; +int effect_start2 = 0, effect_start3 = 0, effect_start4 = 0, effect_start5 = 0, effect_start6 = 0; +bool interactiveMode = false; +bool iLeft, iRight, iToggle = false; +bool keyHeld1 = false, keyHeld2 = false, keyHeld3 = false; +int objectPtr = 0; +bool startMemLog = false; +extern bool doDSPDis, doGPUDis; -////////////////////////////////////////////////////////////////////////////// -// -////////////////////////////////////////////////////////////////////////////// -// -// -// -////////////////////////////////////////////////////////////////////////////// -void joystick_init(void) +bool blitterSingleStep = false; +bool bssGo = false; +bool bssHeld = false; + +void JoystickInit(void) { - joystick_reset(); + JoystickReset(); } -////////////////////////////////////////////////////////////////////////////// -// -////////////////////////////////////////////////////////////////////////////// -// -// -// -////////////////////////////////////////////////////////////////////////////// -void joystick_exec(void) + +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 - uint8 *keystate = SDL_GetKeyState(NULL); - Sint16 x = 0, y = 0; - extern Console console; - - memset(joypad_0_buttons,0,21); - memset(joypad_1_buttons,0,21); - - if ((keystate[SDLK_LALT])&(keystate[SDLK_RETURN])) main_screen_switch(); - - /* Added/Changed by SDLEMU (http://sdlemu.ngemu.com) */ - - if (keystate[SDLK_UP]) joypad_0_buttons[BUTTON_U]=0x01; - if (keystate[SDLK_DOWN]) joypad_0_buttons[BUTTON_D]=0x01; - if (keystate[SDLK_LEFT]) joypad_0_buttons[BUTTON_L]=0x01; - if (keystate[SDLK_RIGHT]) joypad_0_buttons[BUTTON_R]=0x01; - if (keystate[SDLK_z]) joypad_0_buttons[BUTTON_A]=0x01; - if (keystate[SDLK_x]) joypad_0_buttons[BUTTON_B]=0x01; - if (keystate[SDLK_c]) joypad_0_buttons[BUTTON_C]=0x01; - if (keystate[SDLK_TAB]) joypad_0_buttons[BUTTON_OPTION]=0x01; - if (keystate[SDLK_RETURN]) joypad_0_buttons[BUTTON_PAUSE]=0x01; - if (keystate[SDLK_q]) start_logging=1; - if (keystate[SDLK_w]) gpu_reset_stats(); -//f (keystate[SDLK_u]) jaguar_long_write(0xf1c384,jaguar_long_read(0xf1c384)+1); - - if (keystate[SDLK_KP0]) joypad_0_buttons[BUTTON_0]=0x01; - if (keystate[SDLK_KP1]) joypad_0_buttons[BUTTON_1]=0x01; - if (keystate[SDLK_KP2]) joypad_0_buttons[BUTTON_2]=0x01; - if (keystate[SDLK_KP3]) joypad_0_buttons[BUTTON_3]=0x01; - if (keystate[SDLK_KP4]) joypad_0_buttons[BUTTON_4]=0x01; - if (keystate[SDLK_KP5]) joypad_0_buttons[BUTTON_5]=0x01; - if (keystate[SDLK_KP6]) joypad_0_buttons[BUTTON_6]=0x01; - if (keystate[SDLK_KP7]) joypad_0_buttons[BUTTON_7]=0x01; - if (keystate[SDLK_KP8]) joypad_0_buttons[BUTTON_8]=0x01; - if (keystate[SDLK_KP9]) joypad_0_buttons[BUTTON_9]=0x01; - - if (keystate[SDLK_ESCAPE]) finished=1; - - /* Added/Changed by SDLEMU (http://sdlemu.ngemu.com */ - /* Joystick support */ - - if ( console.JoyEnabled() == 1 ) { - - x = SDL_JoystickGetAxis(console.joystick, 0); - y = SDL_JoystickGetAxis(console.joystick, 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(console.joystick, 0) == SDL_PRESSED) joypad_0_buttons[BUTTON_A]=0x01; - if (SDL_JoystickGetButton(console.joystick, 1) == SDL_PRESSED) joypad_0_buttons[BUTTON_B]=0x01; - if (SDL_JoystickGetButton(console.joystick, 2) == SDL_PRESSED) joypad_0_buttons[BUTTON_C]=0x01; +#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; } - - /* ADDED by SDLEMU (http://sdlemu.ngemu.com */ - /* Needed to make sure that the events queue is empty */ - SDL_PumpEvents(); + 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 joystick_reset(void) -{ - memset(joystick_ram,0x00,4); - memset(joypad_0_buttons,0,21); - memset(joypad_1_buttons,0,21); -} -////////////////////////////////////////////////////////////////////////////// -// -////////////////////////////////////////////////////////////////////////////// -// -// -// -////////////////////////////////////////////////////////////////////////////// -void joystick_done(void) -{ -} -////////////////////////////////////////////////////////////////////////////// -// -////////////////////////////////////////////////////////////////////////////// -// -// -// -////////////////////////////////////////////////////////////////////////////// -void joystick_byte_write(uint32 offset, uint8 data) + +void JoystickReset(void) { - joystick_ram[offset&0x03]=data; + memset(joystick_ram, 0x00, 4); + memset(joypad_0_buttons, 0, 21); + memset(joypad_1_buttons, 0, 21); } -////////////////////////////////////////////////////////////////////////////// -// -////////////////////////////////////////////////////////////////////////////// -// -// -// -////////////////////////////////////////////////////////////////////////////// -void joystick_word_write(uint32 offset, uint16 data) + +void JoystickDone(void) { - offset&=0x03; - joystick_ram[offset+0]=(data>>8)&0xff; - joystick_ram[offset+1]=data&0xff; } -////////////////////////////////////////////////////////////////////////////// -// -////////////////////////////////////////////////////////////////////////////// -// -// -// -////////////////////////////////////////////////////////////////////////////// -uint8 joystick_byte_read(uint32 offset) + +uint8 JoystickReadByte(uint32 offset) { - offset&=0x03; +// For now, until we can fix the 2nd controller... :-P +//memset(joypad_1_buttons, 0, 21); + +#warning "No bounds checking done in JoystickReadByte!" +// extern bool hardwareTypeNTSC; + offset &= 0x03; - if (offset==0) + if (offset == 0) { - uint8 data=0x00; - int pad0Index=joystick_ram[1]&0x0f; - int pad1Index=(joystick_ram[1]>>4)&0x0f; - - if (!(pad0Index&0x01)) - pad0Index=0; - else - if (!(pad0Index&0x02)) - pad0Index=1; - else - if (!(pad0Index&0x04)) - pad0Index=2; - else - pad0Index=3; - - if (!(pad1Index&0x01)) - pad1Index=0; - else - if (!(pad1Index&0x02)) - pad1Index=1; - else - if (!(pad1Index&0x04)) - pad1Index=2; - else - pad1Index=3; - - 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); + 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! (now fixed! ;-) +// Also: we should explicitly check for those bit patterns, as other patterns +// are legal and yield other controllers... !!! FIX !!! +#warning "!!! Need to explicitly check for the proper bit combinations! !!!" + + 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) + else if (offset == 3) { - uint8 data=((1<<5)|(1<<4)|0x0f) ; - int pad0Index=joystick_ram[1]&0x0f; - int pad1Index=(joystick_ram[1]>>4)&0x0f; - - if (!(pad0Index&0x01)) + // 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 (!(pad1Index & 0x08)) { - if (joypad_0_buttons[BUTTON_PAUSE]) data^=0x01; - if (joypad_0_buttons[BUTTON_A]) data^=0x02; + if (joypad_1_buttons[BUTTON_PAUSE]) + data ^= 0x04; + if (joypad_1_buttons[BUTTON_A]) + data ^= 0x08; } - else - if (!(pad0Index&0x02)) + else if (!(pad1Index & 0x04)) { - if (joypad_0_buttons[BUTTON_B]) data^=0x02; + if (joypad_1_buttons[BUTTON_B]) + data ^= 0x08; } - else - if (!(pad0Index&0x04)) + else if (!(pad1Index & 0x02)) { - if (joypad_0_buttons[BUTTON_C]) data^=0x02; + if (joypad_1_buttons[BUTTON_C]) + data ^= 0x08; } - else + else if (!(pad1Index & 0x01)) { - if (joypad_0_buttons[BUTTON_OPTION]) data^=0x02; - } - return(data); + if (joypad_1_buttons[BUTTON_OPTION]) + data ^= 0x08; + } + + return data; } - return(joystick_ram[offset]); + + return joystick_ram[offset]; } -////////////////////////////////////////////////////////////////////////////// -// -////////////////////////////////////////////////////////////////////////////// -// -// -// -////////////////////////////////////////////////////////////////////////////// -uint16 joystick_word_read(uint32 offset) + +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) { - uint16 data=joystick_byte_read((offset+0)&0x03); - data<<=8; - data|=joystick_byte_read((offset+1)&0x03); - return(data); +#warning "No bounds checking done for JoystickWriteWord!" + offset &= 0x03; + joystick_ram[offset + 0] = (data >> 8) & 0xFF; + joystick_ram[offset + 1] = data & 0xFF; }