diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index a7b3461ba50..25ef6e01d64 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -1262,8 +1262,6 @@ function linkProjects_mame_mess(_target, _subtarget) "ne", "nec", "netronic", - "news_68k", - "news_r3k", "next", "nintendo", "nokia", @@ -1314,6 +1312,7 @@ function linkProjects_mame_mess(_target, _subtarget) "slicer", "snk", "sony", + "sony_news", "sord", "special", "stm", @@ -2996,24 +2995,6 @@ files { MAME_DIR .. "src/mame/includes/exp85.h", } -createMESSProjects(_target, _subtarget, "news_68k") -files { - MAME_DIR .. "src/mame/drivers/news_68k.cpp", - MAME_DIR .. "src/mame/machine/dmac_0266.cpp", - MAME_DIR .. "src/mame/machine/dmac_0266.h", - MAME_DIR .. "src/mame/machine/news_hid.cpp", - MAME_DIR .. "src/mame/machine/news_hid.h", -} - -createMESSProjects(_target, _subtarget, "news_r3k") -files { - MAME_DIR .. "src/mame/drivers/news_r3k.cpp", - MAME_DIR .. "src/mame/machine/dmac_0448.cpp", - MAME_DIR .. "src/mame/machine/dmac_0448.h", - MAME_DIR .. "src/mame/machine/news_hid.cpp", - MAME_DIR .. "src/mame/machine/news_hid.h", -} - createMESSProjects(_target, _subtarget, "next") files { MAME_DIR .. "src/mame/drivers/next.cpp", @@ -3637,6 +3618,19 @@ files { MAME_DIR .. "src/mame/drivers/ps2sony.cpp", } +createMESSProjects(_target, _subtarget, "sony_news") +files { + MAME_DIR .. "src/mame/drivers/news_68k.cpp", + MAME_DIR .. "src/mame/drivers/news_r3k.cpp", + MAME_DIR .. "src/mame/drivers/news_38xx.cpp", + MAME_DIR .. "src/mame/machine/dmac_0448.cpp", + MAME_DIR .. "src/mame/machine/dmac_0448.h", + MAME_DIR .. "src/mame/machine/dmac_0266.cpp", + MAME_DIR .. "src/mame/machine/dmac_0266.h", + MAME_DIR .. "src/mame/machine/news_hid.cpp", + MAME_DIR .. "src/mame/machine/news_hid.h", +} + createMESSProjects(_target, _subtarget, "sord") files { MAME_DIR .. "src/mame/drivers/m5.cpp", diff --git a/src/mame/drivers/news_38xx.cpp b/src/mame/drivers/news_38xx.cpp new file mode 100644 index 00000000000..6afc4e5adc9 --- /dev/null +++ b/src/mame/drivers/news_38xx.cpp @@ -0,0 +1,473 @@ +// license:BSD-3-Clause +// copyright-holders:Patrick Mackinlay + +/* + * Sony NEWS NWS-38xx. + * + * Sources: + * + * TODO: + * - r3000 cpu + * - misc control registers and leds + * - slots/graphics + * - sound + * - centronics + */ + +#include "emu.h" + +#include "cpu/mips/mips1.h" +#include "cpu/m68000/m68000.h" + +// memory +#include "machine/ram.h" + +// various hardware +#include "machine/msm6242.h" +#include "machine/z80scc.h" +#include "machine/am79c90.h" +#include "machine/upd765.h" +#include "machine/dmac_0266.h" +#include "machine/news_hid.h" +#include "machine/ncr5380n.h" + +// video +#include "screen.h" + +// busses and connectors +#include "machine/nscsi_bus.h" +#include "bus/nscsi/cd.h" +#include "bus/nscsi/hd.h" +#include "bus/rs232/rs232.h" + +#include "machine/input_merger.h" +#include "imagedev/floppy.h" +#include "formats/pc_dsk.h" + +#include "debugger.h" + +#define VERBOSE 1 +#include "logmacro.h" + +class news_38xx_state : public driver_device +{ +public: + news_38xx_state(machine_config const &mconfig, device_type type, char const *tag) + : driver_device(mconfig, type, tag) +// , m_cpu(*this, "cpu") + , m_iop(*this, "iop") + , m_ram(*this, "ram") + , m_dma(*this, "dma%u", 0U) + , m_rtc(*this, "rtc") + , m_scc(*this, "scc") + , m_net(*this, "net") + , m_fdc(*this, "fdc") + , m_hid(*this, "hid") + , m_scsi(*this, "scsi%u:7:cxd1180", 0U) + , m_serial(*this, "serial%u", 0U) + , m_scsibus(*this, "scsi%u", 0U) + , m_serial_irq(*this, "serial_irq") + , m_floppy_irq(*this, "floppy_irq") + , m_eprom(*this, "eprom") +// , m_vram(*this, "vram") +// , m_led(*this, "led%u", 0U) + { + } + +protected: + // driver_device overrides + virtual void machine_start() override; + virtual void machine_reset() override; + + // address maps + void cpu_map(address_map &map); + void iop_map(address_map &map); + void iop_vector_map(address_map &map); + + // machine config + void common(machine_config &config); + +public: + void nws3860(machine_config &config); + + void init_common(); + +protected: + u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, rectangle const &cliprect); + + u8 intst_r() { return m_intst; } + + enum irq_number : unsigned + { + SLOT = 0, + CENTRO = 1, + FDC = 2, + LANCE = 3, + IPC = 4, + SCSI1 = 5, + SCSI0 = 6, + PERR = 7, + }; + template void irq_w(int state); + void int_check(); + + u32 bus_error_r(); + void timer_w(u8 data); + void timer(void *ptr, s32 param); + + DECLARE_FLOPPY_FORMATS(floppy_formats); + + // devices +// required_device m_cpu; + required_device m_iop; + required_device m_ram; + required_device_array m_dma; + required_device m_rtc; + required_device m_scc; + required_device m_net; + required_device m_fdc; + + required_device m_hid; + required_device_array m_scsi; + + required_device_array m_serial; + required_device_array m_scsibus; + + required_device m_serial_irq; + required_device m_floppy_irq; + + required_region_ptr m_eprom; + //required_shared_ptr m_vram; + //output_finder<4> m_led; + + std::unique_ptr m_net_ram; + + emu_timer *m_timer; + + u8 m_intst; + u8 m_inten; + + bool m_int_state[3]; + bool m_scc_irq_state; +}; + +FLOPPY_FORMATS_MEMBER(news_38xx_state::floppy_formats) + FLOPPY_PC_FORMAT +FLOPPY_FORMATS_END + +void news_38xx_state::machine_start() +{ + //m_led.resolve(); + + m_net_ram = std::make_unique(8192); + + save_pointer(NAME(m_net_ram), 8192); + + save_item(NAME(m_intst)); + save_item(NAME(m_inten)); + save_item(NAME(m_int_state)); + + m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(news_38xx_state::timer), this)); + + m_intst = 0; + m_inten = 0x6d; + for (bool &int_state : m_int_state) + int_state = false; + m_scc_irq_state = false; +} + +void news_38xx_state::machine_reset() +{ + // eprom is mapped at 0 after reset + m_iop->space(0).install_rom(0x00000000, 0x0000ffff, m_eprom); + + m_timer->adjust(attotime::from_hz(100), 0, attotime::from_hz(100)); +} + +void news_38xx_state::init_common() +{ + // HACK: hardwire the rate + m_fdc->set_rate(500000); +} + +void news_38xx_state::cpu_map(address_map &map) +{ +} + +void news_38xx_state::iop_map(address_map &map) +{ + map(0xd8000000, 0xd803ffff).ram(); // iop ram + + map(0xe0000000, 0xe000ffff).rom().region("eprom", 0); + + map(0xe2000000, 0xe2000007).nopw(); // ignore for now + // 0xe2000000 // power control + map(0xe2000001, 0xe2000001).lw8([this](u8 data) { m_iop->space(0).install_ram(0x00000000, m_ram->mask(), 0xc0000000, m_ram->pointer()); }, "ram_enable"); + map(0xe2000002, 0xe2000002).lw8([this](u8 data) { m_inten |= 0x80; }, "pie_w"); + map(0xe2000003, 0xe2000003).w(FUNC(news_38xx_state::timer_w)); + // 0xe2000004 // soft interrupt + // 0xe2000005 // ast interrupt + // 0xe2000006 // led 0 + // 0xe2000007 // led 1 + + map(0xe3000000, 0xe3000000).r(FUNC(news_38xx_state::intst_r)); + // 0xe3800000 // inter-processor interrupt + + map(0xe4000000, 0xe4000007).m(m_fdc, FUNC(n82077aa_device::map)); + // 0xe4000105 // fdc psuedo-dma port + + // 0xe6040000 // centronics + map(0xe6040003, 0xe6040003).lw8([this](u8 data) { m_inten |= 0x02; }, "cie_w"); + map(0xe6080000, 0xe6080007).m(m_scsi[0], FUNC(cxd1180_device::map)); + map(0xe60c0000, 0xe60c0007).m(m_scsi[1], FUNC(cxd1180_device::map)); + + map(0xe6100000, 0xe6100007).m(m_hid, FUNC(news_hid_hle_device::map_68k)); + map(0xe6140000, 0xe6140003).rw(m_scc, FUNC(z80scc_device::ab_dc_r), FUNC(z80scc_device::ab_dc_w)); + map(0xe6180000, 0xe618000f).rw(m_rtc, FUNC(rtc62421_device::read), FUNC(rtc62421_device::write)); + // 0xe61c0000 // beep frequency + + map(0xe6200000, 0xe6203fff).lrw16( + [this](offs_t offset) { return m_net_ram[offset]; }, "net_ram_r", + [this](offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_net_ram[offset]); }, "net_ram_w"); + // 0xe62c0000 // audio + + map(0xe6300000, 0xe6300003).rw(m_net, FUNC(am7990_device::regs_r), FUNC(am7990_device::regs_w)); + // 0xe6340000 // park + // 0xe6380000 // divide fdd index pulse? + + map(0xe8000000, 0xe8000017).m(m_dma[0], FUNC(dmac_0266_device::map)); + map(0xea000000, 0xea000017).m(m_dma[1], FUNC(dmac_0266_device::map)); + + map(0xec000000, 0xec0000ff).rom().region("idrom", 0); + map(0xec000100, 0xec000103).portr("SW1"); + + map(0xee000000, 0xeeffffff).r(FUNC(news_38xx_state::bus_error_r)); +} + +void news_38xx_state::iop_vector_map(address_map &map) +{ + map(0xfffffff3, 0xfffffff3).lr8(NAME([]() { return m68000_base_device::autovector(1); })); + map(0xfffffff5, 0xfffffff5).lr8(NAME([]() { return m68000_base_device::autovector(2); })); + map(0xfffffff7, 0xfffffff7).lr8(NAME([]() { return m68000_base_device::autovector(3); })); + map(0xfffffff9, 0xfffffff9).lr8(NAME([]() { return m68000_base_device::autovector(4); })); + map(0xfffffffb, 0xfffffffb).lr8(NAME([this]() { return m_scc_irq_state ? m_scc->m1_r() : m68000_base_device::autovector(5); })); + map(0xfffffffd, 0xfffffffd).lr8(NAME([]() { return m68000_base_device::autovector(6); })); + map(0xffffffff, 0xffffffff).lr8(NAME([]() { return m68000_base_device::autovector(7); })); +} + +template void news_38xx_state::irq_w(int state) +{ + LOG("irq number %d state %d\n", Number, state); + + if (state) + m_intst |= 1U << Number; + else + m_intst &= ~(1U << Number); + + int_check(); +} + +void news_38xx_state::int_check() +{ + // TODO: assume 74444333 + static int const int_line[] = { INPUT_LINE_IRQ7, INPUT_LINE_IRQ4, INPUT_LINE_IRQ3 }; + static u8 const int_mask[] = { 0x80, 0x78, 0x07 }; + + for (unsigned i = 0; i < ARRAY_LENGTH(m_int_state); i++) + { + bool const int_state = m_intst & m_inten & int_mask[i]; + + if (m_int_state[i] != int_state) + { + m_int_state[i] = int_state; + m_iop->set_input_line(int_line[i], int_state); + } + } +} + +u32 news_38xx_state::bus_error_r() +{ + if (!machine().side_effects_disabled()) + m_iop->set_input_line(M68K_LINE_BUSERROR, ASSERT_LINE); + + return 0; +} + +void news_38xx_state::timer_w(u8 data) +{ + LOG("timer_w 0x%02x\n", data); + + m_timer->set_param(data); + + if (!data) + m_iop->set_input_line(INPUT_LINE_IRQ6, CLEAR_LINE); +} + +void news_38xx_state::timer(void *ptr, s32 param) +{ + if (param) + m_iop->set_input_line(INPUT_LINE_IRQ6, ASSERT_LINE); +} + +static void news_scsi_devices(device_slot_interface &device) +{ + device.option_add("harddisk", NSCSI_HARDDISK); + device.option_add("cdrom", NSCSI_CDROM); +} + +void news_38xx_state::common(machine_config &config) +{ + //R3000A(config, m_cpu, 25_MHz_XTAL, 32768, 32768); + //m_cpu->set_addrmap(AS_PROGRAM, &news_38xx_state::cpu_map); + //m_cpu->set_fpu(mips1_device_base::MIPS_R3010Av4); + + M68030(config, m_iop, 50_MHz_XTAL / 2); + m_iop->set_addrmap(AS_PROGRAM, &news_38xx_state::iop_map); + m_iop->set_addrmap(m68000_base_device::AS_CPU_SPACE, &news_38xx_state::iop_vector_map); + + RAM(config, m_ram); + m_ram->set_default_size("16M"); + // TODO: confirm each bank supports 4x1M or 4x4M + //m_ram->set_extra_options("4M,8M,12M,20M,24M,32M,36M,48M"); + + RTC62421(config, m_rtc, 32.768_kHz_XTAL); + + DMAC_0266(config, m_dma[0], 0); + m_dma[0]->set_bus(m_iop, 0); + + DMAC_0266(config, m_dma[1], 0); + m_dma[1]->set_bus(m_iop, 0); + + INPUT_MERGER_ANY_HIGH(config, m_serial_irq); + m_serial_irq->output_handler().set_inputline(m_iop, INPUT_LINE_IRQ5); + + SCC85C30(config, m_scc, 4.9152_MHz_XTAL); + m_scc->out_int_callback().set( + [this](int state) + { + m_scc_irq_state = bool(state); + m_serial_irq->in_w<2>(state); + }); + + // scc channel A + RS232_PORT(config, m_serial[0], default_rs232_devices, "terminal"); + m_serial[0]->cts_handler().set(m_scc, FUNC(z80scc_device::ctsa_w)); + m_serial[0]->dcd_handler().set(m_scc, FUNC(z80scc_device::dcda_w)); + m_serial[0]->rxd_handler().set(m_scc, FUNC(z80scc_device::rxa_w)); + m_scc->out_rtsa_callback().set(m_serial[0], FUNC(rs232_port_device::write_rts)); + m_scc->out_txda_callback().set(m_serial[0], FUNC(rs232_port_device::write_txd)); + + // scc channel B + RS232_PORT(config, m_serial[1], default_rs232_devices, nullptr); + m_serial[1]->cts_handler().set(m_scc, FUNC(z80scc_device::ctsb_w)); + m_serial[1]->dcd_handler().set(m_scc, FUNC(z80scc_device::dcdb_w)); + m_serial[1]->rxd_handler().set(m_scc, FUNC(z80scc_device::rxb_w)); + m_scc->out_rtsb_callback().set(m_serial[1], FUNC(rs232_port_device::write_rts)); + m_scc->out_txdb_callback().set(m_serial[1], FUNC(rs232_port_device::write_txd)); + + AM7990(config, m_net); + m_net->intr_out().set(FUNC(news_38xx_state::irq_w)).invert(); + m_net->dma_in().set([this](offs_t offset) { return m_net_ram[offset >> 1]; }); + m_net->dma_out().set([this](offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_net_ram[offset >> 1]); }); + + INPUT_MERGER_ANY_HIGH(config, m_floppy_irq); + m_floppy_irq->output_handler().set(FUNC(news_38xx_state::irq_w)); + + N82077AA(config, m_fdc, 16_MHz_XTAL); + m_fdc->intrq_wr_callback().set(m_floppy_irq, FUNC(input_merger_any_high_device::in_w<0>)); + m_fdc->drq_wr_callback().set(m_floppy_irq, FUNC(input_merger_any_high_device::in_w<1>)); + FLOPPY_CONNECTOR(config, "fdc:0", "35hd", FLOPPY_35_HD, true, floppy_formats).enable_sound(false); + + // scsi bus 0 and devices + NSCSI_BUS(config, m_scsibus[0]); + NSCSI_CONNECTOR(config, "scsi0:0", news_scsi_devices, "harddisk"); + NSCSI_CONNECTOR(config, "scsi0:1", news_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsi0:2", news_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsi0:3", news_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsi0:4", news_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsi0:5", news_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsi0:6", news_scsi_devices, nullptr); + + // scsi bus 0 host adapter + NSCSI_CONNECTOR(config, "scsi0:7").option_set("cxd1180", CXD1180).machine_config( + [this](device_t *device) + { + cxd1180_device &adapter = downcast(*device); + + adapter.irq_handler().set(*this, FUNC(news_38xx_state::irq_w)); + adapter.drq_handler().set(m_dma[0], FUNC(dmac_0266_device::drq_w)); + + //subdevice(":dma0")->out_eop_cb().set(adapter, FUNC(cxd1180_device::eop_w)); + subdevice(":dma0")->dma_r_cb().set(adapter, FUNC(cxd1180_device::dma_r)); + subdevice(":dma0")->dma_w_cb().set(adapter, FUNC(cxd1180_device::dma_w)); + }); + + // scsi bus 1 and devices + NSCSI_BUS(config, m_scsibus[1]); + NSCSI_CONNECTOR(config, "scsi1:0", news_scsi_devices, "harddisk"); + NSCSI_CONNECTOR(config, "scsi1:1", news_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsi1:2", news_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsi1:3", news_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsi1:4", news_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsi1:5", news_scsi_devices, nullptr); + NSCSI_CONNECTOR(config, "scsi1:6", news_scsi_devices, nullptr); + + // scsi bus 1 host adapter + NSCSI_CONNECTOR(config, "scsi1:7").option_set("cxd1180", CXD1180).machine_config( + [this](device_t *device) + { + cxd1180_device &adapter = downcast(*device); + + adapter.irq_handler().set(*this, FUNC(news_38xx_state::irq_w)); + adapter.drq_handler().set(m_dma[1], FUNC(dmac_0266_device::drq_w)); + + //subdevice(":dma1")->out_eop_cb().set(adapter, FUNC(cxd1180_device::eop_w)); + subdevice(":dma1")->dma_r_cb().set(adapter, FUNC(cxd1180_device::dma_r)); + subdevice(":dma1")->dma_w_cb().set(adapter, FUNC(cxd1180_device::dma_w)); + }); + + NEWS_HID_HLE(config, m_hid); + m_hid->irq_out().set(m_serial_irq, FUNC(input_merger_device::in_w<0>)); + m_hid->irq_out().set(m_serial_irq, FUNC(input_merger_device::in_w<1>)); +} + +void news_38xx_state::nws3860(machine_config &config) +{ + common(config); +} + +ROM_START(nws3860) + ROM_REGION32_BE(0x10000, "eprom", 0) + ROM_SYSTEM_BIOS(0, "nws3860", "NWS-3860 v1.6") + ROMX_LOAD("mpu_10__ver.1.6__1990_sony.ic159", 0x00000, 0x10000, CRC(542e21b8) SHA1(631dca1f3446761973073f5c32c1a0aeba538c2c), ROM_BIOS(0)) + + ROM_REGION32_BE(0x100, "idrom", 0) + ROM_LOAD("idrom.bin", 0x000, 0x100, CRC(a2b9e968) SHA1(09c7d253c7ed0b368c49f4b60bfe5ca76acd7cc3) BAD_DUMP) +ROM_END + +static INPUT_PORTS_START(nws3860) + PORT_START("SW1") + PORT_DIPNAME(0x07000000, 0x07000000, "Display") PORT_DIPLOCATION("SW1:1,2,3") + PORT_DIPSETTING(0x07000000, "Console") + PORT_DIPSETTING(0x06000000, "NWB-512") + PORT_DIPSETTING(0x03000000, "NWB-225A") + PORT_DIPSETTING(0x00000000, "Autoselect") + + PORT_DIPNAME(0x08000000, 0x08000000, "Boot Device") PORT_DIPLOCATION("SW1:4") + PORT_DIPSETTING(0x08000000, "SCSI") + PORT_DIPSETTING(0x00000000, "Floppy") + + PORT_DIPNAME(0x10000000, 0x10000000, "Automatic Boot") PORT_DIPLOCATION("SW1:5") + PORT_DIPSETTING(0x10000000, DEF_STR(Off)) + PORT_DIPSETTING(0x00000000, DEF_STR(On)) + + PORT_DIPNAME(0x20000000, 0x20000000, "Diagnostic Mode") PORT_DIPLOCATION("SW1:6") + PORT_DIPSETTING(0x20000000, DEF_STR(Off)) + PORT_DIPSETTING(0x00000000, DEF_STR(On)) + + PORT_DIPNAME(0xc0000000, 0xc0000000, "Unused") PORT_DIPLOCATION("SW1:7,8") + PORT_DIPSETTING(0xc0000000, DEF_STR(Off)) +INPUT_PORTS_END + +/* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ +COMP(1989, nws3860, 0, 0, nws3860, nws3860, news_38xx_state, init_common, "Sony", "NWS-3860", MACHINE_IS_SKELETON) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 0f7dad2115a..20265d876ac 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -31811,6 +31811,9 @@ newbrainmd // news // "Virus"??? ((c) 1993 Poby in ROM VIRUS.4) newsa // "Jeansole / Poby +@source:news_38xx.cpp +nws3860 // Sony NEWS NWS-3860 + @source:news_68k.cpp nws1580 // Sony NEWS NWS-1580 diff --git a/src/mame/mess.flt b/src/mame/mess.flt index 33b3008b6c9..398468eedf7 100644 --- a/src/mame/mess.flt +++ b/src/mame/mess.flt @@ -638,6 +638,7 @@ nes_clone.cpp nes_sh6578.cpp nes_vt.cpp newbrain.cpp +news_38xx.cpp news_68k.cpp news_r3k.cpp next.cpp