diff options
33 files changed, 162 insertions, 135 deletions
diff --git a/src/emu/cpu/m6800/m6800.c b/src/emu/cpu/m6800/m6800.c index 7aad08794e7..acb5f05ee31 100644 --- a/src/emu/cpu/m6800/m6800.c +++ b/src/emu/cpu/m6800/m6800.c @@ -962,14 +962,14 @@ static void set_irq_line(m6800_state *cpustate, int irqline, int state) } else { - int eddge; + //int eddge; LOG(("M6800 '%s' set_irq_line %d,%d\n", cpustate->device->tag, irqline, state)); cpustate->irq_state[irqline] = state; if (irqline == M6800_TIN_LINE && state != cpustate->irq_state[irqline]) { - eddge = (state == CLEAR_LINE ) ? 2 : 0; + //eddge = (state == CLEAR_LINE ) ? 2 : 0; if( ((cpustate->tcsr&TCSR_IEDG) ^ (state==CLEAR_LINE ? TCSR_IEDG : 0))==0 ) return; /* active edge in */ diff --git a/src/emu/cpu/pdp1/pdp1dasm.c b/src/emu/cpu/pdp1/pdp1dasm.c index c9844cfa7ae..bcb0dc604be 100644 --- a/src/emu/cpu/pdp1/pdp1dasm.c +++ b/src/emu/cpu/pdp1/pdp1dasm.c @@ -22,7 +22,7 @@ INLINE void ea (void) CPU_DISASSEMBLE( pdp1 ) { int md; - int etime = 0; + //int etime = 0; md = *((UINT32 *) oprom); @@ -34,25 +34,25 @@ CPU_DISASSEMBLE( pdp1 ) ea (); sprintf (buffer, "AND (0%06o)", y); IN; - etime = 10; + //etime = 10; break; case IOR: ea (); sprintf (buffer, "IOR (0%06o)", y); IN; - etime = 10; + //etime = 10; break; case XOR: ea (); sprintf (buffer, "XOR (0%06o)", y); IN; - etime = 10; + //etime = 10; break; case XCT: ea (); sprintf (buffer, "XCT (0%06o)", y); IN; - etime = 5; + //etime = 5; break; case CALJDA: { @@ -60,110 +60,110 @@ CPU_DISASSEMBLE( pdp1 ) sprintf (buffer, "JDA 0%06o ", y); if (ib == 0) sprintf (buffer, "CAL "); - etime = 10; + //etime = 10; break; } case LAC: ea (); sprintf (buffer, "LAC (0%06o)", y); IN; - etime = 10; + //etime = 10; break; case LIO: ea (); sprintf (buffer, "LIO (0%06o)", y); IN; - etime = 10; + //etime = 10; break; case DAC: ea (); sprintf (buffer, "DAC 0%06o ", y); IN; - etime = 10; + //etime = 10; break; case DAP: ea (); sprintf (buffer, "DAP 0%06o ", y); IN; - etime = 10; + //etime = 10; break; case DIP: ea (); sprintf (buffer, "DIP 0%06o ", y); IN; - etime = 10; + //etime = 10; break; case DIO: ea (); sprintf (buffer, "DIO 0%06o ", y); IN; - etime = 10; + //etime = 10; break; case DZM: ea (); sprintf (buffer, "DZM 0%06o ", y); IN; - etime = 10; + //etime = 10; break; case ADD: ea (); sprintf (buffer, "ADD (0%06o)", y); IN; - etime = 10; + //etime = 10; break; case SUB: ea (); sprintf (buffer, "SUB (0%06o)", y); IN; - etime = 10; + //etime = 10; break; case IDX: ea (); sprintf (buffer, "IDX (0%06o)", y); IN; - etime = 10; + //etime = 10; break; case ISP: ea (); sprintf (buffer, "ISP (0%06o)", y); IN; - etime = 10; + //etime = 10; break; case SAD: ea (); sprintf (buffer, "SAD (0%06o)", y); IN; - etime = 10; + //etime = 10; break; case SAS: ea (); sprintf (buffer, "SAS (0%06o)", y); IN; - etime = 10; + //etime = 10; break; case MUS_MUL: ea (); sprintf (buffer, "MUS (0%06o)", y); IN; - etime = 10; + //etime = 10; break; case DIS_DIV: ea (); sprintf (buffer, "DIS (0%06o)", y); IN; - etime = 10; + //etime = 10; break; case JMP: ea (); sprintf (buffer, "JMP 0%06o ", y); IN; - etime = 5; + //etime = 5; break; case JSP: ea (); sprintf (buffer, "JSP 0%06o ", y); IN; - etime = 5; + //etime = 5; break; case SKP: { @@ -183,7 +183,7 @@ CPU_DISASSEMBLE( pdp1 ) if (y & 7) sprintf (buffer + strlen (buffer), "SZF 0%01o ", (y & 7)); IN; - etime = 5; + //etime = 5; break; } case SFT: @@ -200,55 +200,55 @@ CPU_DISASSEMBLE( pdp1 ) { case 1: sprintf (buffer, "RAL 0%02o", nshift); - etime = 5; + //etime = 5; break; case 2: sprintf (buffer, "RIL 0%02o", nshift); - etime = 5; + //etime = 5; break; case 3: sprintf (buffer, "RCL 0%02o", nshift); - etime = 5; + //etime = 5; break; case 5: sprintf (buffer, "SAL 0%02o", nshift); - etime = 5; + //etime = 5; break; case 6: sprintf (buffer, "SIL 0%02o", nshift); - etime = 5; + //etime = 5; break; case 7: sprintf (buffer, "SCL 0%02o", nshift); - etime = 5; + //etime = 5; break; case 9: sprintf (buffer, "RAR 0%02o", nshift); - etime = 5; + //etime = 5; break; case 10: sprintf (buffer, "RIR 0%02o", nshift); - etime = 5; + //etime = 5; break; case 11: sprintf (buffer, "RCR 0%02o", nshift); - etime = 5; + //etime = 5; break; case 13: sprintf (buffer, "SAR 0%02o", nshift); - etime = 5; + //etime = 5; break; case 14: sprintf (buffer, "SIR 0%02o", nshift); - etime = 5; + //etime = 5; break; case 15: sprintf (buffer, "SCR 0%02o", nshift); - etime = 5; + //etime = 5; break; default: sprintf (buffer, "SKP ???"); - etime = 5; + //etime = 5; break; } break; @@ -256,11 +256,11 @@ CPU_DISASSEMBLE( pdp1 ) case LAW: sprintf (buffer, "LAW 0%06o", y); IN; - etime = 5; + //etime = 5; break; case IOT: sprintf (buffer, "IOT 0%06o", md); - etime = 10; + //etime = 10; break; case OPR: { @@ -281,12 +281,12 @@ CPU_DISASSEMBLE( pdp1 ) sprintf (buffer + strlen (buffer), "CLF 0%01o ", (y & 7)); if (!(y)) sprintf (buffer + strlen (buffer), "NOP "); - etime = 5; + //etime = 5; break; } default: sprintf (buffer, "ILLEGAL"); - etime = 5; + //etime = 5; break; } return 4; diff --git a/src/emu/cpu/powerpc/ppc403.c b/src/emu/cpu/powerpc/ppc403.c index d10fdc110a9..94e4016862c 100644 --- a/src/emu/cpu/powerpc/ppc403.c +++ b/src/emu/cpu/powerpc/ppc403.c @@ -611,12 +611,14 @@ static void ppc403_spu_w(UINT32 a, UINT8 d) ppc.spu.sprc = d; if (ppc.spu.sprc & 0x80) /* enable RX */ { + /* int baud_rate; if (ppc.iocr & 0x2) { baud_rate = (3686400 / (ppc.spu.brd + 1)) / 16; } else { baud_rate = (33333333 / (ppc.spu.brd + 1)) / 16; } + */ /* check if serial port is hooked to a DMA channel */ /* if so, do a DMA operation */ diff --git a/src/emu/info.c b/src/emu/info.c index 34d6e53374f..2d252118594 100644 --- a/src/emu/info.c +++ b/src/emu/info.c @@ -79,7 +79,7 @@ enum {cjoy, cdoublejoy, cAD_stick, cdial, ctrackball, cpaddle, clightgun, cpedal int nplayer = 0; int nbutton = 0; int ncoin = 0; - int controlsyes = 0; + //int controlsyes = 0; int analogcontrol = 0; int i; const char* service = 0; @@ -135,7 +135,7 @@ enum {cjoy, cdoublejoy, cAD_stick, cdial, ctrackball, cpaddle, clightgun, cpedal else control[cjoy].Xway = "joy8way"; } - controlsyes = 1; + //controlsyes = 1; break; case IPT_JOYSTICK_UP: @@ -154,7 +154,7 @@ enum {cjoy, cdoublejoy, cAD_stick, cdial, ctrackball, cpaddle, clightgun, cpedal else control[cjoy].Xway = "joy8way"; } - controlsyes = 1; + //controlsyes = 1; break; case IPT_JOYSTICKRIGHT_UP: @@ -175,7 +175,7 @@ enum {cjoy, cdoublejoy, cAD_stick, cdial, ctrackball, cpaddle, clightgun, cpedal else control[cdoublejoy].Xway = "doublejoy8way"; } - controlsyes = 1; + //controlsyes = 1; break; case IPT_JOYSTICKRIGHT_LEFT: @@ -196,7 +196,7 @@ enum {cjoy, cdoublejoy, cAD_stick, cdial, ctrackball, cpaddle, clightgun, cpedal else control[cdoublejoy].Xway = "doublejoy8way"; } - controlsyes = 1; + //controlsyes = 1; break; /* mark as an analog input, and get analog stats after switch */ @@ -265,7 +265,7 @@ enum {cjoy, cdoublejoy, cAD_stick, cdial, ctrackball, cpaddle, clightgun, cpedal /* get the analog stats */ if (analogcontrol) { - controlsyes = 1; + //controlsyes = 1; control[analogcontrol].analog = 1; if (field->min) diff --git a/src/emu/machine/68681.c b/src/emu/machine/68681.c index 5dc18e2ea27..0b416ddebe2 100644 --- a/src/emu/machine/68681.c +++ b/src/emu/machine/68681.c @@ -399,10 +399,10 @@ READ8_DEVICE_HANDLER(duart68681_r) { case 0x07: /* Timer, CLK/16 */ { - double hz; + //double hz; //attotime rate = attotime_mul(ATTOTIME_IN_HZ(duart68681->clock), 16*duart68681->CTR.w.l); attotime rate = ATTOTIME_IN_HZ(2*device->clock/(2*16*16*duart68681->CTR.w.l)); - hz = ATTOSECONDS_TO_HZ(rate.attoseconds); + //hz = ATTOSECONDS_TO_HZ(rate.attoseconds); timer_adjust_periodic(duart68681->duart_timer, rate, 0, rate); } break; diff --git a/src/emu/uigfx.c b/src/emu/uigfx.c index 7c9e7bccf5e..52570446f57 100644 --- a/src/emu/uigfx.c +++ b/src/emu/uigfx.c @@ -430,7 +430,7 @@ static void gfxset_handler(running_machine *machine, ui_gfx_state *state) float cellwidth, cellheight; float chwidth, chheight; float titlewidth; - float cellaspect; + //float cellaspect; float x0, y0; render_bounds cellboxbounds; render_bounds boxbounds; @@ -497,7 +497,7 @@ static void gfxset_handler(running_machine *machine, ui_gfx_state *state) /* compute the size of a single cell at this pixel scale factor, as well as the aspect ratio */ cellwidth = (cellboxwidth / (float)xcells) / (float)targwidth; cellheight = (cellboxheight / (float)ycells) / (float)targheight; - cellaspect = cellwidth / cellheight; + //cellaspect = cellwidth / cellheight; /* working from the new width/height, recompute the boxbounds */ fullwidth = (float)cellboxwidth / (float)targwidth + 6.5f * chwidth; diff --git a/src/emu/validity.c b/src/emu/validity.c index 88461cfd86b..f790755a30f 100644 --- a/src/emu/validity.c +++ b/src/emu/validity.c @@ -1385,7 +1385,7 @@ static int validate_inputs(int drivnum, const machine_config *config, const inpu for (field = port->fieldlist; field != NULL; field = field->next) { const input_setting_config *setting; - int strindex = 0; + //int strindex = 0; /* verify analog inputs */ if (input_type_is_analog(field->type)) @@ -1437,7 +1437,7 @@ static int validate_inputs(int drivnum, const machine_config *config, const inpu } /* look up the string and print an error if default strings are not used */ - strindex = get_defstr_index(field->name, driver, &error); + /*strindex = */get_defstr_index(field->name, driver, &error); } /* verify conditions on the field */ diff --git a/src/mame/audio/invinco.c b/src/mame/audio/invinco.c index 2436924d03a..e5c1cb2adbf 100644 --- a/src/mame/audio/invinco.c +++ b/src/mame/audio/invinco.c @@ -68,12 +68,12 @@ WRITE8_HANDLER( invinco_audio_w ) static int port2State = 0; const device_config *samples = devtag_get_device(space->machine, "samples"); int bitsChanged; - int bitsGoneHigh; + //int bitsGoneHigh; int bitsGoneLow; bitsChanged = port2State ^ data; - bitsGoneHigh = bitsChanged & data; + //bitsGoneHigh = bitsChanged & data; bitsGoneLow = bitsChanged & ~data; port2State = data; diff --git a/src/mame/audio/pulsar.c b/src/mame/audio/pulsar.c index 825e415a031..e74fa900e6e 100644 --- a/src/mame/audio/pulsar.c +++ b/src/mame/audio/pulsar.c @@ -90,12 +90,12 @@ WRITE8_HANDLER( pulsar_audio_1_w ) { const device_config *samples = devtag_get_device(space->machine, "samples"); int bitsChanged; - int bitsGoneHigh; + //int bitsGoneHigh; int bitsGoneLow; bitsChanged = port1State ^ data; - bitsGoneHigh = bitsChanged & data; + //bitsGoneHigh = bitsChanged & data; bitsGoneLow = bitsChanged & ~data; port1State = data; diff --git a/src/mame/audio/snes.c b/src/mame/audio/snes.c index 118d0c41f1e..00cda568d5d 100644 --- a/src/mame/audio/snes.c +++ b/src/mame/audio/snes.c @@ -243,9 +243,9 @@ static void DSP_Update /* Mix one sample of audio */ int V; #ifndef NO_ECHO int echo_base; -#endif int echol; int echor; +#endif int envx; int m; int outl; @@ -291,8 +291,10 @@ if( noise_cnt <= 0 ) } outl = 0; outr = 0; +#ifndef NO_ECHO echol = 0; echor = 0; +#endif for( v = 0, m = 1, V = 0; v < 8; v++, V += 16, m <<= 1 ) { vp = &voice_state[ v ]; @@ -630,8 +632,10 @@ for( v = 0, m = 1, V = 0; v < 8; v++, V += 16, m <<= 1 ) outr += vr; if( DSPregs[ 0x4D ] & m ) { +#ifndef NO_ECHO echol += vl; echor += vr; +#endif } } outl = ( outl * ( signed char )DSPregs[ 0x0C ] ) >> 7; diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c index 60a22f0fc7e..d3154ea4e7f 100644 --- a/src/mame/drivers/adp.c +++ b/src/mame/drivers/adp.c @@ -363,8 +363,9 @@ static READ16_HANDLER(t2_r) vblank ^=0x40; hblank ^=0x20; -return mame_rand(space->machine) & 0x00f0; + return mame_rand(space->machine) & 0x00f0; +// FIXME: this code is never executed // popmessage("%08x",cpu_get_pc(space->cpu)); // return 0x0000; return 0xff9f | vblank | hblank; diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c index c6713034270..ffc394f8d99 100644 --- a/src/mame/drivers/cps3.c +++ b/src/mame/drivers/cps3.c @@ -1042,18 +1042,18 @@ static VIDEO_UPDATE(cps3) if (xsize2==0) // xsize of 0 tiles seems to be a special command to draw tilemaps { int tilemapnum = ((value3 & 0x00000030)>>4); - int startline;// = value2 & 0x3ff; - int endline; - int height = (value3 & 0x7f000000)>>24; + //int startline;// = value2 & 0x3ff; + //int endline; + //int height = (value3 & 0x7f000000)>>24; int uu; UINT32* tmapregs[4] = { tilemap20_regs_base, tilemap30_regs_base, tilemap40_regs_base, tilemap50_regs_base }; UINT32* regs; regs = tmapregs[tilemapnum]; - endline = value2; - startline = endline - height; + //endline = value2; + //startline = endline - height; - startline &=0x3ff; - endline &=0x3ff; + //startline &=0x3ff; + //endline &=0x3ff; //printf("tilemap draw %01x %02x %02x %02x\n",tilemapnum, value2, height, regs[0]&0x000003ff ); diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index 89670b582ae..2eceaf76fee 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -1192,7 +1192,9 @@ static void jamma_jvs_cmd_exec(running_machine *machine) { UINT8 sync, node, byte_num; UINT8 data[1024], rdata[1024]; +#if 0 int length; +#endif int rdata_ptr; int sum; @@ -1200,8 +1202,10 @@ static void jamma_jvs_cmd_exec(running_machine *machine) node = jvs_sdata[1]; byte_num = jvs_sdata[2]; - length = jvs_decode_data(&jvs_sdata[3], data, byte_num-1); - +#if 0 + length = +#endif + jvs_decode_data(&jvs_sdata[3], data, byte_num-1); #if 0 printf("jvs input data:\n"); for (i=0; i < byte_num; i++) diff --git a/src/mame/drivers/jpmimpct.c b/src/mame/drivers/jpmimpct.c index 568bc75472f..b9143ad0dad 100644 --- a/src/mame/drivers/jpmimpct.c +++ b/src/mame/drivers/jpmimpct.c @@ -308,7 +308,7 @@ static READ16_HANDLER( duart_1_r ) static WRITE16_HANDLER( duart_1_w ) { - int old_val; + //int old_val; switch (offset) { case 0x1: @@ -364,7 +364,7 @@ static WRITE16_HANDLER( duart_1_w ) } case 0xe: { - old_val = duart_1.OPR; + //old_val = duart_1.OPR; duart_1.OPR = duart_1.OPR | data; duart_1.OP = ~duart_1.OPR; /* Output port bit set */ @@ -372,7 +372,7 @@ static WRITE16_HANDLER( duart_1_w ) } case 0xf: { - old_val = duart_1.OPR; + //old_val = duart_1.OPR; duart_1.OPR = duart_1.OPR &~data; duart_1.OP = ~duart_1.OPR; /* Output port bit reset */ diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c index d7faf801a68..f6b1dc05c91 100644 --- a/src/mame/drivers/konamigv.c +++ b/src/mame/drivers/konamigv.c @@ -454,12 +454,12 @@ static NVRAM_HANDLER( simpbowl ) static READ32_HANDLER( flash_r ) { int reg = offset*2; - int shift = 0; + //int shift = 0; if (mem_mask == 0xffff0000) { reg++; - shift = 16; + //shift = 16; } if (reg == 4) // set odd address diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c index 06b3be084a8..b4ca765a75d 100644 --- a/src/mame/drivers/konamim2.c +++ b/src/mame/drivers/konamim2.c @@ -789,18 +789,18 @@ static void cde_handle_reports(void) static void cde_dma_transfer(const address_space *space, int channel, int next) { UINT32 address; - int length; + //int length; int i; if (next) { address = cde_dma[channel].next_dst_addr; - length = cde_dma[channel].next_length; + //length = cde_dma[channel].next_length; } else { address = cde_dma[channel].dst_addr; - length = cde_dma[channel].length; + //length = cde_dma[channel].length; } for (i=0; i < cde_dma[channel].next_length; i++) diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c index faa78946ea1..bcdcb4ec24c 100644 --- a/src/mame/drivers/maygayv1.c +++ b/src/mame/drivers/maygayv1.c @@ -464,10 +464,11 @@ static void update_outputs(UINT16 which) for (i = 0; i < 16; i++) if (which & (1 << i)) { +/* int val; val = i8279.ram[i] & 0xff; -/* + val = i8279.ram[i] & 0x0f; if (i8279.inhibit & 0x01) val = i8279.clear & 0x0f; diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c index c5c80bcbc2c..986ae2038f8 100644 --- a/src/mame/drivers/megadriv.c +++ b/src/mame/drivers/megadriv.c @@ -3910,7 +3910,7 @@ MACHINE_DRIVER_END /****************************************** END SVP related *************************************/ -static attotime time_elapsed_since_crap; +//static attotime time_elapsed_since_crap; VIDEO_START(megadriv) @@ -6142,14 +6142,14 @@ int megadrive_z80irq_hpos = 320; if (0) { - int xxx; + //int xxx; UINT64 frametime; // /* reference */ frametime = ATTOSECONDS_PER_SECOND/megadriv_framerate; - time_elapsed_since_crap = timer_timeelapsed(frame_timer); - xxx = cputag_attotime_to_clocks(machine, "maincpu",time_elapsed_since_crap); + //time_elapsed_since_crap = timer_timeelapsed(frame_timer); + //xxx = cputag_attotime_to_clocks(machine, "maincpu",time_elapsed_since_crap); //mame_printf_debug("---------- cycles %d, %08x %08x\n",xxx, (UINT32)(time_elapsed_since_crap.attoseconds>>32),(UINT32)(time_elapsed_since_crap.attoseconds&0xffffffff)); //mame_printf_debug("---------- framet %d, %08x %08x\n",xxx, (UINT32)(frametime>>32),(UINT32)(frametime&0xffffffff)); timer_adjust_oneshot(frame_timer, attotime_zero, 0); diff --git a/src/mame/drivers/rabbit.c b/src/mame/drivers/rabbit.c index 0e32c717c32..fa2e69e0fc8 100644 --- a/src/mame/drivers/rabbit.c +++ b/src/mame/drivers/rabbit.c @@ -483,9 +483,9 @@ static READ32_HANDLER( randomrabbits ) static WRITE32_HANDLER ( rabbit_rombank_w ) { UINT8 *dataroms = memory_region(space->machine, "gfx1"); - int bank; +// int bank; // mame_printf_debug("rabbit rombank %08x\n",data&0x3ff); - bank = data & 0x3ff; +// bank = data & 0x3ff; // memory_set_bankptr(space->machine, 1,&dataroms[0x40000*(bank&0x3ff)]); memory_set_bankptr(space->machine, 1,&dataroms[0]); diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c index 0b4084c8c08..75e472e93d1 100644 --- a/src/mame/drivers/simpl156.c +++ b/src/mame/drivers/simpl156.c @@ -176,9 +176,9 @@ static READ32_HANDLER( simpl156_system_r ) static WRITE32_HANDLER( simpl156_eeprom_w ) { - int okibank; + //int okibank; - okibank = data & 0x07; + //okibank = data & 0x07; okim6295_set_bank_base(devtag_get_device(space->machine, "okimusic"), 0x40000 * (data & 0x7) ); diff --git a/src/mame/etc/jrcrypt.c b/src/mame/etc/jrcrypt.c index 4b5f185840b..b2027c961fc 100644 --- a/src/mame/etc/jrcrypt.c +++ b/src/mame/etc/jrcrypt.c @@ -327,7 +327,7 @@ void jr_monitor() { int i; int encrypted=0; - int last_used=-1; + //int last_used=-1; int unmapped_encrypted=0; int unmapped=0; printf("statistics: \n"); @@ -341,7 +341,7 @@ hardware and RAM is */ encrypted = 1; else encrypted = 0; - last_used = i; + //last_used = i; } else { @@ -368,7 +368,7 @@ start,int end); if (c=='d') { char line[100],*l; - int i; + //int i; printf("Enter file prefix (files will be named 'prefix'.8d 'prefix'.8e, etc.\n"); gets(line); // kill newline: diff --git a/src/mame/machine/balsente.c b/src/mame/machine/balsente.c index 048e34d126f..6ed10c4cc24 100644 --- a/src/mame/machine/balsente.c +++ b/src/mame/machine/balsente.c @@ -1082,10 +1082,13 @@ WRITE8_HANDLER( balsente_chip_select_w ) for (i = 0; i < 6; i++) if ((diffchip & (1 << i)) && (data & (1 << i))) { +#if LOG_CEM_WRITES double temp = 0; /* remember the previous value */ - temp = cem3394_get_parameter(cem_device[i], reg); + temp = +#endif + cem3394_get_parameter(cem_device[i], reg); /* set the voltage */ cem3394_set_voltage(cem_device[i], reg, voltage); diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c index ade98de1a87..7ea7df4202e 100644 --- a/src/mame/machine/dc.c +++ b/src/mame/machine/dc.c @@ -1179,10 +1179,10 @@ MACHINE_RESET( dc ) READ64_DEVICE_HANDLER( dc_aica_reg_r ) { - int reg; + //int reg; UINT64 shift; - reg = decode_reg32_64(device->machine, offset, mem_mask, &shift); + /*reg = */decode_reg32_64(device->machine, offset, mem_mask, &shift); // mame_printf_verbose("AICA REG: [%08x] read %llx, mask %llx\n", 0x700000+reg*4, (UINT64)offset, mem_mask); diff --git a/src/mame/machine/r2crypt.c b/src/mame/machine/r2crypt.c index 176c27fd7be..9f1633ea8c9 100644 --- a/src/mame/machine/r2crypt.c +++ b/src/mame/machine/r2crypt.c @@ -256,16 +256,16 @@ void raiden2_decrypt_sprites(running_machine *machine) UINT32 x1, v1, y1; int idx = i & 0xff; - int i2; - int idx2; + //int i2; + //int idx2; - idx2 = ((i>>7) & 0x3ff) | ((i>>8) & 0x400); + //idx2 = ((i>>7) & 0x3ff) | ((i>>8) & 0x400); if(i & 0x008000) idx ^= 1; if(i & 0x100000) idx ^= 256; - i2 = i >> 8; + //i2 = i >> 8; v1 = sw(yrot(data[i], gr(i))); diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c index 0e560021edf..e820a383bca 100644 --- a/src/mame/video/deco32.c +++ b/src/mame/video/deco32.c @@ -420,7 +420,7 @@ static void nslasher_draw_sprites(running_machine* machine, bitmap_t *bitmap, co for (offs = 0; offs<0x400; offs+=4) { int x,y,sprite,colour,multi,fx,fy,inc,flash,mult; /*,pri=0,spri=0;*/ - int trans; + //int trans; sprite = spritedata[offs+1] & 0xffff; @@ -428,7 +428,7 @@ static void nslasher_draw_sprites(running_machine* machine, bitmap_t *bitmap, co flash=y&0x1000; if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; - trans=TRANSPARENCY_PEN; + //trans=TRANSPARENCY_PEN; x = spritedata[offs+2]; // Prepare colour, priority and alpha info diff --git a/src/mame/video/konamiic.c b/src/mame/video/konamiic.c index e0480aca825..b8c928d7740 100644 --- a/src/mame/video/konamiic.c +++ b/src/mame/video/konamiic.c @@ -7996,7 +7996,7 @@ INLINE void K053250_pdraw_scanline32(bitmap_t *bitmap, const pen_t *palette, UIN UINT32 src_wrapmask; UINT8 *src_base; - int src_x; + //int src_x; int src_fx, src_fdx; int pix_data, dst_offset; const pen_t *pal_base; @@ -8104,7 +8104,7 @@ INLINE void K053250_pdraw_scanline32(bitmap_t *bitmap, const pen_t *palette, UIN // generalized src_base = source; - src_x = 0; + //src_x = 0; // there is no need to wrap source offsets along with source clipping // so we set all bits of the wrapmask to one diff --git a/src/mame/video/midtunit.c b/src/mame/video/midtunit.c index 7b8c10cdb51..2009a52f799 100644 --- a/src/mame/video/midtunit.c +++ b/src/mame/video/midtunit.c @@ -293,10 +293,10 @@ READ16_HANDLER( midwunit_control_r ) WRITE16_HANDLER( midtunit_paletteram_w ) { - int newword; + //int newword; COMBINE_DATA(&paletteram16[offset]); - newword = paletteram16[offset]; + //newword = paletteram16[offset]; palette_set_color_rgb(space->machine, offset, pal5bit(data >> 10), pal5bit(data >> 5), pal5bit(data >> 0)); } diff --git a/src/mame/video/model1.c b/src/mame/video/model1.c index fb17c13c304..83342ab3bba 100644 --- a/src/mame/video/model1.c +++ b/src/mame/video/model1.c @@ -731,7 +731,9 @@ static void push_object(running_machine *machine, UINT32 tex_adr, UINT32 poly_ad struct point *old_p0, *old_p1, *p0, *p1; struct vector vn; int link, type; +#if 0 int dump; +#endif int lightmode; float old_z; struct quad cquad; @@ -743,8 +745,10 @@ static void push_object(running_machine *machine, UINT32 tex_adr, UINT32 poly_ad poly_data=(float *) poly_rom; poly_adr &= 0x7fffff; +#if 0 dump = poly_adr == 0x944ea; dump = 0; +#endif #if 0 if(poly_adr < 0x10000 || poly_adr >= 0x80000) diff --git a/src/mame/video/n64.c b/src/mame/video/n64.c index d8ea30029d4..d0c8f3d773c 100644 --- a/src/mame/video/n64.c +++ b/src/mame/video/n64.c @@ -1814,7 +1814,7 @@ static void render_spans_32(int start, int end, int tilenum, int shade, int text if (x >= clipx1 && x < clipx2) { - int alpha_out = 0; + //int alpha_out = 0; COLOR c1, c2; c1.r = c1.g = c1.b = c1.a = 0; c2.r = c2.g = c2.b = c2.a = 0; @@ -1901,7 +1901,7 @@ static void render_spans_32(int start, int end, int tilenum, int shade, int text c1 = COLOR_COMBINER(0); if( c1.a == 0 ) { - alpha_out = 1; + //alpha_out = 1; } } else if (other_modes.cycle_type == CYCLE_TYPE_2) @@ -1910,7 +1910,7 @@ static void render_spans_32(int start, int end, int tilenum, int shade, int text c2 = COLOR_COMBINER(1); if( c2.a == 0 ) { - alpha_out = 1; + //alpha_out = 1; } } @@ -2120,7 +2120,7 @@ static void render_spans_16(int start, int end, int tilenum, int shade, int text UINT16 sz = z >> 16; int oz; int sss = 0, sst = 0; - int alpha_out = 0; + //int alpha_out = 0; COLOR c1, c2; c1.r = c1.g = c1.b = c1.a = 0; c2.r = c2.g = c2.b = c2.a = 0; @@ -2209,7 +2209,7 @@ static void render_spans_16(int start, int end, int tilenum, int shade, int text c1 = COLOR_COMBINER(0); if( c1.a == 0 ) { - alpha_out = 1; + //alpha_out = 1; } } else if (other_modes.cycle_type == CYCLE_TYPE_2) @@ -2218,7 +2218,7 @@ static void render_spans_16(int start, int end, int tilenum, int shade, int text c2 = COLOR_COMBINER(1); if( c2.a == 0 ) { - alpha_out = 1; + //alpha_out = 1; } } @@ -2292,9 +2292,9 @@ static void triangle(UINT32 w1, UINT32 w2, int shade, int texture, int zbuffer) int xleft, xright, xleft_inc, xright_inc; int xstart, xend; int r, g, b, a, z, s, t, w; - int dr, dg, db, da; + //int dr, dg, db, da; int drdx = 0, dgdx = 0, dbdx = 0, dadx = 0, dzdx = 0, dsdx = 0, dtdx = 0, dwdx = 0; - int drdy = 0, dgdy = 0, dbdy = 0, dady = 0, dzdy = 0, dsdy = 0, dtdy = 0, dwdy = 0; + //int drdy = 0, dgdy = 0, dbdy = 0, dady = 0, dzdy = 0, dsdy = 0, dtdy = 0, dwdy = 0; int drde = 0, dgde = 0, dbde = 0, dade = 0, dzde = 0, dsde = 0, dtde = 0, dwde = 0; int tile; int flip = (w1 & 0x800000) ? 1 : 0; @@ -2345,7 +2345,7 @@ static void triangle(UINT32 w1, UINT32 w2, int shade, int texture, int zbuffer) tile = (w1 >> 16) & 0x7; r = 0xff; g = 0xff; b = 0xff; a = 0xff; z = 0; s = 0; t = 0; w = 0; - dr = 0; dg = 0; db = 0; da = 0; + //dr = 0; dg = 0; db = 0; da = 0; if (shade) { @@ -2361,10 +2361,10 @@ static void triangle(UINT32 w1, UINT32 w2, int shade, int texture, int zbuffer) dgde = ((rdp_cmd_data[shade_base+8 ] << 16) & 0xffff0000) | (rdp_cmd_data[shade_base+12] & 0x0000ffff); dbde = (rdp_cmd_data[shade_base+9 ] & 0xffff0000) | ((rdp_cmd_data[shade_base+13] >> 16) & 0x0000ffff); dade = ((rdp_cmd_data[shade_base+9 ] << 16) & 0xffff0000) | (rdp_cmd_data[shade_base+13] & 0x0000ffff); - drdy = (rdp_cmd_data[shade_base+10] & 0xffff0000) | ((rdp_cmd_data[shade_base+14] >> 16) & 0x0000ffff); - dgdy = ((rdp_cmd_data[shade_base+10] << 16) & 0xffff0000) | (rdp_cmd_data[shade_base+14] & 0x0000ffff); - dbdy = (rdp_cmd_data[shade_base+11] & 0xffff0000) | ((rdp_cmd_data[shade_base+15] >> 16) & 0x0000ffff); - dady = ((rdp_cmd_data[shade_base+11] << 16) & 0xffff0000) | (rdp_cmd_data[shade_base+15] & 0x0000ffff); + //drdy = (rdp_cmd_data[shade_base+10] & 0xffff0000) | ((rdp_cmd_data[shade_base+14] >> 16) & 0x0000ffff); + //dgdy = ((rdp_cmd_data[shade_base+10] << 16) & 0xffff0000) | (rdp_cmd_data[shade_base+14] & 0x0000ffff); + //dbdy = (rdp_cmd_data[shade_base+11] & 0xffff0000) | ((rdp_cmd_data[shade_base+15] >> 16) & 0x0000ffff); + //dady = ((rdp_cmd_data[shade_base+11] << 16) & 0xffff0000) | (rdp_cmd_data[shade_base+15] & 0x0000ffff); } if (texture) { @@ -2377,16 +2377,16 @@ static void triangle(UINT32 w1, UINT32 w2, int shade, int texture, int zbuffer) dsde = (rdp_cmd_data[texture_base+8 ] & 0xffff0000) | ((rdp_cmd_data[texture_base+12] >> 16) & 0x0000ffff); dtde = ((rdp_cmd_data[texture_base+8 ] << 16) & 0xffff0000) | (rdp_cmd_data[texture_base+12] & 0x0000ffff); dwde = (rdp_cmd_data[texture_base+9 ] & 0xffff0000) | ((rdp_cmd_data[texture_base+13] >> 16) & 0x0000ffff); - dsdy = (rdp_cmd_data[texture_base+10] & 0xffff0000) | ((rdp_cmd_data[texture_base+14] >> 16) & 0x0000ffff); - dtdy = ((rdp_cmd_data[texture_base+10] << 16) & 0xffff0000) | (rdp_cmd_data[texture_base+14] & 0x0000ffff); - dwdy = (rdp_cmd_data[texture_base+11] & 0xffff0000) | ((rdp_cmd_data[texture_base+15] >> 16) & 0x0000ffff); + //dsdy = (rdp_cmd_data[texture_base+10] & 0xffff0000) | ((rdp_cmd_data[texture_base+14] >> 16) & 0x0000ffff); + //dtdy = ((rdp_cmd_data[texture_base+10] << 16) & 0xffff0000) | (rdp_cmd_data[texture_base+14] & 0x0000ffff); + //dwdy = (rdp_cmd_data[texture_base+11] & 0xffff0000) | ((rdp_cmd_data[texture_base+15] >> 16) & 0x0000ffff); } if (zbuffer) { z = rdp_cmd_data[zbuffer_base+0]; dzdx = rdp_cmd_data[zbuffer_base+1]; dzde = rdp_cmd_data[zbuffer_base+2]; - dzdy = rdp_cmd_data[zbuffer_base+3]; + //dzdy = rdp_cmd_data[zbuffer_base+3]; } xleft = xm; diff --git a/src/mame/video/ppu2c0x.c b/src/mame/video/ppu2c0x.c index 45a10875464..bd0be93a457 100644 --- a/src/mame/video/ppu2c0x.c +++ b/src/mame/video/ppu2c0x.c @@ -199,6 +199,7 @@ void ppu2c0x_init_palette(running_machine *machine, int first_entry ) /* Loop through the emphasis modes (8 total) */ for (colorEmphasis = 0; colorEmphasis < 8; colorEmphasis ++) { + /* double r_mod = 0.0; double g_mod = 0.0; double b_mod = 0.0; @@ -214,6 +215,7 @@ void ppu2c0x_init_palette(running_machine *machine, int first_entry ) case 6: r_mod = 1.02; g_mod = .98; b_mod = .653; break; case 7: r_mod = .75; g_mod = .75; b_mod = .75; break; } + */ /* loop through the 4 intensities */ for (colorIntensity = 0; colorIntensity < 4; colorIntensity++) diff --git a/src/mame/video/stvvdp2.c b/src/mame/video/stvvdp2.c index 78591c18896..18880d7e2d5 100644 --- a/src/mame/video/stvvdp2.c +++ b/src/mame/video/stvvdp2.c @@ -2959,7 +2959,7 @@ static void stv_vdp2_draw_basic_bitmap(running_machine *machine, bitmap_t *bitma case 1: if ( stv2_current_tilemap.incx == 0x10000 && stv2_current_tilemap.incy == 0x10000 ) { - int gfx_wraparound = -1; + //int gfx_wraparound = -1; gfxdata += xlinesize*cliprect->min_y; @@ -2985,7 +2985,7 @@ static void stv_vdp2_draw_basic_bitmap(running_machine *machine, bitmap_t *bitma } if ( (gfxdata + xs) >= gfxdatahigh ) { - gfx_wraparound = (ycnt << 16) | xcnt; + //gfx_wraparound = (ycnt << 16) | xcnt; gfxdata = gfxdatalow - xs; } } diff --git a/src/mame/video/tubep.c b/src/mame/video/tubep.c index 7dc9d168fae..a45c0468dcc 100644 --- a/src/mame/video/tubep.c +++ b/src/mame/video/tubep.c @@ -183,7 +183,7 @@ PALETTE_INIT( tubep ) double weights_g[3*6]; double weights_b[2*6]; - double output_scaler; + //double output_scaler; /* text palette variables */ @@ -251,10 +251,12 @@ PALETTE_INIT( tubep ) for (i=0; i<6; i++) active_resistors_b[ 6+i] = resistors_2[i]; /* calculate and store the scaler */ +/* output_scaler = compute_resistor_weights(0, 255, -1.0, 3*6, active_resistors_r, weights_r, 470, 0, 3*6, active_resistors_g, weights_g, 470, 0, 2*6, active_resistors_b, weights_b, 470, 0); +*/ /* compute_resistor_weights(0, 255, output_scaler, 3*6, active_resistors_r, weights_r, 470, 0, @@ -278,9 +280,9 @@ PALETTE_INIT( tubep ) double out; int c; - int active_r = 3*6; - int active_g = 3*6; - int active_b = 2*6; + //int active_r = 3*6; + //int active_g = 3*6; + //int active_b = 2*6; for (c=0; c<6; c++) { @@ -302,46 +304,46 @@ PALETTE_INIT( tubep ) if ((j >> 0) & 0x01) /* if LS368 @E9 is disabled */ { for (c=0; c<6; c++) bits_r[0 +c] = 0; - active_r-=6; + //active_r-=6; } if ((j >> 1) & 0x01) /* if LS368 @E10 is disabled */ { for (c=0; c<6; c++) bits_r[6 +c] = 0; - active_r-=6; + //active_r-=6; } if ((j >> 2) & 0x01) /* if LS368 @E11 is disabled */ { for (c=0; c<6; c++) bits_r[12 +c] = 0; - active_r-=6; + //active_r-=6; } /* green component */ if ((j >> 3) & 0x01) /* if LS368 @E12 is disabled */ { for (c=0; c<6; c++) bits_g[0 +c] = 0; - active_g-=6; + //active_g-=6; } if ((j >> 4) & 0x01) /* if LS368 @E13 is disabled */ { for (c=0; c<6; c++) bits_g[6 +c] = 0; - active_g-=6; + //active_g-=6; } if ((j >> 5) & 0x01) /* if LS368 @E14 is disabled */ { for (c=0; c<6; c++) bits_g[12+c] = 0; - active_g-=6; + //active_g-=6; } /* blue component */ if ((j >> 6) & 0x01) /* if LS368 @E15 is disabled */ { for (c=0; c<6; c++) bits_b[0 +c] = 0; - active_b-=6; + //active_b-=6; } if ((j >> 7) & 0x01) /* if LS368 @E16 is disabled */ { for (c=0; c<6; c++) bits_b[6 +c] = 0; - active_b-=6; + //active_b-=6; } out = 0.0; diff --git a/src/mame/video/ygv608.c b/src/mame/video/ygv608.c index b3d8f257506..c8c8d3009f7 100644 --- a/src/mame/video/ygv608.c +++ b/src/mame/video/ygv608.c @@ -736,7 +736,9 @@ VIDEO_UPDATE( ygv608 ) #ifdef _SHOW_VIDEO_DEBUG char buffer[64]; #endif +#ifdef _ENABLE_SCROLLY int col; +#endif #ifdef _ENABLE_ROTATE_ZOOM int xc, yc; double r, alpha, sin_theta, cos_theta; @@ -1570,7 +1572,7 @@ static void SetPostShortcuts( running_machine *machine, int reg ) #ifdef MAME_DEBUG -#define nSHOW_SOURCE_MODE +//#define SHOW_SOURCE_MODE #if 0 void dump_block( char *name, UINT8 *block, int len ) @@ -1592,7 +1594,9 @@ READ16_HANDLER( ygv608_debug_trigger ) { static int oneshot = 0; +#ifndef SHOW_SOURCE_MODE int i; +#endif char ascii[16]; if( oneshot ) |