diff options
author | 2024-11-24 03:52:26 +1100 | |
---|---|---|
committer | 2024-11-24 03:52:26 +1100 | |
commit | 146c0b9191a739ed6289c44ca5a5dd6db5f79c1f (patch) | |
tree | 7e3fed017711c49ac675063fee7dd3c31e30a7b8 /src/devices/bus | |
parent | 7b8072ce88a0ed7c39ec91a44642fb8eddd338c6 (diff) |
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.
Diffstat (limited to 'src/devices/bus')
36 files changed, 111 insertions, 110 deletions
diff --git a/src/devices/bus/a2bus/a2corvus.h b/src/devices/bus/a2bus/a2corvus.h index 87d190663f8..874b7dc019e 100644 --- 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 @@ private: // 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 index ac244a3cf1c..9e79193e99d 100644 --- 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 @@ private: // 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 index 4181892e5cd..f99a6272019 100644 --- 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 index 9fb689bfe8f..f18793d9cbb 100644 --- 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 index c99458c2405..09ed302106b 100644 --- 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 @@ private: // 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 index 183b6a60cb1..aeaeab92384 100644 --- 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 index b57cbd9dfa5..18b8e709ca9 100644 --- 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 index f21e32df44e..78dda772f80 100644 --- 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 index 059296205b6..2e311ab03ef 100644 --- 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 index 3208a353296..1f9669409ce 100644 --- a/src/devices/bus/a2bus/mouse.h +++ b/src/devices/bus/a2bus/mouse.h @@ -8,8 +8,8 @@ *********************************************************************/ -#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 @@ -17,4 +17,4 @@ 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 index 2125eb68f3a..cc96ca704ea 100644 --- 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 @@ private: // 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 index a87d0361a94..cb6be184299 100644 --- 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 index 369d3a277de..42e9bfbc7f3 100644 --- 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 index a95742fe919..44023723676 100644 --- 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 index 0d748f1f549..56d038db471 100644 --- 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 @@ protected: 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 index 2f26d1898e0..0c86dfd8dd4 100644 --- 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 @@ private: 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 index 0a33be10b7e..cfc6c2bbb3e 100644 --- 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 @@ private: 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 index 8532e6e22d6..ee36effa8b7 100644 --- 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 index cc585b28a87..51c9fa4d507 100644 --- 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 @@ private: // 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 index 32a474bd98c..afeb2b0ffb2 100644 --- 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 @@ private: // 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 index b757c426d83..5594d06015b 100644 --- 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 @@ private: // 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 diff --git a/src/devices/bus/abcbus/lux10828.h b/src/devices/bus/abcbus/lux10828.h index de491813157..9222ad4629e 100644 --- a/src/devices/bus/abcbus/lux10828.h +++ b/src/devices/bus/abcbus/lux10828.h @@ -6,8 +6,8 @@ *********************************************************************/ -#ifndef MAME_BUS_ABCBUS_LUXOR10828_H -#define MAME_BUS_ABCBUS_LUXOR10828_H +#ifndef MAME_BUS_ABCBUS_LUX10828_H +#define MAME_BUS_ABCBUS_LUX10828_H #pragma once @@ -112,4 +112,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(LUXOR_55_10828, luxor_55_10828_device) -#endif // MAME_BUS_ABCBUS_LUXOR10828_H +#endif // MAME_BUS_ABCBUS_LUX10828_H diff --git a/src/devices/bus/amiga/keyboard/keyboard.h b/src/devices/bus/amiga/keyboard/keyboard.h index 60415650529..9eee49da5b2 100644 --- a/src/devices/bus/amiga/keyboard/keyboard.h +++ b/src/devices/bus/amiga/keyboard/keyboard.h @@ -12,8 +12,8 @@ ***************************************************************************/ -#ifndef MAME_BUS_AMIGA_KEYBOARD_H -#define MAME_BUS_AMIGA_KEYBOARD_H +#ifndef MAME_BUS_AMIGA_KEYBOARD_KEYBOARD_H +#define MAME_BUS_AMIGA_KEYBOARD_KEYBOARD_H #pragma once @@ -93,4 +93,4 @@ void amiga_keyboard_devices(device_slot_interface &device); void a500_keyboard_devices(device_slot_interface &device); void a600_keyboard_devices(device_slot_interface &device); -#endif // MAME_BUS_AMIGA_KEYBOARD_H +#endif // MAME_BUS_AMIGA_KEYBOARD_KEYBOARD_H diff --git a/src/devices/bus/apricot/expansion/ram.h b/src/devices/bus/apricot/expansion/ram.h index 4f079cbe3b9..37325e58516 100644 --- a/src/devices/bus/apricot/expansion/ram.h +++ b/src/devices/bus/apricot/expansion/ram.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_BUS_APRICOT_RAM_H -#define MAME_BUS_APRICOT_RAM_H +#ifndef MAME_BUS_APRICOT_EXPANSION_RAM_H +#define MAME_BUS_APRICOT_EXPANSION_RAM_H #pragma once @@ -85,4 +85,4 @@ DECLARE_DEVICE_TYPE(APRICOT_128K_RAM, apricot_128k_ram_device) DECLARE_DEVICE_TYPE(APRICOT_512K_RAM, apricot_512k_ram_device) -#endif // MAME_BUS_APRICOT_RAM_H +#endif // MAME_BUS_APRICOT_EXPANSION_RAM_H diff --git a/src/devices/bus/apricot/expansion/winchester.h b/src/devices/bus/apricot/expansion/winchester.h index 2e6905eebce..09cd450ff70 100644 --- a/src/devices/bus/apricot/expansion/winchester.h +++ b/src/devices/bus/apricot/expansion/winchester.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_BUS_APRICOT_WINCHESTER_H -#define MAME_BUS_APRICOT_WINCHESTER_H +#ifndef MAME_BUS_APRICOT_EXPANSION_WINCHESTER_H +#define MAME_BUS_APRICOT_EXPANSION_WINCHESTER_H #pragma once @@ -62,4 +62,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(APRICOT_WINCHESTER, apricot_winchester_device) -#endif // MAME_BUS_APRICOT_WINCHESTER_H +#endif // MAME_BUS_APRICOT_EXPANSION_WINCHESTER_H diff --git a/src/devices/bus/astrocde/exp.h b/src/devices/bus/astrocde/exp.h index 4b5f2652c37..4078147ebb7 100644 --- a/src/devices/bus/astrocde/exp.h +++ b/src/devices/bus/astrocde/exp.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Fabio Priuli -#ifndef MAME_BUS_ASTROCADE_EXP_H -#define MAME_BUS_ASTROCADE_EXP_H +#ifndef MAME_BUS_ASTROCDE_EXP_H +#define MAME_BUS_ASTROCDE_EXP_H // ======================> device_astrocade_exp_interface @@ -59,4 +59,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(ASTROCADE_EXP_SLOT, astrocade_exp_device) -#endif // MAME_BUS_ASTROCADE_EXP_H +#endif // MAME_BUS_ASTROCDE_EXP_H diff --git a/src/devices/bus/astrocde/ram.h b/src/devices/bus/astrocde/ram.h index ad8d7cc6248..c163ff47e82 100644 --- a/src/devices/bus/astrocde/ram.h +++ b/src/devices/bus/astrocde/ram.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Fabio Priuli -#ifndef MAME_BUS_ASTROCADE_RAM_H -#define MAME_BUS_ASTROCADE_RAM_H +#ifndef MAME_BUS_ASTROCDE_RAM_H +#define MAME_BUS_ASTROCDE_RAM_H #pragma once @@ -150,4 +150,4 @@ DECLARE_DEVICE_TYPE(ASTROCADE_WHITERAM, astrocade_whiteram_device) DECLARE_DEVICE_TYPE(ASTROCADE_RL64RAM, astrocade_rl64ram_device) -#endif // MAME_BUS_ASTROCADE_RAM_H +#endif // MAME_BUS_ASTROCDE_RAM_H diff --git a/src/devices/bus/astrocde/rom.h b/src/devices/bus/astrocde/rom.h index c4627f48b01..4e46ced63e6 100644 --- a/src/devices/bus/astrocde/rom.h +++ b/src/devices/bus/astrocde/rom.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Fabio Priuli -#ifndef MAME_BUS_ASTROCADE_ROM_H -#define MAME_BUS_ASTROCADE_ROM_H +#ifndef MAME_BUS_ASTROCDE_ROM_H +#define MAME_BUS_ASTROCDE_ROM_H #pragma once @@ -91,4 +91,4 @@ DECLARE_DEVICE_TYPE(ASTROCADE_ROM_256K, astrocade_rom_256k_device) DECLARE_DEVICE_TYPE(ASTROCADE_ROM_512K, astrocade_rom_512k_device) DECLARE_DEVICE_TYPE(ASTROCADE_ROM_CASS, astrocade_rom_cass_device) -#endif // MAME_BUS_ASTROCADE_ROM_H +#endif // MAME_BUS_ASTROCDE_ROM_H diff --git a/src/devices/bus/astrocde/slot.h b/src/devices/bus/astrocde/slot.h index 823d6da0c1d..a3eb711adf9 100644 --- a/src/devices/bus/astrocde/slot.h +++ b/src/devices/bus/astrocde/slot.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Fabio Priuli -#ifndef MAME_BUS_ASTROCADE_SLOT_H -#define MAME_BUS_ASTROCADE_SLOT_H +#ifndef MAME_BUS_ASTROCDE_SLOT_H +#define MAME_BUS_ASTROCDE_SLOT_H #pragma once @@ -93,4 +93,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(ASTROCADE_CART_SLOT, astrocade_cart_slot_device) -#endif // MAME_BUS_ASTROCADE_SLOT_H +#endif // MAME_BUS_ASTROCDE_SLOT_H diff --git a/src/devices/bus/ata/hdd.h b/src/devices/bus/ata/hdd.h index 345b6c77115..c728fef6c7a 100644 --- a/src/devices/bus/ata/hdd.h +++ b/src/devices/bus/ata/hdd.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_BUS_ATA_IDEHD_H -#define MAME_BUS_ATA_IDEHD_H +#ifndef MAME_BUS_ATA_HDD_H +#define MAME_BUS_ATA_HDD_H #pragma once @@ -89,4 +89,4 @@ private: DECLARE_DEVICE_TYPE(IDE_HARDDISK, ide_hdd_device) DECLARE_DEVICE_TYPE(ATA_CF, ata_cf_device) -#endif // MAME_BUS_ATA_IDEHD_H +#endif // MAME_BUS_ATA_HDD_H diff --git a/src/devices/bus/bbc/cart/slot.h b/src/devices/bus/bbc/cart/slot.h index 42487bee5c7..69e5b5f69a5 100644 --- a/src/devices/bus/bbc/cart/slot.h +++ b/src/devices/bus/bbc/cart/slot.h @@ -101,8 +101,8 @@ CSYNC/MADET 10 10 LPSTB 22 0V - Zero volts. **********************************************************************/ -#ifndef MAME_BUS_BBC_CARTSLOT_H -#define MAME_BUS_BBC_CARTSLOT_H +#ifndef MAME_BUS_BBC_CART_SLOT_H +#define MAME_BUS_BBC_CART_SLOT_H #pragma once @@ -158,4 +158,4 @@ DECLARE_DEVICE_TYPE(BBCM_CARTSLOT, bbc_cartslot_device) void bbcm_cart(device_slot_interface &device); -#endif // MAME_BUS_BBC_CARTSLOT_H +#endif // MAME_BUS_BBC_CART_SLOT_H diff --git a/src/devices/bus/bbc/internal/morleyaa.h b/src/devices/bus/bbc/internal/morleyaa.h index a0caba641c5..c565f4b5949 100644 --- a/src/devices/bus/bbc/internal/morleyaa.h +++ b/src/devices/bus/bbc/internal/morleyaa.h @@ -6,9 +6,10 @@ **********************************************************************/ +#ifndef MAME_BUS_BBC_INTERNAL_MORLEYAA_H +#define MAME_BUS_BBC_INTERNAL_MORLEYAA_H -#ifndef MAME_BUS_BBC_INTERNAL_MORLEY_H -#define MAME_BUS_BBC_INTERNAL_MORLEY_H +#pragma once #include "internal.h" @@ -51,4 +52,4 @@ private: DECLARE_DEVICE_TYPE(BBC_MORLEYAA, bbc_morleyaa_device); -#endif /* MAME_BUS_BBC_INTERNAL_MORLEY_H */ +#endif // MAME_BUS_BBC_INTERNAL_MORLEYAA_H diff --git a/src/devices/bus/bbc/tube/tube_32016.h b/src/devices/bus/bbc/tube/tube_32016.h index 25dc86370b9..4d7fe4cb260 100644 --- a/src/devices/bus/bbc/tube/tube_32016.h +++ b/src/devices/bus/bbc/tube/tube_32016.h @@ -12,9 +12,10 @@ **********************************************************************/ +#ifndef MAME_BUS_BBC_TUBE_TUBE_32016_H +#define MAME_BUS_BBC_TUBE_TUBE_32016_H -#ifndef MAME_BUS_BBC_TUBE_32016_H -#define MAME_BUS_BBC_TUBE_32016_H +#pragma once #include "tube.h" #include "cpu/ns32000/ns32000.h" @@ -95,5 +96,4 @@ DECLARE_DEVICE_TYPE(BBC_TUBE_32016, bbc_tube_32016_device) DECLARE_DEVICE_TYPE(BBC_TUBE_16032, bbc_tube_16032_device) DECLARE_DEVICE_TYPE(BBC_TUBE_32016L, bbc_tube_32016l_device) - -#endif /* MAME_BUS_BBC_TUBE_32016_H */ +#endif // MAME_BUS_BBC_TUBE_TUBE_32016_H diff --git a/src/devices/bus/bbc/tube/tube_6502.h b/src/devices/bus/bbc/tube/tube_6502.h index 6d90dc17642..ddfc337109f 100644 --- a/src/devices/bus/bbc/tube/tube_6502.h +++ b/src/devices/bus/bbc/tube/tube_6502.h @@ -12,9 +12,10 @@ **********************************************************************/ +#ifndef MAME_BUS_BBC_TUBE_TUBE_6502_H +#define MAME_BUS_BBC_TUBE_TUBE_6502_H -#ifndef MAME_BUS_BBC_TUBE_6502_H -#define MAME_BUS_BBC_TUBE_6502_H +#pragma once #include "tube.h" #include "cpu/m6502/m65sc02.h" @@ -122,5 +123,4 @@ DECLARE_DEVICE_TYPE(BBC_TUBE_6502P, bbc_tube_6502p_device) DECLARE_DEVICE_TYPE(BBC_TUBE_6502E, bbc_tube_6502e_device) DECLARE_DEVICE_TYPE(BBC_TUBE_65C102, bbc_tube_65c102_device) - -#endif /* MAME_BUS_BBC_TUBE_6502_H */ +#endif // MAME_BUS_BBC_TUBE_TUBE_6502_H diff --git a/src/devices/bus/isa/svga_tseng.cpp b/src/devices/bus/isa/svga_tseng.cpp index 22fed5c2190..4ee430108eb 100644 --- a/src/devices/bus/isa/svga_tseng.cpp +++ b/src/devices/bus/isa/svga_tseng.cpp @@ -180,7 +180,7 @@ void isa16_svga_et4k_w32i_device::device_add_mconfig(machine_config &config) ET4KW32I_VGA(config, m_vga, 0); m_vga->set_screen("screen"); - // 1MB default, 4MB max + // 1MB default, 4MB max m_vga->set_vram_size(1*1024*1024); } @@ -201,7 +201,7 @@ void isa16_svga_et4k_w32i_device::remap(int space_id, offs_t start, offs_t end) if (space_id == AS_PROGRAM) { m_isa->install_memory(0xa0000, 0xbffff, read8sm_delegate(*m_vga, FUNC(tseng_vga_device::mem_r)), write8sm_delegate(*m_vga, FUNC(tseng_vga_device::mem_w))); - // TODO: can be disabled or narrowed thru TS Auxiliary Mode + // TODO: can be disabled or narrowed thru TS Auxiliary Mode m_isa->install_rom(this, 0xc0000, 0xc7fff, "vga_rom"); } else if (space_id == AS_IO) @@ -213,8 +213,8 @@ void isa16_svga_et4k_w32i_device::remap(int space_id, offs_t start, offs_t end) void isa16_svga_et4k_w32i_device::io_isa_map(address_map &map) { map(0x03b0, 0x03df).m(m_vga, FUNC(et4kw32i_vga_device::io_map)); - // IOD controls mirroring - map(0x210a, 0x210a).mirror(0x70).rw(m_vga, FUNC(et4kw32i_vga_device::acl_index_r), FUNC(et4kw32i_vga_device::acl_index_w)); - map(0x210b, 0x210b).mirror(0x70).rw(m_vga, FUNC(et4kw32i_vga_device::acl_data_r), FUNC(et4kw32i_vga_device::acl_data_w)); + // IOD controls mirroring + map(0x210a, 0x210a).mirror(0x70).rw(m_vga, FUNC(et4kw32i_vga_device::acl_index_r), FUNC(et4kw32i_vga_device::acl_index_w)); + map(0x210b, 0x210b).mirror(0x70).rw(m_vga, FUNC(et4kw32i_vga_device::acl_data_r), FUNC(et4kw32i_vga_device::acl_data_w)); } diff --git a/src/devices/bus/jvs/namcoio.cpp b/src/devices/bus/jvs/namcoio.cpp index c640bcf8d9f..2081658c4be 100644 --- a/src/devices/bus/jvs/namcoio.cpp +++ b/src/devices/bus/jvs/namcoio.cpp @@ -782,7 +782,7 @@ protected: { return (3 << 6) | // unknown input (31 << 1) | // unknown output - (BIT(m_dsw->read(), 3) << 0); // SW2:1 TODO: confirm + (BIT(m_dsw->read(), 3) << 0); // SW2:1 TODO: confirm } void iocpu_port_9_w(uint8_t data) |