summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2019-04-12 12:45:17 +0200
committer hap <happppp@users.noreply.github.com>2019-04-12 12:45:30 +0200
commita23dd15c38108a06a50d73a7c794efc3b2af3fca (patch)
tree361d319f159272de59a13f687bbb9016f940f041
parent1dc420a22281691d42fb9aa26daacece5d28bbc4 (diff)
model1: add individual output lines (nw)
-rw-r--r--src/mame/drivers/model1.cpp27
-rw-r--r--src/mame/includes/model1.h6
-rw-r--r--src/mame/machine/model1.cpp2
3 files changed, 22 insertions, 13 deletions
diff --git a/src/mame/drivers/model1.cpp b/src/mame/drivers/model1.cpp
index 5e16da4545b..415f8643963 100644
--- a/src/mame/drivers/model1.cpp
+++ b/src/mame/drivers/model1.cpp
@@ -603,6 +603,16 @@ READ8_MEMBER( model1_state::dpram_r )
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 )
{
// 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(0, BIT(data, 0));
-
- m_digits[1] = data;
}
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(0, BIT(data, 0));
-
- m_digits[1] = data;
}
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(0, BIT(data, 0));
-
- m_digits[1] = data;
}
WRITE8_MEMBER( model1_state::wingwar_outputs_w )
@@ -663,8 +667,6 @@ WRITE8_MEMBER( model1_state::wingwar_outputs_w )
// -------0 coin counter 1
machine().bookkeeping().coin_counter_w(0, BIT(data, 0));
-
- m_digits[1] = data;
}
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(0, BIT(data, 0));
-
- m_digits[1] = data;
}
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.in_callback<2>().set_ioport("IN.2");
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)
@@ -1765,6 +1766,7 @@ void model1_state::vr(machine_config &config)
ioboard.an_callback<1>().set_ioport("ACCEL");
ioboard.an_callback<2>().set_ioport("BRAKE");
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");
}
@@ -1781,6 +1783,7 @@ void model1_state::vformula(machine_config &config)
ioboard.an_callback<1>().set_ioport("ACCEL");
ioboard.an_callback<2>().set_ioport("BRAKE");
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");
}
@@ -1797,6 +1800,7 @@ void model1_state::swa(machine_config &config)
ioboard.an_callback<4>().set_ioport("STICK2X");
ioboard.an_callback<5>().set_ioport("STICK2Y");
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, "dright").front_right();
@@ -1824,6 +1828,7 @@ void model1_state::wingwar(machine_config &config)
ioboard.an_callback<1>().set_ioport("STICKY");
ioboard.an_callback<2>().set_ioport("THROTTLE");
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);
@@ -1839,6 +1844,7 @@ void model1_state::wingwar360(machine_config &config)
ioboard.drive_write_callback().set(FUNC(model1_state::r360_w));
ioboard.an_callback<2>().set_constant(0);
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);
}
@@ -1865,6 +1871,7 @@ void model1_state::netmerc(machine_config &config)
ioboard.an_callback<0>().set_ioport("STICKX");
ioboard.an_callback<2>().set_ioport("STICKY");
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);
}
diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h
index 9f33cf94790..361e42ed672 100644
--- a/src/mame/includes/model1.h
+++ b/src/mame/includes/model1.h
@@ -57,6 +57,7 @@ public:
, m_palette(*this, "palette")
, m_tiles(*this, "tile")
, m_digits(*this, "digit%u", 0U)
+ , m_outs(*this, "out%u", 0U)
{
}
@@ -505,7 +506,9 @@ private:
// I/O related
output_finder<2> m_digits;
+ output_finder<8> m_outs;
DECLARE_READ8_MEMBER(dpram_r);
+ DECLARE_WRITE8_MEMBER(gen_outputs_w);
DECLARE_WRITE8_MEMBER(vf_outputs_w);
DECLARE_WRITE8_MEMBER(vr_outputs_w);
DECLARE_WRITE8_MEMBER(swa_outputs_w);
@@ -515,7 +518,4 @@ private:
DECLARE_WRITE8_MEMBER(drive_board_w);
};
-
-/*----------- defined in machine/model1.c -----------*/
-
#endif // MAME_INCLUDES_MODEL1_H
diff --git a/src/mame/machine/model1.cpp b/src/mame/machine/model1.cpp
index 75eadf9a4d1..e14a5676511 100644
--- a/src/mame/machine/model1.cpp
+++ b/src/mame/machine/model1.cpp
@@ -1726,6 +1726,8 @@ void model1_state::copro_hle_swa()
void model1_state::machine_start()
{
m_digits.resolve();
+ m_outs.resolve();
+
m_copro_ram_data = std::make_unique<u32[]>(0x8000);
save_pointer(NAME(m_copro_ram_data), 0x8000);