diff --git a/src/mame/drivers/pcat_dyn.cpp b/src/mame/drivers/pcat_dyn.cpp index db385937cfe..00bb6b7450f 100644 --- a/src/mame/drivers/pcat_dyn.cpp +++ b/src/mame/drivers/pcat_dyn.cpp @@ -10,7 +10,7 @@ Jet Way Information Co. OP495SLC motherboard - AMD Am486-DX40 CPU - Trident TVGA9000i video card - Breve Technologies audio adapter - - CH Products RollerMouse serial trackball + - CH Products RollerMouse serial trackball, Mouse Systems compatible preliminary driver by Angelo Salese @@ -27,6 +27,7 @@ If the output isn't satisfactory, it prints "I/O BOARD FAILURE". #include "machine/bankdev.h" #include "machine/ds128x.h" #include "machine/ins8250.h" +#include "machine/nvram.h" #include "bus/rs232/rs232.h" #include "bus/rs232/ser_mouse.h" @@ -35,23 +36,39 @@ class pcat_dyn_state : public pcat_base_state public: pcat_dyn_state(const machine_config &mconfig, device_type type, const char *tag) : pcat_base_state(mconfig, type, tag) - , m_bank1(*this, "bank1") - , m_bank2(*this, "bank2"){ } + , m_prgbank(*this, "prgbank") + , m_nvram_bank(*this, "nvram_bank") + , m_nvram_mem(0x2000){ } - required_device m_bank1; - required_device m_bank2; + required_memory_bank m_prgbank; + required_memory_bank m_nvram_bank; + std::vector m_nvram_mem; DECLARE_WRITE8_MEMBER(bank1_w); DECLARE_WRITE8_MEMBER(bank2_w); + virtual void machine_start() override; + void nvram_init(nvram_device &nvram, void *base, size_t size); }; +void pcat_dyn_state::machine_start() +{ + m_prgbank->configure_entries(0, 256, memregion("game_prg")->base(), 0x1000); + m_nvram_bank->configure_entries(0, 2, &m_nvram_mem[0], 0x1000); + machine().device("nvram")->set_base(&m_nvram_mem[0], 0x2000); +} + +void pcat_dyn_state::nvram_init(nvram_device &nvram, void *base, size_t size) +{ + memcpy(base, memregion("nvram")->base(), size); +} + WRITE8_MEMBER(pcat_dyn_state::bank1_w) { - m_bank1->set_bank(data); + m_prgbank->set_entry(data); } WRITE8_MEMBER(pcat_dyn_state::bank2_w) { - m_bank2->set_bank(data); + m_nvram_bank->set_entry(data & 1); } static ADDRESS_MAP_START( pcat_map, AS_PROGRAM, 32, pcat_dyn_state ) @@ -60,8 +77,8 @@ static ADDRESS_MAP_START( pcat_map, AS_PROGRAM, 32, pcat_dyn_state ) AM_RANGE(0x000c0000, 0x000c7fff) AM_ROM AM_REGION("video_bios", 0) AM_RANGE(0x000d0000, 0x000d0fff) AM_ROM AM_REGION("game_prg", 0x0000) AM_WRITE8(bank1_w, 0xffffffff) AM_RANGE(0x000d1000, 0x000d1fff) AM_ROM AM_REGION("game_prg", 0x1000) AM_WRITE8(bank2_w, 0xffffffff) - AM_RANGE(0x000d2000, 0x000d3fff) AM_DEVICE("bank1", address_map_bank_device, amap32) - AM_RANGE(0x000d3000, 0x000d4fff) AM_DEVICE("bank2", address_map_bank_device, amap32) + AM_RANGE(0x000d2000, 0x000d2fff) AM_ROMBANK("prgbank") + AM_RANGE(0x000d3000, 0x000d3fff) AM_RAMBANK("nvram_bank") AM_RANGE(0x000df400, 0x000df8ff) AM_RAM //I/O board? AM_RANGE(0x000f0000, 0x000fffff) AM_ROM AM_REGION("bios", 0 ) AM_RANGE(0x00100000, 0x001fffff) AM_RAM @@ -76,23 +93,35 @@ static ADDRESS_MAP_START( pcat_io, AS_IO, 32, pcat_dyn_state ) AM_RANGE(0x03f8, 0x03ff) AM_DEVREADWRITE8("ns16550", ns16550_device, ins8250_r, ins8250_w, 0xffffffff) ADDRESS_MAP_END -static ADDRESS_MAP_START( bank_map, AS_0, 32, pcat_dyn_state ) - AM_RANGE(0x00000, 0xfffff) AM_ROM AM_REGION("game_prg", 0) -ADDRESS_MAP_END -#define AT_KEYB_HELPER(bit, text, key1) \ - PORT_BIT( bit, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME(text) PORT_CODE(key1) static INPUT_PORTS_START( pcat_dyn ) - // 8 -- Bookkeeping - // L -- Coin // M,N,Numpad 6 -- Hang // Enter,Numpad 4 -- 5 Credits - PORT_INCLUDE(at_keyboard) + PORT_START("pc_keyboard_0") + PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Bookkeeping") + + PORT_START("pc_keyboard_1") + PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_BILL1) + + PORT_START("pc_keyboard_2") + // Don't use IPT_BUTTON1 or the mouse axes are mapped incorrectly + PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Mouse Button") PORT_CODE(MOUSECODE_BUTTON1) + PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_COIN1) + + PORT_START("pc_keyboard_3") + + PORT_START("pc_keyboard_4") + + PORT_START("pc_keyboard_5") + + PORT_START("pc_keyboard_6") + + PORT_START("pc_keyboard_7") INPUT_PORTS_END static SLOT_INTERFACE_START(pcat_dyn_com) - SLOT_INTERFACE("msmouse", MSFT_SERIAL_MOUSE) + SLOT_INTERFACE("msmouse", MSYSTEM_SERIAL_MOUSE) SLOT_INTERFACE_END static MACHINE_CONFIG_START( pcat_dyn, pcat_dyn_state ) @@ -115,18 +144,7 @@ static MACHINE_CONFIG_START( pcat_dyn, pcat_dyn_state ) MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE("pic8259_2", pic8259_device, ir0_w)) MCFG_MC146818_CENTURY_INDEX(0x32) - MCFG_DEVICE_ADD("bank1", ADDRESS_MAP_BANK, 0) - MCFG_DEVICE_PROGRAM_MAP(bank_map) - MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE) - MCFG_ADDRESS_MAP_BANK_DATABUS_WIDTH(32) - MCFG_ADDRESS_MAP_BANK_ADDRBUS_WIDTH(20) - MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000) - MCFG_DEVICE_ADD("bank2", ADDRESS_MAP_BANK, 0) - MCFG_DEVICE_PROGRAM_MAP(bank_map) - MCFG_ADDRESS_MAP_BANK_ENDIANNESS(ENDIANNESS_LITTLE) - MCFG_ADDRESS_MAP_BANK_DATABUS_WIDTH(32) - MCFG_ADDRESS_MAP_BANK_ADDRBUS_WIDTH(20) - MCFG_ADDRESS_MAP_BANK_STRIDE(0x1000) + MCFG_NVRAM_ADD_CUSTOM_DRIVER("nvram", pcat_dyn_state, nvram_init) MCFG_DEVICE_ADD( "ns16550", NS16550, XTAL_1_8432MHz ) MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("serport", rs232_port_device, write_txd)) @@ -161,9 +179,11 @@ ROM_START(toursol) ROM_LOAD("sol.u22", 0x40000, 0x40000, CRC(69d42f50) SHA1(737fe62f3827b00b4f6f3b72ef6c7b6740947e95)) ROM_LOAD("sol.u23", 0x80000, 0x40000, CRC(d1e39bd4) SHA1(39c7ee43cddb53fba0f7c0572ddc40289c4edd07)) ROM_LOAD("sol.u24", 0xc0000, 0x40000, CRC(555341e0) SHA1(81fee576728855e234ff7aae06f54ae9705c3ab5)) - ROM_LOAD("sol.u28", 0xe0000, 0x02000, CRC(c9374d50) SHA1(49173bc69f70bb2a7e8af9d03e2538b34aa881d8)) ROM_FILL(0x2a3e6, 1, 0xeb) // skip prot(?) check + ROM_REGION(0x2000, "nvram", 0) + ROM_LOAD("sol.u28", 0, 0x2000, CRC(c9374d50) SHA1(49173bc69f70bb2a7e8af9d03e2538b34aa881d8)) + ROM_REGION(128, "rtc", 0) ROM_LOAD("rtc", 0, 128, BAD_DUMP CRC(732f64c8) SHA1(5386eac3afef9b16af8dd7766e577f7ac700d9cc)) ROM_END @@ -182,7 +202,9 @@ ROM_START(toursol1) ROM_LOAD("prom.1", 0x40000, 0x40000, CRC(8f96e2a8) SHA1(bc3ce8b99e6ff40e355df2c3f797f1fe88b3b219)) ROM_LOAD("prom.2", 0x80000, 0x40000, CRC(8b0ac5cf) SHA1(1c2b6a53c9ff4d18a5227d899facbbc719f40205)) ROM_LOAD("prom.3", 0xc0000, 0x40000, CRC(9352e965) SHA1(2bfb647ec27c60a8c821fdf7483199e1a444cea8)) - ROM_LOAD("prom.7", 0xe0000, 0x02000, CRC(154c8092) SHA1(4439ee82f36d5d5c334494ba7bb4848e839213a7)) + + ROM_REGION(0x2000, "nvram", 0) + ROM_LOAD("prom.7", 0, 0x2000, CRC(154c8092) SHA1(4439ee82f36d5d5c334494ba7bb4848e839213a7)) ROM_REGION(128, "rtc", 0) ROM_LOAD("rtc", 0, 128, BAD_DUMP CRC(732f64c8) SHA1(5386eac3afef9b16af8dd7766e577f7ac700d9cc))