From 969ee8bc749c9d6749ddddc87f1c0efd2b1a5cfa Mon Sep 17 00:00:00 2001 From: hap Date: Tue, 3 Dec 2024 19:35:03 +0100 Subject: [PATCH] cswat: redumped romset, hooked up color prom and a sn76489a [Phil Bennett] --- src/mame/namco/cswat.cpp | 126 ++++++++++++++++++++++++++++----------- 1 file changed, 91 insertions(+), 35 deletions(-) diff --git a/src/mame/namco/cswat.cpp b/src/mame/namco/cswat.cpp index 44ef1b44099..37ee7238036 100644 --- a/src/mame/namco/cswat.cpp +++ b/src/mame/namco/cswat.cpp @@ -14,7 +14,6 @@ HD68A09EP - Hitachi M6809 CPU 5275 - Namco custom DIP42, sample player TODO: -- fix gfx/colors (redump needed) - improve interrupts - hook up namco 52xx sound - simulate projector with external artwork? @@ -26,8 +25,12 @@ HD68A09EP - Hitachi M6809 CPU #include "cpu/m6809/m6809.h" #include "cpu/mb88xx/mb88xx.h" +#include "sound/sn76496.h" +#include "video/resnet.h" + #include "emupal.h" #include "screen.h" +#include "speaker.h" #include "tilemap.h" @@ -40,16 +43,30 @@ class cswat_state : public driver_device driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode"), + m_palette(*this, "palette"), + m_screen(*this, "screen"), + m_sn(*this, "sn76489a"), m_videoram(*this, "videoram"), m_dips_inp(*this, "DIPS") { } + void cswat(machine_config &config); + +protected: + virtual void video_start() override ATTR_COLD; + virtual void machine_reset() override ATTR_COLD; + virtual void machine_start() override ATTR_COLD; + +private: required_device m_maincpu; required_device m_gfxdecode; + required_device m_palette; + required_device m_screen; + required_device m_sn; required_shared_ptr m_videoram; required_ioport m_dips_inp; - uint8_t m_nmi_enabled; + uint8_t m_nmi_enabled = 0; tilemap_t *m_tilemap; void videoram_w(offs_t offset, uint8_t data); @@ -59,14 +76,11 @@ class cswat_state : public driver_device INTERRUPT_GEN_MEMBER(nmi_handler); + void palette(palette_device &palette) const; TILEMAP_MAPPER_MEMBER(tilemap_scan_rows); TILE_GET_INFO_MEMBER(get_tile_info); uint32_t screen_update_cswat(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - virtual void video_start() override ATTR_COLD; - virtual void machine_reset() override ATTR_COLD; - virtual void machine_start() override ATTR_COLD; - void cswat(machine_config &config); void cswat_map(address_map &map) ATTR_COLD; }; @@ -77,6 +91,44 @@ class cswat_state : public driver_device ***************************************************************************/ +void cswat_state::palette(palette_device &palette) const +{ + const uint8_t *color_prom = memregion("proms")->base(); + static constexpr int resistances[3] = { 1000, 470, 220 }; + + // compute the color output resistor weights + double rweights[3], gweights[3], bweights[2]; + compute_resistor_weights(0, 255, -1.0, + 3, &resistances[0], rweights, 0, 0, + 3, &resistances[0], gweights, 0, 0, + 2, &resistances[1], bweights, 0, 0); + + // initialize the palette with these colors + for (int i = 0; i < 256; i++) + { + int bit0, bit1, bit2; + + // red component + bit0 = BIT(color_prom[i], 0); + bit1 = BIT(color_prom[i], 1); + bit2 = BIT(color_prom[i], 2); + int const r = combine_weights(rweights, bit0, bit1, bit2); + + // green component + bit0 = BIT(color_prom[i], 3); + bit1 = BIT(color_prom[i], 4); + bit2 = BIT(color_prom[i], 5); + int const g = combine_weights(gweights, bit0, bit1, bit2); + + // blue component + bit0 = BIT(color_prom[i], 6); + bit1 = BIT(color_prom[i], 7); + int const b = combine_weights(bweights, bit0, bit1); + + palette.set_pen_color(i, rgb_t(r, g, b)); + } +} + TILEMAP_MAPPER_MEMBER(cswat_state::tilemap_scan_rows) { // like with pacman, lower and upper parts of vram are left and right columns of the screen @@ -90,8 +142,8 @@ TILEMAP_MAPPER_MEMBER(cswat_state::tilemap_scan_rows) TILE_GET_INFO_MEMBER(cswat_state::get_tile_info) { - int color = m_videoram[tile_index | 0x400]; - int attr = m_videoram[tile_index | 0x800]; // high bits unused + int color = m_videoram[tile_index | 0x400]; // high bits unused + int attr = m_videoram[tile_index | 0x800]; // " int code = m_videoram[tile_index] | (attr << 8 & 0x300); int flags = TILE_FLIPYX(attr >> 2); @@ -143,7 +195,7 @@ uint8_t cswat_state::sensors_r() void cswat_state::cswat_map(address_map &map) { - map(0x0000, 0x0bff).ram().w(FUNC(cswat_state::videoram_w)).share("videoram"); + map(0x0000, 0x0bff).ram().w(FUNC(cswat_state::videoram_w)).share(m_videoram); map(0x0c00, 0x0fff).ram(); // map(0x1800, 0x1800).nopr(); // ? reads here after writing to $4000 map(0x2000, 0x2000).w(FUNC(cswat_state::irq_ack_w)); // writes 1 at end of vblank irq, 0 at gamestart @@ -151,7 +203,8 @@ void cswat_state::cswat_map(address_map &map) map(0x2002, 0x2002).w(FUNC(cswat_state::irq_ack_w)); // writes 0 at start of vblank irq map(0x2002, 0x2002).r(FUNC(cswat_state::sensors_r)); map(0x2003, 0x2003).portr("IN0"); -// map(0x4000, 0x4009).noprw(); // ? + map(0x4000, 0x4000).w(m_sn, FUNC(sn76489a_device::write)); +// map(0x4001, 0x4009).noprw(); // ? map(0x8000, 0xffff).rom(); } @@ -241,7 +294,7 @@ static const gfx_layout charlayout = }; static GFXDECODE_START( gfx_cswat ) - GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 ) + GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 64 ) GFXDECODE_END INTERRUPT_GEN_MEMBER(cswat_state::nmi_handler) @@ -262,26 +315,29 @@ void cswat_state::machine_start() void cswat_state::cswat(machine_config &config) { - /* basic machine hardware */ - MC6809E(config, m_maincpu, XTAL(18'432'000)/3/4); // HD68A09EP, 1.5MHz? + // basic machine hardware + MC6809E(config, m_maincpu, 18.432_MHz_XTAL / 3 / 4); // 1.536MHz m_maincpu->set_addrmap(AS_PROGRAM, &cswat_state::cswat_map); m_maincpu->set_vblank_int("screen", FUNC(cswat_state::irq0_line_assert)); - m_maincpu->set_periodic_int(FUNC(cswat_state::nmi_handler), attotime::from_hz(300)); // ? - - /* video hardware */ - screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_refresh_hz(60); - screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); - screen.set_size(36*8, 28*8); - screen.set_visarea_full(); - screen.set_palette("palette"); - screen.set_screen_update(FUNC(cswat_state::screen_update_cswat)); - - GFXDECODE(config, "gfxdecode", "palette", gfx_cswat); - PALETTE(config, "palette").set_entries(4*256); - - /* sound hardware */ - // TODO + m_maincpu->set_periodic_int(FUNC(cswat_state::nmi_handler), attotime::from_hz(300)); // 16V? + + // video hardware + SCREEN(config, m_screen, SCREEN_TYPE_RASTER); + m_screen->set_refresh_hz(60); + m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500)); + m_screen->set_size(36*8, 28*8); + m_screen->set_visarea_full(); + m_screen->set_palette(m_palette); + m_screen->set_screen_update(FUNC(cswat_state::screen_update_cswat)); + + GFXDECODE(config, m_gfxdecode, m_palette, gfx_cswat); + PALETTE(config, m_palette, FUNC(cswat_state::palette), 256); + + // sound hardware + SN76489A(config, m_sn, 18.432_MHz_XTAL / 3 / 2); // 1H + m_sn->add_route(ALL_OUTPUTS, "speaker", 0.50); + + SPEAKER(config, "speaker").front_center(); } @@ -298,18 +354,18 @@ ROM_START( cswat ) ROM_LOAD( "cs2-3.5h", 0xc000, 0x2000, CRC(52af8d0b) SHA1(1087b1dbf8b7734f0497e0ad1f8a7a10a25f4e7b) ) ROM_LOAD( "cs2-4.5f", 0xe000, 0x2000, CRC(2f88074c) SHA1(a8864b6123f76c0d1f372b2196d4e436bac75c21) ) - ROM_REGION( 0x4000, "gfx1", 0 ) - ROM_LOAD( "cs2-5.3l", 0x0000, 0x2000, BAD_DUMP CRC(a09d6894) SHA1(feac4980d5bf6f2a808230962b4140e27767dc9d) ) // bad + ROM_REGION( 0x4000, "gfx1", ROMREGION_INVERT ) + ROM_LOAD( "cs2-5.3l", 0x0000, 0x2000, CRC(909c8903) SHA1(876fdaec70fff7709dbd70ed4f9601c26fa3ce9b) ) ROM_LOAD( "cs2-6.2l", 0x2000, 0x2000, CRC(95e8180f) SHA1(1d819649b62b194e10decb04d6be68c99c419a93) ) ROM_REGION( 0x2000, "52xx", 0 ) // digitised speech - ROM_LOAD( "cs2-7.2b", 0x0000, 0x2000, BAD_DUMP CRC(25a25dc0) SHA1(849e3baa159049754da6fba74c77c86f01952849) ) // FIXED BITS (xxx1xxxx) + ROM_LOAD( "cs2-7.2b", 0x0000, 0x2000, CRC(f57c4a00) SHA1(9d258026b7a829a6f685e5b48656e2142d4cc0ad) ) - ROM_REGION( 0x0001, "proms", 0 ) // color prom - ROM_LOAD( "cs2-1.1p", 0x0000, 0x0001, NO_DUMP ) + ROM_REGION( 0x0200, "proms", 0 ) // color prom + ROM_LOAD( "cs2-1.1p", 0x0000, 0x0200, CRC(2b34d9f2) SHA1(d64c60a43cf98c5e2778509f5a9b912aeda68b8f) ) ROM_END } // anonymous namespace -GAME( 1984, cswat, 0, cswat, cswat, cswat_state, empty_init, ROT0, "Namco", "Cosmoswat", MACHINE_SUPPORTS_SAVE | MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_GRAPHICS ) +GAME( 1984, cswat, 0, cswat, cswat, cswat_state, empty_init, ROT0, "Namco", "Cosmoswat", MACHINE_SUPPORTS_SAVE | MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )