summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2019-12-23 16:52:23 +1100
committer Vas Crabb <vas@vastheman.com>2019-12-23 16:52:23 +1100
commit4a805717e7ef13fc31f15ecf1e35c12090bd0b11 (patch)
treec6e0e291571e0cbc4b08d9917748435380231574
parent5f6e7a3c6825fef8193b40571ddd48e710286fe0 (diff)
parent0644f3cf57ccf467ca8acbda32a433d8c0acdfbd (diff)
Merge branch 'release0217' into mainline-master
-rw-r--r--hash/c64_flop_misc.xml8
-rw-r--r--hash/pce.xml42
-rw-r--r--hash/samcoupe_cass.xml2
-rw-r--r--src/devices/cpu/i386/x87ops.hxx2
-rw-r--r--src/mame/drivers/at.cpp2
-rw-r--r--src/mame/drivers/bnstars.cpp2
6 files changed, 29 insertions, 29 deletions
diff --git a/hash/c64_flop_misc.xml b/hash/c64_flop_misc.xml
index e116cb2bf2d..b911be92675 100644
--- a/hash/c64_flop_misc.xml
+++ b/hash/c64_flop_misc.xml
@@ -343,7 +343,7 @@
</software>
<software name="1541demob" cloneof="1541demo">
- <description>Commodore 1541 Floppy Disk Drive Test/Demo Disk (Alt)</description>
+ <description>Commodore 1541 Floppy Disk Drive Test/Demo Disk (alt)</description>
<year>1984</year>
<publisher>Commodore</publisher>
@@ -355,7 +355,7 @@
</software>
<software name="1541democ" cloneof="1541demo">
- <description>Commodore 1541 Floppy Disk Drive Test/Demo Disk (Alt 2)</description>
+ <description>Commodore 1541 Floppy Disk Drive Test/Demo Disk (alt 2)</description>
<year>1985</year>
<publisher>Commodore</publisher>
@@ -652,7 +652,7 @@
</software>
<software name="cpma" cloneof="cpm">
- <description>Commodore 64 CP/M Cartridge Boot Disk (Alt)</description>
+ <description>Commodore 64 CP/M Cartridge Boot Disk (alt)</description>
<year>1982</year>
<publisher>Commodore</publisher>
<sharedfeat name="requirement" value="c64_cart:cpm"/>
@@ -665,7 +665,7 @@
</software>
<software name="cpmb" cloneof="cpm">
- <description>Commodore 64 CP/M Cartridge Boot Disk (Alt 2)</description>
+ <description>Commodore 64 CP/M Cartridge Boot Disk (alt 2)</description>
<year>1982</year>
<publisher>Commodore</publisher>
<info name="serial" value="D CP2 622-04414" />
diff --git a/hash/pce.xml b/hash/pce.xml
index 5006472e479..d00aee8dd3a 100644
--- a/hash/pce.xml
+++ b/hash/pce.xml
@@ -279,7 +279,7 @@
</software>
<software name="benkei1" cloneof="benkei">
- <description>Benkei Gaiden (Alt)</description>
+ <description>Benkei Gaiden (alt)</description>
<year>1989</year>
<publisher>Sunsoft</publisher>
<info name="serial" value="SS89002"/>
@@ -307,7 +307,7 @@
</software>
<software name="bikkuri1" cloneof="bikkuri">
- <description>Bikkuriman World (Alt)</description>
+ <description>Bikkuriman World (alt)</description>
<year>1987</year>
<publisher>Hudson</publisher>
<info name="serial" value="HC62002"/>
@@ -550,7 +550,7 @@
</software>
<software name="chikuden1" cloneof="chikuden">
- <description>Chikudenya Toubei - Kubikiri Yakata Yori (Alt)</description>
+ <description>Chikudenya Toubei - Kubikiri Yakata Yori (alt)</description>
<year>1990</year>
<publisher>Naxat</publisher>
<info name="serial" value="NX89004"/>
@@ -634,7 +634,7 @@
</software>
<software name="coryoon1" cloneof="coryoon">
- <description>Coryoon - Child of Dragon (Alt)</description>
+ <description>Coryoon - Child of Dragon (alt)</description>
<year>1991</year>
<publisher>Naxat</publisher>
<info name="serial" value="NX91004"/>
@@ -910,7 +910,7 @@
</software>
<software name="download1" cloneof="download">
- <description>Download (Alt)</description>
+ <description>Download (alt)</description>
<year>1990</year>
<publisher>NEC Avenue</publisher>
<info name="serial" value="NAPH-1007"/>
@@ -952,7 +952,7 @@
</software>
<software name="dsaber1" cloneof="dsaber">
- <description>Dragon Saber - After Story of Dragon Spirit (Alt)</description>
+ <description>Dragon Saber - After Story of Dragon Spirit (alt)</description>
<year>1991</year>
<publisher>Namcot</publisher>
<info name="serial" value="NC91005"/>
@@ -994,7 +994,7 @@
</software>
<software name="droprock1" cloneof="droprock">
- <description>Drop Rock Hora Hora (Alt)</description>
+ <description>Drop Rock Hora Hora (alt)</description>
<year>1990</year>
<publisher>Data East</publisher>
<info name="serial" value="DE90005"/>
@@ -1106,7 +1106,7 @@
</software>
<software name="f1circus1" cloneof="f1circus">
- <description>F1 Circus (Alt)</description>
+ <description>F1 Circus (alt)</description>
<year>1990</year>
<publisher>Nihon Bussan</publisher>
<info name="serial" value="NB90002"/>
@@ -1699,7 +1699,7 @@
</software>
<software name="jinmu1" cloneof="jinmu">
- <description>Jinmu Denshou (Alt)</description>
+ <description>Jinmu Denshou (alt)</description>
<year>1989</year>
<publisher>Big Club</publisher>
<info name="serial" value="BG01003"/>
@@ -1727,7 +1727,7 @@
</software>
<software name="juuouki1" cloneof="juuouki">
- <description>Juuouki (Alt)</description>
+ <description>Juuouki (alt)</description>
<year>1989</year>
<publisher>NEC</publisher>
<info name="serial" value="H68G-1006"/>
@@ -1956,7 +1956,7 @@
</software>
<software name="ladyswrd1" cloneof="ladyswrd">
- <description>Lady Sword (Alt)</description>
+ <description>Lady Sword (alt)</description>
<year>19??</year>
<publisher>Game Express</publisher>
<part name="cart" interface="pce_cart">
@@ -2051,7 +2051,7 @@
</software>
<software name="mjgakmld1" cloneof="mjgakmld">
- <description>Mahjong Gakuen Mild - Touma Soushirou Toujou (Alt)</description>
+ <description>Mahjong Gakuen Mild - Touma Soushirou Toujou (alt)</description>
<year>1990</year>
<publisher>Face</publisher>
<info name="serial" value="FA02-004"/>
@@ -2345,7 +2345,7 @@
</software>
<software name="motorod2a" cloneof="motorod2">
- <description>Moto Roader II (Alt)</description>
+ <description>Moto Roader II (alt)</description>
<year>1991</year>
<publisher>Masiya</publisher>
<info name="serial" value="NCS91002"/>
@@ -2373,7 +2373,7 @@
</software>
<software name="mrheli1" cloneof="mrheli">
- <description>Mr. Heli no Daibouken (Alt)</description>
+ <description>Mr. Heli no Daibouken (alt)</description>
<year>1989</year>
<publisher>Irem</publisher>
<info name="serial" value="IC01002"/>
@@ -2803,7 +2803,7 @@
</software>
<software name="pcdenja" cloneof="pcdenj">
- <description>PC Denjin - Punkic Cyborgs (Alt)</description>
+ <description>PC Denjin - Punkic Cyborgs (alt)</description>
<year>1992</year>
<publisher>Hudson</publisher>
<info name="serial" value="HC92053"/>
@@ -2831,7 +2831,7 @@
</software>
<software name="pcgenja" cloneof="pcgenj">
- <description>PC Genjin - Pithecanthropus Computerurus (Alt)</description>
+ <description>PC Genjin - Pithecanthropus Computerurus (alt)</description>
<year>1989</year>
<publisher>Hudson</publisher>
<info name="serial" value="HC89024"/>
@@ -2911,7 +2911,7 @@
</software>
<software name="populous1" cloneof="populous">
- <description>Populous (Alt)</description>
+ <description>Populous (alt)</description>
<year>1991</year>
<publisher>Hudson</publisher>
<info name="serial" value="HC91041"/>
@@ -2940,7 +2940,7 @@
</software>
<software name="pdrift1" cloneof="pdrift">
- <description>Power Drift (Alt)</description>
+ <description>Power Drift (alt)</description>
<year>1990</year>
<publisher>Asmik</publisher>
<info name="serial" value="AS02002"/>
@@ -3243,7 +3243,7 @@
<!-- later revision, password parser bugfix for passwords with 8 lives -->
<software name="rtypep21" cloneof="rtypep2">
- <description>R-Type Part-2 (Alt)</description>
+ <description>R-Type Part-2 (alt)</description>
<year>1988</year>
<publisher>Hudson</publisher>
<info name="serial" value="HC63009"/>
@@ -3839,7 +3839,7 @@
</software>
<software name="shingen1" cloneof="shingen">
- <description>Takeda Shingen (Alt)</description>
+ <description>Takeda Shingen (alt)</description>
<year>1989</year>
<publisher>Aicom</publisher>
<info name="serial" value="AC89002"/>
@@ -3867,7 +3867,7 @@
</software>
<software name="tatsujinp" cloneof="tatsujin">
- <description>Tatsujin (Prototype)</description>
+ <description>Tatsujin (prototype)</description>
<year>1992</year>
<publisher>Taito</publisher>
<part name="cart" interface="pce_cart">
diff --git a/hash/samcoupe_cass.xml b/hash/samcoupe_cass.xml
index 25e50a17d91..051a3a851c3 100644
--- a/hash/samcoupe_cass.xml
+++ b/hash/samcoupe_cass.xml
@@ -25,7 +25,7 @@
</software>
<!-- extracted from covertape of Crash magazine issue 92 (the full game was never released) -->
<software name="f16demo">
- <description>F-16 Combat Pilot (Demo)</description>
+ <description>F-16 Combat Pilot (demo)</description>
<year>1991</year>
<publisher>Digital Integration</publisher>
<part name="cass" interface="samcoupe_cass">
diff --git a/src/devices/cpu/i386/x87ops.hxx b/src/devices/cpu/i386/x87ops.hxx
index 3dbfd7c818e..cce3bc712a2 100644
--- a/src/devices/cpu/i386/x87ops.hxx
+++ b/src/devices/cpu/i386/x87ops.hxx
@@ -5264,7 +5264,7 @@ void i386_device::build_x87_opcode_table_db()
case 0xc8: case 0xc9: case 0xca: case 0xcb: case 0xcc: case 0xcd: case 0xce: case 0xcf: ptr = &i386_device::x87_fcmovne_sti; break;
case 0xd0: case 0xd1: case 0xd2: case 0xd3: case 0xd4: case 0xd5: case 0xd6: case 0xd7: ptr = &i386_device::x87_fcmovnbe_sti; break;
case 0xd8: case 0xd9: case 0xda: case 0xdb: case 0xdc: case 0xdd: case 0xde: case 0xdf: ptr = &i386_device::x87_fcmovnu_sti; break;
- case 0xe0: ptr = &i386_device::x87_fnop; break; /* FENI */
+ case 0xe0: ptr = &i386_device::x87_fnop; break; /* FENI */
case 0xe1: ptr = &i386_device::x87_fnop; break; /* FDISI */
case 0xe2: ptr = &i386_device::x87_fclex; break;
case 0xe3: ptr = &i386_device::x87_finit; break;
diff --git a/src/mame/drivers/at.cpp b/src/mame/drivers/at.cpp
index 0b29c6cd8cd..7a8e37e38b2 100644
--- a/src/mame/drivers/at.cpp
+++ b/src/mame/drivers/at.cpp
@@ -2374,7 +2374,7 @@ ROM_START( at386 )
// BIOS-String: MR BIOS (r) V1.41 / 386DX CPU - the notes also say it comes from a DX motherboard, so sorted here
ROM_SYSTEM_BIOS( 15, "acer310", "Acer 310" )
ROMX_LOAD( "3alr001.bin", 0x10000, 0x10000, CRC(b45e5c73) SHA1(81ef79faed3914ccff23b3da5e831d7a99626538), ROM_BIOS(15))
-// 16: BIOS-String: 30-0200-ZZ1453-00101111-050591-SCAT3.04-0
+ // 16: BIOS-String: 30-0200-ZZ1453-00101111-050591-SCAT3.04-0
ROM_SYSTEM_BIOS( 16, "kmxc02", "KMX-C-02" )
ROMX_LOAD( "3ctm005.bin", 0x10000, 0x10000, CRC(cfba6b2a) SHA1(001642016a3c02b031d739bd8b0fcff9470e86d2), ROM_BIOS(16))
// 17: BIOS: AMI; 11/11/92 - ISA16: 5 - CPU/FPU: Am386DX-40, IIT 3C87-40 - Chipset: FOREX FRX46C521, KS83C206Q
diff --git a/src/mame/drivers/bnstars.cpp b/src/mame/drivers/bnstars.cpp
index ddc8e4709fc..99a690d1256 100644
--- a/src/mame/drivers/bnstars.cpp
+++ b/src/mame/drivers/bnstars.cpp
@@ -797,7 +797,7 @@ void bnstars_state::bnstars(machine_config &config)
TIMER(config, "scantimer").configure_scanline(FUNC(bnstars_state::ms32_interrupt), "lscreen", 0, 1);
- Z80(config, m_audiocpu, XTAL(8'000'000)); // 8MHz presented on sound PCB, Verified
+ Z80(config, m_audiocpu, XTAL(8'000'000)); // 8MHz present on sound PCB, Verified
m_audiocpu->set_addrmap(AS_PROGRAM, &bnstars_state::bnstars_sound_map);
config.set_maximum_quantum(attotime::from_hz(60000));