diff options
author | Aaron Giles <aaron@aarongiles.com> | 2009-03-28 22:10:55 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2009-03-28 22:10:55 +0000 |
commit | 9c63c950435a3d896cfb5d0d8cb639d55f559819 (patch) | |
tree | be1350d8272557292cc78787c62b3a38791db700 /src/mame/drivers | |
parent | 1c61e96910d5ccf215c64aad8ea70e35da719bae (diff) |
Cleanups and version bump.mame0130u2
Diffstat (limited to 'src/mame/drivers')
-rw-r--r-- | src/mame/drivers/cubocd32.c | 18 | ||||
-rw-r--r-- | src/mame/drivers/eolith.c | 24 | ||||
-rw-r--r-- | src/mame/drivers/galpani2.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/model2.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/munchmo.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/naomi.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/pgm.c | 14 | ||||
-rw-r--r-- | src/mame/drivers/royalmah.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/seibuspi.c | 4 |
9 files changed, 36 insertions, 36 deletions
diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c index 6baee77d9aa..e7cb94fff64 100644 --- a/src/mame/drivers/cubocd32.c +++ b/src/mame/drivers/cubocd32.c @@ -150,24 +150,24 @@ static void cubocd32_potgo_w(running_machine *machine, UINT16 data) potgo_value = potgo_value & 0x5500; potgo_value |= data & 0xaa00; - for (i = 0; i < 8; i += 2) + for (i = 0; i < 8; i += 2) { UINT16 dir = 0x0200 << i; - if (data & dir) + if (data & dir) { UINT16 d = 0x0100 << i; potgo_value &= ~d; potgo_value |= data & d; } } - for (i = 0; i < 2; i++) + for (i = 0; i < 2; i++) { UINT16 p5dir = 0x0200 << (i * 4); /* output enable P5 */ UINT16 p5dat = 0x0100 << (i * 4); /* data P5 */ if ((potgo_value & p5dir) && (potgo_value & p5dat)) cd32_shifter[i] = 8; } - + } static void handle_cd32_joystick_cia(UINT8 pra, UINT8 dra) @@ -175,16 +175,16 @@ static void handle_cd32_joystick_cia(UINT8 pra, UINT8 dra) static int oldstate[2]; int i; - for (i = 0; i < 2; i++) + for (i = 0; i < 2; i++) { UINT8 but = 0x40 << i; UINT16 p5dir = 0x0200 << (i * 4); /* output enable P5 */ UINT16 p5dat = 0x0100 << (i * 4); /* data P5 */ - if (!(potgo_value & p5dir) || !(potgo_value & p5dat)) + if (!(potgo_value & p5dir) || !(potgo_value & p5dat)) { - if ((dra & but) && (pra & but) != oldstate[i]) + if ((dra & but) && (pra & but) != oldstate[i]) { - if (!(pra & but)) + if (!(pra & but)) { cd32_shifter[i]--; if (cd32_shifter[i] < 0) @@ -200,7 +200,7 @@ static UINT16 handle_joystick_potgor (running_machine *machine, UINT16 potgor) { int i; - for (i = 0; i < 2; i++) + for (i = 0; i < 2; i++) { UINT16 p9dir = 0x0800 << (i * 4); /* output enable P9 */ UINT16 p9dat = 0x0400 << (i * 4); /* data P9 */ diff --git a/src/mame/drivers/eolith.c b/src/mame/drivers/eolith.c index eced5c61e84..5bebb90f6d4 100644 --- a/src/mame/drivers/eolith.c +++ b/src/mame/drivers/eolith.c @@ -122,20 +122,20 @@ static WRITE32_HANDLER( systemcontrol_w ) } static READ32_HANDLER( hidctch3_pen1_r ) -{ +{ //320 x 240 int xpos = input_port_read(space->machine, "PEN_X_P1"); int ypos = input_port_read(space->machine, "PEN_Y_P1"); - + return xpos + (ypos*168*2); } static READ32_HANDLER( hidctch3_pen2_r ) -{ +{ //320 x 240 int xpos = input_port_read(space->machine, "PEN_X_P2"); int ypos = input_port_read(space->machine, "PEN_Y_P2"); - + return xpos + (ypos*168*2); } @@ -273,7 +273,7 @@ static INPUT_PORTS_START( hidctch3 ) PORT_START("PEN_Y_P1") PORT_BIT( 0xffff, 0, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_MINMAX(0,119) PORT_SENSITIVITY(25) PORT_KEYDELTA(1) PORT_PLAYER(1) - + PORT_START("PEN_X_P2") PORT_BIT( 0xffff, 0, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0,159) PORT_SENSITIVITY(25) PORT_KEYDELTA(1) PORT_PLAYER(2) @@ -365,9 +365,9 @@ MACHINE_DRIVER_END -/* +/* -Iron Fortress +Iron Fortress Eolith, 1998 This game runs on hardware that looks exactly like the Gradation 2D PCB @@ -1032,17 +1032,17 @@ static DRIVER_INIT( hidctch2 ) } static DRIVER_INIT( hidctch3 ) -{ +{ memory_install_write32_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xfc200000, 0xfc200003, 0, 0, SMH_NOP); // this generates pens vibration - + // It is not clear why the first reads are needed too - + memory_install_read32_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xfce00000, 0xfce00003, 0, 0, hidctch3_pen1_r); memory_install_read32_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xfce80000, 0xfce80003, 0, 0, hidctch3_pen1_r); - + memory_install_read32_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xfcf00000, 0xfcf00003, 0, 0, hidctch3_pen2_r); memory_install_read32_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xfcf80000, 0xfcf80003, 0, 0, hidctch3_pen2_r); - + init_eolith_speedup(machine); } diff --git a/src/mame/drivers/galpani2.c b/src/mame/drivers/galpani2.c index 41478b6a03b..8262215ba7f 100644 --- a/src/mame/drivers/galpani2.c +++ b/src/mame/drivers/galpani2.c @@ -134,7 +134,7 @@ static void galpani2_mcu_nmi(running_machine *machine) break; //case 0x02: //?, gp2se is the only one to use it, often! - // break; + // break; case 0x0a: // Copy N bytes from RAM1 to RAM2 mcu_src = (memory_read_byte(srcspace, mcu_address + 2)<<8) + diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c index 932fce93a48..9353f15f615 100644 --- a/src/mame/drivers/model2.c +++ b/src/mame/drivers/model2.c @@ -406,7 +406,7 @@ static WRITE32_HANDLER( pal32_w ) static WRITE32_HANDLER( ctrl0_w ) { - if(ACCESSING_BITS_0_7) + if(ACCESSING_BITS_0_7) { model2_ctrlmode = data & 0x01; eeprom_write_bit(data & 0x20); diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c index b4648dcc6b4..0ad8631afc3 100644 --- a/src/mame/drivers/munchmo.c +++ b/src/mame/drivers/munchmo.c @@ -297,7 +297,7 @@ static MACHINE_DRIVER_START( mnchmobl ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - + /* AY clock speeds confirmed to match known recording */ MDRV_SOUND_ADD("ay1", AY8910, XTAL_15MHz/4/2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index 708fed4c117..36b7577dce7 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -819,7 +819,7 @@ static NVRAM_HANDLER( naomi_eeproms ) } else { - // int a; + // int a; UINT32 length, size; UINT8 *dat; diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c index 831909f3e27..2092c753f62 100644 --- a/src/mame/drivers/pgm.c +++ b/src/mame/drivers/pgm.c @@ -166,8 +166,8 @@ ASIC 25 + ASIC 28 ASIC 27 (5585E): performs a variety of calculations, quite complex, different per region, supplies region code used by: - Knights of Valour 1 / Plus - Photo Y2k / Real and Fake + Knights of Valour 1 / Plus + Photo Y2k / Real and Fake ASIC 27A(5585F/5585G): arm7 cpu with 16kb internal rom (different per game / region) + optional external data rom @@ -899,8 +899,8 @@ static ADDRESS_MAP_START( svg_68k_mem, ADDRESS_SPACE_PROGRAM, 16) AM_RANGE(0xc10000, 0xc1ffff) AM_READWRITE(z80_ram_r, z80_ram_w) /* Z80 Program */ AM_RANGE(0x500000, 0x51ffff) AM_READWRITE(svg_m68k_ram_r, svg_m68k_ram_w) /* ARM7 Shared RAM */ - AM_RANGE(0x5c0000, 0x5c0001) AM_READWRITE(svg_68k_nmi_r, svg_68k_nmi_w) /* ARM7 FIQ */ - AM_RANGE(0x5c0300, 0x5c0301) AM_READWRITE(arm7_latch_68k_r, svg_latch_68k_w) /* ARM7 Latch */ + AM_RANGE(0x5c0000, 0x5c0001) AM_READWRITE(svg_68k_nmi_r, svg_68k_nmi_w) /* ARM7 FIQ */ + AM_RANGE(0x5c0300, 0x5c0301) AM_READWRITE(arm7_latch_68k_r, svg_latch_68k_w) /* ARM7 Latch */ ADDRESS_MAP_END static ADDRESS_MAP_START( svg_arm7_map, ADDRESS_SPACE_PROGRAM, 32 ) @@ -2035,7 +2035,7 @@ static READ16_HANDLER( olds_prot_swap_r16 ) return pgm_mainram[0x178F4/2]; else //game return pgm_mainram[0x178D8/2]; - + } static DRIVER_INIT( olds ) @@ -3626,7 +3626,7 @@ ROM_START( puzzli2 ) ROM_REGION32_LE( 0x4000000, "user1", ROMREGION_ERASEFF ) /* not on this PCB */ - + ROM_REGION( 0x600000, "gfx1", ROMREGION_DISPOSE ) /* 8x8 Text Tiles + 32x32 BG Tiles */ ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // (BIOS) ROM_LOAD( "t0900.u9", 0x400000, 0x200000, CRC(70615611) SHA1(a46d4aa71396947b427f9ba4ba0e636876c09d6b) ) @@ -4007,7 +4007,7 @@ ROM_START( killbldp ) /* CPU2 = Z80, romless, code uploaded by 68k */ ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */ - ROM_LOAD( "kbex_027a.rom", 0x000000, 0x04000, NO_DUMP ) + ROM_LOAD( "kbex_027a.rom", 0x000000, 0x04000, NO_DUMP ) ROM_REGION( 0x800000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */ ROM_LOAD( "kbex_v300x.u26", 0x000000, 0x200000, CRC(144388c8) ) diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c index 9b562a425f7..8b8f9cc0745 100644 --- a/src/mame/drivers/royalmah.c +++ b/src/mame/drivers/royalmah.c @@ -84,7 +84,7 @@ Stephh's notes (based on the games Z80 code and some tests) : hidden options. (thanks bnathan) 2009-03-25 FP: fixed verified DSW and default settings for mjclub (thanks to - translation from manual by Yasu) + translation from manual by Yasu) ****************************************************************************/ @@ -1161,7 +1161,7 @@ static WRITE8_HANDLER( mjvegasa_coin_counter_w ) static WRITE8_HANDLER( mjvegasa_12400_w ) { // bits 0 & 1 -// popmessage("UNK: %02x",data); +// popmessage("UNK: %02x",data); } static READ8_HANDLER( mjvegasa_12500_r ) { diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index 7a6e402e2a2..e1f0b0e5fde 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -2205,12 +2205,12 @@ static DRIVER_INIT( sys386f2 ) int i, j; UINT16 *src = (UINT16 *)memory_region(machine, "gfx3"); UINT16 tmp[0x40 / 2], Offset; - + // sprite_reorder() only for(i = 0; i < memory_region_length(machine, "gfx3") / 0x40; i++) { memcpy(tmp, src, 0x40); - + for(j = 0; j < 0x40 / 2; j++) { Offset = (j >> 1) | (j << 4 & 0x10); |