From c398cf3073a50a0f063b267aab8b9ea53012b610 Mon Sep 17 00:00:00 2001
From: Patrick Mackinlay <pmackinlay@hotmail.com>
Date: Fri, 22 Sep 2023 14:31:27 +0700
Subject: [PATCH] dec: reorganize and rename some device files

---
 scripts/src/machine.lua                            | 12 ------------
 scripts/src/video.lua                              | 11 -----------
 src/{devices/machine => mame/dec}/dc7085.cpp       |  0
 src/{devices/machine => mame/dec}/dc7085.h         |  6 +++---
 src/mame/dec/decmate2.cpp                          |  2 +-
 src/mame/dec/decstation.cpp                        |  9 +++++----
 src/mame/dec/{dec_lk201.cpp => lk201.cpp}          |  2 +-
 src/mame/dec/{dec_lk201.h => lk201.h}              |  6 +++---
 src/mame/dec/rainbow.cpp                           |  4 ++--
 src/{devices/video/decsfb.cpp => mame/dec/sfb.cpp} |  2 +-
 src/{devices/video/decsfb.h => mame/dec/sfb.h}     |  6 +++---
 src/mame/dec/vt240.cpp                             |  2 +-
 12 files changed, 20 insertions(+), 42 deletions(-)
 rename src/{devices/machine => mame/dec}/dc7085.cpp (100%)
 rename src/{devices/machine => mame/dec}/dc7085.h (96%)
 rename src/mame/dec/{dec_lk201.cpp => lk201.cpp} (99%)
 rename src/mame/dec/{dec_lk201.h => lk201.h} (97%)
 rename src/{devices/video/decsfb.cpp => mame/dec/sfb.cpp} (99%)
 rename src/{devices/video/decsfb.h => mame/dec/sfb.h} (89%)

diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 5138a692fee..93946cfb50b 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -4839,18 +4839,6 @@ if (MACHINES["AIC6250"]~=null) then
 	}
 end
 
----------------------------------------------------
---
---@src/devices/machine/dc7085.h,MACHINES["DC7085"] = true
----------------------------------------------------
-
-if (MACHINES["DC7085"]~=null) then
-	files {
-		MAME_DIR .. "src/devices/machine/dc7085.cpp",
-		MAME_DIR .. "src/devices/machine/dc7085.h",
-	}
-end
-
 ---------------------------------------------------
 --
 --@src/devices/machine/i82357.h,MACHINES["I82357"] = true
diff --git a/scripts/src/video.lua b/scripts/src/video.lua
index e23e563cdea..69277f16e61 100644
--- a/scripts/src/video.lua
+++ b/scripts/src/video.lua
@@ -1661,17 +1661,6 @@ if (VIDEOS["PS2GS"]~=null) then
 	}
 end
 
---------------------------------------------------
---
---@src/devices/video/decsfb.h,VIDEOS["DECSFB"] = true
---------------------------------------------------
-if (VIDEOS["DECSFB"]~=null) then
-	files {
-		MAME_DIR .. "src/devices/video/decsfb.cpp",
-		MAME_DIR .. "src/devices/video/decsfb.h",
-	}
-end
-
 --------------------------------------------------
 --
 --@src/devices/video/bt47x.h,VIDEOS["BT47X"] = true
diff --git a/src/devices/machine/dc7085.cpp b/src/mame/dec/dc7085.cpp
similarity index 100%
rename from src/devices/machine/dc7085.cpp
rename to src/mame/dec/dc7085.cpp
diff --git a/src/devices/machine/dc7085.h b/src/mame/dec/dc7085.h
similarity index 96%
rename from src/devices/machine/dc7085.h
rename to src/mame/dec/dc7085.h
index dccb2bbefce..b272743223d 100644
--- a/src/devices/machine/dc7085.h
+++ b/src/mame/dec/dc7085.h
@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:R. Belmont
 
-#ifndef MAME_MACHINE_DC7085_H
-#define MAME_MACHINE_DC7085_H
+#ifndef MAME_DEC_DC7085_H
+#define MAME_DEC_DC7085_H
 
 #pragma once
 
@@ -110,4 +110,4 @@ private:
 DECLARE_DEVICE_TYPE(DC7085, dc7085_device)
 DECLARE_DEVICE_TYPE(DC7085_CHANNEL, dc7085_channel)
 
-#endif // MAME_MACHINE_DC7085_H
+#endif // MAME_DEC_DC7085_H
diff --git a/src/mame/dec/decmate2.cpp b/src/mame/dec/decmate2.cpp
index cd343835246..d44b6a79723 100644
--- a/src/mame/dec/decmate2.cpp
+++ b/src/mame/dec/decmate2.cpp
@@ -56,7 +56,7 @@
 #include "machine/ay31015.h"
 #include "machine/clock.h"
 #include "machine/com8116.h"
-#include "dec_lk201.h"
+#include "lk201.h"
 #include "machine/wd_fdc.h"
 #include "machine/z80sio.h"
 #include "video/crt9007.h"
diff --git a/src/mame/dec/decstation.cpp b/src/mame/dec/decstation.cpp
index 981e386e930..d0d7217a8b0 100644
--- a/src/mame/dec/decstation.cpp
+++ b/src/mame/dec/decstation.cpp
@@ -65,18 +65,19 @@
 #include "machine/mc146818.h"
 #include "machine/z80scc.h"
 #include "machine/ncr53c90.h"
-//#include "machine/dc7061.h"
 #include "machine/nscsi_bus.h"
 #include "bus/nscsi/cd.h"
 #include "bus/nscsi/hd.h"
-#include "dec_lk201.h"
 #include "machine/am79c90.h"
-#include "machine/dc7085.h"
 #include "bus/rs232/rs232.h"
 #include "screen.h"
 #include "video/bt47x.h"
 #include "video/bt459.h"
-#include "video/decsfb.h"
+
+//#include "dc7061.h"
+#include "dc7085.h"
+#include "lk201.h"
+#include "sfb.h"
 
 #include "kn01.lh"
 
diff --git a/src/mame/dec/dec_lk201.cpp b/src/mame/dec/lk201.cpp
similarity index 99%
rename from src/mame/dec/dec_lk201.cpp
rename to src/mame/dec/lk201.cpp
index 1dfb9a493aa..b423e28cd70 100644
--- a/src/mame/dec/dec_lk201.cpp
+++ b/src/mame/dec/lk201.cpp
@@ -105,7 +105,7 @@ ________|D7  |D6  |D5  |D4 |D3 |D2 |D1 |D0
  */
 
 #include "emu.h"
-#include "dec_lk201.h"
+#include "lk201.h"
 #include "cpu/m6805/m6805.h"
 #include "speaker.h"
 
diff --git a/src/mame/dec/dec_lk201.h b/src/mame/dec/lk201.h
similarity index 97%
rename from src/mame/dec/dec_lk201.h
rename to src/mame/dec/lk201.h
index 9f564bbca38..c22f4e70827 100644
--- a/src/mame/dec/dec_lk201.h
+++ b/src/mame/dec/lk201.h
@@ -1,7 +1,7 @@
 // license:BSD-3-Clause
 // copyright-holders:R. Belmont, M. Burke
-#ifndef MAME_DEC_DEC_LK201_H
-#define MAME_DEC_DEC_LK201_H
+#ifndef MAME_DEC_LK201_H
+#define MAME_DEC_LK201_H
 
 #pragma once
 
@@ -129,4 +129,4 @@ private:
 // device type definition
 DECLARE_DEVICE_TYPE(LK201, lk201_device)
 
-#endif // MAME_DEC_DEC_LK201_H
+#endif // MAME_DEC_LK201_H
diff --git a/src/mame/dec/rainbow.cpp b/src/mame/dec/rainbow.cpp
index a940405ec96..df0f5a754f9 100644
--- a/src/mame/dec/rainbow.cpp
+++ b/src/mame/dec/rainbow.cpp
@@ -345,7 +345,7 @@ W17 pulls J1 serial  port pin 1 to GND when set (chassis to logical GND).
 #include "bus/rs232/terminal.h"
 
 #include "machine/i8251.h"
-#include "dec_lk201.h"
+#include "lk201.h"
 #include "machine/nvram.h"
 #include "machine/ripple_counter.h"
 #include "machine/timer.h"
@@ -1267,7 +1267,7 @@ void rainbow_base_state::machine_reset()
 	m_leds[5] = 1;
 	m_leds[6] = 1;
 
-	// GREEN KEYBOARD LEDs (see machine/dec_lk201.cpp)
+	// GREEN KEYBOARD LEDs (see dec/lk201.cpp)
 }
 
 void rainbow_modela_state::machine_reset()
diff --git a/src/devices/video/decsfb.cpp b/src/mame/dec/sfb.cpp
similarity index 99%
rename from src/devices/video/decsfb.cpp
rename to src/mame/dec/sfb.cpp
index df302d076f4..73e32f39366 100644
--- a/src/devices/video/decsfb.cpp
+++ b/src/mame/dec/sfb.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "emu.h"
-#include "decsfb.h"
+#include "sfb.h"
 
 #define MODE_SIMPLE     0
 #define MODE_OPAQUESTIPPLE  1
diff --git a/src/devices/video/decsfb.h b/src/mame/dec/sfb.h
similarity index 89%
rename from src/devices/video/decsfb.h
rename to src/mame/dec/sfb.h
index 9181ae84dbf..59d3dbe1396 100644
--- a/src/devices/video/decsfb.h
+++ b/src/mame/dec/sfb.h
@@ -1,8 +1,8 @@
 // license:BSD-3-Clause
 // copyright-holders:R. Belmont
 
-#ifndef MAME_VIDEO_DECSFB_H
-#define MAME_VIDEO_DECSFB_H
+#ifndef MAME_DEC_SFB_H
+#define MAME_DEC_SFB_H
 
 #pragma once
 
@@ -35,4 +35,4 @@ private:
 
 DECLARE_DEVICE_TYPE(DECSFB, decsfb_device)
 
-#endif // MAME_VIDEO_DECSFB_H
+#endif // MAME_DEC_SFB_H
diff --git a/src/mame/dec/vt240.cpp b/src/mame/dec/vt240.cpp
index 5411594c624..47e50500c78 100644
--- a/src/mame/dec/vt240.cpp
+++ b/src/mame/dec/vt240.cpp
@@ -7,7 +7,7 @@
 ****************************************************************************/
 
 #include "emu.h"
-#include "dec_lk201.h"
+#include "lk201.h"
 
 #include "ms7004.h"