Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

model1: add individual output lines (nw)

Browse Source
This commit is contained in:
hap 2019-04-12 12:45:17 +02:00
parent 1dc420a222
commit a23dd15c38
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/mame/drivers/model1.cpp
View File

@ -603,6 +603,16 @@ READ8_MEMBER( model1_state::dpram_r )
return m_dpram->right_r(offset); return m_dpram->right_r(offset);
} }
WRITE8_MEMBER( model1_state::gen_outputs_w )
{
// generic output lines, output to outx where x = bit
// eg. out0 = coin counter 1, see below for per-game descriptions
for (int i = 0; i < 8; i++)
m_outs[i] = BIT(data, i);
m_digits[1] = data;
}
WRITE8_MEMBER( model1_state::vf_outputs_w ) WRITE8_MEMBER( model1_state::vf_outputs_w )
{ {
// 7654---- unknown (not used?) // 7654---- unknown (not used?)
@ -613,8 +623,6 @@ WRITE8_MEMBER( model1_state::vf_outputs_w )
machine().bookkeeping().coin_counter_w(1, BIT(data, 1)); machine().bookkeeping().coin_counter_w(1, BIT(data, 1));
machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); machine().bookkeeping().coin_counter_w(0, BIT(data, 0));
m_digits[1] = data;
} }
WRITE8_MEMBER( model1_state::vr_outputs_w ) WRITE8_MEMBER( model1_state::vr_outputs_w )
@ -630,8 +638,6 @@ WRITE8_MEMBER( model1_state::vr_outputs_w )
machine().bookkeeping().coin_counter_w(1, BIT(data, 1)); machine().bookkeeping().coin_counter_w(1, BIT(data, 1));
machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); machine().bookkeeping().coin_counter_w(0, BIT(data, 0));
m_digits[1] = data;
} }
WRITE8_MEMBER( model1_state::swa_outputs_w ) WRITE8_MEMBER( model1_state::swa_outputs_w )
@ -647,8 +653,6 @@ WRITE8_MEMBER( model1_state::swa_outputs_w )
machine().bookkeeping().coin_counter_w(1, BIT(data, 1)); machine().bookkeeping().coin_counter_w(1, BIT(data, 1));
machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); machine().bookkeeping().coin_counter_w(0, BIT(data, 0));
m_digits[1] = data;
} }
WRITE8_MEMBER( model1_state::wingwar_outputs_w ) WRITE8_MEMBER( model1_state::wingwar_outputs_w )
@ -663,8 +667,6 @@ WRITE8_MEMBER( model1_state::wingwar_outputs_w )
// -------0 coin counter 1 // -------0 coin counter 1
machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); machine().bookkeeping().coin_counter_w(0, BIT(data, 0));
m_digits[1] = data;
} }
WRITE8_MEMBER( model1_state::wingwar360_outputs_w ) WRITE8_MEMBER( model1_state::wingwar360_outputs_w )
@ -677,8 +679,6 @@ WRITE8_MEMBER( model1_state::wingwar360_outputs_w )
machine().bookkeeping().coin_counter_w(1, BIT(data, 1)); machine().bookkeeping().coin_counter_w(1, BIT(data, 1));
machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); machine().bookkeeping().coin_counter_w(0, BIT(data, 0));
m_digits[1] = data;
} }
WRITE8_MEMBER( model1_state::netmerc_outputs_w ) WRITE8_MEMBER( model1_state::netmerc_outputs_w )
@ -1751,6 +1751,7 @@ void model1_state::vf(machine_config &config)
ioboard.set_default_bios_tag("epr14869b"); ioboard.set_default_bios_tag("epr14869b");
ioboard.in_callback<2>().set_ioport("IN.2"); ioboard.in_callback<2>().set_ioport("IN.2");
ioboard.output_callback().set(FUNC(model1_state::vf_outputs_w)); ioboard.output_callback().set(FUNC(model1_state::vf_outputs_w));
ioboard.output_callback().append(FUNC(model1_state::gen_outputs_w));
} }
void model1_state::vr(machine_config &config) void model1_state::vr(machine_config &config)
@ -1765,6 +1766,7 @@ void model1_state::vr(machine_config &config)
ioboard.an_callback<1>().set_ioport("ACCEL"); ioboard.an_callback<1>().set_ioport("ACCEL");
ioboard.an_callback<2>().set_ioport("BRAKE"); ioboard.an_callback<2>().set_ioport("BRAKE");
ioboard.output_callback().set(FUNC(model1_state::vr_outputs_w)); ioboard.output_callback().set(FUNC(model1_state::vr_outputs_w));
ioboard.output_callback().append(FUNC(model1_state::gen_outputs_w));
M1COMM(config, "m1comm", 0).set_default_bios_tag("epr15112"); M1COMM(config, "m1comm", 0).set_default_bios_tag("epr15112");
} }
@ -1781,6 +1783,7 @@ void model1_state::vformula(machine_config &config)
ioboard.an_callback<1>().set_ioport("ACCEL"); ioboard.an_callback<1>().set_ioport("ACCEL");
ioboard.an_callback<2>().set_ioport("BRAKE"); ioboard.an_callback<2>().set_ioport("BRAKE");
ioboard.output_callback().set(FUNC(model1_state::vr_outputs_w)); ioboard.output_callback().set(FUNC(model1_state::vr_outputs_w));
ioboard.output_callback().append(FUNC(model1_state::gen_outputs_w));
M1COMM(config, "m1comm", 0).set_default_bios_tag("epr15624"); M1COMM(config, "m1comm", 0).set_default_bios_tag("epr15624");
} }
@ -1797,6 +1800,7 @@ void model1_state::swa(machine_config &config)
ioboard.an_callback<4>().set_ioport("STICK2X"); ioboard.an_callback<4>().set_ioport("STICK2X");
ioboard.an_callback<5>().set_ioport("STICK2Y"); ioboard.an_callback<5>().set_ioport("STICK2Y");
ioboard.output_callback().set(FUNC(model1_state::swa_outputs_w)); ioboard.output_callback().set(FUNC(model1_state::swa_outputs_w));
ioboard.output_callback().append(FUNC(model1_state::gen_outputs_w));
SPEAKER(config, "dleft").front_left(); SPEAKER(config, "dleft").front_left();
SPEAKER(config, "dright").front_right(); SPEAKER(config, "dright").front_right();
@ -1824,6 +1828,7 @@ void model1_state::wingwar(machine_config &config)
ioboard.an_callback<1>().set_ioport("STICKY"); ioboard.an_callback<1>().set_ioport("STICKY");
ioboard.an_callback<2>().set_ioport("THROTTLE"); ioboard.an_callback<2>().set_ioport("THROTTLE");
ioboard.output_callback().set(FUNC(model1_state::wingwar_outputs_w)); ioboard.output_callback().set(FUNC(model1_state::wingwar_outputs_w));
ioboard.output_callback().append(FUNC(model1_state::gen_outputs_w));
config.set_default_layout(layout_model1io2); config.set_default_layout(layout_model1io2);
@ -1839,6 +1844,7 @@ void model1_state::wingwar360(machine_config &config)
ioboard.drive_write_callback().set(FUNC(model1_state::r360_w)); ioboard.drive_write_callback().set(FUNC(model1_state::r360_w));
ioboard.an_callback<2>().set_constant(0); ioboard.an_callback<2>().set_constant(0);
ioboard.output_callback().set(FUNC(model1_state::wingwar360_outputs_w)); ioboard.output_callback().set(FUNC(model1_state::wingwar360_outputs_w));
ioboard.output_callback().append(FUNC(model1_state::gen_outputs_w));
config.set_default_layout(layout_model1io2); config.set_default_layout(layout_model1io2);
} }
@ -1865,6 +1871,7 @@ void model1_state::netmerc(machine_config &config)
ioboard.an_callback<0>().set_ioport("STICKX"); ioboard.an_callback<0>().set_ioport("STICKX");
ioboard.an_callback<2>().set_ioport("STICKY"); ioboard.an_callback<2>().set_ioport("STICKY");
ioboard.output_callback().set(FUNC(model1_state::netmerc_outputs_w)); ioboard.output_callback().set(FUNC(model1_state::netmerc_outputs_w));
ioboard.output_callback().append(FUNC(model1_state::gen_outputs_w));
config.set_default_layout(layout_model1io2); config.set_default_layout(layout_model1io2);
} }

6
src/mame/includes/model1.h
View File

@ -57,6 +57,7 @@ public:
, m_palette(*this, "palette") , m_palette(*this, "palette")
, m_tiles(*this, "tile") , m_tiles(*this, "tile")
, m_digits(*this, "digit%u", 0U) , m_digits(*this, "digit%u", 0U)
, m_outs(*this, "out%u", 0U)
{ {
} }
@ -505,7 +506,9 @@ private:
// I/O related // I/O related
output_finder<2> m_digits; output_finder<2> m_digits;
output_finder<8> m_outs;
DECLARE_READ8_MEMBER(dpram_r); DECLARE_READ8_MEMBER(dpram_r);
DECLARE_WRITE8_MEMBER(gen_outputs_w);
DECLARE_WRITE8_MEMBER(vf_outputs_w); DECLARE_WRITE8_MEMBER(vf_outputs_w);
DECLARE_WRITE8_MEMBER(vr_outputs_w); DECLARE_WRITE8_MEMBER(vr_outputs_w);
DECLARE_WRITE8_MEMBER(swa_outputs_w); DECLARE_WRITE8_MEMBER(swa_outputs_w);
@ -515,7 +518,4 @@ private:
DECLARE_WRITE8_MEMBER(drive_board_w); DECLARE_WRITE8_MEMBER(drive_board_w);
}; };
/*----------- defined in machine/model1.c -----------*/
#endif // MAME_INCLUDES_MODEL1_H #endif // MAME_INCLUDES_MODEL1_H

2
src/mame/machine/model1.cpp
View File

@ -1726,6 +1726,8 @@ void model1_state::copro_hle_swa()
void model1_state::machine_start() void model1_state::machine_start()
{ {
m_digits.resolve(); m_digits.resolve();
m_outs.resolve();
m_copro_ram_data = std::make_unique<u32[]>(0x8000); m_copro_ram_data = std::make_unique<u32[]>(0x8000);
save_pointer(NAME(m_copro_ram_data), 0x8000); save_pointer(NAME(m_copro_ram_data), 0x8000);