diff options
| author | 2011-02-09 15:01:01 +0000 | |
|---|---|---|
| committer | 2011-02-09 15:01:01 +0000 | |
| commit | 4fa610aa02582fe7b86688a05c5ee7f92b703497 (patch) | |
| tree | d8c1155af3236f2e9259bd906c9ed26aa33f1142 /src/emu | |
| parent | a38c67f27bf9f10b4bafa7db0344df68b8560ff5 (diff) | |
Cleanups and version bump.mame0141u2
Diffstat (limited to 'src/emu')
34 files changed, 241 insertions, 241 deletions
diff --git a/src/emu/attotime.c b/src/emu/attotime.c index a7693047e49..433bef061bf 100644 --- a/src/emu/attotime.c +++ b/src/emu/attotime.c @@ -139,7 +139,7 @@ attotime &attotime::operator/=(UINT32 factor) //------------------------------------------------- -// as_string - return a temporary printable +// as_string - return a temporary printable // string describing an attotime //------------------------------------------------- diff --git a/src/emu/attotime.h b/src/emu/attotime.h index 9f76a2ab9db..26f72175b12 100644 --- a/src/emu/attotime.h +++ b/src/emu/attotime.h @@ -121,11 +121,11 @@ public: attotime() : seconds(0), attoseconds(0) { } - + attotime(seconds_t secs, attoseconds_t attos) : seconds(secs), attoseconds(attos) { } - + // queries bool is_zero() const { return (seconds == 0 && attoseconds == 0); } bool is_never() const { return (seconds >= ATTOTIME_MAX_SECONDS); } @@ -144,7 +144,7 @@ public: static attotime from_usec(INT64 usec) { return attotime(usec / 1000000, (usec % 1000000) * (ATTOSECONDS_PER_SECOND / 1000000)); } static attotime from_nsec(INT64 nsec) { return attotime(nsec / 1000000000, (nsec % 1000000000) * (ATTOSECONDS_PER_SECOND / 1000000000)); } static attotime from_hz(double frequency) { return attotime(0, double(ATTOSECONDS_PER_SECOND) / frequency); } - + // math attotime &operator+=(const attotime &right); attotime &operator-=(const attotime &right); @@ -167,7 +167,7 @@ public: //************************************************************************** //------------------------------------------------- -// operator+ - handle addition between two +// operator+ - handle addition between two // attotimes //------------------------------------------------- @@ -221,7 +221,7 @@ inline attotime &attotime::operator+=(const attotime &right) //------------------------------------------------- -// operator- - handle subtraction between two +// operator- - handle subtraction between two // attotimes //------------------------------------------------- @@ -295,7 +295,7 @@ inline attotime operator/(const attotime &left, UINT32 factor) //------------------------------------------------- -// operator== - handle comparisons between +// operator== - handle comparisons between // attotimes //------------------------------------------------- @@ -397,7 +397,7 @@ inline UINT64 attotime::as_ticks(UINT32 frequency) const UINT32 fracticks = (attotime(0, attoseconds) * frequency).seconds; return mulu_32x32(seconds, frequency) + fracticks; } - + //------------------------------------------------- // from_ticks - create an attotime from a tick @@ -415,7 +415,7 @@ inline attotime attotime::from_ticks(UINT64 ticks, UINT32 frequency) INT32 secs = divu_64x32_rem(ticks, frequency, &remainder); return attotime(secs, (UINT64)remainder * attos_per_tick); } - + //------------------------------------------------- // from_double - create an attotime from floating @@ -429,6 +429,6 @@ inline attotime attotime::from_double(double _time) attoseconds_t attos = DOUBLE_TO_ATTOSECONDS(_time); return attotime(secs, attos); } - + #endif // __ATTOTIME_H__ diff --git a/src/emu/cpu/adsp2100/adsp2100.h b/src/emu/cpu/adsp2100/adsp2100.h index afbf67e9623..286fecb5379 100644 --- a/src/emu/cpu/adsp2100/adsp2100.h +++ b/src/emu/cpu/adsp2100/adsp2100.h @@ -118,32 +118,32 @@ const int ADSP2181_IRQL2 = 8; // IRQL2 enum { ADSP2100_PC, - ADSP2100_AX0, - ADSP2100_AX1, - ADSP2100_AY0, - ADSP2100_AY1, - ADSP2100_AR, + ADSP2100_AX0, + ADSP2100_AX1, + ADSP2100_AY0, + ADSP2100_AY1, + ADSP2100_AR, ADSP2100_AF, - ADSP2100_MX0, - ADSP2100_MX1, - ADSP2100_MY0, - ADSP2100_MY1, - ADSP2100_MR0, - ADSP2100_MR1, - ADSP2100_MR2, + ADSP2100_MX0, + ADSP2100_MX1, + ADSP2100_MY0, + ADSP2100_MY1, + ADSP2100_MR0, + ADSP2100_MR1, + ADSP2100_MR2, ADSP2100_MF, - ADSP2100_SI, - ADSP2100_SE, - ADSP2100_SB, - ADSP2100_SR0, + ADSP2100_SI, + ADSP2100_SE, + ADSP2100_SB, + ADSP2100_SR0, ADSP2100_SR1, - ADSP2100_I0, - ADSP2100_I1, - ADSP2100_I2, - ADSP2100_I3, - ADSP2100_I4, - ADSP2100_I5, - ADSP2100_I6, + ADSP2100_I0, + ADSP2100_I1, + ADSP2100_I2, + ADSP2100_I3, + ADSP2100_I4, + ADSP2100_I5, + ADSP2100_I6, ADSP2100_I7, ADSP2100_L0, ADSP2100_L1, diff --git a/src/emu/cpu/drcbex64.c b/src/emu/cpu/drcbex64.c index 07f697335fd..54aa38f9526 100644 --- a/src/emu/cpu/drcbex64.c +++ b/src/emu/cpu/drcbex64.c @@ -1288,7 +1288,7 @@ void drcbe_x64::emit_or_m32_p32(x86code *&dst, x86_memref memref, const be_param if (inst.flags() == 0 && (UINT32)param.immediate() == 0) ;// skip else if (inst.flags() == 0 && (UINT32)param.immediate() == 0xffffffff) - emit_mov_m32_imm(dst, memref, 0xffffffff); // mov [dest],-1 + emit_mov_m32_imm(dst, memref, 0xffffffff); // mov [dest],-1 else emit_or_m32_imm(dst, memref, param.immediate()); // or [dest],param } diff --git a/src/emu/cpu/dsp16/dsp16.c b/src/emu/cpu/dsp16/dsp16.c index b5d3ad3bf8c..0c253b24621 100644 --- a/src/emu/cpu/dsp16/dsp16.c +++ b/src/emu/cpu/dsp16/dsp16.c @@ -173,7 +173,7 @@ void dsp16_device::device_reset() void dsp16_device::state_import(const device_state_entry &entry) { - + } @@ -243,7 +243,7 @@ void dsp16_device::execute_run() // instruction fetch //UINT16 op = opcode_read(); - + m_icount--; } while (m_icount > 0); } diff --git a/src/emu/cpu/dsp16/dsp16.h b/src/emu/cpu/dsp16/dsp16.h index e4292d52a15..ea99c06def1 100644 --- a/src/emu/cpu/dsp16/dsp16.h +++ b/src/emu/cpu/dsp16/dsp16.h @@ -17,7 +17,7 @@ //************************************************************************** //#define MCFG_DSP16_CONFIG(_config) -// dsp16_device_config::static_set_config(device, _config); +// dsp16_device_config::static_set_config(device, _config); diff --git a/src/emu/cpu/dsp16/dsp16dis.c b/src/emu/cpu/dsp16/dsp16dis.c index 86995e0a00c..1c8ab0f0c7a 100644 --- a/src/emu/cpu/dsp16/dsp16dis.c +++ b/src/emu/cpu/dsp16/dsp16dis.c @@ -22,7 +22,7 @@ astring disasmF1Field(const UINT8& F1, const UINT8& D, const UINT8& S) case 0x0d: ret.printf("a%d = a%d + y", D, S); break; case 0x0e: ret.printf("a%d = a%d & y", D, S); break; case 0x0f: ret.printf("a%d = a%d - y", D, S); break; - + default: return "UNKNOWN"; } return ret; @@ -41,18 +41,18 @@ astring disasmYField(const UINT8& Y) case 0x05: return "*r1++"; case 0x06: return "*r1--"; case 0x07: return "*r1++j"; - + case 0x08: return "*r2"; case 0x09: return "*r2++"; case 0x0a: return "*r2--"; case 0x0b: return "*r2++j"; - + case 0x0c: return "*r3"; case 0x0d: return "*r3++"; case 0x0e: return "*r3--"; case 0x0f: return "*r3++j"; - default: return "UNKNOWN"; + default: return "UNKNOWN"; } return ""; } @@ -81,7 +81,7 @@ astring disasmZField(const UINT8& Z) case 0x0e: return "*r3m2"; case 0x0f: return "*r3jk"; - default: return "UNKNOWN"; + default: return "UNKNOWN"; } return ""; } @@ -136,7 +136,7 @@ astring disasmCONField(const UINT8& CON) case 0x0f: return "false"; case 0x10: return "gt"; case 0x11: return "le"; - + default: return "RESERVED"; } return ""; @@ -154,7 +154,7 @@ astring disasmBField(const UINT8& B) case 0x05: case 0x06: case 0x07: return "RESERVED"; - + default: return "UNKNOWN"; } return ""; @@ -172,7 +172,7 @@ astring disasmRImmediateField(const UINT8& R) case 0x05: return "r1"; case 0x06: return "r2"; case 0x07: return "r3"; - + default: return "UNKNOWN"; } return ""; @@ -224,7 +224,7 @@ astring disasmIField(const UINT8& I) case 0x01: return "r1/k"; case 0x02: return "r2/rb"; case 0x03: return "r3/re"; - + default: return "UNKNOWN"; } return ""; @@ -248,9 +248,9 @@ CPU_DISASSEMBLE( dsp16a ) UINT32 dasmflags = 0; UINT16 op = oprom[0] | (oprom[1] << 8); UINT16 op2 = oprom[2] | (oprom[3] << 8); - + // TODO: Test for previous "if CON" instruction and tab the next instruction in? - + const UINT8 opcode = (op >> 11) & 0x1f; switch(opcode) { @@ -267,7 +267,7 @@ CPU_DISASSEMBLE( dsp16a ) sprintf(buffer, "%s, %s", fString.cstr(), yString.cstr()); break; } - case 0x04: case 0x1c: + case 0x04: case 0x1c: { // F1 Y=a0[1] | F1 Y=a1[1] const UINT8 Y = (op & 0x000f); @@ -334,7 +334,7 @@ CPU_DISASSEMBLE( dsp16a ) sprintf(buffer, "%s, y = %s, x = %s", fString.cstr(), aString.cstr(), xString.cstr()); if (Y != 0x00) sprintf(buffer, "UNKNOWN"); break; - } + } case 0x14: { // F1, Y = y[1] @@ -411,9 +411,9 @@ CPU_DISASSEMBLE( dsp16a ) sprintf(buffer, "%s, %s <=> %s", fString.cstr(), zString.cstr(), atString.cstr()); break; } - + // Format 3: Special Functions - case 0x12: + case 0x12: case 0x13: { // if|ifc CON F2 @@ -427,7 +427,7 @@ CPU_DISASSEMBLE( dsp16a ) else sprintf(buffer, "ifc %s : %s", conString.cstr(), fString.cstr()); break; } - + // Format 4: Branch Direct Group case 0x00: case 0x01: case 0x10: case 0x11: @@ -438,7 +438,7 @@ CPU_DISASSEMBLE( dsp16a ) else sprintf(buffer, "goto 0x%04x", JA); break; } - + // Format 5: Branch Indirect Group case 0x18: { @@ -448,7 +448,7 @@ CPU_DISASSEMBLE( dsp16a ) sprintf(buffer, "%s", bString.cstr()); break; } - + // Format 6: Contitional Branch Qualifier/Software Interrupt (icall) case 0x1a: { @@ -461,7 +461,7 @@ CPU_DISASSEMBLE( dsp16a ) if (op == 0xd40e) sprintf(buffer, "icall"); break; } - + // Format 7: Data Move Group case 0x09: case 0x0b: { @@ -472,7 +472,7 @@ CPU_DISASSEMBLE( dsp16a ) sprintf(buffer, "%s = %s", rString.cstr(), (S ? "a1" : "a0")); break; } - case 0x08: + case 0x08: { // aT = R const UINT8 R = (op & 0x03f0) >> 4; @@ -492,7 +492,7 @@ CPU_DISASSEMBLE( dsp16a ) // TODO: Special case the R == [y, y1, or x] case break; } - case 0x0c: + case 0x0c: { // Y = R const UINT8 Y = (op & 0x000f); @@ -502,7 +502,7 @@ CPU_DISASSEMBLE( dsp16a ) sprintf(buffer, "%s = %s", yString.cstr(), rString.cstr()); break; } - case 0x0d: + case 0x0d: { // Z : R const UINT8 Z = (op & 0x000f); @@ -512,7 +512,7 @@ CPU_DISASSEMBLE( dsp16a ) sprintf(buffer, "%s <=> %s", zString.cstr(), rString.cstr()); break; } - + // Format 8: Data Move (immediate operand - 2 words) case 0x0a: { @@ -523,7 +523,7 @@ CPU_DISASSEMBLE( dsp16a ) opSize = 2; break; } - + // Format 9: Short Immediate Group case 0x02: case 0x03: { @@ -534,7 +534,7 @@ CPU_DISASSEMBLE( dsp16a ) sprintf(buffer, "%s = 0x%02x", rString.cstr(), M); break; } - + // Format 10: do - redo case 0x0e: { @@ -547,14 +547,14 @@ CPU_DISASSEMBLE( dsp16a ) sprintf(buffer, "redo %d\n", K); break; } - + // RESERVED case 0x1e: { sprintf(buffer, "RESERVED"); break; } - + // UNKNOWN default: { @@ -562,6 +562,6 @@ CPU_DISASSEMBLE( dsp16a ) break; } } - + return opSize | dasmflags | DASMFLAG_SUPPORTED; } diff --git a/src/emu/cpu/dsp32/dsp32.c b/src/emu/cpu/dsp32/dsp32.c index df0984002d5..ed5e8595153 100644 --- a/src/emu/cpu/dsp32/dsp32.c +++ b/src/emu/cpu/dsp32/dsp32.c @@ -458,7 +458,7 @@ void dsp32c_device::state_import(const device_state_entry &entry) { case STATE_GENFLAGS: break; - + case DSP32_PCR: update_pcr(m_iotemp); break; @@ -480,7 +480,7 @@ void dsp32c_device::state_export(const device_state_entry &entry) { case STATE_GENFLAGS: // no actual flags register, so just make something up - m_iotemp = ((zFLAG != 0) << 0) | + m_iotemp = ((zFLAG != 0) << 0) | ((nFLAG != 0) << 1) | ((cFLAG != 0) << 2) | ((vFLAG != 0) << 3) | @@ -489,7 +489,7 @@ void dsp32c_device::state_export(const device_state_entry &entry) ((UFLAG != 0) << 6) | ((VFLAG != 0) << 7); break; - + case DSP32_PCR: m_iotemp = m_pcr; break; diff --git a/src/emu/cpu/dsp32/dsp32.h b/src/emu/cpu/dsp32/dsp32.h index 67dca61d3d1..97e7fd5b64e 100644 --- a/src/emu/cpu/dsp32/dsp32.h +++ b/src/emu/cpu/dsp32/dsp32.h @@ -146,7 +146,7 @@ struct dsp32_config // ======================> dsp32c_device_config -class dsp32c_device_config : public cpu_device_config, +class dsp32c_device_config : public cpu_device_config, public dsp32_config { friend class dsp32c_device; @@ -449,7 +449,7 @@ protected: void d5_ieee(UINT32 op); void d5_dsp(UINT32 op); void d5_seed(UINT32 op); - + // dma helpers void dma_increment(); void dma_load(); @@ -495,7 +495,7 @@ protected: UINT32 m_isr; UINT32 m_obuf; UINT32 m_osr; - + UINT32 m_iotemp; // internal stuff diff --git a/src/emu/cpu/dsp32/dsp32ops.c b/src/emu/cpu/dsp32/dsp32ops.c index 439e1aea107..bf1fcf5213b 100644 --- a/src/emu/cpu/dsp32/dsp32ops.c +++ b/src/emu/cpu/dsp32/dsp32ops.c @@ -90,7 +90,7 @@ #if EMULATE_MEMORY_LATENCY #define WWORD_DEFERRED(a,v) do { int bufidx = m_mbuf_index & 3; m_mbufaddr[bufidx] = -(a); m_mbufdata[bufidx] = (v); } while (0) #define WLONG_DEFERRED(a,v) do { int bufidx = m_mbuf_index & 3; m_mbufaddr[bufidx] = (a); m_mbufdata[bufidx] = (v); } while (0) -#define PROCESS_DEFERRED_MEMORY() \ +#define PROCESS_DEFERRED_MEMORY() \ if (m_mbufaddr[++m_mbuf_index & 3] != 1) \ { \ int bufidx = m_mbuf_index & 3; \ diff --git a/src/emu/cpu/tms32031/32031ops.c b/src/emu/cpu/tms32031/32031ops.c index 9616c675705..9fae72f13cd 100644 --- a/src/emu/cpu/tms32031/32031ops.c +++ b/src/emu/cpu/tms32031/32031ops.c @@ -1,9 +1,9 @@ /*************************************************************************** 32031ops.c - + TMS32031/2 emulator - + **************************************************************************** Copyright Aaron Giles @@ -84,8 +84,8 @@ #define OR_V_ADD(a,b,r) do { UINT32 temp = ((~((a) ^ (b)) & ((a) ^ (r))) >> 30) & VFLAG; IREG(TMR_ST) |= temp | (temp << 4); } while (0) #define OR_C_SUB(a,b,r) do { IREG(TMR_ST) |= ((UINT32)(b) > (UINT32)(a)); } while (0) #define OR_C_ADD(a,b,r) do { IREG(TMR_ST) |= ((UINT32)(~(a)) < (UINT32)(b)); } while (0) -#define OR_NZCV_SUB(a,b,r) do { OR_V_SUB(a,b,r); OR_C_SUB(a,b,r); OR_NZ(r); } while (0) -#define OR_NZCV_ADD(a,b,r) do { OR_V_ADD(a,b,r); OR_C_ADD(a,b,r); OR_NZ(r); } while (0) +#define OR_NZCV_SUB(a,b,r) do { OR_V_SUB(a,b,r); OR_C_SUB(a,b,r); OR_NZ(r); } while (0) +#define OR_NZCV_ADD(a,b,r) do { OR_V_ADD(a,b,r); OR_C_ADD(a,b,r); OR_NZ(r); } while (0) #define OVM() (IREG(TMR_ST) & OVMFLAG) @@ -6346,26 +6346,26 @@ void tms3203x_device::xor3sti(UINT32 op) UINT32 (tms3203x_device::*const tms3203x_device::s_indirect_d[0x20])(UINT32, UINT8) = { - &tms3203x_device::mod00_d, &tms3203x_device::mod01_d, &tms3203x_device::mod02_d, &tms3203x_device::mod03_d, + &tms3203x_device::mod00_d, &tms3203x_device::mod01_d, &tms3203x_device::mod02_d, &tms3203x_device::mod03_d, &tms3203x_device::mod04_d, &tms3203x_device::mod05_d, &tms3203x_device::mod06_d, &tms3203x_device::mod07_d, - &tms3203x_device::mod08, &tms3203x_device::mod09, &tms3203x_device::mod0a, &tms3203x_device::mod0b, + &tms3203x_device::mod08, &tms3203x_device::mod09, &tms3203x_device::mod0a, &tms3203x_device::mod0b, &tms3203x_device::mod0c, &tms3203x_device::mod0d, &tms3203x_device::mod0e, &tms3203x_device::mod0f, - &tms3203x_device::mod10, &tms3203x_device::mod11, &tms3203x_device::mod12, &tms3203x_device::mod13, + &tms3203x_device::mod10, &tms3203x_device::mod11, &tms3203x_device::mod12, &tms3203x_device::mod13, &tms3203x_device::mod14, &tms3203x_device::mod15, &tms3203x_device::mod16, &tms3203x_device::mod17, - &tms3203x_device::mod18, &tms3203x_device::mod19, &tms3203x_device::modillegal, &tms3203x_device::modillegal, + &tms3203x_device::mod18, &tms3203x_device::mod19, &tms3203x_device::modillegal, &tms3203x_device::modillegal, &tms3203x_device::modillegal, &tms3203x_device::modillegal, &tms3203x_device::modillegal, &tms3203x_device::modillegal }; UINT32 (tms3203x_device::*const tms3203x_device::s_indirect_1[0x20])(UINT32, UINT8) = { - &tms3203x_device::mod00_1, &tms3203x_device::mod01_1, &tms3203x_device::mod02_1, &tms3203x_device::mod03_1, + &tms3203x_device::mod00_1, &tms3203x_device::mod01_1, &tms3203x_device::mod02_1, &tms3203x_device::mod03_1, &tms3203x_device::mod04_1, &tms3203x_device::mod05_1, &tms3203x_device::mod06_1, &tms3203x_device::mod07_1, - &tms3203x_device::mod08, &tms3203x_device::mod09, &tms3203x_device::mod0a, &tms3203x_device::mod0b, + &tms3203x_device::mod08, &tms3203x_device::mod09, &tms3203x_device::mod0a, &tms3203x_device::mod0b, &tms3203x_device::mod0c, &tms3203x_device::mod0d, &tms3203x_device::mod0e, &tms3203x_device::mod0f, - &tms3203x_device::mod10, &tms3203x_device::mod11, &tms3203x_device::mod12, &tms3203x_device::mod13, + &tms3203x_device::mod10, &tms3203x_device::mod11, &tms3203x_device::mod12, &tms3203x_device::mod13, &tms3203x_device::mod14, &tms3203x_device::mod15, &tms3203x_device::mod16, &tms3203x_device::mod17, - &tms3203x_device::mod18, &tms3203x_device::mod19, &tms3203x_device::modillegal, &tms3203x_device::modillegal, + &tms3203x_device::mod18, &tms3203x_device::mod19, &tms3203x_device::modillegal, &tms3203x_device::modillegal, &tms3203x_device::modillegal, &tms3203x_device::modillegal, &tms3203x_device::modillegal, &tms3203x_device::modillegal }; @@ -6374,11 +6374,11 @@ UINT32 (tms3203x_device::*const tms3203x_device::s_indirect_1_def[0x20])(UINT32, { &tms3203x_device::mod00_1_def, &tms3203x_device::mod01_1_def, &tms3203x_device::mod02_1_def, &tms3203x_device::mod03_1_def, &tms3203x_device::mod04_1_def, &tms3203x_device::mod05_1_def, &tms3203x_device::mod06_1_def, &tms3203x_device::mod07_1_def, - &tms3203x_device::mod08_def, &tms3203x_device::mod09_def, &tms3203x_device::mod0a_def, &tms3203x_device::mod0b_def, + &tms3203x_device::mod08_def, &tms3203x_device::mod09_def, &tms3203x_device::mod0a_def, &tms3203x_device::mod0b_def, &tms3203x_device::mod0c_def, &tms3203x_device::mod0d_def, &tms3203x_device::mod0e_def, &tms3203x_device::mod0f_def, - &tms3203x_device::mod10_def, &tms3203x_device::mod11_def, &tms3203x_device::mod12_def, &tms3203x_device::mod13_def, + &tms3203x_device::mod10_def, &tms3203x_device::mod11_def, &tms3203x_device::mod12_def, &tms3203x_device::mod13_def, &tms3203x_device::mod14_def, &tms3203x_device::mod15_def, &tms3203x_device::mod16_def, &tms3203x_device::mod17_def, - &tms3203x_device::mod18_def, &tms3203x_device::mod19_def, &tms3203x_device::modillegal_def,&tms3203x_device::modillegal_def, + &tms3203x_device::mod18_def, &tms3203x_device::mod19_def, &tms3203x_device::modillegal_def,&tms3203x_device::modillegal_def, &tms3203x_device::modillegal_def,&tms3203x_device::modillegal_def,&tms3203x_device::modillegal_def,&tms3203x_device::modillegal_def }; diff --git a/src/emu/cpu/tms32031/tms32031.c b/src/emu/cpu/tms32031/tms32031.c index 21504cdd37f..618d978f675 100644 --- a/src/emu/cpu/tms32031/tms32031.c +++ b/src/emu/cpu/tms32031/tms32031.c @@ -1,9 +1,9 @@ /*************************************************************************** tms32031.c - + TMS32031/2 emulator - + **************************************************************************** Copyright Aaron Giles @@ -291,7 +291,7 @@ float tms3203x_device::tmsreg::as_float() const int exp = (exponent() + 127) << 23; id.i[0] = exp + (mantissa() >> 8); } - + // handle negative numbers else { @@ -299,7 +299,7 @@ float tms3203x_device::tmsreg::as_float() const INT32 man = -mantissa(); id.i[0] = 0x80000000 + exp + ((man >> 8) & 0x00ffffff); } - + // return the converted float return id.f[0]; } @@ -326,7 +326,7 @@ double tms3203x_device::tmsreg::as_double() const id.i[BYTE_XOR_BE(0)] = exp + (mantissa() >> 11); id.i[BYTE_XOR_BE(1)] = (mantissa() << 21) & 0xffe00000; } - + // handle negative numbers else { @@ -335,7 +335,7 @@ double tms3203x_device::tmsreg::as_double() const id.i[BYTE_XOR_BE(0)] = 0x80000000 + exp + ((man >> 11) & 0x001fffff); id.i[BYTE_XOR_BE(1)] = (man << 21) & 0xffe00000; } - + // return the converted double return id.d; } @@ -360,7 +360,7 @@ void tms3203x_device::tmsreg::from_double(double val) set_mantissa(0); set_exponent(-128); } - + // if we're too large, map to the maximum value else if (exponent > 127) { @@ -370,21 +370,21 @@ void tms3203x_device::tmsreg::from_double(double val) set_mantissa(0x80000001); set_exponent(127); } - + // if we're positive, map directly else if ((INT32)id.i[BYTE_XOR_BE(0)] >= 0) { set_mantissa(mantissa); set_exponent(exponent); } - + // if we're negative with a non-zero mantissa, remove the leading sign bit else if (mantissa != 0) { set_mantissa(0x80000000 | -mantissa); set_exponent(exponent); } - + // if we're negative with a zero mantissa, normalize else { @@ -846,7 +846,7 @@ void tms3203x_device::execute_run() execute_one(); } } - + // debugging case else { diff --git a/src/emu/cpu/tms32031/tms32031.h b/src/emu/cpu/tms32031/tms32031.h index 397e331d9de..2a5910932f6 100644 --- a/src/emu/cpu/tms32031/tms32031.h +++ b/src/emu/cpu/tms32031/tms32031.h @@ -1,9 +1,9 @@ /*************************************************************************** tms32031.h - + TMS32031/2 emulator - + **************************************************************************** Copyright Aaron Giles @@ -211,21 +211,21 @@ class tms3203x_device : public cpu_device tmsreg() { i32[0] = i32[1] = 0; } tmsreg(double value) { from_double(value); } tmsreg(INT32 mantissa, INT8 exponent) { set_mantissa(mantissa); set_exponent(exponent); } - + // getters UINT32 integer() const { return i32[0]; } INT32 mantissa() const { return i32[0]; } INT8 exponent() const { return i32[1]; } void set_mantissa(INT32 man) { i32[0] = man; } void set_exponent(INT8 exp) { i32[1] = exp; } - + // exporters float as_float() const; double as_double() const; - + // importers void from_double(double); - + UINT32 i32[2]; }; @@ -850,7 +850,7 @@ protected: static UINT32 (tms3203x_device::*const s_indirect_1_def[0x20])(UINT32, UINT8, UINT32 *&); #if (TMS_3203X_LOG_OPCODE_USAGE) - UINT32 m_hits[0x200*4]; + UINT32 m_hits[0x200*4]; #endif }; diff --git a/src/emu/debug/debugcmd.c b/src/emu/debug/debugcmd.c index d7c3e5d88d7..4a9e5eeae75 100644 --- a/src/emu/debug/debugcmd.c +++ b/src/emu/debug/debugcmd.c @@ -318,7 +318,7 @@ void debug_command_init(running_machine *machine) debug_console_register_command(machine, "load", CMDFLAG_NONE, ADDRESS_SPACE_PROGRAM, 3, 4, execute_load); debug_console_register_command(machine, "loadd", CMDFLAG_NONE, ADDRESS_SPACE_DATA, 3, 4, execute_load); debug_console_register_command(machine, "loadi", CMDFLAG_NONE, ADDRESS_SPACE_IO, 3, 4, execute_load); - + debug_console_register_command(machine, "dump", CMDFLAG_NONE, ADDRESS_SPACE_PROGRAM, 3, 6, execute_dump); debug_console_register_command(machine, "dumpd", CMDFLAG_NONE, ADDRESS_SPACE_DATA, 3, 6, execute_dump); debug_console_register_command(machine, "dumpi", CMDFLAG_NONE, ADDRESS_SPACE_IO, 3, 6, execute_dump); @@ -1588,7 +1588,7 @@ static void execute_load(running_machine *machine, int ref, int params, const ch for (i = offset; i <= endoffset || endoffset == offset - 1 ; i++) { fread(&byte, 1, 1, f); - /* check if end of file has been reached and stop loading if it has */ + /* check if end of file has been reached and stop loading if it has */ if (feof(f)) break; debug_write_byte(space, i, byte, TRUE); diff --git a/src/emu/debug/debugcpu.h b/src/emu/debug/debugcpu.h index 8321ce169c8..4b926d7bffb 100644 --- a/src/emu/debug/debugcpu.h +++ b/src/emu/debug/debugcpu.h @@ -357,7 +357,7 @@ private: static const UINT32 DEBUG_FLAG_STEPPING_ANY = DEBUG_FLAG_STEPPING | DEBUG_FLAG_STEPPING_OVER | DEBUG_FLAG_STEPPING_OUT; static const UINT32 DEBUG_FLAG_TRACING_ANY = DEBUG_FLAG_TRACING | DEBUG_FLAG_TRACING_OVER; - static const UINT32 DEBUG_FLAG_TRANSIENT = DEBUG_FLAG_STEPPING_ANY | DEBUG_FLAG_STOP_PC | + static const UINT32 DEBUG_FLAG_TRANSIENT = DEBUG_FLAG_STEPPING_ANY | DEBUG_FLAG_STOP_PC | DEBUG_FLAG_STOP_INTERRUPT | DEBUG_FLAG_STOP_EXCEPTION | DEBUG_FLAG_STOP_VBLANK | DEBUG_FLAG_STOP_TIME; }; diff --git a/src/emu/debug/debughlp.c b/src/emu/debug/debughlp.c index 36f06e15a15..96f771d47e8 100644 --- a/src/emu/debug/debughlp.c +++ b/src/emu/debug/debughlp.c @@ -512,7 +512,7 @@ static const help_item static_help_list[] = "\n" "loadd harddriv.bin,3000,1000,3\n" " Loads data memory addresses 3000-3fff from CPU #3 from the binary file 'harddriv.bin'.\n" - }, + }, { "step", "\n" diff --git a/src/emu/devintrf.h b/src/emu/devintrf.h index f87247b0a60..bf53185ee9f 100644 --- a/src/emu/devintrf.h +++ b/src/emu/devintrf.h @@ -430,7 +430,7 @@ public: void set_clock_scale(double clockscale); attotime clocks_to_attotime(UINT64 clocks) const; UINT64 attotime_to_clocks(attotime duration) const; - + // timer interfaces emu_timer *timer_alloc(device_timer_id id = 0, void *ptr = NULL); void timer_set(attotime duration, device_timer_id id = 0, int param = 0, void *ptr = NULL); diff --git a/src/emu/disound.c b/src/emu/disound.c index 3a37cfe2a15..839de2b8a0c 100644 --- a/src/emu/disound.c +++ b/src/emu/disound.c @@ -173,7 +173,7 @@ device_sound_interface::~device_sound_interface() //------------------------------------------------- -// inputs - return the total number of inputs +// inputs - return the total number of inputs // for the given device //------------------------------------------------- @@ -189,7 +189,7 @@ int device_sound_interface::inputs() const //------------------------------------------------- -// outputs - return the total number of outputs +// outputs - return the total number of outputs // for the given device //------------------------------------------------- @@ -206,14 +206,14 @@ int device_sound_interface::outputs() const //------------------------------------------------- // input_to_stream_input - convert a device's -// input index to a stream and the input index +// input index to a stream and the input index // on that stream //------------------------------------------------- sound_stream *device_sound_interface::input_to_stream_input(int inputnum, int &stream_inputnum) { assert(inputnum >= 0); - + // scan the list looking for streams owned by this device for (sound_stream *stream = m_device.machine->sound().first_stream(); stream != NULL; stream = stream->next()) if (&stream->device() == &m_device) @@ -225,7 +225,7 @@ sound_stream *device_sound_interface::input_to_stream_input(int inputnum, int &s } inputnum -= stream->input_count(); } - + // not found return NULL; } @@ -233,14 +233,14 @@ sound_stream *device_sound_interface::input_to_stream_input(int inputnum, int &s //------------------------------------------------- // output_to_stream_output - convert a device's -// output index to a stream and the output index +// output index to a stream and the output index // on that stream //------------------------------------------------- sound_stream *device_sound_interface::output_to_stream_output(int outputnum, int &stream_outputnum) { assert(outputnum >= 0); - + // scan the list looking for streams owned by this device for (sound_stream *stream = m_device.machine->sound().first_stream(); stream != NULL; stream = stream->next()) if (&stream->device() == &device()) @@ -252,7 +252,7 @@ sound_stream *device_sound_interface::output_to_stream_output(int outputnum, int } outputnum -= stream->output_count(); } - + // not found return NULL; } @@ -260,7 +260,7 @@ sound_stream *device_sound_interface::output_to_stream_output(int outputnum, int //------------------------------------------------- // set_output_gain - set the gain on the given -// output index of the device +// output index of the device //------------------------------------------------- void device_sound_interface::set_output_gain(int outputnum, float gain) @@ -273,7 +273,7 @@ void device_sound_interface::set_output_gain(int outputnum, float gain) for (int outputnum = 0; outputnum < stream->output_count(); outputnum++) stream->set_output_gain(outputnum, gain); } - + // look up the stream and stream output index else { @@ -305,7 +305,7 @@ void device_sound_interface::interface_pre_start() throw device_missing_dependencies(); } } - + // now iterate through devices again and assign any auto-allocated inputs m_auto_allocated_inputs = 0; for (bool gotone = m_device.machine->m_devicelist.first(sound); gotone; gotone = sound->next(sound)) @@ -371,7 +371,7 @@ void device_sound_interface::interface_post_start() //------------------------------------------------- -// interface_pre_reset - called prior to +// interface_pre_reset - called prior to // resetting the device //------------------------------------------------- diff --git a/src/emu/disound.h b/src/emu/disound.h index c34d9024ad6..c4373bd066a 100644 --- a/src/emu/disound.h +++ b/src/emu/disound.h @@ -104,7 +104,7 @@ public: { public: sound_route(int output, int input, float gain, const char *target); - + const sound_route *next() const { return m_next; } sound_route * m_next; // pointer to next route @@ -161,7 +161,7 @@ protected: virtual void interface_pre_start(); virtual void interface_post_start(); virtual void interface_pre_reset(); - + // internal state const device_config_sound_interface &m_sound_config; diff --git a/src/emu/emutempl.h b/src/emu/emutempl.h index 1c30e7f890b..74fe8501f6c 100644 --- a/src/emu/emutempl.h +++ b/src/emu/emutempl.h @@ -133,7 +133,7 @@ public: m_tail = tail; m_count += count; } - + // insert the given object after a particular object (NULL means prepend) T &insert_after(T &object, T *insert_after) { @@ -271,13 +271,13 @@ public: // reclaim an item by adding it to the free list void reclaim(T *item) { if (item != NULL) m_freelist.append(*item); } void reclaim(T &item) { m_freelist.append(item); } - + // reclaim all items from a list void reclaim_all(simple_list<T> &list) { m_freelist.append_list(list); } private: // internal state - simple_list<T> m_freelist; // list of free objects + simple_list<T> m_freelist; // list of free objects }; @@ -373,7 +373,7 @@ public: private: // internal state simple_list<T> m_list; - tagmap_t<T *> m_map; + tagmap_t<T *> m_map; }; diff --git a/src/emu/imagedev/snapquik.c b/src/emu/imagedev/snapquik.c index 1640fd6b32e..7eb090560f2 100644 --- a/src/emu/imagedev/snapquik.c +++ b/src/emu/imagedev/snapquik.c @@ -151,7 +151,7 @@ static DEVICE_IMAGE_LOAD( snapquick ) token->load = (snapquick_load_func) reinterpret_cast<snapquick_load_func>(image.get_device_specific_call()); /* adjust the timer */ - + token->timer->adjust( attotime(config->delay_seconds, config->delay_attoseconds), 0); diff --git a/src/emu/machine.c b/src/emu/machine.c index b64f6ff0bc5..4b152e53e5f 100644 --- a/src/emu/machine.c +++ b/src/emu/machine.c @@ -268,7 +268,7 @@ void running_machine::start() m_render = auto_alloc(this, render_manager(*this)); generic_machine_init(this); generic_sound_init(this); - + // allocate a soft_reset timer m_soft_reset_timer = m_scheduler.timer_alloc(MSTUB(timer_expired, running_machine, soft_reset), this); diff --git a/src/emu/machine/68681.c b/src/emu/machine/68681.c index f4fb54d95da..2b46fbaa21b 100644 --- a/src/emu/machine/68681.c +++ b/src/emu/machine/68681.c @@ -419,26 +419,26 @@ static TIMER_CALLBACK( tx_timer_callback ) if ((duart68681->duart_config->tx_callback) && ((duart68681->channel[ch].MR2&0xC0) != 0x80)) duart68681->duart_config->tx_callback(device, ch, duart68681->channel[ch].tx_data); - // if local loopback is on, write the transmitted data as if a byte had been received - if ((duart68681->channel[ch].MR2 & 0xC0) == 0x80) - { - if (duart68681->channel[ch].rx_fifo_num >= RX_FIFO_SIZE) - { - LOG(( "68681: FIFO overflow\n" )); - duart68681->channel[ch].SR |= STATUS_OVERRUN_ERROR; - } - else - { - duart68681->channel[ch].rx_fifo[duart68681->channel[ch].rx_fifo_write_ptr++] - = duart68681->channel[ch].tx_data; - if (duart68681->channel[ch].rx_fifo_write_ptr == RX_FIFO_SIZE) - { - duart68681->channel[ch].rx_fifo_write_ptr = 0; - } - duart68681->channel[ch].rx_fifo_num++; - } - } - + // if local loopback is on, write the transmitted data as if a byte had been received + if ((duart68681->channel[ch].MR2 & 0xC0) == 0x80) + { + if (duart68681->channel[ch].rx_fifo_num >= RX_FIFO_SIZE) + { + LOG(( "68681: FIFO overflow\n" )); + duart68681->channel[ch].SR |= STATUS_OVERRUN_ERROR; + } + else + { + duart68681->channel[ch].rx_fifo[duart68681->channel[ch].rx_fifo_write_ptr++] + = duart68681->channel[ch].tx_data; + if (duart68681->channel[ch].rx_fifo_write_ptr == RX_FIFO_SIZE) + { + duart68681->channel[ch].rx_fifo_write_ptr = 0; + } + duart68681->channel[ch].rx_fifo_num++; + } + } + duart68681->channel[ch].tx_ready = 1; duart68681->channel[ch].SR |= STATUS_TRANSMITTER_READY; diff --git a/src/emu/machine/mc68901.c b/src/emu/machine/mc68901.c index a43b2db82c0..cc3bc818c1b 100644 --- a/src/emu/machine/mc68901.c +++ b/src/emu/machine/mc68901.c @@ -48,7 +48,7 @@ //************************************************************************** -// MACROS / CONSTANTS +// MACROS / CONSTANTS //************************************************************************** #define LOG 0 @@ -292,7 +292,7 @@ void mc68901_device_config::device_config_complete() // or initialize to defaults if none provided else { -// memset(&in_pa_func, 0, sizeof(in_pa_func)); +// memset(&in_pa_func, 0, sizeof(in_pa_func)); } } @@ -911,7 +911,7 @@ READ8_MEMBER( mc68901_device::read ) { switch (offset) { - case REGISTER_GPIP: + case REGISTER_GPIP: m_gpip = devcb_call_read8(&m_in_gpio_func, 0); return m_gpip; diff --git a/src/emu/machine/mc68901.h b/src/emu/machine/mc68901.h index 9c7e17bf114..7990d31f9d3 100644 --- a/src/emu/machine/mc68901.h +++ b/src/emu/machine/mc68901.h @@ -44,7 +44,7 @@ //************************************************************************** -// MACROS / CONSTANTS +// MACROS / CONSTANTS //************************************************************************** @@ -64,7 +64,7 @@ //************************************************************************** -// TYPE DEFINITIONS +// TYPE DEFINITIONS //************************************************************************** // ======================> mc68901_interface @@ -244,7 +244,7 @@ private: emu_timer *m_timer[4]; /* counter timers */ emu_timer *m_rx_timer; /* receive timer */ emu_timer *m_tx_timer; /* transmit timer */ - + const mc68901_device_config &m_config; }; diff --git a/src/emu/schedule.c b/src/emu/schedule.c index da56b31fea0..948758cc477 100644 --- a/src/emu/schedule.c +++ b/src/emu/schedule.c @@ -119,7 +119,7 @@ emu_timer &emu_timer::init(running_machine &machine, timer_expired_func callback // if we're not temporary, register ourselves with the save state system if (!m_temporary) register_save(); - + // insert into the list machine.scheduler().timer_list_insert(*this); return *this; @@ -152,7 +152,7 @@ emu_timer &emu_timer::init(device_t &device, device_timer_id id, void *ptr, bool // if we're not temporary, register ourselves with the save state system if (!m_temporary) register_save(); - + // insert into the list machine().scheduler().timer_list_insert(*this); return *this; @@ -194,8 +194,8 @@ bool emu_timer::enable(bool enable) //------------------------------------------------- -// adjust - adjust the time when this timer will -// fire and specify a period for subsequent +// adjust - adjust the time when this timer will +// fire and specify a period for subsequent // firings //------------------------------------------------- @@ -241,13 +241,13 @@ attotime emu_timer::elapsed() const //------------------------------------------------- -// remaining - return the amount of time +// remaining - return the amount of time // remaining until the timer expires //------------------------------------------------- -attotime emu_timer::remaining() const +attotime emu_timer::remaining() const { - return m_expire - machine().time(); + return m_expire - machine().time(); } @@ -261,7 +261,7 @@ void emu_timer::register_save() // determine our instance number and name int index = 0; astring name; - + // for non-device timers, it is an index based on the callback function name if (m_device == NULL) { @@ -270,7 +270,7 @@ void emu_timer::register_save() if (!curtimer->m_temporary && curtimer->m_device == NULL && strcmp(curtimer->m_func, m_func) == 0) index++; } - + // for device timers, it is an index based on the device and timer ID else { @@ -500,7 +500,7 @@ void device_scheduler::timeslice() //------------------------------------------------- -// abort_timeslice - abort execution for the +// abort_timeslice - abort execution for the // current timeslice //------------------------------------------------- @@ -617,7 +617,7 @@ void device_scheduler::eat_all_cycles() //------------------------------------------------- -// timed_trigger - generate a trigger after a +// timed_trigger - generate a trigger after a // given amount of time //------------------------------------------------- @@ -832,7 +832,7 @@ emu_timer &device_scheduler::timer_list_remove(emu_timer &timer) //------------------------------------------------- -// execute_timers - execute timers and update +// execute_timers - execute timers and update // scheduling quanta //------------------------------------------------- @@ -890,15 +890,15 @@ void device_scheduler::execute_timers() //------------------------------------------------- -// add_scheduling_quantum - add a scheduling -// quantum; the smallest active one is the one +// add_scheduling_quantum - add a scheduling +// quantum; the smallest active one is the one // that is in use //------------------------------------------------- void device_scheduler::add_scheduling_quantum(attotime quantum, attotime duration) { assert(quantum.seconds == 0); - + attotime curtime = time(); attotime expire = curtime + duration; @@ -911,16 +911,16 @@ void device_scheduler::add_scheduling_quantum(attotime quantum, attotime duratio next = quant->next(); if (curtime >= quant->m_expire) m_quantum_allocator.reclaim(m_quantum_list.detach(*quant)); - + // if this quantum is shorter than us, we need to be inserted afterwards else if (quant->m_requested <= quantum.attoseconds) insert_after = quant; } - + // if we found an exact match, just take the maximum expiry time if (insert_after != NULL && insert_after->m_requested == quantum.attoseconds) insert_after->m_expire = max(insert_after->m_expire, expire); - + // otherwise, allocate a new quantum and insert it after the one we picked else { @@ -974,4 +974,4 @@ void timer_print_first_timer(running_machine *machine) } -#endif
\ No newline at end of file +#endif diff --git a/src/emu/schedule.h b/src/emu/schedule.h index e60978bf6ec..02e8a57bd9a 100644 --- a/src/emu/schedule.h +++ b/src/emu/schedule.h @@ -167,7 +167,7 @@ public: void abort_timeslice(); void trigger(int trigid, attotime after = attotime::zero); void boost_interleave(attotime timeslice_time, attotime boost_duration); - + // timers, specified by callback/name emu_timer *timer_alloc(timer_expired_func callback, const char *name, void *ptr = NULL); void timer_set(attotime duration, timer_expired_func callback, const char *name, int param = 0, void *ptr = NULL); @@ -185,12 +185,12 @@ private: // callbacks void timed_trigger(running_machine &machine, INT32 param); void postload(); - + // scheduling helpers void compute_perfect_interleave(); void rebuild_execute_list(); void add_scheduling_quantum(attotime quantum, attotime duration); - + // timer helpers emu_timer &timer_list_insert(emu_timer &timer); emu_timer &timer_list_remove(emu_timer &timer); @@ -208,7 +208,7 @@ private: // other internal states emu_timer * m_callback_timer; // pointer to the current callback timer - bool m_callback_timer_modified; // true if the current callback timer was modified + bool m_callback_timer_modified; // true if the current callback timer was modified attotime m_callback_timer_expire_time; // the original expiration time // scheduling quanta @@ -218,13 +218,13 @@ private: public: quantum_slot *next() const { return m_next; } - + quantum_slot * m_next; attoseconds_t m_actual; // actual duration of the quantum attoseconds_t m_requested; // duration of the requested quantum attotime m_expire; // absolute expiration time of this quantum }; - simple_list<quantum_slot> m_quantum_list; // list of active quanta + simple_list<quantum_slot> m_quantum_list; // list of active quanta fixed_allocator<quantum_slot> m_quantum_allocator; // allocator for quanta attoseconds_t m_quantum_minimum; // duration of minimum quantum }; diff --git a/src/emu/sound.c b/src/emu/sound.c index 46a35b2cae4..ef850023afc 100644 --- a/src/emu/sound.c +++ b/src/emu/sound.c @@ -103,7 +103,7 @@ sound_stream::sound_stream(device_t &device, int inputs, int outputs, int sample device_sound_interface *sound; if (!device.interface(sound)) throw emu_fatalerror("Attempted to create a sound_stream with a non-sound device"); - + // this is also the implicit parameter if we are using our internal stub if (m_callback == &sound_stream::device_stream_update_stub) m_param = sound; @@ -133,7 +133,7 @@ sound_stream::sound_stream(device_t &device, int inputs, int outputs, int sample //------------------------------------------------- -// sample_time - return the emulation time of the +// sample_time - return the emulation time of the // next sample to be generated on the stream //------------------------------------------------- @@ -156,7 +156,7 @@ float sound_stream::input_gain(int inputnum) const //------------------------------------------------- -// initial_input_gain - return the original input +// initial_input_gain - return the original input // gain on a given stream's input //------------------------------------------------- @@ -177,14 +177,14 @@ const char *sound_stream::input_name(int inputnum, astring &string) const // start with our device name and tag assert(inputnum >= 0 && inputnum < m_inputs); string.printf("%s '%s': ", m_device.name(), m_device.tag()); - + // if we have a source, indicate where the sound comes from by device name and tag if (m_input[inputnum].m_source != NULL && m_input[inputnum].m_source->m_stream != NULL) { device_t &source = m_input[inputnum].m_source->m_stream->device(); string.catprintf("%s '%s'", source.name(), source.tag()); - // get the sound interface; if there is more than 1 output we need to figure out which one + // get the sound interface; if there is more than 1 output we need to figure out which one device_sound_interface *sound; if (source.interface(sound) && sound->outputs() > 1) { @@ -205,7 +205,7 @@ const char *sound_stream::input_name(int inputnum, astring &string) const //------------------------------------------------- -// output_gain - return the output gain on a +// output_gain - return the output gain on a // given stream's output //------------------------------------------------- @@ -289,8 +289,8 @@ void sound_stream::update() //------------------------------------------------- -// output_since_last_update - return a pointer to -// the output buffer and the number of samples +// output_since_last_update - return a pointer to +// the output buffer and the number of samples // since the last global update //------------------------------------------------- @@ -306,7 +306,7 @@ const stream_sample_t *sound_stream::output_since_last_update(int outputnum, int //------------------------------------------------- -// set_sample_rate - set the sample rate on a +// set_sample_rate - set the sample rate on a // given stream //------------------------------------------------- @@ -332,7 +332,7 @@ void sound_stream::set_input_gain(int inputnum, float gain) //------------------------------------------------- -// set_output_gain - set the output gain on a +// set_output_gain - set the output gain on a // given stream's output //------------------------------------------------- @@ -398,7 +398,7 @@ void sound_stream::apply_sample_rate_changes() // skip if nothing to do if (m_new_sample_rate == 0) return; - + // update to the new rate and remember the old rate UINT32 old_rate = m_sample_rate; m_sample_rate = m_new_sample_rate; @@ -854,8 +854,8 @@ void sound_manager::set_attenuation(int attenuation) //------------------------------------------------- -// indexed_speaker_input - return the speaker -// device and input index of the global speaker +// indexed_speaker_input - return the speaker +// device and input index of the global speaker // input //------------------------------------------------- @@ -872,7 +872,7 @@ bool sound_manager::indexed_speaker_input(int index, speaker_input &info) const } index -= info.speaker->inputs(); } - + // didn't locate return false; } @@ -991,7 +991,7 @@ void sound_manager::config_save(running_machine *machine, int config_type, xml_d //------------------------------------------------- -// update - mix everything down to its final form +// update - mix everything down to its final form // and send it to the OSD layer //------------------------------------------------- diff --git a/src/emu/sound.h b/src/emu/sound.h index 5ea47565304..d8130e1aae5 100644 --- a/src/emu/sound.h +++ b/src/emu/sound.h @@ -79,7 +79,7 @@ class sound_stream { friend class simple_list<sound_stream>; friend class sound_manager; - + typedef void (*stream_update_func)(device_t *device, sound_stream *stream, void *param, stream_sample_t **inputs, stream_sample_t **outputs, int samples); // stream output class @@ -88,7 +88,7 @@ class sound_stream public: // construction/destruction stream_output(); - + // internal state sound_stream * m_stream; // owning stream stream_sample_t * m_buffer; // output buffer @@ -102,7 +102,7 @@ class sound_stream public: // construction/destruction stream_input(); - + // internal state stream_output * m_source; // pointer to the sound_output for this source stream_sample_t * m_resample; // buffer for resampling to the stream's sample rate @@ -117,7 +117,7 @@ class sound_stream static const int OUTPUT_BUFFER_UPDATES = 5; static const UINT32 FRAC_BITS = 22; static const UINT32 FRAC_ONE = 1 << FRAC_BITS; - static const UINT32 FRAC_MASK = FRAC_ONE - 1; + static const UINT32 FRAC_MASK = FRAC_ONE - 1; // construction/destruction sound_stream(device_t &device, int inputs, int outputs, int sample_rate, void *param = NULL, stream_update_func callback = &sound_stream::device_stream_update_stub); @@ -145,7 +145,7 @@ public: void set_sample_rate(int sample_rate); void set_input_gain(int inputnum, float gain); void set_output_gain(int outputnum, float gain); - + private: // helpers called by our friends only void update_with_accounting(bool second_tick); @@ -218,26 +218,26 @@ public: // construction/destruction sound_manager(running_machine &machine); ~sound_manager(); - + // getters int attenuation() const { return m_attenuation; } sound_stream *first_stream() const { return m_stream_list.first(); } attotime last_update() const { return m_last_update; } attoseconds_t update_attoseconds() const { return m_update_attoseconds; } - + // stream creation sound_stream *stream_alloc(device_t &device, int inputs, int outputs, int sample_rate, void *param = NULL, sound_stream::stream_update_func callback = NULL); - + // global controls void set_attenuation(int attenuation); void ui_mute(bool turn_off = true) { mute(turn_off, MUTE_REASON_UI); } void debugger_mute(bool turn_off = true) { mute(turn_off, MUTE_REASON_DEBUGGER); } void system_mute(bool turn_off = true) { mute(turn_off, MUTE_REASON_SYSTEM); } void system_enable(bool turn_on = true) { mute(!turn_on, MUTE_REASON_SYSTEM); } - + // user gain controls bool indexed_speaker_input(int index, speaker_input &info) const; - + private: // internal helpers void mute(bool mute, UINT8 reason); @@ -254,17 +254,17 @@ private: running_machine & m_machine; // reference to our machine emu_timer * m_update_timer; // timer to drive periodic updates - UINT32 m_finalmix_leftover; + UINT32 m_finalmix_leftover; INT16 * m_finalmix; INT32 * m_leftmix; INT32 * m_rightmix; - UINT8 m_muted; + UINT8 m_muted; int m_attenuation; int m_nosound_mode; wav_file * m_wavfile; - + // streams data simple_list<sound_stream> m_stream_list; // list of streams attoseconds_t m_update_attoseconds; // attoseconds between global updates diff --git a/src/emu/sound/bsmt2000.c b/src/emu/sound/bsmt2000.c index ed70b946baf..e372c8e50fa 100644 --- a/src/emu/sound/bsmt2000.c +++ b/src/emu/sound/bsmt2000.c @@ -280,7 +280,7 @@ void bsmt2000_device::device_timer(emu_timer &timer, device_timer_id id, int par //------------------------------------------------- -// sound_stream_update - handle update requests +// sound_stream_update - handle update requests // for our sound stream //------------------------------------------------- diff --git a/src/emu/state.c b/src/emu/state.c index 8ebc7935e2b..9759223044d 100644 --- a/src/emu/state.c +++ b/src/emu/state.c @@ -113,7 +113,7 @@ state_manager::state_manager(running_machine &machine) //------------------------------------------------- -// allow_registration - allow/disallow +// allow_registration - allow/disallow // registrations to happen //------------------------------------------------- @@ -127,7 +127,7 @@ void state_manager::allow_registration(bool allowed) //------------------------------------------------- -// indexed_item - return an item with the given +// indexed_item - return an item with the given // index //------------------------------------------------- @@ -136,17 +136,17 @@ const char *state_manager::indexed_item(int index, void *&base, UINT32 &valsize, state_entry *entry = m_entry_list.find(index); if (entry == NULL) return NULL; - + base = entry->m_data; valsize = entry->m_typesize; valcount = entry->m_typecount; - + return entry->m_name; } //------------------------------------------------- -// register_presave - register a pre-save +// register_presave - register a pre-save // function callback //------------------------------------------------- @@ -227,13 +227,13 @@ void state_manager::save_memory(const char *module, const char *tag, UINT32 inde fatalerror("Duplicate save state registration entry (%s)", totalname.cstr()); } - // insert us into the list + // insert us into the list m_entry_list.insert_after(*auto_alloc(&m_machine, state_entry(val, totalname, valsize, valcount)), insert_after); } //------------------------------------------------- -// check_file - check if a file is a valid save +// check_file - check if a file is a valid save // state //------------------------------------------------- @@ -372,7 +372,7 @@ UINT32 state_manager::signature() const //------------------------------------------------- -// dump_registry - dump the registry to the +// dump_registry - dump the registry to the // logfile //------------------------------------------------- diff --git a/src/emu/state.h b/src/emu/state.h index 450a3a50810..fce2e78ca3b 100644 --- a/src/emu/state.h +++ b/src/emu/state.h @@ -141,7 +141,7 @@ public: // getters int registration_count() const { return m_entry_list.count(); } bool registration_allowed() const { return m_reg_allowed; } - + // registration control void allow_registration(bool allowed = true); const char *indexed_item(int index, void *&base, UINT32 &valsize, UINT32 &valcount) const; @@ -152,7 +152,7 @@ public: // generic memory registration void save_memory(const char *module, const char *tag, UINT32 index, const char *name, void *val, UINT32 valsize, UINT32 valcount = 1); - + // templatized wrapper for general objects template<typename T> void save_item(const char *module, const char *tag, int index, T &value, const char *valname) @@ -161,7 +161,7 @@ public: if (!type_checker<T>::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); save_memory(module, tag, index, valname, &value, sizeof(value)); } - + // templatized wrapper for 1-dimensional arrays template<typename T, std::size_t N> void save_item(const char *module, const char *tag, int index, T (&value)[N], const char *valname) @@ -169,7 +169,7 @@ public: if (!type_checker<T>::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); save_memory(module, tag, index, valname, &value[0], sizeof(value[0]), N); } - + // templatized wrapper for 2-dimensional arrays template<typename T, std::size_t M, std::size_t N> void save_item(const char *module, const char *tag, int index, T (&value)[M][N], const char *valname) @@ -177,7 +177,7 @@ public: if (!type_checker<T>::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); save_memory(module, tag, index, valname, &value[0][0], sizeof(value[0][0]), M * N); } - + // templatized wrapper for pointers template<typename T> void save_pointer(const char *module, const char *tag, int index, T *value, const char *valname, UINT32 count) @@ -185,18 +185,18 @@ public: if (!type_checker<T>::is_atom) throw emu_fatalerror("Called save_item on a non-fundamental type!"); save_memory(module, tag, index, valname, value, sizeof(*value), count); } - + // global memory registration template<typename T> void save_item(T &value, const char *valname, int index = 0) { save_item("global", NULL, index, value, valname); } template<typename T> void save_pointer(T *value, const char *valname, UINT32 count, int index = 0) { save_pointer("global", NULL, index, value, valname, count); } - + // file processing static state_save_error check_file(running_machine *machine, mame_file *file, const char *gamename, void (CLIB_DECL *errormsg)(const char *fmt, ...)); state_save_error write_file(mame_file *file); state_save_error read_file(mame_file *file); - + private: // internal helpers UINT32 signature() const; @@ -211,7 +211,7 @@ private: state_callback(prepost_func callback, void *param); // getters - state_callback *next() const { return m_next; } + state_callback *next() const { return m_next; } // state state_callback * m_next; // pointer to next entry @@ -226,8 +226,8 @@ private: state_entry(void *data, const char *name, UINT8 size, UINT32 count); // getters - state_entry *next() const { return m_next; } - + state_entry *next() const { return m_next; } + // helpers void flip_data(); diff --git a/src/emu/timer.h b/src/emu/timer.h index 7df6d824e22..4e1c9bb36a4 100644 --- a/src/emu/timer.h +++ b/src/emu/timer.h @@ -108,7 +108,7 @@ typedef void (*timer_device_fired_func)(timer_device &timer, void *ptr, INT32 pa class timer_device_config : public device_config { friend class timer_device; - + // construction/destruction timer_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock); diff --git a/src/emu/video/tms9928a.h b/src/emu/video/tms9928a.h index c7d009bdcfd..1d8c72458f9 100644 --- a/src/emu/video/tms9928a.h +++ b/src/emu/video/tms9928a.h @@ -6,20 +6,20 @@ /* - Model Video Hz + Model Video Hz - TMS9918 NTSC 60 - TMS9918A NTSC 60 - TMS9118 NTSC 60 - V9938 - V9958 - V9990 + TMS9918 NTSC 60 + TMS9918A NTSC 60 + TMS9118 NTSC 60 + V9938 + V9958 + V9990 - TMS9928A YPbPr 60 - TMS9128 YPbPr 60 + TMS9928A YPbPr 60 + TMS9128 YPbPr 60 - TMS9929A YPbPr 50 - TMS9129 YPbPr 50 + TMS9929A YPbPr 50 + TMS9129 YPbPr 50 */ |
