srcclean and cleanup

Started fixing #include guards that don't match the file path. There are still plenty more in src/devices, but it's a start. When there are none left in src/devices and src/mame, a CI task can be added to catch them.
mamedev · Nov 23, 2024 · 146c0b9 · 146c0b9
1 parent 7b8072c
commit 146c0b9
Show file tree

Hide file tree

Showing 112 changed files with 507 additions and 480 deletions.
diff --git a/hash/ekara_cart.xml b/hash/ekara_cart.xml
@@ -3190,7 +3190,7 @@ license:CC0-1.0
 
 	<!-- this one has some songs programmed into it:
 	    月光町のうた                  おじゃる丸・キス                      Gekkō Machi no Uta              Ojarumaru/Kiss
-	    詠人（うたびと）              北島三郎                              Utabito                         Kitajima Saburō 
+	    詠人（うたびと）              北島三郎                              Utabito                         Kitajima Saburō
 	    アララの呪文                  ちびまる子ちゃんwith爆チュー問題      Arara no Jumon                  Chibi Maruko-chan with Bakuchū Mondai
 	    サザエさん                    宇野ゆう子                            Sazae-san                       Uno Yūko
 	    島人ぬ宝                      BEGIN                                 Shimanchunu Takara              BEGIN -->
@@ -3204,7 +3204,7 @@ license:CC0-1.0
 				<rom name="usercart.bin" size="0x100000" crc="bc4635cd" sha1="5343b254218f85a2f9e5ae9e4646b456d82c7d27"/>
 			</dataarea>
 		</part>
-	</software>	
+	</software>
 
 	<!-- this one has some songs programmed into it:
 	    世界に一つだけの花            SMAP                                  Sekai ni Hitotsu Dake no Hana   SMAP

diff --git a/hash/ibm5170.xml b/hash/ibm5170.xml
@@ -13423,7 +13423,7 @@ Prompts user to "press fire" but no correlated keyboard bind, requires unemulate
 	</software>
 
 	<software name="eyebeho3fr" cloneof="eyebeho3">
-        <!-- Prints regular AD&D with translated subtitle on box art -->
+		<!-- Prints regular AD&D with translated subtitle on box art -->
 		<description>Advanced Dungeons &amp; Dragons - Eye of the Beholder III: A l'assaut de Myth Drannor (France)</description>
 		<year>1993</year>
 		<publisher>SSI</publisher>
@@ -13455,7 +13455,7 @@ Prompts user to "press fire" but no correlated keyboard bind, requires unemulate
 	</software>
 
 	<software name="eyebeho3de" cloneof="eyebeho3">
-        <!-- TODO: assumed same as French version, verify with box art -->
+		<!-- TODO: assumed same as French version, verify with box art -->
 		<description>Advanced Dungeons &amp; Dragons - Eye of the Beholder III: Sturm auf Myth Drannor (Germany)</description>
 		<year>1993</year>
 		<publisher>SSI</publisher>

diff --git a/hash/x68k_flop.xml b/hash/x68k_flop.xml
@@ -5008,7 +5008,7 @@ Including "Daikairei Powerup kit to Shin Scenario Make kit" &amp; "Daikairei Tsu
 		<description>Emerald Densetsu</description>
 		<year>1990</year>
 		<publisher>システムハウスオー (System House Oh!)</publisher>
-   		<notes><![CDATA[
+		<notes><![CDATA[
 Has odd GFX boss fight transitions (verify)
 ]]></notes>
 		<info name="alt_title" value="エメラルド伝説" />

diff --git a/src/devices/bus/a2bus/a2corvus.h b/src/devices/bus/a2bus/a2corvus.h
@@ -9,8 +9,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_A2BUS_A2CORVUS_H
-#define MAME_A2BUS_A2CORVUS_H
+#ifndef MAME_BUS_A2BUS_A2CORVUS_H
+#define MAME_BUS_A2BUS_A2CORVUS_H
 
 #pragma once
 
@@ -52,4 +52,4 @@ class a2bus_corvus_device:
 // device type definition
 DECLARE_DEVICE_TYPE(A2BUS_CORVUS, a2bus_corvus_device)
 
-#endif // MAME_A2BUS_A2CORVUS_H
+#endif // MAME_BUS_A2BUS_A2CORVUS_H
diff --git a/src/devices/bus/a2bus/a2eext80col.h b/src/devices/bus/a2bus/a2eext80col.h
@@ -8,8 +8,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_BUS_A2BUS_A2EEXT809COL_H
-#define MAME_BUS_A2BUS_A2EEXT809COL_H
+#ifndef MAME_BUS_A2BUS_A2EEXT80COL_H
+#define MAME_BUS_A2BUS_A2EEXT80COL_H
 
 #pragma once
 
@@ -47,4 +47,4 @@ class a2eaux_ext80col_device:
 // device type definition
 DECLARE_DEVICE_TYPE(A2EAUX_EXT80COL, a2eaux_ext80col_device)
 
-#endif // MAME_BUS_A2BUS_A2EEXT809COL_H
+#endif // MAME_BUS_A2BUS_A2EEXT80COL_H
diff --git a/src/devices/bus/a2bus/a2superdrive.h b/src/devices/bus/a2bus/a2superdrive.h
@@ -8,8 +8,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_BUS_A2BUS_SUPERDRIVE_H
-#define MAME_BUS_A2BUS_SUPERDRIVE_H
+#ifndef MAME_BUS_A2BUS_A2SUPERDRIVE_H
+#define MAME_BUS_A2BUS_A2SUPERDRIVE_H
 
 #pragma once
 
@@ -19,4 +19,4 @@
 // device type definition
 DECLARE_DEVICE_TYPE(A2BUS_SUPERDRIVE, device_a2bus_card_interface)
 
-#endif // MAME_BUS_A2BUS_SUPERDRIVE_H
+#endif // MAME_BUS_A2BUS_A2SUPERDRIVE_H
diff --git a/src/devices/bus/a2bus/a2wico_trackball.h b/src/devices/bus/a2bus/a2wico_trackball.h
@@ -7,8 +7,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_DEVICES_A2BUS_A2WICO_TRACKBALL_H
-#define MAME_DEVICES_A2BUS_A2WICO_TRACKBALL_H
+#ifndef MAME_BUS_A2BUS_A2WICO_TRACKBALL_H
+#define MAME_BUS_A2BUS_A2WICO_TRACKBALL_H
 
 #pragma once
 
@@ -17,4 +17,4 @@
 // device type definition
 DECLARE_DEVICE_TYPE(A2BUS_WICOTRACKBALL, device_a2bus_card_interface)
 
-#endif // MAME_DEVICES_A2BUS_A2WICO_TRACKBALL_H
+#endif // MAME_BUS_A2BUS_A2WICO_TRACKBALL_H
diff --git a/src/devices/bus/a2bus/agat7ports.h b/src/devices/bus/a2bus/agat7ports.h
@@ -8,8 +8,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_BUS_A2BUS_AGAT7_PORTS_H
-#define MAME_BUS_A2BUS_AGAT7_PORTS_H
+#ifndef MAME_BUS_A2BUS_AGAT7PORTS_H
+#define MAME_BUS_A2BUS_AGAT7PORTS_H
 
 #pragma once
 
@@ -61,4 +61,4 @@ class a2bus_agat7_ports_device:
 // device type definition
 DECLARE_DEVICE_TYPE(A2BUS_AGAT7_PORTS, a2bus_agat7_ports_device)
 
-#endif // MAME_BUS_A2BUS_AGAT7_PORTS_H
+#endif // MAME_BUS_A2BUS_AGAT7PORTS_H
diff --git a/src/devices/bus/a2bus/computereyes2.h b/src/devices/bus/a2bus/computereyes2.h
@@ -8,8 +8,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_BUS_A2BUS_COMPEYES2_H
-#define MAME_BUS_A2BUS_COMPEYES2_H
+#ifndef MAME_BUS_A2BUS_COMPUTEREYES2_H
+#define MAME_BUS_A2BUS_COMPUTEREYES2_H
 
 #pragma once
 
@@ -18,4 +18,4 @@
 // device type declaration
 DECLARE_DEVICE_TYPE(A2BUS_COMPUTEREYES2, device_a2bus_card_interface)
 
-#endif // MAME_BUS_A2BUS_COMPEYES2_H
+#endif // MAME_BUS_A2BUS_COMPUTEREYES2_H
diff --git a/src/devices/bus/a2bus/ezcgi.h b/src/devices/bus/a2bus/ezcgi.h
@@ -10,8 +10,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_BUS_A2BUS_A2EZCGI_H
-#define MAME_BUS_A2BUS_A2EZCGI_H
+#ifndef MAME_BUS_A2BUS_EZCGI_H
+#define MAME_BUS_A2BUS_EZCGI_H
 
 #pragma once
 
@@ -22,4 +22,4 @@ DECLARE_DEVICE_TYPE(A2BUS_EZCGI,      device_a2bus_card_interface)
 DECLARE_DEVICE_TYPE(A2BUS_EZCGI_9938, device_a2bus_card_interface)
 DECLARE_DEVICE_TYPE(A2BUS_EZCGI_9958, device_a2bus_card_interface)
 
-#endif  // MAME_BUS_A2BUS_A2EZCGI_H
+#endif  // MAME_BUS_A2BUS_EZCGI_H
diff --git a/src/devices/bus/a2bus/grafex.h b/src/devices/bus/a2bus/grafex.h
@@ -8,8 +8,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_BUS_A2BUS_A2GRAFEX_H
-#define MAME_BUS_A2BUS_A2GRAFEX_H
+#ifndef MAME_BUS_A2BUS_GRAFEX_H
+#define MAME_BUS_A2BUS_GRAFEX_H
 
 #pragma once
 
@@ -18,4 +18,4 @@
 // device type definition
 DECLARE_DEVICE_TYPE(A2BUS_GRAFEX, device_a2bus_card_interface)
 
-#endif  // MAME_BUS_A2BUS_GRAFEX_H
+#endif // MAME_BUS_A2BUS_GRAFEX_H
diff --git a/src/devices/bus/a2bus/grappler.h b/src/devices/bus/a2bus/grappler.h
@@ -47,8 +47,8 @@
         SLCT  25  26  N/C
 
 ***********************************************************************/
-#ifndef MAME_BUS_A2BUS_GRAPPLERPLUS_H
-#define MAME_BUS_A2BUS_GRAPPLERPLUS_H
+#ifndef MAME_BUS_A2BUS_GRAPPLER_H
+#define MAME_BUS_A2BUS_GRAPPLER_H
 
 #pragma once
 
@@ -60,4 +60,4 @@ DECLARE_DEVICE_TYPE(A2BUS_GRAPPLERPLUS, device_a2bus_card_interface)
 DECLARE_DEVICE_TYPE(A2BUS_BUFGRAPPLERPLUS, device_a2bus_card_interface)
 DECLARE_DEVICE_TYPE(A2BUS_BUFGRAPPLERPLUSA, device_a2bus_card_interface)
 
-#endif // MAME_BUS_A2BUS_GRAPPLERPLUS_H
+#endif // MAME_BUS_A2BUS_GRAPPLER_H
diff --git a/src/devices/bus/a2bus/mouse.h b/src/devices/bus/a2bus/mouse.h
@@ -8,13 +8,13 @@
 
 *********************************************************************/
 
-#ifndef MAME_DEVICES_A2BUS_MOUSE_H
-#define MAME_DEVICES_A2BUS_MOUSE_H
+#ifndef MAME_BUS_A2BUS_MOUSE_H
+#define MAME_BUS_A2BUS_MOUSE_H
 
 #pragma once
 
 #include "a2bus.h"
 
 DECLARE_DEVICE_TYPE(A2BUS_MOUSE, device_a2bus_card_interface)
 
-#endif // MAME_DEVICES_A2BUS_MOUSE_H
+#endif // MAME_BUS_A2BUS_MOUSE_H
diff --git a/src/devices/bus/a2bus/nippelclock.h b/src/devices/bus/a2bus/nippelclock.h
@@ -8,8 +8,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_BUS_A2BUS_A2NIPPELCLOCK_H
-#define MAME_BUS_A2BUS_A2NIPPELCLOCK_H
+#ifndef MAME_BUS_A2BUS_NIPPELCLOCK_H
+#define MAME_BUS_A2BUS_NIPPELCLOCK_H
 
 #pragma once
 
@@ -48,4 +48,4 @@ class a2bus_nippelclock_device:
 // device type definition
 DECLARE_DEVICE_TYPE(A2BUS_NIPPELCLOCK, a2bus_nippelclock_device)
 
-#endif // MAME_BUS_A2BUS_A2NIPPELCLOCK_H
+#endif // MAME_BUS_A2BUS_NIPPELCLOCK_H
diff --git a/src/devices/bus/a2bus/ssprite.h b/src/devices/bus/a2bus/ssprite.h
@@ -9,8 +9,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_BUS_A2BUS_A2SSPRITE_H
-#define MAME_BUS_A2BUS_A2SSPRITE_H
+#ifndef MAME_BUS_A2BUS_SSPRITE_H
+#define MAME_BUS_A2BUS_SSPRITE_H
 
 #pragma once
 
@@ -19,4 +19,4 @@
 // device type definition
 DECLARE_DEVICE_TYPE(A2BUS_SSPRITE, device_a2bus_card_interface)
 
-#endif  // MAME_BUS_A2BUS_SSPRITE_H
+#endif // MAME_BUS_A2BUS_SSPRITE_H
diff --git a/src/devices/bus/a2bus/transwarp.h b/src/devices/bus/a2bus/transwarp.h
@@ -8,8 +8,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_BUS_A2BUS_A2TRANSWARP_H
-#define MAME_BUS_A2BUS_A2TRANSWARP_H
+#ifndef MAME_BUS_A2BUS_TRANSWARP_H
+#define MAME_BUS_A2BUS_TRANSWARP_H
 
 #include "a2bus.h"
 

diff --git a/src/devices/bus/a2gameio/computereyes.h b/src/devices/bus/a2gameio/computereyes.h
@@ -6,8 +6,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_BUS_A2GAMEIO_COMPEYES_H
-#define MAME_BUS_A2GAMEIO_COMPEYES_H
+#ifndef MAME_BUS_A2GAMEIO_COMPUTEREYES_H
+#define MAME_BUS_A2GAMEIO_COMPUTEREYES_H
 
 #pragma once
 
@@ -16,4 +16,4 @@
 // device type declaration
 DECLARE_DEVICE_TYPE(APPLE2_COMPUTEREYES, device_a2gameio_interface)
 
-#endif // MAME_BUS_A2GAMEIO_COMPEYES_H
+#endif // MAME_BUS_A2GAMEIO_COMPUTEREYES_H
diff --git a/src/devices/bus/a800/a5200_supercart.h b/src/devices/bus/a800/a5200_supercart.h
@@ -1,8 +1,8 @@
 // license: BSD-3-Clause
 // copyright-holders: Angelo Salese
 
-#ifndef MAME_BUS_A5200_SUPERCART_H
-#define MAME_BUS_A5200_SUPERCART_H
+#ifndef MAME_BUS_A800_A5200_SUPERCART_H
+#define MAME_BUS_A800_A5200_SUPERCART_H
 
 #pragma once
 
@@ -26,7 +26,7 @@ class a5200_rom_supercart_device : public a5200_rom_device
 	u8 bank_r(offs_t offset);
 };
 
-DECLARE_DEVICE_TYPE(A5200_ROM_SUPERCART,       a5200_rom_supercart_device)
+DECLARE_DEVICE_TYPE(A5200_ROM_SUPERCART, a5200_rom_supercart_device)
 
-#endif // MAME_BUS_A5200_SUPERCART_H
+#endif // MAME_BUS_A800_A5200_SUPERCART_H
 
diff --git a/src/devices/bus/a800/atari1050.h b/src/devices/bus/a800/atari1050.h
@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_BUS_A800_ATARI1050
-#define MAME_BUS_A800_ATARI1050 1
+#ifndef MAME_BUS_A800_ATARI1050_H
+#define MAME_BUS_A800_ATARI1050_H
 
 #pragma once
 
@@ -44,4 +44,4 @@ class atari1050_device : public device_t, public device_a8sio_card_interface
 
 DECLARE_DEVICE_TYPE(ATARI1050, atari1050_device)
 
-#endif // MAME_BUS_A800_ATARI1050
+#endif // MAME_BUS_A800_ATARI1050_H
diff --git a/src/devices/bus/a800/atari810.h b/src/devices/bus/a800/atari810.h
@@ -6,8 +6,8 @@
 
 ***************************************************************************/
 
-#ifndef MAME_BUS_A800_ATARI810
-#define MAME_BUS_A800_ATARI810 1
+#ifndef MAME_BUS_A800_ATARI810_H
+#define MAME_BUS_A800_ATARI810_H
 
 #pragma once
 
@@ -44,4 +44,4 @@ class atari810_device : public device_t, public device_a8sio_card_interface
 
 DECLARE_DEVICE_TYPE(ATARI810, atari810_device)
 
-#endif // MAME_BUS_A800_ATARI810
+#endif // MAME_BUS_A800_ATARI810_H
diff --git a/src/devices/bus/abcbus/abcbus.h b/src/devices/bus/abcbus/abcbus.h
@@ -95,8 +95,8 @@
 
 **********************************************************************/
 
-#ifndef MAME_DEVICES_ABCBUS_ABCBUS_H
-#define MAME_DEVICES_ABCBUS_ABCBUS_H
+#ifndef MAME_BUS_ABCBUS_ABCBUS_H
+#define MAME_BUS_ABCBUS_ABCBUS_H
 
 #pragma once
 
@@ -275,4 +275,4 @@ void abc1600bus_cards(device_slot_interface &device);
 typedef device_type_enumerator<abcbus_slot_device> abcbus_slot_device_enumerator;
 
 
-#endif // MAME_DEVICES_ABCBUS_ABCBUS_H
+#endif // MAME_BUS_ABCBUS_ABCBUS_H
diff --git a/src/devices/bus/abcbus/db4106.h b/src/devices/bus/abcbus/db4106.h
@@ -6,8 +6,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_BUS_ABCBUS_DATABOARD_4106_H
-#define MAME_BUS_ABCBUS_DATABOARD_4106_H
+#ifndef MAME_BUS_ABCBUS_DB4106_H
+#define MAME_BUS_ABCBUS_DB4106_H
 
 #pragma once
 
@@ -60,4 +60,4 @@ class databoard_4106_device : public device_t,
 // device type definition
 DECLARE_DEVICE_TYPE(DATABOARD_4106, databoard_4106_device)
 
-#endif // MAME_BUS_ABCBUS_DATABOARD_4106_H
+#endif // MAME_BUS_ABCBUS_DB4106_H
diff --git a/src/devices/bus/abcbus/db4107.h b/src/devices/bus/abcbus/db4107.h
@@ -6,8 +6,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_BUS_ABCBUS_DATABOARD_4107_H
-#define MAME_BUS_ABCBUS_DATABOARD_4107_H
+#ifndef MAME_BUS_ABCBUS_DB4107_H
+#define MAME_BUS_ABCBUS_DB4107_H
 
 #pragma once
 
@@ -62,4 +62,4 @@ class databoard_4107_device : public device_t,
 // device type definition
 DECLARE_DEVICE_TYPE(DATABOARD_4107, databoard_4107_device)
 
-#endif // MAME_BUS_ABCBUS_DATABOARD_4107_H
+#endif // MAME_BUS_ABCBUS_DB4107_H
diff --git a/src/devices/bus/abcbus/db4112.h b/src/devices/bus/abcbus/db4112.h
@@ -6,8 +6,8 @@
 
 *********************************************************************/
 
-#ifndef MAME_BUS_ABCBUS_DATABOARD_4112_H
-#define MAME_BUS_ABCBUS_DATABOARD_4112_H
+#ifndef MAME_BUS_ABCBUS_DB4112_H
+#define MAME_BUS_ABCBUS_DB4112_H
 
 #pragma once
 
@@ -60,4 +60,4 @@ class abc_databoard_4112_device : public device_t,
 // device type definition
 DECLARE_DEVICE_TYPE(DATABOARD_4112, abc_databoard_4112_device)
 
-#endif // MAME_BUS_ABCBUS_DATABOARD_4112_H
+#endif // MAME_BUS_ABCBUS_DB4112_H