summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2022-01-22 12:49:19 +1100
committer Robbbert <Robbbert@users.noreply.github.com>2022-01-22 12:49:19 +1100
commitacf34ba05e7a2fc22428c6fe849b54db77111c3f (patch)
tree3ee08de52360767e7a1d3d214dfa8bdfdbe8b7db
parent3a1eea0cb1791e05424139a423cef9788aa0f77f (diff)
alcat_l7: fixed layout.
-rw-r--r--src/mame/drivers/wms_shuffle.cpp62
-rw-r--r--src/mame/layout/shuffle11.lay56
-rw-r--r--src/mame/layout/shuffle4.lay111
-rw-r--r--src/mame/layout/shuffle9.lay (renamed from src/mame/layout/shuffle.lay)10
4 files changed, 169 insertions, 70 deletions
diff --git a/src/mame/drivers/wms_shuffle.cpp b/src/mame/drivers/wms_shuffle.cpp
index 6ced679de76..971aea831dd 100644
--- a/src/mame/drivers/wms_shuffle.cpp
+++ b/src/mame/drivers/wms_shuffle.cpp
@@ -39,7 +39,7 @@ Status:
ToDo:
- Only 2 manuals found, and only one schematic, so it's largely guesswork.
-- Layout (s11/a/b)
+- Layout (s11a/b)
- Inputs
- Outputs
- Displays (s11/a/b)
@@ -60,7 +60,8 @@ ToDo:
#include "sound/dac.h"
#include "speaker.h"
-#include "shuffle.lh"
+#include "shuffle4.lh"
+#include "shuffle9.lh"
#include "shuffle11.lh"
@@ -107,10 +108,10 @@ private:
void sol2_w(u8 data) { };
void sol3_w(u8 data) { };
void sound_w(u8);
- void pia2c_pa_w(u8);
- void pia2c_pb_w(u8);
- void pia34_pa_w(u8);
- void pia34_pb_w(u8);
+ void pia2c_pa_w(u8 data) { }
+ void pia2c_pb_w(u8 data) { }
+ void pia34_pa_w(u8 data) { }
+ void pia34_pb_w(u8 data) { }
u8 dips_r();
u8 sound_r();
u8 switch_r();
@@ -121,8 +122,6 @@ private:
bool m_data_ok = 0;
u8 m_lamp_data = 0;
bool m_irq_in_progress = 0;
- u32 m_segment1 = 0U;
- u32 m_segment2 = 0U;
u8 m_sound_data = 0U;
DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { } //ST5
DECLARE_WRITE_LINE_MEMBER(pia22_cb2_w) { } //ST-solenoids enable
@@ -325,9 +324,9 @@ INPUT_PORTS_END
void shuffle_state::clockcnt_w(u16 data)
{
-// if (data >= 1536)
-// m_mainirq->in_set<0>();
+ // A wire jumper allows selection of 7,8,9, or 8,9,10
m_mainirq->in_w<0>(BIT(data, 7, 3)==7);
+
if (BIT(data, 5) && m_irq_in_progress)
m_4020->reset_w(1);
else
@@ -410,43 +409,6 @@ void shuffle_state::dig1_w(u8 data)
m_data_ok = false;
}
-void shuffle_state::pia2c_pa_w(u8 data)
-{
- m_segment1 |= (data<<8);
- m_segment1 |= 0x10000;
- if ((m_segment1 & 0x70000) == 0x30000)
- {
- m_digits[m_strobe] = bitswap<16>(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0);
- m_segment1 |= 0x40000;
- }
-}
-
-void shuffle_state::pia2c_pb_w(u8 data)
-{
- m_segment1 |= data;
- m_segment1 |= 0x20000;
- if ((m_segment1 & 0x70000) == 0x30000)
- {
- m_digits[m_strobe] = bitswap<16>(m_segment1, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0);
- m_segment1 |= 0x40000;
- }
-}
-
-void shuffle_state::pia34_pa_w(u8 data)
-{
- m_segment2 |= (data<<8);
- m_segment2 |= 0x10000;
- if ((m_segment2 & 0x70000) == 0x30000)
- {
- m_digits[m_strobe+16] = bitswap<16>(m_segment2, 7, 15, 12, 10, 8, 14, 13, 9, 11, 6, 5, 4, 3, 2, 1, 0);
- m_segment2 |= 0x40000;
- }
-}
-
-void shuffle_state::pia34_pb_w(u8 data)
-{
-}
-
u8 shuffle_state::sound_r()
{
return m_sound_data;
@@ -490,8 +452,6 @@ void shuffle_state::machine_start()
save_item(NAME(m_row));
save_item(NAME(m_data_ok));
save_item(NAME(m_lamp_data));
- save_item(NAME(m_segment1));
- save_item(NAME(m_segment2));
save_item(NAME(m_sound_data));
}
@@ -511,7 +471,7 @@ void shuffle_state::s4(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &shuffle_state::s4_map);
// Video
- config.set_default_layout(layout_shuffle);
+ config.set_default_layout(layout_shuffle4);
// Sound
genpin_audio(config);
@@ -571,6 +531,8 @@ void shuffle_state::s9(machine_config &config)
config.device_remove("pia22");
m_maincpu->set_addrmap(AS_PROGRAM, &shuffle_state::s9_map);
+ config.set_default_layout(layout_shuffle9);
+
PIA6821(config, m_pia21, 0);
m_pia21->readpa_handler().set(FUNC(shuffle_state::sound_r));
m_pia21->set_port_a_input_overrides_output_mask(0xff);
diff --git a/src/mame/layout/shuffle11.lay b/src/mame/layout/shuffle11.lay
index 7c63416cc1f..2862458316b 100644
--- a/src/mame/layout/shuffle11.lay
+++ b/src/mame/layout/shuffle11.lay
@@ -35,60 +35,80 @@ copyright-holders:Robbbert
</repeat>
</group>
+ <group name="score2">
+ <repeat count="2">
+ <param name="n" start="~s~" increment="1" />
+ <param name="x" start="0" increment="44" />
+ <element name="digit~n~" ref="digit">
+ <bounds x="~x~" y="0" width="34" height="39" />
+ </element>
+ </repeat>
+ </group>
+
<view name="Default Layout">
<bounds left="0" top="20" right="374" bottom="334" />
- <!-- LEDs -->
-
<!-- Player 1 Score -->
- <param name="s" value="0" />
+ <param name="s" value="2" />
<group ref="score">
<bounds left="10" top="45" right="164" bottom="84" />
</group>
<!-- Player 2 Score -->
- <param name="s" value="4" />
+ <param name="s" value="10" />
<group ref="score">
<bounds left="210" top="45" right="364" bottom="84" />
</group>
<!-- Player 3 Score -->
- <param name="s" value="8" />
+ <param name="s" value="18" />
<group ref="score">
<bounds left="10" top="125" right="164" bottom="164" />
</group>
<!-- Player 4 Score -->
- <param name="s" value="16" />
+ <param name="s" value="26" />
<group ref="score">
<bounds left="210" top="125" right="364" bottom="164" />
</group>
<!-- Player 5 Score -->
- <param name="s" value="20" />
- <group ref="score">
- <bounds left="10" top="205" right="164" bottom="244" />
+ <param name="s" value="6" />
+ <group ref="score2">
+ <bounds left="10" top="205" right="80" bottom="244" />
+ </group>
+ <param name="s" value="14" />
+ <group ref="score2">
+ <bounds left="90" top="205" right="164" bottom="244" />
</group>
<!-- Player 6 Score -->
- <param name="s" value="24" />
- <group ref="score">
- <bounds left="210" top="205" right="364" bottom="244" />
+ <param name="s" value="22" />
+ <group ref="score2">
+ <bounds left="210" top="205" right="280" bottom="244" />
+ </group>
+ <param name="s" value="30" />
+ <group ref="score2">
+ <bounds left="290" top="205" right="364" bottom="244" />
</group>
- <!-- Credits and Balls -->
- <element name="digit13" ref="digit">
+ <!-- Credits -->
+ <element name="digit16" ref="digit">
<bounds left="10" top="285" right="44" bottom="324" />
</element>
- <element name="digit12" ref="digit">
+ <element name="digit24" ref="digit">
<bounds left="54" top="285" right="88" bottom="324" />
</element>
- <element name="digit14" ref="digit">
+
+ <!-- Frames and Match -->
+ <element name="digit0" ref="digit">
<bounds left="186" top="285" right="220" bottom="324" />
</element>
- <element name="digit15" ref="digit">
+ <element name="digit8" ref="digit">
<bounds left="230" top="285" right="264" bottom="324" />
</element>
+
+ <!-- Text -->
<element ref="P0"><bounds left="200" right="258" top="270" bottom="282" /></element>
<element ref="P1"><bounds left="30" right="88" top="270" bottom="282" /></element>
<element ref="P3"><bounds left="60" right="140" top="30" bottom="42" /></element>
@@ -97,6 +117,8 @@ copyright-holders:Robbbert
<element ref="P6"><bounds left="260" right="340" top="110" bottom="122" /></element>
<element ref="P7"><bounds left="60" right="140" top="190" bottom="202" /></element>
<element ref="P8"><bounds left="260" right="340" top="190" bottom="202" /></element>
+
+ <!-- LEDs -->
<element name="led0" ref="red_led">
<bounds left="310" right="325" top="300" bottom="315" />
</element>
diff --git a/src/mame/layout/shuffle4.lay b/src/mame/layout/shuffle4.lay
new file mode 100644
index 00000000000..b46b2373a82
--- /dev/null
+++ b/src/mame/layout/shuffle4.lay
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+copyright-holders:Robbbert
+-->
+
+<mamelayout version="2">
+
+ <element name="digit" defstate="0">
+ <led7seg>
+ <color red="1.0" green="0.25" blue="0.0" />
+ </led7seg>
+ </element>
+ <element name="red_led">
+ <disk state="0">
+ <color red="1.0" green="0.0" blue="0.0" />
+ </disk>
+ </element>
+ <element name="P0"><text string="Frame"><color red="1.0" green="1.0" blue="1.0" /></text></element>
+ <element name="P1"><text string="Players"><color red="1.0" green="1.0" blue="1.0" /></text></element>
+ <element name="P3"><text string="Player 1"><color red="1.0" green="1.0" blue="1.0" /></text></element>
+ <element name="P4"><text string="Player 2"><color red="1.0" green="1.0" blue="1.0" /></text></element>
+ <element name="P5"><text string="Player 3"><color red="1.0" green="1.0" blue="1.0" /></text></element>
+ <element name="P6"><text string="Player 4"><color red="1.0" green="1.0" blue="1.0" /></text></element>
+ <element name="P7"><text string="Player 5"><color red="1.0" green="1.0" blue="1.0" /></text></element>
+ <element name="P8"><text string="Player 6"><color red="1.0" green="1.0" blue="1.0" /></text></element>
+
+ <group name="score">
+ <repeat count="4">
+ <param name="n" start="~s~" increment="1" />
+ <param name="x" start="0" increment="44" />
+ <element name="digit~n~" ref="digit">
+ <bounds x="~x~" y="0" width="34" height="39" />
+ </element>
+ </repeat>
+ </group>
+
+ <view name="Default Layout">
+ <bounds left="0" top="20" right="374" bottom="334" />
+
+ <!-- Player 1 Score -->
+ <param name="s" value="0" />
+ <group ref="score">
+ <bounds left="10" top="45" right="164" bottom="84" />
+ </group>
+
+ <!-- Player 2 Score -->
+ <param name="s" value="4" />
+ <group ref="score">
+ <bounds left="210" top="45" right="364" bottom="84" />
+ </group>
+
+ <!-- Player 3 Score -->
+ <param name="s" value="8" />
+ <group ref="score">
+ <bounds left="10" top="125" right="164" bottom="164" />
+ </group>
+
+ <!-- Player 4 Score -->
+ <param name="s" value="16" />
+ <group ref="score">
+ <bounds left="210" top="125" right="364" bottom="164" />
+ </group>
+
+ <!-- Player 5 Score -->
+ <param name="s" value="20" />
+ <group ref="score">
+ <bounds left="10" top="205" right="164" bottom="244" />
+ </group>
+
+ <!-- Player 6 Score -->
+ <param name="s" value="24" />
+ <group ref="score">
+ <bounds left="210" top="205" right="364" bottom="244" />
+ </group>
+
+ <!-- Players -->
+ <element name="digit13" ref="digit">
+ <bounds left="10" top="285" right="44" bottom="324" />
+ </element>
+ <element name="digit12" ref="digit">
+ <bounds left="54" top="285" right="88" bottom="324" />
+ </element>
+
+ <!-- Frames -->
+ <element name="digit14" ref="digit">
+ <bounds left="186" top="285" right="220" bottom="324" />
+ </element>
+ <element name="digit15" ref="digit">
+ <bounds left="230" top="285" right="264" bottom="324" />
+ </element>
+
+ <!-- Text -->
+ <element ref="P0"><bounds left="200" right="258" top="270" bottom="282" /></element>
+ <element ref="P1"><bounds left="30" right="88" top="270" bottom="282" /></element>
+ <element ref="P3"><bounds left="60" right="140" top="30" bottom="42" /></element>
+ <element ref="P4"><bounds left="260" right="340" top="30" bottom="42" /></element>
+ <element ref="P5"><bounds left="60" right="140" top="110" bottom="122" /></element>
+ <element ref="P6"><bounds left="260" right="340" top="110" bottom="122" /></element>
+ <element ref="P7"><bounds left="60" right="140" top="190" bottom="202" /></element>
+ <element ref="P8"><bounds left="260" right="340" top="190" bottom="202" /></element>
+
+ <!-- LEDs -->
+ <element name="led0" ref="red_led">
+ <bounds left="310" right="325" top="300" bottom="315" />
+ </element>
+ <element name="led1" ref="red_led">
+ <bounds left="344" right="359" top="300" bottom="315" />
+ </element>
+ </view>
+</mamelayout>
diff --git a/src/mame/layout/shuffle.lay b/src/mame/layout/shuffle9.lay
index 7c63416cc1f..b2512b3b68c 100644
--- a/src/mame/layout/shuffle.lay
+++ b/src/mame/layout/shuffle9.lay
@@ -38,8 +38,6 @@ copyright-holders:Robbbert
<view name="Default Layout">
<bounds left="0" top="20" right="374" bottom="334" />
- <!-- LEDs -->
-
<!-- Player 1 Score -->
<param name="s" value="0" />
<group ref="score">
@@ -76,19 +74,23 @@ copyright-holders:Robbbert
<bounds left="210" top="205" right="364" bottom="244" />
</group>
- <!-- Credits and Balls -->
+ <!-- Credits -->
<element name="digit13" ref="digit">
<bounds left="10" top="285" right="44" bottom="324" />
</element>
<element name="digit12" ref="digit">
<bounds left="54" top="285" right="88" bottom="324" />
</element>
+
+ <!-- Frames and Match -->
<element name="digit14" ref="digit">
<bounds left="186" top="285" right="220" bottom="324" />
</element>
<element name="digit15" ref="digit">
<bounds left="230" top="285" right="264" bottom="324" />
</element>
+
+ <!-- Text -->
<element ref="P0"><bounds left="200" right="258" top="270" bottom="282" /></element>
<element ref="P1"><bounds left="30" right="88" top="270" bottom="282" /></element>
<element ref="P3"><bounds left="60" right="140" top="30" bottom="42" /></element>
@@ -97,6 +99,8 @@ copyright-holders:Robbbert
<element ref="P6"><bounds left="260" right="340" top="110" bottom="122" /></element>
<element ref="P7"><bounds left="60" right="140" top="190" bottom="202" /></element>
<element ref="P8"><bounds left="260" right="340" top="190" bottom="202" /></element>
+
+ <!-- LEDs -->
<element name="led0" ref="red_led">
<bounds left="310" right="325" top="300" bottom="315" />
</element>