diff options
author | 2009-02-26 09:19:15 +0000 | |
---|---|---|
committer | 2009-02-26 09:19:15 +0000 | |
commit | 8f6f01f26398e0fb4c954430bb9cb0cbec980c11 (patch) | |
tree | 53dcd6cb4eadd445a1bb5478dc29a420b9c5f086 | |
parent | 26dd96003f732e3dbd4629d2469c9bfd2e5e9b5d (diff) |
Cleanups and version bump.mame0129u5
29 files changed, 207 insertions, 223 deletions
diff --git a/src/emu/validity.c b/src/emu/validity.c index 3aa110d1a48..49cb71f625c 100644 --- a/src/emu/validity.c +++ b/src/emu/validity.c @@ -162,7 +162,7 @@ INLINE int validate_tag(const game_driver *driver, const char *object, const cha const char *begin = strrchr(tag, ':'); const char *p; int error = FALSE; - + /* some common names that are now deprecated */ if (strcmp(tag, "main") == 0 || strcmp(tag, "audio") == 0 || @@ -594,7 +594,7 @@ static int validate_roms(int drivnum, const machine_config *config, region_info if (ROMENTRY_ISREGION(romp)) { const char *regiontag = ROMREGION_GETTAG(romp); - + /* if we haven't seen any items since the last region, print a warning */ if (items_since_region == 0) mame_printf_warning("%s: %s has empty ROM region (warning)\n", driver->source_file, driver->name); @@ -1547,7 +1547,7 @@ static int validate_devices(int drivnum, const machine_config *config) /* validate the device tag */ error |= validate_tag(driver, device_get_info_string(device, DEVINFO_STR_NAME), device->tag); - + /* look for duplicates */ for (scandevice = device_list_first(config->devicelist, DEVICE_TYPE_WILDCARD); scandevice != device; scandevice = device_list_next(scandevice, DEVICE_TYPE_WILDCARD)) if (strcmp(scandevice->tag, device->tag) == 0) diff --git a/src/mame/audio/cps3.c b/src/mame/audio/cps3.c index 6cfeab15f3d..e98a137ce91 100644 --- a/src/mame/audio/cps3.c +++ b/src/mame/audio/cps3.c @@ -33,7 +33,7 @@ static STREAM_UPDATE( cps3_stream_update ) // the actual 'user5' region only exists on the nocd sets, on the others it's allocated in the initialization. // it's a shared gfx/sound region, so can't be allocated as part of the sound device. chip.base = (INT8*)cps3_user5region; - + /* Clear the buffers */ memset(outputs[0], 0, samples*sizeof(*outputs[0])); memset(outputs[1], 0, samples*sizeof(*outputs[1])); diff --git a/src/mame/drivers/bfmsys85.c b/src/mame/drivers/bfmsys85.c index ccaee4a31d3..7f5e2b41e6b 100644 --- a/src/mame/drivers/bfmsys85.c +++ b/src/mame/drivers/bfmsys85.c @@ -440,7 +440,7 @@ static MACHINE_DRIVER_START( bfmsys85 ) MDRV_CPU_PROGRAM_MAP(memmap,0) // setup read and write memorymap MDRV_CPU_PERIODIC_INT(timer_irq, 1000 ) // generate 1000 IRQ's per second - MDRV_ACIA6850_ADD("acia6850_0", m6809_acia_if) + MDRV_ACIA6850_ADD("acia6850_0", m6809_acia_if) MDRV_SPEAKER_STANDARD_MONO("mono") MDRV_SOUND_ADD("ay",AY8912, MASTER_CLOCK/4) // add AY8912 soundchip diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c index 660a5617d76..8b8f3aaa65a 100644 --- a/src/mame/drivers/btime.c +++ b/src/mame/drivers/btime.c @@ -1311,7 +1311,7 @@ GFXDECODE_END /*************************************************************************** Discrete Filtering and Mixing - + All values taken from Burger Time Schematics. ****************************************************************************/ @@ -1335,13 +1335,13 @@ static const discrete_mixer_desc btime_sound_mixer_desc = {RES_K(100), RES_K(100)}, {0,0}, /* no variable resistors */ {0,0}, /* no node capacitors */ - 0, /* no RI */ + 0, /* no RI */ RES_K(10), CAP_P(150), 0, /* Modelled separately */ 0, 1}; -static const discrete_op_amp_filt_info btime_opamp_desc = +static const discrete_op_amp_filt_info btime_opamp_desc = {RES_K(1), 0, RES_K(10), 0, RES_K(4.7), CAP_U(0.068), CAP_U(0.068), 0, 0, 5.0, -5.0}; static DISCRETE_SOUND_START( btime_sound ) @@ -1358,7 +1358,7 @@ static DISCRETE_SOUND_START( btime_sound ) DISCRETE_ADDER3(NODE_20, 1, NODE_01, NODE_02, NODE_03) DISCRETE_ADDER3(NODE_21, 1, NODE_20, NODE_05, NODE_06) DISCRETE_MULTIPLY(NODE_22, 1, NODE_21, 0.2) - + /* Filter of channel 2A */ DISCRETE_OP_AMP_FILTER(NODE_30, 1, NODE_04, NODE_NC, DISC_OP_AMP_FILTER_IS_BAND_PASS_1M, &btime_opamp_desc) @@ -1367,7 +1367,7 @@ static DISCRETE_SOUND_START( btime_sound ) /* Amplifier not modelled */ /* Assuming a 4 Ohm impedance speaker */ DISCRETE_CRFILTER(NODE_42, 1, NODE_41, 3.0, CAP_U(100)) - + DISCRETE_OUTPUT(NODE_42, 32767.0 / 5. * 20.0) DISCRETE_SOUND_END @@ -1399,19 +1399,19 @@ static MACHINE_DRIVER_START( btime ) /* audio hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - + MDRV_SOUND_ADD("ay1", AY8910, HCLK2) MDRV_SOUND_CONFIG(ay1_intf) MDRV_SOUND_ROUTE_EX(0, "discrete", 1.0, 0) MDRV_SOUND_ROUTE_EX(1, "discrete", 1.0, 1) MDRV_SOUND_ROUTE_EX(2, "discrete", 1.0, 2) - + MDRV_SOUND_ADD("ay2", AY8910, HCLK2) MDRV_SOUND_CONFIG(ay2_intf) MDRV_SOUND_ROUTE_EX(0, "discrete", 1.0, 3) MDRV_SOUND_ROUTE_EX(1, "discrete", 1.0, 4) MDRV_SOUND_ROUTE_EX(2, "discrete", 1.0, 5) - + MDRV_SOUND_ADD("discrete", DISCRETE, 0) MDRV_SOUND_CONFIG_DISCRETE(btime_sound) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c index b3f5f6a7b15..2bfda256bd1 100644 --- a/src/mame/drivers/centiped.c +++ b/src/mame/drivers/centiped.c @@ -1594,7 +1594,7 @@ static MACHINE_DRIVER_START( centiped ) MDRV_MACHINE_START(centiped) MDRV_MACHINE_RESET(centiped) - + MDRV_ATARIVGEAROM_ADD("earom") /* timer */ diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c index 6a462448a0a..2343eb5e6e0 100644 --- a/src/mame/drivers/cowrace.c +++ b/src/mame/drivers/cowrace.c @@ -38,7 +38,7 @@ static VIDEO_START( cowrace ) tmap = tilemap_create( machine, get_tile_info, tilemap_scan_rows, 8,8, 0x20,0x20 ); -// tilemap_set_transparent_pen(tmap, 0); +// tilemap_set_transparent_pen(tmap, 0); } static VIDEO_UPDATE( cowrace ) diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c index c409e0ff743..7381d9d7f59 100644 --- a/src/mame/drivers/dec0.c +++ b/src/mame/drivers/dec0.c @@ -390,17 +390,17 @@ static ADDRESS_MAP_START( secretab_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x240000, 0x240007) AM_WRITE(dec0_pf2_control_0_w) AM_RANGE(0x240010, 0x240017) AM_WRITE(dec0_pf2_control_1_w) AM_RANGE(0x246000, 0x247fff) AM_RAM_WRITE(dec0_pf2_data_w) AM_BASE(&dec0_pf2_data) -// AM_RANGE(0x240000, 0x24007f) AM_RAM AM_BASE(&dec0_pf2_colscroll) -// AM_RANGE(0x240400, 0x2407ff) AM_RAM AM_BASE(&dec0_pf2_rowscroll) +// AM_RANGE(0x240000, 0x24007f) AM_RAM AM_BASE(&dec0_pf2_colscroll) +// AM_RANGE(0x240400, 0x2407ff) AM_RAM AM_BASE(&dec0_pf2_rowscroll) -// AM_RANGE(0x200000, 0x300007) AM_WRITE(dec0_pf1_control_0_w) -// AM_RANGE(0x300010, 0x300017) AM_WRITE(dec0_pf1_control_1_w) +// AM_RANGE(0x200000, 0x300007) AM_WRITE(dec0_pf1_control_0_w) +// AM_RANGE(0x300010, 0x300017) AM_WRITE(dec0_pf1_control_1_w) AM_RANGE(0x24e000, 0x24ffff) AM_RAM_WRITE(dec0_pf1_data_w) AM_BASE(&dec0_pf1_data) -// AM_RANGE(0x340000, 0x34007f) AM_RAM AM_BASE(&dec0_pf1_colscroll) -// AM_RANGE(0x340400, 0x3407ff) AM_RAM AM_BASE(&dec0_pf1_rowscroll) +// AM_RANGE(0x340000, 0x34007f) AM_RAM AM_BASE(&dec0_pf1_colscroll) +// AM_RANGE(0x340400, 0x3407ff) AM_RAM AM_BASE(&dec0_pf1_rowscroll) AM_RANGE(0x314008, 0x31400f) AM_READ(slyspy_controls_r) -// AM_RANGE(0x314000, 0x314003) AM_WRITE(slyspy_control_w) +// AM_RANGE(0x314000, 0x314003) AM_WRITE(slyspy_control_w) AM_RANGE(0x300000, 0x300007) AM_WRITE(dec0_pf3_control_0_w) AM_RANGE(0x300010, 0x300017) AM_WRITE(dec0_pf3_control_1_w) @@ -463,11 +463,11 @@ static WRITE8_HANDLER( automat_adpcm_w ) static ADDRESS_MAP_START( automat_s_mem, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xc7ff) AM_RAM -// AM_RANGE(0xc800, 0xc800) AM_WRITE(ym2203_control_port_0_w) -// AM_RANGE(0xc801, 0xc801) AM_WRITE(ym2203_write_port_0_w) +// AM_RANGE(0xc800, 0xc800) AM_WRITE(ym2203_control_port_0_w) +// AM_RANGE(0xc801, 0xc801) AM_WRITE(ym2203_write_port_0_w) AM_RANGE(0xd800, 0xd800) AM_READ(soundlatch_r) -// AM_RANGE(0xd000, 0xd000) AM_WRITE(ym2203_control_port_1_w) -// AM_RANGE(0xd001, 0xd001) AM_WRITE(ym2203_write_port_1_w) +// AM_RANGE(0xd000, 0xd000) AM_WRITE(ym2203_control_port_1_w) +// AM_RANGE(0xd001, 0xd001) AM_WRITE(ym2203_write_port_1_w) AM_RANGE(0xf000, 0xf000) AM_WRITE(automat_adpcm_w) AM_RANGE(0x0000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -1424,8 +1424,8 @@ static MACHINE_DRIVER_START( secretab ) MDRV_CPU_VBLANK_INT("screen", irq6_line_hold)/* VBL */ /* z80 */ -// MDRV_CPU_ADD("audiocpu", H6280, XTAL_12MHz/2/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */ -// MDRV_CPU_PROGRAM_MAP(slyspy_s_readmem,slyspy_s_writemem) +// MDRV_CPU_ADD("audiocpu", H6280, XTAL_12MHz/2/3) /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */ +// MDRV_CPU_PROGRAM_MAP(slyspy_s_readmem,slyspy_s_writemem) /* video hardware */ MDRV_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/gaelco2.c b/src/mame/drivers/gaelco2.c index 54227c93681..6634821ab5e 100644 --- a/src/mame/drivers/gaelco2.c +++ b/src/mame/drivers/gaelco2.c @@ -1374,7 +1374,7 @@ ROM_START( wrally2 ) ROM_END /* -CPU 1x MC68HC000FN12 (main)(u18) +CPU 1x MC68HC000FN12 (main)(u18) 1x CG-1V-149 (u42)(sound/gfx? maybe the same as Gaelco) 1x DALLAS DS5002FP (not dumped)(u44) 1x TDA1543 (sound)(u20) @@ -1382,7 +1382,7 @@ CPU 1x MC68HC000FN12 (main)(u18) 1x TDA2003 (sound)(u1) 1x oscillator 34.000 MHz (xtal1) 1x oscillator 11.0592 MHz (xtal2) -ROMs 2x AM27C010 (u39,u40) +ROMs 2x AM27C010 (u39,u40) 4x NM27C040Q (u50,u52,u53,u54) 1x M27C801 (u51) @@ -1392,7 +1392,7 @@ ROMs 2x AM27C010 (u39,u40) 1x PALCE16V8H (u28)(read protected -> extracted with CmD's PALdumper - it's registered) 1x PALCE16V8H (u29)(read protected -> extracted with CmD's PALdumper) -Note 1x 28x2 edge connector +Note 1x 28x2 edge connector 1x 2 legs connector (jp1) 1x 4 legs connector (jp2) 1x 12 legs connector (jp3) diff --git a/src/mame/drivers/galaga.c b/src/mame/drivers/galaga.c index b3115fedbf3..0db9bf66603 100644 --- a/src/mame/drivers/galaga.c +++ b/src/mame/drivers/galaga.c @@ -1859,7 +1859,7 @@ static MACHINE_DRIVER_START( digdug ) /* synchronization of the CPUs */ MDRV_MACHINE_START(galaga) MDRV_MACHINE_RESET(digdug) - + MDRV_ATARIVGEAROM_ADD("earom") /* video hardware */ diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index 9e636fd32f7..63477246bc2 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -290,7 +290,7 @@ static ADDRESS_MAP_START( cm_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x04, 0x07) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w) /* Input Ports */ AM_RANGE(0x08, 0x0b) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w) /* DIP switches */ AM_RANGE(0x10, 0x10) AM_WRITE (cm_outport0_w) /* output port */ -// AM_RANGE(0x11, 0x11) AM_WRITENOP +// AM_RANGE(0x11, 0x11) AM_WRITENOP AM_RANGE(0x12, 0x12) AM_WRITE (cm_outport1_w) /* output port */ AM_RANGE(0x13, 0x13) AM_WRITE(cm_background_col_w) ADDRESS_MAP_END @@ -5777,9 +5777,9 @@ static DRIVER_INIT(mtonic) { if ((A & 4) == 4) ROM[A] ^= 0x01; - + ROM[A] = BITSWAP8(ROM[A], 3,6,5,4,7,2,1,0); - } + } } diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c index 2996489e258..7b6f07efba2 100644 --- a/src/mame/drivers/hvyunit.c +++ b/src/mame/drivers/hvyunit.c @@ -1,6 +1,6 @@ /*************************************************************************************** -very preliminary driver based on djboy.c +very preliminary driver based on djboy.c @@ -42,13 +42,13 @@ Notes: YM2203 clock : 3.000MHz VSync : 58Hz HSync : 15.59kHz - \-\ : KANEKO 1988. DIP40 chip, probably 8751 MCU (clock pins match) + \-\ : KANEKO 1988. DIP40 chip, probably 8751 MCU (clock pins match) MERMAID | : pin 18,19 = 6.000MHz (main clock) - | : pin 30 = 1.000MHz (prog/ale) + | : pin 30 = 1.000MHz (prog/ale) /-/ : pin 22 = 111.48Hz (port 2 bit 1) - + PANDORA : KANEKO PX79480FP-3 PANDORA-CHIP (C) KANEKO 1988 - + ***************************************************************************************/ @@ -61,22 +61,22 @@ Notes: static WRITE8_HANDLER( mermaid_data_w ) { - -} + +} static READ8_HANDLER( mermaid_data_r ) -{ +{ return mame_rand(space->machine); -} +} static READ8_HANDLER( mermaid_status_r ) { return mame_rand(space->machine); -} +} static VIDEO_START(hvyunit) { @@ -99,7 +99,7 @@ static WRITE8_HANDLER( trigger_nmi_on_sound_cpu2 ) { soundlatch_w(space,0,data); cpu_set_input_line(space->machine->cpu[2], INPUT_LINE_NMI, PULSE_LINE); -} +} static WRITE8_HANDLER( trigger_nmi_on_sub_cpu) @@ -111,7 +111,7 @@ static WRITE8_HANDLER( main_bankswitch_w ) { unsigned char *ROM = memory_region(space->machine, "maincpu"); int bank=data&7; - + ROM = &ROM[0x4000 * bank]; memory_set_bankptr(space->machine, 1,ROM); @@ -133,11 +133,11 @@ ADDRESS_MAP_END static WRITE8_HANDLER( sub_bankswitch_w ) { - unsigned char *ROM = memory_region(space->machine, "sub"); + unsigned char *ROM = memory_region(space->machine, "sub"); int bank=data&0x3; ROM = &ROM[0x4000 * bank]; - + memory_set_bankptr(space->machine, 2,ROM); } @@ -249,7 +249,7 @@ static MACHINE_DRIVER_START( hvyunit ) MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) MDRV_QUANTUM_TIME(HZ(6000)) - + MDRV_SCREEN_ADD("screen", RASTER) MDRV_SCREEN_REFRESH_RATE(58) MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) @@ -275,8 +275,8 @@ MACHINE_DRIVER_END ROM_START( hvyunit ) ROM_REGION( 0x20000, "maincpu", 0 ) - ROM_LOAD( "b73.13", 0x00000, 0x20000, CRC(e2874601) SHA1(7f7f3287113b8622eb365d04135d2d9c35d70554) ) - + ROM_LOAD( "b73.13", 0x00000, 0x20000, CRC(e2874601) SHA1(7f7f3287113b8622eb365d04135d2d9c35d70554) ) + ROM_REGION( 0x10000, "sub", 0 ) ROM_LOAD( "b73.14", 0x00000, 0x10000, CRC(0dfb51d4) SHA1(0e6f3b3d4558f12fe1b1620f57a0f4ac2065fd1a) ) @@ -285,25 +285,25 @@ ROM_START( hvyunit ) ROM_REGION( 0x02000, "mermaid", 0 ) ROM_LOAD( "mermaid.i8751_mcu", 0x000000, 0x02000, NO_DUMP ) - + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD( "b73.08", 0x000000, 0x080000, CRC(f83dd808) SHA1(09d5f1e86fad3a0d2d3ac1845103d3f2833c6793) ) ROM_LOAD( "b73.01", 0x080000, 0x010000, CRC(3a8a4489) SHA1(a01d7300015f90ce6dd571ad93e7a58270a99e47) ) - ROM_LOAD( "b73.02", 0x090000, 0x010000, CRC(025c536c) SHA1(075e95cc39e792049ae656404e7f7440df064391) ) + ROM_LOAD( "b73.02", 0x090000, 0x010000, CRC(025c536c) SHA1(075e95cc39e792049ae656404e7f7440df064391) ) ROM_LOAD( "b73.03", 0x0a0000, 0x010000, CRC(ec6020cf) SHA1(2973aa2dc3deb2f27c9f1bad07a7664bad95b3f2) ) ROM_LOAD( "b73.04", 0x0b0000, 0x010000, CRC(f7badbb2) SHA1(d824ab4aba94d7ca02401f4f6f34213143c282ec) ) ROM_LOAD( "b73.05", 0x0c0000, 0x010000, CRC(b8e829d2) SHA1(31102358500d7b58173d4f18647decf5db744416) ) ROM_LOAD( "b73.06", 0x0d0000, 0x010000, CRC(a98e4aea) SHA1(560fef03ad818894c9c7578c6282d55b646e8129) ) ROM_LOAD( "b73.07", 0x0e0000, 0x010000, CRC(5cffa42c) SHA1(687e047345039479b35d5099e56dbc1d57284ed9) ) - + ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "b73.09", 0x000000, 0x080000, CRC(537c647f) SHA1(941c0f4e251bc68e53d62e70b033a3a6c145bb7e) ) ROM_END ROM_START( hvyunita ) ROM_REGION( 0x20000, "maincpu", 0 ) - ROM_LOAD( "b73_10.5c", 0x00000, 0x20000, CRC(ca52210f) SHA1(346951962aa5bbad641117dbd66f035dddc7c0bf) ) - + ROM_LOAD( "b73_10.5c", 0x00000, 0x20000, CRC(ca52210f) SHA1(346951962aa5bbad641117dbd66f035dddc7c0bf) ) + ROM_REGION( 0x10000, "sub", 0 ) ROM_LOAD( "b73_11.5p", 0x00000, 0x10000, CRC(cb451695) SHA1(116fd59f96a54c22fae65eea9ee5e58cb9ce5074) ) @@ -312,25 +312,25 @@ ROM_START( hvyunita ) ROM_REGION( 0x02000, "mermaid", 0 ) ROM_LOAD( "mermaid.i8751_mcu", 0x000000, 0x02000, NO_DUMP ) - + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD( "b73.08", 0x000000, 0x080000, CRC(f83dd808) SHA1(09d5f1e86fad3a0d2d3ac1845103d3f2833c6793) ) ROM_LOAD( "b73.01", 0x080000, 0x010000, CRC(3a8a4489) SHA1(a01d7300015f90ce6dd571ad93e7a58270a99e47) ) - ROM_LOAD( "b73.02", 0x090000, 0x010000, CRC(025c536c) SHA1(075e95cc39e792049ae656404e7f7440df064391) ) + ROM_LOAD( "b73.02", 0x090000, 0x010000, CRC(025c536c) SHA1(075e95cc39e792049ae656404e7f7440df064391) ) ROM_LOAD( "b73.03", 0x0a0000, 0x010000, CRC(ec6020cf) SHA1(2973aa2dc3deb2f27c9f1bad07a7664bad95b3f2) ) ROM_LOAD( "b73.04", 0x0b0000, 0x010000, CRC(f7badbb2) SHA1(d824ab4aba94d7ca02401f4f6f34213143c282ec) ) ROM_LOAD( "b73.05", 0x0c0000, 0x010000, CRC(b8e829d2) SHA1(31102358500d7b58173d4f18647decf5db744416) ) ROM_LOAD( "b73.06", 0x0d0000, 0x010000, CRC(a98e4aea) SHA1(560fef03ad818894c9c7578c6282d55b646e8129) ) ROM_LOAD( "b73.07", 0x0e0000, 0x010000, CRC(5cffa42c) SHA1(687e047345039479b35d5099e56dbc1d57284ed9) ) - + ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "b73.09", 0x000000, 0x080000, CRC(537c647f) SHA1(941c0f4e251bc68e53d62e70b033a3a6c145bb7e) ) ROM_END ROM_START( hvyunitb ) ROM_REGION( 0x20000, "maincpu", 0 ) - ROM_LOAD( "b73-30.bin", 0x00000, 0x20000, CRC(600af545) SHA1(c52b9be2bae28848ad0818c296f000a1bda4fa4f) ) - + ROM_LOAD( "b73-30.bin", 0x00000, 0x20000, CRC(600af545) SHA1(c52b9be2bae28848ad0818c296f000a1bda4fa4f) ) + ROM_REGION( 0x10000, "sub", 0 ) ROM_LOAD( "b73.14", 0x00000, 0x10000, CRC(0dfb51d4) SHA1(0e6f3b3d4558f12fe1b1620f57a0f4ac2065fd1a) ) @@ -339,17 +339,17 @@ ROM_START( hvyunitb ) ROM_REGION( 0x02000, "mermaid", 0 ) ROM_LOAD( "mermaid.i8751_mcu", 0x000000, 0x02000, NO_DUMP ) - + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD( "b73.08", 0x000000, 0x080000, CRC(f83dd808) SHA1(09d5f1e86fad3a0d2d3ac1845103d3f2833c6793) ) ROM_LOAD( "b73.01", 0x080000, 0x010000, CRC(3a8a4489) SHA1(a01d7300015f90ce6dd571ad93e7a58270a99e47) ) - ROM_LOAD( "b73.02", 0x090000, 0x010000, CRC(025c536c) SHA1(075e95cc39e792049ae656404e7f7440df064391) ) + ROM_LOAD( "b73.02", 0x090000, 0x010000, CRC(025c536c) SHA1(075e95cc39e792049ae656404e7f7440df064391) ) ROM_LOAD( "b73.03", 0x0a0000, 0x010000, CRC(ec6020cf) SHA1(2973aa2dc3deb2f27c9f1bad07a7664bad95b3f2) ) ROM_LOAD( "b73.04", 0x0b0000, 0x010000, CRC(f7badbb2) SHA1(d824ab4aba94d7ca02401f4f6f34213143c282ec) ) ROM_LOAD( "b73.05", 0x0c0000, 0x010000, CRC(b8e829d2) SHA1(31102358500d7b58173d4f18647decf5db744416) ) ROM_LOAD( "b73.06", 0x0d0000, 0x010000, CRC(a98e4aea) SHA1(560fef03ad818894c9c7578c6282d55b646e8129) ) ROM_LOAD( "b73.07", 0x0e0000, 0x010000, CRC(5cffa42c) SHA1(687e047345039479b35d5099e56dbc1d57284ed9) ) - + ROM_REGION( 0x80000, "gfx2", 0 ) ROM_LOAD( "b73.09", 0x000000, 0x080000, CRC(537c647f) SHA1(941c0f4e251bc68e53d62e70b033a3a6c145bb7e) ) ROM_END diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c index 447af0d6d39..33241a572a5 100644 --- a/src/mame/drivers/kingdrby.c +++ b/src/mame/drivers/kingdrby.c @@ -235,7 +235,7 @@ static WRITE8_DEVICE_HANDLER( hopper_io_w ) { p1_hopper = (data & 0x8)<<3; p2_hopper = (data & 0x4)<<5; -// printf("%02x\n",data); +// printf("%02x\n",data); } static WRITE8_DEVICE_HANDLER( sound_cmd_w ) @@ -251,7 +251,7 @@ static UINT8 mux_data; /* No idea about what's this (if it's really a mux etc.)*/ static WRITE8_DEVICE_HANDLER( outport2_w ) { -// popmessage("PPI1 port C(upper) out: %02X", data); +// popmessage("PPI1 port C(upper) out: %02X", data); mux_data = data & 0x80; } @@ -323,12 +323,12 @@ static READ8_DEVICE_HANDLER( sound_cmd_r ) static WRITE8_HANDLER( led_array_w ) { /* - offset = directly tied with the button (i.e. offset 1 = 1-2, offset 2 = 1-3 etc.) - data = xxxx ---- p2 array - ---- xxxx p1 array - they goes from 0 to 5, to indicate the number. - If one player bets something, the other led will toggle between p1 and p2 bets. - */ + offset = directly tied with the button (i.e. offset 1 = 1-2, offset 2 = 1-3 etc.) + data = xxxx ---- p2 array + ---- xxxx p1 array + they goes from 0 to 5, to indicate the number. + If one player bets something, the other led will toggle between p1 and p2 bets. + */ } /************************************* diff --git a/src/mame/drivers/kungfur.c b/src/mame/drivers/kungfur.c index 64e708c2c9f..a4839961da6 100644 --- a/src/mame/drivers/kungfur.c +++ b/src/mame/drivers/kungfur.c @@ -103,7 +103,7 @@ static void draw_led(bitmap_t *bitmap, int x, int y,UINT8 value) /* actually debugging purpose, it will be converted to the artwork system at some point. */ VIDEO_UPDATE( kungfur ) { -// popmessage("%02x %02x %02x %02x %02x %02x",io_data[0],io_data[1],io_data[2],io_data[3],io_data[4],io_data[5]); +// popmessage("%02x %02x %02x %02x %02x %02x",io_data[0],io_data[1],io_data[2],io_data[3],io_data[4],io_data[5]); int i; for(i=0;i<16;i++) @@ -117,40 +117,40 @@ static WRITE8_DEVICE_HANDLER( test0_w ) mux_data = data & 7; /* multiplexer selector? (00-06) */ mux_data|= (data & 0x10)>>1; -// printf("%02x MUX W\n",data); +// printf("%02x MUX W\n",data); } static WRITE8_DEVICE_HANDLER( test1_w ) { -// io_data[1] = data; /* the whole port should be NULL */ -// printf("%02x Unk 1 W\n",data); +// io_data[1] = data; /* the whole port should be NULL */ +// printf("%02x Unk 1 W\n",data); } static WRITE8_DEVICE_HANDLER( test2_w ) { -// io_data[2] = data; /* lower nibble should be NULL */ +// io_data[2] = data; /* lower nibble should be NULL */ led[mux_data] = data; -// printf("%02x Unk 2 W\n",data); +// printf("%02x Unk 2 W\n",data); } static WRITE8_DEVICE_HANDLER( test3_w ) { -// io_data[3] = data; -// printf("%02x Unk 3 W\n",data); +// io_data[3] = data; +// printf("%02x Unk 3 W\n",data); } /*mux is always 0*/ static WRITE8_DEVICE_HANDLER( test4_w ) { -// io_data[4] = data; +// io_data[4] = data; led[mux_data] = data; } /* this looks like lamps. */ static WRITE8_DEVICE_HANDLER( test5_w ) { -// io_data[5] = data; -// printf("%02x Unk 5 W\n",data); +// io_data[5] = data; +// printf("%02x Unk 5 W\n",data); } static UINT32 adpcm_pos[2]; diff --git a/src/mame/drivers/maygay1b.c b/src/mame/drivers/maygay1b.c index 343efb2ae73..c23ad6f3dad 100644 --- a/src/mame/drivers/maygay1b.c +++ b/src/mame/drivers/maygay1b.c @@ -151,10 +151,10 @@ static READ8_HANDLER( m1_8279_r ) /* read status word */ else { - if ( chip->read_sensor ) + if ( chip->read_sensor ) { result = input_port_read(space->machine,portnames[chip->sense_address]); -// break +// break } if ( chip->sense_auto_inc ) { @@ -276,9 +276,9 @@ static WRITE8_HANDLER( m1_8279_w ) break; } } - if ( chip->write_display ) + if ( chip->write_display ) { // Data - if ( chip->ram[chip->disp_address] != data ) + if ( chip->ram[chip->disp_address] != data ) { m1_draw_lamps(chip->ram[chip->disp_address],chip->disp_address, 0); } @@ -426,9 +426,9 @@ static WRITE8_HANDLER( m1_8279_2_w ) break; } } - if ( chip->write_display ) + if ( chip->write_display ) { // Data - if ( chip->ram[chip->disp_address] != data ) + if ( chip->ram[chip->disp_address] != data ) { m1_draw_lamps(chip->ram[chip->disp_address],chip->disp_address, 128); } diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c index b0a9f99546b..6a9453115f1 100644 --- a/src/mame/drivers/maygayv1.c +++ b/src/mame/drivers/maygayv1.c @@ -11,7 +11,7 @@ * Believe it or not? * Caesar's Palace (reel to video) * Crossword Quiz - * Give us a Clue + * Give us a Clue * Special Effects (reel to video) * World Cup (reel to video) @@ -307,8 +307,8 @@ static VIDEO_UPDATE( maygayv1 ) if ( BIT(w0, 4) ) break; -// if ( BIT(w0, 5) ) -// printf("Blinking\n"); +// if ( BIT(w0, 5) ) +// printf("Blinking\n"); /* Resolution: either 4bpp or 2bpp */ res = (w0 >> 9) & 3; @@ -417,16 +417,16 @@ static VIDEO_EOF( maygayv1 ) *************************************/ /* - 68681 - YM2413 - 68B21 - 8279C - - 8a0008 0xe0 - 8a000c 0x7 - 8a000e 0x33 - 8a000a 0x8 - 8a001c 0xff R/W + 68681 + YM2413 + 68B21 + 8279C + + 8a0008 0xe0 + 8a000c 0x7 + 8a000e 0x33 + 8a000a 0x8 + 8a001c 0xff R/W */ @@ -477,17 +477,17 @@ static void update_outputs(UINT16 which) val = i8279.ram[i] & 0xff; /* - val = i8279.ram[i] & 0x0f; - if (i8279.inhibit & 0x01) - val = i8279.clear & 0x0f; + val = i8279.ram[i] & 0x0f; + if (i8279.inhibit & 0x01) + val = i8279.clear & 0x0f; - if(val) printf("%x\n", val); + if(val) printf("%x\n", val); - val = i8279.ram[i] >> 4; - if (i8279.inhibit & 0x02) - val = i8279.clear >> 4; + val = i8279.ram[i] >> 4; + if (i8279.inhibit & 0x02) + val = i8279.clear >> 4; - if(val) printf("%x\n", val); + if(val) printf("%x\n", val); */ } } @@ -725,13 +725,13 @@ static WRITE8_HANDLER( mcu_w ) // Bottom nibble = UPD case 1: p1 = data; -// upd7759_msg_w(0, data);//? +// upd7759_msg_w(0, data);//? break; case 3: upd7759_reset_w (0, BIT(data, 2)); upd7759_start_w(0, BIT(data, 6)); -// if ( !BIT(p3, 7) && BIT(data, 7) ) +// if ( !BIT(p3, 7) && BIT(data, 7) ) // P1 propagates to outputs p3 = data; @@ -905,7 +905,7 @@ INPUT_PORTS_END static void duart_irq_handler(const device_config *device, UINT8 vector) { cpu_set_input_line_and_vector(device->machine->cpu[0], 5, ASSERT_LINE, vector); -// cpu_set_input_line(device->machine->cpu[0], 5, state ? ASSERT_LINE : CLEAR_LINE); +// cpu_set_input_line(device->machine->cpu[0], 5, state ? ASSERT_LINE : CLEAR_LINE); }; static int d68681_val; @@ -969,7 +969,7 @@ static MACHINE_START( maygayv1 ) state_save_register_global_pointer(machine, i82716.dram, 0x40000); -// duart_68681_init(DUART_CLOCK, duart_irq_handler, duart_tx); +// duart_68681_init(DUART_CLOCK, duart_irq_handler, duart_tx); i8051_set_serial_tx_callback(machine->cpu[1], data_from_i8031); i8051_set_serial_rx_callback(machine->cpu[1], data_to_i8031); diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c index 3cf6e455f3b..43e6b46429f 100644 --- a/src/mame/drivers/mpu4.c +++ b/src/mame/drivers/mpu4.c @@ -1059,7 +1059,7 @@ static WRITE8_HANDLER( pia_gb_ca2_w ) { LOG(("%04x GAMEBOARD: OKI RESET (offset = %d),data = %02X\n", cpu_get_previouspc(space->cpu), offset, data&0xFF)); -// return okim6376_status_0_r(); +// return okim6376_status_0_r(); } static const pia6821_interface pia_gameboard_intf = @@ -1393,18 +1393,18 @@ static INPUT_PORTS_START( gamball ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) PORT_START("AUX1") -/* PORT_DIPNAME( 0x01, 0x00, "AUX101" ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x01, DEF_STR( On ) ) - PORT_DIPNAME( 0x02, 0x00, "AUX102" ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x02, DEF_STR( On ) ) - PORT_DIPNAME( 0x04, 0x00, "AUX103" ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x04, DEF_STR( On ) ) - PORT_DIPNAME( 0x08, 0x00, "AUX104" ) - PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x08, DEF_STR( On ) )*/ +/* PORT_DIPNAME( 0x01, 0x00, "AUX101" ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x01, DEF_STR( On ) ) + PORT_DIPNAME( 0x02, 0x00, "AUX102" ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x02, DEF_STR( On ) ) + PORT_DIPNAME( 0x04, 0x00, "AUX103" ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x04, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x00, "AUX104" ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x08, DEF_STR( On ) )*/ PORT_DIPNAME( 0x10, 0x00, "AUX105" ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x10, DEF_STR( On ) ) diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c index a0a2eeaa6ea..556c6bc854d 100644 --- a/src/mame/drivers/multfish.c +++ b/src/mame/drivers/multfish.c @@ -56,7 +56,7 @@ static TILE_GET_INFO( get_multfish_tile_info ) { int code = multfish_vid[tile_index*2+0x0000] | (multfish_vid[tile_index*2+0x0001] << 8); int attr = multfish_vid[tile_index*2+0x1000] | (multfish_vid[tile_index*2+0x1001] << 8); - + tileinfo->category = (attr&0x100)>>8; SET_TILE_INFO( @@ -69,7 +69,7 @@ static TILE_GET_INFO( get_multfish_tile_info ) static TILE_GET_INFO( get_multfish_reel_tile_info ) { int code = multfish_vid[tile_index*2+0x2000] | (multfish_vid[tile_index*2+0x2001] << 8); - + SET_TILE_INFO( 0, (code&0x1fff)+0x2000, @@ -87,10 +87,10 @@ static VIDEO_START(multfish) multfish_bram = auto_malloc(multfish_BRAM_SIZE); memset(multfish_bram,0x00,multfish_BRAM_SIZE); state_save_register_global_pointer(machine, multfish_bram, multfish_BRAM_SIZE); - + multfish_tilemap = tilemap_create(machine,get_multfish_tile_info,tilemap_scan_rows,16,16, 64, 32); tilemap_set_transparent_pen(multfish_tilemap,255); - + multfish_reel_tilemap = tilemap_create(machine,get_multfish_reel_tile_info,tilemap_scan_rows,16,16, 64, 64); tilemap_set_transparent_pen(multfish_reel_tilemap,255); tilemap_set_scroll_cols(multfish_reel_tilemap, 64); @@ -109,7 +109,7 @@ static VIDEO_UPDATE(multfish) /* Draw lower part of static tilemap (low pri tiles) */ tilemap_draw(bitmap,cliprect,multfish_tilemap,TILEMAP_DRAW_CATEGORY(1),0); - + /* Setup the column scroll and draw the reels */ for (i=0;i<64;i++) { @@ -127,7 +127,7 @@ static VIDEO_UPDATE(multfish) static WRITE8_HANDLER( multfish_vid_w ) { multfish_vid[offset]=data; - + // 0x0000 - 0x1fff is normal tilemap if (offset < 0x2000) { @@ -151,7 +151,7 @@ static WRITE8_HANDLER( multfish_vid_w ) b = ( (coldat &0x00e0)>> (5)); b|= ( (coldat &0xe000)>> (8+5-3)); - palette_set_color_rgb(space->machine, (offset-0x4000)/2, r<<3, g<<3, b<<2); + palette_set_color_rgb(space->machine, (offset-0x4000)/2, r<<3, g<<3, b<<2); } else { @@ -356,18 +356,18 @@ static ADDRESS_MAP_START( multfish_portmap, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x17, 0x17) AM_READ_PORT("IN7") /* Write ports not hooked up yet (lights etc.) */ -// AM_RANGE(0x30, 0x30) AM_WRITE(multfish_port30_w) -// AM_RANGE(0x31, 0x31) AM_WRITE(multfish_port31_w) -// AM_RANGE(0x32, 0x32) AM_WRITE(multfish_port32_w) -// AM_RANGE(0x33, 0x33) AM_WRITE(multfish_port33_w) -// AM_RANGE(0x34, 0x34) AM_WRITE(multfish_port34_w) -// AM_RANGE(0x35, 0x35) AM_WRITE(multfish_port35_w) -// AM_RANGE(0x36, 0x36) AM_WRITE(multfish_port36_w) -// AM_RANGE(0x37, 0x37) AM_WRITE(multfish_watchdog_reset_w) +// AM_RANGE(0x30, 0x30) AM_WRITE(multfish_port30_w) +// AM_RANGE(0x31, 0x31) AM_WRITE(multfish_port31_w) +// AM_RANGE(0x32, 0x32) AM_WRITE(multfish_port32_w) +// AM_RANGE(0x33, 0x33) AM_WRITE(multfish_port33_w) +// AM_RANGE(0x34, 0x34) AM_WRITE(multfish_port34_w) +// AM_RANGE(0x35, 0x35) AM_WRITE(multfish_port35_w) +// AM_RANGE(0x36, 0x36) AM_WRITE(multfish_port36_w) +// AM_RANGE(0x37, 0x37) AM_WRITE(multfish_watchdog_reset_w) AM_RANGE(0x38, 0x38) AM_DEVWRITE(SOUND, "ay", ay8910_address_w) AM_RANGE(0x39, 0x39) AM_DEVWRITE(SOUND, "ay", ay8910_data_w) AM_RANGE(0x3a, 0x3a) AM_DEVREAD(SOUND, "ay", ay8910_r) - + AM_RANGE(0x90, 0x90) AM_READ(ray_r) AM_RANGE(0xe1, 0xe1) AM_WRITE(multfish_bank_w) diff --git a/src/mame/drivers/runaway.c b/src/mame/drivers/runaway.c index 05eb77ca8e2..a4f63cf18b1 100644 --- a/src/mame/drivers/runaway.c +++ b/src/mame/drivers/runaway.c @@ -366,7 +366,7 @@ static MACHINE_DRIVER_START( runaway ) MDRV_CPU_PROGRAM_MAP(readmem, writemem) MDRV_MACHINE_RESET(runaway) - + MDRV_ATARIVGEAROM_ADD("earom") /* video hardware */ diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c index 7cbf1a603ac..0882a0c3c12 100644 --- a/src/mame/drivers/sfbonus.c +++ b/src/mame/drivers/sfbonus.c @@ -3923,7 +3923,7 @@ ROM_END ROM_START( fb5 ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "fb5b15h.bin", 0x00000, 0x40000, CRC(faba08b8) SHA1(4763f691b563ba23cc3edf86c18cdcda8c415003) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb5rom2.bin", 0x00000, 0x3ffff, BAD_DUMP CRC(bf49ba49) SHA1(eea40e34298f7fd98771f0869ef541c5e1514f2a) ) @@ -3939,7 +3939,7 @@ ROM_END ROM_START( fb5c ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "fb5c15h.bin", 0x00000, 0x40000, CRC(62897a2b) SHA1(7a30c6453b9e04d25686deb97e25b89e49a6305d) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb5rom2.bin", 0x00000, 0x3ffff, BAD_DUMP CRC(bf49ba49) SHA1(eea40e34298f7fd98771f0869ef541c5e1514f2a) ) @@ -3955,7 +3955,7 @@ ROM_END ROM_START( fb5d ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "fb5d15h.bin", 0x00000, 0x40000, CRC(231b4083) SHA1(a009cae4943ba8d6a56eb4d70bc8b50f98b62fde) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb5rom2.bin", 0x00000, 0x3ffff, BAD_DUMP CRC(bf49ba49) SHA1(eea40e34298f7fd98771f0869ef541c5e1514f2a) ) @@ -3971,7 +3971,7 @@ ROM_END ROM_START( fb5v ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "fb5v15h.bin", 0x00000, 0x40000, CRC(c6b117f5) SHA1(186dcfd9fd9b077036af54f8632ba70118f2f510) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb5rom2.bin", 0x00000, 0x3ffff, BAD_DUMP CRC(bf49ba49) SHA1(eea40e34298f7fd98771f0869ef541c5e1514f2a) ) @@ -3988,7 +3988,7 @@ ROM_END ROM_START( fb6 ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "f06d17e.bin", 0x00000, 0x40000, CRC(3c13d847) SHA1(c3ec365a507b960d8e97c19e1334da8fb3c9f4cf) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb06rom2.bin", 0x00000, 0x40000, CRC(f1adbcd5) SHA1(90a8830d000eb634c2db8a09431daba6cdcb2d34) ) @@ -4004,7 +4004,7 @@ ROM_END ROM_START( fb6d ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "f06d17lt.bin", 0x00000, 0x40000, CRC(e222e19f) SHA1(1cd7bc2b802ece74735ec2a794ab5be041c24189) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb06rom2.bin", 0x00000, 0x40000, CRC(f1adbcd5) SHA1(90a8830d000eb634c2db8a09431daba6cdcb2d34) ) @@ -4020,7 +4020,7 @@ ROM_END ROM_START( fb6d2 ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "f06d17r.bin", 0x00000, 0x40000, CRC(b3c1bb6f) SHA1(b8c46066a61ae48eb400014657dd80e7ef6de976) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb06rom2.bin", 0x00000, 0x40000, CRC(f1adbcd5) SHA1(90a8830d000eb634c2db8a09431daba6cdcb2d34) ) @@ -4037,7 +4037,7 @@ ROM_END ROM_START( fb6v ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "f06v17r.bin", 0x00000, 0x40000, CRC(f65ef744) SHA1(1a4fb2b5d34b7466f398b115792a6f972c37e11e) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb06rom2.bin", 0x00000, 0x40000, CRC(f1adbcd5) SHA1(90a8830d000eb634c2db8a09431daba6cdcb2d34) ) @@ -4053,7 +4053,7 @@ ROM_END ROM_START( fb6v2 ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "f06v17lt.bin", 0x00000, 0x40000, CRC(ac70303d) SHA1(c00a776b10142d478d617890d638f260fdc2c356) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb06rom2.bin", 0x00000, 0x40000, CRC(f1adbcd5) SHA1(90a8830d000eb634c2db8a09431daba6cdcb2d34) ) @@ -4069,7 +4069,7 @@ ROM_END ROM_START( fb6v3 ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "f06v17e.bin", 0x00000, 0x40000, CRC(fa42f143) SHA1(e410cc7ae1c86b540c5f573974ee68944fc51a3d)) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb06rom2.bin", 0x00000, 0x40000, CRC(f1adbcd5) SHA1(90a8830d000eb634c2db8a09431daba6cdcb2d34) ) @@ -4085,9 +4085,9 @@ ROM_END ROM_START( fb6s ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "f06s17r.bin", 0x00000, 0x40000, CRC(679747d1) SHA1(ca702324c436d54f4c23350b1af4f0250915883c) ) - - // this is a 'compact' board, the standard roms don't seem correct - + + // this is a 'compact' board, the standard roms don't seem correct + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb06rom2.bin", 0x00000, 0x40000, CRC(f1adbcd5) SHA1(90a8830d000eb634c2db8a09431daba6cdcb2d34) ) @@ -4104,9 +4104,9 @@ ROM_END ROM_START( fb6s2 ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "f06s17lt.bin", 0x00000, 0x40000, CRC(2008a56f) SHA1(1dec4818c49cd63cc29fcb5abdab7a256731ae7b) ) - + // this is a 'compact' board, the standard roms don't seem correct - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb06rom2.bin", 0x00000, 0x40000, CRC(f1adbcd5) SHA1(90a8830d000eb634c2db8a09431daba6cdcb2d34) ) @@ -4125,7 +4125,7 @@ ROM_END ROM_START( fb6se ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "se6d14r.bin", 0x00000, 0x40000, CRC(70567bf1) SHA1(2e2bb317d558c4a8a008a695097f474b5e58ccf4) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "se06rom2.bin", 0x00000, 0x40000, CRC(f1adbcd5) SHA1(90a8830d000eb634c2db8a09431daba6cdcb2d34) ) @@ -4141,7 +4141,7 @@ ROM_END ROM_START( fb6sed ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "se6d14lt.bin", 0x00000, 0x40000, CRC(97cf4951) SHA1(a750d61e4a92a79512cfbef138927581a1e5494c) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "se06rom2.bin", 0x00000, 0x40000, CRC(f1adbcd5) SHA1(90a8830d000eb634c2db8a09431daba6cdcb2d34) ) @@ -4157,7 +4157,7 @@ ROM_END ROM_START( fb6sed2 ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "se6d14e.bin", 0x00000, 0x40000, CRC(e6e54c02) SHA1(f3c1ceb6ac551d2c9bcd244b57cdf0522768d99e) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "se06rom2.bin", 0x00000, 0x40000, CRC(f1adbcd5) SHA1(90a8830d000eb634c2db8a09431daba6cdcb2d34) ) @@ -4173,7 +4173,7 @@ ROM_END ROM_START( fb6sev ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "se6v14r.bin", 0x00000, 0x40000, CRC(8c5a93c9) SHA1(d101a05327e957ab83dc8a45aa005126da3a8fc6) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "se06rom2.bin", 0x00000, 0x40000, CRC(f1adbcd5) SHA1(90a8830d000eb634c2db8a09431daba6cdcb2d34) ) @@ -4189,7 +4189,7 @@ ROM_END ROM_START( fb6sev2 ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "se6v14lt.bin", 0x00000, 0x40000, CRC(f5be2b37) SHA1(b3ff3ec456cbed064e5d05d58b4ff74d61b288dd) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "se06rom2.bin", 0x00000, 0x40000, CRC(f1adbcd5) SHA1(90a8830d000eb634c2db8a09431daba6cdcb2d34) ) @@ -4205,7 +4205,7 @@ ROM_END ROM_START( fb6sev3 ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "se6v14e.bin", 0x00000, 0x40000, CRC(00b681ea) SHA1(050bbe532c6869f64af47a9deec4e12652676e1b) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "se06rom2.bin", 0x00000, 0x40000, CRC(f1adbcd5) SHA1(90a8830d000eb634c2db8a09431daba6cdcb2d34) ) @@ -4221,7 +4221,7 @@ ROM_END ROM_START( version4 ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "96d42r.bin", 0x00000, 0x40000, CRC(dab5706c) SHA1(9fc37b66942a5e7535b4590f132727d793f9d705) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "96rom2.bin", 0x00000, 0x40000, NO_DUMP ) @@ -4237,7 +4237,7 @@ ROM_END ROM_START( bugfever ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "bfd17r.bin", 0x00000, 0x80000, CRC(6fc33307) SHA1(fdb10bd3e463cac2f9050d2d37fdfba9ccee91dc) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "bfrom2.bin", 0x00000, 0x40000, NO_DUMP ) @@ -4253,7 +4253,7 @@ ROM_END ROM_START( bugfeverd ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "bfd17e.bin", 0x00000, 0x80000, CRC(35324195) SHA1(ad290912556f4ddbc33667b3bce5d05f321870d0) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "bfrom2.bin", 0x00000, 0x40000, NO_DUMP ) @@ -4269,7 +4269,7 @@ ROM_END ROM_START( bugfeverv ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "bfv17r.bin", 0x00000, 0x80000, CRC(8b6ee6f5) SHA1(981d60f04ab44ce8fc63019ac3e5b689aa80baf0) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "bfrom2.bin", 0x00000, 0x40000, NO_DUMP ) @@ -4285,7 +4285,7 @@ ROM_END ROM_START( bugfeverv2 ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "bfv17e.bin", 0x00000, 0x80000, CRC(b9afd39a) SHA1(d331551f679b8694bf63812e5e1a54361c87c52a) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "bfrom2.bin", 0x00000, 0x40000, NO_DUMP ) @@ -4317,7 +4317,7 @@ ROM_END ROM_START( funriver ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "frd14r.bin", 0x00000, 0x80000, CRC(03ffabcc) SHA1(0e65be88dc4158f77082e5b50836197dd0e397da) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "frrom2.bin", 0x00000, 0x40000, NO_DUMP ) @@ -4333,7 +4333,7 @@ ROM_END ROM_START( funriverv ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "frv14r.bin", 0x00000, 0x80000, CRC(5629d38e) SHA1(6404f70d94b1ec39d1df4e00c620eb5498d3ff83) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "frrom2.bin", 0x00000, 0x40000, NO_DUMP ) @@ -4350,11 +4350,11 @@ ROM_END ROM_START( amclink ) ROM_REGION( 0x80000, "maincpu", 0 ) /* Z80 Code */ ROM_LOAD( "link22.bin", 0x00000, 0x1ffff, BAD_DUMP CRC(e1acc705) SHA1(eb5684a0924add44f64637c2610f4c9650b8f4d9) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_REGION( 0x100000, "gfx1", ROMREGION_ERASE00 ) - + ROM_REGION( 0x100000, "gfx2", ROMREGION_ERASE00 ) ROM_END #endif diff --git a/src/mame/drivers/tempest.c b/src/mame/drivers/tempest.c index e9553d0349d..eb1ca8e7889 100644 --- a/src/mame/drivers/tempest.c +++ b/src/mame/drivers/tempest.c @@ -579,7 +579,7 @@ static MACHINE_DRIVER_START( tempest ) MDRV_WATCHDOG_TIME_INIT(HZ(CLOCK_3KHZ / 256)) MDRV_ATARIVGEAROM_ADD("earom") - + MDRV_MACHINE_START(tempest) /* video hardware */ @@ -593,7 +593,7 @@ static MACHINE_DRIVER_START( tempest ) /* Drivers */ MDRV_MATHBOX_ADD("mathbox") - + /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/tomcat.c b/src/mame/drivers/tomcat.c index 062f0ced007..15edfa94401 100644 --- a/src/mame/drivers/tomcat.c +++ b/src/mame/drivers/tomcat.c @@ -333,7 +333,7 @@ static MACHINE_START(tomcat) tomcat_nvram = auto_malloc(0x800); - state_save_register_global_pointer(machine, tomcat_nvram, 0x800); + state_save_register_global_pointer(machine, tomcat_nvram, 0x800); state_save_register_global(machine, tomcat_control_num); state_save_register_global(machine, dsp_BIO); state_save_register_global(machine, dsp_idle); diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c index f7bc08ca125..072a73b0fe2 100644 --- a/src/mame/drivers/vball.c +++ b/src/mame/drivers/vball.c @@ -492,8 +492,8 @@ ROM_START( vball ) /* US version */ ROM_LOAD( "25j1-0.47", 0x00000, 0x8000, CRC(10ca79ad) SHA1(aad4a09d6745ca0b5665cb00ff7a4e08ea434068) ) /* the original has the image data stored in a special ceramic embedded package made by Toshiba - with part number 'TOSHIBA TRJ-101' (which has been dumped using a custom made adapter) - there are a few bytes different between the bootleg and the original (the original is correct though!) */ + with part number 'TOSHIBA TRJ-101' (which has been dumped using a custom made adapter) + there are a few bytes different between the bootleg and the original (the original is correct though!) */ ROM_REGION(0x80000, "gfx1", ROMREGION_DISPOSE ) /* fg tiles */ ROM_LOAD( "trj-101.96", 0x00000, 0x80000, CRC(f343eee4) SHA1(1ce95285631f7ec91fe3f6c3d62b13f565d3816a) ) @@ -520,8 +520,8 @@ ROM_START( vball2pj ) /* Japan version */ //ROM_LOAD( "vball04.bin", 0x00000, 0x8000, CRC(534dfbd9) SHA1(d0cb37caf94fa85da4ebdfe15e7a78109084bf91) ) /* the original has the image data stored in a special ceramic embedded package made by Toshiba - with part number 'TOSHIBA TRJ-101' (which has been dumped using a custom made adapter) - there are a few bytes different between the bootleg and the original (the original is correct though!) */ + with part number 'TOSHIBA TRJ-101' (which has been dumped using a custom made adapter) + there are a few bytes different between the bootleg and the original (the original is correct though!) */ ROM_REGION(0x80000, "gfx1", ROMREGION_DISPOSE ) /* fg tiles */ ROM_LOAD( "trj-101.96", 0x00000, 0x80000, CRC(f343eee4) SHA1(1ce95285631f7ec91fe3f6c3d62b13f565d3816a) ) diff --git a/src/mame/machine/mhavoc.c b/src/mame/machine/mhavoc.c index 990581c6ed3..cb79cb5d141 100644 --- a/src/mame/machine/mhavoc.c +++ b/src/mame/machine/mhavoc.c @@ -126,7 +126,7 @@ MACHINE_RESET( mhavoc ) state_save_register_item(machine, "misc", NULL, 0, alpha_irq_clock); state_save_register_item(machine, "misc", NULL, 0, alpha_irq_clock_enable); state_save_register_item(machine, "misc", NULL, 0, gamma_irq_clock); - + state_save_register_item(machine, "misc", NULL, 0, speech_write_buffer); } diff --git a/src/mame/video/avgdvg.c b/src/mame/video/avgdvg.c index d7c9a3913e9..38f34e042cd 100644 --- a/src/mame/video/avgdvg.c +++ b/src/mame/video/avgdvg.c @@ -1469,7 +1469,7 @@ static void register_state (running_machine *machine) state_save_register_item(machine, "AVG", NULL, 0, vg->clipy_min); state_save_register_item(machine, "AVG", NULL, 0, vg->clipx_max); state_save_register_item(machine, "AVG", NULL, 0, vg->clipy_max); - + state_save_register_item(machine, "AVG", NULL, 0, flip_x); state_save_register_item(machine, "AVG", NULL, 0, flip_y); @@ -1546,7 +1546,7 @@ VIDEO_START( avg_tempest ) { vgc = &avg_tempest; VIDEO_START_CALL(avg_common); - + state_save_register_item_pointer(machine, "AVG", NULL, 0, vectorram, vectorram_size); } diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c index 4cfade7b7dd..678e9d5cf36 100644 --- a/src/mame/video/goldstar.c +++ b/src/mame/video/goldstar.c @@ -156,7 +156,7 @@ VIDEO_START( cherrym ) cmaster_girl_num = 0; cmaster_girl_pal = 0; - + goldstar_fg_tilemap = tilemap_create(machine,get_cherrym_fg_tile_info,tilemap_scan_rows,8,8, 64, 32); tilemap_set_transparent_pen(goldstar_fg_tilemap,0); } @@ -171,49 +171,33 @@ WRITE8_HANDLER( goldstar_fa00_w ) bgcolor = (data & 0x04) >> 2; tilemap_mark_all_tiles_dirty (goldstar_reel1_tilemap); tilemap_mark_all_tiles_dirty (goldstar_reel2_tilemap); - tilemap_mark_all_tiles_dirty (goldstar_reel3_tilemap); + tilemap_mark_all_tiles_dirty (goldstar_reel3_tilemap); } WRITE8_HANDLER( cm_background_col_w ) { //printf("cm_background_col_w %02x\n",data); - + /* cherry master writes - - 00 (at start) - 14 (win 1st round) - 38 (win 2nd round) - 4c etc. - 20 - 5c - - these are the following values in binary (sorted) - - 0000 0000 - 0001 0100 - 0010 0000 - 0011 1000 - 0100 1100 - 0101 1100 - - so it's probably - - 0ggg cc00 - - where g is which girl to display and c is the colour palette - - (note, this doesn't apply to the amcoe games which have no girls, I'm unsure how the priority/positioning works) - - - */ + + so it's probably + + 0ggg cc00 + + where g is which girl to display and c is the colour palette + + (note, this doesn't apply to the amcoe games which have no girls, I'm unsure how the priority/positioning works) + + + */ cmaster_girl_num = (data >> 4)&0x7; cmaster_girl_pal = (data >> 2)&0x3; - + bgcolor = (data & 0x03) >> 0; tilemap_mark_all_tiles_dirty (goldstar_reel1_tilemap); tilemap_mark_all_tiles_dirty (goldstar_reel2_tilemap); - tilemap_mark_all_tiles_dirty (goldstar_reel3_tilemap); + tilemap_mark_all_tiles_dirty (goldstar_reel3_tilemap); } // are these hardcoded, or registers? @@ -254,9 +238,9 @@ VIDEO_UPDATE( goldstar ) { const gfx_element *gfx = screen->machine->gfx[2]; drawgfxzoom(bitmap,gfx,cmaster_girl_num,cmaster_girl_pal,0,0,32*8,16*8,cliprect,TRANSPARENCY_PEN,0, 0x20000, 0x10000); - } + } #endif - + tilemap_draw(bitmap,cliprect, goldstar_fg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/hd63484.c b/src/mame/video/hd63484.c index 1da04bfc970..a03ed0e33a9 100644 --- a/src/mame/video/hd63484.c +++ b/src/mame/video/hd63484.c @@ -852,7 +852,7 @@ static void circle(INT16 sx, INT16 sy, UINT16 r, INT16 col) { float degInRad = i * DEG2RAD / (r / 10); dot(sx + cos(degInRad) * r,sy + sin(degInRad) * r,col & 7,cl0); - } + } } static void paint(int sx, int sy, int col) diff --git a/src/mame/video/mcatadv.c b/src/mame/video/mcatadv.c index 185d23ab54a..b9be122f676 100644 --- a/src/mame/video/mcatadv.c +++ b/src/mame/video/mcatadv.c @@ -132,7 +132,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect if((priline[drawxpos] < pri)) { if (offset >= 0x500000*2) offset = 0; pix = sprdata[offset/2]; - + if (offset & 1) pix = pix >> 4; pix &= 0x0f; diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c index 0e31a14d286..03ae2988c0d 100644 --- a/src/mame/video/tatsumi.c +++ b/src/mame/video/tatsumi.c @@ -1086,7 +1086,7 @@ VIDEO_UPDATE( apache3 ) bitmap_fill(bitmap,cliprect,screen->machine->pens[0]); draw_sky(screen->machine, bitmap, cliprect, 256, apache3_rotate_ctrl[1]); -// draw_ground(screen->machine, bitmap, cliprect); +// draw_ground(screen->machine, bitmap, cliprect); draw_sprites(screen->machine, bitmap,cliprect,0, (tatsumi_sprite_control_ram[0x20]&0x1000) ? 0x1000 : 0); tilemap_draw(bitmap,cliprect,tx_layer,0,0); return 0; diff --git a/src/version.c b/src/version.c index b16f56985ad..1a4221a9bc0 100644 --- a/src/version.c +++ b/src/version.c @@ -9,4 +9,4 @@ ***************************************************************************/ -const char build_version[] = "0.129u4 ("__DATE__")"; +const char build_version[] = "0.129u5 ("__DATE__")"; |