From a449c766a220e5edcfc5aeb03730813a929a7c8a Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Sun, 5 Jun 2011 22:35:20 +0000 Subject: Cleanups and version bump --- src/emu/attotime.c | 2 +- src/emu/cpu/am29000/am29ops.h | 4 +-- src/emu/cpu/i386/i386ops.c | 4 +-- src/emu/cpu/i86/instr286.c | 2 +- src/emu/cpu/i86/instr86.c | 4 +-- src/emu/cpu/i86/table286.h | 16 ++++----- src/emu/cpu/konami/konamops.c | 2 +- src/emu/cpu/m6800/6800ops.c | 2 +- src/emu/cpu/m68000/m68kfpu.c | 6 ++-- src/emu/cpu/m6805/6805ops.c | 2 +- src/emu/cpu/m6809/6809ops.c | 2 +- src/emu/cpu/minx/minx.c | 4 +-- src/emu/cpu/mips/mips3com.c | 4 +-- src/emu/hashfile.c | 6 ++-- src/emu/inptport.c | 2 +- src/emu/inptport.h | 2 +- src/emu/input.c | 76 +++++++++++++++++++++---------------------- src/emu/input.h | 42 ++++++++++++------------ src/emu/machine/53c810.c | 18 +++++----- src/emu/machine/mc146818.c | 2 +- src/emu/machine/mc146818.h | 4 +-- src/emu/machine/smc91c9x.c | 4 +-- src/emu/mconfig.c | 2 +- src/emu/memory.c | 14 ++++---- src/emu/schedule.h | 4 +-- src/emu/screen.c | 2 +- src/emu/sound/okim6376.c | 10 +++--- src/emu/sound/rf5c400.c | 2 +- src/emu/sound/ymf271.c | 4 +-- src/emu/video/hd63484.c | 8 ++--- src/emu/video/tlc34076.c | 4 +-- src/emu/video/vooddefs.h | 2 +- 32 files changed, 131 insertions(+), 131 deletions(-) (limited to 'src/emu') diff --git a/src/emu/attotime.c b/src/emu/attotime.c index 12b9c537dd2..d28f832ceca 100644 --- a/src/emu/attotime.c +++ b/src/emu/attotime.c @@ -148,7 +148,7 @@ const char *attotime::as_string(int precision) const static char buffers[8][30]; static int nextbuf; char *buffer = &buffers[nextbuf++ % 8][0]; - + // special case: never if (*this == never) sprintf(buffer, "%-*s", precision, "(never)"); diff --git a/src/emu/cpu/am29000/am29ops.h b/src/emu/cpu/am29000/am29ops.h index 9040379a901..f23189a043a 100644 --- a/src/emu/cpu/am29000/am29ops.h +++ b/src/emu/cpu/am29000/am29ops.h @@ -1059,7 +1059,7 @@ static void LOADM(am29000_state *am29000) static void STORE(am29000_state *am29000) { UINT32 addr = INST_M_BIT ? I8: GET_RB_VAL; -// UINT32 r; +// UINT32 r; if (INST_UA_BIT) fatalerror("Am29000: UA bit set on LOAD\n"); @@ -1067,7 +1067,7 @@ static void STORE(am29000_state *am29000) if (INST_CE_BIT) { logerror("Am29000: Attempting a co-processor LOAD!\n"); -// r = 0; +// r = 0; } else { diff --git a/src/emu/cpu/i386/i386ops.c b/src/emu/cpu/i386/i386ops.c index c851c8ca2eb..85f8eb4ad08 100644 --- a/src/emu/cpu/i386/i386ops.c +++ b/src/emu/cpu/i386/i386ops.c @@ -1018,7 +1018,7 @@ static void I386OP(repeat)(i386_state *cpustate, int invert_flag) UINT32 repeated_eip = cpustate->eip; UINT32 repeated_pc = cpustate->pc; UINT8 opcode; // = FETCH(cpustate); -// UINT32 eas, ead; +// UINT32 eas, ead; UINT32 count; INT32 cycle_base = 0, cycle_adjustment = 0; UINT8 prefix_flag=1; @@ -1070,7 +1070,7 @@ static void I386OP(repeat)(i386_state *cpustate, int invert_flag) // FIXME: the following does not work if both address override and segment override are used i386_translate(cpustate, cpustate->segment_override, cpustate->sreg[cpustate->segment_prefix].d ? REG32(ESI) : REG16(SI) ); } else { - //eas = + //eas = i386_translate(cpustate, DS, cpustate->address_size ? REG32(ESI) : REG16(SI) ); } i386_translate(cpustate, ES, cpustate->address_size ? REG32(EDI) : REG16(DI) ); diff --git a/src/emu/cpu/i86/instr286.c b/src/emu/cpu/i86/instr286.c index bbf1e43f3f5..f25a446ba64 100644 --- a/src/emu/cpu/i86/instr286.c +++ b/src/emu/cpu/i86/instr286.c @@ -841,7 +841,7 @@ static void PREFIX286(_escape_7)(i8086_state *cpustate) /* Opcode 0xdf */ if ((cpustate->msw&8) || (cpustate->msw&4)) throw TRAP(FPU_UNAVAILABLE,-1); unsigned ModRM = FETCH; ICOUNT -= timing.nop; - GetRMByte(ModRM); + GetRMByte(ModRM); if (ModRM == 0xe0) cpustate->regs.w[AX] = 0xffff; // FPU not present } diff --git a/src/emu/cpu/i86/instr86.c b/src/emu/cpu/i86/instr86.c index 75ad21446c3..8d477125627 100644 --- a/src/emu/cpu/i86/instr86.c +++ b/src/emu/cpu/i86/instr86.c @@ -1177,8 +1177,8 @@ static void PREFIX86(_cmp_axd16)(i8086_state *cpustate) /* Opcode 0x3d */ static void PREFIX86(_aas)(i8086_state *cpustate) /* Opcode 0x3f */ { -// UINT8 ALcarry=1; -// if (cpustate->regs.b[AL]>0xf9) ALcarry=2; +// UINT8 ALcarry=1; +// if (cpustate->regs.b[AL]>0xf9) ALcarry=2; if (AF || ((cpustate->regs.b[AL] & 0xf) > 9)) { diff --git a/src/emu/cpu/i86/table286.h b/src/emu/cpu/i86/table286.h index 24b1b05215b..0ac2afa7570 100644 --- a/src/emu/cpu/i86/table286.h +++ b/src/emu/cpu/i86/table286.h @@ -221,14 +221,14 @@ static void (*const PREFIX286(_instruction)[256])(i8086_state *cpustate) = PREFIX86(_aad), /* 0xd5 */ PREFIX286(_invalid), PREFIX86(_xlat), /* 0xd7 */ - PREFIX286(_escape), /* 0xd8 */ - PREFIX286(_escape), /* 0xd9 */ - PREFIX286(_escape), /* 0xda */ - PREFIX286(_escape), /* 0xdb */ - PREFIX286(_escape), /* 0xdc */ - PREFIX286(_escape), /* 0xdd */ - PREFIX286(_escape), /* 0xde */ - PREFIX286(_escape_7), /* 0xdf */ + PREFIX286(_escape), /* 0xd8 */ + PREFIX286(_escape), /* 0xd9 */ + PREFIX286(_escape), /* 0xda */ + PREFIX286(_escape), /* 0xdb */ + PREFIX286(_escape), /* 0xdc */ + PREFIX286(_escape), /* 0xdd */ + PREFIX286(_escape), /* 0xde */ + PREFIX286(_escape_7), /* 0xdf */ PREFIX86(_loopne), /* 0xe0 */ PREFIX86(_loope), /* 0xe1 */ PREFIX86(_loop), /* 0xe2 */ diff --git a/src/emu/cpu/konami/konamops.c b/src/emu/cpu/konami/konamops.c index e04c2483311..1049e18e28e 100644 --- a/src/emu/cpu/konami/konamops.c +++ b/src/emu/cpu/konami/konamops.c @@ -300,7 +300,7 @@ INLINE void bra( konami_state *cpustate ) } /* $21 BRN relative ----- */ -static UINT8 konami_brn_t; // hack around GCC 4.6 error because we need the side effects of IMMBYTE +static UINT8 konami_brn_t; // hack around GCC 4.6 error because we need the side effects of IMMBYTE INLINE void brn( konami_state *cpustate ) { IMMBYTE(cpustate, konami_brn_t); diff --git a/src/emu/cpu/m6800/6800ops.c b/src/emu/cpu/m6800/6800ops.c index 1948e325888..97aab2f8dba 100644 --- a/src/emu/cpu/m6800/6800ops.c +++ b/src/emu/cpu/m6800/6800ops.c @@ -233,7 +233,7 @@ OP_HANDLER( bra ) } /* $21 BRN relative ----- */ -static UINT8 m6800_brn_t; // hack around GCC 4.6 error because we need the side effects of IMMBYTE +static UINT8 m6800_brn_t; // hack around GCC 4.6 error because we need the side effects of IMMBYTE OP_HANDLER( brn ) { IMMBYTE(m6800_brn_t); diff --git a/src/emu/cpu/m68000/m68kfpu.c b/src/emu/cpu/m68000/m68kfpu.c index 27bf7c73a3e..e75142a2ade 100644 --- a/src/emu/cpu/m68000/m68kfpu.c +++ b/src/emu/cpu/m68000/m68kfpu.c @@ -257,9 +257,9 @@ INLINE void store_pack_float80(m68ki_cpu_core *m68k, UINT32 ea, int k, floatx80 INLINE void SET_CONDITION_CODES(m68ki_cpu_core *m68k, floatx80 reg) { -// UINT64 *regi; +// UINT64 *regi; -// regi = (UINT64 *)® +// regi = (UINT64 *)® REG_FPSR &= ~(FPCC_N|FPCC_Z|FPCC_I|FPCC_NAN); @@ -1341,7 +1341,7 @@ static void fpgen_rm_reg(m68ki_cpu_core *m68k, UINT16 w2) } case 0x1e: // FGETEXP { -// floatx80 temp = source; +// floatx80 temp = source; INT16 temp2; temp2 = source.high; // get the exponent diff --git a/src/emu/cpu/m6805/6805ops.c b/src/emu/cpu/m6805/6805ops.c index 0cb9f6e3baf..fba19931e1f 100644 --- a/src/emu/cpu/m6805/6805ops.c +++ b/src/emu/cpu/m6805/6805ops.c @@ -77,7 +77,7 @@ OP_HANDLER( bra ) } /* $21 BRN relative ---- */ -static UINT8 m6805_brn_t; // hack around GCC 4.6 error because we need the side effects of IMMBYTE +static UINT8 m6805_brn_t; // hack around GCC 4.6 error because we need the side effects of IMMBYTE OP_HANDLER( brn ) { IMMBYTE(m6805_brn_t); diff --git a/src/emu/cpu/m6809/6809ops.c b/src/emu/cpu/m6809/6809ops.c index 924ea78795d..e9942d418ef 100644 --- a/src/emu/cpu/m6809/6809ops.c +++ b/src/emu/cpu/m6809/6809ops.c @@ -371,7 +371,7 @@ OP_HANDLER( bra ) } /* $21 BRN relative ----- */ -static UINT8 m6809_brn_t; // hack around GCC 4.6 error because we need the side effects of IMMBYTE +static UINT8 m6809_brn_t; // hack around GCC 4.6 error because we need the side effects of IMMBYTE OP_HANDLER( brn ) { IMMBYTE(m6809_brn_t); diff --git a/src/emu/cpu/minx/minx.c b/src/emu/cpu/minx/minx.c index d0bc3321b2b..59fa2138597 100644 --- a/src/emu/cpu/minx/minx.c +++ b/src/emu/cpu/minx/minx.c @@ -169,14 +169,14 @@ INLINE UINT16 rdop16( minx_state *minx ) static CPU_EXECUTE( minx ) { -// UINT32 oldpc; +// UINT32 oldpc; UINT8 op; minx_state *minx = get_safe_token(device); do { debugger_instruction_hook(device, GET_MINX_PC); -// oldpc = GET_MINX_PC; +// oldpc = GET_MINX_PC; if ( minx->interrupt_pending ) { diff --git a/src/emu/cpu/mips/mips3com.c b/src/emu/cpu/mips/mips3com.c index fca04f1c58d..e8327a440c3 100644 --- a/src/emu/cpu/mips/mips3com.c +++ b/src/emu/cpu/mips/mips3com.c @@ -312,7 +312,7 @@ void mips3com_tlbwr(mips3_state *mips) void mips3com_tlbp(mips3_state *mips) { UINT32 tlbindex; -// UINT64 vpn; +// UINT64 vpn; /* iterate over TLB entries */ for (tlbindex = 0; tlbindex < mips->tlbentries; tlbindex++) @@ -329,7 +329,7 @@ void mips3com_tlbp(mips3_state *mips) } /* validate that our tlb_table was in sync */ -// vpn = ((mips->cpr[0][COP0_EntryHi] >> 13) & 0x07ffffff) << 1; +// vpn = ((mips->cpr[0][COP0_EntryHi] >> 13) & 0x07ffffff) << 1; if (tlbindex != mips->tlbentries) mips->cpr[0][COP0_Index] = tlbindex; else diff --git a/src/emu/hashfile.c b/src/emu/hashfile.c index ed392b6e90b..15a5ea9ffd4 100644 --- a/src/emu/hashfile.c +++ b/src/emu/hashfile.c @@ -178,7 +178,7 @@ static void start_handler(void *data, const char *tagname, const char **attribut hash_collection hashes; astring all_functions; char functions; -// iodevice_t device; +// iodevice_t device; int i; switch(state->pos) @@ -198,7 +198,7 @@ static void start_handler(void *data, const char *tagname, const char **attribut { // we are now examining a hash tag name = NULL; -// device = IO_COUNT; +// device = IO_COUNT; while(attributes[0]) { @@ -231,7 +231,7 @@ static void start_handler(void *data, const char *tagname, const char **attribut unknown_attribute_value(state, attributes[0], attributes[1]); else { - // device = (iodevice_t) i; + // device = (iodevice_t) i; } } else diff --git a/src/emu/inptport.c b/src/emu/inptport.c index 9449f748e5b..2e8c382300d 100644 --- a/src/emu/inptport.c +++ b/src/emu/inptport.c @@ -2886,7 +2886,7 @@ input_field_config::input_field_config(input_port_config &port, int _type, input memset(&condition, 0, sizeof(condition)); for (int seqtype = 0; seqtype < ARRAY_LENGTH(seq); seqtype++) seq[seqtype].set_default(); - chars[0] = chars[1] = chars[2] = (unicode_char) 0; + chars[0] = chars[1] = chars[2] = (unicode_char) 0; } diff --git a/src/emu/inptport.h b/src/emu/inptport.h index f6679f3337c..6e98213ad97 100644 --- a/src/emu/inptport.h +++ b/src/emu/inptport.h @@ -727,7 +727,7 @@ private: class input_type_entry { friend class simple_list; - + public: input_type_entry(UINT32 type, ioport_group group, int player, const char *token, const char *name, input_seq standard); input_type_entry(UINT32 type, ioport_group group, int player, const char *token, const char *name, input_seq standard, input_seq decrement, input_seq increment); diff --git a/src/emu/input.c b/src/emu/input.c index d8e748fd7ef..969d6bf4107 100644 --- a/src/emu/input.c +++ b/src/emu/input.c @@ -131,12 +131,12 @@ class input_device_switch_item : public input_device_item public: // construction/destruction input_device_switch_item(input_device &device, const char *name, void *internal, input_item_id itemid, item_get_state_func getstate); - + // readers virtual INT32 read_as_switch(input_item_modifier modifier); virtual INT32 read_as_relative(input_item_modifier modifier); virtual INT32 read_as_absolute(input_item_modifier modifier); - + // steadykey helper bool steadykey_changed(); void steadykey_update_to_current() { m_steadykey = m_current; } @@ -156,7 +156,7 @@ class input_device_relative_item : public input_device_item public: // construction/destruction input_device_relative_item(input_device &device, const char *name, void *internal, input_item_id itemid, item_get_state_func getstate); - + // readers virtual INT32 read_as_switch(input_item_modifier modifier); virtual INT32 read_as_relative(input_item_modifier modifier); @@ -172,7 +172,7 @@ class input_device_absolute_item : public input_device_item public: // construction/destruction input_device_absolute_item(input_device &device, const char *name, void *internal, input_item_id itemid, item_get_state_func getstate); - + // readers virtual INT32 read_as_switch(input_item_modifier modifier); virtual INT32 read_as_relative(input_item_modifier modifier); @@ -192,7 +192,7 @@ struct code_string_table return current->m_code; return ~0; } - + const char *operator[](UINT32 code) const { for (const code_string_table *current = this; current->m_code != ~0; current++) @@ -650,7 +650,7 @@ UINT8 joystick_map::update(INT32 xaxisval, INT32 yaxisval) //************************************************************************** //------------------------------------------------- -// input_code - construct an input code from a +// input_code - construct an input code from a // device/item pair //------------------------------------------------- @@ -669,7 +669,7 @@ input_code::input_code(input_device &device, input_item_id itemid) //************************************************************************** //------------------------------------------------- -// operator+= - append a code to the end of an +// operator+= - append a code to the end of an // input sequence //------------------------------------------------- @@ -687,8 +687,8 @@ input_seq &input_seq::operator+=(input_code code) //------------------------------------------------- -// operator|= - append a code to a sequence; if -// the sequence is non-empty, insert an OR +// operator|= - append a code to a sequence; if +// the sequence is non-empty, insert an OR // before the new code //------------------------------------------------- @@ -697,7 +697,7 @@ input_seq &input_seq::operator|=(input_code code) // overwrite end/default with the new code if (m_code[0] == end_code || m_code[0] == default_code) m_code[0] = code; - + // otherwise, append an OR token and then the new code else { @@ -723,7 +723,7 @@ int input_seq::length() const //------------------------------------------------- -// is_valid - return true if a given sequence is +// is_valid - return true if a given sequence is // valid //------------------------------------------------- @@ -817,7 +817,7 @@ void input_seq::set(input_code code0, input_code code1, input_code code2, input_ //------------------------------------------------- -// backspace - "backspace" over the last entry in +// backspace - "backspace" over the last entry in // a sequence //------------------------------------------------- @@ -908,7 +908,7 @@ input_item_id input_device::add_item(const char *name, input_item_id itemid, ite // make sure we don't have any overlap assert(m_item[itemid] == NULL); - + // determine the class and create the appropriate item class input_device_item *item = NULL; switch (m_class.standard_item_class(originalid)) @@ -924,7 +924,7 @@ input_item_id input_device::add_item(const char *name, input_item_id itemid, ite case ITEM_CLASS_ABSOLUTE: item = auto_alloc(machine(), input_device_absolute_item(*this, name, internal, itemid, getstate)); break; - + default: assert(false); } @@ -983,7 +983,7 @@ void input_device::apply_steadykey() const // ignore if not enabled if (!m_steadykey_enabled) return; - + // update the state of all the keys and see if any changed state bool anything_changed = false; for (input_item_id itemid = ITEM_ID_FIRST_VALID; itemid <= m_maxitem; itemid++) @@ -1040,7 +1040,7 @@ input_device *input_class::add_device(const char *name, void *internal) for (devindex = 0; devindex < DEVICE_INDEX_MAXIMUM; devindex++) if (m_device[devindex] == NULL) break; - + // call through return add_device(devindex, name, internal); } @@ -1064,7 +1064,7 @@ input_device *input_class::add_device(int devindex, const char *name, void *inte //------------------------------------------------- -// standard_item_class - return the class of a +// standard_item_class - return the class of a // standard item //------------------------------------------------- @@ -1129,7 +1129,7 @@ input_manager::input_manager(running_machine &machine) //------------------------------------------------- -// code_value - return the value of a given +// code_value - return the value of a given // input code //------------------------------------------------- @@ -1145,7 +1145,7 @@ INT32 input_manager::code_value(input_code code) input_device *device = device_from_code(code); if (device == NULL) break; - + // also return 0 if the device class is disabled input_class &devclass = *m_class[code.device_class()]; if (!devclass.enabled()) @@ -1200,8 +1200,8 @@ INT32 input_manager::code_value(input_code code) //------------------------------------------------- -// code_pressed_once - return non-zero if a given -// input code has transitioned from off to on +// code_pressed_once - return non-zero if a given +// input code has transitioned from off to on // since the last call //------------------------------------------------- @@ -1352,7 +1352,7 @@ input_code input_manager::poll_switches() //------------------------------------------------- -// poll_keyboard_switches - poll for any +// poll_keyboard_switches - poll for any // keyboard-specific input //------------------------------------------------- @@ -1385,7 +1385,7 @@ input_code input_manager::poll_keyboard_switches() //------------------------------------------------- -// code_check_axis - see if axis has moved far +// code_check_axis - see if axis has moved far // enough to trigger a read when polling //------------------------------------------------- @@ -1398,7 +1398,7 @@ bool input_manager::code_check_axis(input_device_item &item, input_code code) // ignore min/max for lightguns // so the selection will not be affected by a gun going out of range INT32 curval = code_value(code); - if (code.device_class() == DEVICE_CLASS_LIGHTGUN && + if (code.device_class() == DEVICE_CLASS_LIGHTGUN && (code.item_id() == ITEM_ID_XAXIS || code.item_id() == ITEM_ID_YAXIS) && (curval == INPUT_ABSOLUTE_MAX || curval == INPUT_ABSOLUTE_MIN)) return false; @@ -1486,14 +1486,14 @@ input_device_item *input_manager::item_from_code(input_code code) const input_device *device = device_from_code(code); if (device == NULL) return NULL; - + // then return the device's item return device->item(code.item_id()); } //------------------------------------------------- -// reset_memory - reset the array of memory for +// reset_memory - reset the array of memory for // pressed switches //------------------------------------------------- @@ -1506,7 +1506,7 @@ void input_manager::reset_memory() //------------------------------------------------- -// code_from_itemid - translates an input_item_id +// code_from_itemid - translates an input_item_id // to an input_code //------------------------------------------------- @@ -1625,7 +1625,7 @@ const char *input_manager::code_to_token(astring &string, input_code code) const //------------------------------------------------- -// code_from_token - extract an input code from a +// code_from_token - extract an input code from a // token //------------------------------------------------- @@ -1729,7 +1729,7 @@ input_code input_manager::code_from_token(const char *_token) //------------------------------------------------- -// seq_pressed - return true if the given sequence +// seq_pressed - return true if the given sequence // of switch inputs is "pressed" //------------------------------------------------- @@ -1781,7 +1781,7 @@ bool input_manager::seq_pressed(const input_seq &seq) //------------------------------------------------- -// seq_axis_value - return the value of an axis +// seq_axis_value - return the value of an axis // defined in an input sequence //------------------------------------------------- @@ -1866,7 +1866,7 @@ INT32 input_manager::seq_axis_value(const input_seq &seq, input_item_class &item //------------------------------------------------- -// seq_poll_start - begin polling for a new +// seq_poll_start - begin polling for a new // sequence of the given itemclass //------------------------------------------------- @@ -1990,7 +1990,7 @@ bool input_manager::seq_poll() //------------------------------------------------- -// seq_name - generate the friendly name of a +// seq_name - generate the friendly name of a // sequence //------------------------------------------------- @@ -2043,7 +2043,7 @@ const char *input_manager::seq_name(astring &string, const input_seq &seq) const //------------------------------------------------- -// seq_to_tokens - generate the tokenized form of +// seq_to_tokens - generate the tokenized form of // a sequence //------------------------------------------------- @@ -2078,7 +2078,7 @@ const char *input_manager::seq_to_tokens(astring &string, const input_seq &seq) //------------------------------------------------- -// seq_from_tokens - generate the tokenized form +// seq_from_tokens - generate the tokenized form // of a sequence //------------------------------------------------- @@ -2130,7 +2130,7 @@ void input_manager::seq_from_tokens(input_seq &seq, const char *string) //------------------------------------------------- -// set_global_joystick_map - set the joystick map +// set_global_joystick_map - set the joystick map // for all devices //------------------------------------------------- @@ -2360,7 +2360,7 @@ INT32 input_device_absolute_item::read_as_switch(input_item_modifier modifier) // start with the current value INT32 result = m_device.apply_deadzone_and_saturation(update_value()); assert(result >= INPUT_ABSOLUTE_MIN && result <= INPUT_ABSOLUTE_MAX); - + // left/right/up/down: if this is a joystick, fetch the paired X/Y axis values and convert if (m_device.devclass() == DEVICE_CLASS_JOYSTICK && modifier >= ITEM_MODIFIER_LEFT && modifier <= ITEM_MODIFIER_DOWN) { @@ -2392,7 +2392,7 @@ INT32 input_device_absolute_item::read_as_switch(input_item_modifier modifier) //------------------------------------------------- -// read_as_relative - return the absolute input +// read_as_relative - return the absolute input // as a relative axis value //------------------------------------------------- @@ -2414,7 +2414,7 @@ INT32 input_device_absolute_item::read_as_absolute(input_item_modifier modifier) // start with the current value INT32 result = m_device.apply_deadzone_and_saturation(update_value()); assert(result >= INPUT_ABSOLUTE_MIN && result <= INPUT_ABSOLUTE_MAX); - + // if we're doing a lightgun reload hack, override the value if (m_device.devclass() == DEVICE_CLASS_LIGHTGUN && m_device.lightgun_reload_button()) { diff --git a/src/emu/input.h b/src/emu/input.h index 26aac63da84..bfe1373f575 100644 --- a/src/emu/input.h +++ b/src/emu/input.h @@ -332,7 +332,7 @@ enum input_item_id ITEM_ID_OTHER_AXIS_ABSOLUTE, ITEM_ID_OTHER_AXIS_RELATIVE, ITEM_ID_MAXIMUM, - + // internal codes for sequences ITEM_ID_SEQ_END, ITEM_ID_SEQ_DEFAULT, @@ -370,14 +370,14 @@ public: // construction/destruction joystick_map(); joystick_map(const joystick_map &src) { copy(src); } - + // operators joystick_map &operator=(const joystick_map &src) { if (this != &src) copy(src); return *this; } // parse from a string bool parse(const char *mapstring); - // create a friendly string + // create a friendly string const char *to_string(astring &string) const; // update the state of a live map @@ -426,11 +426,11 @@ public: input_code(const input_code &src) : m_internal(src.m_internal) { } input_code(input_device &device, input_item_id itemid); - + // operators bool operator==(const input_code &rhs) const { return m_internal == rhs.m_internal; } bool operator!=(const input_code &rhs) const { return m_internal != rhs.m_internal; } - + // getters bool internal() const { return device_class() == DEVICE_CLASS_INTERNAL; } input_device_class device_class() const { return input_device_class((m_internal >> 28) & 0xf); } @@ -438,14 +438,14 @@ public: input_item_class item_class() const { return input_item_class((m_internal >> 16) & 0xf); } input_item_modifier item_modifier() const { return input_item_modifier((m_internal >> 12) & 0xf); } input_item_id item_id() const { return input_item_id(m_internal & 0xfff); } - + // setters void set_device_class(input_device_class devclass) { assert(devclass >= 0 && devclass <= 0xf); m_internal = (m_internal & ~(0xf << 28)) | ((devclass & 0xf) << 28); } void set_device_index(int devindex) { assert(devindex >= 0 && devindex <= 0xff); m_internal = (m_internal & ~(0xff << 20)) | ((devindex & 0xff) << 20); } void set_item_class(input_item_class itemclass) { assert(itemclass >= 0 && itemclass <= 0xf); m_internal = (m_internal & ~(0xf << 16)) | ((itemclass & 0xf) << 16); } void set_item_modifier(input_item_modifier modifier) { assert(modifier >= 0 && modifier <= 0xf); m_internal = (m_internal & ~(0xf << 12)) | ((modifier & 0xf) << 12); } void set_item_id(input_item_id itemid) { assert(itemid >= 0 && itemid <= 0xfff); m_internal = (m_internal & ~0xfff) | (itemid & 0xfff); } - + private: // internal state UINT32 m_internal; @@ -481,7 +481,7 @@ public: void set_default() { set(default_code); } void backspace(); void replace(input_code oldcode, input_code newcode); - + // constant codes used in sequences static const input_code end_code; static const input_code default_code; @@ -494,7 +494,7 @@ public: private: // internal state - input_code m_code[16]; + input_code m_code[16]; }; @@ -502,7 +502,7 @@ private: // a logical device of a given class that can provide input class input_device -{ +{ friend class input_class; // construction/destruction @@ -557,7 +557,7 @@ class input_class public: // construction/destruction input_class(input_manager &manager, input_device_class devclass, bool enabled = false, bool multi = false); - + // getters input_manager &manager() const { return m_manager; } running_machine &machine() const; @@ -566,7 +566,7 @@ public: int maxindex() const { return m_maxindex; } bool enabled() const { return m_enabled; } bool multi() const { return m_multi; } - + // setters void enable(bool state = true) { m_enabled = state; } void set_multi(bool multi = true) { m_multi = multi; } @@ -584,7 +584,7 @@ private: // internal state input_manager & m_manager; // reference to our manager - input_device * m_device[DEVICE_INDEX_MAXIMUM]; // array of devices in this class + input_device * m_device[DEVICE_INDEX_MAXIMUM]; // array of devices in this class input_device_class m_devclass; // our device class int m_maxindex; // maximum populated index bool m_enabled; // is this class enabled? @@ -600,22 +600,22 @@ class input_manager public: // construction/destruction input_manager(running_machine &machine); - + // getters running_machine &machine() const { return m_machine; } input_class &device_class(input_device_class devclass) { assert(devclass < ARRAY_LENGTH(m_class)); assert(m_class[devclass] != NULL); return *m_class[devclass]; } - + // input code readers INT32 code_value(input_code code); bool code_pressed(input_code code) { return code_value(code) != 0; } bool code_pressed_once(input_code code); - + // input code polling void reset_polling(); input_code poll_axes(); input_code poll_switches(); input_code poll_keyboard_switches(); - + // input code helpers input_device *device_from_code(input_code code) const; input_device_item *item_from_code(input_code code) const; @@ -623,16 +623,16 @@ public: const char *code_name(astring &string, input_code code) const; const char *code_to_token(astring &string, input_code code) const; input_code code_from_token(const char *_token); - + // input sequence readers bool seq_pressed(const input_seq &seq); INT32 seq_axis_value(const input_seq &seq, input_item_class &itemclass); - + // input sequence polling void seq_poll_start(input_item_class itemclass, const input_seq *startseq = NULL); bool seq_poll(); const input_seq &seq_poll_final() const { return m_poll_seq; } - + // input sequence helpers const char *seq_name(astring &string, const input_seq &seq) const; const char *seq_to_tokens(astring &string, const input_seq &seq) const; @@ -656,7 +656,7 @@ private: input_class m_joystick_class; input_class m_lightgun_class; input_class * m_class[DEVICE_CLASS_MAXIMUM]; - + // sequence polling state input_seq m_poll_seq; osd_ticks_t m_poll_seq_last_ticks; diff --git a/src/emu/machine/53c810.c b/src/emu/machine/53c810.c index f1bf5d29d2e..9e4b7f6f3e1 100644 --- a/src/emu/machine/53c810.c +++ b/src/emu/machine/53c810.c @@ -148,9 +148,9 @@ static OPCODE_HANDLER( dmaop_block_move ) static OPCODE_HANDLER( dmaop_select ) { -// UINT32 operand; +// UINT32 operand; -// operand = FETCH(machine); +// operand = FETCH(machine); if (lsi810.scntl0 & 0x01) { @@ -173,9 +173,9 @@ static OPCODE_HANDLER( dmaop_select ) static OPCODE_HANDLER( dmaop_wait_disconnect ) { -// UINT32 operand; +// UINT32 operand; -// operand = FETCH(machine); +// operand = FETCH(machine); if (lsi810.scntl0 & 0x01) { @@ -193,7 +193,7 @@ static OPCODE_HANDLER( dmaop_wait_reselect ) { // UINT32 operand; -// operand = FETCH(machine); +// operand = FETCH(machine); if (lsi810.scntl0 & 0x01) { @@ -209,9 +209,9 @@ static OPCODE_HANDLER( dmaop_wait_reselect ) static OPCODE_HANDLER( dmaop_set ) { -// UINT32 operand; +// UINT32 operand; -// operand = FETCH(machine); +// operand = FETCH(machine); /* initiator mode */ if (lsi810.dcmd & 0x8) @@ -238,9 +238,9 @@ static OPCODE_HANDLER( dmaop_set ) static OPCODE_HANDLER( dmaop_clear ) { -// UINT32 operand; +// UINT32 operand; -// operand = FETCH(machine); +// operand = FETCH(machine); /* initiator mode */ if (lsi810.dcmd & 0x8) diff --git a/src/emu/machine/mc146818.c b/src/emu/machine/mc146818.c index 681b9ecfd1c..bc048effdc1 100644 --- a/src/emu/machine/mc146818.c +++ b/src/emu/machine/mc146818.c @@ -507,7 +507,7 @@ WRITE8_MEMBER( mc146818_device::write ) // fixme: allow different time base data &= 0x0f; if (m_data[0x0b] & 0x40) { - if (data > 2) + if (data > 2) m_period = attotime::from_hz(32768 >> (data - 1)); else if (data > 0) m_period = attotime::from_hz(32768 >> (data + 6)); diff --git a/src/emu/machine/mc146818.h b/src/emu/machine/mc146818.h index 8d22f064057..38d3e563888 100644 --- a/src/emu/machine/mc146818.h +++ b/src/emu/machine/mc146818.h @@ -26,7 +26,7 @@ #define MCFG_MC146818_ADD(_tag, _type) \ MCFG_DEVICE_ADD(_tag, MC146818, 0) \ - mc146818_device::static_set_type(*device, mc146818_device::_type); + mc146818_device::static_set_type(*device, mc146818_device::_type); //************************************************************************** // TYPE DEFINITIONS @@ -100,7 +100,7 @@ protected: attotime m_last_refresh; attotime m_period; - + static const device_timer_id TIMER_CLOCK = 0; static const device_timer_id TIMER_PERIODIC = 1; diff --git a/src/emu/machine/smc91c9x.c b/src/emu/machine/smc91c9x.c index 6236a7defe3..3c9670ae52a 100644 --- a/src/emu/machine/smc91c9x.c +++ b/src/emu/machine/smc91c9x.c @@ -388,7 +388,7 @@ READ16_DEVICE_HANDLER( smc91c9x_r ) WRITE16_DEVICE_HANDLER( smc91c9x_w ) { smc91c9x_state *smc = get_safe_token(device); -// UINT16 olddata; +// UINT16 olddata; /* determine the effective register */ offset %= 8; @@ -396,7 +396,7 @@ WRITE16_DEVICE_HANDLER( smc91c9x_w ) offset += 8 * (smc->reg[EREG_BANK] & 7); /* update the data generically */ -// olddata = smc->reg[offset]; +// olddata = smc->reg[offset]; mem_mask &= smc->regmask[offset]; COMBINE_DATA(&smc->reg[offset]); diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c index e3e6e971b0f..38a180c2867 100644 --- a/src/emu/mconfig.c +++ b/src/emu/mconfig.c @@ -75,7 +75,7 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options) if (intf != NULL) { device_t &owner = slot->device(); - const char *selval = options.value(owner.tag()); + const char *selval = options.value(owner.tag()); if (options.seqid(owner.tag()) == 0) selval = slot->get_default_card(); diff --git a/src/emu/memory.c b/src/emu/memory.c index 497cea486c0..57ec00c01e9 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -553,7 +553,7 @@ public: read32_delegate r32; read64_delegate r64; }; - + // construction/destruction handler_entry_read(UINT8 width, endianness_t endianness, UINT8 **rambaseptr) : handler_entry(width, endianness, rambaseptr) @@ -769,7 +769,7 @@ private: std::list<_HandlerEntry *> handlers; UINT64 mask; }; - + // ======================> address_table @@ -3282,7 +3282,7 @@ void address_table::map_range(offs_t addrstart, offs_t addrend, offs_t addrmask, // recompute any direct access on this space if it is a read modification m_space.m_direct.force_update(entry); - // verify_reference_counts(); + // verify_reference_counts(); } UINT8 address_table::get_free_handler() @@ -3326,7 +3326,7 @@ void address_table::setup_range(offs_t addrstart, offs_t addrend, offs_t addrmas // Scan the memory to see what has to be done std::list range_override; std::map > range_partial; - + offs_t base_mirror = 0; do { @@ -3418,7 +3418,7 @@ void address_table::setup_range(offs_t addrstart, offs_t addrend, offs_t addrmas } } - // verify_reference_counts(); + // verify_reference_counts(); } @@ -3464,7 +3464,7 @@ void address_table::verify_reference_counts() for(int i = STATIC_COUNT; i != SUBTABLE_BASE; i++) logerror("%02x: %4x .. %4x\n", i, handler_refcount[i-STATIC_COUNT], actual_refcounts[i-STATIC_COUNT]); throw emu_fatalerror("memory.c: refcounts are fucked.\n"); - } + } } @@ -4949,7 +4949,7 @@ void handler_entry_read::set_delegate(read8_delegate delegate, UINT64 mask, cons m_read.r8 = delegate; if (info) m_legacy_info = *info; - } + } } diff --git a/src/emu/schedule.h b/src/emu/schedule.h index c322cd5cae7..36694b5018f 100644 --- a/src/emu/schedule.h +++ b/src/emu/schedule.h @@ -117,7 +117,7 @@ public: attotime remaining() const; attotime start() const { return m_start; } attotime expire() const { return m_expire; } - + private: // internal helpers void register_save(); @@ -184,7 +184,7 @@ public: // debugging void dump_timers() const; - + // for emergencies only! void eat_all_cycles(); diff --git a/src/emu/screen.c b/src/emu/screen.c index 8ca39ee9638..0089399dc38 100644 --- a/src/emu/screen.c +++ b/src/emu/screen.c @@ -1026,7 +1026,7 @@ void screen_device::finalize_burnin() if (filerr == FILERR_NONE) { png_info pnginfo = { 0 }; -// png_error pngerr; +// png_error pngerr; char text[256]; // add two text entries describing the image diff --git a/src/emu/sound/okim6376.c b/src/emu/sound/okim6376.c index d974df20812..7cb547aa843 100644 --- a/src/emu/sound/okim6376.c +++ b/src/emu/sound/okim6376.c @@ -303,7 +303,7 @@ static void oki_process(device_t *device, int channel, int command) { okim6376_state *info = get_safe_token(device); - /* if a command is pending, process the second half */ + /* if a command is pending, process the second half */ if ((command != -1) && (command != 0)) //process silence separately { int start; @@ -488,7 +488,7 @@ WRITE_LINE_DEVICE_HANDLER( okim6376_ch2_w ) { okim6376_state *info = get_safe_token(device); - if (info->ch2 != state) + if (info->ch2 != state) { info->ch2 = state; info->ch2_update = 1; @@ -516,7 +516,7 @@ WRITE_LINE_DEVICE_HANDLER( okim6376_st_w ) okim6376_state *info = get_safe_token(device); - if (info->st != state) + if (info->st != state) { info->st = state; @@ -525,8 +525,8 @@ WRITE_LINE_DEVICE_HANDLER( okim6376_st_w ) if ((info->channel == 1) & !info->st)//ST acts as attenuation for Channel 2 when low, and stays at that level until the channel is reset { struct ADPCMVoice *voice = &info->voice[info->channel]; - { - + { + info->st_pulses ++; if (info->st_pulses > 3) { diff --git a/src/emu/sound/rf5c400.c b/src/emu/sound/rf5c400.c index 4da3757694e..45ef99a622e 100644 --- a/src/emu/sound/rf5c400.c +++ b/src/emu/sound/rf5c400.c @@ -133,7 +133,7 @@ static STREAM_UPDATE( rf5c400_update ) stream_sample_t *buf0 = outputs[0]; stream_sample_t *buf1 = outputs[1]; -// start = ((channel->startH & 0xFF00) << 8) | channel->startL; +// start = ((channel->startH & 0xFF00) << 8) | channel->startL; end = ((channel->endHloopH & 0xFF) << 16) | channel->endL; loop = ((channel->endHloopH & 0xFF00) << 8) | channel->loopL; pos = channel->pos; diff --git a/src/emu/sound/ymf271.c b/src/emu/sound/ymf271.c index f9727703f54..154a825e15a 100644 --- a/src/emu/sound/ymf271.c +++ b/src/emu/sound/ymf271.c @@ -561,8 +561,8 @@ static void update_pcm(YMF271Chip *chip, int slotnum, INT32 *mixp, int length) ch0_vol = ((UINT64)final_volume * (UINT64)channel_attenuation[slot->ch0_level]) >> 16; ch1_vol = ((UINT64)final_volume * (UINT64)channel_attenuation[slot->ch1_level]) >> 16; -// ch2_vol = ((UINT64)final_volume * (UINT64)channel_attenuation[slot->ch2_level]) >> 16; -// ch3_vol = ((UINT64)final_volume * (UINT64)channel_attenuation[slot->ch3_level]) >> 16; +// ch2_vol = ((UINT64)final_volume * (UINT64)channel_attenuation[slot->ch2_level]) >> 16; +// ch3_vol = ((UINT64)final_volume * (UINT64)channel_attenuation[slot->ch3_level]) >> 16; if (ch0_vol > 65536) ch0_vol = 65536; if (ch1_vol > 65536) ch1_vol = 65536; diff --git a/src/emu/video/hd63484.c b/src/emu/video/hd63484.c index 0bf6e5e1a31..daba6ea0bac 100644 --- a/src/emu/video/hd63484.c +++ b/src/emu/video/hd63484.c @@ -688,10 +688,10 @@ static void ptn( device_t *device, int opcode, int src_x, int src_y, INT16 _ax, ax_neg = -1; else ax_neg = 1; -/* if (ay < 0) - ay_neg = -1; - else - ay_neg = 1;*/ +/* if (ay < 0) + ay_neg = -1; + else + ay_neg = 1;*/ if (opcode & 0x0800) switch (opcode & 0x0700) diff --git a/src/emu/video/tlc34076.c b/src/emu/video/tlc34076.c index 21b9a2869d5..8c1af669457 100644 --- a/src/emu/video/tlc34076.c +++ b/src/emu/video/tlc34076.c @@ -163,11 +163,11 @@ READ8_DEVICE_HANDLER( tlc34076_r ) WRITE8_DEVICE_HANDLER( tlc34076_w ) { tlc34076_state *state = get_safe_token(device); -// UINT8 oldval; +// UINT8 oldval; /* keep in range */ offset &= 0x0f; -// oldval = state->regs[offset]; +// oldval = state->regs[offset]; state->regs[offset] = data; /* switch off the offset */ diff --git a/src/emu/video/vooddefs.h b/src/emu/video/vooddefs.h index 5ebbfeacf43..cb743d9e701 100644 --- a/src/emu/video/vooddefs.h +++ b/src/emu/video/vooddefs.h @@ -2079,7 +2079,7 @@ INLINE UINT32 compute_raster_hash(const raster_info *info) const UINT8 *dither4 = NULL; \ const UINT8 *dither = NULL \ -#define DECLARE_DITHER_POINTERS_NO_DITHER_VAR \ +#define DECLARE_DITHER_POINTERS_NO_DITHER_VAR \ const UINT8 *dither_lookup = NULL; \ #define COMPUTE_DITHER_POINTERS(FBZMODE, YY) \ -- cgit v1.2.3