summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/bus.lua
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /scripts/src/bus.lua
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'scripts/src/bus.lua')
-rw-r--r--scripts/src/bus.lua184
1 files changed, 19 insertions, 165 deletions
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 14130a37ae7..a80e2f6e127 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -209,8 +209,6 @@ if (BUSES["APRICOT_EXPANSION"]~=null) then
MAME_DIR .. "src/devices/bus/apricot/expansion/cards.h",
MAME_DIR .. "src/devices/bus/apricot/expansion/ram.cpp",
MAME_DIR .. "src/devices/bus/apricot/expansion/ram.h",
- MAME_DIR .. "src/devices/bus/apricot/expansion/winchester.cpp",
- MAME_DIR .. "src/devices/bus/apricot/expansion/winchester.h",
}
end
@@ -260,16 +258,6 @@ if (BUSES["ASTROCADE"]~=null) then
MAME_DIR .. "src/devices/bus/astrocde/exp.h",
MAME_DIR .. "src/devices/bus/astrocde/ram.cpp",
MAME_DIR .. "src/devices/bus/astrocde/ram.h",
- MAME_DIR .. "src/devices/bus/astrocde/ctrl.cpp",
- MAME_DIR .. "src/devices/bus/astrocde/ctrl.h",
- MAME_DIR .. "src/devices/bus/astrocde/joy.cpp",
- MAME_DIR .. "src/devices/bus/astrocde/joy.h",
- MAME_DIR .. "src/devices/bus/astrocde/cassette.cpp",
- MAME_DIR .. "src/devices/bus/astrocde/cassette.h",
- MAME_DIR .. "src/devices/bus/astrocde/accessory.cpp",
- MAME_DIR .. "src/devices/bus/astrocde/accessory.h",
- MAME_DIR .. "src/devices/bus/astrocde/lightpen.cpp",
- MAME_DIR .. "src/devices/bus/astrocde/lightpen.h",
}
end
@@ -369,8 +357,6 @@ if (BUSES["BBC_1MHZBUS"]~=null) then
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/m2000.h",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/opus3.cpp",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/opus3.h",
- MAME_DIR .. "src/devices/bus/bbc/1mhzbus/sprite.cpp",
- MAME_DIR .. "src/devices/bus/bbc/1mhzbus/sprite.h",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/cfa3000opt.cpp",
MAME_DIR .. "src/devices/bus/bbc/1mhzbus/cfa3000opt.h",
}
@@ -379,29 +365,6 @@ end
---------------------------------------------------
--
---@src/devices/bus/bbc/rom/slot.h,BUSES["BBC_ROM"] = true
----------------------------------------------------
-
-if (BUSES["BBC_ROM"]~=null) then
- files {
- MAME_DIR .. "src/devices/bus/bbc/rom/slot.cpp",
- MAME_DIR .. "src/devices/bus/bbc/rom/slot.h",
- MAME_DIR .. "src/devices/bus/bbc/rom/rom.cpp",
- MAME_DIR .. "src/devices/bus/bbc/rom/rom.h",
- MAME_DIR .. "src/devices/bus/bbc/rom/ram.cpp",
- MAME_DIR .. "src/devices/bus/bbc/rom/ram.h",
- MAME_DIR .. "src/devices/bus/bbc/rom/dfs.cpp",
- MAME_DIR .. "src/devices/bus/bbc/rom/dfs.h",
- MAME_DIR .. "src/devices/bus/bbc/rom/pal.cpp",
- MAME_DIR .. "src/devices/bus/bbc/rom/pal.h",
- MAME_DIR .. "src/devices/bus/bbc/rom/rtc.cpp",
- MAME_DIR .. "src/devices/bus/bbc/rom/rtc.h",
- }
-end
-
-
----------------------------------------------------
---
--@src/devices/bus/bbc/tube/tube.h,BUSES["BBC_TUBE"] = true
---------------------------------------------------
@@ -409,8 +372,6 @@ if (BUSES["BBC_TUBE"]~=null) then
files {
MAME_DIR .. "src/devices/bus/bbc/tube/tube.cpp",
MAME_DIR .. "src/devices/bus/bbc/tube/tube.h",
- MAME_DIR .. "src/devices/bus/bbc/tube/tube_32016.cpp",
- MAME_DIR .. "src/devices/bus/bbc/tube/tube_32016.h",
MAME_DIR .. "src/devices/bus/bbc/tube/tube_6502.cpp",
MAME_DIR .. "src/devices/bus/bbc/tube/tube_6502.h",
MAME_DIR .. "src/devices/bus/bbc/tube/tube_80186.cpp",
@@ -728,34 +689,24 @@ end
---------------------------------------------------
--
---@src/devices/bus/coleco/controller/ctrl.h,BUSES["COLECO_CONTROLLER"] = true
+--@src/devices/bus/coleco/ctrl.h,BUSES["COLECO"] = true
+--@src/devices/bus/coleco/exp.h,BUSES["COLECO"] = true
---------------------------------------------------
-if (BUSES["COLECO_CONTROLLER"]~=null) then
+if (BUSES["COLECO"]~=null) then
files {
- MAME_DIR .. "src/devices/bus/coleco/controller/ctrl.cpp",
- MAME_DIR .. "src/devices/bus/coleco/controller/ctrl.h",
- MAME_DIR .. "src/devices/bus/coleco/controller/hand.cpp",
- MAME_DIR .. "src/devices/bus/coleco/controller/hand.h",
- MAME_DIR .. "src/devices/bus/coleco/controller/sac.cpp",
- MAME_DIR .. "src/devices/bus/coleco/controller/sac.h",
- }
-end
-
-
----------------------------------------------------
---
---@src/devices/bus/coleco/exp.h,BUSES["COLECO_CART"] = true
----------------------------------------------------
-
-if (BUSES["COLECO_CART"]~=null) then
- files {
- MAME_DIR .. "src/devices/bus/coleco/cartridge/exp.cpp",
- MAME_DIR .. "src/devices/bus/coleco/cartridge/exp.h",
- MAME_DIR .. "src/devices/bus/coleco/cartridge/std.cpp",
- MAME_DIR .. "src/devices/bus/coleco/cartridge/std.h",
- MAME_DIR .. "src/devices/bus/coleco/cartridge/xin1.h",
- MAME_DIR .. "src/devices/bus/coleco/cartridge/xin1.cpp",
+ MAME_DIR .. "src/devices/bus/coleco/ctrl.cpp",
+ MAME_DIR .. "src/devices/bus/coleco/ctrl.h",
+ MAME_DIR .. "src/devices/bus/coleco/hand.cpp",
+ MAME_DIR .. "src/devices/bus/coleco/hand.h",
+ MAME_DIR .. "src/devices/bus/coleco/sac.cpp",
+ MAME_DIR .. "src/devices/bus/coleco/sac.h",
+ MAME_DIR .. "src/devices/bus/coleco/exp.cpp",
+ MAME_DIR .. "src/devices/bus/coleco/exp.h",
+ MAME_DIR .. "src/devices/bus/coleco/std.cpp",
+ MAME_DIR .. "src/devices/bus/coleco/std.h",
+ MAME_DIR .. "src/devices/bus/coleco/xin1.h",
+ MAME_DIR .. "src/devices/bus/coleco/xin1.cpp",
}
end
@@ -860,8 +811,6 @@ if (BUSES["ELECTRON"]~=null) then
MAME_DIR .. "src/devices/bus/electron/fbjoy.h",
MAME_DIR .. "src/devices/bus/electron/plus1.cpp",
MAME_DIR .. "src/devices/bus/electron/plus1.h",
- MAME_DIR .. "src/devices/bus/electron/plus2.cpp",
- MAME_DIR .. "src/devices/bus/electron/plus2.h",
MAME_DIR .. "src/devices/bus/electron/plus3.cpp",
MAME_DIR .. "src/devices/bus/electron/plus3.h",
MAME_DIR .. "src/devices/bus/electron/pwrjoy.cpp",
@@ -889,8 +838,6 @@ if (BUSES["ELECTRON_CART"]~=null) then
MAME_DIR .. "src/devices/bus/electron/cart/abr.h",
MAME_DIR .. "src/devices/bus/electron/cart/ap34.cpp",
MAME_DIR .. "src/devices/bus/electron/cart/ap34.h",
- MAME_DIR .. "src/devices/bus/electron/cart/ap5.cpp",
- MAME_DIR .. "src/devices/bus/electron/cart/ap5.h",
MAME_DIR .. "src/devices/bus/electron/cart/aqr.cpp",
MAME_DIR .. "src/devices/bus/electron/cart/aqr.h",
MAME_DIR .. "src/devices/bus/electron/cart/click.cpp",
@@ -901,8 +848,6 @@ if (BUSES["ELECTRON_CART"]~=null) then
MAME_DIR .. "src/devices/bus/electron/cart/mgc.h",
MAME_DIR .. "src/devices/bus/electron/cart/peg400.cpp",
MAME_DIR .. "src/devices/bus/electron/cart/peg400.h",
- MAME_DIR .. "src/devices/bus/electron/cart/romp144.cpp",
- MAME_DIR .. "src/devices/bus/electron/cart/romp144.h",
MAME_DIR .. "src/devices/bus/electron/cart/sndexp.cpp",
MAME_DIR .. "src/devices/bus/electron/cart/sndexp.h",
MAME_DIR .. "src/devices/bus/electron/cart/sndexp3.cpp",
@@ -913,8 +858,6 @@ if (BUSES["ELECTRON_CART"]~=null) then
MAME_DIR .. "src/devices/bus/electron/cart/std.h",
MAME_DIR .. "src/devices/bus/electron/cart/stlefs.cpp",
MAME_DIR .. "src/devices/bus/electron/cart/stlefs.h",
- MAME_DIR .. "src/devices/bus/electron/cart/tube.cpp",
- MAME_DIR .. "src/devices/bus/electron/cart/tube.h",
}
end
@@ -1218,8 +1161,6 @@ if (BUSES["ISA"]~=null) then
MAME_DIR .. "src/devices/bus/isa/hdc.h",
MAME_DIR .. "src/devices/bus/isa/ibm_mfc.cpp",
MAME_DIR .. "src/devices/bus/isa/ibm_mfc.h",
- MAME_DIR .. "src/devices/bus/isa/cl_sh260.cpp",
- MAME_DIR .. "src/devices/bus/isa/cl_sh260.h",
MAME_DIR .. "src/devices/bus/isa/mpu401.cpp",
MAME_DIR .. "src/devices/bus/isa/mpu401.h",
MAME_DIR .. "src/devices/bus/isa/sblaster.cpp",
@@ -1234,12 +1175,8 @@ if (BUSES["ISA"]~=null) then
MAME_DIR .. "src/devices/bus/isa/xtide.h",
MAME_DIR .. "src/devices/bus/isa/side116.cpp",
MAME_DIR .. "src/devices/bus/isa/side116.h",
- MAME_DIR .. "src/devices/bus/isa/aha1542b.cpp",
- MAME_DIR .. "src/devices/bus/isa/aha1542b.h",
- MAME_DIR .. "src/devices/bus/isa/aha1542c.cpp",
- MAME_DIR .. "src/devices/bus/isa/aha1542c.h",
- MAME_DIR .. "src/devices/bus/isa/aha174x.cpp",
- MAME_DIR .. "src/devices/bus/isa/aha174x.h",
+ MAME_DIR .. "src/devices/bus/isa/aha1542.cpp",
+ MAME_DIR .. "src/devices/bus/isa/aha1542.h",
MAME_DIR .. "src/devices/bus/isa/wd1002a_wx1.cpp",
MAME_DIR .. "src/devices/bus/isa/wd1002a_wx1.h",
MAME_DIR .. "src/devices/bus/isa/wd1007a.cpp",
@@ -1314,12 +1251,6 @@ if (BUSES["ISA"]~=null) then
MAME_DIR .. "src/devices/bus/isa/eis_sad8852.h",
MAME_DIR .. "src/devices/bus/isa/lbaenhancer.cpp",
MAME_DIR .. "src/devices/bus/isa/lbaenhancer.h",
- MAME_DIR .. "src/devices/bus/isa/np600.cpp",
- MAME_DIR .. "src/devices/bus/isa/np600.h",
- MAME_DIR .. "src/devices/bus/isa/bt54x.cpp",
- MAME_DIR .. "src/devices/bus/isa/bt54x.h",
- MAME_DIR .. "src/devices/bus/isa/dcb.cpp",
- MAME_DIR .. "src/devices/bus/isa/dcb.h",
}
end
@@ -1339,19 +1270,6 @@ if (BUSES["ISBX"]~=null) then
}
end
----------------------------------------------------
---
---@src/devices/bus/jakks_gamekey/slot.h,BUSES["JAKKS_GAMEKEY"] = true
----------------------------------------------------
-
-if (BUSES["JAKKS_GAMEKEY"]~=null) then
- files {
- MAME_DIR .. "src/devices/bus/jakks_gamekey/slot.cpp",
- MAME_DIR .. "src/devices/bus/jakks_gamekey/slot.h",
- MAME_DIR .. "src/devices/bus/jakks_gamekey/rom.cpp",
- MAME_DIR .. "src/devices/bus/jakks_gamekey/rom.h",
- }
-end
---------------------------------------------------
--
@@ -1436,21 +1354,6 @@ end
---------------------------------------------------
--
---@src/devices/bus/mtx/exp.h,BUSES["MTX"] = true
----------------------------------------------------
-
-if (BUSES["MTX"]~=null) then
- files {
- MAME_DIR .. "src/devices/bus/mtx/exp.cpp",
- MAME_DIR .. "src/devices/bus/mtx/exp.h",
- MAME_DIR .. "src/devices/bus/mtx/sdx.cpp",
- MAME_DIR .. "src/devices/bus/mtx/sdx.h",
- }
-end
-
-
----------------------------------------------------
---
--@src/devices/bus/kc/kc.h,BUSES["KC"] = true
---------------------------------------------------
@@ -2670,14 +2573,10 @@ if (BUSES["SG1000_EXP"]~=null) then
files {
MAME_DIR .. "src/devices/bus/sg1000_exp/sg1000exp.cpp",
MAME_DIR .. "src/devices/bus/sg1000_exp/sg1000exp.h",
- MAME_DIR .. "src/devices/bus/sg1000_exp/fm_unit.cpp",
- MAME_DIR .. "src/devices/bus/sg1000_exp/fm_unit.h",
MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100.cpp",
MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100.h",
- MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100prn.cpp",
- MAME_DIR .. "src/devices/bus/sg1000_exp/sk1100prn.h",
- MAME_DIR .. "src/devices/bus/sg1000_exp/kblink.cpp",
- MAME_DIR .. "src/devices/bus/sg1000_exp/kblink.h",
+ MAME_DIR .. "src/devices/bus/sg1000_exp/fm_unit.cpp",
+ MAME_DIR .. "src/devices/bus/sg1000_exp/fm_unit.h",
}
end
@@ -3305,8 +3204,6 @@ if (BUSES["SPECTRUM"]~=null) then
files {
MAME_DIR .. "src/devices/bus/spectrum/exp.cpp",
MAME_DIR .. "src/devices/bus/spectrum/exp.h",
- MAME_DIR .. "src/devices/bus/spectrum/beta.cpp",
- MAME_DIR .. "src/devices/bus/spectrum/beta.h",
MAME_DIR .. "src/devices/bus/spectrum/intf1.cpp",
MAME_DIR .. "src/devices/bus/spectrum/intf1.h",
MAME_DIR .. "src/devices/bus/spectrum/intf2.cpp",
@@ -3317,18 +3214,12 @@ if (BUSES["SPECTRUM"]~=null) then
MAME_DIR .. "src/devices/bus/spectrum/kempjoy.h",
MAME_DIR .. "src/devices/bus/spectrum/melodik.cpp",
MAME_DIR .. "src/devices/bus/spectrum/melodik.h",
- MAME_DIR .. "src/devices/bus/spectrum/mface.cpp",
- MAME_DIR .. "src/devices/bus/spectrum/mface.h",
MAME_DIR .. "src/devices/bus/spectrum/mikroplus.cpp",
MAME_DIR .. "src/devices/bus/spectrum/mikroplus.h",
- MAME_DIR .. "src/devices/bus/spectrum/opus.cpp",
- MAME_DIR .. "src/devices/bus/spectrum/opus.h",
MAME_DIR .. "src/devices/bus/spectrum/plus2test.cpp",
MAME_DIR .. "src/devices/bus/spectrum/plus2test.h",
MAME_DIR .. "src/devices/bus/spectrum/protek.cpp",
MAME_DIR .. "src/devices/bus/spectrum/protek.h",
- MAME_DIR .. "src/devices/bus/spectrum/specdrum.cpp",
- MAME_DIR .. "src/devices/bus/spectrum/specdrum.h",
MAME_DIR .. "src/devices/bus/spectrum/uslot.cpp",
MAME_DIR .. "src/devices/bus/spectrum/uslot.h",
MAME_DIR .. "src/devices/bus/spectrum/usource.cpp",
@@ -3340,41 +3231,6 @@ end
---------------------------------------------------
--
---@src/devices/bus/uts_kbd/uts_kbd.h,BUSES["UTS_KBD"] = true
----------------------------------------------------
-
-if (BUSES["UTS_KBD"]~=null) then
- files {
- MAME_DIR .. "src/devices/bus/uts_kbd/400kbd.cpp",
- MAME_DIR .. "src/devices/bus/uts_kbd/400kbd.h",
- MAME_DIR .. "src/devices/bus/uts_kbd/extw.cpp",
- MAME_DIR .. "src/devices/bus/uts_kbd/extw.h",
- MAME_DIR .. "src/devices/bus/uts_kbd/uts_kbd.cpp",
- MAME_DIR .. "src/devices/bus/uts_kbd/uts_kbd.h",
- }
-end
-
----------------------------------------------------
---
---@src/devices/bus/vsmile/vsmile_ctrl.h,BUSES["VSMILE"] = true
---@src/devices/bus/vsmile/vsmile_slot.h,BUSES["VSMILE"] = true
----------------------------------------------------
-
-if (BUSES["VSMILE"]~=null) then
- files {
- MAME_DIR .. "src/devices/bus/vsmile/vsmile_ctrl.cpp",
- MAME_DIR .. "src/devices/bus/vsmile/vsmile_ctrl.h",
- MAME_DIR .. "src/devices/bus/vsmile/pad.cpp",
- MAME_DIR .. "src/devices/bus/vsmile/pad.h",
- MAME_DIR .. "src/devices/bus/vsmile/vsmile_slot.cpp",
- MAME_DIR .. "src/devices/bus/vsmile/vsmile_slot.h",
- MAME_DIR .. "src/devices/bus/vsmile/rom.cpp",
- MAME_DIR .. "src/devices/bus/vsmile/rom.h",
- }
-end
-
----------------------------------------------------
---
--@src/devices/bus/vtech/memexp/memexp.h,BUSES["VTECH_MEMEXP"] = true
---------------------------------------------------
@@ -3641,8 +3497,6 @@ if (BUSES["HP9845_IO"]~=null) then
MAME_DIR .. "src/devices/bus/hp9845_io/98034.h",
MAME_DIR .. "src/devices/bus/hp9845_io/98035.cpp",
MAME_DIR .. "src/devices/bus/hp9845_io/98035.h",
- MAME_DIR .. "src/devices/bus/hp9845_io/hp9885.cpp",
- MAME_DIR .. "src/devices/bus/hp9845_io/hp9885.h",
}
end