From dac6dc4f626a70c065b86bbfd97a068b5c6965e6 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 23 Apr 2017 12:27:42 +1000 Subject: srcclean (nw) --- src/emu/debug/debugcpu.cpp | 2 +- src/emu/diimage.cpp | 6 +++--- src/emu/diimage.h | 2 +- src/emu/dislot.cpp | 2 +- src/emu/dislot.h | 14 +++++++------- src/emu/emuopts.cpp | 38 +++++++++++++++++++------------------- src/emu/emuopts.h | 24 ++++++++++++------------ src/emu/romload.cpp | 18 +++++++++--------- src/emu/validity.h | 2 +- 9 files changed, 54 insertions(+), 54 deletions(-) (limited to 'src/emu') diff --git a/src/emu/debug/debugcpu.cpp b/src/emu/debug/debugcpu.cpp index 9da367f641a..3fb5c2421ae 100644 --- a/src/emu/debug/debugcpu.cpp +++ b/src/emu/debug/debugcpu.cpp @@ -1013,7 +1013,7 @@ u64 debugger_cpu::expression_read_memory(void *param, const char *name, expressi auto dis = m_machine.disable_side_effect(disable_se); return expression_read_program_direct(memory->space(AS_DECRYPTED_OPCODES), (spacenum == EXPSPACE_OPCODE), address, size); break; - } + } case EXPSPACE_REGION: if (name == nullptr) diff --git a/src/emu/diimage.cpp b/src/emu/diimage.cpp index 817be9a160b..f55d4bf074b 100644 --- a/src/emu/diimage.cpp +++ b/src/emu/diimage.cpp @@ -1208,9 +1208,9 @@ image_init_result device_image_interface::create(const std::string &path, const //------------------------------------------------- -// reset_and_load - called internally when we try -// to load an is_reset_on_load() item; will reset -// the emulation and record this image to be loaded +// reset_and_load - called internally when we try +// to load an is_reset_on_load() item; will reset +// the emulation and record this image to be loaded //------------------------------------------------- void device_image_interface::reset_and_load(const std::string &path) diff --git a/src/emu/diimage.h b/src/emu/diimage.h index a148dd43e9e..7d05f870ec5 100644 --- a/src/emu/diimage.h +++ b/src/emu/diimage.h @@ -334,7 +334,7 @@ private: // flags bool m_readonly; bool m_created; - + // special - used when creating int m_create_format; util::option_resolution *m_create_args; diff --git a/src/emu/dislot.cpp b/src/emu/dislot.cpp index 7eeeb9a5bf6..ea80b1857bb 100644 --- a/src/emu/dislot.cpp +++ b/src/emu/dislot.cpp @@ -159,4 +159,4 @@ bool get_default_card_software_hook::hashfile_extrainfo(std::string &extrainfo) } extrainfo = m_hash_extrainfo; return m_has_hash_extrainfo; -} \ No newline at end of file +} diff --git a/src/emu/dislot.h b/src/emu/dislot.h index ea4cd983dcd..a6722a50f70 100644 --- a/src/emu/dislot.h +++ b/src/emu/dislot.h @@ -99,7 +99,7 @@ class get_default_card_software_hook public: get_default_card_software_hook(const std::string &path, std::function &&get_hashfile_extrainfo); - // accesses the image file to be scrutinized by get_default_card_software(); is + // accesses the image file to be scrutinized by get_default_card_software(); is // nullptr in the case of images loaded by software list util::core_file::ptr &image_file() { return m_image_file; } @@ -110,12 +110,12 @@ public: bool hashfile_extrainfo(std::string &extrainfo); private: - util::core_file::ptr m_image_file; - std::string m_file_type; - std::function m_get_hashfile_extrainfo; - bool m_called_get_hashfile_extrainfo; - bool m_has_hash_extrainfo; - std::string m_hash_extrainfo; + util::core_file::ptr m_image_file; + std::string m_file_type; + std::function m_get_hashfile_extrainfo; + bool m_called_get_hashfile_extrainfo; + bool m_has_hash_extrainfo; + std::string m_hash_extrainfo; }; diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp index e68d597b7f1..2863ef35caf 100644 --- a/src/emu/emuopts.cpp +++ b/src/emu/emuopts.cpp @@ -267,9 +267,9 @@ void emu_options::value_changed(const std::string &name, const std::string &valu //------------------------------------------------- -// override_get_value - when saving to an INI, we -// need to hook into that process so we can write -// out image/slot options +// override_get_value - when saving to an INI, we +// need to hook into that process so we can write +// out image/slot options //------------------------------------------------- core_options::override_get_value_result emu_options::override_get_value(const char *name, std::string &value) const @@ -298,9 +298,9 @@ core_options::override_get_value_result emu_options::override_get_value(const ch //------------------------------------------------- -// override_set_value - when parsing an INI, we -// need to hook into into it so we can do the same -// crazy slot logic done in mameopt +// override_set_value - when parsing an INI, we +// need to hook into into it so we can do the same +// crazy slot logic done in mameopt //------------------------------------------------- bool emu_options::override_set_value(const char *name, const std::string &value) @@ -334,7 +334,7 @@ bool emu_options::override_set_value(const char *name, const std::string &value) //------------------------------------------------- -// slot_option ctor +// slot_option ctor //------------------------------------------------- slot_option::slot_option(const char *default_value) @@ -345,7 +345,7 @@ slot_option::slot_option(const char *default_value) //------------------------------------------------- -// slot_option::value +// slot_option::value //------------------------------------------------- const std::string &slot_option::value() const @@ -353,17 +353,17 @@ const std::string &slot_option::value() const // There are a number of ways that the value can be determined; there // is a specific order of precedence: // - // 1. Highest priority is whatever may have been specified by the user (whether it - // was specified at the command line, an INI file, or in the UI). We keep track - // of whether these values were specified this way + // 1. Highest priority is whatever may have been specified by the user (whether it + // was specified at the command line, an INI file, or in the UI). We keep track + // of whether these values were specified this way // - // Take note that slots have a notion of being "selectable". Slots that are not - // marked as selectable cannot be specified with this technique + // Take note that slots have a notion of being "selectable". Slots that are not + // marked as selectable cannot be specified with this technique // - // 2. Next highest is what is returned from get_default_card_software() + // 2. Next highest is what is returned from get_default_card_software() // - // 3. Last in priority is what was specified as the slot default. This comes from - // device setup + // 3. Last in priority is what was specified as the slot default. This comes from + // device setup if (m_specified) return m_specified_value; else if (!m_default_card_software.empty()) @@ -374,7 +374,7 @@ const std::string &slot_option::value() const //------------------------------------------------- -// slot_option::specified_value +// slot_option::specified_value //------------------------------------------------- std::string slot_option::specified_value() const @@ -391,7 +391,7 @@ std::string slot_option::specified_value() const //------------------------------------------------- -// slot_option::specify +// slot_option::specify //------------------------------------------------- void slot_option::specify(std::string &&text) @@ -416,7 +416,7 @@ void slot_option::specify(std::string &&text) //------------------------------------------------- -// slot_option::set_bios +// slot_option::set_bios //------------------------------------------------- void slot_option::set_bios(std::string &&text) diff --git a/src/emu/emuopts.h b/src/emu/emuopts.h index 2324783a09d..e592d04d6e3 100644 --- a/src/emu/emuopts.h +++ b/src/emu/emuopts.h @@ -235,11 +235,11 @@ public: void set_default_card_software(std::string &&s) { m_default_card_software = std::move(s); } private: - bool m_specified; - std::string m_specified_value; - std::string m_specified_bios; - std::string m_default_card_software; - std::string m_default_value; + bool m_specified; + std::string m_specified_value; + std::string m_specified_bios; + std::string m_default_card_software; + std::string m_default_value; }; @@ -448,15 +448,15 @@ private: static const options_entry s_option_entries[]; // slots and devices - std::map m_slot_options; - std::map m_image_options; + std::map m_slot_options; + std::map m_image_options; // cached options, for scenarios where parsing core_options is too slow - int m_coin_impulse; - bool m_joystick_contradictory; - bool m_sleep; - bool m_refresh_speed; - ui_option m_ui; + int m_coin_impulse; + bool m_joystick_contradictory; + bool m_sleep; + bool m_refresh_speed; + ui_option m_ui; }; #endif // MAME_EMU_EMUOPTS_H diff --git a/src/emu/romload.cpp b/src/emu/romload.cpp index ecc61f06d7f..118c7fcc0fe 100644 --- a/src/emu/romload.cpp +++ b/src/emu/romload.cpp @@ -1068,15 +1068,15 @@ int open_disk_image(emu_options &options, const game_driver *gamedrv, const rom_ // and try to open that // // An example of a system that requires this is src/mame/drivers/ksys673.cpp, that has declarations like this: - // ... - // DISK_IMAGE_READONLY("889aa", 0, BAD_DUMP SHA1(0b567bf2f03ee8089e0b021ea502a53b3f6fe7ac)) - // ... - // DISK_IMAGE_READONLY("889ea", 0, BAD_DUMP SHA1(0b567bf2f03ee8089e0b021ea502a53b3f6fe7ac)) - // ... - // DISK_IMAGE_READONLY("889ja", 0, BAD_DUMP SHA1(0b567bf2f03ee8089e0b021ea502a53b3f6fe7ac)) - // ... - // DISK_IMAGE_READONLY("889ua", 0, BAD_DUMP SHA1(0b567bf2f03ee8089e0b021ea502a53b3f6fe7ac)) - // ... + // ... + // DISK_IMAGE_READONLY("889aa", 0, BAD_DUMP SHA1(0b567bf2f03ee8089e0b021ea502a53b3f6fe7ac)) + // ... + // DISK_IMAGE_READONLY("889ea", 0, BAD_DUMP SHA1(0b567bf2f03ee8089e0b021ea502a53b3f6fe7ac)) + // ... + // DISK_IMAGE_READONLY("889ja", 0, BAD_DUMP SHA1(0b567bf2f03ee8089e0b021ea502a53b3f6fe7ac)) + // ... + // DISK_IMAGE_READONLY("889ua", 0, BAD_DUMP SHA1(0b567bf2f03ee8089e0b021ea502a53b3f6fe7ac)) + // ... util::hash_collection romphashes(ROM_GETHASHDATA(romp)); for (int drv = driver_list::find(*gamedrv); drv != -1; drv = driver_list::clone(drv)) { diff --git a/src/emu/validity.h b/src/emu/validity.h index a845bac4610..7bdde37e576 100644 --- a/src/emu/validity.h +++ b/src/emu/validity.h @@ -100,7 +100,7 @@ private: driver_enumerator m_drivlist; // blank options for use during validation - emu_options m_blank_options; + emu_options m_blank_options; // error tracking int m_errors; -- cgit v1.2.3