summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author MooglyGuy <MooglyGuy@users.noreply.github.com>2021-08-29 17:46:50 +0200
committer GitHub <noreply@github.com>2021-08-30 01:46:50 +1000
commitcc99e96e30ccfed848e8d80f7d40a325b6c71726 (patch)
tree2c80f97c8befb13ed46c6b9aca08a92d8472e724
parent0510428a31d79095f92931f0abd7cd9e0d99e88b (diff)
-f-32.cpp: royalpk2 fixes and updates (#8493) [Ryan Holtz]
* royalpk2 is now essentially playable, but marked not working due to settings-saving issues. -cpu/e132xs: Fixed issues with SARDI instruction (fixes mosaicf2). [Ryan Holtz]
-rw-r--r--src/devices/cpu/e132xs/e132xsdrc_ops.hxx52
-rw-r--r--src/devices/cpu/e132xs/e132xsop.hxx41
-rw-r--r--src/mame/drivers/f-32.cpp308
3 files changed, 326 insertions, 75 deletions
diff --git a/src/devices/cpu/e132xs/e132xsdrc_ops.hxx b/src/devices/cpu/e132xs/e132xsdrc_ops.hxx
index f61f88f482b..9679faf8364 100644
--- a/src/devices/cpu/e132xs/e132xsdrc_ops.hxx
+++ b/src/devices/cpu/e132xs/e132xsdrc_ops.hxx
@@ -2704,9 +2704,55 @@ void hyperstone_device::generate_shri(drcuml_block &block, compiler_state &compi
template <hyperstone_device::shift_type HI_N>
void hyperstone_device::generate_sardi(drcuml_block &block, compiler_state &compiler, const opcode_desc *desc)
{
- printf("Unimplemented: generate_sardi (%08x)\n", desc->pc);
- fflush(stdout);
- fatalerror(" ");
+ UML_MOV(block, I7, mem(&m_core->clock_cycles_2));
+
+ uint16_t op = desc->opptr.w[0];
+
+ const uint32_t dst_code = (op & 0xf0) >> 4;
+ const uint32_t dstf_code = dst_code + 1;
+
+ generate_check_delay_pc(block, compiler, desc);
+
+ UML_ROLAND(block, I3, DRC_SR, 7, 0x7f);
+
+ UML_ADD(block, I2, I3, dst_code);
+ UML_AND(block, I4, I2, 0x3f);
+ UML_LOAD(block, I0, (void *)m_core->local_regs, I4, SIZE_DWORD, SCALE_x4);
+
+ UML_ADD(block, I2, I3, dstf_code);
+ UML_AND(block, I5, I2, 0x3f);
+ UML_LOAD(block, I1, (void *)m_core->local_regs, I5, SIZE_DWORD, SCALE_x4);
+
+#ifndef PTR64
+ UML_DAND(block, I1, I1, 0x00000000ffffffff);
+#endif
+
+ UML_DSHL(block, I2, I0, 32);
+ UML_DOR(block, I0, I1, I2);
+
+ UML_AND(block, I4, DRC_SR, ~(C_MASK | Z_MASK | N_MASK));
+
+ const uint32_t n = HI_N ? (0x10 | (op & 0xf)) : (op & 0xf);
+ if (HI_N || n)
+ {
+ int no_carry = compiler.m_labelnum++;
+ UML_DTEST(block, I2, (1 << (n - 1)));
+ UML_JMPc(block, uml::COND_Z, no_carry);
+ UML_OR(block, I4, I4, 1);
+ UML_LABEL(block, no_carry);
+
+ UML_DSAR(block, I2, I2, n);
+ }
+
+ UML_DTEST(block, I2, ~0ULL);
+ UML_MOVc(block, uml::COND_Z, I5, Z_MASK);
+ UML_MOVc(block, uml::COND_NZ, I5, 0);
+ UML_DROLINS(block, I5, I2, 3, N_MASK);
+ UML_OR(block, DRC_SR, I4, I5);
+
+ UML_STORE(block, (void *)m_core->local_regs, I6, I2, SIZE_DWORD, SCALE_x4);
+ UML_DSHR(block, I0, I2, 32);
+ UML_STORE(block, (void *)m_core->local_regs, I1, I0, SIZE_DWORD, SCALE_x4);
}
diff --git a/src/devices/cpu/e132xs/e132xsop.hxx b/src/devices/cpu/e132xs/e132xsop.hxx
index 36284db88eb..e1898880d89 100644
--- a/src/devices/cpu/e132xs/e132xsop.hxx
+++ b/src/devices/cpu/e132xs/e132xsop.hxx
@@ -1158,10 +1158,8 @@ void hyperstone_device::hyperstone_shrdi()
{
check_delay_PC();
- const uint32_t fp = GET_FP;
- const uint32_t code = DST_CODE;
- const uint32_t dst_code = (code + fp) & 0x3f;
- const uint32_t dstf_code = (code + 1 + fp) & 0x3f;
+ const uint32_t dst_code = (DST_CODE + GET_FP) & 0x3f;
+ const uint32_t dstf_code = (dst_code + 1) & 0x3f;
uint32_t high_order = m_core->local_regs[dst_code];
const uint32_t low_order = m_core->local_regs[dstf_code];
@@ -1196,9 +1194,8 @@ void hyperstone_device::hyperstone_shrd()
const uint32_t fp = GET_FP;
const uint32_t src_code = (SRC_CODE + fp) & 0x3f;
- const uint32_t d_code = DST_CODE;
- const uint32_t dst_code = (d_code + fp) & 0x3f;
- const uint32_t dstf_code = (d_code + 1 + fp) & 0x3f;
+ const uint32_t dst_code = (DST_CODE + fp) & 0x3f;
+ const uint32_t dstf_code = (dst_code + 1) & 0x3f;
if (src_code == dst_code || src_code == dstf_code)
{
@@ -1260,8 +1257,10 @@ void hyperstone_device::hyperstone_sardi()
const uint32_t dst_code = (DST_CODE + GET_FP) & 0x3f;
const uint32_t dstf_code = (dst_code + 1) & 0x3f;
+ uint32_t high_order = m_core->local_regs[dst_code];
+ const uint32_t low_order = m_core->local_regs[dstf_code];
- uint64_t val = concat_64(m_core->local_regs[dst_code], m_core->local_regs[dstf_code]);
+ uint64_t val = concat_64(high_order, low_order);
SR &= ~(C_MASK | Z_MASK | N_MASK);
@@ -1277,12 +1276,14 @@ void hyperstone_device::hyperstone_sardi()
val |= 0xffffffff00000000U << (32 - n);
}
+ high_order = extract_64hi(val);
+
if (val == 0)
SR |= Z_MASK;
- SR |= SIGN_TO_N(m_core->local_regs[dst_code]);
+ SR |= SIGN_TO_N(high_order);
- m_core->local_regs[dst_code] = (uint32_t)(val >> 32);
- m_core->local_regs[dstf_code] = (uint32_t)val;
+ m_core->local_regs[dst_code] = high_order;
+ m_core->local_regs[dstf_code] = extract_64lo(val);
m_core->icount -= m_core->clock_cycles_2;
}
@@ -1303,7 +1304,10 @@ void hyperstone_device::hyperstone_sard()
return;
}
- uint64_t val = concat_64(m_core->local_regs[dst_code], m_core->local_regs[dstf_code]);
+ uint32_t high_order = m_core->local_regs[dst_code];
+ const uint32_t low_order = m_core->local_regs[dstf_code];
+
+ uint64_t val = concat_64(high_order, low_order);
SR &= ~(C_MASK | Z_MASK | N_MASK);
@@ -1313,22 +1317,21 @@ void hyperstone_device::hyperstone_sard()
{
SR |= (val >> (n - 1)) & 1;
- uint32_t sign_bit = val >> 63;
-
+ const uint64_t sign_bit = val >> 63;
val >>= n;
if (sign_bit)
- {
val |= 0xffffffff00000000L << (32 - n);
- }
}
+ high_order = extract_64hi(val);
+
if (val == 0)
SR |= Z_MASK;
- SR |= SIGN64_TO_N(val);
+ SR |= SIGN_TO_N(high_order);
- m_core->local_regs[dst_code] = (uint32_t)(val >> 32);
- m_core->local_regs[dstf_code] = (uint32_t)val;
+ m_core->local_regs[dst_code] = high_order;
+ m_core->local_regs[dstf_code] = extract_64lo(val);
m_core->icount -= m_core->clock_cycles_2;
}
diff --git a/src/mame/drivers/f-32.cpp b/src/mame/drivers/f-32.cpp
index ff02fb87775..e5be92fede8 100644
--- a/src/mame/drivers/f-32.cpp
+++ b/src/mame/drivers/f-32.cpp
@@ -12,60 +12,131 @@
driver by Pierpaolo Prazzoli
-*********************************************************************/
-
-/*
-royalpk2 : to get 'secret. OK.'
-
-0002D92C: MOV L18, L29
-0002D92E: CMPI L18, $1
-0002D930: BNE $2d94c
-
-go 2d92c
-do l29 = 1
-f5
+ Outputs for Royal Poker 2 (royalpk2):
+ 0: High button
+ 1: Stop button
+ 2: Double Up button
+ 3: Low button *and* Bet button
+ 4: Max Bet button
+ 5: Change button
+ 6: Gift button
+ 7: Hold 1 button
+ 8: Hold 2 button
+ 9: Hold 3 button
+ 10: Hold 4 button
+ 11: Hold 5 button
+ 12: Hold Clear button
+ 13: Staff Call button
+ 14: Start / Deal / Draw button
+ 15: Half Double button
+ 16: 2x Double button
+ 17: Gift 1 lamp
+ 18: Gift 2 lamp
+ 19: Gift 3 lamp
+ 20: 'Medal' (coin output) lamp
+ 21: Counter 1 lamp
+ 22: Counter 2 lamp
+ 23: Counter 3 lamp
+ 24: Counter 4 lamp
+ 25: Counter 5 lamp
+ 26: Light 1 lamp
+ 27: Light 2 lamp
+ 28: Light 3 lamp
+ 29: Light 4 lamp
+ 30: Light 5 lamp
+
+ TODO: royalpk2 is marked non-working, as the machine will soft-lock
+ when attempting to use either settings-save options in the service
+ menu.
-*/
+*********************************************************************/
#include "emu.h"
#include "cpu/e132xs/e132xs.h"
#include "machine/eepromser.h"
+#include "machine/nvram.h"
+#include "machine/ticket.h"
#include "sound/okim6295.h"
#include "sound/ymopm.h"
#include "emupal.h"
#include "screen.h"
#include "speaker.h"
+namespace {
-class mosaicf2_state : public driver_device
+class fe132_state : public driver_device
{
public:
- mosaicf2_state(const machine_config &mconfig, device_type type, const char *tag) :
+ fe132_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu") ,
- m_videoram(*this, "videoram")
+ m_maincpu(*this, "maincpu"),
+ m_eeprom(*this, "eeprom"),
+ m_videoram(*this, "videoram"),
+ m_p1(*this, "P1"),
+ m_system_p2(*this, "SYSTEM_P2")
{ }
- void mosaicf2(machine_config &config);
- void royalpk2(machine_config &config);
+protected:
+ uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ void common_map(address_map &map);
-private:
- /* devices */
required_device<hyperstone_device> m_maincpu;
-
- /* memory pointers */
+ required_device<eeprom_serial_93cxx_device> m_eeprom;
required_shared_ptr<uint32_t> m_videoram;
+ required_ioport m_p1;
+ required_ioport m_system_p2;
+};
- uint32_t f32_input_port_1_r();
- uint32_t screen_update_mosaicf2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- void common_map(address_map &map);
+class mosaicf2_state : public fe132_state
+{
+public:
+ mosaicf2_state(const machine_config &mconfig, device_type type, const char *tag) :
+ fe132_state(mconfig, type, tag)
+ { }
+
+ void mosaicf2(machine_config &config);
+
+protected:
+ uint32_t input_port_1_r();
void mosaicf2_io(address_map &map);
+};
+
+class royalpk2_state : public fe132_state
+{
+public:
+ royalpk2_state(const machine_config &mconfig, device_type type, const char *tag) :
+ fe132_state(mconfig, type, tag),
+ m_nvram(*this, "nvram"),
+ m_hopper(*this, "hopper"),
+ m_lamps(*this, "lamps%u", 0U)
+ { }
+
+ void royalpk2(machine_config &config);
+
+ int hopper_r();
+
+protected:
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
void royalpk2_io(address_map &map);
void royalpk2_map(address_map &map);
-};
+ void protection_seed_w(offs_t offset, uint32_t data);
+ uint32_t protection_response_r();
+
+ template <int Bank> void outputs_w(uint32_t data);
-uint32_t mosaicf2_state::screen_update_mosaicf2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+ required_device<nvram_device> m_nvram;
+ required_device<hopper_device> m_hopper;
+ output_finder<31> m_lamps;
+
+ uint16_t m_protection_index;
+ uint8_t m_protection_response_byte;
+ int m_protection_response_bit;
+};
+
+uint32_t fe132_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
for (offs_t offs = 0; offs < 0x10000; offs++)
{
@@ -84,7 +155,7 @@ uint32_t mosaicf2_state::screen_update_mosaicf2(screen_device &screen, bitmap_in
-void mosaicf2_state::common_map(address_map &map)
+void fe132_state::common_map(address_map &map)
{
map(0x00000000, 0x001fffff).ram();
map(0x40000000, 0x4003ffff).ram().share("videoram");
@@ -92,15 +163,15 @@ void mosaicf2_state::common_map(address_map &map)
map(0xfff00000, 0xffffffff).rom().region("user1", 0);
}
-uint32_t mosaicf2_state::f32_input_port_1_r()
+uint32_t mosaicf2_state::input_port_1_r()
{
- /* burn a bunch of cycles because this is polled frequently during busy loops */
+ // burn a bunch of cycles because this is polled frequently during busy loops
offs_t pc = m_maincpu->pc();
- if ((pc == 0x000379de) || (pc == 0x000379cc) )
+ if (pc == 0x000379de || pc == 0x000379cc)
m_maincpu->eat_cycles(100);
//else printf("PC %08x\n", pc );
- return ioport("SYSTEM_P2")->read();
+ return m_system_p2->read();
}
@@ -109,7 +180,7 @@ void mosaicf2_state::mosaicf2_io(address_map &map)
map(0x4003, 0x4003).r("oki", FUNC(okim6295_device::read));
map(0x4813, 0x4813).r("ymsnd", FUNC(ym2151_device::status_r));
map(0x5000, 0x5003).portr("P1");
- map(0x5200, 0x5203).r(FUNC(mosaicf2_state::f32_input_port_1_r));
+ map(0x5200, 0x5203).r(FUNC(mosaicf2_state::input_port_1_r));
map(0x5400, 0x5403).portr("EEPROMIN");
map(0x6003, 0x6003).w("oki", FUNC(okim6295_device::write));
map(0x6803, 0x6803).w("ymsnd", FUNC(ym2151_device::data_w));
@@ -174,9 +245,9 @@ void mosaicf2_state::mosaicf2(machine_config &config)
m_maincpu->set_addrmap(AS_IO, &mosaicf2_state::mosaicf2_io);
m_maincpu->set_vblank_int("screen", FUNC(mosaicf2_state::irq0_line_hold));
- EEPROM_93C46_16BIT(config, "eeprom")
- .erase_time(attotime::from_usec(1))
- .write_time(attotime::from_usec(1));
+ EEPROM_93C46_16BIT(config, m_eeprom);
+ m_eeprom->erase_time(attotime::from_usec(1));
+ m_eeprom->write_time(attotime::from_usec(1));
/* video hardware */
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -184,7 +255,7 @@ void mosaicf2_state::mosaicf2(machine_config &config)
screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500) /* not accurate */);
screen.set_size(512, 512);
screen.set_visarea(0, 319, 0, 223);
- screen.set_screen_update(FUNC(mosaicf2_state::screen_update_mosaicf2));
+ screen.set_screen_update(FUNC(mosaicf2_state::screen_update));
screen.set_palette("palette");
PALETTE(config, "palette", palette_device::RGB_555);
@@ -206,13 +277,45 @@ void mosaicf2_state::mosaicf2(machine_config &config)
static INPUT_PORTS_START( royalpk2 )
PORT_START("P1")
+ PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_GAMBLE_HIGH )
+ PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_GAMBLE_LOW )
+ PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT )
+ PORT_BIT( 0x00080000, IP_ACTIVE_LOW, IPT_GAMBLE_D_UP )
+ PORT_BIT( 0x00100000, IP_ACTIVE_LOW, IPT_GAMBLE_BET )
+ PORT_BIT( 0x00200000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Max Bet")
+ PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Change")
+ PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Gift")
+ PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_POKER_HOLD1 )
+ PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_POKER_HOLD2 )
+ PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_POKER_HOLD3 )
+ PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_POKER_HOLD4 )
+ PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_POKER_HOLD5 )
+ PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_POKER_CANCEL )
+ PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Staff Call") PORT_CODE(KEYCODE_Q)
+ PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_GAMBLE_DEAL ) PORT_NAME("Start/Deal/Draw") PORT_CODE(KEYCODE_1)
PORT_START("SYSTEM_P2")
+ PORT_BIT( 0x0000ffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x00010000, IP_ACTIVE_LOW, IPT_GAMBLE_HALF )
+ PORT_BIT( 0x00020000, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("2x Double") PORT_CODE(KEYCODE_4)
+ PORT_BIT( 0x00040000, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Credit Clear") PORT_CODE(KEYCODE_W)
+ PORT_BIT( 0x00080000, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Credit Pay Out") PORT_CODE(KEYCODE_E)
+ PORT_BIT( 0x00100000, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_NAME("Income") PORT_CODE(KEYCODE_R)
+ PORT_BIT( 0x00200000, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_NAME("Income Clear") PORT_CODE(KEYCODE_T)
+ PORT_BIT( 0x00400000, IP_ACTIVE_LOW, IPT_GAMBLE_SERVICE )
PORT_BIT( 0x00800000, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen")
- PORT_BIT( 0xff7fffff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+ PORT_BIT( 0x01000000, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0x02000000, IP_ACTIVE_LOW, IPT_COIN2 )
+ PORT_BIT( 0x04000000, IP_ACTIVE_LOW, IPT_COIN3 )
+ PORT_BIT( 0x08000000, IP_ACTIVE_LOW, IPT_BUTTON10 ) PORT_NAME("Medal Clear") PORT_CODE(KEYCODE_Y)
+ PORT_BIT( 0x10000000, IP_ACTIVE_LOW, IPT_BUTTON11 ) PORT_NAME("Operator Gift") PORT_CODE(KEYCODE_U)
+ PORT_BIT( 0x20000000, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(royalpk2_state, hopper_r)
+ PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_BUTTON13 ) PORT_NAME("Over Flow") PORT_CODE(KEYCODE_O)
+ PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_BUTTON14 ) PORT_NAME("Medal Empty") PORT_CODE(KEYCODE_L)
PORT_START( "EEPROMIN" )
- PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, do_read)
+ PORT_BIT( 0x00000080, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, do_read)
PORT_START( "EEPROMOUT" )
PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, di_write)
@@ -224,9 +327,7 @@ static INPUT_PORTS_START( royalpk2 )
PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, cs_write)
INPUT_PORTS_END
-
-
-void mosaicf2_state::royalpk2_map(address_map &map)
+void royalpk2_state::royalpk2_map(address_map &map)
{
map(0x00000000, 0x003fffff).ram();
map(0x40000000, 0x4003ffff).ram().share("videoram");
@@ -234,28 +335,128 @@ void mosaicf2_state::royalpk2_map(address_map &map)
map(0xfff00000, 0xffffffff).rom().region("user1", 0);
}
-void mosaicf2_state::royalpk2_io(address_map &map)
+int royalpk2_state::hopper_r()
+{
+ return m_hopper->line_r() ? 0 : 1;
+}
+
+void royalpk2_state::royalpk2_io(address_map &map)
{
+ map(0x4800, 0x4803).portr("P1");
map(0x4900, 0x4903).portr("SYSTEM_P2");
map(0x4a00, 0x4a03).portr("EEPROMIN");
+ map(0x4b00, 0x4b03).r(FUNC(royalpk2_state::protection_response_r));
+
+ map(0x6000, 0x61ff).ram().share("nvram");
+
map(0x6800, 0x6803).portw("EEPROMCLK");
map(0x6900, 0x6903).portw("EEPROMCS");
map(0x6a00, 0x6a03).portw("EEPROMOUT");
+
+ map(0x6d00, 0x6d03).w(FUNC(royalpk2_state::protection_seed_w));
+
+ map(0x7000, 0x7003).w(FUNC(royalpk2_state::outputs_w<0>));
+ map(0x7100, 0x7103).w(FUNC(royalpk2_state::outputs_w<1>));
+ map(0x7200, 0x7203).w(FUNC(royalpk2_state::outputs_w<2>));
+ map(0x7300, 0x7303).w(FUNC(royalpk2_state::outputs_w<3>));
+ map(0x7400, 0x7403).w(FUNC(royalpk2_state::outputs_w<4>));
+}
+
+void royalpk2_state::machine_start()
+{
+ save_item(NAME(m_protection_index));
+ save_item(NAME(m_protection_response_byte));
+ save_item(NAME(m_protection_response_bit));
+
+ m_lamps.resolve();
+
+ for (int i = 0; i < 31; i++)
+ m_lamps[i] = 0;
+}
+
+void royalpk2_state::machine_reset()
+{
+ m_protection_index = 0;
+ m_protection_response_byte = 0;
+ m_protection_response_bit = 0;
+}
+
+void royalpk2_state::protection_seed_w(offs_t offset, uint32_t data)
+{
+ if ((m_protection_index % 2) == 0)
+ m_protection_response_byte = 0x85;
+ else if ((m_protection_index % 2) == 1)
+ m_protection_response_byte = 0x81;
+
+ m_protection_index++;
+ m_protection_response_bit = 7;
+}
+
+uint32_t royalpk2_state::protection_response_r()
+{
+ uint32_t data = BIT(m_protection_response_byte, m_protection_response_bit) << 6;
+ if (m_protection_response_bit > 0)
+ {
+ m_protection_response_bit--;
+ }
+ else
+ {
+ logerror("Protection response byte fully sent.\n");
+ }
+ return data;
}
-void mosaicf2_state::royalpk2(machine_config &config)
+template <int Bank>
+void royalpk2_state::outputs_w(uint32_t data)
+{
+ // TODO: Lamps 26 to 30 occupy multiple bits of a given output port. Find out if it's due to brightness control or something else.
+
+ switch (Bank)
+ {
+ case 0:
+ m_lamps[0] = BIT(data, 8);
+ for (int i = 0; i < 6; i++)
+ m_lamps[1 + i] = BIT(data, 10 + i);
+ break;
+ case 1:
+ for (int i = 0; i < 8; i++)
+ m_lamps[7 + i] = BIT(data, 8 + i);
+ break;
+ case 2:
+ for (int i = 0; i < 8; i++)
+ m_lamps[15 + i] = BIT(data, 8 + i);
+ break;
+ case 3:
+ for (int i = 0; i < 3; i++)
+ m_lamps[23 + i] = BIT(data, 8 + i);
+ m_lamps[26] = (data & 0x3000) ? 1 : 0;
+ m_lamps[27] = (data & 0xc000) ? 1 : 0;
+ break;
+ case 4:
+ m_lamps[28] = (data & 0x0f00) ? 1 : 0;
+ m_lamps[29] = (data & 0x3000) ? 1 : 0;
+ m_lamps[30] = (data & 0xc000) ? 1 : 0;
+ break;
+ }
+}
+
+void royalpk2_state::royalpk2(machine_config &config)
{
/* basic machine hardware */
GMS30C2132(config, m_maincpu, XTAL(50'000'000));
- m_maincpu->set_addrmap(AS_PROGRAM, &mosaicf2_state::royalpk2_map);
- m_maincpu->set_addrmap(AS_IO, &mosaicf2_state::royalpk2_io);
- m_maincpu->set_vblank_int("screen", FUNC(mosaicf2_state::irq1_line_hold));
+ m_maincpu->set_addrmap(AS_PROGRAM, &royalpk2_state::royalpk2_map);
+ m_maincpu->set_addrmap(AS_IO, &royalpk2_state::royalpk2_io);
+ m_maincpu->set_vblank_int("screen", FUNC(royalpk2_state::irq1_line_hold));
+
+ EEPROM_93C46_16BIT(config, m_eeprom);
+ m_eeprom->erase_time(attotime::from_usec(1));
+ m_eeprom->write_time(attotime::from_usec(1));
+
+ NVRAM(config, m_nvram, nvram_device::DEFAULT_ALL_0);
- EEPROM_93C46_16BIT(config, "eeprom")
- .erase_time(attotime::from_usec(1))
- .write_time(attotime::from_usec(1));
+ HOPPER(config, m_hopper, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW);
/* video hardware */
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -263,7 +464,7 @@ void mosaicf2_state::royalpk2(machine_config &config)
screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500) /* not accurate */);
screen.set_size(512, 512);
screen.set_visarea(0, 319, 0, 223);
- screen.set_screen_update(FUNC(mosaicf2_state::screen_update_mosaicf2));
+ screen.set_screen_update(FUNC(royalpk2_state::screen_update));
screen.set_palette("palette");
PALETTE(config, "palette", palette_device::RGB_555);
@@ -377,6 +578,7 @@ ROM_START( royalpk2 )
ROM_LOAD( "snd2", 0x000000, 0x080000, CRC(f25e3315) SHA1(ce5350ecba6769b17bb01d82b55f26ded4d51773) )
ROM_END
+} // anonymous namespace
GAME( 1999, mosaicf2, 0, mosaicf2, mosaicf2, mosaicf2_state, empty_init, ROT0, "F2 System", "Mosaic (F2 System)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, royalpk2, 0, royalpk2, royalpk2, mosaicf2_state, empty_init, ROT0, "F2 System", "Royal Poker 2 (Network version 3.12)", MACHINE_NOT_WORKING )
+GAME( 1999, royalpk2, 0, royalpk2, royalpk2, royalpk2_state, empty_init, ROT0, "F2 System", "Royal Poker 2 (Network version 3.12)", MACHINE_NOT_WORKING )