diff options
author | Aaron Giles <aaron@aarongiles.com> | 2009-06-08 07:28:13 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2009-06-08 07:28:13 +0000 |
commit | 31d3633838943320f8ae7b4076ec6c20ccfa7a82 (patch) | |
tree | 8d32df9e37ff828d2cf5e72c67d8b387556a7fdc | |
parent | ef0a31ca13fd0598fd9d694d5bc0bee0a0f23f3b (diff) |
Cleanups and version bump.mame0132
-rw-r--r-- | src/emu/devintrf.c | 4 | ||||
-rw-r--r-- | src/mame/drivers/aristmk4.c | 8 | ||||
-rw-r--r-- | src/mame/drivers/megadriv.c | 26 | ||||
-rw-r--r-- | src/mame/drivers/mirax.c | 8 | ||||
-rw-r--r-- | src/mame/drivers/triforce.c | 2 | ||||
-rw-r--r-- | src/mame/mame.mak | 1 | ||||
-rw-r--r-- | src/mame/mamedriv.c | 5 | ||||
-rw-r--r-- | src/version.c | 2 |
8 files changed, 29 insertions, 27 deletions
diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c index ac86a2c74e7..c04d5ee71f9 100644 --- a/src/emu/devintrf.c +++ b/src/emu/devintrf.c @@ -247,7 +247,7 @@ const char *device_inherit_tag(astring *dest, const char *sourcetag, const char /*------------------------------------------------- - device_get_contract - find a given contract + device_get_contract - find a given contract on a device -------------------------------------------------*/ @@ -258,7 +258,7 @@ const device_contract *device_get_contract(const device_config *device, const ch /* if no contracts, obviously we don't have it */ if (contract == NULL) return NULL; - + /* scan forward through the array looking for a match */ for ( ; contract->name != NULL; contract++) if (strcmp(name, contract->name) == 0) diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c index 7dd46e0b7f5..0ae62fc5af3 100644 --- a/src/mame/drivers/aristmk4.c +++ b/src/mame/drivers/aristmk4.c @@ -382,10 +382,10 @@ static const ay8910_interface ay8910_config2 = /* static const via6522_interface via_interface = { - // DEVCB_HANDLER(via_a_in), DEVCB_HANDLER(via_b_in), - // DEVCB_HANDLER(input_ca1), DEVCB_HANDLER(input_cb1), DEVCB_HANDLER(input_ca2), DEVCB_HANDLER(input_cb2), - /// DEVCB_NULL, DEVCB_HANDLER(output_b), - // DEVCB_HANDLER(output_ca1), DEVCB_HANDLER(output_cb1), DEVCB_HANDLER(output_ca2), DEVCB_HANDLER(output_cb2), + // DEVCB_HANDLER(via_a_in), DEVCB_HANDLER(via_b_in), + // DEVCB_HANDLER(input_ca1), DEVCB_HANDLER(input_cb1), DEVCB_HANDLER(input_ca2), DEVCB_HANDLER(input_cb2), + /// DEVCB_NULL, DEVCB_HANDLER(output_b), + // DEVCB_HANDLER(output_ca1), DEVCB_HANDLER(output_cb1), DEVCB_HANDLER(output_ca2), DEVCB_HANDLER(output_cb2), // DEVCB_CPU_INPUT_LINE("maincpu", M6809_FIRQ_LINE) }; */ diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c index 97ec475513b..9d3635eaaeb 100644 --- a/src/mame/drivers/megadriv.c +++ b/src/mame/drivers/megadriv.c @@ -1637,7 +1637,7 @@ INPUT_PORTS_START( aladbl ) PORT_DIPSETTING( 0x05, DEF_STR( 1C_5C ) ) PORT_DIPSETTING( 0x06, DEF_STR( 1C_6C ) ) PORT_DIPSETTING( 0x07, DEF_STR( 1C_7C ) ) -// PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* to avoid it being changed and corrupting Coinage settings */ +// PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* to avoid it being changed and corrupting Coinage settings */ PORT_DIPNAME( 0x30, 0x00, DEF_STR( Difficulty ) ) /* code at 0x1b2680 */ PORT_DIPSETTING( 0x10, DEF_STR( Easy ) ) /* "PRACTICE" */ PORT_DIPSETTING( 0x00, DEF_STR( Normal ) ) /* "NORMAL" */ @@ -1683,14 +1683,14 @@ static UINT8 megadrive_io_read_data_port_6button(running_machine *machine, int p if (io_stage[portnum] == 2) { /* here we read B, C & the additional buttons */ - retdata = (megadrive_io_data_regs[portnum] & helper) | - (((input_port_read_safe(machine, pad3names[portnum], 0) & 0x30) | + retdata = (megadrive_io_data_regs[portnum] & helper) | + (((input_port_read_safe(machine, pad3names[portnum], 0) & 0x30) | (input_port_read_safe(machine, pad6names[portnum], 0) & 0x0f)) & ~helper); } else { /* here we read B, C & the directional buttons */ - retdata = (megadrive_io_data_regs[portnum] & helper) | + retdata = (megadrive_io_data_regs[portnum] & helper) | ((input_port_read_safe(machine, pad3names[portnum], 0) & 0x3f) & ~helper); } } @@ -1699,20 +1699,20 @@ static UINT8 megadrive_io_read_data_port_6button(running_machine *machine, int p if (io_stage[portnum] == 1) { /* here we read ((Start & A) >> 2) | 0x00 */ - retdata = (megadrive_io_data_regs[portnum] & helper) | + retdata = (megadrive_io_data_regs[portnum] & helper) | (((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) & ~helper); } else if (io_stage[portnum]==2) { /* here we read ((Start & A) >> 2) | 0x0f */ - retdata = (megadrive_io_data_regs[portnum] & helper) | + retdata = (megadrive_io_data_regs[portnum] & helper) | ((((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) | 0x0f) & ~helper); } else { /* here we read ((Start & A) >> 2) | Up and Down */ - retdata = (megadrive_io_data_regs[portnum] & helper) | - ((((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) | + retdata = (megadrive_io_data_regs[portnum] & helper) | + ((((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) | (input_port_read_safe(machine, pad3names[portnum], 0) & 0x03)) & ~helper); } } @@ -1732,14 +1732,14 @@ static UINT8 megadrive_io_read_data_port_3button(running_machine *machine, int p if (megadrive_io_data_regs[portnum] & 0x40) { /* here we read B, C & the directional buttons */ - retdata = (megadrive_io_data_regs[portnum] & helper) | + retdata = (megadrive_io_data_regs[portnum] & helper) | (((input_port_read_safe(machine, pad3names[portnum], 0) & 0x3f) | 0x40) & ~helper); } else { /* here we read ((Start & A) >> 2) | Up and Down */ - retdata = (megadrive_io_data_regs[portnum] & helper) | - ((((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) | + retdata = (megadrive_io_data_regs[portnum] & helper) | + ((((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) | (input_port_read_safe(machine, pad3names[portnum], 0) & 0x03) | 0x40) & ~helper); } @@ -1754,7 +1754,7 @@ UINT8 megatech_bios_port_cc_dc_r(running_machine *machine, int offset, int ctrl) if (ctrl == 0x55) { /* A keys */ - retdata = ((input_port_read(machine, "PAD1") & 0x40) >> 2) | + retdata = ((input_port_read(machine, "PAD1") & 0x40) >> 2) | ((input_port_read(machine, "PAD2") & 0x40) >> 4) | 0xeb; } else @@ -5925,7 +5925,7 @@ VIDEO_EOF(megadriv) megadrive_imode_odd_frame^=1; // cputag_set_input_line(machine, "genesis_snd_z80", 0, CLEAR_LINE); // if the z80 interrupt hasn't happened by now, clear it.. - if (input_port_read_safe(machine, "RESET", 0x00) & 0x01) + if (input_port_read_safe(machine, "RESET", 0x00) & 0x01) cputag_set_input_line(machine, "maincpu", INPUT_LINE_RESET, PULSE_LINE); /* diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c index bc3d9e534e9..95d5a47cb2f 100644 --- a/src/mame/drivers/mirax.c +++ b/src/mame/drivers/mirax.c @@ -212,12 +212,12 @@ static ADDRESS_MAP_START( mirax_main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xf200, 0xf200) AM_READ_PORT("DSW1") AM_RANGE(0xf300, 0xf300) AM_READ(unk_r) //watchdog? value is always read then discarded AM_RANGE(0xf400, 0xf400) AM_READ_PORT("DSW2") -// AM_RANGE(0xf500, 0xf500) //coin counter +// AM_RANGE(0xf500, 0xf500) //coin counter AM_RANGE(0xf501, 0xf501) AM_WRITE(nmi_mask_w) -// AM_RANGE(0xf506, 0xf506) -// AM_RANGE(0xf507, 0xf507) +// AM_RANGE(0xf506, 0xf506) +// AM_RANGE(0xf507, 0xf507) AM_RANGE(0xf800, 0xf800) AM_WRITE(mirax_sound_cmd_w) -// AM_RANGE(0xf900, 0xf900) //sound cmd mirror? ack? +// AM_RANGE(0xf900, 0xf900) //sound cmd mirror? ack? ADDRESS_MAP_END static ADDRESS_MAP_START( mirax_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) diff --git a/src/mame/drivers/triforce.c b/src/mame/drivers/triforce.c index 05f85f97792..06920a8c8e5 100644 --- a/src/mame/drivers/triforce.c +++ b/src/mame/drivers/triforce.c @@ -707,5 +707,3 @@ GAME( 2004, vs4j, triforce, triforcegd, triforce, 0, ROT0, "Sega", GAME( 2004, vs4, triforce, triforcegd, triforce, 0, ROT0, "Sega", "Virtua Striker 4 (Export) (GDT-0015)", GAME_NO_SOUND|GAME_NOT_WORKING ) GAME( 2004, avalon20, triforce, triforcegd, triforce, 0, ROT0, "Sega", "The Key Of Avalon 2.0 - Eutaxy and Commandment - Client (GDT-0017B) (V3.001)", GAME_NO_SOUND|GAME_NOT_WORKING ) GAME( 2006, vs42006, triforce, triforcegd, triforce, 0, ROT0, "Sega", "Virtua Striker 4 ver. 2006 (Rev D) (Japan) (GDT-0020D)", GAME_NO_SOUND|GAME_NOT_WORKING ) - - diff --git a/src/mame/mame.mak b/src/mame/mame.mak index b385cbaa5fb..d539550abf5 100644 --- a/src/mame/mame.mak +++ b/src/mame/mame.mak @@ -368,6 +368,7 @@ $(MAMEOBJ)/amiga.a: \ $(MAMEOBJ)/aristocr.a: \ $(DRIVERS)/86lions.o \ $(DRIVERS)/caswin.o \ + $(DRIVERS)/aristmk4.o \ $(DRIVERS)/aristmk5.o \ $(MACHINE)/archimds.o \ diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c index 7534e315591..840dc134c55 100644 --- a/src/mame/mamedriv.c +++ b/src/mame/mamedriv.c @@ -9085,11 +9085,14 @@ Other Sun games DRIVER( 86lions ) /* (c) 1985? */ DRIVER( caswin ) /* (c) 1985 */ + /* Aristocrat Mk4 hardware */ + DRIVER( eforest ) /* (c) 1994 */ + /* Aristocrat Mk5 hardware */ DRIVER( swthrt2v ) /* (c) 1995 */ DRIVER( enchfrst ) /* (c) 1995 */ DRIVER( dolphntr ) /* (c) 1996 */ - DRIVER( dolphtra ) /* (c) 1996 */ + DRIVER( dolphtra ) /* (c) 1996 */ DRIVER( dmdtouch ) /* (c) 1997 */ DRIVER( goldprmd ) /* (c) 1997 */ DRIVER( qotn ) /* (c) 1997 */ diff --git a/src/version.c b/src/version.c index f812631637a..9d0861ba776 100644 --- a/src/version.c +++ b/src/version.c @@ -10,4 +10,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.131u4 ("__DATE__")"; +const char build_version[] = "0.132 ("__DATE__")"; |