summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2023-08-27 04:37:35 +1000
committer Vas Crabb <vas@vastheman.com>2023-08-27 04:37:35 +1000
commit6c0005df396e3eb013314782ca9256eacadbe4d2 (patch)
treee226a66c6734bc5de81551a449543ba817006946 /src
parent9865cf3800c68a323f4bd956c6a95b33ba213887 (diff)
srcclean, #include order cleanup, and self-closing XML tag cleanup before MAME 0.258 release branch.
Diffstat (limited to 'src')
-rw-r--r--src/devices/bus/isa/svga_cirrus.cpp12
-rwxr-xr-xsrc/devices/bus/nscsi/cd.cpp6
-rw-r--r--src/devices/cpu/m16c/m16cdasm.cpp2
-rw-r--r--src/devices/video/mb86292.cpp48
-rw-r--r--src/devices/video/pc_vga_matrox.cpp4
-rw-r--r--src/mame/apple/apple3_m.cpp2
-rwxr-xr-xsrc/mame/apple/dafb.cpp4
-rw-r--r--src/mame/misc/magicard.cpp4
-rw-r--r--src/mame/pc/at.cpp2
-rw-r--r--src/mame/pc/pc.cpp2
-rw-r--r--src/mame/seta/seta.cpp4
-rw-r--r--src/mame/seta/speedatk.cpp114
-rw-r--r--src/mame/sgi/indy_indigo2.cpp16
-rw-r--r--src/mame/sgi/ip4.cpp3
-rw-r--r--src/mame/sgi/ip6.cpp10
-rw-r--r--src/mame/skeleton/tvcobrasd.cpp2
-rw-r--r--src/mame/taito/taitosj.cpp2
-rw-r--r--src/mame/vtech/socrates.cpp2
18 files changed, 119 insertions, 120 deletions
diff --git a/src/devices/bus/isa/svga_cirrus.cpp b/src/devices/bus/isa/svga_cirrus.cpp
index 3d9cc502c62..42b5f37eb3d 100644
--- a/src/devices/bus/isa/svga_cirrus.cpp
+++ b/src/devices/bus/isa/svga_cirrus.cpp
@@ -156,12 +156,12 @@ ROM_START( clgd510 )
// RAM: 256KB - OSC: 28.322000 MHz, 32.514000 MHz, 25.175000MHz - Connectors: DB15, DB9 - DIP: 8-way
ROM_SYSTEM_BIOS(3, "morse_v212", "Morse KP 800 V2.12")
ROMX_LOAD("morse_kp800_vga_cl-gd520a-32pc-b.bin", 0x00000, 0x08000, CRC(9a12e070) SHA1(536046c6c2549d8cc16a546d5ec1739d647486d7), ROM_BIOS(3) )
- // Videoseven VEGA VGA 8bit ISA graphics card - RAM: 256KB - Chips: Cirrus Logic CL-GD540A-32PC-C, AM81C178-50PC, CL-GD510A-32PC-B -
- // Connectors: DB9, DB15, 32pin, 6pin - DIP: 6 way
- ROM_SYSTEM_BIOS(4, "v7vegavga147", "Videoseven VEGA VGA Version 1.47")
- ROMX_LOAD("v7_vega_vga_62L1989V5_435-0016-47.bin", 0x00000, 0x08000, CRC(79daa514) SHA1(cc3fc6bf54ba2668ae0083f917e91beb78894e30), ROM_BIOS(4) )
- ROM_SYSTEM_BIOS(5, "v7vegavga178", "Videoseven VEGA VGA Version 1.78")
- ROMX_LOAD("vegavga.vbi", 0x00000, 0x08000, CRC(438c6790) SHA1(16abdc1bc3cd38f13ce16dc11fa4e99f169b9807), ROM_BIOS(5) )
+ // Videoseven VEGA VGA 8bit ISA graphics card - RAM: 256KB - Chips: Cirrus Logic CL-GD540A-32PC-C, AM81C178-50PC, CL-GD510A-32PC-B -
+ // Connectors: DB9, DB15, 32pin, 6pin - DIP: 6 way
+ ROM_SYSTEM_BIOS(4, "v7vegavga147", "Videoseven VEGA VGA Version 1.47")
+ ROMX_LOAD("v7_vega_vga_62L1989V5_435-0016-47.bin", 0x00000, 0x08000, CRC(79daa514) SHA1(cc3fc6bf54ba2668ae0083f917e91beb78894e30), ROM_BIOS(4) )
+ ROM_SYSTEM_BIOS(5, "v7vegavga178", "Videoseven VEGA VGA Version 1.78")
+ ROMX_LOAD("vegavga.vbi", 0x00000, 0x08000, CRC(438c6790) SHA1(16abdc1bc3cd38f13ce16dc11fa4e99f169b9807), ROM_BIOS(5) )
ROM_END
*/
diff --git a/src/devices/bus/nscsi/cd.cpp b/src/devices/bus/nscsi/cd.cpp
index c119f4282ce..bab36357c34 100755
--- a/src/devices/bus/nscsi/cd.cpp
+++ b/src/devices/bus/nscsi/cd.cpp
@@ -1008,15 +1008,15 @@ void nscsi_cdrom_apple_device::scsi_command()
scsi_cmdbuf[pos++] = dec_2_bcd(BIT(start_frame, 8, 8)); // seconds
scsi_cmdbuf[pos++] = dec_2_bcd(BIT(start_frame, 0, 8)); // frames
}
- else // keep returning the last track if necessary
+ else // keep returning the last track if necessary
{
const uint32_t start_lba = image->get_track_start(image->get_last_track());
const uint32_t start_frame = to_msf(start_lba);
scsi_cmdbuf[pos++] = image->get_adr_control(image->get_last_track());
scsi_cmdbuf[pos++] = dec_2_bcd(BIT(start_frame, 16, 8)); // minutes
- scsi_cmdbuf[pos++] = dec_2_bcd(BIT(start_frame, 8, 8)); // seconds
- scsi_cmdbuf[pos++] = dec_2_bcd(BIT(start_frame, 0, 8)); // frames
+ scsi_cmdbuf[pos++] = dec_2_bcd(BIT(start_frame, 8, 8)); // seconds
+ scsi_cmdbuf[pos++] = dec_2_bcd(BIT(start_frame, 0, 8)); // frames
}
}
diff --git a/src/devices/cpu/m16c/m16cdasm.cpp b/src/devices/cpu/m16c/m16cdasm.cpp
index 3d3835782a4..00972ca24fc 100644
--- a/src/devices/cpu/m16c/m16cdasm.cpp
+++ b/src/devices/cpu/m16c/m16cdasm.cpp
@@ -525,7 +525,7 @@ void m16c_disassembler::dasm_7d(std::ostream &stream, offs_t &pc, offs_t &flags,
format_imm16(stream, opcodes.r16(pc + offset));
stream << ", ";
dasm_ea(stream, pc, opcodes, op2 & 0x0f, true);
- pc += 2;
+ pc += 2;
}
else if ((op2 & 0xf8) == 0x98)
{
diff --git a/src/devices/video/mb86292.cpp b/src/devices/video/mb86292.cpp
index bfdfc6db1c4..4a16ebd6a25 100644
--- a/src/devices/video/mb86292.cpp
+++ b/src/devices/video/mb86292.cpp
@@ -115,8 +115,8 @@ void mb86292_device::device_reset()
m_vsync_timer->adjust(attotime::never);
-// m_crtc.vtr = m_crtc.htp = m_crtc.hdp = m_crtc.hdb = m_crtc.hsp = m_crtc.hsw = 0;
-// m_crtc.vtr = m_crtc.vsp = m_crtc.vdp = m_crtc.vsw = 0;
+// m_crtc.vtr = m_crtc.htp = m_crtc.hdp = m_crtc.hdb = m_crtc.hsp = m_crtc.hsw = 0;
+// m_crtc.vtr = m_crtc.vsp = m_crtc.vdp = m_crtc.vsw = 0;
m_irq.ist = m_irq.mask = 0;
m_dce = 0;
}
@@ -652,36 +652,36 @@ TIMER_CALLBACK_MEMBER(mb86292_device::vsync_cb)
}
/*
- GCTR Geometry ConTrol Register
- ---- ---x ---- ---- ---- ---- ---- ---- FO FIFO Overflow
- ---- ---- ---x xxxx x--- ---- ---- ---- FCNT FIFO Counter (up to 0x100000)
- ---- ---- ---- ---- -x-- ---- ---- ---- NF FIFO Near Full (actually FIFO half size reached)
- ---- ---- ---- ---- --x- ---- ---- ---- FF FIFO full
- ---- ---- ---- ---- ---x ---- ---- ---- FE FIFO empty
- ---- ---- ---- ---- ---- --xx ---- ---- GS Geometry engine Status
- ---- ---- ---- ---- ---- --00 ---- ---- Idle
- ---- ---- ---- ---- ---- --01 ---- ---- Processing, assume pixels rather than commands
- ---- ---- ---- ---- ---- --1x ---- ---- <reserved>
- ---- ---- ---- ---- ---- ---- --xx ---- SS geometry Setup engine Status
- ---- ---- ---- ---- ---- ---- --00 ---- Idle
- ---- ---- ---- ---- ---- ---- --01 ---- Processing
- ---- ---- ---- ---- ---- ---- --10 ---- Processing (separate stage?)
- ---- ---- ---- ---- ---- ---- --11 ---- <reserved>
- ---- ---- ---- ---- ---- ---- ---- --xx PS Pixel engine Status
- ---- ---- ---- ---- ---- ---- ---- --00 Idle
- ---- ---- ---- ---- ---- ---- ---- --01 Processing, assume pixels rather than commands
- ---- ---- ---- ---- ---- ---- ---- --1x <reserved>
+ GCTR Geometry ConTrol Register
+ ---- ---x ---- ---- ---- ---- ---- ---- FO FIFO Overflow
+ ---- ---- ---x xxxx x--- ---- ---- ---- FCNT FIFO Counter (up to 0x100000)
+ ---- ---- ---- ---- -x-- ---- ---- ---- NF FIFO Near Full (actually FIFO half size reached)
+ ---- ---- ---- ---- --x- ---- ---- ---- FF FIFO full
+ ---- ---- ---- ---- ---x ---- ---- ---- FE FIFO empty
+ ---- ---- ---- ---- ---- --xx ---- ---- GS Geometry engine Status
+ ---- ---- ---- ---- ---- --00 ---- ---- Idle
+ ---- ---- ---- ---- ---- --01 ---- ---- Processing, assume pixels rather than commands
+ ---- ---- ---- ---- ---- --1x ---- ---- <reserved>
+ ---- ---- ---- ---- ---- ---- --xx ---- SS geometry Setup engine Status
+ ---- ---- ---- ---- ---- ---- --00 ---- Idle
+ ---- ---- ---- ---- ---- ---- --01 ---- Processing
+ ---- ---- ---- ---- ---- ---- --10 ---- Processing (separate stage?)
+ ---- ---- ---- ---- ---- ---- --11 ---- <reserved>
+ ---- ---- ---- ---- ---- ---- ---- --xx PS Pixel engine Status
+ ---- ---- ---- ---- ---- ---- ---- --00 Idle
+ ---- ---- ---- ---- ---- ---- ---- --01 Processing, assume pixels rather than commands
+ ---- ---- ---- ---- ---- ---- ---- --1x <reserved>
*/
u32 mb86292_device::gctr_r(offs_t offset)
{
u32 res;
res = (m_draw.state == DRAW_DATA) << 0;
-// res |= (m_geo.state == SETUP) << 4;
-// res |= (m_geo.state == DRAW_DATA) << 8;
+// res |= (m_geo.state == SETUP) << 4;
+// res |= (m_geo.state == DRAW_DATA) << 8;
res |= (m_draw.fifo.queue_length() == 0) << 12;
res |= (m_draw.fifo.queue_length() == 16) << 13;
// TODO: pingu just hangs
-// res |= (m_draw.fifo.queue_length() >= 8) << 14;
+// res |= (m_draw.fifo.queue_length() >= 8) << 14;
// fcnt << 15;
// fo << 24;
return res;
diff --git a/src/devices/video/pc_vga_matrox.cpp b/src/devices/video/pc_vga_matrox.cpp
index a5fe8bca111..8b20730e6e4 100644
--- a/src/devices/video/pc_vga_matrox.cpp
+++ b/src/devices/video/pc_vga_matrox.cpp
@@ -234,13 +234,13 @@ void matrox_vga_device::ramdac_ext_map(address_map &map)
u8 matrox_vga_device::ramdac_ext_indexed_r()
{
// Unclear from the docs, according to usage seems to be the write index with no autoincrement
-// logerror("RAMDAC ext read [%02x]\n", vga.dac.write_index);
+// logerror("RAMDAC ext read [%02x]\n", vga.dac.write_index);
return space(EXT_REG + 1).read_byte(vga.dac.write_index);
}
void matrox_vga_device::ramdac_ext_indexed_w(offs_t offset, u8 data)
{
-// logerror("RAMDAC ext [%02x] %02x\n", vga.dac.write_index, data);
+// logerror("RAMDAC ext [%02x] %02x\n", vga.dac.write_index, data);
space(EXT_REG + 1).write_byte(vga.dac.write_index, data);
}
diff --git a/src/mame/apple/apple3_m.cpp b/src/mame/apple/apple3_m.cpp
index c185668f1ab..026080f0137 100644
--- a/src/mame/apple/apple3_m.cpp
+++ b/src/mame/apple/apple3_m.cpp
@@ -1143,7 +1143,7 @@ INPUT_CHANGED_MEMBER(apple3_state::keyb_special_changed)
{
m_nmi_latch = true;
m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
- }
+ }
}
else
{
diff --git a/src/mame/apple/dafb.cpp b/src/mame/apple/dafb.cpp
index 9b6b864cca4..57fb2722ea0 100755
--- a/src/mame/apple/dafb.cpp
+++ b/src/mame/apple/dafb.cpp
@@ -1240,7 +1240,7 @@ void dafb_memcjr_device::clockgen_w(offs_t offset, u8 data)
}
}
-// This is an Anrelope which is a further revised AC842a
+// This is an Antelope which is a further revised AC842a
u32 dafb_memcjr_device::ramdac_r(offs_t offset)
{
switch (offset << 2)
@@ -1268,7 +1268,7 @@ void dafb_memcjr_device::ramdac_w(offs_t offset, u32 data)
if ((m_pal_address == 1) && ((m_ac842_pbctrl & 0x06) == 0x06))
{
LOGMASKED(LOG_RAMDAC, "%02x to Antelope PCBR1\n", data);
- m_pcbr1 = (data & 0xf0) | 0x02; // Antelope version ID
+ m_pcbr1 = (data & 0xf0) | 0x02; // Antelope version ID
}
else
{
diff --git a/src/mame/misc/magicard.cpp b/src/mame/misc/magicard.cpp
index c6c3f62affe..28996dfbdc1 100644
--- a/src/mame/misc/magicard.cpp
+++ b/src/mame/misc/magicard.cpp
@@ -2161,7 +2161,7 @@ ROM_END
2 bytes of difference.
Early board.
-
+
*/
ROM_START( lucky7x )
ROM_REGION( 0x80000, "maincpu", 0 ) // 68070 Code & GFX
@@ -2180,7 +2180,7 @@ ROM_END
Ver 11/90b
Early board.
-
+
*/
ROM_START( jjokeri )
ROM_REGION( 0x80000, "maincpu", 0 ) // 68070 Code & GFX
diff --git a/src/mame/pc/at.cpp b/src/mame/pc/at.cpp
index cdbcac6efd4..c1080b2a180 100644
--- a/src/mame/pc/at.cpp
+++ b/src/mame/pc/at.cpp
@@ -2751,7 +2751,7 @@ ROM_START( n8810m55 )
ROM_END
// Olivetti M250E aka DECStation 220 - PVGA1A on board with the ROM included in the main ROM - Board: BA241 - Chips: 16C451, 8742, WD37C65, GA99, GA80
-// CPU: 12MHz 80286 - FPU: 80287-2 socket provided - RAM: 1MB, 2MB, 4MB in SIMM modules - ROM: 64KB BIOS 1.07-1.09 - Mass storage: 2x 3.5" FDD HD,
+// CPU: 12MHz 80286 - FPU: 80287-2 socket provided - RAM: 1MB, 2MB, 4MB in SIMM modules - ROM: 64KB BIOS 1.07-1.09 - Mass storage: 2x 3.5" FDD HD,
// on board: AT/RLL controller - Shadow memory: E0000-FFFFF - Bus: 3xISA8/18 on riser board - Video: PVGA1A on board, 256KB RAM - Connectors: VGA, ser, par, PS/2 keyboard, PS/2 mouse
ROM_START( m250e )
ROM_REGION16_LE(0x20000, "bios", 0 )
diff --git a/src/mame/pc/pc.cpp b/src/mame/pc/pc.cpp
index f65e256ebaa..b9b0d7e6860 100644
--- a/src/mame/pc/pc.cpp
+++ b/src/mame/pc/pc.cpp
@@ -650,7 +650,7 @@ ROM_END
This is actually the PC compatibility board for the Soviet MC-0585 computer, a DEC Professional 350 clone.
An alternative ROM set shares the same corrupted pixels and some other changed locations in comparison with this dump.
-******************************************************************************/
+******************************************************************************/
ROM_START( mc1702 )
ROM_REGION16_LE(0x10000,"bios", 0)
diff --git a/src/mame/seta/seta.cpp b/src/mame/seta/seta.cpp
index 871d01b0dab..481ab7158b0 100644
--- a/src/mame/seta/seta.cpp
+++ b/src/mame/seta/seta.cpp
@@ -6431,9 +6431,9 @@ static INPUT_PORTS_START( zingzip )
PORT_CONFNAME( 0x0040, 0x0040, "Unknown (bit 6)" )
PORT_CONFSETTING( 0x0040, DEF_STR( Off ) )
PORT_CONFSETTING( 0x0000, DEF_STR( On ) )
- PORT_CONFNAME( 0x0080, 0x0080, "Title Language" ) // Not listed in manual
+ PORT_CONFNAME( 0x0080, 0x0080, "Title Language" ) // Not listed in manual
PORT_CONFSETTING( 0x0080, "English and Chinese" )
- PORT_CONFSETTING( 0x0000, "English only" ) // Without 真真急炮
+ PORT_CONFSETTING( 0x0000, "English only" ) // Without 真真急炮
PORT_START("DSW") //2 DSWs - $600001 & 3.b
PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
diff --git a/src/mame/seta/speedatk.cpp b/src/mame/seta/speedatk.cpp
index cadead605f3..2e8dde8b432 100644
--- a/src/mame/seta/speedatk.cpp
+++ b/src/mame/seta/speedatk.cpp
@@ -87,26 +87,26 @@ Exclusively licensed to ESCO
Model No.834-5206
-CA2_1.1c PRG 0x2000
-CA2_2.1d PRG 0x2000
-CA2_3.1e PRG 0x2000
-CA2_4.1h PRG 0x1000
-CA1_5.7c CHR 0x2000
-CA1_6.7d CHR 0x2000
-CA1_7.7e CHR 0x2000
-tbp24s10.6k COLOR 0x100
-tbp18s030.7l CLUT 0x20
-
-X'tal 12.000MHz
-CPU D780C(Z80 1.5MHz?)
-SOUND AY-3-8910(1.5MHz?)
-CRTC HD46505SP-1 1.5MHz
-WRAM M58725P(16Kbit SRAM)
-VRAM M5L2114LP-3(4Kbit SRAM) x4
-CUSTOM AC001(14pin DIP)
- AC002(40pin DIP)
- AC003(40pin DIP)
-DIPSW 8 Elements Switch Array x1
+CA2_1.1c PRG 0x2000
+CA2_2.1d PRG 0x2000
+CA2_3.1e PRG 0x2000
+CA2_4.1h PRG 0x1000
+CA1_5.7c CHR 0x2000
+CA1_6.7d CHR 0x2000
+CA1_7.7e CHR 0x2000
+tbp24s10.6k COLOR 0x100
+tbp18s030.7l CLUT 0x20
+
+X'tal 12.000MHz
+CPU D780C(Z80 1.5MHz?)
+SOUND AY-3-8910(1.5MHz?)
+CRTC HD46505SP-1 1.5MHz
+WRAM M58725P(16Kbit SRAM)
+VRAM M5L2114LP-3(4Kbit SRAM) x4
+CUSTOM AC001(14pin DIP)
+ AC002(40pin DIP)
+ AC003(40pin DIP)
+DIPSW 8 Elements Switch Array x1
**************************************************************************************************/
@@ -270,19 +270,19 @@ void speedatk_state::daifugo_mem(address_map &map)
}));
// Protection?
map(0x8464, 0x8464).lr8(NAME([] (offs_t offset) {
- return 0x00; // this value is never referenced in game
+ return 0x00; // this value is never referenced in game
}));
map(0x8465, 0x8465).lr8(NAME([] (offs_t offset) {
- return 0xb6; // strange behavior if value other than 0xb6 is set
+ return 0xb6; // strange behavior if value other than 0xb6 is set
}));
map(0x8469, 0x8469).lr8(NAME([] (offs_t offset) {
- return 0x84; // 1000_0100b(084h) game stops if other value is set
+ return 0x84; // 1000_0100b(084h) game stops if other value is set
}));
map(0x8471, 0x8471).lr8(NAME([] (offs_t offset) {
- return 0x00; // 0x00 game stops if other value is set
+ return 0x00; // 0x00 game stops if other value is set
}));
map(0x8630, 0x8630).lr8(NAME([] (offs_t offset) {
- return 0x4d; // 0x4D accept I/O and sound process
+ return 0x4d; // 0x4D accept I/O and sound process
}));
}
@@ -326,40 +326,40 @@ static INPUT_PORTS_START( daifugo )
PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1)
PORT_START("PLAYER1")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_HANAFUDA_A ) PORT_PLAYER(1) // 1
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_HANAFUDA_B ) PORT_PLAYER(1) // 2
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_HANAFUDA_C ) PORT_PLAYER(1) // 3
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_HANAFUDA_D ) PORT_PLAYER(1) // 4
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(1) // 5
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(1) // 6
- PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_HANAFUDA_E ) PORT_PLAYER(1) // 7
- PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_HANAFUDA_H ) PORT_PLAYER(1) // 8
- PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_HANAFUDA_F ) PORT_PLAYER(1) // 9
- PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_HANAFUDA_G ) PORT_PLAYER(1) // 10
- PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(1) // 11
- PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_START1 ) PORT_PLAYER(1) // 12
- PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_START2 ) PORT_PLAYER(1) // 13
- PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_HANAFUDA_YES ) PORT_PLAYER(1) // 14
- PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_HANAFUDA_NO ) PORT_NAME("P1 Hanafuda No/Pass") PORT_PLAYER(1) // 15
- PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(1) // 16
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_HANAFUDA_A ) PORT_PLAYER(1) // 1
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_HANAFUDA_B ) PORT_PLAYER(1) // 2
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_HANAFUDA_C ) PORT_PLAYER(1) // 3
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_HANAFUDA_D ) PORT_PLAYER(1) // 4
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(1) // 5
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(1) // 6
+ PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_HANAFUDA_E ) PORT_PLAYER(1) // 7
+ PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_HANAFUDA_H ) PORT_PLAYER(1) // 8
+ PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_HANAFUDA_F ) PORT_PLAYER(1) // 9
+ PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_HANAFUDA_G ) PORT_PLAYER(1) // 10
+ PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(1) // 11
+ PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_START1 ) PORT_PLAYER(1) // 12
+ PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_START2 ) PORT_PLAYER(1) // 13
+ PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_HANAFUDA_YES ) PORT_PLAYER(1) // 14
+ PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_HANAFUDA_NO ) PORT_NAME("P1 Hanafuda No/Pass") PORT_PLAYER(1) // 15
+ PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(1) // 16
PORT_START("PLAYER2")
- PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_HANAFUDA_A ) PORT_PLAYER(2) // 1
- PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_HANAFUDA_B ) PORT_PLAYER(2) // 2
- PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_HANAFUDA_C ) PORT_PLAYER(2) // 3
- PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_HANAFUDA_D ) PORT_PLAYER(2) // 4
- PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(2) // 5
- PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(2) // 6
- PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_HANAFUDA_E ) PORT_PLAYER(2) // 7
- PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_HANAFUDA_H ) PORT_PLAYER(2) // 8
- PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_HANAFUDA_F ) PORT_PLAYER(2) // 9
- PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_HANAFUDA_G ) PORT_PLAYER(2) // 10
- PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(2) // 11
- PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(2) // 12
- PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(2) // 13
- PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_HANAFUDA_YES ) PORT_PLAYER(2) // 14
- PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_HANAFUDA_NO ) PORT_NAME("P2 Hanafuda No/Pass") PORT_PLAYER(2) // 15
- PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(2) // 16
+ PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_HANAFUDA_A ) PORT_PLAYER(2) // 1
+ PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_HANAFUDA_B ) PORT_PLAYER(2) // 2
+ PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_HANAFUDA_C ) PORT_PLAYER(2) // 3
+ PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_HANAFUDA_D ) PORT_PLAYER(2) // 4
+ PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(2) // 5
+ PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(2) // 6
+ PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_HANAFUDA_E ) PORT_PLAYER(2) // 7
+ PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_HANAFUDA_H ) PORT_PLAYER(2) // 8
+ PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_HANAFUDA_F ) PORT_PLAYER(2) // 9
+ PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_HANAFUDA_G ) PORT_PLAYER(2) // 10
+ PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(2) // 11
+ PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(2) // 12
+ PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(2) // 13
+ PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_HANAFUDA_YES ) PORT_PLAYER(2) // 14
+ PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_HANAFUDA_NO ) PORT_NAME("P2 Hanafuda No/Pass") PORT_PLAYER(2) // 15
+ PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_PLAYER(2) // 16
INPUT_PORTS_END
static INPUT_PORTS_START( speedatk )
diff --git a/src/mame/sgi/indy_indigo2.cpp b/src/mame/sgi/indy_indigo2.cpp
index 6c56f4e0eef..1982685e983 100644
--- a/src/mame/sgi/indy_indigo2.cpp
+++ b/src/mame/sgi/indy_indigo2.cpp
@@ -55,23 +55,21 @@
#include "emu.h"
-#include "bus/gio64/gio64.h"
+#include "hpc3.h"
+#include "ioc2.h"
+#include "mc.h"
+#include "vino.h"
+#include "bus/gio64/gio64.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
#include "cpu/mips/mips3.h"
-
#include "machine/ds1386.h"
#include "machine/edlc.h"
#include "machine/eepromser.h"
-#include "hpc3.h"
-#include "ioc2.h"
#include "machine/nscsi_bus.h"
-#include "bus/nscsi/cd.h"
-#include "bus/nscsi/hd.h"
-#include "mc.h"
-#include "vino.h"
#include "machine/saa7191.h"
#include "machine/wd33c9x.h"
-
#include "sound/cdda.h"
#include "emupal.h"
diff --git a/src/mame/sgi/ip4.cpp b/src/mame/sgi/ip4.cpp
index 9625a2ee099..ede4f37f6a4 100644
--- a/src/mame/sgi/ip4.cpp
+++ b/src/mame/sgi/ip4.cpp
@@ -39,6 +39,8 @@
#include "emu.h"
+#include "kbd.h"
+
// cpu and memory
#include "cpu/mips/mips1.h"
@@ -57,7 +59,6 @@
#include "bus/rs232/rs232.h"
#include "bus/rs232/hlemouse.h"
-#include "kbd.h"
#include "speaker.h"
#define LOG_PARITY (1U << 1)
diff --git a/src/mame/sgi/ip6.cpp b/src/mame/sgi/ip6.cpp
index b8e658be30b..e8c578a23b0 100644
--- a/src/mame/sgi/ip6.cpp
+++ b/src/mame/sgi/ip6.cpp
@@ -51,6 +51,10 @@
#include "emu.h"
+#include "ctl1.h"
+#include "kbd.h"
+#include "sgi_gr1.h"
+
// cpu and memory
#include "cpu/mips/mips1.h"
#include "cpu/dsp56000/dsp56000.h"
@@ -71,17 +75,13 @@
#include "bus/rs232/rs232.h"
#include "bus/rs232/hlemouse.h"
-#include "ctl1.h"
-#include "kbd.h"
-#include "sgi_gr1.h"
+#include "softlist.h"
#include "4dpi.lh"
#define VERBOSE (LOG_GENERAL)
#include "logmacro.h"
-#include "softlist.h"
-
namespace {
class ip6_state : public driver_device
diff --git a/src/mame/skeleton/tvcobrasd.cpp b/src/mame/skeleton/tvcobrasd.cpp
index f2ac181011d..2cb0ead4a66 100644
--- a/src/mame/skeleton/tvcobrasd.cpp
+++ b/src/mame/skeleton/tvcobrasd.cpp
@@ -46,7 +46,7 @@ namespace {
class cobrasd_state : public driver_device
{
public:
- cobrasd_state(const machine_config &mconfig, device_type type, const char *tag) :
+ cobrasd_state(const machine_config &mconfig, device_type type, const char *tag) :
driver_device(mconfig, type, tag),
m_maincpu(*this, "maincpu")
{ }
diff --git a/src/mame/taito/taitosj.cpp b/src/mame/taito/taitosj.cpp
index 592eae2cf6e..583b5bfb502 100644
--- a/src/mame/taito/taitosj.cpp
+++ b/src/mame/taito/taitosj.cpp
@@ -1816,7 +1816,7 @@ void taitosj_state::nomcu(machine_config &config)
AY8910(config, m_ay[3], 12_MHz_XTAL / 8); // on GAME board, AY-3-8910 @ IC50
// TODO: Implement ay4 Port A bits 0 and 1 which connect to a 7416 open collector inverter, to selectively
// tie none, either or both of two capacitors between the ay4 audio output signal and ground,
- // or between audio output signal and high-z (i.e. do nothing). Bio Attack uses this?
+ // or between audio output signal and high-z (i.e. do nothing). Bio Attack uses this?
m_ay[3]->set_flags(AY8910_SINGLE_OUTPUT);
m_ay[3]->port_b_write_callback().set(FUNC(taitosj_state::sndnmi_msk_w));
m_ay[3]->add_route(ALL_OUTPUTS, "speaker", 1.0);
diff --git a/src/mame/vtech/socrates.cpp b/src/mame/vtech/socrates.cpp
index 261cac587b8..4f6e69213a3 100644
--- a/src/mame/vtech/socrates.cpp
+++ b/src/mame/vtech/socrates.cpp
@@ -743,7 +743,7 @@ rgb_t socrates_state::create_color(uint8_t color)
int const swappedcolor = ((color&0xf0)>>4)|((color&0x0f)<<4);
double finalY = (1/LUMAMAX) * lumatable[swappedcolor];
double const finalI = (M_I * (cos((phaseangle[chromaindex]/180)*M_PI)))* ((1/CHROMAMAX)*chromaintensity[swappedcolor]);
- double const finalQ = (M_Q * (sin((phaseangle[chromaindex]/180)*M_PI)))* ((1/CHROMAMAX)*chromaintensity[swappedcolor]);
+ double const finalQ = (M_Q * (sin((phaseangle[chromaindex]/180)*M_PI)))* ((1/CHROMAMAX)*chromaintensity[swappedcolor]);
if (finalY > 1) finalY = 1; // clamp luma
// calculate the R, G and B values here, neato matrix math
double finalR = (finalY*1)+(finalI*0.9563)+(finalQ*0.6210);