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

hh_sm510: made input handlers more generic (nw)

Browse Source
This commit is contained in:
hap 2017-09-24 00:28:24 +02:00
parent 75c06585e7
commit 5a5b6f620f
2 changed files with 35 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/mame/drivers/hh_sm510.cpp
View File

@ -40,6 +40,7 @@ void hh_sm510_state::machine_start()
// zerofill
m_inp_mux = 0;
/* m_inp_lines = 0; */ // not here
/* m_inp_fixed = -1; */ // not here
m_s = 0;
m_r = 0;
m_display_x_len = 0;
@ -51,6 +52,7 @@ void hh_sm510_state::machine_start()
// register for savestates
save_item(NAME(m_inp_mux));
save_item(NAME(m_inp_lines));
save_item(NAME(m_inp_fixed));
save_item(NAME(m_s));
save_item(NAME(m_r));
save_item(NAME(m_display_x_len));
@ -133,7 +135,7 @@ WRITE8_MEMBER(hh_sm510_state::sm500_lcd_segment_w)
// generic input handlers - usually S output is input mux, and K input for buttons
u8 hh_sm510_state::read_inputs(int columns)
u8 hh_sm510_state::read_inputs(int columns, int fixed)
{
u8 ret = 0;
@ -142,6 +144,9 @@ u8 hh_sm510_state::read_inputs(int columns)
if (m_inp_mux >> i & 1)
ret |= m_inp_matrix[i]->read();
if (fixed >= 0)
ret |= m_inp_matrix[fixed]->read();
return ret;
}
@ -164,7 +169,7 @@ WRITE8_MEMBER(hh_sm510_state::input_w)
READ8_MEMBER(hh_sm510_state::input_r)
{
return read_inputs(m_inp_lines);
return read_inputs(m_inp_lines, m_inp_fixed);
}
INPUT_CHANGED_MEMBER(hh_sm510_state::acl_button)
@ -1610,20 +1615,12 @@ class tgaunt_state : public hh_sm510_state
public:
tgaunt_state(const machine_config &mconfig, device_type type, const char *tag)
: hh_sm510_state(mconfig, type, tag)
{ }
virtual DECLARE_READ8_MEMBER(input_r) override;
{
m_inp_lines = 6;
m_inp_fixed = 6;
}
};
// handlers
READ8_MEMBER(tgaunt_state::input_r)
{
// K: multiplexed inputs (note: GND row is always on)
return m_inp_matrix[6]->read() | read_inputs(6);
}
// config
static INPUT_PORTS_START( tgaunt )
@ -1673,7 +1670,7 @@ static MACHINE_CONFIG_START( tgaunt )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(tgaunt_state, input_r))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
@ -1711,20 +1708,12 @@ class tddragon_state : public hh_sm510_state
public:
tddragon_state(const machine_config &mconfig, device_type type, const char *tag)
: hh_sm510_state(mconfig, type, tag)
{ }
virtual DECLARE_READ8_MEMBER(input_r) override;
{
m_inp_lines = 5;
m_inp_fixed = 5;
}
};
// handlers
READ8_MEMBER(tddragon_state::input_r)
{
// K: multiplexed inputs (note: GND row is always on)
return m_inp_matrix[5]->read() | read_inputs(5);
}
// config
static INPUT_PORTS_START( tddragon )
@ -1769,7 +1758,7 @@ static MACHINE_CONFIG_START( tddragon )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(tddragon_state, input_r))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
@ -1807,20 +1796,12 @@ class taltbeast_state : public hh_sm510_state
public:
taltbeast_state(const machine_config &mconfig, device_type type, const char *tag)
: hh_sm510_state(mconfig, type, tag)
{ }
virtual DECLARE_READ8_MEMBER(input_r) override;
{
m_inp_lines = 6;
m_inp_fixed = 6;
}
};
// handlers
READ8_MEMBER(taltbeast_state::input_r)
{
// K: multiplexed inputs (note: GND row is always on)
return m_inp_matrix[6]->read() | read_inputs(6);
}
// config
static INPUT_PORTS_START( taltbeast )
@ -1869,7 +1850,7 @@ static MACHINE_CONFIG_START( taltbeast )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(taltbeast_state, input_r))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
@ -1907,20 +1888,12 @@ class tsjam_state : public hh_sm510_state
public:
tsjam_state(const machine_config &mconfig, device_type type, const char *tag)
: hh_sm510_state(mconfig, type, tag)
{ }
virtual DECLARE_READ8_MEMBER(input_r) override;
{
m_inp_lines = 5;
m_inp_fixed = 5;
}
};
// handlers
READ8_MEMBER(tsjam_state::input_r)
{
// K: multiplexed inputs (note: GND row is always on)
return m_inp_matrix[5]->read() | read_inputs(5);
}
// config
static INPUT_PORTS_START( tsjam )
@ -1965,7 +1938,7 @@ static MACHINE_CONFIG_START( tsjam )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SM510, XTAL_32_768kHz) // no external XTAL
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(tsjam_state, input_r))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(hh_sm510_state, input_w))
MCFG_SM510_WRITE_R_CB(WRITE8(hh_sm510_state, piezo_r1_w))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))
@ -2003,12 +1976,14 @@ class tsonic_state : public hh_sm510_state
public:
tsonic_state(const machine_config &mconfig, device_type type, const char *tag)
: hh_sm510_state(mconfig, type, tag)
{ }
{
m_inp_lines = 5;
m_inp_fixed = 5;
}
void update_speaker();
DECLARE_WRITE8_MEMBER(write_r);
DECLARE_WRITE8_MEMBER(write_s);
virtual DECLARE_READ8_MEMBER(input_r) override;
};
// handlers
@ -2035,12 +2010,6 @@ WRITE8_MEMBER(tsonic_state::write_s)
hh_sm510_state::input_w(space, 0, data >> 1);
}
READ8_MEMBER(tsonic_state::input_r)
{
// K: multiplexed inputs (note: GND row is always on)
return m_inp_matrix[5]->read() | read_inputs(5);
}
// config
@ -2087,7 +2056,7 @@ static MACHINE_CONFIG_START( tsonic )
/* basic machine hardware */
MCFG_CPU_ADD("maincpu", SM511, XTAL_32_768kHz)
MCFG_SM510_WRITE_SEGS_CB(WRITE16(hh_sm510_state, sm510_lcd_segment_w))
MCFG_SM510_READ_K_CB(READ8(tsonic_state, input_r))
MCFG_SM510_READ_K_CB(READ8(hh_sm510_state, input_r))
MCFG_SM510_WRITE_S_CB(WRITE8(tsonic_state, write_s))
MCFG_SM510_WRITE_R_CB(WRITE8(tsonic_state, write_r))
MCFG_SM510_READ_BA_CB(IOPORT("BA"))

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

@ -22,6 +22,7 @@ public:
m_out_x(*this, "%u.%u.%u", 0U, 0U, 0U),
m_speaker(*this, "speaker"),
m_inp_lines(0),
m_inp_fixed(-1),
m_display_wait(33)
{ }
@ -34,10 +35,11 @@ public:
// misc common
u16 m_inp_mux; // multiplexed inputs mask
int m_inp_lines; // number of input mux columns
int m_inp_fixed; // input column fixed to GND/Vdd (-1 means none)
u8 m_s; // MCU S output pins
u8 m_r; // MCU R output pins
u8 read_inputs(int columns);
u8 read_inputs(int columns, int fixed = -1);
virtual void update_k_line();
virtual DECLARE_INPUT_CHANGED_MEMBER(input_changed);