Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-07 05:13:46 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

srcclean and cleanup

Browse Source 
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.
This commit is contained in:
Vas Crabb 2024-11-24 03:52:26 +11:00
parent 7b8072ce88
commit 146c0b9191
112 changed files with 489 additions and 462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hash/ekara_cart.xml
View File

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

4
hash/ibm5170.xml
View File

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

2
hash/x68k_flop.xml
View File

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

6
src/devices/bus/a2bus/a2corvus.h
View File

@ -9,8 +9,8 @@
*********************************************************************/ *********************************************************************/
#ifndef MAME_A2BUS_A2CORVUS_H #ifndef MAME_BUS_A2BUS_A2CORVUS_H
#define MAME_A2BUS_A2CORVUS_H #define MAME_BUS_A2BUS_A2CORVUS_H
#pragma once #pragma once
@ -52,4 +52,4 @@ private:
// device type definition // device type definition
DECLARE_DEVICE_TYPE(A2BUS_CORVUS, a2bus_corvus_device) DECLARE_DEVICE_TYPE(A2BUS_CORVUS, a2bus_corvus_device)
#endif // MAME_A2BUS_A2CORVUS_H #endif // MAME_BUS_A2BUS_A2CORVUS_H

6
src/devices/bus/a2bus/a2eext80col.h
View File

@ -8,8 +8,8 @@
*********************************************************************/ *********************************************************************/
#ifndef MAME_BUS_A2BUS_A2EEXT809COL_H #ifndef MAME_BUS_A2BUS_A2EEXT80COL_H
#define MAME_BUS_A2BUS_A2EEXT809COL_H #define MAME_BUS_A2BUS_A2EEXT80COL_H
#pragma once #pragma once
@ -47,4 +47,4 @@ private:
// device type definition // device type definition
DECLARE_DEVICE_TYPE(A2EAUX_EXT80COL, a2eaux_ext80col_device) DECLARE_DEVICE_TYPE(A2EAUX_EXT80COL, a2eaux_ext80col_device)
#endif // MAME_BUS_A2BUS_A2EEXT809COL_H #endif // MAME_BUS_A2BUS_A2EEXT80COL_H

6
src/devices/bus/a2bus/a2superdrive.h
View File

@ -8,8 +8,8 @@
*********************************************************************/ *********************************************************************/
#ifndef MAME_BUS_A2BUS_SUPERDRIVE_H #ifndef MAME_BUS_A2BUS_A2SUPERDRIVE_H
#define MAME_BUS_A2BUS_SUPERDRIVE_H #define MAME_BUS_A2BUS_A2SUPERDRIVE_H
#pragma once #pragma once
@ -19,4 +19,4 @@
// device type definition // device type definition
DECLARE_DEVICE_TYPE(A2BUS_SUPERDRIVE, device_a2bus_card_interface) DECLARE_DEVICE_TYPE(A2BUS_SUPERDRIVE, device_a2bus_card_interface)
#endif // MAME_BUS_A2BUS_SUPERDRIVE_H #endif // MAME_BUS_A2BUS_A2SUPERDRIVE_H

6
src/devices/bus/a2bus/a2wico_trackball.h
View File

@ -7,8 +7,8 @@
*********************************************************************/ *********************************************************************/
#ifndef MAME_DEVICES_A2BUS_A2WICO_TRACKBALL_H #ifndef MAME_BUS_A2BUS_A2WICO_TRACKBALL_H
#define MAME_DEVICES_A2BUS_A2WICO_TRACKBALL_H #define MAME_BUS_A2BUS_A2WICO_TRACKBALL_H
#pragma once #pragma once
@ -17,4 +17,4 @@
// device type definition // device type definition
DECLARE_DEVICE_TYPE(A2BUS_WICOTRACKBALL, device_a2bus_card_interface) DECLARE_DEVICE_TYPE(A2BUS_WICOTRACKBALL, device_a2bus_card_interface)
#endif // MAME_DEVICES_A2BUS_A2WICO_TRACKBALL_H #endif // MAME_BUS_A2BUS_A2WICO_TRACKBALL_H

6
src/devices/bus/a2bus/agat7ports.h
View File

@ -8,8 +8,8 @@
*********************************************************************/ *********************************************************************/
#ifndef MAME_BUS_A2BUS_AGAT7_PORTS_H #ifndef MAME_BUS_A2BUS_AGAT7PORTS_H
#define MAME_BUS_A2BUS_AGAT7_PORTS_H #define MAME_BUS_A2BUS_AGAT7PORTS_H
#pragma once #pragma once
@ -61,4 +61,4 @@ private:
// device type definition // device type definition
DECLARE_DEVICE_TYPE(A2BUS_AGAT7_PORTS, a2bus_agat7_ports_device) DECLARE_DEVICE_TYPE(A2BUS_AGAT7_PORTS, a2bus_agat7_ports_device)
#endif // MAME_BUS_A2BUS_AGAT7_PORTS_H #endif // MAME_BUS_A2BUS_AGAT7PORTS_H

6
src/devices/bus/a2bus/computereyes2.h
View File

@ -8,8 +8,8 @@
*********************************************************************/ *********************************************************************/
#ifndef MAME_BUS_A2BUS_COMPEYES2_H #ifndef MAME_BUS_A2BUS_COMPUTEREYES2_H
#define MAME_BUS_A2BUS_COMPEYES2_H #define MAME_BUS_A2BUS_COMPUTEREYES2_H
#pragma once #pragma once
@ -18,4 +18,4 @@
// device type declaration // device type declaration
DECLARE_DEVICE_TYPE(A2BUS_COMPUTEREYES2, device_a2bus_card_interface) DECLARE_DEVICE_TYPE(A2BUS_COMPUTEREYES2, device_a2bus_card_interface)
#endif // MAME_BUS_A2BUS_COMPEYES2_H #endif // MAME_BUS_A2BUS_COMPUTEREYES2_H

6
src/devices/bus/a2bus/ezcgi.h
View File

@ -10,8 +10,8 @@
*********************************************************************/ *********************************************************************/
#ifndef MAME_BUS_A2BUS_A2EZCGI_H #ifndef MAME_BUS_A2BUS_EZCGI_H
#define MAME_BUS_A2BUS_A2EZCGI_H #define MAME_BUS_A2BUS_EZCGI_H
#pragma once #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_9938, device_a2bus_card_interface)
DECLARE_DEVICE_TYPE(A2BUS_EZCGI_9958, 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

6
src/devices/bus/a2bus/grafex.h
View File

@ -8,8 +8,8 @@
*********************************************************************/ *********************************************************************/
#ifndef MAME_BUS_A2BUS_A2GRAFEX_H #ifndef MAME_BUS_A2BUS_GRAFEX_H
#define MAME_BUS_A2BUS_A2GRAFEX_H #define MAME_BUS_A2BUS_GRAFEX_H
#pragma once #pragma once
@ -18,4 +18,4 @@
// device type definition // device type definition
DECLARE_DEVICE_TYPE(A2BUS_GRAFEX, device_a2bus_card_interface) DECLARE_DEVICE_TYPE(A2BUS_GRAFEX, device_a2bus_card_interface)
#endif // MAME_BUS_A2BUS_GRAFEX_H #endif // MAME_BUS_A2BUS_GRAFEX_H

6
src/devices/bus/a2bus/grappler.h
View File

@ -47,8 +47,8 @@
SLCT 25 26 N/C SLCT 25 26 N/C
***********************************************************************/ ***********************************************************************/
#ifndef MAME_BUS_A2BUS_GRAPPLERPLUS_H #ifndef MAME_BUS_A2BUS_GRAPPLER_H
#define MAME_BUS_A2BUS_GRAPPLERPLUS_H #define MAME_BUS_A2BUS_GRAPPLER_H
#pragma once #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_BUFGRAPPLERPLUS, device_a2bus_card_interface)
DECLARE_DEVICE_TYPE(A2BUS_BUFGRAPPLERPLUSA, 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

6
src/devices/bus/a2bus/mouse.h
View File

@ -8,8 +8,8 @@
*********************************************************************/ *********************************************************************/
#ifndef MAME_DEVICES_A2BUS_MOUSE_H #ifndef MAME_BUS_A2BUS_MOUSE_H
#define MAME_DEVICES_A2BUS_MOUSE_H #define MAME_BUS_A2BUS_MOUSE_H
#pragma once #pragma once
@ -17,4 +17,4 @@
DECLARE_DEVICE_TYPE(A2BUS_MOUSE, device_a2bus_card_interface) DECLARE_DEVICE_TYPE(A2BUS_MOUSE, device_a2bus_card_interface)
#endif // MAME_DEVICES_A2BUS_MOUSE_H #endif // MAME_BUS_A2BUS_MOUSE_H

6
src/devices/bus/a2bus/nippelclock.h
View File

@ -8,8 +8,8 @@
*********************************************************************/ *********************************************************************/
#ifndef MAME_BUS_A2BUS_A2NIPPELCLOCK_H #ifndef MAME_BUS_A2BUS_NIPPELCLOCK_H
#define MAME_BUS_A2BUS_A2NIPPELCLOCK_H #define MAME_BUS_A2BUS_NIPPELCLOCK_H
#pragma once #pragma once
@ -48,4 +48,4 @@ private:
// device type definition // device type definition
DECLARE_DEVICE_TYPE(A2BUS_NIPPELCLOCK, a2bus_nippelclock_device) DECLARE_DEVICE_TYPE(A2BUS_NIPPELCLOCK, a2bus_nippelclock_device)
#endif // MAME_BUS_A2BUS_A2NIPPELCLOCK_H #endif // MAME_BUS_A2BUS_NIPPELCLOCK_H

6
src/devices/bus/a2bus/ssprite.h
View File

@ -9,8 +9,8 @@
*********************************************************************/ *********************************************************************/
#ifndef MAME_BUS_A2BUS_A2SSPRITE_H #ifndef MAME_BUS_A2BUS_SSPRITE_H
#define MAME_BUS_A2BUS_A2SSPRITE_H #define MAME_BUS_A2BUS_SSPRITE_H
#pragma once #pragma once
@ -19,4 +19,4 @@
// device type definition // device type definition
DECLARE_DEVICE_TYPE(A2BUS_SSPRITE, device_a2bus_card_interface) DECLARE_DEVICE_TYPE(A2BUS_SSPRITE, device_a2bus_card_interface)
#endif // MAME_BUS_A2BUS_SSPRITE_H #endif // MAME_BUS_A2BUS_SSPRITE_H

4
src/devices/bus/a2bus/transwarp.h
View File

@ -8,8 +8,8 @@
*********************************************************************/ *********************************************************************/
#ifndef MAME_BUS_A2BUS_A2TRANSWARP_H #ifndef MAME_BUS_A2BUS_TRANSWARP_H
#define MAME_BUS_A2BUS_A2TRANSWARP_H #define MAME_BUS_A2BUS_TRANSWARP_H
#include "a2bus.h" #include "a2bus.h"

6
src/devices/bus/a2gameio/computereyes.h
View File

@ -6,8 +6,8 @@
*********************************************************************/ *********************************************************************/
#ifndef MAME_BUS_A2GAMEIO_COMPEYES_H #ifndef MAME_BUS_A2GAMEIO_COMPUTEREYES_H
#define MAME_BUS_A2GAMEIO_COMPEYES_H #define MAME_BUS_A2GAMEIO_COMPUTEREYES_H
#pragma once #pragma once
@ -16,4 +16,4 @@
// device type declaration // device type declaration
DECLARE_DEVICE_TYPE(APPLE2_COMPUTEREYES, device_a2gameio_interface) DECLARE_DEVICE_TYPE(APPLE2_COMPUTEREYES, device_a2gameio_interface)
#endif // MAME_BUS_A2GAMEIO_COMPEYES_H #endif // MAME_BUS_A2GAMEIO_COMPUTEREYES_H

8
src/devices/bus/a800/a5200_supercart.h
View File

@ -1,8 +1,8 @@
// license: BSD-3-Clause // license: BSD-3-Clause
// copyright-holders: Angelo Salese // copyright-holders: Angelo Salese
#ifndef MAME_BUS_A5200_SUPERCART_H #ifndef MAME_BUS_A800_A5200_SUPERCART_H
#define MAME_BUS_A5200_SUPERCART_H #define MAME_BUS_A800_A5200_SUPERCART_H
#pragma once #pragma once
@ -26,7 +26,7 @@ protected:
u8 bank_r(offs_t offset); 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

6
src/devices/bus/a800/atari1050.h
View File

@ -6,8 +6,8 @@
***************************************************************************/ ***************************************************************************/
#ifndef MAME_BUS_A800_ATARI1050 #ifndef MAME_BUS_A800_ATARI1050_H
#define MAME_BUS_A800_ATARI1050 1 #define MAME_BUS_A800_ATARI1050_H
#pragma once #pragma once
@ -44,4 +44,4 @@ private:
DECLARE_DEVICE_TYPE(ATARI1050, atari1050_device) DECLARE_DEVICE_TYPE(ATARI1050, atari1050_device)
#endif // MAME_BUS_A800_ATARI1050 #endif // MAME_BUS_A800_ATARI1050_H

6
src/devices/bus/a800/atari810.h
View File

@ -6,8 +6,8 @@
***************************************************************************/ ***************************************************************************/
#ifndef MAME_BUS_A800_ATARI810 #ifndef MAME_BUS_A800_ATARI810_H
#define MAME_BUS_A800_ATARI810 1 #define MAME_BUS_A800_ATARI810_H
#pragma once #pragma once
@ -44,4 +44,4 @@ private:
DECLARE_DEVICE_TYPE(ATARI810, atari810_device) DECLARE_DEVICE_TYPE(ATARI810, atari810_device)
#endif // MAME_BUS_A800_ATARI810 #endif // MAME_BUS_A800_ATARI810_H

6
src/devices/bus/abcbus/abcbus.h
View File

@ -95,8 +95,8 @@
**********************************************************************/ **********************************************************************/
#ifndef MAME_DEVICES_ABCBUS_ABCBUS_H #ifndef MAME_BUS_ABCBUS_ABCBUS_H
#define MAME_DEVICES_ABCBUS_ABCBUS_H #define MAME_BUS_ABCBUS_ABCBUS_H
#pragma once #pragma once
@ -275,4 +275,4 @@ void abc1600bus_cards(device_slot_interface &device);
typedef device_type_enumerator<abcbus_slot_device> abcbus_slot_device_enumerator; typedef device_type_enumerator<abcbus_slot_device> abcbus_slot_device_enumerator;
#endif // MAME_DEVICES_ABCBUS_ABCBUS_H #endif // MAME_BUS_ABCBUS_ABCBUS_H

6
src/devices/bus/abcbus/db4106.h
View File

@ -6,8 +6,8 @@
*********************************************************************/ *********************************************************************/
#ifndef MAME_BUS_ABCBUS_DATABOARD_4106_H #ifndef MAME_BUS_ABCBUS_DB4106_H
#define MAME_BUS_ABCBUS_DATABOARD_4106_H #define MAME_BUS_ABCBUS_DB4106_H
#pragma once #pragma once
@ -60,4 +60,4 @@ private:
// device type definition // device type definition
DECLARE_DEVICE_TYPE(DATABOARD_4106, databoard_4106_device) DECLARE_DEVICE_TYPE(DATABOARD_4106, databoard_4106_device)
#endif // MAME_BUS_ABCBUS_DATABOARD_4106_H #endif // MAME_BUS_ABCBUS_DB4106_H

6
src/devices/bus/abcbus/db4107.h
View File

@ -6,8 +6,8 @@
*********************************************************************/ *********************************************************************/
#ifndef MAME_BUS_ABCBUS_DATABOARD_4107_H #ifndef MAME_BUS_ABCBUS_DB4107_H
#define MAME_BUS_ABCBUS_DATABOARD_4107_H #define MAME_BUS_ABCBUS_DB4107_H
#pragma once #pragma once
@ -62,4 +62,4 @@ private:
// device type definition // device type definition
DECLARE_DEVICE_TYPE(DATABOARD_4107, databoard_4107_device) DECLARE_DEVICE_TYPE(DATABOARD_4107, databoard_4107_device)
#endif // MAME_BUS_ABCBUS_DATABOARD_4107_H #endif // MAME_BUS_ABCBUS_DB4107_H

6
src/devices/bus/abcbus/db4112.h
View File

@ -6,8 +6,8 @@
*********************************************************************/ *********************************************************************/
#ifndef MAME_BUS_ABCBUS_DATABOARD_4112_H #ifndef MAME_BUS_ABCBUS_DB4112_H
#define MAME_BUS_ABCBUS_DATABOARD_4112_H #define MAME_BUS_ABCBUS_DB4112_H
#pragma once #pragma once
@ -60,4 +60,4 @@ private:
// device type definition // device type definition
DECLARE_DEVICE_TYPE(DATABOARD_4112, abc_databoard_4112_device) DECLARE_DEVICE_TYPE(DATABOARD_4112, abc_databoard_4112_device)
#endif // MAME_BUS_ABCBUS_DATABOARD_4112_H #endif // MAME_BUS_ABCBUS_DB4112_H

6
src/devices/bus/abcbus/lux10828.h
View File

@ -6,8 +6,8 @@
*********************************************************************/ *********************************************************************/
#ifndef MAME_BUS_ABCBUS_LUXOR10828_H #ifndef MAME_BUS_ABCBUS_LUX10828_H
#define MAME_BUS_ABCBUS_LUXOR10828_H #define MAME_BUS_ABCBUS_LUX10828_H
#pragma once #pragma once
@ -112,4 +112,4 @@ private:
// device type definition // device type definition
DECLARE_DEVICE_TYPE(LUXOR_55_10828, luxor_55_10828_device) DECLARE_DEVICE_TYPE(LUXOR_55_10828, luxor_55_10828_device)
#endif // MAME_BUS_ABCBUS_LUXOR10828_H #endif // MAME_BUS_ABCBUS_LUX10828_H

6
src/devices/bus/amiga/keyboard/keyboard.h
View File

@ -12,8 +12,8 @@
***************************************************************************/ ***************************************************************************/
#ifndef MAME_BUS_AMIGA_KEYBOARD_H #ifndef MAME_BUS_AMIGA_KEYBOARD_KEYBOARD_H
#define MAME_BUS_AMIGA_KEYBOARD_H #define MAME_BUS_AMIGA_KEYBOARD_KEYBOARD_H
#pragma once #pragma once
@ -93,4 +93,4 @@ void amiga_keyboard_devices(device_slot_interface &device);
void a500_keyboard_devices(device_slot_interface &device); void a500_keyboard_devices(device_slot_interface &device);
void a600_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

6
src/devices/bus/apricot/expansion/ram.h
View File

@ -6,8 +6,8 @@
***************************************************************************/ ***************************************************************************/
#ifndef MAME_BUS_APRICOT_RAM_H #ifndef MAME_BUS_APRICOT_EXPANSION_RAM_H
#define MAME_BUS_APRICOT_RAM_H #define MAME_BUS_APRICOT_EXPANSION_RAM_H
#pragma once #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) DECLARE_DEVICE_TYPE(APRICOT_512K_RAM, apricot_512k_ram_device)
#endif // MAME_BUS_APRICOT_RAM_H #endif // MAME_BUS_APRICOT_EXPANSION_RAM_H

6
src/devices/bus/apricot/expansion/winchester.h
View File

@ -6,8 +6,8 @@
***************************************************************************/ ***************************************************************************/
#ifndef MAME_BUS_APRICOT_WINCHESTER_H #ifndef MAME_BUS_APRICOT_EXPANSION_WINCHESTER_H
#define MAME_BUS_APRICOT_WINCHESTER_H #define MAME_BUS_APRICOT_EXPANSION_WINCHESTER_H
#pragma once #pragma once
@ -62,4 +62,4 @@ private:
// device type definition // device type definition
DECLARE_DEVICE_TYPE(APRICOT_WINCHESTER, apricot_winchester_device) DECLARE_DEVICE_TYPE(APRICOT_WINCHESTER, apricot_winchester_device)
#endif // MAME_BUS_APRICOT_WINCHESTER_H #endif // MAME_BUS_APRICOT_EXPANSION_WINCHESTER_H

6
src/devices/bus/astrocde/exp.h
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:Fabio Priuli // copyright-holders:Fabio Priuli
#ifndef MAME_BUS_ASTROCADE_EXP_H #ifndef MAME_BUS_ASTROCDE_EXP_H
#define MAME_BUS_ASTROCADE_EXP_H #define MAME_BUS_ASTROCDE_EXP_H
// ======================> device_astrocade_exp_interface // ======================> device_astrocade_exp_interface
@ -59,4 +59,4 @@ protected:
// device type definition // device type definition
DECLARE_DEVICE_TYPE(ASTROCADE_EXP_SLOT, astrocade_exp_device) DECLARE_DEVICE_TYPE(ASTROCADE_EXP_SLOT, astrocade_exp_device)
#endif // MAME_BUS_ASTROCADE_EXP_H #endif // MAME_BUS_ASTROCDE_EXP_H

6
src/devices/bus/astrocde/ram.h
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:Fabio Priuli // copyright-holders:Fabio Priuli
#ifndef MAME_BUS_ASTROCADE_RAM_H #ifndef MAME_BUS_ASTROCDE_RAM_H
#define MAME_BUS_ASTROCADE_RAM_H #define MAME_BUS_ASTROCDE_RAM_H
#pragma once #pragma once
@ -150,4 +150,4 @@ DECLARE_DEVICE_TYPE(ASTROCADE_WHITERAM, astrocade_whiteram_device)
DECLARE_DEVICE_TYPE(ASTROCADE_RL64RAM, astrocade_rl64ram_device) DECLARE_DEVICE_TYPE(ASTROCADE_RL64RAM, astrocade_rl64ram_device)
#endif // MAME_BUS_ASTROCADE_RAM_H #endif // MAME_BUS_ASTROCDE_RAM_H

6
src/devices/bus/astrocde/rom.h
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:Fabio Priuli // copyright-holders:Fabio Priuli
#ifndef MAME_BUS_ASTROCADE_ROM_H #ifndef MAME_BUS_ASTROCDE_ROM_H
#define MAME_BUS_ASTROCADE_ROM_H #define MAME_BUS_ASTROCDE_ROM_H
#pragma once #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_512K, astrocade_rom_512k_device)
DECLARE_DEVICE_TYPE(ASTROCADE_ROM_CASS, astrocade_rom_cass_device) DECLARE_DEVICE_TYPE(ASTROCADE_ROM_CASS, astrocade_rom_cass_device)
#endif // MAME_BUS_ASTROCADE_ROM_H #endif // MAME_BUS_ASTROCDE_ROM_H

6
src/devices/bus/astrocde/slot.h
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:Fabio Priuli // copyright-holders:Fabio Priuli
#ifndef MAME_BUS_ASTROCADE_SLOT_H #ifndef MAME_BUS_ASTROCDE_SLOT_H
#define MAME_BUS_ASTROCADE_SLOT_H #define MAME_BUS_ASTROCDE_SLOT_H
#pragma once #pragma once
@ -93,4 +93,4 @@ protected:
// device type definition // device type definition
DECLARE_DEVICE_TYPE(ASTROCADE_CART_SLOT, astrocade_cart_slot_device) DECLARE_DEVICE_TYPE(ASTROCADE_CART_SLOT, astrocade_cart_slot_device)
#endif // MAME_BUS_ASTROCADE_SLOT_H #endif // MAME_BUS_ASTROCDE_SLOT_H

6
src/devices/bus/ata/hdd.h
View File

@ -8,8 +8,8 @@
***************************************************************************/ ***************************************************************************/
#ifndef MAME_BUS_ATA_IDEHD_H #ifndef MAME_BUS_ATA_HDD_H
#define MAME_BUS_ATA_IDEHD_H #define MAME_BUS_ATA_HDD_H
#pragma once #pragma once
@ -89,4 +89,4 @@ private:
DECLARE_DEVICE_TYPE(IDE_HARDDISK, ide_hdd_device) DECLARE_DEVICE_TYPE(IDE_HARDDISK, ide_hdd_device)
DECLARE_DEVICE_TYPE(ATA_CF, ata_cf_device) DECLARE_DEVICE_TYPE(ATA_CF, ata_cf_device)
#endif // MAME_BUS_ATA_IDEHD_H #endif // MAME_BUS_ATA_HDD_H

6
src/devices/bus/bbc/cart/slot.h
View File

@ -101,8 +101,8 @@ CSYNC/MADET 10 10 LPSTB
22 0V - Zero volts. 22 0V - Zero volts.
**********************************************************************/ **********************************************************************/
#ifndef MAME_BUS_BBC_CARTSLOT_H #ifndef MAME_BUS_BBC_CART_SLOT_H
#define MAME_BUS_BBC_CARTSLOT_H #define MAME_BUS_BBC_CART_SLOT_H
#pragma once #pragma once
@ -158,4 +158,4 @@ DECLARE_DEVICE_TYPE(BBCM_CARTSLOT, bbc_cartslot_device)
void bbcm_cart(device_slot_interface &device); void bbcm_cart(device_slot_interface &device);
#endif // MAME_BUS_BBC_CARTSLOT_H #endif // MAME_BUS_BBC_CART_SLOT_H

7
src/devices/bus/bbc/internal/morleyaa.h
View File

@ -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 #pragma once
#define MAME_BUS_BBC_INTERNAL_MORLEY_H
#include "internal.h" #include "internal.h"
@ -51,4 +52,4 @@ private:
DECLARE_DEVICE_TYPE(BBC_MORLEYAA, bbc_morleyaa_device); DECLARE_DEVICE_TYPE(BBC_MORLEYAA, bbc_morleyaa_device);
#endif /* MAME_BUS_BBC_INTERNAL_MORLEY_H */ #endif // MAME_BUS_BBC_INTERNAL_MORLEYAA_H

8
src/devices/bus/bbc/tube/tube_32016.h
View File

@ -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 #pragma once
#define MAME_BUS_BBC_TUBE_32016_H
#include "tube.h" #include "tube.h"
#include "cpu/ns32000/ns32000.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_16032, bbc_tube_16032_device)
DECLARE_DEVICE_TYPE(BBC_TUBE_32016L, bbc_tube_32016l_device) DECLARE_DEVICE_TYPE(BBC_TUBE_32016L, bbc_tube_32016l_device)
#endif // MAME_BUS_BBC_TUBE_TUBE_32016_H
#endif /* MAME_BUS_BBC_TUBE_32016_H */

8
src/devices/bus/bbc/tube/tube_6502.h
View File

@ -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 #pragma once
#define MAME_BUS_BBC_TUBE_6502_H
#include "tube.h" #include "tube.h"
#include "cpu/m6502/m65sc02.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_6502E, bbc_tube_6502e_device)
DECLARE_DEVICE_TYPE(BBC_TUBE_65C102, bbc_tube_65c102_device) DECLARE_DEVICE_TYPE(BBC_TUBE_65C102, bbc_tube_65c102_device)
#endif // MAME_BUS_BBC_TUBE_TUBE_6502_H
#endif /* MAME_BUS_BBC_TUBE_6502_H */

10
src/devices/bus/isa/svga_tseng.cpp
View File

@ -180,7 +180,7 @@ void isa16_svga_et4k_w32i_device::device_add_mconfig(machine_config &config)
ET4KW32I_VGA(config, m_vga, 0); ET4KW32I_VGA(config, m_vga, 0);
m_vga->set_screen("screen"); m_vga->set_screen("screen");
// 1MB default, 4MB max // 1MB default, 4MB max
m_vga->set_vram_size(1*1024*1024); 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) 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))); 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"); m_isa->install_rom(this, 0xc0000, 0xc7fff, "vga_rom");
} }
else if (space_id == AS_IO) 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) void isa16_svga_et4k_w32i_device::io_isa_map(address_map &map)
{ {
map(0x03b0, 0x03df).m(m_vga, FUNC(et4kw32i_vga_device::io_map)); map(0x03b0, 0x03df).m(m_vga, FUNC(et4kw32i_vga_device::io_map));
// IOD controls mirroring // 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(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)); map(0x210b, 0x210b).mirror(0x70).rw(m_vga, FUNC(et4kw32i_vga_device::acl_data_r), FUNC(et4kw32i_vga_device::acl_data_w));
} }

2
src/devices/bus/jvs/namcoio.cpp
View File

@ -782,7 +782,7 @@ protected:
{ {
return (3 << 6) | // unknown input return (3 << 6) | // unknown input
(31 << 1) | // unknown output (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) void iocpu_port_9_w(uint8_t data)

22
src/devices/cpu/m6805/m6805.cpp
View File

@ -395,7 +395,7 @@ void m6805_base_device::device_reset()
m_nmi_state = 0; m_nmi_state = 0;
// IRQ disabled // IRQ disabled
SEI; SEI;
if (m_params.m_addr_width > 14) if (m_params.m_addr_width > 14)
@ -456,12 +456,12 @@ void m6805_base_device::interrupt_vector()
rm16<false>(0xfffa & m_params.m_vector_mask, m_pc); rm16<false>(0xfffa & m_params.m_vector_mask, m_pc);
} }
// Generate interrupts // Generate interrupts
void m6805_base_device::interrupt() void m6805_base_device::interrupt()
{ {
// the 6805 latches interrupt requests internally, so we don't clear // the 6805 latches interrupt requests internally, so we don't clear
// pending_interrupts until the interrupt is taken, no matter what the // pending_interrupts until the interrupt is taken, no matter what the
// external IRQ pin does. // external IRQ pin does.
if (BIT(m_pending_interrupts, HD63705_INT_NMI)) if (BIT(m_pending_interrupts, HD63705_INT_NMI))
{ {
@ -479,7 +479,7 @@ void m6805_base_device::interrupt()
pushbyte<false>(m_cc); pushbyte<false>(m_cc);
} }
SEI; 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); standard_irq_callback(0, m_pc.w.l);
if (m_params.m_addr_width > 14) if (m_params.m_addr_width > 14)
@ -495,7 +495,7 @@ void m6805_base_device::interrupt()
{ {
if ((CC & IFLAG) == 0) if ((CC & IFLAG) == 0)
{ {
// standard IRQ // standard IRQ
if (m_params.m_addr_width > 14) { if (m_params.m_addr_width > 14) {
pushword<true>(m_pc); pushword<true>(m_pc);
pushbyte<true>(m_x); pushbyte<true>(m_x);
@ -511,7 +511,7 @@ void m6805_base_device::interrupt()
} }
SEI; 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); standard_irq_callback(0, m_pc.w.l);
interrupt_vector(); 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() void m6805_base_device::execute_run()
{ {
S = SP_ADJUST( S ); // Taken from CPU_SET_CONTEXT when pointer'ifying 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() void hd63705z0_device::interrupt_vector()
{ {
// Need to add emulation of other interrupt sources here KW-2/4/99 // Need to add emulation of other interrupt sources here KW-2/4/99
// This is just a quick patch for Namco System 2 operation // This is just a quick patch for Namco System 2 operation
if ((m_pending_interrupts & (1 << HD63705_INT_IRQ1)) != 0) if ((m_pending_interrupts & (1 << HD63705_INT_IRQ1)) != 0)
{ {

2
src/devices/cpu/m6805/m6805.h
View File

@ -356,7 +356,7 @@ public:
hd6305v0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); 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_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 read_porta() { return m_read_port [0].bind(); }
auto write_porta() { return m_write_port[0].bind(); } auto write_porta() { return m_write_port[0].bind(); }

6
src/devices/sound/ct1745.h
View File

@ -1,8 +1,8 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:Angelo Salese // copyright-holders:Angelo Salese
#ifndef DEVICE_SOUND_CT1745_H #ifndef MAME_SOUND_CT1745_H
#define DEVICE_SOUND_CT1745_H #define MAME_SOUND_CT1745_H
#pragma once #pragma once
@ -66,4 +66,4 @@ private:
DECLARE_DEVICE_TYPE(CT1745, ct1745_mixer_device) DECLARE_DEVICE_TYPE(CT1745, ct1745_mixer_device)
#endif // DEVICE_SOUND_CT1745_H #endif // MAME_SOUND_CT1745_H

6
src/devices/sound/xt446.h
View File

@ -9,8 +9,8 @@
**************************************************************************************/ **************************************************************************************/
#ifndef DEVICE_SOUND_XT446_H #ifndef MAME_SOUND_XT446_H
#define DEVICE_SOUND_XT446_H #define MAME_SOUND_XT446_H
#pragma once #pragma once
@ -40,4 +40,4 @@ private:
DECLARE_DEVICE_TYPE(XT446, xt446_device) DECLARE_DEVICE_TYPE(XT446, xt446_device)
#endif #endif // MAME_SOUND_XT446_H

2
src/frontend/mame/ui/imgcntrl.cpp
View File

@ -306,7 +306,7 @@ void menu_control_device_image::menu_activated()
{ {
auto [err, msg] = m_image.load(m_midi); auto [err, msg] = m_image.load(m_midi);
if (err) 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(); stack_pop();
break; break;

4
src/frontend/mame/ui/midiinout.cpp
View File

@ -22,7 +22,7 @@ menu_midi_inout::menu_midi_inout(mame_ui_manager &mui, render_container &contain
, m_channel(channel) , m_channel(channel)
, m_is_input(is_input) , 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() 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) void menu_midi_inout::recompute_metrics(uint32_t width, uint32_t height, float aspect)
{ {
menu::recompute_metrics(width, height, aspect); menu::recompute_metrics(width, height, aspect);
// set_custom_space(0.0f, 2.0f * line_height() + 2.0f * tb_border());
} }

6
src/mame/altos/altos2_kbd.h
View File

@ -6,8 +6,8 @@
**********************************************************************/ **********************************************************************/
#ifndef MAME_ALTOS_ALTOS2_KEYBOARD_H #ifndef MAME_ALTOS_ALTOS2_KBD_H
#define MAME_ALTOS_ALTOS2_KEYBOARD_H #define MAME_ALTOS_ALTOS2_KBD_H
#pragma once #pragma once
@ -68,4 +68,4 @@ private:
// device type declarations // device type declarations
DECLARE_DEVICE_TYPE(ALTOS2_KEYBOARD, altos2_keyboard_device) DECLARE_DEVICE_TYPE(ALTOS2_KEYBOARD, altos2_keyboard_device)
#endif // MAME_ALTOS_ALTOS2_KEYBOARD_H #endif // MAME_ALTOS_ALTOS2_KBD_H

6
src/mame/apple/apple2common.h
View File

@ -7,8 +7,8 @@
Apple II stuff shared between apple2/apple2e/apple2gs. Apple II stuff shared between apple2/apple2e/apple2gs.
*********************************************************************/ *********************************************************************/
#ifndef MAME_APPLE_APPLE2_COMMON_H #ifndef MAME_APPLE_APPLE2COMMON_H
#define MAME_APPLE_APPLE2_COMMON_H #define MAME_APPLE_APPLE2COMMON_H
#pragma once #pragma once
@ -51,4 +51,4 @@ private:
DECLARE_DEVICE_TYPE(APPLE2_COMMON, apple2_common_device) DECLARE_DEVICE_TYPE(APPLE2_COMMON, apple2_common_device)
#endif // MAME_APPLE_APPLE2_COMMON_H #endif // MAME_APPLE_APPLE2COMMON_H

8
src/mame/apple/apple2video.h
View File

@ -2,12 +2,12 @@
// copyright-holders:R. Belmont // 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 #ifndef MAME_APPLE_APPLE2VIDEO_H
#define MAME_SHARED_APPLE2VIDEO_H #define MAME_APPLE_APPLE2VIDEO_H
#include "emupal.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, a2_video_device_composite)
DECLARE_DEVICE_TYPE(APPLE2_VIDEO_COMPOSITE_RGB, a2_video_device_composite_rgb) DECLARE_DEVICE_TYPE(APPLE2_VIDEO_COMPOSITE_RGB, a2_video_device_composite_rgb)
#endif // MAME_SHARED_APPLE2VIDEO_H #endif // MAME_APPLE_APPLE2VIDEO_H

212
src/mame/apple/macpwrbk030.cpp
View File

@ -2,132 +2,132 @@
// copyright-holders:R. Belmont // copyright-holders:R. Belmont
/**************************************************************************** /****************************************************************************
drivers/macpwrbk030.cpp drivers/macpwrbk030.cpp
Mac PowerBooks with a 68030 CPU and M50753 PMU Mac PowerBooks with a 68030 CPU and M50753 PMU
By R. Belmont By R. Belmont
These are basically late-period Mac IIs without NuBus and with These are basically late-period Mac IIs without NuBus and with
Egret/Cuda replaced with the PMU. Egret/Cuda replaced with the PMU.
Generation 1: Generation 1:
PowerBook 140: 16 MHz 68030, 2 MiB RAM, no FPU, passive-matrix screen PowerBook 140: 16 MHz 68030, 2 MiB RAM, no FPU, passive-matrix screen
PowerBook 145: 140 with 25 MHz 68030 PowerBook 145: 140 with 25 MHz 68030
PowerBook 145B: 140 with 25 MHz 68030 and 4 MiB of RAM standard 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 PowerBook 170: 140, with 25 MHz 68030, 68881 FPU, active-matrix screen
Generation 2: (all models include external monitor support) 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 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 180: 33 MHz 68030, 68881 FPU, active-matrix screen with 2 bits per pixel grayscale
PowerBook 165: 160 with 33 MHz 68030 PowerBook 165: 160 with 33 MHz 68030
PowerBook 165c: 160 with 33 MHz 68030, FPU, color 640x400 display PowerBook 165c: 160 with 33 MHz 68030, FPU, color 640x400 display
PowerBook 180c: 165c with color 640x480 display PowerBook 180c: 165c with color 640x480 display
Driver features: Driver features:
- Display, audio, floppy, SCSI, and ADB all work. You can boot compatible System versions - Display, audio, floppy, SCSI, and ADB all work. You can boot compatible System versions
and run arbitrary software. and run arbitrary software.
- FPU presence and Jaws/Niagra CPU speed readback are supported so that Gestalt properly - 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 identifies all models (except the 145B is shown as a 145; Apple documents this as also
occuring on hardware). occuring on hardware).
- 165c/180c use of a VGA GPIO feature bit to determine the correct model is supported. - 165c/180c use of a VGA GPIO feature bit to determine the correct model is supported.
Driver TODOs: Driver TODOs:
- Shutting down or restarting from Finder freezes the machine. Something related - 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. 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. - External video interface on 160/165/165c/180/180c.
============================================================================ ============================================================================
Technical info Technical info
VIA 1 connections: (PowerBook 140/170, 160/180/180C are similar) VIA 1 connections: (PowerBook 140/170, 160/180/180C are similar)
Port A: 0: VIA_TEST Port A: 0: VIA_TEST
1: CPU_ID0 1: CPU_ID0
2: CPU_ID1 2: CPU_ID1
3: MODEM 3: MODEM
4: CPU_ID2 4: CPU_ID2
5: HDSEL (floppy head select) 5: HDSEL (floppy head select)
6: CPU_ID3 6: CPU_ID3
7: SCC REQ 7: SCC REQ
Port B: 0: RTC DATA Port B: 0: RTC DATA
1: RTC CLOCK 1: RTC CLOCK
2: RTC 2: RTC
3: LINK SEL 3: LINK SEL
4: N/C 4: N/C
5: N/C 5: N/C
6: N/C 6: N/C
7: N/C 7: N/C
CA1: 60 Hz clock CA1: 60 Hz clock
CA2: 1 second clock CA2: 1 second clock
CB1: PMU IRQ CB1: PMU IRQ
CB2: MODEM SND EN CB2: MODEM SND EN
VIA 2 connections: (VIA2 is a pseudo-VIA inside the "Peripheral Glue" ASIC) VIA 2 connections: (VIA2 is a pseudo-VIA inside the "Peripheral Glue" ASIC)
Port A: bi-directional PMU data bus Port A: bi-directional PMU data bus
Port B: 0: SV1 Port B: 0: SV1
1: PMACK 1: PMACK
2: PMREQ 2: PMREQ
3: SV0 3: SV0
4: SV2 4: SV2
5: HMMU 5: HMMU
6: N/C 6: N/C
7: MODEM RESET 7: MODEM RESET
PMU (M50753) connections: PMU (M50753) connections:
IN port: 0: BRITE SENSE IN port: 0: BRITE SENSE
1: A/D BATT (battery charge level) 1: A/D BATT (battery charge level)
2: SND CNTL 2: SND CNTL
3: MODEM BUSY 3: MODEM BUSY
4: PWR ON (input, 1 = system power on) 4: PWR ON (input, 1 = system power on)
5: TEMP A/D (battery temperature) 5: TEMP A/D (battery temperature)
6: NICAD SLA 6: NICAD SLA
7: TABLE SEL (A/D input, some kind of battery state) 7: TABLE SEL (A/D input, some kind of battery state)
Port 0: 0: SWIM CNTL Port 0: 0: SWIM CNTL
1: SCC CNTL 1: SCC CNTL
2: HD PWR 2: HD PWR
3: MODEM PWR 3: MODEM PWR
4: N/C 4: N/C
5: SOUND PWR 5: SOUND PWR
6: MODEM PWROUT 6: MODEM PWROUT
7: SYS_PWR 7: SYS_PWR
Port 1: 0: CCFL PWR CNTL Port 1: 0: CCFL PWR CNTL
1: AKD (input, works like the high bit of $C000 on the Apple II, except includes the modifiers) 1: AKD (input, works like the high bit of $C000 on the Apple II, except includes the modifiers)
2: STOP CLK 2: STOP CLK
3: CHRG ON (input, 1 = charger is on, 7.1.1 Battery applet shows charging symbol on ) 3: CHRG ON (input, 1 = charger is on, 7.1.1 Battery applet shows charging symbol on )
4: KBD RST (output, resets keyboard M50740) 4: KBD RST (output, resets keyboard M50740)
5: HICHG (output) 5: HICHG (output)
6: RING DETECT 6: RING DETECT
7: CHG OFF (output) 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 Port 3: 0: PWR OFF
1: SYS RST 1: SYS RST
2: VIA TEST 2: VIA TEST
3: SOUND OFF 3: SOUND OFF
4: 1 SEC (input from Mac Plus RTC/PRAM chip, never read by the PMU program) 4: 1 SEC (input from Mac Plus RTC/PRAM chip, never read by the PMU program)
5: PMINT 5: PMINT
6: PMACK 6: PMACK
7: PMREQ 7: PMREQ
Port 4: 0: PMGR_ADB (ADB out) Port 4: 0: PMGR_ADB (ADB out)
1: ADB (ADB in) 1: ADB (ADB in)
2: DISP BLANK 2: DISP BLANK
3: MODEM_INS 3: MODEM_INS
INT1: 60 Hz clock INT1: 60 Hz clock
INT2: INT2 PULLUP (pulled up and otherwise N/C) INT2: INT2 PULLUP (pulled up and otherwise N/C)
PG&E (68HC05 PMU) version spotting: PG&E (68HC05 PMU) version spotting:
(find the text "BORG" in the system ROM, the next 32768 bytes are the PG&E image. (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). offset +4 in the image is the version byte).
01 - PowerBook Duo 210/230/250 01 - PowerBook Duo 210/230/250
02 - PowerBook 540c, PBDuo 270C, PBDuo 280/280C 02 - PowerBook 540c, PBDuo 270C, PBDuo 280/280C
03 - PowerBook 150 03 - PowerBook 150
08 - PB190cs, PowerBook 540c PPC update, all PowerPC PowerBooks through WallStreet G3s 08 - PB190cs, PowerBook 540c PPC update, all PowerPC PowerBooks through WallStreet G3s
****************************************************************************/ ****************************************************************************/

6
src/mame/atari/atarijsa.h
View File

@ -8,8 +8,8 @@
***************************************************************************/ ***************************************************************************/
#ifndef MAME_ATARI_ATARI_JSA_H #ifndef MAME_ATARI_ATARIJSA_H
#define MAME_ATARI_ATARI_JSA_H #define MAME_ATARI_ATARIJSA_H
#pragma once #pragma once
@ -264,4 +264,4 @@ protected:
}; };
#endif // MAME_ATARI_ATARI_JSA_H #endif // MAME_ATARI_ATARIJSA_H

6
src/mame/atari/atarisac.h
View File

@ -8,8 +8,8 @@
***************************************************************************/ ***************************************************************************/
#ifndef MAME_ATARI_ATARI_SAC_H #ifndef MAME_ATARI_ATARISAC_H
#define MAME_ATARI_ATARI_SAC_H #define MAME_ATARI_ATARISAC_H
#pragma once #pragma once
@ -76,4 +76,4 @@ private:
}; };
#endif // MAME_ATARI_ATARI_SAC_H #endif // MAME_ATARI_ATARISAC_H

24
src/mame/atari/jaguar.h
View File

@ -5,20 +5,28 @@
Atari Jaguar hardware 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 "jag_blitter.h"
#include "cdrom.h"
#include "bus/generic/slot.h" #include "bus/generic/slot.h"
#include "cpu/jaguar/jaguar.h"
#include "imagedev/cdromimg.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 "screen.h"
#include "emupal.h" #include "emupal.h"
#include "cdrom.h"
#ifndef ENABLE_SPEEDUP_HACKS #ifndef ENABLE_SPEEDUP_HACKS
#define ENABLE_SPEEDUP_HACKS 1 #define ENABLE_SPEEDUP_HACKS 1
#endif #endif
@ -406,3 +414,5 @@ private:
uint8_t m_butch_cmd_index = 0U; uint8_t m_butch_cmd_index = 0U;
uint8_t m_butch_cmd_size = 0U; uint8_t m_butch_cmd_size = 0U;
}; };
#endif // MAME_ATARI_JAGUAR_H

6
src/mame/barcrest/mpu4_characteriser_bootleg.h
View File

@ -1,8 +1,8 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:David Haywood // copyright-holders:David Haywood
#ifndef MAME_BARCREST_MPU4_CHARACTERISER_BL_H #ifndef MAME_BARCREST_MPU4_CHARACTERISER_BOOTLEG_H
#define MAME_BARCREST_MPU4_CHARACTERISER_BL_H #define MAME_BARCREST_MPU4_CHARACTERISER_BOOTLEG_H
#pragma once #pragma once
@ -67,4 +67,4 @@ protected:
int m_prot_col = 0; int m_prot_col = 0;
}; };
#endif // MAME_BARCREST_MPU4_CHARACTERISER_BL_H #endif // MAME_BARCREST_MPU4_CHARACTERISER_BOOTLEG_H

6
src/mame/bfm/bfm_dm01.h
View File

@ -5,8 +5,8 @@
Bellfruit dotmatrix driver, (under heavy construction !!!) Bellfruit dotmatrix driver, (under heavy construction !!!)
*************************************************************************************/ *************************************************************************************/
#ifndef MAME_BFM_BFM_DM01 #ifndef MAME_BFM_BFM_DM01_H
#define MAME_BFM_BFM_DM01 #define MAME_BFM_BFM_DM01_H
#pragma once #pragma once
@ -64,4 +64,4 @@ private:
DECLARE_DEVICE_TYPE(BFM_DM01, bfm_dm01_device) DECLARE_DEVICE_TYPE(BFM_DM01, bfm_dm01_device)
#endif // MAME_BFM_BFM_DM01 #endif // MAME_BFM_BFM_DM01_H

6
src/mame/bfm/bfm_gu96x8m_k657c2.h
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:David Haywood // copyright-holders:David Haywood
#ifndef MAME_MACHINE_BFG_GU96X8M_K657C2_H #ifndef MAME_BFM_BFM_GU96X8M_K657C2_H
#define MAME_MACHINE_BFG_GU96X8M_K657C2_H #define MAME_BFM_BFM_GU96X8M_K657C2_H
#pragma once #pragma once
@ -74,4 +74,4 @@ private:
DECLARE_DEVICE_TYPE(BFM_GU96X8M_K657C2, bfm_gu96x8m_k657c2_device) DECLARE_DEVICE_TYPE(BFM_GU96X8M_K657C2, bfm_gu96x8m_k657c2_device)
#endif // MAME_MACHINE_BFG_GU96X8M_K657C2_H #endif // MAME_BFM_BFM_GU96X8M_K657C2_H

2
src/mame/capcom/gng.cpp
View File

@ -950,7 +950,7 @@ ROM_START( makaimurb ) // 85606-A-3/85606-B-3
ROM_END ROM_END
/* /*
Makaimura Makaimura
Program is the same as set makaimurb, but different sized/arranged ROMs. Program is the same as set makaimurb, but different sized/arranged ROMs.
Some GFX ROMs are different. Some GFX ROMs are different.
*/ */

20
src/mame/commodore/c65.cpp
View File

@ -73,19 +73,18 @@ protected:
virtual void device_reset() override ATTR_COLD; virtual void device_reset() override ATTR_COLD;
private: private:
required_address_space m_space; enum dma_state_t : u8 {
u32 m_dmalist_address = 0;
TIMER_CALLBACK_MEMBER(execute_cb);
typedef enum {
COPY, COPY,
MIX, MIX,
SWAP, SWAP,
FILL, FILL,
IDLE, IDLE,
FETCH_PARAMS FETCH_PARAMS
} dma_state_t; };
required_address_space m_space;
u32 m_dmalist_address = 0;
dma_state_t m_state; dma_state_t m_state;
u32 m_src, m_dst, m_length, m_command, m_modulo; u32 m_src, m_dst, m_length, m_command, m_modulo;
@ -93,11 +92,16 @@ private:
bool m_chained_transfer; bool m_chained_transfer;
emu_timer *m_dma_timer; emu_timer *m_dma_timer;
TIMER_CALLBACK_MEMBER(execute_cb);
void check_state(int next_cycles); void check_state(int next_cycles);
void increment_src(); void increment_src();
void increment_dst(); void increment_dst();
}; };
ALLOW_SAVE_TYPE(dmagic_f018_device::dma_state_t)
// CSG 390957-01 // CSG 390957-01
DEFINE_DEVICE_TYPE(DMAGIC_F018, dmagic_f018_device, "dmagic_f018", "DMAgic F018 Gate Array") 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() void dmagic_f018_device::device_start()
{ {
save_item(NAME(m_dmalist_address)); 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); m_dma_timer = timer_alloc(FUNC(dmagic_f018_device::execute_cb), this);
} }

6
src/mame/dataeast/decbac06.h
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:Bryan McPhail, David Haywood // copyright-holders:Bryan McPhail, David Haywood
#ifndef MAME_DATAEAST_DECOBAC06_H #ifndef MAME_DATAEAST_DECBAC06_H
#define MAME_DATAEAST_DECOBAC06_H #define MAME_DATAEAST_DECBAC06_H
#pragma once #pragma once
@ -148,4 +148,4 @@ private:
DECLARE_DEVICE_TYPE(DECO_BAC06, deco_bac06_device) DECLARE_DEVICE_TYPE(DECO_BAC06, deco_bac06_device)
#endif // MAME_DATAEAST_DECOBAC06_H #endif // MAME_DATAEAST_DECBAC06_H

6
src/mame/dataeast/deco222.h
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:David Haywood // copyright-holders:David Haywood
#ifndef MAME_DATAEAST_DECO222 #ifndef MAME_DATAEAST_DECO222_H
#define MAME_DATAEAST_DECO222 #define MAME_DATAEAST_DECO222_H
#pragma once #pragma once
@ -67,4 +67,4 @@ protected:
DECLARE_DEVICE_TYPE(DECO_222, deco_222_device) DECLARE_DEVICE_TYPE(DECO_222, deco_222_device)
DECLARE_DEVICE_TYPE(DECO_C10707, deco_c10707_device) DECLARE_DEVICE_TYPE(DECO_C10707, deco_c10707_device)
#endif // MAME_DATAEAST_DECO222 #endif // MAME_DATAEAST_DECO222_H

6
src/mame/dataeast/decrmc3.h
View File

@ -14,8 +14,8 @@
******************************************************************************/ ******************************************************************************/
#ifndef MAME_DATAEAST_DECORMC3_H #ifndef MAME_DATAEAST_DECRMC3_H
#define MAME_DATAEAST_DECORMC3_H #define MAME_DATAEAST_DECRMC3_H
#pragma once #pragma once
@ -110,4 +110,4 @@ private:
memory_array m_paletteram_ext; // extended memory memory_array m_paletteram_ext; // extended memory
}; };
#endif // MAME_DATAEAST_DECORMC3_H #endif // MAME_DATAEAST_DECRMC3_H

8
src/mame/dec/pdp1.h
View File

@ -2,11 +2,11 @@
// copyright-holders:Raphael Nabet // copyright-holders:Raphael Nabet
/***************************************************************************** /*****************************************************************************
* *
* includes/pdp1.h * dec/pdp1.h
* *
****************************************************************************/ ****************************************************************************/
#ifndef MAME_PDP1_PDP1_H #ifndef MAME_DEC_PDP1_H
#define MAME_PDP1_PDP1_H #define MAME_DEC_PDP1_H
#pragma once #pragma once
@ -477,4 +477,4 @@ public:
required_ioport m_lighty; required_ioport m_lighty;
}; };
#endif // MAME_PDP1_PDP1_H #endif // MAME_DEC_PDP1_H

6
src/mame/fidelity/clockdiv.h
View File

@ -6,8 +6,8 @@
*/ */
#ifndef MAME_FIDELITY_FIDEL_CLOCKDIV_H #ifndef MAME_FIDELITY_CLOCKDIV_H
#define MAME_FIDELITY_FIDEL_CLOCKDIV_H #define MAME_FIDELITY_CLOCKDIV_H
#pragma once #pragma once
@ -49,4 +49,4 @@ private:
INPUT_PORTS_EXTERN( fidel_clockdiv_2 ); INPUT_PORTS_EXTERN( fidel_clockdiv_2 );
INPUT_PORTS_EXTERN( fidel_clockdiv_4 ); INPUT_PORTS_EXTERN( fidel_clockdiv_4 );
#endif // MAME_FIDELITY_FIDEL_CLOCKDIV_H #endif // MAME_FIDELITY_CLOCKDIV_H

6
src/mame/funtech/umc6619_sound.h
View File

@ -6,8 +6,8 @@
**********************************************************************/ **********************************************************************/
#ifndef MAME_FUNTECH_UM6619_SOUND_H #ifndef MAME_FUNTECH_UMC6619_SOUND_H
#define MAME_FUNTECH_UM6619_SOUND_H #define MAME_FUNTECH_UMC6619_SOUND_H
#pragma once #pragma once
@ -70,4 +70,4 @@ private:
DECLARE_DEVICE_TYPE(UMC6619_SOUND, umc6619_sound_device) DECLARE_DEVICE_TYPE(UMC6619_SOUND, umc6619_sound_device)
#endif // MAME_FUNTECH_UM6619_SOUND_H #endif // MAME_FUNTECH_UMC6619_SOUND_H

8
src/mame/fuuki/fuukispr.cpp
View File

@ -2,11 +2,11 @@
// copyright-holders: Luca Elia, David Haywood // copyright-holders: Luca Elia, David Haywood
/* /*
Fuuki Sprite hardware Fuuki Sprite hardware
Used by: Used by:
fuukifg2.cpp fuukifg2.cpp
fuukifg3.cpp (with sprite tile bankswitching, triple buffered) fuukifg3.cpp (with sprite tile bankswitching, triple buffered)
*/ */

8
src/mame/fuuki/fuukitmap.cpp
View File

@ -2,11 +2,11 @@
// copyright-holders: Luca Elia, David Haywood // copyright-holders: Luca Elia, David Haywood
/* /*
Fuuki Tilemap hardware Fuuki Tilemap hardware
Used by: Used by:
fuukifg2.cpp fuukifg2.cpp
fuukifg3.cpp fuukifg3.cpp
*/ */
#include "emu.h" #include "emu.h"

2
src/mame/fuuki/fuukitmap.h
View File

@ -34,7 +34,7 @@ public:
m_xoffs = xoffs; m_xoffs = xoffs;
m_xoffs_flip = xoffs_flip; m_xoffs_flip = xoffs_flip;
} }
void set_yoffs(int yoffs, int yoffs_flip) void set_yoffs(int yoffs, int yoffs_flip)
{ {
m_yoffs = yoffs; m_yoffs = yoffs;

6
src/mame/heathzenith/intr_cntrl.h
View File

@ -8,8 +8,8 @@
****************************************************************************/ ****************************************************************************/
#ifndef MAME_HEATHKIT_INTR_CNTRL_H #ifndef MAME_HEATHZENITH_INTR_CNTRL_H
#define MAME_HEATHKIT_INTR_CNTRL_H #define MAME_HEATHZENITH_INTR_CNTRL_H
#pragma once #pragma once
@ -165,4 +165,4 @@ protected:
DECLARE_DEVICE_TYPE(HEATH_INTR_SOCKET, heath_intr_socket) DECLARE_DEVICE_TYPE(HEATH_INTR_SOCKET, heath_intr_socket)
#endif // MAME_HEATHKIT_H89_INTR_CNTRL_H #endif // MAME_HEATHZENITH_H89_INTR_CNTRL_H

6
src/mame/heathzenith/sigmasoft_parallel_port.h
View File

@ -6,8 +6,8 @@
****************************************************************************/ ****************************************************************************/
#ifndef MAME_HEATHKIT_SIGMASOFT_PARALLEL_PORT_H #ifndef MAME_HEATHZENITH_SIGMASOFT_PARALLEL_PORT_H
#define MAME_HEATHKIT_SIGMASOFT_PARALLEL_PORT_H #define MAME_HEATHZENITH_SIGMASOFT_PARALLEL_PORT_H
#pragma once #pragma once
@ -64,4 +64,4 @@ private:
DECLARE_DEVICE_TYPE(SIGMASOFT_PARALLEL_PORT, sigmasoft_parallel_port) DECLARE_DEVICE_TYPE(SIGMASOFT_PARALLEL_PORT, sigmasoft_parallel_port)
#endif // MAME_HEATHKIT_SIGMASOFT_PARALLEL_PORT_H #endif // MAME_HEATHZENITH_SIGMASOFT_PARALLEL_PORT_H

6
src/mame/heathzenith/tlb.h
View File

@ -6,8 +6,8 @@
****************************************************************************/ ****************************************************************************/
#ifndef MAME_HEATHKIT_TLB_H #ifndef MAME_HEATHZENITH_TLB_H
#define MAME_HEATHKIT_TLB_H #define MAME_HEATHZENITH_TLB_H
#pragma once #pragma once
@ -474,4 +474,4 @@ protected:
// device type definition // device type definition
DECLARE_DEVICE_TYPE(HEATH_TLB_CONNECTOR, heath_tlb_connector) DECLARE_DEVICE_TYPE(HEATH_TLB_CONNECTOR, heath_tlb_connector)
#endif // MAME_HEATHKIT_TLB_H #endif // MAME_HEATHZENITH_TLB_H

11
src/mame/hp/hp48.h
View File

@ -7,17 +7,20 @@
Hewlett Packard HP48 S/SX & G/GX and HP49 G Hewlett Packard HP48 S/SX & G/GX and HP49 G
**********************************************************************/ **********************************************************************/
#ifndef MAME_HP_HP84_H #ifndef MAME_HP_HP48_H
#define MAME_HP_HP84_H #define MAME_HP_HP48_H
#pragma once #pragma once
#include "cpu/saturn/saturn.h"
#include "hp48_port.h" #include "hp48_port.h"
#include "cpu/saturn/saturn.h"
#include "sound/dac.h" #include "sound/dac.h"
#include "emupal.h" #include "emupal.h"
#include "screen.h" #include "screen.h"
/* model */ /* model */
typedef enum { typedef enum {
HP48_S, HP48_S,
@ -215,4 +218,4 @@ private:
#define HP48_NCE3 4 #define HP48_NCE3 4
#define HP48_NCE1 5 #define HP48_NCE1 5
#endif // MAME_HP_HP84_H #endif // MAME_HP_HP48_H

6
src/mame/hp/hp48_port.h
View File

@ -7,8 +7,8 @@
Hewlett Packard HP48 S/SX & G/GX and HP49 G Hewlett Packard HP48 S/SX & G/GX and HP49 G
**********************************************************************/ **********************************************************************/
#ifndef MAME_HP_HP84_PORT_H #ifndef MAME_HP_HP48_PORT_H
#define MAME_HP_HP84_PORT_H #define MAME_HP_HP48_PORT_H
#pragma once #pragma once
@ -72,4 +72,4 @@ private:
// device type definition // device type definition
DECLARE_DEVICE_TYPE(HP48_PORT, hp48_port_image_device) DECLARE_DEVICE_TYPE(HP48_PORT, hp48_port_image_device)
#endif // MAME_HP_HP84_PORT_H #endif // MAME_HP_HP48_PORT_H

10
src/mame/igs/igs036crypt.h
View File

@ -1,7 +1,9 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:Andreas Naive,David Haywood // copyright-holders:Andreas Naive, David Haywood
#ifndef _IGS036CRYPT_H_ #ifndef MAME_IGS_IGS036CRYPT_H
#define _IGS036CRYPT_H_ #define MAME_IGS_IGS036CRYPT_H
#pragma once
class igs036_decryptor 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 cjddzsp_key[0x100];
extern const uint8_t cjdh2_key[0x100]; extern const uint8_t cjdh2_key[0x100];
#endif #endif MAME_IGS_IGS036CRYPT_H

6
src/mame/konami/k053250_ps.h
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:Olivier Galibert // copyright-holders:Olivier Galibert
#ifndef MAME_KONAMI_K053250PS_H #ifndef MAME_KONAMI_K053250_PS_H
#define MAME_KONAMI_K053250PS_H #define MAME_KONAMI_K053250_PS_H
#pragma once #pragma once
@ -84,4 +84,4 @@ private:
DECLARE_DEVICE_TYPE(K053250PS, k053250ps_device) DECLARE_DEVICE_TYPE(K053250PS, k053250ps_device)
#endif // MAME_KONAMI_K053250PS_H #endif // MAME_KONAMI_K053250_PS_H

6
src/mame/konami/k573mcal.h
View File

@ -4,8 +4,8 @@
* Konami 573 Master Calendar * Konami 573 Master Calendar
* *
*/ */
#ifndef MAME_KONAMI_K573_MCAL_H #ifndef MAME_KONAMI_K573MCAL_H
#define MAME_KONAMI_K573_MCAL_H #define MAME_KONAMI_K573MCAL_H
#pragma once #pragma once
@ -47,4 +47,4 @@ private:
DECLARE_DEVICE_TYPE(KONAMI_573_MASTER_CALENDAR, k573mcal_device) DECLARE_DEVICE_TYPE(KONAMI_573_MASTER_CALENDAR, k573mcal_device)
#endif // MAME_KONAMI_K573_MCAL_H #endif // MAME_KONAMI_K573MCAL_H

6
src/mame/konami/k573mcr.h
View File

@ -4,8 +4,8 @@
* Konami 573 Memory Card Reader * Konami 573 Memory Card Reader
* *
*/ */
#ifndef MAME_KONAMI_K573_MCR_H #ifndef MAME_KONAMI_K573MCR_H
#define MAME_KONAMI_K573_MCR_H #define MAME_KONAMI_K573MCR_H
#pragma once #pragma once
@ -76,4 +76,4 @@ private:
DECLARE_DEVICE_TYPE(KONAMI_573_MEMORY_CARD_READER, k573mcr_device) DECLARE_DEVICE_TYPE(KONAMI_573_MEMORY_CARD_READER, k573mcr_device)
#endif // MAME_KONAMI_K573_MCR_H #endif // MAME_KONAMI_K573MCR_H

7
src/mame/konami/konami_gn676_lan.h
View File

@ -1,8 +1,7 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:Ville Linde, windyfairy // copyright-holders:Ville Linde, windyfairy
#ifndef MAME_KONAMI_KONAMI_GN676_LAN_H
#ifndef MAME_KONAMI_GN676_LAN_H #define MAME_KONAMI_KONAMI_GN676_LAN_H
#define MAME_KONAMI_GN676_LAN_H
#pragma once #pragma once
@ -71,4 +70,4 @@ protected:
DECLARE_DEVICE_TYPE(KONAMI_GN676A_LAN, konami_gn676a_lan_device) DECLARE_DEVICE_TYPE(KONAMI_GN676A_LAN, konami_gn676a_lan_device)
DECLARE_DEVICE_TYPE(KONAMI_GN676B_LAN, konami_gn676b_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

12
src/mame/korg/polysix.cpp
View File

@ -361,7 +361,7 @@ u8 polysix_sound_block::get_control_low()
void polysix_sound_block::sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs) void polysix_sound_block::sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &outputs)
{ {
for(int sample=0; sample != outputs[0].samples(); sample++) { 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; float out = 0;
// Step the pwm phase (common to all channels) // 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 else
// When gate is off, discharge a 0.047uF cap through a 230K resistor // 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)) m_organ_eg[channel] -= m_organ_eg[channel]*0.00192537196422815; // 1-exp(-1/(230e3 * 0.047e-6 * 48000))
out += wave * m_organ_eg[channel]; out += wave * m_organ_eg[channel];
} }
@ -442,7 +442,7 @@ public:
virtual void machine_start() override ATTR_COLD; virtual void machine_start() override ATTR_COLD;
void polysix(machine_config &config); void polysix(machine_config &config);
INPUT_CHANGED_MEMBER(tape_enable_w); INPUT_CHANGED_MEMBER(tape_enable_w);
private: private:
required_device<mcs48_cpu_device> m_progmcu; required_device<mcs48_cpu_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 0xc: m_sound->set_mg_delay(m_prog_bus); break;
case 0xd: m_sound->set_mg_level(m_prog_bus); break; case 0xd: m_sound->set_mg_level(m_prog_bus); break;
} }
} }
} }
void polysix_state::prog_p2_w(u8 data) void polysix_state::prog_p2_w(u8 data)
@ -625,7 +625,7 @@ int polysix_state::prog_t0_r()
int polysix_state::prog_t1_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; return m_tape->input() >= 0;
} }
@ -689,7 +689,7 @@ void polysix_state::key_p2_w(u8 data)
if(BIT(chg, 7)) if(BIT(chg, 7))
logerror("cn12-16=%d\n", BIT(m_key_p2, 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() int polysix_state::key_t0_r()

6
src/mame/luxor/abc80x.h
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:Curt Coder // copyright-holders:Curt Coder
#ifndef MAME_LUXOR_ABC800_H #ifndef MAME_LUXOR_ABC80X_H
#define MAME_LUXOR_ABC800_H #define MAME_LUXOR_ABC80X_H
#pragma once #pragma once
@ -355,4 +355,4 @@ public:
void abc806_mem(address_map &map) ATTR_COLD; void abc806_mem(address_map &map) ATTR_COLD;
}; };
#endif // MAME_LUXOR_ABC800_H #endif // MAME_LUXOR_ABC80X_H

7
src/mame/misc/nabupc_kbd.h
View File

@ -6,9 +6,8 @@
***************************************************************************/ ***************************************************************************/
#ifndef MAME_MISC_NABUPC_KBD_H
#ifndef MAME_NABUPC_KEYBOARD_DEVICE_H #define MAME_MISC_NABUPC_KBD_H
#define MAME_NABUPC_KEYBOARD_DEVICE_H
#pragma once #pragma once
@ -63,4 +62,4 @@ private:
DECLARE_DEVICE_TYPE(NABUPC_KEYBOARD, nabupc_keyboard_device) DECLARE_DEVICE_TYPE(NABUPC_KEYBOARD, nabupc_keyboard_device)
#endif // MAME_NABUPC_KEYBOARD_DEVICE_H #endif // MAME_MISC_NABUPC_KBD_H

6
src/mame/namco/namco_c45road.h
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:Phil Stroffolino, Aaron Giles, Alex W. Jackson // copyright-holders:Phil Stroffolino, Aaron Giles, Alex W. Jackson
#ifndef MAME_NAMCO_C45_H #ifndef MAME_NAMCO_NAMCO_C45ROAD_H
#define MAME_NAMCO_C45_H #define MAME_NAMCO_NAMCO_C45ROAD_H
#pragma once #pragma once
@ -69,4 +69,4 @@ private:
// device type definition // device type definition
DECLARE_DEVICE_TYPE(NAMCO_C45_ROAD, namco_c45_road_device) DECLARE_DEVICE_TYPE(NAMCO_C45_ROAD, namco_c45_road_device)
#endif // MAME_NAMCO_C45_H #endif // MAME_NAMCO_NAMCO_C45ROAD_H

6
src/mame/nintendo/m6502_swap_op_d2_d7.h
View File

@ -8,8 +8,8 @@
***************************************************************************/ ***************************************************************************/
#ifndef MAME_M6502_SWAP_OP_D2_D7_H #ifndef MAME_NINTENDO_M6502_SWAP_OP_D2_D7_H
#define MAME_M6502_SWAP_OP_D2_D7_H #define MAME_NINTENDO_M6502_SWAP_OP_D2_D7_H
#pragma once #pragma once
@ -50,4 +50,4 @@ protected:
DECLARE_DEVICE_TYPE(M6502_SWAP_OP_D2_D7, m6502_swap_op_d2_d7) 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

6
src/mame/nintendo/m6502_swap_op_d5_d6.h
View File

@ -8,8 +8,8 @@
***************************************************************************/ ***************************************************************************/
#ifndef MAME_M6502_SWAP_OP_D5_D6_H #ifndef MAME_NINTENDO_M6502_SWAP_OP_D5_D6_H
#define MAME_M6502_SWAP_OP_D5_D6_H #define MAME_NINTENDO_M6502_SWAP_OP_D5_D6_H
#pragma once #pragma once
@ -84,4 +84,4 @@ protected:
DECLARE_DEVICE_TYPE(M6502_SWAP_OP_D5_D6, m6502_swap_op_d5_d6) 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) 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

6
src/mame/nintendo/m6502_vtscr.h
View File

@ -8,8 +8,8 @@
***************************************************************************/ ***************************************************************************/
#ifndef MAME_CPU_M6502_VTSCR_H #ifndef MAME_NINTENDO_M6502_VTSCR_H
#define MAME_CPU_M6502_VTSCR_H #define MAME_NINTENDO_M6502_VTSCR_H
#pragma once #pragma once
@ -55,4 +55,4 @@ protected:
DECLARE_DEVICE_TYPE(M6502_VTSCR, m6502_vtscr) DECLARE_DEVICE_TYPE(M6502_VTSCR, m6502_vtscr)
#endif // MAME_CPU_M6502_VTSCR_H #endif // MAME_NINTENDO_M6502_VTSCR_H

6
src/mame/nintendo/nes_vt369_vtunknown_soc.h
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:David Haywood // copyright-holders:David Haywood
#ifndef MAME_NINTENDO_NES_VT369_VTUNKOWN_SOC_H #ifndef MAME_NINTENDO_NES_VT369_VTUNKNOWN_SOC_H
#define MAME_NINTENDO_NES_VT369_VTUNKOWN_SOC_H #define MAME_NINTENDO_NES_VT369_VTUNKNOWN_SOC_H
#pragma once #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_DG, nes_vtunknown_soc_dg_device)
DECLARE_DEVICE_TYPE(NES_VTUNKNOWN_SOC_FA, nes_vtunknown_soc_fa_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

8
src/mame/nintendo/rdpblend.h
View File

@ -13,8 +13,10 @@
******************************************************************************/ ******************************************************************************/
#ifndef _VIDEO_RDPBLEND_H_ #ifndef MAME_NINTENDO_RDPBLEND_H
#define _VIDEO_RDPBLEND_H_ #define MAME_NINTENDO_RDPBLEND_H
#pragma once
#include "n64_v.h" #include "n64_v.h"
@ -69,4 +71,4 @@ class n64_blender_t
uint8_t m_alpha_dither[256 * 8]; uint8_t m_alpha_dither[256 * 8];
}; };
#endif // _VIDEO_RDPBLEND_H_ #endif // MAME_NINTENDO_RDPBLEND_H

8
src/mame/nintendo/rdptpipe.h
View File

@ -13,8 +13,10 @@
******************************************************************************/ ******************************************************************************/
#ifndef _VIDEO_RDPTEXPIPE_H_ #ifndef MAME_NINTENDO_RDPTPIPE_H
#define _VIDEO_RDPTEXPIPE_H_ #define MAME_NINTENDO_RDPTPIPE_H
#pragma once
#include "n64types.h" #include "n64types.h"
@ -162,4 +164,4 @@ class n64_texture_pipe_t
rgbaint_t m_v1; rgbaint_t m_v1;
}; };
#endif // _VIDEO_RDPTEXPIPE_H_ #endif // MAME_NINTENDO_RDPTPIPE_H

10
src/mame/nintendo/vt1682.cpp
View File

@ -1566,7 +1566,7 @@ void vt_vt1682_state::vt1682_2007_vram_data_w(uint8_t data)
uint16_t vram_address = get_vram_addr(); uint16_t vram_address = get_vram_addr();
m_vram->write8(vram_address, data); m_vram->write8(vram_address, data);
if (m_2000 & 0x4) if (m_2000 & 0x4)
{ {
// this mode is completely undocumented, but needed for many games in the cmpmx10 / cmpmx11 sets // 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 // 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? // could this be a workaround for the scroll offset issue the hardware has?
//if (data & 0x30) //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; m_scu_to_main_irq_active = 1;
update_main_interrupts(); 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 // The broken priorities in Table Tennis for exsprt48 / itvg48
// are unrelated (bit isn't set) but as they work in // are unrelated (bit isn't set) but as they work in
// xing48 could be just a bug in those versions // xing48 could be just a bug in those versions
// //
// does it really work on hardware? we disable it entirely // does it really work on hardware? we disable it entirely
// in those sets for now // in those sets for now
if (bk_paldepth_mode && m_allow_bk_paldepth_mode) 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) void vt1682_dance_state::rom_ram_map(address_map &map)
{ {
rom_map(map); rom_map(map);
map(0x1000000, 0x101ffff).ram(); map(0x1000000, 0x101ffff).ram();
} }
// 11-bits (0x800 bytes) for sprites // 11-bits (0x800 bytes) for sprites

8
src/mame/olivetti/m20_kbd.h
View File

@ -1,7 +1,9 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:Carl,Vas Crabb // copyright-holders:Carl,Vas Crabb
#ifndef MAME_OLIVETTI_M20KBD_H #ifndef MAME_OLIVETTI_M20_KBD_H
#define MAME_OLIVETTI_M20KBD_H #define MAME_OLIVETTI_M20_KBD_H
#pragma once
#include "bus/rs232/rs232.h" #include "bus/rs232/rs232.h"
#include "machine/keyboard.h" #include "machine/keyboard.h"
@ -24,4 +26,4 @@ private:
DECLARE_DEVICE_TYPE(M20_KEYBOARD, m20_keyboard_device) DECLARE_DEVICE_TYPE(M20_KEYBOARD, m20_keyboard_device)
#endif // MAME_OLIVETTI_M20KBD_H #endif // MAME_OLIVETTI_M20_KBD_H

9
src/mame/pce/pcecommn.h
View File

@ -8,12 +8,15 @@
***************************************************************************/ ***************************************************************************/
#ifndef PCECOMMON_H #ifndef MAME_PCE_PCECOMMN_H
#define PCECOMMON_H #define MAME_PCE_PCECOMMN_H
#pragma once
#include "cpu/h6280/h6280.h" #include "cpu/h6280/h6280.h"
#include "video/huc6260.h" #include "video/huc6260.h"
#include "video/huc6270.h" #include "video/huc6270.h"
#define PCE_MAIN_CLOCK 21477270 #define PCE_MAIN_CLOCK 21477270
class pce_common_state : public driver_device class pce_common_state : public driver_device
@ -55,4 +58,4 @@ private:
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
#endif #endif // MAME_PCE_PCECOMMN_H

7
src/mame/pinball/genpin.h
View File

@ -1,8 +1,9 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:Robbbert // copyright-holders:Robbbert
#ifndef GENPIN_H_ #ifndef MAME_PINBALL_GENPIN_H
#define GENPIN_H_ #define MAME_PINBALL_GENPIN_H
#pragma once
#include "sound/samples.h" #include "sound/samples.h"
#include "machine/nvram.h" #include "machine/nvram.h"
@ -46,4 +47,4 @@ public:
}; };
#endif /* GENPIN_H_ */ #endif // MAME_PINBALL_GENPIN_H

2
src/mame/pinball/recel.cpp
View File

@ -457,7 +457,7 @@ ROM_START(r_fairfght)
ROM_END ROM_END
/* There are three different known dumps for Poker Plus: /* There are three different known dumps for Poker Plus:
(1) CRC(571ee27b) SHA1(482a3ba18eff05bce4cab073b1f13fc2f145bb2b) (1) CRC(571ee27b) SHA1(482a3ba18eff05bce4cab073b1f13fc2f145bb2b)
(2) CRC(60a199a8) SHA1(045d61f56ea03a694722da810d465ab65d85cbfd) (2) CRC(60a199a8) SHA1(045d61f56ea03a694722da810d465ab65d85cbfd)
(3) CRC(fadd715a) SHA1(6c5b6e8fcf77be2b0b7076dc1139760f7e4d5688) (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, (1) was tested on a real machine and works OK, (2) was also tested, but the pinball did not work with it,

6
src/mame/sega/315-5838_317-0229_comp.h
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:David Haywood, Samuel Neves, Peter Wilhelmsen, Morten Shearman Kirkegaard // copyright-holders:David Haywood, Samuel Neves, Peter Wilhelmsen, Morten Shearman Kirkegaard
#ifndef MAME_SEGA_315_5838_371_0229_COMP_H #ifndef MAME_SEGA_315_5838_317_0229_COMP_H
#define MAME_SEGA_315_5838_371_0229_COMP_H #define MAME_SEGA_315_5838_317_0229_COMP_H
#pragma once #pragma once
@ -78,4 +78,4 @@ private:
#endif #endif
}; };
#endif // MAME_SEGA_315_5838_371_0229_COMP_H #endif // MAME_SEGA_315_5838_317_0229_COMP_H

6
src/mame/sega/dccons.h
View File

@ -1,7 +1,7 @@
// license:LGPL-2.1+ // license:LGPL-2.1+
// copyright-holders:Angelo Salese, R. Belmont // copyright-holders:Angelo Salese, R. Belmont
#ifndef MAME_SEGACONS_DCCONS_H #ifndef MAME_SEGA_DCCONS_H
#define MAME_SEGACONS_DCCONS_H #define MAME_SEGA_DCCONS_H
#pragma once #pragma once
@ -57,4 +57,4 @@ private:
int atapi_xferlen = 0, atapi_xferbase = 0, atapi_xfercomplete; int atapi_xferlen = 0, atapi_xferbase = 0, atapi_xfercomplete;
}; };
#endif // MAME_SEGACONS_DCCONS_H #endif // MAME_SEGA_DCCONS_H

6
src/mame/sega/mdconsole.h
View File

@ -1,7 +1,7 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:David Haywood // copyright-holders:David Haywood
#ifndef MAME_SEGACONS_MDCONSOLE_H #ifndef MAME_SEGA_MDCONSOLE_H
#define MAME_SEGACONS_MDCONSOLE_H #define MAME_SEGA_MDCONSOLE_H
#pragma once #pragma once
@ -115,4 +115,4 @@ protected:
virtual void machine_start() override ATTR_COLD; virtual void machine_start() override ATTR_COLD;
}; };
#endif // MAME_SEGACONS_MDCONSOLE_H #endif // MAME_SEGA_MDCONSOLE_H

6
src/mame/seibu/seicopbl.h
View File

@ -1,7 +1,7 @@
// license:LGPL-2.1+ // license:LGPL-2.1+
// copyright-holders:Olivier Galibert, Angelo Salese, David Haywood, Tomasz Slanina // copyright-holders:Olivier Galibert, Angelo Salese, David Haywood, Tomasz Slanina
#ifndef MAME_SEIBU_SEICOP_H #ifndef MAME_SEIBU_SEICOPBL_H
#define MAME_SEIBU_SEICOP_H #define MAME_SEIBU_SEICOPBL_H
#pragma once #pragma once
@ -63,4 +63,4 @@ private:
DECLARE_DEVICE_TYPE(SEIBU_COP_BOOTLEG, seibu_cop_bootleg_device) DECLARE_DEVICE_TYPE(SEIBU_COP_BOOTLEG, seibu_cop_bootleg_device)
#endif // MAME_SEIBU_SEICOP_H #endif // MAME_SEIBU_SEICOPBL_H

6
src/mame/sgi/ip4.h
View File

@ -1,8 +1,8 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:Patrick Mackinlay // copyright-holders:Patrick Mackinlay
#ifndef MAME_BUS_VME_IP4_H #ifndef MAME_SGI_IP4_H
#define MAME_BUS_VME_IP4_H #define MAME_SGI_IP4_H
#pragma once #pragma once
@ -82,4 +82,4 @@ private:
DECLARE_DEVICE_TYPE(SGI_IP4, sgi_ip4_device) DECLARE_DEVICE_TYPE(SGI_IP4, sgi_ip4_device)
#endif // MAME_BUS_VME_IP4_H #endif // MAME_SGI_IP4_H

6
src/mame/sinclair/tsconfdma.h
View File

@ -6,8 +6,8 @@
***************************************************************************/ ***************************************************************************/
#ifndef MAME_SINCLAIR_TSCONF_DMA_H #ifndef MAME_SINCLAIR_TSCONFDMA_H
#define MAME_SINCLAIR_TSCONF_DMA_H #define MAME_SINCLAIR_TSCONFDMA_H
#pragma once #pragma once
@ -74,4 +74,4 @@ private:
}; };
DECLARE_DEVICE_TYPE(TSCONF_DMA, tsconfdma_device) DECLARE_DEVICE_TYPE(TSCONF_DMA, tsconfdma_device)
#endif // MAME_SINCLAIR_TSCONF_DMA_H #endif // MAME_SINCLAIR_TSCONFDMA_H

4
src/mame/skeleton/flashvga2.cpp
View File

@ -114,8 +114,8 @@ ROM_START( ruletamag )
ROM_LOAD( "m24256bf.u31", 0x000000, 0x008000, CRC(af9adcae) SHA1(ac6274edc4240d5cf397455868009263264ffc6e) ) 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 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. 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. */ Maybe there's a way to initialize the NVRAM, but there's nothing about it on the manual. */
ROM_REGION( 0x2000, "nvram", 0 ) ROM_REGION( 0x2000, "nvram", 0 )
ROM_LOAD( "m48t18.u38", 0x000000, 0x002000, BAD_DUMP CRC(025fb8c2) SHA1(61c90ecad8565cfd20674034a5917b0225edbfe5) ) // Corrupted ROM_LOAD( "m48t18.u38", 0x000000, 0x002000, BAD_DUMP CRC(025fb8c2) SHA1(61c90ecad8565cfd20674034a5917b0225edbfe5) ) // Corrupted
ROM_END ROM_END

4
src/mame/skeleton/itt1700_kbd.h
View File

@ -1,8 +1,8 @@
// license:BSD-3-Clause // license:BSD-3-Clause
// copyright-holders:AJR // copyright-holders:AJR
#ifndef MAME_SKELETON_ITT1700_KBD #ifndef MAME_SKELETON_ITT1700_KBD_H
#define MAME_SKELETON_ITT1700_KBD #define MAME_SKELETON_ITT1700_KBD_H
#pragma once #pragma once

2
src/mame/skeleton/lgtz80.cpp
View File

@ -402,7 +402,7 @@ void lgtz80_state::init_arthurkn()
case 0x140: case 0x140:
case 0x340: 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; break;
case 0x180: case 0x180:

Some files were not shown because too many files have changed in this diff Show More