Fixed some #include guards.

This commit is contained in:
Vas Crabb 2023-07-05 05:06:22 +10:00
parent d0f793242f
commit 898f18a715
4 changed files with 75 additions and 75 deletions

View File

@ -5,8 +5,8 @@
Cirrus Logic GD542x/3x video chipsets
*/
#ifndef MAME_VIDEO_CIRRUS_H
#define MAME_VIDEO_CIRRUS_H
#ifndef MAME_VIDEO_PC_VGA_CIRRUS_H
#define MAME_VIDEO_PC_VGA_CIRRUS_H
#pragma once
@ -129,4 +129,4 @@ DECLARE_DEVICE_TYPE(CIRRUS_GD5428, cirrus_gd5428_device)
DECLARE_DEVICE_TYPE(CIRRUS_GD5430, cirrus_gd5430_device)
DECLARE_DEVICE_TYPE(CIRRUS_GD5446, cirrus_gd5446_device)
#endif // MAME_VIDEO_CIRRUS_H
#endif // MAME_VIDEO_PC_VGA_CIRRUS_H

View File

@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Angelo Salese
#ifndef MAME_VIDEO_PARADISE_H
#define MAME_VIDEO_PARADISE_H
#ifndef MAME_VIDEO_PC_VGA_PARADISE_H
#define MAME_VIDEO_PC_VGA_PARADISE_H
#pragma once
@ -22,4 +22,4 @@ protected:
DECLARE_DEVICE_TYPE(PVGA1A, pvga1a_vga_device)
#endif // MAME_VIDEO_PARADISE_H
#endif // MAME_VIDEO_PC_VGA_PARADISE_H

View File

@ -1,8 +1,8 @@
// license:BSD-3-Clause
// copyright-holders:Angelo Salese
#ifndef MAME_VIDEO_SIS_H
#define MAME_VIDEO_SIS_H
#ifndef MAME_VIDEO_PC_VGA_SIS_H
#define MAME_VIDEO_PC_VGA_SIS_H
#pragma once
@ -41,4 +41,4 @@ protected:
DECLARE_DEVICE_TYPE(SIS630_SVGA, sis630_svga_device)
#endif // MAME_VIDEO_SIS_H
#endif // MAME_VIDEO_PC_VGA_SIS_H

View File

@ -533,75 +533,75 @@ static INPUT_PORTS_START( newufo )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 Prize Sensor")
PORT_START("DSW1") // coinage
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 5C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08) // SETTING 1
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x06, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x01, DEF_STR( 5C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x09, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x00, DEF_STR( 5C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x05, DEF_STR( 3C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x03, DEF_STR( 4C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x0f, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x08, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x0e, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x07, DEF_STR( 2C_5C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x0d, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x0c, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x0b, DEF_STR( 1C_5C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPNAME( 0x0f, 0x0f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3,4")
PORT_DIPSETTING( 0x02, DEF_STR( 5C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08) // SETTING 1
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x06, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x01, DEF_STR( 5C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x09, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x00, DEF_STR( 5C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x05, DEF_STR( 3C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x03, DEF_STR( 4C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x0f, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x08, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x0e, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x07, DEF_STR( 2C_5C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x0d, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x0c, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x0b, DEF_STR( 1C_5C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00) // SETTING 2
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x03, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x05, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x02, DEF_STR( 3C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x0f, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x04, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x0e, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x0d, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x0c, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x0b, DEF_STR( 1C_5C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x09, DEF_STR( 1C_8C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x08, "1 Coin/10 Credits" ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x07, "1 Coin/11 Credits" ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x06, "1 Coin/12 Credits" ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00) // SETTING 2
PORT_DIPSETTING( 0x01, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x03, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x05, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x02, DEF_STR( 3C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x0f, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x04, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x0e, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x0d, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x0c, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x0b, DEF_STR( 1C_5C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x09, DEF_STR( 1C_8C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x08, "1 Coin/10 Credits" ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x07, "1 Coin/11 Credits" ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x06, "1 Coin/12 Credits" ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPNAME( 0xf0, 0xa0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:5,6,7,8")
PORT_DIPSETTING( 0x20, DEF_STR( 5C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08) // SETTING 1
PORT_DIPSETTING( 0x40, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x60, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x10, DEF_STR( 5C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x90, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x00, DEF_STR( 5C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x50, DEF_STR( 3C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x30, DEF_STR( 4C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0xf0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x80, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0xe0, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x70, DEF_STR( 2C_5C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0xd0, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPNAME( 0xf0, 0xa0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:5,6,7,8")
PORT_DIPSETTING( 0x20, DEF_STR( 5C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08) // SETTING 1
PORT_DIPSETTING( 0x40, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x60, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x10, DEF_STR( 5C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x90, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x00, DEF_STR( 5C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x50, DEF_STR( 3C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x30, DEF_STR( 4C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0xf0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x80, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0xe0, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x70, DEF_STR( 2C_5C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0xd0, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x08)
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00) // SETTING 2
PORT_DIPSETTING( 0x10, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x30, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x50, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x20, DEF_STR( 3C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0xf0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x40, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0xe0, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0xd0, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x90, DEF_STR( 1C_8C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x80, "1 Coin/10 Credits" ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x70, "1 Coin/11 Credits" ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x60, "1 Coin/12 Credits" ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00) // SETTING 2
PORT_DIPSETTING( 0x10, DEF_STR( 4C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x30, DEF_STR( 3C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x50, DEF_STR( 2C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x20, DEF_STR( 3C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0xf0, DEF_STR( 1C_1C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x40, DEF_STR( 2C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0xe0, DEF_STR( 1C_2C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0xd0, DEF_STR( 1C_3C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x90, DEF_STR( 1C_8C ) ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x80, "1 Coin/10 Credits" ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x70, "1 Coin/11 Credits" ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_DIPSETTING( 0x60, "1 Coin/12 Credits" ) PORT_CONDITION("DSW2", 0x08, EQUALS, 0x00)
PORT_START("DSW2")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:1") // Manual states "Sounds"