diff --git a/.gitattributes b/.gitattributes index 26f7265eba4..32042bb7e69 100644 --- a/.gitattributes +++ b/.gitattributes @@ -128,7 +128,7 @@ src/emu/cpu/hd6309/hd6309.c svneol=native#text/plain src/emu/cpu/hd6309/hd6309.h svneol=native#text/plain src/emu/cpu/i386/cycles.h svneol=native#text/plain src/emu/cpu/i386/i386.c svneol=native#text/plain -src/emu/cpu/i386/i386.h svneol=native#text/plain +src/emu/cpu/i386/i386.h -text svneol=native#text/plain src/emu/cpu/i386/i386dasm.c svneol=native#text/plain src/emu/cpu/i386/i386op16.c svneol=native#text/plain src/emu/cpu/i386/i386op32.c svneol=native#text/plain diff --git a/src/emu/cpu/dsp56k/dsp56mem.c b/src/emu/cpu/dsp56k/dsp56mem.c index 2bd17e87168..c702ff107c2 100644 --- a/src/emu/cpu/dsp56k/dsp56mem.c +++ b/src/emu/cpu/dsp56k/dsp56mem.c @@ -383,7 +383,7 @@ static void HRIE_bit_set(dsp56k_core* cpustate, UINT16 value) //static UINT16 DMA_bit(dsp56k_core* cpustate) { return ((HSR & 0x0080) != 0); } //static UINT16 HF1_bit(dsp56k_core* cpustate) { return ((HSR & 0x0010) != 0); } //static UINT16 HF0_bit(dsp56k_core* cpustate) { return ((HSR & 0x0008) != 0); } -//static UINT16 HCP_bit(dsp56k_core* cpustate) { return ((HSR & 0x0004) != 0); } +//static UINT16 HCP_bit(dsp56k_core* cpustate) { return ((HSR & 0x0004) != 0); } static UINT16 HTDE_bit(dsp56k_core* cpustate) { return ((HSR & 0x0002) != 0); } static UINT16 HRDF_bit(dsp56k_core* cpustate) { return ((HSR & 0x0001) != 0); } diff --git a/src/emu/cpu/dsp56k/dsp56pcu.c b/src/emu/cpu/dsp56k/dsp56pcu.c index 464439028e7..7748a61376f 100644 --- a/src/emu/cpu/dsp56k/dsp56pcu.c +++ b/src/emu/cpu/dsp56k/dsp56pcu.c @@ -3,7 +3,7 @@ /* ************************************************************************* */ /* MR CCR */ /* |-------------------------------------| |-------------------------------| */ -/* | LF | FV | * | * | S1 | S0 | I1 | I0 | | S | L | E | U | N | Z | V | C | */ +/* | LF | FV | * | * | S1 | S0 | I1 | I0 | | S | L | E | U | N | Z | V | C | */ /* |-------------------------------------| |-------------------------------| */ /* */ /* ************************************************************************* */ @@ -343,7 +343,7 @@ static void dsp56k_irq_table_init(void) dsp56k_set_irq_source(31, 0x003e, "Host Command 8"); } -/* Clear all entries from the pending table */ +/* Clear all entries from the pending table */ static void dsp56k_clear_pending_interrupts(dsp56k_core* cpustate) { int i; diff --git a/src/emu/cpu/i386/i386.h b/src/emu/cpu/i386/i386.h index cf5bbcea286..9244c27b81f 100644 --- a/src/emu/cpu/i386/i386.h +++ b/src/emu/cpu/i386/i386.h @@ -1,25 +1,25 @@ -#pragma once - -#ifndef __I386INTF_H__ -#define __I386INTF_H__ - -#define INPUT_LINE_A20 1 - -#include "cpuintrf.h" - -// mingw has this defined for 32-bit compiles -#undef i386 - -CPU_GET_INFO( i386 ); -CPU_GET_INFO( i486 ); -CPU_GET_INFO( pentium ); -CPU_GET_INFO( mediagx ); - -#define CPU_I386 CPU_GET_INFO_NAME( i386 ) -#define CPU_I486 CPU_GET_INFO_NAME( i486 ) -#define CPU_PENTIUM CPU_GET_INFO_NAME( pentium ) -#define CPU_MEDIAGX CPU_GET_INFO_NAME( mediagx ) - - - -#endif /* __I386INTF_H__ */ +#pragma once + +#ifndef __I386INTF_H__ +#define __I386INTF_H__ + +#define INPUT_LINE_A20 1 + +#include "cpuintrf.h" + +// mingw has this defined for 32-bit compiles +#undef i386 + +CPU_GET_INFO( i386 ); +CPU_GET_INFO( i486 ); +CPU_GET_INFO( pentium ); +CPU_GET_INFO( mediagx ); + +#define CPU_I386 CPU_GET_INFO_NAME( i386 ) +#define CPU_I486 CPU_GET_INFO_NAME( i486 ) +#define CPU_PENTIUM CPU_GET_INFO_NAME( pentium ) +#define CPU_MEDIAGX CPU_GET_INFO_NAME( mediagx ) + + + +#endif /* __I386INTF_H__ */ diff --git a/src/mame/audio/bzone.c b/src/mame/audio/bzone.c index 92f500ac0b1..e5f9867a9bb 100644 --- a/src/mame/audio/bzone.c +++ b/src/mame/audio/bzone.c @@ -378,9 +378,9 @@ static DISCRETE_SOUND_START(bzone) /* FINAL MIX */ /************************************************/ /* We won't bother emulating the final gain of op-amp IC K5, pin 14. - * There signal never reaches a value where it clips, so we will - * just output the final 16-bit level. - */ + * There signal never reaches a value where it clips, so we will + * just output the final 16-bit level. + */ /* not sure about pokey output levels - below is just a estimate to get a 5V signal */ DISCRETE_INPUTX_STREAM(BZ_POKEY_SND, 0, 5.0 / 11000, 0) diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c index 044bb42c85b..45bbcc64c87 100644 --- a/src/mame/audio/dkong.c +++ b/src/mame/audio/dkong.c @@ -887,8 +887,8 @@ static DISCRETE_SOUND_START(dkongjr) //DISCRETE_INPUT_DATA(DS_DAC) /************************************************ - * SOUND0 / SOUND7 - - ************************************************/ + * SOUND0 / SOUND7 - + ************************************************/ DISCRETE_TASK_START(1) DISCRETE_LOGIC_INVERT(DS_SOUND7,DS_SOUND7_INV) @@ -935,11 +935,11 @@ DISCRETE_TASK_START(1) DISCRETE_74LS624(NODE_118, NODE_117, DK_SUP_V, JR_C19, DISC_LS624_OUT_COUNT_F) #endif -//DISCRETE_74LS629(NODE_30, /* IC 5K, pin 7 */ -// 1, /* ENAB */ -// NODE_117, DK_SUP_V, /* VMOD, VRNG */ -// JR_C19, JR_R11, /* C, R_FREQ_IN */ -// DISC_LS624_OUT_COUNT_F) +//DISCRETE_74LS629(NODE_30, /* IC 5K, pin 7 */ +// 1, /* ENAB */ +// NODE_117, DK_SUP_V, /* VMOD, VRNG */ +// JR_C19, JR_R11, /* C, R_FREQ_IN */ +// DISC_LS624_OUT_COUNT_F) //DISCRETE_74LS624(NODE_31, NODE_117, DK_SUP_V, JR_C19, DISC_LS624_OUT_COUNT_F) //DISCRETE_WAVELOG2(NODE_30, 1000,NODE_31, 1000) @@ -948,8 +948,8 @@ DISCRETE_TASK_START(1) DISCRETE_TASK_END() /************************************************ - * SOUND1 - Jump - ************************************************/ + * SOUND1 - Jump + ************************************************/ DISCRETE_TASK_START(2) /* needs NODE_104 from TASK(1) ready */ @@ -982,11 +982,11 @@ DISCRETE_TASK_END() DISCRETE_TASK_START(1) /* the noise source clock is a 74LS629 IC 7P, pin 10. - * using JR_C20 as the timing cap, with Freq Control tied to 0V - * and Range tied to 5V. This creates a fixed frequency of 710Hz. - * So for speed, I breadboarded and measured the frequency. - * Oct 2009, D.R. - */ + * using JR_C20 as the timing cap, with Freq Control tied to 0V + * and Range tied to 5V. This creates a fixed frequency of 710Hz. + * So for speed, I breadboarded and measured the frequency. + * Oct 2009, D.R. + */ DISCRETE_LFSR_NOISE(NODE_21, 1, 1, 710, 1.0, 0, 0.5, &dkongjr_lfsr) DISCRETE_LS123_INV(NODE_25, DS_SOUND2_INV, JR_R17, JR_C27) DISCRETE_RCDISC_MODULATED(NODE_26, NODE_25, NODE_21, 120, JR_R24, RES_K(0.001), JR_R18, JR_C29, DK_SUP_V) @@ -998,8 +998,8 @@ DISCRETE_TASK_START(1) DISCRETE_TASK_END() /************************************************ - * SOUND9 - Falling - ************************************************/ + * SOUND9 - Falling + ************************************************/ DISCRETE_TASK_START(1) #if (USE_LS629) diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c index 7a23dbbf404..ae4cec83312 100644 --- a/src/mame/drivers/1942.c +++ b/src/mame/drivers/1942.c @@ -414,7 +414,7 @@ ROM_START( 1942abl ) ROM_CONTINUE(0x0000,0x4000) ROM_LOAD( "16.bin", 0x0c000, 0x4000, CRC(c106b1ed) SHA1(a16520752fb02e403c93975ecf12b75854d58d69) ) ROM_CONTINUE(0x8000,0x4000) - + // proms not in the set, assumed to be the same ROM_REGION( 0x0a00, "proms", 0 ) ROM_LOAD( "sb-5.e8", 0x0000, 0x0100, CRC(93ab8153) SHA1(a792f24e5c0c3c4a6b436102e7a98199f878ece1) ) /* red component */ diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c index 6cab422d3fe..89ef9648543 100644 --- a/src/mame/drivers/amaticmg.c +++ b/src/mame/drivers/amaticmg.c @@ -100,9 +100,9 @@ PCB Layout: - ________________________________________________________________________ + ________________________________________________________________________ | | | | | | | | | | | | | | | | | | | | | | | | | | - __________| | | | | | | | | |36x2 edge connector | | | | | | | | | |__________ + __________| | | | | | | | | |36x2 edge connector | | | | | | | | | |__________ | ____ ____ | | | ::::: | | | |_________| DIP1 | @@ -124,7 +124,7 @@ | |Datum: 12.02.96 | |__________| | | | | |_________________________| |_______________| | | | - | ´ ____ ___________________ __________________ __ | + | ? ____ ___________________ __________________ __ | | / \ |MGI V GER | | | |H | | | | Batt | |3.9 / I / 8201 | | ALTERA | | | | | | ery | |M27C2001 | | | |__| | diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c index 0fdde0dd06e..62954c4201d 100644 --- a/src/mame/drivers/dynax.c +++ b/src/mame/drivers/dynax.c @@ -1557,7 +1557,7 @@ static WRITE8_HANDLER( gekisha_hopper_w ) { static UINT8 val[2]; val[offset] = data; -// popmessage("%02x %02x",val[0],val[1]); +// popmessage("%02x %02x",val[0],val[1]); } @@ -1605,7 +1605,7 @@ static WRITE8_HANDLER( gekisha_8000_w ) case 0x8001: dynax_blit_palette01_w(space, offset - 0x01, data); return; -// case 0x8002: // ? 1 +// case 0x8002: // ? 1 case 0x8003: dynax_blit_backpen_w(space, offset - 0x03, data); return; @@ -1641,9 +1641,9 @@ static WRITE8_HANDLER( gekisha_8000_w ) case 0x8060: keyb = data; return; -// case 0x8080: // ? 0,1,6 (bit 0 = screen disable?) -// popmessage("80 = %02x", data); -// break; +// case 0x8080: // ? 0,1,6 (bit 0 = screen disable?) +// popmessage("80 = %02x", data); +// break; } } logerror("%04x: unmapped offset %04X=%02X written with rombank=%02X\n",cpu_get_pc(space->cpu),offset,data,rombank); @@ -2372,8 +2372,8 @@ static INPUT_PORTS_START( hjingi ) PORT_DIPSETTING( 0x04, DEF_STR( Medium ) ) PORT_DIPSETTING( 0x03, DEF_STR( Low ) ) PORT_DIPSETTING( 0x02, DEF_STR( Very_Low ) ) -// PORT_DIPSETTING( 0x01, DEF_STR( ) ) -// PORT_DIPSETTING( 0x00, DEF_STR( ) ) +// PORT_DIPSETTING( 0x01, DEF_STR( ) ) +// PORT_DIPSETTING( 0x00, DEF_STR( ) ) PORT_DIPNAME( 0x08, 0x08, "Payout Rate Change" ) PORT_DIPSETTING( 0x08, "Big" ) PORT_DIPSETTING( 0x00, "Small" ) @@ -2450,12 +2450,12 @@ static INPUT_PORTS_START( hjingi ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) // 18A PORT_INCLUDE( HANAFUDA_KEYS_BET ) -// PORT_INCLUDE( HANAFUDA_KEYS_BET_ALT ) +// PORT_INCLUDE( HANAFUDA_KEYS_BET_ALT ) PORT_START("BET") PORT_CONFNAME( 0x40, 0x40, "Allow Betting" ) PORT_CONFSETTING( 0x40, DEF_STR( Yes ) ) // 2 keyboards, normal bet layout, hopper not pulsing in key test -// PORT_CONFSETTING( 0x00, DEF_STR( No ) ) // 1 keyboard, alt bet layout, hopper pulsing in key test +// PORT_CONFSETTING( 0x00, DEF_STR( No ) ) // 1 keyboard, alt bet layout, hopper pulsing in key test INPUT_PORTS_END @@ -6885,7 +6885,7 @@ Mahjong Gekisha PCB Layout ---------- SUBBOARD HERE -D2809218L-1 | +D2809218L-1 | |--------------------------|---|-------| | | \/ 5563| | 2801 2802 2803 2804 2805 | @@ -6909,7 +6909,7 @@ Notes: 0.1F - 0.1 Farad Supercap 5563 - 8kx8 SRAM 4461 - TMS4461 64kx4 Multiport Video RAM - + Sub Board diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index 26ecbc14bd0..b6f67637c45 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -2581,7 +2581,7 @@ static DRIVER_INIT( moonqsr ) static WRITE8_HANDLER( artic_gfxbank_w ) { -// printf("artic_gfxbank_w %02x\n",data); +// printf("artic_gfxbank_w %02x\n",data); } static DRIVER_INIT( pacmanbl ) @@ -2645,7 +2645,7 @@ void tenspot_set_game_bank(running_machine* machine, int bank, int from_game) srcregion = memory_region(machine,tmp); dstregion = memory_region(machine,"proms"); memcpy(dstregion, srcregion, 0x20); - + color_prom = dstregion; PALETTE_INIT_CALL(galaxian); } @@ -2655,7 +2655,7 @@ static DRIVER_INIT( tenspot ) const address_space *space = cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM); /* these are needed for batman part 2 to work properly, this banking is probably a property of the artic board, - which tenspot appears to have copied */ + which tenspot appears to have copied */ /* video extensions */ //common_init(machine, galaxian_draw_bullet, galaxian_draw_background, batman2_extend_tile_info, upper_extend_sprite_info); diff --git a/src/mame/drivers/galdrvr.c b/src/mame/drivers/galdrvr.c index 22a6b38d374..4764484359d 100644 --- a/src/mame/drivers/galdrvr.c +++ b/src/mame/drivers/galdrvr.c @@ -3552,7 +3552,7 @@ ROM_START( atlantisb ) /* Artic Multi-System */ ROM_END -ROM_START( tenspot ) +ROM_START( tenspot ) /* Game A - Survivor */ ROM_REGION( 0x4000, "game_0_cpu", 0 ) ROM_LOAD( "svt1-a.a1", 0x0000, 0x1000, CRC(5806d0e6) SHA1(887ff2985578faa9535387a5ce3953452e7a3171) ) @@ -3565,7 +3565,7 @@ ROM_START( tenspot ) ROM_REGION( 0x0020, "game_0_prom", 0 ) ROM_LOAD( "clr3.a7", 0x0000, 0x0020, CRC(aefcf6b1) SHA1(10cde93e23fe8720f5af9039c4f68999f7cfce67) ) - + /* Game B - Moon Cresta */ ROM_REGION( 0x4000, "game_1_cpu", 0 ) ROM_LOAD( "mct1-a.b1", 0x0000, 0x1000, CRC(90a74a0b) SHA1(a1fb24aa621611c18bf6188f380640e5576ac248) ) @@ -3579,7 +3579,7 @@ ROM_START( tenspot ) ROM_REGION( 0x0020, "game_1_prom", 0 ) ROM_LOAD( "clr2.b7", 0x0000, 0x0020, CRC(6a0c7d87) SHA1(140335d85c67c75b65689d4e76d29863c209cf32) ) - + /* Game C - Space Cruiser */ ROM_REGION( 0x4000, "game_2_cpu", 0 ) ROM_LOAD( "sct1-a.c1", 0x0000, 0x1000, CRC(5068e89c) SHA1(539fe47ec846ec038ee6ffd2d3578d7cf25d4219) ) @@ -3592,7 +3592,7 @@ ROM_START( tenspot ) ROM_REGION( 0x0020, "game_2_prom", 0 ) ROM_LOAD( "clr1.c7", 0x0000, 0x0020, CRC(4e3caeab) SHA1(a25083c3e36d28afdefe4af6e6d4f3155e303625) ) - + /* Game D - Mission Rescue (Black Hole) */ ROM_REGION( 0x4000, "game_3_cpu", 0 ) ROM_LOAD( "mrt1-a.d1", 0x0000, 0x1000, CRC(eb63c4e0) SHA1(29a59fa8616e36dd098ff9f6e520128db3b66ed9) ) @@ -3619,7 +3619,7 @@ ROM_START( tenspot ) ROM_REGION( 0x0020, "game_4_prom", 0 ) ROM_LOAD( "clr1.e7", 0x0000, 0x0020, CRC(4e3caeab) SHA1(a25083c3e36d28afdefe4af6e6d4f3155e303625) ) - + /* Game F - Batman Pt.2 (Phoenix) - this needs custom video banking like the standalone version.... */ ROM_REGION( 0x4000, "game_5_cpu", 0 ) ROM_LOAD( "bmt1-a.f1", 0x0000, 0x1000, CRC(2aecaaa0) SHA1(07c35f34eebbe65247a412c828328a558936d03c) ) @@ -3647,13 +3647,13 @@ ROM_START( tenspot ) ROM_REGION( 0x0020, "game_6_prom", 0 ) ROM_LOAD( "clr1.h7", 0x0000, 0x0020, CRC(4e3caeab) SHA1(a25083c3e36d28afdefe4af6e6d4f3155e303625) ) - + /* Game J - King and Balloon */ ROM_REGION( 0x4000, "game_7_cpu", 0 ) ROM_LOAD( "kbt1-a.j1", 0x0000, 0x1000, CRC(6bcdfaef) SHA1(5f3d57a91d57c8758f1fa39a44be6082fff52406) ) ROM_LOAD( "kbt2-a.j2", 0x1000, 0x1000, CRC(3652c64b) SHA1(7cb2a51e1830d48d5d3a62d521dfef1779dd5222) ) ROM_LOAD( "kbt3-a.j3", 0x2000, 0x1000, CRC(946447c6) SHA1(0759f7d8b538d5e489a85bc6551cde76e6b3ed71) ) - + ROM_REGION( 0x2000, "game_7_temp", 0 ) ROM_LOAD( "kbt5-a.j5", 0x0000, 0x1000, CRC(ea36f825) SHA1(20e26c97d780fb1fd15ad4c33c097a5b3539d43d) ) ROM_LOAD( "kbt6-a.j6", 0x1000, 0x1000, CRC(2b8b46bc) SHA1(48a7a65fc5c174d0cc654557b3a1166df7fea4da) ) @@ -3666,7 +3666,7 @@ ROM_START( tenspot ) ROM_LOAD( "omt1-a.k1", 0x0000, 0x1000, CRC(8fc41a53) SHA1(c1bb4018bad12b83954cf8da8eba49f23618139a) ) ROM_LOAD( "omt2-a.k2", 0x1000, 0x1000, CRC(a3073430) SHA1(200b15c572d7cff9be39439a247c9be742f17a61) ) ROM_LOAD( "omt3-a.k3", 0x2000, 0x1000, CRC(b0de1fa2) SHA1(71cf8303b7ddc5813d6b92a71bd53f83272f5f22) ) - + ROM_REGION( 0x2000, "game_8_temp", 0 ) ROM_LOAD( "omt5-a.k5", 0x0000, 0x1000, CRC(5ab402c8) SHA1(c0640d9907d7dcd34cd7105d21b99fc15fcbac6e) ) ROM_LOAD( "omt6-a.k6", 0x1000, 0x1000, CRC(2552e470) SHA1(ba5fba8047e4bb23442b0c2d45c858ec9da63945) ) @@ -3680,7 +3680,7 @@ ROM_START( tenspot ) ROM_LOAD( "bat2-a.l2", 0x1000, 0x1000, CRC(adc2ce4b) SHA1(36f477a48b3df9cb2456460048b2fdd0d3e8b73e) ) ROM_LOAD( "bat3-a.l3", 0x2000, 0x1000, CRC(81270ace) SHA1(0385fedacbbda4ed750c5a64d51a60ed98c3ed65) ) ROM_LOAD( "bat4-a.l4", 0x3000, 0x1000, CRC(bd751ba9) SHA1(dbdc8972b0236755d5a8ea90e2de2d16585f5e02) ) - + ROM_REGION( 0x2000, "game_9_temp", 0 ) ROM_LOAD( "bat5-a.l5", 0x0000, 0x1000, CRC(b9701513) SHA1(d8bc7b36a6d0b1e73aa7b6a5dab7b36ce111a04c) ) ROM_LOAD( "bat6-a.l6", 0x1000, 0x1000, CRC(54b423b7) SHA1(31eec49b4e9c8b56668b9037dd47e66659ce64cb) ) @@ -5602,7 +5602,7 @@ GAME( 1981, pacmanbla,puckman, pacmanbl, pacmanbl, pacmanbl, ROT270, "bootleg", GAME( 1981, phoenxp2, phoenix, galaxian, phoenxp2, batman2, ROT270, "bootleg", "Phoenix Part 2", GAME_SUPPORTS_SAVE ) GAME( 1981, batman2, phoenix, galaxian, batman2, batman2, ROT270, "bootleg", "Batman Part 2", GAME_SUPPORTS_SAVE ) /* similar to pisces, but with different video banking characteristics */ GAME( 1981, atlantisb,atlantis, galaxian, atlantib, galaxian, ROT270, "bootleg", "Battle of Atlantis (bootleg)", GAME_SUPPORTS_SAVE ) // I don't know if this should have a starfield... -GAME( 1982, tenspot, 0, tenspot, tenspot, tenspot, ROT270, "Thomas Automatics", "Ten Spot", GAME_NOT_WORKING ) // work out how menu works +GAME( 1982, tenspot, 0, tenspot, tenspot, tenspot, ROT270, "Thomas Automatics", "Ten Spot", GAME_NOT_WORKING ) // work out how menu works /* separate tile/sprite ROMs, plus INT instead of NMI */ GAME( 1984, devilfsg, devilfsh, pacmanbl, devilfsg, devilfsg, ROT270, "Vision / Artic", "Devil Fish (Galaxian hardware, bootleg?)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/ggconnie.c b/src/mame/drivers/ggconnie.c index d01eeb9f839..dc950eb912f 100644 --- a/src/mame/drivers/ggconnie.c +++ b/src/mame/drivers/ggconnie.c @@ -1,17 +1,17 @@ /**************************************************************************** - Go! Go! Connie chan Jaka Jaka Janken + Go! Go! Connie chan Jaka Jaka Janken Driver by Mariusz Wojcieszek - EC9601 + EC9601 - Hudson Chip - CPU :Hu6280 - Video:Hu6202,Hu6260,Hu6270 + Hudson Chip + CPU :Hu6280 + Video:Hu6202,Hu6260,Hu6270 - OSC :21.47727MHz - Other:XILINX XC7336-15,OKI M6295 + OSC :21.47727MHz + Other:XILINX XC7336-15,OKI M6295 ****************************************************************************/ diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index 415f8a19da7..0c67a148737 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -479,7 +479,7 @@ static ADDRESS_MAP_START( wcat3_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xb840, 0xb840) AM_DEVWRITE("ay", ay8910_address_w) /* no sound... only use both ports for DSWs */ AM_RANGE(0xb850, 0xb850) AM_WRITE(lucky8_outport_w) AM_RANGE(0xb870, 0xb870) AM_DEVWRITE("sn", sn76496_w) /* sound */ -// AM_RANGE(0xc000, 0xc003) AM_DEVREADWRITE("ppi8255_3", ppi8255_r, ppi8255_w) /* Other PPI initialized? */ +// AM_RANGE(0xc000, 0xc003) AM_DEVREADWRITE("ppi8255_3", ppi8255_r, ppi8255_w) /* Other PPI initialized? */ AM_RANGE(0xd000, 0xefff) AM_ROM AM_RANGE(0xf000, 0xffff) AM_RAM ADDRESS_MAP_END @@ -2633,7 +2633,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( ns8lines ) PORT_START("IN0") /* d800 */ -// PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) +// PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_M) PORT_NAME("IN0-01") PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_L) PORT_NAME("IN0-02") PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_CODE(KEYCODE_X) PORT_NAME("P1 - Big / Switch Controls") @@ -6211,7 +6211,7 @@ ROM_END |4 | J | | | |m2016BP-12| | K | | B | | I | | | | | --| | +-----+ +--------------+ +----------+ +-----+ +-----+ +---------+ +------+ +------+ +--+ | +-----+ +--------------+ +----------+ +-----+ +-----+ +-------+ +------+ +------+ | -|3 | J | | [2] | |USC 6516-A| | T | | B | | H | | | | | | +|3 | J | | [2] | |USC 6516-A| | T | | B | | H | | | | | | | +-----+ | D2764 | |9252E GYU1| +-----+ +-----+ +-------+ +------+ +------+ +--+ | | | +----------+ | | +-----+ +--------------+ +----------+ +-----+ +-----+ +------+ +------+ | @@ -6232,7 +6232,7 @@ DIP1: DIP2: DIP3: DI | |#|#|#| |#|#|#|#| | | | | | |#|#|#|#| | | | |#|#| | | | | |#| | | |#|#|#|#| |#|#|#| | | +---------------+ | | +---------------+ | | +---------------+ | | +---------------+ | | 1 2 3 4 5 6 7 8 | | 1 2 3 4 5 6 7 8 | | 1 2 3 4 5 6 7 8 | | 1 2 3 4 5 6 7 8 | -+-------------------+ +-------------------+ +-------------------+ +-------------------+ ++-------------------+ +-------------------+ +-------------------+ +-------------------+ 1x XTAL = 12 Mhz @@ -6250,18 +6250,18 @@ K = SN74LS283N / KKFQ9149 L = GS 9427 / GD74LS138 M = GS 9424 / GD74LS04 N = Malaysia 9022AS / SN74LS139AN -O = GS 9425 / GD74LS157 ???? +O = GS 9425 / GD74LS157 ???? P = HD74LS04P Q = 5560 / JRC / 3151A R = HD74HC00P S = DM74S288 T = DM74S287 -U = -V = +U = +V = W = -X = -Y = -Z = +X = +Y = +Z = */ @@ -6429,7 +6429,7 @@ Cherry master type game .h7 27256 handwritten 5 .h8 27256 handwritten 6 .h10 27256 stickered 7 E.A.I. -.g13 82s129 stickered G13 +.g13 82s129 stickered G13 .g14 82s129 stickered G14 .d12 82s123 handwritten 2 .d13 82s123 stickered D13 @@ -6438,7 +6438,7 @@ Cherry master type game open 24 pin socket @ B13 Daughter board -.u5 27512 +.u5 27512 Z80 on daughter board SN76489AN diff --git a/src/mame/drivers/mirderby.c b/src/mame/drivers/mirderby.c index 49417cd239a..f5c368a1208 100644 --- a/src/mame/drivers/mirderby.c +++ b/src/mame/drivers/mirderby.c @@ -1,40 +1,40 @@ -/* Miracle Derby - Ascot +/* Miracle Derby - Ascot - has the same GX61A01 custom (blitter?) as homedata.c and a 'similar' CPU setup (this has more CPUs) and similar board / rom numbering (X**-) The drivers can probably be merged later, although the current per-game handling of the blitter in - homedata.c should be looked at. + homedata.c should be looked at. - Notes from Stefan Lindberg: + Notes from Stefan Lindberg: - Eprom "x70_a04.5g" had wires attached to it, pin 2 and 16 was joined and pin 1,32,31,30 was joined, i - removed them and read the eprom as the type it was (D27c1000D). + Eprom "x70_a04.5g" had wires attached to it, pin 2 and 16 was joined and pin 1,32,31,30 was joined, i + removed them and read the eprom as the type it was (D27c1000D). - Measured frequencies: - MBL68B09E = 2mhz - MBL68B09E = 2mhz - z80 = 4mhz - YM2203 = 2mhz + Measured frequencies: + MBL68B09E = 2mhz + MBL68B09E = 2mhz + z80 = 4mhz + YM2203 = 2mhz - See included PCB pics. + See included PCB pics. - Roms: + Roms: - Name Size CRC32 Chip Type - --------------------------------------------------------------------------------- - x70a07.8l 256 0x7d4c9712 82s129 - x70a08.7l 256 0xc4e77174 82s129 - x70a09.6l 256 0xd0187957 82s129 - x70_a03.8g 32768 0x4e298b2d 27c256 - x70_a04.5g 131072 0x14392fdb D27c1000D - x70_a11.1g 32768 0xb394eef7 27c256 - x70_b02.12e 32768 0x76c9bb6f 27c256 - x70_c01.14e 65536 0xd79d072d 27c512 + Name Size CRC32 Chip Type + --------------------------------------------------------------------------------- + x70a07.8l 256 0x7d4c9712 82s129 + x70a08.7l 256 0xc4e77174 82s129 + x70a09.6l 256 0xd0187957 82s129 + x70_a03.8g 32768 0x4e298b2d 27c256 + x70_a04.5g 131072 0x14392fdb D27c1000D + x70_a11.1g 32768 0xb394eef7 27c256 + x70_b02.12e 32768 0x76c9bb6f 27c256 + x70_c01.14e 65536 0xd79d072d 27c512 @@ -155,18 +155,18 @@ ROM_START( mirderby ) ROM_LOAD( "x70_c01.14e", 0x00000, 0x10000, CRC(d79d072d) SHA1(8e189931de9c4eb520c1ec2d0898d8eaba0f01b5) ) ROM_REGION( 0x10000, "cpu2", 0 ) /* M6809 code */ - ROM_LOAD( "x70_b02.12e", 0x8000, 0x8000, CRC(76c9bb6f) SHA1(dd8893f3082d33d366247295e9531f8879c219c5) ) + ROM_LOAD( "x70_b02.12e", 0x8000, 0x8000, CRC(76c9bb6f) SHA1(dd8893f3082d33d366247295e9531f8879c219c5) ) ROM_REGION( 0x8000, "gfx1", 0 ) // horse gfx - ROM_LOAD( "x70_a03.8g", 0x0000, 0x8000, CRC(4e298b2d) SHA1(ae78327d1f30c8d19ef772b82803dab4d6b7b919)) + ROM_LOAD( "x70_a03.8g", 0x0000, 0x8000, CRC(4e298b2d) SHA1(ae78327d1f30c8d19ef772b82803dab4d6b7b919)) ROM_REGION( 0x20000, "gfx2", 0 ) // fonts etc. - ROM_LOAD( "x70_a04.5g", 0x0000, 0x20000, CRC(14392fdb) SHA1(dafdce473b2d2ebbdbf49fbd12f85c1ad69b2877) ) + ROM_LOAD( "x70_a04.5g", 0x0000, 0x20000, CRC(14392fdb) SHA1(dafdce473b2d2ebbdbf49fbd12f85c1ad69b2877) ) ROM_REGION( 0x300, "proms", 0 ) /* colours */ - ROM_LOAD( "x70a07.8l", 0x000, 0x100, CRC(7d4c9712) SHA1(fe2a89841fdf5e4fd6cd41478ad2f29d28bed54d) ) - ROM_LOAD( "x70a08.7l", 0x100, 0x100, CRC(c4e77174) SHA1(ada238ded69f01b4daeb0159a2c5c422977bb95e) ) - ROM_LOAD( "x70a09.6l", 0x200, 0x100, CRC(d0187957) SHA1(6b36c1bccad24708cfa2fc78da08313f9bcfdbc0) ) + ROM_LOAD( "x70a07.8l", 0x000, 0x100, CRC(7d4c9712) SHA1(fe2a89841fdf5e4fd6cd41478ad2f29d28bed54d) ) + ROM_LOAD( "x70a08.7l", 0x100, 0x100, CRC(c4e77174) SHA1(ada238ded69f01b4daeb0159a2c5c422977bb95e) ) + ROM_LOAD( "x70a09.6l", 0x200, 0x100, CRC(d0187957) SHA1(6b36c1bccad24708cfa2fc78da08313f9bcfdbc0) ) ROM_END static DRIVER_INIT( mirderby ) diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index fcbd329adfe..d5e76d203ad 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -2825,12 +2825,12 @@ ROM_START( f355 ) ROM_LOAD("mpr-21901.ic21",0xa800000, 0x0800000, BAD_DUMP CRC(55dcbd6d) SHA1(9fec353f9e58016090e177f899a799e2e8fc7c9f) ) // returns bad in Naomi test mode ROM_END // ROM reads different each time and fails test mode on real h/w, need a new cart -ROM_START( f355twin ) +ROM_START( f355twin ) ROM_REGION( 0x200000, "maincpu", 0) F355_BIOS ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF) - ROM_LOAD( "epr22848.ic22", 0x0000000, 0x800000, CRC(54de0bd5) SHA1(5f6be36d2d39eea681ecac14358b92eaf4bf6c1e) ) + ROM_LOAD( "epr22848.ic22", 0x0000000, 0x800000, CRC(54de0bd5) SHA1(5f6be36d2d39eea681ecac14358b92eaf4bf6c1e) ) ROM_LOAD( "mpr22827.ic1", 0x0800000, 0x800000, CRC(eeb1b975) SHA1(929f453eaf5565ae3e660dbbb8f406ff8aa7897d) ) ROM_LOAD( "mpr22828.ic2", 0x1000000, 0x800000, CRC(691d246a) SHA1(a2d538bc2e0d592a4f18d65f52fea035e1d4c625) ) ROM_LOAD( "mpr22829.ic3", 0x1800000, 0x800000, CRC(00719c9c) SHA1(f0f19af4ebe2720bd822a9ea7e0004db163c706a) ) @@ -2854,12 +2854,12 @@ ROM_START( f355twin ) ROM_LOAD( "mpr22847.ic21", 0xa800000, 0x800000, CRC(955ad42e) SHA1(e396ca02b5786557434632c4fac56af3a4a9f8ce) ) ROM_END -ROM_START( f355twn2 ) +ROM_START( f355twn2 ) ROM_REGION( 0x200000, "maincpu", 0) F355_BIOS ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF) - ROM_LOAD( "epr23399.ic22", 0x0000000, 0x400000, CRC(36de514c) SHA1(1c32064169c233156921fdf170c1958dc0f8a750) ) + ROM_LOAD( "epr23399.ic22", 0x0000000, 0x400000, CRC(36de514c) SHA1(1c32064169c233156921fdf170c1958dc0f8a750) ) ROM_LOAD( "mpr23378.ic1", 0x0800000, 0x800000, CRC(1ad80f12) SHA1(415a021987e07bb298e43eacb54ff898619837b1) ) ROM_LOAD( "mpr23379.ic2", 0x1000000, 0x800000, CRC(a198f0a8) SHA1(7025adfd26f80087fa405acb49797d5c77a55e98) ) ROM_LOAD( "mpr23380.ic3", 0x1800000, 0x800000, CRC(b1993286) SHA1(01ddc81ba3542f37dd2dadac972114ec254059a1) ) @@ -3358,7 +3358,7 @@ ROM_START( crzytaxi ) ROM_LOAD( "a03ff000.bin", 0x000000, 0x000500, CRC(be5e415d) SHA1(baf87191236f332c8df7674a080c2be4824a4bcb) ) ROM_END -/* Jambo! Safari */ +/* Jambo! Safari */ ROM_START( jambo ) ROM_REGION( 0x200000, "maincpu", 0) NAOMI_BIOS @@ -4424,8 +4424,8 @@ GAME( 1998, naomi, 0, naomi, naomi, naomi, ROT0, "Sega", /* 00??C */ GAME( 1999, smlg99, naomi, naomi, naomi, naomi, ROT0, "Sega", "Super Major League '99", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) /* 0020C */ GAME( 1999, samba, naomi, naomi, naomi, naomi, ROT0, "Sega", "Samba De Amigo (JPN)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) /* 0083C */ GAME( 1999, derbyoc2, naomi, naomi, naomi, naomi, ROT0, "Sega", "Derby Owners Club II (JPN, USA, EXP, KOR, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) -/* ????? */ GAME( 1999, crzytaxi, naomi, naomi, naomi, naomi, ROT0, "Sega", "Crazy Taxi (JPN, USA, EXP, KOR, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) -/* ????? */ GAME( 1999, jambo, naomi, naomi, naomi, naomi, ROT0, "Sega", "Jambo! Safari (JPN, USA, EXP, KOR, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) +/* ????? */ GAME( 1999, crzytaxi, naomi, naomi, naomi, naomi, ROT0, "Sega", "Crazy Taxi (JPN, USA, EXP, KOR, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) +/* ????? */ GAME( 1999, jambo, naomi, naomi, naomi, naomi, ROT0, "Sega", "Jambo! Safari (JPN, USA, EXP, KOR, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) /* 0021C */ GAME( 2000, virnba, naomi, naomi, naomi, naomi, ROT0, "Sega", "Virtua NBA (JPN, USA, EXP, KOR, AUS)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) /* 0021C */ GAME( 2000, virnbao, virnba, naomi, naomi, naomi, ROT0, "Sega", "Virtua NBA (JPN, USA, EXP, KOR, AUS) (original)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) /* 0026C */ GAME( 2000, totd, naomi, naomi, naomi, naomi, ROT0, "Sega", "The Typing of the Dead (JPN, USA, EXP, KOR, AUS)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) @@ -4439,7 +4439,7 @@ GAME( 1998, naomi, 0, naomi, naomi, naomi, ROT0, "Sega", /* 0044C */ GAME( 2001, csmasho, csmash, naomi, naomi, naomi, ROT0, "Sega", "Cosmic Smash (JPN, USA, EXP, KOR, AUS) (original)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) /* 0128C */ GAME( 2001, shootpl, naomi, naomi, naomi, naomi, ROT0, "Sega", "Shootout Pool (JPN, USA, KOR, AUS) / Shootout Pool Prize (EXP)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) /* 0???? */ GAME( 2001, shootopl, naomi, naomi, naomi, naomi, ROT0, "Sega", "Shootout Pool", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) -/* 0???? */ GAME( 2001, vtenis2c, naomi, naomi, naomi, naomi, ROT0, "Sega", "Power Smash 2 / Virtua Tennis 2 (cartridge)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) +/* 0???? */ GAME( 2001, vtenis2c, naomi, naomi, naomi, naomi, ROT0, "Sega", "Power Smash 2 / Virtua Tennis 2 (cartridge)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) /* 841-xxxxx ("Licensed by Sega" games)*/ /* 0001C */ GAME( 1999, pstone, naomi, naomi, naomi, naomi, ROT0, "Capcom", "Power Stone (JPN, USA, EUR, ASI, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c index 7f35317ab90..08cba2bf20c 100644 --- a/src/mame/drivers/norautp.c +++ b/src/mame/drivers/norautp.c @@ -543,7 +543,7 @@ 3x ULN2003A (Darlington transistor array) 1x NE555P (Timer) 1x F 2N4401 (NPN General Purpose Amplifier) - + .------. .------------. .-------. | U17 | | NE555P | |2N4401 | @@ -581,7 +581,7 @@ C3 = 503 ; 50.000 pf = 50 nf = 0.05 uf. C4 = .01 Z C5 = .01 Z - C6 = .1 Z + C6 = .1 Z All Capacitors are Ceramic Disc. @@ -594,7 +594,7 @@ U23: PPI-0 (); PortA IN. DIP Switches bank: - + 7654 3210 ---- ---x * DIP switch 8 ---- --x- * DIP switch 7 @@ -611,7 +611,7 @@ Hardware Layout (SMS Hi-Lo Double Up Joker Poker): - - CPU: 1x AMD P8080A + - CPU: 1x AMD P8080A - RAM: 2x 2111A-2: Static Random Access Memory 256 x 4 bit. - RAM: 2x NEC D5101LC-1: 256x4 static CMOS RAM. - I/O: 3x 8255: Peripeheral Interface Adapter. @@ -621,19 +621,19 @@ - Crystal: 1x 18.000 MHz. - PROM 1x 82S129: Bipolar PROM: U51. 1x 3.6 Vcc Battery. - - Frequency on CPU P8080A (pins 15 & 22) = 2.00032 MHz. - - + + Frequency on CPU P8080A (pins 15 & 22) = 2.00032 MHz. + + PCB MARKED: - Solderside: + Solderside: PCB silksceened: SMS Manufacturing Corporation. Component side: PCB silksceened: REV 2. PCB Engraved: "1350" "10-83". - + PCB Layout (SMS Hi-Lo Double Up Joker Poker): Edge Connector 36x2 ____________________________________________________________________________________________________________ @@ -753,7 +753,7 @@ - Crystal: 1x 18.000 MHz. - Etched in copper on board: TP2 + Etched in copper on board: TP2 .U30 2732a ; stickered (c) 1993 MICRO MFG TURBO POKER CHAR, ROM. @@ -1197,12 +1197,12 @@ static WRITE8_DEVICE_HANDLER( counterlamps_w ) //static READ8_DEVICE_HANDLER( ppi2_portc_r ) //{ -// return; +// return; //} //static WRITE8_DEVICE_HANDLER( ppi2_portc_w ) //{ -// /* PC0-PC2 don't seems to be connected to any output */ +// /* PC0-PC2 don't seems to be connected to any output */ //} @@ -1224,8 +1224,8 @@ static WRITE8_HANDLER( vram_data_w ) np_vram[np_addr] = data & 0xff; /* trigger 8255-2 port C bit 7 (/OBF) */ -// i8255a_pc7_w(devtag_get_device(device->machine, "ppi8255_2"), 0); -// i8255a_pc7_w(devtag_get_device(device->machine, "ppi8255_2"), 1); +// i8255a_pc7_w(devtag_get_device(device->machine, "ppi8255_2"), 0); +// i8255a_pc7_w(devtag_get_device(device->machine, "ppi8255_2"), 1); } @@ -1290,7 +1290,7 @@ static ADDRESS_MAP_START( norautp_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x60, 0x63) AM_MIRROR(0x1c) AM_DEVREADWRITE("ppi8255_0", i8255a_r, i8255a_w) AM_RANGE(0xa0, 0xa3) AM_MIRROR(0x1c) AM_DEVREADWRITE("ppi8255_1", i8255a_r, i8255a_w) -// AM_RANGE(0xc0, 0xc3) AM_MIRROR(0x3c) AM_DEVREADWRITE("ppi8255_2", i8255a_r, i8255a_w) +// AM_RANGE(0xc0, 0xc3) AM_MIRROR(0x3c) AM_DEVREADWRITE("ppi8255_2", i8255a_r, i8255a_w) AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x3c) AM_READWRITE(vram_data_r, vram_data_w) AM_RANGE(0xc1, 0xc1) AM_MIRROR(0x3c) AM_WRITE(vram_addr_w) AM_RANGE(0xc2, 0xc2) AM_MIRROR(0x3c) AM_READ(test_r) @@ -1348,7 +1348,7 @@ static ADDRESS_MAP_START( dphla_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( dphltest_map, ADDRESS_SPACE_PROGRAM, 8 ) -// ADDRESS_MAP_GLOBAL_MASK(0x7fff) /* A15 not connected */ +// ADDRESS_MAP_GLOBAL_MASK(0x7fff) /* A15 not connected */ AM_RANGE(0x0000, 0x6fff) AM_ROM AM_RANGE(0x7000, 0x7fff) AM_RAM AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) @@ -1612,12 +1612,12 @@ static I8255A_INTERFACE (ppi8255_intf_1) //{ /* (c0-c3) Group A Mode 2 (5-lines handshacked bidirectional port) Group B Mode 0, output; (see below for lines PC0-PC2) */ -// DEVCB_HANDLER(vram_data_r), /* Port A read (VRAM data read)*/ -// DEVCB_NULL, /* Port B read */ -// DEVCB_HANDLER(ppi2_portc_r), /* Port C read */ -// DEVCB_HANDLER(vram_data_w), /* Port A write (VRAM data write) */ -// DEVCB_HANDLER(vram_addr_w), /* Port B write (VRAM address write) */ -// DEVCB_HANDLER(ppi2_portc_w) /* Port C write */ +// DEVCB_HANDLER(vram_data_r), /* Port A read (VRAM data read)*/ +// DEVCB_NULL, /* Port B read */ +// DEVCB_HANDLER(ppi2_portc_r), /* Port C read */ +// DEVCB_HANDLER(vram_data_w), /* Port A write (VRAM data write) */ +// DEVCB_HANDLER(vram_addr_w), /* Port B write (VRAM address write) */ +// DEVCB_HANDLER(ppi2_portc_w) /* Port C write */ /* PPI-2 is configured as mixed mode2 and mode0 output. It means that port A should be bidirectional and port B just as output. @@ -1640,7 +1640,7 @@ static MACHINE_DRIVER_START( noraut_base ) /* 3x 8255 */ MDRV_I8255A_ADD( "ppi8255_0", ppi8255_intf_0 ) MDRV_I8255A_ADD( "ppi8255_1", ppi8255_intf_1 ) -// MDRV_I8255A_ADD( "ppi8255_2", ppi8255_intf_2 ) +// MDRV_I8255A_ADD( "ppi8255_2", ppi8255_intf_2 ) /* video hardware */ MDRV_SCREEN_ADD("screen", RASTER) @@ -1961,7 +1961,7 @@ ROM_START( dphl ) ROM_LOAD( "dphl_36e3.u18", 0x1000, 0x1000, CRC(06cf6789) SHA1(587d883c399348b518e3be4d1dc2581824055328) ) ROM_REGION( 0x1000, "gfx", 0 ) -// ROM_FILL( 0x0000, 0x0800, 0xff ) +// ROM_FILL( 0x0000, 0x0800, 0xff ) ROM_LOAD( "dphl_model_2_cgi_3939.u31", 0x0000, 0x1000, CRC(2028db2c) SHA1(0f81bb71e88c60df3817f58c28715ce2ea01ad4d) ) ROM_REGION( 0x0100, "proms", 0 ) @@ -2010,7 +2010,7 @@ ROM_END /* -Hi-Lo Double Up Joker Poker +Hi-Lo Double Up Joker Poker SMS Manufacturing Corp., 1983. almost identical to DPHL. @@ -2118,51 +2118,51 @@ ROM_END */ static DRIVER_INIT( norautrh ) { -// UINT8 *ROM = memory_region(machine, "maincpu"); -// ROM[0x1110] = 0x00; -// ROM[0x1111] = 0x00; +// UINT8 *ROM = memory_region(machine, "maincpu"); +// ROM[0x1110] = 0x00; +// ROM[0x1111] = 0x00; } static DRIVER_INIT( norautpn ) { -// UINT8 *ROM = memory_region(machine, "maincpu"); -// ROM[0x0827] = 0x00; -// ROM[0x0828] = 0x00; +// UINT8 *ROM = memory_region(machine, "maincpu"); +// ROM[0x0827] = 0x00; +// ROM[0x0828] = 0x00; } static DRIVER_INIT( norautu ) { -// UINT8 *ROM = memory_region(machine, "maincpu"); -// ROM[0x083c] = 0x00; -// ROM[0x083d] = 0x00; -// ROM[0x083e] = 0x00; +// UINT8 *ROM = memory_region(machine, "maincpu"); +// ROM[0x083c] = 0x00; +// ROM[0x083d] = 0x00; +// ROM[0x083e] = 0x00; } static DRIVER_INIT( gtipoker ) { -// UINT8 *ROM = memory_region(machine, "maincpu"); -// ROM[0x0cc6] = 0x00; -// ROM[0x0cc7] = 0x00; -// ROM[0x0cc8] = 0x00; -// ROM[0x10a5] = 0x00; -// ROM[0x10a6] = 0x00; -// ROM[0x10a7] = 0x00; +// UINT8 *ROM = memory_region(machine, "maincpu"); +// ROM[0x0cc6] = 0x00; +// ROM[0x0cc7] = 0x00; +// ROM[0x0cc8] = 0x00; +// ROM[0x10a5] = 0x00; +// ROM[0x10a6] = 0x00; +// ROM[0x10a7] = 0x00; } static DRIVER_INIT( dphl ) { -// UINT8 *ROM = memory_region(machine, "maincpu"); -// ROM[0x1510] = 0x00; -// ROM[0x1511] = 0x00; -// ROM[0x1512] = 0x00; +// UINT8 *ROM = memory_region(machine, "maincpu"); +// ROM[0x1510] = 0x00; +// ROM[0x1511] = 0x00; +// ROM[0x1512] = 0x00; } static DRIVER_INIT( dphla ) { -// UINT8 *ROM = memory_region(machine, "maincpu"); -// ROM[0x0b09] = 0x00; -// ROM[0x0b0a] = 0x00; -// ROM[0x0b0b] = 0x00; +// UINT8 *ROM = memory_region(machine, "maincpu"); +// ROM[0x0b09] = 0x00; +// ROM[0x0b0a] = 0x00; +// ROM[0x0b0b] = 0x00; } diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 0ade5f22498..d8febfdbb26 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -2199,26 +2199,26 @@ WRITE16_HANDLER( setaroul_spr_w ) { int realoffs = offset; realoffs >>=1; - + if (!(offset & 1)) { data = data >> 8; mem_mask = mem_mask >> 8; } - + COMBINE_DATA(&spriteram16[realoffs]); } static ADDRESS_MAP_START( setaroul_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x01ffff) AM_ROM // ROM - + AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_BASE(&spriteram16_2) // Sprites Code + X + Attr (maybe not) - + AM_RANGE(0xc40000, 0xc40001) AM_RAM //AM_BASE(&seta_vregs) AM_RANGE(0xc80000, 0xc80001) AM_NOP - + AM_RANGE(0xcc0000, 0xcc0019) AM_READ(setaroul_c0_r) AM_RANGE(0xd00000, 0xd00001) AM_NOP // watchdog? @@ -2229,11 +2229,11 @@ static ADDRESS_MAP_START( setaroul_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xd4000a, 0xd4000b) AM_READ(setaroul_d4_a_r) AM_RANGE(0xd40010, 0xd40011) AM_READ(setaroul_d4_10_r) AM_WRITENOP // multiplex? - AM_RANGE(0xdc0000, 0xdc3fff) AM_RAM - + AM_RANGE(0xdc0000, 0xdc3fff) AM_RAM + AM_RANGE(0xe00000, 0xe03fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE(&seta_vram_0 ) // VRAM - draws wheel if you reset enough times.. AM_RANGE(0xe40000, 0xe40005) AM_RAM AM_BASE(&seta_vctrl_0) // VRAM Ctrl - AM_RANGE(0xf00000, 0xf03fff) AM_RAM + AM_RANGE(0xf00000, 0xf03fff) AM_RAM AM_RANGE(0xf40000, 0xf40c11) AM_WRITE(setaroul_spr_w) AM_BASE(&spriteram16) // Sprites Y ADDRESS_MAP_END @@ -7357,7 +7357,7 @@ static MACHINE_DRIVER_START( setaroul ) MDRV_VIDEO_START(seta_1_layer) MDRV_VIDEO_EOF(seta_buffer_sprites) /* qzkklogy uses sprite buffering */ MDRV_VIDEO_UPDATE(seta) - + /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") diff --git a/src/mame/drivers/stepstag.c b/src/mame/drivers/stepstag.c index 29666f98924..15cb8e169d9 100644 --- a/src/mame/drivers/stepstag.c +++ b/src/mame/drivers/stepstag.c @@ -229,7 +229,7 @@ ROM_REGION( 0x100000, "maincpu", 0 ) /* 68k */ DISK_IMAGE("step3", 0, NO_DUMP) ROM_END -//GAME( 1999, stepstag, 0, stepstag, stepstag, 0, ROT0, "Jaleco", "Stepping Stage", GAME_NO_SOUND| GAME_NOT_WORKING) // Original Game +//GAME( 1999, stepstag, 0, stepstag, stepstag, 0, ROT0, "Jaleco", "Stepping Stage", GAME_NO_SOUND| GAME_NOT_WORKING) // Original Game GAME( 1999, stepstag, 0, stepstag, stepstag, 0, ROT0, "Jaleco", "Stepping Stage Special", GAME_NO_SOUND| GAME_NOT_WORKING) //GAME( 1999, stepstag, 0, stepstag, stepstag, 0, ROT0, "Jaleco", "Stepping Stage 2 Supreme", GAME_NO_SOUND| GAME_NOT_WORKING) GAME( 1999, step3, 0, stepstag, stepstag, 0, ROT0, "Jaleco", "Stepping 3 Superior", GAME_NO_SOUND| GAME_NOT_WORKING) diff --git a/src/mame/machine/n64.c b/src/mame/machine/n64.c index a7f772b658a..5e83f17f71c 100644 --- a/src/mame/machine/n64.c +++ b/src/mame/machine/n64.c @@ -1892,7 +1892,7 @@ READ32_HANDLER( n64_si_reg_r ) { switch (offset) { - //case 0x00/4: // SI_DRAM_ADDR_REG + //case 0x00/4: // SI_DRAM_ADDR_REG //return si_dram_addr; case 0x18/4: // SI_STATUS_REG diff --git a/src/mame/machine/naomibd.c b/src/mame/machine/naomibd.c index 02a58e07076..bff19e3a67b 100644 --- a/src/mame/machine/naomibd.c +++ b/src/mame/machine/naomibd.c @@ -286,9 +286,9 @@ static const naomibd_config_table naomibd_translate_tbl[] = 0x2924, 0, 0x080000, 0x3222, 0, 0x090000, 0x7954, 0, 0x0a0000, 0x5acd, 0, 0x0b0000, 0xdd19, 0, 0x0c0000, 0x2428, 0, 0x0d0000, 0x3329, 0, 0x0e0000, 0x2142, 0, 0x0f0000, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "crzytaxi", 0,{ 0x0219, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "jambo", 0,{ 0x0223, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "18wheelr", 0,{ 0x1502, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "crzytaxi", 0,{ 0x0219, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "jambo", 0,{ 0x0223, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "18wheelr", 0,{ 0x1502, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, }; /*************************************************************************** diff --git a/src/mame/video/model3.c b/src/mame/video/model3.c index be61ee1c91a..ac962c9db5d 100644 --- a/src/mame/video/model3.c +++ b/src/mame/video/model3.c @@ -1249,10 +1249,10 @@ static void draw_model(UINT32 addr) if( (header[6] & 0x800000) && (!(header[1] & 0x0010)) ) { if(sn[0]*clip_vert[0].x + sn[1]*clip_vert[0].y + sn[2]*clip_vert[0].pz >0) back_face = 1; - else + else back_face = 0; } - else + else back_face = 0; //no culling for transparent or two-sided polygons if(!back_face) { diff --git a/src/version.c b/src/version.c index aeef3a71646..d5da4c0fca6 100644 --- a/src/version.c +++ b/src/version.c @@ -10,4 +10,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.134u3 ("__DATE__")"; +const char build_version[] = "0.134u4 ("__DATE__")";