diff options
author | 2009-12-28 08:49:12 +0000 | |
---|---|---|
committer | 2009-12-28 08:49:12 +0000 | |
commit | 93d465ad3c54fe1091a22a8f6f124b9faacc0ece (patch) | |
tree | c69c6f02e705136b166763970ecc8b85d21ecc94 /src | |
parent | 7819b1fce7641ec737385238348d997323b06aea (diff) |
Whitespace cleanup. (No, a release is not yet imminent.)
Diffstat (limited to 'src')
51 files changed, 282 insertions, 282 deletions
diff --git a/src/emu/machine/adc1038.c b/src/emu/machine/adc1038.c index a25b20a27f1..1a12f6baa64 100644 --- a/src/emu/machine/adc1038.c +++ b/src/emu/machine/adc1038.c @@ -2,7 +2,7 @@ National Semiconductor ADC1038 - 10-Bit Serial I/O A/D Converters with Analog Multiplexer and + 10-Bit Serial I/O A/D Converters with Analog Multiplexer and Track/hold Function ***************************************************************************/ diff --git a/src/emu/machine/adc1038.h b/src/emu/machine/adc1038.h index ca5cf6a85cf..884d98c1d22 100644 --- a/src/emu/machine/adc1038.h +++ b/src/emu/machine/adc1038.h @@ -2,7 +2,7 @@ National Semiconductor ADC1038 - 10-Bit Serial I/O A/D Converters with Analog Multiplexer and + 10-Bit Serial I/O A/D Converters with Analog Multiplexer and Track/hold Function ***************************************************************************/ diff --git a/src/emu/machine/eeprom.c b/src/emu/machine/eeprom.c index fea2ab0deeb..f985e6145a6 100644 --- a/src/emu/machine/eeprom.c +++ b/src/emu/machine/eeprom.c @@ -392,7 +392,7 @@ static DEVICE_NVRAM( eeprom ) fatalerror("eeprom region '%s' needs to be an 8-bit region", device->tag); if (eestate->intf->data_bits == 16 && ((region_flags & ROMREGION_WIDTHMASK) != ROMREGION_16BIT || (region_flags & ROMREGION_ENDIANMASK) != ROMREGION_BE)) fatalerror("eeprom region '%s' needs to be a 16-bit big-endian region (flags=%08x)", device->tag, region_flags); - + if (eestate->intf->data_bits == 8) memcpy(eestate->data, device->region, eeprom_length); else diff --git a/src/emu/machine/mb87078.c b/src/emu/machine/mb87078.c index 8cb98a0e56c..71c801959a8 100644 --- a/src/emu/machine/mb87078.c +++ b/src/emu/machine/mb87078.c @@ -186,7 +186,7 @@ void mb87078_data_w( const device_config *device, int data, int dsel ) { mb87078_state *mb87078 = get_safe_token(device); - if (mb87078->reset_comp == 0) + if (mb87078->reset_comp == 0) return; if (dsel == 0) /* gd0 - gd5 */ diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c index 66f85f43496..a1f36cfb6d4 100644 --- a/src/mame/drivers/asuka.c +++ b/src/mame/drivers/asuka.c @@ -790,7 +790,7 @@ static VIDEO_EOF( asuka ) static const tc0220ioc_interface asuka_io_intf = { - DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), + DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), DEVCB_INPUT_PORT("IN0"), DEVCB_INPUT_PORT("IN1"), DEVCB_INPUT_PORT("IN2") /* port read handlers */ }; diff --git a/src/mame/drivers/cb2001.c b/src/mame/drivers/cb2001.c index b51ddd9cef8..847f09881bc 100644 --- a/src/mame/drivers/cb2001.c +++ b/src/mame/drivers/cb2001.c @@ -109,7 +109,7 @@ e0035 49 d3 06 mov [6d3],al 0c53 ret nz e0040 be e0083 0c54 ld hl,d461 . 0c57 ld a,(d476) e0042 mov aw,[4b9] (68 -> a1) -0c5a or a e0045 and aw,aw +0c5a or a e0045 and aw,aw 0c5b jr nz,0c6d e0047 be e0083 0c5d ld a,(hl) . 0c5e or a e0049 and al,al @@ -117,7 +117,7 @@ e0035 49 d3 06 mov [6d3],al 0c61 inc hl e004d dec al 0c62 inc (hl) e004f mov [4b9],aw (4c -> a3) 0c63 ld a,(hl) . -. e0052 br e0083 +. e0052 br e0083 . e0054 and ah,ah . e0056 be e007b 0c64 cp 3c e0058 mov al,3c diff --git a/src/mame/drivers/cyclemb.c b/src/mame/drivers/cyclemb.c index 60897fd76c2..d119778d67a 100644 --- a/src/mame/drivers/cyclemb.c +++ b/src/mame/drivers/cyclemb.c @@ -1,19 +1,19 @@ /*************************************************************************************************** - Cycle Mahbou (c) 1984 Taito Corporation / Seta + Cycle Mahbou (c) 1984 Taito Corporation / Seta - appears to be in the exact middle between the gsword / josvolly HW and the ppking / gladiator HW + appears to be in the exact middle between the gsword / josvolly HW and the ppking / gladiator HW - preliminary driver by Angelo Salese + preliminary driver by Angelo Salese - TODO: - - protection (two 8741); - - colors; - - fix remaining video issues; - - sound; - - add flipscreen; + TODO: + - protection (two 8741); + - colors; + - fix remaining video issues; + - sound; + - add flipscreen; - (wait until it completes the post test, then put 1 to be23) + (wait until it completes the post test, then put 1 to be23) ===================================================================================================== @@ -124,7 +124,7 @@ static VIDEO_UPDATE( cyclemb ) int tile = (cyclemb_vram[count]) | ((attr & 3)<<8); int color = ((attr & 0xf8) >> 3) ^ 0x1f; int odd_line = y & 1 ? 0x40 : 0x00; -// int sx_offs = flip_screen ? 512 : 0 +// int sx_offs = flip_screen ? 512 : 0 int scrollx = ((cyclemb_vram[(y/2)+odd_line]) + (cyclemb_cram[(y/2)+odd_line]<<8) + 48) & 0x1ff; if(flip_screen) @@ -145,28 +145,28 @@ static VIDEO_UPDATE( cyclemb ) } /* - bank 1 - xxxx xxxx [0] sprite offset - ---x xxxx [1] color offset - bank 2 - xxxx xxxx [0] y offs - xxxx xxxx [1] x offs - bank 3 - ---- ---x [1] sprite enable flag? - */ + bank 1 + xxxx xxxx [0] sprite offset + ---x xxxx [1] color offset + bank 2 + xxxx xxxx [0] y offs + xxxx xxxx [1] x offs + bank 3 + ---- ---x [1] sprite enable flag? + */ { UINT8 col,fx,fy,region; UINT16 spr_offs,i; INT16 x,y; /* - 0x3b-0x3c-0x3d tire (0x13 0x00 / 0x17 0x00 ) - 0x3b- shirt (0x16 0x00) - 0x20 tire stick (0x16 0x00) - 0x2e go sign (0x11 0x00) - 0x18 trampoline (0x13 0x00) - 0x27 cone (0x13 0x00) - */ + 0x3b-0x3c-0x3d tire (0x13 0x00 / 0x17 0x00 ) + 0x3b- shirt (0x16 0x00) + 0x20 tire stick (0x16 0x00) + 0x2e go sign (0x11 0x00) + 0x18 trampoline (0x13 0x00) + 0x27 cone (0x13 0x00) + */ for(i=0;i<0x40;i+=2) { @@ -185,7 +185,7 @@ static VIDEO_UPDATE( cyclemb ) if(cyclemb_obj3_ram[i+1] & 1) x+=256; //if(cyclemb_obj3_ram[i+1] & 2) -// x-=256; +// x-=256; fx = (cyclemb_obj3_ram[i+0] & 4) >> 2; fy = (cyclemb_obj3_ram[i+0] & 8) >> 3; @@ -247,7 +247,7 @@ static ADDRESS_MAP_START( cyclemb_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( cyclemb_io, ADDRESS_SPACE_IO, 8 ) -// ADDRESS_MAP_GLOBAL_MASK(0xff) +// ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0xc000, 0xc000) AM_WRITE(cyclemb_bankswitch_w) AM_RANGE(0xc09e, 0xc09f) AM_READWRITE(cyclemb_8741_0_r, cyclemb_8741_0_w) AM_RANGE(0xc0bf, 0xc0bf) AM_WRITE(cyclemb_flip_w) //flip screen diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index 2c659ccd969..d64e64b58b0 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -2779,7 +2779,7 @@ ROM_START( tattass ) ROM_LOAD( "u21.snd", 0x080000, 0x80000, CRC(10b2110c) SHA1(83e5938ed22da2874022e1dc8df76c72d95c448d) ) ROM_LOAD( "u36.snd", 0x100000, 0x80000, CRC(3b73abe2) SHA1(195096e2302e84123b23b4ccd982fb3ab9afe42c) ) ROM_LOAD( "u37.snd", 0x180000, 0x80000, CRC(986066b5) SHA1(9dd1a14de81733617cf51293674a8e26fc5cec68) ) - + ROM_REGION( 0x400, "eeprom", 0 ) ROM_LOAD( "eeprom-tattass.bin", 0x0000, 0x0400, CRC(7140f40c) SHA1(4fb7897933046b6adaf00b4626d5fd23d0e8a666) ) ROM_END @@ -2852,7 +2852,7 @@ ROM_START( tattassa ) ROM_LOAD( "u21.snd", 0x080000, 0x80000, CRC(10b2110c) SHA1(83e5938ed22da2874022e1dc8df76c72d95c448d) ) ROM_LOAD( "u36.snd", 0x100000, 0x80000, CRC(3b73abe2) SHA1(195096e2302e84123b23b4ccd982fb3ab9afe42c) ) ROM_LOAD( "u37.snd", 0x180000, 0x80000, CRC(986066b5) SHA1(9dd1a14de81733617cf51293674a8e26fc5cec68) ) - + ROM_REGION( 0x400, "eeprom", 0 ) ROM_LOAD( "eeprom-tattass.bin", 0x0000, 0x0400, CRC(7140f40c) SHA1(4fb7897933046b6adaf00b4626d5fd23d0e8a666) ) ROM_END diff --git a/src/mame/drivers/galastrm.c b/src/mame/drivers/galastrm.c index f67945179ae..a0a7f7054fd 100644 --- a/src/mame/drivers/galastrm.c +++ b/src/mame/drivers/galastrm.c @@ -368,7 +368,7 @@ ROM_START( galastrm ) ROM_CONTINUE( 0x600000, 0x040000 ) ROM_CONTINUE( 0x780000, 0x040000 ) ROM_CONTINUE( 0x700000, 0x040000 ) - + ROM_REGION16_BE( 0x80, "eeprom", 0 ) ROM_LOAD16_WORD( "eeprom-galastrm.bin", 0x0000, 0x0080, CRC(94efa7a6) SHA1(5870b988cb364065e8bd779efbdadca8d3ffc17c) ) ROM_END diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c index cf361de28d0..bd575663b96 100644 --- a/src/mame/drivers/gladiatr.c +++ b/src/mame/drivers/gladiatr.c @@ -402,7 +402,7 @@ static ADDRESS_MAP_START( ppking_cpu3_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( ppking_cpu1_io, ADDRESS_SPACE_IO, 8 ) -// ADDRESS_MAP_GLOBAL_MASK(0xff) +// ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0xc000, 0xc000) AM_WRITE(gladiatr_spritebuffer_w) AM_RANGE(0xc004, 0xc004) AM_NOP // WRITE(ppking_irq_patch_w) AM_RANGE(0xc09e, 0xc09f) AM_READ(qx0_r) AM_WRITE(qx0_w) @@ -446,7 +446,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( gladiatr_cpu1_io, ADDRESS_SPACE_IO, 8 ) -// ADDRESS_MAP_GLOBAL_MASK(0xff) +// ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0xc000, 0xc000) AM_WRITE(gladiatr_spritebuffer_w) AM_RANGE(0xc001, 0xc001) AM_WRITE(gladiatr_spritebank_w) AM_RANGE(0xc002, 0xc002) AM_WRITE(gladiatr_bankswitch_w) diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index de1d676c001..bb22f3e011e 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -709,7 +709,7 @@ static void sound_irq_callback( running_machine *machine, int irq ) timer_set(machine, ATTOTIME_IN_USEC(1), NULL, line, irq_off); } -static const k056800_interface gticlub_k056800_interface = +static const k056800_interface gticlub_k056800_interface = { sound_irq_callback }; @@ -733,25 +733,25 @@ static int adc1038_input_callback( const device_config *device, int input ) return value; } -static const adc1038_interface gticlub_adc1038_intf = +static const adc1038_interface gticlub_adc1038_intf = { 1, adc1038_input_callback }; -static const adc1038_interface thunderh_adc1038_intf = +static const adc1038_interface thunderh_adc1038_intf = { 0, adc1038_input_callback }; -static const k056230_interface gticlub_k056230_intf = +static const k056230_interface gticlub_k056230_intf = { "maincpu", 0 }; -static const k056230_interface thunderh_k056230_intf = +static const k056230_interface thunderh_k056230_intf = { "maincpu", 1 @@ -780,7 +780,7 @@ static MACHINE_DRIVER_START( gticlub ) MDRV_QUANTUM_TIME(HZ(6000)) MDRV_EEPROM_ADD("eeprom", eeprom_intf) - + MDRV_MACHINE_START(gticlub) MDRV_MACHINE_RESET(gticlub) @@ -829,12 +829,12 @@ static MACHINE_DRIVER_START( slrasslt ) MACHINE_DRIVER_END -static const k033906_interface hangplt_k033906_intf_0 = +static const k033906_interface hangplt_k033906_intf_0 = { "voodoo0" }; -static const k033906_interface hangplt_k033906_intf_1 = +static const k033906_interface hangplt_k033906_intf_1 = { "voodoo1" }; diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c index 40312cc3cac..1c72a7fa313 100644 --- a/src/mame/drivers/harddriv.c +++ b/src/mame/drivers/harddriv.c @@ -3379,16 +3379,16 @@ ROM_END 5/2/2003 -The following roms (type 27C512) were dumped and verified from an Atari Race Drivin -Panorama v2.1 boardset by Mickey Johnson (mickster (at) derbyworks.com) and Dave France +The following roms (type 27C512) were dumped and verified from an Atari Race Drivin +Panorama v2.1 boardset by Mickey Johnson (mickster (at) derbyworks.com) and Dave France (dfrance (at) revealed.net). Any questions regarding the hardware, please contact Mickey. The Multisync PCB (A046901), used by the side monitor, uses the 137412-117 slapstic. -The boardset is low rez, and is more similar to STUN Runner than the regular Race +The boardset is low rez, and is more similar to STUN Runner than the regular Race Drivin's hardware. -The Multisync PCB (A045988), used by the main (center) monitor, uses the 137412-115 -slapstic. +The Multisync PCB (A045988), used by the main (center) monitor, uses the 137412-115 +slapstic. The ADSP board was silkscreened "ADSP II A047046-01", but had a factory sticker stamped "ADSP II Panorama A047046-04". @@ -3401,48 +3401,48 @@ have brought these ROMs up in MAME as Race Drivin. It will pass the self-test, game will come up with "DIVIDE BY ZERO ERR". Hitting F2 (Self Test) will display "Hard Drivin / Race Drivin / Panorama Self Test P2.1" in the Test Menu. -Filename Location Label Board --------------- -------------- ---------------------- ----------------------------- -088-1022 9H 136088-1022 CS 0022 ADSP II A047046-01 -088-1018 9/10H 136088-1018 CS 6518 " -088-1020 10H 136088-1020 CS BC20 " -088-1021 9K 136088-1021 CS A121 " -088-1017 9/10K 136088-1017 CS 4B17 " -088-1019 10K 136088-1019 CS 6219 " - -088-2015 210Y 136088-2015 CS DF15 Multisync PCB A046901 -088-2013 210X 136088-2013 CS DA13 " -088-2011 210W 136088-2011 CS 6E11 " -088-2009 210V 136088-2009 CS 1F09 " -088-2007 210U 136088-2007 CS 2F07 " -088-2005 210T 136088-2005C CS D305 " -088-2003 210S 136088-2003C CS 2303 " -088-2001 210R 136088-2001 CS DE01 " -088-2016 200Y 136088-2016 CS 0D16 " -088-2014 200X 136088-2014 CS EB14 " -088-2012 200W 136088-2012 CS 2912 " -088-2010 200V 136088-2010 CS FF10 " -088-2008 200U 136088-2008 CS BA08 " -088-2006 200T 136088-2006C CS D406 " -088-2004 200S 136088-2004C CS 4504 " -088-2002 200R 136088-2002 CS A502 " - -088-1015 210Y 136088-1015 CS E215 Multisync PCB A045988 -088-1013 210X 136088-1013 CS 8F13 " -088-1011 210W 136088-1011 CS 5111 " -088-1009 210V 136088-1009 CS EE09 " -088-1007 210U 136088-1007 CS 4D07 " -088-1005 210T 136088-1005B CS 3905 " -088-1003 210S 136088-1003B CS 7403 " -088-1001 210R 136088-1001 CS 6701 " -088-1016 200Y 136088-1016 CS 3C16 " -088-1014 200X 136088-1014 CS 9C14 " -088-1012 200W 136088-1012 CS C312 " -088-1010 200V 136088-1010 CS 9410 " -088-1008 200U 136088-1008 CS 3408 " -088-1006 200T 136088-1006B CS A006 " -088-1004 200S 136088-1004B CS A904 " -088-1002 200R 136088-1002 CS FB02 " +Filename Location Label Board +-------------- -------------- ---------------------- ----------------------------- +088-1022 9H 136088-1022 CS 0022 ADSP II A047046-01 +088-1018 9/10H 136088-1018 CS 6518 " +088-1020 10H 136088-1020 CS BC20 " +088-1021 9K 136088-1021 CS A121 " +088-1017 9/10K 136088-1017 CS 4B17 " +088-1019 10K 136088-1019 CS 6219 " + +088-2015 210Y 136088-2015 CS DF15 Multisync PCB A046901 +088-2013 210X 136088-2013 CS DA13 " +088-2011 210W 136088-2011 CS 6E11 " +088-2009 210V 136088-2009 CS 1F09 " +088-2007 210U 136088-2007 CS 2F07 " +088-2005 210T 136088-2005C CS D305 " +088-2003 210S 136088-2003C CS 2303 " +088-2001 210R 136088-2001 CS DE01 " +088-2016 200Y 136088-2016 CS 0D16 " +088-2014 200X 136088-2014 CS EB14 " +088-2012 200W 136088-2012 CS 2912 " +088-2010 200V 136088-2010 CS FF10 " +088-2008 200U 136088-2008 CS BA08 " +088-2006 200T 136088-2006C CS D406 " +088-2004 200S 136088-2004C CS 4504 " +088-2002 200R 136088-2002 CS A502 " + +088-1015 210Y 136088-1015 CS E215 Multisync PCB A045988 +088-1013 210X 136088-1013 CS 8F13 " +088-1011 210W 136088-1011 CS 5111 " +088-1009 210V 136088-1009 CS EE09 " +088-1007 210U 136088-1007 CS 4D07 " +088-1005 210T 136088-1005B CS 3905 " +088-1003 210S 136088-1003B CS 7403 " +088-1001 210R 136088-1001 CS 6701 " +088-1016 200Y 136088-1016 CS 3C16 " +088-1014 200X 136088-1014 CS 9C14 " +088-1012 200W 136088-1012 CS C312 " +088-1010 200V 136088-1010 CS 9410 " +088-1008 200U 136088-1008 CS 3408 " +088-1006 200T 136088-1006B CS A006 " +088-1004 200S 136088-1004B CS A904 " +088-1002 200R 136088-1002 CS FB02 " */ diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index 2248ff61e5e..551dc5b890e 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -1101,12 +1101,12 @@ static const k056800_interface hornet_k056800_interface = sound_irq_callback }; -static const k033906_interface hornet_k033906_intf_0 = +static const k033906_interface hornet_k033906_intf_0 = { "voodoo0" }; -static const k033906_interface hornet_k033906_intf_1 = +static const k033906_interface hornet_k033906_intf_1 = { "voodoo1" }; diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c index 58a4ced67fb..bf76cbb201b 100644 --- a/src/mame/drivers/konamigv.c +++ b/src/mame/drivers/konamigv.c @@ -335,7 +335,7 @@ static MACHINE_DRIVER_START( konamigv ) MDRV_MACHINE_START( konamigv ) MDRV_MACHINE_RESET( konamigv ) - + MDRV_EEPROM_93C46_ADD("eeprom") /* video hardware */ diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c index ed9969551a0..112a58274c8 100644 --- a/src/mame/drivers/leland.c +++ b/src/mame/drivers/leland.c @@ -746,7 +746,7 @@ static MACHINE_DRIVER_START( leland ) MDRV_MACHINE_START(leland) MDRV_MACHINE_RESET(leland) MDRV_NVRAM_HANDLER(leland) - + MDRV_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ diff --git a/src/mame/drivers/metalmx.c b/src/mame/drivers/metalmx.c index 9ccfd02050b..c9013627fbd 100644 --- a/src/mame/drivers/metalmx.c +++ b/src/mame/drivers/metalmx.c @@ -271,12 +271,12 @@ MACHINE_DRIVER_END ROM_START( metalmx ) /* ---------------------------------------- - Layer 1 (there are 2 of these boards) + Layer 1 (there are 2 of these boards) ---------------------------------------- */ ROM_REGION( 0x80000, "boot", 0 ) ROM_LOAD( "bootmetl.r34", 0x00000, 0x80000, CRC(ec799644) SHA1(32c77abb70fee1da8e3d7141bce2032e73e0eb35) ) - + ROM_REGION( 0x80000, "data", 0 ) ROM_LOAD( "datametl.0", 0x00000, 0x80000, CRC(004dc445) SHA1(e52e539cc38afa917d1c769f9ad1794f4bd833b2) ) ROM_LOAD( "datametl.1", 0x00000, 0x80000, CRC(e0465fc5) SHA1(cd8584e48b6cf33bc103cdfdb68d32eef3f2bec5) ) @@ -297,9 +297,9 @@ ROM_START( metalmx ) ROM_REGION( 0x80000, "palslayer1", 0 ) ROM_LOAD( "103-1500.bin", 0x000, 0x117, CRC(9883af90) SHA1(62b4a0cce5832628149c48e6810055ad3919cc5b) ) - + /* ---------------------------------------- - Layer 2 (there are 2 of these boards) + Layer 2 (there are 2 of these boards) ---------------------------------------- */ ROM_REGION( 0x80000, "palslayer2", 0 ) @@ -308,7 +308,7 @@ ROM_START( metalmx ) ROM_LOAD( "xdec.bin", 0x000, 0x117, CRC(fcb37143) SHA1(c95a6714f151868d42722684c8b67e9356f70544) ) /* ---------------------------------------- - Layer 3 (there are 2 of these boards) + Layer 3 (there are 2 of these boards) ---------------------------------------- */ ROM_REGION( 0x200000, "maincpu", 0 ) /* 68020 code */ @@ -330,9 +330,9 @@ ROM_START( metalmx ) ROM_LOAD( "103-1300.bin", 0x000, 0x157, CRC(eec18a29) SHA1(cc41cc921f59d385df805217f3b09bc289379f79) ) /* ---------------------------- - Layer 4 + Layer 4 ---------------------------- */ - + ROM_REGION( 0x80000, "palslayer4", 0 ) ROM_LOAD( "103-1200.bin", 0x000, 0x2e5, CRC(cf1d4df4) SHA1(2ae592df2f16af070620766b7ebf60918c7f725d) ) ROM_LOAD( "103-1202.bin", 0x000, 0x2e5, CRC(dab3b17f) SHA1(ac825063a293a32ae6ba5cbf5cfb52aa4aea62c9) ) @@ -341,9 +341,9 @@ ROM_START( metalmx ) ROM_LOAD( "103-1219.bin", 0x000, 0x117, CRC(bf08d1e8) SHA1(5710cbc941830594087320ed2b22bcbb2b5c48de) ) /* ---------------------------- - Layer 5 + Layer 5 ---------------------------- */ - + ROM_REGION( 0x100000, "tex", 0 ) ROM_LOAD16_BYTE( "tex0h.bin", 0x00001, 0x80000, CRC(b4dc459e) SHA1(cd2c6616951bdedeb5bb0c81179b4eee42ed5148) ) ROM_LOAD16_BYTE( "tex0l.bin", 0x00000, 0x80000, CRC(370f9dca) SHA1(e26633f0f78f821fc59d8070ad927507f33d04d2) ) diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index f71999322cc..0b87b940d3f 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -5317,7 +5317,7 @@ ROM_START( dokyusp ) ROM_REGION( 0x200000, "oki", 0 ) /* Samples */ ROM_LOAD( "7.bin", 0x000000, 0x200000, CRC(763985e1) SHA1(395d925b79922de5060a3f59de99fbcc9bd40fad) ) - + ROM_REGION16_BE( 0x80, "eeprom", 0 ) ROM_LOAD16_WORD( "eeprom-dokyusp.bin", 0x0000, 0x0080, CRC(cf159485) SHA1(f8e9c89e1b7c8bcd77ae5f55e334f79285f602a8) ) ROM_END diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c index 73f09bbbebb..13fe7cb3d59 100644 --- a/src/mame/drivers/mitchell.c +++ b/src/mame/drivers/mitchell.c @@ -1111,7 +1111,7 @@ static MACHINE_DRIVER_START( mgakuen ) MDRV_MACHINE_START(mitchell) MDRV_MACHINE_RESET(mitchell) - + MDRV_EEPROM_ADD("eeprom", eeprom_intf) /* video hardware */ @@ -1732,7 +1732,7 @@ ROM_START( spang ) ROM_REGION( 0x80000, "oki", 0 ) /* OKIM */ ROM_LOAD( "spe_01.rom", 0x00000, 0x20000, CRC(2d19c133) SHA1(b3ec226f35494dfc259e910895cec8a49dd2f846) ) - + ROM_REGION16_BE( 0x80, "eeprom", 0 ) ROM_LOAD( "eeprom-spang.bin", 0x0000, 0x0080, CRC(deae1291) SHA1(f62f2ad99852903f1cea3f8c1f69fc11e4e7b48b) ) ROM_END @@ -1820,7 +1820,7 @@ ROM_START( spangj ) ROM_REGION( 0x80000, "oki", 0 ) /* OKIM */ ROM_LOAD( "01.d1", 0x00000, 0x20000, CRC(b96ea126) SHA1(83fa71994518d40b8938520faa8701c63b7f579e) ) // spj01_1d.bin - + ROM_REGION16_BE( 0x80, "eeprom", 0 ) ROM_LOAD( "eeprom-spangj.bin", 0x0000, 0x0080, CRC(237c00eb) SHA1(35a7fe793186e148c163adb04433b6a55ee21502) ) ROM_END @@ -1845,7 +1845,7 @@ ROM_START( sbbros ) ROM_REGION( 0x80000, "oki", 0 ) /* OKIM */ ROM_LOAD( "01.d1", 0x00000, 0x20000, CRC(b96ea126) SHA1(83fa71994518d40b8938520faa8701c63b7f579e) ) - + ROM_REGION16_BE( 0x80, "eeprom", 0 ) ROM_LOAD( "eeprom-sbbros.bin", 0x0000, 0x0080, CRC(ed69d3cd) SHA1(89eb0ca65ffe30f5cbe6427f767f1f0870c8a990) ) ROM_END diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c index ab45b6dbf21..4e0c2be4078 100644 --- a/src/mame/drivers/model2.c +++ b/src/mame/drivers/model2.c @@ -1841,7 +1841,7 @@ static MACHINE_DRIVER_START( model2o ) MDRV_CPU_PROGRAM_MAP(copro_tgp_map) MDRV_MACHINE_RESET(model2o) - + MDRV_EEPROM_93C46_ADD("eeprom") MDRV_NVRAM_HANDLER( model2 ) diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c index 34103da0641..cc98da894eb 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -4720,7 +4720,7 @@ static MACHINE_DRIVER_START( model3_10 ) MDRV_MACHINE_START(model3_10) MDRV_MACHINE_RESET(model3_10) - + MDRV_EEPROM_ADD("eeprom", eeprom_intf) MDRV_NVRAM_HANDLER(model3) diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index e8b5c0ce836..603b60a2680 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -1796,7 +1796,7 @@ static MACHINE_DRIVER_START( naomi_base ) MDRV_EEPROM_93C46_ADD("main_eeprom") MDRV_EEPROM_DEFAULT_VALUE(0) - + MDRV_NVRAM_HANDLER(naomi_eeproms) /* video hardware */ @@ -1855,7 +1855,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( aw ) MDRV_IMPORT_FROM(naomi_base) -// MDRV_DEVICE_REMOVE("main_eeprom") +// MDRV_DEVICE_REMOVE("main_eeprom") MDRV_CPU_MODIFY("maincpu") MDRV_CPU_PROGRAM_MAP(aw_map) MDRV_NVRAM_HANDLER(aw_nvram) @@ -2075,7 +2075,7 @@ Region byte encoding is as follows: ROM_SYSTEM_BIOS( 0, "bios0", "Atomiswave BIOS" ) \ ROM_LOAD16_WORD_SWAP_BIOS( 0, "bios.ic23_l", 0x000000, 0x010000, BAD_DUMP CRC(e5693ce3) SHA1(1bde3ed87af64b0f675ebd47f12a53e1fc5709c1) ) /* Might be bad.. especially. bytes 0x0000, 0x6000, 0x8000 which gave different reads */ -/* default EEPROM values, same works for all games */ +/* default EEPROM values, same works for all games */ #define NAOMI_DEFAULT_EEPROM \ ROM_REGION16_BE( 0x80, "main_eeprom", 0 ) \ ROM_LOAD16_WORD("eeprom-naomi-main-default.bin", 0x0000, 0x0080, CRC(fea29cbb) SHA1(4099f1747aafa07db34f6e072cd9bfaa83bae10e) ) diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c index a1fa68fed54..d24cb408cfd 100644 --- a/src/mame/drivers/ninjaw.c +++ b/src/mame/drivers/ninjaw.c @@ -684,7 +684,7 @@ Darius2: arbitrary interleaving of 10 to keep cpus synced. static const tc0220ioc_interface ninjaw_io_intf = { - DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), + DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), DEVCB_INPUT_PORT("IN0"), DEVCB_INPUT_PORT("IN1"), DEVCB_INPUT_PORT("IN2") /* port read handlers */ }; diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 4abfb9df4e3..5955802d5f0 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -1043,7 +1043,7 @@ static const k056800_interface nwktr_k056800_interface = sound_irq_callback }; -static const k033906_interface nwktr_k033906_interface = +static const k033906_interface nwktr_k033906_interface = { "voodoo" }; diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c index 6a35415720d..73fa195bc1e 100644 --- a/src/mame/drivers/othunder.c +++ b/src/mame/drivers/othunder.c @@ -665,7 +665,7 @@ static const ym2610_interface ym2610_config = static const tc0220ioc_interface othunder_io_intf = { - DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), + DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), DEVCB_INPUT_PORT("IN0"), DEVCB_INPUT_PORT("IN1"), DEVCB_INPUT_PORT("IN2") /* port read handlers */ }; diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c index e5373999074..f23d33d80f8 100644 --- a/src/mame/drivers/pirates.c +++ b/src/mame/drivers/pirates.c @@ -120,7 +120,7 @@ static WRITE16_HANDLER( pirates_out_w ) if (ACCESSING_BITS_0_7) { const device_config *eeprom = devtag_get_device(space->machine, "eeprom"); - + /* bits 0-2 control EEPROM */ eeprom_write_bit(eeprom, data & 0x04); eeprom_set_cs_line(eeprom, (data & 0x01) ? CLEAR_LINE : ASSERT_LINE); diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c index ddf068efa63..df27f8a77e6 100644 --- a/src/mame/drivers/playmark.c +++ b/src/mame/drivers/playmark.c @@ -89,7 +89,7 @@ static WRITE16_HANDLER( wbeachvl_coin_eeprom_w ) if (ACCESSING_BITS_0_7) { const device_config *eeprom = devtag_get_device(space->machine, "eeprom"); - + /* bits 0-3 are coin counters? (only 0 used?) */ coin_counter_w(space->machine, 0,data & 0x01); coin_counter_w(space->machine, 1,data & 0x02); diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c index 1f094f6d189..4a082c9e12a 100644 --- a/src/mame/drivers/segas32.c +++ b/src/mame/drivers/segas32.c @@ -2165,7 +2165,7 @@ static MACHINE_DRIVER_START( system32 ) MDRV_CPU_IO_MAP(system32_sound_portmap) MDRV_MACHINE_RESET(system32) - + MDRV_EEPROM_93C46_ADD("eeprom") MDRV_TIMER_ADD("v60_irq0", signal_v60_irq_callback) @@ -2223,7 +2223,7 @@ static MACHINE_DRIVER_START( multi32 ) MDRV_CPU_IO_MAP(multi32_sound_portmap) MDRV_MACHINE_RESET(system32) - + MDRV_EEPROM_93C46_ADD("eeprom") MDRV_TIMER_ADD("v60_irq0", signal_v60_irq_callback) diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index ad2afaca494..024a1da3e64 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -1932,7 +1932,7 @@ static MACHINE_DRIVER_START( sxx2f ) /* Intel i386DX @ 25MHz, YMF271 @ 16.9344MH MDRV_MACHINE_START(sxx2f) MDRV_MACHINE_RESET(sxx2f) - + MDRV_NVRAM_HANDLER(0) MDRV_EEPROM_ADD("eeprom", eeprom_intf) diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c index 59363939b66..e3dcf2357a8 100644 --- a/src/mame/drivers/slapshot.c +++ b/src/mame/drivers/slapshot.c @@ -497,7 +497,7 @@ static const ym2610_interface ym2610_config = static const tc0640fio_interface slapshot_io_intf = { - DEVCB_NULL, DEVCB_INPUT_PORT("COINS"), + DEVCB_NULL, DEVCB_INPUT_PORT("COINS"), DEVCB_INPUT_PORT("BUTTONS"), DEVCB_INPUT_PORT("SYSTEM"), DEVCB_INPUT_PORT("JOY") /* port read handlers */ }; diff --git a/src/mame/drivers/stlforce.c b/src/mame/drivers/stlforce.c index 919a2a4e74a..a94187391b2 100644 --- a/src/mame/drivers/stlforce.c +++ b/src/mame/drivers/stlforce.c @@ -252,7 +252,7 @@ ROM_START( stlforce ) /* only one bank */ ROM_REGION( 0x80000, "oki", 0 ) /* samples */ ROM_LOAD( "stlforce.u1", 0x00000, 0x80000, CRC(0a55edf1) SHA1(091f12e8110c62df22b370a2e710c930ba06e8ca) ) - + ROM_REGION16_BE( 0x80, "eeprom", 0 ) ROM_LOAD( "eeprom-stlforce.bin", 0x0000, 0x0080, CRC(3fb83951) SHA1(0cbf09751e46f100db847cf0594a4440126a7b6e) ) ROM_END @@ -328,7 +328,7 @@ ROM_START( twinbrat ) ROM_COPY( "user1", 0x040000, 0x0a0000, 0x020000) ROM_COPY( "user1", 0x000000, 0x0c0000, 0x020000) ROM_COPY( "user1", 0x060000, 0x0e0000, 0x020000) - + ROM_REGION16_BE( 0x80, "eeprom", 0 ) ROM_LOAD( "eeprom-twinbrat.bin", 0x0000, 0x0080, CRC(9366263d) SHA1(ff5155498ed0b349ecc1ce98a39566b642201cf2) ) ROM_END @@ -364,7 +364,7 @@ ROM_START( twinbrata ) ROM_COPY( "user1", 0x040000, 0x0a0000, 0x020000) ROM_COPY( "user1", 0x000000, 0x0c0000, 0x020000) ROM_COPY( "user1", 0x060000, 0x0e0000, 0x020000) - + ROM_REGION16_BE( 0x80, "eeprom", 0 ) ROM_LOAD( "eeprom-twinbrat.bin", 0x0000, 0x0080, CRC(9366263d) SHA1(ff5155498ed0b349ecc1ce98a39566b642201cf2) ) ROM_END diff --git a/src/mame/drivers/stv.c b/src/mame/drivers/stv.c index 04cd58e640c..4d56acb4a56 100644 --- a/src/mame/drivers/stv.c +++ b/src/mame/drivers/stv.c @@ -2743,7 +2743,7 @@ static MACHINE_DRIVER_START( stv ) MDRV_MACHINE_START(stv) MDRV_MACHINE_RESET(stv) - + MDRV_EEPROM_93C46_ADD("eeprom") /* Actually 93c45 */ MDRV_TIMER_ADD("scan_timer", hblank_in_irq) diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c index a9d39db2fed..6ab804b67a0 100644 --- a/src/mame/drivers/suna8.c +++ b/src/mame/drivers/suna8.c @@ -878,14 +878,14 @@ static WRITE8_HANDLER( suna8_wram_w ) static WRITE8_HANDLER( sparkman_flipscreen_w ) { flip_screen_set(space->machine, data & 0x01); - //if (data & ~0x01) logerror("CPU #0 - PC %04X: unknown flipscreen bits: %02X\n",cpu_get_pc(space->cpu),data); + //if (data & ~0x01) logerror("CPU #0 - PC %04X: unknown flipscreen bits: %02X\n",cpu_get_pc(space->cpu),data); } static WRITE8_HANDLER( sparkman_leds_w ) { set_led_status(space->machine, 0, data & 0x01); set_led_status(space->machine, 1, data & 0x02); - //if (data & ~0x03) logerror("CPU#0 - PC %06X: unknown leds bits: %02X\n",cpu_get_pc(space->cpu),data); + //if (data & ~0x03) logerror("CPU#0 - PC %06X: unknown leds bits: %02X\n",cpu_get_pc(space->cpu),data); } static WRITE8_HANDLER( sparkman_coin_counter_w ) @@ -904,7 +904,7 @@ static WRITE8_HANDLER( sparkman_spritebank_w ) suna8_spritebank = 0; else suna8_spritebank = (data) & 1; - //if (data & ~0x02) logerror("CPU #0 - PC %04X: unknown spritebank bits: %02X\n",cpu_get_pc(space->cpu),data); + //if (data & ~0x02) logerror("CPU #0 - PC %04X: unknown spritebank bits: %02X\n",cpu_get_pc(space->cpu),data); } /* @@ -915,7 +915,7 @@ static WRITE8_HANDLER( sparkman_rombank_w ) { int bank = data & 0x0f; - //if (data & ~0x0f) logerror("CPU #0 - PC %04X: unknown rom bank bits: %02X\n",cpu_get_pc(space->cpu),data); + //if (data & ~0x0f) logerror("CPU #0 - PC %04X: unknown rom bank bits: %02X\n",cpu_get_pc(space->cpu),data); memory_set_bank(space->machine, "bank1", bank); suna8_rombank = data; diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index 746b58c2de1..e7e63e2ba78 100644 --- a/src/mame/drivers/taito_b.c +++ b/src/mame/drivers/taito_b.c @@ -2122,19 +2122,19 @@ static const mb87078_interface taitob_mb87078_intf = static const tc0220ioc_interface taitob_io_intf = { - DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), + DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), DEVCB_INPUT_PORT("IN0"), DEVCB_INPUT_PORT("IN1"), DEVCB_INPUT_PORT("IN2") /* port read handlers */ }; static const tc0640fio_interface pbobble_io_intf = { - DEVCB_INPUT_PORT("SERVICE"), DEVCB_INPUT_PORT("COIN"), + DEVCB_INPUT_PORT("SERVICE"), DEVCB_INPUT_PORT("COIN"), DEVCB_INPUT_PORT("START"), DEVCB_INPUT_PORT("P1_P2_A"), DEVCB_INPUT_PORT("P1_P2_B") /* port read handlers */ }; static const tc0510nio_interface sbm_io_intf = { - DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), + DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), DEVCB_INPUT_PORT("JOY"), DEVCB_INPUT_PORT("START"), DEVCB_INPUT_PORT("PHOTOSENSOR") /* port read handlers */ }; diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index a035fd5ce4a..046a4813f19 100644 --- a/src/mame/drivers/taito_f2.c +++ b/src/mame/drivers/taito_f2.c @@ -3164,13 +3164,13 @@ static const ym2203_interface ym2203_config = static const tc0220ioc_interface taitof2_io220_intf = { - DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), + DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), DEVCB_INPUT_PORT("IN0"), DEVCB_INPUT_PORT("IN1"), DEVCB_INPUT_PORT("IN2") /* port read handlers */ }; static const tc0510nio_interface taitof2_io510_intf = { - DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), + DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), DEVCB_INPUT_PORT("IN0"), DEVCB_INPUT_PORT("IN1"), DEVCB_INPUT_PORT("IN2") /* port read handlers */ }; diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c index 682cec7a596..559b085f818 100644 --- a/src/mame/drivers/taito_h.c +++ b/src/mame/drivers/taito_h.c @@ -548,7 +548,7 @@ static MACHINE_START( taitoh ) static const tc0220ioc_interface taitoh_io_intf = { - DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), + DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), DEVCB_INPUT_PORT("IN0"), DEVCB_INPUT_PORT("IN1"), DEVCB_INPUT_PORT("IN2") /* port read handlers */ }; diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index c339167d1b5..f778b87eb11 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -2876,13 +2876,13 @@ Contcirc road glitchiness in attract? static const tc0220ioc_interface taitoz_io220_intf = { - DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), + DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), DEVCB_INPUT_PORT("IN0"), DEVCB_INPUT_PORT("IN1"), DEVCB_INPUT_PORT("IN2") /* port read handlers */ }; static const tc0510nio_interface taitoz_io510_intf = { - DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), + DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), DEVCB_INPUT_PORT("IN0"), DEVCB_INPUT_PORT("IN1"), DEVCB_INPUT_PORT("IN2") /* port read handlers */ }; diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c index 223c8a95877..df6dfd0f7a2 100644 --- a/src/mame/drivers/taitoair.c +++ b/src/mame/drivers/taitoair.c @@ -598,7 +598,7 @@ static const ym2610_interface airsys_ym2610_interface = static const tc0220ioc_interface airsys_io_intf = { - DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), + DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), DEVCB_INPUT_PORT("IN0"), DEVCB_INPUT_PORT("IN1"), DEVCB_INPUT_PORT("IN2") /* port read handlers */ }; diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c index 36627d6d721..98073ec3fbd 100644 --- a/src/mame/drivers/topspeed.c +++ b/src/mame/drivers/topspeed.c @@ -672,7 +672,7 @@ static MACHINE_RESET( topspeed ) static const tc0220ioc_interface topspeed_io_intf = { - DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), + DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), DEVCB_INPUT_PORT("IN0"), DEVCB_INPUT_PORT("IN1"), DEVCB_INPUT_PORT("IN2") /* port read handlers */ }; diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index fb95ca2fb48..35df736cb85 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -909,7 +909,7 @@ ROM_START( suplup ) /* version 4.0 / 990518 - also has 'Puzzle Bang Bang' title ROM_REGION( 0x40000, "oki", 0 ) /* Oki Samples */ ROM_LOAD( "vrom1.bin", 0x00000, 0x40000, CRC(34a56987) SHA1(4d8983648a7f0acf43ff4c9c8aa6c8640ee2bbfe) ) - + ROM_REGION16_BE( 0x80, "eeprom", 0 ) /* Default EEPROM */ ROM_LOAD( "eeprom-suplup.bin", 0x0000, 0x0080, CRC(e60c9883) SHA1(662dd8fb85eb97a8a4d53886198b269a5f6a6268) ) ROM_END @@ -1255,7 +1255,7 @@ ROM_START( misncrft ) ROM_REGION( 0x80000, "wavetable", 0 ) ROM_LOAD( "qs1001a.u17", 0x00000, 0x80000, CRC(d13c6407) SHA1(57b14f97c7d4f9b5d9745d3571a0b7115fbe3176) ) - + ROM_REGION16_BE( 0x80, "eeprom", 0 ) ROM_LOAD( "eeprom-misncrft.bin", 0x0000, 0x0080, CRC(9ad27077) SHA1(7f0e98eff9cf6e1b60c19fc1016b888e50b087e0) ) ROM_END diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c index ff19af69c46..a91a532512f 100644 --- a/src/mame/drivers/warriorb.c +++ b/src/mame/drivers/warriorb.c @@ -447,13 +447,13 @@ static DEVICE_GET_INFO( subwoofer ) static const tc0220ioc_interface darius2d_io_intf = { - DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), + DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), DEVCB_INPUT_PORT("IN0"), DEVCB_INPUT_PORT("IN1"), DEVCB_INPUT_PORT("IN2") /* port read handlers */ }; static const tc0510nio_interface warriorb_io_intf = { - DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), + DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), DEVCB_INPUT_PORT("IN0"), DEVCB_INPUT_PORT("IN1"), DEVCB_INPUT_PORT("IN2") /* port read handlers */ }; diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c index 96865c2a34f..90837207321 100644 --- a/src/mame/drivers/wgp.c +++ b/src/mame/drivers/wgp.c @@ -953,7 +953,7 @@ static MACHINE_START( wgp ) static const tc0220ioc_interface wgp_io_intf = { - DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), + DEVCB_INPUT_PORT("DSWA"), DEVCB_INPUT_PORT("DSWB"), DEVCB_INPUT_PORT("IN0"), DEVCB_INPUT_PORT("IN1"), DEVCB_INPUT_PORT("IN2") /* port read handlers */ }; diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index 0b70453c75a..945dcabd989 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -685,7 +685,7 @@ static void sound_irq_callback( running_machine *machine, int irq ) timer_set(machine, ATTOTIME_IN_USEC(1), NULL, line, irq_off); } -static const k056800_interface zr107_k056800_interface = +static const k056800_interface zr107_k056800_interface = { sound_irq_callback }; @@ -699,7 +699,7 @@ static const k056832_interface zr107_k056832_intf = game_tile_callback, "none" }; -static const k056230_interface zr107_k056230_intf = +static const k056230_interface zr107_k056230_intf = { "maincpu", 0 diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c index 52bfc86d17e..33b7e2b4b36 100644 --- a/src/mame/machine/leland.c +++ b/src/mame/machine/leland.c @@ -680,33 +680,33 @@ void leland_init_eeprom(running_machine *machine, UINT8 default_val, const UINT1 UINT8 xorval = (serial_type == SERIAL_TYPE_ADD_XOR || serial_type == SERIAL_TYPE_ENCRYPT_XOR) ? 0xff : 0x00; UINT8 eeprom_data[64*2]; UINT32 serial; - + /* - NOTE: This code is just illustrative, and explains how to generate the - serial numbers for the classic Leland games. We currently load default - EEPROM data from the ROMs rather than generating it. - - Here are the input parameters for various games: - - game default_val serial_offset serial_type - cerberus 0x00 0 SERIAL_TYPE_NONE - mayhem 0x00 0x28 SERIAL_TYPE_ADD - powrplay 0xff 0x2d SERIAL_TYPE_ADD_XOR - wseries 0xff 0x12 SERIAL_TYPE_ENCRYPT_XOR - alleymas 0xff 0x0c SERIAL_TYPE_ENCRYPT_XOR - upyoural 0xff 0x0c SERIAL_TYPE_ENCRYPT_XOR - dangerz 0xff 0x10 SERIAL_TYPE_ENCRYPT_XOR - basebal2 0xff 0x12 SERIAL_TYPE_ENCRYPT_XOR - dblplay 0xff 0x11 SERIAL_TYPE_ENCRYPT_XOR - strkzone 0xff 0x0f SERIAL_TYPE_ENCRYPT_XOR - redlin2p 0xff 0x18 SERIAL_TYPE_ENCRYPT_XOR - quarterb 0xff 0x24 SERIAL_TYPE_ENCRYPT_XOR - viper 0xff 0x0c SERIAL_TYPE_ENCRYPT_XOR - teamqb 0xff 0x1a SERIAL_TYPE_ENCRYPT_XOR - aafb 0xff 0x1a SERIAL_TYPE_ENCRYPT_XOR - offroad 0xff 0x00 SERIAL_TYPE_ENCRYPT_XOR - pigout 0xff 0x00 SERIAL_TYPE_ENCRYPT - */ + NOTE: This code is just illustrative, and explains how to generate the + serial numbers for the classic Leland games. We currently load default + EEPROM data from the ROMs rather than generating it. + + Here are the input parameters for various games: + + game default_val serial_offset serial_type + cerberus 0x00 0 SERIAL_TYPE_NONE + mayhem 0x00 0x28 SERIAL_TYPE_ADD + powrplay 0xff 0x2d SERIAL_TYPE_ADD_XOR + wseries 0xff 0x12 SERIAL_TYPE_ENCRYPT_XOR + alleymas 0xff 0x0c SERIAL_TYPE_ENCRYPT_XOR + upyoural 0xff 0x0c SERIAL_TYPE_ENCRYPT_XOR + dangerz 0xff 0x10 SERIAL_TYPE_ENCRYPT_XOR + basebal2 0xff 0x12 SERIAL_TYPE_ENCRYPT_XOR + dblplay 0xff 0x11 SERIAL_TYPE_ENCRYPT_XOR + strkzone 0xff 0x0f SERIAL_TYPE_ENCRYPT_XOR + redlin2p 0xff 0x18 SERIAL_TYPE_ENCRYPT_XOR + quarterb 0xff 0x24 SERIAL_TYPE_ENCRYPT_XOR + viper 0xff 0x0c SERIAL_TYPE_ENCRYPT_XOR + teamqb 0xff 0x1a SERIAL_TYPE_ENCRYPT_XOR + aafb 0xff 0x1a SERIAL_TYPE_ENCRYPT_XOR + offroad 0xff 0x00 SERIAL_TYPE_ENCRYPT_XOR + pigout 0xff 0x00 SERIAL_TYPE_ENCRYPT + */ /* initialize everything to the default value */ memset(eeprom_data, default_val, sizeof(eeprom_data)); @@ -794,11 +794,11 @@ void ataxx_init_eeprom(running_machine *machine, const UINT16 *data) UINT32 serial; /* - NOTE: This code is just illustrative, and explains how to generate the - serial numbers for the classic Leland games. We currently load default - EEPROM data from the ROMs rather than generating it. - */ - + NOTE: This code is just illustrative, and explains how to generate the + serial numbers for the classic Leland games. We currently load default + EEPROM data from the ROMs rather than generating it. + */ + /* initialize everything to the default value */ memset(eeprom_data, default_val, sizeof(eeprom_data)); @@ -1176,7 +1176,7 @@ READ8_HANDLER( leland_master_input_r ) WRITE8_HANDLER( leland_master_output_w ) { const device_config *eeprom; - + switch (offset) { case 0x09: /* /MCONT */ diff --git a/src/mame/machine/namcoio.c b/src/mame/machine/namcoio.c index 6736bebaa1b..fd18d977bf9 100644 --- a/src/mame/machine/namcoio.c +++ b/src/mame/machine/namcoio.c @@ -463,7 +463,7 @@ READ8_DEVICE_HANDLER( namcoio_r ) namcoio_state *namcoio = get_safe_token(device); offset &= 0x3f; -// LOG(("%04x: I/O read: mode %d, offset %d = %02x\n", cpu_get_pc(space->cpu), offset / 16, namcoio_ram[(offset & 0x30) + 8], offset & 0x0f, namcoio_ram[offset]&0x0f)); +// LOG(("%04x: I/O read: mode %d, offset %d = %02x\n", cpu_get_pc(space->cpu), offset / 16, namcoio_ram[(offset & 0x30) + 8], offset & 0x0f, namcoio_ram[offset]&0x0f)); return 0xf0 | namcoio->ram[offset]; } @@ -474,7 +474,7 @@ WRITE8_DEVICE_HANDLER( namcoio_w ) offset &= 0x3f; data &= 0x0f; // RAM is 4-bit wide -// LOG(("%04x: I/O write %d: offset %d = %02x\n", cpu_get_pc(space->cpu), offset / 16, offset & 0x0f, data)); +// LOG(("%04x: I/O write %d: offset %d = %02x\n", cpu_get_pc(space->cpu), offset / 16, offset & 0x0f, data)); namcoio->ram[offset] = data; } diff --git a/src/mame/machine/tait8741.c b/src/mame/machine/tait8741.c index 1810577991e..742244ca042 100644 --- a/src/mame/machine/tait8741.c +++ b/src/mame/machine/tait8741.c @@ -561,15 +561,15 @@ static void cyclemb_8741_w(const address_space *space, int num, int offset, int break; case 1: /* - status codes: - 0x06 sub NG IOX2 - 0x05 sub NG IOX1 - 0x04 sub NG CIOS - 0x03 sub NG OPN - 0x02 sub NG ROM - 0x01 sub NG RAM - 0x00 ok - */ + status codes: + 0x06 sub NG IOX2 + 0x05 sub NG IOX1 + 0x04 sub NG CIOS + 0x03 sub NG OPN + 0x02 sub NG ROM + 0x01 sub NG RAM + 0x00 ok + */ cyclemb_mcu.rxd = 0x40; cyclemb_mcu.rst = 0; break; diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c index c98e8e8d831..9d3d04996b9 100644 --- a/src/mame/video/deco32.c +++ b/src/mame/video/deco32.c @@ -1168,7 +1168,7 @@ static void tilemap_raster_draw(bitmap_t *bitmap, const rectangle *cliprect, int deco32_raster_display_list[overflow++]=deco32_pf12_control[2]; deco32_raster_display_list[overflow++]=deco32_pf12_control[3]; deco32_raster_display_list[overflow++]=deco32_pf12_control[4]; - + while (ptr<overflow) { start=end; end=deco32_raster_display_list[ptr++]; diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c index 344a98e40c9..fb3f3e7d1ca 100644 --- a/src/mame/video/hng64.c +++ b/src/mame/video/hng64.c @@ -2256,8 +2256,8 @@ void recoverPolygonBlock(running_machine* machine, const UINT16* packet, struct // uToF(threeDPointer[29]) - vertex #4 - System not capable yet // threeDPointer[30]? - //polys[*numPolys].vert[2].texCoords[0] = uToF(threeDPointer[31]); // System not capable yet - //polys[*numPolys].vert[2].texCoords[1] = uToF(threeDPointer[32]); // System not capable yet + //polys[*numPolys].vert[2].texCoords[0] = uToF(threeDPointer[31]); // System not capable yet + //polys[*numPolys].vert[2].texCoords[1] = uToF(threeDPointer[32]); // System not capable yet //polys[*numPolys].vert[2].texCoords[2] = 0.0f; //polys[*numPolys].vert[2].texCoords[3] = 1.0f; @@ -2269,14 +2269,14 @@ void recoverPolygonBlock(running_machine* machine, const UINT16* packet, struct /* There's something fishy about this guy - see 0x7a below. Very likely not fixed-length */ /* - printf("0x2e : %08x (%d/%d)\n", address[k]*3*2, l, size[k]-1); + printf("0x2e : %08x (%d/%d)\n", address[k]*3*2, l, size[k]-1); for (m = 0; m < 37; m++) printf("%04x ", threeDPointer[m]); - printf("\n"); + printf("\n"); for (m = 0; m < 37; m++) printf("%3.4f ", uToF(threeDPointer[m])); - printf("\n\n"); - */ + printf("\n\n"); + */ chunkLength = 36; break; @@ -2289,7 +2289,7 @@ void recoverPolygonBlock(running_machine* machine, const UINT16* packet, struct /* printf("0x7a : %08x (%d/%d)\n", mame_rand(machine), l, size[k]-1); for (m = 0; m < 100; m++) - printf("%04x ", threeDPointer[m]); + printf("%04x ", threeDPointer[m]); printf("\n\n"); */ chunkLength = 0; diff --git a/src/mame/video/konicdev.c b/src/mame/video/konicdev.c index 86a9548df1d..f9783bd075e 100644 --- a/src/mame/video/konicdev.c +++ b/src/mame/video/konicdev.c @@ -7668,12 +7668,12 @@ int k056832_read_register( const device_config *device, int regnum ) static STATE_POSTLOAD( k056832_postload ) { -// k056832_state *k056832 = (k056832_state *)param; +// k056832_state *k056832 = (k056832_state *)param; // still in progress... -// k056832_update_page_layout(device); -// k056832_change_rambank(device); -// k056832_change_rombank(device); +// k056832_update_page_layout(device); +// k056832_change_rambank(device); +// k056832_change_rombank(device); } /***************************************************************************** @@ -10143,7 +10143,7 @@ static const gfx_layout k001604_char_layout_layer_16x16 = }; -/* FIXME: The TILEMAP_MAPPER below depends on parameters passed by the device interface (being game dependent). +/* FIXME: The TILEMAP_MAPPER below depends on parameters passed by the device interface (being game dependent). we might simplify the code, by passing the whole TILEMAP_MAPPER as a callback in the interface, but is it really worth? */ static TILEMAP_MAPPER( k001604_scan_layer_8x8_0_size0 ) @@ -10286,7 +10286,7 @@ void k001604_draw_front_layer( const device_config *device, bitmap_t *bitmap, co READ32_DEVICE_HANDLER( k001604_tile_r ) { -// int chip = get_cgboard_id(); +// int chip = get_cgboard_id(); k001604_state *k001604 = k001604_get_safe_token(device); return k001604->tile_ram[offset]; @@ -10294,7 +10294,7 @@ READ32_DEVICE_HANDLER( k001604_tile_r ) READ32_DEVICE_HANDLER( k001604_char_r ) { -// int chip = get_cgboard_id(); +// int chip = get_cgboard_id(); k001604_state *k001604 = k001604_get_safe_token(device); int set, bank; @@ -10314,7 +10314,7 @@ READ32_DEVICE_HANDLER( k001604_char_r ) WRITE32_DEVICE_HANDLER( k001604_tile_w ) { -// int chip = get_cgboard_id(); +// int chip = get_cgboard_id(); k001604_state *k001604 = k001604_get_safe_token(device); int x, y; @@ -10367,7 +10367,7 @@ WRITE32_DEVICE_HANDLER( k001604_tile_w ) WRITE32_DEVICE_HANDLER( k001604_char_w ) { -// int chip = get_cgboard_id(); +// int chip = get_cgboard_id(); k001604_state *k001604 = k001604_get_safe_token(device); int set, bank; @@ -10390,7 +10390,7 @@ WRITE32_DEVICE_HANDLER( k001604_char_w ) WRITE32_DEVICE_HANDLER( k001604_reg_w ) { -// int chip = get_cgboard_id(); +// int chip = get_cgboard_id(); k001604_state *k001604 = k001604_get_safe_token(device); COMBINE_DATA(k001604->reg + offset); @@ -10412,7 +10412,7 @@ WRITE32_DEVICE_HANDLER( k001604_reg_w ) READ32_DEVICE_HANDLER( k001604_reg_r ) { -// int chip = get_cgboard_id(); +// int chip = get_cgboard_id(); k001604_state *k001604 = k001604_get_safe_token(device); switch (offset) @@ -10433,7 +10433,7 @@ static DEVICE_START( k001604 ) { k001604_state *k001604 = k001604_get_safe_token(device); const k001604_interface *intf = k001604_get_interface(device); - int roz_tile_size; + int roz_tile_size; k001604->layer_size = intf->layer_size; // 0 -> width = 128 tiles, 1 -> width = 256 tiles k001604->roz_size = intf->roz_size; // 0 -> 8x8, 1 -> 16x16 @@ -10613,7 +10613,7 @@ static void update_palette_color( const device_config *device, UINT32 palette_ba READ32_DEVICE_HANDLER( k037122_sram_r ) { -// int chip = get_cgboard_id(); +// int chip = get_cgboard_id(); k037122_state *k037122 = k037122_get_safe_token(device); return k037122->tile_ram[offset]; @@ -10621,7 +10621,7 @@ READ32_DEVICE_HANDLER( k037122_sram_r ) WRITE32_DEVICE_HANDLER( k037122_sram_w ) { -// int chip = get_cgboard_id(); +// int chip = get_cgboard_id(); k037122_state *k037122 = k037122_get_safe_token(device); COMBINE_DATA(k037122->tile_ram + offset); @@ -10661,7 +10661,7 @@ WRITE32_DEVICE_HANDLER( k037122_sram_w ) READ32_DEVICE_HANDLER( k037122_char_r ) { -// int chip = get_cgboard_id(); +// int chip = get_cgboard_id(); k037122_state *k037122 = k037122_get_safe_token(device); int bank = k037122->reg[0x30 / 4] & 0x7; @@ -10670,7 +10670,7 @@ READ32_DEVICE_HANDLER( k037122_char_r ) WRITE32_DEVICE_HANDLER( k037122_char_w ) { -// int chip = get_cgboard_id(); +// int chip = get_cgboard_id(); k037122_state *k037122 = k037122_get_safe_token(device); int bank = k037122->reg[0x30 / 4] & 0x7; UINT32 addr = offset + (bank * (0x40000/4)); @@ -10681,7 +10681,7 @@ WRITE32_DEVICE_HANDLER( k037122_char_w ) READ32_DEVICE_HANDLER( k037122_reg_r ) { -// int chip = get_cgboard_id(); +// int chip = get_cgboard_id(); k037122_state *k037122 = k037122_get_safe_token(device); switch (offset) @@ -10696,7 +10696,7 @@ READ32_DEVICE_HANDLER( k037122_reg_r ) WRITE32_DEVICE_HANDLER( k037122_reg_w ) { -// int chip = get_cgboard_id(); +// int chip = get_cgboard_id(); k037122_state *k037122 = k037122_get_safe_token(device); COMBINE_DATA(k037122->reg + offset); diff --git a/src/mame/video/taiicdev.c b/src/mame/video/taiicdev.c index 16abeac715a..75a5f98bbe4 100644 --- a/src/mame/video/taiicdev.c +++ b/src/mame/video/taiicdev.c @@ -511,13 +511,13 @@ INLINE void taitoic_drawscanline( bitmap_t *bitmap, const rectangle *cliprect, i src += cliprect->min_x; dsti += cliprect->min_x; dstp += cliprect->min_x; - if (transparent) + if (transparent) { - while (length--) + while (length--) { UINT32 spixel = *src++; - if (spixel < 0x7fff) + if (spixel < 0x7fff) { *dsti = spixel; *dstp = pri; @@ -526,10 +526,10 @@ INLINE void taitoic_drawscanline( bitmap_t *bitmap, const rectangle *cliprect, i dsti++; dstp++; } - } + } else /* Not transparent case */ { - while (length--) + while (length--) { *dsti++ = *src++; *dstp++ = pri; @@ -811,11 +811,11 @@ static UINT16 topspeed_get_road_pixel_color( UINT16 pixel, UINT16 color ) switch (pixel_type) { case 0x01: /* Center lines */ - if (color & 0x08) + if (color & 0x08) pixel = road_body_color; break; case 0x02: /* Road edge (inner) */ - if (color & 0x08) + if (color & 0x08) pixel = road_body_color; break; case 0x03: /* Road edge (outer) */ @@ -871,9 +871,9 @@ static void topspeed_custom_draw( const device_config *device, bitmap_t *bitmap, y_index = 0; } - if (!machine_flip) - y = min_y; - else + if (!machine_flip) + y = min_y; + else y = max_y; do @@ -921,9 +921,9 @@ static void topspeed_custom_draw( const device_config *device, bitmap_t *bitmap, taitoic_drawscanline(bitmap, cliprect, 0, y, scanline, (flags & TILEMAP_DRAW_OPAQUE) ? 0 : 1, ROT0, device->machine->priority_bitmap, priority); y_index++; - if (!machine_flip) - y++; - else + if (!machine_flip) + y++; + else y--; } while ((!machine_flip && y <= max_y) || (machine_flip && y >= min_y)); @@ -1617,9 +1617,9 @@ static void tc0080vco_bg0_tilemap_draw( const device_config *device, bitmap_t *b y_index = ((-tc0080vco->scroll_ram[3] - 2) << 16) + min_y * zoomy - (max_y + min_y) * (zoomy - 0x10000); } - if (!machine_flip) - y = min_y; - else + if (!machine_flip) + y = min_y; + else y = max_y; do @@ -1628,7 +1628,7 @@ static void tc0080vco_bg0_tilemap_draw( const device_config *device, bitmap_t *b /* row areas are the same in flipscreen, so we must read in reverse */ row_index = (src_y_index & 0x1ff); - if (flip) + if (flip) row_index = 0x1ff - row_index; x_index = sx - ((tc0080vco->bgscroll_ram[row_index] << 16)); @@ -1663,9 +1663,9 @@ static void tc0080vco_bg0_tilemap_draw( const device_config *device, bitmap_t *b y_index += zoomy; - if (!machine_flip) - y++; - else + if (!machine_flip) + y++; + else y--; } while ((!machine_flip && y <= max_y) || (machine_flip && y >= min_y)); @@ -1783,17 +1783,17 @@ void tc0080vco_tilemap_draw( const device_config *device, bitmap_t *bitmap, cons switch (layer) { case 0: - if (disable & 0x01) + if (disable & 0x01) return; tc0080vco_bg0_tilemap_draw(device, bitmap, cliprect, flags, priority); break; case 1: - if (disable & 0x02) + if (disable & 0x02) return; tc0080vco_bg1_tilemap_draw(device, bitmap, cliprect, flags, priority); break; case 2: - if (disable & 0x04) + if (disable & 0x04) return; tilemap_draw(bitmap, cliprect, tc0080vco->tilemap[2], flags, priority); break; @@ -2321,9 +2321,9 @@ READ32_DEVICE_HANDLER( tc0100scn_ctrl_long_r ) WRITE32_DEVICE_HANDLER( tc0100scn_ctrl_long_w ) { - if (ACCESSING_BITS_16_31) + if (ACCESSING_BITS_16_31) tc0100scn_ctrl_word_w(device, offset * 2, data >> 16, mem_mask >> 16); - if (ACCESSING_BITS_0_15) + if (ACCESSING_BITS_0_15) tc0100scn_ctrl_word_w(device, (offset * 2) + 1, data & 0xffff, mem_mask & 0xffff); } @@ -2390,14 +2390,14 @@ static void tc0100scn_tilemap_draw_fg( const device_config *device, bitmap_t *bi //We use cliprect->max_y and cliprect->max_x to support games which use more than 1 screen // Row offsets are 'screen space' 0-255 regardless of Y scroll - for (y = 0; y <= cliprect->max_y; y++) + for (y = 0; y <= cliprect->max_y; y++) { src_x = (tc0100scn->fgscrollx - tc0100scn->fgscroll_ram[(y + scrolly_delta) & 0x1ff] + scrollx_delta + cliprect->min_x) & width_mask; if (tc0100scn->ctrl[0x7] & 1) // Flipscreen src_x = (256 - 64 - src_x) & width_mask; // Col offsets are 'tilemap' space 0-511, and apply to blocks of 8 pixels at once - for (x = 0; x <= (cliprect->max_x - cliprect->min_x); x++) + for (x = 0; x <= (cliprect->max_x - cliprect->min_x); x++) { column_offset = tc0100scn->colscroll_ram[(src_x & 0x3ff) / 8]; p = *BITMAP_ADDR16(src_bitmap, (src_y - column_offset) & height_mask, src_x); @@ -2432,17 +2432,17 @@ if (disable != 0 && disable != 3 && disable != 7) switch (layer) { case 0: - if (disable & 0x01) + if (disable & 0x01) return 1; tilemap_draw(bitmap, &clip, tc0100scn->tilemap[0][tc0100scn->dblwidth], flags, priority); break; case 1: - if (disable & 0x02) + if (disable & 0x02) return 1; tc0100scn_tilemap_draw_fg(device, bitmap, &clip, tc0100scn->tilemap[1][tc0100scn->dblwidth], flags, priority); break; case 2: - if (disable & 0x04) + if (disable & 0x04) return 1; tilemap_draw(bitmap, &clip, tc0100scn->tilemap[2][tc0100scn->dblwidth], flags, priority); break; @@ -2671,7 +2671,7 @@ static void zoom_draw( const device_config *device, bitmap_t *bitmap, const rect /* 24-bit signed */ startx = ((tc0280grd->ctrl[0] & 0xff) << 16) + tc0280grd->ctrl[1]; - if (startx & 0x800000) + if (startx & 0x800000) startx -= 0x1000000; incxx = (INT16)tc0280grd->ctrl[2]; @@ -2681,7 +2681,7 @@ static void zoom_draw( const device_config *device, bitmap_t *bitmap, const rect /* 24-bit signed */ starty = ((tc0280grd->ctrl[4] & 0xff) << 16) + tc0280grd->ctrl[5]; - if (starty & 0x800000) + if (starty & 0x800000) starty -= 0x1000000; incxy = (INT16)tc0280grd->ctrl[6]; @@ -3164,9 +3164,9 @@ READ32_DEVICE_HANDLER( tc0480scp_ctrl_long_r ) WRITE32_DEVICE_HANDLER( tc0480scp_ctrl_long_w ) { - if (ACCESSING_BITS_16_31) + if (ACCESSING_BITS_16_31) tc0480scp_ctrl_word_w(device, offset * 2, data >> 16, mem_mask >> 16); - if (ACCESSING_BITS_0_15) + if (ACCESSING_BITS_0_15) tc0480scp_ctrl_word_w(device, (offset * 2) + 1, data & 0xffff, mem_mask & 0xffff); } @@ -3320,9 +3320,9 @@ static void tc0480scp_bg01_draw( const device_config *device, bitmap_t *bitmap, y_index -= (tc0480scp->y_offs - min_y) * zoomy; } - if (!machine_flip) - y = min_y; - else + if (!machine_flip) + y = min_y; + else y = max_y; do @@ -3331,7 +3331,7 @@ static void tc0480scp_bg01_draw( const device_config *device, bitmap_t *bitmap, /* row areas are the same in flipscreen, so we must read in reverse */ row_index = src_y_index; - if (flip) + if (flip) row_index = 0x1ff - row_index; x_index = sx - ((tc0480scp->bgscroll_ram[layer][row_index] << 16)) - ((tc0480scp->bgscroll_ram[layer][row_index + 0x800] << 8) & 0xffff); @@ -3365,9 +3365,9 @@ static void tc0480scp_bg01_draw( const device_config *device, bitmap_t *bitmap, taitoic_drawscanline(bitmap, cliprect, 0, y, scanline, (flags & TILEMAP_DRAW_OPAQUE) ? 0 : 1, ROT0, device->machine->priority_bitmap, priority); y_index += zoomy; - if (!machine_flip) - y++; - else + if (!machine_flip) + y++; + else y--; } while ((!machine_flip && y <= max_y) || (machine_flip && y >= min_y)); @@ -3464,9 +3464,9 @@ static void tc0480scp_bg23_draw( const device_config *device, bitmap_t *bitmap, } - if (!machine_flip) - y = min_y; - else + if (!machine_flip) + y = min_y; + else y = max_y; do @@ -3529,9 +3529,9 @@ static void tc0480scp_bg23_draw( const device_config *device, bitmap_t *bitmap, taitoic_drawscanline(bitmap, cliprect, 0, y, scanline, (flags & TILEMAP_DRAW_OPAQUE) ? 0 : 1, ROT0, device->machine->priority_bitmap, priority); y_index += zoomy; - if (!machine_flip) - y++; - else + if (!machine_flip) + y++; + else y--; } while ((!machine_flip && y<=max_y) || (machine_flip && y>=min_y)); @@ -4676,7 +4676,7 @@ WRITE16_DEVICE_HANDLER( tc0110pcr_word_w ) case 0: /* In test mode game writes to odd register number so (data>>1) */ tc0110pcr->addr = (data >> 1) & 0xfff; - if (data > 0x1fff) + if (data > 0x1fff) logerror ("Write to palette index > 0x1fff\n"); break; @@ -4699,7 +4699,7 @@ WRITE16_DEVICE_HANDLER( tc0110pcr_step1_word_w ) { case 0: tc0110pcr->addr = data & 0xfff; - if (data > 0xfff) + if (data > 0xfff) logerror ("Write to palette index (color area %d) > 0xfff\n", tc0110pcr->pal_offs); break; @@ -4724,7 +4724,7 @@ WRITE16_DEVICE_HANDLER( tc0110pcr_step1_rbswap_word_w ) { case 0: tc0110pcr->addr = data & 0xfff; - if (data > 0xfff) + if (data > 0xfff) logerror ("Write to palette index > 0xfff\n"); break; @@ -4749,7 +4749,7 @@ WRITE16_DEVICE_HANDLER( tc0110pcr_step1_4bpg_word_w ) { case 0: tc0110pcr->addr = data & 0xfff; - if (data > 0xfff) + if (data > 0xfff) logerror ("Write to palette index > 0xfff\n"); break; @@ -5105,11 +5105,11 @@ static DEVICE_START( tc0180vcu ) state_save_register_device_item(device, 0, tc0180vcu->video_control); state_save_register_device_item_array(device, 0, tc0180vcu->ctrl); -// tc0180vcu->ram = auto_alloc_array_clear(device->machine, UINT16, PC090OJ_RAM_SIZE / 2); -// tc0180vcu->scrollram = auto_alloc_array_clear(device->machine, UINT16, PC090OJ_RAM_SIZE / 2); +// tc0180vcu->ram = auto_alloc_array_clear(device->machine, UINT16, PC090OJ_RAM_SIZE / 2); +// tc0180vcu->scrollram = auto_alloc_array_clear(device->machine, UINT16, PC090OJ_RAM_SIZE / 2); -// state_save_register_device_item_pointer(device, 0, tc0180vcu->ram, PC090OJ_RAM_SIZE / 2); -// state_save_register_device_item_pointer(device, 0, tc0180vcu->scrollram, PC090OJ_RAM_SIZE / 2); +// state_save_register_device_item_pointer(device, 0, tc0180vcu->ram, PC090OJ_RAM_SIZE / 2); +// state_save_register_device_item_pointer(device, 0, tc0180vcu->scrollram, PC090OJ_RAM_SIZE / 2); } static DEVICE_RESET( tc0180vcu ) diff --git a/src/osd/windows/video.c b/src/osd/windows/video.c index 30ce7c4e978..7850ac96b9f 100644 --- a/src/osd/windows/video.c +++ b/src/osd/windows/video.c @@ -226,7 +226,7 @@ win_monitor_info *winvideo_monitor_from_handle(HMONITOR hmonitor) void osd_update(running_machine *machine, int skip_redraw) { win_window_info *window; - + // ping the watchdog on each update winmain_watchdog_ping(); diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c index 52d0b975188..138fed1ce73 100644 --- a/src/osd/windows/winmain.c +++ b/src/osd/windows/winmain.c @@ -461,20 +461,20 @@ static DWORD WINAPI watchdog_thread_entry(LPVOID lpParameter) { HANDLE handle_list[2]; DWORD wait_result; - + // wait for either a reset or an exit, or a timeout handle_list[0] = watchdog_reset_event; handle_list[1] = watchdog_exit_event; wait_result = WaitForMultipleObjects(2, handle_list, FALSE, timeout); - + // on a reset, just loop around and re-wait if (wait_result == WAIT_OBJECT_0 + 0) continue; - + // on an exit, break out if (wait_result == WAIT_OBJECT_0 + 1) break; - + // on a timeout, kill the process if (wait_result == WAIT_TIMEOUT) { |