diff options
author | 2008-12-15 01:46:32 +0000 | |
---|---|---|
committer | 2008-12-15 01:46:32 +0000 | |
commit | 54db8f077b03a1342dc589c65a8f33da142eb262 (patch) | |
tree | 599314f3eaba377886a17e85539526c59efe2e12 | |
parent | f65131343d3e3147d5bed92437ac6300c6eee4b4 (diff) |
Cleanups and version bump.
61 files changed, 268 insertions, 268 deletions
diff --git a/src/emu/attotime.h b/src/emu/attotime.h index 912d2a2a138..a7ecd5ab593 100644 --- a/src/emu/attotime.h +++ b/src/emu/attotime.h @@ -244,7 +244,7 @@ INLINE attotime ticks_to_attotime(UINT64 ticks, UINT32 frequency) { attoseconds_t attos_per_tick = HZ_TO_ATTOSECONDS(frequency); attotime result; - + if (ticks < frequency) { result.seconds = 0; diff --git a/src/emu/cpu/apexc/apexc.c b/src/emu/cpu/apexc/apexc.c index 4800a5c5a9c..0931e288b36 100644 --- a/src/emu/cpu/apexc/apexc.c +++ b/src/emu/cpu/apexc/apexc.c @@ -868,7 +868,7 @@ static CPU_SET_INFO( apexc ) CPU_GET_INFO( apexc ) { apexc_state *cpustate = (device != NULL) ? device->token : NULL; - + switch (state) { case CPUINFO_INT_CONTEXT_SIZE: info->i = sizeof(apexc_state); break; diff --git a/src/emu/cpu/dsp32/dsp32.c b/src/emu/cpu/dsp32/dsp32.c index d8729de9c00..e72ab4427a5 100644 --- a/src/emu/cpu/dsp32/dsp32.c +++ b/src/emu/cpu/dsp32/dsp32.c @@ -368,7 +368,7 @@ static CPU_EXECUTE( dsp32c ) cpustate->abufcycle[1] += cpustate->icount; cpustate->abufcycle[2] += cpustate->icount; cpustate->abufcycle[3] += cpustate->icount; - + /* handle interrupts */ check_irqs(cpustate); diff --git a/src/emu/cpu/dsp32/dsp32ops.c b/src/emu/cpu/dsp32/dsp32ops.c index 2d0f5c2b056..233b4aab0ef 100644 --- a/src/emu/cpu/dsp32/dsp32ops.c +++ b/src/emu/cpu/dsp32/dsp32ops.c @@ -130,7 +130,7 @@ static void unimplemented(dsp32_state *cpustate, UINT32 op) INLINE void execute_one(dsp32_state *cpustate) { UINT32 op; - + PROCESS_DEFERRED_MEMORY(cpustate); debugger_instruction_hook(cpustate->device, cpustate->PC); op = ROPCODE(cpustate, cpustate->PC); diff --git a/src/emu/cpu/dsp56k/dsp56def.h b/src/emu/cpu/dsp56k/dsp56def.h index f3552449482..43f2cc922c9 100644 --- a/src/emu/cpu/dsp56k/dsp56def.h +++ b/src/emu/cpu/dsp56k/dsp56def.h @@ -3,7 +3,7 @@ /////////////////////////////////////////// /*************************************************************************** - CURRENT CPU + CURRENT CPU ***************************************************************************/ //TODO: Just an idea. //#define CCPU cpustate diff --git a/src/emu/cpu/i8085/i8085.c b/src/emu/cpu/i8085/i8085.c index af731aadfd2..f95193510db 100644 --- a/src/emu/cpu/i8085/i8085.c +++ b/src/emu/cpu/i8085/i8085.c @@ -1268,7 +1268,7 @@ static void Interrupt(i8085_state *cpustate) static CPU_EXECUTE( i8085 ) { i8085_state *cpustate = device->token; - + cpustate->icount = cycles; do { diff --git a/src/emu/cpu/konami/konami.c b/src/emu/cpu/konami/konami.c index d2d7682c714..b3e21fea8c3 100644 --- a/src/emu/cpu/konami/konami.c +++ b/src/emu/cpu/konami/konami.c @@ -356,7 +356,7 @@ static void check_irq_lines(konami_state *cpustate) PCD = RM16(cpustate, 0xfff6); (void)(*cpustate->irq_callback)(cpustate->device, KONAMI_FIRQ_LINE); } - + else if (cpustate->irq_state[KONAMI_IRQ_LINE] != CLEAR_LINE && !(CC & CC_II)) { /* standard IRQ */ @@ -377,7 +377,7 @@ static void check_irq_lines(konami_state *cpustate) PUSHBYTE(cpustate, B); PUSHBYTE(cpustate, A); PUSHBYTE(cpustate, CC); - cpustate->icount -= 19; + cpustate->icount -= 19; } CC |= CC_II; /* inhibit IRQ */ PCD = RM16(cpustate, 0xfff8); @@ -392,7 +392,7 @@ static void check_irq_lines(konami_state *cpustate) static CPU_INIT( konami ) { konami_state *cpustate = device->token; - + cpustate->irq_callback = irqcallback; cpustate->device = device; cpustate->program = memory_find_address_space(device, ADDRESS_SPACE_PROGRAM); @@ -442,7 +442,7 @@ static void set_irq_line(konami_state *cpustate, int irqline, int state) { if (state != CLEAR_LINE) cpustate->int_state &= ~KONAMI_SYNC; - + if (irqline == INPUT_LINE_NMI) { if (cpustate->nmi_state == CLEAR_LINE && state != CLEAR_LINE) @@ -476,7 +476,7 @@ static CPU_EXECUTE( konami ) do { UINT8 ireg; - + pPPC = pPC; debugger_instruction_hook(device, PCD); diff --git a/src/emu/cpu/lh5801/lh5801.c b/src/emu/cpu/lh5801/lh5801.c index 92e2b010859..b36f27a9326 100644 --- a/src/emu/cpu/lh5801/lh5801.c +++ b/src/emu/cpu/lh5801/lh5801.c @@ -93,7 +93,7 @@ struct _lh5810_state static CPU_INIT( lh5801 ) { lh5801_state *cpustate = device->token; - + memset(cpustate, 0, sizeof(*cpustate)); cpustate->config = (const lh5801_cpu_core *) device->static_config; cpustate->device = device; diff --git a/src/emu/cpu/lr35902/lr35902.c b/src/emu/cpu/lr35902/lr35902.c index d2e62158e9a..647897601f1 100644 --- a/src/emu/cpu/lr35902/lr35902.c +++ b/src/emu/cpu/lr35902/lr35902.c @@ -181,7 +181,7 @@ static const int CyclesCB[256] = static CPU_INIT( lr35902 ) { lr35902_state *cpustate = device->token; - + cpustate->w.config = (const lr35902_cpu_core *) device->static_config; cpustate->w.irq_callback = irqcallback; cpustate->w.device = device; @@ -196,7 +196,7 @@ static CPU_INIT( lr35902 ) static CPU_RESET( lr35902 ) { lr35902_state *cpustate = device->token; - + cpustate->w.AF = 0x0000; cpustate->w.BC = 0x0000; cpustate->w.DE = 0x0000; @@ -301,7 +301,7 @@ INLINE void lr35902_ProcessInterrupts (lr35902_state *cpustate) static CPU_EXECUTE( lr35902 ) { lr35902_state *cpustate = device->token; - + cpustate->w.icount = cycles; do @@ -337,7 +337,7 @@ static CPU_EXECUTE( lr35902 ) static CPU_BURN( lr35902 ) { lr35902_state *cpustate = device->token; - + if( cycles > 0 ) { /* NOP takes 4 cycles per instruction */ @@ -379,7 +379,7 @@ static void lr35902_clear_pending_interrupts (lr35902_state *cpustate) static CPU_SET_INFO( lr35902 ) { lr35902_state *cpustate = device->token; - + switch (state) { /* --- the following bits of info are set as 64-bit signed integers --- */ @@ -407,7 +407,7 @@ static CPU_SET_INFO( lr35902 ) CPU_GET_INFO( lr35902 ) { lr35902_state *cpustate = (device != NULL) ? device->token : NULL; - + switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ diff --git a/src/emu/cpu/mb86233/mb86233.c b/src/emu/cpu/mb86233/mb86233.c index 10d847fd7df..4a12ea8dd3a 100644 --- a/src/emu/cpu/mb86233/mb86233.c +++ b/src/emu/cpu/mb86233/mb86233.c @@ -950,7 +950,7 @@ static UINT32 INDIRECT( mb86233_state *cpustate, UINT32 reg, int source ) static CPU_EXECUTE( mb86233 ) { mb86233_state *cpustate = device->token; - + cpustate->icount = cycles; while( cpustate->icount > 0 ) @@ -1590,7 +1590,7 @@ static CPU_DISASSEMBLE( mb86233 ) static CPU_SET_INFO( mb86233 ) { mb86233_state *cpustate = device->token; - + switch (state) { case CPUINFO_INT_PC: @@ -1631,7 +1631,7 @@ static CPU_SET_INFO( mb86233 ) CPU_GET_INFO( mb86233 ) { mb86233_state *cpustate = (device != NULL) ? device->token : NULL; - + switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ diff --git a/src/emu/cpu/mb88xx/mb88xx.c b/src/emu/cpu/mb88xx/mb88xx.c index e0b15ba3f36..3c9e20d0108 100644 --- a/src/emu/cpu/mb88xx/mb88xx.c +++ b/src/emu/cpu/mb88xx/mb88xx.c @@ -100,7 +100,7 @@ struct _mb88_state static CPU_INIT( mb88 ) { mb88_state *cpustate = device->token; - + if ( device->static_config ) { const mb88_cpu_core *_config = (const mb88_cpu_core*)device->static_config; diff --git a/src/emu/cpu/mc68hc11/mc68hc11.c b/src/emu/cpu/mc68hc11/mc68hc11.c index f6b676d3e0a..cac33fbb860 100644 --- a/src/emu/cpu/mc68hc11/mc68hc11.c +++ b/src/emu/cpu/mc68hc11/mc68hc11.c @@ -371,7 +371,7 @@ static CPU_EXIT( hc11 ) static CPU_EXECUTE( hc11 ) { hc11_state *cpustate = device->token; - + cpustate->icount = cycles; while(cpustate->icount > 0) diff --git a/src/emu/cpu/nec/nec.c b/src/emu/cpu/nec/nec.c index ca85cf974aa..91a420e6f7a 100644 --- a/src/emu/cpu/nec/nec.c +++ b/src/emu/cpu/nec/nec.c @@ -1241,10 +1241,10 @@ static CPU_INIT( v33 ) nec_init(device, index, clock, irqcallback, 2); nec_state->chip_type=V33; - nec_state->prefetch_size = 6; + nec_state->prefetch_size = 6; /* FIXME: Need information about prefetch size and cycles for V33. - * complete guess below, nbbatman will not work - * properly without. */ + * complete guess below, nbbatman will not work + * properly without. */ nec_state->prefetch_cycles = 1; /* two cycles per byte / four per word */ configure_memory_16bit(nec_state); diff --git a/src/emu/cpu/powerpc/ppcdrc.c b/src/emu/cpu/powerpc/ppcdrc.c index a7fe35c72c9..eaedfaa899b 100644 --- a/src/emu/cpu/powerpc/ppcdrc.c +++ b/src/emu/cpu/powerpc/ppcdrc.c @@ -2969,7 +2969,7 @@ static int generate_instruction_1f(powerpc_state *ppc, drcuml_block *block, comp case 0x028: /* SUBFx */ case 0x228: /* SUBFOx */ UML_SUB(block, R32(G_RD(op)), R32(G_RB(op)), R32(G_RA(op))); // sub rd,rb,ra - generate_compute_flags(ppc, block, desc, op & M_RC, (op & M_OE) ? XER_OV : 0, TRUE); + generate_compute_flags(ppc, block, desc, op & M_RC, (op & M_OE) ? XER_OV : 0, TRUE); // <update flags> return TRUE; @@ -3010,7 +3010,7 @@ static int generate_instruction_1f(powerpc_state *ppc, drcuml_block *block, comp case 0x068: /* NEGx */ case 0x268: /* NEGOx */ UML_SUB(block, R32(G_RD(op)), IMM(0), R32(G_RA(op))); // sub rd,0,ra - generate_compute_flags(ppc, block, desc, op & M_RC, (op & M_OE) ? XER_OV : 0, TRUE); + generate_compute_flags(ppc, block, desc, op & M_RC, (op & M_OE) ? XER_OV : 0, TRUE); // <update flags> return TRUE; diff --git a/src/emu/cpu/saturn/saturn.c b/src/emu/cpu/saturn/saturn.c index cbad90404e7..48b0a2eb358 100644 --- a/src/emu/cpu/saturn/saturn.c +++ b/src/emu/cpu/saturn/saturn.c @@ -102,7 +102,7 @@ struct _saturn_state static CPU_INIT( saturn ) { saturn_state *cpustate = device->token; - + cpustate->config = (saturn_cpu_core *) device->static_config; cpustate->irq_callback = irqcallback; cpustate->device = device; @@ -136,7 +136,7 @@ static CPU_INIT( saturn ) static CPU_RESET( saturn ) { saturn_state *cpustate = device->token; - + cpustate->pc=0; cpustate->sleeping = 0; cpustate->irq_enable = 0; @@ -160,7 +160,7 @@ INLINE void saturn_take_irq(saturn_state *cpustate) static CPU_EXECUTE( saturn ) { saturn_state *cpustate = device->token; - + cpustate->icount = cycles; do @@ -239,7 +239,7 @@ static void IntReg64(Saturn64 r, INT64 d) static CPU_SET_INFO( saturn ) { saturn_state *cpustate = device->token; - + switch (state) { /* --- the following bits of info are set as 64-bit signed integers --- */ @@ -296,7 +296,7 @@ static INT64 Reg64Int(Saturn64 r) CPU_GET_INFO( saturn ) { saturn_state *cpustate = (device != NULL) ? device->token : NULL; - + switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ diff --git a/src/emu/cpu/sc61860/sc61860.c b/src/emu/cpu/sc61860/sc61860.c index 74cef3d3d93..0e9080cf3ee 100644 --- a/src/emu/cpu/sc61860/sc61860.c +++ b/src/emu/cpu/sc61860/sc61860.c @@ -62,7 +62,7 @@ struct _sc61860_state UINT8 *sc61860_internal_ram(const device_config *device) { sc61860_state *cpustate = device->token; - return cpustate->ram; + return cpustate->ram; } static TIMER_CALLBACK(sc61860_2ms_tick) diff --git a/src/emu/cpu/sh2/sh2drc.c b/src/emu/cpu/sh2/sh2drc.c index 769fd2e531a..8d51cd8fbcf 100644 --- a/src/emu/cpu/sh2/sh2drc.c +++ b/src/emu/cpu/sh2/sh2drc.c @@ -846,7 +846,7 @@ static CPU_RESET( sh1 ) static void code_flush_cache(SH2 *sh2) { drcuml_state *drcuml = sh2->drcuml; - + /* empty the transient cache contents */ drcuml_reset(drcuml); diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c index f41fa311868..8e9235e0d77 100644 --- a/src/emu/cpu/sh4/sh4.c +++ b/src/emu/cpu/sh4/sh4.c @@ -3628,7 +3628,7 @@ ADDRESS_MAP_END CPU_GET_INFO( sh4 ) { SH4 *sh4 = (device != NULL) ? device->token : NULL; - + switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ diff --git a/src/emu/cpu/sharc/sharc.c b/src/emu/cpu/sharc/sharc.c index 92f45e7ed5a..7406fb4e9fa 100644 --- a/src/emu/cpu/sharc/sharc.c +++ b/src/emu/cpu/sharc/sharc.c @@ -674,7 +674,7 @@ static void check_interrupts(SHARC_REGS *cpustate) static CPU_EXECUTE( sharc ) { - SHARC_REGS *cpustate = device->token; + SHARC_REGS *cpustate = device->token; cpustate->icount = cycles; if (cpustate->idle && cpustate->irq_active == 0) diff --git a/src/emu/cpu/tms32010/tms32010.c b/src/emu/cpu/tms32010/tms32010.c index 77465a9a222..9d900e9c954 100644 --- a/src/emu/cpu/tms32010/tms32010.c +++ b/src/emu/cpu/tms32010/tms32010.c @@ -705,7 +705,7 @@ static const tms32010_opcode_7F opcode_7F[32]= static CPU_INIT( tms32010 ) { tms32010_state *cpustate = device->token; - + state_save_register_device_item(device, 0, cpustate->PC); state_save_register_device_item(device, 0, cpustate->PREVPC); state_save_register_device_item(device, 0, cpustate->STR); diff --git a/src/emu/cpu/tms32025/tms32025.c b/src/emu/cpu/tms32025/tms32025.c index fb952058c90..0b0294549c9 100644 --- a/src/emu/cpu/tms32025/tms32025.c +++ b/src/emu/cpu/tms32025/tms32025.c @@ -1484,15 +1484,15 @@ static void subb(tms32025_state *cpustate) static void subc(tms32025_state *cpustate) { /** - * conditional subtraction, which may be used for division - * execute 16 times for 16-bit division - * - * input: 32 bit numerator in accumulator - * 16 bit denominator in data memory - * - * output: remainder in upper 16 bits - * quotient in lower 16 bits - */ + * conditional subtraction, which may be used for division + * execute 16 times for 16-bit division + * + * input: 32 bit numerator in accumulator + * 16 bit denominator in data memory + * + * output: remainder in upper 16 bits + * quotient in lower 16 bits + */ GETDATA(cpustate, 15, SXM); if( cpustate->ACC.d >= cpustate->ALU.d ) { cpustate->ACC.d = (cpustate->ACC.d - cpustate->ALU.d)*2+1; @@ -1504,10 +1504,10 @@ static void subc(tms32025_state *cpustate) // System22 games - for example, the score display in Prop Cycle. // cpustate->ACC.d = ((INT32)cpustate->oldacc.d < 0) ? 0x80000000 : 0x7fffffff; -// if ((INT32)((cpustate->oldacc.d ^ subval ) & (cpustate->oldacc.d ^ cpustate->ALU.d)) < 0) { -// SET0(cpustate, OV_FLAG); -// } -// CALCULATE_SUB_CARRY(cpustate); +// if ((INT32)((cpustate->oldacc.d ^ subval ) & (cpustate->oldacc.d ^ cpustate->ALU.d)) < 0) { +// SET0(cpustate, OV_FLAG); +// } +// CALCULATE_SUB_CARRY(cpustate); } static void subh(tms32025_state *cpustate) @@ -1750,7 +1750,7 @@ static CPU_INIT( tms32025 ) state_save_register_device_item(device, 0, cpustate->init_load_addr); state_save_register_device_item(device, 0, cpustate->PREVPC); -// state_save_register_device_item_pointer(device, 0, cpustate->intRAM, 0x800*2); +// state_save_register_device_item_pointer(device, 0, cpustate->intRAM, 0x800*2); } /**************************************************************************** @@ -1874,7 +1874,7 @@ static int process_IRQs(tms32025_state *cpustate) return cpustate->tms32025_irq_cycles; } if ((cpustate->IFR & 0x08) && (IMR & 0x08)) { /* Timer IRQ (internal) */ -// logerror("TMS32025: Active TINT (Timer)\n"); +// logerror("TMS32025: Active TINT (Timer)\n"); SET_PC(0x0018); cpustate->idle = 0; cpustate->IFR &= (~0x08); @@ -1882,7 +1882,7 @@ static int process_IRQs(tms32025_state *cpustate) return cpustate->tms32025_irq_cycles; } if ((cpustate->IFR & 0x10) && (IMR & 0x10)) { /* Serial port receive IRQ (internal) */ -// logerror("TMS32025: Active RINT (Serial recieve)\n"); +// logerror("TMS32025: Active RINT (Serial recieve)\n"); DRR = S_IN(TMS32025_DR); SET_PC(0x001A); cpustate->idle = 0; @@ -1891,7 +1891,7 @@ static int process_IRQs(tms32025_state *cpustate) return cpustate->tms32025_irq_cycles; } if ((cpustate->IFR & 0x20) && (IMR & 0x20)) { /* Serial port transmit IRQ (internal) */ -// logerror("TMS32025: Active XINT (Serial transmit)\n"); +// logerror("TMS32025: Active XINT (Serial transmit)\n"); S_OUT(TMS32025_DX,DXR); SET_PC(0x001C); cpustate->idle = 0; @@ -2091,7 +2091,7 @@ static void set_irq_line(tms32025_state *cpustate, int irqline, int state) if (state != CLEAR_LINE) { cpustate->IFR |= (1 << irqline); -// cpustate->IFR &= 0x07; +// cpustate->IFR &= 0x07; } } diff --git a/src/emu/cpu/tms32051/tms32051.c b/src/emu/cpu/tms32051/tms32051.c index e0731b8e88b..0f18dd860d1 100644 --- a/src/emu/cpu/tms32051/tms32051.c +++ b/src/emu/cpu/tms32051/tms32051.c @@ -329,7 +329,7 @@ static CPU_EXIT( tms ) static CPU_EXECUTE( tms ) { tms32051_state *cpustate = device->token; - + cpustate->icount = cycles; while(cpustate->icount > 0) @@ -397,7 +397,7 @@ static CPU_EXECUTE( tms ) static READ16_HANDLER( cpuregs_r ) { tms32051_state *cpustate = space->cpu->token; - + switch (offset) { case 0x04: return cpustate->imr; diff --git a/src/emu/cpu/tms7000/tms7000.c b/src/emu/cpu/tms7000/tms7000.c index 6763b5eedad..9e6ae89cad2 100644 --- a/src/emu/cpu/tms7000/tms7000.c +++ b/src/emu/cpu/tms7000/tms7000.c @@ -154,7 +154,7 @@ INLINE void WRF16( tms7000_state *cpustate, UINT32 mAddr, PAIR p ) /*Write regis static CPU_INIT( tms7000 ) { tms7000_state *cpustate = device->token; - + cpustate->irq_callback = irqcallback; cpustate->device = device; cpustate->program = memory_find_address_space(device, ADDRESS_SPACE_PROGRAM); diff --git a/src/emu/cpu/tms9900/99xxcore.h b/src/emu/cpu/tms9900/99xxcore.h index fd3ee021492..256e13b9ba2 100644 --- a/src/emu/cpu/tms9900/99xxcore.h +++ b/src/emu/cpu/tms9900/99xxcore.h @@ -1777,7 +1777,7 @@ static void tms99xx_set_irq_line(tms99xx_state *cpustate, int irqline, int state static TIMER_CALLBACK( decrementer_callback ) { tms99xx_state *cpustate = ptr; - + /* request decrementer interrupt */ cpustate->int_latch |= 0x8; cpustate->flag |= 0x8; diff --git a/src/emu/cpu/upd7810/upd7810.c b/src/emu/cpu/upd7810/upd7810.c index a4da59d8821..f7e14ded912 100644 --- a/src/emu/cpu/upd7810/upd7810.c +++ b/src/emu/cpu/upd7810/upd7810.c @@ -1622,7 +1622,7 @@ static void upd78c05_timers(upd7810_state *cpustate, int cycles) static CPU_INIT( upd7810 ) { upd7810_state *cpustate = device->token; - + cpustate->config = *(const UPD7810_CONFIG*) device->static_config; cpustate->irq_callback = irqcallback; cpustate->device = device; diff --git a/src/emu/cpu/v60/v60.c b/src/emu/cpu/v60/v60.c index babda6d6a81..4e677619998 100644 --- a/src/emu/cpu/v60/v60.c +++ b/src/emu/cpu/v60/v60.c @@ -69,7 +69,7 @@ struct _v60_flags // v60 Register Inside (Hm... It's not a pentium inside :-))) ) typedef struct _v60_state v60_state; -struct _v60_state +struct _v60_state { struct cpu_info info; UINT32 reg[68]; @@ -345,7 +345,7 @@ static void base_init(const device_config *device, cpu_irq_callback irqcallback) static CPU_INIT( v60 ) { v60_state *cpustate = device->token; - + base_init(device, irqcallback); // Set cpustate->PIR (Processor ID) for NEC cpustate-> LSB is reserved to NEC, // so I don't know what it contains. diff --git a/src/emu/cpu/v810/v810.c b/src/emu/cpu/v810/v810.c index 81413614a75..9af32d274b5 100644 --- a/src/emu/cpu/v810/v810.c +++ b/src/emu/cpu/v810/v810.c @@ -1016,12 +1016,12 @@ static CPU_RESET( v810 ) static CPU_EXECUTE( v810 ) { v810_state *cpustate = device->token; - + cpustate->icount = cycles; while(cpustate->icount>=0) { UINT32 op; - + cpustate->PPC=cpustate->PC; debugger_instruction_hook(device, cpustate->PC); op=R_OP(cpustate,cpustate->PC); diff --git a/src/emu/cpu/z8000/z8000.c b/src/emu/cpu/z8000/z8000.c index 30e190b834b..62a6e6eafcc 100644 --- a/src/emu/cpu/z8000/z8000.c +++ b/src/emu/cpu/z8000/z8000.c @@ -350,7 +350,7 @@ static CPU_INIT( z8000 ) static CPU_RESET( z8000 ) { z8000_state *cpustate = device->token; - + cpu_irq_callback save_irqcallback = cpustate->irq_callback; memset(cpustate, 0, sizeof(*cpustate)); cpustate->irq_callback = save_irqcallback; diff --git a/src/emu/cpu/z8000/z8000tbl.c b/src/emu/cpu/z8000/z8000tbl.c index 58f239ca8b2..023c8b5e29f 100644 --- a/src/emu/cpu/z8000/z8000tbl.c +++ b/src/emu/cpu/z8000/z8000tbl.c @@ -543,7 +543,7 @@ void z8000_init_tables(void) { const Z8000_init *init; int i; - + /* allocate the opcode execution and disassembler array */ z8000_exec = (Z8000_exec *)malloc(0x10000 * sizeof(Z8000_exec)); if( !z8000_exec ) diff --git a/src/emu/cpuexec.c b/src/emu/cpuexec.c index 24ad6806ee7..9165b6fea16 100644 --- a/src/emu/cpuexec.c +++ b/src/emu/cpuexec.c @@ -206,7 +206,7 @@ const device_config *cpuexec_create_cpu_device(const cpu_config *config) void cpuexec_init(running_machine *machine) { int cpunum; - + /* allocate global state */ machine->cpuexec_data = auto_malloc(sizeof(*machine->cpuexec_data)); memset(machine->cpuexec_data, 0, sizeof(*machine->cpuexec_data)); diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c index 7600af442f2..b5aadefb295 100644 --- a/src/emu/debug/debugcpu.c +++ b/src/emu/debug/debugcpu.c @@ -272,14 +272,14 @@ void debug_cpu_init(running_machine *machine) void debug_cpu_flush_traces(running_machine *machine) { int cpunum; - + for (cpunum = 0; cpunum < ARRAY_LENGTH(machine->cpu); cpunum++) if (machine->cpu[cpunum] != NULL) { cpu_debug_data *info = cpu_get_debug_data(machine->cpu[cpunum]); - + /* this can be called on exit even when no debugging is enabled, so - make sure the info is valid before proceeding */ + make sure the info is valid before proceeding */ if (info != NULL && info->trace.file != NULL) fflush(info->trace.file); } diff --git a/src/emu/machine/6522via.c b/src/emu/machine/6522via.c index d4820b8b554..fee3851f068 100644 --- a/src/emu/machine/6522via.c +++ b/src/emu/machine/6522via.c @@ -943,7 +943,7 @@ WRITE8_DEVICE_HANDLER(via_w) /*------------------------------------------------- via_porta_w - interface setting VIA port - A input + A input -------------------------------------------------*/ WRITE8_DEVICE_HANDLER(via_porta_w) @@ -957,7 +957,7 @@ WRITE8_DEVICE_HANDLER(via_porta_w) /*------------------------------------------------- via_ca1_r - interface retrieving VIA port - CA1 input + CA1 input -------------------------------------------------*/ READ8_DEVICE_HANDLER(via_ca1_r) @@ -969,7 +969,7 @@ READ8_DEVICE_HANDLER(via_ca1_r) /*------------------------------------------------- via_ca1_w - interface setting VIA port - CA1 input + CA1 input -------------------------------------------------*/ WRITE8_DEVICE_HANDLER(via_ca1_w) @@ -1023,7 +1023,7 @@ WRITE8_DEVICE_HANDLER(via_ca1_w) /*------------------------------------------------- via_ca2_r - interface retrieving VIA port - CA2 input + CA2 input -------------------------------------------------*/ READ8_DEVICE_HANDLER(via_ca2_r) @@ -1035,7 +1035,7 @@ READ8_DEVICE_HANDLER(via_ca2_r) /*------------------------------------------------- via_ca2_w - interface setting VIA port - CA2 input + CA2 input -------------------------------------------------*/ WRITE8_DEVICE_HANDLER(via_ca2_w) @@ -1068,7 +1068,7 @@ WRITE8_DEVICE_HANDLER(via_ca2_w) /*------------------------------------------------- via_portb_r - interface retrieving VIA port - B input + B input -------------------------------------------------*/ READ8_DEVICE_HANDLER(via_portb_r) @@ -1080,7 +1080,7 @@ READ8_DEVICE_HANDLER(via_portb_r) /*------------------------------------------------- via_portb_w - interface setting VIA port - B input + B input -------------------------------------------------*/ WRITE8_DEVICE_HANDLER(via_portb_w) @@ -1094,7 +1094,7 @@ WRITE8_DEVICE_HANDLER(via_portb_w) /*------------------------------------------------- via_cb1_r - interface retrieving VIA port - CB1 input + CB1 input -------------------------------------------------*/ READ8_DEVICE_HANDLER(via_cb1_r) @@ -1106,7 +1106,7 @@ READ8_DEVICE_HANDLER(via_cb1_r) /*------------------------------------------------- via_cb1_w - interface setting VIA port - CB1 input + CB1 input -------------------------------------------------*/ WRITE8_DEVICE_HANDLER(via_cb1_w) @@ -1158,7 +1158,7 @@ WRITE8_DEVICE_HANDLER(via_cb1_w) /*------------------------------------------------- via_cb2_r - interface retrieving VIA port - CB2 input + CB2 input -------------------------------------------------*/ READ8_DEVICE_HANDLER(via_cb2_r) @@ -1170,7 +1170,7 @@ READ8_DEVICE_HANDLER(via_cb2_r) /*------------------------------------------------- via_cb2_w - interface setting VIA port - CB2 input + CB2 input -------------------------------------------------*/ WRITE8_DEVICE_HANDLER(via_cb2_w) diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c index ee1c10ede12..d3944fb5833 100644 --- a/src/emu/machine/generic.c +++ b/src/emu/machine/generic.c @@ -619,8 +619,8 @@ void generic_pulse_irq_line(const device_config *device, int irqline) /*------------------------------------------------- - generic_pulse_irq_line_and_vector - "pulse" an - IRQ line by asserting it and then clearing it + generic_pulse_irq_line_and_vector - "pulse" an + IRQ line by asserting it and then clearing it 1 cycle later, specifying a vector -------------------------------------------------*/ diff --git a/src/emu/machine/pci.c b/src/emu/machine/pci.c index 80e88c6af0e..fa165a6ba33 100644 --- a/src/emu/machine/pci.c +++ b/src/emu/machine/pci.c @@ -214,12 +214,12 @@ static DEVICE_START( pci_bus ) pcibus->config = device->inline_config; pcibus->busdevice = device; pcibus->devicenum = -1; - + /* find all our devices */ for (devicenum = 0; devicenum < ARRAY_LENGTH(pcibus->device); devicenum++) if (pcibus->config->device[devicenum].devtag != NULL) pcibus->device[devicenum] = devtag_get_device(device->machine, pcibus->config->device[devicenum].devtype, pcibus->config->device[devicenum].devtag); - + /* register pci states */ state_save_register_device_item(device, 0, pcibus->address); state_save_register_device_item(device, 0, pcibus->devicenum); diff --git a/src/emu/mame.c b/src/emu/mame.c index 0d7fcb14ebe..3e3fc40813d 100644 --- a/src/emu/mame.c +++ b/src/emu/mame.c @@ -1731,10 +1731,10 @@ static void handle_save(running_machine *machine) { astring *fullname = astring_dupc(mame_file_full_name(file)); state_save_error staterr; - + /* write the save state */ staterr = state_save_write_file(machine, file); - + /* handle the result */ switch (staterr) { @@ -1745,14 +1745,14 @@ static void handle_save(running_machine *machine) case STATERR_WRITE_ERROR: popmessage("Error: Unable to save state due to a write error. Verify there is enough disk space."); break; - + case STATERR_NONE: if (!(machine->gamedrv->flags & GAME_SUPPORTS_SAVE)) popmessage("State successfully saved.\nWarning: Save states are not officially supported for this game."); else popmessage("State successfully saved."); break; - + default: popmessage("Error: Unknwon error during state save."); break; @@ -1811,10 +1811,10 @@ static void handle_load(running_machine *machine) if (filerr == FILERR_NONE) { state_save_error staterr; - + /* write the save state */ staterr = state_save_read_file(machine, file); - + /* handle the result */ switch (staterr) { @@ -1825,18 +1825,18 @@ static void handle_load(running_machine *machine) case STATERR_INVALID_HEADER: popmessage("Error: Unable to load state due to an invalid header. Make sure the save state is correct for this game."); break; - + case STATERR_READ_ERROR: popmessage("Error: Unable to load state due to a read error (file is likely corrupt)."); break; - + case STATERR_NONE: if (!(machine->gamedrv->flags & GAME_SUPPORTS_SAVE)) popmessage("State successfully loaded.\nWarning: Save states are not officially supported for this game."); else popmessage("State successfully loaded."); break; - + default: popmessage("Error: Unknwon error during state load."); break; diff --git a/src/emu/state.c b/src/emu/state.c index b296c7e702d..e9454d5fa77 100644 --- a/src/emu/state.c +++ b/src/emu/state.c @@ -17,7 +17,7 @@ 0A..1B Game name padded with \0 1C..1F Signature 20..end Save game data (compressed) - + Data is always written as native-endian. Data is converted from the endiannness it was written upon load. @@ -129,7 +129,7 @@ INLINE void flip_data(state_entry *entry) UINT32 *data32; UINT64 *data64; int count; - + switch (entry->typesize) { case 2: @@ -150,7 +150,7 @@ INLINE void flip_data(state_entry *entry) data64[count] = FLIPENDIAN_INT64(data64[count]); break; } -} +} @@ -576,18 +576,18 @@ state_save_error state_save_write_file(running_machine *machine, mame_file *file #endif strncpy((char *)&header[0x0a], machine->gamedrv->name, 0x1c - 0x0a); *(UINT32 *)&header[0x1c] = LITTLE_ENDIANIZE_INT32(signature); - + /* write the header and turn on compression for the rest of the file */ mame_fcompress(file, FCOMPRESS_NONE); mame_fseek(file, 0, SEEK_SET); if (mame_fwrite(file, header, sizeof(header)) != sizeof(header)) return STATERR_WRITE_ERROR; mame_fcompress(file, FCOMPRESS_MEDIUM); - + /* call the pre-save functions */ for (func = global->prefunclist; func != NULL; func = func->next) (*func->func.presave)(machine, func->param); - + /* then write all the data */ for (entry = global->entrylist; entry != NULL; entry = entry->next) { @@ -612,18 +612,18 @@ state_save_error state_save_read_file(running_machine *machine, mame_file *file) state_callback *func; state_entry *entry; int flip; - + /* if we have illegal registrations, return an error */ if (global->illegal_regs > 0) return STATERR_ILLEGAL_REGISTRATIONS; - + /* read the header and turn on compression for the rest of the file */ mame_fcompress(file, FCOMPRESS_NONE); mame_fseek(file, 0, SEEK_SET); if (mame_fread(file, header, sizeof(header)) != sizeof(header)) return STATERR_READ_ERROR; mame_fcompress(file, FCOMPRESS_MEDIUM); - + /* verify the header and report an error if it doesn't match */ if (validate_header(header, machine->gamedrv->name, signature, popmessage, "Error: ") != STATERR_NONE) return STATERR_INVALID_HEADER; @@ -641,7 +641,7 @@ state_save_error state_save_read_file(running_machine *machine, mame_file *file) UINT32 totalsize = entry->typesize * entry->typecount; if (mame_fread(file, entry->data, totalsize) != totalsize) return STATERR_READ_ERROR; - + /* handle flipping */ if (flip) flip_data(entry); diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c index 6334f38ada3..dedd4f52ef1 100644 --- a/src/emu/video/voodoo.c +++ b/src/emu/video/voodoo.c @@ -4011,11 +4011,11 @@ static READ8_DEVICE_HANDLER( banshee_vga_r ) /* Input status 0 */ case 0x3c2: /* - bit 7 = Interrupt Status. When its value is ?1?, denotes that an interrupt is pending. - bit 6:5 = Feature Connector. These 2 bits are readable bits from the feature connector. - bit 4 = Sense. This bit reflects the state of the DAC monitor sense logic. - bit 3:0 = Reserved. Read back as 0. - */ + bit 7 = Interrupt Status. When its value is ?1?, denotes that an interrupt is pending. + bit 6:5 = Feature Connector. These 2 bits are readable bits from the feature connector. + bit 4 = Sense. This bit reflects the state of the DAC monitor sense logic. + bit 3:0 = Reserved. Read back as 0. + */ result = 0x00; if (LOG_REGISTERS) logerror("%s:banshee_vga_r(%X)\n", cpuexec_describe_context(device->machine), 0x300+offset); @@ -4063,14 +4063,14 @@ static READ8_DEVICE_HANDLER( banshee_vga_r ) /* Input status 1 */ case 0x3da: /* - bit 7:6 = Reserved. These bits read back 0. - bit 5:4 = Display Status. These 2 bits reflect 2 of the 8 pixel data outputs from the Attribute - controller, as determined by the Attribute controller index 0x12 bits 4 and 5. - bit 3 = Vertical sync Status. A ?1? indicates vertical retrace is in progress. - bit 2:1 = Reserved. These bits read back 0x2. - bit 0 = Display Disable. When this bit is 1, either horizontal or vertical display end has occurred, - otherwise video data is being displayed. - */ + bit 7:6 = Reserved. These bits read back 0. + bit 5:4 = Display Status. These 2 bits reflect 2 of the 8 pixel data outputs from the Attribute + controller, as determined by the Attribute controller index 0x12 bits 4 and 5. + bit 3 = Vertical sync Status. A ?1? indicates vertical retrace is in progress. + bit 2:1 = Reserved. These bits read back 0x2. + bit 0 = Display Disable. When this bit is 1, either horizontal or vertical display end has occurred, + otherwise video data is being displayed. + */ result = 0x04; if (LOG_REGISTERS) logerror("%s:banshee_vga_r(%X)\n", cpuexec_describe_context(device->machine), 0x300+offset); @@ -4432,11 +4432,11 @@ WRITE32_DEVICE_HANDLER( banshee_io_w ) /*************************************************************************** - DEVICE INTERFACE + DEVICE INTERFACE ***************************************************************************/ /*------------------------------------------------- - device start callback + device start callback -------------------------------------------------*/ static DEVICE_START( voodoo ) @@ -4620,7 +4620,7 @@ static DEVICE_START( voodoo ) /*------------------------------------------------- - device exit callback + device exit callback -------------------------------------------------*/ static DEVICE_STOP( voodoo ) @@ -4634,7 +4634,7 @@ static DEVICE_STOP( voodoo ) /*------------------------------------------------- - device reset callback + device reset callback -------------------------------------------------*/ static DEVICE_RESET( voodoo ) @@ -4645,7 +4645,7 @@ static DEVICE_RESET( voodoo ) /*------------------------------------------------- - device set info callback + device set info callback -------------------------------------------------*/ static DEVICE_SET_INFO( voodoo ) @@ -4658,7 +4658,7 @@ static DEVICE_SET_INFO( voodoo ) /*------------------------------------------------- - device get info callback + device get info callback -------------------------------------------------*/ DEVICE_GET_INFO( voodoo ) diff --git a/src/mame/drivers/4roses.c b/src/mame/drivers/4roses.c index 6481bad6087..b066dcc99f9 100644 --- a/src/mame/drivers/4roses.c +++ b/src/mame/drivers/4roses.c @@ -317,10 +317,10 @@ static const gfx_layout charlayout = /* WRONG... Must be changed */ 4, 8, -// 0x1000, +// 0x1000, RGN_FRAC(1,2), 4, -// { 0, 4, 0x8000*8, 0x8000*8+4 }, +// { 0, 4, 0x8000*8, 0x8000*8+4 }, { RGN_FRAC(0,2), RGN_FRAC(0,2) + 4, RGN_FRAC(1,2), RGN_FRAC(1,2) + 4 }, { 3, 2, 1, 0 }, { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 }, @@ -362,7 +362,7 @@ static MACHINE_DRIVER_START( 4roses ) MDRV_CPU_PROGRAM_MAP(4roses_map, 0) MDRV_CPU_VBLANK_INT("main", nmi_line_pulse) -// MDRV_NVRAM_HANDLER(generic_0fill) +// MDRV_NVRAM_HANDLER(generic_0fill) /* video hardware */ diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c index a3105ad35d0..51942bd1b96 100644 --- a/src/mame/drivers/adp.c +++ b/src/mame/drivers/adp.c @@ -418,21 +418,21 @@ static READ16_HANDLER(rh1_r) } - switch (mame_rand(space->machine) & 3) - { - case 0: - return 0; - case 1: - return 0xffff; - default: - return mame_rand(space->machine) % 0xffff; - } + switch (mame_rand(space->machine) & 3) + { + case 0: + return 0; + case 1: + return 0xffff; + default: + return mame_rand(space->machine) % 0xffff; + } } */ /* static WRITE16_HANDLER(wh1_w) { - // register_active = data; + // register_active = data; } */ diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c index 91de9366c5f..a1247c7e545 100644 --- a/src/mame/drivers/arkanoid.c +++ b/src/mame/drivers/arkanoid.c @@ -1016,7 +1016,7 @@ ROM_END /* arkgcbl - dump from citylan: -Anno 1986 +Anno 1986 N.revisione 06.09.86 CPU: 1x MK3880N-4-Z80CPU (main) diff --git a/src/mame/drivers/brasil.c b/src/mame/drivers/brasil.c index 49962e1fa75..40e3061d5aa 100644 --- a/src/mame/drivers/brasil.c +++ b/src/mame/drivers/brasil.c @@ -241,14 +241,14 @@ static WRITE16_HANDLER( write1_w ) output_set_lamp_value(5, (data >> 4) & 1); /* Lamp 5 - HOLD 5 */ output_set_lamp_value(6, (data >> 5) & 1); /* Lamp 6 - START */ -// popmessage("%04x %04x",t1,t3); +// popmessage("%04x %04x",t1,t3); } static WRITE16_HANDLER( write2_w ) { static int i; -// popmessage("%04x",data); +// popmessage("%04x",data); for(i=0;i<4;i++) { @@ -262,7 +262,7 @@ static WRITE16_HANDLER( fashion_write2_w ) { static int i; -// popmessage("%04x",data); +// popmessage("%04x",data); for(i=0;i<4;i++) { @@ -274,7 +274,7 @@ static WRITE16_HANDLER( fashion_write2_w ) static WRITE16_HANDLER( write3_w ) { t3 = data; -// popmessage("%04x %04x",t1,t3); +// popmessage("%04x %04x",t1,t3); } static ADDRESS_MAP_START( brasil_map, ADDRESS_SPACE_PROGRAM, 16 ) diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c index c78f1245408..d649ac53037 100644 --- a/src/mame/drivers/cb2001.c +++ b/src/mame/drivers/cb2001.c @@ -3,7 +3,7 @@ Cherry Bonus 2001 (c)2000/2001 Dyna -Produttore Dyna +Produttore Dyna N.revisione CPU @@ -46,37 +46,37 @@ In test mode (c) is 2000 const UINT8 cb2001_decryption_table[256] = { 0xe8,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, /* 00 */ -// pppp +// pppp xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, 0x32,xxxx,xxxx,xxxx,0x3a,xxxx,xxxx,xxxx, /* 10 */ -// ???? ???? +// ???? ???? xxxx,0x8e,xxxx,xxxx,xxxx,0x49,xxxx,xxxx, xxxx,xxxx,xxxx,0x75,xxxx,xxxx,xxxx,xxxx, /* 20 */ -// !!!! ???? pppp +// !!!! ???? pppp xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,0xbe,xxxx, xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,0xb0,xxxx, /* 30 */ -// pppp ???? +// pppp ???? xxxx,0xea,xxxx,xxxx,xxxx,0xb0,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, /* 40 */ -// !!!! gggg +// !!!! gggg xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,0x78,xxxx,xxxx,xxxx, /* 50 */ -// ???? ???? +// ???? ???? xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,0xba,xxxx, /* 60 */ -// gggg +// gggg 0xc3,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, /* 70 */ -// pppp ???? +// pppp ???? xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,0x34, xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, /* 80 */ -// ???? +// ???? xxxx,xxxx,0xe9,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,0xb9,xxxx,xxxx,xxxx, /* 90 */ -// ???? pppp +// ???? pppp xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,0xb8, xxxx,xxxx,0xfa,xxxx,xxxx,xxxx,xxxx,xxxx, /* A0 */ -// !!!! ???? +// !!!! ???? xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, /* B0 */ -// +// xxxx,xxxx,0xee,xxxx,xxxx,0xe2,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, /* C0 */ -// ???? pppp +// ???? pppp xxxx,xxxx,0x46,xxxx,xxxx,xxxx,xxxx,xxxx, 0x88,xxxx,xxxx,xxxx,xxxx,0xfa,0xc7,xxxx, /* D0 */ // ???? ???? ???? !!!! 0xb0,xxxx,xxxx,0xc6,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, /* E0 */ -// ???? !!!! +// ???? !!!! xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, /* F0 */ -// +// }; /* robiza notes: @@ -104,7 +104,7 @@ c2 -> ee (out dw,al) probably: 00 -> e8 (call) 2b -> conditional jmp for sure (75) -36 -> be +36 -> be 41 -> ea (jmp_far) 70 -> c3 (ret) 9c -> it's a counter (like mov cw,#value) -> not sure the register (cw,bw,....) -> b9 (cw) @@ -142,7 +142,7 @@ INPUT_PORTS_END static INTERRUPT_GEN( vblank_irq ) { -// cpu_set_input_line_and_vector(device,0,HOLD_LINE,0x08/4); +// cpu_set_input_line_and_vector(device,0,HOLD_LINE,0x08/4); } static const nec_config cb2001_config = { cb2001_decryption_table, }; diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c index f1436d4860e..a0efeda0a4a 100644 --- a/src/mame/drivers/cps2.c +++ b/src/mame/drivers/cps2.c @@ -3408,10 +3408,10 @@ ROM_START( gigamn2 ) ROM_REGION( 0x1000000, "gfx", 0 ) ROM_FILL( 0x000000, 0x800000, 0 ) /* you can use the original CPS2 gfx roms, but the 'GIGA part of GIGAMAN2 is missing, on real HW it isn't, roms are different */ -// ROMX_LOAD( "rm2.14m", 0x800000, 0x200000, CRC(9b1f00b4) SHA1(c1c5c2d9d00121425ae6598444d704f420ef4eef) , ROM_GROUPWORD | ROM_SKIP(6) ) -// ROMX_LOAD( "rm2.16m", 0x800002, 0x200000, CRC(c2bb0c24) SHA1(38724c49d9db49765a4ed9bc2dc8f57cec45ec7c) , ROM_GROUPWORD | ROM_SKIP(6) ) -// ROMX_LOAD( "rm2.18m", 0x800004, 0x200000, CRC(12257251) SHA1(20cb58afda0e6200991277817485340a6a41ae2b) , ROM_GROUPWORD | ROM_SKIP(6) ) -// ROMX_LOAD( "rm2.20m", 0x800006, 0x200000, CRC(f9b6e786) SHA1(aeb4acff7208e66a35198143fd2478039fdaa3a6) , ROM_GROUPWORD | ROM_SKIP(6) ) +// ROMX_LOAD( "rm2.14m", 0x800000, 0x200000, CRC(9b1f00b4) SHA1(c1c5c2d9d00121425ae6598444d704f420ef4eef) , ROM_GROUPWORD | ROM_SKIP(6) ) +// ROMX_LOAD( "rm2.16m", 0x800002, 0x200000, CRC(c2bb0c24) SHA1(38724c49d9db49765a4ed9bc2dc8f57cec45ec7c) , ROM_GROUPWORD | ROM_SKIP(6) ) +// ROMX_LOAD( "rm2.18m", 0x800004, 0x200000, CRC(12257251) SHA1(20cb58afda0e6200991277817485340a6a41ae2b) , ROM_GROUPWORD | ROM_SKIP(6) ) +// ROMX_LOAD( "rm2.20m", 0x800006, 0x200000, CRC(f9b6e786) SHA1(aeb4acff7208e66a35198143fd2478039fdaa3a6) , ROM_GROUPWORD | ROM_SKIP(6) ) ROM_LOAD( "gfx1.bin", 0x800000, 0x400000, NO_DUMP ) ROM_LOAD( "gfx2.bin", 0xc00000, 0x400000, NO_DUMP ) diff --git a/src/mame/drivers/csk.c b/src/mame/drivers/csk.c index f0b1159c170..a4c3796ff9e 100644 --- a/src/mame/drivers/csk.c +++ b/src/mame/drivers/csk.c @@ -841,8 +841,8 @@ ROM_END /* -Anno 199x -Produttore IGS +Anno 199x +Produttore IGS N.revisione CPU diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index 1c42ddc9663..17dc10c3d39 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -2494,7 +2494,7 @@ static DRIVER_INIT( zigzag ) memory_configure_bank(machine, 2, 0, 2, memory_region(machine, "main") + 0x2000, 0x1000); /* also re-install the fixed ROM area as a bank in order to inform the memory system that - the fixed area only extends to 0x1fff */ + the fixed area only extends to 0x1fff */ memory_install_read8_handler(space, 0x0000, 0x1fff, 0, 0, SMH_BANK3); memory_set_bankptr(machine, 3, memory_region(machine, "main") + 0x0000); diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index 5ec58fa271c..2c2ebdf7b6f 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -120,12 +120,12 @@ static ADDRESS_MAP_START( ncb3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf810, 0xf810) AM_READ_PORT("UNK1") AM_RANGE(0xf811, 0xf811) AM_READ_PORT("UNK2") AM_RANGE(0xf820, 0xf820) AM_READ_PORT("DSW2") -// AM_RANGE(0xf830, 0xf830) AM_READWRITE(ay8910_read_port_0_r,ay8910_write_port_0_w) -// AM_RANGE(0xf840, 0xf840) AM_WRITE(ay8910_control_port_0_w) -// AM_RANGE(0xfa00, 0xfa00) AM_WRITE(goldstar_fa00_w) -// AM_RANGE(0xfb00, 0xfb00) AM_READWRITE(okim6295_status_0_r,okim6295_data_0_w) -// AM_RANGE(0xfd00, 0xfdff) AM_READWRITE(SMH_RAM,paletteram_BBGGGRRR_w) AM_BASE(&paletteram) -// AM_RANGE(0xfe00, 0xfe00) AM_READWRITE(protection_r,protection_w) +// AM_RANGE(0xf830, 0xf830) AM_READWRITE(ay8910_read_port_0_r,ay8910_write_port_0_w) +// AM_RANGE(0xf840, 0xf840) AM_WRITE(ay8910_control_port_0_w) +// AM_RANGE(0xfa00, 0xfa00) AM_WRITE(goldstar_fa00_w) +// AM_RANGE(0xfb00, 0xfb00) AM_READWRITE(okim6295_status_0_r,okim6295_data_0_w) +// AM_RANGE(0xfd00, 0xfdff) AM_READWRITE(SMH_RAM,paletteram_BBGGGRRR_w) AM_BASE(&paletteram) +// AM_RANGE(0xfe00, 0xfe00) AM_READWRITE(protection_r,protection_w) ADDRESS_MAP_END @@ -810,7 +810,7 @@ static MACHINE_DRIVER_START( cm ) MDRV_GFXDECODE(ncb3) MDRV_PALETTE_LENGTH(256) MDRV_PALETTE_INIT(cm) -// MDRV_NVRAM_HANDLER(goldstar) +// MDRV_NVRAM_HANDLER(goldstar) MDRV_VIDEO_START(goldstar) MDRV_VIDEO_UPDATE(cherrym) diff --git a/src/mame/drivers/itgamble.c b/src/mame/drivers/itgamble.c index 0ae358c5456..372f28b6025 100644 --- a/src/mame/drivers/itgamble.c +++ b/src/mame/drivers/itgamble.c @@ -510,8 +510,8 @@ ROM_END /* Europa 2002 Space (Ver 3.0) -Year: 2002 -Company: Nazionale Elettronica +Year: 2002 +Company: Nazionale Elettronica CPU: @@ -521,13 +521,13 @@ CPU: 1x TDA2003 (sound)(ic26) 1x LM358N (sound)(ic27) 1x oscillator 30MHz (close to main)(osc1) -1x blue resonator (close to sound) (x1) +1x blue resonator (close to sound) (x1) ROMs: 1x MX27C1000 (1) 2x M27C2001 (2,3) -2x M27C4001 (4,5) +2x M27C4001 (4,5) Note: diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c index 00814c46785..afca34f76ff 100644 --- a/src/mame/drivers/jangou.c +++ b/src/mame/drivers/jangou.c @@ -33,12 +33,12 @@ Location 3-G: MB7051 Jangou Lady (c)1984 Nihon Bussan -CPU: Z80 x2 (#1,#2) - (40pin unknown:#3) -SOUND: AY-3-8910 - MSM5218RS -OSC: 19.968MHz - 400KHz +CPU: Z80 x2 (#1,#2) + (40pin unknown:#3) +SOUND: AY-3-8910 + MSM5218RS +OSC: 19.968MHz + 400KHz 1.5N chr. @@ -195,7 +195,7 @@ static WRITE8_HANDLER( blitter_process_w ) /*trigger blitter write to ram,might not be correct...*/ if(offset == 5) { -// printf("%02x %02x %02x %02x %02x %02x\n",blit_data[0],blit_data[1],blit_data[2],blit_data[3],blit_data[4],blit_data[5]); +// printf("%02x %02x %02x %02x %02x %02x\n",blit_data[0],blit_data[1],blit_data[2],blit_data[3],blit_data[4],blit_data[5]); w = (blit_data[4] & 0xff)+1; h = (blit_data[5] & 0xff)+1; src = ((blit_data[1]<<8)|(blit_data[0]<<0)); @@ -274,14 +274,14 @@ static WRITE8_HANDLER( mux_w ) static WRITE8_HANDLER( output_w ) { /* - --x- ---- ? (polls between high and low in irq routine,probably signals the vblank routine) - ---- -x-- flip screen - ---- ---x coin counter - */ -// printf("%02x\n",data); + --x- ---- ? (polls between high and low in irq routine,probably signals the vblank routine) + ---- -x-- flip screen + ---- ---x coin counter + */ +// printf("%02x\n",data); coin_counter_w(0,data & 0x01); -// flip_screen_set(data & 0x04); -// coin_lockout_w(0,~data & 0x20); +// flip_screen_set(data & 0x04); +// coin_lockout_w(0,~data & 0x20); } static READ8_HANDLER( input_mux_r ) @@ -295,7 +295,7 @@ static READ8_HANDLER( input_mux_r ) case 0x10: return input_port_read(space->machine, "PL1_3"); case 0x20: return input_port_read(space->machine, "PL2_3"); } -// printf("%04x\n",mux_data); +// printf("%04x\n",mux_data); return 0xff; } @@ -391,7 +391,7 @@ static READ8_HANDLER( slave_com_r ) static WRITE8_HANDLER( slave_com_w ) { nsc_latch = data; -// cpu_set_input_line(space->machine->cpu[0], 0, HOLD_LINE); +// cpu_set_input_line(space->machine->cpu[0], 0, HOLD_LINE); } /************************************* diff --git a/src/mame/drivers/mil4000.c b/src/mame/drivers/mil4000.c index 14a89542557..df9ebaabfe6 100644 --- a/src/mame/drivers/mil4000.c +++ b/src/mame/drivers/mil4000.c @@ -47,7 +47,7 @@ ROMs RAM: 4x CY62256L-70PC - 32K x 8 Static RAM. -2x CY7C199-15PC - 32K x 8 Static RAM +2x CY7C199-15PC - 32K x 8 Static RAM Note 1x 28x2 edge connector @@ -235,7 +235,7 @@ static WRITE16_HANDLER( output_w ) output_set_lamp_value(5, (data >> 5) & 1); /* START */ output_set_lamp_value(6, (data >> 6) & 1); /* PREMIO */ -// popmessage("%04x\n",data); +// popmessage("%04x\n",data); } static ADDRESS_MAP_START( mil4000_map, ADDRESS_SPACE_PROGRAM, 16 ) diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c index 689b078a11c..b7a9fec08bd 100644 --- a/src/mame/drivers/neogeo.c +++ b/src/mame/drivers/neogeo.c @@ -660,7 +660,7 @@ static WRITE16_HANDLER( main_cpu_bank_select_w ) static void main_cpu_banking_init(running_machine *machine) { const address_space *mainspace = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM); - + /* create vector banks */ memory_configure_bank(machine, NEOGEO_BANK_VECTORS, 0, 1, memory_region(machine, "mainbios"), 0); memory_configure_bank(machine, NEOGEO_BANK_VECTORS, 1, 1, memory_region(machine, "main"), 0); diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c index d42660ba600..a60aa4f7164 100644 --- a/src/mame/drivers/playmark.c +++ b/src/mame/drivers/playmark.c @@ -1300,7 +1300,7 @@ ROM_START( hotmind ) /* ROM will be copied here by the init code from "user1" */ /* original PIC (which is the one from Hard Times) was protected, but it works with the Excelsior one - because it uses only 1 bank of samples */ + because it uses only 1 bank of samples */ ROM_REGION( 0x3000, "user1", ROMREGION_DISPOSE ) ROM_LOAD( "pic16c57-hs.i015", 0x0000, 0x2d4c, BAD_DUMP CRC(022c6941) SHA1(8ead40bfa7aa783b1ce62bd6cfa673cb876e29e7) ) diff --git a/src/mame/drivers/queen.c b/src/mame/drivers/queen.c index 6612c8d890f..cdb13b85f89 100644 --- a/src/mame/drivers/queen.c +++ b/src/mame/drivers/queen.c @@ -2,10 +2,10 @@ /* -Produttore STG +Produttore STG N.revisione -CPU main PCB is a standard EPIA -ROMs epia BIOS + solid state HD +CPU main PCB is a standard EPIA +ROMs epia BIOS + solid state HD diff --git a/src/mame/drivers/sfkick.c b/src/mame/drivers/sfkick.c index f043f736890..7519cf65ecd 100644 --- a/src/mame/drivers/sfkick.c +++ b/src/mame/drivers/sfkick.c @@ -1,8 +1,8 @@ -/* +/* Super Free Kick / Spinkick by HEC (Haesung Enterprise Co.) - + driver by Tomasz Slanina - + Hacked MSX2 home computer hardware. Romset contains modifed ( (c) strings removed and patched boot sequence) MSX2 bios. Yamaha VDP v9938 is hidden in huge epoxy block. @@ -72,7 +72,7 @@ static int sfkick_bank_cfg; static int sfkick_bank[8]; static int sfkick_input_mux; static READ8_DEVICE_HANDLER( ppi_port_b_r ) -{ +{ switch(sfkick_input_mux&0x0f) { case 0: return input_port_read(device->machine, "IN0"); @@ -96,7 +96,7 @@ void sfkick_remap_banks(running_machine *machine) memory_set_bankptr (machine,2, mem+0x2000); } break; - + case 1: /* ext rom */ { UINT8 *mem = memory_region(machine, "extrom"); @@ -104,7 +104,7 @@ void sfkick_remap_banks(running_machine *machine) memory_set_bankptr (machine,2, mem+0x6000); } break; - + case 2: /* banked */ { UINT8 *mem = memory_region(machine, "banked"); @@ -112,7 +112,7 @@ void sfkick_remap_banks(running_machine *machine) memory_set_bankptr (machine,2, mem+0x2000*sfkick_bank[1]); } break; - + case 3: /* unknown */ { UINT8 *mem = memory_region(machine, "banked"); @@ -132,7 +132,7 @@ void sfkick_remap_banks(running_machine *machine) memory_set_bankptr (machine,4, mem+0x6000); } break; - + case 1: /* unknown */ case 3: { @@ -141,7 +141,7 @@ void sfkick_remap_banks(running_machine *machine) memory_set_bankptr(machine,4, mem+0x18000); } break; - + case 2: /* banked */ { UINT8 *mem = memory_region(machine, "banked"); @@ -161,7 +161,7 @@ void sfkick_remap_banks(running_machine *machine) memory_set_bankptr(machine,6, mem+0x6000); } break; - + case 1: /* unknown */ case 3: { @@ -170,7 +170,7 @@ void sfkick_remap_banks(running_machine *machine) memory_set_bankptr(machine,6, mem+0x18000); } break; - + case 2: /* banked */ { UINT8 *mem = memory_region(machine, "banked"); @@ -179,7 +179,7 @@ void sfkick_remap_banks(running_machine *machine) } break; } - + /* c000-fffff */ switch((sfkick_bank_cfg>>6)&3) { @@ -191,7 +191,7 @@ void sfkick_remap_banks(running_machine *machine) memory_set_bankptr(machine,8, mem+0x18000); } break; - + case 2: /* banked */ { UINT8 *mem = memory_region(machine, "banked"); @@ -199,7 +199,7 @@ void sfkick_remap_banks(running_machine *machine) memory_set_bankptr (machine,8, mem+0x2000*sfkick_bank[7]); } break; - + case 3: /* RAM */ { memory_set_bankptr(machine,7, main_mem); @@ -332,12 +332,12 @@ static ADDRESS_MAP_START (sound_io, ADDRESS_SPACE_IO, 8) AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r) AM_RANGE(0x04, 0x04) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w) AM_RANGE(0x05, 0x05) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w) -ADDRESS_MAP_END +ADDRESS_MAP_END static WRITE8_DEVICE_HANDLER ( ppi_port_c_w ) { sfkick_input_mux=data; -} +} static const ppi8255_interface ppi8255_intf = { @@ -346,7 +346,7 @@ static const ppi8255_interface ppi8255_intf = NULL, ppi_port_a_w, NULL, - ppi_port_c_w + ppi_port_c_w }; @@ -355,24 +355,24 @@ static INPUT_PORTS_START( sfkick ) PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED ) /* unused ? */ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) - + PORT_START("IN1") PORT_BIT( 0x71, IP_ACTIVE_LOW, IPT_UNUSED ) /* unused ? */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) - + PORT_START("DIAL") PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(-20) - + PORT_START("DSW1") /* bitswapped at read! 76543210 -> 45673210 */ PORT_DIPNAME( 0x82, 0x02, DEF_STR( Unknown ) ) /* unknown, code @ $98a8 */ PORT_DIPSETTING( 0x00, "3" ) PORT_DIPSETTING( 0x02, "2" ) PORT_DIPSETTING( 0x80, "1" ) PORT_DIPSETTING( 0x82, "0" ) - PORT_DIPNAME( 0x0c, 0x08, DEF_STR( Difficulty ) ) /* not sure, code @ $9877 */ + PORT_DIPNAME( 0x0c, 0x08, DEF_STR( Difficulty ) ) /* not sure, code @ $9877 */ PORT_DIPSETTING( 0x0c, DEF_STR( Easy ) ) PORT_DIPSETTING( 0x08, DEF_STR( Normal ) ) PORT_DIPSETTING( 0x04, DEF_STR( Medium ) ) @@ -386,7 +386,7 @@ static INPUT_PORTS_START( sfkick ) PORT_DIPSETTING( 0x01, "3" ) PORT_DIPSETTING( 0x40, "2" ) PORT_DIPSETTING( 0x41, "1" ) - + PORT_START("DSW2") /* bitswapped at read! 76543210 -> 45673210 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED ) /* unused ? */ PORT_DIPNAME( 0x02, 0x02, "Test Mode" ) @@ -443,7 +443,7 @@ static INTERRUPT_GEN( sfkick_interrupt ) { v9938_interrupt(0); } -static void irqhandler(running_machine *machine, int irq) +static void irqhandler(running_machine *machine, int irq) { cpu_set_input_line_and_vector(machine->cpu[1], 0, irq ? ASSERT_LINE : CLEAR_LINE, 0xff); } @@ -464,9 +464,9 @@ static MACHINE_DRIVER_START( sfkick ) MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(main_io,0) MDRV_CPU_VBLANK_INT_HACK(sfkick_interrupt,262) - - MDRV_INTERLEAVE(1000) - + + MDRV_INTERLEAVE(1000) + MDRV_CPU_ADD("sound",Z80,MASTER_CLOCK/6) MDRV_CPU_PROGRAM_MAP(sound_mem,0) MDRV_CPU_IO_MAP(sound_io,0) @@ -481,14 +481,14 @@ static MACHINE_DRIVER_START( sfkick ) MDRV_PALETTE_LENGTH(512) MDRV_PPI8255_ADD( "ppi8255", ppi8255_intf ) - + MDRV_MACHINE_RESET(sfkick) MDRV_PALETTE_INIT( v9938 ) MDRV_VIDEO_START(sfkick) MDRV_VIDEO_UPDATE(generic_bitmapped) - + MDRV_SPEAKER_STANDARD_MONO("mono") MDRV_SOUND_ADD("ym1", YM2203, MASTER_CLOCK/6) MDRV_SOUND_CONFIG(ym2203_config) @@ -496,7 +496,7 @@ static MACHINE_DRIVER_START( sfkick ) MDRV_SOUND_ROUTE(1, "mono", 0.25) MDRV_SOUND_ROUTE(2, "mono", 0.25) MDRV_SOUND_ROUTE(3, "mono", 0.50) - + MACHINE_DRIVER_END static DRIVER_INIT(sfkick) @@ -505,46 +505,46 @@ static DRIVER_INIT(sfkick) } ROM_START( sfkick ) - ROM_REGION( 0x10000, "main", ROMREGION_ERASEFF ) - + ROM_REGION( 0x10000, "main", ROMREGION_ERASEFF ) + ROM_REGION(0x20000, "banked", ROMREGION_ERASEFF) ROM_LOAD( "sfkick2.a7", 0x00000, 0x8000, CRC(1dcaec5e) SHA1(7e063d46fb6606df2d772866cc55f207035b98c4) ) ROM_LOAD( "sfkick3.c7", 0x08000, 0x8000, CRC(639d3cf2) SHA1(950fd28058d32e4532eb6e99454dcaef092a955e) ) ROM_LOAD( "sfkick4.d7", 0x10000, 0x8000, CRC(ee1b344e) SHA1(d33fbad017cc4838192e9c540621537edb7e8dc4) ) /* 0x18000-0x1ffff = empty */ - - ROM_REGION(0x8000, "extrom", 0) + + ROM_REGION(0x8000, "extrom", 0) ROM_LOAD( "sfkick5.h7", 0x00000, 0x8000, CRC(8e8bd9cf) SHA1(f493de40147fdd67a48d4c90b01170fbd6ea074e) ) ROM_REGION(0x8000, "cartridge", 0) ROM_LOAD( "sfkick6.j7", 0x0000, 0x8000, CRC(7a91ac4b) SHA1(afc5e2c2fe0cd108235ac6ae2775cc9a0b1c9f76) ) - + ROM_REGION(0x8000, "bios", 0) ROM_LOAD( "sfkick7.l7", 0x00000, 0x8000, CRC(8cd94c63) SHA1(e6dba66c8716593b8ab88f79f7205211938d1598) ) - + ROM_REGION(0x10000, "sound", 0) ROM_LOAD( "sfkick1.c5", 0x00000, 0x8000, CRC(2f5e3b7a) SHA1(d2ff566b415ab10c0681fa1eb221a56e3c137ecf) ) ROM_END ROM_START( spinkick ) - ROM_REGION( 0x10000, "main", ROMREGION_ERASEFF ) - + ROM_REGION( 0x10000, "main", ROMREGION_ERASEFF ) + ROM_REGION(0x20000, "banked", ROMREGION_ERASEFF) ROM_LOAD( "spinkick.r2", 0x00000, 0x8000, CRC(1dcaec5e) SHA1(7e063d46fb6606df2d772866cc55f207035b98c4) ) ROM_LOAD( "spinkick.r3", 0x08000, 0x8000, CRC(e86a194a) SHA1(19a02375ec463e795770403c3e948d754919458b) ) ROM_LOAD( "spinkick.r4", 0x10000, 0x8000, CRC(ee1b344e) SHA1(d33fbad017cc4838192e9c540621537edb7e8dc4) ) /* 0x18000-0x1ffff = empty */ - + ROM_REGION(0x8000, "extrom", 0) ROM_LOAD( "spinkick.r5", 0x00000, 0x8000, CRC(8e8bd9cf) SHA1(f493de40147fdd67a48d4c90b01170fbd6ea074e) ) ROM_REGION(0x8000, "cartridge", 0) ROM_LOAD( "spinkick.r6", 0x0000, 0x8000, CRC(7a91ac4b) SHA1(afc5e2c2fe0cd108235ac6ae2775cc9a0b1c9f76) ) - + ROM_REGION(0x8000, "bios", 0) ROM_LOAD( "spinkick.r7", 0x00000, 0x8000, CRC(8cd94c63) SHA1(e6dba66c8716593b8ab88f79f7205211938d1598) ) - + ROM_REGION(0x10000, "sound", 0) ROM_LOAD( "spinkick.r1", 0x00000, 0x8000, CRC(2f5e3b7a) SHA1(d2ff566b415ab10c0681fa1eb221a56e3c137ecf) ) ROM_END diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c index ae8dd154b3b..39b07d3489b 100644 --- a/src/mame/drivers/spool99.c +++ b/src/mame/drivers/spool99.c @@ -25,9 +25,9 @@ TODO: ============================================================================================ -Year 1998 +Year 1998 Manufacturer Electronic Projects -Revision N. 0.36 +Revision N. 0.36 CPU @@ -56,7 +56,7 @@ Note --- 2nd pcb -Year 1998 +Year 1998 Manufacturer Electronic Projects Revision N. 0.31 @@ -135,12 +135,12 @@ static READ8_HANDLER( spool99_io_r ) { UINT8 *ROM = memory_region(space->machine, "main"); -// if(!(io_switch)) +// if(!(io_switch)) { switch(offset+0xaf00) { case 0xafd8: return input_port_read(space->machine,"COIN1"); -// case 0xafd9: return 1; +// case 0xafd9: return 1; case 0xafda: return input_port_read(space->machine,"COIN2"); case 0xafdb: return 1; case 0xafdc: return input_port_read(space->machine,"SERVICE1");//attract mode @@ -152,13 +152,13 @@ static READ8_HANDLER( spool99_io_r ) case 0xafe2: return input_port_read(space->machine,"START"); case 0xafe3: return input_port_read(space->machine,"BET");//system 2 case 0xafe4: return input_port_read(space->machine,"SERVICE2");//attract mode -// case 0xafe5: return 1; -// case 0xafe6: return 1; +// case 0xafe5: return 1; +// case 0xafe6: return 1; case 0xafe7: return eeprom_read_bit(); case 0xaff8: return okim6295_status_0_r(space,0); } } -// printf("%04x %d\n",offset+0xaf00,io_switch); +// printf("%04x %d\n",offset+0xaf00,io_switch); return ROM[0xaf00+offset]; } @@ -322,7 +322,7 @@ ROM_END static DRIVER_INIT( spool99 ) { UINT8 *ROM = memory_region(machine, "main"); -// vram = auto_malloc(0x2000); +// vram = auto_malloc(0x2000); memcpy(spool99_main, ROM, 0xae00); } diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index d68c9d147af..c1fdf0da388 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -785,7 +785,7 @@ ROM_START( statrv2v ) ROM_CONTINUE(0x0000, 0x800) /* other roms were not from this set, missing sub-board?, but as the game is 'triv two' like the parent - it seems compatible with the same question board */ + it seems compatible with the same question board */ ROM_REGION( 0x10000, "user1", 0 ) /* question data */ ROM_LOAD( "statuspb.u1", 0x00000, 0x02000, CRC(a50c0313) SHA1(f9bf84613e2ebb952a81a10ee1da49a37423b717) ) diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c index 4f7dd735ef0..8d64b718620 100644 --- a/src/mame/drivers/tmaster.c +++ b/src/mame/drivers/tmaster.c @@ -831,7 +831,7 @@ static MACHINE_RESET( galgames ) memory_set_bank(machine, 2, 0); // ram memory_set_bank(machine, 4, 0); // ram - + cpu_reset(machine->cpu[0]); } diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c index d3354341d7a..f23622d0b8a 100644 --- a/src/mame/drivers/twin16.c +++ b/src/mame/drivers/twin16.c @@ -1184,10 +1184,10 @@ ROM_START( gradius2 ) ROM_LOAD16_WORD_SWAP( "gr2.p13", 0x100000, 0x80000, CRC(5bd239ac) SHA1(9c96f6069d06a1d80c04650ed56bc5e1508db657) ) /* 785f15.p13 byteswapped */ ROM_LOAD16_WORD_SWAP( "gr2.p15", 0x180000, 0x80000, CRC(95c6b8a3) SHA1(0a906af72d08993fd83f23d72ffb919801aa17af) ) /* 785f16.p15 byteswapped */ -// ROM_LOAD16_WORD( "785f17.p16", 0x000000, 0x80000, CRC(8fbec1a4) SHA1(71cbdb25470b5a2ca7e80c92f12fc47e28085793) ) /* not working in a original PCB */ -// ROM_LOAD16_WORD( "785f18.p18", 0x080000, 0x80000, CRC(50d61e38) SHA1(051d332d93d435d19571e22d69ffc5395dbb16a4) ) /* not working in a original PCB */ -// ROM_LOAD16_WORD( "785f15.p13", 0x100000, 0x80000, CRC(af96aef3) SHA1(a58e26a8b134ab6e7938cd4fa342c04c236efd99) ) /* not working in a original PCB */ -// ROM_LOAD16_WORD( "785f16.p15", 0x180000, 0x80000, CRC(b858df1f) SHA1(c434da7ba54d59643fe6ca30bceccf16413904c3) ) /* not working in a original PCB */ +// ROM_LOAD16_WORD( "785f17.p16", 0x000000, 0x80000, CRC(8fbec1a4) SHA1(71cbdb25470b5a2ca7e80c92f12fc47e28085793) ) /* not working in a original PCB */ +// ROM_LOAD16_WORD( "785f18.p18", 0x080000, 0x80000, CRC(50d61e38) SHA1(051d332d93d435d19571e22d69ffc5395dbb16a4) ) /* not working in a original PCB */ +// ROM_LOAD16_WORD( "785f15.p13", 0x100000, 0x80000, CRC(af96aef3) SHA1(a58e26a8b134ab6e7938cd4fa342c04c236efd99) ) /* not working in a original PCB */ +// ROM_LOAD16_WORD( "785f16.p15", 0x180000, 0x80000, CRC(b858df1f) SHA1(c434da7ba54d59643fe6ca30bceccf16413904c3) ) /* not working in a original PCB */ ROM_REGION( 0x20000, "gfx3", ROMREGION_ERASE00 ) // tile data; mapped at 0x80000 on CPUB diff --git a/src/mame/video/eprom.c b/src/mame/video/eprom.c index 0dcad07abe9..3e207ac5b12 100644 --- a/src/mame/video/eprom.c +++ b/src/mame/video/eprom.c @@ -30,11 +30,11 @@ static void update_palette(running_machine *machine) UINT16 const data = paletteram16[color]; /* FIXME this is only a very crude approximation of the palette output. - * The circuit involves a dozen transistors and probably has an output - * which is quite different from this. - * This is, however, good enough to match the video and description - * of MAMETesters bug #02677. - */ + * The circuit involves a dozen transistors and probably has an output + * which is quite different from this. + * This is, however, good enough to match the video and description + * of MAMETesters bug #02677. + */ i = (((data >> 12) & 15) + 1) * (4 - eprom_screen_intensity); if (i < 0) i = 0; diff --git a/src/mame/video/taitoic.c b/src/mame/video/taitoic.c index ded8001bbc4..bde3e7f2131 100644 --- a/src/mame/video/taitoic.c +++ b/src/mame/video/taitoic.c @@ -601,7 +601,7 @@ int TC0100SCN_count(running_machine *machine) has_write_handler(machine, 0, TC0100SCN_triple_screen_w)) ? 1 : 0; mask |= has_write_handler(machine, 0, TC0100SCN_word_1_w) << 1; mask |= has_write_handler(machine, 0, TC0100SCN_word_2_w) << 2; - + /* Catch illegal configurations */ /* TODO: we should give an appropriate warning */ assert_always(mask == 0 || mask == 1 || mask == 3 || mask == 7, "Invalid TC0110PCR configuration"); diff --git a/src/osd/windows/debugwin.c b/src/osd/windows/debugwin.c index 4d1e2480223..4f4d4f69947 100644 --- a/src/osd/windows/debugwin.c +++ b/src/osd/windows/debugwin.c @@ -2372,15 +2372,15 @@ void console_create_window(running_machine *machine) for (regsubview = registers_view_get_subview_list(info->view[1].view); regsubview != NULL; regsubview = regsubview->next) { UINT32 regchars; - + // set the view and fetch the width registers_view_set_subview(info->view[1].view, regsubview->index); regchars = debug_view_get_total_size(info->view[1].view).x; - + // track the maximum main_console_regwidth = MAX(regchars, main_console_regwidth); } - + // determine the width of the console (this is fixed) conchars = debug_view_get_total_size(info->view[2].view).x; @@ -2394,7 +2394,7 @@ void console_create_window(running_machine *machine) // set the view and fetch the width disasm_view_set_subview(info->view[0].view, dasmsubview->index); dischars = debug_view_get_total_size(info->view[0].view).x; - + // compute the preferred width minwidth = EDGE_WIDTH + main_console_regwidth * debug_font_width + vscroll_width + 2 * EDGE_WIDTH + 100 + EDGE_WIDTH; maxwidth = EDGE_WIDTH + main_console_regwidth * debug_font_width + vscroll_width + 2 * EDGE_WIDTH + MAX(dischars, conchars) * debug_font_width + vscroll_width + EDGE_WIDTH; @@ -2548,7 +2548,7 @@ static void console_set_cpu(const device_config *device) if (strcmp(title, curtitle) != 0) win_set_window_text_utf8(main_console->wnd, title); } - + // and recompute the children console_recompute_children(main_console); } diff --git a/src/version.c b/src/version.c index 5d2015893fd..0c0b1407cd3 100644 --- a/src/version.c +++ b/src/version.c @@ -9,4 +9,4 @@ ***************************************************************************/ -const char build_version[] = "0.128u5 ("__DATE__")"; +const char build_version[] = "0.128u6 ("__DATE__")"; |