- uint8_t 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)
- {
- // Hardware ID returns NTSC/PAL identification bit here
- uint8_t 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;
- }