From 0238c610f7591571ef6258b1d1cc0653d5353ffa Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 7 May 2012 06:57:50 +0000 Subject: Clean-ups and version bump --- src/emu/cpu/i386/i386.c | 2 +- src/emu/dirtc.c | 14 +-- src/emu/disound.c | 2 +- src/emu/ioport.c | 226 +++++++++++++++++++-------------------- src/emu/ioport.h | 70 ++++++------ src/emu/machine/ds1302.c | 16 +-- src/emu/machine/intelfsh.c | 2 +- src/emu/machine/intelfsh.h | 2 +- src/emu/machine/mc146818.c | 2 +- src/emu/machine/msm5832.c | 2 +- src/emu/machine/msm5832.h | 2 +- src/emu/machine/rp5c01.c | 4 +- src/emu/machine/rp5c15.c | 4 +- src/emu/rendlay.c | 20 ++-- src/emu/screen.c | 2 +- src/emu/sound.c | 6 +- src/emu/sound/i5000.c | 4 +- src/emu/uimain.c | 10 +- src/lib/formats/ap2_dsk.c | 102 +++++++++--------- src/lib/formats/dfi_dsk.c | 2 +- src/lib/libflac/libflac/memory.c | 20 ++-- src/mame/drivers/aliens.c | 4 +- src/mame/drivers/amaticmg.c | 12 +-- src/mame/drivers/astrafr.c | 4 +- src/mame/drivers/bfm_sc4.c | 2 +- src/mame/drivers/bfm_sc5.c | 8 +- src/mame/drivers/bfm_swp.c | 2 +- src/mame/drivers/bmcpokr.c | 2 +- src/mame/drivers/byvid.c | 8 +- src/mame/drivers/chance32.c | 4 +- src/mame/drivers/crimfght.c | 4 +- src/mame/drivers/galdrvr.c | 2 +- src/mame/drivers/gei.c | 2 +- src/mame/drivers/hikaru.c | 6 +- src/mame/drivers/ksys573.c | 16 +-- src/mame/drivers/namcos10.c | 2 +- src/mame/drivers/puckpkmn.c | 2 +- src/mame/drivers/seta2.c | 4 +- src/mame/includes/bfm_sc45.h | 4 +- src/mame/includes/megadriv.h | 76 ++++++------- src/mame/layout/bfm_sc1.lay | 2 +- src/mame/layout/bfm_sc4.lay | 12 +-- src/mame/video/awpvid.c | 12 +-- src/mame/video/turbo.c | 2 +- src/osd/windows/input.c | 2 +- src/version.c | 2 +- 46 files changed, 355 insertions(+), 355 deletions(-) diff --git a/src/emu/cpu/i386/i386.c b/src/emu/cpu/i386/i386.c index d95f599a49b..5f6a93c74ff 100644 --- a/src/emu/cpu/i386/i386.c +++ b/src/emu/cpu/i386/i386.c @@ -52,7 +52,7 @@ static UINT32 i386_load_protected_mode_segment(i386_state *cpustate, I386_SREG * entry = seg->selector & ~0x7; if (limit == 0 || entry + 7 > limit) return 0; - + int cpl = cpustate->CPL; cpustate->CPL = 0; diff --git a/src/emu/dirtc.c b/src/emu/dirtc.c index 569e0c30a94..c230f1eb856 100644 --- a/src/emu/dirtc.c +++ b/src/emu/dirtc.c @@ -64,14 +64,14 @@ void device_rtc_interface::set_time(bool update, int year, int month, int day, i if (update) { rtc_clock_updated(m_register[RTC_YEAR], m_register[RTC_MONTH], m_register[RTC_DAY], m_register[RTC_DAY_OF_WEEK], - m_register[RTC_HOUR], m_register[RTC_MINUTE], m_register[RTC_SECOND]); + m_register[RTC_HOUR], m_register[RTC_MINUTE], m_register[RTC_SECOND]); } } //------------------------------------------------- -// set_current_time - called to initialize the RTC -// to the current system time +// set_current_time - called to initialize the RTC +// to the current system time //------------------------------------------------- void device_rtc_interface::set_current_time(running_machine &machine) @@ -105,7 +105,7 @@ int device_rtc_interface::bcd_to_integer(UINT8 val) //------------------------------------------------- -// set_clock_register - +// set_clock_register - //------------------------------------------------- void device_rtc_interface::set_clock_register(int reg, int value) @@ -115,7 +115,7 @@ void device_rtc_interface::set_clock_register(int reg, int value) //------------------------------------------------- -// get_clock_register - +// get_clock_register - //------------------------------------------------- int device_rtc_interface::get_clock_register(int reg) @@ -125,13 +125,13 @@ int device_rtc_interface::get_clock_register(int reg) //------------------------------------------------- -// clock_updated - +// clock_updated - //------------------------------------------------- void device_rtc_interface::clock_updated() { rtc_clock_updated(m_register[RTC_YEAR], m_register[RTC_MONTH], m_register[RTC_DAY], m_register[RTC_DAY_OF_WEEK], - m_register[RTC_HOUR], m_register[RTC_MINUTE], m_register[RTC_SECOND]); + m_register[RTC_HOUR], m_register[RTC_MINUTE], m_register[RTC_SECOND]); } diff --git a/src/emu/disound.c b/src/emu/disound.c index 4b633c46730..672842de5f0 100644 --- a/src/emu/disound.c +++ b/src/emu/disound.c @@ -240,7 +240,7 @@ void device_sound_interface::set_output_gain(int outputnum, float gain) //------------------------------------------------- // inputnum_from_device - return the input number -// that is connected to the given device's output +// that is connected to the given device's output //------------------------------------------------- int device_sound_interface::inputnum_from_device(device_t &source_device, int outputnum) const diff --git a/src/emu/ioport.c b/src/emu/ioport.c index e18c9ae54a6..e34604fd506 100644 --- a/src/emu/ioport.c +++ b/src/emu/ioport.c @@ -165,11 +165,11 @@ class analog_field friend class simple_list; friend class ioport_manager; friend void ioport_field::set_user_settings(const ioport_field::user_settings &settings); - + public: // construction/destruction analog_field(ioport_field &field); - + // getters analog_field *next() const { return m_next; } ioport_manager &manager() const { return m_field.manager(); } @@ -183,7 +183,7 @@ public: void read(ioport_value &value); float crosshair_read(); void frame_update(running_machine &machine); - + private: // helpers INT32 apply_min_max(INT32 value) const; @@ -239,19 +239,19 @@ private: class dynamic_field { friend class simple_list; - + public: // construction/destruction dynamic_field(ioport_field &field); - + // getters dynamic_field *next() const { return m_next; } ioport_field &field() const { return m_field; } - + // read/write void read(ioport_value &result); void write(ioport_value newval); - + private: // internal state dynamic_field * m_next; // linked list of info for this port @@ -284,7 +284,7 @@ struct ioport_port_live { // construction/destruction ioport_port_live(ioport_port &port); - + // public state simple_list analoglist; // list of analog port info simple_list readlist; // list of dynamic read fields @@ -313,7 +313,7 @@ struct char_info //------------------------------------------------- // compute_scale -- compute an 8.24 scale value -// from a numerator and a denominator +// from a numerator and a denominator //------------------------------------------------- inline INT64 compute_scale(INT32 num, INT32 den) @@ -335,7 +335,7 @@ inline INT64 recip_scale(INT64 scale) //------------------------------------------------- // apply_scale -- apply an 8.24 scale value to -// a 32-bit value +// a 32-bit value //------------------------------------------------- inline INT32 apply_scale(INT32 value, INT64 scale) @@ -858,7 +858,7 @@ input_type_entry::input_type_entry(ioport_type type, ioport_group group, int pla //------------------------------------------------- // configure_osd - set the token and name of an -// OSD entry +// OSD entry //------------------------------------------------- void input_type_entry::configure_osd(const char *token, const char *name) @@ -889,7 +889,7 @@ digital_joystick::digital_joystick(int player, int number) //------------------------------------------------- -// set_axis - configure a single axis of a +// set_axis - configure a single axis of a // digital joystick //------------------------------------------------- @@ -902,8 +902,8 @@ digital_joystick::direction_t digital_joystick::set_axis(ioport_field &field) //------------------------------------------------- -// frame_update - update the state of digital -// joysticks prior to accumulating the results +// frame_update - update the state of digital +// joysticks prior to accumulating the results // in a port //------------------------------------------------- @@ -1054,7 +1054,7 @@ void natural_keyboard::post(unicode_char ch) if (can_post_directly(ch)) internal_post(ch); - // can we post this key with an alternate representation? + // can we post this key with an alternate representation? else if (can_post_alternate(ch)) { const char_info *info = char_info::find(ch); @@ -1077,7 +1077,7 @@ void natural_keyboard::post(const unicode_char *text, size_t length, attotime ra { // set the fixed rate m_current_rate = rate; - + // 0 length means strlen if (length == 0) for (const unicode_char *scan = text; *scan != 0; scan++) @@ -1101,8 +1101,8 @@ void natural_keyboard::post_utf8(const char *text, size_t length, attotime rate) { // set the fixed rate m_current_rate = rate; - - // 0-length means strlen + + // 0-length means strlen if (length == 0) length = strlen(text); @@ -1117,7 +1117,7 @@ void natural_keyboard::post_utf8(const char *text, size_t length, attotime rate) count = 1; uc = INVALID_CHAR; } - + // append to the buffer post(uc); text += count; @@ -1170,8 +1170,8 @@ void natural_keyboard::post_coded(const char *text, size_t length, attotime rate // set the fixed rate m_current_rate = rate; - - // 0-length means strlen + + // 0-length means strlen if (length == 0) length = strlen(text); @@ -1282,7 +1282,7 @@ bool natural_keyboard::can_post_alternate(unicode_char ch) const char_info *info = char_info::find(ch); if (info == NULL) return false; - + const char *altstring = info->alternate; if (altstring == NULL) return false; @@ -1303,7 +1303,7 @@ bool natural_keyboard::can_post_alternate(unicode_char ch) //------------------------------------------------- // choose_delay - determine the delay between -// posting keyboard events +// posting keyboard events //------------------------------------------------- attotime natural_keyboard::choose_delay(unicode_char ch) @@ -1316,7 +1316,7 @@ attotime natural_keyboard::choose_delay(unicode_char ch) if (!m_queue_chars.isnull()) return attotime::from_msec(10); - // otherwise, default to constant delay with a longer delay on CR + // otherwise, default to constant delay with a longer delay on CR return attotime::from_msec((ch == '\r') ? 200 : 50); } @@ -1344,7 +1344,7 @@ void natural_keyboard::internal_post(unicode_char ch) //------------------------------------------------- // timer - timer callback to keep things flowing -// when posting a string of characters +// when posting a string of characters //------------------------------------------------- void natural_keyboard::timer(void *ptr, int param) @@ -1375,8 +1375,8 @@ void natural_keyboard::timer(void *ptr, int param) //------------------------------------------------- -// unicode_to_string - obtain a string -// representation of a given code; used for +// unicode_to_string - obtain a string +// representation of a given code; used for // logging and debugging //------------------------------------------------- @@ -1429,7 +1429,7 @@ const natural_keyboard::keycode_map_entry *natural_keyboard::find_code(unicode_c //------------------------------------------------- // frame_update - once per frame update of the -// natural keyboard state +// natural keyboard state //------------------------------------------------- void natural_keyboard::frame_update(ioport_port &port, ioport_value &digital) @@ -1674,7 +1674,7 @@ ioport_field::~ioport_field() //------------------------------------------------- -// name - return the field name for a given input +// name - return the field name for a given input // field //------------------------------------------------- @@ -1692,7 +1692,7 @@ const char *ioport_field::name() const //------------------------------------------------- -// seq - return the live input sequence for the +// seq - return the live input sequence for the // given input field //------------------------------------------------- @@ -1716,7 +1716,7 @@ const input_seq &ioport_field::seq(input_seq_type seqtype) const //------------------------------------------------- -// defseq - return the default input sequence for +// defseq - return the default input sequence for // the given input field //------------------------------------------------- @@ -1737,7 +1737,7 @@ const input_seq &ioport_field::defseq(input_seq_type seqtype) const //------------------------------------------------- // type_class - return the type class for this -// field +// field //------------------------------------------------- ioport_type_class ioport_field::type_class() const @@ -1811,7 +1811,7 @@ ioport_type_class ioport_field::type_class() const //------------------------------------------------- -// keyboard_code - accesses a particular keyboard +// keyboard_code - accesses a particular keyboard // code //------------------------------------------------- @@ -1827,7 +1827,7 @@ unicode_char ioport_field::keyboard_code(int which) const //------------------------------------------------- -// get_user_settings - return the current +// get_user_settings - return the current // settings for the given input field //------------------------------------------------- @@ -1888,7 +1888,7 @@ void ioport_field::set_user_settings(const user_settings &settings) //------------------------------------------------- -// setting_name - return the expanded setting +// setting_name - return the expanded setting // name for a field //------------------------------------------------- @@ -1908,7 +1908,7 @@ const char *ioport_field::setting_name() const //------------------------------------------------- -// has_previous_setting - return true if the +// has_previous_setting - return true if the // given field has a "previous" setting //------------------------------------------------- @@ -1927,7 +1927,7 @@ bool ioport_field::has_previous_setting() const //------------------------------------------------- -// select_previous_setting - select the previous +// select_previous_setting - select the previous // item for a DIP switch or configuration field //------------------------------------------------- @@ -1966,7 +1966,7 @@ void ioport_field::select_previous_setting() //------------------------------------------------- -// has_next_setting - return true if the given +// has_next_setting - return true if the given // field has a "next" setting //------------------------------------------------- @@ -1991,7 +1991,7 @@ bool ioport_field::has_next_setting() const //------------------------------------------------- -// select_next_setting - select the next item for +// select_next_setting - select the next item for // a DIP switch or configuration field //------------------------------------------------- @@ -2027,7 +2027,7 @@ void ioport_field::select_next_setting() //------------------------------------------------- -// frame_update_digital - get the state of a +// frame_update_digital - get the state of a // digital field //------------------------------------------------- @@ -2043,7 +2043,7 @@ void ioport_field::frame_update(ioport_value &result, bool mouse_down) m_live->analog->frame_update(machine()); return; } - + // if UI is active, ignore digital inputs if (ui_is_menu_active()) return; @@ -2136,7 +2136,7 @@ void ioport_field::frame_update(ioport_value &result, bool mouse_down) //------------------------------------------------- // crosshair_position - compute the crosshair -// position +// position //------------------------------------------------- void ioport_field::crosshair_position(float &x, float &y, bool &gotx, bool &goty) @@ -2364,7 +2364,7 @@ ioport_port::~ioport_port() //------------------------------------------------- // machine - return a reference to the running -// machine +// machine //------------------------------------------------- running_machine &ioport_port::machine() const @@ -2374,7 +2374,7 @@ running_machine &ioport_port::machine() const //------------------------------------------------- -// manager - return a reference to the +// manager - return a reference to the // ioport_manager on the running machine //------------------------------------------------- @@ -2465,7 +2465,7 @@ void ioport_port::frame_update(ioport_field *mouse_field) //------------------------------------------------- // collapse_fields - remove any fields that are -// wholly overlapped by other fields +// wholly overlapped by other fields //------------------------------------------------- void ioport_port::collapse_fields(astring &errorbuf) @@ -2483,7 +2483,7 @@ void ioport_port::collapse_fields(astring &errorbuf) lastmodcount = field->modcount(); maskbits = 0; } - + // reinsert this field ioport_field *current = field; field = field->next(); @@ -2494,7 +2494,7 @@ void ioport_port::collapse_fields(astring &errorbuf) //------------------------------------------------- // insert_field - insert a new field, checking -// for errors +// for errors //------------------------------------------------- void ioport_port::insert_field(ioport_field &newfield, ioport_value &disallowedbits, astring &errorbuf) @@ -2512,7 +2512,7 @@ void ioport_port::insert_field(ioport_field &newfield, ioport_value &disallowedb for (ioport_field *field = first_field(); field != NULL; field = nextfield) { nextfield = field->next(); - if ((field->mask() & newfield.mask()) != 0 && + if ((field->mask() & newfield.mask()) != 0 && (newfield.condition().none() || field->condition().none() || field->condition() == newfield.condition())) { // reduce the mask of the field we found @@ -2569,15 +2569,15 @@ ioport_port_live::ioport_port_live(ioport_port &port) analog_field *analog = NULL; if (field->is_analog()) analog = &analoglist.append(*global_alloc(analog_field(*field))); - + // allocate a dynamic field for reading if (field->has_dynamic_read()) readlist.append(*global_alloc(dynamic_field(*field))); - + // allocate a dynamic field for writing if (field->has_dynamic_write()) writelist.append(*global_alloc(dynamic_field(*field))); - + // let the field initialize its live state field->init_live_state(analog); } @@ -2610,7 +2610,7 @@ ioport_manager::ioport_manager(running_machine &machine) //------------------------------------------------- // initialize - walk the configured ports and -// create live state information +// create live state information //------------------------------------------------- time_t ioport_manager::initialize() @@ -2748,7 +2748,7 @@ void ioport_manager::init_autoselect_devices(int type1, int type2, int type3, co //------------------------------------------------- -// exit - exit callback to ensure we clean up +// exit - exit callback to ensure we clean up // and close our files //------------------------------------------------- @@ -2761,7 +2761,7 @@ void ioport_manager::exit() //------------------------------------------------- -// type_name - return the name for the given +// type_name - return the name for the given // type/player //------------------------------------------------- @@ -2778,7 +2778,7 @@ const char *ioport_manager::type_name(ioport_type type, UINT8 player) //------------------------------------------------- -// type_group - return the group for the given +// type_group - return the group for the given // type/player //------------------------------------------------- @@ -2794,7 +2794,7 @@ ioport_group ioport_manager::type_group(ioport_type type, int player) //------------------------------------------------- -// type_seq - return the input sequence for the +// type_seq - return the input sequence for the // given type/player //------------------------------------------------- @@ -2814,7 +2814,7 @@ const input_seq &ioport_manager::type_seq(ioport_type type, int player, input_se //------------------------------------------------- -// set_type_seq - change the input sequence for +// set_type_seq - change the input sequence for // the given type/player //------------------------------------------------- @@ -2827,7 +2827,7 @@ void ioport_manager::set_type_seq(ioport_type type, int player, input_seq_type s //------------------------------------------------- -// type_pressed - return true if the sequence for +// type_pressed - return true if the sequence for // the given input type/player is pressed //------------------------------------------------- @@ -2853,7 +2853,7 @@ bool ioport_manager::type_class_present(ioport_type_class inputclass) //------------------------------------------------- -// has_keyboard - determine if there is a +// has_keyboard - determine if there is a // keyboard present in the control list //------------------------------------------------- @@ -2876,7 +2876,7 @@ bool ioport_manager::has_keyboard() const } //------------------------------------------------- -// count_players - counts the number of active +// count_players - counts the number of active // players //------------------------------------------------- @@ -2893,7 +2893,7 @@ int ioport_manager::count_players() const //------------------------------------------------- -// crosshair_position - return the extracted +// crosshair_position - return the extracted // crosshair values for the given player //------------------------------------------------- @@ -2917,7 +2917,7 @@ bool ioport_manager::crosshair_position(int player, float &x, float &y) //------------------------------------------------- -// update_defaults - force an update to the input +// update_defaults - force an update to the input // port values based on current conditions //------------------------------------------------- @@ -2953,7 +2953,7 @@ digital_joystick &ioport_manager::digjoystick(int player, int number) for (digital_joystick *joystick = m_joystick_list.first(); joystick != NULL; joystick = joystick->next()) if (joystick->player() == player && joystick->number() == number) return *joystick; - + // create a new one return m_joystick_list.append(*global_alloc(digital_joystick(player, number))); } @@ -2972,8 +2972,8 @@ void ioport_manager::frame_update_callback() //------------------------------------------------- -// frame_update_internal - core logic for -// per-frame input port updating +// frame_update_internal - core logic for +// per-frame input port updating //------------------------------------------------- void ioport_manager::frame_update() @@ -3031,7 +3031,7 @@ g_profiler.stop(); //------------------------------------------------- -// frame_interpolate - interpolate between two +// frame_interpolate - interpolate between two // values based on the time between frames //------------------------------------------------- @@ -3230,7 +3230,7 @@ bool ioport_manager::load_game_config(xml_data_node *portnode, int type, int pla //************************************************************************** //------------------------------------------------- -// save_config - config callback for saving input +// save_config - config callback for saving input // port configuration //------------------------------------------------- @@ -3270,7 +3270,7 @@ void ioport_manager::save_sequence(xml_data_node *parentnode, input_seq_type typ //------------------------------------------------- -// save_this_input_field_type - determine if the +// save_this_input_field_type - determine if the // given port type is worth saving //------------------------------------------------- @@ -3283,7 +3283,7 @@ bool ioport_manager::save_this_input_field_type(ioport_type type) case IPT_PORT: case IPT_UNKNOWN: return false; - + default: break; } @@ -3603,7 +3603,7 @@ void ioport_manager::record_init() if (filename[0] == 0) return; - // open the record file + // open the record file file_error filerr = m_record_file.open(filename); assert_always(filerr == FILERR_NONE, "Failed to open file for recording"); @@ -3765,7 +3765,7 @@ void ioport_configurer::port_alloc(const char *tag) // create the full tag astring fulltag; m_owner.subtag(fulltag, tag); - + // add it to the list, and reset current field/setting m_curport = &m_portlist.append(fulltag, *global_alloc(ioport_port(m_owner, fulltag))); m_curfield = NULL; @@ -3788,7 +3788,7 @@ void ioport_configurer::port_modify(const char *tag) m_curport = m_portlist.find(fulltag.cstr()); if (m_curport == NULL) throw emu_fatalerror("Requested to modify nonexistent port '%s'", fulltag.cstr()); - + // bump the modification count, and reset current field/setting m_curport->m_modcount++; m_curfield = NULL; @@ -3858,7 +3858,7 @@ void ioport_configurer::setting_alloc(ioport_value value, const char *name) //------------------------------------------------- // set_condition - set the condition for either -// the current setting or field +// the current setting or field //------------------------------------------------- void ioport_configurer::set_condition(ioport_condition::condition_t condition, const char *tag, ioport_value mask, ioport_value value) @@ -3883,7 +3883,7 @@ void ioport_configurer::onoff_alloc(const char *name, ioport_value defval, iopor field_set_toggle(); m_curfield->m_seq[SEQ_TYPE_STANDARD].set(KEYCODE_F2); } - + // expand the diplocation if (diplocation != NULL) field_set_diplocation(diplocation); @@ -3943,7 +3943,7 @@ dynamic_field::dynamic_field(ioport_field &field) //------------------------------------------------- // read - read the updated value and merge it -// into the target +// into the target //------------------------------------------------- void dynamic_field::read(ioport_value &result) @@ -3951,11 +3951,11 @@ void dynamic_field::read(ioport_value &result) // skip if not enabled if (!m_field.enabled()) return; - + // call the callback to read a new value ioport_value newval = m_field.m_read(m_field, m_field.m_read_param); m_oldval = newval; - + // merge in the bits (don't invert yet, as all digitals are inverted together) result = (result & ~m_field.mask()) | ((newval << m_shift) & m_field.mask()); } @@ -3963,7 +3963,7 @@ void dynamic_field::read(ioport_value &result) //------------------------------------------------- // write - track a change to a value and call -// the write callback if there's something new +// the write callback if there's something new //------------------------------------------------- void dynamic_field::write(ioport_value newval) @@ -4166,7 +4166,7 @@ analog_field::analog_field(ioport_field &field) //------------------------------------------------- -// apply_min_max - clamp the given input value to +// apply_min_max - clamp the given input value to // the appropriate min/max for the analog control //------------------------------------------------- @@ -4203,7 +4203,7 @@ inline INT32 analog_field::apply_min_max(INT32 value) const //------------------------------------------------- // apply_sensitivity - apply a sensitivity -// adjustment for a current value +// adjustment for a current value //------------------------------------------------- inline INT32 analog_field::apply_sensitivity(INT32 value) const @@ -4213,8 +4213,8 @@ inline INT32 analog_field::apply_sensitivity(INT32 value) const //------------------------------------------------- -// apply_inverse_sensitivity - reverse-apply the -// sensitivity adjustment for a current value +// apply_inverse_sensitivity - reverse-apply the +// sensitivity adjustment for a current value //------------------------------------------------- inline INT32 analog_field::apply_inverse_sensitivity(INT32 value) const @@ -4224,7 +4224,7 @@ inline INT32 analog_field::apply_inverse_sensitivity(INT32 value) const //------------------------------------------------- -// apply_settings - return the value of an +// apply_settings - return the value of an // analog input //------------------------------------------------- @@ -4254,7 +4254,7 @@ INT32 analog_field::apply_settings(INT32 value) const //------------------------------------------------- -// frame_update - update the internals of a +// frame_update - update the internals of a // single analog field periodically //------------------------------------------------- @@ -4396,7 +4396,7 @@ void analog_field::frame_update(running_machine &machine) //------------------------------------------------- // read - read the current value and insert into -// the provided ioport_value +// the provided ioport_value //------------------------------------------------- void analog_field::read(ioport_value &result) @@ -4430,7 +4430,7 @@ void analog_field::read(ioport_value &result) //------------------------------------------------- // crosshair_read - read a value for crosshairs, -// scaled between 0 and 1 +// scaled between 0 and 1 //------------------------------------------------- float analog_field::crosshair_read() @@ -4512,33 +4512,33 @@ input_seq_type ioport_manager::token_to_seq_type(const char *string) /* int validate_natural_keyboard_statics(void) { - int i; - int error = FALSE; - unicode_char last_char = 0; - const char_info *ci; - - // check to make sure that charinfo is in order - for (i = 0; i < ARRAY_LENGTH(charinfo); i++) - { - if (last_char >= charinfo[i].ch) - { - mame_printf_error("inputx: charinfo is out of order; 0x%08x should be higher than 0x%08x\n", charinfo[i].ch, last_char); - error = TRUE; - } - last_char = charinfo[i].ch; - } - - // check to make sure that I can look up everything on alternate_charmap - for (i = 0; i < ARRAY_LENGTH(charinfo); i++) - { - ci = char_info::find(charinfo[i].ch); - if (ci != &charinfo[i]) - { - mame_printf_error("ioport: expected char_info::find(0x%08x) to work properly\n", charinfo[i].ch); - error = TRUE; - } - } - return error; + int i; + int error = FALSE; + unicode_char last_char = 0; + const char_info *ci; + + // check to make sure that charinfo is in order + for (i = 0; i < ARRAY_LENGTH(charinfo); i++) + { + if (last_char >= charinfo[i].ch) + { + mame_printf_error("inputx: charinfo is out of order; 0x%08x should be higher than 0x%08x\n", charinfo[i].ch, last_char); + error = TRUE; + } + last_char = charinfo[i].ch; + } + + // check to make sure that I can look up everything on alternate_charmap + for (i = 0; i < ARRAY_LENGTH(charinfo); i++) + { + ci = char_info::find(charinfo[i].ch); + if (ci != &charinfo[i]) + { + mame_printf_error("ioport: expected char_info::find(0x%08x) to work properly\n", charinfo[i].ch); + error = TRUE; + } + } + return error; } */ diff --git a/src/emu/ioport.h b/src/emu/ioport.h index e9362571e48..4e4050fcd13 100644 --- a/src/emu/ioport.h +++ b/src/emu/ioport.h @@ -194,7 +194,7 @@ enum ioport_type IPT_JOYSTICKLEFT_DOWN, IPT_JOYSTICKLEFT_LEFT, IPT_JOYSTICKLEFT_RIGHT, - + IPT_DIGITAL_JOYSTICK_LAST, // action buttons @@ -217,7 +217,7 @@ enum ioport_type // mahjong inputs IPT_MAHJONG_FIRST, - + IPT_MAHJONG_A, IPT_MAHJONG_B, IPT_MAHJONG_C, @@ -247,7 +247,7 @@ enum ioport_type IPT_MAHJONG_FLIP_FLOP, IPT_MAHJONG_BIG, IPT_MAHJONG_SMALL, - + IPT_MAHJONG_LAST, // hanafuda inputs @@ -263,7 +263,7 @@ enum ioport_type IPT_HANAFUDA_H, IPT_HANAFUDA_YES, IPT_HANAFUDA_NO, - + IPT_HANAFUDA_LAST, // gambling inputs @@ -325,7 +325,7 @@ enum ioport_type // analog inputs IPT_ANALOG_FIRST, - + IPT_ANALOG_ABSOLUTE_FIRST, IPT_AD_STICK_X, // absolute // autocenter @@ -340,7 +340,7 @@ enum ioport_type IPT_LIGHTGUN_Y, // absolute IPT_POSITIONAL, // absolute // autocenter if not wraps IPT_POSITIONAL_V, // absolute // autocenter if not wraps - + IPT_ANALOG_ABSOLUTE_LAST, IPT_DIAL, // relative @@ -349,7 +349,7 @@ enum ioport_type IPT_TRACKBALL_Y, // relative IPT_MOUSE_X, // relative IPT_MOUSE_Y, // relative - + IPT_ANALOG_LAST, // analog adjuster support @@ -414,7 +414,7 @@ enum ioport_type IPT_OSD_14, IPT_OSD_15, IPT_OSD_16, - + IPT_UI_LAST, // other meaning not mapped to standard defaults @@ -750,10 +750,10 @@ public: const char *name() const { return m_name; } input_seq &defseq(input_seq_type seqtype = SEQ_TYPE_STANDARD) { return m_defseq[seqtype]; } const input_seq &seq(input_seq_type seqtype = SEQ_TYPE_STANDARD) const { return m_seq[seqtype]; } - + // setters void configure_osd(const char *token, const char *name); - + private: // internal state input_type_entry * m_next; // next description in the list @@ -785,7 +785,7 @@ public: JOYDIR_RIGHT, JOYDIR_COUNT }; - + // bit constants static const UINT8 UP_BIT = 1 << JOYDIR_UP; static const UINT8 DOWN_BIT = 1 << JOYDIR_DOWN; @@ -794,20 +794,20 @@ public: // construction/destruction digital_joystick(int player, int number); - + // getters digital_joystick *next() const { return m_next; } int player() const { return m_player; } int number() const { return m_number; } UINT8 current() const { return m_current; } UINT8 current4way() const { return m_current4way; } - + // configuration direction_t set_axis(ioport_field &field); // updates void frame_update(); - + private: // internal state digital_joystick * m_next; // next joystick in the list @@ -831,7 +831,7 @@ class natural_keyboard public: // construction/destruction natural_keyboard(running_machine &machine); - + // getters and queries running_machine &machine() const { return m_machine; } bool empty() const { return (m_bufbegin == m_bufend); } @@ -855,7 +855,7 @@ private: // internal keyboard code information struct keycode_map_entry { - unicode_char ch; + unicode_char ch; ioport_field * field[UCHAR_SHIFT_END + 1 - UCHAR_SHIFT_BEGIN]; }; @@ -881,7 +881,7 @@ private: bool m_status_keydown; // current keydown status bool m_last_cr; // was the last char a CR? emu_timer * m_timer; // timer for posting characters - attotime m_current_rate; // current rate for posting + attotime m_current_rate; // current rate for posting ioport_queue_chars_delegate m_queue_chars; // queue characters callback ioport_accept_char_delegate m_accept_char; // accept character callback ioport_charqueue_empty_delegate m_charqueue_empty; // character queue empty callback @@ -913,7 +913,7 @@ public: // getters const char *tag() const { return m_tag; } - + // operators bool operator==(const ioport_condition &rhs) const { return (m_mask == rhs.m_mask && m_value == rhs.m_value && m_condition == rhs.m_condition && strcmp(m_tag, rhs.m_tag) == 0); } bool eval(device_t &device) const; @@ -949,7 +949,7 @@ class ioport_setting public: // construction/destruction ioport_setting(ioport_field &field, ioport_value value, const char *name); - + // getters ioport_setting *next() const { return m_next; } ioport_field &field() const { return m_field; } @@ -983,7 +983,7 @@ class ioport_diplocation public: // construction/destruction ioport_diplocation(const char *name, UINT8 swnum, bool invert); - + // getters ioport_diplocation *next() const { return m_next; } const char *name() const { return m_name; } @@ -1039,14 +1039,14 @@ public: ioport_type type() const { return m_type; } UINT8 player() const { return m_player; } - bool unused() const { return ((m_flags & FIELD_FLAG_UNUSED) != 0); } - bool cocktail() const { return ((m_flags & FIELD_FLAG_COCKTAIL) != 0); } - bool toggle() const { return ((m_flags & FIELD_FLAG_TOGGLE) != 0); } - bool rotated() const { return ((m_flags & FIELD_FLAG_ROTATED) != 0); } - bool analog_reverse() const { return ((m_flags & ANALOG_FLAG_REVERSE) != 0); } - bool analog_reset() const { return ((m_flags & ANALOG_FLAG_RESET) != 0); } - bool analog_wraps() const { return ((m_flags & ANALOG_FLAG_WRAPS) != 0); } - bool analog_invert() const { return ((m_flags & ANALOG_FLAG_INVERT) != 0); } + bool unused() const { return ((m_flags & FIELD_FLAG_UNUSED) != 0); } + bool cocktail() const { return ((m_flags & FIELD_FLAG_COCKTAIL) != 0); } + bool toggle() const { return ((m_flags & FIELD_FLAG_TOGGLE) != 0); } + bool rotated() const { return ((m_flags & FIELD_FLAG_ROTATED) != 0); } + bool analog_reverse() const { return ((m_flags & ANALOG_FLAG_REVERSE) != 0); } + bool analog_reset() const { return ((m_flags & ANALOG_FLAG_RESET) != 0); } + bool analog_wraps() const { return ((m_flags & ANALOG_FLAG_WRAPS) != 0); } + bool analog_invert() const { return ((m_flags & ANALOG_FLAG_INVERT) != 0); } UINT8 impulse() const { return m_impulse; } const char *name() const; @@ -1056,7 +1056,7 @@ public: const input_seq &defseq_unresolved(input_seq_type seqtype = SEQ_TYPE_STANDARD) const { return m_seq[seqtype]; } bool has_dynamic_read() const { return !m_read.isnull(); } bool has_dynamic_write() const { return !m_write.isnull(); } - + ioport_value minval() const { return m_min; } ioport_value maxval() const { return m_max; } INT32 sensitivity() const { return m_sensitivity; } @@ -1067,11 +1067,11 @@ public: double crosshair_offset() const { return m_crosshair_offset; } UINT16 full_turn_count() const { return m_full_turn_count; } const ioport_value *remap_table() const { return m_remap_table; } - + UINT8 way() const { return m_way; } unicode_char keyboard_code(int which) const; ioport_field_live &live() const { assert(m_live != NULL); return *m_live; } - + // setters void set_crosshair_scale(double scale) { m_crosshair_scale = scale; } void set_crosshair_offset(double offset) { m_crosshair_offset = offset; } @@ -1115,7 +1115,7 @@ private: ioport_field_live * m_live; // live state of field (NULL if not live) int m_modcount; // modification count simple_list m_settinglist; // list of input_setting_configs - simple_list m_diploclist; // list of locations for various bits + simple_list m_diploclist; // list of locations for various bits // generally-applicable data ioport_value m_mask; // mask of bits belonging to the field @@ -1194,7 +1194,7 @@ public: ioport_value active() const { return m_active; } ioport_value active_safe(ioport_value defval) const { return (this == NULL) ? defval : active(); } ioport_port_live &live() const { assert(m_live != NULL); return *m_live; } - + // read/write to the port ioport_value read(); ioport_value read_safe(ioport_value defval) { return (this == NULL) ? defval : read(); } @@ -1213,7 +1213,7 @@ private: // internal state ioport_port * m_next; // pointer to next port device_t & m_device; // associated device - simple_list m_fieldlist; // list of ioport_fields + simple_list m_fieldlist; // list of ioport_fields astring m_tag; // copy of this port's tag int m_modcount; // modification count ioport_value m_active; // mask of active bits in the port @@ -1378,7 +1378,7 @@ private: device_t & m_owner; ioport_list & m_portlist; astring & m_errorbuf; - + ioport_port * m_curport; ioport_field * m_curfield; ioport_setting * m_cursetting; diff --git a/src/emu/machine/ds1302.c b/src/emu/machine/ds1302.c index d7d9fd9d61a..e96a710c73a 100644 --- a/src/emu/machine/ds1302.c +++ b/src/emu/machine/ds1302.c @@ -9,10 +9,10 @@ /* - TODO: + TODO: - - 12 hour format - - synchronize user buffers on falling edge of CE after write + - 12 hour format + - synchronize user buffers on falling edge of CE after write */ @@ -115,11 +115,11 @@ void ds1302_device::device_start() void ds1302_device::device_reset() { set_current_time(machine()); - + m_clk = 0; m_ce = 0; m_state = STATE_COMMAND; - m_bits = 0; + m_bits = 0; } @@ -170,7 +170,7 @@ void ds1302_device::nvram_write(emu_file &file) //------------------------------------------------- -// rtc_clock_updated - +// rtc_clock_updated - //------------------------------------------------- void ds1302_device::rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) @@ -231,7 +231,7 @@ void ds1302_device::load_shift_register() m_data = m_user[m_addr]; if (LOG) logerror("DS1302 '%s' Read Clock %u:%02x\n", tag(), m_addr, m_data); - } + } } else { @@ -246,7 +246,7 @@ void ds1302_device::load_shift_register() if (LOG) logerror("DS1302 '%s' Write Clock %u:%02x\n", tag(), m_addr, m_data); m_reg[m_addr] = m_data; - } + } } } diff --git a/src/emu/machine/intelfsh.c b/src/emu/machine/intelfsh.c index f48c53e0aa0..7eab09f9226 100644 --- a/src/emu/machine/intelfsh.c +++ b/src/emu/machine/intelfsh.c @@ -832,7 +832,7 @@ void intelfsh_device::write_full(UINT32 address, UINT32 data) if (m_byte_count == m_page_size) { - m_flash_mode = FM_NORMAL; + m_flash_mode = FM_NORMAL; } break; case FM_CLEARPART1: diff --git a/src/emu/machine/intelfsh.h b/src/emu/machine/intelfsh.h index bb4220bedee..6cb394a7b08 100644 --- a/src/emu/machine/intelfsh.h +++ b/src/emu/machine/intelfsh.h @@ -122,7 +122,7 @@ protected: UINT8 m_device_id; UINT8 m_maker_id; bool m_sector_is_4k; - UINT8 m_page_size; + UINT8 m_page_size; // internal state UINT8 m_status; diff --git a/src/emu/machine/mc146818.c b/src/emu/machine/mc146818.c index 40a58fe52d4..c350e083620 100644 --- a/src/emu/machine/mc146818.c +++ b/src/emu/machine/mc146818.c @@ -300,7 +300,7 @@ void mc146818_device::device_timer(emu_timer &timer, device_timer_id id, int par //------------------------------------------------- -// rtc_clock_updated - +// rtc_clock_updated - //------------------------------------------------- void mc146818_device::rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) diff --git a/src/emu/machine/msm5832.c b/src/emu/machine/msm5832.c index 8a41f61fc6a..6c5f834b319 100644 --- a/src/emu/machine/msm5832.c +++ b/src/emu/machine/msm5832.c @@ -151,7 +151,7 @@ void msm5832_device::device_timer(emu_timer &timer, device_timer_id id, int para //------------------------------------------------- -// rtc_clock_updated - +// rtc_clock_updated - //------------------------------------------------- void msm5832_device::rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) diff --git a/src/emu/machine/msm5832.h b/src/emu/machine/msm5832.h index c497abd11de..fb52a81a37a 100644 --- a/src/emu/machine/msm5832.h +++ b/src/emu/machine/msm5832.h @@ -67,7 +67,7 @@ protected: // device-level overrides virtual void device_start(); virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); // device_rtc_interface overrides virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second); diff --git a/src/emu/machine/rp5c01.c b/src/emu/machine/rp5c01.c index 349f303720a..170c1c61ee2 100644 --- a/src/emu/machine/rp5c01.c +++ b/src/emu/machine/rp5c01.c @@ -270,7 +270,7 @@ void rp5c01_device::device_timer(emu_timer &timer, device_timer_id id, int param //------------------------------------------------- -// rtc_clock_updated - +// rtc_clock_updated - //------------------------------------------------- void rp5c01_device::rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) @@ -420,7 +420,7 @@ WRITE8_MEMBER( rp5c01_device::write ) m_reg[mode][offset & 0x0f] = data & REGISTER_WRITE_MASK[mode][offset & 0x0f]; set_time(false, read_counter(REGISTER_1_YEAR), read_counter(REGISTER_1_MONTH), read_counter(REGISTER_1_DAY), m_reg[MODE00][REGISTER_DAY_OF_THE_WEEK], - read_counter(REGISTER_1_HOUR), read_counter(REGISTER_1_MINUTE), read_counter(REGISTER_1_SECOND)); + read_counter(REGISTER_1_HOUR), read_counter(REGISTER_1_MINUTE), read_counter(REGISTER_1_SECOND)); break; case BLOCK10: diff --git a/src/emu/machine/rp5c15.c b/src/emu/machine/rp5c15.c index d493c2f8cf4..30e5f4a2e08 100644 --- a/src/emu/machine/rp5c15.c +++ b/src/emu/machine/rp5c15.c @@ -291,7 +291,7 @@ void rp5c15_device::device_timer(emu_timer &timer, device_timer_id id, int param //------------------------------------------------- -// rtc_clock_updated - +// rtc_clock_updated - //------------------------------------------------- void rp5c15_device::rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) @@ -395,7 +395,7 @@ WRITE8_MEMBER( rp5c15_device::write ) m_reg[mode][offset & 0x0f] = data & REGISTER_WRITE_MASK[mode][offset & 0x0f]; set_time(false, read_counter(REGISTER_1_YEAR), read_counter(REGISTER_1_MONTH), read_counter(REGISTER_1_DAY), m_reg[MODE00][REGISTER_DAY_OF_THE_WEEK], - read_counter(REGISTER_1_HOUR), read_counter(REGISTER_1_MINUTE), read_counter(REGISTER_1_SECOND)); + read_counter(REGISTER_1_HOUR), read_counter(REGISTER_1_MINUTE), read_counter(REGISTER_1_SECOND)); break; case MODE01: diff --git a/src/emu/rendlay.c b/src/emu/rendlay.c index 2c502cf031d..005383a0b3b 100644 --- a/src/emu/rendlay.c +++ b/src/emu/rendlay.c @@ -664,8 +664,8 @@ layout_element::component::component(running_machine &machine, xml_data_node &co m_numstops = 0; location=symbollist.find(0,","); while (location!=-1) - { - m_stopnames[m_numstops] = symbollist; + { + m_stopnames[m_numstops] = symbollist; m_stopnames[m_numstops].substr(0, location); symbollist.substr(location+1, symbollist.len()-(location-1)); m_numstops++; @@ -685,8 +685,8 @@ layout_element::component::component(running_machine &machine, xml_data_node &co m_imagefile[i] = m_stopnames[i]; m_stopnames[i].substr(0, location); m_imagefile[i].substr(location+1, m_imagefile[i].len()-(location-1)); - - //m_alphafile[i] = + + //m_alphafile[i] = m_file[i] = global_alloc(emu_file(machine.options().art_path(), OPEN_FLAG_READ)); } else @@ -1045,7 +1045,7 @@ void layout_element::component::draw_reel(running_machine &machine, bitmap_argb3 { basey = bounds.min_y - ((use_state)*(ourheight/num_shown)/(max_state_used/m_numstops)) + curry; } - + // wrap around... if (basey < bounds.min_y) basey += ((max_state_used)*(ourheight/num_shown)/(max_state_used/m_numstops)); @@ -1065,7 +1065,7 @@ void layout_element::component::draw_reel(running_machine &machine, bitmap_argb3 break; aspect *= 0.9f; } - + INT32 curx; curx = bounds.min_x + (bounds.width() - width) / 2; @@ -1076,7 +1076,7 @@ void layout_element::component::draw_reel(running_machine &machine, bitmap_argb3 if (m_file[fruit]) // render gfx { bitmap_argb32 tempbitmap2(dest.width(), ourheight/num_shown); - + if (m_bitmap[fruit].valid()) { render_resample_argb_bitmap_hq(tempbitmap2, m_bitmap[fruit], m_color); @@ -1103,7 +1103,7 @@ void layout_element::component::draw_reel(running_machine &machine, bitmap_argb3 } } } - + } } } @@ -1111,7 +1111,7 @@ void layout_element::component::draw_reel(running_machine &machine, bitmap_argb3 { // allocate a temporary bitmap bitmap_argb32 tempbitmap(dest.width(), dest.height()); - + // loop over characters for (const char *s = m_stopnames[fruit]; *s != 0; s++) { @@ -1210,7 +1210,7 @@ void layout_element::component::load_reel_bitmap(int number) // load the alpha bitmap if specified //if (m_bitmap[number].valid() && m_alphafile[number]) - // render_load_png(m_bitmap[number], *m_file[number], m_dirname, m_alphafile[number], true); + // render_load_png(m_bitmap[number], *m_file[number], m_dirname, m_alphafile[number], true); // if we can't load the bitmap just use text rendering if (!m_bitmap[number].valid()) diff --git a/src/emu/screen.c b/src/emu/screen.c index 05aa8ac141b..56ee41dbbbb 100644 --- a/src/emu/screen.c +++ b/src/emu/screen.c @@ -783,7 +783,7 @@ void screen_device::register_screen_bitmap(bitmap_t &bitmap) //------------------------------------------------- // vblank_port_read - custom port handler to -// return a VBLANK state +// return a VBLANK state //------------------------------------------------- int screen_device::vblank_port_read() diff --git a/src/emu/sound.c b/src/emu/sound.c index f9a376c54aa..6920dcb3c01 100644 --- a/src/emu/sound.c +++ b/src/emu/sound.c @@ -144,7 +144,7 @@ attotime sound_stream::sample_time() const //------------------------------------------------- -// user_gain - return the user-controllable gain +// user_gain - return the user-controllable gain // on a given stream's input //------------------------------------------------- @@ -217,7 +217,7 @@ const char *sound_stream::input_name(int inputnum, astring &string) const //------------------------------------------------- -// input_source_device - return the device +// input_source_device - return the device // attached as a given input's source //------------------------------------------------- @@ -229,7 +229,7 @@ device_t *sound_stream::input_source_device(int inputnum) const //------------------------------------------------- -// input_source_device - return the output number +// input_source_device - return the output number // attached as a given input's source //------------------------------------------------- diff --git a/src/emu/sound/i5000.c b/src/emu/sound/i5000.c index d483019d2a6..be0f34db405 100644 --- a/src/emu/sound/i5000.c +++ b/src/emu/sound/i5000.c @@ -45,7 +45,7 @@ void i5000snd_device::device_start() m_rom_base = (UINT16 *)device().machine().root_device().memregion(":i5000snd")->base(); m_rom_mask = device().machine().root_device().memregion(":i5000snd")->bytes() / 2 - 1; - + // register for savestates for (int ch = 0; ch < 16; ch++) { @@ -66,7 +66,7 @@ void i5000snd_device::device_start() save_item(NAME(m_channels[ch].output_r), ch); save_item(NAME(m_channels[ch].output_l), ch); } - + save_item(NAME(m_regs)); } diff --git a/src/emu/uimain.c b/src/emu/uimain.c index 5167149adb4..94cc6190a47 100644 --- a/src/emu/uimain.c +++ b/src/emu/uimain.c @@ -130,7 +130,7 @@ void ui_menu_main::populate() device_iterator deviter(machine().root_device()); for (device_t *device = deviter.first(); device != NULL; device = deviter.next()) if (device->rom_region()) - for (const rom_entry *rom = device->rom_region(); !ROMENTRY_ISEND(rom); rom++) + for (const rom_entry *rom = device->rom_region(); !ROMENTRY_ISEND(rom); rom++) if (ROMENTRY_ISSYSTEM_BIOS(rom)) { has_bioses= true; break; } /* add input menu items */ @@ -319,7 +319,7 @@ void ui_menu_main::handle() case BIOS_SELECTION: ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_bios_selection(machine(), container))); break; - + default: fatalerror("ui_menu_main::handle - unknown reference"); } @@ -496,7 +496,7 @@ void ui_menu_bios_selection::populate() { if (device->rom_region()) { const char *val = "default"; - for (const rom_entry *rom = device->rom_region(); !ROMENTRY_ISEND(rom); rom++) + for (const rom_entry *rom = device->rom_region(); !ROMENTRY_ISEND(rom); rom++) { if (ROMENTRY_ISSYSTEM_BIOS(rom) && ROM_GETBIOSFLAGS(rom)==device->system_bios()) { @@ -529,7 +529,7 @@ void ui_menu_bios_selection::handle() if (menu_event->iptkey == IPT_UI_LEFT || menu_event->iptkey == IPT_UI_RIGHT) { device_t *dev = (device_t *)menu_event->itemref; int cnt = 0; - for (const rom_entry *rom = dev->rom_region(); !ROMENTRY_ISEND(rom); rom++) + for (const rom_entry *rom = dev->rom_region(); !ROMENTRY_ISEND(rom); rom++) { if (ROMENTRY_ISSYSTEM_BIOS(rom)) cnt ++; } @@ -1372,7 +1372,7 @@ void ui_menu_analog::populate() case IPT_PEDAL3: use_autocenter = true; break; - + default: break; } diff --git a/src/lib/formats/ap2_dsk.c b/src/lib/formats/ap2_dsk.c index 03f29aa4fd8..ad73492e36b 100644 --- a/src/lib/formats/ap2_dsk.c +++ b/src/lib/formats/ap2_dsk.c @@ -1100,7 +1100,7 @@ bool a2_rwts18_format::save(io_generic *io, floppy_image *image) visualgrid[se][0] |= ADDRFOUND; visualgrid[se][0] |= ((chk ^ vl ^ tr ^ se)==0)?ADDRGOOD:0; #ifdef LENIENT_ADDR_CHECK -// if ((visualgrid[se][0] & ADDRFOUND) == ADDRFOUND) { +// if ((visualgrid[se][0] & ADDRFOUND) == ADDRFOUND) { #else if ((visualgrid[se][0] & ADDRGOOD) == ADDRGOOD) { #endif @@ -1217,7 +1217,7 @@ bool a2_rwts18_format::save(io_generic *io, floppy_image *image) io_generic_write(io, data, pos_data, 256); pos_data += 256; } - + // for the rest of the tracks for(int track=2; track < 70; track+=2) { UINT8 sectdata[(768)*6]; @@ -1257,7 +1257,7 @@ bool a2_rwts18_format::save(io_generic *io, floppy_image *image) visualgrid[se][track/2] |= ADDRFOUND; visualgrid[se][track/2] |= ((chk ^ tr ^ se)==0)?ADDRGOOD:0; #ifdef LENIENT_ADDR_CHECK -// if ((visualgrid[se][track/2] & ADDRFOUND) == ADDRFOUND) { +// if ((visualgrid[se][track/2] & ADDRFOUND) == ADDRFOUND) { #else if ((visualgrid[se][track/2] & ADDRGOOD) == ADDRGOOD) { #endif @@ -1267,7 +1267,7 @@ bool a2_rwts18_format::save(io_generic *io, floppy_image *image) // The next byte however is unique per title v = gb(buf, ts, pos, wrap); printf("Data mark header per-title byte = 0x%2x\n", v); - + visualgrid[se][track/2] |= DATAFOUND; //UINT8 *dest = sectdata+(768)*se; UINT8 data[0x401]; @@ -1289,55 +1289,55 @@ bool a2_rwts18_format::save(io_generic *io, floppy_image *image) } printf("Data Postamble was 0x%02x\n", dpost); /* - // next combine in the upper 2 bits of each byte - UINT8 bit_swap[4] = { 0, 2, 1, 3 }; - for(int i=0; i<0x56; i++) - data[i+0x056] = data[i+0x056]<<2 | bit_swap[data[i]&3]; - for(int i=0; i<0x56; i++) - data[i+0x0ac] = data[i+0x0ac]<<2 | bit_swap[(data[i]>>2)&3]; - for(int i=0; i<0x54; i++) - data[i+0x102] = data[i+0x102]<<2 | bit_swap[(data[i]>>4)&3]; - // now decode it into 256 bytes - // but only write it if the bitfield of the track shows datagood is NOT set. - // if it is set we don't want to overwrite a guaranteed good read with a bad one - // if past read had a bad checksum or bad postamble... + // next combine in the upper 2 bits of each byte + UINT8 bit_swap[4] = { 0, 2, 1, 3 }; + for(int i=0; i<0x56; i++) + data[i+0x056] = data[i+0x056]<<2 | bit_swap[data[i]&3]; + for(int i=0; i<0x56; i++) + data[i+0x0ac] = data[i+0x0ac]<<2 | bit_swap[(data[i]>>2)&3]; + for(int i=0; i<0x54; i++) + data[i+0x102] = data[i+0x102]<<2 | bit_swap[(data[i]>>4)&3]; + // now decode it into 256 bytes + // but only write it if the bitfield of the track shows datagood is NOT set. + // if it is set we don't want to overwrite a guaranteed good read with a bad one + // if past read had a bad checksum or bad postamble... #ifndef USE_OLD_BEST_SECTOR_PRIORITY - if (((visualgrid[se][track/2]&DATAGOOD)==0)||((visualgrid[se][track/2]&DATAPOST)==0)) { - // if the current read is good, and postamble is good, write it in, no matter what. - // if the current read is good and the current postamble is bad, write it in unless the postamble was good before - // if the current read is bad and the current postamble is good and the previous read had neither good, write it in - // if the current read isn't good and neither is the postamble but nothing better - // has been written before, write it anyway. - if ( ((data[0x156] == c) && (dpost&0xFFFF00)==0xDEAA00) || - (((data[0x156] == c) && (dpost&0xFFFF00)!=0xDEAA00) && ((visualgrid[se][track/2]&DATAPOST)==0)) || - (((data[0x156] != c) && (dpost&0xFFFF00)==0xDEAA00) && (((visualgrid[se][track/2]&DATAGOOD)==0)&&(visualgrid[se][track/2]&DATAPOST)==0)) || - (((data[0x156] != c) && (dpost&0xFFFF00)!=0xDEAA00) && (((visualgrid[se][track/2]&DATAGOOD)==0)&&(visualgrid[se][track/2]&DATAPOST)==0)) - ) { - for(int i=0x56; i<0x156; i++) { - UINT8 dv = data[i]; - *dest++ = dv; - } - } - } + if (((visualgrid[se][track/2]&DATAGOOD)==0)||((visualgrid[se][track/2]&DATAPOST)==0)) { + // if the current read is good, and postamble is good, write it in, no matter what. + // if the current read is good and the current postamble is bad, write it in unless the postamble was good before + // if the current read is bad and the current postamble is good and the previous read had neither good, write it in + // if the current read isn't good and neither is the postamble but nothing better + // has been written before, write it anyway. + if ( ((data[0x156] == c) && (dpost&0xFFFF00)==0xDEAA00) || + (((data[0x156] == c) && (dpost&0xFFFF00)!=0xDEAA00) && ((visualgrid[se][track/2]&DATAPOST)==0)) || + (((data[0x156] != c) && (dpost&0xFFFF00)==0xDEAA00) && (((visualgrid[se][track/2]&DATAGOOD)==0)&&(visualgrid[se][track/2]&DATAPOST)==0)) || + (((data[0x156] != c) && (dpost&0xFFFF00)!=0xDEAA00) && (((visualgrid[se][track/2]&DATAGOOD)==0)&&(visualgrid[se][track/2]&DATAPOST)==0)) + ) { + for(int i=0x56; i<0x156; i++) { + UINT8 dv = data[i]; + *dest++ = dv; + } + } + } #else - if ((visualgrid[se][track/2]&DATAGOOD)==0) { - for(int i=0x56; i<0x156; i++) { - UINT8 dv = data[i]; - *dest++ = dv; - } - } + if ((visualgrid[se][track/2]&DATAGOOD)==0) { + for(int i=0x56; i<0x156; i++) { + UINT8 dv = data[i]; + *dest++ = dv; + } + } #endif - // do some checking - if ((data[0x156] != c) || (dpost&0xFFFF00)!=0xDEAA00) - fprintf(stderr,"Data Mark:\tChecksum xpctd %d found %d: %s, Postamble %03X: %s\n", data[0x156], c, (data[0x156]==c)?"OK":"BAD", dpost, (dpost&0xFFFF00)==0xDEAA00?"OK":"BAD"); - if (data[0x156] == c) visualgrid[se][track/2] |= DATAGOOD; - if ((dpost&0xFFFF00)==0xDEAA00) visualgrid[se][track/2] |= DATAPOST; - } else if ((hb == 4)&&(dosver == 1)) { - fprintf(stderr,"ERROR: We don't handle dos sectors below 3.3 yet!\n"); - } else { - pos = opos; - wrap = owrap; - }*/ + // do some checking + if ((data[0x156] != c) || (dpost&0xFFFF00)!=0xDEAA00) + fprintf(stderr,"Data Mark:\tChecksum xpctd %d found %d: %s, Postamble %03X: %s\n", data[0x156], c, (data[0x156]==c)?"OK":"BAD", dpost, (dpost&0xFFFF00)==0xDEAA00?"OK":"BAD"); + if (data[0x156] == c) visualgrid[se][track/2] |= DATAGOOD; + if ((dpost&0xFFFF00)==0xDEAA00) visualgrid[se][track/2] |= DATAPOST; + } else if ((hb == 4)&&(dosver == 1)) { + fprintf(stderr,"ERROR: We don't handle dos sectors below 3.3 yet!\n"); + } else { + pos = opos; + wrap = owrap; + }*/ } } hb = 0; @@ -1374,4 +1374,4 @@ bool a2_rwts18_format::save(io_generic *io, floppy_image *image) return true; } -const floppy_format_type FLOPPY_RWTS18_FORMAT = &floppy_image_format_creator; \ No newline at end of file +const floppy_format_type FLOPPY_RWTS18_FORMAT = &floppy_image_format_creator; diff --git a/src/lib/formats/dfi_dsk.c b/src/lib/formats/dfi_dsk.c index 6f9e1e40fd4..a324c091e42 100644 --- a/src/lib/formats/dfi_dsk.c +++ b/src/lib/formats/dfi_dsk.c @@ -151,7 +151,7 @@ bool dfi_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) } else // (v & 0x80) == 0 total_time += v & 0x7f; } - + // its possible on single read images for there to be no index pulse during the image at all! if (onerev_time == 0) onerev_time = total_time; diff --git a/src/lib/libflac/libflac/memory.c b/src/lib/libflac/libflac/memory.c index 6dd9b77257e..0ce1e8f21bd 100644 --- a/src/lib/libflac/libflac/memory.c +++ b/src/lib/libflac/libflac/memory.c @@ -84,8 +84,8 @@ FLAC__bool FLAC__memory_alloc_aligned_int32_array(unsigned elements, FLAC__int32 FLAC__ASSERT(0 != aligned_pointer); FLAC__ASSERT(unaligned_pointer != aligned_pointer); -// if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */ -// return false; +// if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */ +// return false; pu = (FLAC__int32*)FLAC__memory_alloc_aligned(sizeof(*pu) * (size_t)elements, &u.pv); if(0 == pu) { @@ -113,8 +113,8 @@ FLAC__bool FLAC__memory_alloc_aligned_uint32_array(unsigned elements, FLAC__uint FLAC__ASSERT(0 != aligned_pointer); FLAC__ASSERT(unaligned_pointer != aligned_pointer); -// if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */ -// return false; +// if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */ +// return false; pu = (FLAC__uint32*)FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv); if(0 == pu) { @@ -142,8 +142,8 @@ FLAC__bool FLAC__memory_alloc_aligned_uint64_array(unsigned elements, FLAC__uint FLAC__ASSERT(0 != aligned_pointer); FLAC__ASSERT(unaligned_pointer != aligned_pointer); -// if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */ -// return false; +// if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */ +// return false; pu = (FLAC__uint64*)FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv); if(0 == pu) { @@ -171,8 +171,8 @@ FLAC__bool FLAC__memory_alloc_aligned_unsigned_array(unsigned elements, unsigned FLAC__ASSERT(0 != aligned_pointer); FLAC__ASSERT(unaligned_pointer != aligned_pointer); -// if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */ -// return false; +// if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */ +// return false; pu = (unsigned*)FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv); if(0 == pu) { @@ -202,8 +202,8 @@ FLAC__bool FLAC__memory_alloc_aligned_real_array(unsigned elements, FLAC__real * FLAC__ASSERT(0 != aligned_pointer); FLAC__ASSERT(unaligned_pointer != aligned_pointer); -// if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */ -// return false; +// if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */ +// return false; pu = (FLAC__real*)FLAC__memory_alloc_aligned(sizeof(*pu) * elements, &u.pv); if(0 == pu) { diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c index b0a1133720b..61e8996bd19 100644 --- a/src/mame/drivers/aliens.c +++ b/src/mame/drivers/aliens.c @@ -292,12 +292,12 @@ static MACHINE_CONFIG_START( aliens, aliens_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */ + MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */ MCFG_SOUND_CONFIG(ym2151_config) MCFG_SOUND_ROUTE(0, "mono", 0.60) MCFG_SOUND_ROUTE(1, "mono", 0.60) - MCFG_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz) /* verified on pcb */ + MCFG_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz) /* verified on pcb */ MCFG_SOUND_CONFIG(k007232_config) MCFG_SOUND_ROUTE(0, "mono", 0.20) MCFG_SOUND_ROUTE(1, "mono", 0.20) diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c index a458ac04553..b2665813a5c 100644 --- a/src/mame/drivers/amaticmg.c +++ b/src/mame/drivers/amaticmg.c @@ -594,15 +594,15 @@ static WRITE8_DEVICE_HANDLER(out_c_w) output_set_lamp_value(5, (data >> 4) & 1); /* HOLD2 */ output_set_lamp_value(6, (data >> 6) & 1); /* CANCEL */ -// coin_counter_w(machine(), 0, data & 0x04); /* Coin In */ -// coin_counter_w(machine(), 1, data & 0x01); /* Coin Out */ +// coin_counter_w(machine(), 0, data & 0x04); /* Coin In */ +// coin_counter_w(machine(), 1, data & 0x01); /* Coin Out */ logerror("port C: %2X\n", data); } WRITE8_MEMBER( amaticmg_state::unk80_w ) { -// dac_data_w(machine().device("dac"), data & 0x01); /* Sound DAC */ +// dac_data_w(machine().device("dac"), data & 0x01); /* Sound DAC */ } @@ -636,7 +636,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( amaticmg2_portmap, AS_IO, 8, amaticmg_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) -// ADDRESS_MAP_UNMAP_HIGH +// ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x00, 0x03) AM_DEVREADWRITE("ppi8255_0", i8255_device, read, write) AM_RANGE(0x20, 0x23) AM_DEVREADWRITE("ppi8255_1", i8255_device, read, write) AM_RANGE(0x40, 0x41) AM_DEVWRITE_LEGACY("ymsnd", ym3812_w) @@ -879,8 +879,8 @@ static MACHINE_CONFIG_START( amaticmg, amaticmg_state ) MCFG_SOUND_CONFIG(ym3812_config) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) -// MCFG_SOUND_ADD("dac", DAC, 0) /* Y3014B */ -// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) +// MCFG_SOUND_ADD("dac", DAC, 0) /* Y3014B */ +// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_CONFIG_END diff --git a/src/mame/drivers/astrafr.c b/src/mame/drivers/astrafr.c index 3d824c4007b..dc110ad6492 100644 --- a/src/mame/drivers/astrafr.c +++ b/src/mame/drivers/astrafr.c @@ -111,7 +111,7 @@ public: logerror("%08x astra_fgpa_slave_w offset %02x %02x\n", pc, offset, data); } } - + // devices required_device m_maincpu; optional_device m_slavecpu; @@ -2314,7 +2314,7 @@ GAME( 200?, as_tble, as_tbl , astra_single, astrafr, 0, ROT0, "Astra GAME( 200?, as_tblf, as_tbl , astra_single, astrafr, 0, ROT0, "Astra", "Triple Bells (Astra, V301)" , GAME_IS_SKELETON_MECHANICAL) GAME( 200?, as_td, 0 , astra_single_2e, astrafr, astradec, ROT0, "Astra", "Twin Dragons (Astra, V103)" , GAME_IS_SKELETON_MECHANICAL) -GAME( 200?, as_twp, 0 , astra_single_2e, astrafr, 0, ROT0, "Astra", "Twin Pots (Astra, V106)" , GAME_IS_SKELETON_MECHANICAL) +GAME( 200?, as_twp, 0 , astra_single_2e, astrafr, 0, ROT0, "Astra", "Twin Pots (Astra, V106)" , GAME_IS_SKELETON_MECHANICAL) GAME( 200?, as_twpa, as_twp , astra_single, astrafr, 0, ROT0, "Astra", "Twin Pots (Astra, V104)" , GAME_IS_SKELETON_MECHANICAL) GAME( 200?, as_vn, 0 , astrafr_dual_alt_37, astrafr, astradec_dual, ROT0, "Astra", "Vegas Nights (Astra, V205)" , GAME_IS_SKELETON_MECHANICAL) GAME( 200?, as_vcv, 0 , astra_single, astrafr, astradec, ROT0, "Astra", "Viva Cash Vegas (Astra, V005)" , GAME_IS_SKELETON_MECHANICAL) diff --git a/src/mame/drivers/bfm_sc4.c b/src/mame/drivers/bfm_sc4.c index e13cd53eefe..954b814ea10 100644 --- a/src/mame/drivers/bfm_sc4.c +++ b/src/mame/drivers/bfm_sc4.c @@ -23954,7 +23954,7 @@ GAME( 200?, sc4duckqa ,sc4duckq, sc4, sc4, sc4, ROT0, "Qps","Ducks Of Hazzard (Q // PR1326 CASINO EASY STREAK PR1326 EASY STREAK SOUNDS11 (actually expects PR1326_CAS_EASY_STREAK_SOUNDS11 ? ) -GAME( 200?, sc4eascs ,0, sc4, sc4, sc4, ROT0, "BFM","Easy Streak Casino (Bellfruit) (Scorpion 4) (set 1)", GAME_IS_SKELETON_MECHANICAL ) +GAME( 200?, sc4eascs ,0, sc4, sc4, sc4, ROT0, "BFM","Easy Streak Casino (Bellfruit) (Scorpion 4) (set 1)", GAME_IS_SKELETON_MECHANICAL ) GAME( 200?, sc4eascsa ,sc4eascs, sc4, sc4, sc4, ROT0, "BFM","Easy Streak Casino (Bellfruit) (Scorpion 4) (set 2)", GAME_IS_SKELETON_MECHANICAL ) GAME( 200?, sc4eascsb ,sc4eascs, sc4, sc4, sc4, ROT0, "BFM","Easy Streak Casino (Bellfruit) (Scorpion 4) (set 3)", GAME_IS_SKELETON_MECHANICAL ) GAME( 200?, sc4eascsc ,sc4eascs, sc4, sc4, sc4, ROT0, "BFM","Easy Streak Casino (Bellfruit) (Scorpion 4) (set 4)", GAME_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/drivers/bfm_sc5.c b/src/mame/drivers/bfm_sc5.c index 7f9b63b3480..f97bb759b26 100644 --- a/src/mame/drivers/bfm_sc5.c +++ b/src/mame/drivers/bfm_sc5.c @@ -10774,7 +10774,7 @@ ROM_START( ad5sslam ) ROM_LOAD( "p3084s12.bin", 0x0000, 0x1000000, CRC(7d33e52d) SHA1(6591834c60103f71211449355c592473180c33d9) ) ROM_LOAD( "39211386.bin", 0x00000, 0x1000000, CRC(05d2c75b) SHA1(7c82d48e74997b4fe2c12e56a96a7c7ca57628cb) ) ROM_LOAD( "39212386.bin", 0x00000, 0x1000000, CRC(4b47f4fc) SHA1(4a72df0c60968bdedac967f1989e3a4bcd7b974d) ) - + sc_sslam_others ROM_END @@ -11467,8 +11467,8 @@ ROM_START( ad5copsr ) ROM_LOAD( "39212623.bin", 0x00000, 0x1000000, CRC(13b1e404) SHA1(ee170ffbd8fcd552c374e550e58a455da76af5fe) ) - - + + ROM_END @@ -11778,7 +11778,7 @@ ROM_START( ad5mowow ) ROM_LOAD( "39211172.bin", 0x00000, 0x1000000, CRC(8342c383) SHA1(cc92f7ebab0a55d2a6023ca194e81ef6154563a1) ) // video casino wow ROM_LOAD( "39212172.bin", 0x00000, 0x1000000, CRC(3aed8e3a) SHA1(de5a3fc0d77bf4044a17f17f41ab5c953b500e81) ) // video casino wow - + ROM_LOAD( "39211351.bin", 0x00000, 0x511189, CRC(8dd8fc7d) SHA1(54a5e2887e0df095d12beb7fbe7e5fe766c116a4) ) ROM_LOAD( "39212351.bin", 0x00000, 0x511189, CRC(38c7be05) SHA1(9d0057863fcd02b5d68717b3bbd5762131b15ed7) ) diff --git a/src/mame/drivers/bfm_swp.c b/src/mame/drivers/bfm_swp.c index 968fc259ca5..bc6e4ffd9ca 100644 --- a/src/mame/drivers/bfm_swp.c +++ b/src/mame/drivers/bfm_swp.c @@ -1,4 +1,4 @@ -/* Bellfruit SWP (Skill With Prizes) Video hardware +/* Bellfruit SWP (Skill With Prizes) Video hardware aka Cobra 3 */ diff --git a/src/mame/drivers/bmcpokr.c b/src/mame/drivers/bmcpokr.c index e2aa8324c09..fa80e2daf34 100644 --- a/src/mame/drivers/bmcpokr.c +++ b/src/mame/drivers/bmcpokr.c @@ -209,7 +209,7 @@ SCREEN_UPDATE_IND16( bmcpokr ) { UINT16 data = state->m_videoram[count]; count++; - + drawgfx_opaque(bitmap,cliprect,gfx,data,0,0,0,x*8,y*8); } diff --git a/src/mame/drivers/byvid.c b/src/mame/drivers/byvid.c index 3cc4129978c..854641dd266 100644 --- a/src/mame/drivers/byvid.c +++ b/src/mame/drivers/byvid.c @@ -32,7 +32,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(video_test); DECLARE_INPUT_CHANGED_MEMBER(sound_test); - + UINT8 m_sound_port2; }; @@ -117,8 +117,8 @@ static WRITE_LINE_DEVICE_HANDLER(by133_firq) static WRITE_LINE_DEVICE_HANDLER(by133_cb2) { // to M6803 port 2 d0? -// by133_state *drv_state = device->machine().driver_data(); -// device_set_input_line(drv_state->m_audiocpu, M6801_TIN_LINE, state ? ASSERT_LINE : CLEAR_LINE); +// by133_state *drv_state = device->machine().driver_data(); +// device_set_input_line(drv_state->m_audiocpu, M6801_TIN_LINE, state ? ASSERT_LINE : CLEAR_LINE); } static READ8_DEVICE_HANDLER(by133_portb_r) @@ -130,7 +130,7 @@ static WRITE8_DEVICE_HANDLER(by133_portb_w) { by133_state *state = device->machine().driver_data(); device->machine().scheduler().synchronize(); - + // d0-d3 to m6803 d1-d4 state->m_sound_port2 = data << 1 & 0x1f; } diff --git a/src/mame/drivers/chance32.c b/src/mame/drivers/chance32.c index d0a26e8dde3..3450730808d 100644 --- a/src/mame/drivers/chance32.c +++ b/src/mame/drivers/chance32.c @@ -148,11 +148,11 @@ static ADDRESS_MAP_START( chance32_portmap, AS_IO, 8, chance32_state ) AM_RANGE(0x23, 0x23) AM_READ_PORT("DSW3") AM_RANGE(0x24, 0x24) AM_READ_PORT("DSW4") AM_RANGE(0x25, 0x25) AM_READ(mux_r) -// AM_RANGE(0x26, 0x26) AM_READ_PORT("UNK") // vblank? +// AM_RANGE(0x26, 0x26) AM_READ_PORT("UNK") // vblank? AM_RANGE(0x30, 0x30) AM_DEVWRITE("crtc", mc6845_device, address_w) AM_RANGE(0x31, 0x31) AM_DEVWRITE("crtc", mc6845_device, register_w) AM_RANGE(0x50, 0x50) AM_DEVREADWRITE("oki", okim6295_device, read, write) -// AM_RANGE(0x60, 0x60) AM_WRITENOP // lamps +// AM_RANGE(0x60, 0x60) AM_WRITENOP // lamps ADDRESS_MAP_END diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c index e88e0349bc2..c5524adb8f2 100644 --- a/src/mame/drivers/crimfght.c +++ b/src/mame/drivers/crimfght.c @@ -318,12 +318,12 @@ static MACHINE_CONFIG_START( crimfght, crimfght_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */ + MCFG_SOUND_ADD("ymsnd", YM2151, XTAL_3_579545MHz) /* verified on pcb */ MCFG_SOUND_CONFIG(ym2151_config) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) - MCFG_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz) /* verified on pcb */ + MCFG_SOUND_ADD("k007232", K007232, XTAL_3_579545MHz) /* verified on pcb */ MCFG_SOUND_CONFIG(k007232_config) MCFG_SOUND_ROUTE(0, "lspeaker", 0.20) MCFG_SOUND_ROUTE(0, "rspeaker", 0.20) diff --git a/src/mame/drivers/galdrvr.c b/src/mame/drivers/galdrvr.c index 496d721b8c1..f366e4e7dff 100644 --- a/src/mame/drivers/galdrvr.c +++ b/src/mame/drivers/galdrvr.c @@ -4209,7 +4209,7 @@ ROM_START( mooncrstuku ) ROM_LOAD( "smc2f", 0x0800, 0x0800, CRC(410ab430) SHA1(d89abff6ac4afbf69377a1d63043d629a634aab7) ) ROM_LOAD( "smc3f", 0x1000, 0x0800, CRC(a6b4144b) SHA1(2b27ad54d716286c0dc9476d47df182ae01bcfd7) ) ROM_LOAD( "smc4f", 0x1800, 0x0800, CRC(4cc046fe) SHA1(465eaacd50967d768babadd09ab9cad35380f6bf) ) - ROM_LOAD( "smc5f", 0x2000, 0x0800, CRC(06d378a6) SHA1(99dbe9fc7f95f8fdce86eb5c32bd1ca1bea0ca3c) ) + ROM_LOAD( "smc5f", 0x2000, 0x0800, CRC(06d378a6) SHA1(99dbe9fc7f95f8fdce86eb5c32bd1ca1bea0ca3c) ) ROM_LOAD( "smc6f", 0x2800, 0x0800, CRC(6e84a927) SHA1(82e8e825d157c3c947a3a222bca059a735169c7d) ) ROM_LOAD( "smc7f", 0x3000, 0x0800, CRC(b45af1e8) SHA1(d7020774707234acdaef5c655f667d5ee9e54a13) ) ROM_LOAD( "smc8f_uk", 0x3800, 0x0800, CRC(b968b2ff) SHA1(40105423f48d2260e85597c3c1e4d8fe947db793) ) diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c index 95a15b0a135..71c95758b7b 100644 --- a/src/mame/drivers/gei.c +++ b/src/mame/drivers/gei.c @@ -1937,4 +1937,4 @@ GAME( 1986, suprpkr1, suprpokr, suprpokr, suprpokr, 0, ROT0, "Grayhound El GAME( 1991, quiz211, 0, findout, quiz, 0, ROT0, "Elettronolo", "Quiz (Revision 2.11)", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) GAME( 1992, geimulti, 0, geimulti, geimulti, geimulti,ROT0, "Grayhound Electronics", "GEI Multi Game", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) -GAME( 1992, sprtauth, 0, sprtauth, sprtauth, geimulti,ROT0, "Classic Games", "Sports Authority", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) \ No newline at end of file +GAME( 1992, sprtauth, 0, sprtauth, sprtauth, geimulti,ROT0, "Classic Games", "Sports Authority", GAME_IMPERFECT_GRAPHICS | GAME_IMPERFECT_SOUND ) diff --git a/src/mame/drivers/hikaru.c b/src/mame/drivers/hikaru.c index 3c8d4adda08..193af77d0e6 100644 --- a/src/mame/drivers/hikaru.c +++ b/src/mame/drivers/hikaru.c @@ -321,7 +321,7 @@ Notes: /* New hardware notes from Stefano Teso: - + - The master SH-4 port A: the bit layout for this thing is (MSB left) xxxx xxii iiee eexM @@ -376,8 +376,8 @@ Notes: - the serial device at 0080000(A|C) is not an EEPROM; it's likely some weird device that is used to query the heirarchy of the attached input/output devices. Probably the naomi has something similar, I - haven't looked into it yet. - + haven't looked into it yet. + */ #include "emu.h" diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c index e395e45b89a..422dd21b729 100644 --- a/src/mame/drivers/ksys573.c +++ b/src/mame/drivers/ksys573.c @@ -348,23 +348,23 @@ G: gun mania only, drives air soft gun (this game uses real BB bullet) CN3 - Connector joining this PCB to the MAIN PCB HYC24855 - ? RCA-L/R - RCA connectors for left/right audio output - + Drummania 10th Mix Multisession ------------------------------- - + This box is used with multi-session System 573 games. - + Main board is standard GX700 PCB with CDROM (Drummania 10th Mix Multisession) and Digital I/O Board GX894-PWB(B)A BIOS is on a small plug-in daughterboard. Daughterboard contains one EPROM, one PAL22V10, 2 logic chips and a PIC16F84. The dumps provided are the EPROM dumped separately and a dump of the 'board' with it plugged in (reading may be affected by the PIC) - - + + PCB Layout of External Multisession Box --------------------------------------- - + GXA25-PWB(A)(C)2000 KONAMI |--------------------------------------------------------------------------| |CN9 ADM232 LS273 PC16552 PC16552 XC9536(1) CN13| @@ -407,7 +407,7 @@ G: gun mania only, drives air soft gun (this game uses real BB bullet) TC9446F - Toshiba TC9446F-016 Audio Digital Processor for Decode of Dolby Digital (AC-3) MPEG2 Audio CN16-CN19 - Connector for sub board (3 of them are present). One board connects via a thin cable from CN1 to the main board to a connector on the security board labelled 'AMP BOX'. - + Sub Board Layout ---------------- @@ -421,7 +421,7 @@ G: gun mania only, drives air soft gun (this game uses real BB bullet) |ZUS1R50505 6379A | | LM358 | |---------------------------------| - + */ #include "emu.h" diff --git a/src/mame/drivers/namcos10.c b/src/mame/drivers/namcos10.c index 74a005513b2..25f239ba7bb 100644 --- a/src/mame/drivers/namcos10.c +++ b/src/mame/drivers/namcos10.c @@ -352,7 +352,7 @@ READ32_MEMBER(namcos10_state::range_r) */ UINT16 dd16 = d16 ^ key; - + key = d16; key = diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c index fb4e25ce9b2..ca720c2991e 100644 --- a/src/mame/drivers/puckpkmn.c +++ b/src/mame/drivers/puckpkmn.c @@ -246,7 +246,7 @@ static ADDRESS_MAP_START( jzth_map, AS_PROGRAM, 16, md_boot_state ) AM_RANGE(0x700022, 0x700023) AM_DEVREADWRITE8("oki", okim6295_device, read, write, 0x00ff) AM_RANGE(0xa04000, 0xa04003) AM_DEVREADWRITE8_LEGACY("ymsnd", megadriv_68k_YM2612_read, megadriv_68k_YM2612_write, 0xffff) AM_RANGE(0xc00000, 0xc0001f) AM_READWRITE_LEGACY(megadriv_vdp_r, megadriv_vdp_w) - + AM_RANGE(0xe00000, 0xe0ffff) AM_RAM AM_MIRROR(0x1f0000) AM_BASE_LEGACY(&megadrive_ram) diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index 5b55b83f694..7eb37ee7c99 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -687,8 +687,8 @@ READ8_MEMBER(seta2_state::funcube_serial_r) static void funcube_debug_outputs(running_machine &machine) { #ifdef MAME_DEBUG -// seta2_state *state = machine.driver_data(); -// popmessage("LED: %02x OUT: %02x", (int)*state->m_funcube_leds, (int)*state->m_funcube_outputs); +// seta2_state *state = machine.driver_data(); +// popmessage("LED: %02x OUT: %02x", (int)*state->m_funcube_leds, (int)*state->m_funcube_outputs); #endif } diff --git a/src/mame/includes/bfm_sc45.h b/src/mame/includes/bfm_sc45.h index 28660bf2bb1..70c5b72b063 100644 --- a/src/mame/includes/bfm_sc45.h +++ b/src/mame/includes/bfm_sc45.h @@ -62,7 +62,7 @@ public: : sc4_state(mconfig, type, tag), m_adder4cpu(*this, "adder4") { } - + UINT32* m_adder4cpuregion; UINT32* m_adder4ram; @@ -3121,7 +3121,7 @@ INPUT_PORTS_EXTERN( sc4_base ); ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 ) \ ROM_LOAD( "95008666.bin", 0x000000, 0x100000, CRC(6dcb4a96) SHA1(844dc67bacb7136a3c0f897a69ac5bcacaa4968a) ) \ ROM_LOAD( "95008667.bin", 0x100000, 0x100000, CRC(5243784c) SHA1(771248de9fa3446ad6fe1bd35b240ad6ae23f008) ) \ - + diff --git a/src/mame/includes/megadriv.h b/src/mame/includes/megadriv.h index 2087727cf65..31a9592a9e8 100644 --- a/src/mame/includes/megadriv.h +++ b/src/mame/includes/megadriv.h @@ -120,48 +120,48 @@ public: // protection value is read from 0x710000 after a series of writes.. and stored at ff0007 // startup /* - 059ce0 writing to bl_710000_w ff08 ffff - 059d04 writing to bl_710000_w 000a ffff - 059d04 writing to bl_710000_w 000b ffff - 059d04 writing to bl_710000_w 000c ffff - 059d04 writing to bl_710000_w 000f ffff - 059d1c writing to bl_710000_w ff09 ffff - 059d2a reading from bl_710000_r (wants 0xe) - 059ce0 writing to bl_710000_w ff08 ffff - 059d04 writing to bl_710000_w 000a ffff - 059d04 writing to bl_710000_w 000b ffff - 059d04 writing to bl_710000_w 000c ffff - 059d04 writing to bl_710000_w 000f ffff - 059d1c writing to bl_710000_w ff09 ffff - 059d2a reading from bl_710000_r (wants 0xe) - */ + 059ce0 writing to bl_710000_w ff08 ffff + 059d04 writing to bl_710000_w 000a ffff + 059d04 writing to bl_710000_w 000b ffff + 059d04 writing to bl_710000_w 000c ffff + 059d04 writing to bl_710000_w 000f ffff + 059d1c writing to bl_710000_w ff09 ffff + 059d2a reading from bl_710000_r (wants 0xe) + 059ce0 writing to bl_710000_w ff08 ffff + 059d04 writing to bl_710000_w 000a ffff + 059d04 writing to bl_710000_w 000b ffff + 059d04 writing to bl_710000_w 000c ffff + 059d04 writing to bl_710000_w 000f ffff + 059d1c writing to bl_710000_w ff09 ffff + 059d2a reading from bl_710000_r (wants 0xe) + */ // before lv stage 3 /* - 059ce0 writing to bl_710000_w 0008 ffff - 059d04 writing to bl_710000_w 000b ffff - 059d04 writing to bl_710000_w 000f ffff - 059d1c writing to bl_710000_w ff09 ffff - 059d2a reading from bl_710000_r (wants 0x4) - */ + 059ce0 writing to bl_710000_w 0008 ffff + 059d04 writing to bl_710000_w 000b ffff + 059d04 writing to bl_710000_w 000f ffff + 059d1c writing to bl_710000_w ff09 ffff + 059d2a reading from bl_710000_r (wants 0x4) + */ // start level 3 /* - 059ce0 writing to bl_710000_w ff08 ffff - 059d04 writing to bl_710000_w 000b ffff - 059d04 writing to bl_710000_w 000c ffff - 059d04 writing to bl_710000_w 000e ffff - 059d1c writing to bl_710000_w ff09 ffff - 059d2a reading from bl_710000_r (wants 0x5) - - // after end sequence - 059ce0 writing to bl_710000_w 0008 ffff - 059d04 writing to bl_710000_w 000a ffff - 059d04 writing to bl_710000_w 000b ffff - 059d04 writing to bl_710000_w 000c ffff - 059d04 writing to bl_710000_w 000f ffff - 059d1c writing to bl_710000_w ff09 ffff - 059d2a reading from bl_710000_r (wants 0xe) - - */ + 059ce0 writing to bl_710000_w ff08 ffff + 059d04 writing to bl_710000_w 000b ffff + 059d04 writing to bl_710000_w 000c ffff + 059d04 writing to bl_710000_w 000e ffff + 059d1c writing to bl_710000_w ff09 ffff + 059d2a reading from bl_710000_r (wants 0x5) + + // after end sequence + 059ce0 writing to bl_710000_w 0008 ffff + 059d04 writing to bl_710000_w 000a ffff + 059d04 writing to bl_710000_w 000b ffff + 059d04 writing to bl_710000_w 000c ffff + 059d04 writing to bl_710000_w 000f ffff + 059d1c writing to bl_710000_w ff09 ffff + 059d2a reading from bl_710000_r (wants 0xe) + + */ m_protcount++; } diff --git a/src/mame/layout/bfm_sc1.lay b/src/mame/layout/bfm_sc1.lay index 9448bb2af3f..c0805393696 100644 --- a/src/mame/layout/bfm_sc1.lay +++ b/src/mame/layout/bfm_sc1.lay @@ -19,7 +19,7 @@ - + diff --git a/src/mame/layout/bfm_sc4.lay b/src/mame/layout/bfm_sc4.lay index 849875d8b2f..900360c733d 100644 --- a/src/mame/layout/bfm_sc4.lay +++ b/src/mame/layout/bfm_sc4.lay @@ -28,8 +28,8 @@ - - + + @@ -144,8 +144,8 @@ - - + + @@ -155,7 +155,7 @@ - + @@ -228,7 +228,7 @@ - + diff --git a/src/mame/video/awpvid.c b/src/mame/video/awpvid.c index d23557784aa..aab99ef8353 100644 --- a/src/mame/video/awpvid.c +++ b/src/mame/video/awpvid.c @@ -1,13 +1,13 @@ /************************************************************************************* AWP Hardware video simulation system - originally written for AGEMAME by J.Wallace + originally written for AGEMAME by J.Wallace M.A.M.E Core Copyright Nicola Salmoria and the MAME Team. - This is a primitive handler for generating reels with multiple symbols visible - hanging off steppers.c . - + This is a primitive handler for generating reels with multiple symbols visible + hanging off steppers.c . + **************************************************************************************/ #include "emu.h" @@ -36,10 +36,10 @@ void awp_draw_reel(int rno) // if the reel isn't configured don't do this, otherwise you'll get DIV0 if (stepper_get_max(rno)) { - sprintf(rg,"sreel%d", x); // our new scrolling reels are called 'sreel' + sprintf(rg,"sreel%d", x); // our new scrolling reels are called 'sreel' // normalize the value int sreelpos = (reelpos[rno] * 0x10000) / stepper_get_max(rno); - + output_set_value(rg,sreelpos); } } diff --git a/src/mame/video/turbo.c b/src/mame/video/turbo.c index f5bebff4895..8ca98d3776a 100644 --- a/src/mame/video/turbo.c +++ b/src/mame/video/turbo.c @@ -342,7 +342,7 @@ static void turbo_prepare_sprites(running_machine &machine, turbo_state *state, VR2 = 910 Ohm */ info->step[level] = sprite_xscale(xscale, 1.0e3 * machine.root_device().ioport("VR1")->read() / 100.0, 1.0e3 * machine.root_device().ioport("VR2")->read() / 100.0, 100e-12); - } + } } } diff --git a/src/osd/windows/input.c b/src/osd/windows/input.c index d0c9bfd8660..d8a4cff6444 100644 --- a/src/osd/windows/input.c +++ b/src/osd/windows/input.c @@ -792,7 +792,7 @@ void windows_osd_interface::customize_input_type_list(simple_listconfigure_osd("RENDER_AVI", "Record Rendered Video"); entry->defseq(SEQ_TYPE_STANDARD).set(KEYCODE_LALT, KEYCODE_F11); break; - + // leave everything else alone default: break; diff --git a/src/version.c b/src/version.c index 47b1d51e7a4..b8d01fc9340 100644 --- a/src/version.c +++ b/src/version.c @@ -38,4 +38,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.145u7 ("__DATE__")"; +const char build_version[] = "0.145u8 ("__DATE__")"; -- cgit v1.2.3