summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2022-04-24 06:22:24 +1000
committer Vas Crabb <vas@vastheman.com>2022-04-24 06:22:24 +1000
commite2f4c3950d9bf3e96bee2cfc1acdf356d4ead296 (patch)
tree5abe79a9cd666d8457984d2c65c749c1ed203979 /src
parent3eaead499e24fac0f6a4f47f9b45592ba51ec9dd (diff)
krz2000.cpp, vigilant.cpp: Clean-up, no functional changes.
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/krz2000.cpp35
-rw-r--r--src/mame/drivers/vigilant.cpp53
-rw-r--r--src/mame/drivers/ymmu100.cpp6
3 files changed, 49 insertions, 45 deletions
diff --git a/src/mame/drivers/krz2000.cpp b/src/mame/drivers/krz2000.cpp
index 5e92a1ec283..2c4afa6ee63 100644
--- a/src/mame/drivers/krz2000.cpp
+++ b/src/mame/drivers/krz2000.cpp
@@ -26,22 +26,26 @@
***************************************************************************/
#include "emu.h"
-#include "cpu/m68000/m68000.h"
+
+#include "bus/midi/midi.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
#include "cpu/m6502/m3745x.h"
-#include "machine/tmp68301.h"
+#include "cpu/m68000/m68000.h"
+#include "imagedev/floppy.h"
#include "machine/bankdev.h"
-#include "machine/upd765.h"
#include "machine/ncr5380.h"
-#include "bus/nscsi/cd.h"
-#include "bus/nscsi/hd.h"
-#include "bus/midi/midi.h"
+#include "machine/tmp68301.h"
+#include "machine/upd765.h"
#include "video/t6963c.h"
-#include "imagedev/floppy.h"
-#include "screen.h"
+
#include "emupal.h"
+#include "screen.h"
#include "softlist.h"
#include "speaker.h"
+namespace {
+
class k2000_state : public driver_device
{
public:
@@ -246,9 +250,9 @@ void k2000_state::k2000_map(address_map &map)
// down to 0x500004 (then 0x500006)
// Calvin memory?
- map(0x500000, 0x5003FF).rw(FUNC(k2000_state::calvin_read), FUNC(k2000_state::calvin_write));
+ map(0x500000, 0x5003ff).rw(FUNC(k2000_state::calvin_read), FUNC(k2000_state::calvin_write));
// Calvin control registers?
- map(0x500400, 0x5004FF).rw(FUNC(k2000_state::calvin_read), FUNC(k2000_state::calvin_write));
+ map(0x500400, 0x5004ff).rw(FUNC(k2000_state::calvin_read), FUNC(k2000_state::calvin_write));
// Reads and writes to 0x580000
// Hobbes (it seems) is connected in the 0x600000 range
@@ -263,9 +267,9 @@ void k2000_state::k2000_map(address_map &map)
// Each Hobbes chip seems to have two control registers, mapped at 0x600300/0x680300 and 0x600400/0x680400
// Hobbes memory?
- map(0x600000, 0x6002FF).rw(FUNC(k2000_state::hobbes0_read), FUNC(k2000_state::hobbes0_write));
+ map(0x600000, 0x6002ff).rw(FUNC(k2000_state::hobbes0_read), FUNC(k2000_state::hobbes0_write));
// Hobbes control registers?
- map(0x600300, 0x6005FF).rw(FUNC(k2000_state::hobbes0_read), FUNC(k2000_state::hobbes0_write));
+ map(0x600300, 0x6005ff).rw(FUNC(k2000_state::hobbes0_read), FUNC(k2000_state::hobbes0_write));
// Hobbes memory?
map(0x680000, 0x6802FF).rw(FUNC(k2000_state::hobbes1_read), FUNC(k2000_state::hobbes1_write));
@@ -288,11 +292,11 @@ void k2000_state::k2000_map(address_map &map)
// Writes to 0x7C0000
// Single byte reads seem to happen at 0x740000, which seems to be FDCCTLCSb?
- // map(0x740000, 0x74000F).
+ // map(0x740000, 0x74000f).
map(0x7e0000, 0x7e0001).w(FUNC(k2000_state::swap_bit_ctrl_w));
// Some sort of hardware mapping - initial firmware boot expects a 4 at $78000B
- map(0x780000, 0x78FFFF).ram();
+ map(0x780000, 0x78ffff).ram();
// When (CPUASb + GODOT I6) and (GODOT I/O0 + IOCSb) are low,
// Address bits 17, 18, 19 get demultiplexed onto:
@@ -472,5 +476,6 @@ ROM_START( k2000 )
// seem to be the Sample Bank address lines.
ROM_END
-CONS( 1990, k2000, 0, 0, k2000, k2000, k2000_state, empty_init, "Kurzweil Music Systems", "K2000", MACHINE_NOT_WORKING|MACHINE_NO_SOUND )
+} // anonymous namespace
+SYST( 1990, k2000, 0, 0, k2000, k2000, k2000_state, empty_init, "Kurzweil Music Systems", "K2000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff --git a/src/mame/drivers/vigilant.cpp b/src/mame/drivers/vigilant.cpp
index 7471b7d72b8..42ff8cb2455 100644
--- a/src/mame/drivers/vigilant.cpp
+++ b/src/mame/drivers/vigilant.cpp
@@ -22,13 +22,12 @@ Bottom board - M75-B-A (all versions regardless of mask ROM/EPROM)
****************************************************************************
Roberto Fresca 2022.04.23:
-Added Bowmen, from Ten-Level. Very rare and bizarre game.
-The kid peeks the girl's ass and get fulminated with a lightning bolt thrown by god.
+Added Bowmen, from Ten-Level. A very rare Spanish game.
-The game uses a derivative hardware and have some odd things, like lack of
-some music codes or some clipped sample codes that make me think that they
-finished the development abruptly, without a final polish. Also seems to
-finish in level 10 (30 stages), but the game is so hard to test it.
+The game uses derivative hardware, and has some oddities, like lack of some
+music codes or clipped samples. They may have finished development
+abruptly, without time for final polish. Seems to finish in level 10
+(30 stages), but the game is so hard, testing is difficult.
***************************************************************************/
@@ -132,21 +131,21 @@ void vigilant_state::kikcubic_io_map(address_map &map)
void vigilant_state::bowmen_io_map(address_map &map)
{
map.global_mask(0xff);
- map(0x00, 0x00).portr("IN0").w("soundlatch", FUNC(generic_latch_8_device::write)); // SD seems BAD
- map(0x01, 0x01).portr("IN1").w(FUNC(vigilant_state::vigilant_out2_w)); // OUT2?
+ map(0x00, 0x00).portr("IN0").w("soundlatch", FUNC(generic_latch_8_device::write)); // SD seems BAD
+ map(0x01, 0x01).portr("IN1").w(FUNC(vigilant_state::vigilant_out2_w)); // OUT2?
map(0x02, 0x02).portr("IN2");
map(0x03, 0x03).portr("DSW2");
map(0x04, 0x04).portr("DSW1").w(FUNC(vigilant_state::bank_select_w)); // PBANK?
-// map(0x10, 0x11).w(FUNC(vigilant_state::vigilant_horiz_scroll_w)); // HSPL, HSPH
+// map(0x10, 0x11).w(FUNC(vigilant_state::vigilant_horiz_scroll_w)); // HSPL, HSPH
map(0x12, 0x13).w(FUNC(vigilant_state::bowmen_rear_horiz_scroll_w)); // RHSPL, RHSPH
map(0x14, 0x14).w(FUNC(vigilant_state::bowmen_rear_color_w)); // RCOD
/*
- 02; w
- 10; w
- 11; w
- 12; w
- 13; w
- 14; w
+ 02; w
+ 10; w
+ 11; w
+ 12; w
+ 13; w
+ 14; w
*/
}
@@ -437,31 +436,31 @@ static INPUT_PORTS_START( bowmen )
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
PORT_START("DSW1")
- PORT_DIPNAME( 0x01, 0x01, "Screen Orientation" ) PORT_DIPLOCATION("SW1:1")
+ PORT_DIPNAME( 0x01, 0x01, "Screen Orientation" ) PORT_DIPLOCATION("SW1:1")
PORT_DIPSETTING( 0x01, "Normal Screen" )
PORT_DIPSETTING( 0x00, "Inverted Screen" )
- PORT_DIPNAME( 0x02, 0x02, "Players" ) PORT_DIPLOCATION("SW1:2")
+ PORT_DIPNAME( 0x02, 0x02, "Players" ) PORT_DIPLOCATION("SW1:2")
PORT_DIPSETTING( 0x02, "Two Players" )
PORT_DIPSETTING( 0x00, "One Player" )
- PORT_DIPNAME( 0x0c, 0x0c, "Time for Round" ) PORT_DIPLOCATION("SW1:3,4")
+ PORT_DIPNAME( 0x0c, 0x0c, "Time for Round" ) PORT_DIPLOCATION("SW1:3,4")
PORT_DIPSETTING( 0x00, "Free Time per Round" )
PORT_DIPSETTING( 0x04, "30 Seconds per Round" )
PORT_DIPSETTING( 0x08, "50 Seconds per Round" )
PORT_DIPSETTING( 0x0c, "60 Seconds per Round" )
- PORT_DIPNAME( 0x30, 0x30, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:5,6")
+ PORT_DIPNAME( 0x30, 0x30, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:5,6")
PORT_DIPSETTING( 0x00, DEF_STR( Very_Hard ) )
PORT_DIPSETTING( 0x10, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x20, DEF_STR( Very_Easy ) )
PORT_DIPSETTING( 0x30, DEF_STR( Normal ) )
- PORT_DIPNAME( 0x40, 0x40, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:7")
+ PORT_DIPNAME( 0x40, 0x40, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW1:7")
PORT_DIPSETTING( 0x40, DEF_STR( Yes ) )
PORT_DIPSETTING( 0x00, DEF_STR( No ) )
- PORT_DIPNAME( 0x80, 0x80, "Test Type" ) PORT_DIPLOCATION("SW1:8")
+ PORT_DIPNAME( 0x80, 0x80, "Test Type" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x80, "Easy Test" )
PORT_DIPSETTING( 0x00, "Advanced Test" )
PORT_START("DSW2")
- PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3,4")
+ PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3,4")
PORT_DIPSETTING( 0x00, DEF_STR( 5C_2C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x02, DEF_STR( 4C_5C ) )
@@ -478,7 +477,7 @@ static INPUT_PORTS_START( bowmen )
PORT_DIPSETTING( 0x0d, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x0f, DEF_STR( 1C_1C ) )
- PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW2:5,6,7,8")
+ PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW2:5,6,7,8")
PORT_DIPSETTING( 0x00, DEF_STR( 5C_2C ) )
PORT_DIPSETTING( 0x10, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x20, DEF_STR( 4C_5C ) )
@@ -777,21 +776,21 @@ void vigilant_state::kikcubic(machine_config &config)
void vigilant_state::bowmen(machine_config &config)
{
// basic machine hardware
- Z80(config, m_maincpu, 18_MHz_XTAL / 3); // 5.99538 Mhz verified
+ Z80(config, m_maincpu, 18_MHz_XTAL / 3); // 5.99538 MHz verified
m_maincpu->set_addrmap(AS_PROGRAM, &vigilant_state::vigilant_map);
m_maincpu->set_addrmap(AS_IO, &vigilant_state::bowmen_io_map);
m_maincpu->set_vblank_int("screen", FUNC(vigilant_state::irq0_line_hold));
- z80_device &soundcpu(Z80(config, "soundcpu", 18_MHz_XTAL / 3)); // 5.99528 Mhz verified
+ z80_device &soundcpu(Z80(config, "soundcpu", 18_MHz_XTAL / 3)); // 5.99528 MHz verified
soundcpu.set_addrmap(AS_PROGRAM, &vigilant_state::sound_map);
soundcpu.set_addrmap(AS_IO, &vigilant_state::buccanrs_sound_io_map);
- soundcpu.set_periodic_int(FUNC(vigilant_state::nmi_line_pulse), attotime::from_hz(7806.5)); // 7.80650 KHz. measured
+ soundcpu.set_periodic_int(FUNC(vigilant_state::nmi_line_pulse), attotime::from_hz(7806.5)); // 7.80650 kHz measured
soundcpu.set_irq_acknowledge_callback("soundirq", FUNC(rst_neg_buffer_device::inta_cb));
// video hardware
screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
- screen.set_refresh_hz(55); // 54.9752 Hz. Verified
+ screen.set_refresh_hz(55); // 54.9752 Hz verified
screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500));
screen.set_size(64 * 8, 32 * 8);
screen.set_visarea(16 * 8, (64 - 16) * 8 - 1, 0 * 8, 32 * 8 - 1);
diff --git a/src/mame/drivers/ymmu100.cpp b/src/mame/drivers/ymmu100.cpp
index e3b4ab7590e..debecd41f0a 100644
--- a/src/mame/drivers/ymmu100.cpp
+++ b/src/mame/drivers/ymmu100.cpp
@@ -779,6 +779,6 @@ ROM_START( mu100b )
ROM_LOAD32_WORD( "xt463a0.ic38", 0x1000002, 0x400000, CRC(cce5f8d3) SHA1(bdca8c5158f452f2b5535c7d658c9b22c6d66048) )
ROM_END
-CONS( 1997, mu100, 0, 0, mu100, mu100, mu100_state, empty_init, "Yamaha", "MU100", MACHINE_NOT_WORKING )
-CONS( 1997, mu100r, mu100, 0, mu100, mu100, mu100r_state, empty_init, "Yamaha", "MU100 Rackable version", MACHINE_NOT_WORKING )
-CONS( 1998, mu100b, mu100, 0, mu100, mu100, mu100_state, empty_init, "Yamaha", "MU100B", MACHINE_NOT_WORKING )
+SYST( 1997, mu100, 0, 0, mu100, mu100, mu100_state, empty_init, "Yamaha", "MU100", MACHINE_NOT_WORKING )
+SYST( 1997, mu100r, mu100, 0, mu100, mu100, mu100r_state, empty_init, "Yamaha", "MU100 Rackable version", MACHINE_NOT_WORKING )
+SYST( 1998, mu100b, mu100, 0, mu100, mu100, mu100_state, empty_init, "Yamaha", "MU100B", MACHINE_NOT_WORKING )