diff options
author | Aaron Giles <aaron@aarongiles.com> | 2009-05-07 15:46:14 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2009-05-07 15:46:14 +0000 |
commit | 673ca66750503dbef77b967ed1fbaa0d86355513 (patch) | |
tree | 3d26385d287b623e0dedc2cdd5d3fc3a9dafde31 | |
parent | c80c4730c4170342f34e5b92e3ca9132490bf977 (diff) |
Cleanups and version bump.mame0131u1
74 files changed, 487 insertions, 486 deletions
diff --git a/src/emu/cpu/h83002/h8_8.c b/src/emu/cpu/h83002/h8_8.c index 4d1a695158b..6a4b7934e2f 100644 --- a/src/emu/cpu/h83002/h8_8.c +++ b/src/emu/cpu/h83002/h8_8.c @@ -310,9 +310,9 @@ static int h8_get_priority(h83xx_state *h8, UINT8 bit) case 11: // IRQ7 if (h8->per_regs[0xc7]&0x80) res = 1; break; case 28: // SCI0 Rx - if (h8->per_regs[0xda]&0x40) res = 1; break; + if (h8->per_regs[0xda]&0x40) res = 1; break; case 32: // SCI1 Rx - if (h8->per_regs[0x8a]&0x40) res = 1; break; + if (h8->per_regs[0x8a]&0x40) res = 1; break; } return res; } diff --git a/src/emu/machine/x76f041.c b/src/emu/machine/x76f041.c index fb26eaf74de..c54617a3db6 100644 --- a/src/emu/machine/x76f041.c +++ b/src/emu/machine/x76f041.c @@ -115,7 +115,7 @@ void x76f041_init( running_machine *machine, int chip, UINT8 *data ) if( data == NULL ) { - data = auto_alloc_array( machine, UINT8, + data = auto_alloc_array( machine, UINT8, SIZE_RESPONSE_TO_RESET + SIZE_READ_PASSWORD + SIZE_WRITE_PASSWORD + diff --git a/src/emu/machine/x76f100.c b/src/emu/machine/x76f100.c index d355b7c6cac..80c77d54b27 100644 --- a/src/emu/machine/x76f100.c +++ b/src/emu/machine/x76f100.c @@ -84,7 +84,7 @@ void x76f100_init( running_machine *machine, int chip, UINT8 *data ) if( data == NULL ) { - data = auto_alloc_array( machine, UINT8, + data = auto_alloc_array( machine, UINT8, SIZE_RESPONSE_TO_RESET + SIZE_READ_PASSWORD + SIZE_WRITE_PASSWORD + diff --git a/src/emu/sound/sn76496.c b/src/emu/sound/sn76496.c index d356c791771..3804edbeef3 100644 --- a/src/emu/sound/sn76496.c +++ b/src/emu/sound/sn76496.c @@ -32,24 +32,24 @@ 23/04/2007 : Lord Nightmare Major update, implement all three different noise generation algorithms and a set_variant call to discern among them. - + 28/04/2009 : Lord Nightmare Add READY line readback; cleaned up struct a bit. Cleaned up comments. Add more TODOs. Fixed some unsaved savestate related stuff. TODO: * Implement a function for setting stereo regs for the game gear. - Requires making the core support both mono and stereo, and have - a select register which determines which channels go where. - * Implement the TMS9919 and SN94624, which are earlier versions, - possibly lacking the /8 clock divider, of the SN76489, and hence - would have a max clock of 500Khz and 4 clocks per sample, as - opposed to max of 4Mhz and 32 clocks per sample on the SN76489A - * Implement the T6W28; has registers in a weird order, needs writes - to be 'sanitized' first. Also is stereo, similar to game gear. - * Implement the NCR 7496; Is probably 100% compatible with SN76496, - but the whitenoise taps could be different. Needs someone with a - Tandy 1200 or whatever it was which uses this to run some tests. - * Factor out common code so that the SAA1099 can share some code. + Requires making the core support both mono and stereo, and have + a select register which determines which channels go where. + * Implement the TMS9919 and SN94624, which are earlier versions, + possibly lacking the /8 clock divider, of the SN76489, and hence + would have a max clock of 500Khz and 4 clocks per sample, as + opposed to max of 4Mhz and 32 clocks per sample on the SN76489A + * Implement the T6W28; has registers in a weird order, needs writes + to be 'sanitized' first. Also is stereo, similar to game gear. + * Implement the NCR 7496; Is probably 100% compatible with SN76496, + but the whitenoise taps could be different. Needs someone with a + Tandy 1200 or whatever it was which uses this to run some tests. + * Factor out common code so that the SAA1099 can share some code. ***************************************************************************/ #include "sndintrf.h" @@ -162,7 +162,7 @@ WRITE8_DEVICE_HANDLER( sn76496_w ) /* N/512,N/1024,N/2048,Tone #3 output */ R->Period[3] = ((n&3) == 3) ? 2 * R->Period[2] : (STEP << (5+(n&3))); /* Reset noise shifter */ - R->RNG = R->FeedbackMask; + R->RNG = R->FeedbackMask; R->Output[3] = R->RNG & 1; } break; @@ -179,15 +179,15 @@ static STREAM_UPDATE( SN76496Update ) /* If the volume is 0, increase the counter; this is more or less - a speedup hack for when silence is to be output */ + a speedup hack for when silence is to be output */ for (i = 0;i < 4;i++) { if (R->Volume[i] == 0) { - /* note that I do count += samples, NOT count = samples + 1. - You might think it's the same since the volume is 0, but doing - the latter could cause interferencies when the program is - rapidly modulating the volume. */ + /* note that I do count += samples, NOT count = samples + 1. + You might think it's the same since the volume is 0, but doing + the latter could cause interferencies when the program is + rapidly modulating the volume. */ if (R->Count[i] <= samples*STEP) R->Count[i] += samples*STEP; } } @@ -197,7 +197,7 @@ static STREAM_UPDATE( SN76496Update ) int vol[4]; unsigned int out; int left; - + /* decrement Cycles to READY by one */ if (R->CyclestoREADY >0) R->CyclestoREADY--; @@ -209,14 +209,14 @@ static STREAM_UPDATE( SN76496Update ) { if (R->Output[i]) vol[i] += R->Count[i]; R->Count[i] -= STEP; - /* Period[i] is the half period of the square wave. Here, in each - loop I add Period[i] twice, so that at the end of the loop the - square wave is in the same status (0 or 1) it was at the start. - vol[i] is also incremented by Period[i], since the wave has been 1 - exactly half of the time, regardless of the initial position. - If we exit the loop in the middle, Output[i] has to be inverted - and vol[i] incremented only if the exit status of the square - wave is 1. */ + /* Period[i] is the half period of the square wave. Here, in each + loop I add Period[i] twice, so that at the end of the loop the + square wave is in the same status (0 or 1) it was at the start. + vol[i] is also incremented by Period[i], since the wave has been 1 + exactly half of the time, regardless of the initial position. + If we exit the loop in the middle, Output[i] has to be inverted + and vol[i] incremented only if the exit status of the square + wave is 1. */ while (R->Count[i] <= 0) { R->Count[i] += R->Period[i]; diff --git a/src/emu/sound/wave.c b/src/emu/sound/wave.c index d9b5e1dd265..b16446aa646 100644 --- a/src/emu/sound/wave.c +++ b/src/emu/sound/wave.c @@ -34,7 +34,7 @@ static STREAM_UPDATE( wave_sound_update ) state = cassette_get_state(image); state &= CASSETTE_MASK_UISTATE | CASSETTE_MASK_MOTOR | CASSETTE_MASK_SPEAKER; - + if (image_exists(image) && (ALWAYS_PLAY_SOUND || (state == (CASSETTE_PLAY | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED)))) { cassette = cassette_get_image(image); diff --git a/src/emu/validity.c b/src/emu/validity.c index adfbb207a48..77de5af944b 100644 --- a/src/emu/validity.c +++ b/src/emu/validity.c @@ -301,19 +301,19 @@ static void quark_tables_free(void) if (source_table != NULL) free(source_table); source_table = NULL; - + if (name_table != NULL) free(name_table); name_table = NULL; - + if (description_table != NULL) free(description_table); description_table = NULL; - + if (roms_table != NULL) free(roms_table); roms_table = NULL; - + if (defstr_table != NULL) free(defstr_table); defstr_table = NULL; diff --git a/src/mame/drivers/alg.c b/src/mame/drivers/alg.c index b47915d18db..c7cdb18abf9 100644 --- a/src/mame/drivers/alg.c +++ b/src/mame/drivers/alg.c @@ -199,7 +199,7 @@ static CUSTOM_INPUT( lightgun_holster_r ) static WRITE8_DEVICE_HANDLER( alg_cia_0_porta_w ) { const address_space *space = cputag_get_address_space(device->machine, "maincpu", ADDRESS_SPACE_PROGRAM); - + /* switch banks as appropriate */ memory_set_bank(device->machine, 1, data & 1); diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c index d0d2032a5a0..94ed9c19057 100644 --- a/src/mame/drivers/battlera.c +++ b/src/mame/drivers/battlera.c @@ -46,7 +46,7 @@ static int control_port_select; static WRITE8_HANDLER( battlera_sound_w ) { - if (offset == 0) + if (offset == 0) { soundlatch_w(space,0,data); cputag_set_input_line(space->machine, "audiocpu", 0, HOLD_LINE); @@ -62,7 +62,7 @@ static WRITE8_HANDLER( control_data_w ) static READ8_HANDLER( control_data_r ) { - switch (control_port_select) + switch (control_port_select) { case 0xfe: return input_port_read(space->machine, "IN0"); /* Player 1 */ case 0xfd: return input_port_read(space->machine, "IN1"); /* Player 2 */ diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c index c737e5888cb..8abf47b7a2c 100644 --- a/src/mame/drivers/cabal.c +++ b/src/mame/drivers/cabal.c @@ -807,7 +807,7 @@ ROM_START( cabalbl2 ) ROM_REGION( 0x4000, "gfx1", ROMREGION_DISPOSE ) ROM_LOAD( "c5.bin", 0x00000, 0x04000, CRC(183e4834) SHA1(05ab0c388be8701930a9de437978206cda6fed68) ) /* characters */ ROM_CONTINUE(0x0000,0x4000) - + ROM_REGION( 0x80000, "gfx2", ROMREGION_DISPOSE ) ROM_LOAD16_BYTE( "c14.bin", 0x00000, 0x10000, CRC(1023319b) SHA1(38fcc8159776b82779b3163329b07c61be939fae) ) ROM_LOAD16_BYTE( "c10.bin", 0x00001, 0x10000, CRC(3b6d2b09) SHA1(4cdcd22836dce4ee6348c4e6df7c6360d12ef912) ) @@ -844,7 +844,7 @@ void seibu_sound_bootleg(running_machine *machine,const char *cpu,int length) memory_set_decrypted_region(space, 0x0000, (length < 0x10000) ? (length - 1) : 0x1fff, decrypt); memcpy(decrypt, rom+length, length); - + if (length > 0x10000) memory_configure_bank_decrypted(machine, 1, 0, (length - 0x10000) / 0x8000, decrypt + 0x10000, 0x8000); } diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index 05205fde323..1383b66ec75 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -636,8 +636,8 @@ static ADDRESS_MAP_START( guwange_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xd00010, 0xd00011) AM_READ_PORT("IN0") // Inputs AM_RANGE(0xd00010, 0xd00011) AM_WRITE(cave_eeprom_lsb_w) // EEPROM AM_RANGE(0xd00012, 0xd00013) AM_READ_PORT("IN1") // Inputs + EEPROM -// AM_RANGE(0xd00012, 0xd00013) AM_WRITE(SMH_NOP) // ? -// AM_RANGE(0xd00014, 0xd00015) AM_WRITE(SMH_NOP) // ? $800068 in dfeveron ? probably Watchdog +// AM_RANGE(0xd00012, 0xd00013) AM_WRITE(SMH_NOP) // ? +// AM_RANGE(0xd00014, 0xd00015) AM_WRITE(SMH_NOP) // ? $800068 in dfeveron ? probably Watchdog ADDRESS_MAP_END @@ -653,7 +653,7 @@ static ADDRESS_MAP_START( hotdogst_map, ADDRESS_SPACE_PROGRAM, 16 ) /**/AM_RANGE(0x900000, 0x907fff) AM_RAM_WRITE(cave_vram_1_w) AM_BASE(&cave_vram_1) // Layer 1 /**/AM_RANGE(0x980000, 0x987fff) AM_RAM_WRITE(cave_vram_2_w) AM_BASE(&cave_vram_2) // Layer 2 AM_RANGE(0xa80000, 0xa80007) AM_READ(cave_irq_cause_r) // IRQ Cause -// AM_RANGE(0xa8006e, 0xa8006f) AM_READ(soundlatch_ack_r) // From Sound CPU +// AM_RANGE(0xa8006e, 0xa8006f) AM_READ(soundlatch_ack_r) // From Sound CPU AM_RANGE(0xa8006e, 0xa8006f) AM_WRITE(sound_cmd_w) // To Sound CPU AM_RANGE(0xa80000, 0xa8007f) AM_WRITE(SMH_RAM) AM_BASE(&cave_videoregs) // Video Regs /**/AM_RANGE(0xb00000, 0xb00005) AM_RAM AM_BASE(&cave_vctrl_0) // Layer 0 Control @@ -737,17 +737,17 @@ static CUSTOM_INPUT( korokoro_hopper_r ) static ADDRESS_MAP_START( korokoro_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM -// AM_RANGE(0x100000, 0x107fff) AM_READ(SMH_RAM) // Layer 0 +// AM_RANGE(0x100000, 0x107fff) AM_READ(SMH_RAM) // Layer 0 AM_RANGE(0x100000, 0x107fff) AM_WRITE(cave_vram_0_w) AM_BASE(&cave_vram_0) // Layer 0 -// AM_RANGE(0x140000, 0x140005) AM_READ(SMH_RAM) // Layer 0 Control +// AM_RANGE(0x140000, 0x140005) AM_READ(SMH_RAM) // Layer 0 Control AM_RANGE(0x140000, 0x140005) AM_WRITE(SMH_RAM) AM_BASE(&cave_vctrl_0) // Layer 0 Control -// AM_RANGE(0x180000, 0x187fff) AM_READ(SMH_RAM) // Sprites +// AM_RANGE(0x180000, 0x187fff) AM_READ(SMH_RAM) // Sprites AM_RANGE(0x180000, 0x187fff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites AM_RANGE(0x1c0000, 0x1c0007) AM_READ(cave_irq_cause_r) // IRQ Cause AM_RANGE(0x1c0000, 0x1c007f) AM_WRITE(SMH_RAM) AM_BASE(&cave_videoregs) // Video Regs -// AM_RANGE(0x200000, 0x207fff) AM_READ(SMH_RAM) // Palette +// AM_RANGE(0x200000, 0x207fff) AM_READ(SMH_RAM) // Palette AM_RANGE(0x200000, 0x207fff) AM_WRITE(SMH_RAM) AM_BASE(&paletteram16) AM_SIZE(&cave_paletteram_size) // Palette -// AM_RANGE(0x240000, 0x240003) AM_DEVREAD8( "ymz", ymz280b_r, 0x00ff) // YMZ280 +// AM_RANGE(0x240000, 0x240003) AM_DEVREAD8( "ymz", ymz280b_r, 0x00ff) // YMZ280 AM_RANGE(0x240000, 0x240003) AM_DEVWRITE8( "ymz", ymz280b_w, 0x00ff) // YMZ280 AM_RANGE(0x280000, 0x280001) AM_READ_PORT("IN0") // Inputs + ??? AM_RANGE(0x280002, 0x280003) AM_READ_PORT("IN1") // Inputs + EEPROM @@ -1102,7 +1102,7 @@ static ADDRESS_MAP_START( pwrinst2_sound_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x10, 0x17) AM_WRITE(NMK112_okibank_w) // Samples bank AM_RANGE(0x40, 0x41) AM_DEVREADWRITE("ym", ym2203_r, ym2203_w) // AM_RANGE(0x50, 0x50) AM_WRITE(soundlatch_ack_w) // To Main CPU -// AM_RANGE(0x51, 0x51) AM_WRITE(SMH_NOP) // ?? volume +// AM_RANGE(0x51, 0x51) AM_WRITE(SMH_NOP) // ?? volume AM_RANGE(0x80, 0x80) AM_WRITE(pwrinst2_rombank_w) // ROM bank AM_RANGE(0x60, 0x60) AM_READ(soundlatch_hi_r) // From Main CPU AM_RANGE(0x70, 0x70) AM_READ(soundlatch_lo_r) // diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c index 0933fb93761..0944a275439 100644 --- a/src/mame/drivers/cbuster.c +++ b/src/mame/drivers/cbuster.c @@ -39,7 +39,7 @@ static UINT16 prot; static WRITE16_HANDLER( twocrude_control_w ) { - switch (offset << 1) + switch (offset << 1) { case 0: /* DMA flag */ buffer_spriteram16_w(space, 0, 0, 0xffff); diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c index 8a0111412e5..7ad5c202c2d 100644 --- a/src/mame/drivers/cps2.c +++ b/src/mame/drivers/cps2.c @@ -752,7 +752,7 @@ static WRITE16_HANDLER( cps2_eeprom_port_w ) /* bit 7 - */ /* Z80 Reset */ - if (cputag_get_cpu(space->machine, "audiocpu")) + if (cputag_get_cpu(space->machine, "audiocpu")) cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_RESET, (data & 0x0008) ? CLEAR_LINE : ASSERT_LINE); coin_counter_w(0, data & 0x0001); diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c index 14bafbe25d8..57b1fc82cbd 100644 --- a/src/mame/drivers/dassault.c +++ b/src/mame/drivers/dassault.c @@ -189,7 +189,7 @@ static READ16_HANDLER( dassault_irq_r ) static WRITE16_HANDLER( dassault_irq_w ) { - switch (offset) + switch (offset) { case 0: cputag_set_input_line(space->machine, "maincpu", 5, ASSERT_LINE); break; case 1: cputag_set_input_line(space->machine, "sub", 6, ASSERT_LINE); break; diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c index 33a1fb1dabe..d76acbba8d9 100644 --- a/src/mame/drivers/ddenlovr.c +++ b/src/mame/drivers/ddenlovr.c @@ -1582,7 +1582,7 @@ static ADDRESS_MAP_START( quiz365_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200c02, 0x200c03) AM_READ(quiz365_protection_r) // Protection AM_RANGE(0x200e0a, 0x200e0d) AM_WRITE(quiz365_protection_w) // Protection -// AM_RANGE(0x201000, 0x2017ff) AM_WRITE(SMH_RAM) // ? +// AM_RANGE(0x201000, 0x2017ff) AM_WRITE(SMH_RAM) // ? AM_RANGE(0x300200, 0x300201) AM_WRITE(ddenlovr_select2_16_w) AM_RANGE(0x300202, 0x300203) AM_WRITE(quiz365_coincounter_w) // Coin Counters + more stuff written on startup @@ -1642,7 +1642,7 @@ static ADDRESS_MAP_START( ddenlvrj_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM AM_RANGE(0x200000, 0x2003ff) AM_WRITE(ddenlovr_palette_w) // Palette -// AM_RANGE(0x201000, 0x2017ff) AM_WRITE(SMH_RAM) // ? B0 on startup, then 00 +// AM_RANGE(0x201000, 0x2017ff) AM_WRITE(SMH_RAM) // ? B0 on startup, then 00 AM_RANGE(0x300040, 0x300047) AM_WRITE(ddenlovr16_palette_base_w) AM_RANGE(0x300048, 0x30004f) AM_WRITE(ddenlovr16_palette_mask_w) @@ -1701,7 +1701,7 @@ static ADDRESS_MAP_START( ddenlvrk_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200000, 0x200001) AM_READWRITE(ddenlvrk_protection2_r, ddenlvrk_protection2_w) AM_BASE(&ddenlvrk_protection2) AM_RANGE(0xd00000, 0xd003ff) AM_WRITE(ddenlovr_palette_w) // Palette -// AM_RANGE(0xd01000, 0xd017ff) SMH_RAM) // ? B0 on startup, then 00 +// AM_RANGE(0xd01000, 0xd017ff) SMH_RAM) // ? B0 on startup, then 00 AM_RANGE(0xe00040, 0xe00047) AM_WRITE(ddenlovr16_palette_base_w) AM_RANGE(0xe00048, 0xe0004f) AM_WRITE(ddenlovr16_palette_mask_w) @@ -1739,7 +1739,7 @@ static ADDRESS_MAP_START( ddenlovr_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x300000, 0x300001) AM_DEVWRITE("oki", ddenlovr_oki_bank_w) AM_RANGE(0xd00000, 0xd003ff) AM_WRITE(ddenlovr_palette_w) // Palette -// AM_RANGE(0xd01000, 0xd017ff) SMH_RAM) // ? B0 on startup, then 00 +// AM_RANGE(0xd01000, 0xd017ff) SMH_RAM) // ? B0 on startup, then 00 AM_RANGE(0xe00040, 0xe00047) AM_WRITE(ddenlovr16_palette_base_w) AM_RANGE(0xe00048, 0xe0004f) AM_WRITE(ddenlovr16_palette_mask_w) @@ -3141,7 +3141,7 @@ static ADDRESS_MAP_START( akamaru_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x624680, 0x624681) AM_READ(akamaru_protection1_r) AM_RANGE(0xd00000, 0xd003ff) AM_WRITE(ddenlovr_palette_w) // Palette -// AM_RANGE(0xd01000, 0xd017ff) AM_WRITE(SMH_RAM) // 0 +// AM_RANGE(0xd01000, 0xd017ff) AM_WRITE(SMH_RAM) // 0 AM_RANGE(0xe00040, 0xe00047) AM_WRITE(ddenlovr16_palette_base_w) AM_RANGE(0xe00048, 0xe0004f) AM_WRITE(ddenlovr16_palette_mask_w) diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c index 868177c16c5..5fce98d7afc 100644 --- a/src/mame/drivers/dec0.c +++ b/src/mame/drivers/dec0.c @@ -143,7 +143,7 @@ static WRITE16_HANDLER( automat_control_w ) static WRITE16_HANDLER( slyspy_control_w ) { - switch (offset << 1) + switch (offset << 1) { case 0: if (ACCESSING_BITS_0_7) diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index 7160dd7cf96..69b10e8941d 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -260,7 +260,7 @@ static READ32_HANDLER( deco32_irq_controller_r ) { int vblank; - switch (offset) + switch (offset) { case 2: /* Raster IRQ ACK - value read is not used */ cputag_set_input_line(space->machine, "maincpu", ARM_IRQ_LINE, CLEAR_LINE); diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c index ed8bf1c4140..40f68b08b40 100644 --- a/src/mame/drivers/flkatck.c +++ b/src/mame/drivers/flkatck.c @@ -121,7 +121,7 @@ static ADDRESS_MAP_START( flkatck_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM /* ROM */ AM_RANGE(0x8000, 0x87ff) AM_RAM /* RAM */ AM_RANGE(0x9000, 0x9000) AM_READWRITE(multiply_r, multiply_w) /* ??? */ -// AM_RANGE(0x9001, 0x9001) AM_RAM /* ??? */ +// AM_RANGE(0x9001, 0x9001) AM_RAM /* ??? */ AM_RANGE(0x9004, 0x9004) AM_READNOP /* ??? */ AM_RANGE(0x9006, 0x9006) AM_WRITENOP /* ??? */ AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r) /* soundlatch_r */ diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c index 3d21a20266f..b97d3b0c2f8 100644 --- a/src/mame/drivers/flstory.c +++ b/src/mame/drivers/flstory.c @@ -46,7 +46,7 @@ static int sound_nmi_enable,pending_nmi; static TIMER_CALLBACK( nmi_callback ) { - if (sound_nmi_enable) + if (sound_nmi_enable) cputag_set_input_line(machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE); else pending_nmi = 1; } diff --git a/src/mame/drivers/freekick.c b/src/mame/drivers/freekick.c index 06c64949c18..89317091865 100644 --- a/src/mame/drivers/freekick.c +++ b/src/mame/drivers/freekick.c @@ -984,7 +984,7 @@ ROM_START( gigas ) /* From an actual Sega board 834-6167 with mc-8123: 317-5002 ROM_REGION( 0x0600, "proms", 0 ) /* not dumped yet; assumed to be the same */ /* fill in which locations for each prom when redumping; the chips have - * no labels, but are clearly located at 3a 3b 3c 3d 4a and 4d */ + * no labels, but are clearly located at 3a 3b 3c 3d 4a and 4d */ ROM_LOAD( "1.pr", 0x0000, 0x0100, CRC(a784e71f) SHA1(1741ce98d719bad6cc5ea42337ef897f2435bbab) ) ROM_LOAD( "6.pr", 0x0100, 0x0100, CRC(376df30c) SHA1(cc95920cd1c133da1becc7d92f4b187b56a90ec7) ) ROM_LOAD( "5.pr", 0x0200, 0x0100, CRC(4edff5bd) SHA1(305efc7ad7f86635489a655e214e216ac02b904d) ) diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c index 36fa77f362d..884bac78ff0 100644 --- a/src/mame/drivers/fuukifg3.c +++ b/src/mame/drivers/fuukifg3.c @@ -281,8 +281,8 @@ static ADDRESS_MAP_START( fuuki32_map, ADDRESS_SPACE_PROGRAM, 32 ) /**/AM_RANGE(0x8e0000, 0x8e0003) AM_RAM AM_BASE(&fuuki32_priority) // Controls layer order AM_RANGE(0x903fe0, 0x903fff) AM_READWRITE(snd_020_r, snd_020_w) // Shared with Z80 -// AM_RANGE(0x903fe0, 0x903fe3) AM_READ(fuuki32_sound_command_r) // Shared with Z80 -// AM_RANGE(0x903fe4, 0x903fff) AM_READ(SMH_RAM) // ?? +// AM_RANGE(0x903fe0, 0x903fe3) AM_READ(fuuki32_sound_command_r) // Shared with Z80 +// AM_RANGE(0x903fe4, 0x903fff) AM_READ(SMH_RAM) // ?? AM_RANGE(0xa00000, 0xa00003) AM_WRITE(SMH_RAM) AM_BASE(&fuuki32_tilebank) ADDRESS_MAP_END diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c index 908ca5e03d1..2bd8ff8906f 100644 --- a/src/mame/drivers/gaelco.c +++ b/src/mame/drivers/gaelco.c @@ -144,7 +144,7 @@ static ADDRESS_MAP_START( bigkarnk_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(gaelco_vram_w) AM_BASE(&gaelco_videoram) /* Video RAM */ AM_RANGE(0x102000, 0x103fff) AM_RAM /* Screen RAM */ AM_RANGE(0x108000, 0x108007) AM_WRITEONLY AM_BASE(&gaelco_vregs) /* Video Registers */ -// AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */ +// AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */ AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) /* Palette */ AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE(&gaelco_spriteram) /* Sprite RAM */ AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW1") @@ -160,7 +160,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( bigkarnk_snd_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_RAM /* RAM */ AM_RANGE(0x0800, 0x0801) AM_DEVREADWRITE("oki", okim6295_r, okim6295_w) /* OKI6295 */ -// AM_RANGE(0x0900, 0x0900) AM_WRITENOP /* enable sound output? */ +// AM_RANGE(0x0900, 0x0900) AM_WRITENOP /* enable sound output? */ AM_RANGE(0x0a00, 0x0a01) AM_DEVREADWRITE("ym", ym3812_r, ym3812_w) /* YM3812 */ AM_RANGE(0x0b00, 0x0b00) AM_READ(soundlatch_r) /* Sound latch */ AM_RANGE(0x0c00, 0xffff) AM_ROM /* ROM */ @@ -291,7 +291,7 @@ static ADDRESS_MAP_START( maniacsq_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(gaelco_vram_w) AM_BASE(&gaelco_videoram) /* Video RAM */ AM_RANGE(0x102000, 0x103fff) AM_RAM /* Screen RAM */ AM_RANGE(0x108000, 0x108007) AM_WRITE(SMH_RAM) AM_BASE(&gaelco_vregs) /* Video Registers */ -// AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */ +// AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */ AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) /* Palette */ AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE(&gaelco_spriteram) /* Sprite RAM */ AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW2") @@ -572,7 +572,7 @@ static ADDRESS_MAP_START( squash_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(gaelco_vram_encrypted_w) AM_BASE(&gaelco_videoram) /* Video RAM */ AM_RANGE(0x102000, 0x103fff) AM_RAM_WRITE(gaelco_encrypted_w) AM_BASE(&gaelco_screen) /* Screen RAM */ AM_RANGE(0x108000, 0x108007) AM_WRITE(SMH_RAM) AM_BASE(&gaelco_vregs) /* Video Registers */ -// AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */ +// AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */ AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) /* Palette */ AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE(&gaelco_spriteram) /* Sprite RAM */ AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW2") @@ -727,7 +727,7 @@ static ADDRESS_MAP_START( thoop_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x101fff) AM_RAM_WRITE(thoop_vram_encrypted_w) AM_BASE(&gaelco_videoram) /* Video RAM */ AM_RANGE(0x102000, 0x103fff) AM_RAM_WRITE(thoop_encrypted_w) AM_BASE(&gaelco_screen) /* Screen RAM */ AM_RANGE(0x108000, 0x108007) AM_WRITE(SMH_RAM) AM_BASE(&gaelco_vregs) /* Video Registers */ -// AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */ +// AM_RANGE(0x10800c, 0x10800d) AM_WRITE(watchdog_reset_w) /* INT 6 ACK/Watchdog timer */ AM_RANGE(0x200000, 0x2007ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) /* Palette */ AM_RANGE(0x440000, 0x440fff) AM_RAM AM_BASE(&gaelco_spriteram) /* Sprite RAM */ AM_RANGE(0x700000, 0x700001) AM_READ_PORT("DSW2") diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c index cff375a6975..571f65a0c1f 100644 --- a/src/mame/drivers/galpani2.c +++ b/src/mame/drivers/galpani2.c @@ -241,7 +241,7 @@ static WRITE8_HANDLER( galpani2_mcu_nmi1_w ) //driven by CPU1's int5 ISR //Triggered from 'maincpu' (0000741E),from here on...driven by int5, even if there's no command static UINT16 old_mcu_nmi1 = 0; if ( (data & 1) && !(old_mcu_nmi1 & 1) ) galpani2_mcu_nmi1(space->machine); - //if ( (data & 0x10) && !(old_mcu_nmi1 & 0x10) ) galpani2_mcu_nmi1(space->machine); + //if ( (data & 0x10) && !(old_mcu_nmi1 & 0x10) ) galpani2_mcu_nmi1(space->machine); //alternate line, same function? old_mcu_nmi1 = data; } @@ -368,7 +368,7 @@ static ADDRESS_MAP_START( galpani2_mem2, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x680000, 0x680001) AM_WRITENOP // ? 0 at startup only AM_RANGE(0x6c0000, 0x6c0001) AM_WRITENOP // ? 0 at startup only AM_RANGE(0x700000, 0x700001) AM_WRITENOP // Watchdog -// AM_RANGE(0x740000, 0x740001) AM_WRITENOP // ? Reset mcu +// AM_RANGE(0x740000, 0x740001) AM_WRITENOP // ? Reset mcu AM_RANGE(0x780000, 0x780001) AM_WRITE8(galpani2_mcu_nmi2_w, 0x00ff) // ? 0 -> 1 -> 0 (lev 5) AM_RANGE(0x7c0000, 0x7c0001) AM_WRITE(SMH_RAM) AM_BASE(&galpani2_rombank ) // Rom Bank AM_RANGE(0x800000, 0xffffff) AM_READ(galpani2_bankedrom_r ) // Banked ROM diff --git a/src/mame/drivers/gamecstl.c b/src/mame/drivers/gamecstl.c index 3599962bc68..facd6d94e42 100644 --- a/src/mame/drivers/gamecstl.c +++ b/src/mame/drivers/gamecstl.c @@ -379,7 +379,7 @@ static READ8_HANDLER(at_page8_r) { UINT8 data = at_pages[offset % 0x10]; - switch(offset % 8) + switch(offset % 8) { case 1: data = dma_offset[(offset / 8) & 1][2]; @@ -402,7 +402,7 @@ static WRITE8_HANDLER(at_page8_w) { at_pages[offset % 0x10] = data; - switch(offset % 8) + switch(offset % 8) { case 1: dma_offset[(offset / 8) & 1][2] = data; @@ -603,13 +603,13 @@ static MACHINE_RESET(gamecstl) * *************************************************************/ -static PIC8259_SET_INT_LINE( gamecstl_pic8259_1_set_int_line ) +static PIC8259_SET_INT_LINE( gamecstl_pic8259_1_set_int_line ) { cputag_set_input_line(device->machine, "maincpu", 0, interrupt ? HOLD_LINE : CLEAR_LINE); } -static PIC8259_SET_INT_LINE( gamecstl_pic8259_2_set_int_line ) +static PIC8259_SET_INT_LINE( gamecstl_pic8259_2_set_int_line ) { pic8259_set_irq_line( gamecstl_devices.pic8259_1, 2, interrupt); } @@ -711,7 +711,7 @@ static void ide_interrupt(const device_config *device, int state) pic8259_set_irq_line( gamecstl_devices.pic8259_2, 6, state); } -static int gamecstl_get_out2(running_machine *machine) +static int gamecstl_get_out2(running_machine *machine) { return pit8253_get_output( gamecstl_devices.pit8254, 2 ); } @@ -721,7 +721,7 @@ static const struct kbdc8042_interface at8042 = KBDC8042_AT386, set_gate_a20, keyboard_interrupt, gamecstl_get_out2 }; -static void gamecstl_set_keyb_int(running_machine *machine, int state) +static void gamecstl_set_keyb_int(running_machine *machine, int state) { pic8259_set_irq_line(gamecstl_devices.pic8259_1, 1, state); } diff --git a/src/mame/drivers/gaplus.c b/src/mame/drivers/gaplus.c index 190cd749113..8825210777a 100644 --- a/src/mame/drivers/gaplus.c +++ b/src/mame/drivers/gaplus.c @@ -328,7 +328,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( cpu2_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x07ff) AM_READWRITE(gaplus_videoram_r, gaplus_videoram_w) /* tilemap RAM (shared with CPU #1) */ AM_RANGE(0x0800, 0x1fff) AM_READWRITE(gaplus_spriteram_r, gaplus_spriteram_w) /* shared RAM with CPU #1 */ -// AM_RANGE(0x500f, 0x500f) AM_WRITENOP /* ??? written 256 times on startup */ +// AM_RANGE(0x500f, 0x500f) AM_WRITENOP /* ??? written 256 times on startup */ AM_RANGE(0x6000, 0x6fff) AM_WRITE(gaplus_irq_2_ctrl_w) /* IRQ 2 control */ AM_RANGE(0xa000, 0xffff) AM_ROM /* ROM */ ADDRESS_MAP_END diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index e5f16eed9af..ff5939cf06f 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -191,8 +191,8 @@ ADDRESS_MAP_END static WRITE8_HANDLER( ncb3_port81_w ) { -// if (data!=0x00) -// popmessage("ncb3_port81_w %02x\n",data); +// if (data!=0x00) +// popmessage("ncb3_port81_w %02x\n",data); } // where is colour bank for 'all blue' in attract? @@ -4652,7 +4652,7 @@ static MACHINE_DRIVER_START( cmasterc ) MDRV_IMPORT_FROM(cm) MDRV_GFXDECODE(cmasterc) - + MACHINE_DRIVER_END static MACHINE_DRIVER_START( cmnobmp ) @@ -7078,13 +7078,13 @@ ROM_START( nfm ) ROM_LOAD( "fruit3", 0x08000, 0x04000, CRC(f3361ba7) SHA1(1a7b9c4f685656447bd6ce5f361e6e4af63012e3) ) ROM_CONTINUE(0x8000, 0x4000) ROM_LOAD( "fruit4", 0x0c000, 0x04000, CRC(99ac5ddf) SHA1(65b6abb98f3156f4c0c55478d09c612eed5ae555) ) - + // do these graphics really belong with this set? a lot of the tiles seem wrong for it ROM_REGION( 0x18000, "tilegfx", 0 ) ROM_LOAD( "fruit5", 0x00000, 0x08000, CRC(a7a8f08d) SHA1(76c93194133ba85c0dde1f364260e16d5b647134) ) ROM_LOAD( "fruit6", 0x08000, 0x08000, CRC(39d5b89a) SHA1(4cf52fa557ffc792d3e13f7dbb5d45fd617bac85) ) ROM_LOAD( "fruit7", 0x10000, 0x08000, CRC(3ade6709) SHA1(9cdf2814e50c5433c582fc40265c5df2a16e99e7) ) - + ROM_REGION( 0x18000, "proms", 0 ) // colours? ROM_LOAD( "fruiprg2", 0x00000, 0x08000, CRC(13925ff5) SHA1(236415a244ef6092834f8080cf0d2e04bbfa2650) ) ROM_END diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c index 3dfd4f3f368..9c2cb8d8c33 100644 --- a/src/mame/drivers/hng64.c +++ b/src/mame/drivers/hng64.c @@ -629,7 +629,7 @@ static READ32_HANDLER( hng64_sysregs_r ) mame_get_base_datetime(space->machine, &systime); //if(((offset*4) & 0xff00) == 0x2100) - // printf("HNG64 port read (PC=%08x) 0x%08x\n", cpu_get_pc(space->cpu),offset*4); + // printf("HNG64 port read (PC=%08x) 0x%08x\n", cpu_get_pc(space->cpu),offset*4); switch(offset*4) { @@ -944,7 +944,7 @@ static ADDRESS_MAP_START( hng_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x20208000, 0x2020805f) AM_READWRITE(tcram_r, tcram_w) AM_BASE(&hng64_tcram) // Transition Control AM_RANGE(0x20300000, 0x203001ff) AM_WRITE(dl_w) AM_BASE(&hng64_dl) // 3d Display List AM_RANGE(0x20300214, 0x20300217) AM_WRITE(dl_control_w) - + // 3d? // AM_RANGE(0x30000000, 0x3000002f) AM_READWRITE(q2_r, q2_w) AM_BASE(&hng64_q2) AM_RANGE(0x30100000, 0x3015ffff) AM_READWRITE(hng64_3d_1_r,hng64_3d_2_w) AM_BASE(&hng64_3d_1) // 3D Display Buffer A diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c index 48ca5b835ac..d02636454f5 100644 --- a/src/mame/drivers/itech32.c +++ b/src/mame/drivers/itech32.c @@ -426,13 +426,13 @@ void itech32_update_interrupts(running_machine *machine, int vint, int xint, int if (xint != -1) xint_state = xint; if (qint != -1) qint_state = qint; - if (is_drivedge) + if (is_drivedge) { cputag_set_input_line(machine, "maincpu", 3, vint_state ? ASSERT_LINE : CLEAR_LINE); cputag_set_input_line(machine, "maincpu", 4, xint_state ? ASSERT_LINE : CLEAR_LINE); cputag_set_input_line(machine, "maincpu", 5, qint_state ? ASSERT_LINE : CLEAR_LINE); - } - else + } + else { cputag_set_input_line(machine, "maincpu", 1, vint_state ? ASSERT_LINE : CLEAR_LINE); cputag_set_input_line(machine, "maincpu", 2, xint_state ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/drivers/itgambl2.c b/src/mame/drivers/itgambl2.c index 5bb9c4c9340..81e28ed53a2 100644 --- a/src/mame/drivers/itgambl2.c +++ b/src/mame/drivers/itgambl2.c @@ -711,7 +711,7 @@ RAMs PLDs 2x ispLSI10032E-70LJ -Note 1x 28x2 edge connector +Note 1x 28x2 edge connector 1x 14 legs connector 1x RS232 connector 1x trimmer (volume) diff --git a/src/mame/drivers/m14.c b/src/mame/drivers/m14.c index c1f56a44580..f05ad79b3fe 100644 --- a/src/mame/drivers/m14.c +++ b/src/mame/drivers/m14.c @@ -12,11 +12,11 @@ TODO: ============================================================================================== x (Mystery Rom) (c)1978-1981? Irem? -PCB No. :M14S-2 - :M14L-2 -CPU :NEC D8085AC -Sound :? -OSC :6MHz x2 +PCB No. :M14S-2 + :M14L-2 +CPU :NEC D8085AC +Sound :? +OSC :6MHz x2 mgpb1.bin mgpa2.bin @@ -258,9 +258,9 @@ static MACHINE_DRIVER_START( m14 ) MDRV_VIDEO_UPDATE(m14) /* sound hardware */ -// MDRV_SPEAKER_STANDARD_MONO("mono") -// MDRV_SOUND_ADD("ay", AY8910, 8000000/4 /* guess */) -// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) +// MDRV_SPEAKER_STANDARD_MONO("mono") +// MDRV_SOUND_ADD("ay", AY8910, 8000000/4 /* guess */) +// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MACHINE_DRIVER_END /*************************************************************************** diff --git a/src/mame/drivers/mediagx.c b/src/mame/drivers/mediagx.c index 1ae1a242603..b90ee0069fd 100644 --- a/src/mame/drivers/mediagx.c +++ b/src/mame/drivers/mediagx.c @@ -732,7 +732,7 @@ static READ8_HANDLER(at_page8_r) { UINT8 data = at_pages[offset % 0x10]; - switch(offset % 8) + switch(offset % 8) { case 1: data = dma_offset[(offset / 8) & 1][2]; @@ -755,7 +755,7 @@ static WRITE8_HANDLER(at_page8_w) { at_pages[offset % 0x10] = data; - switch(offset % 8) + switch(offset % 8) { case 1: dma_offset[(offset / 8) & 1][2] = data; @@ -980,13 +980,13 @@ static MACHINE_RESET(mediagx) * *************************************************************/ -static PIC8259_SET_INT_LINE( mediagx_pic8259_1_set_int_line ) +static PIC8259_SET_INT_LINE( mediagx_pic8259_1_set_int_line ) { cputag_set_input_line(device->machine, "maincpu", 0, interrupt ? HOLD_LINE : CLEAR_LINE); } -static PIC8259_SET_INT_LINE( mediagx_pic8259_2_set_int_line ) +static PIC8259_SET_INT_LINE( mediagx_pic8259_2_set_int_line ) { pic8259_set_irq_line( mediagx_devices.pic8259_1, 2, interrupt); } @@ -1096,7 +1096,7 @@ static void ide_interrupt(const device_config *device, int state) pic8259_set_irq_line(mediagx_devices.pic8259_2, 6, state); } -static int mediagx_get_out2(running_machine *machine) +static int mediagx_get_out2(running_machine *machine) { return pit8253_get_output( mediagx_devices.pit8254, 2 ); } @@ -1106,7 +1106,7 @@ static const struct kbdc8042_interface at8042 = KBDC8042_AT386, set_gate_a20, keyboard_interrupt, mediagx_get_out2 }; -static void mediagx_set_keyb_int(running_machine *machine, int state) +static void mediagx_set_keyb_int(running_machine *machine, int state) { pic8259_set_irq_line(mediagx_devices.pic8259_1, 1, state); } diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c index c6e7c5fb11e..ee292f178ae 100644 --- a/src/mame/drivers/metlclsh.c +++ b/src/mame/drivers/metlclsh.c @@ -127,8 +127,8 @@ static ADDRESS_MAP_START( metlclsh_slave_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe301, 0xe301) AM_WRITE(metlclsh_flipscreen_w) // 0/1 AM_RANGE(0xe401, 0xe401) AM_WRITE(metlclsh_rambank_w) AM_RANGE(0xe402, 0xe403) AM_WRITEONLY AM_BASE(&metlclsh_scrollx) -// AM_RANGE(0xe404, 0xe404) AM_WRITENOP // ? 0 -// AM_RANGE(0xe410, 0xe410) AM_WRITENOP // ? 0 on startup only +// AM_RANGE(0xe404, 0xe404) AM_WRITENOP // ? 0 +// AM_RANGE(0xe410, 0xe410) AM_WRITENOP // ? 0 on startup only AM_RANGE(0xe417, 0xe417) AM_WRITE(metlclsh_ack_nmi2) // nmi ack AM_RANGE(0xfff0, 0xffff) AM_ROM // Reset/IRQ vectors ADDRESS_MAP_END diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index 4887701aa55..d469a1cd2b6 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -1138,7 +1138,7 @@ static ADDRESS_MAP_START( kokushi_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x878840, 0x87884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs) // Tiles Blitter AM_RANGE(0x878860, 0x87886b) AM_WRITE(metro_window_w) AM_BASE(&metro_window) // Tilemap Window AM_RANGE(0x878870, 0x87887b) AM_WRITEONLY AM_BASE(&metro_scroll) // Scroll Regs - WRONG -// AM_RANGE(0x878880, 0x878881) AM_WRITENOP // ? increasing +// AM_RANGE(0x878880, 0x878881) AM_WRITENOP // ? increasing AM_RANGE(0x878890, 0x878891) AM_WRITENOP // ? increasing AM_RANGE(0x8788a2, 0x8788a3) AM_READWRITE(metro_irq_cause_r,metro_irq_cause_w) // IRQ Cause / IRQ Acknowledge AM_RANGE(0x8788a4, 0x8788a5) AM_WRITEONLY AM_BASE(&metro_irq_enable) // IRQ Enable @@ -1444,7 +1444,7 @@ static ADDRESS_MAP_START( dokyusei_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x478810, 0x47881f) AM_WRITEONLY AM_BASE(&metro_irq_levels) // IRQ Levels AM_RANGE(0x478820, 0x47882f) AM_WRITEONLY AM_BASE(&metro_irq_vectors) // IRQ Vectors AM_RANGE(0x478830, 0x478831) AM_WRITEONLY AM_BASE(&metro_irq_enable) // IRQ Enable -// AM_RANGE(0x478832, 0x478833) AM_READ(metro_irq_cause_r) // IRQ Cause +// AM_RANGE(0x478832, 0x478833) AM_READ(metro_irq_cause_r) // IRQ Cause AM_RANGE(0x478832, 0x478833) AM_WRITE(metro_irq_cause_w) // IRQ Acknowledge AM_RANGE(0x478836, 0x478837) AM_WRITENOP // ? watchdog ? AM_RANGE(0x478840, 0x47884d) AM_WRITE(metro_blitter_w) AM_BASE(&metro_blitter_regs) // Tiles Blitter @@ -1683,7 +1683,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( blzntrnd_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x1fffff) AM_ROM // ROM AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM -// AM_RANGE(0x300000, 0x300001) AM_READNOP // Sound +// AM_RANGE(0x300000, 0x300001) AM_READNOP // Sound AM_RANGE(0x200000, 0x21ffff) AM_RAM_WRITE(metro_vram_0_w) AM_BASE(&metro_vram_0) // Layer 0 AM_RANGE(0x220000, 0x23ffff) AM_RAM_WRITE(metro_vram_1_w) AM_BASE(&metro_vram_1) // Layer 1 AM_RANGE(0x240000, 0x25ffff) AM_RAM_WRITE(metro_vram_2_w) AM_BASE(&metro_vram_2) // Layer 2 diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c index 5da8a2d777d..00715f757e1 100644 --- a/src/mame/drivers/msisaac.c +++ b/src/mame/drivers/msisaac.c @@ -226,7 +226,7 @@ static ADDRESS_MAP_START( msisaac_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf082, 0xf082) AM_READ_PORT("DSW3") AM_RANGE(0xf083, 0xf083) AM_READ_PORT("IN0") AM_RANGE(0xf084, 0xf084) AM_READ_PORT("IN1") -// AM_RANGE(0xf086, 0xf086) AM_READ_PORT("IN2") +// AM_RANGE(0xf086, 0xf086) AM_READ_PORT("IN2") AM_RANGE(0xf100, 0xf17f) AM_RAM AM_BASE(&spriteram) //sprites AM_RANGE(0xf400, 0xf7ff) AM_RAM_WRITE(msisaac_fg_videoram_w) AM_BASE(&videoram) diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c index 10bc4dea774..d842b867984 100644 --- a/src/mame/drivers/namcos1.c +++ b/src/mame/drivers/namcos1.c @@ -653,8 +653,8 @@ static INPUT_PORTS_START( tankfrc4 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) // and start1 PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_START( "IN1" ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) @@ -663,7 +663,7 @@ static INPUT_PORTS_START( tankfrc4 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) // and start2 PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START( "IN2" ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(3) @@ -673,7 +673,7 @@ static INPUT_PORTS_START( tankfrc4 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) // and start3 PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START( "IN3" ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(4) @@ -683,7 +683,7 @@ static INPUT_PORTS_START( tankfrc4 ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) // and start4 PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index 3a8bc25bd07..64f6cb78f49 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -1223,7 +1223,7 @@ static READ8_HANDLER( s23_mcu_iob_r ) im_rd++; im_rd &= 0xf; - if (im_rd == im_wr) + if (im_rd == im_wr) { cputag_set_input_line(space->machine, "audiocpu", H8_SCI_0_RX, CLEAR_LINE); } diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index b285faac90f..4559d6e287a 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -1984,7 +1984,7 @@ EXP: F355 CHALLENGE EXPORT ROM_START( f355 ) ROM_REGION( 0x200000, "maincpu", 0) F355_BIOS -// NAOMI_BIOS +// NAOMI_BIOS ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF) ROM_LOAD("epr-21902.ic22",0x0000000, 0x0400000, CRC(04e8acec) SHA1(82e20f99876b13b77c0393ef545316f9eeb2c29c) ) diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c index 59012f589d3..97ec49f8dbe 100644 --- a/src/mame/drivers/nbmj8891.c +++ b/src/mame/drivers/nbmj8891.c @@ -641,7 +641,7 @@ static ADDRESS_MAP_START( taiwanmb_io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r) AM_RANGE(0x81, 0x81) AM_DEVREAD("fm", ay8910_r) AM_RANGE(0x82, 0x83) AM_DEVWRITE("fm", ay8910_data_address_w) - AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r) //AM_WRITENOP // ? + AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r) //AM_WRITENOP // ? AM_RANGE(0xa0, 0xa0) AM_READWRITE(nb1413m3_inputport1_r,nb1413m3_inputportsel_w) AM_RANGE(0xb0, 0xb0) AM_READWRITE(nb1413m3_inputport2_r,nb1413m3_sndrombank1_w) // AM_RANGE(0xc0, 0xc0) AM_WRITENOP // ? diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index a52d80c2ca2..639e49f1cd1 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -361,7 +361,7 @@ static MACHINE_DRIVER_START( olibochu ) MDRV_CPU_PROGRAM_MAP(olibochu_sound_map,0) MDRV_CPU_PERIODIC_INT(irq0_line_hold,60) //??? -// MDRV_QUANTUM_PERFECT_CPU("maincpu") +// MDRV_QUANTUM_PERFECT_CPU("maincpu") /* video hardware */ MDRV_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c index 75b20d79811..53a745f1daf 100644 --- a/src/mame/drivers/pandoras.c +++ b/src/mame/drivers/pandoras.c @@ -151,7 +151,7 @@ static ADDRESS_MAP_START( pandoras_slave_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1a02, 0x1a02) AM_READ_PORT("P2") AM_RANGE(0x1a03, 0x1a03) AM_READ_PORT("DSW3") AM_RANGE(0x1c00, 0x1c00) AM_READ_PORT("DSW2") -// AM_RANGE(0x1e00, 0x1e00) AM_READNOP /* ??? seems to be important */ +// AM_RANGE(0x1e00, 0x1e00) AM_READNOP /* ??? seems to be important */ AM_RANGE(0x8000, 0x8000) AM_WRITE(watchdog_reset_w) /* watchdog reset */ AM_RANGE(0xa000, 0xa000) AM_WRITE(pandoras_cpua_irqtrigger_w) /* cause FIRQ on CPU A */ AM_RANGE(0xc000, 0xc7ff) AM_RAM AM_SHARE(4) /* Shared RAM with the CPU A */ diff --git a/src/mame/drivers/pcat_nit.c b/src/mame/drivers/pcat_nit.c index 2bc19abd6d6..4570edb4835 100644 --- a/src/mame/drivers/pcat_nit.c +++ b/src/mame/drivers/pcat_nit.c @@ -211,7 +211,7 @@ static READ8_HANDLER(dma_page_select_r) { UINT8 data = at_pages[offset % 0x10]; - switch(offset % 8) + switch(offset % 8) { case 1: data = dma_offset[(offset / 8) & 1][2]; @@ -234,7 +234,7 @@ static WRITE8_HANDLER(dma_page_select_w) { at_pages[offset % 0x10] = data; - switch(offset % 8) + switch(offset % 8) { case 1: dma_offset[(offset / 8) & 1][2] = data; @@ -283,7 +283,7 @@ static const struct dma8237_interface dma8237_2_config = 8259 IRQ controller ******************/ -static PIC8259_SET_INT_LINE( pic8259_1_set_int_line ) +static PIC8259_SET_INT_LINE( pic8259_1_set_int_line ) { cputag_set_input_line(device->machine, "maincpu", 0, interrupt ? HOLD_LINE : CLEAR_LINE); } @@ -292,7 +292,7 @@ static const struct pic8259_interface pic8259_1_config = { pic8259_1_set_int_line }; -static PIC8259_SET_INT_LINE( pic8259_2_set_int_line ) +static PIC8259_SET_INT_LINE( pic8259_2_set_int_line ) { pic8259_set_irq_line( streetg2_devices.pic8259_1, 2, interrupt); } @@ -314,7 +314,7 @@ static IRQ_CALLBACK(irq_callback) static PIT8253_OUTPUT_CHANGED( at_pit8254_out0_changed ) { - if ( streetg2_devices.pic8259_1 ) + if ( streetg2_devices.pic8259_1 ) { pic8259_set_irq_line(streetg2_devices.pic8259_1, 0, state); } @@ -519,7 +519,7 @@ static PALETTE_INIT(pcat_286) //todo: 256 colors } -static void streetg2_set_keyb_int(running_machine *machine, int state) +static void streetg2_set_keyb_int(running_machine *machine, int state) { pic8259_set_irq_line(streetg2_devices.pic8259_1, 1, state); } diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c index ae0df71ec22..78ed04e4fad 100644 --- a/src/mame/drivers/pgm.c +++ b/src/mame/drivers/pgm.c @@ -385,12 +385,12 @@ static WRITE16_HANDLER ( z80_reset_w ) { if (PGMLOGERROR) logerror("Z80: reset %04x @ %04x (%06x)\n", data, mem_mask, cpu_get_pc(space->cpu)); - if(data == 0x5050) + if(data == 0x5050) { devtag_reset(space->machine, "ics"); cputag_set_input_line(space->machine, "soundcpu", INPUT_LINE_HALT, CLEAR_LINE); cputag_set_input_line(space->machine, "soundcpu", INPUT_LINE_RESET, PULSE_LINE); - if(0) + if(0) { FILE *out; out = fopen("z80ram.bin", "wb"); @@ -413,7 +413,7 @@ static WRITE16_HANDLER ( z80_ctrl_w ) static WRITE16_HANDLER ( m68k_l1_w ) { - if(ACCESSING_BITS_0_7) + if(ACCESSING_BITS_0_7) { if (PGMLOGERROR) logerror("SL 1 m68.w %02x (%06x) IRQ\n", data & 0xff, cpu_get_pc(space->cpu)); soundlatch_w(space, 0, data); @@ -1262,7 +1262,7 @@ GFXDECODE_END /* only dragon world 2 NEEDs irq4, Puzzli 2 explicitly doesn't want it, what is the source? maybe the protection device? */ -static INTERRUPT_GEN( drgw_interrupt ) +static INTERRUPT_GEN( drgw_interrupt ) { if( cpu_getiloops(device) == 0 ) cpu_set_input_line(device, 6, HOLD_LINE); diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c index 7c627522df5..4f67efe5135 100644 --- a/src/mame/drivers/psikyo.c +++ b/src/mame/drivers/psikyo.c @@ -350,9 +350,9 @@ static ADDRESS_MAP_START( psikyo_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x800000, 0x801fff) AM_RAM_WRITE(psikyo_vram_0_w) AM_BASE(&psikyo_vram_0) // Layer 0 AM_RANGE(0x802000, 0x803fff) AM_RAM_WRITE(psikyo_vram_1_w) AM_BASE(&psikyo_vram_1) // Layer 1 AM_RANGE(0x804000, 0x807fff) AM_RAM AM_BASE(&psikyo_vregs) // RAM + Vregs -// AM_RANGE(0xc00000, 0xc0000b) AM_READ(psikyo_input_r) // Depends on board, see DRIVER_INIT -// AM_RANGE(0xc00004, 0xc0000b) AM_WRITE(s1945_mcu_w) // MCU on sh404, see DRIVER_INIT -// AM_RANGE(0xc00010, 0xc00013) AM_WRITE(psikyo_soundlatch_w) // Depends on board, see DRIVER_INIT +// AM_RANGE(0xc00000, 0xc0000b) AM_READ(psikyo_input_r) // Depends on board, see DRIVER_INIT +// AM_RANGE(0xc00004, 0xc0000b) AM_WRITE(s1945_mcu_w) // MCU on sh404, see DRIVER_INIT +// AM_RANGE(0xc00010, 0xc00013) AM_WRITE(psikyo_soundlatch_w) // Depends on board, see DRIVER_INIT AM_RANGE(0xfe0000, 0xffffff) AM_RAM // RAM ADDRESS_MAP_END diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c index 5fe4f500d4f..e32d1432fc6 100644 --- a/src/mame/drivers/puckpkmn.c +++ b/src/mame/drivers/puckpkmn.c @@ -146,11 +146,11 @@ static ADDRESS_MAP_START( puckpkmn_map, ADDRESS_SPACE_PROGRAM, 16 ) /* Unknown reads/writes: */ AM_RANGE(0xa00000, 0xa00551) AM_WRITENOP /* ? */ -// AM_RANGE(0xa10000, 0xa10001) AM_READNOP /* ? once */ +// AM_RANGE(0xa10000, 0xa10001) AM_READNOP /* ? once */ AM_RANGE(0xa10002, 0xa10005) AM_NOP /* ? alternative way of reading inputs ? */ AM_RANGE(0xa11100, 0xa11101) AM_NOP /* ? */ -// AM_RANGE(0xa10008, 0xa1000d) AM_WRITENOP /* ? once */ -// AM_RANGE(0xa14000, 0xa14003) AM_WRITENOP /* ? once */ +// AM_RANGE(0xa10008, 0xa1000d) AM_WRITENOP /* ? once */ +// AM_RANGE(0xa14000, 0xa14003) AM_WRITENOP /* ? once */ AM_RANGE(0xa11200, 0xa11201) AM_WRITENOP /* ? */ ADDRESS_MAP_END diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c index 3571ec485a4..019693d8597 100644 --- a/src/mame/drivers/pushman.c +++ b/src/mame/drivers/pushman.c @@ -131,7 +131,7 @@ static READ8_HANDLER( pushman_68000_r ) static WRITE8_HANDLER( pushman_68000_w ) { - if (offset == 2 && (shared_ram[2] & 2) == 0 && data & 2) + if (offset == 2 && (shared_ram[2] & 2) == 0 && data & 2) { latch = (shared_ram[1] << 8) | shared_ram[0]; new_latch = 1; diff --git a/src/mame/drivers/qdrmfgp.c b/src/mame/drivers/qdrmfgp.c index dfda1b54d2a..9476b8308a8 100644 --- a/src/mame/drivers/qdrmfgp.c +++ b/src/mame/drivers/qdrmfgp.c @@ -314,8 +314,8 @@ static void gp2_ide_interrupt(const device_config *device, int state) gp2_irq_control = 0; else cputag_set_input_line(device->machine, "maincpu", 5, HOLD_LINE); - } - else + } + else { cputag_set_input_line(device->machine, "maincpu", 5, CLEAR_LINE); } diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c index eb88b10c16b..f7754f5a7ec 100644 --- a/src/mame/drivers/rockrage.c +++ b/src/mame/drivers/rockrage.c @@ -90,12 +90,12 @@ static WRITE8_HANDLER( rockrage_sh_irqtrigger_w ) cputag_set_input_line(space->machine, "audiocpu", M6809_IRQ_LINE, HOLD_LINE); } -static READ8_DEVICE_HANDLER( rockrage_VLM5030_busy_r ) +static READ8_DEVICE_HANDLER( rockrage_VLM5030_busy_r ) { return ( vlm5030_bsy(device) ? 1 : 0 ); } -static WRITE8_DEVICE_HANDLER( rockrage_speech_w ) +static WRITE8_DEVICE_HANDLER( rockrage_speech_w ) { /* bit2 = data bus enable */ vlm5030_rst( device, ( data >> 1 ) & 0x01 ); diff --git a/src/mame/drivers/rungun.c b/src/mame/drivers/rungun.c index df1e058e4b5..8e6a8699b89 100644 --- a/src/mame/drivers/rungun.c +++ b/src/mame/drivers/rungun.c @@ -210,7 +210,7 @@ static ADDRESS_MAP_START( rungun_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x2fffff) AM_ROM // main program + data AM_RANGE(0x300000, 0x3007ff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16) AM_RANGE(0x380000, 0x39ffff) AM_RAM // work RAM - AM_RANGE(0x400000, 0x43ffff) AM_READNOP // AM_READ( K053936_0_rom_r ) // '936 ROM readback window + AM_RANGE(0x400000, 0x43ffff) AM_READNOP // AM_READ( K053936_0_rom_r ) // '936 ROM readback window AM_RANGE(0x480000, 0x48001f) AM_READWRITE(rng_sysregs_r,rng_sysregs_w) AM_BASE(&rng_sysreg) AM_RANGE(0x4c0000, 0x4c001f) AM_READ(K053252_word_r) // CCU (for scanline and vblank polling) AM_RANGE(0x540000, 0x540001) AM_WRITE(sound_irq_w) diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c index 03258dcc254..083730b2d02 100644 --- a/src/mame/drivers/segae.c +++ b/src/mame/drivers/segae.c @@ -328,7 +328,7 @@ static ADDRESS_MAP_START( systeme_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1) /* Banked ROM */ // AM_RANGE(0x0000 , 0xbfff) AM_ROM -// AM_RANGE(0xc000 , 0xdfff) AM_RAM AM_MIRROR(0x2000) +// AM_RANGE(0xc000 , 0xdfff) AM_RAM AM_MIRROR(0x2000) ADDRESS_MAP_END static ADDRESS_MAP_START( sms_io_map, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 73cf010053d..f4f5de34948 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -2665,8 +2665,8 @@ static READ8_HANDLER( ff_r ) {return 0xff;} static ADDRESS_MAP_START( tndrcade_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x01ff) AM_RAM // RAM AM_RANGE(0x0800, 0x0800) AM_READ(ff_r) // ? (bits 0/1/2/3: 1 -> do test 0-ff/100-1e0/5001-57ff/banked rom) -// AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r) // -// AM_RANGE(0x0801, 0x0801) AM_READ(soundlatch2_r) // +// AM_RANGE(0x0800, 0x0800) AM_READ(soundlatch_r) // +// AM_RANGE(0x0801, 0x0801) AM_READ(soundlatch2_r) // AM_RANGE(0x1000, 0x1000) AM_READ_PORT("P1") // P1 AM_RANGE(0x1000, 0x1000) AM_WRITE(sub_bankswitch_lockout_w) // ROM Bank + Coin Lockout AM_RANGE(0x1001, 0x1001) AM_READ_PORT("P2") // P2 @@ -2776,7 +2776,7 @@ static ADDRESS_MAP_START( metafox_sub_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1000, 0x1000) AM_READ_PORT("COINS") // Coins AM_RANGE(0x1000, 0x1000) AM_WRITE(sub_bankswitch_lockout_w) // ROM Bank + Coin Lockout AM_RANGE(0x1002, 0x1002) AM_READ_PORT("P1") // P1 -// AM_RANGE(0x1004, 0x1004) AM_READNOP // ? +// AM_RANGE(0x1004, 0x1004) AM_READNOP // ? AM_RANGE(0x1006, 0x1006) AM_READ_PORT("P2") // P2 AM_RANGE(0x5000, 0x57ff) AM_RAM AM_BASE(&sharedram) // Shared RAM AM_RANGE(0x7000, 0x7fff) AM_ROM // ROM diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c index 9922c6c6809..32395921128 100644 --- a/src/mame/drivers/seta2.c +++ b/src/mame/drivers/seta2.c @@ -806,7 +806,7 @@ static ADDRESS_MAP_START( penbros_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x600004, 0x600005) AM_READ_PORT("SYSTEM") // Coins AM_RANGE(0x600004, 0x600005) AM_WRITE(pzlbowl_coin_counter_w) // Coins Counter AM_RANGE(0x600006, 0x600007) AM_READ(watchdog_reset16_r) // Watchdog -// AM_RANGE(0x700000, 0x700001) AM_READ(pzlbowl_protection_r) // Protection +// AM_RANGE(0x700000, 0x700001) AM_READ(pzlbowl_protection_r) // Protection AM_RANGE(0xb00000, 0xb3ffff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) // Sprites AM_RANGE(0xb40000, 0xb4ffff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16) // Palette AM_RANGE(0xa00000, 0xa03fff) AM_DEVREADWRITE("x1", seta_sound_word_r,seta_sound_word_w) // Sound diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c index 938a49776e3..02b8c02a8f4 100644 --- a/src/mame/drivers/sidepckt.c +++ b/src/mame/drivers/sidepckt.c @@ -139,7 +139,7 @@ static ADDRESS_MAP_START( sidepckt_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3003, 0x3003) AM_READ_PORT("DSW2") AM_RANGE(0x3004, 0x3004) AM_WRITE(sound_cpu_command_w) AM_RANGE(0x300c, 0x300c) AM_READNOP AM_WRITE(sidepckt_flipscreen_w) -// AM_RANGE(0x3014, 0x3014) //i8751 read +// AM_RANGE(0x3014, 0x3014) //i8751 read // AM_RANGE(0x3018, 0x3018) //i8751 write AM_RANGE(0x4000, 0xffff) AM_ROM ADDRESS_MAP_END diff --git a/src/mame/drivers/skimaxx.c b/src/mame/drivers/skimaxx.c index 5812456ad13..3e05eea2ee5 100644 --- a/src/mame/drivers/skimaxx.c +++ b/src/mame/drivers/skimaxx.c @@ -235,7 +235,7 @@ static MACHINE_RESET( skimaxx ) static MACHINE_DRIVER_START( skimaxx ) MDRV_CPU_ADD("maincpu", M68020, XTAL_40MHz) // TODO: Should be a 68030! MDRV_CPU_PROGRAM_MAP(68030_1_map, 0) -// MDRV_CPU_VBLANK_INT("screen", irq3_line_hold) +// MDRV_CPU_VBLANK_INT("screen", irq3_line_hold) MDRV_CPU_ADD("subcpu", M68020, XTAL_40MHz) MDRV_CPU_PROGRAM_MAP(68030_2_map, 0) // TODO: Should be a 68030! diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c index 7cc1ae4b285..1a4f3a5a0f9 100644 --- a/src/mame/drivers/skyfox.c +++ b/src/mame/drivers/skyfox.c @@ -58,7 +58,7 @@ static ADDRESS_MAP_START( skyfox_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xe002, 0xe002) AM_READ_PORT("DSW1") // AM_RANGE(0xe008, 0xe00f) AM_WRITE(skyfox_vregs_w) // Video Regs AM_RANGE(0xf001, 0xf001) AM_READ_PORT("DSW2") // -// AM_RANGE(0xff00, 0xff07) AM_READ(skyfox_vregs_r) // fake to read the vregs +// AM_RANGE(0xff00, 0xff07) AM_READ(skyfox_vregs_r) // fake to read the vregs ADDRESS_MAP_END @@ -79,9 +79,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( skyfox_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x7fff) AM_ROM // ROM AM_RANGE(0x8000, 0x87ff) AM_RAM // RAM -// AM_RANGE(0x9000, 0x9001) AM_WRITENOP // ?? +// AM_RANGE(0x9000, 0x9001) AM_WRITENOP // ?? AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE("ym1", ym2203_r,ym2203_w) // YM2203 #1 -// AM_RANGE(0xb000, 0xb001) AM_WRITENOP // ?? +// AM_RANGE(0xb000, 0xb001) AM_WRITENOP // ?? AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ym2", ym2203_r,ym2203_w) // YM2203 #2 AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_r) // From Main CPU ADDRESS_MAP_END diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c index b1325956a22..e6132c836a4 100644 --- a/src/mame/drivers/splash.c +++ b/src/mame/drivers/splash.c @@ -136,7 +136,7 @@ static void splash_msm5205_int(const device_config *device) static ADDRESS_MAP_START( splash_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xd7ff) AM_ROM /* ROM */ AM_RANGE(0xd800, 0xd800) AM_WRITE(splash_adpcm_data_w) /* ADPCM data for the MSM5205 chip */ -// AM_RANGE(0xe000, 0xe000) AM_WRITENOP /* ??? */ +// AM_RANGE(0xe000, 0xe000) AM_WRITENOP /* ??? */ AM_RANGE(0xe800, 0xe800) AM_READ(soundlatch_r) /* Sound latch */ AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ym", ym3812_r,ym3812_w) /* YM3812 */ AM_RANGE(0xf800, 0xffff) AM_RAM /* RAM */ @@ -191,7 +191,7 @@ static ADDRESS_MAP_START( funystrp_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x01ffff) AM_ROM /* ROM */ AM_RANGE(0x100000, 0x100fff) AM_RAM /* protection? RAM */ AM_RANGE(0x800000, 0x83ffff) AM_RAM AM_BASE(&splash_pixelram) /* Pixel Layer */ -// AM_RANGE(0x84000e, 0x84000f) AM_WRITE(splash_sh_irqtrigger_w) /* Sound command */ +// AM_RANGE(0x84000e, 0x84000f) AM_WRITE(splash_sh_irqtrigger_w) /* Sound command */ AM_RANGE(0x84000a, 0x84003b) AM_WRITE(splash_coin_w) /* Coin Counters + Coin Lockout */ AM_RANGE(0x840000, 0x840001) AM_READ_PORT("DSW1") AM_RANGE(0x840002, 0x840003) AM_READ_PORT("DSW2") diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index 922bd05b0df..c3e8cd39f9c 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -438,11 +438,11 @@ static READ16_HANDLER( fake_r ) { return ssv_scroll[offset]; } AM_RANGE(0x21000e, 0x21000f) AM_READWRITE(SMH_NOP, ssv_lockout_w) /* Lockout */ \ AM_RANGE(0x210010, 0x210011) AM_WRITENOP \ AM_RANGE(0x230000, 0x230071) AM_WRITE(SMH_RAM) AM_BASE(&ssv_irq_vectors) /* IRQ Vec */ \ - AM_RANGE(0x240000, 0x240071) AM_WRITE(ssv_irq_ack_w ) /* IRQ Ack */ \ - AM_RANGE(0x260000, 0x260001) AM_WRITE(ssv_irq_enable_w) /* IRQ En */ \ + AM_RANGE(0x240000, 0x240071) AM_WRITE(ssv_irq_ack_w ) /* IRQ Ack */ \ + AM_RANGE(0x260000, 0x260001) AM_WRITE(ssv_irq_enable_w) /* IRQ En */ \ AM_RANGE(0x300000, 0x30007f) AM_DEVREADWRITE8("ensoniq", es5506_r, es5506_w, 0x00ff) /* Sound */ \ AM_RANGE(0x482000, 0x482fff) AM_RAM_WRITE(dsp_w) AM_BASE(&dsp_ram) \ - AM_RANGE(_ROM, 0xffffff) AM_ROMBANK(1) /* ROM */ \ + AM_RANGE(_ROM, 0xffffff) AM_ROMBANK(1) /* ROM */ \ //AM_RANGE(0x990000, 0x99007f) AM_READ(fake_r) @@ -458,7 +458,7 @@ static READ16_HANDLER( drifto94_rand_r ) } static ADDRESS_MAP_START( drifto94_map, ADDRESS_SPACE_PROGRAM, 16 ) -// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 1 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 1 at the start AM_RANGE(0x400000, 0x47ffff) AM_WRITE(SMH_RAM) // ? AM_RANGE(0x480000, 0x480001) AM_NOP // ? AM_RANGE(0x483000, 0x485fff) AM_WRITE(SMH_NOP) // ? @@ -635,9 +635,9 @@ static READ16_HANDLER( hypreact_input_r ) static ADDRESS_MAP_START( hypreact_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r) // Watchdog -// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 5 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 5 at the start AM_RANGE(0x21000e, 0x21000f) AM_WRITE(ssv_lockout_inv_w) // Inverted lockout lines -// AM_RANGE(0x280000, 0x280001) AM_READ(SMH_NOP) // ? read at the start, value not used +// AM_RANGE(0x280000, 0x280001) AM_READ(SMH_NOP) // ? read at the start, value not used AM_RANGE(0xc00000, 0xc00001) AM_READ(hypreact_input_r) // Inputs AM_RANGE(0xc00006, 0xc00007) AM_RAM AM_BASE(&ssv_input_sel) // AM_RANGE(0xc00008, 0xc00009) AM_NOP // @@ -651,9 +651,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( hypreac2_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r) // Watchdog -// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 5 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 5 at the start AM_RANGE(0x21000e, 0x21000f) AM_WRITE(ssv_lockout_inv_w) // Inverted lockout lines -// AM_RANGE(0x280000, 0x280001) AM_READ(SMH_NOP) // ? read at the start, value not used +// AM_RANGE(0x280000, 0x280001) AM_READ(SMH_NOP) // ? read at the start, value not used AM_RANGE(0x500000, 0x500001) AM_READ(hypreact_input_r) // Inputs AM_RANGE(0x500002, 0x500003) AM_READ(hypreact_input_r) // (again?) AM_RANGE(0x520000, 0x520001) AM_WRITE(SMH_RAM) AM_BASE(&ssv_input_sel) // Inputs @@ -670,7 +670,7 @@ static READ16_HANDLER( srmp4_input_r ); static ADDRESS_MAP_START( janjans1_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x210001) AM_WRITE(SMH_NOP) // koikois2 but not janjans1 -// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 1 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 1 at the start AM_RANGE(0x210006, 0x210007) AM_READ(SMH_NOP) AM_RANGE(0x800000, 0x800001) AM_WRITE(SMH_RAM) AM_BASE(&ssv_input_sel) // Inputs AM_RANGE(0x800002, 0x800003) AM_READ(srmp4_input_r) // Inputs @@ -683,7 +683,7 @@ ADDRESS_MAP_END ***************************************************************************/ static ADDRESS_MAP_START( keithlcy_map, ADDRESS_SPACE_PROGRAM, 16 ) -// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 1 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 1 at the start AM_RANGE(0x210010, 0x210011) AM_WRITE(SMH_NOP) // AM_RANGE(0x21000e, 0x21000f) AM_READ(SMH_NOP) // AM_RANGE(0x400000, 0x47ffff) AM_WRITE(SMH_RAM) // ? @@ -697,9 +697,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( meosism_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r ) // Watchdog -// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 5 at the start -// AM_RANGE(0x280000, 0x280001) AM_READ(SMH_NOP) // ? read once, value not used -// AM_RANGE(0x500004, 0x500005) AM_WRITE(SMH_NOP) // ? 0,58,18 +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 5 at the start +// AM_RANGE(0x280000, 0x280001) AM_READ(SMH_NOP) // ? read once, value not used +// AM_RANGE(0x500004, 0x500005) AM_WRITE(SMH_NOP) // ? 0,58,18 AM_RANGE(0x580000, 0x58ffff) AM_RAM AM_BASE(&ssv_nvram) AM_SIZE(&ssv_nvram_size) // NVRAM SSV_MAP( 0xf00000 ) ADDRESS_MAP_END @@ -722,9 +722,9 @@ static WRITE16_HANDLER( ssv_mainram_w ) static ADDRESS_MAP_START( mslider_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x010000, 0x01ffff) AM_READWRITE(ssv_mainram_r, ssv_mainram_w) // RAM Mirror -// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 1 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 1 at the start AM_RANGE(0x400000, 0x47ffff) AM_WRITE(SMH_RAM) // ? -// AM_RANGE(0x500000, 0x500001) AM_WRITE(SMH_NOP) // ? ff at the start +// AM_RANGE(0x500000, 0x500001) AM_WRITE(SMH_NOP) // ? ff at the start SSV_MAP( 0xf00000 ) ADDRESS_MAP_END @@ -735,7 +735,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ryorioh_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x210001) AM_WRITE(watchdog_reset16_w) // Watchdog -// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 1 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 1 at the start SSV_MAP( 0xc00000 ) ADDRESS_MAP_END @@ -757,7 +757,7 @@ static READ16_HANDLER( srmp4_input_r ) static ADDRESS_MAP_START( srmp4_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r) // Watchdog -// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 1,5 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 1,5 at the start AM_RANGE(0xc0000a, 0xc0000b) AM_READ(srmp4_input_r) // Inputs AM_RANGE(0xc0000e, 0xc0000f) AM_WRITE(SMH_RAM) AM_BASE(&ssv_input_sel) // Inputs AM_RANGE(0xc00010, 0xc00011) AM_WRITE(SMH_NOP) // @@ -805,7 +805,7 @@ static READ16_HANDLER( srmp7_input_r ) static ADDRESS_MAP_START( srmp7_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x010000, 0x050faf) AM_RAM // More RAM AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r) // Watchdog -// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 0,4 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 0,4 at the start AM_RANGE(0x21000e, 0x21000f) AM_WRITE(ssv_lockout_inv_w) // Coin Counters / Lockouts AM_RANGE(0x300076, 0x300077) AM_READ(srmp7_irqv_r) // Sound // 0x540000, 0x540003, related to lev 5 irq? @@ -822,9 +822,9 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( survarts_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r) // Watchdog -// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 0,4 at the start -// AM_RANGE(0x290000, 0x290001) AM_READ(SMH_NOP) // ? -// AM_RANGE(0x2a0000, 0x2a0001) AM_READ(SMH_NOP) // ? +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 0,4 at the start +// AM_RANGE(0x290000, 0x290001) AM_READ(SMH_NOP) // ? +// AM_RANGE(0x2a0000, 0x2a0001) AM_READ(SMH_NOP) // ? AM_RANGE(0x400000, 0x43ffff) AM_RAM // dyna @@ -871,9 +871,9 @@ static WRITE16_HANDLER( sxyreact_motor_w ) } static ADDRESS_MAP_START( sxyreact_map, ADDRESS_SPACE_PROGRAM, 16 ) -// AM_RANGE(0x020000, 0x03ffff) AM_READWRITE(ssv_mainram_r, ssv_mainram_w) // sxyreac2 reads / writes here, why? +// AM_RANGE(0x020000, 0x03ffff) AM_READWRITE(ssv_mainram_r, ssv_mainram_w) // sxyreac2 reads / writes here, why? AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r) // Watchdog -// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 1 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 1 at the start AM_RANGE(0x21000e, 0x21000f) AM_WRITE(ssv_lockout_inv_w) // Inverted lockout lines AM_RANGE(0x500002, 0x500003) AM_READ(sxyreact_ballswitch_r) // ? AM_RANGE(0x500004, 0x500005) AM_READWRITE(sxyreact_dial_r, sxyreact_motor_w) // Dial Value (serial) @@ -905,7 +905,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( ultrax_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x010000, 0x03ffff) AM_RAM // More RAM AM_RANGE(0x210000, 0x210001) AM_READ(watchdog_reset16_r) // Watchdog (also value is cmp.b with memory address 8) -// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 2,6 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 2,6 at the start SSV_MAP( 0xe00000 ) ADDRESS_MAP_END @@ -1028,7 +1028,7 @@ static WRITE16_HANDLER( eaglshot_gfxram_w ) static ADDRESS_MAP_START( eaglshot_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x180000, 0x1bffff) AM_READWRITE(eaglshot_gfxram_r, eaglshot_gfxram_w) AM_RANGE(0x210000, 0x210001) AM_READ(/*watchdog_reset16_r*/SMH_NOP) // Watchdog -// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 0,4 at the start +// AM_RANGE(0x210002, 0x210003) AM_WRITE(SMH_NOP) // ? 0,4 at the start AM_RANGE(0x21000e, 0x21000f) AM_WRITE(ssv_lockout_inv_w) // Inverted lockout lines AM_RANGE(0x800000, 0x800001) AM_WRITE(eaglshot_gfxrom_w) AM_RANGE(0x900000, 0x900001) AM_WRITE(eaglshot_trackball_w) diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c index a5813f22726..dc9375cea24 100644 --- a/src/mame/drivers/system1.c +++ b/src/mame/drivers/system1.c @@ -721,11 +721,11 @@ static WRITE8_HANDLER( mcu_io_w ) logerror("%03X: MCU movx write mode %02X offset %04X = %02X\n", cpu_get_pc(space->cpu), mcu_control, offset, data); break; - + case 0x51: memory_write_byte(cpu_get_address_space(space->machine->cpu[0], ADDRESS_SPACE_IO), offset, data); break; - + default: logerror("%03X: MCU movx write mode %02X offset %04X = %02X\n", cpu_get_pc(space->cpu), mcu_control, offset, data); @@ -746,16 +746,16 @@ static READ8_HANDLER( mcu_io_r ) cpu_get_pc(space->cpu), mcu_control, offset); return 0xff; } - + case 0x47: return memory_region(space->machine, "maincpu")[offset + 0x00000]; case 0x4f: return memory_region(space->machine, "maincpu")[offset + 0x10000]; - + case 0x51: return memory_read_byte(cpu_get_address_space(space->machine->cpu[0], ADDRESS_SPACE_IO), offset); - + case 0x59: /* read after each byte of internal checksum */ case 0x5f: /* read after each pair of bytes during main CPU checksum */ return 0xff; @@ -773,14 +773,14 @@ static READ8_HANDLER( mcu_io_r ) | +----------- I/O? | | +--------- ROM bank select | | | -01 0000 0001 = read/write to Z80 program space -51 0101 0001 = read/write to Z80 I/O space +01 0000 0001 = read/write to Z80 program space +51 0101 0001 = read/write to Z80 I/O space 41 0100 0001 = write at initialization time -47 0100 0111 = read from ROM 00000-07FFF -4F 0100 1111 = read from ROM 10000-1FFFF +47 0100 0111 = read from ROM 00000-07FFF +4F 0100 1111 = read from ROM 10000-1FFFF 5F 0101 1111 = read during ROM checksum -19 0001 1001 = reads here before doing shorter loops -59 0101 1001 = reads here during checksum, and in infinite loop on checksum error +19 0001 1001 = reads here before doing shorter loops +59 0101 1001 = reads here during checksum, and in infinite loop on checksum error When P1 = $01, movx writes to ???, reads from ??? @@ -2187,7 +2187,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( nobm ) MDRV_IMPORT_FROM( nob ) - + /* basic machine hardware */ MDRV_CPU_ADD("mcu", I8751, 8000000 /* unknown speed */) MDRV_CPU_IO_MAP(mcu_io_map,0) @@ -2207,7 +2207,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sys2m ) MDRV_IMPORT_FROM( sys2 ) - + /* basic machine hardware */ MDRV_CPU_ADD("mcu", I8751, 8000000 /* unknown speed */) MDRV_CPU_IO_MAP(mcu_io_map,0) @@ -2224,7 +2224,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( sys2rowm ) MDRV_IMPORT_FROM( sys2row ) - + /* basic machine hardware */ MDRV_CPU_ADD("mcu", I8751, 8000000 /* unknown speed */) MDRV_CPU_IO_MAP(mcu_io_map,0) @@ -4736,7 +4736,7 @@ static DRIVER_INIT( shtngmst ) UINT8 *rom = memory_region(machine, "maincpu"); int addr; - // this is not right, but works for a decent amount of the data + // this is not right, but works for a decent amount of the data for (addr = 0; addr < 0x8000; addr++) rom[addr] ^= 0x04; DRIVER_INIT_CALL(shtngmst1); diff --git a/src/mame/drivers/taito_o.c b/src/mame/drivers/taito_o.c index d3afce7ddba..41e931d5489 100644 --- a/src/mame/drivers/taito_o.c +++ b/src/mame/drivers/taito_o.c @@ -9,7 +9,7 @@ Board specs (based on poor quality pic): 68000 YM2203 -4 custom Taito chips ( TC0080VCO? TC0070RGB? ) +4 custom Taito chips ( TC0080VCO? TC0070RGB? ) Custom (non JAMMA) connector Battery @@ -45,7 +45,7 @@ static WRITE16_HANDLER(io_w) switch(offset) { case 2: watchdog_reset(space->machine); break; - + default: logerror("IO W %x %x %x\n",offset,data,mem_mask); } } @@ -78,15 +78,15 @@ static INPUT_PORTS_START( parentj ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_CODE(KEYCODE_C) PORT_NAME("Bet 3") PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_CODE(KEYCODE_V) PORT_NAME("Bet 4") - PORT_DIPNAME(0x0010, 0x10, "IN0 4") + PORT_DIPNAME(0x0010, 0x10, "IN0 4") PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_CODE(KEYCODE_F) PORT_NAME("Payout") - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_CODE(KEYCODE_D) PORT_NAME("Check") PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_CODE(KEYCODE_A) PORT_NAME("Deal/Hit") PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_CODE(KEYCODE_S) PORT_NAME("Double") - PORT_DIPNAME(0x000400, 0x400, "IN0 a") + PORT_DIPNAME(0x000400, 0x400, "IN0 a") PORT_DIPSETTING( 0x400, DEF_STR( Off ) ) PORT_DIPSETTING( 0x000, DEF_STR( On ) ) PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_J) PORT_NAME("Reset") @@ -95,7 +95,7 @@ static INPUT_PORTS_START( parentj ) PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_W) PORT_NAME("Meter Key") PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_E) PORT_NAME("Opto 1H") PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_R) PORT_NAME("Opto 1L") - + PORT_START("IN1") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_U) PORT_NAME("Hop Over") PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_T) PORT_NAME("Opto 2H") @@ -162,7 +162,7 @@ static INPUT_PORTS_START( parentj ) PORT_DIPNAME(0x0080, 0x00, "DSWA 7") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x080, DEF_STR( On ) ) - + PORT_START("DSWB") PORT_DIPNAME(0x0001, 0x00, "Credits at start") PORT_DIPSETTING( 0x00, "500" ) @@ -188,7 +188,7 @@ static INPUT_PORTS_START( parentj ) PORT_DIPNAME(0x0080, 0x00, "DSWB 7") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x080, DEF_STR( On ) ) - + INPUT_PORTS_END static const gfx_layout parentj_layout = @@ -251,9 +251,9 @@ static MACHINE_DRIVER_START( parentj ) MDRV_VIDEO_START(parentj) MDRV_VIDEO_UPDATE(parentj) - + MDRV_SPEAKER_STANDARD_MONO("mono") - + MDRV_SOUND_ADD("ym", YM2203, 2000000) /*?? MHz */ MDRV_SOUND_CONFIG(ym2203_config) MDRV_SOUND_ROUTE(0, "mono", 0.25) diff --git a/src/mame/drivers/taitowlf.c b/src/mame/drivers/taitowlf.c index 3e54332c694..10f3185b88f 100644 --- a/src/mame/drivers/taitowlf.c +++ b/src/mame/drivers/taitowlf.c @@ -324,7 +324,7 @@ static READ8_HANDLER(at_page8_r) { UINT8 data = at_pages[offset % 0x10]; - switch(offset % 8) + switch(offset % 8) { case 1: data = dma_offset[(offset / 8) & 1][2]; @@ -347,7 +347,7 @@ static WRITE8_HANDLER(at_page8_w) { at_pages[offset % 0x10] = data; - switch(offset % 8) + switch(offset % 8) { case 1: dma_offset[(offset / 8) & 1][2] = data; @@ -548,13 +548,13 @@ static MACHINE_RESET(taitowlf) * *************************************************************/ -static PIC8259_SET_INT_LINE( taitowlf_pic8259_1_set_int_line ) +static PIC8259_SET_INT_LINE( taitowlf_pic8259_1_set_int_line ) { cputag_set_input_line(device->machine, "maincpu", 0, interrupt ? HOLD_LINE : CLEAR_LINE); } -static PIC8259_SET_INT_LINE( taitowlf_pic8259_2_set_int_line ) +static PIC8259_SET_INT_LINE( taitowlf_pic8259_2_set_int_line ) { pic8259_set_irq_line( taitowlf_devices.pic8259_1, 2, interrupt); } @@ -656,7 +656,7 @@ static void ide_interrupt(const device_config *device, int state) pic8259_set_irq_line(taitowlf_devices.pic8259_2, 6, state); } -static int taitowlf_get_out2(running_machine *machine) +static int taitowlf_get_out2(running_machine *machine) { return pit8253_get_output(taitowlf_devices.pit8254, 2 ); } @@ -666,7 +666,7 @@ static const struct kbdc8042_interface at8042 = KBDC8042_AT386, set_gate_a20, keyboard_interrupt, taitowlf_get_out2 }; -static void taitowlf_set_keyb_int(running_machine *machine, int state) +static void taitowlf_set_keyb_int(running_machine *machine, int state) { pic8259_set_irq_line(taitowlf_devices.pic8259_1, 1, state); } diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c index a6e7f50a466..1f86ec33826 100644 --- a/src/mame/drivers/vball.c +++ b/src/mame/drivers/vball.c @@ -165,7 +165,7 @@ static WRITE8_HANDLER( vb_bankswitch_w ) UINT8 *RAM = memory_region(space->machine, "maincpu"); memory_set_bankptr(space->machine, 1, &RAM[0x10000 + (0x4000 * (data & 1))]); - if (vball_gfxset != ((data & 0x20) ^ 0x20)) + if (vball_gfxset != ((data & 0x20) ^ 0x20)) { vball_gfxset = (data & 0x20) ^ 0x20; vb_mark_all_dirty(); @@ -174,7 +174,7 @@ static WRITE8_HANDLER( vb_bankswitch_w ) } /* The sound system comes all but verbatim from Double Dragon */ -static WRITE8_HANDLER( cpu_sound_command_w ) +static WRITE8_HANDLER( cpu_sound_command_w ) { soundlatch_w(space, offset, data); cputag_set_input_line(space->machine, "audiocpu", INPUT_LINE_NMI, PULSE_LINE); diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c index 98e28515ad1..30a50f4493b 100644 --- a/src/mame/drivers/xmen.c +++ b/src/mame/drivers/xmen.c @@ -120,7 +120,7 @@ static READ16_HANDLER( sound_status_r ) static WRITE16_HANDLER( sound_cmd_w ) { - if (ACCESSING_BITS_0_7) + if (ACCESSING_BITS_0_7) { data &= 0xff; soundlatch_w(space, 0, data); @@ -136,7 +136,7 @@ static WRITE16_HANDLER( sound_irq_w ) static WRITE16_HANDLER( xmen_18fa00_w ) { - if(ACCESSING_BITS_0_7) + if(ACCESSING_BITS_0_7) { /* bit 2 is interrupt enable */ interrupt_enable_w(space, 0, data & 0x04); diff --git a/src/mame/includes/atari.h b/src/mame/includes/atari.h index 9bc89060713..e6f332c07d5 100644 --- a/src/mame/includes/atari.h +++ b/src/mame/includes/atari.h @@ -24,7 +24,7 @@ READ8_DEVICE_HANDLER(atari_pia_pb_r); WRITE8_DEVICE_HANDLER(a600xl_pia_pb_w); /* This is needed in MESS as well for Atari 8bit drivers */ -void atari_machine_start(running_machine *machine); +void atari_machine_start(running_machine *machine); MACHINE_START( atarixl ); diff --git a/src/mame/machine/flstory.c b/src/mame/machine/flstory.c index be238e8358a..db7e2216bd6 100644 --- a/src/mame/machine/flstory.c +++ b/src/mame/machine/flstory.c @@ -68,7 +68,7 @@ WRITE8_HANDLER( flstory_68705_portB_w ) if ((ddrB & 0x02) && (~data & 0x02) && (portB_out & 0x02)) { portA_in = from_main; - if (main_sent) + if (main_sent) cputag_set_input_line(space->machine, "mcu", 0, CLEAR_LINE); main_sent = 0; logerror("read command %02x from main cpu\n", portA_in); diff --git a/src/mame/machine/tatsumi.c b/src/mame/machine/tatsumi.c index fd7848e7a28..cd19ec3c97a 100644 --- a/src/mame/machine/tatsumi.c +++ b/src/mame/machine/tatsumi.c @@ -223,7 +223,7 @@ WRITE16_HANDLER( roundup5_control_w ) // if ((tatsumi_control_w&0x200)==0 && (last_bank&0x200)==0x200) // logerror("68k reset\n"); - if (tatsumi_control_word == 0x3a00) + if (tatsumi_control_word == 0x3a00) { // cpu_set_reset_line(1, CLEAR_LINE); // logerror("68k on\n"); @@ -274,13 +274,13 @@ WRITE16_HANDLER(cyclwarr_control_w) */ - if ((tatsumi_control_word & 4) == 4 && (tatsumi_last_control & 4) == 0) + if ((tatsumi_control_word & 4) == 4 && (tatsumi_last_control & 4) == 0) { // logerror("68k 2 halt\n"); cputag_set_input_line(space->machine, "sub", INPUT_LINE_HALT, ASSERT_LINE); } - if ((tatsumi_control_word & 4) == 0 && (tatsumi_last_control & 4) == 4) + if ((tatsumi_control_word & 4) == 0 && (tatsumi_last_control & 4) == 4) { // logerror("68k 2 irq go\n"); cputag_set_input_line(space->machine, "sub", INPUT_LINE_HALT, CLEAR_LINE); @@ -288,7 +288,7 @@ WRITE16_HANDLER(cyclwarr_control_w) // hack - if (cpu_get_pc(space->cpu) == 0x2c3c34) + if (cpu_get_pc(space->cpu) == 0x2c3c34) { // cpu_set_reset_line(1, CLEAR_LINE); // logerror("hack 68k2 on\n"); diff --git a/src/mame/machine/zs01.c b/src/mame/machine/zs01.c index a3f34e4a594..7699e6b6e20 100644 --- a/src/mame/machine/zs01.c +++ b/src/mame/machine/zs01.c @@ -81,7 +81,7 @@ void zs01_init( running_machine *machine, int chip, UINT8 *data, zs01_write_hand if( data == NULL ) { - data = auto_alloc_array(machine, UINT8, + data = auto_alloc_array(machine, UINT8, SIZE_RESPONSE_TO_RESET + SIZE_KEY + SIZE_KEY + diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c index 8773a8a76e2..bc19d0320ac 100644 --- a/src/mame/mamedriv.c +++ b/src/mame/mamedriv.c @@ -897,6 +897,7 @@ const game_driver * const drivers[] = DRIVER( motoxgo ) /* (c) 1997 */ DRIVER( timecrs2 ) /* (c) 1997 */ DRIVER( timcrs2b ) /* (c) 1997 */ + DRIVER( panicprk ) /* (c) 1998 */ DRIVER( 500gp ) /* (c) 1999 */ DRIVER( finfurl2 ) /* (c) 1999 */ DRIVER( finfrl2j ) /* (c) 1999 */ diff --git a/src/mame/video/arkanoid.c b/src/mame/video/arkanoid.c index a601b9ca339..4ba2033b8d8 100644 --- a/src/mame/video/arkanoid.c +++ b/src/mame/video/arkanoid.c @@ -24,13 +24,13 @@ WRITE8_HANDLER( arkanoid_d008_w ) int bank; /* bits 0 and 1 flip X and Y, I don't know which is which */ - if (flip_screen_x_get(space->machine) != (data & 0x01)) + if (flip_screen_x_get(space->machine) != (data & 0x01)) { flip_screen_x_set(space->machine, data & 0x01); tilemap_mark_all_tiles_dirty(bg_tilemap); } - if (flip_screen_y_get(space->machine) != (data & 0x02)) + if (flip_screen_y_get(space->machine) != (data & 0x02)) { flip_screen_y_set(space->machine, data & 0x02); tilemap_mark_all_tiles_dirty(bg_tilemap); @@ -49,7 +49,7 @@ WRITE8_HANDLER( arkanoid_d008_w ) /* so I don't know which is which. */ bank = (data & 0x20) >> 5; - if (gfxbank != bank) + if (gfxbank != bank) { gfxbank = bank; tilemap_mark_all_tiles_dirty(bg_tilemap); @@ -57,7 +57,7 @@ WRITE8_HANDLER( arkanoid_d008_w ) bank = (data & 0x40) >> 6; - if (palettebank != bank) + if (palettebank != bank) { palettebank = bank; tilemap_mark_all_tiles_dirty(bg_tilemap); diff --git a/src/mame/video/dc.c b/src/mame/video/dc.c index 9404fd6fb5f..b26c10b66a0 100644 --- a/src/mame/video/dc.c +++ b/src/mame/video/dc.c @@ -414,14 +414,14 @@ static UINT32 tex_r_default(texinfo *t, float x, float y) static void tex_prepare(texinfo *t) { int miptype = 0; - + t->r = tex_r_default; t->cd = dilatechose[t->sizes]; t->palbase = 0; t->vqbase = t->address; - // fprintf(stderr, "tex %d %d %d %d\n", t->pf, t->mode, pvrta_regs[PAL_RAM_CTRL], t->mipmapped); - + // fprintf(stderr, "tex %d %d %d %d\n", t->pf, t->mode, pvrta_regs[PAL_RAM_CTRL], t->mipmapped); + switch(t->pf) { case 0: // 1555 switch(t->mode) { @@ -462,8 +462,8 @@ static void tex_prepare(texinfo *t) t->palbase = 0x400 | ((t->palette & 0x3f) << 4); switch(t->mode) { case 0: case 1: - miptype = 0; - + miptype = 0; + switch(pvrta_regs[PAL_RAM_CTRL]) { case 0: t->r = tex_r_p4_1555_tw; break; case 1: t->r = tex_r_p4_565_tw; break; @@ -472,7 +472,7 @@ static void tex_prepare(texinfo *t) } break; default: - miptype = 3; // ? + miptype = 3; // ? switch(pvrta_regs[PAL_RAM_CTRL]) { case 0: t->r = tex_r_p4_1555_vq; t->address += 0x800; break; @@ -488,8 +488,8 @@ static void tex_prepare(texinfo *t) t->palbase = 0x400 | ((t->palette & 0x30) << 4); switch(t->mode) { case 0: case 1: - miptype = 1; - + miptype = 1; + switch(pvrta_regs[PAL_RAM_CTRL]) { case 0: t->r = tex_r_p8_1555_tw; break; case 1: t->r = tex_r_p8_565_tw; break; @@ -498,8 +498,8 @@ static void tex_prepare(texinfo *t) } break; default: - miptype = 3; // ? - + miptype = 3; // ? + switch(pvrta_regs[PAL_RAM_CTRL]) { case 0: t->r = tex_r_p8_1555_vq; t->address += 0x800; break; case 1: t->r = tex_r_p8_565_vq; t->address += 0x800; break; @@ -513,98 +513,98 @@ static void tex_prepare(texinfo *t) case 9: // reserved break; } - + if (t->mipmapped) { // full offset tables for reference, // we don't do mipmapping, so don't use anything < 8x8 // first table is half-bytes - + // 4BPP palette textures // Texture size _4-bit_ offset value for starting address - // 1x1 0x00003 - // 2x2 0x00004 - // 4x4 0x00008 - // 8x8 0x00018 - // 16x16 0x00058 - // 32x32 0x00158 - // 64x64 0x00558 - // 128x128 0x01558 - // 256x256 0x05558 - // 512x512 0x15558 - // 1024x1024 0x55558 - + // 1x1 0x00003 + // 2x2 0x00004 + // 4x4 0x00008 + // 8x8 0x00018 + // 16x16 0x00058 + // 32x32 0x00158 + // 64x64 0x00558 + // 128x128 0x01558 + // 256x256 0x05558 + // 512x512 0x15558 + // 1024x1024 0x55558 + // 8BPP palette textures // Texture size Byte offset value for starting address - // 1x1 0x00003 - // 2x2 0x00004 - // 4x4 0x00008 - // 8x8 0x00018 - // 16x16 0x00058 - // 32x32 0x00158 - // 64x64 0x00558 - // 128x128 0x01558 - // 256x256 0x05558 - // 512x512 0x15558 - // 1024x1024 0x55558 - + // 1x1 0x00003 + // 2x2 0x00004 + // 4x4 0x00008 + // 8x8 0x00018 + // 16x16 0x00058 + // 32x32 0x00158 + // 64x64 0x00558 + // 128x128 0x01558 + // 256x256 0x05558 + // 512x512 0x15558 + // 1024x1024 0x55558 + // Non-palette textures // Texture size Byte offset value for starting address - // 1x1 0x00006 - // 2x2 0x00008 - // 4x4 0x00010 - // 8x8 0x00030 - // 16x16 0x000B0 - // 32x32 0x002B0 - // 64x64 0x00AB0 - // 128x128 0x02AB0 - // 256x256 0x0AAB0 - // 512x512 0x2AAB0 - // 1024x1024 0xAAAB0 - + // 1x1 0x00006 + // 2x2 0x00008 + // 4x4 0x00010 + // 8x8 0x00030 + // 16x16 0x000B0 + // 32x32 0x002B0 + // 64x64 0x00AB0 + // 128x128 0x02AB0 + // 256x256 0x0AAB0 + // 512x512 0x2AAB0 + // 1024x1024 0xAAAB0 + // VQ textures // Texture size Byte offset value for starting address - // 1x1 0x00000 - // 2x2 0x00001 - // 4x4 0x00002 - // 8x8 0x00006 - // 16x16 0x00016 - // 32x32 0x00056 - // 64x64 0x00156 - // 128x128 0x00556 - // 256x256 0x01556 - // 512x512 0x05556 - // 1024x1024 0x15556 - + // 1x1 0x00000 + // 2x2 0x00001 + // 4x4 0x00002 + // 8x8 0x00006 + // 16x16 0x00016 + // 32x32 0x00056 + // 64x64 0x00156 + // 128x128 0x00556 + // 256x256 0x01556 + // 512x512 0x05556 + // 1024x1024 0x15556 + static const int mipmap_4_8_offset[8] = { 0x00018, 0x00058, 0x00158, 0x00558, 0x01558, 0x05558, 0x15558, 0x55558 }; // 4bpp (4bit offset) / 8bpp (8bit offset) static const int mipmap_np_offset[8] = { 0x00030, 0x000B0, 0x002B0, 0x00AB0, 0x02AB0, 0x0AAB0, 0x2AAB0, 0xAAAB0 }; // nonpalette textures static const int mipmap_vq_offset[8] = { 0x00006, 0x00016, 0x00056, 0x00156, 0x00556, 0x01556, 0x05556, 0x15556 }; // vq textures - + switch (miptype) { - + case 0: // 4bpp //printf("4bpp\n"); t->address += mipmap_4_8_offset[t->sizes&7]>>1; break; - + case 1: // 8bpp //printf("8bpp\n"); t->address += mipmap_4_8_offset[t->sizes&7]; break; - + case 2: // nonpalette //printf("np\n"); t->address += mipmap_np_offset[t->sizes&7]; break; - + case 3: // vq //printf("vq\n"); t->address += mipmap_vq_offset[t->sizes&7]; break; } } - + } static void tex_get_info(texinfo *ti, pvrta_state *sa) @@ -1222,7 +1222,7 @@ void process_ta_fifo(running_machine* machine) ts->evert = rd->verts_size + 3; rd->verts_size += 4; - } + } } } else if (state_ta.global_paratype == 4) @@ -1244,7 +1244,7 @@ void process_ta_fifo(running_machine* machine) tv->w=u2f(tafifo_buff[3]); tv->u=u2f(tafifo_buff[4]); tv->v=u2f(tafifo_buff[5]); - + if((!rd->strips_size) || rd->strips[rd->strips_size-1].evert != -1) { diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c index 8aae9dfd07b..316d311a6a5 100644 --- a/src/mame/video/dec8.c +++ b/src/mame/video/dec8.c @@ -166,7 +166,7 @@ WRITE8_HANDLER( srdarwin_control_w ) int bankaddress; UINT8 *RAM = memory_region(space->machine, "maincpu"); - switch (offset) + switch (offset) { case 0: /* Top 3 bits - bank switch, bottom 4 - scroll MSB */ bankaddress = 0x10000 + (data >> 5) * 0x4000; @@ -227,7 +227,7 @@ WRITE8_HANDLER( lastmiss_scrolly_w ) WRITE8_HANDLER( gondo_scroll_w ) { - switch (offset) + switch (offset) { case 0x0: scroll2[1] = data; /* X LSB */ @@ -278,7 +278,7 @@ static void draw_sprites1(running_machine* machine, bitmap_t *bitmap, const rect y=(y+16)%0x200; x=256 - x; y=256 - y; - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) { y=240-y; x=240-x; @@ -288,7 +288,7 @@ static void draw_sprites1(running_machine* machine, bitmap_t *bitmap, const rect } /* Y Flip determines order of multi-sprite */ - if (extra && fy) + if (extra && fy) { sprite2=sprite; sprite++; @@ -352,7 +352,7 @@ static void draw_sprites2(running_machine* machine, bitmap_t *bitmap, const rect inc = 1; } - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) { y=240-y; x=240-x; @@ -399,7 +399,7 @@ static void srdarwin_draw_sprites(running_machine* machine, bitmap_t *bitmap, co fx = buffered_spriteram[offs+1] & 0x04; multi = buffered_spriteram[offs+1] & 0x10; - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) { sy=240-sy; sx=240-sx; @@ -430,7 +430,7 @@ static void draw_characters(running_machine* machine, bitmap_t *bitmap, const re { int mx,my,tile,color,offs; - for (offs = 0x800 - 2;offs >= 0;offs -= 2) + for (offs = 0x800 - 2;offs >= 0;offs -= 2) { tile=videoram[offs+1]+((videoram[offs]&0xf)<<8); @@ -533,15 +533,15 @@ VIDEO_START( cobracom ) VIDEO_UPDATE( ghostb ) { - if (dec8_pf0_control[0]&0x4) + if (dec8_pf0_control[0]&0x4) { /* Rowscroll */ int offs; tilemap_set_scroll_rows(dec8_pf0_tilemap,512); for (offs = 0;offs < 512;offs+=2) tilemap_set_scrollx( dec8_pf0_tilemap,offs/2, (dec8_pf0_control[0x10]<<8)+dec8_pf0_control[0x11] + (dec8_row[offs]<<8)+dec8_row[offs+1] ); - } - else + } + else { tilemap_set_scroll_rows(dec8_pf0_tilemap,1); tilemap_set_scrollx( dec8_pf0_tilemap,0, (dec8_pf0_control[0x10]<<8)+dec8_pf0_control[0x11] ); diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c index a1b6d0ff0a9..0e560021edf 100644 --- a/src/mame/video/deco32.c +++ b/src/mame/video/deco32.c @@ -285,7 +285,7 @@ static void captaven_draw_sprites(running_machine* machine, bitmap_t *bitmap, co fx,fy, sx + x_mult * (w-x),sy + y_mult * (h-y), cliprect,TRANSPARENCY_PEN,0,prival); - + // wrap-around y pdrawgfx(bitmap,machine->gfx[gfxbank], sprite + y + h * x, diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c index 545949309c4..0a8c02f9a9f 100644 --- a/src/mame/video/goldstar.c +++ b/src/mame/video/goldstar.c @@ -32,12 +32,12 @@ WRITE8_HANDLER( cm_girl_scroll_w ) { cm_girl_scroll = data; /* - xxxx ---- yscroll - ---- xxxx xscroll + xxxx ---- yscroll + ---- xxxx xscroll - this isn't very fine scrolling, but i see no other registers. - 1000 1000 is the center of the screen. - */ + this isn't very fine scrolling, but i see no other registers. + 1000 1000 is the center of the screen. + */ } WRITE8_HANDLER( cm_outport0_w ) @@ -288,7 +288,7 @@ VIDEO_UPDATE( goldstar ) const gfx_element *gfx = screen->machine->gfx[2]; int girlyscroll = (INT8)((cm_girl_scroll & 0xf0)); int girlxscroll = (INT8)((cm_girl_scroll & 0x0f)<<4); - + drawgfxzoom(bitmap,gfx,cmaster_girl_num,cmaster_girl_pal,0,0,-(girlxscroll*2),-(girlyscroll),cliprect,TRANSPARENCY_PEN,0, 0x20000, 0x10000); } } diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c index 5bb5ab93ce2..a8d281fb409 100644 --- a/src/mame/video/hng64.c +++ b/src/mame/video/hng64.c @@ -166,7 +166,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta if(xflip) { //xinc=-(int)(16.0f*foomX); - + xinc=-16; xpos-=xinc*chainx; } @@ -952,20 +952,20 @@ static TILE_GET_INFO( get_hng64_tile0_info ) { UINT16 tilemapinfo = (hng64_videoregs[0x02]&0xffff0000)>>16; int tileno,pal, flip; - + tileno = hng64_videoram[tile_index+(0x00000/4)]; // pppppppp ff--atttt tttttttt tttttttt - + pal = (tileno&0xff000000)>>24; flip =(tileno&0x00c00000)>>22; if (tileno&0x200000) { - tileno = (tileno & hng64_videoregs[0x0b]) | hng64_videoregs[0x0c]; + tileno = (tileno & hng64_videoregs[0x0b]) | hng64_videoregs[0x0c]; } - + tileno &= 0x1fffff; - + if (tilemapinfo&0x400) { SET_TILE_INFO(1,tileno>>1,pal>>4,TILE_FLIPYX(flip)); @@ -981,20 +981,20 @@ static TILE_GET_INFO( get_hng64_tile1_info ) { UINT16 tilemapinfo = (hng64_videoregs[0x02]&0x0000ffff)>>0; int tileno,pal, flip; - + tileno = hng64_videoram[tile_index+(0x10000/4)]; // pppppppp ff--atttt tttttttt tttttttt - + pal = (tileno&0xff000000)>>24; flip =(tileno&0x00c00000)>>22; if (tileno&0x200000) { - tileno = (tileno & hng64_videoregs[0x0b]) | hng64_videoregs[0x0c]; + tileno = (tileno & hng64_videoregs[0x0b]) | hng64_videoregs[0x0c]; } tileno &= 0x1fffff; - + if (tilemapinfo&0x400) { SET_TILE_INFO(3,tileno>>3,pal>>4,TILE_FLIPYX(flip)); @@ -1010,20 +1010,20 @@ static TILE_GET_INFO( get_hng64_tile2_info ) { UINT16 tilemapinfo = (hng64_videoregs[0x03]&0xffff0000)>>16; int tileno,pal, flip; - + tileno = hng64_videoram[tile_index+(0x20000/4)]; // pppppppp ff--atttt tttttttt tttttttt - + pal = (tileno&0xff000000)>>24; flip =(tileno&0x00c00000)>>22; if (tileno&0x200000) { - tileno = (tileno & hng64_videoregs[0x0b]) | hng64_videoregs[0x0c]; + tileno = (tileno & hng64_videoregs[0x0b]) | hng64_videoregs[0x0c]; } - + tileno &= 0x1fffff; - + if (tilemapinfo&0x400) { SET_TILE_INFO(3,tileno>>3,pal>>4,TILE_FLIPYX(flip)); @@ -1039,20 +1039,20 @@ static TILE_GET_INFO( get_hng64_tile3_info ) { UINT16 tilemapinfo = (hng64_videoregs[0x03]&0x0000ffff)>>0; int tileno,pal, flip; - + tileno = hng64_videoram[tile_index+(0x30000/4)]; // pppppppp ff--atttt tttttttt tttttttt - + pal = (tileno&0xff000000)>>24; flip =(tileno&0x00c00000)>>22; if (tileno&0x200000) { - tileno = (tileno & hng64_videoregs[0x0b]) | hng64_videoregs[0x0c]; + tileno = (tileno & hng64_videoregs[0x0b]) | hng64_videoregs[0x0c]; } - - tileno &= 0x1fffff; - + + tileno &= 0x1fffff; + if (tilemapinfo&0x400) { SET_TILE_INFO(3,tileno>>3,pal>>4,TILE_FLIPYX(flip)); @@ -1072,8 +1072,8 @@ static void hng64_drawtilemap( bitmap_t *bitmap, const rectangle *cliprect, int xscroll = (INT16)(hng64_videoram[(0x40000+(scrollbase<<4))/4]>>16); // ??? = (INT16)(hng64_videoram[(0x40004+(scrollbase<<4))/4]>>16); yscroll = (INT16)(hng64_videoram[(0x40008+(scrollbase<<4))/4]>>16); -// xzoom = (INT16)(hng64_videoram[(0x40010+(scrollbase<<4))/4]>>16); -// yzoom = (INT16)(hng64_videoram[(0x4000c+(scrollbase<<4))/4]>>16); +// xzoom = (INT16)(hng64_videoram[(0x40010+(scrollbase<<4))/4]>>16); +// yzoom = (INT16)(hng64_videoram[(0x4000c+(scrollbase<<4))/4]>>16); // ??? = (INT16)(hng64_videoram[(0x40014+(scrollbase<<4))/4]>>16); // ??? = (INT16)(hng64_videoram[(0x40018+(scrollbase<<4))/4]>>16); // ??? = (INT16)(hng64_videoram[(0x4001c+(scrollbase<<4))/4]>>16); @@ -1115,7 +1115,7 @@ static void hng64_drawtilemap( bitmap_t *bitmap, const rectangle *cliprect, int * 8 | oooooooo | unknown - always seems to be 80008000 (fatfurwa) * 9 | oooooooo | unknown - always seems to be 00000000 (fatfurwa) * a | oooooooo | unknown - always seems to be 00000000 (fatfurwa) - * b | mmmmmmmm | auto animation mask for tilemaps, - use these bits from the original tile number + * b | mmmmmmmm | auto animation mask for tilemaps, - use these bits from the original tile number * c | xxxxxxxx | auto animation bits for tilemaps, - merge in these bits to auto animate the tilemap * d | oooooooo | not used ?? * e | oooooooo | not used ?? @@ -1133,7 +1133,7 @@ VIDEO_UPDATE( hng64 ) tilemap_mark_all_tiles_dirty (hng64_tilemap1); tilemap_mark_all_tiles_dirty (hng64_tilemap0); - + hng64_drawtilemap(bitmap,cliprect, (hng64_videoregs[0x05]&0x00003fff)>>0, hng64_tilemap3); hng64_drawtilemap(bitmap,cliprect, (hng64_videoregs[0x05]&0x3fff0000)>>16, hng64_tilemap2); hng64_drawtilemap(bitmap,cliprect, (hng64_videoregs[0x04]&0x00003fff)>>0, hng64_tilemap1); @@ -1147,24 +1147,24 @@ VIDEO_UPDATE( hng64 ) transition_control(bitmap, cliprect) ; /* - popmessage("%08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x", - hng64_videoregs[0x00], - hng64_videoregs[0x01], - hng64_videoregs[0x02], - hng64_videoregs[0x03], - hng64_videoregs[0x04], - hng64_videoregs[0x05], - hng64_videoregs[0x06], - hng64_videoregs[0x07], - hng64_videoregs[0x08], - hng64_videoregs[0x09], - hng64_videoregs[0x0a], - hng64_videoregs[0x0b], - hng64_videoregs[0x0c], - hng64_videoregs[0x0d], - hng64_videoregs[0x0e]); - */ - + popmessage("%08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x", + hng64_videoregs[0x00], + hng64_videoregs[0x01], + hng64_videoregs[0x02], + hng64_videoregs[0x03], + hng64_videoregs[0x04], + hng64_videoregs[0x05], + hng64_videoregs[0x06], + hng64_videoregs[0x07], + hng64_videoregs[0x08], + hng64_videoregs[0x09], + hng64_videoregs[0x0a], + hng64_videoregs[0x0b], + hng64_videoregs[0x0c], + hng64_videoregs[0x0d], + hng64_videoregs[0x0e]); + */ + // tilemap0 per layer flags // 0840 - startup tests, 8x8x4 layer // 0cc0 - beast busters 2, 8x8x8 layer @@ -1172,19 +1172,19 @@ VIDEO_UPDATE( hng64 ) // 08e0 - fatal fury wa during transitions // 0940 - samurai shodown 64 // 0880 - buriki - + // ---l rb?? ???? ???? // l = floor effects / linescroll enable (buriki on tilemap1, fatal fury on tilemap3) // r = tile size? // b = 4bpp/8bpp ? (beast busters, samsh64, sasm64 2 switch it for some screens) - - - - + + + + popmessage("0: %04x 1: %04x 2: %04x 3: %04x\n", (hng64_videoregs[0x02]&0xffff0000)>>16, (hng64_videoregs[0x02]&0x0000ffff)>>0, (hng64_videoregs[0x03]&0xffff0000)>>16, (hng64_videoregs[0x03]&0x0000ffff)>>0); - - - + + + // mame_printf_debug("FRAME DONE %d\n", frameCount) ; frameCount++ ; diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c index 6f0dc3df6fe..7398856f19c 100644 --- a/src/mame/video/liberate.c +++ b/src/mame/video/liberate.c @@ -46,14 +46,14 @@ static TILE_GET_INFO( get_back_tile_info ) int tile, bank; /* Convert tile index of 512x512 to paged format */ - if (tile_index & 0x100) + if (tile_index & 0x100) { if (tile_index & 0x200) tile_index = (tile_index & 0xff) + (deco16_io_ram[5] << 8); /* Bottom right */ else tile_index = (tile_index & 0xff) + (deco16_io_ram[4] << 8); /* Bottom left */ - } - else + } + else { if (tile_index & 0x200) tile_index = (tile_index & 0xff) + (deco16_io_ram[3] << 8); /* Top right */ @@ -89,10 +89,10 @@ WRITE8_HANDLER( deco16_io_w ) if (offset > 1 && offset < 6) tilemap_mark_all_tiles_dirty(background_tilemap); - switch (offset) + switch (offset) { case 6: /* Background colour */ - if (((data >> 4) & 3) != background_color) + if (((data >> 4) & 3) != background_color) { background_color = (data >> 4) & 3; tilemap_mark_all_tiles_dirty(background_tilemap); @@ -219,7 +219,7 @@ static void liberate_draw_sprites(running_machine *machine, bitmap_t *bitmap, co if (multi && fy==0) sy-=16; - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) { sy=240-sy; sx=240-sx; @@ -230,7 +230,7 @@ static void liberate_draw_sprites(running_machine *machine, bitmap_t *bitmap, co if (fx) fx=0; else fx=1; if (fy) fy=0; else fy=1; } - else + else { if (fy) sy2=sy-16; @@ -282,7 +282,7 @@ static void prosport_draw_sprites(running_machine *machine, bitmap_t *bitmap, co // if (multi) sy-=16; if (fy && multi) { code2=code; code++; } - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) { sy=240-sy; sx=240-sx; @@ -290,7 +290,7 @@ static void prosport_draw_sprites(running_machine *machine, bitmap_t *bitmap, co if (fy) fy=0; else fy=1; sy2=sy-16; } - else + else { sy2=sy+16; } @@ -340,7 +340,7 @@ static void boomrang_draw_sprites(running_machine *machine, bitmap_t *bitmap, co // if (multi) sy-=16; if (fy && multi) { code2=code; code++; } - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) { sy=240-sy; sx=240-sx; @@ -348,7 +348,7 @@ static void boomrang_draw_sprites(running_machine *machine, bitmap_t *bitmap, co if (fy) fy=0; else fy=1; sy2=sy-16; } - else + else { sy2=sy+16; } @@ -393,7 +393,7 @@ VIDEO_UPDATE( prosport ) prosport_draw_sprites(screen->machine,bitmap,cliprect); - for (offs = 0;offs < 0x400;offs++) + for (offs = 0;offs < 0x400;offs++) { tile=videoram[offs+0x400]+((videoram[offs]&0x3)<<8); diff --git a/src/mame/video/vdc.c b/src/mame/video/vdc.c index 1f82c21c154..86d586cc381 100644 --- a/src/mame/video/vdc.c +++ b/src/mame/video/vdc.c @@ -82,14 +82,14 @@ static void vpc_init( running_machine *machine ); INTERRUPT_GEN( pce_interrupt ) { /* Draw the last scanline */ - if ( vce.current_bitmap_line >= 14 && vce.current_bitmap_line < 14 + 242 ) + if ( vce.current_bitmap_line >= 14 && vce.current_bitmap_line < 14 + 242 ) { /* We are in the active display area */ /* First fill the line with the overscan color */ draw_overscan_line(vce.current_bitmap_line ); /* Check if we need to draw more just the overscan color */ - if ( vdc[0].current_segment == STATE_VDW ) + if ( vdc[0].current_segment == STATE_VDW ) { /* 0 - no sprite and background pixels drawn 1 - background pixel drawn @@ -107,13 +107,13 @@ INTERRUPT_GEN( pce_interrupt ) pce_refresh_line( 0, vdc[0].current_segment_line, 0, drawn, line_buffer); /* Draw VDC #0 sprite layer */ - if(vdc[0].vdc_data[CR].w & CR_SB) + if(vdc[0].vdc_data[CR].w & CR_SB) { pce_refresh_sprites(device->machine, 0, vdc[0].current_segment_line, drawn, line_buffer); } } - } - else + } + else { /* We are in one of the blanking areas */ draw_black_line(device->machine, vce.current_bitmap_line ); @@ -127,14 +127,14 @@ INTERRUPT_GEN( pce_interrupt ) INTERRUPT_GEN( sgx_interrupt ) { /* Draw the last scanline */ - if ( vce.current_bitmap_line >= 14 && vce.current_bitmap_line < 14 + 242 ) + if ( vce.current_bitmap_line >= 14 && vce.current_bitmap_line < 14 + 242 ) { /* We are in the active display area */ /* First fill the line with the overscan color */ draw_sgx_overscan_line(vce.current_bitmap_line ); /* Check if we need to draw more just the overscan color */ - if ( vdc[0].current_segment == STATE_VDW ) + if ( vdc[0].current_segment == STATE_VDW ) { /* 0 - no sprite and background pixels drawn 1 - background pixel drawn @@ -154,7 +154,7 @@ INTERRUPT_GEN( sgx_interrupt ) pce_refresh_line( 0, vdc[0].current_segment_line, 0, drawn[0], temp_buffer[0]); /* Draw VDC #0 sprite layer */ - if(vdc[0].vdc_data[CR].w & CR_SB) + if(vdc[0].vdc_data[CR].w & CR_SB) { pce_refresh_sprites(device->machine, 0, vdc[0].current_segment_line, drawn[0], temp_buffer[0]); } @@ -163,53 +163,53 @@ INTERRUPT_GEN( sgx_interrupt ) pce_refresh_line( 1, vdc[1].current_segment_line, 1, drawn[1], temp_buffer[1]); /* Draw VDC #1 sprite layer */ - if ( vdc[1].vdc_data[CR].w & CR_SB ) + if ( vdc[1].vdc_data[CR].w & CR_SB ) { pce_refresh_sprites(device->machine, 1, vdc[1].current_segment_line, drawn[1], temp_buffer[1]); } line_buffer = BITMAP_ADDR16( vce.bmp, vce.current_bitmap_line, 86 ); /* Combine the output of both VDCs */ - for( i = 0; i < 512; i++ ) + for( i = 0; i < 512; i++ ) { int cur_prio = vpc.prio_map[i]; - if ( vpc.vpc_prio[cur_prio].vdc0_enabled ) + if ( vpc.vpc_prio[cur_prio].vdc0_enabled ) { - if ( vpc.vpc_prio[cur_prio].vdc1_enabled ) + if ( vpc.vpc_prio[cur_prio].vdc1_enabled ) { - switch( vpc.vpc_prio[cur_prio].prio ) + switch( vpc.vpc_prio[cur_prio].prio ) { case 0: /* BG1 SP1 BG0 SP0 */ - if ( drawn[0][i] ) + if ( drawn[0][i] ) { line_buffer[i] = temp_buffer[0][i]; - } - else if ( drawn[1][i] ) + } + else if ( drawn[1][i] ) { line_buffer[i] = temp_buffer[1][i]; } break; case 1: /* BG1 BG0 SP1 SP0 */ - if ( drawn[0][i] ) + if ( drawn[0][i] ) { - if ( drawn[0][i] > 1 ) + if ( drawn[0][i] > 1 ) { line_buffer[i] = temp_buffer[0][i]; - } - else + } + else { - if ( drawn[1][i] > 1 ) + if ( drawn[1][i] > 1 ) { line_buffer[i] = temp_buffer[1][i]; - } - else + } + else { line_buffer[i] = temp_buffer[0][i]; } } - } - else if ( drawn[1][i] ) + } + else if ( drawn[1][i] ) { line_buffer[i] = temp_buffer[1][i]; } @@ -220,44 +220,44 @@ INTERRUPT_GEN( sgx_interrupt ) BG0 + SP0 => SP0 BG1 + SP0 => BG1 SP0 + SP1 => SP0 */ - if ( drawn[0][i] ) + if ( drawn[0][i] ) { - if ( drawn[0][i] > 1 ) + if ( drawn[0][i] > 1 ) { - if ( drawn[1][i] == 1 ) + if ( drawn[1][i] == 1 ) { line_buffer[i] = temp_buffer[1][i]; - } - else + } + else { line_buffer[i] = temp_buffer[0][i]; } - } - else + } + else { line_buffer[i] = temp_buffer[0][i]; } - } - else if ( drawn[1][i] ) + } + else if ( drawn[1][i] ) { line_buffer[i] = temp_buffer[1][i]; } break; } - } - else + } + else { - if ( drawn[0][i] ) + if ( drawn[0][i] ) { line_buffer[i] = temp_buffer[0][i]; } } - } - else + } + else { - if ( vpc.vpc_prio[cur_prio].vdc1_enabled ) + if ( vpc.vpc_prio[cur_prio].vdc1_enabled ) { - if ( drawn[1][i] ) + if ( drawn[1][i] ) { line_buffer[i] = temp_buffer[1][i]; } @@ -265,8 +265,8 @@ INTERRUPT_GEN( sgx_interrupt ) } } } - } - else + } + else { /* We are in one of the blanking areas */ draw_black_line(device->machine, vce.current_bitmap_line ); @@ -278,7 +278,7 @@ INTERRUPT_GEN( sgx_interrupt ) vdc_advance_line(device->machine, 1 ); } -static void vdc_advance_line(running_machine *machine, int which) +static void vdc_advance_line(running_machine *machine, int which) { int ret = 0; @@ -286,12 +286,12 @@ static void vdc_advance_line(running_machine *machine, int which) vdc[which].current_segment_line += 1; vdc[which].raster_count += 1; - if ( vdc[which].satb_countdown ) + if ( vdc[which].satb_countdown ) { vdc[which].satb_countdown -= 1; - if ( vdc[which].satb_countdown == 0 ) + if ( vdc[which].satb_countdown == 0 ) { - if ( vdc[which].vdc_data[DCR].w & DCR_DSC ) + if ( vdc[which].vdc_data[DCR].w & DCR_DSC ) { vdc[which].status |= VDC_DS; /* set satb done flag */ ret = 1; @@ -299,7 +299,7 @@ static void vdc_advance_line(running_machine *machine, int which) } } - if ( vce.current_bitmap_line == 0 ) + if ( vce.current_bitmap_line == 0 ) { vdc[which].current_segment = STATE_VSW; vdc[which].current_segment_line = 0; @@ -307,55 +307,55 @@ static void vdc_advance_line(running_machine *machine, int which) vdc[which].curline = 0; } - if ( STATE_VSW == vdc[which].current_segment && vdc[which].current_segment_line >= ( vdc[which].vdc_data[VPR].b.l & 0x1F ) ) + if ( STATE_VSW == vdc[which].current_segment && vdc[which].current_segment_line >= ( vdc[which].vdc_data[VPR].b.l & 0x1F ) ) { vdc[which].current_segment = STATE_VDS; vdc[which].current_segment_line = 0; } - if ( STATE_VDS == vdc[which].current_segment && vdc[which].current_segment_line >= vdc[which].vdc_data[VPR].b.h ) + if ( STATE_VDS == vdc[which].current_segment && vdc[which].current_segment_line >= vdc[which].vdc_data[VPR].b.h ) { vdc[which].current_segment = STATE_VDW; vdc[which].current_segment_line = 0; vdc[which].raster_count = 0x40; } - if ( STATE_VDW == vdc[which].current_segment && vdc[which].current_segment_line > ( vdc[which].vdc_data[VDW].w & 0x01FF ) ) + if ( STATE_VDW == vdc[which].current_segment && vdc[which].current_segment_line > ( vdc[which].vdc_data[VDW].w & 0x01FF ) ) { vdc[which].current_segment = STATE_VCR; vdc[which].current_segment_line = 0; /* Generate VBlank interrupt, sprite DMA */ vdc[which].vblank_triggered = 1; - if ( vdc[which].vdc_data[CR].w & CR_VR ) + if ( vdc[which].vdc_data[CR].w & CR_VR ) { vdc[which].status |= VDC_VD; ret = 1; } /* do VRAM > SATB DMA if the enable bit is set or the DVSSR reg. was written to */ - if( ( vdc[which].vdc_data[DCR].w & DCR_DSR ) || vdc[which].dvssr_write ) + if( ( vdc[which].vdc_data[DCR].w & DCR_DSR ) || vdc[which].dvssr_write ) { int i; vdc[which].dvssr_write = 0; - for( i = 0; i < 256; i++ ) + for( i = 0; i < 256; i++ ) { vdc[which].sprite_ram[i] = ( vdc[which].vram[ ( vdc[which].vdc_data[DVSSR].w << 1 ) + i * 2 + 1 ] << 8 ) | vdc[which].vram[ ( vdc[which].vdc_data[DVSSR].w << 1 ) + i * 2 ]; } /* generate interrupt if needed */ - if ( vdc[which].vdc_data[DCR].w & DCR_DSC ) + if ( vdc[which].vdc_data[DCR].w & DCR_DSC ) { vdc[which].satb_countdown = 4; } } } - if ( STATE_VCR == vdc[which].current_segment ) + if ( STATE_VCR == vdc[which].current_segment ) { - if ( vdc[which].current_segment_line >= 3 && vdc[which].current_segment_line >= vdc[which].vdc_data[VCR].b.l ) + if ( vdc[which].current_segment_line >= 3 && vdc[which].current_segment_line >= vdc[which].vdc_data[VCR].b.l ) { vdc[which].current_segment = STATE_VSW; vdc[which].current_segment_line = 0; @@ -364,25 +364,25 @@ static void vdc_advance_line(running_machine *machine, int which) } /* generate interrupt on line compare if necessary */ - if ( vdc[which].raster_count == vdc[which].vdc_data[RCR].w && vdc[which].vdc_data[CR].w & CR_RC ) + if ( vdc[which].raster_count == vdc[which].vdc_data[RCR].w && vdc[which].vdc_data[CR].w & CR_RC ) { vdc[which].status |= VDC_RR; ret = 1; } /* handle frame events */ - if(vdc[which].curline == 261 && ! vdc[which].vblank_triggered ) + if(vdc[which].curline == 261 && ! vdc[which].vblank_triggered ) { vdc[which].vblank_triggered = 1; - if(vdc[which].vdc_data[CR].w & CR_VR) + if(vdc[which].vdc_data[CR].w & CR_VR) { /* generate IRQ1 if enabled */ vdc[which].status |= VDC_VD; /* set vblank flag */ ret = 1; } /* do VRAM > SATB DMA if the enable bit is set or the DVSSR reg. was written to */ - if ( ( vdc[which].vdc_data[DCR].w & DCR_DSR ) || vdc[which].dvssr_write ) + if ( ( vdc[which].vdc_data[DCR].w & DCR_DSR ) || vdc[which].dvssr_write ) { int i; @@ -390,13 +390,13 @@ static void vdc_advance_line(running_machine *machine, int which) #ifdef MAME_DEBUG assert(((vdc[which].vdc_data[DVSSR].w<<1) + 512) <= 0x10000); #endif - for( i = 0; i < 256; i++ ) + for( i = 0; i < 256; i++ ) { vdc[which].sprite_ram[i] = ( vdc[which].vram[ ( vdc[which].vdc_data[DVSSR].w << 1 ) + i * 2 + 1 ] << 8 ) | vdc[which].vram[ ( vdc[which].vdc_data[DVSSR].w << 1 ) + i * 2 ]; } /* generate interrupt if needed */ - if(vdc[which].vdc_data[DCR].w & DCR_DSC) + if(vdc[which].vdc_data[DCR].w & DCR_DSC) { vdc[which].satb_countdown = 4; } @@ -464,7 +464,7 @@ static void draw_overscan_line(int line) line_buffer[i] = color_base + vce.vce_data[0x100].w; } -static void draw_sgx_overscan_line(int line) +static void draw_sgx_overscan_line(int line) { int i; @@ -613,7 +613,7 @@ static UINT8 vdc_r( running_machine *machine, int which, offs_t offset ) case 0x03: temp = vram_read(which, vdc[which].vdc_data[MARR].w * 2 + 1); - if ( vdc[which].vdc_register == VxR ) + if ( vdc[which].vdc_register == VxR ) { vdc[which].vdc_data[MARR].w += vdc[which].inc; } @@ -627,11 +627,11 @@ WRITE8_HANDLER( vdc_1_w ) { vdc_w( space->machine, 1, offset, data ); } READ8_HANDLER( vdc_0_r ) { return vdc_r( space->machine, 0, offset ); } READ8_HANDLER( vdc_1_r ) { return vdc_r( space->machine, 1, offset ); } -PALETTE_INIT( vce ) +PALETTE_INIT( vce ) { int i; - for( i = 0; i < 512; i++ ) + for( i = 0; i < 512; i++ ) { int r = (( i >> 3) & 7) << 5; int g = (( i >> 6) & 7) << 5; @@ -768,15 +768,15 @@ static void pce_refresh_line(int which, int line, int external_input, UINT8 *dra if ( ! ( c & 0x0F ) ) c &= 0x0F; - if ( phys_x >= 0 && phys_x < vdc[which].physical_width ) + if ( phys_x >= 0 && phys_x < vdc[which].physical_width ) { drawn[ pixel ] = c ? 1 : 0; if ( c || ! external_input ) line_buffer[ pixel ] = color_base + vce.vce_data[c].w; pixel++; - if ( vdc[which].physical_width != 512 ) + if ( vdc[which].physical_width != 512 ) { - while ( pixel < ( ( ( phys_x + 1 ) * 512 ) / vdc[which].physical_width ) ) + while ( pixel < ( ( ( phys_x + 1 ) * 512 ) / vdc[which].physical_width ) ) { drawn[ pixel ] = c ? 1 : 0; if ( c || ! external_input ) @@ -870,11 +870,11 @@ static void pce_refresh_sprites(running_machine *machine, int which, int line, U if ( cgy & 2 ) obj_i &= ~12; - if (obj_l < obj_h) + if (obj_l < obj_h) { sprites_drawn++; - if(sprites_drawn > 16) + if(sprites_drawn > 16) { vdc[which].status |= VDC_OR; if(vdc[which].vdc_data[CR].w & CR_OV) @@ -898,15 +898,15 @@ static void pce_refresh_sprites(running_machine *machine, int which, int line, U { if ( buf[x] ) { - if( drawn[pixel_x] < 2 ) + if( drawn[pixel_x] < 2 ) { - if( priority || drawn[pixel_x] == 0 ) + if( priority || drawn[pixel_x] == 0 ) { line_buffer[pixel_x] = color_base + vce.vce_data[0x100 + (palette << 4) + buf[x]].w; - if ( vdc[which].physical_width != 512 ) + if ( vdc[which].physical_width != 512 ) { int dp = 1; - while ( pixel_x + dp < ( ( ( obj_x + x + 1 ) * 512 ) / vdc[which].physical_width ) ) + while ( pixel_x + dp < ( ( ( obj_x + x + 1 ) * 512 ) / vdc[which].physical_width ) ) { drawn[pixel_x + dp] = i + 2; line_buffer[pixel_x + dp] = color_base + vce.vce_data[0x100 + (palette << 4) + buf[x]].w; @@ -925,11 +925,11 @@ static void pce_refresh_sprites(running_machine *machine, int which, int line, U } } } - if ( vdc[which].physical_width != 512 ) + if ( vdc[which].physical_width != 512 ) { pixel_x = ( ( obj_x + x + 1 ) * 512 ) / vdc[which].physical_width; - } - else + } + else { pixel_x += 1; } @@ -946,17 +946,17 @@ static void pce_refresh_sprites(running_machine *machine, int which, int line, U { if(((obj_x + x) < (vdc[which].physical_width)) && ((obj_x + x) >= 0)) { - if ( buf[x] ) + if ( buf[x] ) { - if( drawn[pixel_x] < 2 ) + if( drawn[pixel_x] < 2 ) { - if ( priority || drawn[pixel_x] == 0 ) + if ( priority || drawn[pixel_x] == 0 ) { line_buffer[pixel_x] = color_base + vce.vce_data[0x100 + (palette << 4) + buf[x]].w; - if ( vdc[which].physical_width != 512 ) + if ( vdc[which].physical_width != 512 ) { int dp = 1; - while ( pixel_x + dp < ( ( ( obj_x + x + 1 ) * 512 ) / vdc[which].physical_width ) ) + while ( pixel_x + dp < ( ( ( obj_x + x + 1 ) * 512 ) / vdc[which].physical_width ) ) { drawn[pixel_x + dp] = i + 2; line_buffer[pixel_x + dp] = color_base + vce.vce_data[0x100 + (palette << 4) + buf[x]].w; @@ -967,7 +967,7 @@ static void pce_refresh_sprites(running_machine *machine, int which, int line, U drawn[pixel_x] = i + 2; } /* Check for sprite #0 collision */ - else if ( drawn[pixel_x] == 2 ) + else if ( drawn[pixel_x] == 2 ) { if(vdc[which].vdc_data[CR].w & CR_CC) cputag_set_input_line(machine, "maincpu", 0, ASSERT_LINE); @@ -975,11 +975,11 @@ static void pce_refresh_sprites(running_machine *machine, int which, int line, U } } } - if ( vdc[which].physical_width != 512 ) + if ( vdc[which].physical_width != 512 ) { pixel_x = ( ( obj_x + x + 1 ) * 512 ) / vdc[which].physical_width; } - else + else { pixel_x += 1; } @@ -989,30 +989,30 @@ static void pce_refresh_sprites(running_machine *machine, int which, int line, U is only drawn if there are 2 open slots. */ sprites_drawn++; - if( sprites_drawn > 16 ) + if( sprites_drawn > 16 ) { vdc[which].status |= VDC_OR; if(vdc[which].vdc_data[CR].w&CR_OV) cputag_set_input_line(machine, "maincpu", 0, ASSERT_LINE); - } - else + } + else { conv_obj(which, obj_i + (cgypos << 2) + (hf ? 0 : 2), obj_l, hf, vf, buf); for(x = 0; x < 16; x++) { if(((obj_x + 0x10 + x) < (vdc[which].physical_width)) && ((obj_x + 0x10 + x) >= 0)) { - if ( buf[x] ) + if ( buf[x] ) { - if( drawn[pixel_x] < 2 ) + if( drawn[pixel_x] < 2 ) { - if( priority || drawn[pixel_x] == 0 ) + if( priority || drawn[pixel_x] == 0 ) { line_buffer[pixel_x] = color_base + vce.vce_data[0x100 + (palette << 4) + buf[x]].w; - if ( vdc[which].physical_width != 512 ) + if ( vdc[which].physical_width != 512 ) { int dp = 1; - while ( pixel_x + dp < ( ( ( obj_x + x + 17 ) * 512 ) / vdc[which].physical_width ) ) + while ( pixel_x + dp < ( ( ( obj_x + x + 17 ) * 512 ) / vdc[which].physical_width ) ) { drawn[pixel_x + dp] = i + 2; line_buffer[pixel_x + dp] = color_base + vce.vce_data[0x100 + (palette << 4) + buf[x]].w; @@ -1031,11 +1031,11 @@ static void pce_refresh_sprites(running_machine *machine, int which, int line, U } } } - if ( vdc[which].physical_width != 512 ) + if ( vdc[which].physical_width != 512 ) { pixel_x = ( ( obj_x + x + 17 ) * 512 ) / vdc[which].physical_width; - } - else + } + else { pixel_x += 1; } @@ -1086,29 +1086,29 @@ static void vdc_do_dma(running_machine *machine, int which) } -static void vpc_update_prio_map( void ) +static void vpc_update_prio_map( void ) { int i; - for( i = 0; i < 512; i++ ) + for( i = 0; i < 512; i++ ) { vpc.prio_map[i] = 0; - if ( vpc.window1.w < 0x40 || i > vpc.window1.w ) + if ( vpc.window1.w < 0x40 || i > vpc.window1.w ) { vpc.prio_map[i] |= 1; } - if ( vpc.window2.w < 0x40 || i > vpc.window2.w ) + if ( vpc.window2.w < 0x40 || i > vpc.window2.w ) { vpc.prio_map[i] |= 2; } } } -WRITE8_HANDLER( vpc_w ) +WRITE8_HANDLER( vpc_w ) { //if ( offset < 2 ) //printf("VPC write offset %02X, data %02X\n", offset, data ); - switch( offset & 0x07 ) + switch( offset & 0x07 ) { case 0x00: /* Priority register #0 */ vpc.priority.b.l = data; @@ -1150,10 +1150,10 @@ WRITE8_HANDLER( vpc_w ) } } -READ8_HANDLER( vpc_r ) +READ8_HANDLER( vpc_r ) { UINT8 data = 0; - switch( offset & 0x07 ) + switch( offset & 0x07 ) { case 0x00: /* Priority register #0 */ data = vpc.priority.b.l; @@ -1187,19 +1187,19 @@ static void vpc_init( running_machine *machine ) vpc.vdc_select = 0; } -WRITE8_HANDLER( sgx_vdc_w ) +WRITE8_HANDLER( sgx_vdc_w ) { - if ( vpc.vdc_select ) + if ( vpc.vdc_select ) { vdc_1_w( space, offset, data ); - } - else + } + else { vdc_0_w( space, offset, data ); } } -READ8_HANDLER( sgx_vdc_r ) +READ8_HANDLER( sgx_vdc_r ) { return ( vpc.vdc_select ) ? vdc_1_r( space, offset ) : vdc_0_r( space, offset ); } diff --git a/src/version.c b/src/version.c index 11fb9b52512..86dbabe22bb 100644 --- a/src/version.c +++ b/src/version.c @@ -10,4 +10,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.131 ("__DATE__")"; +const char build_version[] = "0.131u1 ("__DATE__")"; |