From 23a05f7e85d3e17a180302757528e6986c9477cf Mon Sep 17 00:00:00 2001 From: ajrhacker Date: Wed, 23 Oct 2019 10:22:17 -0400 Subject: Move IDE devices into bus/ata (nw) (#5756) --- scripts/src/bus.lua | 30 ++++++++++++++++++++++++++++++ scripts/src/machine.lua | 34 ++++------------------------------ 2 files changed, 34 insertions(+), 30 deletions(-) (limited to 'scripts/src') diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 46d11bfdb81..5d57448facb 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -280,6 +280,36 @@ if (BUSES["ASTROCADE"]~=null) then end +--------------------------------------------------- +-- +--@src/devices/bus/ata/atadev.h,BUSES["ATA"] = true +--@src/devices/bus/ata/ataintf.h,BUSES["ATA"] = true +--------------------------------------------------- + +if (MACHINES["ATAFLASH"]~=null) then + BUSES["ATA"] = true +end + +if (BUSES["ATA"]~=null) then + files { + MAME_DIR .. "src/devices/bus/ata/atadev.cpp", + MAME_DIR .. "src/devices/bus/ata/atadev.h", + MAME_DIR .. "src/devices/bus/ata/atahle.cpp", + MAME_DIR .. "src/devices/bus/ata/atahle.h", + MAME_DIR .. "src/devices/bus/ata/ataintf.cpp", + MAME_DIR .. "src/devices/bus/ata/ataintf.h", + MAME_DIR .. "src/devices/bus/ata/atapicdr.cpp", + MAME_DIR .. "src/devices/bus/ata/atapicdr.h", + MAME_DIR .. "src/devices/bus/ata/atapihle.cpp", + MAME_DIR .. "src/devices/bus/ata/atapihle.h", + MAME_DIR .. "src/devices/bus/ata/cr589.cpp", + MAME_DIR .. "src/devices/bus/ata/cr589.h", + MAME_DIR .. "src/devices/bus/ata/idehd.cpp", + MAME_DIR .. "src/devices/bus/ata/idehd.h", + } +end + + --------------------------------------------------- -- --@src/devices/bus/bbc/fdc/fdc.h,BUSES["BBC_FDC"] = true diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index 27a5069ce51..63b16b28c0f 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -795,7 +795,6 @@ end --------------------------------------------------- if (MACHINES["ATAFLASH"]~=null) then - MACHINES["IDE"] = true MACHINES["PCCARD"] = true files { MAME_DIR .. "src/devices/machine/ataflash.cpp", @@ -913,18 +912,6 @@ if (MACHINES["COM8116"]~=null) then } end ---------------------------------------------------- --- ---@src/devices/machine/cr589.h,MACHINES["CR589"] = true ---------------------------------------------------- - -if (MACHINES["CR589"]~=null) then - files { - MAME_DIR .. "src/devices/machine/cr589.cpp", - MAME_DIR .. "src/devices/machine/cr589.h", - } -end - --------------------------------------------------- -- --@src/devices/machine/cs4031.h,MACHINES["CS4031"] = true @@ -1436,27 +1423,14 @@ end --------------------------------------------------- -- ---@src/devices/machine/atadev.h,MACHINES["IDE"] = true ---@src/devices/machine/ataintf.h,MACHINES["IDE"] = true +--@src/devices/machine/idectrl.h,MACHINES["IDECTRL"] = true +--@src/devices/machine/vt83c461.h,MACHINES["IDECTRL"] = true --------------------------------------------------- -if (MACHINES["IDE"]~=null) then - MACHINES["T10"] = true +if (MACHINES["IDECTRL"]~=null) then files { - MAME_DIR .. "src/devices/machine/atadev.cpp", - MAME_DIR .. "src/devices/machine/atadev.h", - MAME_DIR .. "src/devices/machine/atahle.cpp", - MAME_DIR .. "src/devices/machine/atahle.h", - MAME_DIR .. "src/devices/machine/ataintf.cpp", - MAME_DIR .. "src/devices/machine/ataintf.h", - MAME_DIR .. "src/devices/machine/atapicdr.cpp", - MAME_DIR .. "src/devices/machine/atapicdr.h", - MAME_DIR .. "src/devices/machine/atapihle.cpp", - MAME_DIR .. "src/devices/machine/atapihle.h", MAME_DIR .. "src/devices/machine/idectrl.cpp", MAME_DIR .. "src/devices/machine/idectrl.h", - MAME_DIR .. "src/devices/machine/idehd.cpp", - MAME_DIR .. "src/devices/machine/idehd.h", MAME_DIR .. "src/devices/machine/vt83c461.cpp", MAME_DIR .. "src/devices/machine/vt83c461.h", } @@ -2842,7 +2816,7 @@ end -- --------------------------------------------------- -if (BUSES["SCSI"]~=null) then +if (BUSES["IDE"]~=null) or (BUSES["SCSI"]~=null) then MACHINES["T10"] = true end -- cgit v1.2.3