Skip to content

Commit 31d3633

Browse files
aaronsgilesaaronsgiles
committed
Cleanups and version bump.
1 parent ef0a31c commit 31d3633

File tree

8 files changed

+29
-27
lines changed

8 files changed

+29
-27
lines changed

‎src/emu/devintrf.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ const char *device_inherit_tag(astring *dest, const char *sourcetag, const char
247247

248248

249249
/*-------------------------------------------------
250-
device_get_contract - find a given contract
250+
device_get_contract - find a given contract
251251
on a device
252252
-------------------------------------------------*/
253253

@@ -258,7 +258,7 @@ const device_contract *device_get_contract(const device_config *device, const ch
258258
/* if no contracts, obviously we don't have it */
259259
if (contract == NULL)
260260
return NULL;
261-
261+
262262
/* scan forward through the array looking for a match */
263263
for ( ; contract->name != NULL; contract++)
264264
if (strcmp(name, contract->name) == 0)

‎src/mame/drivers/aristmk4.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -382,10 +382,10 @@ static const ay8910_interface ay8910_config2 =
382382
/*
383383
static const via6522_interface via_interface =
384384
{
385-
// DEVCB_HANDLER(via_a_in), DEVCB_HANDLER(via_b_in),
386-
// DEVCB_HANDLER(input_ca1), DEVCB_HANDLER(input_cb1), DEVCB_HANDLER(input_ca2), DEVCB_HANDLER(input_cb2),
387-
/// DEVCB_NULL, DEVCB_HANDLER(output_b),
388-
// DEVCB_HANDLER(output_ca1), DEVCB_HANDLER(output_cb1), DEVCB_HANDLER(output_ca2), DEVCB_HANDLER(output_cb2),
385+
// DEVCB_HANDLER(via_a_in), DEVCB_HANDLER(via_b_in),
386+
// DEVCB_HANDLER(input_ca1), DEVCB_HANDLER(input_cb1), DEVCB_HANDLER(input_ca2), DEVCB_HANDLER(input_cb2),
387+
/// DEVCB_NULL, DEVCB_HANDLER(output_b),
388+
// DEVCB_HANDLER(output_ca1), DEVCB_HANDLER(output_cb1), DEVCB_HANDLER(output_ca2), DEVCB_HANDLER(output_cb2),
389389
// DEVCB_CPU_INPUT_LINE("maincpu", M6809_FIRQ_LINE)
390390
}; */
391391

‎src/mame/drivers/megadriv.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,7 +1637,7 @@ INPUT_PORTS_START( aladbl )
16371637
PORT_DIPSETTING( 0x05, DEF_STR( 1C_5C ) )
16381638
PORT_DIPSETTING( 0x06, DEF_STR( 1C_6C ) )
16391639
PORT_DIPSETTING( 0x07, DEF_STR( 1C_7C ) )
1640-
// PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* to avoid it being changed and corrupting Coinage settings */
1640+
// PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* to avoid it being changed and corrupting Coinage settings */
16411641
PORT_DIPNAME( 0x30, 0x00, DEF_STR( Difficulty ) ) /* code at 0x1b2680 */
16421642
PORT_DIPSETTING( 0x10, DEF_STR( Easy ) ) /* "PRACTICE" */
16431643
PORT_DIPSETTING( 0x00, DEF_STR( Normal ) ) /* "NORMAL" */
@@ -1683,14 +1683,14 @@ static UINT8 megadrive_io_read_data_port_6button(running_machine *machine, int p
16831683
if (io_stage[portnum] == 2)
16841684
{
16851685
/* here we read B, C & the additional buttons */
1686-
retdata = (megadrive_io_data_regs[portnum] & helper) |
1687-
(((input_port_read_safe(machine, pad3names[portnum], 0) & 0x30) |
1686+
retdata = (megadrive_io_data_regs[portnum] & helper) |
1687+
(((input_port_read_safe(machine, pad3names[portnum], 0) & 0x30) |
16881688
(input_port_read_safe(machine, pad6names[portnum], 0) & 0x0f)) & ~helper);
16891689
}
16901690
else
16911691
{
16921692
/* here we read B, C & the directional buttons */
1693-
retdata = (megadrive_io_data_regs[portnum] & helper) |
1693+
retdata = (megadrive_io_data_regs[portnum] & helper) |
16941694
((input_port_read_safe(machine, pad3names[portnum], 0) & 0x3f) & ~helper);
16951695
}
16961696
}
@@ -1699,20 +1699,20 @@ static UINT8 megadrive_io_read_data_port_6button(running_machine *machine, int p
16991699
if (io_stage[portnum] == 1)
17001700
{
17011701
/* here we read ((Start & A) >> 2) | 0x00 */
1702-
retdata = (megadrive_io_data_regs[portnum] & helper) |
1702+
retdata = (megadrive_io_data_regs[portnum] & helper) |
17031703
(((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) & ~helper);
17041704
}
17051705
else if (io_stage[portnum]==2)
17061706
{
17071707
/* here we read ((Start & A) >> 2) | 0x0f */
1708-
retdata = (megadrive_io_data_regs[portnum] & helper) |
1708+
retdata = (megadrive_io_data_regs[portnum] & helper) |
17091709
((((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) | 0x0f) & ~helper);
17101710
}
17111711
else
17121712
{
17131713
/* here we read ((Start & A) >> 2) | Up and Down */
1714-
retdata = (megadrive_io_data_regs[portnum] & helper) |
1715-
((((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) |
1714+
retdata = (megadrive_io_data_regs[portnum] & helper) |
1715+
((((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) |
17161716
(input_port_read_safe(machine, pad3names[portnum], 0) & 0x03)) & ~helper);
17171717
}
17181718
}
@@ -1732,14 +1732,14 @@ static UINT8 megadrive_io_read_data_port_3button(running_machine *machine, int p
17321732
if (megadrive_io_data_regs[portnum] & 0x40)
17331733
{
17341734
/* here we read B, C & the directional buttons */
1735-
retdata = (megadrive_io_data_regs[portnum] & helper) |
1735+
retdata = (megadrive_io_data_regs[portnum] & helper) |
17361736
(((input_port_read_safe(machine, pad3names[portnum], 0) & 0x3f) | 0x40) & ~helper);
17371737
}
17381738
else
17391739
{
17401740
/* here we read ((Start & A) >> 2) | Up and Down */
1741-
retdata = (megadrive_io_data_regs[portnum] & helper) |
1742-
((((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) |
1741+
retdata = (megadrive_io_data_regs[portnum] & helper) |
1742+
((((input_port_read_safe(machine, pad3names[portnum], 0) & 0xc0) >> 2) |
17431743
(input_port_read_safe(machine, pad3names[portnum], 0) & 0x03) | 0x40) & ~helper);
17441744
}
17451745

@@ -1754,7 +1754,7 @@ UINT8 megatech_bios_port_cc_dc_r(running_machine *machine, int offset, int ctrl)
17541754
if (ctrl == 0x55)
17551755
{
17561756
/* A keys */
1757-
retdata = ((input_port_read(machine, "PAD1") & 0x40) >> 2) |
1757+
retdata = ((input_port_read(machine, "PAD1") & 0x40) >> 2) |
17581758
((input_port_read(machine, "PAD2") & 0x40) >> 4) | 0xeb;
17591759
}
17601760
else
@@ -5925,7 +5925,7 @@ VIDEO_EOF(megadriv)
59255925
megadrive_imode_odd_frame^=1;
59265926
// cputag_set_input_line(machine, "genesis_snd_z80", 0, CLEAR_LINE); // if the z80 interrupt hasn't happened by now, clear it..
59275927

5928-
if (input_port_read_safe(machine, "RESET", 0x00) & 0x01)
5928+
if (input_port_read_safe(machine, "RESET", 0x00) & 0x01)
59295929
cputag_set_input_line(machine, "maincpu", INPUT_LINE_RESET, PULSE_LINE);
59305930

59315931
/*

‎src/mame/drivers/mirax.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,12 @@ static ADDRESS_MAP_START( mirax_main_map, ADDRESS_SPACE_PROGRAM, 8 )
212212
AM_RANGE(0xf200, 0xf200) AM_READ_PORT("DSW1")
213213
AM_RANGE(0xf300, 0xf300) AM_READ(unk_r) //watchdog? value is always read then discarded
214214
AM_RANGE(0xf400, 0xf400) AM_READ_PORT("DSW2")
215-
// AM_RANGE(0xf500, 0xf500) //coin counter
215+
// AM_RANGE(0xf500, 0xf500) //coin counter
216216
AM_RANGE(0xf501, 0xf501) AM_WRITE(nmi_mask_w)
217-
// AM_RANGE(0xf506, 0xf506)
218-
// AM_RANGE(0xf507, 0xf507)
217+
// AM_RANGE(0xf506, 0xf506)
218+
// AM_RANGE(0xf507, 0xf507)
219219
AM_RANGE(0xf800, 0xf800) AM_WRITE(mirax_sound_cmd_w)
220-
// AM_RANGE(0xf900, 0xf900) //sound cmd mirror? ack?
220+
// AM_RANGE(0xf900, 0xf900) //sound cmd mirror? ack?
221221
ADDRESS_MAP_END
222222

223223
static ADDRESS_MAP_START( mirax_sound_map, ADDRESS_SPACE_PROGRAM, 8 )

‎src/mame/drivers/triforce.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -707,5 +707,3 @@ GAME( 2004, vs4j, triforce, triforcegd, triforce, 0, ROT0, "Sega",
707707
GAME( 2004, vs4, triforce, triforcegd, triforce, 0, ROT0, "Sega", "Virtua Striker 4 (Export) (GDT-0015)", GAME_NO_SOUND|GAME_NOT_WORKING )
708708
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 )
709709
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 )
710-
711-

‎src/mame/mame.mak‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ $(MAMEOBJ)/amiga.a: \
368368
$(MAMEOBJ)/aristocr.a: \
369369
$(DRIVERS)/86lions.o \
370370
$(DRIVERS)/caswin.o \
371+
$(DRIVERS)/aristmk4.o \
371372
$(DRIVERS)/aristmk5.o \
372373
$(MACHINE)/archimds.o \
373374

‎src/mame/mamedriv.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9085,11 +9085,14 @@ Other Sun games
90859085
DRIVER( 86lions ) /* (c) 1985? */
90869086
DRIVER( caswin ) /* (c) 1985 */
90879087

9088+
/* Aristocrat Mk4 hardware */
9089+
DRIVER( eforest ) /* (c) 1994 */
9090+
90889091
/* Aristocrat Mk5 hardware */
90899092
DRIVER( swthrt2v ) /* (c) 1995 */
90909093
DRIVER( enchfrst ) /* (c) 1995 */
90919094
DRIVER( dolphntr ) /* (c) 1996 */
9092-
DRIVER( dolphtra ) /* (c) 1996 */
9095+
DRIVER( dolphtra ) /* (c) 1996 */
90939096
DRIVER( dmdtouch ) /* (c) 1997 */
90949097
DRIVER( goldprmd ) /* (c) 1997 */
90959098
DRIVER( qotn ) /* (c) 1997 */

‎src/version.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
***************************************************************************/
1111

1212
extern const char build_version[];
13-
const char build_version[] = "0.131u4 ("__DATE__")";
13+
const char build_version[] = "0.132 ("__DATE__")";

0 commit comments

Comments
 (0)