(MESS) c64: Moved expansion and user ports under emu/bus. (nw)

.gitattributes

@@ -369,6 +369,152 @@ src/emu/bus/adamnet/printer.h svneol=native#text/plain
 src/emu/bus/adamnet/spi.c svneol=native#text/plain
 src/emu/bus/adamnet/spi.h svneol=native#text/plain
 src/emu/bus/bus.mak svneol=native#text/plain
+src/emu/bus/c64/16kb.c svneol=native#text/plain
+src/emu/bus/c64/16kb.h svneol=native#text/plain
+src/emu/bus/c64/4cga.c svneol=native#text/plain
+src/emu/bus/c64/4cga.h svneol=native#text/plain
+src/emu/bus/c64/4dxh.c svneol=native#text/plain
+src/emu/bus/c64/4dxh.h svneol=native#text/plain
+src/emu/bus/c64/4ksa.c svneol=native#text/plain
+src/emu/bus/c64/4ksa.h svneol=native#text/plain
+src/emu/bus/c64/4tba.c svneol=native#text/plain
+src/emu/bus/c64/4tba.h svneol=native#text/plain
+src/emu/bus/c64/bn1541.c svneol=native#text/plain
+src/emu/bus/c64/bn1541.h svneol=native#text/plain
+src/emu/bus/c64/c128_comal80.c svneol=native#text/plain
+src/emu/bus/c64/c128_comal80.h svneol=native#text/plain
+src/emu/bus/c64/comal80.c svneol=native#text/plain
+src/emu/bus/c64/comal80.h svneol=native#text/plain
+src/emu/bus/c64/cpm.c svneol=native#text/plain
+src/emu/bus/c64/cpm.h svneol=native#text/plain
+src/emu/bus/c64/currah_speech.c svneol=native#text/plain
+src/emu/bus/c64/currah_speech.h svneol=native#text/plain
+src/emu/bus/c64/dela_ep256.c svneol=native#text/plain
+src/emu/bus/c64/dela_ep256.h svneol=native#text/plain
+src/emu/bus/c64/dela_ep64.c svneol=native#text/plain
+src/emu/bus/c64/dela_ep64.h svneol=native#text/plain
+src/emu/bus/c64/dela_ep7x8.c svneol=native#text/plain
+src/emu/bus/c64/dela_ep7x8.h svneol=native#text/plain
+src/emu/bus/c64/dinamic.c svneol=native#text/plain
+src/emu/bus/c64/dinamic.h svneol=native#text/plain
+src/emu/bus/c64/dqbb.c svneol=native#text/plain
+src/emu/bus/c64/dqbb.h svneol=native#text/plain
+src/emu/bus/c64/easy_calc_result.c svneol=native#text/plain
+src/emu/bus/c64/easy_calc_result.h svneol=native#text/plain
+src/emu/bus/c64/easyflash.c svneol=native#text/plain
+src/emu/bus/c64/easyflash.h svneol=native#text/plain
+src/emu/bus/c64/epyx_fast_load.c svneol=native#text/plain
+src/emu/bus/c64/epyx_fast_load.h svneol=native#text/plain
+src/emu/bus/c64/exos.c svneol=native#text/plain
+src/emu/bus/c64/exos.h svneol=native#text/plain
+src/emu/bus/c64/exp.c svneol=native#text/plain
+src/emu/bus/c64/exp.h svneol=native#text/plain
+src/emu/bus/c64/fcc.c svneol=native#text/plain
+src/emu/bus/c64/fcc.h svneol=native#text/plain
+src/emu/bus/c64/final.c svneol=native#text/plain
+src/emu/bus/c64/final.h svneol=native#text/plain
+src/emu/bus/c64/final3.c svneol=native#text/plain
+src/emu/bus/c64/final3.h svneol=native#text/plain
+src/emu/bus/c64/fun_play.c svneol=native#text/plain
+src/emu/bus/c64/fun_play.h svneol=native#text/plain
+src/emu/bus/c64/geocable.c svneol=native#text/plain
+src/emu/bus/c64/geocable.h svneol=native#text/plain
+src/emu/bus/c64/georam.c svneol=native#text/plain
+src/emu/bus/c64/georam.h svneol=native#text/plain
+src/emu/bus/c64/ide64.c svneol=native#text/plain
+src/emu/bus/c64/ide64.h svneol=native#text/plain
+src/emu/bus/c64/ieee488.c svneol=native#text/plain
+src/emu/bus/c64/ieee488.h svneol=native#text/plain
+src/emu/bus/c64/kingsoft.c svneol=native#text/plain
+src/emu/bus/c64/kingsoft.h svneol=native#text/plain
+src/emu/bus/c64/mach5.c svneol=native#text/plain
+src/emu/bus/c64/mach5.h svneol=native#text/plain
+src/emu/bus/c64/magic_desk.c svneol=native#text/plain
+src/emu/bus/c64/magic_desk.h svneol=native#text/plain
+src/emu/bus/c64/magic_formel.c svneol=native#text/plain
+src/emu/bus/c64/magic_formel.h svneol=native#text/plain
+src/emu/bus/c64/magic_voice.c svneol=native#text/plain
+src/emu/bus/c64/magic_voice.h svneol=native#text/plain
+src/emu/bus/c64/midi_maplin.c svneol=native#text/plain
+src/emu/bus/c64/midi_maplin.h svneol=native#text/plain
+src/emu/bus/c64/midi_namesoft.c svneol=native#text/plain
+src/emu/bus/c64/midi_namesoft.h svneol=native#text/plain
+src/emu/bus/c64/midi_passport.c svneol=native#text/plain
+src/emu/bus/c64/midi_passport.h svneol=native#text/plain
+src/emu/bus/c64/midi_sci.c svneol=native#text/plain
+src/emu/bus/c64/midi_sci.h svneol=native#text/plain
+src/emu/bus/c64/midi_siel.c svneol=native#text/plain
+src/emu/bus/c64/midi_siel.h svneol=native#text/plain
+src/emu/bus/c64/mikro_assembler.c svneol=native#text/plain
+src/emu/bus/c64/mikro_assembler.h svneol=native#text/plain
+src/emu/bus/c64/multiscreen.c svneol=native#text/plain
+src/emu/bus/c64/multiscreen.h svneol=native#text/plain
+src/emu/bus/c64/music64.c svneol=native#text/plain
+src/emu/bus/c64/music64.h svneol=native#text/plain
+src/emu/bus/c64/neoram.c svneol=native#text/plain
+src/emu/bus/c64/neoram.h svneol=native#text/plain
+src/emu/bus/c64/ocean.c svneol=native#text/plain
+src/emu/bus/c64/ocean.h svneol=native#text/plain
+src/emu/bus/c64/pagefox.c svneol=native#text/plain
+src/emu/bus/c64/pagefox.h svneol=native#text/plain
+src/emu/bus/c64/partner.c svneol=native#text/plain
+src/emu/bus/c64/partner.h svneol=native#text/plain
+src/emu/bus/c64/prophet64.c svneol=native#text/plain
+src/emu/bus/c64/prophet64.h svneol=native#text/plain
+src/emu/bus/c64/ps64.c svneol=native#text/plain
+src/emu/bus/c64/ps64.h svneol=native#text/plain
+src/emu/bus/c64/reu.c svneol=native#text/plain
+src/emu/bus/c64/reu.h svneol=native#text/plain
+src/emu/bus/c64/rex.c svneol=native#text/plain
+src/emu/bus/c64/rex.h svneol=native#text/plain
+src/emu/bus/c64/rex_ep256.c svneol=native#text/plain
+src/emu/bus/c64/rex_ep256.h svneol=native#text/plain
+src/emu/bus/c64/ross.c svneol=native#text/plain
+src/emu/bus/c64/ross.h svneol=native#text/plain
+src/emu/bus/c64/sfx_sound_expander.c svneol=native#text/plain
+src/emu/bus/c64/sfx_sound_expander.h svneol=native#text/plain
+src/emu/bus/c64/silverrock.c svneol=native#text/plain
+src/emu/bus/c64/silverrock.h svneol=native#text/plain
+src/emu/bus/c64/simons_basic.c svneol=native#text/plain
+src/emu/bus/c64/simons_basic.h svneol=native#text/plain
+src/emu/bus/c64/stardos.c svneol=native#text/plain
+src/emu/bus/c64/stardos.h svneol=native#text/plain
+src/emu/bus/c64/std.c svneol=native#text/plain
+src/emu/bus/c64/std.h svneol=native#text/plain
+src/emu/bus/c64/structured_basic.c svneol=native#text/plain
+src/emu/bus/c64/structured_basic.h svneol=native#text/plain
+src/emu/bus/c64/super_explode.c svneol=native#text/plain
+src/emu/bus/c64/super_explode.h svneol=native#text/plain
+src/emu/bus/c64/super_games.c svneol=native#text/plain
+src/emu/bus/c64/super_games.h svneol=native#text/plain
+src/emu/bus/c64/supercpu.c svneol=native#text/plain
+src/emu/bus/c64/supercpu.h svneol=native#text/plain
+src/emu/bus/c64/sw8k.c svneol=native#text/plain
+src/emu/bus/c64/sw8k.h svneol=native#text/plain
+src/emu/bus/c64/swiftlink.c svneol=native#text/plain
+src/emu/bus/c64/swiftlink.h svneol=native#text/plain
+src/emu/bus/c64/system3.c svneol=native#text/plain
+src/emu/bus/c64/system3.h svneol=native#text/plain
+src/emu/bus/c64/tdos.c svneol=native#text/plain
+src/emu/bus/c64/tdos.h svneol=native#text/plain
+src/emu/bus/c64/turbo232.c svneol=native#text/plain
+src/emu/bus/c64/turbo232.h svneol=native#text/plain
+src/emu/bus/c64/user.c svneol=native#text/plain
+src/emu/bus/c64/user.h svneol=native#text/plain
+src/emu/bus/c64/vic1011.c svneol=native#text/plain
+src/emu/bus/c64/vic1011.h svneol=native#text/plain
+src/emu/bus/c64/vizastar.c svneol=native#text/plain
+src/emu/bus/c64/vizastar.h svneol=native#text/plain
+src/emu/bus/c64/vw64.c svneol=native#text/plain
+src/emu/bus/c64/vw64.h svneol=native#text/plain
+src/emu/bus/c64/warp_speed.c svneol=native#text/plain
+src/emu/bus/c64/warp_speed.h svneol=native#text/plain
+src/emu/bus/c64/westermann.c svneol=native#text/plain
+src/emu/bus/c64/westermann.h svneol=native#text/plain
+src/emu/bus/c64/xl80.c svneol=native#text/plain
+src/emu/bus/c64/xl80.h svneol=native#text/plain
+src/emu/bus/c64/zaxxon.c svneol=native#text/plain
+src/emu/bus/c64/zaxxon.h svneol=native#text/plain
 src/emu/bus/cbmiec/c1541.c svneol=native#text/plain
 src/emu/bus/cbmiec/c1541.h svneol=native#text/plain
 src/emu/bus/cbmiec/c1571.c svneol=native#text/plain
@@ -1473,6 +1619,8 @@ src/emu/machine/mos6530.c svneol=native#text/plain
 src/emu/machine/mos6530.h svneol=native#text/plain
 src/emu/machine/mos6551.c svneol=native#text/plain
 src/emu/machine/mos6551.h svneol=native#text/plain
+src/emu/machine/mos8726.c svneol=native#text/plain
+src/emu/machine/mos8726.h svneol=native#text/plain
 src/emu/machine/msm5832.c svneol=native#text/plain
 src/emu/machine/msm5832.h svneol=native#text/plain
 src/emu/machine/msm58321.c svneol=native#text/plain
@@ -7296,156 +7444,10 @@ src/mess/machine/bw2_ramcard.c svneol=native#text/plain
 src/mess/machine/bw2_ramcard.h svneol=native#text/plain
 src/mess/machine/bw2exp.c svneol=native#text/plain
 src/mess/machine/bw2exp.h svneol=native#text/plain
-src/mess/machine/c128_comal80.c svneol=native#text/plain
-src/mess/machine/c128_comal80.h svneol=native#text/plain
 src/mess/machine/c1551.c svneol=native#text/plain
 src/mess/machine/c1551.h svneol=native#text/plain
 src/mess/machine/c2n.c svneol=native#text/plain
 src/mess/machine/c2n.h svneol=native#text/plain
-src/mess/machine/c64/16kb.c svneol=native#text/plain
-src/mess/machine/c64/16kb.h svneol=native#text/plain
-src/mess/machine/c64/4cga.c svneol=native#text/plain
-src/mess/machine/c64/4cga.h svneol=native#text/plain
-src/mess/machine/c64/4dxh.c svneol=native#text/plain
-src/mess/machine/c64/4dxh.h svneol=native#text/plain
-src/mess/machine/c64/4ksa.c svneol=native#text/plain
-src/mess/machine/c64/4ksa.h svneol=native#text/plain
-src/mess/machine/c64/4tba.c svneol=native#text/plain
-src/mess/machine/c64/4tba.h svneol=native#text/plain
-src/mess/machine/c64/bn1541.c svneol=native#text/plain
-src/mess/machine/c64/bn1541.h svneol=native#text/plain
-src/mess/machine/c64/comal80.c svneol=native#text/plain
-src/mess/machine/c64/comal80.h svneol=native#text/plain
-src/mess/machine/c64/cpm.c svneol=native#text/plain
-src/mess/machine/c64/cpm.h svneol=native#text/plain
-src/mess/machine/c64/currah_speech.c svneol=native#text/plain
-src/mess/machine/c64/currah_speech.h svneol=native#text/plain
-src/mess/machine/c64/dela_ep256.c svneol=native#text/plain
-src/mess/machine/c64/dela_ep256.h svneol=native#text/plain
-src/mess/machine/c64/dela_ep64.c svneol=native#text/plain
-src/mess/machine/c64/dela_ep64.h svneol=native#text/plain
-src/mess/machine/c64/dela_ep7x8.c svneol=native#text/plain
-src/mess/machine/c64/dela_ep7x8.h svneol=native#text/plain
-src/mess/machine/c64/dinamic.c svneol=native#text/plain
-src/mess/machine/c64/dinamic.h svneol=native#text/plain
-src/mess/machine/c64/dqbb.c svneol=native#text/plain
-src/mess/machine/c64/dqbb.h svneol=native#text/plain
-src/mess/machine/c64/easy_calc_result.c svneol=native#text/plain
-src/mess/machine/c64/easy_calc_result.h svneol=native#text/plain
-src/mess/machine/c64/easyflash.c svneol=native#text/plain
-src/mess/machine/c64/easyflash.h svneol=native#text/plain
-src/mess/machine/c64/epyx_fast_load.c svneol=native#text/plain
-src/mess/machine/c64/epyx_fast_load.h svneol=native#text/plain
-src/mess/machine/c64/exos.c svneol=native#text/plain
-src/mess/machine/c64/exos.h svneol=native#text/plain
-src/mess/machine/c64/exp.c svneol=native#text/plain
-src/mess/machine/c64/exp.h svneol=native#text/plain
-src/mess/machine/c64/fcc.c svneol=native#text/plain
-src/mess/machine/c64/fcc.h svneol=native#text/plain
-src/mess/machine/c64/final.c svneol=native#text/plain
-src/mess/machine/c64/final.h svneol=native#text/plain
-src/mess/machine/c64/final3.c svneol=native#text/plain
-src/mess/machine/c64/final3.h svneol=native#text/plain
-src/mess/machine/c64/fun_play.c svneol=native#text/plain
-src/mess/machine/c64/fun_play.h svneol=native#text/plain
-src/mess/machine/c64/geocable.c svneol=native#text/plain
-src/mess/machine/c64/geocable.h svneol=native#text/plain
-src/mess/machine/c64/georam.c svneol=native#text/plain
-src/mess/machine/c64/georam.h svneol=native#text/plain
-src/mess/machine/c64/ide64.c svneol=native#text/plain
-src/mess/machine/c64/ide64.h svneol=native#text/plain
-src/mess/machine/c64/ieee488.c svneol=native#text/plain
-src/mess/machine/c64/ieee488.h svneol=native#text/plain
-src/mess/machine/c64/kingsoft.c svneol=native#text/plain
-src/mess/machine/c64/kingsoft.h svneol=native#text/plain
-src/mess/machine/c64/mach5.c svneol=native#text/plain
-src/mess/machine/c64/mach5.h svneol=native#text/plain
-src/mess/machine/c64/magic_desk.c svneol=native#text/plain
-src/mess/machine/c64/magic_desk.h svneol=native#text/plain
-src/mess/machine/c64/magic_formel.c svneol=native#text/plain
-src/mess/machine/c64/magic_formel.h svneol=native#text/plain
-src/mess/machine/c64/magic_voice.c svneol=native#text/plain
-src/mess/machine/c64/magic_voice.h svneol=native#text/plain
-src/mess/machine/c64/midi_maplin.c svneol=native#text/plain
-src/mess/machine/c64/midi_maplin.h svneol=native#text/plain
-src/mess/machine/c64/midi_namesoft.c svneol=native#text/plain
-src/mess/machine/c64/midi_namesoft.h svneol=native#text/plain
-src/mess/machine/c64/midi_passport.c svneol=native#text/plain
-src/mess/machine/c64/midi_passport.h svneol=native#text/plain
-src/mess/machine/c64/midi_sci.c svneol=native#text/plain
-src/mess/machine/c64/midi_sci.h svneol=native#text/plain
-src/mess/machine/c64/midi_siel.c svneol=native#text/plain
-src/mess/machine/c64/midi_siel.h svneol=native#text/plain
-src/mess/machine/c64/mikro_assembler.c svneol=native#text/plain
-src/mess/machine/c64/mikro_assembler.h svneol=native#text/plain
-src/mess/machine/c64/multiscreen.c svneol=native#text/plain
-src/mess/machine/c64/multiscreen.h svneol=native#text/plain
-src/mess/machine/c64/music64.c svneol=native#text/plain
-src/mess/machine/c64/music64.h svneol=native#text/plain
-src/mess/machine/c64/neoram.c svneol=native#text/plain
-src/mess/machine/c64/neoram.h svneol=native#text/plain
-src/mess/machine/c64/ocean.c svneol=native#text/plain
-src/mess/machine/c64/ocean.h svneol=native#text/plain
-src/mess/machine/c64/pagefox.c svneol=native#text/plain
-src/mess/machine/c64/pagefox.h svneol=native#text/plain
-src/mess/machine/c64/partner.c svneol=native#text/plain
-src/mess/machine/c64/partner.h svneol=native#text/plain
-src/mess/machine/c64/prophet64.c svneol=native#text/plain
-src/mess/machine/c64/prophet64.h svneol=native#text/plain
-src/mess/machine/c64/ps64.c svneol=native#text/plain
-src/mess/machine/c64/ps64.h svneol=native#text/plain
-src/mess/machine/c64/reu.c svneol=native#text/plain
-src/mess/machine/c64/reu.h svneol=native#text/plain
-src/mess/machine/c64/rex.c svneol=native#text/plain
-src/mess/machine/c64/rex.h svneol=native#text/plain
-src/mess/machine/c64/rex_ep256.c svneol=native#text/plain
-src/mess/machine/c64/rex_ep256.h svneol=native#text/plain
-src/mess/machine/c64/ross.c svneol=native#text/plain
-src/mess/machine/c64/ross.h svneol=native#text/plain
-src/mess/machine/c64/sfx_sound_expander.c svneol=native#text/plain
-src/mess/machine/c64/sfx_sound_expander.h svneol=native#text/plain
-src/mess/machine/c64/silverrock.c svneol=native#text/plain
-src/mess/machine/c64/silverrock.h svneol=native#text/plain
-src/mess/machine/c64/simons_basic.c svneol=native#text/plain
-src/mess/machine/c64/simons_basic.h svneol=native#text/plain
-src/mess/machine/c64/stardos.c svneol=native#text/plain
-src/mess/machine/c64/stardos.h svneol=native#text/plain
-src/mess/machine/c64/std.c svneol=native#text/plain
-src/mess/machine/c64/std.h svneol=native#text/plain
-src/mess/machine/c64/structured_basic.c svneol=native#text/plain
-src/mess/machine/c64/structured_basic.h svneol=native#text/plain
-src/mess/machine/c64/super_explode.c svneol=native#text/plain
-src/mess/machine/c64/super_explode.h svneol=native#text/plain
-src/mess/machine/c64/super_games.c svneol=native#text/plain
-src/mess/machine/c64/super_games.h svneol=native#text/plain
-src/mess/machine/c64/supercpu.c svneol=native#text/plain
-src/mess/machine/c64/supercpu.h svneol=native#text/plain
-src/mess/machine/c64/sw8k.c svneol=native#text/plain
-src/mess/machine/c64/sw8k.h svneol=native#text/plain
-src/mess/machine/c64/swiftlink.c svneol=native#text/plain
-src/mess/machine/c64/swiftlink.h svneol=native#text/plain
-src/mess/machine/c64/system3.c svneol=native#text/plain
-src/mess/machine/c64/system3.h svneol=native#text/plain
-src/mess/machine/c64/tdos.c svneol=native#text/plain
-src/mess/machine/c64/tdos.h svneol=native#text/plain
-src/mess/machine/c64/turbo232.c svneol=native#text/plain
-src/mess/machine/c64/turbo232.h svneol=native#text/plain
-src/mess/machine/c64/user.c svneol=native#text/plain
-src/mess/machine/c64/user.h svneol=native#text/plain
-src/mess/machine/c64/vic1011.c svneol=native#text/plain
-src/mess/machine/c64/vic1011.h svneol=native#text/plain
-src/mess/machine/c64/vizastar.c svneol=native#text/plain
-src/mess/machine/c64/vizastar.h svneol=native#text/plain
-src/mess/machine/c64/vw64.c svneol=native#text/plain
-src/mess/machine/c64/vw64.h svneol=native#text/plain
-src/mess/machine/c64/warp_speed.c svneol=native#text/plain
-src/mess/machine/c64/warp_speed.h svneol=native#text/plain
-src/mess/machine/c64/westermann.c svneol=native#text/plain
-src/mess/machine/c64/westermann.h svneol=native#text/plain
-src/mess/machine/c64/xl80.c svneol=native#text/plain
-src/mess/machine/c64/xl80.h svneol=native#text/plain
-src/mess/machine/c64/zaxxon.c svneol=native#text/plain
-src/mess/machine/c64/zaxxon.h svneol=native#text/plain
 src/mess/machine/c65.c svneol=native#text/plain
 src/mess/machine/cbm2_24k.c svneol=native#text/plain
 src/mess/machine/cbm2_24k.h svneol=native#text/plain
@@ -7758,8 +7760,6 @@ src/mess/machine/mos8706.c svneol=native#text/plain
 src/mess/machine/mos8706.h svneol=native#text/plain
 src/mess/machine/mos8722.c svneol=native#text/plain
 src/mess/machine/mos8722.h svneol=native#text/plain
-src/mess/machine/mos8726.c svneol=native#text/plain
-src/mess/machine/mos8726.h svneol=native#text/plain
 src/mess/machine/mpc105.c svneol=native#text/plain
 src/mess/machine/mpc105.h svneol=native#text/plain
 src/mess/machine/mpu401.c svneol=native#text/plain

src/emu/bus/bus.mak

@@ -29,6 +29,89 @@ BUSOBJS += $(BUSOBJ)/adamnet/spi.o
 endif
 
 
+#-------------------------------------------------
+#
+#@src/emu/bus/c64/exp.h,BUSES += C64
+#@src/emu/bus/c64/user.h,BUSES += C64
+#-------------------------------------------------
+
+ifneq ($(filter C64,$(BUSES)),)
+BUSOBJS += $(BUSOBJ)/c64/exp.o
+BUSOBJS += $(BUSOBJ)/c64/c128_comal80.o
+BUSOBJS += $(BUSOBJ)/c64/comal80.o
+BUSOBJS += $(BUSOBJ)/c64/cpm.o
+BUSOBJS += $(BUSOBJ)/c64/currah_speech.o
+BUSOBJS += $(BUSOBJ)/c64/dela_ep256.o
+BUSOBJS += $(BUSOBJ)/c64/dela_ep64.o
+BUSOBJS += $(BUSOBJ)/c64/dela_ep7x8.o
+BUSOBJS += $(BUSOBJ)/c64/dinamic.o
+BUSOBJS += $(BUSOBJ)/c64/dqbb.o
+BUSOBJS += $(BUSOBJ)/c64/easy_calc_result.o
+BUSOBJS += $(BUSOBJ)/c64/easyflash.o
+BUSOBJS += $(BUSOBJ)/c64/epyx_fast_load.o
+BUSOBJS += $(BUSOBJ)/c64/exos.o
+BUSOBJS += $(BUSOBJ)/c64/fcc.o
+BUSOBJS += $(BUSOBJ)/c64/final.o
+BUSOBJS += $(BUSOBJ)/c64/final3.o
+BUSOBJS += $(BUSOBJ)/c64/fun_play.o
+BUSOBJS += $(BUSOBJ)/c64/georam.o
+BUSOBJS += $(BUSOBJ)/c64/ide64.o
+BUSOBJS += $(BUSOBJ)/c64/ieee488.o
+BUSOBJS += $(BUSOBJ)/c64/kingsoft.o
+BUSOBJS += $(BUSOBJ)/c64/mach5.o
+BUSOBJS += $(BUSOBJ)/c64/magic_desk.o
+BUSOBJS += $(BUSOBJ)/c64/magic_formel.o
+BUSOBJS += $(BUSOBJ)/c64/magic_voice.o
+BUSOBJS += $(BUSOBJ)/c64/midi_maplin.o
+BUSOBJS += $(BUSOBJ)/c64/midi_namesoft.o
+BUSOBJS += $(BUSOBJ)/c64/midi_passport.o
+BUSOBJS += $(BUSOBJ)/c64/midi_sci.o
+BUSOBJS += $(BUSOBJ)/c64/midi_siel.o
+BUSOBJS += $(BUSOBJ)/c64/mikro_assembler.o
+BUSOBJS += $(BUSOBJ)/c64/multiscreen.o
+BUSOBJS += $(BUSOBJ)/c64/music64.o
+BUSOBJS += $(BUSOBJ)/c64/neoram.o
+BUSOBJS += $(BUSOBJ)/c64/ocean.o
+BUSOBJS += $(BUSOBJ)/c64/pagefox.o
+BUSOBJS += $(BUSOBJ)/c64/partner.o
+BUSOBJS += $(BUSOBJ)/c64/prophet64.o
+BUSOBJS += $(BUSOBJ)/c64/ps64.o
+BUSOBJS += $(BUSOBJ)/c64/reu.o
+BUSOBJS += $(BUSOBJ)/c64/rex.o
+BUSOBJS += $(BUSOBJ)/c64/rex_ep256.o
+BUSOBJS += $(BUSOBJ)/c64/ross.o
+BUSOBJS += $(BUSOBJ)/c64/sfx_sound_expander.o
+BUSOBJS += $(BUSOBJ)/c64/silverrock.o
+BUSOBJS += $(BUSOBJ)/c64/simons_basic.o
+BUSOBJS += $(BUSOBJ)/c64/stardos.o
+BUSOBJS += $(BUSOBJ)/c64/std.o
+BUSOBJS += $(BUSOBJ)/c64/structured_basic.o
+BUSOBJS += $(BUSOBJ)/c64/super_explode.o
+BUSOBJS += $(BUSOBJ)/c64/super_games.o
+BUSOBJS += $(BUSOBJ)/c64/supercpu.o
+BUSOBJS += $(BUSOBJ)/c64/sw8k.o
+BUSOBJS += $(BUSOBJ)/c64/swiftlink.o
+BUSOBJS += $(BUSOBJ)/c64/system3.o
+BUSOBJS += $(BUSOBJ)/c64/tdos.o
+BUSOBJS += $(BUSOBJ)/c64/turbo232.o
+BUSOBJS += $(BUSOBJ)/c64/vizastar.o
+BUSOBJS += $(BUSOBJ)/c64/vw64.o
+BUSOBJS += $(BUSOBJ)/c64/warp_speed.o
+BUSOBJS += $(BUSOBJ)/c64/westermann.o
+BUSOBJS += $(BUSOBJ)/c64/xl80.o
+BUSOBJS += $(BUSOBJ)/c64/zaxxon.o
+BUSOBJS += $(BUSOBJ)/c64/user.o
+BUSOBJS += $(BUSOBJ)/c64/4cga.o
+BUSOBJS += $(BUSOBJ)/c64/4dxh.o
+BUSOBJS += $(BUSOBJ)/c64/4ksa.o
+BUSOBJS += $(BUSOBJ)/c64/4tba.o
+BUSOBJS += $(BUSOBJ)/c64/16kb.o
+BUSOBJS += $(BUSOBJ)/c64/bn1541.o
+BUSOBJS += $(BUSOBJ)/c64/geocable.o
+BUSOBJS += $(BUSOBJ)/c64/vic1011.o
+endif
+
+
 #-------------------------------------------------
 #
 #@src/emu/bus/cbmiec/cbmiec.h,BUSES += CBMIEC

src/emu/bus/c64/16kb.h

@@ -17,7 +17,7 @@
 
 #include "emu.h"
 #include "imagedev/cartslot.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/4cga.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/user.h"
+#include "user.h"
 
 
 

src/emu/bus/c64/4dxh.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/user.h"
+#include "user.h"
 
 
 

src/emu/bus/c64/4ksa.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/user.h"
+#include "user.h"
 
 
 

src/emu/bus/c64/4tba.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/user.h"
+#include "user.h"
 
 
 

src/emu/bus/c64/bn1541.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/user.h"
+#include "user.h"
 
 
 

src/emu/bus/c64/c128_comal80.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/comal80.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/cpm.h

@@ -18,7 +18,7 @@
 
 #include "emu.h"
 #include "cpu/z80/z80.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/currah_speech.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 #include "sound/sp0256.h"
 
 

src/emu/bus/c64/dela_ep256.h

@@ -16,8 +16,8 @@
 
 
 #include "emu.h"
+#include "exp.h"
 #include "imagedev/cartslot.h"
-#include "machine/c64/exp.h"
 
 
 

src/emu/bus/c64/dela_ep64.h

@@ -17,7 +17,7 @@
 
 #include "emu.h"
 #include "imagedev/cartslot.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/dela_ep7x8.h

@@ -17,7 +17,7 @@
 
 #include "emu.h"
 #include "imagedev/cartslot.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/dinamic.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/dqbb.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 #include "machine/nvram.h"
 
 

src/emu/bus/c64/easy_calc_result.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/easyflash.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 #include "machine/intelfsh.h"
 
 

src/emu/bus/c64/epyx_fast_load.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/exos.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/exp.c

@@ -9,7 +9,7 @@
 
 **********************************************************************/
 
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/exp.h

@@ -204,70 +204,70 @@ extern const device_type C64_EXPANSION_SLOT;
 
 
 // slot devices
-#include "machine/c64/16kb.h"
-#include "machine/c64/comal80.h"
-#include "machine/c64/cpm.h"
-#include "machine/c64/currah_speech.h"
-#include "machine/c64/dela_ep256.h"
-#include "machine/c64/dela_ep64.h"
-#include "machine/c64/dela_ep7x8.h"
-#include "machine/c64/dinamic.h"
-#include "machine/c64/dqbb.h"
-#include "machine/c64/easy_calc_result.h"
-#include "machine/c64/easyflash.h"
-#include "machine/c64/epyx_fast_load.h"
-#include "machine/c64/exos.h"
-#include "machine/c64/fcc.h"
-#include "machine/c64/final.h"
-#include "machine/c64/final3.h"
-#include "machine/c64/fun_play.h"
-#include "machine/c64/georam.h"
-#include "machine/c64/ide64.h"
-#include "machine/c64/ieee488.h"
-#include "machine/c64/kingsoft.h"
-#include "machine/c64/mach5.h"
-#include "machine/c64/magic_desk.h"
-#include "machine/c64/magic_formel.h"
-#include "machine/c64/magic_voice.h"
-#include "machine/c64/midi_maplin.h"
-#include "machine/c64/midi_namesoft.h"
-#include "machine/c64/midi_passport.h"
-#include "machine/c64/midi_sci.h"
-#include "machine/c64/midi_siel.h"
-#include "machine/c64/mikro_assembler.h"
-#include "machine/c64/multiscreen.h"
-#include "machine/c64/music64.h"
-#include "machine/c64/neoram.h"
-#include "machine/c64/ocean.h"
-#include "machine/c64/pagefox.h"
-#include "machine/c64/partner.h"
-#include "machine/c64/prophet64.h"
-#include "machine/c64/ps64.h"
-#include "machine/c64/reu.h"
-#include "machine/c64/rex.h"
-#include "machine/c64/rex_ep256.h"
-#include "machine/c64/ross.h"
-#include "machine/c64/sfx_sound_expander.h"
-#include "machine/c64/silverrock.h"
-#include "machine/c64/simons_basic.h"
-#include "machine/c64/stardos.h"
-#include "machine/c64/std.h"
-#include "machine/c64/structured_basic.h"
-#include "machine/c64/super_explode.h"
-#include "machine/c64/super_games.h"
-#include "machine/c64/supercpu.h"
-#include "machine/c64/sw8k.h"
-#include "machine/c64/swiftlink.h"
-#include "machine/c64/system3.h"
-#include "machine/c64/tdos.h"
-#include "machine/c64/turbo232.h"
-#include "machine/c64/vizastar.h"
-#include "machine/c64/vw64.h"
-#include "machine/c64/warp_speed.h"
-#include "machine/c64/westermann.h"
-#include "machine/c64/xl80.h"
-#include "machine/c64/zaxxon.h"
-#include "machine/c128_comal80.h"
+#include "16kb.h"
+#include "c128_comal80.h"
+#include "comal80.h"
+#include "cpm.h"
+#include "currah_speech.h"
+#include "dela_ep256.h"
+#include "dela_ep64.h"
+#include "dela_ep7x8.h"
+#include "dinamic.h"
+#include "dqbb.h"
+#include "easy_calc_result.h"
+#include "easyflash.h"
+#include "epyx_fast_load.h"
+#include "exos.h"
+#include "fcc.h"
+#include "final.h"
+#include "final3.h"
+#include "fun_play.h"
+#include "georam.h"
+#include "ide64.h"
+#include "ieee488.h"
+#include "kingsoft.h"
+#include "mach5.h"
+#include "magic_desk.h"
+#include "magic_formel.h"
+#include "magic_voice.h"
+#include "midi_maplin.h"
+#include "midi_namesoft.h"
+#include "midi_passport.h"
+#include "midi_sci.h"
+#include "midi_siel.h"
+#include "mikro_assembler.h"
+#include "multiscreen.h"
+#include "music64.h"
+#include "neoram.h"
+#include "ocean.h"
+#include "pagefox.h"
+#include "partner.h"
+#include "prophet64.h"
+#include "ps64.h"
+#include "reu.h"
+#include "rex.h"
+#include "rex_ep256.h"
+#include "ross.h"
+#include "sfx_sound_expander.h"
+#include "silverrock.h"
+#include "simons_basic.h"
+#include "stardos.h"
+#include "std.h"
+#include "structured_basic.h"
+#include "super_explode.h"
+#include "super_games.h"
+#include "supercpu.h"
+#include "sw8k.h"
+#include "swiftlink.h"
+#include "system3.h"
+#include "tdos.h"
+#include "turbo232.h"
+#include "vizastar.h"
+#include "vw64.h"
+#include "warp_speed.h"
+#include "westermann.h"
+#include "xl80.h"
+#include "zaxxon.h"
 
 SLOT_INTERFACE_EXTERN( c64_expansion_cards );
 

src/emu/bus/c64/fcc.h

@@ -15,7 +15,7 @@
 #define __FCC__
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 #include "cpu/m6502/m65sc02.h"
 
 

src/emu/bus/c64/final.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/final3.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/fun_play.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/geocable.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/user.h"
+#include "user.h"
 #include "machine/ctronics.h"
 
 

src/emu/bus/c64/georam.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/ide64.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 #include "machine/ds1302.h"
 #include "machine/ataintf.h"
 #include "machine/intelfsh.h"

src/emu/bus/c64/ieee488.h

@@ -17,7 +17,7 @@
 #include "emu.h"
 #include "bus/ieee488/ieee488.h"
 #include "machine/6525tpi.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/kingsoft.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/mach5.h

@@ -15,7 +15,7 @@
 #define __MACH5__
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/magic_desk.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/magic_formel.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 #include "machine/6821pia.h"
 
 

src/emu/bus/c64/magic_voice.h

@@ -17,7 +17,7 @@
 #include "emu.h"
 #include "machine/40105.h"
 #include "machine/6525tpi.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 #include "sound/t6721a.h"
 
 

src/emu/bus/c64/midi_maplin.h

@@ -15,7 +15,7 @@
 #define __C64_MIDI_MAPLIN__
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 #include "machine/6850acia.h"
 #include "machine/serial.h"
 #include "machine/midiinport.h"

src/emu/bus/c64/midi_namesoft.h

@@ -15,7 +15,7 @@
 #define __C64_MIDI_NAMESOFT__
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 #include "machine/6850acia.h"
 #include "machine/serial.h"
 #include "machine/midiinport.h"

src/emu/bus/c64/midi_passport.h

@@ -15,7 +15,7 @@
 #define __C64_MIDI_PASSPORT__
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 #include "machine/6840ptm.h"
 #include "machine/6850acia.h"
 #include "machine/serial.h"

src/emu/bus/c64/midi_sci.h

@@ -15,7 +15,7 @@
 #define __C64_MIDI_SCI__
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 #include "machine/6850acia.h"
 #include "machine/serial.h"
 #include "machine/midiinport.h"

src/emu/bus/c64/midi_siel.h

@@ -15,7 +15,7 @@
 #define __C64_MIDI_SIEL__
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 #include "machine/6850acia.h"
 #include "machine/serial.h"
 #include "machine/midiinport.h"

src/emu/bus/c64/mikro_assembler.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/multiscreen.h

@@ -18,7 +18,7 @@
 #include "emu.h"
 #include "cpu/m6800/m6800.h"
 #include "machine/6821pia.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/music64.h

@@ -15,7 +15,7 @@
 #define __MUSIC64__
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/neoram.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/ocean.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/pagefox.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/partner.h

@@ -15,7 +15,7 @@
 #define __PARTNER__
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/prophet64.h

@@ -15,7 +15,7 @@
 #define __PROPHET64__
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 
 
 

src/emu/bus/c64/ps64.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 #include "sound/votrax.h"
 
 

src/emu/bus/c64/reu.h

@@ -17,7 +17,7 @@
 
 #include "emu.h"
 #include "imagedev/cartslot.h"
-#include "machine/c64/exp.h"
+#include "exp.h"
 #include "machine/mos8726.h"
 
 

src/emu/bus/c64/rex.h

@@ -16,7 +16,7 @@
 
 
 #include "emu.h"
-#include "machine/c64/exp.h"
+#include "exp.h"