Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-24 09:20:02 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

jaguar.cpp: Use ioport finders for joysticks/buttons (nw)

Browse Source
This commit is contained in:
AJR 2018-05-31 11:33:12 -04:00
parent 04cd6a61b7
commit b447f8cd91
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mame/drivers/jaguar.cpp
View File

@ -702,12 +702,6 @@ READ32_MEMBER(jaguar_state::joystick_r)
{
uint16_t joystick_result = 0xfffe;
uint16_t joybuts_result = 0xffef;
int i;
static const char *const keynames[2][8] =
{
{ "JOY0", "JOY1", "JOY2", "JOY3", "JOY4", "JOY5", "JOY6", "JOY7" },
{ "BUTTONS0", "BUTTONS1", "BUTTONS2", "BUTTONS3", "BUTTONS4", "BUTTONS5", "BUTTONS6", "BUTTONS7" }
};
/*
* 16 12 8 4 0
@ -723,12 +717,12 @@ READ32_MEMBER(jaguar_state::joystick_r)
* to the buttons.
*/
for (i = 0; i < 8; i++)
for (int i = 0; i < 8; i++)
{
if ((m_joystick_data & (0x10000 << i)) == 0)
{
joystick_result &= ioport(keynames[0][i])->read();
joybuts_result &= ioport(keynames[1][i])->read();
joystick_result &= m_joy[i]->read();
joybuts_result &= m_buttons[i]->read();
}
}

4
src/mame/includes/jaguar.h
View File

@ -52,6 +52,8 @@ public:
, m_mainsndbank(*this, "mainsndbank")
, m_dspsndbank(*this, "dspsndbank")
, m_config_io(*this, "CONFIG")
, m_joy(*this, "JOY%u", 0U)
, m_buttons(*this, "BUTTONS%u", 0U)
, m_is_r3000(false)
, m_is_cojag(false)
, m_hacks_enabled(false)
@ -101,6 +103,8 @@ public:
optional_memory_bank m_mainsndbank;
optional_memory_bank m_dspsndbank;
optional_ioport m_config_io;
optional_ioport_array<8> m_joy;
optional_ioport_array<8> m_buttons;
// configuration
bool m_is_r3000;