Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-22 16:31:49 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor (nw)

Browse Source
This commit is contained in:
DavidHaywood 2019-01-24 13:57:32 +00:00
parent 6bdb818a72
commit f15c6daa43
3 changed files with 62 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mame/drivers/xavix.cpp
View File

@ -430,26 +430,6 @@ void xavix_state::superxavix_lowbus_map(address_map &map)
CUSTOM_INPUT_MEMBER(xavix_i2c_state::i2c_r)
{
return m_i2cmem->read_sda();
}
CUSTOM_INPUT_MEMBER(xavix_i2c_cart_state::i2c_r)
{
return m_i2cmem->read_sda();
}
CUSTOM_INPUT_MEMBER(xavix_i2c_lotr_state::camera_r) // seems to be some kind of camera status bits
{
return machine().rand();
}
CUSTOM_INPUT_MEMBER(xavix_i2c_bowl_state::camera_r) // seems to be some kind of camera status bits
{
return machine().rand();
}
static INPUT_PORTS_START( xavix )
PORT_START("IN0")
PORT_DIPNAME( 0x01, 0x00, "IN0" )
@ -785,8 +765,8 @@ static INPUT_PORTS_START( ekara )
PORT_INCLUDE(xavix)
PORT_MODIFY("IN1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_CUSTOM ) // multiplexed input
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) // multiplexed input
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, xavix_ekara_state,ekara_multi0_r, nullptr)
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, xavix_ekara_state,ekara_multi1_r, nullptr)
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_POWER_OFF ) PORT_NAME("Power Switch") // pressing this will turn the game off.

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

@ -884,6 +884,9 @@ public:
m_extraiowrite(0)
{ }
DECLARE_CUSTOM_INPUT_MEMBER(ekara_multi0_r);
DECLARE_CUSTOM_INPUT_MEMBER(ekara_multi1_r);
// void xavix_ekara(machine_config &config);
protected:
@ -891,7 +894,6 @@ protected:
required_ioport m_extra0;
required_ioport m_extra1;
virtual uint8_t read_io1(uint8_t direction) override;
virtual void write_io0(uint8_t data, uint8_t direction) override;
virtual void write_io1(uint8_t data, uint8_t direction) override;

106
src/mame/machine/xavix.cpp
View File

@ -488,6 +488,63 @@ WRITE8_MEMBER(xavix_state::dispctrl_posirq_y_w)
/* Per Game IO port callbacks */
CUSTOM_INPUT_MEMBER(xavix_i2c_state::i2c_r)
{
return m_i2cmem->read_sda();
}
CUSTOM_INPUT_MEMBER(xavix_i2c_cart_state::i2c_r)
{
return m_i2cmem->read_sda();
}
CUSTOM_INPUT_MEMBER(xavix_i2c_lotr_state::camera_r) // seems to be some kind of camera status bits
{
return machine().rand();
}
CUSTOM_INPUT_MEMBER(xavix_i2c_bowl_state::camera_r) // seems to be some kind of camera status bits
{
return machine().rand();
}
CUSTOM_INPUT_MEMBER(xavix_ekara_state::ekara_multi0_r)
{
switch (m_extraioselect & 0x7f)
{
case 0x01: return (m_extra0->read() & 0x01) >> 0; break;
case 0x02: return (m_extra0->read() & 0x04) >> 2; break;
case 0x04: return (m_extra0->read() & 0x10) >> 4; break;
case 0x08: return (m_extra0->read() & 0x40) >> 6; break;
case 0x10: return (m_extra1->read() & 0x01) >> 0; break;
case 0x20: return (m_extra1->read() & 0x04) >> 2; break;
case 0x40: return (m_extra1->read() & 0x10) >> 4; break;
default:
LOG("latching inputs with invalid m_extraioselect value of %02x\n", m_extraioselect);
return 0x00;
}
return 0x00;
}
CUSTOM_INPUT_MEMBER(xavix_ekara_state::ekara_multi1_r)
{
switch (m_extraioselect & 0x7f)
{
case 0x01: return (m_extra0->read() & 0x02) >> 1;
case 0x02: return (m_extra0->read() & 0x08) >> 3;
case 0x04: return (m_extra0->read() & 0x20) >> 5;
case 0x08: return (m_extra0->read() & 0x80) >> 7;
case 0x10: return (m_extra1->read() & 0x02) >> 1;
case 0x20: return (m_extra1->read() & 0x08) >> 3;
case 0x40: return (m_extra1->read() & 0x20) >> 5;
default:
LOG("latching inputs with invalid m_extraioselect value of %02x\n", m_extraioselect);
return 0x00;
}
return 0x00;
}
uint8_t xavix_state::read_io0(uint8_t direction)
{
// no special handling
@ -544,55 +601,6 @@ void xavix_i2c_cart_state::write_io1(uint8_t data, uint8_t direction)
}
}
uint8_t xavix_ekara_state::read_io1(uint8_t direction)
{
uint8_t extrainlatch0 = 0x00;
uint8_t extrainlatch1 = 0x00;
switch (m_extraioselect & 0x7f)
{
case 0x01:
extrainlatch0 = (m_extra0->read() & 0x01) >> 0;
extrainlatch1 = (m_extra0->read() & 0x02) >> 1;
break;
case 0x02:
extrainlatch0 = (m_extra0->read() & 0x04) >> 2;
extrainlatch1 = (m_extra0->read() & 0x08) >> 3;
break;
case 0x04:
extrainlatch0 = (m_extra0->read() & 0x10) >> 4;
extrainlatch1 = (m_extra0->read() & 0x20) >> 5;
break;
case 0x08:
extrainlatch0 = (m_extra0->read() & 0x40) >> 6;
extrainlatch1 = (m_extra0->read() & 0x80) >> 7;
break;
case 0x10:
extrainlatch0 = (m_extra1->read() & 0x01) >> 0;
extrainlatch1 = (m_extra1->read() & 0x02) >> 1;
break;
case 0x20:
extrainlatch0 = (m_extra1->read() & 0x04) >> 2;
extrainlatch1 = (m_extra1->read() & 0x08) >> 3;
break;
case 0x40:
extrainlatch0 = (m_extra1->read() & 0x10) >> 4;
extrainlatch1 = (m_extra1->read() & 0x20) >> 5;
break;
default:
LOG("latching inputs with invalid m_extraioselect value of %02x\n", m_extraioselect);
break;
}
uint8_t ret = m_in1->read();
ret &= 0xfc;
ret |= extrainlatch0 << 0;
ret |= extrainlatch1 << 1;
return ret;
}
void xavix_ekara_state::write_io0(uint8_t data, uint8_t direction)
{
// is bit 0x80 an enable for something else? LED? Microphone? it doesn't seem related to the multiplexing