summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/devices/bus/z88/z88.cpp34
-rw-r--r--src/devices/bus/z88/z88.h9
-rw-r--r--src/mame/arcade.flt1
-rw-r--r--src/mame/drivers/nbmj9195.cpp98
-rw-r--r--src/mame/drivers/nichild.cpp321
-rw-r--r--src/mame/drivers/policetr.cpp2
-rw-r--r--src/mame/drivers/z88.cpp130
-rw-r--r--src/mame/includes/nbmj9195.h3
-rw-r--r--src/mame/includes/z88.h34
-rw-r--r--src/mame/mame.lst6
-rw-r--r--src/mame/video/z88.cpp91
11 files changed, 457 insertions, 272 deletions
diff --git a/src/devices/bus/z88/z88.cpp b/src/devices/bus/z88/z88.cpp
index 9f7b7fb3172..bed0141b012 100644
--- a/src/devices/bus/z88/z88.cpp
+++ b/src/devices/bus/z88/z88.cpp
@@ -55,20 +55,13 @@ device_z88cart_interface::~device_z88cart_interface()
//-------------------------------------------------
// z88cart_slot_device - constructor
//-------------------------------------------------
-z88cart_slot_device::z88cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
- device_t(mconfig, Z88CART_SLOT, tag, owner, clock),
- device_image_interface(mconfig, *this),
- device_slot_interface(mconfig, *this),
- m_out_flp_cb(*this),
- m_cart(nullptr), m_flp_timer(nullptr)
-{
-}
-
-//-------------------------------------------------
-// z88cart_slot_device - destructor
-//-------------------------------------------------
-
-z88cart_slot_device::~z88cart_slot_device()
+z88cart_slot_device::z88cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ : device_t(mconfig, Z88CART_SLOT, tag, owner, clock)
+ , device_image_interface(mconfig, *this)
+ , device_slot_interface(mconfig, *this)
+ , m_out_flp_cb(*this)
+ , m_cart(nullptr)
+ , m_flp_timer(nullptr)
{
}
@@ -109,24 +102,25 @@ image_init_result z88cart_slot_device::call_load()
{
if (m_cart)
{
- offs_t read_length;
uint8_t *cart_base = m_cart->get_cart_base();
if (cart_base != nullptr)
{
if (!loaded_through_softlist())
{
- read_length = length();
+ offs_t read_length = length();
fread(cart_base + (m_cart->get_cart_size() - read_length), read_length);
}
else
{
- read_length = get_software_region_length("rom");
+ offs_t read_length = get_software_region_length("rom");
memcpy(cart_base + (m_cart->get_cart_size() - read_length), get_software_region("rom"), read_length);
}
}
else
+ {
return image_init_result::FAIL;
+ }
}
// open the flap
@@ -147,9 +141,11 @@ void z88cart_slot_device::call_unload()
{
if (m_cart)
{
- auto cart_size = m_cart->get_cart_size();
- if (cart_size>0)
+ size_t cart_size = m_cart->get_cart_size();
+ if (cart_size > 0)
+ {
memset(m_cart->get_cart_base(), 0xff, cart_size);
+ }
}
// open the flap
diff --git a/src/devices/bus/z88/z88.h b/src/devices/bus/z88/z88.h
index 8481c3e7780..c1337cab5cf 100644
--- a/src/devices/bus/z88/z88.h
+++ b/src/devices/bus/z88/z88.h
@@ -90,8 +90,7 @@ class z88cart_slot_device : public device_t,
{
public:
// construction/destruction
- z88cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- virtual ~z88cart_slot_device();
+ z88cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
template <class Object> devcb_base &set_out_flp_callback(Object &&cb) { return m_out_flp_cb.set_callback(std::forward<Object>(cb)); }
@@ -125,9 +124,9 @@ protected:
private:
static constexpr device_timer_id TIMER_FLP_CLEAR = 0;
- devcb_write_line m_out_flp_cb;
- device_z88cart_interface* m_cart;
- emu_timer * m_flp_timer;
+ devcb_write_line m_out_flp_cb;
+ device_z88cart_interface* m_cart;
+ emu_timer * m_flp_timer;
};
diff --git a/src/mame/arcade.flt b/src/mame/arcade.flt
index 5962de7e509..b4d53785c61 100644
--- a/src/mame/arcade.flt
+++ b/src/mame/arcade.flt
@@ -832,6 +832,7 @@ neptunp2.cpp
news.cpp
nexus3d.cpp
nibble.cpp
+nichild.cpp
nightgal.cpp
ninjakd2.cpp
ninjaw.cpp
diff --git a/src/mame/drivers/nbmj9195.cpp b/src/mame/drivers/nbmj9195.cpp
index ab627ecc8a6..2767038d9cb 100644
--- a/src/mame/drivers/nbmj9195.cpp
+++ b/src/mame/drivers/nbmj9195.cpp
@@ -663,29 +663,6 @@ void nbmj9195_state::sailorws_sound_io_map(address_map &map)
map(0x80, 0x81).mirror(0xff00).w("ymsnd", FUNC(ym3812_device::write));
}
-
-
-
-/*
-TODO: it probably doesn't belong in here. Both CPUs are certainly tmpz84c011 tho ...
-*/
-
-void nbmj9195_state::shabdama_map(address_map &map)
-{
- map(0x0000, 0x7fff).rom();
- map(0xe000, 0xe7ff).ram();
-// AM_RANGE(0xd000, 0xd1ff) AM_RAM_WRITE(palette_w) AM_SHARE("paletteram")
-// AM_RANGE(0xd800, 0xdfff) AM_RAM
-}
-
-void nbmj9195_state::shabdama_io_map(address_map &map)
-{
-// ADDRESS_MAP_UNMAP_HIGH
-// AM_RANGE(0x60, 0x61) AM_READ(blitter_0_r)
-// AM_RANGE(0x60, 0x6f) AM_WRITE(blitter_0_w)
-// AM_RANGE(0x70, 0x7f) AM_WRITE(clut_0_w)
-}
-
/********************************************************************************
These Nichibutsu Mahjong games use two different but very similar control ports:
- the 1st type is the common control panel used by many other nbmj* drivers
@@ -2889,15 +2866,6 @@ MACHINE_CONFIG_START(nbmj9195_state::mjegolf)
MACHINE_CONFIG_END
-MACHINE_CONFIG_START(nbmj9195_state::shabdama)
- NBMJDRV1(config);
-
- /* basic machine hardware */
- MCFG_DEVICE_MODIFY("maincpu")
- MCFG_DEVICE_PROGRAM_MAP(shabdama_map)
- MCFG_DEVICE_IO_MAP(shabdama_io_map)
-MACHINE_CONFIG_END
-
ROM_START( mjuraden )
ROM_REGION( 0x10000, "maincpu", 0 ) /* main program */
@@ -3470,68 +3438,6 @@ ROM_START( jituroku )
ROM_LOAD( "9.10h", 0x300000, 0x80000, CRC(6bea11d7) SHA1(c9ea69ed38a86c138f702f84c26897225cdaff31) )
ROM_END
-ROM_START( shabdama )
- ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
- ROM_LOAD( "1.bin", 0x000000, 0x010000, CRC(e49e3d73) SHA1(6d17d60e1b6f8aee96f7a09f45113030064d3bdb) )
-
- ROM_REGION( 0x20000, "audiocpu", ROMREGION_ERASE00 )
- ROM_LOAD( "3.bin", 0x000000, 0x010000, CRC(e8233c6e) SHA1(fbfdb03dc9f4e3e80e161b8522b676485ffb1c95) )
- ROM_LOAD( "2.bin", 0x010000, 0x010000, CRC(3e0b5344) SHA1(eeae36fc4fca091065c1d51f05c2d11f44fe6d13) )
-
- ROM_REGION( 0x80000, "gfx1", ROMREGION_ERASE00 )
- ROM_LOAD( "10.bin", 0x060000, 0x010000, CRC(5da10b82) SHA1(72974d083110fc6c583bfa1c22ce3abe02ba86f6) )
- ROM_LOAD( "9.bin", 0x050000, 0x010000, CRC(1afdc5bf) SHA1(b07b32656ffc96b7f7d4bd242b2a6e0e105ab67a) )
- ROM_LOAD( "8.bin", 0x040000, 0x010000, CRC(3e75423e) SHA1(62e24849ddeb004ed8570d2884afa4ab257cdf07) )
- ROM_LOAD( "7.bin", 0x030000, 0x010000, CRC(7f08e3a6) SHA1(127018442183332175c9e1f558274cd2cb5f0147) )
- ROM_LOAD( "6.bin", 0x020000, 0x010000, CRC(0fece809) SHA1(1fe8436af8ead02a3b517b6306f9824cd64b2d26) )
- ROM_LOAD( "5.bin", 0x010000, 0x010000, CRC(0706386a) SHA1(29eee363775869dcc9c46285632e8bf745c9110b) )
- ROM_LOAD( "4.bin", 0x000000, 0x010000, CRC(199e2127) SHA1(2514d51cb06438b312d1f328c72baa739280416a) )
-
- DISK_REGION( "laserdisc" )
- DISK_IMAGE_READONLY( "shabdama", 0, NO_DUMP )
-ROM_END
-
-
-// LD QUIZ 第4弾 答えたもん勝ち!
-// This runs on slightly different hardware, which might need a dedicated driver when the LD dump becomes available:
-// 1 x TMPZ84C011AF-6 main CPU
-// 1 x 21.47727MHz OSC
-// 1 x Z0840004PSC audio CPU
-// 1 x 4.000MHz OSC
-// 1 x Yamaha V9938
-// 1 x uPC1352C
-// 1 x Yamaha YM3812
-// 2 x 8 dip switch banks
-
-ROM_START( ldquiz4 )
- ROM_REGION( 0x10000, "maincpu", 0 ) // 27512
- ROM_LOAD( "1.e3", 0x00000, 0x10000, CRC(49255f66) SHA1(bdd01987331c2aadea7f588d39c48c70cd43fc71) )
-
- ROM_REGION( 0x20000, "audiocpu", 0 ) // 27512
- ROM_LOAD( "3.e7", 0x00000, 0x10000, CRC(b033eb6a) SHA1(2c11b2b998117f68a1fbbd110d3f67ab472e133d) )
- ROM_LOAD( "2.e6", 0x10000, 0x10000, CRC(6c83cad6) SHA1(c38f60fb4fdbda76ea3459644bf491cc305a7ae6) )
-
- ROM_REGION( 0x120000, "gfx1", 0 ) // 27010
- ROM_LOAD( "4.k1", 0x000000, 0x20000, CRC(9cdf8114) SHA1(99e6b9bb43c6df320fdb1ea8599967b707f7f18d) )
- ROM_LOAD( "5.k2", 0x020000, 0x20000, CRC(7746a909) SHA1(c69a45159d15e8897a5999e57b519ed6fc0d9812) )
- ROM_LOAD( "6.k3", 0x040000, 0x20000, CRC(3b3e63ad) SHA1(92898ade77ad267978a469b03c9113f4e5a47288) )
- ROM_LOAD( "7.k4", 0x060000, 0x20000, CRC(cdcaae32) SHA1(bfc07524a9859592bf7c6397fd80570b4e5e15fc) )
- ROM_LOAD( "8.k5", 0x080000, 0x20000, CRC(c08b90e6) SHA1(add35812ea98ac44299b7f165efeee268aa57132) )
- ROM_LOAD( "9.k6", 0x0a0000, 0x20000, CRC(72c1a283) SHA1(8dbfc5892d719033dff82c70f13c1d7c63173240) )
- ROM_LOAD( "10.k8", 0x0c0000, 0x20000, CRC(c7437125) SHA1(55b161ce2432d04531ed0afab973f892b571ef88) )
- ROM_LOAD( "11.k9", 0x0e0000, 0x20000, CRC(6feeab93) SHA1(d77325c1eecb677c48d11bf8d5f73b238f2896e6) )
- ROM_LOAD( "12.k10", 0x100000, 0x20000, CRC(c7f9bf98) SHA1(103b78b0e126ea4249982bf114010f57e5ffa70a) )
-
- ROM_REGION( 0x800, "plds", 0 ) // all protected
- ROM_LOAD( "pal16l8.0", 0x000, 0x104, NO_DUMP )
- ROM_LOAD( "pal16l8.1", 0x200, 0x104, NO_DUMP )
- ROM_LOAD( "pal16l8.2", 0x400, 0x104, NO_DUMP )
- ROM_LOAD( "pal16l8.3", 0x600, 0x104, NO_DUMP )
-
- DISK_REGION( "laserdisc" )
- DISK_IMAGE_READONLY( "ldquiz4", 0, NO_DUMP )
-ROM_END
-
// YEAR, NAME, PARENT, MACHINE, INPUT, STATE, INIT, MONITOR, COMPANY, FULLNAME, FLAGS
GAME( 1992, mjuraden, 0, mjuraden, mjuraden, nbmj9195_state, init_nbmj9195, ROT0, "Nichibutsu / Yubis", "Mahjong Uranai Densetsu (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1992, koinomp, 0, koinomp, koinomp, nbmj9195_state, init_nbmj9195, ROT0, "Nichibutsu", "Mahjong Koi no Magic Potion (Japan)", MACHINE_SUPPORTS_SAVE )
@@ -3566,7 +3472,3 @@ GAME( 1992, mkoiuraa, mjkoiura, mkoiuraa, mjkoiura, nbmj9195_state, init_nbmj919
GAME( 1994, mscoutm, 0, mscoutm, mscoutm, nbmj9195_state, init_nbmj9195, ROT0, "Sphinx / AV Japan", "Mahjong Scout Man (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1994, imekura, 0, imekura, imekura, nbmj9195_state, init_nbmj9195, ROT0, "Sphinx / AV Japan", "Imekura Mahjong (Japan)", MACHINE_SUPPORTS_SAVE )
GAME( 1994, mjegolf, 0, mjegolf, mjegolf, nbmj9195_state, init_nbmj9195, ROT0, "Fujic / AV Japan", "Mahjong Erotica Golf (Japan)", MACHINE_SUPPORTS_SAVE )
-
-GAME( 1991, shabdama, 0, shabdama, mjuraden, nbmj9195_state, init_nbmj9195, ROT0, "Nichibutsu", "LD Mahjong #4 Shabon-Dama", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-
-GAME( 1992, ldquiz4, 0, shabdama, mjuraden, nbmj9195_state, init_nbmj9195, ROT0, "Nichibutsu", "LD Quiz dai 4-dan - Kotaetamon Gachi! (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/nichild.cpp b/src/mame/drivers/nichild.cpp
new file mode 100644
index 00000000000..4d2f81b7c92
--- /dev/null
+++ b/src/mame/drivers/nichild.cpp
@@ -0,0 +1,321 @@
+// license:LGPL-2.1+
+// copyright-holders:Angelo Salese
+/***************************************************************************
+
+ 'Nichibutsu LD' HW (c) 199? Nichibutsu
+
+ TODO:
+ - Understand how MMU works (both games jumps to invalid areas, probably
+ port A remaps memory for the whole space!);
+ - (if ld check patched) memory error printed by ldquiz4, most likely
+ related to above;
+ - Unknown LaserDisc type;
+ - Verify irq vector for vblank irq, and make it work with daisy chain;
+ - Unknown irq vector for LaserDisc strobe (ldquiz4 sets a flag at $f014,
+ the only place it clears it is at snippet 0x0ED6);
+ - hookup audio CPU (same as niyanpai HW?)
+
+=============================================================================
+
+ 1 x TMPZ84C011AF-6 main CPU
+ 1 x 21.47727MHz OSC
+ 1 x Z0840004PSC audio CPU
+ 1 x 4.000MHz OSC
+ 1 x Yamaha V9938
+ 1 x uPC1352C
+ 1 x Yamaha YM3812
+ 2 x 8 dip switch banks
+
+***************************************************************************/
+
+
+#include "emu.h"
+#include "cpu/z80/tmpz84c011.h"
+#include "video/v9938.h"
+#include "screen.h"
+#include "speaker.h"
+
+#define MAIN_CLOCK XTAL(21'477'272)
+#define SOUND_CLOCK XTAL(4'000'000)
+
+class nichild_state : public driver_device
+{
+public:
+ nichild_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_v9938(*this, "v9938")
+ , m_gfxrom(*this, "gfx")
+ {
+ }
+
+ DECLARE_READ8_MEMBER(gfx_r);
+ DECLARE_READ8_MEMBER(mux_r);
+ DECLARE_WRITE8_MEMBER(mux_w);
+ DECLARE_WRITE8_MEMBER(porta_w);
+ DECLARE_WRITE8_MEMBER(portb_w);
+ DECLARE_WRITE8_MEMBER(portc_w);
+ DECLARE_WRITE8_MEMBER(portd_w);
+ DECLARE_WRITE8_MEMBER(gfxbank_w);
+ INTERRUPT_GEN_MEMBER(vdp_irq);
+
+ void nichild(machine_config &config);
+
+ void nichild_io(address_map &map);
+ void nichild_map(address_map &map);
+protected:
+ // driver_device overrides
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
+private:
+ required_device<cpu_device> m_maincpu;
+ required_device<v9938_device> m_v9938;
+ required_region_ptr<uint8_t> m_gfxrom;
+ uint32_t m_gfx_bank;
+};
+
+
+READ8_MEMBER(nichild_state::gfx_r)
+{
+ uint32_t gfx_offset;
+
+ gfx_offset = ((offset & 0x007f) << 8);
+ gfx_offset |= ((offset & 0xff00) >> 8);
+ gfx_offset |= m_gfx_bank;
+
+ //printf("%08x %02x\n",gfx_offset,m_gfx_bank);
+
+ return m_gfxrom[gfx_offset];
+}
+
+//#include "debugger.h"
+
+WRITE8_MEMBER(nichild_state::porta_w)
+{
+ printf("PORTA %02x\n",data);
+// machine().debug_break();
+}
+
+WRITE8_MEMBER(nichild_state::portb_w)
+{
+ printf("PORTB %02x\n",data);
+}
+
+WRITE8_MEMBER(nichild_state::portc_w)
+{
+ printf("PORTC %02x\n",data);
+}
+
+WRITE8_MEMBER(nichild_state::portd_w)
+{
+ printf("PORTD %02x\n",data);
+}
+
+WRITE8_MEMBER(nichild_state::gfxbank_w)
+{
+ // TODO: ldquiz4 checks up to 0x30, what for?
+ m_gfx_bank = data * 0x8000;
+}
+
+READ8_MEMBER(nichild_state::mux_r)
+{
+ // TODO
+ return 0xff;
+}
+
+WRITE8_MEMBER(nichild_state::mux_w)
+{
+ // ...
+}
+
+void nichild_state::nichild_map(address_map &map)
+{
+ // TODO: MMU :/
+ map(0x0000, 0x1fff).rom().region("ipl", 0x0000);
+ map(0x2000, 0x3fff).rom().region("ipl", 0x2000);
+ map(0x4000, 0x5fff).rom().region("ipl", 0x4000);
+ map(0x6000, 0x7fff).rom().region("ipl", 0x6000);
+ map(0x8000, 0x9fff).rom().region("ipl", 0x8000);
+ map(0xc000, 0xdfff).rom().region("ipl", 0x0000);
+ map(0xe000, 0xffff).ram();
+}
+
+void nichild_state::nichild_io(address_map &map)
+{
+// map.global_mask(0xff);
+ map(0x60, 0x60).mirror(0xff00).w(FUNC(nichild_state::mux_w));
+ // shabdama accesses 0x70-0x73, ldquiz4 0x7c-0x7f
+ map(0x70, 0x73).mirror(0xff0c).rw(m_v9938, FUNC(v9938_device::read), FUNC(v9938_device::write));
+ map(0x80, 0xff).select(0xff00).r(FUNC(nichild_state::gfx_r));
+}
+
+static INPUT_PORTS_START( nichild )
+ /* dummy active high structure */
+ PORT_START("SYSA")
+ PORT_DIPNAME( 0x01, 0x00, "SYSA" )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x01, DEF_STR( On ) )
+ PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x02, DEF_STR( On ) )
+ PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x04, DEF_STR( On ) )
+ PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x08, DEF_STR( On ) )
+ PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x10, DEF_STR( On ) )
+ PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x20, DEF_STR( On ) )
+ PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x40, DEF_STR( On ) )
+ PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x80, DEF_STR( On ) )
+
+ /* dummy active low structure */
+ PORT_START("DSWA")
+ PORT_DIPNAME( 0x01, 0x01, "DSWA" )
+ PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+INPUT_PORTS_END
+
+
+void nichild_state::machine_start()
+{
+}
+
+void nichild_state::machine_reset()
+{
+}
+
+#if 0
+static const z80_daisy_config daisy_chain_main[] =
+{
+ TMPZ84C011_DAISY_INTERNAL,
+ { nullptr }
+};
+#endif
+
+
+INTERRUPT_GEN_MEMBER(nichild_state::vdp_irq)
+{
+ m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0x76);
+}
+
+
+MACHINE_CONFIG_START(nichild_state::nichild)
+
+ /* basic machine hardware */
+ MCFG_DEVICE_ADD("maincpu",TMPZ84C011,MAIN_CLOCK/4)
+// MCFG_Z80_DAISY_CHAIN(daisy_chain_main)
+ MCFG_DEVICE_PROGRAM_MAP(nichild_map)
+ MCFG_DEVICE_IO_MAP(nichild_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", nichild_state, vdp_irq)
+ MCFG_TMPZ84C011_PORTB_READ_CB(READ8(*this, nichild_state, mux_r))
+ MCFG_TMPZ84C011_PORTA_WRITE_CB(WRITE8(*this, nichild_state, porta_w))
+ MCFG_TMPZ84C011_PORTB_WRITE_CB(WRITE8(*this, nichild_state, portb_w))
+ MCFG_TMPZ84C011_PORTC_WRITE_CB(WRITE8(*this, nichild_state, portc_w))
+ MCFG_TMPZ84C011_PORTD_WRITE_CB(WRITE8(*this, nichild_state, portd_w))
+ MCFG_TMPZ84C011_PORTE_WRITE_CB(WRITE8(*this, nichild_state, gfxbank_w))
+
+ /* video hardware */
+ MCFG_V9938_ADD("v9938", "screen", 0x40000, MAIN_CLOCK)
+// MCFG_V99X8_INTERRUPT_CALLBACK(INPUTLINE("maincpu", 0))
+// MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(*this, nichild_state, vdp_irq))
+ MCFG_V99X8_SCREEN_ADD_NTSC("screen", "v9938", MAIN_CLOCK)
+
+ /* sound hardware */
+ SPEAKER(config, "mono").front_center();
+// MCFG_DEVICE_ADD("aysnd", AY8910, MAIN_CLOCK/4)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
+MACHINE_CONFIG_END
+
+
+/***************************************************************************
+
+ Machine driver(s)
+
+***************************************************************************/
+
+ROM_START( shabdama )
+ ROM_REGION( 0x10000, "ipl", ROMREGION_ERASE00 )
+ ROM_LOAD( "1.bin", 0x000000, 0x010000, CRC(e49e3d73) SHA1(6d17d60e1b6f8aee96f7a09f45113030064d3bdb) )
+
+ ROM_REGION( 0x20000, "audiocpu", ROMREGION_ERASE00 )
+ ROM_LOAD( "3.bin", 0x000000, 0x010000, CRC(e8233c6e) SHA1(fbfdb03dc9f4e3e80e161b8522b676485ffb1c95) )
+ ROM_LOAD( "2.bin", 0x010000, 0x010000, CRC(3e0b5344) SHA1(eeae36fc4fca091065c1d51f05c2d11f44fe6d13) )
+
+ ROM_REGION( 0x200000, "gfx", ROMREGION_ERASE00 )
+ ROM_LOAD( "10.bin", 0x060000, 0x010000, CRC(5da10b82) SHA1(72974d083110fc6c583bfa1c22ce3abe02ba86f6) )
+ ROM_LOAD( "9.bin", 0x050000, 0x010000, CRC(1afdc5bf) SHA1(b07b32656ffc96b7f7d4bd242b2a6e0e105ab67a) )
+ ROM_LOAD( "8.bin", 0x040000, 0x010000, CRC(3e75423e) SHA1(62e24849ddeb004ed8570d2884afa4ab257cdf07) )
+ ROM_LOAD( "7.bin", 0x030000, 0x010000, CRC(7f08e3a6) SHA1(127018442183332175c9e1f558274cd2cb5f0147) )
+ ROM_LOAD( "6.bin", 0x020000, 0x010000, CRC(0fece809) SHA1(1fe8436af8ead02a3b517b6306f9824cd64b2d26) )
+ ROM_LOAD( "5.bin", 0x010000, 0x010000, CRC(0706386a) SHA1(29eee363775869dcc9c46285632e8bf745c9110b) )
+ ROM_LOAD( "4.bin", 0x000000, 0x010000, CRC(199e2127) SHA1(2514d51cb06438b312d1f328c72baa739280416a) )
+
+ DISK_REGION( "laserdisc" )
+ DISK_IMAGE_READONLY( "shabdama", 0, NO_DUMP )
+ROM_END
+
+
+// LD QUIZ 第4弾 答えたもん勝ち!
+
+ROM_START( ldquiz4 )
+ ROM_REGION( 0x10000, "ipl", 0 ) // 27512
+ ROM_LOAD( "1.e3", 0x00000, 0x10000, CRC(49255f66) SHA1(bdd01987331c2aadea7f588d39c48c70cd43fc71) )
+
+ ROM_REGION( 0x20000, "audiocpu", 0 ) // 27512
+ ROM_LOAD( "3.e7", 0x00000, 0x10000, CRC(b033eb6a) SHA1(2c11b2b998117f68a1fbbd110d3f67ab472e133d) )
+ ROM_LOAD( "2.e6", 0x10000, 0x10000, CRC(6c83cad6) SHA1(c38f60fb4fdbda76ea3459644bf491cc305a7ae6) )
+
+ ROM_REGION( 0x200000, "gfx", ROMREGION_ERASE00 ) // 27010
+ ROM_LOAD( "4.k1", 0x000000, 0x20000, CRC(9cdf8114) SHA1(99e6b9bb43c6df320fdb1ea8599967b707f7f18d) )
+ ROM_LOAD( "5.k2", 0x020000, 0x20000, CRC(7746a909) SHA1(c69a45159d15e8897a5999e57b519ed6fc0d9812) )
+ ROM_LOAD( "6.k3", 0x040000, 0x20000, CRC(3b3e63ad) SHA1(92898ade77ad267978a469b03c9113f4e5a47288) )
+ ROM_LOAD( "7.k4", 0x060000, 0x20000, CRC(cdcaae32) SHA1(bfc07524a9859592bf7c6397fd80570b4e5e15fc) )
+ ROM_LOAD( "8.k5", 0x080000, 0x20000, CRC(c08b90e6) SHA1(add35812ea98ac44299b7f165efeee268aa57132) )
+ ROM_LOAD( "9.k6", 0x0a0000, 0x20000, CRC(72c1a283) SHA1(8dbfc5892d719033dff82c70f13c1d7c63173240) )
+ ROM_LOAD( "10.k8", 0x0c0000, 0x20000, CRC(c7437125) SHA1(55b161ce2432d04531ed0afab973f892b571ef88) )
+ ROM_LOAD( "11.k9", 0x0e0000, 0x20000, CRC(6feeab93) SHA1(d77325c1eecb677c48d11bf8d5f73b238f2896e6) )
+ ROM_LOAD( "12.k10", 0x100000, 0x20000, CRC(c7f9bf98) SHA1(103b78b0e126ea4249982bf114010f57e5ffa70a) )
+
+ ROM_REGION( 0x800, "plds", 0 ) // all protected
+ ROM_LOAD( "pal16l8.0", 0x000, 0x104, NO_DUMP )
+ ROM_LOAD( "pal16l8.1", 0x200, 0x104, NO_DUMP )
+ ROM_LOAD( "pal16l8.2", 0x400, 0x104, NO_DUMP )
+ ROM_LOAD( "pal16l8.3", 0x600, 0x104, NO_DUMP )
+
+ DISK_REGION( "laserdisc" )
+ DISK_IMAGE_READONLY( "ldquiz4", 0, NO_DUMP )
+ROM_END
+
+GAME( 1991, shabdama, 0, nichild, nichild, nichild_state, empty_init, ROT0, "Nichibutsu", "LD Mahjong #4 Shabon-Dama (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1992, ldquiz4, 0, nichild, nichild, nichild_state, empty_init, ROT0, "Nichibutsu", "LD Quiz dai 4-dan - Kotaetamon Gachi! (Japan)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/policetr.cpp b/src/mame/drivers/policetr.cpp
index 4295a3baec9..e8520cb5b89 100644
--- a/src/mame/drivers/policetr.cpp
+++ b/src/mame/drivers/policetr.cpp
@@ -404,7 +404,7 @@ MACHINE_CONFIG_START(policetr_state::policetr)
EEPROM_SERIAL_93C66_16BIT(config, m_eeprom);
/* video hardware */
- MCFG_DEVICE_ADD(m_screen, SCREEN, SCREEN_TYPE_RASTER);
+ device = &SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
m_screen->set_video_attributes(VIDEO_UPDATE_BEFORE_VBLANK);
m_screen->set_refresh_hz(60);
m_screen->set_size(400, 262); /* needs to be verified */
diff --git a/src/mame/drivers/z88.cpp b/src/mame/drivers/z88.cpp
index 108ce972bc0..2a87f979641 100644
--- a/src/mame/drivers/z88.cpp
+++ b/src/mame/drivers/z88.cpp
@@ -21,10 +21,6 @@
#include "emu.h"
#include "includes/z88.h"
-#include "screen.h"
-#include "speaker.h"
-
-
/* Assumption:
all banks can access the same memory blocks in the same way.
@@ -63,9 +59,6 @@ WRITE8_MEMBER(z88_state::bank3_cart_w) { m_carts[m_bank[3].slot]->write(space, (
UPD65031_MEMORY_UPDATE(z88_state::bankswitch_update)
{
- char bank_tag[6];
- sprintf(bank_tag, "bank%d", bank + 2);
-
// bank 0 is always even
if (bank == 0) page &= 0xfe;
@@ -74,12 +67,12 @@ UPD65031_MEMORY_UPDATE(z88_state::bankswitch_update)
// install read bank
if (m_bank_type[bank] != Z88_BANK_ROM)
{
- m_maincpu->space(AS_PROGRAM).install_read_bank(bank<<14, (bank<<14) + 0x3fff, bank_tag);
+ m_maincpu->space(AS_PROGRAM).install_read_bank(bank<<14, (bank<<14) + 0x3fff, m_banks[bank + 1]);
m_maincpu->space(AS_PROGRAM).unmap_write(bank<<14, (bank<<14) + 0x3fff);
m_bank_type[bank] = Z88_BANK_ROM;
}
- membank(bank_tag)->set_entry(page);
+ m_banks[bank + 1]->set_entry(page);
}
else if (page < 0x40) // internal RAM
{
@@ -88,12 +81,12 @@ UPD65031_MEMORY_UPDATE(z88_state::bankswitch_update)
// install readwrite bank
if (m_bank_type[bank] != Z88_BANK_RAM)
{
- m_maincpu->space(AS_PROGRAM).install_readwrite_bank(bank<<14, (bank<<14) + 0x3fff, bank_tag);
+ m_maincpu->space(AS_PROGRAM).install_readwrite_bank(bank<<14, (bank<<14) + 0x3fff, m_banks[bank + 1]);
m_bank_type[bank] = Z88_BANK_RAM;
}
// set the bank
- membank(bank_tag)->set_entry(page);
+ m_banks[bank + 1]->set_entry(page);
}
else
{
@@ -135,31 +128,31 @@ UPD65031_MEMORY_UPDATE(z88_state::bankswitch_update)
// override setting for lower 8k of bank 0
if (bank == 0)
{
- m_maincpu->space(AS_PROGRAM).install_read_bank(0, 0x1fff, "bank1");
+ m_maincpu->space(AS_PROGRAM).install_read_bank(0, 0x1fff, m_banks[0]);
// enable RAM
if (rams)
- m_maincpu->space(AS_PROGRAM).install_write_bank(0, 0x1fff, "bank1");
+ m_maincpu->space(AS_PROGRAM).install_write_bank(0, 0x1fff, m_banks[0]);
else
m_maincpu->space(AS_PROGRAM).unmap_write(0, 0x1fff);
- membank("bank1")->set_entry(rams & 1);
+ m_banks[0]->set_entry(rams & 1);
}
}
void z88_state::z88_mem(address_map &map)
{
- map(0x0000, 0x1fff).bankrw("bank1");
- map(0x2000, 0x3fff).bankrw("bank2");
- map(0x4000, 0x7fff).bankrw("bank3");
- map(0x8000, 0xbfff).bankrw("bank4");
- map(0xc000, 0xffff).bankrw("bank5");
+ map(0x0000, 0x1fff).bankrw(m_banks[0]);
+ map(0x2000, 0x3fff).bankrw(m_banks[1]);
+ map(0x4000, 0x7fff).bankrw(m_banks[2]);
+ map(0x8000, 0xbfff).bankrw(m_banks[3]);
+ map(0xc000, 0xffff).bankrw(m_banks[4]);
}
void z88_state::z88_io(address_map &map)
{
- map(0x0000, 0xffff).rw("blink", FUNC(upd65031_device::read), FUNC(upd65031_device::write));
+ map(0x0000, 0xffff).rw(m_blink, FUNC(upd65031_device::read), FUNC(upd65031_device::write));
}
@@ -556,24 +549,21 @@ INPUT_PORTS_END
void z88_state::machine_start()
{
- m_bios = (uint8_t*)memregion("bios")->base();
+ m_bios = (uint8_t*)m_bios_region->base();
m_ram_base = (uint8_t*)m_ram->pointer();
// configure the memory banks
- membank("bank1")->configure_entry(0, m_bios);
- membank("bank1")->configure_entry(1, m_ram_base);
- membank("bank2")->configure_entries(0, 32, m_bios, 0x4000);
- membank("bank3")->configure_entries(0, 32, m_bios, 0x4000);
- membank("bank4")->configure_entries(0, 32, m_bios, 0x4000);
- membank("bank5")->configure_entries(0, 32, m_bios, 0x4000);
- membank("bank2")->configure_entries(32, m_ram->size()>>14, m_ram_base, 0x4000);
- membank("bank3")->configure_entries(32, m_ram->size()>>14, m_ram_base, 0x4000);
- membank("bank4")->configure_entries(32, m_ram->size()>>14, m_ram_base, 0x4000);
- membank("bank5")->configure_entries(32, m_ram->size()>>14, m_ram_base, 0x4000);
-
- m_carts[1] = machine().device<z88cart_slot_device>("slot1");
- m_carts[2] = machine().device<z88cart_slot_device>("slot2");
- m_carts[3] = machine().device<z88cart_slot_device>("slot3");
+
+ m_banks[0]->configure_entry(0, m_bios);
+ m_banks[0]->configure_entry(1, m_ram_base);
+ m_banks[1]->configure_entries(0, 32, m_bios, 0x4000);
+ m_banks[2]->configure_entries(0, 32, m_bios, 0x4000);
+ m_banks[3]->configure_entries(0, 32, m_bios, 0x4000);
+ m_banks[4]->configure_entries(0, 32, m_bios, 0x4000);
+ m_banks[1]->configure_entries(32, m_ram->size()>>14, m_ram_base, 0x4000);
+ m_banks[2]->configure_entries(32, m_ram->size()>>14, m_ram_base, 0x4000);
+ m_banks[3]->configure_entries(32, m_ram->size()>>14, m_ram_base, 0x4000);
+ m_banks[4]->configure_entries(32, m_ram->size()>>14, m_ram_base, 0x4000);
}
void z88_state::machine_reset()
@@ -585,29 +575,11 @@ READ8_MEMBER(z88_state::kb_r)
{
uint8_t data = 0xff;
- if (!(offset & 0x80))
- data &= ioport("LINE7")->read();
-
- if (!(offset & 0x40))
- data &= ioport("LINE6")->read();
-
- if (!(offset & 0x20))
- data &= ioport("LINE5")->read();
-
- if (!(offset & 0x10))
- data &= ioport("LINE4")->read();
-
- if (!(offset & 0x08))
- data &= ioport("LINE3")->read();
-
- if (!(offset & 0x04))
- data &= ioport("LINE2")->read();
-
- if (!(offset & 0x02))
- data &= ioport("LINE1")->read();
-
- if (!(offset & 0x01))
- data &= ioport("LINE0")->read();
+ for (int i = 7; i >= 0; i--)
+ {
+ if (!BIT(offset, i))
+ data &= m_lines[i]->read();
+ }
return data;
}
@@ -626,36 +598,36 @@ static void z88_cart(device_slot_interface &device)
MACHINE_CONFIG_START(z88_state::z88)
/* basic machine hardware */
- MCFG_DEVICE_ADD("maincpu", Z80, XTAL(9'830'400)/3) // divided by 3 through the uPD65031
- MCFG_DEVICE_PROGRAM_MAP(z88_mem)
- MCFG_DEVICE_IO_MAP(z88_io)
+ Z80(config, m_maincpu, XTAL(9'830'400)/3); // divided by 3 through the uPD65031
+ m_maincpu->set_addrmap(AS_PROGRAM, &z88_state::z88_mem);
+ m_maincpu->set_addrmap(AS_IO, &z88_state::z88_io);
/* video hardware */
- MCFG_SCREEN_ADD("screen", LCD)
- MCFG_SCREEN_REFRESH_RATE(50)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
- MCFG_SCREEN_SIZE(Z88_SCREEN_WIDTH, Z88_SCREEN_HEIGHT)
- MCFG_SCREEN_VISIBLE_AREA(0, (Z88_SCREEN_WIDTH - 1), 0, (Z88_SCREEN_HEIGHT - 1))
+ device = &SCREEN(config, m_screen, SCREEN_TYPE_LCD);
+ m_screen->set_refresh_hz(50);
+ m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0));
+ m_screen->set_size(Z88_SCREEN_WIDTH, Z88_SCREEN_HEIGHT);
+ m_screen->set_visarea(0, (Z88_SCREEN_WIDTH - 1), 0, (Z88_SCREEN_HEIGHT - 1));
+ m_screen->set_palette(m_palette);
MCFG_SCREEN_UPDATE_DEVICE("blink", upd65031_device, screen_update)
- MCFG_SCREEN_PALETTE("palette")
- MCFG_PALETTE_ADD("palette", Z88_NUM_COLOURS)
+ device = &PALETTE(config, m_palette, Z88_NUM_COLOURS);
MCFG_PALETTE_INIT_OWNER(z88_state, z88)
MCFG_DEFAULT_LAYOUT(layout_lcd)
- MCFG_DEVICE_ADD("blink", UPD65031, XTAL(9'830'400))
+ device = &UPD65031(config, m_blink, XTAL(9'830'400));
MCFG_UPD65031_KB_CALLBACK(READ8(*this, z88_state, kb_r))
- MCFG_UPD65031_INT_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_UPD65031_NMI_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI))
- MCFG_UPD65031_SPKR_CALLBACK(WRITELINE("speaker", speaker_sound_device, level_w))
+ MCFG_UPD65031_INT_CALLBACK(INPUTLINE(m_maincpu, INPUT_LINE_IRQ0))
+ MCFG_UPD65031_NMI_CALLBACK(INPUTLINE(m_maincpu, INPUT_LINE_NMI))
+ MCFG_UPD65031_SPKR_CALLBACK(WRITELINE(m_speaker, speaker_sound_device, level_w))
MCFG_UPD65031_SCR_UPDATE_CB(z88_state, lcd_update)
MCFG_UPD65031_MEM_UPDATE_CB(z88_state, bankswitch_update)
/* sound hardware */
- SPEAKER(config, "mono").front_center();
- MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+ SPEAKER(config, m_mono).front_center();
+ SPEAKER_SOUND(config, m_speaker);
+ m_speaker->add_route(ALL_OUTPUTS, "mono", 0.50);
/* internal ram */
MCFG_RAM_ADD(RAM_TAG)
@@ -663,13 +635,15 @@ MACHINE_CONFIG_START(z88_state::z88)
MCFG_RAM_EXTRA_OPTIONS("32K,64K,256K,512k")
/* cartridges */
- MCFG_DEVICE_ADD("slot1", Z88CART_SLOT, 0)
+ device = &Z88CART_SLOT(config, m_carts[1]);
MCFG_DEVICE_SLOT_INTERFACE(z88_cart, nullptr, false)
MCFG_Z88CART_SLOT_OUT_FLP_CB(WRITELINE("blink", upd65031_device, flp_w))
- MCFG_DEVICE_ADD("slot2", Z88CART_SLOT, 0)
+
+ device = &Z88CART_SLOT(config, m_carts[2]);
MCFG_DEVICE_SLOT_INTERFACE(z88_cart, nullptr, false)
MCFG_Z88CART_SLOT_OUT_FLP_CB(WRITELINE("blink", upd65031_device, flp_w))
- MCFG_DEVICE_ADD("slot3", Z88CART_SLOT, 0)
+
+ device = &Z88CART_SLOT(config, m_carts[3]);
MCFG_DEVICE_SLOT_INTERFACE(z88_cart, nullptr, false)
MCFG_Z88CART_SLOT_OUT_FLP_CB(WRITELINE("blink", upd65031_device, flp_w))
diff --git a/src/mame/includes/nbmj9195.h b/src/mame/includes/nbmj9195.h
index 5b7359da554..88f65818476 100644
--- a/src/mame/includes/nbmj9195.h
+++ b/src/mame/includes/nbmj9195.h
@@ -122,7 +122,6 @@ public:
void mjuraden(machine_config &config);
void psailor1(machine_config &config);
void ngpgal(machine_config &config);
- void shabdama(machine_config &config);
void mjgottsu(machine_config &config);
void mkeibaou(machine_config &config);
void gal10ren(machine_config &config);
@@ -178,8 +177,6 @@ public:
void sailorws_map(address_map &map);
void sailorws_sound_io_map(address_map &map);
void sailorws_sound_map(address_map &map);
- void shabdama_io_map(address_map &map);
- void shabdama_map(address_map &map);
void yosimotm_io_map(address_map &map);
void yosimoto_io_map(address_map &map);
protected:
diff --git a/src/mame/includes/z88.h b/src/mame/includes/z88.h
index 5697cf90672..a9e64efc86e 100644
--- a/src/mame/includes/z88.h
+++ b/src/mame/includes/z88.h
@@ -20,7 +20,8 @@
#include "bus/z88/z88.h"
#include "rendlay.h"
-
+#include "screen.h"
+#include "speaker.h"
#define Z88_NUM_COLOURS 3
@@ -39,10 +40,18 @@ class z88_state : public driver_device
{
public:
z88_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag),
- m_maincpu(*this, "maincpu"),
- m_ram(*this, RAM_TAG),
- m_palette(*this, "palette")
+ : driver_device(mconfig, type, tag)
+ , m_maincpu(*this, "maincpu")
+ , m_bios_region(*this, "bios")
+ , m_ram(*this, RAM_TAG)
+ , m_screen(*this, "screen")
+ , m_palette(*this, "palette")
+ , m_blink(*this, "blink")
+ , m_mono(*this, "mono")
+ , m_speaker(*this, "speaker")
+ , m_lines(*this, "LINE%u", 0U)
+ , m_banks(*this, "bank%u", 1U)
+ , m_carts(*this, "slot%u", 0U)
{ }
void z88(machine_config &config);
@@ -86,8 +95,16 @@ protected:
private:
required_device<cpu_device> m_maincpu;
+ required_memory_region m_bios_region;
required_device<ram_device> m_ram;
+ required_device<screen_device> m_screen;
required_device<palette_device> m_palette;
+ required_device<upd65031_device> m_blink;
+ required_device<speaker_device> m_mono;
+ required_device<speaker_sound_device> m_speaker;
+ required_ioport_array<8> m_lines;
+ required_memory_bank_array<5> m_banks;
+ optional_device_array<z88cart_slot_device, 4> m_carts;
struct
{
@@ -95,10 +112,9 @@ private:
uint8_t page;
} m_bank[4];
- int m_bank_type[4];
- uint8_t * m_bios;
- uint8_t * m_ram_base;
- z88cart_slot_device * m_carts[4];
+ int m_bank_type[4];
+ uint8_t * m_bios;
+ uint8_t * m_ram_base;
};
#endif /* MAME_INCLUDES_Z88_H */
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 90ae6bc2aba..a12e1219c22 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -29586,7 +29586,6 @@ imekura // (c) 1994 SPHINX/AV JAPAN
janbari // (c) 1992 Nichibutsu/Yubis/AV JAPAN
jituroku // (c) 1993 Windom
koinomp // (c) 1992
-ldquiz4 // (c) 1992
mjanbari // (c) 1992 Nichibutsu/Yubis/AV JAPAN
mjegolf // (c) 1994 FUJIC/AV JAPAN
mjgottsu // (c) 1991
@@ -29607,7 +29606,6 @@ renaiclb // (c) 1993 FUJIC
sailorwa // (c) 1993
sailorwr // (c) 1993
sailorws // (c) 1993
-shabdama // (c) 199?
ultramhm // (c) 1993 Apple
wcatcher // (c) 1993
yosimotm // (c) 1994 Nichibutsu/Yoshimoto Kougyou
@@ -30048,6 +30046,10 @@ ngpc // NeoGeo Pocket Color
@source:nibble.cpp
l9nibble // unknown Nibble game.
+@source:nichild.cpp
+ldquiz4 // (c) 1992
+shabdama // (c) 1991
+
@source:nightgal.cpp
ngalsumr // (c) 1985
ngtbunny // (c) 1984
diff --git a/src/mame/video/z88.cpp b/src/mame/video/z88.cpp
index d0f405d3e1c..ff78f2d0bcd 100644
--- a/src/mame/video/z88.cpp
+++ b/src/mame/video/z88.cpp
@@ -14,27 +14,25 @@
inline void z88_state::plot_pixel(bitmap_ind16 &bitmap, int x, int y, uint16_t color)
{
- if (x<Z88_SCREEN_WIDTH)
+ if (x < Z88_SCREEN_WIDTH)
bitmap.pix16(y, x) = color;
}
// convert absolute offset into correct address to get data from
inline uint8_t* z88_state::convert_address(uint32_t offset)
{
- uint8_t *ptr = nullptr;
-
if (offset < 0x080000) // rom
- ptr = m_bios + (offset & 0x7ffff);
+ return m_bios + (offset & 0x7ffff);
else if (offset < 0x100000) // slot0
- ptr = m_ram_base + (offset & 0x7ffff);
+ return m_ram_base + (offset & 0x7ffff);
else if (offset < 0x200000) // slot1
- ptr = m_carts[1]->get_cart_base() + (offset & 0xfffff);
+ return m_carts[1]->get_cart_base() + (offset & 0xfffff);
else if (offset < 0x300000) // slot2
- ptr = m_carts[2]->get_cart_base() + (offset & 0xfffff);
+ return m_carts[2]->get_cart_base() + (offset & 0xfffff);
else if (offset < 0x400000) // slot3
- ptr = m_carts[3]->get_cart_base() + (offset & 0xfffff);
+ return m_carts[3]->get_cart_base() + (offset & 0xfffff);
- return ptr;
+ return nullptr;
}
/***************************************************************************
@@ -53,37 +51,36 @@ PALETTE_INIT_MEMBER(z88_state, z88)
void z88_state::vh_render_8x8(bitmap_ind16 &bitmap, int x, int y, uint16_t pen0, uint16_t pen1, uint8_t *gfx)
{
- for (int h=0; h<8; h++)
+ for (int h = 0; h < 8; h++)
{
uint8_t data = gfx[h];
- for (int b=0; b<8; b++)
+ for (int b = 0; b < 8; b++)
{
- plot_pixel(bitmap, x+b, y+h, (data & 0x80) ? pen1 : pen0);
-
- data = data<<1;
+ plot_pixel(bitmap, x + b, y + h, BIT(data, 7 - b) ? pen1 : pen0);
}
}
}
void z88_state::vh_render_6x8(bitmap_ind16 &bitmap, int x, int y, uint16_t pen0, uint16_t pen1, uint8_t *gfx)
{
- for (int h=0; h<8; h++)
+ for (int h = 0; h < 8; h++)
{
- uint8_t data = gfx[h]<<2;
+ uint8_t data = gfx[h] << 2;
- for (int b=0; b<6; b++)
+ for (int b = 0; b < 6; b++)
{
- plot_pixel(bitmap, x+1+b, y+h, (data & 0x80) ? pen1 : pen0);
- data = data<<1;
+ plot_pixel(bitmap, x + 1 + b, y + h, BIT(data, 7 - b) ? pen1 : pen0);
}
}
}
void z88_state::vh_render_line(bitmap_ind16 &bitmap, int x, int y, uint16_t pen)
{
- for (int i=0; i<8; i++)
+ for (int i = 0; i < 8; i++)
+ {
plot_pixel(bitmap, x + i, y + 7, pen);
+ }
}
UPD65031_SCREEN_UPDATE(z88_state::lcd_update)
@@ -95,30 +92,24 @@ UPD65031_SCREEN_UPDATE(z88_state::lcd_update)
}
else
{
- uint8_t *vram = convert_address(sbf<<11);
+ uint8_t *vram = convert_address(sbf << 11);
- for (int y=0; y<(Z88_SCREEN_HEIGHT>>3); y++)
+ for (int y = 0; y < (Z88_SCREEN_HEIGHT >> 3); y++)
{
int x = 0, c = 0;
while (x < Z88_SCREEN_WIDTH)
{
- uint16_t pen0, pen1;
- uint8_t *char_gfx;
uint8_t byte0 = vram[(y * 0x100) + c];
uint8_t byte1 = vram[(y * 0x100) + c + 1];
// inverted graphics?
+ uint16_t pen0 = 0;
+ uint16_t pen1 = 0;
if (byte1 & Z88_SCR_HW_REV)
- {
pen0 = (byte1 & Z88_SCR_HW_GRY) ? 2 : 1;
- pen1 = 0;
- }
else
- {
- pen0 = 0;
pen1 = (byte1 & Z88_SCR_HW_GRY) ? 2 : 1;
- }
if ((byte1 & Z88_SCR_HW_NULL) == Z88_SCR_HW_NULL)
{
@@ -127,56 +118,42 @@ UPD65031_SCREEN_UPDATE(z88_state::lcd_update)
else if (!(byte1 & Z88_SCR_HW_HRS) || (((byte1 & Z88_SCR_HW_CURS) == Z88_SCR_HW_CURS)))
{
// low-res 6x8
- uint16_t ch = (byte0 | (byte1<<8)) & 0x1ff;
+ const uint16_t ch = (byte0 | (byte1 << 8)) & 0x1ff;
+ uint8_t *char_gfx;
if ((ch & 0x01c0) == 0x01c0)
- {
- ch &= 0x3f;
-
- char_gfx = convert_address(lores0<<9);
- }
+ char_gfx = convert_address(lores0 << 9) + ((ch & 0x3f) << 3);
else
- {
- char_gfx = convert_address(lores1<<12);
- }
-
- char_gfx += (ch<<3);
+ char_gfx = convert_address(lores1 << 12) + (ch << 3);
// cursor flash
if (flash && (byte1 & Z88_SCR_HW_CURS) == Z88_SCR_HW_CURS)
- vh_render_6x8(bitmap, x,(y<<3), pen1, pen0, char_gfx);
+ vh_render_6x8(bitmap, x, y << 3, pen1, pen0, char_gfx);
else
- vh_render_6x8(bitmap, x,(y<<3), pen0, pen1, char_gfx);
+ vh_render_6x8(bitmap, x, y << 3, pen0, pen1, char_gfx);
// underline?
if (byte1 & Z88_SCR_HW_UND)
- vh_render_line(bitmap, x, (y<<3), pen1);
+ vh_render_line(bitmap, x, y << 3, pen1);
x += 6;
}
else if ((byte1 & Z88_SCR_HW_HRS) && !(byte1 & Z88_SCR_HW_REV))
{
// high-res 8x8
- uint16_t ch = (byte0 | (byte1<<8)) & 0x3ff;
+ const uint16_t ch = (byte0 | (byte1 << 8)) & 0x3ff;
- if (ch & 0x0100)
- {
- ch &= 0xff;
- char_gfx = convert_address(hires1<<11);
- }
+ uint8_t *char_gfx;
+ if (BIT(ch, 8))
+ char_gfx = convert_address(hires1 << 11) + ((ch & 0xff) << 3);
else
- {
- ch &= 0xff;
- char_gfx = convert_address(hires0<<13);
- }
-
- char_gfx += (ch<<3);
+ char_gfx = convert_address(hires0 << 13) + ((ch & 0xff) << 3);
// flash
if ((byte1 & Z88_SCR_HW_FLS) && flash)
pen0 = pen1 = 0;
- vh_render_8x8(bitmap, x,(y<<3), pen0, pen1, char_gfx);
+ vh_render_8x8(bitmap, x, y << 3, pen0, pen1, char_gfx);
x += 8;
}