diff --git a/hash/ekara_cart.xml b/hash/ekara_cart.xml index a58ea850fd0..d94b9b25b71 100644 --- a/hash/ekara_cart.xml +++ b/hash/ekara_cart.xml @@ -3190,7 +3190,7 @@ license:CC0-1.0 @@ -3204,7 +3204,7 @@ license:CC0-1.0 - + + Advanced Dungeons & Dragons - Eye of the Beholder III: A l'assaut de Myth Drannor (France) 1993 SSI @@ -13455,7 +13455,7 @@ Prompts user to "press fire" but no correlated keyboard bind, requires unemulate - + Advanced Dungeons & Dragons - Eye of the Beholder III: Sturm auf Myth Drannor (Germany) 1993 SSI diff --git a/hash/x68k_flop.xml b/hash/x68k_flop.xml index b899780619a..ae6e0e73cef 100644 --- a/hash/x68k_flop.xml +++ b/hash/x68k_flop.xml @@ -5008,7 +5008,7 @@ Including "Daikairei Powerup kit to Shin Scenario Make kit" & "Daikairei Tsu Emerald Densetsu 1990 システムハウスオー (System House Oh!) - 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_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) diff --git a/src/devices/cpu/m6805/m6805.cpp b/src/devices/cpu/m6805/m6805.cpp index 9087110bd1d..50a6abd1d69 100644 --- a/src/devices/cpu/m6805/m6805.cpp +++ b/src/devices/cpu/m6805/m6805.cpp @@ -395,7 +395,7 @@ void m6805_base_device::device_reset() m_nmi_state = 0; - // IRQ disabled + // IRQ disabled SEI; if (m_params.m_addr_width > 14) @@ -456,12 +456,12 @@ void m6805_base_device::interrupt_vector() rm16(0xfffa & m_params.m_vector_mask, m_pc); } -// Generate interrupts +// Generate interrupts void m6805_base_device::interrupt() { - // the 6805 latches interrupt requests internally, so we don't clear - // pending_interrupts until the interrupt is taken, no matter what the - // external IRQ pin does. + // the 6805 latches interrupt requests internally, so we don't clear + // pending_interrupts until the interrupt is taken, no matter what the + // external IRQ pin does. if (BIT(m_pending_interrupts, HD63705_INT_NMI)) { @@ -479,7 +479,7 @@ void m6805_base_device::interrupt() pushbyte(m_cc); } SEI; - // no vectors supported, just do the callback to clear irq_state if needed + // no vectors supported, just do the callback to clear irq_state if needed standard_irq_callback(0, m_pc.w.l); if (m_params.m_addr_width > 14) @@ -495,7 +495,7 @@ void m6805_base_device::interrupt() { if ((CC & IFLAG) == 0) { - // standard IRQ + // standard IRQ if (m_params.m_addr_width > 14) { pushword(m_pc); pushbyte(m_x); @@ -511,7 +511,7 @@ void m6805_base_device::interrupt() } SEI; - // no vectors supported, just do the callback to clear irq_state if needed + // no vectors supported, just do the callback to clear irq_state if needed standard_irq_callback(0, m_pc.w.l); interrupt_vector(); @@ -582,7 +582,7 @@ uint32_t m6805_base_device::execute_max_cycles() const noexcept } -// execute instructions on this CPU until icount expires +// execute instructions on this CPU until icount expires void m6805_base_device::execute_run() { S = SP_ADJUST( S ); // Taken from CPU_SET_CONTEXT when pointer'ifying @@ -1118,8 +1118,8 @@ void hd63705z0_device::execute_set_input(int inputnum, int state) void hd63705z0_device::interrupt_vector() { - // Need to add emulation of other interrupt sources here KW-2/4/99 - // This is just a quick patch for Namco System 2 operation + // Need to add emulation of other interrupt sources here KW-2/4/99 + // This is just a quick patch for Namco System 2 operation if ((m_pending_interrupts & (1 << HD63705_INT_IRQ1)) != 0) { diff --git a/src/devices/cpu/m6805/m6805.h b/src/devices/cpu/m6805/m6805.h index 0341df18eaf..4fefe663819 100644 --- a/src/devices/cpu/m6805/m6805.h +++ b/src/devices/cpu/m6805/m6805.h @@ -356,7 +356,7 @@ public: hd6305v0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); auto write_sci_tx() { return m_sci_tx.bind(); } - auto write_sci_clk() { return m_sci_clk.bind(); } + auto write_sci_clk() { return m_sci_clk.bind(); } auto read_porta() { return m_read_port [0].bind(); } auto write_porta() { return m_write_port[0].bind(); } diff --git a/src/devices/sound/ct1745.h b/src/devices/sound/ct1745.h index ce619171e18..6e6d02b818a 100644 --- a/src/devices/sound/ct1745.h +++ b/src/devices/sound/ct1745.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Angelo Salese -#ifndef DEVICE_SOUND_CT1745_H -#define DEVICE_SOUND_CT1745_H +#ifndef MAME_SOUND_CT1745_H +#define MAME_SOUND_CT1745_H #pragma once @@ -66,4 +66,4 @@ private: DECLARE_DEVICE_TYPE(CT1745, ct1745_mixer_device) -#endif // DEVICE_SOUND_CT1745_H +#endif // MAME_SOUND_CT1745_H diff --git a/src/devices/sound/xt446.h b/src/devices/sound/xt446.h index d9fe5feb7d2..9f363f1175e 100644 --- a/src/devices/sound/xt446.h +++ b/src/devices/sound/xt446.h @@ -9,8 +9,8 @@ **************************************************************************************/ -#ifndef DEVICE_SOUND_XT446_H -#define DEVICE_SOUND_XT446_H +#ifndef MAME_SOUND_XT446_H +#define MAME_SOUND_XT446_H #pragma once @@ -40,4 +40,4 @@ private: DECLARE_DEVICE_TYPE(XT446, xt446_device) -#endif +#endif // MAME_SOUND_XT446_H diff --git a/src/frontend/mame/ui/imgcntrl.cpp b/src/frontend/mame/ui/imgcntrl.cpp index 73cce5b2bf0..01106a7ba48 100644 --- a/src/frontend/mame/ui/imgcntrl.cpp +++ b/src/frontend/mame/ui/imgcntrl.cpp @@ -306,7 +306,7 @@ void menu_control_device_image::menu_activated() { auto [err, msg] = m_image.load(m_midi); if (err) - machine().popmessage(_("Error connecting to midi port: %1$s"), !msg.empty() ? msg : err.message()); + machine().popmessage(_("Error connecting to midi port: %1$s"), !msg.empty() ? msg : err.message()); } stack_pop(); break; diff --git a/src/frontend/mame/ui/midiinout.cpp b/src/frontend/mame/ui/midiinout.cpp index 28f335c7488..558d3f0fb0f 100644 --- a/src/frontend/mame/ui/midiinout.cpp +++ b/src/frontend/mame/ui/midiinout.cpp @@ -22,7 +22,7 @@ menu_midi_inout::menu_midi_inout(mame_ui_manager &mui, render_container &contain , m_channel(channel) , m_is_input(is_input) { - set_heading(m_is_input ? _("Midi input channel") : _("Midi output channel")); + set_heading(m_is_input ? _("MIDI input channel") : _("MIDI output channel")); } menu_midi_inout::~menu_midi_inout() @@ -67,8 +67,6 @@ void menu_midi_inout::populate() void menu_midi_inout::recompute_metrics(uint32_t width, uint32_t height, float aspect) { menu::recompute_metrics(width, height, aspect); - - // set_custom_space(0.0f, 2.0f * line_height() + 2.0f * tb_border()); } diff --git a/src/mame/altos/altos2_kbd.h b/src/mame/altos/altos2_kbd.h index 1346d4ae5a6..40c549aa775 100644 --- a/src/mame/altos/altos2_kbd.h +++ b/src/mame/altos/altos2_kbd.h @@ -6,8 +6,8 @@ **********************************************************************/ -#ifndef MAME_ALTOS_ALTOS2_KEYBOARD_H -#define MAME_ALTOS_ALTOS2_KEYBOARD_H +#ifndef MAME_ALTOS_ALTOS2_KBD_H +#define MAME_ALTOS_ALTOS2_KBD_H #pragma once @@ -68,4 +68,4 @@ private: // device type declarations DECLARE_DEVICE_TYPE(ALTOS2_KEYBOARD, altos2_keyboard_device) -#endif // MAME_ALTOS_ALTOS2_KEYBOARD_H +#endif // MAME_ALTOS_ALTOS2_KBD_H diff --git a/src/mame/apple/apple2common.h b/src/mame/apple/apple2common.h index b046c940c4f..5a696ab7e2a 100644 --- a/src/mame/apple/apple2common.h +++ b/src/mame/apple/apple2common.h @@ -7,8 +7,8 @@ Apple II stuff shared between apple2/apple2e/apple2gs. *********************************************************************/ -#ifndef MAME_APPLE_APPLE2_COMMON_H -#define MAME_APPLE_APPLE2_COMMON_H +#ifndef MAME_APPLE_APPLE2COMMON_H +#define MAME_APPLE_APPLE2COMMON_H #pragma once @@ -51,4 +51,4 @@ private: DECLARE_DEVICE_TYPE(APPLE2_COMMON, apple2_common_device) -#endif // MAME_APPLE_APPLE2_COMMON_H +#endif // MAME_APPLE_APPLE2COMMON_H diff --git a/src/mame/apple/apple2video.h b/src/mame/apple/apple2video.h index 887ac12ef86..e602e7e9b31 100644 --- a/src/mame/apple/apple2video.h +++ b/src/mame/apple/apple2video.h @@ -2,12 +2,12 @@ // copyright-holders:R. Belmont /********************************************************************* - video/apple2.h - Video handling for Apple II and IIgs + apple/apple2video.h - Video handling for Apple II and IIgs *********************************************************************/ -#ifndef MAME_SHARED_APPLE2VIDEO_H -#define MAME_SHARED_APPLE2VIDEO_H +#ifndef MAME_APPLE_APPLE2VIDEO_H +#define MAME_APPLE_APPLE2VIDEO_H #include "emupal.h" @@ -147,4 +147,4 @@ DECLARE_DEVICE_TYPE(APPLE2_VIDEO, a2_video_device) DECLARE_DEVICE_TYPE(APPLE2_VIDEO_COMPOSITE, a2_video_device_composite) DECLARE_DEVICE_TYPE(APPLE2_VIDEO_COMPOSITE_RGB, a2_video_device_composite_rgb) -#endif // MAME_SHARED_APPLE2VIDEO_H +#endif // MAME_APPLE_APPLE2VIDEO_H diff --git a/src/mame/apple/macpwrbk030.cpp b/src/mame/apple/macpwrbk030.cpp index 6789a3be470..d478dff50f0 100644 --- a/src/mame/apple/macpwrbk030.cpp +++ b/src/mame/apple/macpwrbk030.cpp @@ -2,132 +2,132 @@ // copyright-holders:R. Belmont /**************************************************************************** - drivers/macpwrbk030.cpp - Mac PowerBooks with a 68030 CPU and M50753 PMU - By R. Belmont + drivers/macpwrbk030.cpp + Mac PowerBooks with a 68030 CPU and M50753 PMU + By R. Belmont - These are basically late-period Mac IIs without NuBus and with - Egret/Cuda replaced with the PMU. + These are basically late-period Mac IIs without NuBus and with + Egret/Cuda replaced with the PMU. - Generation 1: - PowerBook 140: 16 MHz 68030, 2 MiB RAM, no FPU, passive-matrix screen - PowerBook 145: 140 with 25 MHz 68030 - PowerBook 145B: 140 with 25 MHz 68030 and 4 MiB of RAM standard - PowerBook 170: 140, with 25 MHz 68030, 68881 FPU, active-matrix screen + Generation 1: + PowerBook 140: 16 MHz 68030, 2 MiB RAM, no FPU, passive-matrix screen + PowerBook 145: 140 with 25 MHz 68030 + PowerBook 145B: 140 with 25 MHz 68030 and 4 MiB of RAM standard + PowerBook 170: 140, with 25 MHz 68030, 68881 FPU, active-matrix screen - Generation 2: (all models include external monitor support) - PowerBook 160: 25 MHz 68030, no FPU, passive-matrix screen with 2 bits per pixel grayscale - PowerBook 180: 33 MHz 68030, 68881 FPU, active-matrix screen with 2 bits per pixel grayscale - PowerBook 165: 160 with 33 MHz 68030 - PowerBook 165c: 160 with 33 MHz 68030, FPU, color 640x400 display - PowerBook 180c: 165c with color 640x480 display + Generation 2: (all models include external monitor support) + PowerBook 160: 25 MHz 68030, no FPU, passive-matrix screen with 2 bits per pixel grayscale + PowerBook 180: 33 MHz 68030, 68881 FPU, active-matrix screen with 2 bits per pixel grayscale + PowerBook 165: 160 with 33 MHz 68030 + PowerBook 165c: 160 with 33 MHz 68030, FPU, color 640x400 display + PowerBook 180c: 165c with color 640x480 display - Driver features: - - Display, audio, floppy, SCSI, and ADB all work. You can boot compatible System versions - and run arbitrary software. - - FPU presence and Jaws/Niagra CPU speed readback are supported so that Gestalt properly - identifies all models (except the 145B is shown as a 145; Apple documents this as also - occuring on hardware). - - 165c/180c use of a VGA GPIO feature bit to determine the correct model is supported. + Driver features: + - Display, audio, floppy, SCSI, and ADB all work. You can boot compatible System versions + and run arbitrary software. + - FPU presence and Jaws/Niagra CPU speed readback are supported so that Gestalt properly + identifies all models (except the 145B is shown as a 145; Apple documents this as also + occuring on hardware). + - 165c/180c use of a VGA GPIO feature bit to determine the correct model is supported. - Driver TODOs: - - Shutting down or restarting from Finder freezes the machine. Something related - to power management presumably, but the cause is not clear. This is why the driver is MACHINE_NOT_WORKING. - - External video interface on 160/165/165c/180/180c. + Driver TODOs: + - Shutting down or restarting from Finder freezes the machine. Something related + to power management presumably, but the cause is not clear. This is why the driver is MACHINE_NOT_WORKING. + - External video interface on 160/165/165c/180/180c. ============================================================================ - Technical info + Technical info - VIA 1 connections: (PowerBook 140/170, 160/180/180C are similar) - Port A: 0: VIA_TEST - 1: CPU_ID0 - 2: CPU_ID1 - 3: MODEM - 4: CPU_ID2 - 5: HDSEL (floppy head select) - 6: CPU_ID3 - 7: SCC REQ + VIA 1 connections: (PowerBook 140/170, 160/180/180C are similar) + Port A: 0: VIA_TEST + 1: CPU_ID0 + 2: CPU_ID1 + 3: MODEM + 4: CPU_ID2 + 5: HDSEL (floppy head select) + 6: CPU_ID3 + 7: SCC REQ - Port B: 0: RTC DATA - 1: RTC CLOCK - 2: RTC - 3: LINK SEL - 4: N/C - 5: N/C - 6: N/C - 7: N/C + Port B: 0: RTC DATA + 1: RTC CLOCK + 2: RTC + 3: LINK SEL + 4: N/C + 5: N/C + 6: N/C + 7: N/C - CA1: 60 Hz clock - CA2: 1 second clock - CB1: PMU IRQ - CB2: MODEM SND EN + CA1: 60 Hz clock + CA2: 1 second clock + CB1: PMU IRQ + CB2: MODEM SND EN - VIA 2 connections: (VIA2 is a pseudo-VIA inside the "Peripheral Glue" ASIC) - Port A: bi-directional PMU data bus + VIA 2 connections: (VIA2 is a pseudo-VIA inside the "Peripheral Glue" ASIC) + Port A: bi-directional PMU data bus - Port B: 0: SV1 - 1: PMACK - 2: PMREQ - 3: SV0 - 4: SV2 - 5: HMMU - 6: N/C - 7: MODEM RESET + Port B: 0: SV1 + 1: PMACK + 2: PMREQ + 3: SV0 + 4: SV2 + 5: HMMU + 6: N/C + 7: MODEM RESET - PMU (M50753) connections: - IN port: 0: BRITE SENSE - 1: A/D BATT (battery charge level) - 2: SND CNTL - 3: MODEM BUSY - 4: PWR ON (input, 1 = system power on) - 5: TEMP A/D (battery temperature) - 6: NICAD SLA - 7: TABLE SEL (A/D input, some kind of battery state) + PMU (M50753) connections: + IN port: 0: BRITE SENSE + 1: A/D BATT (battery charge level) + 2: SND CNTL + 3: MODEM BUSY + 4: PWR ON (input, 1 = system power on) + 5: TEMP A/D (battery temperature) + 6: NICAD SLA + 7: TABLE SEL (A/D input, some kind of battery state) - Port 0: 0: SWIM CNTL - 1: SCC CNTL - 2: HD PWR - 3: MODEM PWR - 4: N/C - 5: SOUND PWR - 6: MODEM PWROUT - 7: SYS_PWR + Port 0: 0: SWIM CNTL + 1: SCC CNTL + 2: HD PWR + 3: MODEM PWR + 4: N/C + 5: SOUND PWR + 6: MODEM PWROUT + 7: SYS_PWR - Port 1: 0: CCFL PWR CNTL - 1: AKD (input, works like the high bit of $C000 on the Apple II, except includes the modifiers) - 2: STOP CLK - 3: CHRG ON (input, 1 = charger is on, 7.1.1 Battery applet shows charging symbol on ) - 4: KBD RST (output, resets keyboard M50740) - 5: HICHG (output) - 6: RING DETECT - 7: CHG OFF (output) + Port 1: 0: CCFL PWR CNTL + 1: AKD (input, works like the high bit of $C000 on the Apple II, except includes the modifiers) + 2: STOP CLK + 3: CHRG ON (input, 1 = charger is on, 7.1.1 Battery applet shows charging symbol on ) + 4: KBD RST (output, resets keyboard M50740) + 5: HICHG (output) + 6: RING DETECT + 7: CHG OFF (output) - Port 2: bi-directional data bus, connected to VIA port A + Port 2: bi-directional data bus, connected to VIA port A - Port 3: 0: PWR OFF - 1: SYS RST - 2: VIA TEST - 3: SOUND OFF - 4: 1 SEC (input from Mac Plus RTC/PRAM chip, never read by the PMU program) - 5: PMINT - 6: PMACK - 7: PMREQ + Port 3: 0: PWR OFF + 1: SYS RST + 2: VIA TEST + 3: SOUND OFF + 4: 1 SEC (input from Mac Plus RTC/PRAM chip, never read by the PMU program) + 5: PMINT + 6: PMACK + 7: PMREQ - Port 4: 0: PMGR_ADB (ADB out) - 1: ADB (ADB in) - 2: DISP BLANK - 3: MODEM_INS + Port 4: 0: PMGR_ADB (ADB out) + 1: ADB (ADB in) + 2: DISP BLANK + 3: MODEM_INS - INT1: 60 Hz clock - INT2: INT2 PULLUP (pulled up and otherwise N/C) + INT1: 60 Hz clock + INT2: INT2 PULLUP (pulled up and otherwise N/C) - PG&E (68HC05 PMU) version spotting: - (find the text "BORG" in the system ROM, the next 32768 bytes are the PG&E image. - offset +4 in the image is the version byte). - 01 - PowerBook Duo 210/230/250 - 02 - PowerBook 540c, PBDuo 270C, PBDuo 280/280C - 03 - PowerBook 150 - 08 - PB190cs, PowerBook 540c PPC update, all PowerPC PowerBooks through WallStreet G3s + PG&E (68HC05 PMU) version spotting: + (find the text "BORG" in the system ROM, the next 32768 bytes are the PG&E image. + offset +4 in the image is the version byte). + 01 - PowerBook Duo 210/230/250 + 02 - PowerBook 540c, PBDuo 270C, PBDuo 280/280C + 03 - PowerBook 150 + 08 - PB190cs, PowerBook 540c PPC update, all PowerPC PowerBooks through WallStreet G3s ****************************************************************************/ diff --git a/src/mame/atari/atarijsa.h b/src/mame/atari/atarijsa.h index 8afe524e946..fcd77d6b17a 100644 --- a/src/mame/atari/atarijsa.h +++ b/src/mame/atari/atarijsa.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_ATARI_ATARI_JSA_H -#define MAME_ATARI_ATARI_JSA_H +#ifndef MAME_ATARI_ATARIJSA_H +#define MAME_ATARI_ATARIJSA_H #pragma once @@ -264,4 +264,4 @@ protected: }; -#endif // MAME_ATARI_ATARI_JSA_H +#endif // MAME_ATARI_ATARIJSA_H diff --git a/src/mame/atari/atarisac.h b/src/mame/atari/atarisac.h index ec02e84d5eb..8c38805523e 100644 --- a/src/mame/atari/atarisac.h +++ b/src/mame/atari/atarisac.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_ATARI_ATARI_SAC_H -#define MAME_ATARI_ATARI_SAC_H +#ifndef MAME_ATARI_ATARISAC_H +#define MAME_ATARI_ATARISAC_H #pragma once @@ -76,4 +76,4 @@ private: }; -#endif // MAME_ATARI_ATARI_SAC_H +#endif // MAME_ATARI_ATARISAC_H diff --git a/src/mame/atari/jaguar.h b/src/mame/atari/jaguar.h index fe36353be3d..34f36c332d8 100644 --- a/src/mame/atari/jaguar.h +++ b/src/mame/atari/jaguar.h @@ -5,20 +5,28 @@ Atari Jaguar hardware *************************************************************************/ +#ifndef MAME_ATARI_JAGUAR_H +#define MAME_ATARI_JAGUAR_H + +#pragma once -#include "cpu/jaguar/jaguar.h" -#include "machine/nvram.h" -#include "sound/dac.h" -#include "machine/eepromser.h" -#include "machine/vt83c461.h" -#include "imagedev/snapquik.h" #include "jag_blitter.h" -#include "cdrom.h" + #include "bus/generic/slot.h" +#include "cpu/jaguar/jaguar.h" #include "imagedev/cdromimg.h" +#include "imagedev/snapquik.h" +#include "machine/eepromser.h" +#include "machine/nvram.h" +#include "machine/vt83c461.h" +#include "sound/dac.h" + #include "screen.h" #include "emupal.h" +#include "cdrom.h" + + #ifndef ENABLE_SPEEDUP_HACKS #define ENABLE_SPEEDUP_HACKS 1 #endif @@ -406,3 +414,5 @@ private: uint8_t m_butch_cmd_index = 0U; uint8_t m_butch_cmd_size = 0U; }; + +#endif // MAME_ATARI_JAGUAR_H diff --git a/src/mame/barcrest/mpu4_characteriser_bootleg.h b/src/mame/barcrest/mpu4_characteriser_bootleg.h index ed511d73e30..689139db87c 100644 --- a/src/mame/barcrest/mpu4_characteriser_bootleg.h +++ b/src/mame/barcrest/mpu4_characteriser_bootleg.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_BARCREST_MPU4_CHARACTERISER_BL_H -#define MAME_BARCREST_MPU4_CHARACTERISER_BL_H +#ifndef MAME_BARCREST_MPU4_CHARACTERISER_BOOTLEG_H +#define MAME_BARCREST_MPU4_CHARACTERISER_BOOTLEG_H #pragma once @@ -67,4 +67,4 @@ protected: int m_prot_col = 0; }; -#endif // MAME_BARCREST_MPU4_CHARACTERISER_BL_H +#endif // MAME_BARCREST_MPU4_CHARACTERISER_BOOTLEG_H diff --git a/src/mame/bfm/bfm_dm01.h b/src/mame/bfm/bfm_dm01.h index ff9a2f05d52..3bc4c498fbf 100644 --- a/src/mame/bfm/bfm_dm01.h +++ b/src/mame/bfm/bfm_dm01.h @@ -5,8 +5,8 @@ Bellfruit dotmatrix driver, (under heavy construction !!!) *************************************************************************************/ -#ifndef MAME_BFM_BFM_DM01 -#define MAME_BFM_BFM_DM01 +#ifndef MAME_BFM_BFM_DM01_H +#define MAME_BFM_BFM_DM01_H #pragma once @@ -64,4 +64,4 @@ private: DECLARE_DEVICE_TYPE(BFM_DM01, bfm_dm01_device) -#endif // MAME_BFM_BFM_DM01 +#endif // MAME_BFM_BFM_DM01_H diff --git a/src/mame/bfm/bfm_gu96x8m_k657c2.h b/src/mame/bfm/bfm_gu96x8m_k657c2.h index 82b3977838d..93269e751bd 100644 --- a/src/mame/bfm/bfm_gu96x8m_k657c2.h +++ b/src/mame/bfm/bfm_gu96x8m_k657c2.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_MACHINE_BFG_GU96X8M_K657C2_H -#define MAME_MACHINE_BFG_GU96X8M_K657C2_H +#ifndef MAME_BFM_BFM_GU96X8M_K657C2_H +#define MAME_BFM_BFM_GU96X8M_K657C2_H #pragma once @@ -74,4 +74,4 @@ private: DECLARE_DEVICE_TYPE(BFM_GU96X8M_K657C2, bfm_gu96x8m_k657c2_device) -#endif // MAME_MACHINE_BFG_GU96X8M_K657C2_H +#endif // MAME_BFM_BFM_GU96X8M_K657C2_H diff --git a/src/mame/capcom/gng.cpp b/src/mame/capcom/gng.cpp index a70db9ad1be..ac546934f1d 100644 --- a/src/mame/capcom/gng.cpp +++ b/src/mame/capcom/gng.cpp @@ -950,7 +950,7 @@ ROM_START( makaimurb ) // 85606-A-3/85606-B-3 ROM_END /* - Makaimura + Makaimura Program is the same as set makaimurb, but different sized/arranged ROMs. Some GFX ROMs are different. */ diff --git a/src/mame/commodore/c65.cpp b/src/mame/commodore/c65.cpp index 7c603860435..242564db746 100644 --- a/src/mame/commodore/c65.cpp +++ b/src/mame/commodore/c65.cpp @@ -73,19 +73,18 @@ protected: virtual void device_reset() override ATTR_COLD; private: - required_address_space m_space; - - u32 m_dmalist_address = 0; - - TIMER_CALLBACK_MEMBER(execute_cb); - typedef enum { + enum dma_state_t : u8 { COPY, MIX, SWAP, FILL, IDLE, FETCH_PARAMS - } dma_state_t; + }; + + required_address_space m_space; + + u32 m_dmalist_address = 0; dma_state_t m_state; u32 m_src, m_dst, m_length, m_command, m_modulo; @@ -93,11 +92,16 @@ private: bool m_chained_transfer; emu_timer *m_dma_timer; + + TIMER_CALLBACK_MEMBER(execute_cb); + void check_state(int next_cycles); void increment_src(); void increment_dst(); }; +ALLOW_SAVE_TYPE(dmagic_f018_device::dma_state_t) + // CSG 390957-01 DEFINE_DEVICE_TYPE(DMAGIC_F018, dmagic_f018_device, "dmagic_f018", "DMAgic F018 Gate Array") @@ -110,7 +114,7 @@ dmagic_f018_device::dmagic_f018_device(const machine_config &mconfig, const char void dmagic_f018_device::device_start() { save_item(NAME(m_dmalist_address)); - //save_item(NAME(m_state)); + save_item(NAME(m_state)); m_dma_timer = timer_alloc(FUNC(dmagic_f018_device::execute_cb), this); } diff --git a/src/mame/dataeast/decbac06.h b/src/mame/dataeast/decbac06.h index a56c726f513..3ffdf637ff4 100644 --- a/src/mame/dataeast/decbac06.h +++ b/src/mame/dataeast/decbac06.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Bryan McPhail, David Haywood -#ifndef MAME_DATAEAST_DECOBAC06_H -#define MAME_DATAEAST_DECOBAC06_H +#ifndef MAME_DATAEAST_DECBAC06_H +#define MAME_DATAEAST_DECBAC06_H #pragma once @@ -148,4 +148,4 @@ private: DECLARE_DEVICE_TYPE(DECO_BAC06, deco_bac06_device) -#endif // MAME_DATAEAST_DECOBAC06_H +#endif // MAME_DATAEAST_DECBAC06_H diff --git a/src/mame/dataeast/deco222.h b/src/mame/dataeast/deco222.h index 4a5655290f6..be5b675063e 100644 --- a/src/mame/dataeast/deco222.h +++ b/src/mame/dataeast/deco222.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_DATAEAST_DECO222 -#define MAME_DATAEAST_DECO222 +#ifndef MAME_DATAEAST_DECO222_H +#define MAME_DATAEAST_DECO222_H #pragma once @@ -67,4 +67,4 @@ protected: DECLARE_DEVICE_TYPE(DECO_222, deco_222_device) DECLARE_DEVICE_TYPE(DECO_C10707, deco_c10707_device) -#endif // MAME_DATAEAST_DECO222 +#endif // MAME_DATAEAST_DECO222_H diff --git a/src/mame/dataeast/decrmc3.h b/src/mame/dataeast/decrmc3.h index bf73bb1d227..c2af176b628 100644 --- a/src/mame/dataeast/decrmc3.h +++ b/src/mame/dataeast/decrmc3.h @@ -14,8 +14,8 @@ ******************************************************************************/ -#ifndef MAME_DATAEAST_DECORMC3_H -#define MAME_DATAEAST_DECORMC3_H +#ifndef MAME_DATAEAST_DECRMC3_H +#define MAME_DATAEAST_DECRMC3_H #pragma once @@ -110,4 +110,4 @@ private: memory_array m_paletteram_ext; // extended memory }; -#endif // MAME_DATAEAST_DECORMC3_H +#endif // MAME_DATAEAST_DECRMC3_H diff --git a/src/mame/dec/pdp1.h b/src/mame/dec/pdp1.h index 64d42bc9ea5..bb1587fae7b 100644 --- a/src/mame/dec/pdp1.h +++ b/src/mame/dec/pdp1.h @@ -2,11 +2,11 @@ // copyright-holders:Raphael Nabet /***************************************************************************** * - * includes/pdp1.h + * dec/pdp1.h * ****************************************************************************/ -#ifndef MAME_PDP1_PDP1_H -#define MAME_PDP1_PDP1_H +#ifndef MAME_DEC_PDP1_H +#define MAME_DEC_PDP1_H #pragma once @@ -477,4 +477,4 @@ public: required_ioport m_lighty; }; -#endif // MAME_PDP1_PDP1_H +#endif // MAME_DEC_PDP1_H diff --git a/src/mame/fidelity/clockdiv.h b/src/mame/fidelity/clockdiv.h index 86ef0499efa..71c6cdbe817 100644 --- a/src/mame/fidelity/clockdiv.h +++ b/src/mame/fidelity/clockdiv.h @@ -6,8 +6,8 @@ */ -#ifndef MAME_FIDELITY_FIDEL_CLOCKDIV_H -#define MAME_FIDELITY_FIDEL_CLOCKDIV_H +#ifndef MAME_FIDELITY_CLOCKDIV_H +#define MAME_FIDELITY_CLOCKDIV_H #pragma once @@ -49,4 +49,4 @@ private: INPUT_PORTS_EXTERN( fidel_clockdiv_2 ); INPUT_PORTS_EXTERN( fidel_clockdiv_4 ); -#endif // MAME_FIDELITY_FIDEL_CLOCKDIV_H +#endif // MAME_FIDELITY_CLOCKDIV_H diff --git a/src/mame/funtech/umc6619_sound.h b/src/mame/funtech/umc6619_sound.h index d928b5ba227..f897a469d97 100644 --- a/src/mame/funtech/umc6619_sound.h +++ b/src/mame/funtech/umc6619_sound.h @@ -6,8 +6,8 @@ **********************************************************************/ -#ifndef MAME_FUNTECH_UM6619_SOUND_H -#define MAME_FUNTECH_UM6619_SOUND_H +#ifndef MAME_FUNTECH_UMC6619_SOUND_H +#define MAME_FUNTECH_UMC6619_SOUND_H #pragma once @@ -70,4 +70,4 @@ private: DECLARE_DEVICE_TYPE(UMC6619_SOUND, umc6619_sound_device) -#endif // MAME_FUNTECH_UM6619_SOUND_H +#endif // MAME_FUNTECH_UMC6619_SOUND_H diff --git a/src/mame/fuuki/fuukispr.cpp b/src/mame/fuuki/fuukispr.cpp index cf48231c1c2..0182a8f9c94 100644 --- a/src/mame/fuuki/fuukispr.cpp +++ b/src/mame/fuuki/fuukispr.cpp @@ -2,11 +2,11 @@ // copyright-holders: Luca Elia, David Haywood /* - Fuuki Sprite hardware + Fuuki Sprite hardware - Used by: - fuukifg2.cpp - fuukifg3.cpp (with sprite tile bankswitching, triple buffered) + Used by: + fuukifg2.cpp + fuukifg3.cpp (with sprite tile bankswitching, triple buffered) */ diff --git a/src/mame/fuuki/fuukitmap.cpp b/src/mame/fuuki/fuukitmap.cpp index 9e7ce00bcae..cd09b3daef4 100644 --- a/src/mame/fuuki/fuukitmap.cpp +++ b/src/mame/fuuki/fuukitmap.cpp @@ -2,11 +2,11 @@ // copyright-holders: Luca Elia, David Haywood /* - Fuuki Tilemap hardware + Fuuki Tilemap hardware - Used by: - fuukifg2.cpp - fuukifg3.cpp + Used by: + fuukifg2.cpp + fuukifg3.cpp */ #include "emu.h" diff --git a/src/mame/fuuki/fuukitmap.h b/src/mame/fuuki/fuukitmap.h index ceb209ead5d..fb4d1289fc6 100644 --- a/src/mame/fuuki/fuukitmap.h +++ b/src/mame/fuuki/fuukitmap.h @@ -34,7 +34,7 @@ public: m_xoffs = xoffs; m_xoffs_flip = xoffs_flip; } - + void set_yoffs(int yoffs, int yoffs_flip) { m_yoffs = yoffs; diff --git a/src/mame/heathzenith/intr_cntrl.h b/src/mame/heathzenith/intr_cntrl.h index ca26007df3e..e0e9c3966f7 100644 --- a/src/mame/heathzenith/intr_cntrl.h +++ b/src/mame/heathzenith/intr_cntrl.h @@ -8,8 +8,8 @@ ****************************************************************************/ -#ifndef MAME_HEATHKIT_INTR_CNTRL_H -#define MAME_HEATHKIT_INTR_CNTRL_H +#ifndef MAME_HEATHZENITH_INTR_CNTRL_H +#define MAME_HEATHZENITH_INTR_CNTRL_H #pragma once @@ -165,4 +165,4 @@ protected: DECLARE_DEVICE_TYPE(HEATH_INTR_SOCKET, heath_intr_socket) -#endif // MAME_HEATHKIT_H89_INTR_CNTRL_H +#endif // MAME_HEATHZENITH_H89_INTR_CNTRL_H diff --git a/src/mame/heathzenith/sigmasoft_parallel_port.h b/src/mame/heathzenith/sigmasoft_parallel_port.h index b32aa193a88..60030b2647b 100644 --- a/src/mame/heathzenith/sigmasoft_parallel_port.h +++ b/src/mame/heathzenith/sigmasoft_parallel_port.h @@ -6,8 +6,8 @@ ****************************************************************************/ -#ifndef MAME_HEATHKIT_SIGMASOFT_PARALLEL_PORT_H -#define MAME_HEATHKIT_SIGMASOFT_PARALLEL_PORT_H +#ifndef MAME_HEATHZENITH_SIGMASOFT_PARALLEL_PORT_H +#define MAME_HEATHZENITH_SIGMASOFT_PARALLEL_PORT_H #pragma once @@ -64,4 +64,4 @@ private: DECLARE_DEVICE_TYPE(SIGMASOFT_PARALLEL_PORT, sigmasoft_parallel_port) -#endif // MAME_HEATHKIT_SIGMASOFT_PARALLEL_PORT_H +#endif // MAME_HEATHZENITH_SIGMASOFT_PARALLEL_PORT_H diff --git a/src/mame/heathzenith/tlb.h b/src/mame/heathzenith/tlb.h index 6034265ef21..b0ed5ba31ef 100644 --- a/src/mame/heathzenith/tlb.h +++ b/src/mame/heathzenith/tlb.h @@ -6,8 +6,8 @@ ****************************************************************************/ -#ifndef MAME_HEATHKIT_TLB_H -#define MAME_HEATHKIT_TLB_H +#ifndef MAME_HEATHZENITH_TLB_H +#define MAME_HEATHZENITH_TLB_H #pragma once @@ -474,4 +474,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(HEATH_TLB_CONNECTOR, heath_tlb_connector) -#endif // MAME_HEATHKIT_TLB_H +#endif // MAME_HEATHZENITH_TLB_H diff --git a/src/mame/hp/hp48.h b/src/mame/hp/hp48.h index dbfe09fa452..19690fb7270 100644 --- a/src/mame/hp/hp48.h +++ b/src/mame/hp/hp48.h @@ -7,17 +7,20 @@ Hewlett Packard HP48 S/SX & G/GX and HP49 G **********************************************************************/ -#ifndef MAME_HP_HP84_H -#define MAME_HP_HP84_H +#ifndef MAME_HP_HP48_H +#define MAME_HP_HP48_H #pragma once -#include "cpu/saturn/saturn.h" #include "hp48_port.h" + +#include "cpu/saturn/saturn.h" #include "sound/dac.h" + #include "emupal.h" #include "screen.h" + /* model */ typedef enum { HP48_S, @@ -215,4 +218,4 @@ private: #define HP48_NCE3 4 #define HP48_NCE1 5 -#endif // MAME_HP_HP84_H +#endif // MAME_HP_HP48_H diff --git a/src/mame/hp/hp48_port.h b/src/mame/hp/hp48_port.h index a7c99fa4eda..7b50cdc1665 100644 --- a/src/mame/hp/hp48_port.h +++ b/src/mame/hp/hp48_port.h @@ -7,8 +7,8 @@ Hewlett Packard HP48 S/SX & G/GX and HP49 G **********************************************************************/ -#ifndef MAME_HP_HP84_PORT_H -#define MAME_HP_HP84_PORT_H +#ifndef MAME_HP_HP48_PORT_H +#define MAME_HP_HP48_PORT_H #pragma once @@ -72,4 +72,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(HP48_PORT, hp48_port_image_device) -#endif // MAME_HP_HP84_PORT_H +#endif // MAME_HP_HP48_PORT_H diff --git a/src/mame/igs/igs036crypt.h b/src/mame/igs/igs036crypt.h index d22283e5801..860d4742779 100644 --- a/src/mame/igs/igs036crypt.h +++ b/src/mame/igs/igs036crypt.h @@ -1,7 +1,9 @@ // license:BSD-3-Clause -// copyright-holders:Andreas Naive,David Haywood -#ifndef _IGS036CRYPT_H_ -#define _IGS036CRYPT_H_ +// copyright-holders:Andreas Naive, David Haywood +#ifndef MAME_IGS_IGS036CRYPT_H +#define MAME_IGS_IGS036CRYPT_H + +#pragma once class igs036_decryptor @@ -29,4 +31,4 @@ extern const uint8_t m312cn_key[0x100]; extern const uint8_t cjddzsp_key[0x100]; extern const uint8_t cjdh2_key[0x100]; -#endif +#endif MAME_IGS_IGS036CRYPT_H diff --git a/src/mame/konami/k053250_ps.h b/src/mame/konami/k053250_ps.h index 9113ec53af8..a8bd5b56a30 100644 --- a/src/mame/konami/k053250_ps.h +++ b/src/mame/konami/k053250_ps.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Olivier Galibert -#ifndef MAME_KONAMI_K053250PS_H -#define MAME_KONAMI_K053250PS_H +#ifndef MAME_KONAMI_K053250_PS_H +#define MAME_KONAMI_K053250_PS_H #pragma once @@ -84,4 +84,4 @@ private: DECLARE_DEVICE_TYPE(K053250PS, k053250ps_device) -#endif // MAME_KONAMI_K053250PS_H +#endif // MAME_KONAMI_K053250_PS_H diff --git a/src/mame/konami/k573mcal.h b/src/mame/konami/k573mcal.h index e91cdbb9125..ba34c71fef9 100644 --- a/src/mame/konami/k573mcal.h +++ b/src/mame/konami/k573mcal.h @@ -4,8 +4,8 @@ * Konami 573 Master Calendar * */ -#ifndef MAME_KONAMI_K573_MCAL_H -#define MAME_KONAMI_K573_MCAL_H +#ifndef MAME_KONAMI_K573MCAL_H +#define MAME_KONAMI_K573MCAL_H #pragma once @@ -47,4 +47,4 @@ private: DECLARE_DEVICE_TYPE(KONAMI_573_MASTER_CALENDAR, k573mcal_device) -#endif // MAME_KONAMI_K573_MCAL_H +#endif // MAME_KONAMI_K573MCAL_H diff --git a/src/mame/konami/k573mcr.h b/src/mame/konami/k573mcr.h index b51da4d95f6..2313f055206 100644 --- a/src/mame/konami/k573mcr.h +++ b/src/mame/konami/k573mcr.h @@ -4,8 +4,8 @@ * Konami 573 Memory Card Reader * */ -#ifndef MAME_KONAMI_K573_MCR_H -#define MAME_KONAMI_K573_MCR_H +#ifndef MAME_KONAMI_K573MCR_H +#define MAME_KONAMI_K573MCR_H #pragma once @@ -76,4 +76,4 @@ private: DECLARE_DEVICE_TYPE(KONAMI_573_MEMORY_CARD_READER, k573mcr_device) -#endif // MAME_KONAMI_K573_MCR_H +#endif // MAME_KONAMI_K573MCR_H diff --git a/src/mame/konami/konami_gn676_lan.h b/src/mame/konami/konami_gn676_lan.h index b7156b8152c..4ac9cfe76d8 100644 --- a/src/mame/konami/konami_gn676_lan.h +++ b/src/mame/konami/konami_gn676_lan.h @@ -1,8 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Ville Linde, windyfairy - -#ifndef MAME_KONAMI_GN676_LAN_H -#define MAME_KONAMI_GN676_LAN_H +#ifndef MAME_KONAMI_KONAMI_GN676_LAN_H +#define MAME_KONAMI_KONAMI_GN676_LAN_H #pragma once @@ -71,4 +70,4 @@ protected: DECLARE_DEVICE_TYPE(KONAMI_GN676A_LAN, konami_gn676a_lan_device) DECLARE_DEVICE_TYPE(KONAMI_GN676B_LAN, konami_gn676b_lan_device) -#endif // MAME_KONAMI_GN676_LAN_H +#endif // MAME_KONAMI_KONAMI_GN676_LAN_H diff --git a/src/mame/korg/polysix.cpp b/src/mame/korg/polysix.cpp index 20fc26c49ad..6ecfde0bb5a 100644 --- a/src/mame/korg/polysix.cpp +++ b/src/mame/korg/polysix.cpp @@ -361,7 +361,7 @@ u8 polysix_sound_block::get_control_low() void polysix_sound_block::sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) { for(int sample=0; sample != outputs[0].samples(); sample++) { - // u8 trigger = m_gates & ~m_current_gates; + // u8 trigger = m_gates & ~m_current_gates; float out = 0; // Step the pwm phase (common to all channels) @@ -411,7 +411,7 @@ void polysix_sound_block::sound_stream_update(sound_stream &stream, std::vector< else // When gate is off, discharge a 0.047uF cap through a 230K resistor m_organ_eg[channel] -= m_organ_eg[channel]*0.00192537196422815; // 1-exp(-1/(230e3 * 0.047e-6 * 48000)) - + out += wave * m_organ_eg[channel]; } @@ -442,7 +442,7 @@ public: virtual void machine_start() override ATTR_COLD; void polysix(machine_config &config); - INPUT_CHANGED_MEMBER(tape_enable_w); + INPUT_CHANGED_MEMBER(tape_enable_w); private: required_device m_progmcu; @@ -573,7 +573,7 @@ void polysix_state::prog_p1_w(u8 data) case 0xc: m_sound->set_mg_delay(m_prog_bus); break; case 0xd: m_sound->set_mg_level(m_prog_bus); break; } - } + } } void polysix_state::prog_p2_w(u8 data) @@ -625,7 +625,7 @@ int polysix_state::prog_t0_r() int polysix_state::prog_t1_r() { - // logerror("prog t1 %f\n", m_tape->input()); + // logerror("prog t1 %f\n", m_tape->input()); return m_tape->input() >= 0; } @@ -689,7 +689,7 @@ void polysix_state::key_p2_w(u8 data) if(BIT(chg, 7)) logerror("cn12-16=%d\n", BIT(m_key_p2, 7)); - // logerror("key_p2_w row=%x l1=%d l2=%d inh=%d cn12=%d\n", BIT(data, 0, 3), BIT(data, 3), BIT(data, 4), BIT(data, 5), BIT(data, 7)); + // logerror("key_p2_w row=%x l1=%d l2=%d inh=%d cn12=%d\n", BIT(data, 0, 3), BIT(data, 3), BIT(data, 4), BIT(data, 5), BIT(data, 7)); } int polysix_state::key_t0_r() diff --git a/src/mame/luxor/abc80x.h b/src/mame/luxor/abc80x.h index 59d9360364f..6c1de58bf92 100644 --- a/src/mame/luxor/abc80x.h +++ b/src/mame/luxor/abc80x.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Curt Coder -#ifndef MAME_LUXOR_ABC800_H -#define MAME_LUXOR_ABC800_H +#ifndef MAME_LUXOR_ABC80X_H +#define MAME_LUXOR_ABC80X_H #pragma once @@ -355,4 +355,4 @@ public: void abc806_mem(address_map &map) ATTR_COLD; }; -#endif // MAME_LUXOR_ABC800_H +#endif // MAME_LUXOR_ABC80X_H diff --git a/src/mame/misc/nabupc_kbd.h b/src/mame/misc/nabupc_kbd.h index 23b6067b5f7..2dd57ef80a7 100644 --- a/src/mame/misc/nabupc_kbd.h +++ b/src/mame/misc/nabupc_kbd.h @@ -6,9 +6,8 @@ ***************************************************************************/ - -#ifndef MAME_NABUPC_KEYBOARD_DEVICE_H -#define MAME_NABUPC_KEYBOARD_DEVICE_H +#ifndef MAME_MISC_NABUPC_KBD_H +#define MAME_MISC_NABUPC_KBD_H #pragma once @@ -63,4 +62,4 @@ private: DECLARE_DEVICE_TYPE(NABUPC_KEYBOARD, nabupc_keyboard_device) -#endif // MAME_NABUPC_KEYBOARD_DEVICE_H +#endif // MAME_MISC_NABUPC_KBD_H diff --git a/src/mame/namco/namco_c45road.h b/src/mame/namco/namco_c45road.h index 59626213145..5874e7180fd 100644 --- a/src/mame/namco/namco_c45road.h +++ b/src/mame/namco/namco_c45road.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Phil Stroffolino, Aaron Giles, Alex W. Jackson -#ifndef MAME_NAMCO_C45_H -#define MAME_NAMCO_C45_H +#ifndef MAME_NAMCO_NAMCO_C45ROAD_H +#define MAME_NAMCO_NAMCO_C45ROAD_H #pragma once @@ -69,4 +69,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(NAMCO_C45_ROAD, namco_c45_road_device) -#endif // MAME_NAMCO_C45_H +#endif // MAME_NAMCO_NAMCO_C45ROAD_H diff --git a/src/mame/nintendo/m6502_swap_op_d2_d7.h b/src/mame/nintendo/m6502_swap_op_d2_d7.h index b66a9eac842..4e83781f50b 100644 --- a/src/mame/nintendo/m6502_swap_op_d2_d7.h +++ b/src/mame/nintendo/m6502_swap_op_d2_d7.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_M6502_SWAP_OP_D2_D7_H -#define MAME_M6502_SWAP_OP_D2_D7_H +#ifndef MAME_NINTENDO_M6502_SWAP_OP_D2_D7_H +#define MAME_NINTENDO_M6502_SWAP_OP_D2_D7_H #pragma once @@ -50,4 +50,4 @@ protected: DECLARE_DEVICE_TYPE(M6502_SWAP_OP_D2_D7, m6502_swap_op_d2_d7) -#endif // MAME_M6502_SWAP_OP_D2_D7_H +#endif // MAME_NINTENDO_M6502_SWAP_OP_D2_D7_H diff --git a/src/mame/nintendo/m6502_swap_op_d5_d6.h b/src/mame/nintendo/m6502_swap_op_d5_d6.h index c9cc33bacd0..b21ec63f97b 100644 --- a/src/mame/nintendo/m6502_swap_op_d5_d6.h +++ b/src/mame/nintendo/m6502_swap_op_d5_d6.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_M6502_SWAP_OP_D5_D6_H -#define MAME_M6502_SWAP_OP_D5_D6_H +#ifndef MAME_NINTENDO_M6502_SWAP_OP_D5_D6_H +#define MAME_NINTENDO_M6502_SWAP_OP_D5_D6_H #pragma once @@ -84,4 +84,4 @@ protected: DECLARE_DEVICE_TYPE(M6502_SWAP_OP_D5_D6, m6502_swap_op_d5_d6) DECLARE_DEVICE_TYPE(RP2A03_CORE_SWAP_OP_D5_D6, rp2a03_core_swap_op_d5_d6) -#endif // MAME_M6502_SWAP_OP_D5_D6_H +#endif // MAME_NINTENDO_M6502_SWAP_OP_D5_D6_H diff --git a/src/mame/nintendo/m6502_vtscr.h b/src/mame/nintendo/m6502_vtscr.h index f7c30997e0e..29cc75a404d 100644 --- a/src/mame/nintendo/m6502_vtscr.h +++ b/src/mame/nintendo/m6502_vtscr.h @@ -8,8 +8,8 @@ ***************************************************************************/ -#ifndef MAME_CPU_M6502_VTSCR_H -#define MAME_CPU_M6502_VTSCR_H +#ifndef MAME_NINTENDO_M6502_VTSCR_H +#define MAME_NINTENDO_M6502_VTSCR_H #pragma once @@ -55,4 +55,4 @@ protected: DECLARE_DEVICE_TYPE(M6502_VTSCR, m6502_vtscr) -#endif // MAME_CPU_M6502_VTSCR_H +#endif // MAME_NINTENDO_M6502_VTSCR_H diff --git a/src/mame/nintendo/nes_vt369_vtunknown_soc.h b/src/mame/nintendo/nes_vt369_vtunknown_soc.h index 26599c05d85..e3959e14352 100644 --- a/src/mame/nintendo/nes_vt369_vtunknown_soc.h +++ b/src/mame/nintendo/nes_vt369_vtunknown_soc.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_NINTENDO_NES_VT369_VTUNKOWN_SOC_H -#define MAME_NINTENDO_NES_VT369_VTUNKOWN_SOC_H +#ifndef MAME_NINTENDO_NES_VT369_VTUNKNOWN_SOC_H +#define MAME_NINTENDO_NES_VT369_VTUNKNOWN_SOC_H #pragma once @@ -138,4 +138,4 @@ DECLARE_DEVICE_TYPE(NES_VT369_SOC_SWAP, nes_vt369_alt_swap_d5_d6_soc_device) DECLARE_DEVICE_TYPE(NES_VTUNKNOWN_SOC_DG, nes_vtunknown_soc_dg_device) DECLARE_DEVICE_TYPE(NES_VTUNKNOWN_SOC_FA, nes_vtunknown_soc_fa_device) -#endif // MAME_NINTENDO_NES_VT369_VTUNKOWN_SOC_H +#endif // MAME_NINTENDO_NES_VT369_VTUNKNOWN_SOC_H diff --git a/src/mame/nintendo/rdpblend.h b/src/mame/nintendo/rdpblend.h index ac6326b2423..4675ea8b028 100644 --- a/src/mame/nintendo/rdpblend.h +++ b/src/mame/nintendo/rdpblend.h @@ -13,8 +13,10 @@ ******************************************************************************/ -#ifndef _VIDEO_RDPBLEND_H_ -#define _VIDEO_RDPBLEND_H_ +#ifndef MAME_NINTENDO_RDPBLEND_H +#define MAME_NINTENDO_RDPBLEND_H + +#pragma once #include "n64_v.h" @@ -69,4 +71,4 @@ class n64_blender_t uint8_t m_alpha_dither[256 * 8]; }; -#endif // _VIDEO_RDPBLEND_H_ +#endif // MAME_NINTENDO_RDPBLEND_H diff --git a/src/mame/nintendo/rdptpipe.h b/src/mame/nintendo/rdptpipe.h index 9c04e8f215d..2bdceb41a8f 100644 --- a/src/mame/nintendo/rdptpipe.h +++ b/src/mame/nintendo/rdptpipe.h @@ -13,8 +13,10 @@ ******************************************************************************/ -#ifndef _VIDEO_RDPTEXPIPE_H_ -#define _VIDEO_RDPTEXPIPE_H_ +#ifndef MAME_NINTENDO_RDPTPIPE_H +#define MAME_NINTENDO_RDPTPIPE_H + +#pragma once #include "n64types.h" @@ -162,4 +164,4 @@ class n64_texture_pipe_t rgbaint_t m_v1; }; -#endif // _VIDEO_RDPTEXPIPE_H_ +#endif // MAME_NINTENDO_RDPTPIPE_H diff --git a/src/mame/nintendo/vt1682.cpp b/src/mame/nintendo/vt1682.cpp index bca9d39a696..9c4752f210f 100644 --- a/src/mame/nintendo/vt1682.cpp +++ b/src/mame/nintendo/vt1682.cpp @@ -1566,7 +1566,7 @@ void vt_vt1682_state::vt1682_2007_vram_data_w(uint8_t data) uint16_t vram_address = get_vram_addr(); m_vram->write8(vram_address, data); - + if (m_2000 & 0x4) { // this mode is completely undocumented, but needed for many games in the cmpmx10 / cmpmx11 sets @@ -2263,7 +2263,7 @@ void vt_vt1682_state::vt1682_2020_bk_linescroll_w(uint8_t data) // cmpmx10 / cmpmx11 set a scroll bank, but don't appear to enable linescroll // could this be a workaround for the scroll offset issue the hardware has? //if (data & 0x30) - // popmessage("linescroll unused %01x | BK2enable %d BK1enable %d PRAM addr %04x!\n", (data & 0xc0) >> 6, (data & 0x20)>> 5, (data & 0x10) >> 4, (data & 0xf) << 8); + // popmessage("linescroll unused %01x | BK2enable %d BK1enable %d PRAM addr %04x!\n", (data & 0xc0) >> 6, (data & 0x20)>> 5, (data & 0x10) >> 4, (data & 0xf) << 8); } /* @@ -4255,7 +4255,7 @@ void vt_vt1682_state::vt1682_soundcpu_211c_reg_irqctrl_w(uint8_t data) { m_scu_to_main_irq_active = 1; update_main_interrupts(); - // logerror("Main CPU IRQ Request from Sound CPU\n"); + // logerror("Main CPU IRQ Request from Sound CPU\n"); } @@ -5075,7 +5075,7 @@ void vt_vt1682_state::draw_layer(int which, int opaque, const rectangle& cliprec // The broken priorities in Table Tennis for exsprt48 / itvg48 // are unrelated (bit isn't set) but as they work in // xing48 could be just a bug in those versions - // + // // does it really work on hardware? we disable it entirely // in those sets for now if (bk_paldepth_mode && m_allow_bk_paldepth_mode) @@ -5266,7 +5266,7 @@ void vt_vt1682_state::rom_map(address_map &map) void vt1682_dance_state::rom_ram_map(address_map &map) { rom_map(map); - map(0x1000000, 0x101ffff).ram(); + map(0x1000000, 0x101ffff).ram(); } // 11-bits (0x800 bytes) for sprites diff --git a/src/mame/olivetti/m20_kbd.h b/src/mame/olivetti/m20_kbd.h index e4dbe9fa543..09534eca27b 100644 --- a/src/mame/olivetti/m20_kbd.h +++ b/src/mame/olivetti/m20_kbd.h @@ -1,7 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Carl,Vas Crabb -#ifndef MAME_OLIVETTI_M20KBD_H -#define MAME_OLIVETTI_M20KBD_H +#ifndef MAME_OLIVETTI_M20_KBD_H +#define MAME_OLIVETTI_M20_KBD_H + +#pragma once #include "bus/rs232/rs232.h" #include "machine/keyboard.h" @@ -24,4 +26,4 @@ private: DECLARE_DEVICE_TYPE(M20_KEYBOARD, m20_keyboard_device) -#endif // MAME_OLIVETTI_M20KBD_H +#endif // MAME_OLIVETTI_M20_KBD_H diff --git a/src/mame/pce/pcecommn.h b/src/mame/pce/pcecommn.h index 49f29895f6f..9b02a13ec19 100644 --- a/src/mame/pce/pcecommn.h +++ b/src/mame/pce/pcecommn.h @@ -8,12 +8,15 @@ ***************************************************************************/ -#ifndef PCECOMMON_H -#define PCECOMMON_H +#ifndef MAME_PCE_PCECOMMN_H +#define MAME_PCE_PCECOMMN_H + +#pragma once #include "cpu/h6280/h6280.h" #include "video/huc6260.h" #include "video/huc6270.h" + #define PCE_MAIN_CLOCK 21477270 class pce_common_state : public driver_device @@ -55,4 +58,4 @@ private: PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) -#endif +#endif // MAME_PCE_PCECOMMN_H diff --git a/src/mame/pinball/genpin.h b/src/mame/pinball/genpin.h index d1ee6620bd0..d75f0fdf8fb 100644 --- a/src/mame/pinball/genpin.h +++ b/src/mame/pinball/genpin.h @@ -1,8 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Robbbert -#ifndef GENPIN_H_ -#define GENPIN_H_ +#ifndef MAME_PINBALL_GENPIN_H +#define MAME_PINBALL_GENPIN_H +#pragma once #include "sound/samples.h" #include "machine/nvram.h" @@ -46,4 +47,4 @@ public: }; -#endif /* GENPIN_H_ */ +#endif // MAME_PINBALL_GENPIN_H diff --git a/src/mame/pinball/recel.cpp b/src/mame/pinball/recel.cpp index b15a02c1708..8a89372a413 100644 --- a/src/mame/pinball/recel.cpp +++ b/src/mame/pinball/recel.cpp @@ -457,7 +457,7 @@ ROM_START(r_fairfght) ROM_END /* There are three different known dumps for Poker Plus: - (1) CRC(571ee27b) SHA1(482a3ba18eff05bce4cab073b1f13fc2f145bb2b) + (1) CRC(571ee27b) SHA1(482a3ba18eff05bce4cab073b1f13fc2f145bb2b) (2) CRC(60a199a8) SHA1(045d61f56ea03a694722da810d465ab65d85cbfd) (3) CRC(fadd715a) SHA1(6c5b6e8fcf77be2b0b7076dc1139760f7e4d5688) (1) was tested on a real machine and works OK, (2) was also tested, but the pinball did not work with it, diff --git a/src/mame/sega/315-5838_317-0229_comp.h b/src/mame/sega/315-5838_317-0229_comp.h index 179cbf1f142..c918c074151 100644 --- a/src/mame/sega/315-5838_317-0229_comp.h +++ b/src/mame/sega/315-5838_317-0229_comp.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood, Samuel Neves, Peter Wilhelmsen, Morten Shearman Kirkegaard -#ifndef MAME_SEGA_315_5838_371_0229_COMP_H -#define MAME_SEGA_315_5838_371_0229_COMP_H +#ifndef MAME_SEGA_315_5838_317_0229_COMP_H +#define MAME_SEGA_315_5838_317_0229_COMP_H #pragma once @@ -78,4 +78,4 @@ private: #endif }; -#endif // MAME_SEGA_315_5838_371_0229_COMP_H +#endif // MAME_SEGA_315_5838_317_0229_COMP_H diff --git a/src/mame/sega/dccons.h b/src/mame/sega/dccons.h index e71dbaff4dd..85cf8b0ad2b 100644 --- a/src/mame/sega/dccons.h +++ b/src/mame/sega/dccons.h @@ -1,7 +1,7 @@ // license:LGPL-2.1+ // copyright-holders:Angelo Salese, R. Belmont -#ifndef MAME_SEGACONS_DCCONS_H -#define MAME_SEGACONS_DCCONS_H +#ifndef MAME_SEGA_DCCONS_H +#define MAME_SEGA_DCCONS_H #pragma once @@ -57,4 +57,4 @@ private: int atapi_xferlen = 0, atapi_xferbase = 0, atapi_xfercomplete; }; -#endif // MAME_SEGACONS_DCCONS_H +#endif // MAME_SEGA_DCCONS_H diff --git a/src/mame/sega/mdconsole.h b/src/mame/sega/mdconsole.h index 11dc9952cd5..e7f4060c831 100644 --- a/src/mame/sega/mdconsole.h +++ b/src/mame/sega/mdconsole.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_SEGACONS_MDCONSOLE_H -#define MAME_SEGACONS_MDCONSOLE_H +#ifndef MAME_SEGA_MDCONSOLE_H +#define MAME_SEGA_MDCONSOLE_H #pragma once @@ -115,4 +115,4 @@ protected: virtual void machine_start() override ATTR_COLD; }; -#endif // MAME_SEGACONS_MDCONSOLE_H +#endif // MAME_SEGA_MDCONSOLE_H diff --git a/src/mame/seibu/seicopbl.h b/src/mame/seibu/seicopbl.h index 8d70b180415..5b606943ab4 100644 --- a/src/mame/seibu/seicopbl.h +++ b/src/mame/seibu/seicopbl.h @@ -1,7 +1,7 @@ // license:LGPL-2.1+ // copyright-holders:Olivier Galibert, Angelo Salese, David Haywood, Tomasz Slanina -#ifndef MAME_SEIBU_SEICOP_H -#define MAME_SEIBU_SEICOP_H +#ifndef MAME_SEIBU_SEICOPBL_H +#define MAME_SEIBU_SEICOPBL_H #pragma once @@ -63,4 +63,4 @@ private: DECLARE_DEVICE_TYPE(SEIBU_COP_BOOTLEG, seibu_cop_bootleg_device) -#endif // MAME_SEIBU_SEICOP_H +#endif // MAME_SEIBU_SEICOPBL_H diff --git a/src/mame/sgi/ip4.h b/src/mame/sgi/ip4.h index 333a8de3e71..b51b713004f 100644 --- a/src/mame/sgi/ip4.h +++ b/src/mame/sgi/ip4.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:Patrick Mackinlay -#ifndef MAME_BUS_VME_IP4_H -#define MAME_BUS_VME_IP4_H +#ifndef MAME_SGI_IP4_H +#define MAME_SGI_IP4_H #pragma once @@ -82,4 +82,4 @@ private: DECLARE_DEVICE_TYPE(SGI_IP4, sgi_ip4_device) -#endif // MAME_BUS_VME_IP4_H +#endif // MAME_SGI_IP4_H diff --git a/src/mame/sinclair/tsconfdma.h b/src/mame/sinclair/tsconfdma.h index 387dc2e3c7c..722282c03bb 100644 --- a/src/mame/sinclair/tsconfdma.h +++ b/src/mame/sinclair/tsconfdma.h @@ -6,8 +6,8 @@ ***************************************************************************/ -#ifndef MAME_SINCLAIR_TSCONF_DMA_H -#define MAME_SINCLAIR_TSCONF_DMA_H +#ifndef MAME_SINCLAIR_TSCONFDMA_H +#define MAME_SINCLAIR_TSCONFDMA_H #pragma once @@ -74,4 +74,4 @@ private: }; DECLARE_DEVICE_TYPE(TSCONF_DMA, tsconfdma_device) -#endif // MAME_SINCLAIR_TSCONF_DMA_H +#endif // MAME_SINCLAIR_TSCONFDMA_H diff --git a/src/mame/skeleton/flashvga2.cpp b/src/mame/skeleton/flashvga2.cpp index 28f2383f64c..32ac0675177 100644 --- a/src/mame/skeleton/flashvga2.cpp +++ b/src/mame/skeleton/flashvga2.cpp @@ -114,8 +114,8 @@ ROM_START( ruletamag ) ROM_LOAD( "m24256bf.u31", 0x000000, 0x008000, CRC(af9adcae) SHA1(ac6274edc4240d5cf397455868009263264ffc6e) ) /* With an unintialized NVRAM/timekeeper, the machine won't work and Will output just a "ERROR EN RELOJ" message. - With the included dump (corrupted), it will output the message "ERROR EN MODULO", but still won't boot. - Maybe there's a way to initialize the NVRAM, but there's nothing about it on the manual. */ + With the included dump (corrupted), it will output the message "ERROR EN MODULO", but still won't boot. + Maybe there's a way to initialize the NVRAM, but there's nothing about it on the manual. */ ROM_REGION( 0x2000, "nvram", 0 ) ROM_LOAD( "m48t18.u38", 0x000000, 0x002000, BAD_DUMP CRC(025fb8c2) SHA1(61c90ecad8565cfd20674034a5917b0225edbfe5) ) // Corrupted ROM_END diff --git a/src/mame/skeleton/itt1700_kbd.h b/src/mame/skeleton/itt1700_kbd.h index 6b6f6ed94bd..d84c8fac063 100644 --- a/src/mame/skeleton/itt1700_kbd.h +++ b/src/mame/skeleton/itt1700_kbd.h @@ -1,8 +1,8 @@ // license:BSD-3-Clause // copyright-holders:AJR -#ifndef MAME_SKELETON_ITT1700_KBD -#define MAME_SKELETON_ITT1700_KBD +#ifndef MAME_SKELETON_ITT1700_KBD_H +#define MAME_SKELETON_ITT1700_KBD_H #pragma once diff --git a/src/mame/skeleton/lgtz80.cpp b/src/mame/skeleton/lgtz80.cpp index 4ba2391eef1..9f47331d930 100644 --- a/src/mame/skeleton/lgtz80.cpp +++ b/src/mame/skeleton/lgtz80.cpp @@ -402,7 +402,7 @@ void lgtz80_state::init_arthurkn() case 0x140: case 0x340: - rom[i] = bitswap<8>(rom[i], 3, 6, 7, 4, 5, 2, 1, 0); + rom[i] = bitswap<8>(rom[i], 3, 6, 7, 4, 5, 2, 1, 0); break; case 0x180: diff --git a/src/mame/taito/lsasquad.h b/src/mame/taito/lsasquad.h index 3e9210831d7..3652a391936 100644 --- a/src/mame/taito/lsasquad.h +++ b/src/mame/taito/lsasquad.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_TAITO_LSASQAD_H -#define MAME_TAITO_LSASQAD_H +#ifndef MAME_TAITO_LSASQUAD_H +#define MAME_TAITO_LSASQUAD_H #pragma once @@ -81,4 +81,4 @@ private: void storming_map(address_map &map) ATTR_COLD; }; -#endif // MAME_TAITO_LSASQAD_H +#endif // MAME_TAITO_LSASQUAD_H diff --git a/src/mame/taito/taitosjsec.h b/src/mame/taito/taitosjsec.h index fa8f88f7e56..8920ded03b7 100644 --- a/src/mame/taito/taitosjsec.h +++ b/src/mame/taito/taitosjsec.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Vas Crabb -#ifndef MAME_TAITO_TAITSJSEC_H -#define MAME_TAITO_TAITSJSEC_H +#ifndef MAME_TAITO_TAITOSJSEC_H +#define MAME_TAITO_TAITOSJSEC_H #pragma once @@ -91,4 +91,4 @@ private: bool m_busak, m_reset; }; -#endif // MAME_TAITO_TATISJSEC_H +#endif // MAME_TAITO_TAITOSJSEC_H diff --git a/src/mame/tandberg/tdv2100_disp_logic.h b/src/mame/tandberg/tdv2100_disp_logic.h index a5ce275ee61..6c85b81ccbe 100644 --- a/src/mame/tandberg/tdv2100_disp_logic.h +++ b/src/mame/tandberg/tdv2100_disp_logic.h @@ -6,8 +6,8 @@ ****************************************************************************/ -#ifndef MAME_TANDBERG_DISP_LOGIC_H -#define MAME_TANDBERG_DISP_LOGIC_H +#ifndef MAME_TANDBERG_TDV2100_DISP_LOGIC_H +#define MAME_TANDBERG_TDV2100_DISP_LOGIC_H #pragma once @@ -144,4 +144,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(TANDBERG_TDV2100_DISPLAY_LOGIC, tandberg_tdv2100_disp_logic_device) -#endif // MAME_TANDBERG_DISP_LOGIC_H +#endif // MAME_TANDBERG_TDV2100_DISP_LOGIC_H diff --git a/src/mame/tandberg/tdv2100_kbd.h b/src/mame/tandberg/tdv2100_kbd.h index 185e1f1dfd0..99077e09785 100644 --- a/src/mame/tandberg/tdv2100_kbd.h +++ b/src/mame/tandberg/tdv2100_kbd.h @@ -6,8 +6,8 @@ ****************************************************************************/ -#ifndef MAME_TANDBERG_TDV2100KBD_H -#define MAME_TANDBERG_TDV2100KBD_H +#ifndef MAME_TANDBERG_TDV2100_KBD_H +#define MAME_TANDBERG_TDV2100_KBD_H #pragma once @@ -83,4 +83,4 @@ private: // device type definition DECLARE_DEVICE_TYPE(TANDBERG_TDV2100_KEYBOARD, tandberg_tdv2100_keyboard_device) -#endif // MAME_TANDBERG_TDV2100KBD_H +#endif // MAME_TANDBERG_TDV2100_KBD_H diff --git a/src/mame/tvgames/generalplus_gpl16250.h b/src/mame/tvgames/generalplus_gpl16250.h index 9a1bd65cab6..128755599e7 100644 --- a/src/mame/tvgames/generalplus_gpl16250.h +++ b/src/mame/tvgames/generalplus_gpl16250.h @@ -1,14 +1,15 @@ // license:BSD-3-Clause // copyright-holders:David Haywood -#ifndef MAME_TVGAMES_SUNPLUS_GCM394_H -#define MAME_TVGAMES_SUNPLUS_GCM394_H +#ifndef MAME_TVGAMES_GENERALPLUS_GPL16250_H +#define MAME_TVGAMES_GENERALPLUS_GPL16250_H #pragma once -#include "machine/generalplus_gpl16250soc.h" #include "generalplus_gpl16250_m.h" -#include "bus/generic/slot.h" + #include "bus/generic/carts.h" +#include "bus/generic/slot.h" +#include "machine/generalplus_gpl16250soc.h" #include "screen.h" #include "speaker.h" @@ -177,4 +178,4 @@ private: }; -#endif // MAME_TVGAMES_SUNPLUS_GCM394_H +#endif // MAME_TVGAMES_GENERALPLUS_GPL16250_H diff --git a/src/mame/tvgames/xavix.cpp b/src/mame/tvgames/xavix.cpp index 2f3d8c94b31..6f061363b96 100644 --- a/src/mame/tvgames/xavix.cpp +++ b/src/mame/tvgames/xavix.cpp @@ -76,9 +76,9 @@ 2005 Let's!TVプレイ ドラゴンボ－ルＺ バトル体感かめはめ波～ おめぇとフュージョン / バンダイ / 日本 Let's!TV Play Dragon Ball Z Battle Experience Kamehameha ~ Ometo Fusion / Bandai / Japan dumped: either here, xavix_2000.cpp, or xavix_2002.cpp - Let's construct the town! /TAKARA/Japan - - - - - - - - TV hockey /TOMY/Japan - - - - - - - - Zuba-Zuba Blade /TAKARA/Japan - - - - - - - + Let's construct the town! /TAKARA/Japan - - - - - - - + TV hockey /TOMY/Japan - - - - - - - + Zuba-Zuba Blade /TAKARA/Japan - - - - - - - テレビで遊び隊　韋駄天翔 激走 韋駄天バトル / トミー / 日本 Playing with TV Idaten Sho Gekisou Idaten Battle / Tommy / Japan Beyblade Ultimate shooter /TAKARA/Japan - - - - - - - 東京フレンドパーク2スペシャル / エポック社 / 日本 Tokyo Friend Park 2 Special / Epochsha / Japan @@ -2607,7 +2607,7 @@ CONS( 2001, epo_strk, 0, 0, xavix, epo_epp, xavix_state, CONS( 2002, epo_strkp, epo_strk, 0, xavixp, epo_epp, xavix_state, init_xavix, "Epoch / SSD Company LTD", "Let's Play Excite Striker (UK)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) CONS( 2002, rad_socr, epo_strk, 0, xavix, epo_epp, xavix_state, init_xavix, "Radica / Epoch / SSD Company LTD", "Play TV Soccer", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) -// まちをつくろう 工事のくるま５ +// まちをつくろう 工事のくるま５ CONS( 2001, tak_town, 0, 0, xavix, rad_jcon, xavix_state, init_xavix, "Takara / SSD Company LTD", "Machi o Tsukurou: Kouji no Kuruma 5 (Japan)", MACHINE_IMPERFECT_SOUND ) // this is roughly based on tak_town above CONS( 2002, rad_jcon, tak_town, 0, xavix, rad_jcon, xavix_state, init_xavix, "Radica / Takara / SSD Company LTD", "Play TV Jr. Construction", MACHINE_IMPERFECT_SOUND ) diff --git a/src/mame/universal/ladybug_video.h b/src/mame/universal/ladybug_video.h index 15f07543702..7fed1ba2471 100644 --- a/src/mame/universal/ladybug_video.h +++ b/src/mame/universal/ladybug_video.h @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Nicola Salmoria -#ifndef MAME_UNIVERSAL_LADYBUG_H -#define MAME_UNIVERSAL_LADYBUG_H +#ifndef MAME_UNIVERSAL_LADYBUG_VIDEO_H +#define MAME_UNIVERSAL_LADYBUG_VIDEO_H #pragma once @@ -41,4 +41,4 @@ private: DECLARE_DEVICE_TYPE(LADYBUG_VIDEO, ladybug_video_device) -#endif // MAME_UNIVERSAL_LADYBUG_H +#endif // MAME_UNIVERSAL_LADYBUG_VIDEO_H diff --git a/src/mame/ussr/juku.cpp b/src/mame/ussr/juku.cpp index bc5affd622b..40737fd3e34 100644 --- a/src/mame/ussr/juku.cpp +++ b/src/mame/ussr/juku.cpp @@ -404,7 +404,7 @@ INPUT_PORTS_END // VIDEO //************************************************************************** -inline uint16_t bcd_value(uint16_t val) +inline uint16_t bcd_value(uint16_t val) { return ((val>>12) & 0xf) * 1000 + @@ -443,7 +443,7 @@ void juku_state::screen_hblank_period(uint8_t data) void juku_state::screen_vblank_period(uint8_t data) { m_pit[1]->write(0x15, data); - + if (m_vblank_period_lsb == -1) { m_vblank_period_lsb = (int)data; } else { @@ -495,10 +495,10 @@ void juku_state::adjust_monitor_params(uint8_t monitor_bits) } uint32_t juku_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) -{ +{ int y_max = (m_vbporch < 0) ? (m_height + m_vbporch) : (m_vbporch+m_height > m_screen->height()) ? m_screen->height() : m_height; int x_max = (m_hbporch < 0) ? (m_width + m_hbporch) : (m_hbporch+m_width > m_screen->width()) ? m_screen->width() : m_width; - + if (m_empty_screen_on_update) { m_empty_screen_on_update--; bitmap.fill(0); @@ -561,7 +561,7 @@ uint8_t juku_state::fdc_data_r() void juku_state::fdc_data_w(uint8_t data) { // on write commands (101xxxxx, 11110xxx) and fdc reports busy - if ( ((m_fdc_cur_cmd >> 5) == 0x5 || (m_fdc_cur_cmd >> 3) == 0x1e) && m_fdc->drq_r() == 0 && (m_fdc->status_r() & 0x1) == 0x1 ) { + if ( ((m_fdc_cur_cmd >> 5) == 0x5 || (m_fdc_cur_cmd >> 3) == 0x1e) && m_fdc->drq_r() == 0 && (m_fdc->status_r() & 0x1) == 0x1 ) { // cpu tries to write data without drq, halt it and reset pc m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); m_maincpu->set_state_int(i8080a_cpu_device::I8085_PC, m_maincpu->pc() - 2); @@ -600,7 +600,7 @@ void juku_state::pio0_porta_w(uint8_t data) for (int i = 0; i < 6; i++) m_key_encoder->input_line_w(i, BIT(col_data, i)); m_contrdat = (col_data & 0b1100'0000) >> 6; // decoded by 2x К555ИД7 - + if (m_beep_level != BIT(data, 4)) m_speaker->level_w(m_beep_state << (m_beep_level = BIT(data, 4))); @@ -731,7 +731,7 @@ void juku_state::juku(machine_config &config) m_pit[1]->out_handler<0>().append(m_pit[1], FUNC(pit8253_device::write_gate1)); m_pit[1]->out_handler<0>().append(m_pit[1], FUNC(pit8253_device::write_gate2)); m_pit[1]->out_handler<1>().set(m_pic, FUNC(pic8259_device::ir5_w)); // VER RTR / FRAME INT - + //m_pit[1]->out_handler<2>().append(m_pit[1], FUNC(pit8253_device::write_clk1)); // VERT SYNC DSL //m_pit[1]->out_handler<2>().append(m_pit[1], FUNC(pit8253_device::write_clk2)); diff --git a/src/mame/ussr/orion.h b/src/mame/ussr/orion.h index e9eb54e6127..b07645fff2f 100644 --- a/src/mame/ussr/orion.h +++ b/src/mame/ussr/orion.h @@ -6,8 +6,8 @@ * ****************************************************************************/ -#ifndef MAME_RADIO_ORION_H -#define MAME_RADIO_ORION_H +#ifndef MAME_USSR_ORION_H +#define MAME_USSR_ORION_H #pragma once @@ -167,4 +167,4 @@ private: void mem_map(address_map &map) ATTR_COLD; }; -#endif // MAME_RADIO_ORION_H +#endif // MAME_USSR_ORION_H diff --git a/src/mame/ussr/special.h b/src/mame/ussr/special.h index bf392119094..e53b327dfbf 100644 --- a/src/mame/ussr/special.h +++ b/src/mame/ussr/special.h @@ -2,12 +2,12 @@ // copyright-holders:Miodrag Milanovic /***************************************************************************** * - * includes/special.h + * ussr/special.h * ****************************************************************************/ -#ifndef MAME_SPECIAL_SPECIAL_H -#define MAME_SPECIAL_SPECIAL_H +#ifndef MAME_USSR_SPECIAL_H +#define MAME_USSR_SPECIAL_H #pragma once @@ -143,4 +143,4 @@ private: optional_device m_pit_timer; // specimx only }; -#endif // MAME_SPECIAL_SPECIAL_H +#endif // MAME_USSR_SPECIAL_H diff --git a/src/mame/ussr/specialsound.h b/src/mame/ussr/specialsound.h index d717d74bca0..8b2cdb309d0 100644 --- a/src/mame/ussr/specialsound.h +++ b/src/mame/ussr/specialsound.h @@ -2,12 +2,12 @@ // copyright-holders:Miodrag Milanovic /***************************************************************************** * - * audio/specimx.h + * ussr/specialsound.h * ****************************************************************************/ -#ifndef MAME_USSR_SPECIAL_H -#define MAME_USSR_SPECIAL_H +#ifndef MAME_USSR_SPECIALSOUND_H +#define MAME_USSR_SPECIALSOUND_H #pragma once @@ -35,4 +35,4 @@ private: DECLARE_DEVICE_TYPE(SPECIMX_SND, specimx_sound_device) -#endif // MAME_USSR_SPECIAL_H +#endif // MAME_USSR_SPECIALSOUND_H diff --git a/src/mame/vsystem/mb60553.h b/src/mame/vsystem/mb60553.h index 1546c08cb16..5180f70d950 100644 --- a/src/mame/vsystem/mb60553.h +++ b/src/mame/vsystem/mb60553.h @@ -2,8 +2,8 @@ // copyright-holders:David Haywood /*** MB60553 **********************************************/ -#ifndef MAME_VSYSTEM_MB60533_H -#define MAME_VSYSTEM_MB60533_H +#ifndef MAME_VSYSTEM_MB60553_H +#define MAME_VSYSTEM_MB60553_H #pragma once @@ -60,4 +60,4 @@ private: DECLARE_DEVICE_TYPE(MB60553, mb60553_zooming_tilemap_device) -#endif // MAME_VSYSTEM_MB60533_H +#endif // MAME_VSYSTEM_MB60553_H