Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-26 10:13:37 +03:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

Move modern SCSI CD/HD devices into src/devices/bus/nscsi (nw)

Browse Source
This commit is contained in:
AJR 2019-07-11 14:20:16 -04:00
parent 9050224c2d
commit 60d4805d55
38 changed files with 78 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/src/bus.lua
View File

@ -2140,6 +2140,24 @@ if (BUSES["A2GAMEIO"]~=null) then
}
end
---------------------------------------------------
--
--@src/devices/bus/nscsi/cd.h,BUSES["NSCSI"] = true
--@src/devices/bus/nscsi/hd.h,BUSES["NSCSI"] = true
--@src/devices/bus/nscsi/s1410.h,BUSES["NSCSI"] = true
---------------------------------------------------
if (BUSES["NSCSI"]~=null) then
files {
MAME_DIR .. "src/devices/bus/nscsi/cd.cpp",
MAME_DIR .. "src/devices/bus/nscsi/cd.h",
MAME_DIR .. "src/devices/bus/nscsi/hd.cpp",
MAME_DIR .. "src/devices/bus/nscsi/hd.h",
MAME_DIR .. "src/devices/bus/nscsi/s1410.cpp",
MAME_DIR .. "src/devices/bus/nscsi/s1410.h",
}
end
---------------------------------------------------
--
--@src/devices/bus/nubus/nubus.h,BUSES["NUBUS"] = true

9
scripts/src/machine.lua
View File

@ -2224,9 +2224,6 @@ end
--
--@src/devices/machine/nscsi_bus.h,MACHINES["NSCSI"] = true
--@src/devices/machine/nscsi_cb.h,MACHINES["NSCSI"] = true
--@src/devices/machine/nscsi_cd.h,MACHINES["NSCSI"] = true
--@src/devices/machine/nscsi_hd.h,MACHINES["NSCSI"] = true
--@src/devices/machine/nscsi_s1410.h,MACHINES["NSCSI"] = true
---------------------------------------------------
if (MACHINES["NSCSI"]~=null) then
@ -2235,12 +2232,6 @@ if (MACHINES["NSCSI"]~=null) then
MAME_DIR .. "src/devices/machine/nscsi_bus.h",
MAME_DIR .. "src/devices/machine/nscsi_cb.cpp",
MAME_DIR .. "src/devices/machine/nscsi_cb.h",
MAME_DIR .. "src/devices/machine/nscsi_cd.cpp",
MAME_DIR .. "src/devices/machine/nscsi_cd.h",
MAME_DIR .. "src/devices/machine/nscsi_hd.cpp",
MAME_DIR .. "src/devices/machine/nscsi_hd.h",
MAME_DIR .. "src/devices/machine/nscsi_s1410.cpp",
MAME_DIR .. "src/devices/machine/nscsi_s1410.h",
}
end

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

@ -732,6 +732,7 @@ BUSES["MIDI"] = true
BUSES["NEOGEO"] = true
BUSES["NEOGEO_CTRL"] = true
--BUSES["NES"] = true
BUSES["NSCSI"] = true
--BUSES["NUBUS"] = true
--BUSES["O2"] = true
--BUSES["ORICEXT"] = true

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

@ -808,6 +808,7 @@ BUSES["NEOGEO_CTRL"] = true
BUSES["NES"] = true
BUSES["NES_CTRL"] = true
BUSES["NEWBRAIN"] = true
BUSES["NSCSI"] = true
BUSES["NUBUS"] = true
BUSES["O2"] = true
BUSES["ORICEXT"] = true

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

@ -40,8 +40,8 @@
#include "emu.h"
#include "a2hsscsi.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
/***************************************************************************
PARAMETERS

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

@ -33,8 +33,8 @@
#include "emu.h"
#include "a2scsi.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
/***************************************************************************
PARAMETERS

4
src/devices/bus/amiga/zorro/a590.cpp
View File

@ -11,8 +11,8 @@
#include "emu.h"
#include "a590.h"
#include "machine/nscsi_bus.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
//**************************************************************************

4
src/devices/bus/hp_dio/hp98265a.cpp
View File

@ -10,8 +10,8 @@
#include "hp98265a.h"
#include "machine/nscsi_bus.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
#include "machine/mb87030.h"
#define VERBOSE 0

2
src/devices/bus/isa/aha1542b.cpp
View File

@ -12,10 +12,10 @@
#include "emu.h"
#include "aha1542b.h"
#include "bus/nscsi/hd.h"
#include "cpu/i8085/i8085.h"
#include "machine/gen_latch.h"
#include "machine/nscsi_bus.h"
#include "machine/nscsi_hd.h"
DEFINE_DEVICE_TYPE(AHA1542A, aha1542a_device, "aha1542a", "AHA-1542A SCSI Controller")

2
src/devices/bus/isa/aha174x.cpp
View File

@ -33,10 +33,10 @@
#include "emu.h"
#include "aha174x.h"
#include "bus/nscsi/hd.h"
#include "machine/aic6250.h"
#include "machine/i82355.h"
#include "machine/nscsi_bus.h"
#include "machine/nscsi_hd.h"
DEFINE_DEVICE_TYPE(AHA1740, aha1740_device, "aha1740", "AHA-1740 Fast SCSI Host Adapter")
DEFINE_DEVICE_TYPE(AHA1742A, aha1742a_device, "aha1742a", "AHA-1742A Fast SCSI Host Adapter")

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

@ -16,8 +16,8 @@
#include "emu.h"
#include "asc88.h"
#include "bus/nscsi/hd.h"
#include "machine/nscsi_bus.h"
#include "machine/nscsi_hd.h"
DEFINE_DEVICE_TYPE(ASC88, asc88_device, "asc88", "ASC-88 SCSI Adapter")

4
src/devices/bus/isa/bt54x.cpp
View File

@ -17,10 +17,10 @@
#include "emu.h"
#include "bt54x.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
#include "machine/ncr5390.h"
//#include "machine/ncr86c05.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
DEFINE_DEVICE_TYPE(BT542B, bt542b_device, "bt542b", "BusTek BT-542B SCSI Host Adapter") // Rev. G or earlier
DEFINE_DEVICE_TYPE(BT542BH, bt542bh_device, "bt542bh", "BusLogic BT-542B SCSI Host Adapter (Rev. H)")

2
src/devices/bus/isa/tekram_dc820.cpp
View File

@ -23,11 +23,11 @@
#include "emu.h"
#include "tekram_dc820.h"
#include "bus/nscsi/hd.h"
#include "cpu/i86/i186.h"
#include "machine/i82355.h"
#include "machine/ncr5390.h"
#include "machine/nscsi_bus.h"
#include "machine/nscsi_hd.h"
DEFINE_DEVICE_TYPE(TEKRAM_DC320B, tekram_dc320b_device, "dc320b", "Tekram DC-320B SCSI Controller")
DEFINE_DEVICE_TYPE(TEKRAM_DC320E, tekram_dc320e_device, "dc320e", "Tekram DC-320E SCSI Controller")

2
src/devices/bus/isa/ultra14f.cpp
View File

@ -9,10 +9,10 @@
#include "emu.h"
#include "ultra14f.h"
#include "bus/nscsi/hd.h"
#include "cpu/m68000/m68000.h"
#include "machine/ncr5390.h"
#include "machine/nscsi_bus.h"
#include "machine/nscsi_hd.h"
DEFINE_DEVICE_TYPE(ULTRA14F, ultra14f_device, "ultra14f", "Ultra-14F SCSI Host Adapter")

2
src/devices/bus/isa/ultra24f.cpp
View File

@ -9,10 +9,10 @@
#include "emu.h"
#include "ultra24f.h"
#include "bus/nscsi/hd.h"
#include "cpu/m68000/m68000.h"
#include "machine/ncr5390.h"
#include "machine/nscsi_bus.h"
#include "machine/nscsi_hd.h"
DEFINE_DEVICE_TYPE(ULTRA24F, ultra24f_device, "ultra24f", "Ultra-24F SCSI Host Adapter")

2
src/devices/machine/nscsi_cd.cpp → src/devices/bus/nscsi/cd.cpp
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
#include "emu.h"
#include "machine/nscsi_cd.h"
#include "bus/nscsi/cd.h"
#define VERBOSE 0
#include "logmacro.h"

6
src/devices/machine/nscsi_cd.h → src/devices/bus/nscsi/cd.h
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
#ifndef MAME_MACHINE_NSCSI_CD_H
#define MAME_MACHINE_NSCSI_CD_H
#ifndef MAME_BUS_NSCSI_CD_H
#define MAME_BUS_NSCSI_CD_H
#pragma once
@ -123,4 +123,4 @@ DECLARE_DEVICE_TYPE(NSCSI_XM5701, nscsi_toshiba_xm5701_device)
DECLARE_DEVICE_TYPE(NSCSI_XM5701SUN, nscsi_toshiba_xm5701_sun_device)
DECLARE_DEVICE_TYPE(NSCSI_CDROM_APPLE, nscsi_cdrom_apple_device)
#endif // MAME_MACHINE_NSCSI_CD_H
#endif // MAME_BUS_NSCSI_CD_H

2
src/devices/machine/nscsi_hd.cpp → src/devices/bus/nscsi/hd.cpp
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
#include "emu.h"
#include "machine/nscsi_hd.h"
#include "bus/nscsi/hd.h"
#include "imagedev/harddriv.h"
#define LOG_GENERAL (1U << 0)

6
src/devices/machine/nscsi_hd.h → src/devices/bus/nscsi/hd.h
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
#ifndef MAME_MACHINE_NSCSI_HD_H
#define MAME_MACHINE_NSCSI_HD_H
#ifndef MAME_BUS_NSCSI_HD_H
#define MAME_BUS_NSCSI_HD_H
#pragma once
@ -35,4 +35,4 @@ protected:
DECLARE_DEVICE_TYPE(NSCSI_HARDDISK, nscsi_harddisk_device)
#endif // MAME_MACHINE_NSCSI_HD_H
#endif // MAME_BUS_NSCSI_HD_H

2
src/devices/machine/nscsi_s1410.cpp → src/devices/bus/nscsi/s1410.cpp
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
#include "emu.h"
#include "machine/nscsi_s1410.h"
#include "bus/nscsi/s1410.h"
DEFINE_DEVICE_TYPE(NSCSI_S1410, nscsi_s1410_device, "scsi_s1410", "S1410 Hard Disk")

4
src/devices/machine/nscsi_s1410.h → src/devices/bus/nscsi/s1410.h
View File

@ -6,7 +6,7 @@
#pragma once
#include "machine/nscsi_bus.h"
#include "machine/nscsi_hd.h"
#include "bus/nscsi/hd.h"
class nscsi_s1410_device : public nscsi_harddisk_device
{
@ -75,4 +75,4 @@ protected:
DECLARE_DEVICE_TYPE(NSCSI_S1410, nscsi_s1410_device)
#endif // MAME_MACHINE_NSCSI_S1410_H
#endif // MAME_BUS_NSCSI_S1410_H

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

@ -55,8 +55,8 @@
// buses and connectors
#include "machine/nscsi_bus.h"
#include "machine/nscsi_hd.h"
#include "machine/nscsi_cd.h"
#include "bus/nscsi/hd.h"
#include "bus/nscsi/cd.h"
#include "bus/rs232/rs232.h"
#include "bus/sgikbd/sgikbd.h"
#include "bus/rs232/hlemouse.h"

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

@ -23,8 +23,8 @@ of a hard drive of up to 88MB.
#include "cpu/z80/z80.h"
#include "imagedev/floppy.h"
#include "machine/ncr5380n.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
#include "machine/output_latch.h"
#include "machine/z80daisy.h"
#include "machine/z80ctc.h"

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

@ -464,7 +464,7 @@ hardware modification to the security cart.....
#include "machine/intelfsh.h"
#include "machine/nvram.h"
#include "includes/cps3.h"
#include "machine/nscsi_cd.h"
#include "bus/nscsi/cd.h"
#include "machine/wd33c9x.h"
#include "screen.h"
#include "speaker.h"

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

@ -65,8 +65,8 @@
#include "machine/z80scc.h"
#include "machine/ncr5390.h"
#include "machine/nscsi_bus.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
#include "machine/dec_lk201.h"
#include "machine/am79c90.h"
#include "machine/dc7085.h"

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

@ -64,8 +64,8 @@
#include "machine/hpc3.h"
#include "machine/ioc2.h"
#include "machine/nscsi_bus.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
#include "machine/sgi.h"
#include "machine/vino.h"
#include "machine/wd33c9x.h"

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

@ -24,8 +24,8 @@
#include "machine/bankdev.h"
#include "machine/upd765.h"
#include "machine/ncr5380n.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
#include "video/t6963c.h"
#include "screen.h"
#include "emupal.h"

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

@ -5,8 +5,8 @@
#include "cpu/i86/i186.h"
#include "machine/wd_fdc.h"
#include "machine/mc68681.h"
#include "bus/nscsi/hd.h"
#include "bus/rs232/rs232.h"
#include "machine/nscsi_hd.h"
#include "machine/ncr5380n.h"
#include "imagedev/floppy.h"
#include "formats/pc_dsk.h"

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

@ -28,8 +28,8 @@
#include "emu.h"
#include "includes/next.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
#include "screen.h"
#include "softlist.h"

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

@ -53,8 +53,8 @@
#include "machine/terminal.h"
#include "machine/nscsi_bus.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
#include "machine/wd33c9x.h"

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

@ -16,11 +16,11 @@
****************************************************************************/
#include "emu.h"
#include "bus/nscsi/hd.h"
#include "cpu/i386/i386.h"
#include "cpu/tms32031/tms32031.h"
#include "machine/53c7xx.h"
#include "machine/mc146818.h"
#include "machine/nscsi_hd.h"
#include "machine/nvram.h"
#include "machine/timer.h"
#include "sound/dac.h"

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

@ -189,8 +189,8 @@ fefc34a - start of mem_size, which queries ECC registers for each memory board
#include "machine/z80scc.h"
#include "machine/am79c90.h"
#include "machine/ncr5380n.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
#include "bus/rs232/rs232.h"
#include "bus/sunkbd/sunkbd.h"

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

@ -411,6 +411,8 @@
#include "emu.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
#include "bus/rs232/rs232.h"
#include "bus/sunkbd/sunkbd.h"
#include "bus/sunmouse/sunmouse.h"
@ -422,8 +424,6 @@
#include "machine/bankdev.h"
#include "machine/ncr5390.h"
#include "machine/nscsi_bus.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
#include "machine/nvram.h"
#include "machine/ram.h"
#include "machine/sun4c_mmu.h"

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

@ -16,14 +16,14 @@ Other: LED, 20MHz crystal. Next to the MC68901P is another chip just as large (4
************************************************************************************************************************************/
#include "emu.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
#include "bus/rs232/rs232.h"
#include "cpu/m68000/m68000.h"
#include "machine/74259.h"
#include "machine/eepromser.h"
#include "machine/mc68901.h"
#include "machine/ncr5390.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
class tti_state : public driver_device
{

4
src/mame/includes/interpro.h
View File

@ -24,8 +24,8 @@
#include "machine/ncr5390.h"
#include "machine/nscsi_bus.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
#include "bus/rs232/rs232.h"

4
src/mame/includes/jazz.h
View File

@ -34,8 +34,8 @@
// busses and connectors
#include "machine/nscsi_bus.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
#include "bus/rs232/rs232.h"
#include "bus/pc_kbd/pc_kbdc.h"
#include "bus/pc_kbd/keyboards.h"

4
src/mame/includes/mips.h
View File

@ -29,8 +29,8 @@
// busses and connectors
#include "machine/nscsi_bus.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
#include "bus/pc_kbd/pc_kbdc.h"
#include "bus/pc_kbd/keyboards.h"

4
src/mame/machine/hpc1.cpp
View File

@ -11,8 +11,8 @@
#include "bus/rs232/rs232.h"
#include "bus/rs232/hlemouse.h"
#include "machine/nscsi_bus.h"
#include "machine/nscsi_cd.h"
#include "machine/nscsi_hd.h"
#include "bus/nscsi/cd.h"
#include "bus/nscsi/hd.h"
#include "bus/sgikbd/sgikbd.h"
#include "machine/hpc1.h"
#include "speaker.h"