diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/mess/includes/c128.h | 4 | ||||
-rw-r--r-- | src/mess/includes/c64.h | 4 | ||||
-rw-r--r-- | src/mess/machine/c128_comal80.h | 2 | ||||
-rw-r--r-- | src/mess/machine/c1541.h | 2 | ||||
-rw-r--r-- | src/mess/machine/c1571.h | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/16kb.c (renamed from src/mess/machine/c64_16kb.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/16kb.h (renamed from src/mess/machine/c64_16kb.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/4cga.c (renamed from src/mess/machine/c64_4cga.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/4cga.h (renamed from src/mess/machine/c64_4cga.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/4dxh.c (renamed from src/mess/machine/c64_4dxh.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/4dxh.h (renamed from src/mess/machine/c64_4dxh.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/4ksa.c (renamed from src/mess/machine/c64_4ksa.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/4ksa.h (renamed from src/mess/machine/c64_4ksa.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/4tba.c (renamed from src/mess/machine/c64_4tba.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/4tba.h (renamed from src/mess/machine/c64_4tba.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/bn1541.c (renamed from src/mess/machine/c64_bn1541.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/bn1541.h (renamed from src/mess/machine/c64_bn1541.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/comal80.c (renamed from src/mess/machine/c64_comal80.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/comal80.h (renamed from src/mess/machine/c64_comal80.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/cpm.c (renamed from src/mess/machine/c64_cpm.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/cpm.h (renamed from src/mess/machine/c64_cpm.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/currah_speech.c (renamed from src/mess/machine/c64_currah_speech.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/currah_speech.h (renamed from src/mess/machine/c64_currah_speech.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/dela_ep256.c (renamed from src/mess/machine/c64_dela_ep256.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/dela_ep256.h (renamed from src/mess/machine/c64_dela_ep256.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/dela_ep64.c (renamed from src/mess/machine/c64_dela_ep64.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/dela_ep64.h (renamed from src/mess/machine/c64_dela_ep64.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/dela_ep7x8.c (renamed from src/mess/machine/c64_dela_ep7x8.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/dela_ep7x8.h (renamed from src/mess/machine/c64_dela_ep7x8.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/dinamic.c (renamed from src/mess/machine/c64_dinamic.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/dinamic.h (renamed from src/mess/machine/c64_dinamic.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/dqbb.c (renamed from src/mess/machine/c64_dqbb.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/dqbb.h (renamed from src/mess/machine/c64_dqbb.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/easy_calc_result.c (renamed from src/mess/machine/c64_easy_calc_result.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/easy_calc_result.h (renamed from src/mess/machine/c64_easy_calc_result.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/easyflash.c (renamed from src/mess/machine/c64_easyflash.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/easyflash.h (renamed from src/mess/machine/c64_easyflash.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/epyx_fast_load.c (renamed from src/mess/machine/c64_epyx_fast_load.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/epyx_fast_load.h (renamed from src/mess/machine/c64_epyx_fast_load.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/exos.c (renamed from src/mess/machine/c64_exos.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/exos.h (renamed from src/mess/machine/c64_exos.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/exp.c (renamed from src/mess/machine/c64exp.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/exp.h (renamed from src/mess/machine/c64exp.h) | 0 | ||||
-rw-r--r-- | src/mess/machine/c64/fcc.c (renamed from src/mess/machine/c64_fcc.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/fcc.h (renamed from src/mess/machine/c64_fcc.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/final.c (renamed from src/mess/machine/c64_final.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/final.h (renamed from src/mess/machine/c64_final.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/final3.c (renamed from src/mess/machine/c64_final3.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/final3.h (renamed from src/mess/machine/c64_final3.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/fun_play.c (renamed from src/mess/machine/c64_fun_play.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/fun_play.h (renamed from src/mess/machine/c64_fun_play.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/geocable.c (renamed from src/mess/machine/c64_geocable.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/geocable.h (renamed from src/mess/machine/c64_geocable.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/georam.c (renamed from src/mess/machine/c64_georam.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/georam.h (renamed from src/mess/machine/c64_georam.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/ide64.c (renamed from src/mess/machine/c64_ide64.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/ide64.h (renamed from src/mess/machine/c64_ide64.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/ieee488.c (renamed from src/mess/machine/c64_ieee488.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/ieee488.h (renamed from src/mess/machine/c64_ieee488.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/kingsoft.c (renamed from src/mess/machine/c64_kingsoft.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/kingsoft.h (renamed from src/mess/machine/c64_kingsoft.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/mach5.c (renamed from src/mess/machine/c64_mach5.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/mach5.h (renamed from src/mess/machine/c64_mach5.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/magic_desk.c (renamed from src/mess/machine/c64_magic_desk.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/magic_desk.h (renamed from src/mess/machine/c64_magic_desk.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/magic_formel.c (renamed from src/mess/machine/c64_magic_formel.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/magic_formel.h (renamed from src/mess/machine/c64_magic_formel.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/magic_voice.c (renamed from src/mess/machine/c64_magic_voice.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/magic_voice.h (renamed from src/mess/machine/c64_magic_voice.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/midi_maplin.c (renamed from src/mess/machine/c64_midi_maplin.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/midi_maplin.h (renamed from src/mess/machine/c64_midi_maplin.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/midi_namesoft.c (renamed from src/mess/machine/c64_midi_namesoft.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/midi_namesoft.h (renamed from src/mess/machine/c64_midi_namesoft.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/midi_passport.c (renamed from src/mess/machine/c64_midi_passport.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/midi_passport.h (renamed from src/mess/machine/c64_midi_passport.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/midi_sci.c (renamed from src/mess/machine/c64_midi_sci.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/midi_sci.h (renamed from src/mess/machine/c64_midi_sci.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/midi_siel.c (renamed from src/mess/machine/c64_midi_siel.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/midi_siel.h (renamed from src/mess/machine/c64_midi_siel.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/mikro_assembler.c (renamed from src/mess/machine/c64_mikro_assembler.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/mikro_assembler.h (renamed from src/mess/machine/c64_mikro_assembler.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/multiscreen.c (renamed from src/mess/machine/c64_multiscreen.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/multiscreen.h (renamed from src/mess/machine/c64_multiscreen.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/neoram.c (renamed from src/mess/machine/c64_neoram.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/neoram.h (renamed from src/mess/machine/c64_neoram.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/ocean.c (renamed from src/mess/machine/c64_ocean.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/ocean.h (renamed from src/mess/machine/c64_ocean.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/pagefox.c (renamed from src/mess/machine/c64_pagefox.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/pagefox.h (renamed from src/mess/machine/c64_pagefox.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/prophet64.c (renamed from src/mess/machine/c64_prophet64.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/prophet64.h (renamed from src/mess/machine/c64_prophet64.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/ps64.c (renamed from src/mess/machine/c64_ps64.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/ps64.h (renamed from src/mess/machine/c64_ps64.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/reu.c (renamed from src/mess/machine/c64_reu.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/reu.h (renamed from src/mess/machine/c64_reu.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/rex.c (renamed from src/mess/machine/c64_rex.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/rex.h (renamed from src/mess/machine/c64_rex.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/rex_ep256.c (renamed from src/mess/machine/c64_rex_ep256.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/rex_ep256.h (renamed from src/mess/machine/c64_rex_ep256.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/ross.c (renamed from src/mess/machine/c64_ross.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/ross.h (renamed from src/mess/machine/c64_ross.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/sfx_sound_expander.c (renamed from src/mess/machine/c64_sfx_sound_expander.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/sfx_sound_expander.h (renamed from src/mess/machine/c64_sfx_sound_expander.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/silverrock.c (renamed from src/mess/machine/c64_silverrock.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/silverrock.h (renamed from src/mess/machine/c64_silverrock.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/simons_basic.c (renamed from src/mess/machine/c64_simons_basic.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/simons_basic.h (renamed from src/mess/machine/c64_simons_basic.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/stardos.c (renamed from src/mess/machine/c64_stardos.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/stardos.h (renamed from src/mess/machine/c64_stardos.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/std.c (renamed from src/mess/machine/c64_std.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/std.h (renamed from src/mess/machine/c64_std.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/structured_basic.c (renamed from src/mess/machine/c64_structured_basic.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/structured_basic.h (renamed from src/mess/machine/c64_structured_basic.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/super_explode.c (renamed from src/mess/machine/c64_super_explode.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/super_explode.h (renamed from src/mess/machine/c64_super_explode.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/super_games.c (renamed from src/mess/machine/c64_super_games.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/super_games.h (renamed from src/mess/machine/c64_super_games.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/supercpu.c (renamed from src/mess/machine/c64_supercpu.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/supercpu.h (renamed from src/mess/machine/c64_supercpu.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/sw8k.c (renamed from src/mess/machine/c64_sw8k.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/sw8k.h (renamed from src/mess/machine/c64_sw8k.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/swiftlink.c (renamed from src/mess/machine/c64_swiftlink.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/swiftlink.h (renamed from src/mess/machine/c64_swiftlink.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/system3.c (renamed from src/mess/machine/c64_system3.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/system3.h (renamed from src/mess/machine/c64_system3.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/tdos.c (renamed from src/mess/machine/c64_tdos.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/tdos.h (renamed from src/mess/machine/c64_tdos.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/turbo232.c (renamed from src/mess/machine/c64_turbo232.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/turbo232.h (renamed from src/mess/machine/c64_turbo232.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/user.c (renamed from src/mess/machine/c64user.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/user.h (renamed from src/mess/machine/c64user.h) | 0 | ||||
-rw-r--r-- | src/mess/machine/c64/vic1011.c (renamed from src/mess/machine/c64_vic1011.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/vic1011.h (renamed from src/mess/machine/c64_vic1011.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/vizastar.c (renamed from src/mess/machine/c64_vizastar.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/vizastar.h (renamed from src/mess/machine/c64_vizastar.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/vw64.c (renamed from src/mess/machine/c64_vw64.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/vw64.h (renamed from src/mess/machine/c64_vw64.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/warp_speed.c (renamed from src/mess/machine/c64_warp_speed.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/warp_speed.h (renamed from src/mess/machine/c64_warp_speed.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/westermann.c (renamed from src/mess/machine/c64_westermann.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/westermann.h (renamed from src/mess/machine/c64_westermann.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/xl80.c (renamed from src/mess/machine/c64_xl80.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/xl80.h (renamed from src/mess/machine/c64_xl80.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/zaxxon.c (renamed from src/mess/machine/c64_zaxxon.c) | 2 | ||||
-rw-r--r-- | src/mess/machine/c64/zaxxon.h (renamed from src/mess/machine/c64_zaxxon.h) | 2 | ||||
-rw-r--r-- | src/mess/machine/cbmipt.c | 1 | ||||
-rw-r--r-- | src/mess/machine/cbmipt.h | 136 | ||||
-rw-r--r-- | src/mess/mess.mak | 140 | ||||
-rw-r--r-- | src/mess/messcore.mak | 1 |
149 files changed, 284 insertions, 284 deletions
diff --git a/src/mess/includes/c128.h b/src/mess/includes/c128.h index 0018171ae9c..12141b03569 100644 --- a/src/mess/includes/c128.h +++ b/src/mess/includes/c128.h @@ -6,8 +6,8 @@ #include "emu.h" #include "machine/cbm_snqk.h" #include "cpu/m6502/m8502.h" -#include "machine/c64exp.h" -#include "machine/c64user.h" +#include "machine/c64/exp.h" +#include "machine/c64/user.h" #include "machine/cbmiec.h" #include "machine/cbmipt.h" #include "machine/mos6526.h" diff --git a/src/mess/includes/c64.h b/src/mess/includes/c64.h index 6cf0b902556..016dc5c59cd 100644 --- a/src/mess/includes/c64.h +++ b/src/mess/includes/c64.h @@ -6,8 +6,8 @@ #include "emu.h" #include "cpu/m6502/m6510.h" #include "machine/cbm_snqk.h" -#include "machine/c64exp.h" -#include "machine/c64user.h" +#include "machine/c64/exp.h" +#include "machine/c64/user.h" #include "machine/cbmiec.h" #include "machine/cbmipt.h" #include "machine/mos6526.h" diff --git a/src/mess/machine/c128_comal80.h b/src/mess/machine/c128_comal80.h index 03ed7d2f27b..a051aabd16b 100644 --- a/src/mess/machine/c128_comal80.h +++ b/src/mess/machine/c128_comal80.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c1541.h b/src/mess/machine/c1541.h index ab347b0c5c8..a2696873fd8 100644 --- a/src/mess/machine/c1541.h +++ b/src/mess/machine/c1541.h @@ -21,7 +21,7 @@ #include "machine/64h156.h" #include "machine/6522via.h" #include "machine/6821pia.h" -#include "machine/c64_bn1541.h" +#include "machine/c64/bn1541.h" #include "machine/cbmiec.h" #include "machine/ctronics.h" diff --git a/src/mess/machine/c1571.h b/src/mess/machine/c1571.h index 9980ced2815..469f0d571d4 100644 --- a/src/mess/machine/c1571.h +++ b/src/mess/machine/c1571.h @@ -19,7 +19,7 @@ #include "formats/g64_dsk.h" #include "machine/64h156.h" #include "machine/6522via.h" -#include "machine/c64_bn1541.h" +#include "machine/c64/bn1541.h" #include "machine/cbmiec.h" #include "machine/isa.h" #include "machine/mos6526.h" diff --git a/src/mess/machine/c64_16kb.c b/src/mess/machine/c64/16kb.c index 90cc5b767a3..17dd3f1eb02 100644 --- a/src/mess/machine/c64_16kb.c +++ b/src/mess/machine/c64/16kb.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_16kb.h" +#include "16kb.h" diff --git a/src/mess/machine/c64_16kb.h b/src/mess/machine/c64/16kb.h index 85f576be334..50bf81bbd17 100644 --- a/src/mess/machine/c64_16kb.h +++ b/src/mess/machine/c64/16kb.h @@ -15,7 +15,7 @@ #include "emu.h" #include "imagedev/cartslot.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_4cga.c b/src/mess/machine/c64/4cga.c index f5fdc77142c..ecbcc25a2f8 100644 --- a/src/mess/machine/c64_4cga.c +++ b/src/mess/machine/c64/4cga.c @@ -10,7 +10,7 @@ **********************************************************************/ -#include "c64_4cga.h" +#include "4cga.h" diff --git a/src/mess/machine/c64_4cga.h b/src/mess/machine/c64/4cga.h index 4d2cea6020b..d2e3e97e7b4 100644 --- a/src/mess/machine/c64_4cga.h +++ b/src/mess/machine/c64/4cga.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64user.h" +#include "machine/c64/user.h" diff --git a/src/mess/machine/c64_4dxh.c b/src/mess/machine/c64/4dxh.c index 457c36df254..ff53143a161 100644 --- a/src/mess/machine/c64_4dxh.c +++ b/src/mess/machine/c64/4dxh.c @@ -9,7 +9,7 @@ **********************************************************************/ -#include "c64_4dxh.h" +#include "4dxh.h" diff --git a/src/mess/machine/c64_4dxh.h b/src/mess/machine/c64/4dxh.h index 4b822b9f637..a02ccad3987 100644 --- a/src/mess/machine/c64_4dxh.h +++ b/src/mess/machine/c64/4dxh.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64user.h" +#include "machine/c64/user.h" diff --git a/src/mess/machine/c64_4ksa.c b/src/mess/machine/c64/4ksa.c index c11d2bcf6c0..190e16105d7 100644 --- a/src/mess/machine/c64_4ksa.c +++ b/src/mess/machine/c64/4ksa.c @@ -9,7 +9,7 @@ **********************************************************************/ -#include "c64_4ksa.h" +#include "4ksa.h" diff --git a/src/mess/machine/c64_4ksa.h b/src/mess/machine/c64/4ksa.h index f17c4234765..fe09480afdf 100644 --- a/src/mess/machine/c64_4ksa.h +++ b/src/mess/machine/c64/4ksa.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64user.h" +#include "machine/c64/user.h" diff --git a/src/mess/machine/c64_4tba.c b/src/mess/machine/c64/4tba.c index 0ed075f8039..26ff6db03fb 100644 --- a/src/mess/machine/c64_4tba.c +++ b/src/mess/machine/c64/4tba.c @@ -9,7 +9,7 @@ **********************************************************************/ -#include "c64_4tba.h" +#include "4tba.h" diff --git a/src/mess/machine/c64_4tba.h b/src/mess/machine/c64/4tba.h index a6544d367c8..3dc3da5ca3a 100644 --- a/src/mess/machine/c64_4tba.h +++ b/src/mess/machine/c64/4tba.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64user.h" +#include "machine/c64/user.h" diff --git a/src/mess/machine/c64_bn1541.c b/src/mess/machine/c64/bn1541.c index 61710763d13..2395779ba21 100644 --- a/src/mess/machine/c64_bn1541.c +++ b/src/mess/machine/c64/bn1541.c @@ -9,7 +9,7 @@ **********************************************************************/ -#include "c64_bn1541.h" +#include "bn1541.h" diff --git a/src/mess/machine/c64_bn1541.h b/src/mess/machine/c64/bn1541.h index eda2f7f6197..4e08cf45694 100644 --- a/src/mess/machine/c64_bn1541.h +++ b/src/mess/machine/c64/bn1541.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64user.h" +#include "machine/c64/user.h" diff --git a/src/mess/machine/c64_comal80.c b/src/mess/machine/c64/comal80.c index b05838a9cd2..7b89245793e 100644 --- a/src/mess/machine/c64_comal80.c +++ b/src/mess/machine/c64/comal80.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_comal80.h" +#include "comal80.h" diff --git a/src/mess/machine/c64_comal80.h b/src/mess/machine/c64/comal80.h index 61deea14788..7d4e50a8dde 100644 --- a/src/mess/machine/c64_comal80.h +++ b/src/mess/machine/c64/comal80.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_cpm.c b/src/mess/machine/c64/cpm.c index 5296cccf81b..131b359da01 100644 --- a/src/mess/machine/c64_cpm.c +++ b/src/mess/machine/c64/cpm.c @@ -17,7 +17,7 @@ */ -#include "c64_cpm.h" +#include "cpm.h" diff --git a/src/mess/machine/c64_cpm.h b/src/mess/machine/c64/cpm.h index 9e4c31d9f87..447af110f3b 100644 --- a/src/mess/machine/c64_cpm.h +++ b/src/mess/machine/c64/cpm.h @@ -16,7 +16,7 @@ #include "emu.h" #include "cpu/z80/z80.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_currah_speech.c b/src/mess/machine/c64/currah_speech.c index 44fa33f5109..1ca75a03331 100644 --- a/src/mess/machine/c64_currah_speech.c +++ b/src/mess/machine/c64/currah_speech.c @@ -68,7 +68,7 @@ Notes: */ -#include "c64_currah_speech.h" +#include "currah_speech.h" diff --git a/src/mess/machine/c64_currah_speech.h b/src/mess/machine/c64/currah_speech.h index 0dfae6fcbce..f89a221ec40 100644 --- a/src/mess/machine/c64_currah_speech.h +++ b/src/mess/machine/c64/currah_speech.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "sound/sp0256.h" diff --git a/src/mess/machine/c64_dela_ep256.c b/src/mess/machine/c64/dela_ep256.c index efd11cb8941..2bddac5b03c 100644 --- a/src/mess/machine/c64_dela_ep256.c +++ b/src/mess/machine/c64/dela_ep256.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_dela_ep256.h" +#include "dela_ep256.h" diff --git a/src/mess/machine/c64_dela_ep256.h b/src/mess/machine/c64/dela_ep256.h index 20430bd9de6..59e33a654db 100644 --- a/src/mess/machine/c64_dela_ep256.h +++ b/src/mess/machine/c64/dela_ep256.h @@ -15,7 +15,7 @@ #include "emu.h" #include "imagedev/cartslot.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_dela_ep64.c b/src/mess/machine/c64/dela_ep64.c index 5c44f5712a8..275ce0c0a59 100644 --- a/src/mess/machine/c64_dela_ep64.c +++ b/src/mess/machine/c64/dela_ep64.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_dela_ep64.h" +#include "dela_ep64.h" diff --git a/src/mess/machine/c64_dela_ep64.h b/src/mess/machine/c64/dela_ep64.h index 3c3c79c0874..cc1088e9cc9 100644 --- a/src/mess/machine/c64_dela_ep64.h +++ b/src/mess/machine/c64/dela_ep64.h @@ -15,7 +15,7 @@ #include "emu.h" #include "imagedev/cartslot.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_dela_ep7x8.c b/src/mess/machine/c64/dela_ep7x8.c index 3ef9239b08d..08eb446d318 100644 --- a/src/mess/machine/c64_dela_ep7x8.c +++ b/src/mess/machine/c64/dela_ep7x8.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_dela_ep7x8.h" +#include "dela_ep7x8.h" diff --git a/src/mess/machine/c64_dela_ep7x8.h b/src/mess/machine/c64/dela_ep7x8.h index 8c45c3664ae..404ae48887d 100644 --- a/src/mess/machine/c64_dela_ep7x8.h +++ b/src/mess/machine/c64/dela_ep7x8.h @@ -15,7 +15,7 @@ #include "emu.h" #include "imagedev/cartslot.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_dinamic.c b/src/mess/machine/c64/dinamic.c index 0a3a426ce7f..ce90ec17ff9 100644 --- a/src/mess/machine/c64_dinamic.c +++ b/src/mess/machine/c64/dinamic.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_dinamic.h" +#include "dinamic.h" diff --git a/src/mess/machine/c64_dinamic.h b/src/mess/machine/c64/dinamic.h index ca5aa068689..ad6bf88cf0f 100644 --- a/src/mess/machine/c64_dinamic.h +++ b/src/mess/machine/c64/dinamic.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_dqbb.c b/src/mess/machine/c64/dqbb.c index 687059ae4bf..1b27391231d 100644 --- a/src/mess/machine/c64_dqbb.c +++ b/src/mess/machine/c64/dqbb.c @@ -16,7 +16,7 @@ */ -#include "c64_dqbb.h" +#include "dqbb.h" diff --git a/src/mess/machine/c64_dqbb.h b/src/mess/machine/c64/dqbb.h index 506f6712f54..0a4aa88738c 100644 --- a/src/mess/machine/c64_dqbb.h +++ b/src/mess/machine/c64/dqbb.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/nvram.h" diff --git a/src/mess/machine/c64_easy_calc_result.c b/src/mess/machine/c64/easy_calc_result.c index 3e943c20538..aa5507f9dfa 100644 --- a/src/mess/machine/c64_easy_calc_result.c +++ b/src/mess/machine/c64/easy_calc_result.c @@ -28,7 +28,7 @@ */ -#include "c64_easy_calc_result.h" +#include "easy_calc_result.h" diff --git a/src/mess/machine/c64_easy_calc_result.h b/src/mess/machine/c64/easy_calc_result.h index 6ca71c31c36..89ebc4c9a0f 100644 --- a/src/mess/machine/c64_easy_calc_result.h +++ b/src/mess/machine/c64/easy_calc_result.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_easyflash.c b/src/mess/machine/c64/easyflash.c index f581295db2b..b08643e3017 100644 --- a/src/mess/machine/c64_easyflash.c +++ b/src/mess/machine/c64/easyflash.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_easyflash.h" +#include "easyflash.h" //************************************************************************** diff --git a/src/mess/machine/c64_easyflash.h b/src/mess/machine/c64/easyflash.h index 4406cfbbea5..1115bc3523c 100644 --- a/src/mess/machine/c64_easyflash.h +++ b/src/mess/machine/c64/easyflash.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/intelfsh.h" diff --git a/src/mess/machine/c64_epyx_fast_load.c b/src/mess/machine/c64/epyx_fast_load.c index 2e658b7a70c..899056abce7 100644 --- a/src/mess/machine/c64_epyx_fast_load.c +++ b/src/mess/machine/c64/epyx_fast_load.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_epyx_fast_load.h" +#include "epyx_fast_load.h" diff --git a/src/mess/machine/c64_epyx_fast_load.h b/src/mess/machine/c64/epyx_fast_load.h index 658545e6564..89944cd44de 100644 --- a/src/mess/machine/c64_epyx_fast_load.h +++ b/src/mess/machine/c64/epyx_fast_load.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_exos.c b/src/mess/machine/c64/exos.c index 1c2e16ca65e..8ebf01b90ca 100644 --- a/src/mess/machine/c64_exos.c +++ b/src/mess/machine/c64/exos.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_exos.h" +#include "exos.h" diff --git a/src/mess/machine/c64_exos.h b/src/mess/machine/c64/exos.h index e66d196afe6..ab0f23497dc 100644 --- a/src/mess/machine/c64_exos.h +++ b/src/mess/machine/c64/exos.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64exp.c b/src/mess/machine/c64/exp.c index 4c0f6f2d847..1014b4a707d 100644 --- a/src/mess/machine/c64exp.c +++ b/src/mess/machine/c64/exp.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64exp.h b/src/mess/machine/c64/exp.h index 1fa57cfd8b0..1fa57cfd8b0 100644 --- a/src/mess/machine/c64exp.h +++ b/src/mess/machine/c64/exp.h diff --git a/src/mess/machine/c64_fcc.c b/src/mess/machine/c64/fcc.c index 5501b8c5948..b15b5b7fe40 100644 --- a/src/mess/machine/c64_fcc.c +++ b/src/mess/machine/c64/fcc.c @@ -22,7 +22,7 @@ */ -#include "c64_fcc.h" +#include "fcc.h" diff --git a/src/mess/machine/c64_fcc.h b/src/mess/machine/c64/fcc.h index 9dbfd2f7531..f3de27fe873 100644 --- a/src/mess/machine/c64_fcc.h +++ b/src/mess/machine/c64/fcc.h @@ -13,7 +13,7 @@ #define __FCC__ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "cpu/m6502/m65sc02.h" diff --git a/src/mess/machine/c64_final.c b/src/mess/machine/c64/final.c index 9a931a3c804..07bd03925eb 100644 --- a/src/mess/machine/c64_final.c +++ b/src/mess/machine/c64/final.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_final.h" +#include "final.h" diff --git a/src/mess/machine/c64_final.h b/src/mess/machine/c64/final.h index e439131cf2d..3acbb0515c3 100644 --- a/src/mess/machine/c64_final.h +++ b/src/mess/machine/c64/final.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_final3.c b/src/mess/machine/c64/final3.c index 8756925ce0e..93721c1a122 100644 --- a/src/mess/machine/c64_final3.c +++ b/src/mess/machine/c64/final3.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_final3.h" +#include "final3.h" diff --git a/src/mess/machine/c64_final3.h b/src/mess/machine/c64/final3.h index 25e1ca4ce6a..bb125adc749 100644 --- a/src/mess/machine/c64_final3.h +++ b/src/mess/machine/c64/final3.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_fun_play.c b/src/mess/machine/c64/fun_play.c index 18d400be395..30b1f1e6d86 100644 --- a/src/mess/machine/c64_fun_play.c +++ b/src/mess/machine/c64/fun_play.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_fun_play.h" +#include "fun_play.h" diff --git a/src/mess/machine/c64_fun_play.h b/src/mess/machine/c64/fun_play.h index dacb527248b..c21a7708cf7 100644 --- a/src/mess/machine/c64_fun_play.h +++ b/src/mess/machine/c64/fun_play.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_geocable.c b/src/mess/machine/c64/geocable.c index e0bfca8e1e6..19ac039274f 100644 --- a/src/mess/machine/c64_geocable.c +++ b/src/mess/machine/c64/geocable.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_geocable.h" +#include "geocable.h" diff --git a/src/mess/machine/c64_geocable.h b/src/mess/machine/c64/geocable.h index cdae4a5fe2b..8a999203e94 100644 --- a/src/mess/machine/c64_geocable.h +++ b/src/mess/machine/c64/geocable.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64user.h" +#include "machine/c64/user.h" #include "machine/ctronics.h" diff --git a/src/mess/machine/c64_georam.c b/src/mess/machine/c64/georam.c index eb9dde56c1a..5ca6c6e1b70 100644 --- a/src/mess/machine/c64_georam.c +++ b/src/mess/machine/c64/georam.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_georam.h" +#include "georam.h" diff --git a/src/mess/machine/c64_georam.h b/src/mess/machine/c64/georam.h index a6f9094291e..0f6a4751574 100644 --- a/src/mess/machine/c64_georam.h +++ b/src/mess/machine/c64/georam.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_ide64.c b/src/mess/machine/c64/ide64.c index 060ad4de8f1..31890efe0c5 100644 --- a/src/mess/machine/c64_ide64.c +++ b/src/mess/machine/c64/ide64.c @@ -20,7 +20,7 @@ */ -#include "c64_ide64.h" +#include "ide64.h" diff --git a/src/mess/machine/c64_ide64.h b/src/mess/machine/c64/ide64.h index 5a96a31507d..fa1cdd4c859 100644 --- a/src/mess/machine/c64_ide64.h +++ b/src/mess/machine/c64/ide64.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/ds1302.h" #include "machine/ataintf.h" #include "machine/intelfsh.h" diff --git a/src/mess/machine/c64_ieee488.c b/src/mess/machine/c64/ieee488.c index 71b439858b8..201faceade0 100644 --- a/src/mess/machine/c64_ieee488.c +++ b/src/mess/machine/c64/ieee488.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_ieee488.h" +#include "ieee488.h" diff --git a/src/mess/machine/c64_ieee488.h b/src/mess/machine/c64/ieee488.h index 196aaef501c..4f87cd48b73 100644 --- a/src/mess/machine/c64_ieee488.h +++ b/src/mess/machine/c64/ieee488.h @@ -15,7 +15,7 @@ #include "emu.h" #include "machine/6525tpi.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/cbmipt.h" #include "machine/ieee488.h" #include "video/mc6845.h" diff --git a/src/mess/machine/c64_kingsoft.c b/src/mess/machine/c64/kingsoft.c index 24dbf15892b..990e06153b8 100644 --- a/src/mess/machine/c64_kingsoft.c +++ b/src/mess/machine/c64/kingsoft.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_kingsoft.h" +#include "kingsoft.h" diff --git a/src/mess/machine/c64_kingsoft.h b/src/mess/machine/c64/kingsoft.h index a831db55946..22c2a33690e 100644 --- a/src/mess/machine/c64_kingsoft.h +++ b/src/mess/machine/c64/kingsoft.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_mach5.c b/src/mess/machine/c64/mach5.c index 5db0a040057..2aceae67990 100644 --- a/src/mess/machine/c64_mach5.c +++ b/src/mess/machine/c64/mach5.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_mach5.h" +#include "mach5.h" diff --git a/src/mess/machine/c64_mach5.h b/src/mess/machine/c64/mach5.h index 03282ae5cae..f45b743174e 100644 --- a/src/mess/machine/c64_mach5.h +++ b/src/mess/machine/c64/mach5.h @@ -13,7 +13,7 @@ #define __MACH5__ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_magic_desk.c b/src/mess/machine/c64/magic_desk.c index 7c3e3a89758..a0342949a10 100644 --- a/src/mess/machine/c64_magic_desk.c +++ b/src/mess/machine/c64/magic_desk.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_magic_desk.h" +#include "magic_desk.h" diff --git a/src/mess/machine/c64_magic_desk.h b/src/mess/machine/c64/magic_desk.h index 1cad9b2f84a..e22b25d558a 100644 --- a/src/mess/machine/c64_magic_desk.h +++ b/src/mess/machine/c64/magic_desk.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_magic_formel.c b/src/mess/machine/c64/magic_formel.c index b6123e01a1f..afd040c03d1 100644 --- a/src/mess/machine/c64_magic_formel.c +++ b/src/mess/machine/c64/magic_formel.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_magic_formel.h" +#include "magic_formel.h" diff --git a/src/mess/machine/c64_magic_formel.h b/src/mess/machine/c64/magic_formel.h index 2ddccbdafbb..548f743f611 100644 --- a/src/mess/machine/c64_magic_formel.h +++ b/src/mess/machine/c64/magic_formel.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/6821pia.h" diff --git a/src/mess/machine/c64_magic_voice.c b/src/mess/machine/c64/magic_voice.c index 4204870b287..c9ca300def7 100644 --- a/src/mess/machine/c64_magic_voice.c +++ b/src/mess/machine/c64/magic_voice.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_magic_voice.h" +#include "magic_voice.h" diff --git a/src/mess/machine/c64_magic_voice.h b/src/mess/machine/c64/magic_voice.h index 07a2a9dc5f5..a2526d38588 100644 --- a/src/mess/machine/c64_magic_voice.h +++ b/src/mess/machine/c64/magic_voice.h @@ -14,7 +14,7 @@ #include "emu.h" #include "machine/6525tpi.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/cbmipt.h" #include "sound/t6721a.h" diff --git a/src/mess/machine/c64_midi_maplin.c b/src/mess/machine/c64/midi_maplin.c index a093d47962d..3b85e74b312 100644 --- a/src/mess/machine/c64_midi_maplin.c +++ b/src/mess/machine/c64/midi_maplin.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_midi_maplin.h" +#include "midi_maplin.h" diff --git a/src/mess/machine/c64_midi_maplin.h b/src/mess/machine/c64/midi_maplin.h index 896a560344e..813201954d8 100644 --- a/src/mess/machine/c64_midi_maplin.h +++ b/src/mess/machine/c64/midi_maplin.h @@ -13,7 +13,7 @@ #define __C64_MIDI_MAPLIN__ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/6850acia.h" #include "machine/serial.h" #include "machine/midiinport.h" diff --git a/src/mess/machine/c64_midi_namesoft.c b/src/mess/machine/c64/midi_namesoft.c index 52bc988e32a..672dfdea980 100644 --- a/src/mess/machine/c64_midi_namesoft.c +++ b/src/mess/machine/c64/midi_namesoft.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_midi_namesoft.h" +#include "midi_namesoft.h" diff --git a/src/mess/machine/c64_midi_namesoft.h b/src/mess/machine/c64/midi_namesoft.h index 740b349776a..748fec9e373 100644 --- a/src/mess/machine/c64_midi_namesoft.h +++ b/src/mess/machine/c64/midi_namesoft.h @@ -13,7 +13,7 @@ #define __C64_MIDI_NAMESOFT__ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/6850acia.h" #include "machine/serial.h" #include "machine/midiinport.h" diff --git a/src/mess/machine/c64_midi_passport.c b/src/mess/machine/c64/midi_passport.c index e8955558ff3..a3074c1ae20 100644 --- a/src/mess/machine/c64_midi_passport.c +++ b/src/mess/machine/c64/midi_passport.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_midi_passport.h" +#include "midi_passport.h" diff --git a/src/mess/machine/c64_midi_passport.h b/src/mess/machine/c64/midi_passport.h index 8264edc7897..14cd2ca35ff 100644 --- a/src/mess/machine/c64_midi_passport.h +++ b/src/mess/machine/c64/midi_passport.h @@ -13,7 +13,7 @@ #define __C64_MIDI_PASSPORT__ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/6840ptm.h" #include "machine/6850acia.h" #include "machine/serial.h" diff --git a/src/mess/machine/c64_midi_sci.c b/src/mess/machine/c64/midi_sci.c index 4eaf29b5462..4e0f4d6da37 100644 --- a/src/mess/machine/c64_midi_sci.c +++ b/src/mess/machine/c64/midi_sci.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_midi_sci.h" +#include "midi_sci.h" diff --git a/src/mess/machine/c64_midi_sci.h b/src/mess/machine/c64/midi_sci.h index c93f3145b60..3f7e10e99df 100644 --- a/src/mess/machine/c64_midi_sci.h +++ b/src/mess/machine/c64/midi_sci.h @@ -13,7 +13,7 @@ #define __C64_MIDI_SCI__ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/6850acia.h" #include "machine/serial.h" #include "machine/midiinport.h" diff --git a/src/mess/machine/c64_midi_siel.c b/src/mess/machine/c64/midi_siel.c index 8f9c9362f11..7b587b97570 100644 --- a/src/mess/machine/c64_midi_siel.c +++ b/src/mess/machine/c64/midi_siel.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_midi_siel.h" +#include "midi_siel.h" diff --git a/src/mess/machine/c64_midi_siel.h b/src/mess/machine/c64/midi_siel.h index 38a0d68616e..62e194ef495 100644 --- a/src/mess/machine/c64_midi_siel.h +++ b/src/mess/machine/c64/midi_siel.h @@ -13,7 +13,7 @@ #define __C64_MIDI_SIEL__ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/6850acia.h" #include "machine/serial.h" #include "machine/midiinport.h" diff --git a/src/mess/machine/c64_mikro_assembler.c b/src/mess/machine/c64/mikro_assembler.c index fd836691025..83433d42788 100644 --- a/src/mess/machine/c64_mikro_assembler.c +++ b/src/mess/machine/c64/mikro_assembler.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_mikro_assembler.h" +#include "mikro_assembler.h" diff --git a/src/mess/machine/c64_mikro_assembler.h b/src/mess/machine/c64/mikro_assembler.h index 75eb71050c1..d9302c614ab 100644 --- a/src/mess/machine/c64_mikro_assembler.h +++ b/src/mess/machine/c64/mikro_assembler.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_multiscreen.c b/src/mess/machine/c64/multiscreen.c index 46dfeb399a9..c75c7dd9501 100644 --- a/src/mess/machine/c64_multiscreen.c +++ b/src/mess/machine/c64/multiscreen.c @@ -57,7 +57,7 @@ */ -#include "c64_multiscreen.h" +#include "multiscreen.h" diff --git a/src/mess/machine/c64_multiscreen.h b/src/mess/machine/c64/multiscreen.h index 189e746c7d0..e6ae7be96c8 100644 --- a/src/mess/machine/c64_multiscreen.h +++ b/src/mess/machine/c64/multiscreen.h @@ -16,7 +16,7 @@ #include "emu.h" #include "cpu/m6800/m6800.h" #include "machine/6821pia.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_neoram.c b/src/mess/machine/c64/neoram.c index c8c325b5180..cd91adf425c 100644 --- a/src/mess/machine/c64_neoram.c +++ b/src/mess/machine/c64/neoram.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_neoram.h" +#include "neoram.h" diff --git a/src/mess/machine/c64_neoram.h b/src/mess/machine/c64/neoram.h index e535cfd1fc3..e0c7fd3e93d 100644 --- a/src/mess/machine/c64_neoram.h +++ b/src/mess/machine/c64/neoram.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_ocean.c b/src/mess/machine/c64/ocean.c index 41884f06e3f..8bb881f3202 100644 --- a/src/mess/machine/c64_ocean.c +++ b/src/mess/machine/c64/ocean.c @@ -29,7 +29,7 @@ */ -#include "c64_ocean.h" +#include "ocean.h" diff --git a/src/mess/machine/c64_ocean.h b/src/mess/machine/c64/ocean.h index c1b46113300..99626fb5e07 100644 --- a/src/mess/machine/c64_ocean.h +++ b/src/mess/machine/c64/ocean.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_pagefox.c b/src/mess/machine/c64/pagefox.c index 3fa608e4a90..4d22263be4d 100644 --- a/src/mess/machine/c64_pagefox.c +++ b/src/mess/machine/c64/pagefox.c @@ -29,7 +29,7 @@ */ -#include "c64_pagefox.h" +#include "pagefox.h" diff --git a/src/mess/machine/c64_pagefox.h b/src/mess/machine/c64/pagefox.h index 214c1ff692b..b8c14b78942 100644 --- a/src/mess/machine/c64_pagefox.h +++ b/src/mess/machine/c64/pagefox.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_prophet64.c b/src/mess/machine/c64/prophet64.c index 560d3284b63..fab038f6f46 100644 --- a/src/mess/machine/c64_prophet64.c +++ b/src/mess/machine/c64/prophet64.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_prophet64.h" +#include "prophet64.h" diff --git a/src/mess/machine/c64_prophet64.h b/src/mess/machine/c64/prophet64.h index dab92f3246f..131e4bdf922 100644 --- a/src/mess/machine/c64_prophet64.h +++ b/src/mess/machine/c64/prophet64.h @@ -13,7 +13,7 @@ #define __PROPHET64__ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_ps64.c b/src/mess/machine/c64/ps64.c index a27b6a772c7..b2f1a0115d0 100644 --- a/src/mess/machine/c64_ps64.c +++ b/src/mess/machine/c64/ps64.c @@ -41,7 +41,7 @@ */ -#include "c64_ps64.h" +#include "ps64.h" diff --git a/src/mess/machine/c64_ps64.h b/src/mess/machine/c64/ps64.h index 4333512229c..4a957aeb684 100644 --- a/src/mess/machine/c64_ps64.h +++ b/src/mess/machine/c64/ps64.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "sound/votrax.h" diff --git a/src/mess/machine/c64_reu.c b/src/mess/machine/c64/reu.c index cfce656bb57..6f6444e0768 100644 --- a/src/mess/machine/c64_reu.c +++ b/src/mess/machine/c64/reu.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_reu.h" +#include "reu.h" diff --git a/src/mess/machine/c64_reu.h b/src/mess/machine/c64/reu.h index 697a65c7458..95f87cb5a6d 100644 --- a/src/mess/machine/c64_reu.h +++ b/src/mess/machine/c64/reu.h @@ -15,7 +15,7 @@ #include "emu.h" #include "imagedev/cartslot.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/mos8726.h" diff --git a/src/mess/machine/c64_rex.c b/src/mess/machine/c64/rex.c index 8f1f697b929..5e0980e087d 100644 --- a/src/mess/machine/c64_rex.c +++ b/src/mess/machine/c64/rex.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_rex.h" +#include "rex.h" diff --git a/src/mess/machine/c64_rex.h b/src/mess/machine/c64/rex.h index 8dac503e866..b7df74c9e24 100644 --- a/src/mess/machine/c64_rex.h +++ b/src/mess/machine/c64/rex.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_rex_ep256.c b/src/mess/machine/c64/rex_ep256.c index ffa3c5f0da4..e6fe4325d6f 100644 --- a/src/mess/machine/c64_rex_ep256.c +++ b/src/mess/machine/c64/rex_ep256.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_rex_ep256.h" +#include "rex_ep256.h" diff --git a/src/mess/machine/c64_rex_ep256.h b/src/mess/machine/c64/rex_ep256.h index fd670cd447b..da1d89c38ea 100644 --- a/src/mess/machine/c64_rex_ep256.h +++ b/src/mess/machine/c64/rex_ep256.h @@ -15,7 +15,7 @@ #include "emu.h" #include "imagedev/cartslot.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_ross.c b/src/mess/machine/c64/ross.c index 0022b4acd72..9e33f0a2a7b 100644 --- a/src/mess/machine/c64_ross.c +++ b/src/mess/machine/c64/ross.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_ross.h" +#include "ross.h" diff --git a/src/mess/machine/c64_ross.h b/src/mess/machine/c64/ross.h index b407ba1081c..12b8e98740e 100644 --- a/src/mess/machine/c64_ross.h +++ b/src/mess/machine/c64/ross.h @@ -15,7 +15,7 @@ #include "emu.h" #include "imagedev/cartslot.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_sfx_sound_expander.c b/src/mess/machine/c64/sfx_sound_expander.c index f9c364cc0b6..1e74d958208 100644 --- a/src/mess/machine/c64_sfx_sound_expander.c +++ b/src/mess/machine/c64/sfx_sound_expander.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_sfx_sound_expander.h" +#include "sfx_sound_expander.h" diff --git a/src/mess/machine/c64_sfx_sound_expander.h b/src/mess/machine/c64/sfx_sound_expander.h index af17020471c..091e26b80f9 100644 --- a/src/mess/machine/c64_sfx_sound_expander.h +++ b/src/mess/machine/c64/sfx_sound_expander.h @@ -13,7 +13,7 @@ #define __SFX_SOUND_EXPANDER__ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/cbmipt.h" #include "sound/3526intf.h" diff --git a/src/mess/machine/c64_silverrock.c b/src/mess/machine/c64/silverrock.c index 92b5a7677b8..43465106e6e 100644 --- a/src/mess/machine/c64_silverrock.c +++ b/src/mess/machine/c64/silverrock.c @@ -28,7 +28,7 @@ */ -#include "c64_silverrock.h" +#include "silverrock.h" diff --git a/src/mess/machine/c64_silverrock.h b/src/mess/machine/c64/silverrock.h index f6c303db487..9fbfb279866 100644 --- a/src/mess/machine/c64_silverrock.h +++ b/src/mess/machine/c64/silverrock.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_simons_basic.c b/src/mess/machine/c64/simons_basic.c index f597128470f..26171a50171 100644 --- a/src/mess/machine/c64_simons_basic.c +++ b/src/mess/machine/c64/simons_basic.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_simons_basic.h" +#include "simons_basic.h" diff --git a/src/mess/machine/c64_simons_basic.h b/src/mess/machine/c64/simons_basic.h index deb6fd87c1d..c020a5b6475 100644 --- a/src/mess/machine/c64_simons_basic.h +++ b/src/mess/machine/c64/simons_basic.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_stardos.c b/src/mess/machine/c64/stardos.c index e9cfa9be972..7fb925001cc 100644 --- a/src/mess/machine/c64_stardos.c +++ b/src/mess/machine/c64/stardos.c @@ -27,7 +27,7 @@ */ -#include "c64_stardos.h" +#include "stardos.h" diff --git a/src/mess/machine/c64_stardos.h b/src/mess/machine/c64/stardos.h index 3b139671dad..7ecd82fb821 100644 --- a/src/mess/machine/c64_stardos.h +++ b/src/mess/machine/c64/stardos.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/6821pia.h" diff --git a/src/mess/machine/c64_std.c b/src/mess/machine/c64/std.c index b4b083aadcc..95f7930e69b 100644 --- a/src/mess/machine/c64_std.c +++ b/src/mess/machine/c64/std.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_std.h" +#include "std.h" diff --git a/src/mess/machine/c64_std.h b/src/mess/machine/c64/std.h index 103aa975679..02578b1a4ea 100644 --- a/src/mess/machine/c64_std.h +++ b/src/mess/machine/c64/std.h @@ -15,7 +15,7 @@ #include "emu.h" #include "imagedev/cartslot.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_structured_basic.c b/src/mess/machine/c64/structured_basic.c index 880c1977376..12232b627ac 100644 --- a/src/mess/machine/c64_structured_basic.c +++ b/src/mess/machine/c64/structured_basic.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_structured_basic.h" +#include "structured_basic.h" diff --git a/src/mess/machine/c64_structured_basic.h b/src/mess/machine/c64/structured_basic.h index 9e5c9b6a15f..e6d63240f39 100644 --- a/src/mess/machine/c64_structured_basic.h +++ b/src/mess/machine/c64/structured_basic.h @@ -15,7 +15,7 @@ #include "emu.h" #include "imagedev/cartslot.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_super_explode.c b/src/mess/machine/c64/super_explode.c index b50ffb9bd0a..f73585870da 100644 --- a/src/mess/machine/c64_super_explode.c +++ b/src/mess/machine/c64/super_explode.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_super_explode.h" +#include "super_explode.h" diff --git a/src/mess/machine/c64_super_explode.h b/src/mess/machine/c64/super_explode.h index 52eb646c10f..b3d354569e5 100644 --- a/src/mess/machine/c64_super_explode.h +++ b/src/mess/machine/c64/super_explode.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_super_games.c b/src/mess/machine/c64/super_games.c index 5f68a33a718..6444db71909 100644 --- a/src/mess/machine/c64_super_games.c +++ b/src/mess/machine/c64/super_games.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_super_games.h" +#include "super_games.h" diff --git a/src/mess/machine/c64_super_games.h b/src/mess/machine/c64/super_games.h index 155f16ad044..4dd2ef1953d 100644 --- a/src/mess/machine/c64_super_games.h +++ b/src/mess/machine/c64/super_games.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_supercpu.c b/src/mess/machine/c64/supercpu.c index a0f3dcdc9e1..ce31ee70d24 100644 --- a/src/mess/machine/c64_supercpu.c +++ b/src/mess/machine/c64/supercpu.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_supercpu.h" +#include "supercpu.h" diff --git a/src/mess/machine/c64_supercpu.h b/src/mess/machine/c64/supercpu.h index 213a0c6ac76..537e73e3ab7 100644 --- a/src/mess/machine/c64_supercpu.h +++ b/src/mess/machine/c64/supercpu.h @@ -13,7 +13,7 @@ #define __SUPERCPU__ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/cbmipt.h" #include "cpu/g65816/g65816.h" diff --git a/src/mess/machine/c64_sw8k.c b/src/mess/machine/c64/sw8k.c index f070eeff91d..16ddcb6dbcc 100644 --- a/src/mess/machine/c64_sw8k.c +++ b/src/mess/machine/c64/sw8k.c @@ -30,7 +30,7 @@ */ -#include "c64_sw8k.h" +#include "sw8k.h" diff --git a/src/mess/machine/c64_sw8k.h b/src/mess/machine/c64/sw8k.h index ed5d9934df7..ad53bcde062 100644 --- a/src/mess/machine/c64_sw8k.h +++ b/src/mess/machine/c64/sw8k.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_swiftlink.c b/src/mess/machine/c64/swiftlink.c index 92e4f30f436..1e0317c601b 100644 --- a/src/mess/machine/c64_swiftlink.c +++ b/src/mess/machine/c64/swiftlink.c @@ -13,7 +13,7 @@ */ -#include "c64_swiftlink.h" +#include "swiftlink.h" diff --git a/src/mess/machine/c64_swiftlink.h b/src/mess/machine/c64/swiftlink.h index 68158736d03..347af0b4ed6 100644 --- a/src/mess/machine/c64_swiftlink.h +++ b/src/mess/machine/c64/swiftlink.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/mos6551.h" #include "machine/serial.h" diff --git a/src/mess/machine/c64_system3.c b/src/mess/machine/c64/system3.c index 73cdf4e9ae1..0acc6fd5f85 100644 --- a/src/mess/machine/c64_system3.c +++ b/src/mess/machine/c64/system3.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_system3.h" +#include "system3.h" diff --git a/src/mess/machine/c64_system3.h b/src/mess/machine/c64/system3.h index 04ca3bb87bc..286ed9a14c6 100644 --- a/src/mess/machine/c64_system3.h +++ b/src/mess/machine/c64/system3.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_tdos.c b/src/mess/machine/c64/tdos.c index fa339b1e258..95cf6ea3bd5 100644 --- a/src/mess/machine/c64_tdos.c +++ b/src/mess/machine/c64/tdos.c @@ -52,7 +52,7 @@ */ -#include "c64_tdos.h" +#include "tdos.h" diff --git a/src/mess/machine/c64_tdos.h b/src/mess/machine/c64/tdos.h index eeabbd23fba..eea6bef25b3 100644 --- a/src/mess/machine/c64_tdos.h +++ b/src/mess/machine/c64/tdos.h @@ -13,7 +13,7 @@ #define __TDOS__ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/cbmipt.h" #include "machine/mc6852.h" diff --git a/src/mess/machine/c64_turbo232.c b/src/mess/machine/c64/turbo232.c index c87a84b97df..78588bd9910 100644 --- a/src/mess/machine/c64_turbo232.c +++ b/src/mess/machine/c64/turbo232.c @@ -13,7 +13,7 @@ */ -#include "c64_turbo232.h" +#include "turbo232.h" diff --git a/src/mess/machine/c64_turbo232.h b/src/mess/machine/c64/turbo232.h index 523aef49867..d5b0e10178b 100644 --- a/src/mess/machine/c64_turbo232.h +++ b/src/mess/machine/c64/turbo232.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "machine/mos6551.h" #include "machine/null_modem.h" #include "machine/serial.h" diff --git a/src/mess/machine/c64user.c b/src/mess/machine/c64/user.c index 305c7153f19..ca09ef1af29 100644 --- a/src/mess/machine/c64user.c +++ b/src/mess/machine/c64/user.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "machine/c64user.h" +#include "machine/c64/user.h" diff --git a/src/mess/machine/c64user.h b/src/mess/machine/c64/user.h index 905c97312bf..905c97312bf 100644 --- a/src/mess/machine/c64user.h +++ b/src/mess/machine/c64/user.h diff --git a/src/mess/machine/c64_vic1011.c b/src/mess/machine/c64/vic1011.c index 8d683c409d7..fa173674fb0 100644 --- a/src/mess/machine/c64_vic1011.c +++ b/src/mess/machine/c64/vic1011.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_vic1011.h" +#include "vic1011.h" diff --git a/src/mess/machine/c64_vic1011.h b/src/mess/machine/c64/vic1011.h index 9012f5109b2..5ec257e10c8 100644 --- a/src/mess/machine/c64_vic1011.h +++ b/src/mess/machine/c64/vic1011.h @@ -13,7 +13,7 @@ #define __C64_VIC1011__ #include "emu.h" -#include "machine/c64user.h" +#include "machine/c64/user.h" #include "machine/serial.h" diff --git a/src/mess/machine/c64_vizastar.c b/src/mess/machine/c64/vizastar.c index 9a9529d4a5b..8dc4013911e 100644 --- a/src/mess/machine/c64_vizastar.c +++ b/src/mess/machine/c64/vizastar.c @@ -27,7 +27,7 @@ */ -#include "c64_vizastar.h" +#include "vizastar.h" diff --git a/src/mess/machine/c64_vizastar.h b/src/mess/machine/c64/vizastar.h index 7ce80f632f5..5661c0847fb 100644 --- a/src/mess/machine/c64_vizastar.h +++ b/src/mess/machine/c64/vizastar.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_vw64.c b/src/mess/machine/c64/vw64.c index aca1433b70d..b2720d50bc9 100644 --- a/src/mess/machine/c64_vw64.c +++ b/src/mess/machine/c64/vw64.c @@ -31,7 +31,7 @@ */ -#include "c64_vw64.h" +#include "vw64.h" diff --git a/src/mess/machine/c64_vw64.h b/src/mess/machine/c64/vw64.h index 9b0f2170938..a24539c4645 100644 --- a/src/mess/machine/c64_vw64.h +++ b/src/mess/machine/c64/vw64.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_warp_speed.c b/src/mess/machine/c64/warp_speed.c index be5c6dcac29..6dbf841acc8 100644 --- a/src/mess/machine/c64_warp_speed.c +++ b/src/mess/machine/c64/warp_speed.c @@ -29,7 +29,7 @@ */ -#include "c64_warp_speed.h" +#include "warp_speed.h" diff --git a/src/mess/machine/c64_warp_speed.h b/src/mess/machine/c64/warp_speed.h index 3d83c0e3c3c..a92d014d2eb 100644 --- a/src/mess/machine/c64_warp_speed.h +++ b/src/mess/machine/c64/warp_speed.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_westermann.c b/src/mess/machine/c64/westermann.c index 407babca1ac..376cb5f7fb5 100644 --- a/src/mess/machine/c64_westermann.c +++ b/src/mess/machine/c64/westermann.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_westermann.h" +#include "westermann.h" diff --git a/src/mess/machine/c64_westermann.h b/src/mess/machine/c64/westermann.h index b7b77b1c38c..20e010464a4 100644 --- a/src/mess/machine/c64_westermann.h +++ b/src/mess/machine/c64/westermann.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/c64_xl80.c b/src/mess/machine/c64/xl80.c index 55467bc2ca0..488a8f8169a 100644 --- a/src/mess/machine/c64_xl80.c +++ b/src/mess/machine/c64/xl80.c @@ -34,7 +34,7 @@ Notes: */ -#include "c64_xl80.h" +#include "xl80.h" diff --git a/src/mess/machine/c64_xl80.h b/src/mess/machine/c64/xl80.h index 4085478210e..f952a32e8eb 100644 --- a/src/mess/machine/c64_xl80.h +++ b/src/mess/machine/c64/xl80.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" #include "video/mc6845.h" diff --git a/src/mess/machine/c64_zaxxon.c b/src/mess/machine/c64/zaxxon.c index 8148e83d219..247870988af 100644 --- a/src/mess/machine/c64_zaxxon.c +++ b/src/mess/machine/c64/zaxxon.c @@ -7,7 +7,7 @@ **********************************************************************/ -#include "c64_zaxxon.h" +#include "zaxxon.h" diff --git a/src/mess/machine/c64_zaxxon.h b/src/mess/machine/c64/zaxxon.h index 2b4b50a71d2..c8e9c5642e8 100644 --- a/src/mess/machine/c64_zaxxon.h +++ b/src/mess/machine/c64/zaxxon.h @@ -14,7 +14,7 @@ #include "emu.h" -#include "machine/c64exp.h" +#include "machine/c64/exp.h" diff --git a/src/mess/machine/cbmipt.c b/src/mess/machine/cbmipt.c index 11c154b2ef1..24fe4cb2211 100644 --- a/src/mess/machine/cbmipt.c +++ b/src/mess/machine/cbmipt.c @@ -18,7 +18,6 @@ #include "emu.h" #include "machine/cbmipt.h" -#include "machine/c64_neoram.h" /***************************** Commodore 64 **************************************** diff --git a/src/mess/machine/cbmipt.h b/src/mess/machine/cbmipt.h index 8dacc127b7c..4a4da3ee3ad 100644 --- a/src/mess/machine/cbmipt.h +++ b/src/mess/machine/cbmipt.h @@ -4,74 +4,74 @@ #define CBMIPT_H_ #include "machine/c2n.h" -#include "machine/c64_4cga.h" -#include "machine/c64_4dxh.h" -#include "machine/c64_4ksa.h" -#include "machine/c64_4tba.h" -#include "machine/c64_16kb.h" -#include "machine/c64_bn1541.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_geocable.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_neoram.h" -#include "machine/c64_ocean.h" -#include "machine/c64_pagefox.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_vic1011.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/c64/4cga.h" +#include "machine/c64/4dxh.h" +#include "machine/c64/4ksa.h" +#include "machine/c64/4tba.h" +#include "machine/c64/16kb.h" +#include "machine/c64/bn1541.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/geocable.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/neoram.h" +#include "machine/c64/ocean.h" +#include "machine/c64/pagefox.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/vic1011.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 "machine/cbm2_std.h" #include "machine/cbm2_24k.h" diff --git a/src/mess/mess.mak b/src/mess/mess.mak index 3ba4cd7d0a0..9d844e09cf1 100644 --- a/src/mess/mess.mak +++ b/src/mess/mess.mak @@ -1065,76 +1065,76 @@ $(MESSOBJ)/cbm.a: \ $(MESS_MACHINE)/shark.o \ $(MESS_DRIVERS)/c64.o \ $(MESS_DRIVERS)/c64dtv.o \ - $(MESS_MACHINE)/c64exp.o \ - $(MESS_MACHINE)/c64user.o \ - $(MESS_MACHINE)/c64_4cga.o \ - $(MESS_MACHINE)/c64_4dxh.o \ - $(MESS_MACHINE)/c64_4ksa.o \ - $(MESS_MACHINE)/c64_4tba.o \ - $(MESS_MACHINE)/c64_16kb.o \ - $(MESS_MACHINE)/c64_bn1541.o\ - $(MESS_MACHINE)/c64_comal80.o \ - $(MESS_MACHINE)/c64_cpm.o \ - $(MESS_MACHINE)/c64_currah_speech.o \ - $(MESS_MACHINE)/c64_dela_ep256.o \ - $(MESS_MACHINE)/c64_dela_ep64.o \ - $(MESS_MACHINE)/c64_dela_ep7x8.o \ - $(MESS_MACHINE)/c64_dinamic.o \ - $(MESS_MACHINE)/c64_dqbb.o \ - $(MESS_MACHINE)/c64_easy_calc_result.o \ - $(MESS_MACHINE)/c64_easyflash.o \ - $(MESS_MACHINE)/c64_epyx_fast_load.o \ - $(MESS_MACHINE)/c64_exos.o \ - $(MESS_MACHINE)/c64_fcc.o \ - $(MESS_MACHINE)/c64_final.o \ - $(MESS_MACHINE)/c64_final3.o\ - $(MESS_MACHINE)/c64_fun_play.o \ - $(MESS_MACHINE)/c64_geocable.o \ - $(MESS_MACHINE)/c64_georam.o \ - $(MESS_MACHINE)/c64_ide64.o \ - $(MESS_MACHINE)/c64_ieee488.o \ - $(MESS_MACHINE)/c64_kingsoft.o \ - $(MESS_MACHINE)/c64_mach5.o \ - $(MESS_MACHINE)/c64_magic_desk.o \ - $(MESS_MACHINE)/c64_magic_formel.o \ - $(MESS_MACHINE)/c64_magic_voice.o \ - $(MESS_MACHINE)/c64_midi_maplin.o \ - $(MESS_MACHINE)/c64_midi_namesoft.o \ - $(MESS_MACHINE)/c64_midi_passport.o \ - $(MESS_MACHINE)/c64_midi_sci.o \ - $(MESS_MACHINE)/c64_midi_siel.o \ - $(MESS_MACHINE)/c64_mikro_assembler.o \ - $(MESS_MACHINE)/c64_multiscreen.o \ - $(MESS_MACHINE)/c64_neoram.o\ - $(MESS_MACHINE)/c64_ocean.o \ - $(MESS_MACHINE)/c64_pagefox.o \ - $(MESS_MACHINE)/c64_prophet64.o \ - $(MESS_MACHINE)/c64_ps64.o \ - $(MESS_MACHINE)/c64_reu.o \ - $(MESS_MACHINE)/c64_rex.o \ - $(MESS_MACHINE)/c64_rex_ep256.o \ - $(MESS_MACHINE)/c64_ross.o \ - $(MESS_MACHINE)/c64_sfx_sound_expander.o \ - $(MESS_MACHINE)/c64_silverrock.o \ - $(MESS_MACHINE)/c64_simons_basic.o \ - $(MESS_MACHINE)/c64_stardos.o \ - $(MESS_MACHINE)/c64_std.o \ - $(MESS_MACHINE)/c64_structured_basic.o \ - $(MESS_MACHINE)/c64_super_explode.o \ - $(MESS_MACHINE)/c64_super_games.o \ - $(MESS_MACHINE)/c64_supercpu.o \ - $(MESS_MACHINE)/c64_sw8k.o \ - $(MESS_MACHINE)/c64_swiftlink.o \ - $(MESS_MACHINE)/c64_system3.o \ - $(MESS_MACHINE)/c64_tdos.o \ - $(MESS_MACHINE)/c64_turbo232.o \ - $(MESS_MACHINE)/c64_vic1011.o \ - $(MESS_MACHINE)/c64_vizastar.o \ - $(MESS_MACHINE)/c64_vw64.o \ - $(MESS_MACHINE)/c64_warp_speed.o \ - $(MESS_MACHINE)/c64_westermann.o \ - $(MESS_MACHINE)/c64_xl80.o \ - $(MESS_MACHINE)/c64_zaxxon.o\ + $(MESS_MACHINE)/c64/exp.o \ + $(MESS_MACHINE)/c64/user.o \ + $(MESS_MACHINE)/c64/4cga.o \ + $(MESS_MACHINE)/c64/4dxh.o \ + $(MESS_MACHINE)/c64/4ksa.o \ + $(MESS_MACHINE)/c64/4tba.o \ + $(MESS_MACHINE)/c64/16kb.o \ + $(MESS_MACHINE)/c64/bn1541.o\ + $(MESS_MACHINE)/c64/comal80.o \ + $(MESS_MACHINE)/c64/cpm.o \ + $(MESS_MACHINE)/c64/currah_speech.o \ + $(MESS_MACHINE)/c64/dela_ep256.o \ + $(MESS_MACHINE)/c64/dela_ep64.o \ + $(MESS_MACHINE)/c64/dela_ep7x8.o \ + $(MESS_MACHINE)/c64/dinamic.o \ + $(MESS_MACHINE)/c64/dqbb.o \ + $(MESS_MACHINE)/c64/easy_calc_result.o \ + $(MESS_MACHINE)/c64/easyflash.o \ + $(MESS_MACHINE)/c64/epyx_fast_load.o \ + $(MESS_MACHINE)/c64/exos.o \ + $(MESS_MACHINE)/c64/fcc.o \ + $(MESS_MACHINE)/c64/final.o \ + $(MESS_MACHINE)/c64/final3.o\ + $(MESS_MACHINE)/c64/fun_play.o \ + $(MESS_MACHINE)/c64/geocable.o \ + $(MESS_MACHINE)/c64/georam.o \ + $(MESS_MACHINE)/c64/ide64.o \ + $(MESS_MACHINE)/c64/ieee488.o \ + $(MESS_MACHINE)/c64/kingsoft.o \ + $(MESS_MACHINE)/c64/mach5.o \ + $(MESS_MACHINE)/c64/magic_desk.o \ + $(MESS_MACHINE)/c64/magic_formel.o \ + $(MESS_MACHINE)/c64/magic_voice.o \ + $(MESS_MACHINE)/c64/midi_maplin.o \ + $(MESS_MACHINE)/c64/midi_namesoft.o \ + $(MESS_MACHINE)/c64/midi_passport.o \ + $(MESS_MACHINE)/c64/midi_sci.o \ + $(MESS_MACHINE)/c64/midi_siel.o \ + $(MESS_MACHINE)/c64/mikro_assembler.o \ + $(MESS_MACHINE)/c64/multiscreen.o \ + $(MESS_MACHINE)/c64/neoram.o\ + $(MESS_MACHINE)/c64/ocean.o \ + $(MESS_MACHINE)/c64/pagefox.o \ + $(MESS_MACHINE)/c64/prophet64.o \ + $(MESS_MACHINE)/c64/ps64.o \ + $(MESS_MACHINE)/c64/reu.o \ + $(MESS_MACHINE)/c64/rex.o \ + $(MESS_MACHINE)/c64/rex_ep256.o \ + $(MESS_MACHINE)/c64/ross.o \ + $(MESS_MACHINE)/c64/sfx_sound_expander.o \ + $(MESS_MACHINE)/c64/silverrock.o \ + $(MESS_MACHINE)/c64/simons_basic.o \ + $(MESS_MACHINE)/c64/stardos.o \ + $(MESS_MACHINE)/c64/std.o \ + $(MESS_MACHINE)/c64/structured_basic.o \ + $(MESS_MACHINE)/c64/super_explode.o \ + $(MESS_MACHINE)/c64/super_games.o \ + $(MESS_MACHINE)/c64/supercpu.o \ + $(MESS_MACHINE)/c64/sw8k.o \ + $(MESS_MACHINE)/c64/swiftlink.o \ + $(MESS_MACHINE)/c64/system3.o \ + $(MESS_MACHINE)/c64/tdos.o \ + $(MESS_MACHINE)/c64/turbo232.o \ + $(MESS_MACHINE)/c64/vic1011.o \ + $(MESS_MACHINE)/c64/vizastar.o \ + $(MESS_MACHINE)/c64/vw64.o \ + $(MESS_MACHINE)/c64/warp_speed.o \ + $(MESS_MACHINE)/c64/westermann.o \ + $(MESS_MACHINE)/c64/xl80.o \ + $(MESS_MACHINE)/c64/zaxxon.o\ $(MESS_MACHINE)/interpod.o \ $(MESS_DRIVERS)/vic10.o \ $(MESS_MACHINE)/vic10exp.o \ diff --git a/src/mess/messcore.mak b/src/mess/messcore.mak index ca3f4702103..f25c1f8c304 100644 --- a/src/mess/messcore.mak +++ b/src/mess/messcore.mak @@ -55,6 +55,7 @@ OBJDIRS += \ $(MESS_DRIVERS) \ $(MESS_LAYOUT) \ $(MESS_MACHINE) \ + $(MESS_MACHINE)/c64 \ $(MESS_VIDEO) \ # System-specific directories |