Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-16 05:24:54 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ncr5380n: reclaim ncr5380 device name

Browse Source
This commit is contained in:
Patrick Mackinlay 2021-07-20 12:22:15 +07:00
parent 22a873ccd5
commit de881afb9e
28 changed files with 145 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/src/machine.lua
View File

@ -3814,13 +3814,13 @@ end
---------------------------------------------------
--
--@src/devices/machine/ncr5380n.h,MACHINES["NCR5380N"] = true
--@src/devices/machine/ncr5380.h,MACHINES["NCR5380"] = true
---------------------------------------------------
if (MACHINES["NCR5380N"]~=null) then
if (MACHINES["NCR5380"]~=null) then
files {
MAME_DIR .. "src/devices/machine/ncr5380n.cpp",
MAME_DIR .. "src/devices/machine/ncr5380n.h",
MAME_DIR .. "src/devices/machine/ncr5380.cpp",
MAME_DIR .. "src/devices/machine/ncr5380.h",
}
end

2
scripts/target/mame/arcade.lua
View File

@ -589,7 +589,7 @@ MACHINES["MSM5832"] = true
MACHINES["MSM58321"] = true
MACHINES["MSM6242"] = true
MACHINES["MSM6253"] = true
MACHINES["NCR5380N"] = true
MACHINES["NCR5380"] = true
MACHINES["NCR5390"] = true
MACHINES["NCR539x"] = true
MACHINES["NETLIST"] = true

2
scripts/target/mame/mess.lua
View File

@ -625,7 +625,7 @@ MACHINES["MSM58321"] = true
MACHINES["MSM6242"] = true
--MACHINES["MSM6253"] = true
MACHINES["MYB3K_KEYBOARD"] = true
MACHINES["NCR5380N"] = true
MACHINES["NCR5380"] = true
MACHINES["NCR5385"] = true
MACHINES["NCR5390"] = true
MACHINES["NCR539x"] = true

2
src/devices/bus/a2bus/a2hsscsi.h
View File

@ -14,7 +14,7 @@
#pragma once
#include "a2bus.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
//**************************************************************************
// TYPE DEFINITIONS

4
src/devices/bus/a2bus/a2scsi.cpp
View File

@ -72,8 +72,8 @@ void a2bus_scsi_device::device_add_mconfig(machine_config &config)
NSCSI_CONNECTOR(config, "scsibus:4", default_scsi_devices, nullptr, false);
NSCSI_CONNECTOR(config, "scsibus:5", default_scsi_devices, nullptr, false);
NSCSI_CONNECTOR(config, "scsibus:6", default_scsi_devices, "harddisk", false);
NSCSI_CONNECTOR(config, "scsibus:7").option_set("ncr5380", NCR5380N).machine_config([this](device_t *device) {
downcast<ncr5380n_device &>(*device).drq_handler().set(*this, FUNC(a2bus_scsi_device::drq_w));
NSCSI_CONNECTOR(config, "scsibus:7").option_set("ncr5380", NCR5380).machine_config([this](device_t *device) {
downcast<ncr5380_device &>(*device).drq_handler().set(*this, FUNC(a2bus_scsi_device::drq_w));
});
}

4
src/devices/bus/a2bus/a2scsi.h
View File

@ -14,7 +14,7 @@
#pragma once
#include "a2bus.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
//**************************************************************************
// TYPE DEFINITIONS
@ -46,7 +46,7 @@ protected:
virtual uint8_t read_c800(uint16_t offset) override;
virtual void write_c800(uint16_t offset, uint8_t data) override;
required_device<ncr5380n_device> m_ncr5380;
required_device<ncr5380_device> m_ncr5380;
required_device<nscsi_bus_device> m_scsibus;
required_region_ptr<u8> m_rom;

2
src/devices/bus/a2bus/cmsscsi.cpp
View File

@ -72,7 +72,7 @@ void a2bus_cmsscsi_device::device_add_mconfig(machine_config &config)
NSCSI_CONNECTOR(config, "scsibus:4", default_scsi_devices, nullptr, false);
NSCSI_CONNECTOR(config, "scsibus:5", default_scsi_devices, nullptr, false);
NSCSI_CONNECTOR(config, "scsibus:6", default_scsi_devices, "harddisk", false);
NSCSI_CONNECTOR(config, "scsibus:7").option_set("ncr5380", NCR5380N);
NSCSI_CONNECTOR(config, "scsibus:7").option_set("ncr5380", NCR5380);
}
//-------------------------------------------------

4
src/devices/bus/a2bus/cmsscsi.h
View File

@ -14,7 +14,7 @@
#pragma once
#include "a2bus.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
//**************************************************************************
// TYPE DEFINITIONS
@ -46,7 +46,7 @@ protected:
virtual uint8_t read_c800(uint16_t offset) override;
virtual void write_c800(uint16_t offset, uint8_t data) override;
required_device<ncr5380n_device> m_ncr5380;
required_device<ncr5380_device> m_ncr5380;
required_device<nscsi_bus_device> m_scsibus;
required_region_ptr<u8> m_rom;

10
src/devices/bus/isa/asc88.cpp
View File

@ -53,8 +53,8 @@ void asc88_device::device_reset()
m_isa->install_rom(this, baseaddr, baseaddr | 0x37ff, "bios");
m_isa->install_bank(baseaddr | 0x3800, baseaddr | 0x3fef, m_ram.get());
m_isa->install_memory(baseaddr | 0x3ff0, baseaddr | 0x3ff7,
read8sm_delegate(*m_scsic, FUNC(ncr5380n_device::read)),
write8sm_delegate(*m_scsic, FUNC(ncr5380n_device::write)));
read8sm_delegate(*m_scsic, FUNC(ncr5380_device::read)),
write8sm_delegate(*m_scsic, FUNC(ncr5380_device::write)));
m_isa->install_memory(baseaddr | 0x3ff8, baseaddr | 0x3ff8,
read8smo_delegate(*this, FUNC(asc88_device::eeprom_r)),
write8smo_delegate(*this, FUNC(asc88_device::control_w)));
@ -152,8 +152,8 @@ ioport_constructor asc88_device::device_input_ports() const
void asc88_device::scsic_config(device_t *device)
{
downcast<ncr5380n_device &>(*device).irq_handler().set("^^", FUNC(asc88_device::irq_w));
downcast<ncr5380n_device &>(*device).drq_handler().set("^^", FUNC(asc88_device::drq_w));
downcast<ncr5380_device &>(*device).irq_handler().set("^^", FUNC(asc88_device::irq_w));
downcast<ncr5380_device &>(*device).drq_handler().set("^^", FUNC(asc88_device::drq_w));
}
void asc88_device::device_add_mconfig(machine_config &config)
@ -167,7 +167,7 @@ void asc88_device::device_add_mconfig(machine_config &config)
NSCSI_CONNECTOR(config, "scsi:5", default_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi:6", default_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi:7", default_scsi_devices, "scsic", true)
.option_add_internal("scsic", NCR5380N)
.option_add_internal("scsic", NCR5380)
.machine_config([this] (device_t *device) { scsic_config(device); });
EEPROM_93C06_16BIT(config, m_eeprom); // NMC9306N

4
src/devices/bus/isa/asc88.h
View File

@ -14,7 +14,7 @@
#include "isa.h"
#include "machine/eepromser.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
class asc88_device : public device_t, public device_isa8_card_interface
{
@ -40,7 +40,7 @@ private:
void scsic_config(device_t *device);
required_device<ncr5380n_device> m_scsic;
required_device<ncr5380_device> m_scsic;
required_device<eeprom_serial_93cxx_device> m_eeprom;
required_ioport m_baseaddr;

2
src/devices/bus/nscsi/applecd.cpp
View File

@ -40,7 +40,7 @@
#include "cpu/mcs51/mcs51.h"
#include "cpu/m6502/m3745x.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
DEFINE_DEVICE_TYPE(APPLECD150, applecd150_device, "aplcd150", "AppleCD 150")

98
src/devices/machine/ncr5380n.cpp → src/devices/machine/ncr5380.cpp
View File

@ -13,7 +13,7 @@
*/
#include "emu.h"
#include "ncr5380n.h"
#include "ncr5380.h"
#define LOG_GENERAL (1U << 0)
#define LOG_REGW (1U << 1)
@ -25,13 +25,13 @@
//#define VERBOSE (LOG_GENERAL|LOG_REGW|LOG_REGR|LOG_SCSI|LOG_ARB|LOG_DMA)
#include "logmacro.h"
DEFINE_DEVICE_TYPE(NCR5380N, ncr5380n_device, "ncr5380_new", "NCR 5380 SCSI (new)")
DEFINE_DEVICE_TYPE(NCR53C80, ncr53c80_device, "ncr53c80", "NCR 53C80 SCSI")
DEFINE_DEVICE_TYPE(CXD1180, cxd1180_device, "cxd1180", "Sony CXD1180")
DEFINE_DEVICE_TYPE(NCR5380, ncr5380_device, "ncr5380", "NCR 5380 SCSI")
DEFINE_DEVICE_TYPE(NCR53C80, ncr53c80_device, "ncr53c80", "NCR 53C80 SCSI")
DEFINE_DEVICE_TYPE(CXD1180, cxd1180_device, "cxd1180", "Sony CXD1180")
ALLOW_SAVE_TYPE(ncr5380n_device::state);
ALLOW_SAVE_TYPE(ncr5380_device::state);
ncr5380n_device::ncr5380n_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock, bool has_lbs)
ncr5380_device::ncr5380_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock, bool has_lbs)
: nscsi_device(mconfig, type, tag, owner, clock)
, nscsi_slot_card_interface(mconfig, *this, DEVICE_SELF)
, m_irq_handler(*this)
@ -40,39 +40,39 @@ ncr5380n_device::ncr5380n_device(machine_config const &mconfig, device_type type
{
}
ncr5380n_device::ncr5380n_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
: ncr5380n_device(mconfig, NCR5380N, tag, owner, clock)
ncr5380_device::ncr5380_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
: ncr5380_device(mconfig, NCR5380, tag, owner, clock)
{
}
ncr53c80_device::ncr53c80_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
: ncr5380n_device(mconfig, NCR53C80, tag, owner, clock, true)
: ncr5380_device(mconfig, NCR53C80, tag, owner, clock, true)
{
}
cxd1180_device::cxd1180_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
: ncr5380n_device(mconfig, CXD1180, tag, owner, clock, true)
: ncr5380_device(mconfig, CXD1180, tag, owner, clock, true)
{
}
void ncr5380n_device::map(address_map &map)
void ncr5380_device::map(address_map &map)
{
map(0x0, 0x0).rw(FUNC(ncr5380n_device::csdata_r), FUNC(ncr5380n_device::odata_w));
map(0x1, 0x1).rw(FUNC(ncr5380n_device::icmd_r), FUNC(ncr5380n_device::icmd_w));
map(0x2, 0x2).rw(FUNC(ncr5380n_device::mode_r), FUNC(ncr5380n_device::mode_w));
map(0x3, 0x3).rw(FUNC(ncr5380n_device::tcmd_r), FUNC(ncr5380n_device::tcmd_w));
map(0x4, 0x4).rw(FUNC(ncr5380n_device::csstat_r), FUNC(ncr5380n_device::selen_w));
map(0x5, 0x5).rw(FUNC(ncr5380n_device::bas_r), FUNC(ncr5380n_device::sds_w));
map(0x6, 0x6).rw(FUNC(ncr5380n_device::idata_r), FUNC(ncr5380n_device::sdtr_w));
map(0x7, 0x7).rw(FUNC(ncr5380n_device::rpi_r), FUNC(ncr5380n_device::sdir_w));
map(0x0, 0x0).rw(FUNC(ncr5380_device::csdata_r), FUNC(ncr5380_device::odata_w));
map(0x1, 0x1).rw(FUNC(ncr5380_device::icmd_r), FUNC(ncr5380_device::icmd_w));
map(0x2, 0x2).rw(FUNC(ncr5380_device::mode_r), FUNC(ncr5380_device::mode_w));
map(0x3, 0x3).rw(FUNC(ncr5380_device::tcmd_r), FUNC(ncr5380_device::tcmd_w));
map(0x4, 0x4).rw(FUNC(ncr5380_device::csstat_r), FUNC(ncr5380_device::selen_w));
map(0x5, 0x5).rw(FUNC(ncr5380_device::bas_r), FUNC(ncr5380_device::sds_w));
map(0x6, 0x6).rw(FUNC(ncr5380_device::idata_r), FUNC(ncr5380_device::sdtr_w));
map(0x7, 0x7).rw(FUNC(ncr5380_device::rpi_r), FUNC(ncr5380_device::sdir_w));
}
void ncr5380n_device::device_start()
void ncr5380_device::device_start()
{
m_irq_handler.resolve_safe();
m_drq_handler.resolve_safe();
m_state_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ncr5380n_device::state_timer), this));
m_state_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ncr5380_device::state_timer), this));
save_item(NAME(m_state));
@ -88,7 +88,7 @@ void ncr5380n_device::device_start()
save_item(NAME(m_drq_state));
}
void ncr5380n_device::device_reset()
void ncr5380_device::device_reset()
{
m_state = IDLE;
@ -113,7 +113,7 @@ void ncr5380n_device::device_reset()
set_drq(false);
}
void ncr5380n_device::scsi_ctrl_changed()
void ncr5380_device::scsi_ctrl_changed()
{
u32 const ctrl = scsi_bus->ctrl_r();
@ -196,7 +196,7 @@ void ncr5380n_device::scsi_ctrl_changed()
m_scsi_ctrl = ctrl;
}
u8 ncr5380n_device::csdata_r()
u8 ncr5380_device::csdata_r()
{
u8 const data = scsi_bus->data_r();
LOGMASKED(LOG_REGR, "csdata_r 0x%02x (%s)\n", data, machine().describe_context());
@ -204,7 +204,7 @@ u8 ncr5380n_device::csdata_r()
return data;
}
void ncr5380n_device::odata_w(u8 data)
void ncr5380_device::odata_w(u8 data)
{
LOGMASKED(LOG_REGW, "odata_w 0x%02x (%s)\n", data, machine().describe_context());
@ -215,14 +215,14 @@ void ncr5380n_device::odata_w(u8 data)
m_odata = data;
}
u8 ncr5380n_device::icmd_r()
u8 ncr5380_device::icmd_r()
{
LOGMASKED(LOG_REGR, "icmd_r 0x%02x (%s)\n", m_icmd, machine().describe_context());
return m_icmd;
}
void ncr5380n_device::icmd_w(u8 data)
void ncr5380_device::icmd_w(u8 data)
{
LOGMASKED(LOG_REGW, "icmd_w 0x%02x (%s)\n", data, machine().describe_context());
@ -263,14 +263,14 @@ void ncr5380n_device::icmd_w(u8 data)
m_icmd = (m_icmd & ~IC_WRITE) | (data & IC_WRITE);
}
u8 ncr5380n_device::mode_r()
u8 ncr5380_device::mode_r()
{
LOGMASKED(LOG_REGR, "mode_r 0x%02x (%s)\n", m_mode, machine().describe_context());
return m_mode;
}
void ncr5380n_device::mode_w(u8 data)
void ncr5380_device::mode_w(u8 data)
{
LOGMASKED(LOG_REGW, "mode_w 0x%02x (%s)\n", data, machine().describe_context());
@ -315,14 +315,14 @@ void ncr5380n_device::mode_w(u8 data)
m_mode = data;
}
u8 ncr5380n_device::tcmd_r()
u8 ncr5380_device::tcmd_r()
{
LOGMASKED(LOG_REGR, "tcmd_r 0x%02x (%s)\n", m_tcmd, machine().describe_context());
return m_tcmd;
}
void ncr5380n_device::tcmd_w(u8 data)
void ncr5380_device::tcmd_w(u8 data)
{
LOGMASKED(LOG_REGW, "tcmd_w 0x%02x (%s)\n", data, machine().describe_context());
@ -332,7 +332,7 @@ void ncr5380n_device::tcmd_w(u8 data)
m_tcmd = data;
}
u8 ncr5380n_device::csstat_r()
u8 ncr5380_device::csstat_r()
{
u32 const ctrl = scsi_bus->ctrl_r();
u8 const data =
@ -348,12 +348,12 @@ u8 ncr5380n_device::csstat_r()
return data;
}
void ncr5380n_device::selen_w(u8 data)
void ncr5380_device::selen_w(u8 data)
{
LOGMASKED(LOG_REGW, "selen_w 0x%02x (%s)\n", data, machine().describe_context());
}
u8 ncr5380n_device::bas_r()
u8 ncr5380_device::bas_r()
{
u32 const ctrl = scsi_bus->ctrl_r();
u8 const data = m_bas |
@ -366,7 +366,7 @@ u8 ncr5380n_device::bas_r()
return data;
}
void ncr5380n_device::sds_w(u8 data)
void ncr5380_device::sds_w(u8 data)
{
LOGMASKED(LOG_REGW, "sds_w 0x%02x (%s)\n", data, machine().describe_context());
@ -377,19 +377,19 @@ void ncr5380n_device::sds_w(u8 data)
}
}
u8 ncr5380n_device::idata_r()
u8 ncr5380_device::idata_r()
{
LOGMASKED(LOG_REGR, "idata_r 0x%02x (%s)\n", m_idata, machine().describe_context());
return m_idata;
}
void ncr5380n_device::sdtr_w(u8 data)
void ncr5380_device::sdtr_w(u8 data)
{
LOGMASKED(LOG_REGW, "sdtr_w 0x%02x (%s)\n", data, machine().describe_context());
}
u8 ncr5380n_device::rpi_r()
u8 ncr5380_device::rpi_r()
{
LOGMASKED(LOG_REGR, "rpi_r (%s)\n", machine().describe_context());
@ -399,7 +399,7 @@ u8 ncr5380n_device::rpi_r()
return 0;
}
void ncr5380n_device::sdir_w(u8 data)
void ncr5380_device::sdir_w(u8 data)
{
LOGMASKED(LOG_REGW, "sdir_w 0x%02x (%s)\n", data, machine().describe_context());
@ -410,7 +410,7 @@ void ncr5380n_device::sdir_w(u8 data)
}
}
void ncr5380n_device::state_timer(void *ptr, s32 param)
void ncr5380_device::state_timer(void *ptr, s32 param)
{
// step state machine
int const delay = state_step();
@ -424,7 +424,7 @@ void ncr5380n_device::state_timer(void *ptr, s32 param)
m_state_timer->adjust(attotime::from_nsec(delay));
}
int ncr5380n_device::state_step()
int ncr5380_device::state_step()
{
u32 const ctrl = scsi_bus->ctrl_r();
int delay = 0;
@ -552,7 +552,7 @@ int ncr5380n_device::state_step()
return delay;
}
void ncr5380n_device::eop_w(int state)
void ncr5380_device::eop_w(int state)
{
LOGMASKED(LOG_DMA, "eop_w %d\n", state);
if (state && (m_mode & MODE_DMA))
@ -569,7 +569,7 @@ void ncr5380n_device::eop_w(int state)
}
}
void ncr5380n_device::dma_w(u8 data)
void ncr5380_device::dma_w(u8 data)
{
set_drq(false);
@ -581,7 +581,7 @@ void ncr5380n_device::dma_w(u8 data)
}
}
u8 ncr5380n_device::dma_r()
u8 ncr5380_device::dma_r()
{
set_drq(false);
@ -591,7 +591,7 @@ u8 ncr5380n_device::dma_r()
return m_idata;
}
void ncr5380n_device::scsi_data_w(u8 data)
void ncr5380_device::scsi_data_w(u8 data)
{
// TODO: release data bus when any of the prerequisite conditions expire
u32 const ctrl = scsi_bus->ctrl_r();
@ -603,7 +603,7 @@ void ncr5380n_device::scsi_data_w(u8 data)
}
}
void ncr5380n_device::set_irq(bool irq_state)
void ncr5380_device::set_irq(bool irq_state)
{
if (irq_state != m_irq_state)
{
@ -619,7 +619,7 @@ void ncr5380n_device::set_irq(bool irq_state)
}
}
void ncr5380n_device::set_drq(bool drq_state)
void ncr5380_device::set_drq(bool drq_state)
{
if (drq_state != m_drq_state)
{
@ -635,7 +635,7 @@ void ncr5380n_device::set_drq(bool drq_state)
}
}
u8 ncr5380n_device::read(offs_t offset)
u8 ncr5380_device::read(offs_t offset)
{
switch (offset & 7)
{
@ -653,7 +653,7 @@ u8 ncr5380n_device::read(offs_t offset)
return 0;
}
void ncr5380n_device::write(offs_t offset, u8 data)
void ncr5380_device::write(offs_t offset, u8 data)
{
switch (offset & 7)
{

18
src/devices/machine/ncr5380n.h → src/devices/machine/ncr5380.h
View File

@ -1,19 +1,19 @@
// license:BSD-3-Clause
// copyright-holders:Patrick Mackinlay
#ifndef MAME_MACHINE_NCR5380N_H
#define MAME_MACHINE_NCR5380N_H
#ifndef MAME_MACHINE_NCR5380_H
#define MAME_MACHINE_NCR5380_H
#pragma once
#include "machine/nscsi_bus.h"
class ncr5380n_device
class ncr5380_device
: public nscsi_device
, public nscsi_slot_card_interface
{
public:
ncr5380n_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock = 0);
ncr5380_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock = 0);
// device configuration
auto irq_handler() { return m_irq_handler.bind(); }
@ -30,7 +30,7 @@ public:
void dma_w(u8 val);
protected:
ncr5380n_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock, bool has_lbs = false);
ncr5380_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock, bool has_lbs = false);
// device_t overrides
virtual void device_start() override;
@ -167,20 +167,20 @@ private:
bool const m_has_lbs;
};
class ncr53c80_device : public ncr5380n_device
class ncr53c80_device : public ncr5380_device
{
public:
ncr53c80_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock = 0);
};
class cxd1180_device : public ncr5380n_device
class cxd1180_device : public ncr5380_device
{
public:
cxd1180_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock = 0);
};
DECLARE_DEVICE_TYPE(NCR5380N, ncr5380n_device)
DECLARE_DEVICE_TYPE(NCR5380, ncr5380_device)
DECLARE_DEVICE_TYPE(NCR53C80, ncr53c80_device)
DECLARE_DEVICE_TYPE(CXD1180, cxd1180_device)
#endif // MAME_MACHINE_NCR5380N_H
#endif // MAME_MACHINE_NCR5380_H

14
src/mame/drivers/ampro.cpp
View File

@ -22,7 +22,7 @@ of a hard drive of up to 88MB.
#include "bus/rs232/rs232.h"
#include "cpu/z80/z80.h"
#include "imagedev/floppy.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
#include "bus/nscsi/devices.h"
#include "machine/output_latch.h"
#include "machine/z80daisy.h"
@ -80,7 +80,7 @@ private:
required_device<floppy_connector> m_floppy1;
required_device<floppy_connector> m_floppy2;
required_device<floppy_connector> m_floppy3;
required_device<ncr5380n_device> m_ncr;
required_device<ncr5380_device> m_ncr;
required_device<centronics_device> m_printer;
};
@ -149,8 +149,8 @@ void ampro_state::io_map(address_map &map)
map(0x01, 0x01).w("pio", FUNC(output_latch_device::write)); // printer data
map(0x02, 0x02).w(FUNC(ampro_state::set_strobe)); // printer strobe
map(0x03, 0x03).w(FUNC(ampro_state::clear_strobe)); // printer strobe
map(0x20, 0x27).rw(m_ncr, FUNC(ncr5380n_device::read), FUNC(ncr5380n_device::write)); // scsi chip
map(0x28, 0x28).rw(m_ncr, FUNC(ncr5380n_device::dma_r), FUNC(ncr5380n_device::dma_w)); // scsi control
map(0x20, 0x27).rw(m_ncr, FUNC(ncr5380_device::read), FUNC(ncr5380_device::write)); // scsi chip
map(0x28, 0x28).rw(m_ncr, FUNC(ncr5380_device::dma_r), FUNC(ncr5380_device::dma_w)); // scsi control
map(0x29, 0x29).portr("ID"); // ID port
map(0x40, 0x7f).rw(FUNC(ampro_state::ctc_r), FUNC(ampro_state::ctc_w));
map(0x80, 0x8f).rw(FUNC(ampro_state::dart_r), FUNC(ampro_state::dart_w));
@ -258,9 +258,9 @@ void ampro_state::ampro(machine_config &config)
NSCSI_CONNECTOR(config, "scsi:4", default_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi:5", default_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi:6", default_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi:7").option_set("ncr", NCR5380N).machine_config([] (device_t *device) {
//downcast<ncr5380n_device &>(*device).irq_handler().set(m_ctc, FUNC(z80ctc_device::trg2)); // only if JMP3 shorted
//downcast<ncr5380n_device &>(*device).drq_handler().set(m_dart, FUNC(z80dart_device::dcda_w)); // only if JMP8 shorted
NSCSI_CONNECTOR(config, "scsi:7").option_set("ncr", NCR5380).machine_config([] (device_t *device) {
//downcast<ncr5380_device &>(*device).irq_handler().set(m_ctc, FUNC(z80ctc_device::trg2)); // only if JMP3 shorted
//downcast<ncr5380_device &>(*device).drq_handler().set(m_dart, FUNC(z80dart_device::dcda_w)); // only if JMP8 shorted
});
}

8
src/mame/drivers/emax.cpp
View File

@ -11,7 +11,7 @@
#include "cpu/ns32000/ns32000.h"
#include "machine/6850acia.h"
#include "machine/eepromser.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
#include "machine/pit8253.h"
#include "machine/wd_fdc.h"
#include "video/hd44780.h"
@ -56,7 +56,7 @@ private:
required_device<cpu_device> m_maincpu;
required_device<pit8254_device> m_ctc;
required_device<wd1772_device> m_fdc;
optional_device<ncr5380n_device> m_hdc;
optional_device<ncr5380_device> m_hdc;
required_device<hd44780_device> m_lcdc;
};
@ -157,7 +157,7 @@ void emax_state::emax2_map(address_map &map)
map(0x0b0002, 0x0b0002).r(m_lcdc, FUNC(hd44780_device::control_r));
map(0x0b0004, 0x0b0004).w(m_lcdc, FUNC(hd44780_device::data_w));
map(0x0b0006, 0x0b0006).r(m_lcdc, FUNC(hd44780_device::data_r));
map(0x1f8000, 0x1f800f).rw(m_hdc, FUNC(ncr5380n_device::read), FUNC(ncr5380n_device::write)).umask16(0x00ff);
map(0x1f8000, 0x1f800f).rw(m_hdc, FUNC(ncr5380_device::read), FUNC(ncr5380_device::write)).umask16(0x00ff);
map(0x3f8000, 0x3f8007).rw(m_ctc, FUNC(pit8254_device::read), FUNC(pit8254_device::write)).umask16(0x00ff);
map(0x8e8000, 0x8e82ff).ram();
map(0xae2000, 0xae2000).w(m_fdc, FUNC(wd1772_device::cmd_w));
@ -193,7 +193,7 @@ void emax_state::scsihd(machine_config &config)
NSCSI_CONNECTOR(config, "scsi:4", default_scsi_devices, nullptr, false);
NSCSI_CONNECTOR(config, "scsi:5", default_scsi_devices, nullptr, false);
NSCSI_CONNECTOR(config, "scsi:6", default_scsi_devices, "harddisk", false);
NSCSI_CONNECTOR(config, "scsi:7").option_set("hdc", NCR5380N);
NSCSI_CONNECTOR(config, "scsi:7").option_set("hdc", NCR5380);
}
void emax_state::emax(machine_config &config)

12
src/mame/drivers/emu3.cpp
View File

@ -19,7 +19,7 @@
#include "machine/pit8253.h"
#include "machine/wd_fdc.h"
#include "machine/z80scc.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
#include "machine/6850acia.h"
#include "machine/clock.h"
@ -75,7 +75,7 @@ private:
required_device<hd44780_device> m_lcdc;
required_device<wd1772_device> m_fdc;
required_device<floppy_image_device> m_fdd;
required_device<ncr5380n_device> m_hdc;
required_device<ncr5380_device> m_hdc;
required_device<pit8254_device> m_pit;
required_device<z80scc_device> m_scc;
optional_device<acia6850_device> m_ddt;
@ -144,8 +144,8 @@ void emu3_state::emu3_map(address_map &map)
{
map(0x000000, 0x007fff).rom().region("bootprom", 0);
map(0x008000, 0x027fff).ram();
map(0x2c0000, 0x2c0000).rw(m_hdc, FUNC(ncr5380n_device::dma_r), FUNC(ncr5380n_device::dma_w));
map(0x300000, 0x30000f).rw(m_hdc, FUNC(ncr5380n_device::read), FUNC(ncr5380n_device::write)).umask16(0x00ff);
map(0x2c0000, 0x2c0000).rw(m_hdc, FUNC(ncr5380_device::dma_r), FUNC(ncr5380_device::dma_w));
map(0x300000, 0x30000f).rw(m_hdc, FUNC(ncr5380_device::read), FUNC(ncr5380_device::write)).umask16(0x00ff);
map(0x390000, 0x390007).rw(m_pit, FUNC(pit8254_device::read), FUNC(pit8254_device::write)).umask16(0x00ff);
map(0x400000, 0xbfffff).ram();
@ -230,10 +230,10 @@ void emu3_state::emu3(machine_config &config)
NSCSI_BUS(config, "scsi");
// scsi host adapter
NSCSI_CONNECTOR(config, "scsi:0").option_set("ncr5380", NCR5380N).machine_config(
NSCSI_CONNECTOR(config, "scsi:0").option_set("ncr5380", NCR5380).machine_config(
[this](device_t *device)
{
ncr5380n_device &adapter = downcast<ncr5380n_device &>(*device);
ncr5380_device &adapter = downcast<ncr5380_device &>(*device);
adapter.irq_handler().set(*this, FUNC(emu3_state::irq_w<HDINT>));
});

2
src/mame/drivers/korgdss1.cpp
View File

@ -16,7 +16,7 @@
#include "machine/gen_latch.h"
#include "machine/i8155.h"
#include "machine/i8255.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
#include "machine/nscsi_bus.h"
#include "machine/pit8253.h"
#include "machine/upd765.h"

2
src/mame/drivers/krz2000.cpp
View File

@ -23,7 +23,7 @@
#include "machine/tmp68301.h"
#include "machine/bankdev.h"
#include "machine/upd765.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
#include "video/t6963c.h"

14
src/mame/drivers/lb186.cpp
View File

@ -7,7 +7,7 @@
#include "machine/mc68681.h"
#include "bus/nscsi/hd.h"
#include "bus/rs232/rs232.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
#include "imagedev/floppy.h"
#include "formats/pc_dsk.h"
#include "formats/naslite_dsk.h"
@ -35,7 +35,7 @@ private:
required_device<i80186_cpu_device> m_maincpu;
required_device<wd1772_device> m_fdc;
required_device<ncr5380n_device> m_scsi;
required_device<ncr5380_device> m_scsi;
};
void lb186_state::sio_out_w(uint8_t data)
@ -88,9 +88,9 @@ void lb186_state::lb186_io(address_map &map)
{
map.unmap_value_high();
map(0x1000, 0x101f).rw("duart", FUNC(scn2681_device::read), FUNC(scn2681_device::write)).umask16(0x00ff);
map(0x1080, 0x108f).rw(m_scsi, FUNC(ncr5380n_device::read), FUNC(ncr5380n_device::write)).umask16(0x00ff);
map(0x1080, 0x108f).rw(m_scsi, FUNC(ncr5380_device::read), FUNC(ncr5380_device::write)).umask16(0x00ff);
map(0x1100, 0x1107).rw(m_fdc, FUNC(wd1772_device::read), FUNC(wd1772_device::write)).umask16(0x00ff);
map(0x1180, 0x1180).rw(m_scsi, FUNC(ncr5380n_device::dma_r), FUNC(ncr5380n_device::dma_w));
map(0x1180, 0x1180).rw(m_scsi, FUNC(ncr5380_device::dma_r), FUNC(ncr5380_device::dma_w));
map(0x1200, 0x1200).w(FUNC(lb186_state::drive_sel_w));
}
@ -103,14 +103,14 @@ void lb186_state::ncr5380(device_t *device)
{
devcb_base *devcb;
(void)devcb;
downcast<ncr5380n_device &>(*device).irq_handler().set(":maincpu", FUNC(i80186_cpu_device::int1_w));
downcast<ncr5380n_device &>(*device).drq_handler().set(":maincpu", FUNC(i80186_cpu_device::drq0_w));
downcast<ncr5380_device &>(*device).irq_handler().set(":maincpu", FUNC(i80186_cpu_device::int1_w));
downcast<ncr5380_device &>(*device).drq_handler().set(":maincpu", FUNC(i80186_cpu_device::drq0_w));
}
static void scsi_devices(device_slot_interface &device)
{
device.option_add("harddisk", NSCSI_HARDDISK);
device.option_add_internal("ncr5380", NCR5380N);
device.option_add_internal("ncr5380", NCR5380);
}
void lb186_state::floppy_formats(format_registration &fr)

2
src/mame/drivers/lbpc.cpp
View File

@ -24,7 +24,7 @@
#include "formats/pc_dsk.h"
#include "imagedev/floppy.h"
#include "machine/ins8250.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
#include "machine/upd765.h"
#include "sound/spkrdev.h"
#include "softlist_dev.h"

38
src/mame/drivers/mac128.cpp
View File

@ -92,7 +92,7 @@ Scanline 0 is the start of vblank.
#include "machine/6522via.h"
#include "machine/iwm.h"
#include "machine/swim1.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
#include "machine/nscsi_bus.h"
#include "machine/rescap.h"
#include "bus/nscsi/devices.h"
@ -137,7 +137,7 @@ public:
m_ram(*this, RAM_TAG),
m_scsibus(*this, "scsibus"),
m_scsihelp(*this, "scsihelp"),
m_ncr5380n(*this, "scsibus:7:ncr5380n"),
m_ncr5380(*this, "scsibus:7:ncr5380"),
m_iwm(*this, "fdc"),
m_floppy(*this, "fdc:%d", 0U),
m_mackbd(*this, "kbd"),
@ -173,7 +173,7 @@ private:
required_device<ram_device> m_ram;
optional_device<nscsi_bus_device> m_scsibus;
optional_device<mac_scsi_helper_device> m_scsihelp;
optional_device<ncr5380n_device> m_ncr5380n;
optional_device<ncr5380_device> m_ncr5380;
required_device<applefdintf_device> m_iwm;
required_device_array<floppy_connector, 2> m_floppy;
optional_device<mac_keyboard_port_device> m_mackbd;
@ -631,18 +631,18 @@ uint16_t mac128_state::macplus_scsi_r(offs_t offset, uint16_t mem_mask)
{
if ((offset >= 0x100) && (m_scsi_drq))
{
return m_ncr5380n->dma_r();
return m_ncr5380->dma_r();
}
return m_ncr5380n->read(reg);
return m_ncr5380->read(reg);
}
if ((offset >= 0x100) && (m_scsi_drq))
{
return u16(m_ncr5380n->dma_r()) << 8;
return u16(m_ncr5380->dma_r()) << 8;
}
return u16(m_ncr5380n->read(reg)) << 8;
return u16(m_ncr5380->read(reg)) << 8;
}
void mac128_state::macplus_scsi_w(offs_t offset, uint16_t data, uint16_t mem_mask)
@ -654,10 +654,10 @@ void mac128_state::macplus_scsi_w(offs_t offset, uint16_t data, uint16_t mem_mas
// here we can take advantage of 68000 byte smearing
if ((offset >= 0x100) && (m_scsi_drq))
{
m_ncr5380n->dma_w(data & 0xff);
m_ncr5380->dma_w(data & 0xff);
}
m_ncr5380n->write(reg, data & 0xff);
m_ncr5380->write(reg, data & 0xff);
}
uint16_t mac128_state::macse_scsi_r(offs_t offset, uint16_t mem_mask)
@ -1219,8 +1219,8 @@ void mac128_state::macplus(machine_config &config)
NSCSI_CONNECTOR(config, "scsibus:4", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsibus:5", mac_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsibus:6", mac_scsi_devices, "harddisk");
NSCSI_CONNECTOR(config, "scsibus:7").option_set("ncr5380n", NCR5380N).machine_config([this](device_t *device) {
ncr5380n_device &adapter = downcast<ncr5380n_device &>(*device);
NSCSI_CONNECTOR(config, "scsibus:7").option_set("ncr5380", NCR5380).machine_config([this](device_t *device) {
ncr5380_device &adapter = downcast<ncr5380_device &>(*device);
adapter.irq_handler().set(*this, FUNC(mac128_state::scsi_irq_w));
adapter.drq_handler().set(*this, FUNC(mac128_state::scsi_drq_w));
});
@ -1251,15 +1251,15 @@ void mac128_state::macse(machine_config &config)
applefdintf_device::add_35(config, m_floppy[1]);
MAC_SCSI_HELPER(config, m_scsihelp);
m_scsihelp->scsi_read_callback().set(m_ncr5380n, FUNC(ncr5380n_device::read));
m_scsihelp->scsi_write_callback().set(m_ncr5380n, FUNC(ncr5380n_device::write));
m_scsihelp->scsi_dma_read_callback().set(m_ncr5380n, FUNC(ncr5380n_device::dma_r));
m_scsihelp->scsi_dma_write_callback().set(m_ncr5380n, FUNC(ncr5380n_device::dma_w));
m_scsihelp->scsi_read_callback().set(m_ncr5380, FUNC(ncr5380_device::read));
m_scsihelp->scsi_write_callback().set(m_ncr5380, FUNC(ncr5380_device::write));
m_scsihelp->scsi_dma_read_callback().set(m_ncr5380, FUNC(ncr5380_device::dma_r));
m_scsihelp->scsi_dma_write_callback().set(m_ncr5380, FUNC(ncr5380_device::dma_w));
m_scsihelp->cpu_halt_callback().set_inputline(m_maincpu, INPUT_LINE_HALT);
m_scsihelp->timeout_error_callback().set(FUNC(mac128_state::scsi_berr_w));
subdevice<nscsi_connector>("scsibus:7")->set_option_machine_config("ncr5380n", [this](device_t *device) {
ncr5380n_device &adapter = downcast<ncr5380n_device &>(*device);
subdevice<nscsi_connector>("scsibus:7")->set_option_machine_config("ncr5380", [this](device_t *device) {
ncr5380_device &adapter = downcast<ncr5380_device &>(*device);
adapter.irq_handler().set(*this, FUNC(mac128_state::scsi_irq_w));
adapter.drq_handler().set(m_scsihelp, FUNC(mac_scsi_helper_device::drq_w));
});
@ -1306,8 +1306,8 @@ void mac128_state::macclasc(machine_config &config)
config.device_remove("pds");
config.device_remove("sepds");
NSCSI_CONNECTOR(config.replace(), "scsibus:7").option_set("ncr5380n", NCR53C80).machine_config([this](device_t *device) {
ncr5380n_device &adapter = downcast<ncr5380n_device &>(*device);
NSCSI_CONNECTOR(config.replace(), "scsibus:7").option_set("ncr5380", NCR53C80).machine_config([this](device_t *device) {
ncr5380_device &adapter = downcast<ncr5380_device &>(*device);
adapter.irq_handler().set(*this, FUNC(mac128_state::scsi_irq_w));
adapter.drq_handler().set(m_scsihelp, FUNC(mac_scsi_helper_device::drq_w));
});

2
src/mame/drivers/macprtb.cpp
View File

@ -99,7 +99,7 @@
#include "machine/z80scc.h"
#include "machine/macadb.h"
#include "machine/macscsi.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
#include "machine/nscsi_bus.h"
#include "bus/nscsi/devices.h"
#include "sound/asc.h"

2
src/mame/drivers/macpwrbk030.cpp
View File

@ -107,7 +107,7 @@
#include "machine/z80scc.h"
#include "machine/macadb.h"
#include "machine/macscsi.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
#include "machine/nscsi_bus.h"
#include "bus/nscsi/devices.h"
#include "sound/asc.h"

2
src/mame/drivers/news_38xx.cpp
View File

@ -29,7 +29,7 @@
#include "machine/upd765.h"
#include "machine/dmac_0266.h"
#include "machine/news_hid.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
// video
#include "screen.h"

4
src/mame/drivers/news_68k.cpp
View File

@ -26,7 +26,7 @@
#include "machine/upd765.h"
#include "machine/dmac_0266.h"
#include "machine/news_hid.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
// video
#include "screen.h"
@ -187,7 +187,7 @@ void news_68k_state::cpu_map(address_map &map)
// 0xe0c40000 // centronics
map(0xe0c80000, 0xe0c80003).m(m_fdc, FUNC(upd72067_device::map));
map(0xe0c80100, 0xe0c80100).rw(m_fdc, FUNC(upd72067_device::dma_r), FUNC(upd72067_device::dma_w));
map(0xe0cc0000, 0xe0cc0007).m(m_scsi, FUNC(ncr5380n_device::map));
map(0xe0cc0000, 0xe0cc0007).m(m_scsi, FUNC(ncr5380_device::map));
map(0xe0d00000, 0xe0d00007).m(m_hid, FUNC(news_hid_hle_device::map_68k));
map(0xe0d40000, 0xe0d40003).rw(m_scc, FUNC(z80scc_device::ab_dc_r), FUNC(z80scc_device::ab_dc_w));

16
src/mame/drivers/philipsbo.cpp
View File

@ -13,7 +13,7 @@
#include "machine/am79c90.h"
#include "machine/hd63450.h"
#include "machine/mc68681.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
#include "machine/nscsi_bus.h"
#include "machine/wd_fdc.h"
#include "machine/z80scc.h"
@ -36,7 +36,7 @@ public:
, m_scc(*this, "scc")
, m_rs232(*this, "rs232%u", 0U)
, m_fdc(*this, "fdc")
, m_hdc(*this, "scsi:7:ncr5380n")
, m_hdc(*this, "scsi:7:ncr5380")
, m_dmac(*this, "dmac")
, m_lance(*this, "lance")
, m_main_ram_share(*this, "main_ram")
@ -57,7 +57,7 @@ protected:
required_device<scc85c30_device> m_scc;
required_device_array<rs232_port_device, 2> m_rs232;
required_device<mb8877_device> m_fdc;
required_device<ncr5380n_device> m_hdc;
required_device<ncr5380_device> m_hdc;
required_device<hd63450_device> m_dmac;
required_device<am7990_device> m_lance;
required_shared_ptr<uint16_t> m_main_ram_share;
@ -83,7 +83,7 @@ void pbo_state::main_map(address_map &map)
map(0xfa0000, 0xfa0007).rw(m_fdc, FUNC(mb8877_device::read), FUNC(mb8877_device::write)).umask16(0x00ff);
map(0xfa0011, 0xfa0011).w(FUNC(pbo_state::floppy_select_w));
map(0xfa0030, 0xfa0037).rw(m_scc, FUNC(scc85c30_device::ab_dc_r), FUNC(scc85c30_device::ab_dc_w)).umask16(0x00ff);
map(0xfa8400, 0xfa840f).rw(m_hdc, FUNC(ncr5380n_device::read), FUNC(ncr5380n_device::write)).umask16(0x00ff);
map(0xfa8400, 0xfa840f).rw(m_hdc, FUNC(ncr5380_device::read), FUNC(ncr5380_device::write)).umask16(0x00ff);
map(0xfa0100, 0xfa0101).r(FUNC(pbo_state::fa0101_read)).umask16(0x00ff);
}
@ -220,8 +220,8 @@ void pbo_state::pbo(machine_config &config)
m_dmac->set_clocks(attotime::from_usec(32), attotime::from_nsec(450), attotime::from_usec(4), attotime::from_hz(15625/2)); // Guesses
m_dmac->set_burst_clocks(attotime::from_usec(32), attotime::from_nsec(450), attotime::from_nsec(50), attotime::from_nsec(50)); // Guesses
m_dmac->irq_callback().set(FUNC(pbo_state::dma_irq_w));
//m_dmac->dma_read<0>().set(m_hdc, FUNC(ncr5380n_device::dma_r));
//m_dmac->dma_write<0>().set(m_hdc, FUNC(ncr5380n_device::dma_w));
//m_dmac->dma_read<0>().set(m_hdc, FUNC(ncr5380_device::dma_r));
//m_dmac->dma_write<0>().set(m_hdc, FUNC(ncr5380_device::dma_w));
MB8877(config, m_fdc, 8_MHz_XTAL / 8); // Unknown clock
//m_fdc->set_force_ready(true);
@ -239,10 +239,10 @@ void pbo_state::pbo(machine_config &config)
NSCSI_CONNECTOR(config, "scsi:5", pbo_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi:6", pbo_scsi_devices, nullptr);
NSCSI_CONNECTOR(config, "scsi:7").option_set("ncr5380n", NCR5380N).machine_config(
NSCSI_CONNECTOR(config, "scsi:7").option_set("ncr5380", NCR5380).machine_config(
[this](device_t *device)
{
ncr5380n_device &adapter = downcast<ncr5380n_device &>(*device);
ncr5380_device &adapter = downcast<ncr5380_device &>(*device);
adapter.irq_handler().set(*this, FUNC(pbo_state::scsi_irq_w));
});

10
src/mame/drivers/sun3.cpp
View File

@ -188,7 +188,7 @@ fefc34a - start of mem_size, which queries ECC registers for each memory board
#include "machine/timer.h"
#include "machine/z80scc.h"
#include "machine/am79c90.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
@ -264,7 +264,7 @@ private:
required_device<z80scc_device> m_scc1;
required_device<z80scc_device> m_scc2;
required_device<nscsi_bus_device> m_scsibus;
required_device<ncr5380n_device> m_scsi;
required_device<ncr5380_device> m_scsi;
optional_shared_ptr<uint32_t> m_p_ram;
optional_shared_ptr<uint32_t> m_bw2_vram;
@ -322,14 +322,14 @@ void sun3_state::ncr5380(device_t *device)
{
devcb_base *devcb;
(void)devcb;
// downcast<ncr5380n_device &>(*device).drq_handler().set(FUNC(sun3_state::drq_w));
// downcast<ncr5380_device &>(*device).drq_handler().set(FUNC(sun3_state::drq_w));
}
static void scsi_devices(device_slot_interface &device)
{
device.option_add("cdrom", NSCSI_CDROM);
device.option_add("harddisk", NSCSI_HARDDISK);
device.option_add_internal("ncr5380", NCR5380N);
device.option_add_internal("ncr5380", NCR5380);
device.set_option_machine_config("cdrom", sun_cdrom);
}
@ -789,7 +789,7 @@ void sun3_state::vmetype1space_map(address_map &map)
map(0x000a0000, 0x000a0003).rw(FUNC(sun3_state::irqctrl_r), FUNC(sun3_state::irqctrl_w));
map(0x00100000, 0x0010ffff).rom().region("user1", 0);
map(0x00120000, 0x00120003).rw(m_lance, FUNC(am79c90_device::regs_r), FUNC(am79c90_device::regs_w));
map(0x00140000, 0x00140007).rw(m_scsi, FUNC(ncr5380n_device::read), FUNC(ncr5380n_device::write)).umask32(0xffffffff);
map(0x00140000, 0x00140007).rw(m_scsi, FUNC(ncr5380_device::read), FUNC(ncr5380_device::write)).umask32(0xffffffff);
map(0x001e0000, 0x001e00ff).rw(FUNC(sun3_state::ecc_r), FUNC(sun3_state::ecc_w));
}

2
src/mame/includes/mac.h
View File

@ -14,7 +14,7 @@
#include "machine/8530scc.h"
#include "machine/6522via.h"
#include "machine/ncr5380n.h"
#include "machine/ncr5380.h"
#include "machine/nscsi_bus.h"
#include "machine/ram.h"
#include "machine/timer.h"