The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2024-12-26 19:21:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Core/IO] change Master System multitap "official" name

Browse Source
This commit is contained in:
EkeEke 2014-06-17 22:09:20 +02:00
parent 731b0afcc3
commit ade2c6ad78
10 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/cart_hw/sms_cart.c
View File

@ -255,8 +255,8 @@ static const rominfo_t game_list[] =
{0x41C948BF, 0, 0, SYSTEM_SPORTSPAD, MAPPER_SEGA, SYSTEM_SMS2, REGION_USA}, /* Sports Pad Soccer */ {0x41C948BF, 0, 0, SYSTEM_SPORTSPAD, MAPPER_SEGA, SYSTEM_SMS2, REGION_USA}, /* Sports Pad Soccer */
/* games requiring homemade multitap */ /* games requiring homemade multitap */
{0xFAB6F52F, 0, 0, SYSTEM_MS4PLAY, MAPPER_NONE, SYSTEM_SMS2, REGION_USA}, /* BOom (v1.0) */ {0xFAB6F52F, 0, 0, SYSTEM_MASTERTAP, MAPPER_NONE, SYSTEM_SMS2, REGION_USA}, /* BOom (v1.0) */
{0x143AB50B, 0, 0, SYSTEM_MS4PLAY, MAPPER_NONE, SYSTEM_SMS2, REGION_USA}, /* BOom (v1.1) */ {0x143AB50B, 0, 0, SYSTEM_MASTERTAP, MAPPER_NONE, SYSTEM_SMS2, REGION_USA}, /* BOom (v1.1) */
/* games supporting YM2413 FM */ /* games supporting YM2413 FM */
{0x1C951F8E, 0, 1, SYSTEM_GAMEPAD, MAPPER_SEGA, SYSTEM_SMS2, REGION_USA}, /* After Burner */ {0x1C951F8E, 0, 1, SYSTEM_GAMEPAD, MAPPER_SEGA, SYSTEM_SMS2, REGION_USA}, /* After Burner */

8
core/input_hw/gamepad.c
View File

@ -253,17 +253,17 @@ void jcart_write(unsigned int address, unsigned int data)
/* Master System multitap ports handler (original design by Furrtek) */ /* Master System multitap ports handler (original design by Furrtek) */
/* cf. http://www.smspower.org/uploads/Homebrew/BOoM-SMS-sms4p_2.png */ /* cf. http://www.smspower.org/uploads/Homebrew/BOoM-SMS-sms4p_2.png */
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
unsigned char ms4play_1_read(void) unsigned char mastertap_1_read(void)
{ {
return gamepad_read(flipflop[0].Counter); return gamepad_read(flipflop[0].Counter);
} }
unsigned char ms4play_2_read(void) unsigned char mastertap_2_read(void)
{ {
return gamepad_read(flipflop[1].Counter + 4); return gamepad_read(flipflop[1].Counter + 4);
} }
void ms4play_1_write(unsigned char data, unsigned char mask) void mastertap_1_write(unsigned char data, unsigned char mask)
{ {
/* update bits set as output only */ /* update bits set as output only */
data = (flipflop[0].Latch & ~mask) | (data & mask); data = (flipflop[0].Latch & ~mask) | (data & mask);
@ -278,7 +278,7 @@ void ms4play_1_write(unsigned char data, unsigned char mask)
flipflop[0].Latch = data; flipflop[0].Latch = data;
} }
void ms4play_2_write(unsigned char data, unsigned char mask) void mastertap_2_write(unsigned char data, unsigned char mask)
{ {
/* update bits set as output only */ /* update bits set as output only */
data = (flipflop[1].Latch & ~mask) | (data & mask); data = (flipflop[1].Latch & ~mask) | (data & mask);

8
core/input_hw/gamepad.h
View File

@ -53,9 +53,9 @@ extern void wayplay_1_write(unsigned char data, unsigned char mask);
extern void wayplay_2_write(unsigned char data, unsigned char mask); extern void wayplay_2_write(unsigned char data, unsigned char mask);
extern unsigned int jcart_read(unsigned int address); extern unsigned int jcart_read(unsigned int address);
extern void jcart_write(unsigned int address, unsigned int data); extern void jcart_write(unsigned int address, unsigned int data);
extern unsigned char ms4play_1_read(void); extern unsigned char mastertap_1_read(void);
extern unsigned char ms4play_2_read(void); extern unsigned char mastertap_2_read(void);
extern void ms4play_1_write(unsigned char data, unsigned char mask); extern void mastertap_1_write(unsigned char data, unsigned char mask);
extern void ms4play_2_write(unsigned char data, unsigned char mask); extern void mastertap_2_write(unsigned char data, unsigned char mask);
#endif #endif

4
core/input_hw/input.c
View File

@ -170,7 +170,7 @@ void input_init(void)
break; break;
} }
case SYSTEM_MS4PLAY: case SYSTEM_MASTERTAP:
{ {
for (i=0; i<4; i++) for (i=0; i<4; i++)
{ {
@ -289,7 +289,7 @@ void input_init(void)
break; break;
} }
case SYSTEM_MS4PLAY: case SYSTEM_MASTERTAP:
{ {
for (i=4; i<8; i++) for (i=4; i<8; i++)
{ {

2
core/input_hw/input.h
View File

@ -54,7 +54,7 @@
#define SYSTEM_LIGHTPHASER (7) /* Sega Light Phaser (Master System) */ #define SYSTEM_LIGHTPHASER (7) /* Sega Light Phaser (Master System) */
#define SYSTEM_PADDLE (8) /* Sega Paddle Control (Master System) */ #define SYSTEM_PADDLE (8) /* Sega Paddle Control (Master System) */
#define SYSTEM_SPORTSPAD (9) /* Sega Sports Pad (Master System) */ #define SYSTEM_SPORTSPAD (9) /* Sega Sports Pad (Master System) */
#define SYSTEM_MS4PLAY (10) /* Multi Tap -- Master System homemade */ #define SYSTEM_MASTERTAP (10) /* Multi Tap -- Master System homemade */
#define SYSTEM_TEAMPLAYER (11) /* Multi Tap -- Sega TeamPlayer */ #define SYSTEM_TEAMPLAYER (11) /* Multi Tap -- Sega TeamPlayer */
#define SYSTEM_WAYPLAY (12) /* Multi Tap -- EA 4-Way Play (use both ports) */ #define SYSTEM_WAYPLAY (12) /* Multi Tap -- EA 4-Way Play (use both ports) */

12
core/io_ctrl.c
View File

@ -122,10 +122,10 @@ void io_init(void)
break; break;
} }
case SYSTEM_MS4PLAY: case SYSTEM_MASTERTAP:
{ {
port[0].data_w = ms4play_1_write; port[0].data_w = mastertap_1_write;
port[0].data_r = ms4play_1_read; port[0].data_r = mastertap_1_read;
break; break;
} }
@ -216,10 +216,10 @@ void io_init(void)
break; break;
} }
case SYSTEM_MS4PLAY: case SYSTEM_MASTERTAP:
{ {
port[1].data_w = ms4play_2_write; port[1].data_w = mastertap_2_write;
port[1].data_r = ms4play_2_read; port[1].data_r = mastertap_2_read;
break; break;
} }

24
gx/gui/menu.c
View File

@ -108,7 +108,7 @@ extern const u8 Ctrl_paddle_png[];
extern const u8 Ctrl_sportspad_png[]; extern const u8 Ctrl_sportspad_png[];
extern const u8 Ctrl_none_png[]; extern const u8 Ctrl_none_png[];
extern const u8 Ctrl_teamplayer_png[]; extern const u8 Ctrl_teamplayer_png[];
extern const u8 Ctrl_ms4play_png[]; extern const u8 Ctrl_mastertap_png[];
extern const u8 Ctrl_pad_auto_png[]; extern const u8 Ctrl_pad_auto_png[];
extern const u8 Ctrl_pad2b_png[]; extern const u8 Ctrl_pad2b_png[];
extern const u8 Ctrl_pad3b_png[]; extern const u8 Ctrl_pad3b_png[];
@ -2062,7 +2062,7 @@ static void ctrlmenu(void)
{NULL,Ctrl_lightphaser_png,"","Select Port 1 device", 89,109,88,92}, {NULL,Ctrl_lightphaser_png,"","Select Port 1 device", 89,109,88,92},
{NULL,Ctrl_paddle_png ,"","Select Port 1 device", 86,117,96,84}, {NULL,Ctrl_paddle_png ,"","Select Port 1 device", 86,117,96,84},
{NULL,Ctrl_sportspad_png ,"","Select Port 1 device", 95,117,76,84}, {NULL,Ctrl_sportspad_png ,"","Select Port 1 device", 95,117,76,84},
{NULL,Ctrl_ms4play_png ,"","Select Port 1 device", 94,100,80,100}, {NULL,Ctrl_mastertap_png ,"","Select Port 1 device", 96,104,76,96},
{NULL,Ctrl_teamplayer_png ,"","Select Port 1 device", 94,109,80,92}, {NULL,Ctrl_teamplayer_png ,"","Select Port 1 device", 94,109,80,92},
{NULL,Ctrl_4wayplay_png ,"","Select Port 1 device", 98,110,72,92} {NULL,Ctrl_4wayplay_png ,"","Select Port 1 device", 98,110,72,92}
}, },
@ -2077,7 +2077,7 @@ static void ctrlmenu(void)
{NULL,Ctrl_lightphaser_png,"","Select Port 2 device", 89,279,88,92}, {NULL,Ctrl_lightphaser_png,"","Select Port 2 device", 89,279,88,92},
{NULL,Ctrl_paddle_png ,"","Select Port 2 device", 86,287,96,84}, {NULL,Ctrl_paddle_png ,"","Select Port 2 device", 86,287,96,84},
{NULL,Ctrl_sportspad_png ,"","Select Port 2 device", 95,287,76,84}, {NULL,Ctrl_sportspad_png ,"","Select Port 2 device", 95,287,76,84},
{NULL,Ctrl_ms4play_png ,"","Select Port 1 device", 94,270,80,100}, {NULL,Ctrl_mastertap_png ,"","Select Port 1 device", 96,274,76,96},
{NULL,Ctrl_teamplayer_png ,"","Select Port 2 device", 94,279,80,92}, {NULL,Ctrl_teamplayer_png ,"","Select Port 2 device", 94,279,80,92},
{NULL,Ctrl_4wayplay_png ,"","Select Port 2 device", 98,280,72,92} {NULL,Ctrl_4wayplay_png ,"","Select Port 2 device", 98,280,72,92}
} }
@ -2438,7 +2438,7 @@ static void ctrlmenu(void)
case DEVICE_PAD3B: case DEVICE_PAD3B:
case DEVICE_PAD6B: case DEVICE_PAD6B:
{ {
if (input.system[index/4] == SYSTEM_MS4PLAY) if (input.system[index/4] == SYSTEM_MASTERTAP)
{ {
/* force 2-buttons pad */ /* force 2-buttons pad */
items = items_special[3]; items = items_special[3];
@ -3139,13 +3139,17 @@ static int savemenu(void)
{ {
if (slots[slot].valid) if (slots[slot].valid)
{ {
if (slot_delete(slot,config.s_device) >= 0) if (GUI_WaitConfirm("Warning","Delete Save File ?"))
{ {
/* hide screenshot */ if (slot_delete(slot,config.s_device) >= 0)
gxTextureClose(&bg_saves[0].texture); {
bg_saves[0].state &= ~IMAGE_VISIBLE; /* hide screenshot */
slots[slot].valid = 0; gxTextureClose(&bg_saves[0].texture);
update = -1; bg_saves[0].state &= ~IMAGE_VISIBLE;
bg_saves[1].state |= IMAGE_VISIBLE;
slots[slot].valid = 0;
update = -1;
}
} }
} }
break; break;

BIN
gx/images/Ctrl_mastertap.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

BIN
gx/images/Ctrl_ms4play.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.2 KiB

4
libretro/libretro.c
View File

@ -745,8 +745,8 @@ static void configure_controls(void)
input.system[1] = SYSTEM_TEAMPLAYER; input.system[1] = SYSTEM_TEAMPLAYER;
else if (!strcmp(var.value, "teamplayer 1&2")) else if (!strcmp(var.value, "teamplayer 1&2"))
input.system[0] = input.system[1] = SYSTEM_TEAMPLAYER; input.system[0] = input.system[1] = SYSTEM_TEAMPLAYER;
else if (!strcmp(var.value, "master system 4p")) else if (!strcmp(var.value, "mastertap"))
input.system[0] = SYSTEM_MS4PLAY; input.system[0] = SYSTEM_MASTERTAP;
var.key = "portb"; var.key = "portb";
environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var); environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var);