diff options
| author | 2011-03-25 16:14:09 +0000 | |
|---|---|---|
| committer | 2011-03-25 16:14:09 +0000 | |
| commit | fb5091182ec04236744f282bdf37c3ccdda8c04d (patch) | |
| tree | 9f8e28726ba8527f0829ea01db9b140ca3bbb7d8 /src/emu | |
| parent | e9fc65db486e87fcd44bbb298cf957843a027359 (diff) | |
Cleanups and version bump.mame0141u4
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/clifront.c | 14 | ||||
| -rw-r--r-- | src/emu/cpu/m6809/6809tbl.c | 4 | ||||
| -rw-r--r-- | src/emu/devcb.c | 2 | ||||
| -rw-r--r-- | src/emu/emuopts.c | 12 | ||||
| -rw-r--r-- | src/emu/emuopts.h | 8 | ||||
| -rw-r--r-- | src/emu/fileio.c | 2 | ||||
| -rw-r--r-- | src/emu/image.c | 2 | ||||
| -rw-r--r-- | src/emu/inptport.c | 24 | ||||
| -rw-r--r-- | src/emu/mame.c | 2 |
9 files changed, 35 insertions, 35 deletions
diff --git a/src/emu/clifront.c b/src/emu/clifront.c index 7ecd5032e47..305244330d2 100644 --- a/src/emu/clifront.c +++ b/src/emu/clifront.c @@ -184,7 +184,7 @@ int cli_execute(cli_options &options, osd_interface &osd, int argc, char **argv) throw emu_fatalerror(MAMERR_INVALID_CONFIG, "%s", option_errors.trimspace().cstr()); if (option_errors) printf("Error in command line:\n%s\n", option_errors.trimspace().cstr()); - + // determine the base name of the EXE astring exename; core_filename_extract_base(&exename, argv[0], TRUE); @@ -192,7 +192,7 @@ int cli_execute(cli_options &options, osd_interface &osd, int argc, char **argv) // if we have a command, execute that if (strlen(options.command()) != 0) execute_commands(options, exename); - + // otherwise, check for a valid system else { @@ -200,19 +200,19 @@ int cli_execute(cli_options &options, osd_interface &osd, int argc, char **argv) const game_driver *system = options.system(); if (system == NULL && strlen(options.system_name()) > 0) throw emu_fatalerror(MAMERR_NO_SUCH_GAME, "Unknown system '%s'", options.system_name()); - + // otherwise just run the game result = mame_execute(options, osd); } } - + // handle exceptions of various types catch (emu_fatalerror &fatal) { astring string(fatal.string()); fprintf(stderr, "%s\n", string.trimspace().cstr()); result = (fatal.exitcode() != 0) ? fatal.exitcode() : MAMERR_FATALERROR; - + // if a game was specified, wasn't a wildcard, and our error indicates this was the // reason for failure, offer some suggestions if (result == MAMERR_NO_SUCH_GAME && strlen(options.system_name()) > 0 && strchr(options.system_name(), '*') == NULL && options.system() == NULL) @@ -228,7 +228,7 @@ int cli_execute(cli_options &options, osd_interface &osd, int argc, char **argv) fprintf(stderr, "Out of memory!\n"); result = MAMERR_FATALERROR; } - + // handle any other exceptions catch (...) { @@ -378,7 +378,7 @@ void cli_info_listxml(emu_options &options, const char *gamename) /*------------------------------------------------- - cli_info_listfull - output the name and + cli_info_listfull - output the name and description of one or more games -------------------------------------------------*/ diff --git a/src/emu/cpu/m6809/6809tbl.c b/src/emu/cpu/m6809/6809tbl.c index 549f493f24d..372642eb04d 100644 --- a/src/emu/cpu/m6809/6809tbl.c +++ b/src/emu/cpu/m6809/6809tbl.c @@ -361,8 +361,8 @@ static const UINT8 cycles1[] = }; static void (*const m6809_main[0x100])(m68_state_t *) = { -/* 0xX0, 0xX1, 0xX2, 0xX3, 0xX4, 0xX5, 0xX6, 0xX7, - 0xX8, 0xX9, 0xXA, 0xXB, 0xXC, 0xXD, 0xXE, 0xXF */ +/* 0xX0, 0xX1, 0xX2, 0xX3, 0xX4, 0xX5, 0xX6, 0xX7, + 0xX8, 0xX9, 0xXA, 0xXB, 0xXC, 0xXD, 0xXE, 0xXF */ /* 0x0X */ neg_di, neg_di, com_di, com_di, lsr_di, lsr_di, ror_di, asr_di, asl_di, rol_di, dec_di, dec_di, inc_di, tst_di, jmp_di, clr_di, diff --git a/src/emu/devcb.c b/src/emu/devcb.c index b8f68a46b92..f671554a65e 100644 --- a/src/emu/devcb.c +++ b/src/emu/devcb.c @@ -343,7 +343,7 @@ void devcb_resolve_write8(devcb_resolved_write8 *resolved, const devcb_write8 *c resolved->target = device->owner(); else resolved->target = device->siblingdevice(config->tag); - + if (resolved->target == NULL) fatalerror("devcb_resolve_write8: unable to find device '%s' (requested by %s '%s')", config->tag, device->name(), device->tag()); diff --git a/src/emu/emuopts.c b/src/emu/emuopts.c index 81f81968c5c..d3db7c45503 100644 --- a/src/emu/emuopts.c +++ b/src/emu/emuopts.c @@ -264,7 +264,7 @@ void emu_options::remove_device_options() { // pre-fetch the next entry in case we delete this one nextentry = curentry->next(); - + // if this is a device option, nuke it if ((curentry->flags() & OPTION_FLAG_DEVICE) != 0) remove_entry(*curentry); @@ -281,15 +281,15 @@ bool emu_options::parse_command_line(int argc, char *argv[], astring &error_stri { // remember the original system name astring old_system_name(system_name()); - + // parse as normal bool result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); - + // if the system name changed, fix up the device options if (old_system_name != system_name()) { add_device_options(); - + // if we failed the first time, try parsing again with the new options in place if (!result) result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string); @@ -379,7 +379,7 @@ void emu_options::set_system_name(const char *name) { // remember the original system name astring old_system_name(system_name()); - + // if the system name changed, fix up the device options if (old_system_name != name) { @@ -395,7 +395,7 @@ void emu_options::set_system_name(const char *name) //------------------------------------------------- -// device_option - return the value of the +// device_option - return the value of the // device-specific option //------------------------------------------------- diff --git a/src/emu/emuopts.h b/src/emu/emuopts.h index 6943338f16e..9d76a69ab64 100644 --- a/src/emu/emuopts.h +++ b/src/emu/emuopts.h @@ -54,7 +54,7 @@ enum { // command-line options are HIGH priority OPTION_PRIORITY_CMDLINE = OPTION_PRIORITY_HIGH, - + // INI-based options are NORMAL priority, in increasing order: OPTION_PRIORITY_INI = OPTION_PRIORITY_NORMAL, OPTION_PRIORITY_MAME_INI, @@ -216,7 +216,7 @@ public: const char *system_name() const { return value(OPTION_SYSTEMNAME); } const game_driver *system() const; void set_system_name(const char *name); - + // core configuration options bool read_config() const { return bool_value(OPTION_READCONFIG); } bool write_config() const { return bool_value(OPTION_WRITECONFIG); } @@ -334,7 +334,7 @@ public: bool skip_gameinfo() const { return bool_value(OPTION_SKIP_GAMEINFO); } const char *ui_font() const { return value(OPTION_UI_FONT); } const char *ram_size() const { return value(OPTION_RAMSIZE); } - + // device-specific options const char *device_option(device_image_interface &image); @@ -344,7 +344,7 @@ private: void remove_device_options(); // INI parsing helper - bool parse_one_ini(const char *basename, int priority, astring *error_string = NULL); + bool parse_one_ini(const char *basename, int priority, astring *error_string = NULL); static const options_entry s_option_entries[]; }; diff --git a/src/emu/fileio.c b/src/emu/fileio.c index f655de04c78..bf0e61e62bf 100644 --- a/src/emu/fileio.c +++ b/src/emu/fileio.c @@ -80,7 +80,7 @@ bool path_iterator::next(astring &buffer, const char *name) semi = m_current + strlen(m_current); buffer.cpy(m_current, semi - m_current); m_current = (*semi == 0) ? semi : semi + 1; - + // append the name if we have one if (name != NULL) { diff --git a/src/emu/image.c b/src/emu/image.c index 690b8ace136..1baf723183b 100644 --- a/src/emu/image.c +++ b/src/emu/image.c @@ -156,7 +156,7 @@ static int write_config(emu_options &options, const char *filename, const game_d static void image_options_extract(running_machine *machine) { /* only extract the device options if we've added them */ -// if (machine->options().bool_value(OPTION_ADDED_DEVICE_OPTIONS)) +// if (machine->options().bool_value(OPTION_ADDED_DEVICE_OPTIONS)) { int index = 0; device_image_interface *image = NULL; diff --git a/src/emu/inptport.c b/src/emu/inptport.c index abaea68723c..3dda70c83d3 100644 --- a/src/emu/inptport.c +++ b/src/emu/inptport.c @@ -1498,8 +1498,8 @@ const input_type_desc *input_type_list(running_machine *machine) /*------------------------------------------------- - input_port_exists - return whether an input - port exists + input_port_exists - return whether an input + port exists -------------------------------------------------*/ bool input_port_exists(running_machine *machine, const char *tag) @@ -1509,9 +1509,9 @@ bool input_port_exists(running_machine *machine, const char *tag) /*------------------------------------------------- - input_port_active - return a bitmask of which - bits of an input port are active (i.e. not - unused or unknown) + input_port_active - return a bitmask of which + bits of an input port are active (i.e. not + unused or unknown) -------------------------------------------------*/ input_port_value input_port_active(running_machine *machine, const char *tag) @@ -1524,10 +1524,10 @@ input_port_value input_port_active(running_machine *machine, const char *tag) /*------------------------------------------------- - input_port_active_safe - return a bitmask of - which bits of an input port are active (i.e. - not unused or unknown), or a default value if - the port does not exist + input_port_active_safe - return a bitmask of + which bits of an input port are active (i.e. + not unused or unknown), or a default value if + the port does not exist -------------------------------------------------*/ input_port_value input_port_active_safe(running_machine *machine, const char *tag, input_port_value defvalue) @@ -2933,7 +2933,7 @@ static int frame_get_digital_field_state(const input_field_config *field, int mo /*------------------------------------------------- port_default_value - updates default value - of port settings according to device settings + of port settings according to device settings -------------------------------------------------*/ static UINT32 port_default_value(const char *fulltag, UINT32 mask, UINT32 defval, device_config *owner) @@ -3433,7 +3433,7 @@ static void port_config_detokenize(ioport_list &portlist, const input_port_token TOKEN_GET_UINT64_UNPACK2(ipt, mask, 32, defval, 32); if (curfield != NULL) field_config_insert(curfield, &maskbits, errorbuf, errorbuflen); - defval = port_default_value(fulltag,mask,defval,owner); + defval = port_default_value(fulltag,mask,defval,owner); curfield = field_config_alloc(curport, IPT_DIPSWITCH, defval, mask); cursetting = NULL; curfield->name = input_port_string_from_token(*ipt++); @@ -3512,7 +3512,7 @@ static void port_config_detokenize(ioport_list &portlist, const input_port_token TOKEN_GET_UINT64_UNPACK2(ipt, mask, 32, defval, 32); if (curfield != NULL) field_config_insert(curfield, &maskbits, errorbuf, errorbuflen); - defval = port_default_value(fulltag,mask,defval,owner); + defval = port_default_value(fulltag,mask,defval,owner); curfield = field_config_alloc(curport, IPT_CONFIG, defval, mask); cursetting = NULL; curfield->name = input_port_string_from_token(*ipt++); diff --git a/src/emu/mame.c b/src/emu/mame.c index db6fb00b453..1cbfa192f72 100644 --- a/src/emu/mame.c +++ b/src/emu/mame.c @@ -163,7 +163,7 @@ int mame_execute(emu_options &options, osd_interface &osd) } // otherwise, perform validity checks before anything else - else + else validate_drivers(options, system); firstgame = false; |
