diff options
author | 2019-10-23 10:22:17 -0400 | |
---|---|---|
committer | 2019-10-23 10:22:17 -0400 | |
commit | 23a05f7e85d3e17a180302757528e6986c9477cf (patch) | |
tree | b1eefe42c7ba94c30dbc064e698898595f191d6d /scripts | |
parent | 54b3968c741b2e3a3ec3897d7d2947fa55c748a0 (diff) |
Move IDE devices into bus/ata (nw) (#5756)
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/src/bus.lua | 30 | ||||
-rw-r--r-- | scripts/src/machine.lua | 34 | ||||
-rw-r--r-- | scripts/target/mame/arcade.lua | 3 | ||||
-rw-r--r-- | scripts/target/mame/mess.lua | 3 |
4 files changed, 38 insertions, 32 deletions
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 @@ -282,6 +282,36 @@ 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", @@ -915,18 +914,6 @@ 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 diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index d3e8e3a1d4c..a00aaeb668c 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -480,7 +480,7 @@ MACHINES["I8255"] = true --MACHINES["I8271"] = true MACHINES["I8279"] = true MACHINES["I8355"] = true -MACHINES["IDE"] = true +MACHINES["IDECTRL"] = true MACHINES["IE15"] = true MACHINES["IM6402"] = true MACHINES["INS8154"] = true @@ -703,6 +703,7 @@ MACHINES["VRENDER0"] = true BUSES["AMIGA_KEYBOARD"] = true --BUSES["ARCADIA"] = true --BUSES["ASTROCADE"] = true +BUSES["ATA"] = true --BUSES["BML3"] = true --BUSES["BW2"] = true --BUSES["C64"] = true diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index fa3b1e175ed..79313910ef1 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -493,7 +493,7 @@ MACHINES["I8271"] = true MACHINES["I8279"] = true MACHINES["I8291A"] = true MACHINES["I8355"] = true -MACHINES["IDE"] = true +MACHINES["IDECTRL"] = true MACHINES["IE15"] = true MACHINES["IM6402"] = true MACHINES["INS8154"] = true @@ -746,6 +746,7 @@ BUSES["APRICOT_KEYBOARD"] = true BUSES["AMIGA_KEYBOARD"] = true BUSES["ARCADIA"] = true BUSES["ASTROCADE"] = true +BUSES["ATA"] = true BUSES["BBC_FDC"] = true BUSES["BBC_ANALOGUE"] = true BUSES["BBC_EXP"] = true |