formats: Get rid of more inappropriate use of emu_fatalerror (and fix some spelling issues, etc. while I'm at it)

docs/source/conf.py

@@ -145,7 +145,7 @@ html_theme_path = ["../themes/"]
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-# This was depreciated in Sphinx 1.6.6
+# This was deprecated in Sphinx 1.6.6
 #html_use_smartypants = True
 
 # We don't want smartquotes in general.

hash/ibmpcjr_cart.xml

@@ -41,7 +41,7 @@ KinderComp (Spinnaker)
 Information about Lotus 1-2-3
 
 Lotus123 comes with 2 cartridges and 3 floppy disks. None of the disks are bootable, so a pcdos boot disk has been
-included. Since the computer only has one floppy, you need to use Mame's File Manager to switch disks as needed.
+included. Since the computer only has one floppy, you need to use MAME's File Manager to switch disks as needed.
 Please note that most actions take quite a while to happen.
 
 Start the emulation with >mame64 ibmpcjr lotus123

hash/samcoupe_flop.xml

@@ -13,7 +13,7 @@ license:CC0
   .sad seems to be a more advanced format that allows copy-protected images etc.
 
   currently only .mgt/.dsk is supported in coupedsk.cpp
-  should be trivial to add "extended DSK disk image" support as it's already in Mame.
+  should be trivial to add "extended DSK disk image" support as it's already in MAME.
 
   most game images have trainers/pokes.
   all Sam Coupe games will probably need re-dumping at some point as there seems to be very few clean images available.

hash/sol20_cass.xml

@@ -7,7 +7,7 @@ license:CC0
 <softwarelist name="sol20_cass" description="PTC SOL-20 cassettes">
 
 <!--
-These programs were .svt (Solace Virtual Tape) files, currently only partially supported in Mame emulator and therefore marked as unsupported.
+These programs were .svt (Solace Virtual Tape) files, currently only partially supported in MAME emulator and therefore marked as unsupported.
 Downloaded from http://www.sol20.org (Note: .svt files: pilot, space and strategy, for which exist recreated .wav version, were rejected.)
 -->
 
@@ -131,7 +131,7 @@ Owner's Manual at http://primepuzzle.com/tc/tiny_c_docs_8080_PDP11.zip
 
 
 <!--
-These programs were downloaded as ASCII text format files (.bs5, .ecb, .ent) and using Mame emu text paste option recreated into .wav tape files.
+These programs were downloaded as ASCII text format files (.bs5, .ecb, .ent) and using MAME emu text paste option recreated into .wav tape files.
 NOTE: ALL RECREATED FILES HAVE BEEN TESTED TO WORK FINE WITH MAME EMULATOR ... THE COMPATIBILITY WITH A REAL SOL-20 SYSTEM IS UNKNOWN/UNTESTED!
 http://www.sol20.org/programs.html (Note: On the same link exist manuals for most programs, and some are necessary in order to know how to use.)
 -->
@@ -504,7 +504,7 @@ User Manual at http://www.sol20.org/manuals/img/pilot-img.pdf
 Space Games from Creative Computing Software
 
     ASTER   3000 0901           ;asteroids; not to be confused with arcade game
-    LUNAR C 3C20 1FFC   (Ext BASIC) ;lunar lander (Note: a problem with keyboard not responding in Mame emu!)
+    LUNAR C 3C20 1FFC   (Ext BASIC) ;lunar lander (Note: a problem with keyboard not responding in MAME emu!)
     STRWR C 3C20 144D   (Ext BASIC) ;star wars
     ROMLN C 3C20 13F4   (Ext BASIC) ;romulan
 
@@ -629,7 +629,7 @@ Various games written by Ray White
 
 In SOLOS monitor "XEQ name" to load/autorun or "GET name" and then "EXEC 0".
 
-Note: If in some games the screen starts blinking, then in Mame select in "Dip Switches" Cursor Type "Solid".
+Note: If in some games the screen starts blinking, then in MAME select in "Dip Switches" Cursor Type "Solid".
 -->
 	<software name="various1">
 		<description>Various games written by Ray White</description>
@@ -698,7 +698,7 @@ Standalone software of various origins
 
 In SOLOS monitor "XEQ name" to load/autorun or "GET name" and then "EXEC 0".
 
-Note: If in some games the screen starts blinking, then in Mame select in "Dip Switches" Cursor Type "Solid".
+Note: If in some games the screen starts blinking, then in MAME select in "Dip Switches" Cursor Type "Solid".
 
 Note for #5: Moves are entered using decimal coordinates, using this grid:
 

src/lib/formats/d64_dsk.cpp

@@ -12,8 +12,6 @@
 
 #include "formats/d64_dsk.h"
 
-#include "emucore.h" // emu_fatalerror
-
 
 d64_format::d64_format()
 {
@@ -246,8 +244,10 @@ bool d64_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
 			floppy_image_format_t::desc_e *desc = this->get_sector_desc(f, current_size, sector_count, id1, id2, gap2);
 
 			int remaining_size = total_size - current_size;
-			if(remaining_size < 0)
+			if(remaining_size < 0) {
-				throw emu_fatalerror("d64_format: Incorrect track layout, max_size=%d, current_size=%d", total_size, current_size);
+				osd_printf_error("d64_format: Incorrect track layout, max_size=%d, current_size=%d\n", total_size, current_size);
+				return false;
+			}
 
 			this->fix_end_gap(desc, remaining_size);
 

src/lib/formats/g64_dsk.cpp

@@ -12,8 +12,6 @@
 
 #include "formats/g64_dsk.h"
 
-#include "emucore.h" // emu_fatalerror
-
 
 #define G64_FORMAT_HEADER   "GCR-1541"
 
@@ -34,9 +32,9 @@ int g64_format::identify(io_generic *io, uint32_t form_factor)
 	char h[8];
 
 	io_generic_read(io, h, 0, 8);
-	if (!memcmp(h, G64_FORMAT_HEADER, 8)) {
+	if (!memcmp(h, G64_FORMAT_HEADER, 8))
 		return 100;
-	}
+
 	return 0;
 }
 
@@ -46,8 +44,10 @@ bool g64_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
 	std::vector<uint8_t> img(size);
 	io_generic_read(io, &img[0], 0, size);
 
-	if (img[POS_VERSION]) {
+	if (img[POS_VERSION])
-		throw emu_fatalerror("g64_format: Unsupported version %u", img[POS_VERSION]);
+	{
+		osd_printf_error("g64_format: Unsupported version %u\n", img[POS_VERSION]);
+		return false;
 	}
 
 	int track_count = img[POS_TRACK_COUNT];
@@ -68,12 +68,18 @@ bool g64_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
 			continue;
 
 		if (dpos > size)
-			throw emu_fatalerror("g64_format: Track %u offset %06x out of bounds", track, dpos);
+		{
+			osd_printf_error("g64_format: Track %u offset %06x out of bounds\n", track, dpos);
+			return false;
+		}
 
 		uint32_t speed_zone = pick_integer_le(&img[0], spos, 4);
 
 		if (speed_zone > 3)
-			throw emu_fatalerror("g64_format: Unsupported variable speed zones on track %d", track);
+		{
+			osd_printf_error("g64_format: Unsupported variable speed zones on track %d\n", track);
+			return false;
+		}
 
 		uint16_t track_bytes = pick_integer_le(&img[0], dpos, 2);
 		int track_size = track_bytes * 8;
@@ -137,8 +143,10 @@ bool g64_format::save(io_generic *io, floppy_image *image)
 			if ((speed_zone = generate_bitstream(track, head, 3, &trackbuf[0], track_size, image)) == -1)
 				if ((speed_zone = generate_bitstream(track, head, 2, &trackbuf[0], track_size, image)) == -1)
 					if ((speed_zone = generate_bitstream(track, head, 1, &trackbuf[0], track_size, image)) == -1)
-						if ((speed_zone = generate_bitstream(track, head, 0, &trackbuf[0], track_size, image)) == -1)
+						if ((speed_zone = generate_bitstream(track, head, 0, &trackbuf[0], track_size, image)) == -1) {
-							throw emu_fatalerror("g64_format: Cannot determine speed zone for track %u", track);
+							osd_printf_error("g64_format: Cannot determine speed zone for track %u\n", track);
+							return false;
+						}
 
 			LOG_FORMATS("head %u track %u size %u cell %u\n", head, track, track_size, c1541_cell_size[speed_zone]);
 

src/lib/formats/ibmxdf_dsk.cpp

@@ -32,8 +32,6 @@
 
 #include "ibmxdf_dsk.h"
 
-#include "emucore.h" // emu_fatalerror
-
 
 ibmxdf_format::ibmxdf_format() : wd177x_format(formats)
 {
@@ -196,8 +194,10 @@ bool ibmxdf_format::load(io_generic *io, uint32_t form_factor, floppy_image *ima
 
 			int total_size = 200000000/tf.cell_size;
 			int remaining_size = total_size - current_size;
-			if(remaining_size < 0)
+			if(remaining_size < 0) {
-				throw emu_fatalerror("ibmxdf_format: Incorrect track layout, max_size=%d, current_size=%d", total_size, current_size);
+				osd_printf_error("ibmxdf_format: Incorrect track layout, max_size=%d, current_size=%d\n", total_size, current_size);
+				return false;
+			}
 
 			// Fixup the end gap
 			desc[end_gap_index].p2 = remaining_size / 16;

src/lib/formats/upd765_dsk.cpp

@@ -10,8 +10,6 @@
 
 #include "formats/upd765_dsk.h"
 
-#include "emucore.h" // emu_fatalerror
-
 
 upd765_format::upd765_format(const format *_formats) : file_header_skip_bytes(0), file_footer_skip_bytes(0), formats(_formats)
 {
@@ -192,8 +190,7 @@ bool upd765_format::load(io_generic *io, uint32_t form_factor, floppy_image *ima
 	int current_size;
 	int end_gap_index;
 
-	switch (f.encoding)
+	switch(f.encoding) {
-	{
 	case floppy_image::FM:
 		desc = get_desc_fm(f, current_size, end_gap_index);
 		break;
@@ -205,8 +202,10 @@ bool upd765_format::load(io_generic *io, uint32_t form_factor, floppy_image *ima
 
 	int total_size = 200000000/f.cell_size;
 	int remaining_size = total_size - current_size;
-	if(remaining_size < 0)
+	if(remaining_size < 0) {
-		throw emu_fatalerror("upd765_format: Incorrect track layout, max_size=%d, current_size=%d", total_size, current_size);
+		osd_printf_error("upd765_format: Incorrect track layout, max_size=%d, current_size=%d\n", total_size, current_size);
+		return false;
+	}
 
 	// Fixup the end gap
 	desc[end_gap_index].p2 = remaining_size / 16;

src/lib/formats/victor9k_dsk.cpp

@@ -99,8 +99,6 @@
 
 #include "formats/victor9k_dsk.h"
 
-#include "emucore.h" // emu_fatalerror
-
 
 victor9k_format::victor9k_format()
 {
@@ -278,8 +276,10 @@ bool victor9k_format::load(io_generic *io, uint32_t form_factor, floppy_image *i
 			floppy_image_format_t::desc_e *desc = get_sector_desc(f, current_size, sector_count);
 
 			int remaining_size = total_size - current_size;
-			if(remaining_size < 0)
+			if(remaining_size < 0) {
-				throw emu_fatalerror("victor9k_format: Incorrect track layout, max_size=%d, current_size=%d", total_size, current_size);
+				osd_printf_error("victor9k_format: Incorrect track layout, max_size=%d, current_size=%d\n", total_size, current_size);
+				return false;
+			}
 
 			// Fixup the end gap
 			desc[18].p2 = remaining_size / 8;

src/lib/formats/wd177x_dsk.cpp

@@ -10,8 +10,6 @@
 
 #include "formats/wd177x_dsk.h"
 
-#include "emucore.h" // emu_fatalerror
-
 
 wd177x_format::wd177x_format(const format *_formats)
 {
@@ -228,8 +226,10 @@ bool wd177x_format::load(io_generic *io, uint32_t form_factor, floppy_image *ima
 
 			int total_size = 200000000/tf.cell_size;
 			int remaining_size = total_size - current_size;
-			if(remaining_size < 0)
+			if(remaining_size < 0) {
-				throw emu_fatalerror("wd177x_format: Incorrect track layout, max_size=%d, current_size=%d", total_size, current_size);
+				osd_printf_error("wd177x_format: Incorrect track layout, max_size=%d, current_size=%d\n", total_size, current_size);
+				return false;
+			}
 
 			// Fixup the end gap
 			desc[end_gap_index].p2 = remaining_size / 16;

src/mame/audio/ad_sound.h

@@ -5,8 +5,8 @@
 //    Functions to emulate the Alpha Denshi "59MC07" audio board
 //****************************************************************************
 
-#ifndef MAME_AUDIO_AD_SOUND_BOARDS_H
+#ifndef MAME_AUDIO_AD_SOUND_H
-#define MAME_AUDIO_AD_SOUND_BOARDS_H
+#define MAME_AUDIO_AD_SOUND_H
 
 #pragma once
 
@@ -128,4 +128,4 @@ private:
 	INTERRUPT_GEN_MEMBER(sound_irq) { m_audiocpu->set_input_line(0, HOLD_LINE); }
 };
 
-#endif // MAME_AUDIO_AD_SOUND_BOARDS_H
+#endif // MAME_AUDIO_AD_SOUND_H

src/mame/drivers/dbox.cpp

@@ -34,9 +34,9 @@
  *
  * History of Nokia Multimedia Division
  *-------------------------------------
- * Luxor AB was a swedish home electronics and computer manufacturer located in Motala from 1923 and acquired
+ * Luxor AB was a Swedish home electronics and computer manufacturer located in Motala from 1923 and acquired
  * by Nokia 1985. Luxor designed among other things TV sets, Radios and the famous ABC-80. The Nokia Multimedia
- * Division was formed in Linköping as a result of the Luxor aquisition. Their main design was a satellite
+ * Division was formed in Linköping as a result of the Luxor acquisition. Their main design was a satellite
  * receiver, the first satellite in Europe was launched in 1988 and the market was growing fast however it took
  * a long time, almost 10 years before the breakthrough came for Nokia, a deal with the Kirsch Gruppe was struck and
  * in 1996 the 68340 based Dbox-1 was released in Germany. The original design was expensive, so soon a cost reduced
@@ -45,7 +45,7 @@
  *
  * The heavily subsidised Dbox was very popular in Holland since Kirsch Gruppe didn't lock usage to themselves. This was
  * corrected in a forced firmware upgrade leaving the "customers" in Holland without a working box. Pretty soon a
- * shareware software developed by Uli Hermann appeared called DVB98 and later DVB2000 reenabling the boxes in  Holland
+ * shareware software developed by Uli Hermann appeared called DVB98 and later DVB2000 re-enabling the boxes in  Holland
  * and blocking upgrades. Uli's software was by many considered better than the original software.
  *
  * Misc links about Nokia Multimedia Division and this board:
@@ -237,7 +237,7 @@
  *                            - ignore FREEZE
  *                            - The crystal clock is the clear-to-send input capture clock for both channels
  *  SIM40 + 0x0701: 0x8A     Serial Module - MCR Low Byte
- *                            - The serial control registers are only accessable from supervisor mode
+ *                            - The serial control registers are only accessible from supervisor mode
  *                            - IARB = 0x0A - serial module has priority level 10d
  *  SIM40 + 0x0704: 0x01     Serial Module - ILR Interrupt Level
  *  SIM40 + 0x0705: 0x44     Serial Module - IVR Interrupt Vector
@@ -255,7 +255,7 @@
  *                                           - No Parity
  *                                           - Eight bits
  *  SIM40 + 0x0720: 0x07     Serial Module - MR2A Mode Register 2A
- *                                           - No CTS or RTS controll
+ *                                           - No CTS or RTS control
  *                                           - 1 STOP bit
  *  SIM40 + 0x0711: 0xCC     Serial Module - CSRA Clock Select Register A
  *                                           - 19200 baud TXc
@@ -510,7 +510,7 @@ void dbox_state::write_pa(uint8_t data) {
 
 #if LOCALFLASH
 /* Local emulation of the 29F800B 8Mbit flashes if the intelflsh bugs, relies on a complete command cycle is done per device, not in parallel */
-/* TODO: Make a flash device of this and support programming per sector and persistance, as settings etc may be stored in a 8Kb sector  */
+/* TODO: Make a flash device of this and support programming per sector and persistence, as settings etc may be stored in a 8Kb sector  */
 void dbox_state::sysflash_w(offs_t offset, uint16_t data, uint16_t mem_mask) {
 	LOGFLASH("%s pc:%08x offset:%08x data:%08x mask:%08x\n", FUNCNAME, m_maincpu->pc(), offset, data, mem_mask);
 

src/mame/drivers/firebeat.cpp

@@ -1744,4 +1744,3 @@ GAME(  2000, bm3core,  0,   firebeat_spu, popn, firebeat_state, init_ppp, ROT0,
 GAME(  2001, bm36th,   0,   firebeat_spu, popn, firebeat_state, init_ppp, ROT0,   "Konami",  "Beatmania III Append 6th Mix", MACHINE_NOT_WORKING)
 GAME(  2002, bm37th,   0,   firebeat_spu, popn, firebeat_state, init_ppp, ROT0,   "Konami",  "Beatmania III Append 7th Mix", MACHINE_NOT_WORKING)
 GAME(  2003, bm3final, 0,   firebeat_spu, popn, firebeat_state, init_ppp, ROT0,   "Konami",  "Beatmania III The Final", MACHINE_NOT_WORKING)
-

src/mame/drivers/goori.cpp

@@ -54,12 +54,14 @@ ROMS:
 
 #include "cpu/m68000/m68000.h"
 #include "machine/eepromser.h"
-#include "emupal.h"
-#include "screen.h"
-#include "tilemap.h"
 #include "sound/okim6295.h"
 #include "sound/ym2151.h"
+
+#include "emupal.h"
+#include "screen.h"
 #include "speaker.h"
+#include "tilemap.h"
+
 
 class goori_state : public driver_device
 {
@@ -177,9 +179,9 @@ void goori_state::goori_30000e_w(offs_t offset, uint16_t data, uint16_t mem_mask
 
 	if (mem_mask & 0x00ff)
 	{
-		m_eeprom->di_write((data & 0x0004) >> 2);
+		m_eeprom->di_write(BIT(data, 2));
-		m_eeprom->cs_write((data & 0x0001) ? ASSERT_LINE : CLEAR_LINE);
+		m_eeprom->cs_write(BIT(data, 0));
-		m_eeprom->clk_write((data & 0x0002) ? ASSERT_LINE : CLEAR_LINE);
+		m_eeprom->clk_write(BIT(data, 1));
 	}
 }