diff options
author | 2009-12-28 09:09:20 +0000 | |
---|---|---|
committer | 2009-12-28 09:09:20 +0000 | |
commit | 45d1ff4d1ef6aecb494c80d7bdf58abcdeda0445 (patch) | |
tree | 185708f2c80110b4f29191561a6dd049e0ff5809 /src | |
parent | bd24fb23c10ca9fbf63e2191dc8e58a87b83b325 (diff) |
Cleaned up braces in the code so that they are properly balanced. [Atari Ace]
Diffstat (limited to 'src')
112 files changed, 601 insertions, 530 deletions
diff --git a/src/emu/audit.c b/src/emu/audit.c index b7aa96e1c22..f05dd34fe9f 100644 --- a/src/emu/audit.c +++ b/src/emu/audit.c @@ -218,7 +218,7 @@ int audit_samples(core_options *options, const game_driver *gamedrv, audit_recor else set_status(record++, AUDIT_STATUS_NOT_FOUND, SUBSTATUS_NOT_FOUND); } - } + } } skip: diff --git a/src/emu/cpu/cubeqcpu/cubeqcpu.c b/src/emu/cpu/cubeqcpu/cubeqcpu.c index b075d2b5ce2..a375d7f5def 100644 --- a/src/emu/cpu/cubeqcpu/cubeqcpu.c +++ b/src/emu/cpu/cubeqcpu/cubeqcpu.c @@ -644,7 +644,7 @@ static CPU_EXECUTE( cquestsnd ) cpustate->ram[b] = (cpustate->f << 1) | (_rin ? 0 : 0x0001); cpustate->y = cpustate->f; break; - } + } } /* Now handle any SRAM accesses from the previous cycle */ @@ -1027,7 +1027,7 @@ static CPU_EXECUTE( cquestrot ) cpustate->y = cpustate->f; break; } - } + } } /* Check for jump */ @@ -1408,7 +1408,7 @@ static CPU_EXECUTE( cquestlin ) cpustate->y = cpustate->f; break; } - } + } } /* Adjust program counter */ diff --git a/src/emu/cpu/e132xs/32xsdasm.c b/src/emu/cpu/e132xs/32xsdasm.c index a3ed5fd9d21..537e230ba5b 100644 --- a/src/emu/cpu/e132xs/32xsdasm.c +++ b/src/emu/cpu/e132xs/32xsdasm.c @@ -1103,7 +1103,7 @@ unsigned dasm_hyperstone(char *buffer, unsigned pc, const UINT8 *oprom, unsigned } break; - } + } // LDxx.N/S case 0x94: case 0x95: case 0x96: case 0x97: @@ -1293,7 +1293,7 @@ unsigned dasm_hyperstone(char *buffer, unsigned pc, const UINT8 *oprom, unsigned } break; - } + } // STxx.N/S case 0x9c: case 0x9d: case 0x9e: case 0x9f: diff --git a/src/emu/cpu/g65816/g65816op.h b/src/emu/cpu/g65816/g65816op.h index c4a3e7f2754..43d077c7295 100644 --- a/src/emu/cpu/g65816/g65816op.h +++ b/src/emu/cpu/g65816/g65816op.h @@ -2397,7 +2397,7 @@ TABLE_FUNCTION(void, set_reg, (g65816i_cpu_struct *cpustate, int regnum, uint va case G65816_PB: REGISTER_PB = MAKE_UINT_8(val); break; case G65816_NMI_STATE: FTABLE_SET_LINE(cpustate, G65816_LINE_NMI, val == 0 ? CLEAR_LINE : ASSERT_LINE); break; case G65816_IRQ_STATE: FTABLE_SET_LINE(cpustate, G65816_LINE_IRQ, val == 0 ? CLEAR_LINE : ASSERT_LINE); break; - } + } } diff --git a/src/emu/cpu/h83002/h8disasm.c b/src/emu/cpu/h83002/h8disasm.c index d0c1883c2ad..d7c77d27335 100644 --- a/src/emu/cpu/h83002/h8disasm.c +++ b/src/emu/cpu/h83002/h8disasm.c @@ -1092,7 +1092,7 @@ static UINT32 h8disasm_6(UINT32 address, UINT32 opcode, char *buffer, const UINT sprintf(buffer, "%4.4x mov.b %s,@(%x, %s)", opcode, reg_names8[opcode &0xf], data16, reg_names32[(opcode>>4)&7]); } else - { + { sprintf(buffer, "%4.4x mov.b @(%x, %s), %s", opcode, data16, reg_names32[(opcode>>4)&7], reg_names8[opcode &0xf]); } size = 4; diff --git a/src/emu/cpu/i386/i386ops.c b/src/emu/cpu/i386/i386ops.c index 2f8ae65defe..2197acdd923 100644 --- a/src/emu/cpu/i386/i386ops.c +++ b/src/emu/cpu/i386/i386ops.c @@ -911,7 +911,7 @@ static void I386OP(arpl)(i386_state *cpustate) // Opcode 0x63 flag = 1; WRITE16(cpustate, ea, dst); } - } + } SetZF(flag); } @@ -1061,7 +1061,7 @@ static void I386OP(repeat)(i386_state *cpustate, int invert_flag) break; default: prefix_flag=0; - } + } } while (prefix_flag); @@ -1177,10 +1177,10 @@ outofcycles: static void I386OP(rep)(i386_state *cpustate) // Opcode 0xf3 { I386OP(repeat)(cpustate, 0); - } +} static void I386OP(repne)(i386_state *cpustate) // Opcode 0xf2 - { +{ I386OP(repeat)(cpustate, 1); } diff --git a/src/emu/cpu/i86/instr86.c b/src/emu/cpu/i86/instr86.c index 194fcbfe98e..bb4debe2def 100644 --- a/src/emu/cpu/i86/instr86.c +++ b/src/emu/cpu/i86/instr86.c @@ -1489,7 +1489,7 @@ static void PREFIX86(_jbe)(i8086_state *cpustate) /* Opcode 0x76 */ static void PREFIX86(_jnbe)(i8086_state *cpustate) /* Opcode 0x77 */ { int tmp = (int)((INT8)FETCH); - if (!(CF || ZF)) { + if (!(CF || ZF)) { cpustate->pc += tmp; ICOUNT -= timing.jcc_t; /* ASG - can probably assume this is safe @@ -2569,7 +2569,7 @@ static void PREFIX86(_loope)(i8086_state *cpustate) /* Opcode 0xe1 */ cpustate->pc += disp; /* ASG - can probably assume this is safe CHANGE_PC(cpustate->pc);*/ - } else ICOUNT -= timing.loope_nt; + } else ICOUNT -= timing.loope_nt; } static void PREFIX86(_loop)(i8086_state *cpustate) /* Opcode 0xe2 */ @@ -3053,11 +3053,11 @@ static void PREFIX86(_fepre)(i8086_state *cpustate) /* Opcode 0xfe */ ICOUNT -= (ModRM >= 0xc0) ? timing.incdec_r8 : timing.incdec_m8; if ((ModRM & 0x38) == 0) /* INC eb */ - { + { tmp1 = tmp+1; SetOFB_Add(tmp1,tmp,1); } - else /* DEC eb */ + else /* DEC eb */ { tmp1 = tmp-1; SetOFB_Sub(tmp1,1,tmp); @@ -3156,7 +3156,7 @@ static void PREFIX86(_ffpre)(i8086_state *cpustate) /* Opcode 0xff */ tmp = GetRMWord(ModRM); PUSH(tmp); break; - } + } } diff --git a/src/emu/cpu/konami/konami.c b/src/emu/cpu/konami/konami.c index 5b34283ec8e..e7cda95d990 100644 --- a/src/emu/cpu/konami/konami.c +++ b/src/emu/cpu/konami/konami.c @@ -267,7 +267,7 @@ CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N case 4: val = S; break; /* ? */ \ case 5: val = U; break; \ default: val = 0xff; logerror("Unknown TFR/EXG idx at PC:%04x\n", PC ); break; \ -} + } #define SETREG(val,reg) \ switch(reg) { \ @@ -278,7 +278,7 @@ CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N,CC_N case 4: S = val; break; /* ? */ \ case 5: U = val; break; \ default: logerror("Unknown TFR/EXG idx at PC:%04x\n", PC ); break; \ -} + } /* opcode timings */ static const UINT8 cycles1[] = diff --git a/src/emu/cpu/lr35902/lr35902.c b/src/emu/cpu/lr35902/lr35902.c index 8f55ddd88d7..92456920725 100644 --- a/src/emu/cpu/lr35902/lr35902.c +++ b/src/emu/cpu/lr35902/lr35902.c @@ -370,7 +370,7 @@ static void lr35902_set_irq_line (lr35902_state *cpustate, int irqline, int stat cpustate->w.IF &= ~(0x01 << irqline); /*logerror("LR35902 clear irq line %d ($%02X)\n", irqline, cpustate->w.IF);*/ - } + } } #ifdef UNUSED_FUNCTION diff --git a/src/emu/cpu/m37710/m37710op.h b/src/emu/cpu/m37710/m37710op.h index ca3e40e88c9..b53545cab9f 100644 --- a/src/emu/cpu/m37710/m37710op.h +++ b/src/emu/cpu/m37710/m37710op.h @@ -1433,11 +1433,11 @@ INLINE uint EA_SIY(m37710i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_ { \ REG_A = 0xff; \ REG_B = 0xff00; \ - } \ + } \ else \ - { \ - REG_A = 0xffff; \ - } \ + { \ + REG_A = 0xffff; \ + } \ } \ } #else @@ -1463,11 +1463,11 @@ INLINE uint EA_SIY(m37710i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_ { \ REG_A = 0xff; \ REG_B = 0xff00; \ - } \ + } \ else \ - { \ - REG_A = 0xffff; \ - } \ + { \ + REG_A = 0xffff; \ + } \ } \ } #endif @@ -1497,11 +1497,11 @@ INLINE uint EA_SIY(m37710i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_ { \ REG_A = 0xff; \ REG_B = 0xff00; \ - } \ + } \ else \ - { \ - REG_A = 0xffff; \ - } \ + { \ + REG_A = 0xffff; \ + } \ } \ } #else @@ -1527,11 +1527,11 @@ INLINE uint EA_SIY(m37710i_cpu_struct *cpustate) {return MAKE_UINT_16(read_16_ { \ REG_A = 0xff; \ REG_B = 0xff00; \ - } \ + } \ else \ - { \ - REG_A = 0xffff; \ - } \ + { \ + REG_A = 0xffff; \ + } \ } \ } #endif @@ -2932,7 +2932,7 @@ TABLE_FUNCTION(void, set_reg, (m37710i_cpu_struct *cpustate, int regnum, uint va case M37710_Y: REG_Y = MAKE_UINT_16(val); break; #endif case M37710_IRQ_STATE: FTABLE_SET_LINE(cpustate, M37710_LINE_IRQ0, val == 0 ? CLEAR_LINE : ASSERT_LINE); break; - } + } } TABLE_FUNCTION(int, execute, (m37710i_cpu_struct *cpustate, int clocks)) diff --git a/src/emu/cpu/m6502/ill02.h b/src/emu/cpu/m6502/ill02.h index aa1dccd1f7d..ab79cfc84bd 100644 --- a/src/emu/cpu/m6502/ill02.h +++ b/src/emu/cpu/m6502/ill02.h @@ -270,7 +270,7 @@ * ARR logical and, rotate right - no decimal mode ***************************************************************/ #define ARR_NES \ - { \ + { \ tmp &= A; \ ROR; \ P &=~(F_V|F_C); \ diff --git a/src/emu/cpu/m6502/tdeco16.c b/src/emu/cpu/m6502/tdeco16.c index 3b09faeae93..adfd190a7c9 100644 --- a/src/emu/cpu/m6502/tdeco16.c +++ b/src/emu/cpu/m6502/tdeco16.c @@ -198,7 +198,7 @@ OP(67) { OP(87) { int tmp; cpustate->icount -= 1; RD_IMM; logerror("%04x: OP87 %02x\n",PCW,tmp); - } /* */ +} /* */ OP(a7) { RD_DUM; ILL; } /* 2 ILL / 5 SMB2 ZPG ?? */ OP(c7) { RD_DUM; ILL; } /* 2 ILL / 5 SMB4 ZPG ?? */ OP(e7) { RD_DUM; ILL; } /* 2 ILL / 5 SMB6 ZPG ?? */ @@ -370,9 +370,8 @@ OP(8f) { int tmp; cpustate->icount -= 1; RD_IMM; memory_write_byte_8le(cpustate->io,0,tmp); -//swap bank in/out - - } /* */ + //swap bank in/out +} /* */ OP(af) { RD_DUM; ILL; } /* 2 ILL / 5 BBS2 ZPG ?? */ OP(cf) { RD_DUM; ILL; } /* 2 ILL / 5 BBS4 ZPG ?? */ OP(ef) { RD_DUM; ILL; } /* 2 ILL / 5 BBS6 ZPG ?? */ diff --git a/src/emu/cpu/m6805/m6805.c b/src/emu/cpu/m6805/m6805.c index 30871ff8abe..ece6757145c 100644 --- a/src/emu/cpu/m6805/m6805.c +++ b/src/emu/cpu/m6805/m6805.c @@ -354,7 +354,7 @@ static void Interrupt( m6805_Regs *cpustate ) PUSHBYTE(cpustate->x); PUSHBYTE(cpustate->a); PUSHBYTE(cpustate->cc); - SEI; + SEI; /* no vectors supported, just do the callback to clear irq_state if needed */ if (cpustate->irq_callback) (*cpustate->irq_callback)(cpustate->device, 0); @@ -377,7 +377,7 @@ static void Interrupt( m6805_Regs *cpustate ) PUSHBYTE(cpustate->x); PUSHBYTE(cpustate->a); PUSHBYTE(cpustate->cc); - SEI; + SEI; /* no vectors supported, just do the callback to clear irq_state if needed */ if (cpustate->irq_callback) (*cpustate->irq_callback)(cpustate->device, 0); @@ -434,7 +434,7 @@ static void Interrupt( m6805_Regs *cpustate ) RM16( cpustate, 0xffff - 5, &pPC ); } - } // CC & IFLAG + } // CC & IFLAG cpustate->pending_interrupts &= ~(1<<M6805_IRQ_LINE); } cpustate->iCount -= 11; diff --git a/src/emu/cpu/nec/nec.c b/src/emu/cpu/nec/nec.c index a63cdff2139..58e76b7a0f6 100644 --- a/src/emu/cpu/nec/nec.c +++ b/src/emu/cpu/nec/nec.c @@ -1010,7 +1010,7 @@ OP( 0xf6, i_f6pre ) { UINT32 tmp; UINT32 uresult,uresult2; INT32 result,result2; case 0x28: result = (INT16)((INT8)nec_state->regs.b[AL])*(INT16)((INT8)tmp); nec_state->regs.w[AW]=(WORD)result; nec_state->CarryVal=nec_state->OverVal=(nec_state->regs.b[AH]!=0); nec_state->icount-=(ModRM >=0xc0 )?30:36; break; /* MUL */ case 0x30: if (tmp) { DIVUB; } else nec_interrupt(nec_state, 0,0); nec_state->icount-=(ModRM >=0xc0 )?43:53; break; case 0x38: if (tmp) { DIVB; } else nec_interrupt(nec_state, 0,0); nec_state->icount-=(ModRM >=0xc0 )?43:53; break; - } + } } OP( 0xf7, i_f7pre ) { UINT32 tmp,tmp2; UINT32 uresult,uresult2; INT32 result,result2; diff --git a/src/emu/cpu/powerpc/ppc403.c b/src/emu/cpu/powerpc/ppc403.c index 1d90a5943d8..29db1b04c38 100644 --- a/src/emu/cpu/powerpc/ppc403.c +++ b/src/emu/cpu/powerpc/ppc403.c @@ -275,7 +275,7 @@ void ppc403_exception(int exception) } case EXCEPTION_TRAP: /* Program exception / Trap */ - { + { UINT32 msr = ppc_get_msr(); SRR0 = ppc.pc; @@ -296,7 +296,7 @@ void ppc403_exception(int exception) } case EXCEPTION_SYSTEM_CALL: /* System call */ - { + { UINT32 msr = ppc_get_msr(); SRR0 = ppc.npc; @@ -797,7 +797,7 @@ static void ppc403_dma_exec(int ch) if( ppc.dma[ch].cr & DMA_TD ) /* peripheral to mem */ { // nothing to do for now */ - } + } else /* mem to peripheral */ { diff --git a/src/emu/cpu/sh2/sh2.c b/src/emu/cpu/sh2/sh2.c index 978a8de6d34..e18ce428525 100644 --- a/src/emu/cpu/sh2/sh2.c +++ b/src/emu/cpu/sh2/sh2.c @@ -1063,7 +1063,7 @@ INLINE void MAC_W(UINT32 m, UINT32 n) sh2->mach += tempn; if (templ > sh2->macl) sh2->mach += 1; - } + } sh2_icount -= 2; } diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c index 6f35f6dc792..77ae140b0ea 100644 --- a/src/emu/cpu/sh4/sh4.c +++ b/src/emu/cpu/sh4/sh4.c @@ -1066,7 +1066,7 @@ INLINE void MAC_W(SH4 *sh4, UINT32 m, UINT32 n) sh4->mach += tempn; if (templ > sh4->macl) sh4->mach += 1; - } + } sh4->sh4_icount -= 2; } diff --git a/src/emu/cpu/sm8500/sm85ops.h b/src/emu/cpu/sm8500/sm85ops.h index 7e8113d02e1..9bc1ce0692b 100644 --- a/src/emu/cpu/sm8500/sm85ops.h +++ b/src/emu/cpu/sm8500/sm85ops.h @@ -1630,7 +1630,7 @@ case 0xF0: /* STOP - 2 cycles - Flags affected: -------- */ /* TODO: Set system clock divider */ /* TODO: Add a bunch of additional cycles */ cpustate->clock_changed = 0; - } + } break; case 0xF1: /* HALT - 2 cycles - Flags affected: -------- */ cpustate->halted = 1; diff --git a/src/emu/cpu/ssp1601/ssp1601.c b/src/emu/cpu/ssp1601/ssp1601.c index 09b12a7914a..d4d4d474e38 100644 --- a/src/emu/cpu/ssp1601/ssp1601.c +++ b/src/emu/cpu/ssp1601/ssp1601.c @@ -191,7 +191,7 @@ INLINE ssp1601_state_t *get_safe_token(const device_config *device) #define OP_CHECK32(OP) { \ - if ((op & 0x0f) == SSP_P) { /* A <- P */ \ + if ((op & 0x0f) == SSP_P) { /* A <- P */ \ update_P(ssp1601_state); \ OP(rP.d); \ break; \ diff --git a/src/emu/cpu/tms9900/9900dasm.c b/src/emu/cpu/tms9900/9900dasm.c index eb974831f83..2f10b8796ee 100644 --- a/src/emu/cpu/tms9900/9900dasm.c +++ b/src/emu/cpu/tms9900/9900dasm.c @@ -524,7 +524,7 @@ unsigned Dasm9900 (char *buffer, unsigned pc, int model_id, const UINT8 *oprom, darg = 16; if (format == format_3_9) - { + { buffer += sprintf (buffer, "%-4s ", mnemonic); buffer += print_arg (buffer, smode, sarg, opram, pc); buffer += sprintf (buffer, ",R%d", darg); @@ -708,7 +708,7 @@ unsigned Dasm9900 (char *buffer, unsigned pc, int model_id, const UINT8 *oprom, break; case format_20: /* list search instructions */ - { + { const char *condition_code; OP2 = readop_arg(opram, pc); @@ -753,7 +753,7 @@ unsigned Dasm9900 (char *buffer, unsigned pc, int model_id, const UINT8 *oprom, default: condition_code = "??"; break; - } + } buffer += sprintf (buffer, "%-4s %s,", mnemonic, condition_code); buffer += print_arg (buffer, smode, sarg, opram, pc); diff --git a/src/emu/cpu/tms9900/99xxcore.h b/src/emu/cpu/tms9900/99xxcore.h index 7f23f4e8932..24f2baad277 100644 --- a/src/emu/cpu/tms9900/99xxcore.h +++ b/src/emu/cpu/tms9900/99xxcore.h @@ -902,9 +902,9 @@ WRITE8_HANDLER(tms9995_internal2_w) { memory_write_byte_8be(cpustate->program, addr, data); memory_write_byte_8be(cpustate->program, addr+1, cpustate->extra_byte); + } } } - } #elif (TMS99XX_MODEL == TMS9995_ID) /*8-bit external data bus, with on-chip 16-bit RAM, and 16-bit address bus*/ @@ -1151,22 +1151,22 @@ INLINE void WRITEREG_DEBUG(tms99xx_state *cpustate, int reg, UINT16 data) cpustate->latch_control[7-offset] = data; break; } - } + } INLINE void handle_error_interrupt(tms99xx_state *cpustate) - { + { if (cpustate->error_interrupt_callback) (*cpustate->error_interrupt_callback)(cpustate->device, cpustate->error_interrupt_register ? 1 : 0); - } + } READ8_HANDLER(ti990_10_eir_cru_r) - { + { tms99xx_state *cpustate = get_safe_token(space->cpu); return (offset == 1) ? (cpustate->error_interrupt_register & 0xff) : 0; - } + } WRITE8_HANDLER(ti990_10_eir_cru_w) - { + { tms99xx_state *cpustate = get_safe_token(space->cpu); if (offset < 4) /* does not work for EIR_MAPERR */ { @@ -1344,7 +1344,7 @@ static CPU_RESET( tms99xx ) #if HAS_MAPPING cpustate->mapping_on = 0; -{ + { int i,j; for (i=0; i<3; i++) @@ -1405,7 +1405,7 @@ INLINE UINT16 fetch(tms99xx_state *cpustate) static CPU_EXECUTE( tms99xx ) - { +{ tms99xx_state *cpustate = get_safe_token(device); cpustate->icount = cycles; @@ -1730,7 +1730,7 @@ static void tms99xx_set_irq_line(tms99xx_state *cpustate, int irqline, int state */ static void tms99xx_set_irq_line(tms99xx_state *cpustate, int irqline, int state) - { +{ int mask; if (irqline == 0) @@ -1783,7 +1783,7 @@ static void reset_decrementer(tms99xx_state *cpustate) cpustate->decrementer_enabled = ((cpustate->flag & 2) && (cpustate->decrementer_interval)); if (cpustate->decrementer_enabled && ! (cpustate->flag & 1)) - { /* timer */ + { /* timer */ attotime period = cpu_clocks_to_attotime(cpustate->device, cpustate->decrementer_interval * 16L); timer_adjust_periodic(cpustate->timer, period, 0, period); } @@ -2084,7 +2084,7 @@ static void write_single_CRU(tms99xx_state *cpustate, int port, int data) #elif (TMS99XX_MODEL == TMS9995_ID) /* on tms9995, we have to handle internal CRU ports */ static void write_single_CRU(tms99xx_state *cpustate, int port, int data) - { +{ /* Internal CRU */ switch (port) { @@ -2152,7 +2152,7 @@ static cru_error_code writeCRU(tms99xx_state *cpustate, int CRUAddr, int Number, #if HAS_PRIVILEGE if ((cpustate->STATUS & ST_PR) && (CRUAddr >= 0xE00)) return CRU_PRIVILEGE_VIOLATION; -#endif + #endif write_single_CRU(cpustate, CRUAddr, (Value & 0x01)); Value >>= 1; @@ -2309,7 +2309,7 @@ static int read_single_CRU(tms99xx_state *cpustate, int port) static int read_single_CRU(tms99xx_state *cpustate, int port) { switch (port) -{ + { case 0x1EE: /* flag, bits 0-7 */ return cpustate->flag & 0xFF; @@ -2365,7 +2365,7 @@ static int readCRU(tms99xx_state *cpustate, int CRUAddr, int Number) Value |= read_single_CRU(cpustate, Location) << 8; if ((Offset+Number) > 16) - { + { /* Read next 8 bits */ Location = (Location + 1) & rCRUAddrMask; #if HAS_PRIVILEGE @@ -2377,14 +2377,14 @@ static int readCRU(tms99xx_state *cpustate, int CRUAddr, int Number) } /* Allow for Offset */ - Value >>= Offset; + Value >>= Offset; /* Mask out what we want */ Value &= BitMask[Number]; /* And update */ return Value; - } +} /*****************************************************************************/ @@ -2408,7 +2408,7 @@ static void load_map_file(tms99xx_state *cpustate, UINT16 src_addr, int src_map_ else if (! cpustate->mapping_on) { cpustate->mapper_address_latch = src_addr; -} + } else { int map_index; @@ -2435,7 +2435,7 @@ static void load_map_file(tms99xx_state *cpustate, UINT16 src_addr, int src_map_ for (i=0; i<3; i++) -{ + { cpustate->map_files[dst_file].L[i] = memory_read_word_16be(cpustate->program, cpustate->mapper_address_latch) & 0xffe0; cpustate->map_files[dst_file].limit[i] = (cpustate->map_files[dst_file].L[i] ^ 0xffe0) | 0x001f; cpustate->mapper_address_latch = (cpustate->mapper_address_latch+2) & 0x1fffff; @@ -2726,7 +2726,7 @@ static void h0000(tms99xx_state *cpustate, UINT16 opcode) HANDLE_ILLEGAL; break; } -} + } } #endif @@ -2943,7 +2943,7 @@ static void h0200(tms99xx_state *cpustate, UINT16 opcode) CYCLES(3, Mooof!, Mooof!); return; } -#endif + #endif #if BETTER_0200_DECODING /* better instruction decoding on ti990/10 */ @@ -2957,27 +2957,27 @@ static void h0200(tms99xx_state *cpustate, UINT16 opcode) if (((opcode < 0x2E0) && (opcode & 0x10)) || ((opcode >= 0x2E0) && (opcode & 0x1F))) { #if 0 - /* tms99110 opcode (not supported by 990/12) */ + /* tms99110 opcode (not supported by 990/12) */ if (opcode == 0x0301) { /* CR ---- Compare Reals */ } - else - /* tms99105+tms99110 opcode (not supported by 990/12) */ - if (opcode == 0x0302) + else + /* tms99105+tms99110 opcode (not supported by 990/12) */ + if (opcode == 0x0302) { /* MM ---- Multiply Multiple */ } - else - #endif + else +#endif #if 0 /* ti990/12 only */ if (opcode >= 0x03F0) { /* EP ---- Extended Precision */ - } - else -#endif + } + else + #endif HANDLE_ILLEGAL; return; } -#endif + #endif switch ((opcode & 0x1e0) >> 5) { @@ -3058,7 +3058,7 @@ static void h0200(tms99xx_state *cpustate, UINT16 opcode) HANDLE_PRIVILEGE_VIOLATION break; } -#endif + #endif value = fetch(cpustate); cpustate->STATUS = (cpustate->STATUS & ~ST_IM) | (value & ST_IM); @@ -3321,7 +3321,7 @@ static void h0400(tms99xx_state *cpustate, UINT16 opcode) cpustate->STATUS &= ~ ST_DC; else cpustate->STATUS |= ST_DC; -#endif + #endif setst_laeo(cpustate, value); writewordX(cpustate, addr, value, src_map); @@ -3402,7 +3402,7 @@ static void h0400(tms99xx_state *cpustate, UINT16 opcode) #if (TMS99XX_MODEL == TMS9940_ID) || (TMS99XX_MODEL == TMS9985_ID) /* I guess ST_DC is cleared here, too*/ cpustate->STATUS &= ~ ST_DC; -#endif + #endif value = readwordX(cpustate, addr, src_map); @@ -3419,7 +3419,7 @@ static void h0400(tms99xx_state *cpustate, UINT16 opcode) #if (TMS99XX_MODEL == TMS9940_ID) || (TMS99XX_MODEL == TMS9985_ID) if (! (value & 0x0FFF)) cpustate->STATUS |= ST_DC; -#endif + #endif writewordX(cpustate, addr, - ((INT16) value), src_map); CYCLES(0, 2, Mooof!); @@ -4174,14 +4174,14 @@ static void xop(tms99xx_state *cpustate, UINT16 opcode) #if ((TMS99XX_MODEL <= TMS9989_ID) && (TMS99XX_MODEL != TI990_10_ID)) (void)readword(cpustate, operand & ~1); /*dummy read (personnal guess)*/ -#endif + #endif contextswitchX(cpustate, 0x40 + (immediate << 2)); #if ! ((TMS99XX_MODEL == TMS9940_ID) || (TMS99XX_MODEL == TMS9985_ID)) /* The bit is not set on tms9940 */ cpustate->STATUS |= ST_X; -#endif + #endif WRITEREG(R11, operand); CYCLES(7, 36, 15); @@ -4388,7 +4388,7 @@ static void h4000w(tms99xx_state *cpustate, UINT16 opcode) #if ((TMS99XX_MODEL >= TMS9900_ID) && (TMS99XX_MODEL <= TMS9985_ID)) /* MOV performs a dummy read with tms9900/9980 (but neither ti990/10 nor tms9995) */ (void)readwordX(cpustate, dest, dst_map); -#endif + #endif writewordX(cpustate, dest, value, dst_map); CYCLES(1, 14, 3); break; @@ -4461,7 +4461,7 @@ static void h4000b(tms99xx_state *cpustate, UINT16 opcode) the result. A tms9980 should not need to do so, but still does, because it is just a tms9900 with a 16 to 8 bit multiplexer (instead of a new chip design, like tms9995). */ (void)readbyteX(cpustate, dest, dst_map); -#endif + #endif writebyteX(cpustate, dest, value, dst_map); CYCLES(3, 14, 3); break; diff --git a/src/emu/cpu/v30mz/v30mz.c b/src/emu/cpu/v30mz/v30mz.c index 6503d0e9fdd..d0856bcf874 100644 --- a/src/emu/cpu/v30mz/v30mz.c +++ b/src/emu/cpu/v30mz/v30mz.c @@ -839,7 +839,7 @@ OP( 0xf6, i_f6pre ) { UINT32 tmp; UINT32 uresult,uresult2; INT32 result,result2; case 0x28: result = (INT16)((INT8)cpustate->regs.b[AL])*(INT16)((INT8)tmp); cpustate->regs.w[AW]=(WORD)result; cpustate->CarryVal=cpustate->OverVal=(cpustate->regs.b[AH]!=0); CLKM(3,4); break; /* MUL */ case 0x30: if (tmp) { DIVUB; } else nec_interrupt(cpustate,0,0); CLKM(15,16); break; case 0x38: if (tmp) { DIVB; } else nec_interrupt(cpustate,0,0); CLKM(17,18); break; - } + } } OP( 0xf7, i_f7pre ) { UINT32 tmp,tmp2; UINT32 uresult,uresult2; INT32 result,result2; diff --git a/src/emu/cpu/v810/v810dasm.c b/src/emu/cpu/v810/v810dasm.c index 0245f1a5248..ccf71c4ce8d 100644 --- a/src/emu/cpu/v810/v810dasm.c +++ b/src/emu/cpu/v810/v810dasm.c @@ -164,7 +164,7 @@ CPU_DISASSEMBLE( v810 ) case 0x7: sprintf(buffer,"DIVF.S %s, %s",GET1s(opc),GET2s(opc)); break; case 0xb: sprintf(buffer,"TRNC.SW %s, %s",GET1s(opc),GET2s(opc)); break; default : sprintf(buffer,"Unkf 0x%X",(opc2&0xfc00)>>10); break; - } + } size=4; break; case 0x3f: sprintf(buffer,"OUTW %s, %X[%s]",GET2s(opc),D16(opc2),GET1s(opc));size=4; break; diff --git a/src/emu/cpu/z8000/z8000.c b/src/emu/cpu/z8000/z8000.c index 6cd1b1aeb01..e77ffa13e1c 100644 --- a/src/emu/cpu/z8000/z8000.c +++ b/src/emu/cpu/z8000/z8000.c @@ -260,9 +260,9 @@ INLINE void Interrupt(z8000_state *cpustate) set_irq(cpustate, type); } - /* trap ? */ - if (cpustate->irq_req & Z8000_TRAP) - { + /* trap ? */ + if (cpustate->irq_req & Z8000_TRAP) + { CHANGE_FCW(cpustate, fcw | F_S_N);/* swap to system stack */ PUSHW(cpustate, SP, cpustate->pc); /* save current cpustate->pc */ PUSHW(cpustate, SP, fcw); /* save current cpustate->fcw */ @@ -271,10 +271,10 @@ INLINE void Interrupt(z8000_state *cpustate) cpustate->irq_req &= ~Z8000_TRAP; cpustate->pc = TRAP; LOG(("Z8K '%s' trap $%04x\n", cpustate->device->tag, cpustate->pc)); - } - else - if (cpustate->irq_req & Z8000_SYSCALL) - { + } + else + if (cpustate->irq_req & Z8000_SYSCALL) + { CHANGE_FCW(cpustate, fcw | F_S_N);/* swap to system stack */ PUSHW(cpustate, SP, cpustate->pc); /* save current cpustate->pc */ PUSHW(cpustate, SP, fcw); /* save current cpustate->fcw */ @@ -283,10 +283,10 @@ INLINE void Interrupt(z8000_state *cpustate) cpustate->irq_req &= ~Z8000_SYSCALL; cpustate->pc = SYSCALL; LOG(("Z8K '%s' syscall $%04x\n", cpustate->device->tag, cpustate->pc)); - } - else - if (cpustate->irq_req & Z8000_SEGTRAP) - { + } + else + if (cpustate->irq_req & Z8000_SEGTRAP) + { CHANGE_FCW(cpustate, fcw | F_S_N);/* swap to system stack */ PUSHW(cpustate, SP, cpustate->pc); /* save current cpustate->pc */ PUSHW(cpustate, SP, fcw); /* save current cpustate->fcw */ @@ -295,10 +295,10 @@ INLINE void Interrupt(z8000_state *cpustate) cpustate->irq_req &= ~Z8000_SEGTRAP; cpustate->pc = SEGTRAP; LOG(("Z8K '%s' segtrap $%04x\n", cpustate->device->tag, cpustate->pc)); - } - else - if (cpustate->irq_req & Z8000_NMI) - { + } + else + if (cpustate->irq_req & Z8000_NMI) + { CHANGE_FCW(cpustate, fcw | F_S_N);/* swap to system stack */ PUSHW(cpustate, SP, cpustate->pc); /* save current cpustate->pc */ PUSHW(cpustate, SP, fcw); /* save current cpustate->fcw */ diff --git a/src/emu/debug/debugvw.c b/src/emu/debug/debugvw.c index a2900c76c05..8553d050ee4 100644 --- a/src/emu/debug/debugvw.c +++ b/src/emu/debug/debugvw.c @@ -2425,7 +2425,7 @@ static const memory_subview_item *memory_view_enumerate_subviews(running_machine *tailptr = subview; tailptr = &subview->next; } - } + } /* then add all the memory regions */ for (rgntag = memory_region_next(machine, NULL); rgntag != NULL; rgntag = memory_region_next(machine, rgntag)) diff --git a/src/emu/machine/53c810.c b/src/emu/machine/53c810.c index 47f2a5ab9fd..214e2818bed 100644 --- a/src/emu/machine/53c810.c +++ b/src/emu/machine/53c810.c @@ -326,7 +326,7 @@ static int scripts_compute_branch(void) if (lsi810.dcmd & 0x00040000) { logerror("53c810: data test. target: %x [not yet implemented]\n", lsi810.dcmd&0xff); -} + } // if all conditions go, take the jump passed = 0; @@ -370,7 +370,7 @@ static UINT32 scripts_get_jump_dest(running_machine *machine) static OPCODE_HANDLER( dmaop_jump ) { if (scripts_compute_branch()) -{ + { lsi810.dsp = scripts_get_jump_dest(machine); } else diff --git a/src/emu/machine/8255ppi.c b/src/emu/machine/8255ppi.c index d7bbb5572d3..d1b81c20994 100644 --- a/src/emu/machine/8255ppi.c +++ b/src/emu/machine/8255ppi.c @@ -520,7 +520,7 @@ static void set_mode(const device_config *device, int data, int call_handlers) ppi8255->in_mask[2] &= ~0x07; ppi8255->out_mask[2] &= ~0x07; break; - } + } /* KT: 25-Dec-99 - 8255 resets latches when mode set */ ppi8255->latch[0] = ppi8255->latch[1] = ppi8255->latch[2] = 0; diff --git a/src/emu/machine/mc146818.c b/src/emu/machine/mc146818.c index 938e60b9f16..5efd5af61a6 100644 --- a/src/emu/machine/mc146818.c +++ b/src/emu/machine/mc146818.c @@ -185,7 +185,7 @@ static TIMER_CALLBACK( mc146818_timer ) } else { YEAR%=100; } - } + } } } } diff --git a/src/emu/machine/roc10937.c b/src/emu/machine/roc10937.c index 62650a2e96c..29bba9edf50 100644 --- a/src/emu/machine/roc10937.c +++ b/src/emu/machine/roc10937.c @@ -276,9 +276,9 @@ void ROC10937_shift_data(int id, int data) roc10937[id].changed |= 1; } - roc10937[id].count = 0; - roc10937[id].data = 0; - } + roc10937[id].count = 0; + roc10937[id].data = 0; + } } /////////////////////////////////////////////////////////////////////////// diff --git a/src/emu/sound/c140.c b/src/emu/sound/c140.c index 300840e7e04..7e6c592493d 100644 --- a/src/emu/sound/c140.c +++ b/src/emu/sound/c140.c @@ -244,10 +244,10 @@ WRITE8_DEVICE_HANDLER( c140_w ) } else { - v->sample_loop = vreg->loop_msb*256 + vreg->loop_lsb; - v->sample_start = vreg->start_msb*256 + vreg->start_lsb; - v->sample_end = vreg->end_msb*256 + vreg->end_lsb; - } + v->sample_loop = vreg->loop_msb*256 + vreg->loop_lsb; + v->sample_start = vreg->start_msb*256 + vreg->start_lsb; + v->sample_end = vreg->end_msb*256 + vreg->end_lsb; + } } else { diff --git a/src/emu/sound/disc_flt.c b/src/emu/sound/disc_flt.c index 54007a962a3..a5c296f87ef 100644 --- a/src/emu/sound/disc_flt.c +++ b/src/emu/sound/disc_flt.c @@ -669,7 +669,7 @@ static DISCRETE_STEP(dst_rcdisc) { context->state = 0; } - } + } } static DISCRETE_RESET(dst_rcdisc) diff --git a/src/emu/sound/k053260.c b/src/emu/sound/k053260.c index fe721516fb7..83904ca07a7 100644 --- a/src/emu/sound/k053260.c +++ b/src/emu/sound/k053260.c @@ -159,7 +159,7 @@ static STREAM_UPDATE( k053260_update ) { /* this is all due to the dynamic sample rate convertion */ if ( pos[i] == 0 || ( ( pos[i] ^ ( pos[i] - delta[i] ) ) & 0x8000 ) == 0x8000 ) - { + { int newdata; if ( pos[i] & 0x8000 ){ diff --git a/src/emu/sound/s14001a.c b/src/emu/sound/s14001a.c index e903a22b7cc..a66e47c1007 100644 --- a/src/emu/sound/s14001a.c +++ b/src/emu/sound/s14001a.c @@ -410,7 +410,7 @@ static void s14001a_clock(S14001AChip *chip) /* called once per clock */ */ chip->oddeven = !(chip->oddeven); // invert the clock if (chip->oddeven == 0) // even clock - { + { chip->audioout = ALTFLAG; // flag to the renderer that this output should be the average of the last 8 // DIGITAL INPUT on the test pins occurs on this cycle used for output } diff --git a/src/emu/sound/sidenvel.c b/src/emu/sound/sidenvel.c index 65a02f8510f..7fd1d074ac9 100644 --- a/src/emu/sound/sidenvel.c +++ b/src/emu/sound/sidenvel.c @@ -169,7 +169,7 @@ void enveEmuInit( UINT32 updateFreq, int measuredValues ) decayReleaseRates[i] = releaseTabLen / scaledenvelen; decayReleaseRatesP[i] = (( releaseTabLen % scaledenvelen ) * 65536UL ) / scaledenvelen; #endif - } + } } /* Reset op. */ diff --git a/src/emu/sound/tms5110r.c b/src/emu/sound/tms5110r.c index 486e375ea85..2da96305ecb 100644 --- a/src/emu/sound/tms5110r.c +++ b/src/emu/sound/tms5110r.c @@ -163,7 +163,7 @@ static const struct tms5100_coeffs pat4403965_coeff = -19,-17,-9,-9,-6,1,4,3, 1,0,0,0,0,0,0,0, 0,0,0 - }, + }, /* interpolation coefficients */ { 3, 3, 3, 2, 2, 2, 1, 0 } }; diff --git a/src/emu/sound/tms5220.c b/src/emu/sound/tms5220.c index 782886ae86c..7e393ebb7aa 100644 --- a/src/emu/sound/tms5220.c +++ b/src/emu/sound/tms5220.c @@ -785,12 +785,16 @@ static INT16 clip_and_wrap(INT16 cliptemp) if (cliptemp > 2047) cliptemp = -2048 + (cliptemp-2047); else if (cliptemp < -2048) cliptemp = 2047 - (cliptemp+2048); - if (cliptemp > 511) { mame_printf_debug ("cliptemp > 511\n"); - return 127<<8; } - else if (cliptemp < -512) { mame_printf_debug ("cliptemp < -512\n"); - return -128<<8; } - else - return cliptemp << 6; + if (cliptemp > 511) { + mame_printf_debug ("cliptemp > 511\n"); + return 127<<8; + } + else if (cliptemp < -512) { + mame_printf_debug ("cliptemp < -512\n"); + return -128<<8; + } + else + return cliptemp << 6; } diff --git a/src/emu/sound/ym2151.c b/src/emu/sound/ym2151.c index 1d689c50c8b..1e918d66479 100644 --- a/src/emu/sound/ym2151.c +++ b/src/emu/sound/ym2151.c @@ -2311,7 +2311,8 @@ INLINE signed int acc_calc(signed int value) { signed int pom= -(chanout[j] & PSG->pan[j*2]); \ if (pom > 32767) pom = 32767; else if (pom < -32768) pom = -32768; \ fputc((unsigned short)pom&0xff,sample[j]); \ - fputc(((unsigned short)pom>>8)&0xff,sample[j]); } + fputc(((unsigned short)pom>>8)&0xff,sample[j]); \ + } #else #define SAVE_SINGLE_CHANNEL(j) #endif diff --git a/src/emu/uimenu.c b/src/emu/uimenu.c index 1e17b841572..3818aee4da5 100644 --- a/src/emu/uimenu.c +++ b/src/emu/uimenu.c @@ -105,10 +105,10 @@ struct _ui_menu_pool typedef struct _ui_menu_item ui_menu_item; struct _ui_menu_item { - const char * text; - const char * subtext; - UINT32 flags; - void * ref; + const char * text; + const char * subtext; + UINT32 flags; + void * ref; }; diff --git a/src/emu/video/tms9928a.c b/src/emu/video/tms9928a.c index 198bf13fcb4..ff8f165cb23 100644 --- a/src/emu/video/tms9928a.c +++ b/src/emu/video/tms9928a.c @@ -113,7 +113,8 @@ static void change_register (running_machine *machine, int reg, UINT8 data); static void (*const ModeHandlers[])(const device_config *screen, bitmap_t *bitmap, const rectangle *cliprect) = { draw_mode0, draw_mode1, draw_mode2, draw_mode12, draw_mode3, draw_modebogus, draw_mode23, - draw_modebogus }; + draw_modebogus +}; #define IMAGE_SIZE (256*192) /* size of rendered image */ @@ -309,7 +310,8 @@ static void change_register (running_machine *machine, int reg, UINT8 val) { "Mode 0 (GRAPHIC 1)", "Mode 1 (TEXT 1)", "Mode 2 (GRAPHIC 2)", "Mode 1+2 (TEXT 1 variation)", "Mode 3 (MULTICOLOR)", "Mode 1+3 (BOGUS)", "Mode 2+3 (MULTICOLOR variation)", - "Mode 1+2+3 (BOGUS)" }; + "Mode 1+2+3 (BOGUS)" + }; UINT8 b; val &= Mask[reg]; @@ -347,7 +349,7 @@ static void change_register (running_machine *machine, int reg, UINT8 val) { if (tms.Regs[0] & 2) { tms.colour = ((val & 0x80) * 64) & (tms.vramsize - 1); tms.colourmask = (val & 0x7f) * 8 | 7; - } else { + } else { tms.colour = (val * 64) & (tms.vramsize - 1); } tms.patternmask = (tms.Regs[4] & 3) * 256 | (tms.colourmask & 255); @@ -421,7 +423,7 @@ VIDEO_UPDATE( tms9928a ) bitmap_fill (bitmap, &rt, BackColour); rt.min_x = LEFT_BORDER+256; rt.max_x = LEFT_BORDER+256+RIGHT_BORDER-1; bitmap_fill (bitmap, &rt, BackColour); - } + } if (TMS_SPRITES_ENABLED) draw_sprites(screen, bitmap, cliprect); } @@ -746,7 +748,7 @@ static void draw_sprites (const device_config *screen, bitmap_t *bitmap, const r /* illegal sprite line */ if (yy < illegalspriteline) { illegalspriteline = yy; - illegalsprite = p; + illegalsprite = p; } else if (illegalspriteline == yy) { if (illegalsprite > p) { illegalsprite = p; diff --git a/src/emu/video/v9938.c b/src/emu/video/v9938.c index c0886cfa192..e7a171827fd 100644 --- a/src/emu/video/v9938.c +++ b/src/emu/video/v9938.c @@ -65,7 +65,7 @@ typedef struct { UINT8 LO; UINT8 CM; UINT8 MXS, MXD; - } MMC; + } MMC; int VdpOpsCnt; void (*VdpEngine)(void); } V9938; @@ -91,7 +91,8 @@ static V9938 *vdp = NULL; static const char *const v9938_modes[] = { "TEXT 1", "MULTICOLOR", "GRAPHIC 1", "GRAPHIC 2", "GRAPHIC 3", "GRAPHIC 4", "GRAPHIC 5", "GRAPHIC 6", "GRAPHIC 7", "TEXT 2", - "UNKNOWN" }; + "UNKNOWN" +}; static void v9938_register_write (running_machine *machine, int reg, int data); static void v9938_update_command (void); @@ -263,7 +264,7 @@ WRITE8_HANDLER( v9938_0_palette_w ) { vdp = &vdps[0]; v9938_palette_w(data); -}; +} WRITE8_HANDLER( v9938_1_palette_w ) { @@ -291,7 +292,7 @@ static void v9938_reset_palette (void) 2, 6, 5, /* 13: magenta */ 5, 5, 5, /* 14: gray */ 7, 7, 7 /* 15: white */ - }; + }; int i, red, ind; for (i=0;i<16;i++) @@ -375,19 +376,19 @@ static void v9938_vram_w( UINT8 data ) } } - WRITE8_HANDLER (v9938_0_vram_w) - { - vdp = &vdps[0]; - v9938_vram_w( data ); - } +WRITE8_HANDLER (v9938_0_vram_w) +{ + vdp = &vdps[0]; + v9938_vram_w( data ); +} - WRITE8_HANDLER (v9938_1_vram_w) - { - vdp = &vdps[1]; - v9938_vram_w( data ); - } +WRITE8_HANDLER (v9938_1_vram_w) +{ + vdp = &vdps[1]; + v9938_vram_w( data ); +} - static UINT8 v9938_vram_r(void) +static UINT8 v9938_vram_r(void) { UINT8 ret; int address; @@ -584,10 +585,12 @@ static void v9938_check_int (running_machine *machine) n = ( (vdp->contReg[1] & 0x20) && (vdp->statReg[0] & 0x80) /*&& vdp->vblank_int*/) || ( (vdp->statReg[1] & 0x01) && (vdp->contReg[0] & 0x10) ); - /*if(n && vdp->vblank_int) - { - vdp->vblank_int = 0; - }*/ +#if 0 + if(n && vdp->vblank_int) + { + vdp->vblank_int = 0; + } +#endif if (n != vdp->INT) { @@ -741,7 +744,7 @@ static void v9938_register_write (running_machine *machine, int reg, int data) vdp->contReg[reg] = data; } - static UINT8 v9938_status_r(running_machine *machine) +static UINT8 v9938_status_r(running_machine *machine) { int reg; UINT8 ret; @@ -1696,22 +1699,36 @@ static const UINT8 Mask[4] = { 0x0F,0x03,0x0F,0xFF }; static const int PPB[4] = { 2,4,2,1 }; static const int PPL[4] = { 256,512,512,256 }; - /* SprOn SprOn SprOf SprOf */ - /* ScrOf ScrOn ScrOf ScrOn */ -static const int srch_timing[8]={ 818, 1025, 818, 830, /* ntsc */ - 696, 854, 696, 684 }; /* pal */ -static const int line_timing[8]={ 1063, 1259, 1063, 1161, - 904, 1026, 904, 953 }; -static const int hmmv_timing[8]={ 439, 549, 439, 531, - 366, 439, 366, 427 }; -static const int lmmv_timing[8]={ 873, 1135, 873, 1056, - 732, 909, 732, 854 }; -static const int ymmm_timing[8]={ 586, 952, 586, 610, - 488, 720, 488, 500 }; -static const int hmmm_timing[8]={ 818, 1111, 818, 854, - 684, 879, 684, 708 }; -static const int lmmm_timing[8]={ 1160, 1599, 1160, 1172, - 964, 1257, 964, 977 }; +/* SprOn SprOn SprOf SprOf */ +/* ScrOf ScrOn ScrOf ScrOn */ +static const int srch_timing[8]={ + 818, 1025, 818, 830, /* ntsc */ + 696, 854, 696, 684 /* pal */ +}; +static const int line_timing[8]={ + 1063, 1259, 1063, 1161, + 904, 1026, 904, 953 +}; +static const int hmmv_timing[8]={ + 439, 549, 439, 531, + 366, 439, 366, 427 +}; +static const int lmmv_timing[8]={ + 873, 1135, 873, 1056, + 732, 909, 732, 854 +}; +static const int ymmm_timing[8]={ + 586, 952, 586, 610, + 488, 720, 488, 500 +}; +static const int hmmm_timing[8]={ + 818, 1111, 818, 854, + 684, 879, 684, 708 +}; +static const int lmmm_timing[8]={ + 1160, 1599, 1160, 1172, + 964, 1257, 964, 977 +}; /** VDPVRMP() **********************************************/ /** Calculate addr of a pixel in vram **/ diff --git a/src/mame/audio/segag80v.c b/src/mame/audio/segag80v.c index 2b4f9610bf9..05a2c4e86fe 100644 --- a/src/mame/audio/segag80v.c +++ b/src/mame/audio/segag80v.c @@ -312,7 +312,7 @@ WRITE8_HANDLER( spacfury2_sh_w ) sample_stop(samples, 6); sample_start(samples, 6, 3, 0); - } + } /* fireball */ if (data & 0x04) diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c index da8e7b15732..cfcc70342d0 100644 --- a/src/mame/drivers/2mindril.c +++ b/src/mame/drivers/2mindril.c @@ -80,7 +80,8 @@ struct __2mindril_state -#define DRAW_MAP(map,num) { int x, y; \ +#define DRAW_MAP(map,num) \ + { int x, y; \ for (y = 0; y < 16; y++) \ for (x = 0; x < 128; x++) \ { \ diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c index 427f91d5fcb..400f25f8cac 100644 --- a/src/mame/drivers/aristmk4.c +++ b/src/mame/drivers/aristmk4.c @@ -118,10 +118,10 @@ static UINT8 rtc_get_reg(running_machine *machine,int address_register) return 0; case 0x02: //minutes - return bcd(systime.local_time.minute); + return bcd(systime.local_time.minute); case 0x03: //minutes alarm - return 0;//bcd(systime.local_time.minute); + return 0;//bcd(systime.local_time.minute); case 0x04: //hours return bcd(systime.local_time.hour); @@ -155,7 +155,7 @@ static UINT8 rtc_get_reg(running_machine *machine,int address_register) default: fatalerror("DALLAS DS1287: Unknown register %02X", address_register); return 0x00; - } + } } // RTC CLOCK diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c index 964b0782f27..2f3b55ebbcc 100644 --- a/src/mame/drivers/armedf.c +++ b/src/mame/drivers/armedf.c @@ -773,7 +773,7 @@ static MACHINE_START( armedf ) state_save_register_global(machine, state->fg_scrolly); state_save_register_global(machine, state->bg_scrollx); state_save_register_global(machine, state->bg_scrolly); - } +} static MACHINE_RESET( armedf ) { diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c index 22a2b87205c..442b36c21e6 100644 --- a/src/mame/drivers/bfm_sc2.c +++ b/src/mame/drivers/bfm_sc2.c @@ -1399,7 +1399,7 @@ static WRITE8_HANDLER( e2ram_w ) LOG(("e2ram: ? c:%d d:%d\n", (data & SCL)?1:0, (data&SDA)?1:0 )); break; - } + } break; } } diff --git a/src/mame/drivers/bfmsys85.c b/src/mame/drivers/bfmsys85.c index 615bf3cfa68..bb99b23551a 100644 --- a/src/mame/drivers/bfmsys85.c +++ b/src/mame/drivers/bfmsys85.c @@ -324,7 +324,7 @@ static WRITE8_HANDLER( mux_ctrl_w ) case 0xE0: // End of interrupt break; - } + } } static READ8_HANDLER( mux_ctrl_r ) diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index 119adb202bf..529b031f04f 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -252,8 +252,10 @@ static READ16_HANDLER( soundlatch_ack_r ) return data; } else - { logerror("CPU #1 - PC %04X: Sound Buffer 2 Underflow Error\n",cpu_get_pc(space->cpu)); - return 0xff; } + { + logerror("CPU #1 - PC %04X: Sound Buffer 2 Underflow Error\n",cpu_get_pc(space->cpu)); + return 0xff; + } } @@ -3981,7 +3983,8 @@ static DRIVER_INIT( pwrins2j ) buffer = alloc_array_or_die(UINT8, len); { - for(i=0; i<len/2; i++) { + for(i=0; i<len/2; i++) + { j = BITSWAP24(i,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7, 2,4,6,1,5,3, 0); if(((j & 6) == 0) || ((j & 6) == 6)) j ^= 6; diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c index 5a3a994545b..55a817a485f 100644 --- a/src/mame/drivers/cosmic.c +++ b/src/mame/drivers/cosmic.c @@ -270,7 +270,7 @@ static WRITE8_HANDLER( cosmica_sound_output_w ) } else sample_start(state->samples, 7, 8, 0); break; - } + } } case 3: /*Dive Bombing Type B (G.S.B)*/ diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c index e0b0bcb13d2..12c23411b00 100644 --- a/src/mame/drivers/cps3.c +++ b/src/mame/drivers/cps3.c @@ -1953,7 +1953,7 @@ static UINT32 ProcessByte8(running_machine *machine,UINT8 b,UINT32 dst_offset) gfx_element_mark_dirty(machine->gfx[1], (dst_offset&0x7fffff)/0x100); return 1; } - } +} static void cps3_do_alt_char_dma( running_machine *machine, UINT32 src, UINT32 real_dest, UINT32 real_length ) { diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index b202a2d2756..f52e644917e 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -406,7 +406,7 @@ static VIDEO_UPDATE( ddayjlc ) drawgfx_transpen(bitmap, cliprect, screen->machine->gfx[1], c + state->char_bank * 0x100, 1, 0, 0, x*8, y*8, 0); else drawgfx_opaque(bitmap, cliprect, screen->machine->gfx[1], c + state->char_bank * 0x100, 1, 0, 0, x*8, y*8); - } + } } return 0; } diff --git a/src/mame/drivers/drgnmst.c b/src/mame/drivers/drgnmst.c index 533ae9494df..6b6a540b653 100644 --- a/src/mame/drivers/drgnmst.c +++ b/src/mame/drivers/drgnmst.c @@ -531,7 +531,7 @@ static DRIVER_INIT( drgnmst ) if ((drgnmst_PICROM_HEX[src_pos + 0] == ':') && (drgnmst_PICROM_HEX[src_pos + 1] == '1') && (drgnmst_PICROM_HEX[src_pos + 2] == '0')) - { + { src_pos += 9; for (offs = 0; offs < 32; offs += 4) @@ -559,7 +559,7 @@ static DRIVER_INIT( drgnmst ) (drgnmst_PICROM_HEX[src_pos + 1] == '0') && (drgnmst_PICROM_HEX[src_pos + 2] == '2') && (drgnmst_PICROM_HEX[src_pos + 3] == '1')) - { + { src_pos += 9; data_hi = drgnmst_asciitohex((drgnmst_PICROM_HEX[src_pos + 0])); diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c index 3df1ee09b8b..fb53e25f14d 100644 --- a/src/mame/drivers/freekick.c +++ b/src/mame/drivers/freekick.c @@ -130,8 +130,8 @@ static READ8_HANDLER( oigas_3_r ) case 0xc710: state->outval = 0x0fdd; break; case 0xc4f0: state->outval = 0x05b6; break; case 0xc4e0: state->outval = 0xae1e; break; - } - return state->outval>>8; + } + return state->outval>>8; case 5: state->cnt=0;return state->outval&0xff; } return 0; diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c index 2742eb05248..64b8e8d0a38 100644 --- a/src/mame/drivers/halleys.c +++ b/src/mame/drivers/halleys.c @@ -314,7 +314,8 @@ static void blit(int offset) if (0) { logerror("%s:[%04x]", cpuexec_describe_context(machine), offset); for (ecx=0; ecx<16; ecx++) logerror(" %02x", param[ecx]); - logerror("\n"); } + logerror("\n"); +} #endif @@ -440,7 +441,8 @@ if (0) { eax = wclip<<1; \ ecx = hclip; \ edi = dst_ptr; \ - do { memset((UINT8*)edi, 0, eax); edi = (UINT8*)edi + SCREEN_BYTEWIDTH; } while (--ecx); } + do { memset((UINT8*)edi, 0, eax); edi = (UINT8*)edi + SCREEN_BYTEWIDTH; } while (--ecx); \ +} //-------------------------------------------------------------------------- @@ -690,7 +692,9 @@ COMMAND_MODE: for (edx=y; edx<ebx; edx++) { \ dst_ptr = dst_base + ((edx & YMASK) << SCREEN_WIDTH_L2); \ if (ecx > 0) { memset(dst_ptr, 0, ecx); eax = SCREEN_WIDTH - x; } else eax = w; \ - memset(dst_ptr+x, 0, eax<<1); } } + memset(dst_ptr+x, 0, eax<<1); \ + } \ +} //-------------------------------------------------------------------------- @@ -884,7 +888,8 @@ COMMAND_MODE: #define WARP_LINE_COMMON { \ if (ecx & 1) { ecx--; *dst_ptr = (UINT16)eax; dst_ptr++; } \ dst_ptr += ecx; ecx = -ecx; \ - while (ecx) { *(UINT32*)(dst_ptr+ecx) = eax; ecx += 2; } } + while (ecx) { *(UINT32*)(dst_ptr+ecx) = eax; ecx += 2; } \ + } src1_ptr = src_base + src1; src2_ptr = src_base + src2; @@ -1256,7 +1261,9 @@ static void copy_scroll_xp(bitmap_t *bitmap, UINT16 *source, int sx, int sy) bx = esi[ecx+1]; \ if (ax) edi[ecx] = ax; \ if (bx) edi[ecx+1] = bx; \ - ecx += 2; } } + ecx += 2; \ + } \ + } //-------------------------------------------------------------------------- @@ -1264,7 +1271,8 @@ static void copy_scroll_xp(bitmap_t *bitmap, UINT16 *source, int sx, int sy) esi = src_base + sx; ecx = rcw; XCOPY_COMMON \ esi = src_base; ecx = CLIP_W - rcw; XCOPY_COMMON \ src_base += SCREEN_WIDTH; \ - edi += dst_adv; } + edi += dst_adv; \ +} //-------------------------------------------------------------------------- diff --git a/src/mame/drivers/igs011.c b/src/mame/drivers/igs011.c index d22ce581513..bb5df591885 100644 --- a/src/mame/drivers/igs011.c +++ b/src/mame/drivers/igs011.c @@ -643,8 +643,8 @@ static void vbowlj_decrypt(running_machine *machine) if((i & 0x2004) != 0x2004 || (i & 0x0090) == 0x0000) x ^= 0x0020; - src[i] = x; - } + src[i] = x; + } } diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c index ac102ff2b54..90ac342b445 100644 --- a/src/mame/drivers/konamigx.c +++ b/src/mame/drivers/konamigx.c @@ -811,7 +811,7 @@ static READ32_HANDLER( sound020_r ) if (cpu_get_pc(space->cpu) == 0x0236740) rv = 0xffffffff; if (cpu_get_pc(space->cpu) == 0x023674e) rv = 0xffffffff; break; - } + } return(rv); } diff --git a/src/mame/drivers/ksys573.c b/src/mame/drivers/ksys573.c index 1adbbc8c593..5c7b31d9d04 100644 --- a/src/mame/drivers/ksys573.c +++ b/src/mame/drivers/ksys573.c @@ -960,7 +960,7 @@ static WRITE32_HANDLER( atapi_w ) break; } } - } + } } static void atapi_exit(running_machine* machine) diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c index a2ecf91df55..298c65dd662 100644 --- a/src/mame/drivers/maygay1b.c +++ b/src/mame/drivers/maygay1b.c @@ -743,7 +743,7 @@ static WRITE8_HANDLER( m1_latch_w ) case 6: // Srsel SRSEL = (data & 1); break; - } + } } diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index 70c143b872c..7f7ff5819c9 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -1332,7 +1332,7 @@ static WRITE8_HANDLER( s23_iob_p4_w ) s23_tssio_port_4 = data; namcos23_jvssense = (data & 0x04) ? 0 : 1; - } +} /* H8/3334 (Namco C78) I/O board MCU */ static ADDRESS_MAP_START( s23iobrdmap, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c index 3786bdfdb82..15873b00ead 100644 --- a/src/mame/drivers/nbmj9195.c +++ b/src/mame/drivers/nbmj9195.c @@ -337,7 +337,7 @@ static WRITE8_HANDLER( tmpz84c011_pio_w ) if ((!strcmp(space->machine->gamedrv->name, "imekura")) || (!strcmp(space->machine->gamedrv->name, "mscoutm")) || (!strcmp(space->machine->gamedrv->name, "mjegolf"))) - { + { switch (offset) { diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index 05fe50ccd2a..6fdfe93480d 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -343,7 +343,7 @@ static void handle_lightpen( const device_config *device ) yt = y_val * (vis_area->max_y - vis_area->min_y) / 1024 + vis_area->min_y; timer_set(device->machine, video_screen_get_time_until_pos(device->machine->primary_screen, yt, xt), (void *) device, 0, assert_lp_cb); - } +} static WRITE_LINE_DEVICE_HANDLER(crtc_vsync) { diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c index df27f8a77e6..b9119a043b8 100644 --- a/src/mame/drivers/playmark.c +++ b/src/mame/drivers/playmark.c @@ -1407,7 +1407,7 @@ static DRIVER_INIT( bigtwin ) if ((playmark_PICROM_HEX[src_pos + 0] == ':') && (playmark_PICROM_HEX[src_pos + 1] == '1') && (playmark_PICROM_HEX[src_pos + 2] == '0')) - { + { src_pos += 9; for (offs = 0; offs < 32; offs += 4) @@ -1435,7 +1435,7 @@ static DRIVER_INIT( bigtwin ) (playmark_PICROM_HEX[src_pos + 1] == '0') && (playmark_PICROM_HEX[src_pos + 2] == '2') && (playmark_PICROM_HEX[src_pos + 3] == '1')) - { + { src_pos += 9; data_hi = playmark_asciitohex((playmark_PICROM_HEX[src_pos + 0])); diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c index f2607b12097..e3c8e74b8cb 100644 --- a/src/mame/drivers/sliver.c +++ b/src/mame/drivers/sliver.c @@ -175,7 +175,7 @@ static const int gfxlookup[][4]= { 0x1b78000, 0x017b5db, 512, 256 }, { 0x1bd8000, 0x017f2e6, 512, 256 }, { -1,-1,-1,-1} - }; +}; static WRITE16_HANDLER( sliver_RAMDAC_offset_w ) { @@ -354,8 +354,8 @@ static WRITE16_HANDLER( jpeg2_w ) jpeg_w = gfxlookup[idx][2]; jpeg_h = gfxlookup[idx][3]; render_jpeg(space->machine); - } - else + } + else { jpeg_addr = -1; } diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index 961a5013df3..0678e8c95d7 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -383,7 +383,7 @@ static UINT32 process(running_machine *machine,UINT8 b,UINT32 dst_offset) return 1; } - } +} static WRITE16_HANDLER(srmp6_dma_w) diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index 88b40809639..6b9ad94698b 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -2601,7 +2601,7 @@ static const es5506_interface es5506_config = ***************************************************************************/ -static void init_ssv(void) +static void init_ssv(int sprites_offsx, int sprites_offsy, int tilemap_offsx, int tilemap_offsy) { int i; for (i = 0; i < 16; i++) @@ -2612,84 +2612,45 @@ static void init_ssv(void) ssv_enable_video(1); ssv_special = 0; interrupt_ultrax = 0; + + ssv_sprites_offsx = sprites_offsx; + ssv_sprites_offsy = sprites_offsy; + ssv_tilemap_offsx = tilemap_offsx; + ssv_tilemap_offsy = tilemap_offsy; } -static void init_ssv_hypreac2(void) +static void init_hypreac2(void) { int i; - init_ssv(); - for (i = 0; i < 16; i++) ssv_tile_code[i] = (i << 16); } -static DRIVER_INIT( drifto94 ) { init_ssv(); - ssv_sprites_offsx = -8; ssv_sprites_offsy = +0xf0; - ssv_tilemap_offsx = +0; ssv_tilemap_offsy = -0xf0; } -static DRIVER_INIT( eaglshot ) { init_ssv_hypreac2(); - ssv_sprites_offsx = -8; ssv_sprites_offsy = +0xf0; - ssv_tilemap_offsx = 0; ssv_tilemap_offsy = -0xef; } -static DRIVER_INIT( gdfs ) { init_ssv(); - ssv_sprites_offsx = -8; ssv_sprites_offsy = 1; - ssv_tilemap_offsx = +0; ssv_tilemap_offsy = 0; } -static DRIVER_INIT( hypreact ) { init_ssv(); - ssv_sprites_offsx = +0; ssv_sprites_offsy = +0xf0; - ssv_tilemap_offsx = +0; ssv_tilemap_offsy = -0xf7; } -static DRIVER_INIT( hypreac2 ) { init_ssv_hypreac2(); // different - ssv_sprites_offsx = +0; ssv_sprites_offsy = +0xf0; - ssv_tilemap_offsx = +0; ssv_tilemap_offsy = -0xf8; } -static DRIVER_INIT( janjans1 ) { init_ssv(); - ssv_sprites_offsx = +0; ssv_sprites_offsy = +0xe8; - ssv_tilemap_offsx = +0; ssv_tilemap_offsy = -0xf0; } -static DRIVER_INIT( keithlcy ) { init_ssv(); - ssv_sprites_offsx = -8; ssv_sprites_offsy = +0xf1; - ssv_tilemap_offsx = +0; ssv_tilemap_offsy = -0xf0; } -static DRIVER_INIT( meosism ) { init_ssv(); - ssv_sprites_offsx = +0; ssv_sprites_offsy = +0xe8; - ssv_tilemap_offsx = +0; ssv_tilemap_offsy = -0xef; } -static DRIVER_INIT( mslider ) { init_ssv(); - ssv_sprites_offsx =-16; ssv_sprites_offsy = +0xf0; - ssv_tilemap_offsx = +8; ssv_tilemap_offsy = -0xf1; } -static DRIVER_INIT( ryorioh ) { init_ssv(); - ssv_sprites_offsx = +0; ssv_sprites_offsy = +0xe8; - ssv_tilemap_offsx = +0; ssv_tilemap_offsy = -0xf0; } -static DRIVER_INIT( srmp4 ) { init_ssv(); - ssv_sprites_offsx = -8; ssv_sprites_offsy = +0xf0; - ssv_tilemap_offsx = +0; ssv_tilemap_offsy = -0xf0; +static DRIVER_INIT( drifto94 ) { init_ssv(-8, +0xf0, +0, -0xf0); } +static DRIVER_INIT( eaglshot ) { init_ssv(-8, +0xf0, +0, -0xef); init_hypreac2(); } +static DRIVER_INIT( gdfs ) { init_ssv(-8, +0x01, +0, +0x00); } +static DRIVER_INIT( hypreact ) { init_ssv(+0, +0xf0, +0, -0xf7); } +static DRIVER_INIT( hypreac2 ) { init_ssv(+0, +0xf0, +0, -0xf8); init_hypreac2(); } +static DRIVER_INIT( janjans1 ) { init_ssv(+0, +0xe8, +0, -0xf0); } +static DRIVER_INIT( keithlcy ) { init_ssv(-8, +0xf1, +0, -0xf0); } +static DRIVER_INIT( meosism ) { init_ssv(+0, +0xe8, +0, -0xef); } +static DRIVER_INIT( mslider ) { init_ssv(-16,+0xf0, +8, -0xf1); } +static DRIVER_INIT( ryorioh ) { init_ssv(+0, +0xe8, +0, -0xf0); } +static DRIVER_INIT( srmp4 ) { init_ssv(-8, +0xf0, +0, -0xf0); // ((UINT16 *)memory_region(machine, "user1"))[0x2b38/2] = 0x037a; /* patch to see gal test mode */ - } -static DRIVER_INIT( srmp7 ) { init_ssv(); - ssv_sprites_offsx = +0; ssv_sprites_offsy = -0xf; - ssv_tilemap_offsx = +0; ssv_tilemap_offsy = -0xf0; } -static DRIVER_INIT( stmblade ) { init_ssv(); - ssv_sprites_offsx = -8; ssv_sprites_offsy = +0xef; - ssv_tilemap_offsx = +0; ssv_tilemap_offsy = -0xf0; } -static DRIVER_INIT( survarts ) { init_ssv(); - ssv_sprites_offsx = +0; ssv_sprites_offsy = +0xe8; - ssv_tilemap_offsx = +0; ssv_tilemap_offsy = -0xef; } -static DRIVER_INIT( dynagear ) { init_ssv(); - ssv_sprites_offsx = -8; ssv_sprites_offsy = +0xec; - ssv_tilemap_offsx = +0; ssv_tilemap_offsy = -0xef; } -static DRIVER_INIT( sxyreact ) { init_ssv_hypreac2(); // different - ssv_sprites_offsx = +0; ssv_sprites_offsy = +0xe8; - ssv_tilemap_offsx = +0; ssv_tilemap_offsy = -0xef; } -static DRIVER_INIT( sxyreac2 ) { init_ssv_hypreac2(); - ssv_sprites_offsx = +0; ssv_sprites_offsy = +0xe8; - ssv_tilemap_offsx = +0; ssv_tilemap_offsy = -0xef; } -static DRIVER_INIT( twineag2 ) { init_ssv();interrupt_ultrax=1; - ssv_sprites_offsx = -6; ssv_sprites_offsy = +0x01; - ssv_tilemap_offsx = -2; ssv_tilemap_offsy = +0x00; } -static DRIVER_INIT( ultrax ) { init_ssv();interrupt_ultrax=1; - ssv_sprites_offsx = -8; ssv_sprites_offsy = +0x01; - ssv_tilemap_offsx = +0; ssv_tilemap_offsy = +0x00; } -static DRIVER_INIT( vasara ) { init_ssv(); - ssv_sprites_offsx = +0; ssv_sprites_offsy = +0xf0; - ssv_tilemap_offsx = +0; ssv_tilemap_offsy = -0xf8; } -static DRIVER_INIT( jsk ) { init_ssv(); - ssv_sprites_offsx = -8; ssv_sprites_offsy = +0xf5; - ssv_tilemap_offsx = 0; ssv_tilemap_offsy = -0xf4; } +} +static DRIVER_INIT( srmp7 ) { init_ssv(+0, -0x0f, +0, -0xf0); } +static DRIVER_INIT( stmblade ) { init_ssv(-8, +0xef, +0, -0xf0); } +static DRIVER_INIT( survarts ) { init_ssv(+0, +0xe8, +0, -0xef); } +static DRIVER_INIT( dynagear ) { init_ssv(-8, +0xec, +0, -0xef); } +static DRIVER_INIT( sxyreact ) { init_ssv(+0, +0xe8, +0, -0xef); init_hypreac2(); } // different +static DRIVER_INIT( sxyreac2 ) { init_ssv(+0, +0xe8, +0, -0xef); init_hypreac2(); } +static DRIVER_INIT( twineag2 ) { init_ssv(-6, +0x01, -2, +0x00); interrupt_ultrax=1; } +static DRIVER_INIT( ultrax ) { init_ssv(-8, +0x01, +0, +0x00); interrupt_ultrax=1; } +static DRIVER_INIT( vasara ) { init_ssv(+0, +0xf0, +0, -0xf8); } +static DRIVER_INIT( jsk ) { init_ssv(-8, +0xf5, +0, -0xf4); } static MACHINE_DRIVER_START( ssv ) diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c index 76f62040c65..9a716c821e3 100644 --- a/src/mame/drivers/system1.c +++ b/src/mame/drivers/system1.c @@ -252,7 +252,8 @@ static const UINT8 cc_op[0x100] = { 5*5+1*2,10*5+1*2,10*5+3*2,10*5+3*2,10*5+3*2,11*5+1*2, 7*5+2*2,11*5+1*2, 5*5+1*2,10*5+1*2,10*5+3*2, 0*5+1*2,10*5+3*2,17*5+3*2, 7*5+2*2,11*5+1*2, 5*5+1*2,10*5+1*2,10*5+3*2,11*5+2*2,10*5+3*2,11*5+1*2, 7*5+2*2,11*5+1*2, 5*5+1*2, 4*5+1*2,10*5+3*2,11*5+2*2,10*5+3*2, 0*5 , 7*5+2*2,11*5+1*2, 5*5+1*2,10*5+1*2,10*5+3*2,19*5+1*2,10*5+3*2,11*5+1*2, 7*5+2*2,11*5+1*2, 5*5+1*2, 4*5+1*2,10*5+3*2, 4*5+1*2,10*5+3*2, 0*5 , 7*5+2*2,11*5+1*2, - 5*5+1*2,10*5+1*2,10*5+3*2, 4*5+1*2,10*5+3*2,11*5+1*2, 7*5+2*2,11*5+1*2, 5*5+1*2, 6*5+1*2,10*5+3*2, 4*5+1*2,10*5+3*2, 0*5 , 7*5+2*2,11*5+1*2}; + 5*5+1*2,10*5+1*2,10*5+3*2, 4*5+1*2,10*5+3*2,11*5+1*2, 7*5+2*2,11*5+1*2, 5*5+1*2, 6*5+1*2,10*5+3*2, 4*5+1*2,10*5+3*2, 0*5 , 7*5+2*2,11*5+1*2 +}; static const UINT8 cc_cb[0x100] = { 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2,15*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2,15*5+2*2, 8*5+2*2, @@ -270,7 +271,8 @@ static const UINT8 cc_cb[0x100] = { 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2,15*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2,15*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2,15*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2,15*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2,15*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2,15*5+2*2, 8*5+2*2, - 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2,15*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2,15*5+2*2, 8*5+2*2}; + 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2,15*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2,15*5+2*2, 8*5+2*2 +}; static const UINT8 cc_ed[0x100] = { 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, @@ -288,7 +290,8 @@ static const UINT8 cc_ed[0x100] = { 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, - 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2}; + 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2, 8*5+2*2 +}; static const UINT8 cc_xy[0x100] = { 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2,15*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, @@ -306,7 +309,8 @@ static const UINT8 cc_xy[0x100] = { 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 0*5 , 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2,14*5+2*2, 4*5+2*2,23*5+2*2, 4*5+2*2,15*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 8*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, - 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2,10*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2}; + 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2,10*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2, 4*5+2*2 +}; static const UINT8 cc_xycb[0x100] = { 23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2, @@ -324,7 +328,8 @@ static const UINT8 cc_xycb[0x100] = { 23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2, 23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2, 23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2, -23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2}; +23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2,23*5+4*2 +}; /* extra cycles if jr/jp/call taken and 'interrupt latency' on rst 0-7 */ static const UINT8 cc_ex[0x100] = { @@ -343,7 +348,8 @@ static const UINT8 cc_ex[0x100] = { 6*5, 0*5, 0*5, 0*5, 7*5, 0*5, 0*5, 2*5, 6*5, 0*5, 0*5, 0*5, 7*5, 0*5, 0*5, 2*5, 6*5, 0*5, 0*5, 0*5, 7*5, 0*5, 0*5, 2*5, 6*5, 0*5, 0*5, 0*5, 7*5, 0*5, 0*5, 2*5, 6*5, 0*5, 0*5, 0*5, 7*5, 0*5, 0*5, 2*5, 6*5, 0*5, 0*5, 0*5, 7*5, 0*5, 0*5, 2*5, - 6*5, 0*5, 0*5, 0*5, 7*5, 0*5, 0*5, 2*5, 6*5, 0*5, 0*5, 0*5, 7*5, 0*5, 0*5, 2*5}; + 6*5, 0*5, 0*5, 0*5, 7*5, 0*5, 0*5, 2*5, 6*5, 0*5, 0*5, 0*5, 7*5, 0*5, 0*5, 2*5 +}; static MACHINE_START( system1 ) diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c index 080d2639637..fd8e175005f 100644 --- a/src/mame/drivers/system16.c +++ b/src/mame/drivers/system16.c @@ -274,7 +274,7 @@ ADDRESS_MAP_END static WRITE16_HANDLER( sound_command_w ) { if( ACCESSING_BITS_0_7 ) -{ + { soundlatch_w( space, 0, data & 0xff ); cputag_set_input_line(space->machine, "soundcpu", 0, HOLD_LINE ); } @@ -286,7 +286,7 @@ static WRITE16_HANDLER( sound_command_w ) static WRITE16_HANDLER( sys16_coinctrl_w ) { if( ACCESSING_BITS_0_7 ) -{ + { coinctrl = data&0xff; sys16_refreshenable = coinctrl & 0x20; set_led_status(space->machine, 1,coinctrl & 0x08); diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c index 74a077f5733..475c48593e4 100644 --- a/src/mame/drivers/witch.c +++ b/src/mame/drivers/witch.c @@ -392,7 +392,7 @@ static READ8_HANDLER(prot_read_700x) case 0x258: case 0x25e: return offset;//enough to pass... - } + } return memory_region(space->machine, "sub")[0x7000+offset]; } diff --git a/src/mame/includes/atari.h b/src/mame/includes/atari.h index 85294466310..b443d05748a 100644 --- a/src/mame/includes/atari.h +++ b/src/mame/includes/atari.h @@ -424,10 +424,10 @@ typedef struct { /* erase a number of color clocks to background color PBK */ #define ERASE4 { \ *dst++ = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \ - *dst++ = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \ - *dst++ = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \ + *dst++ = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \ + *dst++ = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \ *dst++ = (PBK << 24) | (PBK << 16) | (PBK << 8) | PBK; \ - } +} #define ZAP48() \ dst = (UINT32 *)&antic.cclock[PMOFFSET]; \ diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c index 547434a24f6..e3a7693fb46 100644 --- a/src/mame/machine/atari.c +++ b/src/mame/machine/atari.c @@ -161,8 +161,10 @@ void a800_handle_keyboard(running_machine *machine) { const device_config *pokey = devtag_get_device(machine, "pokey"); int atari_code, count, ipt, i; - static const char *const tag[] = { "keyboard_0", "keyboard_1", "keyboard_2", "keyboard_3", - "keyboard_4", "keyboard_5", "keyboard_6", "keyboard_7" }; + static const char *const tag[] = { + "keyboard_0", "keyboard_1", "keyboard_2", "keyboard_3", + "keyboard_4", "keyboard_5", "keyboard_6", "keyboard_7" + }; /* check keyboard */ for( i = 0; i < 8; i++ ) diff --git a/src/mame/machine/bfm_bd1.c b/src/mame/machine/bfm_bd1.c index 2db67a73583..e9c361d915d 100644 --- a/src/mame/machine/bfm_bd1.c +++ b/src/mame/machine/bfm_bd1.c @@ -241,11 +241,11 @@ void BFM_BD1_shift_data(int id, int data) { bd1[id].changed |= 1; } - //logerror("vfd %3d -> %02X \"%s\"\n", id, bd1[id].data, bd1[id].string); + //logerror("vfd %3d -> %02X \"%s\"\n", id, bd1[id].data, bd1[id].string); - bd1[id].count = 0; - bd1[id].data = 0; - } + bd1[id].count = 0; + bd1[id].data = 0; + } } /////////////////////////////////////////////////////////////////////////// @@ -444,14 +444,14 @@ static int BD1_setdata(int id, int segdata, int data) bd1[id].pcursor_pos = bd1[id].cursor_pos; if ( bd1[id].window_size <= 0 || (bd1[id].window_size > 16)) - { // no window selected default to rotate mode + { // no window selected default to rotate mode if ( mode == 2 ) mode = 0; else if ( mode == 3 ) mode = 1; //mode &= -2; - } + } - switch ( mode ) - { + switch ( mode ) + { case 0: // rotate left bd1[id].cursor_pos &= 0x0F; @@ -514,7 +514,7 @@ static int BD1_setdata(int id, int segdata, int data) case 3: // Scroll right - if ( bd1[id].cursor_pos > bd1[id].window_start ) + if ( bd1[id].cursor_pos > bd1[id].window_start ) { if ( change ) { diff --git a/src/mame/machine/kaneko16.c b/src/mame/machine/kaneko16.c index 1759e0887d4..a8d02ed524d 100644 --- a/src/mame/machine/kaneko16.c +++ b/src/mame/machine/kaneko16.c @@ -1670,7 +1670,7 @@ static const INT16 calc3_keydata[0x40*0x100] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - }; +}; // global so we can use them in the filename when we save out the data (debug..) static UINT8 calc3_decryption_key_byte; diff --git a/src/mame/machine/model3.c b/src/mame/machine/model3.c index 4416e4ef3db..d6a6b8758b8 100644 --- a/src/mame/machine/model3.c +++ b/src/mame/machine/model3.c @@ -23,7 +23,7 @@ static int m3_step; #define NEXT(new_state) fsm[state][new_state] static INT32 state; // current state -static const INT32 fsm[][2] = { +static const INT32 fsm[][2] = { { 1, 0 }, // 0 Test-Logic/Reset { 1, 2 }, // 1 Run-Test/Idle { 3, 9 }, // 2 Select-DR-Scan @@ -40,7 +40,7 @@ static const INT32 fsm[][2] = { { 13, 14 }, // 13 Pause-IR { 11, 15 }, // 14 Exit2-IR { 1, 2 } // 15 Update-IR - }; +}; /* * TAP Registers diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c index d70a981d153..f43c88fe704 100644 --- a/src/mame/machine/namcos1.c +++ b/src/mame/machine/namcos1.c @@ -667,8 +667,10 @@ static WRITE8_HANDLER( unknown_w ) /* Main bankswitching routine */ static void set_bank(running_machine *machine, int banknum, const bankhandler *handler) { - static const char *const banktags[] ={ "bank1", "bank2", "bank3", "bank4", "bank5", "bank6", "bank7", "bank8", - "bank9", "bank10", "bank11", "bank12", "bank13", "bank14", "bank15", "bank16" }; + static const char *const banktags[] = { + "bank1", "bank2", "bank3", "bank4", "bank5", "bank6", "bank7", "bank8", + "bank9", "bank10", "bank11", "bank12", "bank13", "bank14", "bank15", "bank16" + }; static const char *const cputags[] = { "maincpu", "sub" }; const address_space *space = cputag_get_address_space(machine, cputags[(banknum >> 3) & 1], ADDRESS_SPACE_PROGRAM); int bankstart = (banknum & 7) * 0x2000; diff --git a/src/mame/machine/pckeybrd.c b/src/mame/machine/pckeybrd.c index 3e5b3316784..cfe14b4a17f 100644 --- a/src/mame/machine/pckeybrd.c +++ b/src/mame/machine/pckeybrd.c @@ -601,7 +601,7 @@ void at_keyboard_polling(void) at_keyboard_extended_scancode_insert(i,0); } } - } + } } } diff --git a/src/mame/machine/pgmprot.c b/src/mame/machine/pgmprot.c index 1b7a48cabd9..333918991a7 100644 --- a/src/mame/machine/pgmprot.c +++ b/src/mame/machine/pgmprot.c @@ -406,16 +406,18 @@ static const UINT32 B0TABLE[16] = {2, 0, 1, 4, 3}; //maps char portraits to tabl // photo2yk bonus stage static const UINT32 AETABLE[16]={0x00,0x0a,0x14, 0x01,0x0b,0x15, - 0x02,0x0c,0x16}; + 0x02,0x0c,0x16 +}; //Not sure if BATABLE is complete -static const UINT32 BATABLE[0x40]= - {0x00,0x29,0x2c,0x35,0x3a,0x41,0x4a,0x4e, //0x00 +static const UINT32 BATABLE[0x40]= { + 0x00,0x29,0x2c,0x35,0x3a,0x41,0x4a,0x4e, //0x00 0x57,0x5e,0x77,0x79,0x7a,0x7b,0x7c,0x7d, //0x08 0x7e,0x7f,0x80,0x81,0x82,0x85,0x86,0x87, //0x10 0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x90, //0x18 0x95,0x96,0x97,0x98,0x99,0x9a,0x9b,0x9c, - 0x9e,0xa3,0xd4,0xa9,0xaf,0xb5,0xbb,0xc1}; + 0x9e,0xa3,0xd4,0xa9,0xaf,0xb5,0xbb,0xc1 +}; diff --git a/src/mame/machine/segas32.c b/src/mame/machine/segas32.c index d4756171d42..64a6d9c04b9 100644 --- a/src/mame/machine/segas32.c +++ b/src/mame/machine/segas32.c @@ -323,7 +323,7 @@ READ16_HANDLER(arf_wakeup_protection_r) ****************************************************************************** ******************************************************************************/ WRITE16_HANDLER( jleague_protection_w ) - { +{ COMBINE_DATA( &system32_workram[0xf700/2 + offset ] ); switch( offset ) diff --git a/src/mame/video/appoooh.c b/src/mame/video/appoooh.c index 7606770b5ee..ee985361179 100644 --- a/src/mame/video/appoooh.c +++ b/src/mame/video/appoooh.c @@ -235,7 +235,7 @@ static void appoooh_draw_sprites( bitmap_t *dest_bmp, const rectangle *cliprect, color, flipx,flipy, sx, sy, 0); - } + } } static void robowres_draw_sprites( bitmap_t *dest_bmp, const rectangle *cliprect, const gfx_element *gfx, UINT8 *sprite ) @@ -266,7 +266,7 @@ static void robowres_draw_sprites( bitmap_t *dest_bmp, const rectangle *cliprect color, flipx,flipy, sx, sy, 0); - } + } } diff --git a/src/mame/video/battlera.c b/src/mame/video/battlera.c index f0c5c8c1410..a8c2865ed08 100644 --- a/src/mame/video/battlera.c +++ b/src/mame/video/battlera.c @@ -331,7 +331,7 @@ VIDEO_UPDATE( battlera ) /* If this tile was changed OR tilemap was changed, redraw */ if (vram_dirty[offs/2]) { vram_dirty[offs/2]=0; - drawgfx_opaque(tile_bitmap,0,screen->machine->gfx[0], + drawgfx_opaque(tile_bitmap,0,screen->machine->gfx[0], code, HuC6270_vram[offs] >> 4, 0,0, @@ -341,12 +341,12 @@ VIDEO_UPDATE( battlera ) 0, /* fill the spot with pen 256 */ 0,0, 8*mx,8*my); - drawgfx_transmask(front_bitmap,0,screen->machine->gfx[0], + drawgfx_transmask(front_bitmap,0,screen->machine->gfx[0], code, HuC6270_vram[offs] >> 4, 0,0, 8*mx,8*my,0x1); - } + } } /* Render bitmap */ diff --git a/src/mame/video/bosco.c b/src/mame/video/bosco.c index 42f86de73c1..771d881a25c 100644 --- a/src/mame/video/bosco.c +++ b/src/mame/video/bosco.c @@ -284,7 +284,7 @@ static void draw_stars(bitmap_t *bitmap, const rectangle *cliprect, int flip) if (y >= cliprect->min_y && y <= cliprect->max_y) *BITMAP_ADDR16(bitmap, y, x) = STARS_COLOR_BASE + star_seed_tab[star_cntr].col; - } + } } } } diff --git a/src/mame/video/brkthru.c b/src/mame/video/brkthru.c index c32e539cb37..a94139cbf1d 100644 --- a/src/mame/video/brkthru.c +++ b/src/mame/video/brkthru.c @@ -246,9 +246,9 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect sx,sy + 256,0); } - } } } +} VIDEO_UPDATE( brkthru ) { diff --git a/src/mame/video/bwing.c b/src/mame/video/bwing.c index 75aa278abe6..6c3c22397fa 100644 --- a/src/mame/video/bwing.c +++ b/src/mame/video/bwing.c @@ -137,10 +137,12 @@ WRITE8_HANDLER( bwing_scrollreg_w ) WRITE8_HANDLER( bwing_paletteram_w ) { bwing_state *state = (bwing_state *)space->machine->driver_data; - static const float rgb[4][3] = {{0.85f, 0.95f, 1.00f}, - {0.90f, 1.00f, 1.00f}, - {0.80f, 1.00f, 1.00f}, - {0.75f, 0.90f, 1.10f}}; + static const float rgb[4][3] = { + {0.85f, 0.95f, 1.00f}, + {0.90f, 1.00f, 1.00f}, + {0.80f, 1.00f, 1.00f}, + {0.75f, 0.90f, 1.10f} + }; int r, g, b, i; state->paletteram[offset] = data; diff --git a/src/mame/video/cave.c b/src/mame/video/cave.c index f24a7c2b747..72e48b55a73 100644 --- a/src/mame/video/cave.c +++ b/src/mame/video/cave.c @@ -1469,24 +1469,32 @@ VIDEO_UPDATE( cave ) /* Choose the tilemap to display (8x8 tiles or 16x16 tiles) */ if (tilemap_0) - { tiledim_0 = cave_vctrl_0[ 1 ] & 0x2000; + { + tiledim_0 = cave_vctrl_0[ 1 ] & 0x2000; if (tiledim_0 != old_tiledim_0) tilemap_mark_all_tiles_dirty(tilemap_0); - old_tiledim_0 = tiledim_0; } + old_tiledim_0 = tiledim_0; + } if (tilemap_1) - { tiledim_1 = cave_vctrl_1[ 1 ] & 0x2000; + { + tiledim_1 = cave_vctrl_1[ 1 ] & 0x2000; if (tiledim_1 != old_tiledim_1) tilemap_mark_all_tiles_dirty(tilemap_1); - old_tiledim_1 = tiledim_1; } + old_tiledim_1 = tiledim_1; + } if (tilemap_2) - { tiledim_2 = cave_vctrl_2[ 1 ] & 0x2000; + { + tiledim_2 = cave_vctrl_2[ 1 ] & 0x2000; if (tiledim_2 != old_tiledim_2) tilemap_mark_all_tiles_dirty(tilemap_2); - old_tiledim_2 = tiledim_2; } + old_tiledim_2 = tiledim_2; + } if (tilemap_3) - { tiledim_3 = cave_vctrl_3[ 1 ] & 0x2000; + { + tiledim_3 = cave_vctrl_3[ 1 ] & 0x2000; if (tiledim_3 != old_tiledim_3) tilemap_mark_all_tiles_dirty(tilemap_3); - old_tiledim_3 = tiledim_3; } + old_tiledim_3 = tiledim_3; + } #ifdef MAME_DEBUG @@ -1526,14 +1534,26 @@ VIDEO_UPDATE( cave ) /* Show the row / "column" scroll enable flags, when they change state */ rasflag = 0; - if (tilemap_0) { rasflag |= (cave_vctrl_0[0] & 0x4000) ? 0x0001 : 0; - rasflag |= (cave_vctrl_0[1] & 0x4000) ? 0x0002 : 0; } - if (tilemap_1) { rasflag |= (cave_vctrl_1[0] & 0x4000) ? 0x0010 : 0; - rasflag |= (cave_vctrl_1[1] & 0x4000) ? 0x0020 : 0; } - if (tilemap_2) { rasflag |= (cave_vctrl_2[0] & 0x4000) ? 0x0100 : 0; - rasflag |= (cave_vctrl_2[1] & 0x4000) ? 0x0200 : 0; } - if (tilemap_3) { rasflag |= (cave_vctrl_3[0] & 0x4000) ? 0x1000 : 0; - rasflag |= (cave_vctrl_3[1] & 0x4000) ? 0x2000 : 0; } + if (tilemap_0) + { + rasflag |= (cave_vctrl_0[0] & 0x4000) ? 0x0001 : 0; + rasflag |= (cave_vctrl_0[1] & 0x4000) ? 0x0002 : 0; + } + if (tilemap_1) + { + rasflag |= (cave_vctrl_1[0] & 0x4000) ? 0x0010 : 0; + rasflag |= (cave_vctrl_1[1] & 0x4000) ? 0x0020 : 0; + } + if (tilemap_2) + { + rasflag |= (cave_vctrl_2[0] & 0x4000) ? 0x0100 : 0; + rasflag |= (cave_vctrl_2[1] & 0x4000) ? 0x0200 : 0; + } + if (tilemap_3) + { + rasflag |= (cave_vctrl_3[0] & 0x4000) ? 0x1000 : 0; + rasflag |= (cave_vctrl_3[1] & 0x4000) ? 0x2000 : 0; + } if (rasflag != old_rasflag) { popmessage("Line Effect: 0:%c%c 1:%c%c 2:%c%c 3:%c%c", diff --git a/src/mame/video/cloak.c b/src/mame/video/cloak.c index d008085de82..1ae6bd9772c 100644 --- a/src/mame/video/cloak.c +++ b/src/mame/video/cloak.c @@ -144,7 +144,7 @@ WRITE8_HANDLER( graph_processor_w ) adjust_xy(offset); break; - } + } } WRITE8_HANDLER( cloak_videoram_w ) diff --git a/src/mame/video/darkmist.c b/src/mame/video/darkmist.c index 5362cb1206f..d65d7445c2e 100644 --- a/src/mame/video/darkmist.c +++ b/src/mame/video/darkmist.c @@ -163,33 +163,32 @@ VIDEO_UPDATE( darkmist) 3 - XXXX XXXX - x coord */ - int i,fx,fy,tile,palette; - for(i=0;i<screen->machine->generic.spriteram_size;i+=32) - { - fy=spriteram[i+1]&0x40; - fx=spriteram[i+1]&0x80; + int i,fx,fy,tile,palette; + for(i=0;i<screen->machine->generic.spriteram_size;i+=32) + { + fy=spriteram[i+1]&0x40; + fx=spriteram[i+1]&0x80; - tile=spriteram[i+0]; + tile=spriteram[i+0]; - if(spriteram[i+1]&0x20) - tile += (*darkmist_spritebank << 8); + if(spriteram[i+1]&0x20) + tile += (*darkmist_spritebank << 8); - palette=((spriteram[i+1])>>1)&0xf; + palette=((spriteram[i+1])>>1)&0xf; - if(spriteram[i+1]&0x1) - palette=mame_rand(screen->machine)&15; + if(spriteram[i+1]&0x1) + palette=mame_rand(screen->machine)&15; - palette+=32; + palette+=32; - drawgfx_transpen( - bitmap,cliprect, - screen->machine->gfx[2], - tile, - palette, - fx,fy, - spriteram[i+3],spriteram[i+2],0 ); + drawgfx_transpen( + bitmap,cliprect, + screen->machine->gfx[2], + tile, + palette, + fx,fy, + spriteram[i+3],spriteram[i+2],0 ); } - } if(darkmist_hw & DISPLAY_TXT) diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c index 715986b7c9a..4b43e88abaf 100644 --- a/src/mame/video/dynax.c +++ b/src/mame/video/dynax.c @@ -924,14 +924,20 @@ static void jantouki_copylayer(bitmap_t *bitmap,const rectangle *cliprect,int i, { int color,scrollx,scrolly,palettes,palbank; - if (i < 4) { scrollx = dynax_blit_scroll_x; - scrolly = dynax_blit_scroll_y; - palettes = dynax_blit_palettes; - palbank = dynax_blit_palbank; } - else { scrollx = dynax_blit2_scroll_x; - scrolly = dynax_blit2_scroll_y; - palettes = dynax_blit2_palettes; - palbank = dynax_blit2_palbank; } + if (i < 4) + { + scrollx = dynax_blit_scroll_x; + scrolly = dynax_blit_scroll_y; + palettes = dynax_blit_palettes; + palbank = dynax_blit_palbank; + } + else + { + scrollx = dynax_blit2_scroll_x; + scrolly = dynax_blit2_scroll_y; + palettes = dynax_blit2_palettes; + palbank = dynax_blit2_palbank; + } switch ( i % 4 ) { @@ -1092,10 +1098,14 @@ static int debug_viewer(running_machine *machine, bitmap_t *bitmap,const rectang if (input_code_pressed_once(machine, KEYCODE_I)) c = (c-1) & 0x1f; if (input_code_pressed_once(machine, KEYCODE_O)) c = (c+1) & 0x1f; if (input_code_pressed_once(machine, KEYCODE_R)) { r = (r+1) & 0x7; i = size/8 * r; } - if (input_code_pressed(machine, KEYCODE_M) | input_code_pressed_once(machine, KEYCODE_K)) { - while( i < size && RAM[i] ) i++; while( i < size && !RAM[i] ) i++; } - if (input_code_pressed(machine, KEYCODE_N) | input_code_pressed_once(machine, KEYCODE_J)) { - if (i >= 2) i-=2; while( i > 0 && RAM[i] ) i--; i++; } + if (input_code_pressed(machine, KEYCODE_M) | input_code_pressed_once(machine, KEYCODE_K)) + { + while( i < size && RAM[i] ) i++; while( i < size && !RAM[i] ) i++; + } + if (input_code_pressed(machine, KEYCODE_N) | input_code_pressed_once(machine, KEYCODE_J)) + { + if (i >= 2) i-=2; while( i > 0 && RAM[i] ) i--; i++; + } dynax_blit_palettes = (c & 0xf) * 0x111; dynax_blit_palbank = (c >> 4) & 1; diff --git a/src/mame/video/exerion.c b/src/mame/video/exerion.c index 5ebd0b85451..6d005934714 100644 --- a/src/mame/video/exerion.c +++ b/src/mame/video/exerion.c @@ -93,7 +93,7 @@ PALETTE_INIT( exerion ) UINT8 ctabentry = color_prom[i] & 0x0f; colortable_entry_set_value(machine->colortable, i, ctabentry); } - } +} diff --git a/src/mame/video/galpani2.c b/src/mame/video/galpani2.c index 541757a3bf7..f5f62f862a1 100644 --- a/src/mame/video/galpani2.c +++ b/src/mame/video/galpani2.c @@ -157,12 +157,14 @@ VIDEO_UPDATE( galpani2 ) #ifdef MAME_DEBUG if (input_code_pressed(screen->machine, KEYCODE_Z)) -{ int msk = 0; +{ + int msk = 0; if (input_code_pressed(screen->machine, KEYCODE_Q)) msk |= 1; if (input_code_pressed(screen->machine, KEYCODE_W)) msk |= 2; if (input_code_pressed(screen->machine, KEYCODE_E)) msk |= 4; if (input_code_pressed(screen->machine, KEYCODE_A)) msk |= 8; - if (msk != 0) layers_ctrl &= msk; } + if (msk != 0) layers_ctrl &= msk; +} #endif bitmap_fill(bitmap,cliprect,0); diff --git a/src/mame/video/grchamp.c b/src/mame/video/grchamp.c index 01b549a38fe..e606eb63add 100644 --- a/src/mame/video/grchamp.c +++ b/src/mame/video/grchamp.c @@ -467,14 +467,14 @@ VIDEO_UPDATE( grchamp ) { if (objpix & 0x08) { -mame_printf_debug("Collide car/object @ (%d,%d)\n", x, y); + mame_printf_debug("Collide car/object @ (%d,%d)\n", x, y); state->collide = 0x1000 | 0x2000/* guess */ | ((~y & 0x80) << 3) | ((~y & 0xf8) << 2) | ((~x & 0xf8) >> 3); -} + } else if ((mvid & 0x0f) != 0) { -mame_printf_debug("Collide car/bg @ (%d,%d)\n", x, y); + mame_printf_debug("Collide car/bg @ (%d,%d)\n", x, y); state->collide = 0x1000 | 0x4000/* guess */ | ((~y & 0x80) << 3) | ((~y & 0xf8) << 2) | ((~x & 0xf8) >> 3); -} + } } } if (bits & 0x10) diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c index 25ae754dc36..ebe35026a59 100644 --- a/src/mame/video/hyprduel.c +++ b/src/mame/video/hyprduel.c @@ -502,14 +502,16 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect /* Exponential zoom table extracted from daitoride */ static const int zoomtable[0x40] = - { 0xAAC,0x800,0x668,0x554,0x494,0x400,0x390,0x334, + { + 0xAAC,0x800,0x668,0x554,0x494,0x400,0x390,0x334, 0x2E8,0x2AC,0x278,0x248,0x224,0x200,0x1E0,0x1C8, 0x1B0,0x198,0x188,0x174,0x164,0x154,0x148,0x13C, 0x130,0x124,0x11C,0x110,0x108,0x100,0x0F8,0x0F0, 0x0EC,0x0E4,0x0DC,0x0D8,0x0D4,0x0CC,0x0C8,0x0C4, 0x0C0,0x0BC,0x0B8,0x0B4,0x0B0,0x0AC,0x0A8,0x0A4, 0x0A0,0x09C,0x098,0x094,0x090,0x08C,0x088,0x080, - 0x078,0x070,0x068,0x060,0x058,0x050,0x048,0x040 }; + 0x078,0x070,0x068,0x060,0x058,0x050,0x048,0x040 + }; x = src[0]; curr_pri = (x & 0xf800) >> 11; @@ -738,7 +740,8 @@ if (input_code_pressed(screen->machine, KEYCODE_Z)) popmessage("%x-%x-%x:%04x %04x %04x", state->videoregs[0x10/2]&3,(state->videoregs[0x10/2] & 0xc) >> 2, (state->videoregs[0x10/2] & 0x30) >> 4, state->videoregs[0x02/2], state->videoregs[0x08/2], - *state->screenctrl);} + *state->screenctrl); +} #endif for (pri = 3; pri >= 0; pri--) diff --git a/src/mame/video/irobot.c b/src/mame/video/irobot.c index 4a9238f374d..fb6411a2b98 100644 --- a/src/mame/video/irobot.c +++ b/src/mame/video/irobot.c @@ -204,7 +204,7 @@ static void draw_line (UINT8 *polybitmap, int x1, int y1, int x2, int y2, int co { x1 += sx; cy += dy; - } + } } } } diff --git a/src/mame/video/kyugo.c b/src/mame/video/kyugo.c index 31ed1f47d44..d7a58f19d95 100644 --- a/src/mame/video/kyugo.c +++ b/src/mame/video/kyugo.c @@ -215,7 +215,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect color, flipx,flipy, sx,state->flipscreen ? sy - 16*y : sy + 16*y, 0 ); - } + } } } diff --git a/src/mame/video/ladyfrog.c b/src/mame/video/ladyfrog.c index bf8a6b5f3a6..75a524e7760 100644 --- a/src/mame/video/ladyfrog.c +++ b/src/mame/video/ladyfrog.c @@ -133,10 +133,9 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect pal, flipx,flipy, sx,sy,15); - } - } + } } - + } } static VIDEO_START( ladyfrog_common ) diff --git a/src/mame/video/leland.c b/src/mame/video/leland.c index d37fc4e9cff..b18924680af 100644 --- a/src/mame/video/leland.c +++ b/src/mame/video/leland.c @@ -206,7 +206,7 @@ static int leland_vram_port_r(const address_space *space, int offset, int num) logerror("%s:%s comm read %04X = %02X\n", cpuexec_describe_context(space->machine), num ? "slave" : "master", addr, ret); return ret; - } +} diff --git a/src/mame/video/lsasquad.c b/src/mame/video/lsasquad.c index 0359249d621..31f4a328bd3 100644 --- a/src/mame/video/lsasquad.c +++ b/src/mame/video/lsasquad.c @@ -119,19 +119,19 @@ static int draw_layer_daikaiju(running_machine *machine, bitmap_t *bitmap, const if((type==0 && color!=0x0d) || (type !=0 && color==0x0d)) - { - drawgfx_transpen(bitmap,cliprect,machine->gfx[0], + { + drawgfx_transpen(bitmap,cliprect,machine->gfx[0], code, color, flip_screen_get(machine),flip_screen_get(machine), sx,sy,15); - if (sx > 248) /* wraparound */ - drawgfx_transpen(bitmap,cliprect,machine->gfx[0], + if (sx > 248) /* wraparound */ + drawgfx_transpen(bitmap,cliprect,machine->gfx[0], code, color, flip_screen_get(machine),flip_screen_get(machine), sx-256,sy,15); - } + } } } return offs; diff --git a/src/mame/video/metro.c b/src/mame/video/metro.c index 3493e20db02..1ad3e621c3d 100644 --- a/src/mame/video/metro.c +++ b/src/mame/video/metro.c @@ -924,8 +924,10 @@ if (input_code_pressed(screen->machine, KEYCODE_Z)) if (input_code_pressed(screen->machine, KEYCODE_E)) msk |= 4; if (input_code_pressed(screen->machine, KEYCODE_A)) msk |= 8; if (msk != 0) - { bitmap_fill(bitmap,cliprect,0); - layers_ctrl &= msk; } + { + bitmap_fill(bitmap,cliprect,0); + layers_ctrl &= msk; + } popmessage("l %x-%x-%x r %04x %04x %04x", (metro_videoregs[0x10/2]&0x30)>>4,(metro_videoregs[0x10/2]&0xc)>>2,metro_videoregs[0x10/2]&3, diff --git a/src/mame/video/namcos22.c b/src/mame/video/namcos22.c index 220ee2f97aa..bf7de0ee420 100644 --- a/src/mame/video/namcos22.c +++ b/src/mame/video/namcos22.c @@ -920,7 +920,7 @@ static void RenderSprite(running_machine *machine, bitmap_t *bitmap, struct Scen node->data.sprite.pri ); i++; } /* next col */ - } /* next row */ + } /* next row */ } /* RenderSprite */ static void RenderSceneHelper(running_machine *machine, bitmap_t *bitmap, struct SceneNode *node ) @@ -1114,7 +1114,7 @@ PatchTexture( void ) default: break; - } + } } /* PatchTexture */ void diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c index 1bf7d6449bd..4ed1a2a80e2 100644 --- a/src/mame/video/nycaptor.c +++ b/src/mame/video/nycaptor.c @@ -151,17 +151,17 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta { int pr = nycaptor_spriteram[0x9f-i]; int offs = (pr & 0x1f) * 4; + int code,sx,sy,flipx,flipy,pal,priori; + + code = nycaptor_spriteram[offs+2] + ((nycaptor_spriteram[offs+1] & 0x10) << 4);//1 bit wolny = 0x20 + pal=nycaptor_spriteram[offs+1] & 0x0f; + sx = nycaptor_spriteram[offs+3]; + sy = 240-nycaptor_spriteram[offs+0]; + priori=(pr&0xe0)>>5; + if(priori==pri) { - int code,sx,sy,flipx,flipy,pal,priori; - code = nycaptor_spriteram[offs+2] + ((nycaptor_spriteram[offs+1] & 0x10) << 4);//1 bit wolny = 0x20 - pal=nycaptor_spriteram[offs+1] & 0x0f; - sx = nycaptor_spriteram[offs+3]; - sy = 240-nycaptor_spriteram[offs+0]; - priori=(pr&0xe0)>>5; - if(priori==pri) - { #if NYCAPTOR_DEBUG - if(nycaptor_mask&(1<<(pri+4)))pal=0xd; + if(nycaptor_mask&(1<<(pri+4)))pal=0xd; #endif flipx = ((nycaptor_spriteram[offs+1]&0x40)>>6); flipy = ((nycaptor_spriteram[offs+1]&0x80)>>7); diff --git a/src/mame/video/paradise.c b/src/mame/video/paradise.c index 40dd0be36a2..a0598321259 100644 --- a/src/mame/video/paradise.c +++ b/src/mame/video/paradise.c @@ -193,8 +193,11 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan int flipx = 0; // ? int flipy = 0; - if (flip_screen_get(machine)) { x = 0xf0 - x; flipx = !flipx; - y = 0xf0 - y; flipy = !flipy; } + if (flip_screen_get(machine)) + { + x = 0xf0 - x; flipx = !flipx; + y = 0xf0 - y; flipy = !flipy; + } drawgfx_transpen(bitmap,cliprect,machine->gfx[0], code + (attr << 8), diff --git a/src/mame/video/powerins.c b/src/mame/video/powerins.c index 5a40f6001db..0b7e28ddb6e 100644 --- a/src/mame/video/powerins.c +++ b/src/mame/video/powerins.c @@ -299,11 +299,15 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan /* Handle flip_screen. Apply a global offset of 32 pixels along x too */ if (flip_screen_get(machine)) - { sx = screen_w - sx - dimx*16 - 32; flipx = !flipx; + { + sx = screen_w - sx - dimx*16 - 32; flipx = !flipx; sy = screen_h - sy - dimy*16; flipy = !flipy; - code += dimx*dimy-1; inc = -1; } + code += dimx*dimy-1; inc = -1; + } else - { sx += 32; inc = +1; } + { + sx += 32; inc = +1; + } code = (code & 0x7fff) + ( (size & 0x0100) << 7 ); diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c index d4cd86310c8..3200671ddd7 100644 --- a/src/mame/video/realbrk.c +++ b/src/mame/video/realbrk.c @@ -504,12 +504,14 @@ VIDEO_UPDATE(realbrk) #ifdef MAME_DEBUG if ( input_code_pressed(screen->machine, KEYCODE_Z) ) -{ int msk = 0; +{ + int msk = 0; if (input_code_pressed(screen->machine, KEYCODE_Q)) msk |= 1; if (input_code_pressed(screen->machine, KEYCODE_W)) msk |= 2; if (input_code_pressed(screen->machine, KEYCODE_E)) msk |= 4; if (input_code_pressed(screen->machine, KEYCODE_A)) msk |= 8; - if (msk != 0) layers_ctrl &= msk; } + if (msk != 0) layers_ctrl &= msk; +} #endif if (disable_video) @@ -572,12 +574,14 @@ VIDEO_UPDATE(dai2kaku) #ifdef MAME_DEBUG if ( input_code_pressed(screen->machine, KEYCODE_Z) ) -{ int msk = 0; +{ + int msk = 0; if (input_code_pressed(screen->machine, KEYCODE_Q)) msk |= 1; if (input_code_pressed(screen->machine, KEYCODE_W)) msk |= 2; if (input_code_pressed(screen->machine, KEYCODE_E)) msk |= 4; if (input_code_pressed(screen->machine, KEYCODE_A)) msk |= 8; - if (msk != 0) layers_ctrl &= msk; } + if (msk != 0) layers_ctrl &= msk; +} #endif if (disable_video) diff --git a/src/mame/video/shootout.c b/src/mame/video/shootout.c index 4c0f60a5dfa..bca57cc77ba 100644 --- a/src/mame/video/shootout.c +++ b/src/mame/video/shootout.c @@ -149,7 +149,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta vx,vy, machine->priority_bitmap, priority_mask,0); - } + } } source -= 4; } diff --git a/src/mame/video/snes.c b/src/mame/video/snes.c index cc5be52fc5c..9b4ea2a7129 100644 --- a/src/mame/video/snes.c +++ b/src/mame/video/snes.c @@ -763,7 +763,7 @@ static void snes_update_objects( UINT8 screen, UINT8 priority_tbl, UINT16 curlin {0, 2, 3, 4}, // mode 7 {1, 3, 5, 6}, // mode 7 EXTBG {1, 2, 5, 8} // mode 1 + BG3 priority bit - }; + }; #ifdef MAME_DEBUG if( debug_options.bg_disabled[4] ) @@ -1565,8 +1565,8 @@ static UINT8 snes_dbg_video( running_machine *machine, bitmap_t *bitmap, UINT16 destline[ii] = machine->pens[pixdata]; } return 1; - } } + } #if 0 // 2009-08 FP: what was the purpose of these lines? /* Draw some useful information about the back/fixed colours and current bg mode etc. */ *BITMAP_ADDR32(bitmap, curline, SNES_DBG_HORZ_POS - 26) = machine->pens[dbg_mode_colours[(snes_ram[CGWSEL] & 0xc0) >> 6]]; @@ -1586,6 +1586,6 @@ static UINT8 snes_dbg_video( running_machine *machine, bitmap_t *bitmap, UINT16 scanlines[MAINSCREEN].buffer[snes_ram[WH3]] = machine->pens[dbg_mode_colours[2]]; #endif return 0; - } +} #endif /* MAME_DEBUG */ diff --git a/src/mame/video/st0016.c b/src/mame/video/st0016.c index 5eb9ca07ea9..65122144b29 100644 --- a/src/mame/video/st0016.c +++ b/src/mame/video/st0016.c @@ -578,8 +578,8 @@ static void draw_bgmap(running_machine *machine, bitmap_t *bitmap,const rectangl } } - } - i+=4; + } + i+=4; } } } diff --git a/src/mame/video/stvvdp2.c b/src/mame/video/stvvdp2.c index 1cb450c2ff0..dbc9183faf7 100644 --- a/src/mame/video/stvvdp2.c +++ b/src/mame/video/stvvdp2.c @@ -5803,8 +5803,10 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta UINT16 *bitmap_line, *bitmap_line2 = NULL; UINT8 interlace_framebuffer; UINT8 double_x; - static const UINT16 sprite_colormask_table[] = { 0x07ff, 0x07ff, 0x07ff, 0x07ff, 0x03ff, 0x07ff, 0x03ff, 0x01ff, - 0x007f, 0x003f, 0x003f, 0x003f, 0x0ff, 0x0ff, 0x0ff, 0x0ff }; + static const UINT16 sprite_colormask_table[] = { + 0x07ff, 0x07ff, 0x07ff, 0x07ff, 0x03ff, 0x07ff, 0x03ff, 0x01ff, + 0x007f, 0x003f, 0x003f, 0x003f, 0x00ff, 0x00ff, 0x00ff, 0x00ff + }; static const UINT16 priority_shift_table[] = { 14, 13, 14, 13, 13, 12, 12, 12, 7, 7, 6, 0, 7, 7, 6, 0 }; static const UINT16 priority_mask_table[] = { 3, 7, 1, 3, 3, 7, 7, 7, 1, 1, 3, 0, 1, 1, 3, 0 }; static const UINT16 ccrr_shift_table[] = { 11, 11, 11, 11, 10, 11, 10, 9, 0, 6, 0, 6, 0, 6, 0, 6 }; diff --git a/src/mame/video/suna8.c b/src/mame/video/suna8.c index 98f549e8454..fce643cb3c4 100644 --- a/src/mame/video/suna8.c +++ b/src/mame/video/suna8.c @@ -91,12 +91,16 @@ static TILE_GET_INFO( get_tile_info ) { UINT8 code, attr; if (input_code_pressed(screen->machine, KEYCODE_X)) - { UINT8 *rom = memory_region(machine, REGION_CPU1) + 0x10000 + 0x4000*rombank; + { + UINT8 *rom = memory_region(machine, REGION_CPU1) + 0x10000 + 0x4000*rombank; code = rom[ 2 * tile_index + 0 ]; - attr = rom[ 2 * tile_index + 1 ]; } + attr = rom[ 2 * tile_index + 1 ]; + } else - { code = machine->generic.spriteram.u8[ 2 * tile_index + 0 ]; - attr = machine->generic.spriteram.u8[ 2 * tile_index + 1 ]; } + { + code = machine->generic.spriteram.u8[ 2 * tile_index + 0 ]; + attr = machine->generic.spriteram.u8[ 2 * tile_index + 1 ]; + } SET_TILE_INFO( 0, ( (attr & 0x03) << 8 ) + code + tiles*0x400, @@ -312,8 +316,10 @@ static void draw_normal_sprites(running_machine *machine, bitmap_t *bitmap,const if (flipy) tile_flipy = !tile_flipy; if (flip_screen_get(machine)) - { sx = max_x - sx; tile_flipx = !tile_flipx; - sy = max_y - sy; tile_flipy = !tile_flipy; } + { + sx = max_x - sx; tile_flipx = !tile_flipx; + sy = max_y - sy; tile_flipy = !tile_flipy; + } drawgfx_transpen( bitmap,cliprect,machine->gfx[0], tile + (attr & 0x3)*0x100 + gfxbank, @@ -377,8 +383,10 @@ static void draw_text_sprites(running_machine *machine, bitmap_t *bitmap,const r int sy = (y + real_ty * 8) & 0xff; if (flip_screen_get(machine)) - { sx = max_x - sx; flipx = !flipx; - sy = max_y - sy; flipy = !flipy; } + { + sx = max_x - sx; flipx = !flipx; + sy = max_y - sy; flipy = !flipy; + } drawgfx_transpen( bitmap,cliprect,machine->gfx[0], tile + (attr & 0x3)*0x100 + bank, diff --git a/src/mame/video/suprnova.c b/src/mame/video/suprnova.c index 8dd8cb1d545..7d875fec5b2 100644 --- a/src/mame/video/suprnova.c +++ b/src/mame/video/suprnova.c @@ -830,9 +830,9 @@ void skns_draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectang } } } - }//End PriTest + }//End PriTest - source+=4; + source+=4; } } } diff --git a/src/mame/video/thunderj.c b/src/mame/video/thunderj.c index 632a6b101e0..f9fee44ab37 100644 --- a/src/mame/video/thunderj.c +++ b/src/mame/video/thunderj.c @@ -136,7 +136,7 @@ void thunderj_mark_high_palette(bitmap_t *bitmap, UINT16 *pf, UINT16 *mo, int x, break; offnext = ((mo[x] & END_MARKER) == END_MARKER); } - } +} diff --git a/src/mame/video/tsamurai.c b/src/mame/video/tsamurai.c index ae64ab89108..6587c78d408 100644 --- a/src/mame/video/tsamurai.c +++ b/src/mame/video/tsamurai.c @@ -268,7 +268,7 @@ VIDEO_UPDATE( vsgongf ) k++; vsgongf_color = k; tilemap_mark_all_tiles_dirty( foreground ); - } + } } #endif diff --git a/src/mame/video/vdc.c b/src/mame/video/vdc.c index 77891d50ae1..07e2f185d68 100644 --- a/src/mame/video/vdc.c +++ b/src/mame/video/vdc.c @@ -897,7 +897,7 @@ static void pce_refresh_sprites(running_machine *machine, int which, int line, U if(((obj_x + x) < (vdc[which].physical_width)) && ((obj_x + x) >= 0)) { if ( buf[x] ) - { + { if( drawn[pixel_x] < 2 ) { if( priority || drawn[pixel_x] == 0 ) @@ -1024,7 +1024,7 @@ static void pce_refresh_sprites(running_machine *machine, int which, int line, U } /* Check for sprite #0 collision */ else if ( drawn[pixel_x] == 2 ) - { + { if(vdc[which].vdc_data[CR].w & CR_CC) cputag_set_input_line(machine, "maincpu", 0, ASSERT_LINE); vdc[which].status |= VDC_CR; diff --git a/src/mame/video/wwfwfest.c b/src/mame/video/wwfwfest.c index 03349e435cc..214ad17abce 100644 --- a/src/mame/video/wwfwfest.c +++ b/src/mame/video/wwfwfest.c @@ -205,7 +205,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta drawgfx_transpen(bitmap,cliprect,gfx,number+count,colourbank,flipx,flipy,xpos,ypos+16*count,0); } } else { - if (flipy) { + if (flipy) { drawgfx_transpen(bitmap,cliprect,gfx,number+count,colourbank,flipx,flipy,xpos,ypos-(16*(chain-1))+(16*count),0); } else { drawgfx_transpen(bitmap,cliprect,gfx,number+count,colourbank,flipx,flipy,xpos,ypos-16*count,0); diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c index 2d738a59363..dac410409ac 100644 --- a/src/mame/video/ygv608.c +++ b/src/mame/video/ygv608.c @@ -360,26 +360,26 @@ static TILE_GET_INFO( get_tile_info_A_16 ) j = 0; } - if ((ygv608.regs.s.r12 & r12_apf) != 0) - { - // attribute only valid in 16 color mode - if( set == GFX_16X16_4BIT ) - attr = ( j >> ( ((ygv608.regs.s.r12 & r12_apf)) * 2 ) ) & 0x0f; - } + if ((ygv608.regs.s.r12 & r12_apf) != 0) + { + // attribute only valid in 16 color mode + if( set == GFX_16X16_4BIT ) + attr = ( j >> ( ((ygv608.regs.s.r12 & r12_apf)) * 2 ) ) & 0x0f; + } - // banking - if (set == GFX_16X16_4BIT) - { - j += namcond1_gfxbank * 0x4000; - } - else // 8x8x8 - { - j += namcond1_gfxbank * 0x2000; - } + // banking + if (set == GFX_16X16_4BIT) + { + j += namcond1_gfxbank * 0x4000; + } + else // 8x8x8 + { + j += namcond1_gfxbank * 0x2000; + } - SET_TILE_INFO( set, j, attr, f ); - } + SET_TILE_INFO( set, j, attr, f ); + } } static TILE_GET_INFO( get_tile_info_B_16 ) @@ -450,27 +450,26 @@ static TILE_GET_INFO( get_tile_info_B_16 ) j = 0; } - if ((ygv608.regs.s.r12 & r12_bpf) != 0) - { - UINT8 color = (ygv608.regs.s.r12 & r12_bpf) >> 3; - - /* assume 16 colour mode for now... */ - attr = ( j >> (color * 2)) & 0x0f; - } + if ((ygv608.regs.s.r12 & r12_bpf) != 0) + { + UINT8 color = (ygv608.regs.s.r12 & r12_bpf) >> 3; - // banking - if (set == GFX_16X16_4BIT) - { - j += namcond1_gfxbank * 0x4000; - } - else // 8x8x8 - { - j += namcond1_gfxbank * 0x2000; - } + /* assume 16 colour mode for now... */ + attr = ( j >> (color * 2)) & 0x0f; + } + // banking + if (set == GFX_16X16_4BIT) + { + j += namcond1_gfxbank * 0x4000; + } + else // 8x8x8 + { + j += namcond1_gfxbank * 0x2000; + } - SET_TILE_INFO( set, j, attr, f ); - } + SET_TILE_INFO( set, j, attr, f ); + } } static STATE_POSTLOAD( ygv608_postload ) @@ -711,10 +710,12 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } #ifdef _SHOW_VIDEO_DEBUG -static const char *const mode[] = { "2PLANE_8BIT", - "2PLANE_16BIT", - "1PLANE_16COLORS", - "1PLANE_256COLORS" }; +static const char *const mode[] = { + "2PLANE_8BIT", + "2PLANE_16BIT", + "1PLANE_16COLORS", + "1PLANE_256COLORS" +}; static const char *const psize[] = { "8x8", "16x16", "32x32", "64x64" }; #endif @@ -1405,45 +1406,45 @@ static void SetPreShortcuts( int reg, int data ) static void SetPostShortcuts( running_machine *machine, int reg ) { - int plane, addr; - - switch (reg) - { - case 0: - { - UINT8 yTile = ygv608.regs.s.r0 & r0_pny; + int plane, addr; - if (yTile >= ygv608.page_y) - logerror ("%s:setting pny(%d) >= page_y(%d)\n", cpuexec_describe_context(machine), - yTile, ygv608.page_y ); - yTile &= (ygv608.page_y - 1); - ygv608.regs.s.r0 &= ~r0_pny; - ygv608.regs.s.r0 |= yTile; - } - break; - - case 1: - { - UINT8 xTile = ygv608.regs.s.r1 & r1_pnx; + switch (reg) + { + case 0: + { + UINT8 yTile = ygv608.regs.s.r0 & r0_pny; + + if (yTile >= ygv608.page_y) + logerror ("%s:setting pny(%d) >= page_y(%d)\n", cpuexec_describe_context(machine), + yTile, ygv608.page_y ); + yTile &= (ygv608.page_y - 1); + ygv608.regs.s.r0 &= ~r0_pny; + ygv608.regs.s.r0 |= yTile; + } + break; - if (xTile >= ygv608.page_x) - logerror ("%s:setting pnx(%d) >= page_x(%d)\n", cpuexec_describe_context(machine), - xTile, ygv608.page_x ); - xTile &= (ygv608.page_x - 1); - ygv608.regs.s.r1 &= ~r1_pnx; - ygv608.regs.s.r1 |= xTile; - } - break; + case 1: + { + UINT8 xTile = ygv608.regs.s.r1 & r1_pnx; + + if (xTile >= ygv608.page_x) + logerror ("%s:setting pnx(%d) >= page_x(%d)\n", cpuexec_describe_context(machine), + xTile, ygv608.page_x ); + xTile &= (ygv608.page_x - 1); + ygv608.regs.s.r1 &= ~r1_pnx; + ygv608.regs.s.r1 |= xTile; + } + break; - case 6: + case 6: #if 0 - logerror( "SBA = $%08X\n", (int)ygv608.regs.s.sba << 13 ); + logerror( "SBA = $%08X\n", (int)ygv608.regs.s.sba << 13 ); #endif - break; + break; - case 7: - ygv608.na8_mask = ((ygv608.regs.s.r7 & r7_flip) ? 0x03 : 0x0f ); - /* fall thru */ + case 7: + ygv608.na8_mask = ((ygv608.regs.s.r7 & r7_flip) ? 0x03 : 0x0f ); + /* fall thru */ case 8 : ygv608.bits16 = ((ygv608.regs.s.r7 & r7_md) == MD_2PLANE_8BIT ? 0 : 1 ); @@ -1451,12 +1452,12 @@ static void SetPostShortcuts( running_machine *machine, int reg ) ygv608.page_x = ygv608.page_y = 32; else { if ((ygv608.regs.s.r8 & r8_pgs) == 0 ) { - ygv608.page_x = 64; - ygv608.page_y = 32; + ygv608.page_x = 64; + ygv608.page_y = 32; } else { - ygv608.page_x = 32; - ygv608.page_y = 64; + ygv608.page_x = 32; + ygv608.page_y = 64; } } ygv608.pny_shift = ( ygv608.page_x == 32 ? 5 : 6 ); diff --git a/src/tools/romcmp.c b/src/tools/romcmp.c index ea6da159be8..ebf6f5abfa9 100644 --- a/src/tools/romcmp.c +++ b/src/tools/romcmp.c @@ -38,13 +38,17 @@ /* O1 = Odd bytes 1st half */ /* E2 = Even bytes 2nd half */ /* O2 = Odd bytes 2nd half */ -enum { MODE_A, - MODE_NIB1,MODE_NIB2, - MODE_12, MODE_22, - MODE_14, MODE_24, MODE_34, MODE_44, - MODE_E, MODE_O, - MODE_E12, MODE_O12, MODE_E22, MODE_O22, - TOTAL_MODES }; +enum +{ + MODE_A, + MODE_NIB1,MODE_NIB2, + MODE_12, MODE_22, + MODE_14, MODE_24, MODE_34, MODE_44, + MODE_E, MODE_O, + MODE_E12, MODE_O12, MODE_E22, MODE_O22, + TOTAL_MODES +}; + static const char *const modenames[] = { " ", |