From 1eabe5285114d3d4eda886be5be90a30e472d2a1 Mon Sep 17 00:00:00 2001 From: cracyc Date: Mon, 21 Mar 2016 12:18:12 -0500 Subject: [PATCH] magtouch: mark working [Carl] --- src/mame/drivers/magtouch.cpp | 105 +++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 32 deletions(-) diff --git a/src/mame/drivers/magtouch.cpp b/src/mame/drivers/magtouch.cpp index 1e5c06922b0..5fe05796c7a 100644 --- a/src/mame/drivers/magtouch.cpp +++ b/src/mame/drivers/magtouch.cpp @@ -80,23 +80,27 @@ video card #include "machine/pcshare.h" #include "machine/ins8250.h" #include "machine/microtch.h" -#include "video/pc_vga.h" - +#include "machine/nvram.h" +#include "bus/isa/trident.h" +#include "bus/isa/isa.h" +#include "bus/isa/sblaster.h" class magtouch_state : public pcat_base_state { public: magtouch_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag), - m_uart(*this, "ns16450_0"), - m_microtouch(*this, "microtouch"){ } + m_isabus(*this, "isa"), + m_rombank(*this, "rombank"), + m_in0(*this, "IN0"){ } - required_device m_uart; - required_device m_microtouch; + required_device m_isabus; + required_memory_bank m_rombank; + required_ioport m_in0; DECLARE_READ8_MEMBER(magtouch_io_r); DECLARE_WRITE8_MEMBER(magtouch_io_w); - DECLARE_DRIVER_INIT(magtouch); + DECLARE_WRITE8_MEMBER(dma8237_1_dack_w); virtual void machine_start() override; }; @@ -111,7 +115,7 @@ READ8_MEMBER(magtouch_state::magtouch_io_r) switch(offset) { case 1: - return ioport("IN0")->read(); + return m_in0->read(); default: return 0; } @@ -122,27 +126,27 @@ WRITE8_MEMBER(magtouch_state::magtouch_io_w) switch(offset) { case 6: - membank("rombank")->set_entry(data & 0x7f ); + m_rombank->set_entry(data & 0x7f ); break; } } static ADDRESS_MAP_START( magtouch_map, AS_PROGRAM, 32, magtouch_state ) AM_RANGE(0x00000000, 0x0009ffff) AM_RAM - AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", vga_device, mem_r, mem_w, 0xffffffff) + AM_RANGE(0x000a0000, 0x000bffff) AM_DEVREADWRITE8("vga", trident_vga_device, mem_r, mem_w, 0xffffffff) AM_RANGE(0x000c0000, 0x000c7fff) AM_ROM AM_REGION("video_bios", 0) + AM_RANGE(0x000d0000, 0x000d1fff) AM_RAM AM_SHARE("nvram") AM_RANGE(0x000d8000, 0x000dffff) AM_ROMBANK("rombank") AM_RANGE(0x000f0000, 0x000fffff) AM_RAM AM_REGION("bios", 0 ) - AM_RANGE(0x00100000, 0x0027ffff) AM_ROM AM_REGION("game_prg", 0) AM_RANGE(0xffff0000, 0xffffffff) AM_ROM AM_REGION("bios", 0 ) ADDRESS_MAP_END static ADDRESS_MAP_START( magtouch_io, AS_IO, 32, magtouch_state ) AM_IMPORT_FROM(pcat32_io_common) AM_RANGE(0x02e0, 0x02e7) AM_READWRITE8(magtouch_io_r, magtouch_io_w, 0xffffffff) - AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", vga_device, port_03b0_r, port_03b0_w, 0xffffffff) - AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", vga_device, port_03c0_r, port_03c0_w, 0xffffffff) - AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", vga_device, port_03d0_r, port_03d0_w, 0xffffffff) + AM_RANGE(0x03b0, 0x03bf) AM_DEVREADWRITE8("vga", trident_vga_device, port_03b0_r, port_03b0_w, 0xffffffff) + AM_RANGE(0x03c0, 0x03cf) AM_DEVREADWRITE8("vga", trident_vga_device, port_03c0_r, port_03c0_w, 0xffffffff) + AM_RANGE(0x03d0, 0x03df) AM_DEVREADWRITE8("vga", trident_vga_device, port_03d0_r, port_03d0_w, 0xffffffff) AM_RANGE(0x03f8, 0x03ff) AM_DEVREADWRITE8("ns16450_0", ns16450_device, ins8250_r, ins8250_w, 0xffffffff) ADDRESS_MAP_END @@ -150,17 +154,34 @@ static INPUT_PORTS_START( magtouch ) PORT_START("IN0") PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Clear") PORT_CODE(KEYCODE_C) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_SERVICE) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_COIN1) PORT_IMPULSE(1) - PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_COIN2) PORT_IMPULSE(1) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_COIN3) PORT_IMPULSE(1) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_COIN1) PORT_IMPULSE(2) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_COIN2) PORT_IMPULSE(2) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_COIN3) PORT_IMPULSE(2) INPUT_PORTS_END +//TODO: use atmb device +WRITE8_MEMBER( magtouch_state::dma8237_1_dack_w ){ m_isabus->dack_w(1, data); } + void magtouch_state::machine_start() { - membank("rombank")->configure_entries(0, 0x80, memregion("game_prg")->base(), 0x8000 ); - membank("rombank")->set_entry(0); + m_rombank->configure_entries(0, 0x80, memregion("game_prg")->base(), 0x8000 ); + m_rombank->set_entry(0); + machine().device("nvram")->set_base(memshare("nvram")->ptr(), 0x2000); } +static SLOT_INTERFACE_START( magtouch_isa8_cards ) + SLOT_INTERFACE("sb15", ISA8_SOUND_BLASTER_1_5) +SLOT_INTERFACE_END + +static DEVICE_INPUT_DEFAULTS_START( magtouch_sb_def ) + DEVICE_INPUT_DEFAULTS("CONFIG", 0x03, 0x01) +DEVICE_INPUT_DEFAULTS_END + +static MACHINE_CONFIG_FRAGMENT( magtouch_sb_conf ) + MCFG_DEVICE_MODIFY("pc_joy") + MCFG_DEVICE_SLOT_INTERFACE(pc_joysticks, nullptr, true) // remove joystick +MACHINE_CONFIG_END + static MACHINE_CONFIG_START( magtouch, magtouch_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I386, 14318180*2) /* I386 ?? Mhz */ @@ -169,17 +190,35 @@ static MACHINE_CONFIG_START( magtouch, magtouch_state ) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259_1", pic8259_device, inta_cb) /* video hardware */ - MCFG_FRAGMENT_ADD( pcvideo_vga ) - - MCFG_SCREEN_MODIFY("screen") - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ + MCFG_FRAGMENT_ADD( pcvideo_trident_vga ) + MCFG_DEVICE_REPLACE("vga", TVGA9000_VGA, 0) MCFG_FRAGMENT_ADD( pcat_common ) MCFG_DEVICE_ADD( "ns16450_0", NS16450, XTAL_1_8432MHz ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("microtouch", microtouch_device, rx)) MCFG_INS8250_OUT_INT_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir4_w)) - MCFG_MICROTOUCH_ADD( "microtouch", 9600, DEVWRITELINE("ns16450_0", ins8250_uart_device, rx_w) ) // rate? + MCFG_MICROTOUCH_ADD( "microtouch", 9600, DEVWRITELINE("ns16450_0", ins8250_uart_device, rx_w) ) + + MCFG_NVRAM_ADD_0FILL("nvram") + + MCFG_DEVICE_MODIFY("dma8237_1") + MCFG_I8237_OUT_IOW_1_CB(WRITE8(magtouch_state, dma8237_1_dack_w)) + + MCFG_DEVICE_ADD("isa", ISA8, 0) + MCFG_ISA8_CPU(":maincpu") + MCFG_ISA_OUT_IRQ2_CB(DEVWRITELINE("pic8259_2", pic8259_device, ir2_w)) + MCFG_ISA_OUT_IRQ3_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir3_w)) + //MCFG_ISA_OUT_IRQ4_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir4_w)) + MCFG_ISA_OUT_IRQ5_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir5_w)) + MCFG_ISA_OUT_IRQ6_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir6_w)) + MCFG_ISA_OUT_IRQ7_CB(DEVWRITELINE("pic8259_1", pic8259_device, ir7_w)) + MCFG_ISA_OUT_DRQ1_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq1_w)) + MCFG_ISA_OUT_DRQ2_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq2_w)) + MCFG_ISA_OUT_DRQ3_CB(DEVWRITELINE("dma8237_1", am9517a_device, dreq3_w)) + + MCFG_ISA8_SLOT_ADD("isa", "isa1", magtouch_isa8_cards, "sb15", true) + MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("sb15", magtouch_sb_def) + MCFG_DEVICE_CARD_MACHINE_CONFIG("sb15", magtouch_sb_conf) MACHINE_CONFIG_END @@ -188,18 +227,20 @@ ROM_START(magtouch) ROM_LOAD("mtouch.u13", 0x00000, 0x10000, CRC(e74fb144) SHA1(abc99e84832c30606374da542fd94f0fbc8cbaa6) ) ROM_REGION(0x08000, "video_bios", 0) - ROM_LOAD16_BYTE("vga1-bios-ver-b-1.00-07.u8", 0x00000, 0x04000, CRC(a40551d6) SHA1(db38190f06e4af2c2d59ae310e65883bb16cd3d6)) + //this is a phoenix standard vga only bios from 1991 despite the notes above saying the machine has a trident svga adapter + //ROM_LOAD16_BYTE("vga1-bios-ver-b-1.00-07.u8", 0x00000, 0x04000, CRC(a40551d6) SHA1(db38190f06e4af2c2d59ae310e65883bb16cd3d6)) + //ROM_CONTINUE( 0x00001, 0x04000 ) + //the game requires an svga mode, 640x480x8bpp so substituting a quadtel (later purchased by phoenix) trident ver. D4.01E bios + ROM_LOAD16_BYTE("prom.vid", 0x00000, 0x04000, BAD_DUMP CRC(ad7eadaf) SHA1(ab379187914a832284944e81e7652046c7d938cc) ) ROM_CONTINUE( 0x00001, 0x04000 ) ROM_REGION(0x400000, "game_prg", 0) /* proper game */ ROM_LOAD("mtouch.u20", 0x000000,0x100000, CRC(fb7b529b) SHA1(ecf8792ce7b6b2f59c2178dc1524c3830a4b4ebc) ) ROM_LOAD("mtouch.u21", 0x100000,0x100000, CRC(af1491a6) SHA1(2d09506a3368fd64b1081017c58065635be5a62f) ) ROM_LOAD("mtouch.u22", 0x200000,0x100000, CRC(da39c860) SHA1(7648e063ec68575abd808d5dea933f292197a2c2) ) + ROM_FILL(0x511fa, 1, 0xeb) // skip prot(?) check and exe relocation + ROM_FILL(0x511fb, 1, 0x03) + ROM_FILL(0x511ba, 1, 0xeb) // skip csum ROM_END -DRIVER_INIT_MEMBER(magtouch_state,magtouch) -{ -} - - -GAME( 1995, magtouch, 0, magtouch, magtouch, magtouch_state, magtouch, ROT0, "Micro Manufacturing", "Magical Touch", MACHINE_NOT_WORKING | MACHINE_NO_SOUND ) +GAME( 1995, magtouch, 0, magtouch, magtouch, driver_device, 0, ROT0, "Micro Manufacturing", "Magical Touch", MACHINE_UNEMULATED_PROTECTION )