diff options
author | Patrick Mackinlay <pmackinlay@hotmail.com> | 2020-02-06 19:22:39 +0700 |
---|---|---|
committer | Patrick Mackinlay <pmackinlay@hotmail.com> | 2020-02-06 19:22:39 +0700 |
commit | c169fca4aa1cd60d6a8754380baa4ecc46c681bb (patch) | |
tree | 7162b1aeeb938d9f296052baf3b91701d3e77684 | |
parent | a353a25b12b00422ffea578663881e36767016de (diff) |
jazz: add softlist (nw)
-rw-r--r-- | hash/jazz.xml | 55 | ||||
-rw-r--r-- | src/mame/drivers/jazz.cpp | 19 | ||||
-rw-r--r-- | src/mame/includes/jazz.h | 3 | ||||
-rw-r--r-- | src/mame/layout/jazz.lay | 2 |
4 files changed, 70 insertions, 9 deletions
diff --git a/hash/jazz.xml b/hash/jazz.xml new file mode 100644 index 00000000000..2bbd751836f --- /dev/null +++ b/hash/jazz.xml @@ -0,0 +1,55 @@ +<?xml version="1.0"?> +<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd"> +<softwarelist name="jazz" description="Jazz software"> + + <!-- can't install yet + <software name="winnt31"> + <description>Windows NT Version 3.1</description> + <year>1993</year> + <publisher>Microsoft</publisher> + + <part name="hdd" interface="scsi_hdd"> + <diskarea name="harddriv"> + <disk name="winnt31" sha1="5d556b4df2dccdc681095fedcf836a5b0a7782a0" writeable="yes" /> + </diskarea> + </part> + </software> + --> + + <software name="winnt35"> + <description>Windows NT Workstation Version 3.5</description> + <year>1994</year> + <publisher>Microsoft</publisher> + + <part name="hdd" interface="scsi_hdd"> + <diskarea name="harddriv"> + <disk name="winnt35" sha1="d0377ef1a150abc164a9cdac3eaccb204c5af040" writeable="yes" /> + </diskarea> + </part> + </software> + + <software name="winnt351"> + <description>Windows NT Workstation Version 3.51</description> + <year>1995</year> + <publisher>Microsoft</publisher> + + <part name="hdd" interface="scsi_hdd"> + <diskarea name="harddriv"> + <disk name="winnt351" sha1="b60bea66e2187cc2406778a26fc9ca4b661ff71f" writeable="yes" /> + </diskarea> + </part> + </software> + + <software name="winnt4sp1"> + <description>Windows NT Workstation Version 4.0 Service Pack 1</description> + <year>1996</year> + <publisher>Microsoft</publisher> + + <part name="hdd" interface="scsi_hdd"> + <diskarea name="harddriv"> + <disk name="winnt4sp1" sha1="a988e57e021174f859e972c50786656e408fb18a" writeable="yes" /> + </diskarea> + </part> + </software> + +</softwarelist> diff --git a/src/mame/drivers/jazz.cpp b/src/mame/drivers/jazz.cpp index e2569b22d61..88909d5bab0 100644 --- a/src/mame/drivers/jazz.cpp +++ b/src/mame/drivers/jazz.cpp @@ -212,7 +212,7 @@ void jazz_state::jazz(machine_config &config) { ncr53c94_device &adapter = downcast<ncr53c94_device &>(*device); - adapter.irq_handler_cb().set(m_mct_adr, FUNC(mct_adr_device::irq<5>));; + adapter.irq_handler_cb().set(m_mct_adr, FUNC(mct_adr_device::irq<5>)); adapter.drq_handler_cb().set(m_mct_adr, FUNC(mct_adr_device::drq<0>)); subdevice<mct_adr_device>(":mct_adr")->dma_r_cb<0>().set(adapter, FUNC(ncr53c94_device::dma_r)); @@ -324,6 +324,9 @@ void jazz_state::jazz(machine_config &config) // TODO: 4 EISA slots config.set_default_layout(layout_jazz); + + // software list + SOFTWARE_LIST(config, m_softlist).set_original("jazz"); } void jazz_state::led_w(u8 data) @@ -373,7 +376,7 @@ ROM_START(mmr4000be) ROMX_LOAD("riscos.bin", 0x00000, 0x40000, CRC(cea6bc8f) SHA1(3e47b4ad5d1a0c7aac649e6aef3df1bf86fc938b), ROM_BIOS(0)) ROM_REGION32_LE(0x800000, "graphics", 0) - ROM_LOAD64_BYTE("mips_g364.bin", 0x00, 0x40, CRC(9265ccb6) SHA1(ef5c3a6bc5249274dd9c9a18d88a668cdd457370) BAD_DUMP) + ROM_LOAD64_BYTE("mips_g364.bin", 0x000000, 0x020000, CRC(be6a726e) SHA1(225c198f6a7f8445dac3de052ecceecbb5be6bc7) BAD_DUMP) ROM_END ROM_START(mmr4000le) @@ -382,14 +385,14 @@ ROM_START(mmr4000le) ROMX_LOAD("ntprom.bin", 0x00000, 0x40000, CRC(d91018d7) SHA1(316de17820192c89b8ee6d9936ab8364a739ca53), ROM_BIOS(0)) ROM_REGION32_LE(0x800000, "graphics", 0) - // Jazz G300 (8.125MHz video clock) + // Jazz G300 (8.125MHz video clock, Bt431) //ROM_LOAD64_BYTE("jazz_g300.bin", 0x00, 0x40, CRC(258eb00a) SHA1(6e3fd0272957524de82e7042d6e36aca492c4d26) BAD_DUMP) // Jazz G364 (8.125MHz video clock) - //ROM_LOAD64_BYTE("jazz_g364.bin", 0x00, 0x40, CRC(6d1ee59f) SHA1(8ec928af5b72c52eae6a3e81942db7cfaf9b9c1d) BAD_DUMP) - // Jazz VXL (aka Jaguar, part number 09-00184) - //ROM_LOAD64_BYTE("jazz_vxl.bin", 0x00, 0x40, CRC(df86e670) SHA1(2a9e8b1a42e4a29242131fa26c493f53eb866484) BAD_DUMP) - // MIPS Video G364 (5MHz video clock, part number 09-00176) - ROM_LOAD64_BYTE("mips_g364.bin", 0x00, 0x40, CRC(9265ccb6) SHA1(ef5c3a6bc5249274dd9c9a18d88a668cdd457370) BAD_DUMP) + //ROM_LOAD64_BYTE("jazz_g364.bin", 0x000000, 0x020000, CRC(495fb417) SHA1(c341f3d498822ec1ee07a70076d7bbbf7aa60cb5) BAD_DUMP) + // Jazz VXL (aka Jaguar, part number 09-00184, Bt484 or Bt485) + //ROM_LOAD64_BYTE("jazz_vxl.bin", 0x000000, 0x010000, CRC(8edf1a62) SHA1(7750833eac0708ee79f01f36523554d29a094692) BAD_DUMP) + // MIPS G364 (5MHz video clock, part number 09-00176) + ROM_LOAD64_BYTE("mips_g364.bin", 0x000000, 0x020000, CRC(be6a726e) SHA1(225c198f6a7f8445dac3de052ecceecbb5be6bc7) BAD_DUMP) ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ diff --git a/src/mame/includes/jazz.h b/src/mame/includes/jazz.h index 7b8135899e5..f774608e62f 100644 --- a/src/mame/includes/jazz.h +++ b/src/mame/includes/jazz.h @@ -42,6 +42,7 @@ #include "imagedev/floppy.h" #include "formats/pc_dsk.h" +#include "softlist.h" class jazz_state : public driver_device { @@ -66,6 +67,7 @@ public: , m_lpt(*this, "lpt") , m_isp(*this, "isp") , m_buzzer(*this, "buzzer") + , m_softlist(*this, "softlist") , m_led(*this, "led0") { } @@ -112,6 +114,7 @@ protected: required_device<pc_lpt_device> m_lpt; required_device<i82357_device> m_isp; required_device<speaker_sound_device> m_buzzer; + required_device<software_list_device> m_softlist; output_finder<> m_led; }; diff --git a/src/mame/layout/jazz.lay b/src/mame/layout/jazz.lay index 7e6aaf4988e..2ecd6c34d80 100644 --- a/src/mame/layout/jazz.lay +++ b/src/mame/layout/jazz.lay @@ -19,7 +19,7 @@ TODO <bounds x="0" y="0" width="1280" height="1024" /> </screen> <bezel name="led0" element="led"> - <bounds x="1240" y="1024" width="40" height="50" /> + <bounds x="1230" y="1024" width="40" height="50" /> </bezel> </view> </mamelayout> |