diff options
| author | 2013-05-20 06:51:25 +0000 | |
|---|---|---|
| committer | 2013-05-20 06:51:25 +0000 | |
| commit | 1c05ccc93bd32a9bb5a50f18e2e8bd29c3511e25 (patch) | |
| tree | 7133a7cea14e7c27e731c320b87663971b1a31d3 /src/emu | |
| parent | cae878c9b438a4b88678db213db9c4aed215b5cc (diff) | |
Cleanups and version bumpmame0148u5
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/cpu/cosmac/cosdasm.c | 46 | ||||
| -rw-r--r-- | src/emu/cpu/ie15/ie15.c | 66 | ||||
| -rw-r--r-- | src/emu/cpu/ie15/ie15.h | 2 | ||||
| -rw-r--r-- | src/emu/cpu/ie15/ie15dasm.c | 118 | ||||
| -rw-r--r-- | src/emu/debug/debugcmd.c | 8 | ||||
| -rw-r--r-- | src/emu/debug/debugcpu.c | 28 | ||||
| -rw-r--r-- | src/emu/debug/debugcpu.h | 10 | ||||
| -rw-r--r-- | src/emu/emuopts.h | 8 | ||||
| -rw-r--r-- | src/emu/luaengine.c | 58 | ||||
| -rw-r--r-- | src/emu/luaengine.h | 14 | ||||
| -rw-r--r-- | src/emu/machine.c | 4 | ||||
| -rw-r--r-- | src/emu/machine.h | 6 | ||||
| -rw-r--r-- | src/emu/machine/mcf5206e.c | 62 | ||||
| -rw-r--r-- | src/emu/machine/mcf5206e.h | 8 | ||||
| -rw-r--r-- | src/emu/machine/pic8259.c | 1 | ||||
| -rw-r--r-- | src/emu/machine/spchrom.c | 2 | ||||
| -rw-r--r-- | src/emu/machine/upd4701.h | 2 | ||||
| -rw-r--r-- | src/emu/sound/2610intf.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/2610intf.h | 2 | ||||
| -rw-r--r-- | src/emu/sound/3812intf.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/8950intf.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/qsound.c | 18 | ||||
| -rw-r--r-- | src/emu/sound/qsound.h | 2 | ||||
| -rw-r--r-- | src/emu/sound/spu.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/tms5110.h | 2 | ||||
| -rw-r--r-- | src/emu/video/315_5124.c | 4 | ||||
| -rw-r--r-- | src/emu/video/pc_vga.c | 16 |
27 files changed, 247 insertions, 248 deletions
diff --git a/src/emu/cpu/cosmac/cosdasm.c b/src/emu/cpu/cosmac/cosdasm.c index e411fb0ced9..889605461b6 100644 --- a/src/emu/cpu/cosmac/cosdasm.c +++ b/src/emu/cpu/cosmac/cosdasm.c @@ -58,18 +58,18 @@ static UINT32 disassemble(device_t *device, char *buffer, offs_t pc, const UINT8 opram++; UINT8 opcode = *oprom++; - + switch (opcode) { case 0x00: CDP1801_OPCODE("IDL"); break; - case 0x01: case 0x02: case 0x03: case 0x04: case 0x05: case 0x06: case 0x07: - case 0x08: case 0x09: case 0x0a: case 0x0b: case 0x0c: case 0x0d: case 0x0e: case 0x0f: + case 0x01: case 0x02: case 0x03: case 0x04: case 0x05: case 0x06: case 0x07: + case 0x08: case 0x09: case 0x0a: case 0x0b: case 0x0c: case 0x0d: case 0x0e: case 0x0f: CDP1801_OPCODE("LDN R%01X", implied(opcode)); break; - case 0x10: case 0x11: case 0x12: case 0x13: case 0x14: case 0x15: case 0x16: case 0x17: - case 0x18: case 0x19: case 0x1a: case 0x1b: case 0x1c: case 0x1d: case 0x1e: case 0x1f: + case 0x10: case 0x11: case 0x12: case 0x13: case 0x14: case 0x15: case 0x16: case 0x17: + case 0x18: case 0x19: case 0x1a: case 0x1b: case 0x1c: case 0x1d: case 0x1e: case 0x1f: CDP1801_OPCODE("INC R%01X", implied(opcode)); break; - case 0x20: case 0x21: case 0x22: case 0x23: case 0x24: case 0x25: case 0x26: case 0x27: - case 0x28: case 0x29: case 0x2a: case 0x2b: case 0x2c: case 0x2d: case 0x2e: case 0x2f: + case 0x20: case 0x21: case 0x22: case 0x23: case 0x24: case 0x25: case 0x26: case 0x27: + case 0x28: case 0x29: case 0x2a: case 0x2b: case 0x2c: case 0x2d: case 0x2e: case 0x2f: CDP1801_OPCODE("DEC R%01X", implied(opcode)); break; case 0x30: CDP1801_OPCODE("BR %04X", short_branch(pc, &opram)); break; case 0x32: CDP1801_OPCODE("BZ %04X", short_branch(pc, &opram)); break; @@ -85,11 +85,11 @@ static UINT32 disassemble(device_t *device, char *buffer, offs_t pc, const UINT8 case 0x3d: CDP1801_OPCODE("BN2 %04X", short_branch(pc, &opram)); break; case 0x3e: CDP1801_OPCODE("BN3 %04X", short_branch(pc, &opram)); break; case 0x3f: CDP1801_OPCODE("BN4 %04X", short_branch(pc, &opram)); break; - case 0x40: case 0x41: case 0x42: case 0x43: case 0x44: case 0x45: case 0x46: case 0x47: - case 0x48: case 0x49: case 0x4a: case 0x4b: case 0x4c: case 0x4d: case 0x4e: case 0x4f: + case 0x40: case 0x41: case 0x42: case 0x43: case 0x44: case 0x45: case 0x46: case 0x47: + case 0x48: case 0x49: case 0x4a: case 0x4b: case 0x4c: case 0x4d: case 0x4e: case 0x4f: CDP1801_OPCODE("LDA R%01X", implied(opcode)); break; - case 0x50: case 0x51: case 0x52: case 0x53: case 0x54: case 0x55: case 0x56: case 0x57: - case 0x58: case 0x59: case 0x5a: case 0x5b: case 0x5c: case 0x5d: case 0x5e: case 0x5f: + case 0x50: case 0x51: case 0x52: case 0x53: case 0x54: case 0x55: case 0x56: case 0x57: + case 0x58: case 0x59: case 0x5a: case 0x5b: case 0x5c: case 0x5d: case 0x5e: case 0x5f: CDP1801_OPCODE("STR R%01X", implied(opcode)); break; case 0x61: CDP1801_OPCODE("OUT 1"); break; case 0x62: CDP1801_OPCODE("OUT 2"); break; @@ -108,23 +108,23 @@ static UINT32 disassemble(device_t *device, char *buffer, offs_t pc, const UINT8 case 0x70: CDP1801_OPCODE("RET"); flags = DASMFLAG_STEP_OUT; break; case 0x71: CDP1801_OPCODE("DIS"); flags = DASMFLAG_STEP_OUT; break; case 0x78: CDP1801_OPCODE("SAV"); break; - case 0x80: case 0x81: case 0x82: case 0x83: case 0x84: case 0x85: case 0x86: case 0x87: - case 0x88: case 0x89: case 0x8a: case 0x8b: case 0x8c: case 0x8d: case 0x8e: case 0x8f: + case 0x80: case 0x81: case 0x82: case 0x83: case 0x84: case 0x85: case 0x86: case 0x87: + case 0x88: case 0x89: case 0x8a: case 0x8b: case 0x8c: case 0x8d: case 0x8e: case 0x8f: CDP1801_OPCODE("GLO R%01X", implied(opcode)); break; - case 0x90: case 0x91: case 0x92: case 0x93: case 0x94: case 0x95: case 0x96: case 0x97: - case 0x98: case 0x99: case 0x9a: case 0x9b: case 0x9c: case 0x9d: case 0x9e: case 0x9f: + case 0x90: case 0x91: case 0x92: case 0x93: case 0x94: case 0x95: case 0x96: case 0x97: + case 0x98: case 0x99: case 0x9a: case 0x9b: case 0x9c: case 0x9d: case 0x9e: case 0x9f: CDP1801_OPCODE("GHI R%01X", implied(opcode)); break; - case 0xa0: case 0xa1: case 0xa2: case 0xa3: case 0xa4: case 0xa5: case 0xa6: case 0xa7: - case 0xa8: case 0xa9: case 0xaa: case 0xab: case 0xac: case 0xad: case 0xae: case 0xaf: + case 0xa0: case 0xa1: case 0xa2: case 0xa3: case 0xa4: case 0xa5: case 0xa6: case 0xa7: + case 0xa8: case 0xa9: case 0xaa: case 0xab: case 0xac: case 0xad: case 0xae: case 0xaf: CDP1801_OPCODE("PLO R%01X", implied(opcode)); break; - case 0xb0: case 0xb1: case 0xb2: case 0xb3: case 0xb4: case 0xb5: case 0xb6: case 0xb7: - case 0xb8: case 0xb9: case 0xba: case 0xbb: case 0xbc: case 0xbd: case 0xbe: case 0xbf: + case 0xb0: case 0xb1: case 0xb2: case 0xb3: case 0xb4: case 0xb5: case 0xb6: case 0xb7: + case 0xb8: case 0xb9: case 0xba: case 0xbb: case 0xbc: case 0xbd: case 0xbe: case 0xbf: CDP1801_OPCODE("PHI R%01X", implied(opcode)); break; - case 0xd0: case 0xd1: case 0xd2: case 0xd3: case 0xd4: case 0xd5: case 0xd6: case 0xd7: - case 0xd8: case 0xd9: case 0xda: case 0xdb: case 0xdc: case 0xdd: case 0xde: case 0xdf: + case 0xd0: case 0xd1: case 0xd2: case 0xd3: case 0xd4: case 0xd5: case 0xd6: case 0xd7: + case 0xd8: case 0xd9: case 0xda: case 0xdb: case 0xdc: case 0xdd: case 0xde: case 0xdf: CDP1801_OPCODE("SEP R%01X", implied(opcode)); flags = DASMFLAG_STEP_OVER; break; - case 0xe0: case 0xe1: case 0xe2: case 0xe3: case 0xe4: case 0xe5: case 0xe6: case 0xe7: - case 0xe8: case 0xe9: case 0xea: case 0xeb: case 0xec: case 0xed: case 0xee: case 0xef: + case 0xe0: case 0xe1: case 0xe2: case 0xe3: case 0xe4: case 0xe5: case 0xe6: case 0xe7: + case 0xe8: case 0xe9: case 0xea: case 0xeb: case 0xec: case 0xed: case 0xee: case 0xef: CDP1801_OPCODE("SEX R%01X", implied(opcode)); break; case 0xf0: CDP1801_OPCODE("LDX"); break; case 0xf1: CDP1801_OPCODE("OR"); break; diff --git a/src/emu/cpu/ie15/ie15.c b/src/emu/cpu/ie15/ie15.c index f25122fd474..1a926e895cd 100644 --- a/src/emu/cpu/ie15/ie15.c +++ b/src/emu/cpu/ie15/ie15.c @@ -231,24 +231,24 @@ inline void ie15_device::execute_one(int opcode) switch (opcode & 0xf0) { - case 0x00: // add + case 0x00: // add tmp = m_A + get_reg_lo(opcode & 15); m_A = tmp & 255; update_flags(m_A); m_CF = BIT(tmp, 8); break; - case 0x10: // jmp + case 0x10: // jmp m_PC.w.l = get_addr(opcode); -// m_CF = 0; +// m_CF = 0; break; - case 0x20: // ldc + case 0x20: // ldc set_reg(opcode & 15, arg() | (m_PC.w.l & 0xf00)); m_PC.w.l = m_PC.w.l + 1; -// m_CF = 0; +// m_CF = 0; break; - case 0x40: // dsr + case 0x40: // dsr tmp = get_reg_lo(opcode & 15) - 1; -// m_CF = BIT(tmp, 8); +// m_CF = BIT(tmp, 8); tmp &= 255; set_reg(opcode & 15, tmp); update_flags(tmp); @@ -259,17 +259,17 @@ inline void ie15_device::execute_one(int opcode) case 0x30: switch (opcode) { - case 0x30: // lca + case 0x30: // lca m_A = arg(); update_flags(m_A); m_PC.w.l = m_PC.w.l + 1; break; - case 0x33: // ral + case 0x33: // ral tmp = m_A; m_A = (m_A << 1) | BIT(tmp,7); update_flags(m_A); break; - case 0x35: // rar + case 0x35: // rar tmp = m_A; m_A = (m_A >> 1) | (BIT(tmp,0) ? 0x80 : 0x00); update_flags(m_A); @@ -282,9 +282,9 @@ inline void ie15_device::execute_one(int opcode) case 0x50: switch (opcode) { - case 0x51: // inc - case 0x50: // isn - case 0x58: // ise + case 0x51: // inc + case 0x50: // isn + case 0x58: // ise tmp = m_A + 1; m_A = tmp & 255; update_flags(m_A); @@ -294,9 +294,9 @@ inline void ie15_device::execute_one(int opcode) if (opcode == 0x58 && !m_ZF) SKIP_OP(tmp); break; - case 0x5b: // dec - case 0x52: // dsn - case 0x5a: // dse + case 0x5b: // dec + case 0x52: // dsn + case 0x5a: // dse tmp = m_A - 1; m_A = tmp & 255; update_flags(m_A); @@ -306,11 +306,11 @@ inline void ie15_device::execute_one(int opcode) if (opcode == 0x5a && !m_ZF) SKIP_OP(tmp); break; - case 0x5d: // com + case 0x5d: // com m_A ^= 255; update_flags(m_A); break; - case 0x5f: // clr + case 0x5f: // clr m_A = 0; update_flags(m_A); break; @@ -319,11 +319,11 @@ inline void ie15_device::execute_one(int opcode) break; }; break; - case 0x70: // jmi -// m_CF = 0; + case 0x70: // jmi +// m_CF = 0; m_PC.w.l = get_reg(opcode & 15); break; - case 0x60: // lla + case 0x60: // lla // special case -- port 7 if (opcode == 0x67) m_A = 255; @@ -331,7 +331,7 @@ inline void ie15_device::execute_one(int opcode) m_A = m_io->read_byte(opcode & 15); update_flags(m_A); break; - case 0xf0: // ota + case 0xf0: // ota // special case -- ports 016, 017 if (opcode == 0xfe) m_RF = 1; @@ -339,9 +339,9 @@ inline void ie15_device::execute_one(int opcode) m_RF = 0; else m_io->write_byte(opcode & 15, m_A); -// m_CF = 0; +// m_CF = 0; break; - case 0xc0: // cfl, sfl + case 0xc0: // cfl, sfl switch (opcode) { // special case -- accessing control flag 05 resets CF @@ -354,7 +354,7 @@ inline void ie15_device::execute_one(int opcode) break; } break; - case 0x80: // sfc, skp, sfs, nop + case 0x80: // sfc, skp, sfs, nop tmp = opcode & 7; switch (tmp) { @@ -377,28 +377,28 @@ inline void ie15_device::execute_one(int opcode) if (BIT(opcode, 3) && tmp) SKIP_OP(tmp); break; - case 0xb0: // cs -// m_CF = 0; + case 0xb0: // cs +// m_CF = 0; if (m_A == get_reg_lo(opcode & 15)) { m_ZF = 1; SKIP_OP(tmp); } break; - case 0x90: // and + case 0x90: // and m_A &= get_reg_lo(opcode & 15); update_flags(m_A); break; - case 0xa0: // xor + case 0xa0: // xor m_A ^= get_reg_lo(opcode & 15); update_flags(m_A); break; - case 0xd0: // lda + case 0xd0: // lda m_A = get_reg_lo(opcode & 15); update_flags(m_A); break; - case 0xe0: // sta + case 0xe0: // sta set_reg(opcode & 15, m_A | (m_PC.w.l & 0xf00)); -// m_CF = 0; +// m_CF = 0; break; default: illegal(opcode); @@ -437,7 +437,7 @@ inline UINT16 ie15_device::get_reg(UINT8 reg) inline void ie15_device::set_reg(UINT8 reg, UINT16 val) { (m_RF ? m_REGS[16 + reg] : m_REGS[reg]) = val; - + } inline void ie15_device::update_flags(UINT8 val) diff --git a/src/emu/cpu/ie15/ie15.h b/src/emu/cpu/ie15/ie15.h index 2f9616f75a6..cd67a89f71c 100644 --- a/src/emu/cpu/ie15/ie15.h +++ b/src/emu/cpu/ie15/ie15.h @@ -73,7 +73,7 @@ protected: UINT8 m_A; PAIR m_PC; - UINT16 m_REGS[32]; // General registers (2 pages of 16) + UINT16 m_REGS[32]; // General registers (2 pages of 16) UINT8 m_CF; // Carry flag UINT8 m_ZF; // Zero flag UINT8 m_RF; // Current register page diff --git a/src/emu/cpu/ie15/ie15dasm.c b/src/emu/cpu/ie15/ie15dasm.c index 7c2da4a55c8..4f1e7b40385 100644 --- a/src/emu/cpu/ie15/ie15dasm.c +++ b/src/emu/cpu/ie15/ie15dasm.c @@ -12,112 +12,112 @@ CPU_DISASSEMBLE( ie15 ) op = OP(pc++); switch (op & 0xf0) { - case 0x00: - sprintf (buffer,"add r%d", op & 0x0f); + case 0x00: + sprintf (buffer,"add r%d", op & 0x0f); break; - case 0x10: - sprintf (buffer,"jmp $%04x", (((op & 0x0f) << 8) | ARG(pc)) + 1); - pc+=1; + case 0x10: + sprintf (buffer,"jmp $%04x", (((op & 0x0f) << 8) | ARG(pc)) + 1); + pc+=1; break; - case 0x20: - sprintf (buffer,"ldc r%d, #$%02x", (op & 0x0f), ARG(pc)); - pc+=1; + case 0x20: + sprintf (buffer,"ldc r%d, #$%02x", (op & 0x0f), ARG(pc)); + pc+=1; break; case 0x30: switch (op) { - case 0x30: - sprintf (buffer,"lca #$%02x", ARG(pc)); + case 0x30: + sprintf (buffer,"lca #$%02x", ARG(pc)); pc+=1; break; - case 0x33: - sprintf (buffer,"ral"); + case 0x33: + sprintf (buffer,"ral"); break; - case 0x35: - sprintf (buffer,"rar"); + case 0x35: + sprintf (buffer,"rar"); break; default: sprintf (buffer,"illegal"); break; - }; + }; break; - case 0x40: - sprintf (buffer,"dsr r%d", op & 0x0f); + case 0x40: + sprintf (buffer,"dsr r%d", op & 0x0f); break; case 0x50: switch (op) { - case 0x50: - sprintf (buffer,"isn"); + case 0x50: + sprintf (buffer,"isn"); break; - case 0x51: - sprintf (buffer,"inc"); + case 0x51: + sprintf (buffer,"inc"); break; - case 0x52: - sprintf (buffer,"dsn"); + case 0x52: + sprintf (buffer,"dsn"); break; - case 0x58: - sprintf (buffer,"ise"); + case 0x58: + sprintf (buffer,"ise"); break; - case 0x5a: - sprintf (buffer,"dse"); + case 0x5a: + sprintf (buffer,"dse"); break; - case 0x5b: - sprintf (buffer,"dec"); + case 0x5b: + sprintf (buffer,"dec"); break; - case 0x5d: - sprintf (buffer,"com"); + case 0x5d: + sprintf (buffer,"com"); break; - case 0x5f: - sprintf (buffer,"clr"); + case 0x5f: + sprintf (buffer,"clr"); break; default: sprintf (buffer,"illegal"); break; - }; + }; break; - case 0x60: - sprintf (buffer,"lla #$%02x", op & 0x0f); + case 0x60: + sprintf (buffer,"lla #$%02x", op & 0x0f); break; - case 0x70: - sprintf (buffer,"jmi r%d", op & 0x0f); + case 0x70: + sprintf (buffer,"jmi r%d", op & 0x0f); break; case 0x80: switch (op) { case 0x80: case 0x81: case 0x82: case 0x83: case 0x84: case 0x85: case 0x86: - sprintf (buffer,"sfc #%d", op & 0x07); + sprintf (buffer,"sfc #%d", op & 0x07); break; - case 0x87: - sprintf (buffer,"skp"); + case 0x87: + sprintf (buffer,"skp"); break; case 0x88: case 0x89: case 0x8a: case 0x8b: case 0x8c: case 0x8d: case 0x8e: - sprintf (buffer,"sfs #%d", op & 0x07); + sprintf (buffer,"sfs #%d", op & 0x07); break; - case 0x8f: - sprintf (buffer,"nop"); + case 0x8f: + sprintf (buffer,"nop"); break; - }; + }; break; - case 0x90: - sprintf (buffer,"and r%d", op & 0x0f); + case 0x90: + sprintf (buffer,"and r%d", op & 0x0f); break; - case 0xa0: - sprintf (buffer,"xor r%d", op & 0x0f); + case 0xa0: + sprintf (buffer,"xor r%d", op & 0x0f); break; - case 0xb0: - sprintf (buffer,"cs r%d", op & 0x0f); + case 0xb0: + sprintf (buffer,"cs r%d", op & 0x0f); break; - case 0xc0: - sprintf (buffer,"%s #%d", BIT(op, 3) ? "sfl" : "cfl", op & 0x07); + case 0xc0: + sprintf (buffer,"%s #%d", BIT(op, 3) ? "sfl" : "cfl", op & 0x07); break; - case 0xd0: - sprintf (buffer,"lda r%d", op & 0x0f); + case 0xd0: + sprintf (buffer,"lda r%d", op & 0x0f); break; - case 0xe0: - sprintf (buffer,"sta r%d", op & 0x0f); + case 0xe0: + sprintf (buffer,"sta r%d", op & 0x0f); break; - case 0xf0: - sprintf (buffer,"ota #$%02x", op & 0x0f); + case 0xf0: + sprintf (buffer,"ota #$%02x", op & 0x0f); break; } return (pc - PC) | flags | DASMFLAG_SUPPORTED; diff --git a/src/emu/debug/debugcmd.c b/src/emu/debug/debugcmd.c index 6622f61fafc..06b37a6826e 100644 --- a/src/emu/debug/debugcmd.c +++ b/src/emu/debug/debugcmd.c @@ -1721,7 +1721,7 @@ static void execute_stateload(running_machine &machine, int ref, int params, con { astring filename(param[0]); machine.immediate_load(filename); - + // Clear all PC & memory tracks device_iterator iter(machine.root_device()); for (device_t *device = iter.first(); device != NULL; device = iter.next()) @@ -2802,9 +2802,9 @@ static void execute_pcatmem(running_machine &machine, int ref, int params, const // Get the value of memory at the address const int nativeDataWidth = space->data_width() / 8; const UINT64 data = debug_read_memory(*space, - space->address_to_byte(address), - nativeDataWidth, - true); + space->address_to_byte(address), + nativeDataWidth, + true); // Recover the pc & print const address_spacenum spaceNum = (address_spacenum)ref; diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c index 3c52455b74e..4101a0307a4 100644 --- a/src/emu/debug/debugcpu.c +++ b/src/emu/debug/debugcpu.c @@ -2647,9 +2647,9 @@ void device_debug::set_track_pc_visited(const offs_t& pc) // 'not available'. //------------------------------------------------- -offs_t device_debug::track_mem_pc_from_space_address_data(const address_spacenum& space, - const offs_t& address, - const UINT64& data) const +offs_t device_debug::track_mem_pc_from_space_address_data(const address_spacenum& space, + const offs_t& address, + const UINT64& data) const { const offs_t missing = (offs_t)(-1); if (m_track_mem_set.empty()) @@ -2702,7 +2702,7 @@ bool device_debug::comment_remove(offs_t addr) const char *device_debug::comment_text(offs_t addr) const { - const UINT32 crc = compute_opcode_crc32(addr); + const UINT32 crc = compute_opcode_crc32(addr); dasm_comment* comment = m_comment_set.find(dasm_comment(addr, crc, "", 0)); if (comment == NULL) return NULL; return comment->m_text; @@ -3553,7 +3553,7 @@ void device_debug::tracer::flush() device_debug::dasm_pc_tag::dasm_pc_tag(const offs_t& address, const UINT32& crc) : m_address(address), - m_crc(crc) + m_crc(crc) { } @@ -3561,14 +3561,14 @@ device_debug::dasm_pc_tag::dasm_pc_tag(const offs_t& address, const UINT32& crc) // dasm_memory_access - constructor //------------------------------------------------- -device_debug::dasm_memory_access::dasm_memory_access(const address_spacenum& address_space, - const offs_t& address, - const UINT64& data, - const offs_t& pc) +device_debug::dasm_memory_access::dasm_memory_access(const address_spacenum& address_space, + const offs_t& address, + const UINT64& data, + const offs_t& pc) : m_address_space(address_space), - m_address(address), - m_data(data), - m_pc(pc) + m_address(address), + m_data(data), + m_pc(pc) { } @@ -3578,7 +3578,7 @@ device_debug::dasm_memory_access::dasm_memory_access(const address_spacenum& add device_debug::dasm_comment::dasm_comment(offs_t address, UINT32 crc, const char *text, rgb_t color) : dasm_pc_tag(address, crc), - m_text(text), - m_color(color) + m_text(text), + m_color(color) { } diff --git a/src/emu/debug/debugcpu.h b/src/emu/debug/debugcpu.h index 75589ac6bc7..97da6ede8e6 100644 --- a/src/emu/debug/debugcpu.h +++ b/src/emu/debug/debugcpu.h @@ -261,7 +261,7 @@ public: // memory tracking void set_track_mem(bool value) { m_track_mem = value; } offs_t track_mem_pc_from_space_address_data(const address_spacenum& space, - const offs_t& address, + const offs_t& address, const UINT64& data) const; void track_mem_data_clear() { m_track_mem_set.clear(); } @@ -410,10 +410,10 @@ private: class dasm_memory_access { public: - dasm_memory_access(const address_spacenum& address_space, - const offs_t& address, - const UINT64& data, - const offs_t& pc); + dasm_memory_access(const address_spacenum& address_space, + const offs_t& address, + const UINT64& data, + const offs_t& pc); // required to be included in a simple_set bool operator < (const dasm_memory_access& rhs) const diff --git a/src/emu/emuopts.h b/src/emu/emuopts.h index 8e95d9124b1..3af5dad2022 100644 --- a/src/emu/emuopts.h +++ b/src/emu/emuopts.h @@ -199,9 +199,9 @@ enum #define OPTION_CONFIRM_QUIT "confirm_quit" #define OPTION_UI_MOUSE "ui_mouse" -#define OPTION_AUTOBOOT_COMMAND "autoboot_command" -#define OPTION_AUTOBOOT_DELAY "autoboot_delay" -#define OPTION_AUTOBOOT_SCRIPT "autoboot_script" +#define OPTION_AUTOBOOT_COMMAND "autoboot_command" +#define OPTION_AUTOBOOT_DELAY "autoboot_delay" +#define OPTION_AUTOBOOT_SCRIPT "autoboot_script" //************************************************************************** // TYPE DEFINITIONS @@ -355,7 +355,7 @@ public: bool confirm_quit() const { return bool_value(OPTION_CONFIRM_QUIT); } bool ui_mouse() const { return bool_value(OPTION_UI_MOUSE); } - + const char *autoboot_command() const { return value(OPTION_AUTOBOOT_COMMAND); } int autoboot_delay() const { return int_value(OPTION_AUTOBOOT_DELAY); } const char *autoboot_script() const { return value(OPTION_AUTOBOOT_SCRIPT); } diff --git a/src/emu/luaengine.c b/src/emu/luaengine.c index 132aa52da75..ba220907276 100644 --- a/src/emu/luaengine.c +++ b/src/emu/luaengine.c @@ -53,7 +53,7 @@ lua_engine* lua_engine::luaThis = NULL; // emu_gamename - returns game full name //------------------------------------------------- -int lua_engine::emu_gamename(lua_State *L) +int lua_engine::emu_gamename(lua_State *L) { lua_pushstring(L, luaThis->machine().system().description); return 1; @@ -63,7 +63,7 @@ int lua_engine::emu_gamename(lua_State *L) // emu_keypost - post keys to natural keyboard //------------------------------------------------- -int lua_engine::emu_keypost(lua_State *L) +int lua_engine::emu_keypost(lua_State *L) { const char *keys = luaL_checkstring(L,1); luaThis->machine().ioport().natkeyboard().post_utf8(keys); @@ -72,9 +72,9 @@ int lua_engine::emu_keypost(lua_State *L) static const struct luaL_Reg emu_funcs [] = { - { "gamename", lua_engine::emu_gamename }, - { "keypost", lua_engine::emu_keypost }, - { NULL, NULL } /* sentinel */ + { "gamename", lua_engine::emu_gamename }, + { "keypost", lua_engine::emu_keypost }, + { NULL, NULL } /* sentinel */ }; //------------------------------------------------- @@ -83,8 +83,8 @@ static const struct luaL_Reg emu_funcs [] = int luaopen_emu ( lua_State * L ) { - luaL_newlib(L, emu_funcs); - return 1; + luaL_newlib(L, emu_funcs); + return 1; } //------------------------------------------------- @@ -94,7 +94,7 @@ int luaopen_emu ( lua_State * L ) void hook(lua_State* l, lua_Debug* ar) { - lua_yield(l, 0); + lua_yield(l, 0); } //------------------------------------------------- @@ -133,9 +133,9 @@ void lua_engine::initialize() void lua_engine::close() { if (m_lua_state) { - // close the Lua state + // close the Lua state lua_close(m_lua_state); - mame_printf_verbose("[LUA] End executing script\n"); + mame_printf_verbose("[LUA] End executing script\n"); m_lua_state = NULL; } } @@ -146,12 +146,12 @@ void lua_engine::close() void lua_engine::report_errors(int status) { - if ( status!=0 ) { - mame_printf_error("[LUA ERROR] %s\n",lua_tostring(m_lua_state, -1)); - lua_pop(m_lua_state, 1); // remove error message - + if ( status!=0 ) { + mame_printf_error("[LUA ERROR] %s\n",lua_tostring(m_lua_state, -1)); + lua_pop(m_lua_state, 1); // remove error message + close(); // close in case of error - } + } } //------------------------------------------------- @@ -161,12 +161,12 @@ void lua_engine::report_errors(int status) void lua_engine::createvm() { close(); - - // create new Lua state - m_lua_state = luaL_newstate(); + + // create new Lua state + m_lua_state = luaL_newstate(); luaL_openlibs(m_lua_state); - luaL_requiref(m_lua_state, "emu", luaopen_emu, 1); - lua_sethook(m_lua_state, hook, LUA_MASKLINE, 0); + luaL_requiref(m_lua_state, "emu", luaopen_emu, 1); + lua_sethook(m_lua_state, hook, LUA_MASKLINE, 0); } //------------------------------------------------- @@ -175,9 +175,9 @@ void lua_engine::createvm() void lua_engine::execute(const char *filename) { - createvm(); - - int s = luaL_loadfile(m_lua_state, filename); + createvm(); + + int s = luaL_loadfile(m_lua_state, filename); report_errors(s); mame_printf_verbose("[LUA] Start executing script\n"); @@ -189,9 +189,9 @@ void lua_engine::execute(const char *filename) void lua_engine::execute_string(const char *value) { - createvm(); - - int s = luaL_loadstring(m_lua_state, value); + createvm(); + + int s = luaL_loadstring(m_lua_state, value); report_errors(s); mame_printf_verbose("[LUA] Start executing script\n"); @@ -204,11 +204,11 @@ void lua_engine::execute_string(const char *value) void lua_engine::lua_execute() { if (m_lua_state==NULL) return; - + int s = lua_resume(m_lua_state, m_lua_state, 0); - + if (s != LUA_YIELD) { - report_errors(s); + report_errors(s); close(); } } diff --git a/src/emu/luaengine.h b/src/emu/luaengine.h index 0375312228a..6bf2217cc75 100644 --- a/src/emu/luaengine.h +++ b/src/emu/luaengine.h @@ -61,20 +61,20 @@ public: void initialize(); void lua_execute(); void report_errors(int status); - + void createvm(); - void execute(const char *filename); + void execute(const char *filename); void execute_string(const char *value); void close(); - - //static + + //static static int emu_gamename(lua_State *L); static int emu_keypost(lua_State *L); -private: +private: // internal state running_machine & m_machine; // reference to our machine - lua_State* m_lua_state; - + lua_State* m_lua_state; + static lua_engine* luaThis; }; diff --git a/src/emu/machine.c b/src/emu/machine.c index 8c9ac74acdc..4e5d12910cf 100644 --- a/src/emu/machine.c +++ b/src/emu/machine.c @@ -896,9 +896,9 @@ void running_machine::soft_reset(void *ptr, INT32 param) // setup autoboot if needed m_autoboot_timer->adjust(attotime(options().autoboot_delay(),0),0); - + // now we're running - m_current_phase = MACHINE_PHASE_RUNNING; + m_current_phase = MACHINE_PHASE_RUNNING; } diff --git a/src/emu/machine.h b/src/emu/machine.h index ffdaa8a7e39..a211a4bddaa 100644 --- a/src/emu/machine.h +++ b/src/emu/machine.h @@ -333,7 +333,7 @@ private: void stop_all_devices(); void presave_all_devices(); void postload_all_devices(); - + TIMER_CALLBACK_MEMBER(autoboot_callback); // internal state @@ -421,8 +421,8 @@ private: memory_manager m_memory; // memory manager ioport_manager m_ioport; // I/O port manager device_scheduler m_scheduler; // scheduler object - emu_timer *m_autoboot_timer; // autoboot timer - lua_engine m_lua_engine; // LUA engine + emu_timer *m_autoboot_timer; // autoboot timer + lua_engine m_lua_engine; // LUA engine }; diff --git a/src/emu/machine/mcf5206e.c b/src/emu/machine/mcf5206e.c index fe5e0b30749..2679a7b62cb 100644 --- a/src/emu/machine/mcf5206e.c +++ b/src/emu/machine/mcf5206e.c @@ -18,10 +18,10 @@ void CLIB_DECL nolog(const char *format, ...) {} #define debuglogtimer nolog static ADDRESS_MAP_START( coldfire_regs_map, AS_0, 32, mcf5206e_peripheral_device ) - - + + AM_RANGE(0x014, 0x017) AM_READWRITE8(ICR1_ICR2_ICR3_ICR4_r, ICR1_ICR2_ICR3_ICR4_w, 0xffffffff) - + AM_RANGE(0x01c, 0x01f) AM_READWRITE8(ICR9_ICR10_ICR11_ICR12_r, ICR9_ICR10_ICR11_ICR12_w, 0xffffffff) AM_RANGE(0x020, 0x023) AM_READWRITE8(ICR13_r, ICR13_w, 0xffffffff) @@ -64,7 +64,7 @@ static ADDRESS_MAP_START( coldfire_regs_map, AS_0, 32, mcf5206e_peripheral_devic AM_RANGE(0x1c4, 0x1c7) AM_READWRITE8(PPDDR_r, PPDDR_w, 0xffffffff) AM_RANGE(0x1c8, 0x1cb) AM_READWRITE8(PPDAT_r, PPDAT_w, 0xffffffff) - + AM_RANGE(0x1e4, 0x1e7) AM_READWRITE8(MFDR_r, MFDR_w, 0xffffffff) AM_RANGE(0x1e8, 0x1eb) AM_READWRITE8(MBCR_r, MBCR_w, 0xffffffff) AM_RANGE(0x1ec, 0x1ef) AM_READWRITE8(MBSR_r, MBSR_w, 0xffffffff) @@ -651,7 +651,7 @@ WRITE16_MEMBER( mcf5206e_peripheral_device::IMR_w) void mcf5206e_peripheral_device::ICR_info(UINT8 ICR) { - debuglog(" (AutoVector) AVEC : %01x | ", (ICR&0x80)>>7); + debuglog(" (AutoVector) AVEC : %01x | ", (ICR&0x80)>>7); debuglog("(Interrupt Level) IL : %01x | ", (ICR&0x1c)>>2); // if autovector (AVEC) is used then the vectors referenced are at +24 (+0x18) + IL, ie the standard 68k autovectors, otherwise vector must be provided by device debuglog("(Interrupt Priority) IP : %01x |", (ICR&0x03)>>0); debuglog("(Unused bits) : %01x\n", (ICR&0x60)>>5); @@ -671,7 +671,7 @@ TIMER_CALLBACK_MEMBER(mcf5206e_peripheral_device::timer1_callback) debuglogtimer("timer1_callback\n"); m_TER1 |= 0x02; - + timer1->adjust(attotime::from_msec(10)); // completely made up value just to fire our timers for now } @@ -699,8 +699,8 @@ WRITE16_MEMBER( mcf5206e_peripheral_device::TMR1_w) COMBINE_DATA(&m_TMR1); debuglogtimer("%s: (Timer 1 Mode Register) TMR1_w %04x %04x\n", this->machine().describe_context(), data, mem_mask); - debuglogtimer(" (Prescale) PS : %02x (Capture Edge/Interrupt) CE : %01x (Output Mode) OM : %01x (Output Reference Interrupt En) ORI : %01x Free Run (FRR) : %01x Input Clock Source (ICLK) : %01x (Reset Timer) RST : %01x \n", (m_TMR1 & 0xff00)>>8, (m_TMR1 & 0x00c0)>>6, (m_TMR1 & 0x0020)>>5, (m_TMR1 & 0x0010)>>4, (m_TMR1 & 0x0008)>>3, (m_TMR1 & 0x0006)>>1, (m_TMR1 & 0x0001)>>0); - + debuglogtimer(" (Prescale) PS : %02x (Capture Edge/Interrupt) CE : %01x (Output Mode) OM : %01x (Output Reference Interrupt En) ORI : %01x Free Run (FRR) : %01x Input Clock Source (ICLK) : %01x (Reset Timer) RST : %01x \n", (m_TMR1 & 0xff00)>>8, (m_TMR1 & 0x00c0)>>6, (m_TMR1 & 0x0020)>>5, (m_TMR1 & 0x0010)>>4, (m_TMR1 & 0x0008)>>3, (m_TMR1 & 0x0006)>>1, (m_TMR1 & 0x0001)>>0); + if (m_TMR1 & 0x0001) { timer1->adjust(attotime::from_seconds(1)); // completely made up value just to fire our timers for now @@ -709,8 +709,8 @@ WRITE16_MEMBER( mcf5206e_peripheral_device::TMR1_w) { timer1->adjust(attotime::never); } - - + + break; case 1: invalidlog("%s: invalid TMR1_w %d, %04x %04x\n", this->machine().describe_context(), offset, data, mem_mask); @@ -830,8 +830,8 @@ const device_type MCF5206E_PERIPHERAL = &device_creator<mcf5206e_peripheral_devi mcf5206e_peripheral_device::mcf5206e_peripheral_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, MCF5206E_PERIPHERAL, "MCF5206E Peripheral", tag, owner, clock), - device_memory_interface(mconfig, *this), - m_space_config("coldfire_regs", ENDIANNESS_BIG, 32,10, 0, NULL, *ADDRESS_MAP_NAME(coldfire_regs_map)) + device_memory_interface(mconfig, *this), + m_space_config("coldfire_regs", ENDIANNESS_BIG, 32,10, 0, NULL, *ADDRESS_MAP_NAME(coldfire_regs_map)) { } @@ -915,31 +915,31 @@ READ32_MEMBER(mcf5206e_peripheral_device::seta2_coldfire_regs_r) void mcf5206e_peripheral_device::init_regs(bool first_init) { - m_ICR[ICR1] = 0x04; - m_ICR[ICR2] = 0x08; - m_ICR[ICR3] = 0x0C; - m_ICR[ICR4] = 0x10; - m_ICR[ICR5] = 0x14; - m_ICR[ICR6] = 0x18; - m_ICR[ICR7] = 0x1C; - m_ICR[ICR8] = 0x1C; - m_ICR[ICR9] = 0x80; - m_ICR[ICR10] = 0x80; - m_ICR[ICR11] = 0x80; - m_ICR[ICR12] = 0x00; - m_ICR[ICR13] = 0x00; - - m_CSAR[0] = 0x0000; - m_CSMR[0] = 0x00000000; + m_ICR[ICR1] = 0x04; + m_ICR[ICR2] = 0x08; + m_ICR[ICR3] = 0x0C; + m_ICR[ICR4] = 0x10; + m_ICR[ICR5] = 0x14; + m_ICR[ICR6] = 0x18; + m_ICR[ICR7] = 0x1C; + m_ICR[ICR8] = 0x1C; + m_ICR[ICR9] = 0x80; + m_ICR[ICR10] = 0x80; + m_ICR[ICR11] = 0x80; + m_ICR[ICR12] = 0x00; + m_ICR[ICR13] = 0x00; + + m_CSAR[0] = 0x0000; + m_CSMR[0] = 0x00000000; m_CSCR[0] = 0x3C1F; /* 3C1F, 3C5F, 3C9F, 3CDF, 3D1F, 3D5F, 3D9F, 3DDF | AA set by IRQ 7 at reset, PS1 set by IRQ 4 at reset, PS0 set by IRQ 1 at reset*/ if (first_init) { for (int x=1;x<8;x++) { - m_CSAR[1] = UNINIT; - m_CSMR[1] = UNINIT; - m_CSCR[1] = UNINIT_NOTE; // except BRST=ASET=WRAH=RDAH=WR=RD=0 + m_CSAR[1] = UNINIT; + m_CSMR[1] = UNINIT; + m_CSCR[1] = UNINIT_NOTE; // except BRST=ASET=WRAH=RDAH=WR=RD=0 } } diff --git a/src/emu/machine/mcf5206e.h b/src/emu/machine/mcf5206e.h index 6221f11d279..8bda69d7cfb 100644 --- a/src/emu/machine/mcf5206e.h +++ b/src/emu/machine/mcf5206e.h @@ -50,7 +50,7 @@ class mcf5206e_peripheral_device : public device_t, public: // construction/destruction mcf5206e_peripheral_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + void ICR_info(UINT8 ICR); DECLARE_READ32_MEMBER( dev_r ); @@ -153,9 +153,9 @@ public: DECLARE_WRITE8_MEMBER( MFDR_w ); DECLARE_READ8_MEMBER( MBDR_r ); DECLARE_WRITE8_MEMBER( MBDR_w ); - - + + cpu_device* m_cpu; @@ -171,7 +171,7 @@ protected: private: - + void init_regs(bool first_init); UINT8 m_ICR[MAX_ICR]; diff --git a/src/emu/machine/pic8259.c b/src/emu/machine/pic8259.c index c6a2e4473de..3f96d96734c 100644 --- a/src/emu/machine/pic8259.c +++ b/src/emu/machine/pic8259.c @@ -447,4 +447,3 @@ pic8259_device::pic8259_device(const machine_config &mconfig, const char *tag, d , m_read_slave_ack_func(*this) { } - diff --git a/src/emu/machine/spchrom.c b/src/emu/machine/spchrom.c index a7c3d75988e..37678a9296d 100644 --- a/src/emu/machine/spchrom.c +++ b/src/emu/machine/spchrom.c @@ -10,7 +10,7 @@ This file is designed to be interfaced with the tms5220 core. Interfacing it with the tms5110 would make sense, too. - TODO: + TODO: Create seperate devices for TMS6100 & TMS6125 Implement the serial protocol */ diff --git a/src/emu/machine/upd4701.h b/src/emu/machine/upd4701.h index b169d74d445..cf3af3357d3 100644 --- a/src/emu/machine/upd4701.h +++ b/src/emu/machine/upd4701.h @@ -29,7 +29,7 @@ public: DECLARE_WRITE_LINE_MEMBER( ul_w ); DECLARE_WRITE_LINE_MEMBER( resetx_w ); DECLARE_WRITE_LINE_MEMBER( resety_w ); - + DECLARE_READ16_MEMBER( d_r ); DECLARE_READ_LINE_MEMBER( cf_r ); DECLARE_READ_LINE_MEMBER( sf_r ); diff --git a/src/emu/sound/2610intf.c b/src/emu/sound/2610intf.c index 654cf79e8f0..2b11e740528 100644 --- a/src/emu/sound/2610intf.c +++ b/src/emu/sound/2610intf.c @@ -150,7 +150,7 @@ void ym2610_device::device_start() AY8910_DEFAULT_LOADS, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL }; - + int rate = clock()/72; void *pcmbufa,*pcmbufb; int pcmsizea,pcmsizeb; diff --git a/src/emu/sound/2610intf.h b/src/emu/sound/2610intf.h index 34f5faa2071..ac29f88efa6 100644 --- a/src/emu/sound/2610intf.h +++ b/src/emu/sound/2610intf.h @@ -38,7 +38,7 @@ protected: virtual void device_reset(); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - + // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); diff --git a/src/emu/sound/3812intf.c b/src/emu/sound/3812intf.c index 9bf31c13122..e901e6e5e27 100644 --- a/src/emu/sound/3812intf.c +++ b/src/emu/sound/3812intf.c @@ -146,7 +146,7 @@ WRITE8_MEMBER( ym3812_device::write ) READ8_MEMBER( ym3812_device::status_port_r ) { return read(space, 0); } READ8_MEMBER( ym3812_device::read_port_r ) { return read(space, 1); } WRITE8_MEMBER( ym3812_device::control_port_w ) { write(space, 0, data); } -WRITE8_MEMBER( ym3812_device::write_port_w ) { write( space, 1, data); } +WRITE8_MEMBER( ym3812_device::write_port_w ) { write( space, 1, data); } const device_type YM3812 = &device_creator<ym3812_device>; diff --git a/src/emu/sound/8950intf.c b/src/emu/sound/8950intf.c index 664df2d7d41..684c74ac6aa 100644 --- a/src/emu/sound/8950intf.c +++ b/src/emu/sound/8950intf.c @@ -39,7 +39,7 @@ void y8950_device::device_timer(emu_timer &timer, device_timer_id id, int param, case 0: y8950_timer_over(m_chip,0); break; - + case 1: y8950_timer_over(m_chip,1); break; diff --git a/src/emu/sound/qsound.c b/src/emu/sound/qsound.c index dbc1ccc61c5..9fd4dc7657a 100644 --- a/src/emu/sound/qsound.c +++ b/src/emu/sound/qsound.c @@ -87,15 +87,15 @@ ROM_END qsound_device::qsound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) : device_t(mconfig, QSOUND, "Q-Sound", tag, owner, clock, "qsound", __FILE__), - device_sound_interface(mconfig, *this), - m_data(0), - m_stream(NULL), - m_sample_rom_length(0), - m_sample_rom(NULL), - m_cpu(NULL), - m_frq_ratio(0.0f), - m_fpRawDataL(NULL), - m_fpRawDataR(NULL) + device_sound_interface(mconfig, *this), + m_data(0), + m_stream(NULL), + m_sample_rom_length(0), + m_sample_rom(NULL), + m_cpu(NULL), + m_frq_ratio(0.0f), + m_fpRawDataL(NULL), + m_fpRawDataR(NULL) { } diff --git a/src/emu/sound/qsound.h b/src/emu/sound/qsound.h index 396c4a16b85..1c477136125 100644 --- a/src/emu/sound/qsound.h +++ b/src/emu/sound/qsound.h @@ -57,7 +57,7 @@ struct QSOUND_CHANNEL // ======================> qsound_device class qsound_device : public device_t, - public device_sound_interface + public device_sound_interface { public: qsound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); diff --git a/src/emu/sound/spu.c b/src/emu/sound/spu.c index c0db5b0c5bc..f7cfa4d0a2e 100644 --- a/src/emu/sound/spu.c +++ b/src/emu/sound/spu.c @@ -986,7 +986,7 @@ void spu_device::device_start() memset(cache,0,(spu_ram_size>>4)*sizeof(sample_cache *)); // register save state stuff - save_item(NAME(reg)); // this covers all spureg.* plus the reverb parameter block + save_item(NAME(reg)); // this covers all spureg.* plus the reverb parameter block save_item(NAME(xa_cnt)); save_item(NAME(cdda_cnt)); save_item(NAME(xa_freq)); diff --git a/src/emu/sound/tms5110.h b/src/emu/sound/tms5110.h index da3d533c795..d06578e6763 100644 --- a/src/emu/sound/tms5110.h +++ b/src/emu/sound/tms5110.h @@ -99,7 +99,7 @@ private: UINT8 m_PDC; UINT8 m_CTL_pins; UINT8 m_speaking_now; -protected: UINT8 m_talk_status; private: +protected: UINT8 m_talk_status; private: UINT8 m_state; /* Rom interface */ diff --git a/src/emu/video/315_5124.c b/src/emu/video/315_5124.c index 9792024181c..d0db9c292df 100644 --- a/src/emu/video/315_5124.c +++ b/src/emu/video/315_5124.c @@ -1690,11 +1690,11 @@ void sega315_5124_device::vdp_postload() case 192: m_frame_timing = (m_is_pal) ? pal_192 : ntsc_192; break; - + case 224: m_frame_timing = (m_is_pal) ? pal_224 : ntsc_224; break; - + case 240: m_frame_timing = (m_is_pal) ? pal_240 : ntsc_240; break; diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c index 8ff0cae6f9e..871829639e6 100644 --- a/src/emu/video/pc_vga.c +++ b/src/emu/video/pc_vga.c @@ -322,7 +322,7 @@ void mach8_device::device_start() UINT16 vga_device::offset() { -// popmessage("Offset: %04x %s %s **",vga.crtc.offset,vga.crtc.dw?"DW":"--",vga.crtc.word_mode?"BYTE":"WORD"); +// popmessage("Offset: %04x %s %s **",vga.crtc.offset,vga.crtc.dw?"DW":"--",vga.crtc.word_mode?"BYTE":"WORD"); if(vga.crtc.dw) return vga.crtc.offset << 3; if(vga.crtc.word_mode) @@ -603,18 +603,18 @@ void svga_device::svga_vh_rgb8(bitmap_rgb32 &bitmap, const rectangle &cliprect) int yi; int xi; UINT8 start_shift; -// UINT16 line_length; +// UINT16 line_length; /* line compare is screen sensitive */ mask_comp = 0x3ff; curr_addr = 0; -// if(vga.crtc.dw) -// line_length = vga.crtc.offset << 3; // doubleword mode -// else -// { -// line_length = vga.crtc.offset << 4; -// } +// if(vga.crtc.dw) +// line_length = vga.crtc.offset << 3; // doubleword mode +// else +// { +// line_length = vga.crtc.offset << 4; +// } start_shift = (!(vga.sequencer.data[4] & 0x08)) ? 2 : 0; |
