From 202c33d5e4c3a99f4c1950e2f62f2d81bd44e5aa Mon Sep 17 00:00:00 2001 From: hap Date: Thu, 11 Apr 2024 22:30:50 +0200 Subject: [PATCH] ds8874: move to video folder (led driver chip), misc: remove folder from self #include --- scripts/src/machine.lua | 12 ------------ scripts/src/video.lua | 12 ++++++++++++ src/devices/machine/7200fifo.cpp | 2 +- src/devices/machine/74123.cpp | 3 ++- src/devices/machine/74148.cpp | 2 +- src/devices/machine/8042kbdc.cpp | 2 +- src/devices/machine/aicartc.cpp | 2 +- src/devices/machine/am9513.cpp | 2 +- src/devices/machine/am9519.cpp | 2 +- src/devices/machine/at.cpp | 4 +++- src/devices/machine/at28c16.cpp | 2 +- src/devices/machine/at28c64b.cpp | 2 +- src/devices/machine/bl_handhelds_menucontrol.cpp | 2 +- src/devices/machine/ch376.cpp | 2 +- src/devices/machine/chessmachine.cpp | 2 +- src/devices/machine/corvushd.cpp | 2 +- src/devices/machine/cs4031.cpp | 2 +- src/devices/machine/cs8221.cpp | 3 ++- src/devices/machine/cs8900a.cpp | 3 +-- src/devices/machine/cxd1095.cpp | 2 +- src/devices/machine/dp8573a.cpp | 2 +- src/devices/machine/ds1994.cpp | 2 +- src/devices/machine/ds2401.cpp | 2 +- src/devices/machine/eeprom.cpp | 2 +- src/devices/machine/eeprompar.cpp | 2 +- src/devices/machine/eepromser.cpp | 2 +- src/devices/machine/er1400.cpp | 2 +- src/devices/machine/er2055.cpp | 2 +- src/devices/machine/exorterm.cpp | 3 ++- src/devices/machine/f4702.cpp | 2 +- src/devices/machine/fdc37c665gt.cpp | 2 +- src/devices/machine/fdc37c93x.cpp | 2 +- src/devices/machine/genpc.cpp | 3 +-- src/devices/machine/i2cmem.cpp | 2 +- src/devices/machine/ie15.cpp | 2 +- src/devices/machine/ie15_kbd.cpp | 2 +- src/devices/machine/ins8250.cpp | 2 +- src/devices/machine/it8705f.cpp | 2 +- src/devices/machine/ldp1000.cpp | 2 +- src/devices/machine/ldp1450.cpp | 2 +- src/devices/machine/lpci.cpp | 4 ++-- src/devices/machine/m6m80011ap.cpp | 3 +-- src/devices/machine/mb14241.cpp | 2 +- src/devices/machine/mb8421.cpp | 2 +- src/devices/machine/mb87078.cpp | 2 +- src/devices/machine/mb89363b.cpp | 2 +- src/devices/machine/mc146818.cpp | 2 +- src/devices/machine/mc68328.cpp | 2 +- src/devices/machine/mm58174.cpp | 2 +- src/devices/machine/mm58274c.cpp | 2 +- src/devices/machine/mpu401.cpp | 3 ++- src/devices/machine/msm5001n.cpp | 2 +- src/devices/machine/msm6242.cpp | 2 +- src/devices/machine/msm6253.cpp | 2 +- src/devices/machine/nvram.cpp | 2 +- src/devices/machine/pc87306.cpp | 4 ++-- src/devices/machine/pc_fdc.cpp | 3 ++- src/devices/machine/pic8259.cpp | 2 +- src/devices/machine/pit8253.cpp | 2 +- src/devices/machine/r10696.cpp | 2 +- src/devices/machine/r10788.cpp | 2 +- src/devices/machine/ra17xx.cpp | 2 +- src/devices/machine/ripple_counter.cpp | 2 +- src/devices/machine/rp5h01.cpp | 2 +- src/devices/machine/rstbuf.cpp | 2 +- src/devices/machine/rtc9701.cpp | 2 +- src/devices/machine/s2636.cpp | 2 +- src/devices/machine/s3520cf.cpp | 3 +-- src/devices/machine/s3c2400.cpp | 2 +- src/devices/machine/s3c2410.cpp | 2 +- src/devices/machine/s3c2440.cpp | 2 +- src/devices/machine/s3c44b0.cpp | 2 +- src/devices/machine/scc66470.cpp | 1 + src/devices/machine/scc68070.cpp | 2 +- src/devices/machine/sda2006.cpp | 2 +- src/devices/machine/sensorboard.cpp | 2 +- src/devices/machine/smpc.cpp | 2 +- src/devices/machine/stvcd.cpp | 2 +- src/devices/machine/swtpc8212.cpp | 4 +++- src/devices/machine/tc009xlvc.cpp | 2 +- src/devices/machine/te7750.cpp | 2 +- src/devices/machine/terminal.cpp | 3 ++- src/devices/machine/ticket.cpp | 4 ++-- src/devices/machine/timekpr.cpp | 3 ++- src/devices/machine/timer.cpp | 2 +- src/devices/machine/tmc0999.cpp | 2 +- src/devices/machine/tms1024.cpp | 5 ++--- src/devices/machine/tube.cpp | 2 +- src/devices/machine/upc82c710.cpp | 2 +- src/devices/machine/upc82c711.cpp | 2 +- src/devices/machine/upd4991a.cpp | 2 +- src/devices/machine/upd4992.cpp | 3 +-- src/devices/machine/upd71071.cpp | 2 +- src/devices/machine/v3021.cpp | 2 +- src/devices/machine/vic_pl192.cpp | 2 +- src/devices/machine/w83787f.cpp | 3 +-- src/devices/machine/w83977tf.cpp | 2 +- src/devices/machine/wd1000.cpp | 2 +- src/devices/machine/wd11c00_17.cpp | 2 +- src/devices/machine/wd2010.cpp | 2 +- src/devices/machine/wd7600.cpp | 2 +- src/devices/machine/x2201.cpp | 2 +- src/devices/machine/x2212.cpp | 2 +- src/devices/machine/x76f041.cpp | 2 +- src/devices/machine/x76f100.cpp | 2 +- src/devices/sound/ad1848.cpp | 2 +- src/devices/sound/beep.cpp | 2 +- src/devices/sound/esqpump.cpp | 2 +- src/devices/sound/k056800.cpp | 4 +--- src/devices/sound/mos6560.cpp | 2 +- src/devices/sound/nes_apu_vt.cpp | 2 +- src/devices/sound/spkrdev.cpp | 2 +- src/devices/sound/uda1344.cpp | 2 +- src/devices/sound/upd7752.cpp | 3 +-- src/devices/sound/vgm_visualizer.cpp | 2 +- src/devices/video/315_5124.cpp | 2 +- src/devices/video/315_5313.cpp | 2 +- src/devices/video/am8052.cpp | 2 +- src/devices/video/ati_mach32.cpp | 2 +- src/devices/video/cgapal.cpp | 2 +- src/devices/video/crt9028.cpp | 3 ++- src/devices/video/dp8350.cpp | 3 ++- src/devices/{machine => video}/ds8874.cpp | 2 +- src/devices/{machine => video}/ds8874.h | 6 +++--- src/devices/video/gb_lcd.cpp | 2 +- src/devices/video/gf4500.cpp | 2 +- src/devices/video/hd44352.cpp | 2 +- src/devices/video/hd44780.cpp | 2 +- src/devices/video/hlcd0438.cpp | 2 +- src/devices/video/hlcd0488.cpp | 2 +- src/devices/video/hlcd0538.cpp | 2 +- src/devices/video/huc6272.cpp | 2 +- src/devices/video/lc7580.cpp | 2 +- src/devices/video/m50458.cpp | 2 +- src/devices/video/mb90082.cpp | 3 +-- src/devices/video/mb_vcu.cpp | 3 ++- src/devices/video/mc6847.cpp | 2 +- src/devices/video/md4330b.cpp | 2 +- src/devices/video/mm5445.cpp | 2 +- src/devices/video/nt7534.cpp | 2 +- src/devices/video/pcd8544.cpp | 2 +- src/devices/video/pcf2100.cpp | 2 +- src/devices/video/ppu2c0x.cpp | 2 +- src/devices/video/ppu2c0x_sh6578.cpp | 2 +- src/devices/video/ppu2c0x_vt.cpp | 2 +- src/devices/video/psx.cpp | 3 ++- src/devices/video/pwm.cpp | 2 +- src/devices/video/ramdac.cpp | 2 +- src/devices/video/sed1500.cpp | 2 +- src/devices/video/sed1520.cpp | 2 +- src/devices/video/snes_ppu.cpp | 2 +- src/devices/video/t6a04.cpp | 2 +- src/devices/video/tms9927.cpp | 2 +- src/devices/video/vic4567.cpp | 2 +- src/mame/handheld/hh_cops1.cpp | 2 +- src/mame/handheld/hh_tms1k.cpp | 2 +- 156 files changed, 187 insertions(+), 182 deletions(-) rename src/devices/{machine => video}/ds8874.cpp (98%) rename src/devices/{machine => video}/ds8874.h (91%) diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua index e302cd20d1a..5ca9f9d977d 100644 --- a/scripts/src/machine.lua +++ b/scripts/src/machine.lua @@ -1337,18 +1337,6 @@ if (MACHINES["DS75161A"]~=null) then } end ---------------------------------------------------- --- ---@src/devices/machine/ds8874.h,MACHINES["DS8874"] = true ---------------------------------------------------- - -if (MACHINES["DS8874"]~=null) then - files { - MAME_DIR .. "src/devices/machine/ds8874.cpp", - MAME_DIR .. "src/devices/machine/ds8874.h", - } -end - --------------------------------------------------- -- --@src/devices/machine/e0516.h,MACHINES["E0516"] = true diff --git a/scripts/src/video.lua b/scripts/src/video.lua index b002af9c818..7205f84dd46 100644 --- a/scripts/src/video.lua +++ b/scripts/src/video.lua @@ -199,6 +199,18 @@ if (VIDEOS["DP8350"]~=null) then } end +--------------------------------------------------- +-- +--@src/devices/video/ds8874.h,VIDEOS["DS8874"] = true +--------------------------------------------------- + +if (VIDEOS["DS8874"]~=null) then + files { + MAME_DIR .. "src/devices/video/ds8874.cpp", + MAME_DIR .. "src/devices/video/ds8874.h", + } +end + -------------------------------------------------- -- --@src/devices/video/ef9340_1.h,VIDEOS["EF9340_1"] = true diff --git a/src/devices/machine/7200fifo.cpp b/src/devices/machine/7200fifo.cpp index d40d7c71c4f..d411d7ededa 100644 --- a/src/devices/machine/7200fifo.cpp +++ b/src/devices/machine/7200fifo.cpp @@ -11,7 +11,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/7200fifo.h" +#include "7200fifo.h" DEFINE_DEVICE_TYPE(IDT7200, idt7200_device, "idt7200", "IDT7200 FIFO (256x9)") diff --git a/src/devices/machine/74123.cpp b/src/devices/machine/74123.cpp index 895d49a4a9e..9e57a805664 100644 --- a/src/devices/machine/74123.cpp +++ b/src/devices/machine/74123.cpp @@ -9,7 +9,8 @@ *****************************************************************************/ #include "emu.h" -#include "machine/74123.h" +#include "74123.h" + #include "machine/rescap.h" //#define VERBOSE 1 diff --git a/src/devices/machine/74148.cpp b/src/devices/machine/74148.cpp index 44b62d95bc9..216d98a05d1 100644 --- a/src/devices/machine/74148.cpp +++ b/src/devices/machine/74148.cpp @@ -41,7 +41,7 @@ *****************************************************************************/ #include "emu.h" -#include "machine/74148.h" +#include "74148.h" DEFINE_DEVICE_TYPE(TTL74148, ttl74148_device, "74148", "74148 TTL") diff --git a/src/devices/machine/8042kbdc.cpp b/src/devices/machine/8042kbdc.cpp index c9dbcbdcffd..8f6918767e5 100644 --- a/src/devices/machine/8042kbdc.cpp +++ b/src/devices/machine/8042kbdc.cpp @@ -10,7 +10,7 @@ #include "emu.h" -#include "machine/8042kbdc.h" +#include "8042kbdc.h" /*************************************************************************** diff --git a/src/devices/machine/aicartc.cpp b/src/devices/machine/aicartc.cpp index 8e58ec0bb33..f68ca2e3bca 100644 --- a/src/devices/machine/aicartc.cpp +++ b/src/devices/machine/aicartc.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/aicartc.h" +#include "aicartc.h" diff --git a/src/devices/machine/am9513.cpp b/src/devices/machine/am9513.cpp index 1960bac555d..34c5c5ec981 100644 --- a/src/devices/machine/am9513.cpp +++ b/src/devices/machine/am9513.cpp @@ -27,7 +27,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/am9513.h" +#include "am9513.h" #define LOG_MODE (1U << 1) #define LOG_INPUT (1U << 2) diff --git a/src/devices/machine/am9519.cpp b/src/devices/machine/am9519.cpp index ed0b87f2637..9a5eb100773 100644 --- a/src/devices/machine/am9519.cpp +++ b/src/devices/machine/am9519.cpp @@ -4,7 +4,7 @@ //TODO: rotating priority, cascade #include "emu.h" -#include "machine/am9519.h" +#include "am9519.h" //#define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/devices/machine/at.cpp b/src/devices/machine/at.cpp index 8decc967081..e77c72af599 100644 --- a/src/devices/machine/at.cpp +++ b/src/devices/machine/at.cpp @@ -7,9 +7,11 @@ ***************************************************************************/ #include "emu.h" -#include "machine/at.h" +#include "at.h" + #include "cpu/i86/i286.h" #include "cpu/i386/i386.h" + #include "softlist_dev.h" #include "speaker.h" diff --git a/src/devices/machine/at28c16.cpp b/src/devices/machine/at28c16.cpp index d092d7f6d34..079649e0e95 100644 --- a/src/devices/machine/at28c16.cpp +++ b/src/devices/machine/at28c16.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/at28c16.h" +#include "at28c16.h" #define AT28C16_DATA_BYTES ( 0x800 ) #define AT28C16_ID_BYTES ( 0x20 ) diff --git a/src/devices/machine/at28c64b.cpp b/src/devices/machine/at28c64b.cpp index 85bf3cb52fb..3fdc23a1c86 100644 --- a/src/devices/machine/at28c64b.cpp +++ b/src/devices/machine/at28c64b.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/at28c64b.h" +#include "at28c64b.h" static constexpr int AT28C64B_DATA_BYTES = 0x10000; static constexpr int AT28C64B_ID_BYTES = 0x40; diff --git a/src/devices/machine/bl_handhelds_menucontrol.cpp b/src/devices/machine/bl_handhelds_menucontrol.cpp index f4495b004e4..703ce996324 100644 --- a/src/devices/machine/bl_handhelds_menucontrol.cpp +++ b/src/devices/machine/bl_handhelds_menucontrol.cpp @@ -4,7 +4,7 @@ // Menu controller, stores / increments menu position etc. used on handhelds that typically have BL on the boot screen (BaoBaoLong?) #include "emu.h" -#include "machine/bl_handhelds_menucontrol.h" +#include "bl_handhelds_menucontrol.h" DEFINE_DEVICE_TYPE(BL_HANDHELDS_MENUCONTROL, bl_handhelds_menucontrol_device, "blhandheldmenu", "BaoBaoLong Handhelds Menu Controller") diff --git a/src/devices/machine/ch376.cpp b/src/devices/machine/ch376.cpp index dfd6d7eca8b..6f971de7186 100644 --- a/src/devices/machine/ch376.cpp +++ b/src/devices/machine/ch376.cpp @@ -26,7 +26,7 @@ #include "emu.h" #include "emuopts.h" -#include "machine/ch376.h" +#include "ch376.h" #include "multibyte.h" diff --git a/src/devices/machine/chessmachine.cpp b/src/devices/machine/chessmachine.cpp index b833ccc6108..a7db23f99fd 100644 --- a/src/devices/machine/chessmachine.cpp +++ b/src/devices/machine/chessmachine.cpp @@ -32,7 +32,7 @@ TODO: */ #include "emu.h" -#include "machine/chessmachine.h" +#include "chessmachine.h" DEFINE_DEVICE_TYPE(CHESSMACHINE, chessmachine_device, "chessmachine", "Tasc ChessMachine") diff --git a/src/devices/machine/corvushd.cpp b/src/devices/machine/corvushd.cpp index 6b4a2c15c99..62c376249e3 100644 --- a/src/devices/machine/corvushd.cpp +++ b/src/devices/machine/corvushd.cpp @@ -65,7 +65,7 @@ // #include "emu.h" -#include "machine/corvushd.h" +#include "corvushd.h" #define LOG_RESPONSES (1U << 1) diff --git a/src/devices/machine/cs4031.cpp b/src/devices/machine/cs4031.cpp index c885c30b056..30712c02059 100644 --- a/src/devices/machine/cs4031.cpp +++ b/src/devices/machine/cs4031.cpp @@ -26,7 +26,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/cs4031.h" +#include "cs4031.h" #define LOG_REGISTER (1U << 1) #define LOG_MEMORY (1U << 2) diff --git a/src/devices/machine/cs8221.cpp b/src/devices/machine/cs8221.cpp index 96b3ea6928d..64887cafc6b 100644 --- a/src/devices/machine/cs8221.cpp +++ b/src/devices/machine/cs8221.cpp @@ -16,7 +16,8 @@ ***************************************************************************/ #include "emu.h" -#include "machine/cs8221.h" +#include "cs8221.h" + #include "machine/ram.h" #define LOG_REGISTER (1U << 1) diff --git a/src/devices/machine/cs8900a.cpp b/src/devices/machine/cs8900a.cpp index b91957c29b2..5efab09a5ad 100644 --- a/src/devices/machine/cs8900a.cpp +++ b/src/devices/machine/cs8900a.cpp @@ -1,5 +1,4 @@ // license:GPL-2.0+ - // copyright-holders:Spiro Trikaliotis, Rhett Aultman /************************************************************************* @@ -13,7 +12,7 @@ **************************************************************************/ #include "emu.h" -#include "machine/cs8900a.h" +#include "cs8900a.h" #include diff --git a/src/devices/machine/cxd1095.cpp b/src/devices/machine/cxd1095.cpp index e4998ea7cd1..7819751e573 100644 --- a/src/devices/machine/cxd1095.cpp +++ b/src/devices/machine/cxd1095.cpp @@ -17,7 +17,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/cxd1095.h" +#include "cxd1095.h" //************************************************************************** // GLOBAL VARIABLES diff --git a/src/devices/machine/dp8573a.cpp b/src/devices/machine/dp8573a.cpp index e6c461fb688..c0af28637ab 100644 --- a/src/devices/machine/dp8573a.cpp +++ b/src/devices/machine/dp8573a.cpp @@ -15,7 +15,7 @@ */ #include "emu.h" -#include "machine/dp8573a.h" +#include "dp8573a.h" #include "machine/timehelp.h" diff --git a/src/devices/machine/ds1994.cpp b/src/devices/machine/ds1994.cpp index ab041984348..544bc20d050 100644 --- a/src/devices/machine/ds1994.cpp +++ b/src/devices/machine/ds1994.cpp @@ -12,7 +12,7 @@ // FIXME: convert to device_rtc_interface and remove #include "emu.h" -#include "machine/ds1994.h" +#include "ds1994.h" #include #include diff --git a/src/devices/machine/ds2401.cpp b/src/devices/machine/ds2401.cpp index d3a6abc3f54..758d4405013 100644 --- a/src/devices/machine/ds2401.cpp +++ b/src/devices/machine/ds2401.cpp @@ -9,7 +9,7 @@ */ #include "emu.h" -#include "machine/ds2401.h" +#include "ds2401.h" #include diff --git a/src/devices/machine/eeprom.cpp b/src/devices/machine/eeprom.cpp index a15b8b8bcf3..50be30e9131 100644 --- a/src/devices/machine/eeprom.cpp +++ b/src/devices/machine/eeprom.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/eeprom.h" +#include "eeprom.h" #include "multibyte.h" diff --git a/src/devices/machine/eeprompar.cpp b/src/devices/machine/eeprompar.cpp index be99c359532..787093f9194 100644 --- a/src/devices/machine/eeprompar.cpp +++ b/src/devices/machine/eeprompar.cpp @@ -47,7 +47,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/eeprompar.h" +#include "eeprompar.h" //#define VERBOSE 1 #include "logmacro.h" diff --git a/src/devices/machine/eepromser.cpp b/src/devices/machine/eepromser.cpp index 2ba5fcc59be..e060eaed79a 100644 --- a/src/devices/machine/eepromser.cpp +++ b/src/devices/machine/eepromser.cpp @@ -112,7 +112,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/eepromser.h" +#include "eepromser.h" diff --git a/src/devices/machine/er1400.cpp b/src/devices/machine/er1400.cpp index de4ae9c8d28..03b1df5036c 100644 --- a/src/devices/machine/er1400.cpp +++ b/src/devices/machine/er1400.cpp @@ -22,7 +22,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/er1400.h" +#include "er1400.h" #define VERBOSE 0 #include "logmacro.h" diff --git a/src/devices/machine/er2055.cpp b/src/devices/machine/er2055.cpp index aa80957b12d..f6c74bb3d6c 100644 --- a/src/devices/machine/er2055.cpp +++ b/src/devices/machine/er2055.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/er2055.h" +#include "er2055.h" #include "logmacro.h" diff --git a/src/devices/machine/exorterm.cpp b/src/devices/machine/exorterm.cpp index f6166bc22b0..977b84ec937 100644 --- a/src/devices/machine/exorterm.cpp +++ b/src/devices/machine/exorterm.cpp @@ -17,7 +17,8 @@ TODO ****************************************************************************/ #include "emu.h" -#include "machine/exorterm.h" +#include "exorterm.h" + #include "speaker.h" #include "exorterm155.lh" diff --git a/src/devices/machine/f4702.cpp b/src/devices/machine/f4702.cpp index db756c650d3..499f1a6793a 100644 --- a/src/devices/machine/f4702.cpp +++ b/src/devices/machine/f4702.cpp @@ -56,7 +56,7 @@ ****************************************************************************/ #include "emu.h" -#include "machine/f4702.h" +#include "f4702.h" //************************************************************************** diff --git a/src/devices/machine/fdc37c665gt.cpp b/src/devices/machine/fdc37c665gt.cpp index 05a2c2eb446..feeec63a201 100644 --- a/src/devices/machine/fdc37c665gt.cpp +++ b/src/devices/machine/fdc37c665gt.cpp @@ -9,7 +9,7 @@ SMSC FDC37C665GT High Performance Multi-Mode Parallel Port Super I/O Floppy Disk ***************************************************************************/ #include "emu.h" -#include "machine/fdc37c665gt.h" +#include "fdc37c665gt.h" #define LOG_CONFIG (1U << 1) // Show global configuration changes diff --git a/src/devices/machine/fdc37c93x.cpp b/src/devices/machine/fdc37c93x.cpp index 48a50681ccd..e613cc59400 100644 --- a/src/devices/machine/fdc37c93x.cpp +++ b/src/devices/machine/fdc37c93x.cpp @@ -9,7 +9,7 @@ SMSC FDC37C93x Plug and Play Compatible Ultra I/O Controller ***************************************************************************/ #include "emu.h" -#include "machine/fdc37c93x.h" +#include "fdc37c93x.h" #include "machine/pckeybrd.h" diff --git a/src/devices/machine/genpc.cpp b/src/devices/machine/genpc.cpp index 3dcfc3dc192..b0e57789932 100644 --- a/src/devices/machine/genpc.cpp +++ b/src/devices/machine/genpc.cpp @@ -4,11 +4,10 @@ machine/genpc.cpp - ***************************************************************************/ #include "emu.h" -#include "machine/genpc.h" +#include "genpc.h" #include "imagedev/cassette.h" #include "machine/i8255.h" diff --git a/src/devices/machine/i2cmem.cpp b/src/devices/machine/i2cmem.cpp index c8c49dc5fb3..625ecb1cabe 100644 --- a/src/devices/machine/i2cmem.cpp +++ b/src/devices/machine/i2cmem.cpp @@ -23,7 +23,7 @@ there are two standard values. ***************************************************************************/ #include "emu.h" -#include "machine/i2cmem.h" +#include "i2cmem.h" #include diff --git a/src/devices/machine/ie15.cpp b/src/devices/machine/ie15.cpp index 9f977fcaa40..ee0278801e3 100644 --- a/src/devices/machine/ie15.cpp +++ b/src/devices/machine/ie15.cpp @@ -12,7 +12,7 @@ ****************************************************************************/ #include "emu.h" -#include "machine/ie15.h" +#include "ie15.h" #include "emupal.h" diff --git a/src/devices/machine/ie15_kbd.cpp b/src/devices/machine/ie15_kbd.cpp index 27a203b46d9..8052b862ad7 100644 --- a/src/devices/machine/ie15_kbd.cpp +++ b/src/devices/machine/ie15_kbd.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/ie15_kbd.h" +#include "ie15_kbd.h" #include "machine/keyboard.ipp" diff --git a/src/devices/machine/ins8250.cpp b/src/devices/machine/ins8250.cpp index 6b676b774ac..cfbe099beed 100644 --- a/src/devices/machine/ins8250.cpp +++ b/src/devices/machine/ins8250.cpp @@ -95,7 +95,7 @@ History: **********************************************************************/ #include "emu.h" -#include "machine/ins8250.h" +#include "ins8250.h" #include diff --git a/src/devices/machine/it8705f.cpp b/src/devices/machine/it8705f.cpp index 002d7eede66..5a001cb9af0 100644 --- a/src/devices/machine/it8705f.cpp +++ b/src/devices/machine/it8705f.cpp @@ -11,7 +11,7 @@ TODO: **************************************************************************************************/ #include "emu.h" -#include "machine/it8705f.h" +#include "it8705f.h" #include "formats/naslite_dsk.h" diff --git a/src/devices/machine/ldp1000.cpp b/src/devices/machine/ldp1000.cpp index 42f8cb796fe..64a2ec48faa 100644 --- a/src/devices/machine/ldp1000.cpp +++ b/src/devices/machine/ldp1000.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/ldp1000.h" +#include "ldp1000.h" #define DUMP_BCD 1 #define FIFO_MAX 0x10 diff --git a/src/devices/machine/ldp1450.cpp b/src/devices/machine/ldp1450.cpp index 2b4d037cab4..a0cf8e11e9e 100644 --- a/src/devices/machine/ldp1450.cpp +++ b/src/devices/machine/ldp1450.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/ldp1450.h" +#include "ldp1450.h" #define DUMP_BCD 1 #define FIFO_MAX 0x10 diff --git a/src/devices/machine/lpci.cpp b/src/devices/machine/lpci.cpp index 44b8b84bf3d..5f378108020 100644 --- a/src/devices/machine/lpci.cpp +++ b/src/devices/machine/lpci.cpp @@ -2,7 +2,7 @@ // copyright-holders:Olivier Galibert /*************************************************************************** - machine/lpci.c + machine/lpci.cpp Legacy PCI bus @@ -72,7 +72,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/lpci.h" +#include "lpci.h" //#define VERBOSE 1 #include "logmacro.h" diff --git a/src/devices/machine/m6m80011ap.cpp b/src/devices/machine/m6m80011ap.cpp index 7fd3e3ce5c5..92d13fe5de5 100644 --- a/src/devices/machine/m6m80011ap.cpp +++ b/src/devices/machine/m6m80011ap.cpp @@ -2,8 +2,7 @@ // copyright-holders:Angelo Salese #include "emu.h" -#include "machine/m6m80011ap.h" - +#include "m6m80011ap.h" //************************************************************************** diff --git a/src/devices/machine/mb14241.cpp b/src/devices/machine/mb14241.cpp index c9d08eb503e..4e087ade8a3 100644 --- a/src/devices/machine/mb14241.cpp +++ b/src/devices/machine/mb14241.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "machine/mb14241.h" +#include "mb14241.h" //------------------------------------------------- diff --git a/src/devices/machine/mb8421.cpp b/src/devices/machine/mb8421.cpp index 53a19a70be8..62eb69c035d 100644 --- a/src/devices/machine/mb8421.cpp +++ b/src/devices/machine/mb8421.cpp @@ -18,7 +18,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/mb8421.h" +#include "mb8421.h" template class dual_port_mailbox_ram_base; template class dual_port_mailbox_ram_base; diff --git a/src/devices/machine/mb87078.cpp b/src/devices/machine/mb87078.cpp index 5e952c5eab3..b32207ccd51 100644 --- a/src/devices/machine/mb87078.cpp +++ b/src/devices/machine/mb87078.cpp @@ -70,7 +70,7 @@ *****************************************************************************/ #include "emu.h" -#include "machine/mb87078.h" +#include "mb87078.h" /***************************************************************************** diff --git a/src/devices/machine/mb89363b.cpp b/src/devices/machine/mb89363b.cpp index 74c43a1960c..56d1bf83350 100644 --- a/src/devices/machine/mb89363b.cpp +++ b/src/devices/machine/mb89363b.cpp @@ -77,7 +77,7 @@ */ #include "emu.h" -#include "machine/mb89363b.h" +#include "mb89363b.h" DEFINE_DEVICE_TYPE(MB89363B, mb89363b_device, "mb89363b", "Fujitsu MB89363B I/O") diff --git a/src/devices/machine/mc146818.cpp b/src/devices/machine/mc146818.cpp index ffa14fa4b55..ae03165b819 100644 --- a/src/devices/machine/mc146818.cpp +++ b/src/devices/machine/mc146818.cpp @@ -12,7 +12,7 @@ *********************************************************************/ #include "emu.h" -#include "machine/mc146818.h" +#include "mc146818.h" #include "coreutil.h" diff --git a/src/devices/machine/mc68328.cpp b/src/devices/machine/mc68328.cpp index 8c7bebd9dd8..2429130654d 100644 --- a/src/devices/machine/mc68328.cpp +++ b/src/devices/machine/mc68328.cpp @@ -9,7 +9,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/mc68328.h" +#include "mc68328.h" #define LOG_SCR (1U << 1) #define LOG_CS_GRP (1U << 2) diff --git a/src/devices/machine/mm58174.cpp b/src/devices/machine/mm58174.cpp index 3d15060666a..0223a70accf 100644 --- a/src/devices/machine/mm58174.cpp +++ b/src/devices/machine/mm58174.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/mm58174.h" +#include "mm58174.h" enum { diff --git a/src/devices/machine/mm58274c.cpp b/src/devices/machine/mm58274c.cpp index cc054767a73..214e6b2ea08 100644 --- a/src/devices/machine/mm58274c.cpp +++ b/src/devices/machine/mm58274c.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/mm58274c.h" +#include "mm58274c.h" enum { diff --git a/src/devices/machine/mpu401.cpp b/src/devices/machine/mpu401.cpp index d4e80eb4bd5..2bf71c51fbf 100644 --- a/src/devices/machine/mpu401.cpp +++ b/src/devices/machine/mpu401.cpp @@ -39,7 +39,8 @@ ***************************************************************************/ #include "emu.h" -#include "machine/mpu401.h" +#include "mpu401.h" + #include "bus/midi/midi.h" #define M6801_TAG "mpu6801" diff --git a/src/devices/machine/msm5001n.cpp b/src/devices/machine/msm5001n.cpp index 8a3ab9f9ef7..4fd30735314 100644 --- a/src/devices/machine/msm5001n.cpp +++ b/src/devices/machine/msm5001n.cpp @@ -17,7 +17,7 @@ TODO: */ #include "emu.h" -#include "machine/msm5001n.h" +#include "msm5001n.h" DEFINE_DEVICE_TYPE(MSM5001N, msm5001n_device, "msm5001n", "OKI MSM5001N LCD Watch") diff --git a/src/devices/machine/msm6242.cpp b/src/devices/machine/msm6242.cpp index f4c808db9a6..59abd5313bc 100644 --- a/src/devices/machine/msm6242.cpp +++ b/src/devices/machine/msm6242.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/msm6242.h" +#include "msm6242.h" #define LOG_UNMAPPED (1U << 1) #define LOG_IRQ (1U << 2) diff --git a/src/devices/machine/msm6253.cpp b/src/devices/machine/msm6253.cpp index 53a47b2152e..5f6bd1a8a12 100644 --- a/src/devices/machine/msm6253.cpp +++ b/src/devices/machine/msm6253.cpp @@ -7,7 +7,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/msm6253.h" +#include "msm6253.h" //************************************************************************** // GLOBAL VARIABLES diff --git a/src/devices/machine/nvram.cpp b/src/devices/machine/nvram.cpp index 039b0360db0..3a6f24c593c 100644 --- a/src/devices/machine/nvram.cpp +++ b/src/devices/machine/nvram.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/nvram.h" +#include "nvram.h" //************************************************************************** // LIVE DEVICE diff --git a/src/devices/machine/pc87306.cpp b/src/devices/machine/pc87306.cpp index 8512e44d084..8bc2deb00b0 100644 --- a/src/devices/machine/pc87306.cpp +++ b/src/devices/machine/pc87306.cpp @@ -11,9 +11,9 @@ TODO: **************************************************************************************************/ #include "emu.h" -#include "bus/isa/isa.h" +#include "pc87306.h" + //#include "machine/ds128x.h" -#include "machine/pc87306.h" #include "machine/pckeybrd.h" #define LOG_WARN (1U << 1) // Show warnings diff --git a/src/devices/machine/pc_fdc.cpp b/src/devices/machine/pc_fdc.cpp index 03ce46ee866..6c737f03364 100644 --- a/src/devices/machine/pc_fdc.cpp +++ b/src/devices/machine/pc_fdc.cpp @@ -14,7 +14,8 @@ **********************************************************************/ #include "emu.h" -#include "machine/pc_fdc.h" +#include "pc_fdc.h" + #include "imagedev/floppy.h" //#define VERBOSE (LOG_GENERAL) diff --git a/src/devices/machine/pic8259.cpp b/src/devices/machine/pic8259.cpp index c9eaecdaf92..b641abe3c97 100644 --- a/src/devices/machine/pic8259.cpp +++ b/src/devices/machine/pic8259.cpp @@ -14,7 +14,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/pic8259.h" +#include "pic8259.h" #define LOG_ICW (1U << 1) #define LOG_OCW (1U << 2) diff --git a/src/devices/machine/pit8253.cpp b/src/devices/machine/pit8253.cpp index 93c39670e30..c75c8b6a9cc 100644 --- a/src/devices/machine/pit8253.cpp +++ b/src/devices/machine/pit8253.cpp @@ -21,7 +21,7 @@ *****************************************************************************/ #include "emu.h" -#include "machine/pit8253.h" +#include "pit8253.h" /*************************************************************************** diff --git a/src/devices/machine/r10696.cpp b/src/devices/machine/r10696.cpp index bee69b5f993..2172c9d1b86 100644 --- a/src/devices/machine/r10696.cpp +++ b/src/devices/machine/r10696.cpp @@ -30,7 +30,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/r10696.h" +#include "r10696.h" //#define VERBOSE 1 #include "logmacro.h" diff --git a/src/devices/machine/r10788.cpp b/src/devices/machine/r10788.cpp index c3d72d2aa16..fd8e69c9b3c 100644 --- a/src/devices/machine/r10788.cpp +++ b/src/devices/machine/r10788.cpp @@ -40,7 +40,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/r10788.h" +#include "r10788.h" //#define VERBOSE 1 #include "logmacro.h" diff --git a/src/devices/machine/ra17xx.cpp b/src/devices/machine/ra17xx.cpp index 7a3b930f0ad..a49205695a0 100644 --- a/src/devices/machine/ra17xx.cpp +++ b/src/devices/machine/ra17xx.cpp @@ -38,7 +38,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/ra17xx.h" +#include "ra17xx.h" //#define VERBOSE 1 #include "logmacro.h" diff --git a/src/devices/machine/ripple_counter.cpp b/src/devices/machine/ripple_counter.cpp index dc4c9317199..6c60d7238a5 100644 --- a/src/devices/machine/ripple_counter.cpp +++ b/src/devices/machine/ripple_counter.cpp @@ -15,7 +15,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/ripple_counter.h" +#include "ripple_counter.h" //************************************************************************** // GLOBAL VARIABLES diff --git a/src/devices/machine/rp5h01.cpp b/src/devices/machine/rp5h01.cpp index 348a4d8a780..bdd3f7b1c97 100644 --- a/src/devices/machine/rp5h01.cpp +++ b/src/devices/machine/rp5h01.cpp @@ -17,7 +17,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/rp5h01.h" +#include "rp5h01.h" // this is the contents of an unprogrammed PROM uint8_t const rp5h01_device::s_initial_data[0x10] = diff --git a/src/devices/machine/rstbuf.cpp b/src/devices/machine/rstbuf.cpp index 42a241bd308..ad6324a184e 100644 --- a/src/devices/machine/rstbuf.cpp +++ b/src/devices/machine/rstbuf.cpp @@ -56,7 +56,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/rstbuf.h" +#include "rstbuf.h" // device type definition DEFINE_DEVICE_TYPE(RST_POS_BUFFER, rst_pos_buffer_device, "rst_pos_buffer", "RST Interrupt Buffer (positive modification)") diff --git a/src/devices/machine/rtc9701.cpp b/src/devices/machine/rtc9701.cpp index fd615ed898f..7f521d43063 100644 --- a/src/devices/machine/rtc9701.cpp +++ b/src/devices/machine/rtc9701.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/rtc9701.h" +#include "rtc9701.h" ALLOW_SAVE_TYPE(rtc9701_device::state_t); diff --git a/src/devices/machine/s2636.cpp b/src/devices/machine/s2636.cpp index c5663d2ccb1..c8e90251799 100644 --- a/src/devices/machine/s2636.cpp +++ b/src/devices/machine/s2636.cpp @@ -119,7 +119,7 @@ *************************************************************/ #include "emu.h" -#include "machine/s2636.h" +#include "s2636.h" #include "screen.h" diff --git a/src/devices/machine/s3520cf.cpp b/src/devices/machine/s3520cf.cpp index 402dc909e12..567e9792b66 100644 --- a/src/devices/machine/s3520cf.cpp +++ b/src/devices/machine/s3520cf.cpp @@ -15,8 +15,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "machine/s3520cf.h" - +#include "s3520cf.h" //************************************************************************** diff --git a/src/devices/machine/s3c2400.cpp b/src/devices/machine/s3c2400.cpp index 0fa124fdebd..437612a8331 100644 --- a/src/devices/machine/s3c2400.cpp +++ b/src/devices/machine/s3c2400.cpp @@ -9,7 +9,7 @@ *******************************************************************************/ #include "emu.h" -#include "machine/s3c2400.h" +#include "s3c2400.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" diff --git a/src/devices/machine/s3c2410.cpp b/src/devices/machine/s3c2410.cpp index c6319119914..e5017ddaed4 100644 --- a/src/devices/machine/s3c2410.cpp +++ b/src/devices/machine/s3c2410.cpp @@ -9,7 +9,7 @@ *******************************************************************************/ #include "emu.h" -#include "machine/s3c2410.h" +#include "s3c2410.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" diff --git a/src/devices/machine/s3c2440.cpp b/src/devices/machine/s3c2440.cpp index 562067879b1..3bec1249b11 100644 --- a/src/devices/machine/s3c2440.cpp +++ b/src/devices/machine/s3c2440.cpp @@ -9,7 +9,7 @@ *******************************************************************************/ #include "emu.h" -#include "machine/s3c2440.h" +#include "s3c2440.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" diff --git a/src/devices/machine/s3c44b0.cpp b/src/devices/machine/s3c44b0.cpp index 6d625557933..a67be48455c 100644 --- a/src/devices/machine/s3c44b0.cpp +++ b/src/devices/machine/s3c44b0.cpp @@ -9,7 +9,7 @@ *******************************************************************************/ #include "emu.h" -#include "machine/s3c44b0.h" +#include "s3c44b0.h" #include "cpu/arm7/arm7.h" #include "cpu/arm7/arm7core.h" diff --git a/src/devices/machine/scc66470.cpp b/src/devices/machine/scc66470.cpp index b723ed2acd4..7538cf88e3a 100644 --- a/src/devices/machine/scc66470.cpp +++ b/src/devices/machine/scc66470.cpp @@ -20,6 +20,7 @@ #include "emu.h" #include "scc66470.h" + #include "screen.h" #define CSR_REG (m_csr) diff --git a/src/devices/machine/scc68070.cpp b/src/devices/machine/scc68070.cpp index 070d82f82d1..57238532f41 100644 --- a/src/devices/machine/scc68070.cpp +++ b/src/devices/machine/scc68070.cpp @@ -23,7 +23,7 @@ TODO: *******************************************************************************/ #include "emu.h" -#include "machine/scc68070.h" +#include "scc68070.h" #define LOG_I2C (1U << 1) #define LOG_UART (1U << 2) diff --git a/src/devices/machine/sda2006.cpp b/src/devices/machine/sda2006.cpp index 3de3e276a7a..99b4a41d9f7 100644 --- a/src/devices/machine/sda2006.cpp +++ b/src/devices/machine/sda2006.cpp @@ -2,7 +2,7 @@ // copyright-holders:Tomasz Slanina #include "emu.h" -#include "machine/sda2006.h" +#include "sda2006.h" //------------------------------------------------- // diff --git a/src/devices/machine/sensorboard.cpp b/src/devices/machine/sensorboard.cpp index 356b81cad5c..5fa63885f1f 100644 --- a/src/devices/machine/sensorboard.cpp +++ b/src/devices/machine/sensorboard.cpp @@ -57,7 +57,7 @@ sensor state instead. */ #include "emu.h" -#include "machine/sensorboard.h" +#include "sensorboard.h" DEFINE_DEVICE_TYPE(SENSORBOARD, sensorboard_device, "sensorboard", "Sensorboard") diff --git a/src/devices/machine/smpc.cpp b/src/devices/machine/smpc.cpp index d8a83a6bfd5..e70ab757dc7 100644 --- a/src/devices/machine/smpc.cpp +++ b/src/devices/machine/smpc.cpp @@ -160,7 +160,7 @@ SMPC NVRAM contents: */ #include "emu.h" -#include "machine/smpc.h" +#include "smpc.h" #include "screen.h" #include "coreutil.h" diff --git a/src/devices/machine/stvcd.cpp b/src/devices/machine/stvcd.cpp index 6b46750d4ac..0cb67d62cc8 100644 --- a/src/devices/machine/stvcd.cpp +++ b/src/devices/machine/stvcd.cpp @@ -41,7 +41,7 @@ DASM notes: ***************************************************************************/ #include "emu.h" -#include "machine/stvcd.h" +#include "stvcd.h" #include "coreutil.h" #include "multibyte.h" diff --git a/src/devices/machine/swtpc8212.cpp b/src/devices/machine/swtpc8212.cpp index a37518cf7c5..e7e739b4373 100644 --- a/src/devices/machine/swtpc8212.cpp +++ b/src/devices/machine/swtpc8212.cpp @@ -136,8 +136,10 @@ swtp|ct8212|southwest technical products ct8212, ****************************************************************************/ #include "emu.h" -#include "machine/swtpc8212.h" +#include "swtpc8212.h" + #include "machine/input_merger.h" + #include "screen.h" #include "speaker.h" diff --git a/src/devices/machine/tc009xlvc.cpp b/src/devices/machine/tc009xlvc.cpp index 12260976822..c0c5e41fed4 100644 --- a/src/devices/machine/tc009xlvc.cpp +++ b/src/devices/machine/tc009xlvc.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/tc009xlvc.h" +#include "tc009xlvc.h" #include "emupal.h" #include "screen.h" diff --git a/src/devices/machine/te7750.cpp b/src/devices/machine/te7750.cpp index 51577759477..94376c6dafb 100644 --- a/src/devices/machine/te7750.cpp +++ b/src/devices/machine/te7750.cpp @@ -170,7 +170,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/te7750.h" +#include "te7750.h" //************************************************************************** // GLOBAL VARIABLES diff --git a/src/devices/machine/terminal.cpp b/src/devices/machine/terminal.cpp index 31ec127a31f..b367a12857b 100644 --- a/src/devices/machine/terminal.cpp +++ b/src/devices/machine/terminal.cpp @@ -1,7 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Miodrag Milanovic #include "emu.h" -#include "machine/terminal.h" +#include "terminal.h" + #include "screen.h" #include "speaker.h" diff --git a/src/devices/machine/ticket.cpp b/src/devices/machine/ticket.cpp index eac0bf0a18a..92e5f316819 100644 --- a/src/devices/machine/ticket.cpp +++ b/src/devices/machine/ticket.cpp @@ -2,14 +2,14 @@ // copyright-holders:Aaron Giles /*************************************************************************** - ticket.c + ticket.cpp Generic ticket dispensing device. ***************************************************************************/ #include "emu.h" -#include "machine/ticket.h" +#include "ticket.h" //************************************************************************** diff --git a/src/devices/machine/timekpr.cpp b/src/devices/machine/timekpr.cpp index 5acf210afd0..c5ed19a3330 100644 --- a/src/devices/machine/timekpr.cpp +++ b/src/devices/machine/timekpr.cpp @@ -15,7 +15,8 @@ ***************************************************************************/ #include "emu.h" -#include "machine/timekpr.h" +#include "timekpr.h" + #include "machine/timehelp.h" #define LOG_TICKS (1U << 1) diff --git a/src/devices/machine/timer.cpp b/src/devices/machine/timer.cpp index 538329c998e..f2dc8464578 100644 --- a/src/devices/machine/timer.cpp +++ b/src/devices/machine/timer.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/timer.h" +#include "timer.h" /*************************************************************************** diff --git a/src/devices/machine/tmc0999.cpp b/src/devices/machine/tmc0999.cpp index e270e871524..e40426e61d8 100644 --- a/src/devices/machine/tmc0999.cpp +++ b/src/devices/machine/tmc0999.cpp @@ -14,7 +14,7 @@ TODO: */ #include "emu.h" -#include "machine/tmc0999.h" +#include "tmc0999.h" DEFINE_DEVICE_TYPE(TMC0999, tmc0999_device, "tmc0999", "TI TMC0999 RAM") diff --git a/src/devices/machine/tms1024.cpp b/src/devices/machine/tms1024.cpp index b283c20893c..63de6583e3a 100644 --- a/src/devices/machine/tms1024.cpp +++ b/src/devices/machine/tms1024.cpp @@ -11,7 +11,7 @@ */ #include "emu.h" -#include "machine/tms1024.h" +#include "tms1024.h" #define VERBOSE 0 #include "logmacro.h" @@ -19,6 +19,7 @@ DEFINE_DEVICE_TYPE(TMS1024, tms1024_device, "tms1024", "TMS1024 I/O Expander") DEFINE_DEVICE_TYPE(TMS1025, tms1025_device, "tms1025", "TMS1025 I/O Expander") + //------------------------------------------------- // constructor //------------------------------------------------- @@ -42,7 +43,6 @@ tms1025_device::tms1025_device(const machine_config &mconfig, const char *tag, d } - //------------------------------------------------- // device_start - device-specific startup //------------------------------------------------- @@ -57,7 +57,6 @@ void tms1024_device::device_start() } - //------------------------------------------------- // handlers //------------------------------------------------- diff --git a/src/devices/machine/tube.cpp b/src/devices/machine/tube.cpp index 328a5fafbb7..74093398c33 100644 --- a/src/devices/machine/tube.cpp +++ b/src/devices/machine/tube.cpp @@ -13,7 +13,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/tube.h" +#include "tube.h" diff --git a/src/devices/machine/upc82c710.cpp b/src/devices/machine/upc82c710.cpp index d64b9008b07..9fb2ea89ac2 100644 --- a/src/devices/machine/upc82c710.cpp +++ b/src/devices/machine/upc82c710.cpp @@ -7,7 +7,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/upc82c710.h" +#include "upc82c710.h" #define LOG_CFG (1U << 1) #define LOG_FDC (1U << 2) diff --git a/src/devices/machine/upc82c711.cpp b/src/devices/machine/upc82c711.cpp index 7c021d30b2c..7e9e88d992b 100644 --- a/src/devices/machine/upc82c711.cpp +++ b/src/devices/machine/upc82c711.cpp @@ -7,7 +7,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/upc82c711.h" +#include "upc82c711.h" #define LOG_CFG (1U << 1) #define LOG_FDC (1U << 2) diff --git a/src/devices/machine/upd4991a.cpp b/src/devices/machine/upd4991a.cpp index 0f1419d7270..c58fcfef159 100644 --- a/src/devices/machine/upd4991a.cpp +++ b/src/devices/machine/upd4991a.cpp @@ -18,7 +18,7 @@ **************************************************************************************************/ #include "emu.h" -#include "machine/upd4991a.h" +#include "upd4991a.h" //************************************************************************************************* diff --git a/src/devices/machine/upd4992.cpp b/src/devices/machine/upd4992.cpp index 52e3f8d9f10..79f23784c82 100644 --- a/src/devices/machine/upd4992.cpp +++ b/src/devices/machine/upd4992.cpp @@ -13,8 +13,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/upd4992.h" - +#include "upd4992.h" //************************************************************************** diff --git a/src/devices/machine/upd71071.cpp b/src/devices/machine/upd71071.cpp index 61b830d5920..a23b859e3c7 100644 --- a/src/devices/machine/upd71071.cpp +++ b/src/devices/machine/upd71071.cpp @@ -88,7 +88,7 @@ */ #include "emu.h" -#include "machine/upd71071.h" +#include "upd71071.h" DEFINE_DEVICE_TYPE(UPD71071, upd71071_device, "upd71071", "NEC uPD71071 DMA Controller") diff --git a/src/devices/machine/v3021.cpp b/src/devices/machine/v3021.cpp index 88a49e89108..82386e216f7 100644 --- a/src/devices/machine/v3021.cpp +++ b/src/devices/machine/v3021.cpp @@ -95,7 +95,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/v3021.h" +#include "v3021.h" //************************************************************************** diff --git a/src/devices/machine/vic_pl192.cpp b/src/devices/machine/vic_pl192.cpp index c4ab633145d..c2c47549556 100644 --- a/src/devices/machine/vic_pl192.cpp +++ b/src/devices/machine/vic_pl192.cpp @@ -4,7 +4,7 @@ // ARM PrimeCell PL190/PL192 VIC emulation #include "emu.h" -#include "machine/vic_pl192.h" +#include "vic_pl192.h" #define VERBOSE (LOG_GENERAL) #include "logmacro.h" diff --git a/src/devices/machine/w83787f.cpp b/src/devices/machine/w83787f.cpp index 994ef2af8e4..751766294a0 100644 --- a/src/devices/machine/w83787f.cpp +++ b/src/devices/machine/w83787f.cpp @@ -10,8 +10,7 @@ Looks similar in design to National PC87306 (including similar reg names) **************************************************************************************************/ #include "emu.h" -#include "bus/isa/isa.h" -#include "machine/w83787f.h" +#include "w83787f.h" #define LOG_WARN (1U << 1) diff --git a/src/devices/machine/w83977tf.cpp b/src/devices/machine/w83977tf.cpp index 5308d65b1e8..2a5131210e5 100644 --- a/src/devices/machine/w83977tf.cpp +++ b/src/devices/machine/w83977tf.cpp @@ -15,7 +15,7 @@ TODO: **************************************************************************************************/ #include "emu.h" -#include "machine/w83977tf.h" +#include "w83977tf.h" //#include "machine/ds128x.h" #include "machine/pckeybrd.h" diff --git a/src/devices/machine/wd1000.cpp b/src/devices/machine/wd1000.cpp index b9a475cc74f..109a3776df4 100644 --- a/src/devices/machine/wd1000.cpp +++ b/src/devices/machine/wd1000.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/wd1000.h" +#include "wd1000.h" //************************************************************************** // DEVICE DEFINITIONS diff --git a/src/devices/machine/wd11c00_17.cpp b/src/devices/machine/wd11c00_17.cpp index d05db87f6cc..79cbd4f4ef2 100644 --- a/src/devices/machine/wd11c00_17.cpp +++ b/src/devices/machine/wd11c00_17.cpp @@ -7,7 +7,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/wd11c00_17.h" +#include "wd11c00_17.h" #define VERBOSE 1 #include "logmacro.h" diff --git a/src/devices/machine/wd2010.cpp b/src/devices/machine/wd2010.cpp index f86f6645a70..28f7b8ebbc3 100644 --- a/src/devices/machine/wd2010.cpp +++ b/src/devices/machine/wd2010.cpp @@ -36,7 +36,7 @@ UNIMPLEMENTED FEATURES : **********************************************************************/ #include "emu.h" -#include "machine/wd2010.h" +#include "wd2010.h" #define VERBOSE 1 #include "logmacro.h" diff --git a/src/devices/machine/wd7600.cpp b/src/devices/machine/wd7600.cpp index e75fc067552..226520e1dc7 100644 --- a/src/devices/machine/wd7600.cpp +++ b/src/devices/machine/wd7600.cpp @@ -13,7 +13,7 @@ */ #include "emu.h" -#include "machine/wd7600.h" +#include "wd7600.h" #define VERBOSE 1 #include "logmacro.h" diff --git a/src/devices/machine/x2201.cpp b/src/devices/machine/x2201.cpp index 28a404963d5..cc35e7c8051 100644 --- a/src/devices/machine/x2201.cpp +++ b/src/devices/machine/x2201.cpp @@ -23,7 +23,7 @@ **********************************************************************/ #include "emu.h" -#include "machine/x2201.h" +#include "x2201.h" #include diff --git a/src/devices/machine/x2212.cpp b/src/devices/machine/x2212.cpp index b549fc76583..ddd31ab5af8 100644 --- a/src/devices/machine/x2212.cpp +++ b/src/devices/machine/x2212.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "machine/x2212.h" +#include "x2212.h" #include diff --git a/src/devices/machine/x76f041.cpp b/src/devices/machine/x76f041.cpp index deaa79d0a69..aa96ad90180 100644 --- a/src/devices/machine/x76f041.cpp +++ b/src/devices/machine/x76f041.cpp @@ -14,7 +14,7 @@ */ #include "emu.h" -#include "machine/x76f041.h" +#include "x76f041.h" #include #include diff --git a/src/devices/machine/x76f100.cpp b/src/devices/machine/x76f100.cpp index d4213a53200..b64bbdf32c2 100644 --- a/src/devices/machine/x76f100.cpp +++ b/src/devices/machine/x76f100.cpp @@ -12,7 +12,7 @@ */ #include "emu.h" -#include "machine/x76f100.h" +#include "x76f100.h" #include #include diff --git a/src/devices/sound/ad1848.cpp b/src/devices/sound/ad1848.cpp index 081b4172d47..b47e3c4a683 100644 --- a/src/devices/sound/ad1848.cpp +++ b/src/devices/sound/ad1848.cpp @@ -5,7 +5,7 @@ // TODO: Emulate pin-compatible Crystal Semiconductor CS4231 and its extra Mode 2 features #include "emu.h" -#include "sound/ad1848.h" +#include "ad1848.h" #include "speaker.h" diff --git a/src/devices/sound/beep.cpp b/src/devices/sound/beep.cpp index 14fadcf6b7d..d2358d4cc93 100644 --- a/src/devices/sound/beep.cpp +++ b/src/devices/sound/beep.cpp @@ -12,7 +12,7 @@ ****************************************************************************/ #include "emu.h" -#include "sound/beep.h" +#include "beep.h" #define BEEP_RATE (384000) diff --git a/src/devices/sound/esqpump.cpp b/src/devices/sound/esqpump.cpp index 38b95a15bed..af1a59db799 100644 --- a/src/devices/sound/esqpump.cpp +++ b/src/devices/sound/esqpump.cpp @@ -9,7 +9,7 @@ ***************************************************************************/ #include "emu.h" -#include "sound/esqpump.h" +#include "esqpump.h" DEFINE_DEVICE_TYPE(ESQ_5505_5510_PUMP, esq_5505_5510_pump_device, "esq_5505_5510_pump", "Ensoniq 5505/5506 to 5510 interface") diff --git a/src/devices/sound/k056800.cpp b/src/devices/sound/k056800.cpp index 00a7f7235b6..690165d838d 100644 --- a/src/devices/sound/k056800.cpp +++ b/src/devices/sound/k056800.cpp @@ -8,14 +8,12 @@ ***********************************************************************/ #include "emu.h" -#include "sound/k056800.h" - +#include "k056800.h" DEFINE_DEVICE_TYPE(K056800, k056800_device, "k056800", "K056800 MIRAC") - //------------------------------------------------- // k056800_device - constructor //------------------------------------------------- diff --git a/src/devices/sound/mos6560.cpp b/src/devices/sound/mos6560.cpp index c1224ee1f61..6434621f13d 100644 --- a/src/devices/sound/mos6560.cpp +++ b/src/devices/sound/mos6560.cpp @@ -59,7 +59,7 @@ #include "emu.h" -#include "sound/mos6560.h" +#include "mos6560.h" /***************************************************************************** diff --git a/src/devices/sound/nes_apu_vt.cpp b/src/devices/sound/nes_apu_vt.cpp index f93c3203bac..8216cd3c8f2 100644 --- a/src/devices/sound/nes_apu_vt.cpp +++ b/src/devices/sound/nes_apu_vt.cpp @@ -8,7 +8,7 @@ // TODO: everything #include "emu.h" -#include "sound/nes_apu_vt.h" +#include "nes_apu_vt.h" DEFINE_DEVICE_TYPE(NES_APU_VT, nes_apu_vt_device, "nes_apu_vt", "XOP APU") diff --git a/src/devices/sound/spkrdev.cpp b/src/devices/sound/spkrdev.cpp index 7d9333d02cb..19d1f1813d6 100644 --- a/src/devices/sound/spkrdev.cpp +++ b/src/devices/sound/spkrdev.cpp @@ -72,7 +72,7 @@ */ #include "emu.h" -#include "sound/spkrdev.h" +#include "spkrdev.h" // The default is 1-bit, but can be customized with set_levels. static constexpr double default_levels[2] = { 0.0, 1.0 }; diff --git a/src/devices/sound/uda1344.cpp b/src/devices/sound/uda1344.cpp index f3123371d82..b8d445ef3b8 100644 --- a/src/devices/sound/uda1344.cpp +++ b/src/devices/sound/uda1344.cpp @@ -7,7 +7,7 @@ ****************************************************************************/ #include "emu.h" -#include "sound/uda1344.h" +#include "uda1344.h" #define LOG_ADDR (1U << 1) #define LOG_STATUS_REG (1U << 2) diff --git a/src/devices/sound/upd7752.cpp b/src/devices/sound/upd7752.cpp index 7c063fbee95..8f8a3a6f9a3 100644 --- a/src/devices/sound/upd7752.cpp +++ b/src/devices/sound/upd7752.cpp @@ -9,8 +9,7 @@ skeleton device ***************************************************************************/ #include "emu.h" -#include "sound/upd7752.h" - +#include "upd7752.h" /* status flags */ diff --git a/src/devices/sound/vgm_visualizer.cpp b/src/devices/sound/vgm_visualizer.cpp index 6dc37c4e87b..e62ffe07785 100644 --- a/src/devices/sound/vgm_visualizer.cpp +++ b/src/devices/sound/vgm_visualizer.cpp @@ -11,7 +11,7 @@ ***************************************************************************/ #include "emu.h" -#include "sound/vgm_visualizer.h" +#include "vgm_visualizer.h" #include "wdlfft/fft.h" diff --git a/src/devices/video/315_5124.cpp b/src/devices/video/315_5124.cpp index bc35a956bab..8bfef88e451 100644 --- a/src/devices/video/315_5124.cpp +++ b/src/devices/video/315_5124.cpp @@ -65,7 +65,7 @@ PAL frame timing */ #include "emu.h" -#include "video/315_5124.h" +#include "315_5124.h" /**************************************************************************** diff --git a/src/devices/video/315_5313.cpp b/src/devices/video/315_5313.cpp index 57b32a642a9..f48468963be 100644 --- a/src/devices/video/315_5313.cpp +++ b/src/devices/video/315_5313.cpp @@ -12,7 +12,7 @@ TODO: */ #include "emu.h" -#include "video/315_5313.h" +#include "315_5313.h" /* The VDP occupies addresses C00000h to C0001Fh. diff --git a/src/devices/video/am8052.cpp b/src/devices/video/am8052.cpp index e97e2488b9f..628e9c701e8 100644 --- a/src/devices/video/am8052.cpp +++ b/src/devices/video/am8052.cpp @@ -9,7 +9,7 @@ **********************************************************************/ #include "emu.h" -#include "video/am8052.h" +#include "am8052.h" //#include "screen.h" //************************************************************************** diff --git a/src/devices/video/ati_mach32.cpp b/src/devices/video/ati_mach32.cpp index 343a5f87db5..ab474389f97 100644 --- a/src/devices/video/ati_mach32.cpp +++ b/src/devices/video/ati_mach32.cpp @@ -10,7 +10,7 @@ */ #include "emu.h" -#include "video/ati_mach32.h" +#include "ati_mach32.h" #include "screen.h" diff --git a/src/devices/video/cgapal.cpp b/src/devices/video/cgapal.cpp index b726db23335..5d0ef561103 100644 --- a/src/devices/video/cgapal.cpp +++ b/src/devices/video/cgapal.cpp @@ -12,7 +12,7 @@ */ #include "emu.h" -#include "video/cgapal.h" +#include "cgapal.h" const unsigned char cga_palette[16 * CGA_PALETTE_SETS][3] = { diff --git a/src/devices/video/crt9028.cpp b/src/devices/video/crt9028.cpp index 7ed0c398c2f..a3840b2df3a 100644 --- a/src/devices/video/crt9028.cpp +++ b/src/devices/video/crt9028.cpp @@ -24,7 +24,8 @@ **********************************************************************/ #include "emu.h" -#include "video/crt9028.h" +#include "crt9028.h" + #include "screen.h" //************************************************************************** diff --git a/src/devices/video/dp8350.cpp b/src/devices/video/dp8350.cpp index c14a93b8958..19789ac4222 100644 --- a/src/devices/video/dp8350.cpp +++ b/src/devices/video/dp8350.cpp @@ -44,7 +44,8 @@ **********************************************************************/ #include "emu.h" -#include "video/dp8350.h" +#include "dp8350.h" + #include "screen.h" //#define VERBOSE 1 diff --git a/src/devices/machine/ds8874.cpp b/src/devices/video/ds8874.cpp similarity index 98% rename from src/devices/machine/ds8874.cpp rename to src/devices/video/ds8874.cpp index 2b978d15403..681c0f84cd1 100644 --- a/src/devices/machine/ds8874.cpp +++ b/src/devices/video/ds8874.cpp @@ -15,7 +15,7 @@ TODO: */ #include "emu.h" -#include "machine/ds8874.h" +#include "ds8874.h" DEFINE_DEVICE_TYPE(DS8874, ds8874_device, "ds8874", "DS8874 LED Driver") diff --git a/src/devices/machine/ds8874.h b/src/devices/video/ds8874.h similarity index 91% rename from src/devices/machine/ds8874.h rename to src/devices/video/ds8874.h index c7f0355f33d..e7408d0a465 100644 --- a/src/devices/machine/ds8874.h +++ b/src/devices/video/ds8874.h @@ -6,8 +6,8 @@ */ -#ifndef MAME_MACHINE_DS8874_H -#define MAME_MACHINE_DS8874_H +#ifndef MAME_VIDEO_DS8874_H +#define MAME_VIDEO_DS8874_H #pragma once @@ -58,4 +58,4 @@ private: DECLARE_DEVICE_TYPE(DS8874, ds8874_device) -#endif // MAME_MACHINE_DS8874_H +#endif // MAME_VIDEO_DS8874_H diff --git a/src/devices/video/gb_lcd.cpp b/src/devices/video/gb_lcd.cpp index f9070ad4ec7..76066883ade 100644 --- a/src/devices/video/gb_lcd.cpp +++ b/src/devices/video/gb_lcd.cpp @@ -156,7 +156,7 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "video/gb_lcd.h" +#include "gb_lcd.h" #include "screen.h" diff --git a/src/devices/video/gf4500.cpp b/src/devices/video/gf4500.cpp index 63d7ea4ec0f..43e232544fb 100644 --- a/src/devices/video/gf4500.cpp +++ b/src/devices/video/gf4500.cpp @@ -9,7 +9,7 @@ */ #include "emu.h" -#include "video/gf4500.h" +#include "gf4500.h" #define VERBOSE (0) #include "logmacro.h" diff --git a/src/devices/video/hd44352.cpp b/src/devices/video/hd44352.cpp index c5da136331e..af781e17e41 100644 --- a/src/devices/video/hd44352.cpp +++ b/src/devices/video/hd44352.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "video/hd44352.h" +#include "hd44352.h" #define LCD_BYTE_INPUT 0x01 #define LCD_BYTE_OUTPUT 0x02 diff --git a/src/devices/video/hd44780.cpp b/src/devices/video/hd44780.cpp index ade4187a027..0c78d01da31 100644 --- a/src/devices/video/hd44780.cpp +++ b/src/devices/video/hd44780.cpp @@ -119,7 +119,7 @@ ***************************************************************************/ #include "emu.h" -#include "video/hd44780.h" +#include "hd44780.h" //#define VERBOSE 1 #include "logmacro.h" diff --git a/src/devices/video/hlcd0438.cpp b/src/devices/video/hlcd0438.cpp index f92683f79ee..01b30dbd343 100644 --- a/src/devices/video/hlcd0438.cpp +++ b/src/devices/video/hlcd0438.cpp @@ -10,7 +10,7 @@ LCD pin can be driven manually, or oscillating. */ #include "emu.h" -#include "video/hlcd0438.h" +#include "hlcd0438.h" DEFINE_DEVICE_TYPE(HLCD0438, hlcd0438_device, "hlcd0438", "Hughes HLCD 0438 LCD Driver") diff --git a/src/devices/video/hlcd0488.cpp b/src/devices/video/hlcd0488.cpp index 016bad5f73d..293f9e96a07 100644 --- a/src/devices/video/hlcd0488.cpp +++ b/src/devices/video/hlcd0488.cpp @@ -12,7 +12,7 @@ TODO: */ #include "emu.h" -#include "video/hlcd0488.h" +#include "hlcd0488.h" DEFINE_DEVICE_TYPE(HLCD0488, hlcd0488_device, "hlcd0488", "Hughes HLCD 0488 LCD Driver") diff --git a/src/devices/video/hlcd0538.cpp b/src/devices/video/hlcd0538.cpp index 8ec3ed2be62..dec7d04278c 100644 --- a/src/devices/video/hlcd0538.cpp +++ b/src/devices/video/hlcd0538.cpp @@ -16,7 +16,7 @@ TODO: */ #include "emu.h" -#include "video/hlcd0538.h" +#include "hlcd0538.h" DEFINE_DEVICE_TYPE(HLCD0538, hlcd0538_device, "hlcd0538", "Hughes HLCD 0538 LCD Driver") diff --git a/src/devices/video/huc6272.cpp b/src/devices/video/huc6272.cpp index 11a06429fca..256e14013f7 100644 --- a/src/devices/video/huc6272.cpp +++ b/src/devices/video/huc6272.cpp @@ -31,7 +31,7 @@ **************************************************************************************************/ #include "emu.h" -#include "video/huc6272.h" +#include "huc6272.h" #define VERBOSE (LOG_GENERAL) diff --git a/src/devices/video/lc7580.cpp b/src/devices/video/lc7580.cpp index 42b2a6783d7..19868db4409 100644 --- a/src/devices/video/lc7580.cpp +++ b/src/devices/video/lc7580.cpp @@ -14,7 +14,7 @@ TODO: */ #include "emu.h" -#include "video/lc7580.h" +#include "lc7580.h" #include diff --git a/src/devices/video/m50458.cpp b/src/devices/video/m50458.cpp index 0ccbec7eebe..93cdf3c8011 100644 --- a/src/devices/video/m50458.cpp +++ b/src/devices/video/m50458.cpp @@ -17,7 +17,7 @@ ***************************************************************************/ #include "emu.h" -#include "video/m50458.h" +#include "m50458.h" #include "screen.h" diff --git a/src/devices/video/mb90082.cpp b/src/devices/video/mb90082.cpp index 27ef9238ec6..d3bddcd5915 100644 --- a/src/devices/video/mb90082.cpp +++ b/src/devices/video/mb90082.cpp @@ -12,8 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "video/mb90082.h" - +#include "mb90082.h" //************************************************************************** diff --git a/src/devices/video/mb_vcu.cpp b/src/devices/video/mb_vcu.cpp index 09ac807f13a..de84566fc64 100644 --- a/src/devices/video/mb_vcu.cpp +++ b/src/devices/video/mb_vcu.cpp @@ -24,7 +24,8 @@ TODO: ***************************************************************************/ #include "emu.h" -#include "video/mb_vcu.h" +#include "mb_vcu.h" + #include "video/resnet.h" diff --git a/src/devices/video/mc6847.cpp b/src/devices/video/mc6847.cpp index 3a1d0457b61..89e833798f6 100644 --- a/src/devices/video/mc6847.cpp +++ b/src/devices/video/mc6847.cpp @@ -91,7 +91,7 @@ #include "emu.h" -#include "video/mc6847.h" +#include "mc6847.h" #define LOG_SCANLINE (1U << 1) #define LOG_HSYNC (1U << 2) diff --git a/src/devices/video/md4330b.cpp b/src/devices/video/md4330b.cpp index b44313d8bac..418fcc40ef8 100644 --- a/src/devices/video/md4330b.cpp +++ b/src/devices/video/md4330b.cpp @@ -13,7 +13,7 @@ TODO: */ #include "emu.h" -#include "video/md4330b.h" +#include "md4330b.h" DEFINE_DEVICE_TYPE(MD4330B, md4330b_device, "md4330b", "Mitel MD4330B LCD Driver") diff --git a/src/devices/video/mm5445.cpp b/src/devices/video/mm5445.cpp index 30d5e8b03bc..cecd0674495 100644 --- a/src/devices/video/mm5445.cpp +++ b/src/devices/video/mm5445.cpp @@ -10,7 +10,7 @@ */ #include "emu.h" -#include "video/mm5445.h" +#include "mm5445.h" DEFINE_DEVICE_TYPE(MM5445, mm5445_device, "mm5445", "MM5445 VFD Driver") diff --git a/src/devices/video/nt7534.cpp b/src/devices/video/nt7534.cpp index e1065376860..44c21b6cb0b 100644 --- a/src/devices/video/nt7534.cpp +++ b/src/devices/video/nt7534.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include "emu.h" -#include "video/nt7534.h" +#include "nt7534.h" #define VERBOSE 0 #include "logmacro.h" diff --git a/src/devices/video/pcd8544.cpp b/src/devices/video/pcd8544.cpp index bb64d561281..04f177e873d 100644 --- a/src/devices/video/pcd8544.cpp +++ b/src/devices/video/pcd8544.cpp @@ -7,7 +7,7 @@ ***************************************************************************/ #include "emu.h" -#include "video/pcd8544.h" +#include "pcd8544.h" #include "screen.h" diff --git a/src/devices/video/pcf2100.cpp b/src/devices/video/pcf2100.cpp index dcffabfe797..1d21947c90d 100644 --- a/src/devices/video/pcf2100.cpp +++ b/src/devices/video/pcf2100.cpp @@ -15,7 +15,7 @@ Actual segment output frequency is divided by number of LCD commons. */ #include "emu.h" -#include "video/pcf2100.h" +#include "pcf2100.h" DEFINE_DEVICE_TYPE(PCF2100, pcf2100_device, "pcf2100", "Philips PCF2100 LCD Driver") diff --git a/src/devices/video/ppu2c0x.cpp b/src/devices/video/ppu2c0x.cpp index 8078424fa56..9ec7f66e2de 100644 --- a/src/devices/video/ppu2c0x.cpp +++ b/src/devices/video/ppu2c0x.cpp @@ -26,7 +26,7 @@ ******************************************************************************/ #include "emu.h" -#include "video/ppu2c0x.h" +#include "ppu2c0x.h" #include "screen.h" diff --git a/src/devices/video/ppu2c0x_sh6578.cpp b/src/devices/video/ppu2c0x_sh6578.cpp index a63fa2a5162..b2bbc6d995b 100644 --- a/src/devices/video/ppu2c0x_sh6578.cpp +++ b/src/devices/video/ppu2c0x_sh6578.cpp @@ -5,7 +5,7 @@ ******************************************************************************/ #include "emu.h" -#include "video/ppu2c0x_sh6578.h" +#include "ppu2c0x_sh6578.h" #define LOG_PPU_EXTRA (1U << 1) diff --git a/src/devices/video/ppu2c0x_vt.cpp b/src/devices/video/ppu2c0x_vt.cpp index 3287ccbd6cc..a4754b421d7 100644 --- a/src/devices/video/ppu2c0x_vt.cpp +++ b/src/devices/video/ppu2c0x_vt.cpp @@ -10,7 +10,7 @@ ******************************************************************************/ #include "emu.h" -#include "video/ppu2c0x_vt.h" +#include "ppu2c0x_vt.h" /* constant definitions */ diff --git a/src/devices/video/psx.cpp b/src/devices/video/psx.cpp index c891830257b..6ffefd3c981 100644 --- a/src/devices/video/psx.cpp +++ b/src/devices/video/psx.cpp @@ -8,8 +8,9 @@ */ #include "emu.h" +#include "psx.h" + #include "cpu/psx/psx.h" -#include "video/psx.h" #include "screen.h" diff --git a/src/devices/video/pwm.cpp b/src/devices/video/pwm.cpp index d1d5064be87..7d1ae67c10e 100644 --- a/src/devices/video/pwm.cpp +++ b/src/devices/video/pwm.cpp @@ -36,7 +36,7 @@ TODO: */ #include "emu.h" -#include "video/pwm.h" +#include "pwm.h" #include diff --git a/src/devices/video/ramdac.cpp b/src/devices/video/ramdac.cpp index 4504d7f0deb..bd674d679c1 100644 --- a/src/devices/video/ramdac.cpp +++ b/src/devices/video/ramdac.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include "emu.h" -#include "video/ramdac.h" +#include "ramdac.h" // default address map void ramdac_device::ramdac_palram(address_map &map) diff --git a/src/devices/video/sed1500.cpp b/src/devices/video/sed1500.cpp index 04c3c07bf35..ac79d30f734 100644 --- a/src/devices/video/sed1500.cpp +++ b/src/devices/video/sed1500.cpp @@ -22,7 +22,7 @@ TODO: */ #include "emu.h" -#include "video/sed1500.h" +#include "sed1500.h" DEFINE_DEVICE_TYPE(SED1500, sed1500_device, "sed1500", "Epson SED1500 LCD Driver") diff --git a/src/devices/video/sed1520.cpp b/src/devices/video/sed1520.cpp index 9dd8017155d..de559af4f9a 100644 --- a/src/devices/video/sed1520.cpp +++ b/src/devices/video/sed1520.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "video/sed1520.h" +#include "sed1520.h" #include "screen.h" diff --git a/src/devices/video/snes_ppu.cpp b/src/devices/video/snes_ppu.cpp index d83f16a6cae..40feb73e53f 100644 --- a/src/devices/video/snes_ppu.cpp +++ b/src/devices/video/snes_ppu.cpp @@ -73,7 +73,7 @@ ***************************************************************************/ #include "emu.h" -#include "video/snes_ppu.h" +#include "snes_ppu.h" #define SNES_MAINSCREEN 0 #define SNES_SUBSCREEN 1 diff --git a/src/devices/video/t6a04.cpp b/src/devices/video/t6a04.cpp index a5dc8bfa928..989711eb2f3 100644 --- a/src/devices/video/t6a04.cpp +++ b/src/devices/video/t6a04.cpp @@ -12,7 +12,7 @@ ***************************************************************************/ #include "emu.h" -#include "video/t6a04.h" +#include "t6a04.h" // devices DEFINE_DEVICE_TYPE(T6A04, t6a04_device, "t6a04", "Toshiba T6A04 LCD Controller") diff --git a/src/devices/video/tms9927.cpp b/src/devices/video/tms9927.cpp index caa7230ad0c..12b17acac99 100644 --- a/src/devices/video/tms9927.cpp +++ b/src/devices/video/tms9927.cpp @@ -7,7 +7,7 @@ **********************************************************************/ #include "emu.h" -#include "video/tms9927.h" +#include "tms9927.h" #include "screen.h" diff --git a/src/devices/video/vic4567.cpp b/src/devices/video/vic4567.cpp index 1208bd243f9..a599f56f885 100644 --- a/src/devices/video/vic4567.cpp +++ b/src/devices/video/vic4567.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include "emu.h" -#include "video/vic4567.h" +#include "vic4567.h" #include "screen.h" diff --git a/src/mame/handheld/hh_cops1.cpp b/src/mame/handheld/hh_cops1.cpp index f3db97b1b3c..573b2a8bb71 100644 --- a/src/mame/handheld/hh_cops1.cpp +++ b/src/mame/handheld/hh_cops1.cpp @@ -19,8 +19,8 @@ TODO: #include "emu.h" #include "cpu/cops1/mm5799.h" -#include "machine/ds8874.h" #include "sound/spkrdev.h" +#include "video/ds8874.h" #include "video/pwm.h" #include "speaker.h" diff --git a/src/mame/handheld/hh_tms1k.cpp b/src/mame/handheld/hh_tms1k.cpp index b95e2f0deee..52df8479da0 100644 --- a/src/mame/handheld/hh_tms1k.cpp +++ b/src/mame/handheld/hh_tms1k.cpp @@ -232,7 +232,6 @@ on Joerg Woerner's datamath.org: http://www.datamath.org/IC_List.htm #include "cpu/tms1000/tms0970.h" #include "cpu/tms1000/tms0980.h" #include "machine/clock.h" -#include "machine/ds8874.h" #include "machine/netlist.h" #include "machine/nvram.h" #include "machine/timer.h" @@ -245,6 +244,7 @@ on Joerg Woerner's datamath.org: http://www.datamath.org/IC_List.htm #include "sound/sn76477.h" #include "sound/spkrdev.h" #include "sound/tms5110.h" +#include "video/ds8874.h" #include "video/hlcd0515.h" #include "video/pwm.h"