summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Aaron Giles <aaron@aarongiles.com>2009-07-20 07:20:41 +0000
committerGravatarGravatar Aaron Giles <aaron@aarongiles.com>2009-07-20 07:20:41 +0000
commit0fdce58484202265b0794a77652bb5e3da9c56af (patch)
tree430c3588fd8e47b541c1ce16201ec072d2f52d02
parent66bddc00bc0313afc97033abdaa364d0e1ff7c54 (diff)
Cleanups and version bump.mame0133
-rw-r--r--src/emu/cpu/cdp1802/cdp1802.c2
-rw-r--r--src/mame/drivers/cischeat.c2
-rw-r--r--src/mame/drivers/cliffhgr.c2
-rw-r--r--src/mame/drivers/darkhors.c6
-rw-r--r--src/mame/drivers/deco_ld.c6
-rw-r--r--src/mame/drivers/mpoker.c44
-rw-r--r--src/mame/drivers/taitogn.c26
-rw-r--r--src/mame/machine/naomibd.c14
-rw-r--r--src/mame/mamedriv.c16
-rw-r--r--src/version.c2
10 files changed, 60 insertions, 60 deletions
diff --git a/src/emu/cpu/cdp1802/cdp1802.c b/src/emu/cpu/cdp1802/cdp1802.c
index ce648cb6075..1d56f9105bd 100644
--- a/src/emu/cpu/cdp1802/cdp1802.c
+++ b/src/emu/cpu/cdp1802/cdp1802.c
@@ -896,7 +896,7 @@ static CPU_EXECUTE( cdp1802 )
/* execute initialization cycle */
cpustate->state = CDP1802_STATE_1_INIT;
cdp1802_run(device);
-
+
/* next state is IDLE */
cpustate->state = CDP1802_STATE_1_EXECUTE;
}
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index 12ca5c858f4..cea04a33f69 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -1769,7 +1769,7 @@ static INTERRUPT_GEN( interrupt_armchmp2)
{
case 0: cpu_set_input_line(device, 4, HOLD_LINE); break;
case 14: cpu_set_input_line(device, 2, HOLD_LINE); break;
-
+
default: break;
}
}
diff --git a/src/mame/drivers/cliffhgr.c b/src/mame/drivers/cliffhgr.c
index 727983708af..d0f3d0647e6 100644
--- a/src/mame/drivers/cliffhgr.c
+++ b/src/mame/drivers/cliffhgr.c
@@ -199,7 +199,7 @@ static TIMER_CALLBACK( cliff_irq_callback )
/* if we have a valid code, trigger an IRQ */
if (phillips_code & 0x800000)
{
-// printf("%2d:code = %06X\n", param, phillips_code);
+// printf("%2d:code = %06X\n", param, phillips_code);
cputag_set_input_line(machine, "maincpu", 0, ASSERT_LINE);
}
diff --git a/src/mame/drivers/darkhors.c b/src/mame/drivers/darkhors.c
index 8d35b31490d..1e14511a462 100644
--- a/src/mame/drivers/darkhors.c
+++ b/src/mame/drivers/darkhors.c
@@ -619,7 +619,7 @@ static const gfx_layout layout_16x16x8_jclub2 =
};
static GFXDECODE_START( jclub2 )
- //GFXDECODE_ENTRY( "maincpu", 0, layout_16x16x8_jclub2, 0, 0x10000/64 ) // color codes should be doubled
+ //GFXDECODE_ENTRY( "maincpu", 0, layout_16x16x8_jclub2, 0, 0x10000/64 ) // color codes should be doubled
GFXDECODE_END
@@ -679,12 +679,12 @@ VIDEO_START(jclub2)
if (machine->gfx[jclub2_gfx_index] == 0)
break;
- assert(jclub2_gfx_index != MAX_GFX_ELEMENTS);
+ assert(jclub2_gfx_index != MAX_GFX_ELEMENTS);
/* create the char set (gfx will then be updated dynamically from RAM) */
machine->gfx[jclub2_gfx_index] = gfx_element_alloc(machine, &layout_16x16x8_jclub2, (UINT8 *)jclub2_tileram, machine->config->total_colors / 16, 0);
-
+
}
VIDEO_UPDATE(jclub2)
diff --git a/src/mame/drivers/deco_ld.c b/src/mame/drivers/deco_ld.c
index 9119ca0998e..0472e20edc2 100644
--- a/src/mame/drivers/deco_ld.c
+++ b/src/mame/drivers/deco_ld.c
@@ -18,10 +18,10 @@ Data East 3-boardset, same hardware as Bega's Battle & Road Blaster, Sony
LDP-1000
MACH3 conversion kit (ROMs, disc, decals), Pioneer PR-8210
-There are four versions of the laserdisc.
+There are four versions of the laserdisc.
Pioneer (08359)
-Data East (Japan), LDS-301 with an orange label
+Data East (Japan), LDS-301 with an orange label
Data East (USA), LDS-301A with a green label
Sony (a1090731704132a)
@@ -35,7 +35,7 @@ which has a similar Sony label.
I peeled the Data East labels off an orange and a green labelled disc and
the labels underneath were identical to the Sony labelled disc (Sony Japan,
disc No.a1090731704132a).
-
+
Physical appearances aside, the Sony and Pioneer pressed discs have
identical content.
diff --git a/src/mame/drivers/mpoker.c b/src/mame/drivers/mpoker.c
index f64d8836d42..bdfbe60443e 100644
--- a/src/mame/drivers/mpoker.c
+++ b/src/mame/drivers/mpoker.c
@@ -41,7 +41,7 @@
| |___|___|___|___| |
| | | | | |
| |
- | 74LS253N 74LS253N 74LS253N 74LS253 |
+ | 74LS253N 74LS253N 74LS253N 74LS253 |
| _____________ |
| | 4700uF 35V | MC7812CT |
| -| Capacitor |- |
@@ -63,7 +63,7 @@
| | | 74LS367N 74LS161N 74LS161N 74LS04N DM7404N |
| | | |
| | | 74LS245PC _________ 74LS74N LM3302N |
- | | | | Z80 CPU | |
+ | | | | Z80 CPU | |
| | | 74LS245PC |___U1____| MM2114N-3 74LS174N 74LS166J |
| | | _____ |
| |_| 74LS138N 74LS245PC 74LS245PC MM2114N-3 74LS157N |_U68_| |
@@ -148,7 +148,7 @@
* CPU clock derived from #defined crystal.
* 8000-8007 Output ports.
* Coin related counters.
- * Sound components and trigger found at 8000-8003, bit2.
+ * Sound components and trigger found at 8000-8003, bit2.
* Full lamps support.
* PCBs layouts & technical notes.
@@ -158,10 +158,10 @@
- Still analyze 8000-8007 offset range remaining bits.
These writes sounds like a BCD valueset.
- Maybe were intended formerly to send some data to 7seg display unit.
+ Maybe were intended formerly to send some data to 7seg display unit.
- Color system (no bipolar PROMs in the system)
-
+
**********************************************************************************/
@@ -227,7 +227,7 @@ static READ8_HANDLER( mixport_r )
Spark-Watchdog... The system expect status changes on bit1, otherwise stop the hardware with an error message.
The line seems to be tied to a clock. We can't use XORed status due to the nested checks.
- If you change the status *every* read, the HW stucks.
+ If you change the status *every* read, the HW stucks.
*/
static int mixdata;
@@ -250,7 +250,7 @@ static READ8_HANDLER( mixport_r )
//static WRITE8_HANDLER( muxed_w )
//{
-// popmessage("written : %02X %02X %02X %02X %02X %02X %02X %02X", data & 0x01, data & 0x02, data & 0x04, data & 0x08, data & 0x10, data & 0x20, data & 0x40, data & 0x80);
+// popmessage("written : %02X %02X %02X %02X %02X %02X %02X %02X", data & 0x01, data & 0x02, data & 0x04, data & 0x08, data & 0x10, data & 0x20, data & 0x40, data & 0x80);
//}
/***** Port 8000 *****
@@ -440,13 +440,13 @@ static WRITE8_HANDLER( outport7_w )
//static WRITE8_HANDLER( sound_w )
//{
-// dac_data_w(devtag_get_device(space->machine, "dac"), data);
+// dac_data_w(devtag_get_device(space->machine, "dac"), data);
//}
*/
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x2fff) AM_ROM
-// AM_RANGE(0x0158, 0x0158) AM_WRITE (muxed_w)
+// AM_RANGE(0x0158, 0x0158) AM_WRITE (muxed_w)
AM_RANGE(0x3800, 0x38ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size) /* NVRAM = 2x SCM5101E */
AM_RANGE(0x4000, 0x47ff) AM_RAM AM_BASE(&mpoker_video) /* 4x MM2114N-3 */
AM_RANGE(0x8000, 0x8000) AM_READ_PORT("SW1")
@@ -467,17 +467,17 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( mpoker )
PORT_START("IN1")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CODE(KEYCODE_1) PORT_NAME("Bet")
- PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_CODE(KEYCODE_2) PORT_NAME("Deal/Draw")
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_CODE(KEYCODE_N) PORT_NAME("Cancel Discards")
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_CODE(KEYCODE_M) PORT_NAME("Stand (Hold all Cards)")
- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_CODE(KEYCODE_Z) PORT_NAME("Discard 1")
- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_CODE(KEYCODE_X) PORT_NAME("Discard 2")
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_CODE(KEYCODE_C) PORT_NAME("Discard 3")
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_CODE(KEYCODE_V) PORT_NAME("Discard 4")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_CODE(KEYCODE_1) PORT_NAME("Bet")
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_CODE(KEYCODE_2) PORT_NAME("Deal/Draw")
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_CODE(KEYCODE_N) PORT_NAME("Cancel Discards")
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_CODE(KEYCODE_M) PORT_NAME("Stand (Hold all Cards)")
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_CODE(KEYCODE_Z) PORT_NAME("Discard 1")
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_CODE(KEYCODE_X) PORT_NAME("Discard 2")
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_CODE(KEYCODE_C) PORT_NAME("Discard 3")
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON8 ) PORT_CODE(KEYCODE_V) PORT_NAME("Discard 4")
PORT_START("IN2")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_CODE(KEYCODE_B) PORT_NAME("Discard 5")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON9 ) PORT_CODE(KEYCODE_B) PORT_NAME("Discard 5")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_9) PORT_NAME("Stats")
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_Q) PORT_NAME("Payout")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
@@ -495,7 +495,7 @@ static INPUT_PORTS_START( mpoker )
PORT_DIPSETTING( 0x04, DEF_STR( 4C_1C ) )
PORT_DIPSETTING( 0x05, "5 Coins/2 Credits" )
PORT_DIPSETTING( 0x06, DEF_STR( 2C_1C ) )
-// PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) ) --> damn check... you can't set 2 different bits pointing to the same coinage.
+// PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) ) --> damn check... you can't set 2 different bits pointing to the same coinage.
PORT_DIPSETTING( 0x0f, DEF_STR( 1C_1C ) )
PORT_DIPSETTING( 0x0e, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0x0d, DEF_STR( 2C_5C ) )
@@ -578,9 +578,9 @@ static MACHINE_DRIVER_START( mpoker )
MDRV_VIDEO_UPDATE(mpoker)
/* sound hardware */
-// MDRV_SPEAKER_STANDARD_MONO("mono")
-// MDRV_SOUND_ADD("dac", DAC, 0)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
+// MDRV_SPEAKER_STANDARD_MONO("mono")
+// MDRV_SOUND_ADD("dac", DAC, 0)
+// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
ROM_START( mpoker )
diff --git a/src/mame/drivers/taitogn.c b/src/mame/drivers/taitogn.c
index 6f08f2acecf..2724a6a87d6 100644
--- a/src/mame/drivers/taitogn.c
+++ b/src/mame/drivers/taitogn.c
@@ -306,15 +306,15 @@ Notes:
Super Puzzle Bobble (Japan)
Usagi
-Type 3 (PCMCIA Compact Flash Adaptor + Compact Flash card, sealed together with the game´s label)
+Type 3 (PCMCIA Compact Flash Adaptor + Compact Flash card, sealed together with the game?s label)
------
-
- The Compact Flash card is read protected, it is a custom Sandisk SDCFB-64 Card (64MByte)
-
- Confirmed usage on.... (not all games listed)
- Otenami Haiken Final
- Kollon
- Zooo
+
+ The Compact Flash card is read protected, it is a custom Sandisk SDCFB-64 Card (64MByte)
+
+ Confirmed usage on.... (not all games listed)
+ Otenami Haiken Final
+ Kollon
+ Zooo
*/
#include "driver.h"
@@ -341,16 +341,16 @@ static void rf5c296_reg_w(ATTR_UNUSED running_machine *machine, UINT8 reg, UINT8
switch (reg)
{
// Interrupt and General Control Register
- case 0x03:
+ case 0x03:
// Check for card reset
if (!(data & 0x40))
{
devtag_reset(machine, "card");
locked = 0x1ff;
- ide_set_gnet_readlock (devtag_get_device(machine, "card"), 1);
+ ide_set_gnet_readlock (devtag_get_device(machine, "card"), 1);
}
break;
-
+
default:
break;
}
@@ -549,7 +549,7 @@ static WRITE32_HANDLER(control_w)
UINT32 p = control;
const device_config *mb3773 = devtag_get_device(space->machine, "mb3773");
-
+
COMBINE_DATA(&control);
mb3773_set_ck(mb3773, 0, (control & 0x20) >> 5);
@@ -946,7 +946,7 @@ static MACHINE_DRIVER_START( coh3002t )
MDRV_AT28C16_ADD( "at28c16", 0 )
MDRV_IDE_CONTROLLER_ADD( "card", 0 )
MDRV_NVRAM_HANDLER( coh3002t )
-
+
MDRV_MB3773_ADD("mb3773")
MACHINE_DRIVER_END
diff --git a/src/mame/machine/naomibd.c b/src/mame/machine/naomibd.c
index 999b54c9976..84e341544ff 100644
--- a/src/mame/machine/naomibd.c
+++ b/src/mame/machine/naomibd.c
@@ -45,24 +45,24 @@
Cartridge protection info from Deunan Knute:
- NAOMI cart can hold up to 256MB of data (well, 512 is possible too I guess), so the highest bits are used for other, dark and scary purposes.
+ NAOMI cart can hold up to 256MB of data (well, 512 is possible too I guess), so the highest bits are used for other, dark and scary purposes.
I call those bits "mode selector".
First it's important to note that DMA and PIO seem to have separate address counters, as well as separate mode selector registers.
* bit 31 (mode bit 3) is auto-advance bit
- When set to one the address will be automatically incremented when data is read, so you need only set it once and can just keep polling
- the PIO port. When zero it will stay on current address. Now this works exactly the same for DMA, and even if DMA engine is 32-byte
+ When set to one the address will be automatically incremented when data is read, so you need only set it once and can just keep polling
+ the PIO port. When zero it will stay on current address. Now this works exactly the same for DMA, and even if DMA engine is 32-byte
per block it will repeatedly read only the first 16-bit word.
* bit 30 (mode bit 2) is most often as special mode switch
DMA transfer with this bit set will hang. PIO will return semi-random data (floating bus?). So one function of that bit is "disable".
- PIO read will return all ones if DMA mode has this bit cleared, so it seems you can do either PIO or DMA but not both at the same time.
+ PIO read will return all ones if DMA mode has this bit cleared, so it seems you can do either PIO or DMA but not both at the same time.
In other words, disable DMA once before using PIO (most games using both access types do that when the DMA terminates).
This bit is also used to reset the chip's internal protection mechanism on "Oh! My Goddess" to a known state.
* bit 29 (mode bit 1) is address shuffle bit
- It's actually the opposite, when set the addressing is following the chip layout and when cleared the protection chip will have it's fun
+ It's actually the opposite, when set the addressing is following the chip layout and when cleared the protection chip will have it's fun
with address lines 10 to 23(?). It's not a simple swap function, rather a lookup table and one with repeating results too.
The few games I got to work never made any use of that bit, it's always set for all normal reads.
@@ -133,11 +133,11 @@ static naomibd_config_table naomibd_translate_tbl[] =
{
{ "doa2", { 0x500, 0, 0x20504, 0x20000, 0x40508, 0x40000, 0x6050c, 0x60000, 0x80510, 0x80000,
0xa0514, 0xa0000, 0xc0518, 0xc0000, 0xe051c, 0xe0000, 0x100520,0x100000, 0x118a3a, 0x120000,
- 0x12c0d8, 0x140000, 0x147e22, 0x160000, 0x1645ce, 0x180000, 0x17c6b2, 0x1a0000,
+ 0x12c0d8, 0x140000, 0x147e22, 0x160000, 0x1645ce, 0x180000, 0x17c6b2, 0x1a0000,
0x19902e, 0x1c0000, 0x1b562a, 0x1e0000, 0xffffffff, 0xffffffff } },
{ "doa2m", { 0x500, 0, 0x20504, 0x20000, 0x40508, 0x40000, 0x6050c, 0x60000, 0x80510, 0x80000,
0xa0514, 0xa0000, 0xc0518, 0xc0000, 0xe051c, 0xe0000, 0x100520,0x100000, 0x11a5b4, 0x120000,
- 0x12e7c4, 0x140000, 0x1471f6, 0x160000, 0x1640c4, 0x180000, 0x1806ca, 0x1a0000,
+ 0x12e7c4, 0x140000, 0x1471f6, 0x160000, 0x1640c4, 0x180000, 0x1806ca, 0x1a0000,
0x199df4, 0x1c0000, 0x1b5d0a, 0x1e0000, 0xffffffff, 0xffffffff } },
};
diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c
index 6336408f4f4..1d924965fed 100644
--- a/src/mame/mamedriv.c
+++ b/src/mame/mamedriv.c
@@ -3632,7 +3632,7 @@ DokiDoki Penguin Land *not confirmed
/* Bingo-based games */
DRIVER( bingoc ) /* (c) 1989 Sega */
/* Bingo Fantasy *//* (c) 19?? Sega */
- /* Bingo Star *//* (c) 19?? Sega */
+ /* Bingo Star *//* (c) 19?? Sega */
/* Bingo Party *//* (c) 1993 Sega */
/* BP Phoenix *//* (c) 1998 Sega */
/* BP Special *//* (c) 2000 Sega */
@@ -4296,8 +4296,8 @@ BOMULEUL CHAJARA SEGA ST-V 1997/04/11
DRIVER( mt_kcham ) /* 60 */
/* 61 */
DRIVER( mt_soni2 ) /* 62 */
- //DRIVER( mt_comp1 ) /* ?? */
- //DRIVER( mt_comp2 ) /* ?? */
+ //DRIVER( mt_comp1 ) /* ?? */
+ //DRIVER( mt_comp2 ) /* ?? */
/* Sega MegaPlay */
DRIVER( megaplay )
@@ -5471,7 +5471,7 @@ BOMULEUL CHAJARA SEGA ST-V 1997/04/11
DRIVER( bm2ndmix ) /* GX853 (c) 1998 (Japan) */
DRIVER( bm2ndmxa ) /* GX853 (c) 1998 (Japan) */
DRIVER( bm3rdmix ) /* GX853 (c) 1998 (Japan) */
- //DRIVER( bm3rdmxb ) /* GX853 (c) 1998 (Japan) */
+ //DRIVER( bm3rdmxb ) /* GX853 (c) 1998 (Japan) */
DRIVER( bmcompmx ) /* GX858 (c) 1999 (Japan) */
DRIVER( hmcompmx ) /* GX858 (c) 1999 */
DRIVER( bm4thmix ) /* GX847 (c) 1999 (Japan) */
@@ -5485,10 +5485,10 @@ BOMULEUL CHAJARA SEGA ST-V 1997/04/11
DRIVER( bm7thmix ) /* GXB07 (c) 2001 (Japan) */
DRIVER( bmfinal ) /* GXC01 (c) 2002 (Japan) */
- //DRIVER( popn1 ) /* GX803 (c) 1998 (Japan) */
- //DRIVER( popn2 ) /* GX831 (c) 1998 (Japan) */
- //DRIVER( popn3 ) /* GX980 (c) 1999 (Japan) */
- //DRIVER( popnstex ) /* GX970 (c) 1999 (Japan) */
+ //DRIVER( popn1 ) /* GX803 (c) 1998 (Japan) */
+ //DRIVER( popn2 ) /* GX831 (c) 1998 (Japan) */
+ //DRIVER( popn3 ) /* GX980 (c) 1999 (Japan) */
+ //DRIVER( popnstex ) /* GX970 (c) 1999 (Japan) */
/* Firebeat games */
DRIVER( ppp ) /* GQ977 (c) 2000 */
diff --git a/src/version.c b/src/version.c
index 195b6bdbdbc..ffcb8248fe4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -10,4 +10,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.132u5 ("__DATE__")";
+const char build_version[] = "0.133 ("__DATE__")";