From 1e0f3bfc373f205bb22644ea1032bf24875e9a19 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 25 Apr 2016 12:16:28 +0200 Subject: [PATCH] Revert "Unified filenames for ep64 audio/video components to match driver (nw)" This reverts commit 10a20e4d7de5fbd3dc3b2c1651e107578bf15dc1. --- scripts/target/mame/mess.lua | 8 ++++---- src/devices/bus/ep64/exp.h | 2 +- src/mame/audio/{ep64.cpp => dave.cpp} | 3 +-- src/mame/audio/{ep64.h => dave.h} | 1 - src/mame/includes/ep64.h | 4 ++-- src/mame/video/{ep64.cpp => nick.cpp} | 3 +-- src/mame/video/{ep64.h => nick.h} | 1 - 7 files changed, 9 insertions(+), 13 deletions(-) rename src/mame/audio/{ep64.cpp => dave.cpp} (99%) rename src/mame/audio/{ep64.h => dave.h} (98%) rename src/mame/video/{ep64.cpp => nick.cpp} (99%) rename src/mame/video/{ep64.h => nick.h} (98%) diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 60e8eff9513..871e3e247cb 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -1656,10 +1656,10 @@ createMESSProjects(_target, _subtarget, "enterprise") files { MAME_DIR .. "src/mame/drivers/ep64.cpp", MAME_DIR .. "src/mame/includes/ep64.h", - MAME_DIR .. "src/mame/audio/ep64.cpp", - MAME_DIR .. "src/mame/audio/ep64.h", - MAME_DIR .. "src/mame/video/ep64.cpp", - MAME_DIR .. "src/mame/video/ep64.h", + MAME_DIR .. "src/mame/audio/dave.cpp", + MAME_DIR .. "src/mame/audio/dave.h", + MAME_DIR .. "src/mame/video/nick.cpp", + MAME_DIR .. "src/mame/video/nick.h", } createMESSProjects(_target, _subtarget, "entex") diff --git a/src/devices/bus/ep64/exp.h b/src/devices/bus/ep64/exp.h index 31b96622535..a80f05b76f9 100644 --- a/src/devices/bus/ep64/exp.h +++ b/src/devices/bus/ep64/exp.h @@ -48,7 +48,7 @@ #define __EP64_EXPANSION_BUS__ #include "emu.h" -#include "audio/ep64.h" +#include "audio/dave.h" diff --git a/src/mame/audio/ep64.cpp b/src/mame/audio/dave.cpp similarity index 99% rename from src/mame/audio/ep64.cpp rename to src/mame/audio/dave.cpp index f44c1927968..138b8d9ac40 100644 --- a/src/mame/audio/ep64.cpp +++ b/src/mame/audio/dave.cpp @@ -3,11 +3,10 @@ /********************************************************************** Intelligent Designs DAVE emulation - Used in Enterprise Enterprise Sixty Four / One Two Eight Computers **********************************************************************/ -#include "ep64.h" +#include "dave.h" diff --git a/src/mame/audio/ep64.h b/src/mame/audio/dave.h similarity index 98% rename from src/mame/audio/ep64.h rename to src/mame/audio/dave.h index 9f356a5e795..de534c51bda 100644 --- a/src/mame/audio/ep64.h +++ b/src/mame/audio/dave.h @@ -3,7 +3,6 @@ /********************************************************************** Intelligent Designs DAVE emulation - Used in Enterprise Enterprise Sixty Four / One Two Eight Computers **********************************************************************/ diff --git a/src/mame/includes/ep64.h b/src/mame/includes/ep64.h index c06c8c4f840..85c0ae27a97 100644 --- a/src/mame/includes/ep64.h +++ b/src/mame/includes/ep64.h @@ -11,7 +11,7 @@ #ifndef __EP64__ #define __EP64__ -#include "audio/ep64.h" +#include "audio/dave.h" #include "bus/rs232/rs232.h" #include "bus/ep64/exp.h" #include "cpu/z80/z80.h" @@ -20,7 +20,7 @@ #include "bus/generic/slot.h" #include "bus/generic/carts.h" #include "machine/ram.h" -#include "video/ep64.h" +#include "video/nick.h" #define Z80_TAG "u1" #define DAVE_TAG "u3" diff --git a/src/mame/video/ep64.cpp b/src/mame/video/nick.cpp similarity index 99% rename from src/mame/video/ep64.cpp rename to src/mame/video/nick.cpp index 73df441e64d..68b9011d31c 100644 --- a/src/mame/video/ep64.cpp +++ b/src/mame/video/nick.cpp @@ -3,11 +3,10 @@ /********************************************************************** Intelligent Designs NICK emulation - Used in Enterprise Enterprise Sixty Four / One Two Eight Computers **********************************************************************/ -#include "ep64.h" +#include "nick.h" diff --git a/src/mame/video/ep64.h b/src/mame/video/nick.h similarity index 98% rename from src/mame/video/ep64.h rename to src/mame/video/nick.h index 4647b5f132e..ba701283cd9 100644 --- a/src/mame/video/ep64.h +++ b/src/mame/video/nick.h @@ -3,7 +3,6 @@ /********************************************************************** Intelligent Designs NICK emulation - Used in Enterprise Enterprise Sixty Four / One Two Eight Computers **********************************************************************/