summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Aaron Giles <aaron@aarongiles.com>2009-01-22 10:40:20 +0000
committerGravatarGravatar Aaron Giles <aaron@aarongiles.com>2009-01-22 10:40:20 +0000
commitb02a507c1f3326a4c9a1a44bdb91753d94448907 (patch)
tree3f67c78e462aa13a4a226cc2e83f84bd20c9791b
parent325dadfdc0d0cd2afcad8d04e8c973793f4866fc (diff)
Cleanups and version bump.mame0129u2
-rw-r--r--src/emu/devintrf.c2
-rw-r--r--src/emu/sndintrf.c2
-rw-r--r--src/mame/drivers/adp.c48
-rw-r--r--src/mame/drivers/drw80pkr.c50
-rw-r--r--src/mame/drivers/guab.c2
-rw-r--r--src/mame/drivers/igspoker.c14
-rw-r--r--src/mame/drivers/jackie.c4
-rw-r--r--src/mame/drivers/jantotsu.c8
-rw-r--r--src/mame/drivers/m92.c2
-rw-r--r--src/mame/drivers/micro3d.c4
-rw-r--r--src/mame/drivers/progolf.c4
-rw-r--r--src/mame/drivers/segaybd.c14
-rw-r--r--src/mame/drivers/sengokmj.c4
-rw-r--r--src/mame/drivers/sothello.c52
-rw-r--r--src/mame/drivers/srmp5.c10
-rw-r--r--src/mame/drivers/vcombat.c4
-rw-r--r--src/mame/drivers/yunsung8.c6
-rw-r--r--src/mame/video/namcona1.c2
-rw-r--r--src/version.c2
19 files changed, 117 insertions, 117 deletions
diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c
index e96fc65a6c7..906f63b1750 100644
--- a/src/emu/devintrf.c
+++ b/src/emu/devintrf.c
@@ -21,7 +21,7 @@
#define TEMP_STRING_POOL_ENTRIES 16
#define MAX_STRING_LENGTH 256
-// ->started states
+// ->started states
//
// Only 0 and 1 are externally visible in practice, making it a
// boolean //for external users
diff --git a/src/emu/sndintrf.c b/src/emu/sndintrf.c
index ae4073e8ace..038d588cdf0 100644
--- a/src/emu/sndintrf.c
+++ b/src/emu/sndintrf.c
@@ -131,7 +131,7 @@ int sndintrf_init_sound(running_machine *machine, int sndnum, const char *tag, s
index++;
info->index = index;
totalsnd++;
-
+
/* allocate the token */
tokenbytes = sndtype_get_info_int(sndtype, DEVINFO_INT_TOKEN_BYTES);
assert(tokenbytes != 0);
diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c
index f3c39926325..70cf200c3a9 100644
--- a/src/mame/drivers/adp.c
+++ b/src/mame/drivers/adp.c
@@ -254,29 +254,29 @@ static VIDEO_UPDATE(adp)
b = ((HD63484_reg[0xcc/2] & 0x000f) << 16) + HD63484_reg[0xce/2];
/*
- if (input_code_pressed(KEYCODE_M)) b = 0;
- if (input_code_pressed(KEYCODE_Q)) b += 0x060 * 280 * 1;
- if (input_code_pressed(KEYCODE_W)) b += 0x060 * 280 * 2;
- if (input_code_pressed(KEYCODE_E)) b += 0x060 * 280 * 3;
- if (input_code_pressed(KEYCODE_R)) b += 0x060 * 280 * 4;
- if (input_code_pressed(KEYCODE_T)) b += 0x060 * 280 * 5;
- if (input_code_pressed(KEYCODE_Y)) b += 0x060 * 280 * 6;
- if (input_code_pressed(KEYCODE_U)) b += 0x060 * 280 * 7;
- if (input_code_pressed(KEYCODE_I)) b += 0x060 * 280 * 8;
- if (input_code_pressed(KEYCODE_A)) b += 0x060 * 280 * 9;
- if (input_code_pressed(KEYCODE_S)) b += 0x060 * 280 * 10;
- if (input_code_pressed(KEYCODE_D)) b += 0x060 * 280 * 11;
- if (input_code_pressed(KEYCODE_F)) b += 0x060 * 280 * 12;
- if (input_code_pressed(KEYCODE_G)) b += 0x060 * 280 * 13;
- if (input_code_pressed(KEYCODE_H)) b += 0x060 * 280 * 14;
- if (input_code_pressed(KEYCODE_J)) b += 0x060 * 280 * 15;
- if (input_code_pressed(KEYCODE_K)) b += 0x060 * 280 * 16;
- if (input_code_pressed(KEYCODE_Z)) b += 0x060 * 280 * 17;
- if (input_code_pressed(KEYCODE_X)) b += 0x060 * 280 * 18;
- if (input_code_pressed(KEYCODE_C)) b += 0x060 * 280 * 19;
- if (input_code_pressed(KEYCODE_V)) b += 0x060 * 280 * 20;
- if (input_code_pressed(KEYCODE_B)) b += 0x060 * 280 * 21;
- if (input_code_pressed(KEYCODE_N)) b += 0x060 * 280 * 22;
+ if (input_code_pressed(KEYCODE_M)) b = 0;
+ if (input_code_pressed(KEYCODE_Q)) b += 0x060 * 280 * 1;
+ if (input_code_pressed(KEYCODE_W)) b += 0x060 * 280 * 2;
+ if (input_code_pressed(KEYCODE_E)) b += 0x060 * 280 * 3;
+ if (input_code_pressed(KEYCODE_R)) b += 0x060 * 280 * 4;
+ if (input_code_pressed(KEYCODE_T)) b += 0x060 * 280 * 5;
+ if (input_code_pressed(KEYCODE_Y)) b += 0x060 * 280 * 6;
+ if (input_code_pressed(KEYCODE_U)) b += 0x060 * 280 * 7;
+ if (input_code_pressed(KEYCODE_I)) b += 0x060 * 280 * 8;
+ if (input_code_pressed(KEYCODE_A)) b += 0x060 * 280 * 9;
+ if (input_code_pressed(KEYCODE_S)) b += 0x060 * 280 * 10;
+ if (input_code_pressed(KEYCODE_D)) b += 0x060 * 280 * 11;
+ if (input_code_pressed(KEYCODE_F)) b += 0x060 * 280 * 12;
+ if (input_code_pressed(KEYCODE_G)) b += 0x060 * 280 * 13;
+ if (input_code_pressed(KEYCODE_H)) b += 0x060 * 280 * 14;
+ if (input_code_pressed(KEYCODE_J)) b += 0x060 * 280 * 15;
+ if (input_code_pressed(KEYCODE_K)) b += 0x060 * 280 * 16;
+ if (input_code_pressed(KEYCODE_Z)) b += 0x060 * 280 * 17;
+ if (input_code_pressed(KEYCODE_X)) b += 0x060 * 280 * 18;
+ if (input_code_pressed(KEYCODE_C)) b += 0x060 * 280 * 19;
+ if (input_code_pressed(KEYCODE_V)) b += 0x060 * 280 * 20;
+ if (input_code_pressed(KEYCODE_B)) b += 0x060 * 280 * 21;
+ if (input_code_pressed(KEYCODE_N)) b += 0x060 * 280 * 22;
*/
for (y = 0;y < 280;y++)
{
@@ -406,7 +406,7 @@ static ADDRESS_MAP_START( funland_mem, ADDRESS_SPACE_PROGRAM, 16 )
//400000-40001f?
AM_RANGE(0x800080, 0x800081) AM_READWRITE(HD63484_status_r, HD63484_address_w)
AM_RANGE(0x800082, 0x800083) AM_READWRITE(HD63484_data_r, HD63484_data_w)
-// AM_RANGE(0x800100, 0x8001ff) AM_READ(test_r) //18b too
+// AM_RANGE(0x800100, 0x8001ff) AM_READ(test_r) //18b too
AM_RANGE(0x800140, 0x800141) AM_READWRITE(t2_r,ay8910_control_port_0_lsb_w) //18b too
AM_RANGE(0x800142, 0x800143) AM_READWRITE(ay8910_read_port_0_lsb_r,ay8910_write_port_0_lsb_w) //18b too
AM_RANGE(0x800180, 0x80019f) AM_DEVREADWRITE8( DUART68681, "duart68681", duart68681_r, duart68681_w, 0xff )
diff --git a/src/mame/drivers/drw80pkr.c b/src/mame/drivers/drw80pkr.c
index d7b34b84194..d5c3af27c10 100644
--- a/src/mame/drivers/drw80pkr.c
+++ b/src/mame/drivers/drw80pkr.c
@@ -68,7 +68,7 @@ static WRITE8_HANDLER( prog_w )
if (active_bank == 2)
active_bank = 0;
- memory_set_bank(space->machine, 1, active_bank);
+ memory_set_bank(space->machine, 1, active_bank);
}
}
@@ -82,8 +82,8 @@ static WRITE8_HANDLER( drw80pkr_io_w )
static UINT16 n_offs;
static UINT16 n_data;
static UINT16 add;
-
-
+
+
if (p2 == 0x3f) // write cg address
{
if (p1 == 0xbf || p1 == 0x3f)
@@ -111,7 +111,7 @@ static WRITE8_HANDLER( drw80pkr_io_w )
{
n_offs = ((p1 & 0xc0) << 2 ) + (0xff-offset);
- color_ram[n_offs] = 0;//data & 0x0f;
+ color_ram[n_offs] = 0;//data & 0x0f;
if (data < 0x10)
video_ram[n_offs] = video_ram[n_offs] + 0x100;
@@ -128,25 +128,25 @@ static WRITE8_HANDLER( drw80pkr_io_w )
ay8910_write_port_0_w(space, 1, data);
// CRTC Register
- // R0 = 0x1f(31) Horizontal Total
- // R1 = 0x18(24) Horizontal Displayed
- // R2 = 0x1a(26) Horizontal Sync Position
- // R3 = 0x34(52) HSYNC/VSYNC Widths
- // R4 = 0x1f(31) Vertical Total
- // R5 = 0x01(01) Vertical Total Adjust
- // R6 = 0x1b(27) Vertical Displayed
- // R7 = 0x1c(28) Vertical Sync Position
- // R8 = 0x10 Mode Control
- // Non-interlace
- // Straight Binary - Ram Addressing
- // Shared Memory - Ram Access
- // Delay Display Enable one character time
- // No Delay Cursor Skew
- // R9 = 0x07(07) Scan Line
- // R10 = 0x00 Cursor Start
- // R11 = 0x00 Cursor End
- // R12 = 0x00 Display Start Address (High)
- // R13 = 0x00 Display Start Address (Low)
+ // R0 = 0x1f(31) Horizontal Total
+ // R1 = 0x18(24) Horizontal Displayed
+ // R2 = 0x1a(26) Horizontal Sync Position
+ // R3 = 0x34(52) HSYNC/VSYNC Widths
+ // R4 = 0x1f(31) Vertical Total
+ // R5 = 0x01(01) Vertical Total Adjust
+ // R6 = 0x1b(27) Vertical Displayed
+ // R7 = 0x1c(28) Vertical Sync Position
+ // R8 = 0x10 Mode Control
+ // Non-interlace
+ // Straight Binary - Ram Addressing
+ // Shared Memory - Ram Access
+ // Delay Display Enable one character time
+ // No Delay Cursor Skew
+ // R9 = 0x07(07) Scan Line
+ // R10 = 0x00 Cursor Start
+ // R11 = 0x00 Cursor End
+ // R12 = 0x00 Display Start Address (High)
+ // R13 = 0x00 Display Start Address (Low)
//if (p1 == 0xff && p2 == 0xc7)
// CRTC Address
@@ -341,8 +341,8 @@ MACHINE_DRIVER_END
ROM_START( drw80pkr )
ROM_REGION( 0x2000, "main", 0 )
ROM_LOAD( "pm0.u81", 0x0000, 0x1000, CRC(0f3e97d2) SHA1(aa9e4015246284f32435d7320de667e075412e5b) )
- ROM_LOAD( "pm1.u82", 0x1000, 0x1000, CRC(5a6ad467) SHA1(0128bd70b65244a0f68031d5f451bf115eeb7609) )
-
+ ROM_LOAD( "pm1.u82", 0x1000, 0x1000, CRC(5a6ad467) SHA1(0128bd70b65244a0f68031d5f451bf115eeb7609) )
+
ROM_REGION( 0x002000, "gfx1", ROMREGION_DISPOSE )
ROM_LOAD( "cg0-a.u74", 0x0000, 0x1000, CRC(97f5eb92) SHA1(f6c7bb42ccef8a78e8d56104ad942ae5b8e5b0df) )
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index 5a57dc50c57..e1471ecff56 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -573,7 +573,7 @@ static INPUT_CHANGED( coin_inserted )
{
UINT32 credit;
const address_space *space = cpu_get_address_space(field->port->machine->cpu[0], ADDRESS_SPACE_PROGRAM);
-
+
/* Get the current credit value and add the new coin value */
credit = memory_read_dword(space, 0x8002c) + (UINT32)(FPTR)param;
memory_write_dword(space, 0x8002c, credit);
diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c
index ce83855ec0a..265f61dcb4a 100644
--- a/src/mame/drivers/igspoker.c
+++ b/src/mame/drivers/igspoker.c
@@ -50,12 +50,12 @@ xBBBBBGGGGGRRRRR (Bit 15 is never used)
---
FIX: csk227it has video issues, as after Ability game, bg_tilemap is not reset
- so there must be some bg_enable command which I couldn't find, or rom is
- from a beta version which has transparency issues. This doesn't happen with
- csk234it or New Champion Skill.
- Insert credits with Key-In and press Pay-out to play ability game, and wait
- for attract-mode to show cubes (not cards), which are transparent and reveal
- background tilemap.
+ so there must be some bg_enable command which I couldn't find, or rom is
+ from a beta version which has transparency issues. This doesn't happen with
+ csk234it or New Champion Skill.
+ Insert credits with Key-In and press Pay-out to play ability game, and wait
+ for attract-mode to show cubes (not cards), which are transparent and reveal
+ background tilemap.
*****************************************************************************/
@@ -96,7 +96,7 @@ static READ8_HANDLER( igs_irqack_r )
static WRITE8_HANDLER( igs_irqack_w )
{
-// cpu_set_input_line(space->machine->cpu[0], 0, CLEAR_LINE);
+// cpu_set_input_line(space->machine->cpu[0], 0, CLEAR_LINE);
}
diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c
index d885d70397c..654e8a26d08 100644
--- a/src/mame/drivers/jackie.c
+++ b/src/mame/drivers/jackie.c
@@ -122,7 +122,7 @@ static READ8_HANDLER( igs_irqack_r )
static WRITE8_HANDLER( igs_irqack_w )
{
-// cpu_set_input_line(space->machine->cpu[0], 0, CLEAR_LINE);
+// cpu_set_input_line(space->machine->cpu[0], 0, CLEAR_LINE);
out[2] = data;
show_out();
}
@@ -132,7 +132,7 @@ UINT8 *main_ram;
static WRITE8_HANDLER( ram_w )
{
main_ram[offset] = data;
-// logerror("PC %06X: %04x = %02x\n",cpu_get_pc(space->cpu),offset+0xf000,data);
+// logerror("PC %06X: %04x = %02x\n",cpu_get_pc(space->cpu),offset+0xf000,data);
}
diff --git a/src/mame/drivers/jantotsu.c b/src/mame/drivers/jantotsu.c
index ff81bcfd3ae..58fcef3a72e 100644
--- a/src/mame/drivers/jantotsu.c
+++ b/src/mame/drivers/jantotsu.c
@@ -224,13 +224,13 @@ static WRITE8_HANDLER( jan_adpcm_w )
adpcm_pos = (data & 0xff) * 0x80;
adpcm_idle = 0;
msm5205_reset_w(0,0);
-// printf("%02x 0\n",data);
+// printf("%02x 0\n",data);
break;
/*same write as port 2?*/
case 1:
-// adpcm_idle = 1;
-// msm5205_reset_w(0,1);
-// printf("%02x 1\n",data);
+// adpcm_idle = 1;
+// msm5205_reset_w(0,1);
+// printf("%02x 1\n",data);
break;
}
}
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index 71d71025d12..c717fcb804e 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -767,7 +767,7 @@ static INPUT_PORTS_START( psoldier )
PORT_MODIFY("P1_P2")
IREM_GENERIC_JOYSTICKS_3_BUTTONS(1, 2)
-
+
PORT_MODIFY("DSW")
/* Dip switch bank 1 */
PORT_DIPNAME( 0x0020, 0x0000, "Any Button to Start" ) PORT_DIPLOCATION("SW1:6")
diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c
index 8fb76078497..8dc453c7e0b 100644
--- a/src/mame/drivers/micro3d.c
+++ b/src/mame/drivers/micro3d.c
@@ -343,7 +343,7 @@ static void m68901_int_gen(running_machine *machine, int source)
static WRITE16_HANDLER( m68901_w )
{
-// UINT8 value = (data >> 8) & 0xff;
+// UINT8 value = (data >> 8) & 0xff;
m68901_base[offset] = data;
switch (offset)
@@ -640,7 +640,7 @@ static const duart68681_config micro3d_duart68681_config =
static MACHINE_RESET( micro3d )
{
/* TODO: Check. Also do this for the other CPUs? */
-// cpu_set_input_line(machine->cpu[2], INPUT_LINE_RESET, ASSERT_LINE);
+// cpu_set_input_line(machine->cpu[2], INPUT_LINE_RESET, ASSERT_LINE);
creg = 0;
ti_uart[STATUS] = 1;
diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c
index 206f1332384..1b9ab5e3df1 100644
--- a/src/mame/drivers/progolf.c
+++ b/src/mame/drivers/progolf.c
@@ -72,7 +72,7 @@ static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x5000, 0x5fff) AM_WRITE(ay8910_control_port_0_w)
AM_RANGE(0x6000, 0x6fff) AM_READWRITE(ay8910_read_port_1_r,ay8910_write_port_1_w)
AM_RANGE(0x7000, 0x7fff) AM_WRITE(ay8910_control_port_1_w)
-// AM_RANGE(0x8000, 0x8fff) AM_WRITE(interrupt_enable_w) //???
+// AM_RANGE(0x8000, 0x8fff) AM_WRITE(interrupt_enable_w) //???
AM_RANGE(0x9000, 0xafff) AM_READ(soundlatch_r)
AM_RANGE(0xf000, 0xffff) AM_ROM
ADDRESS_MAP_END
@@ -188,7 +188,7 @@ static MACHINE_DRIVER_START( progolf )
MDRV_CPU_ADD("audio", M6502, 500000)
MDRV_CPU_PROGRAM_MAP(sound_cpu,0)
-// MDRV_CPU_VBLANK_INT("main",nmi_line_pulse)
+// MDRV_CPU_VBLANK_INT("main",nmi_line_pulse)
/* video hardware */
MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c
index fd3bbf47baa..88612a886b7 100644
--- a/src/mame/drivers/segaybd.c
+++ b/src/mame/drivers/segaybd.c
@@ -4,16 +4,16 @@
Games supported:
- G-LOC Air Battle
- G-LOC R360
- Galaxy Force 2
- Power Drift
- Rail Chase
- Strike Fighter
+ G-LOC Air Battle
+ G-LOC R360
+ Galaxy Force 2
+ Power Drift
+ Rail Chase
+ Strike Fighter
Known games currently not dumped:
- Galaxy Force
+ Galaxy Force
****************************************************************************
diff --git a/src/mame/drivers/sengokmj.c b/src/mame/drivers/sengokmj.c
index 31985821d34..1bc4dad9c96 100644
--- a/src/mame/drivers/sengokmj.c
+++ b/src/mame/drivers/sengokmj.c
@@ -95,7 +95,7 @@ static WRITE16_HANDLER( sengokmj_out_w )
coin_lockout_w(1,~data & 2);
coin_counter_w(0,data & 4);
hopper_io = ((data & 1)<<6);
-// popmessage("%02x",hopper_io);
+// popmessage("%02x",hopper_io);
}
static WRITE16_HANDLER( seibu_z80_com_6_mirror_w )
@@ -239,7 +239,7 @@ static INPUT_PORTS_START( sengokmj )
PORT_DIPNAME( 0x0020, 0x0020, "Cash" )
PORT_DIPSETTING( 0x0020, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
-// 0x40 Hopper
+// 0x40 Hopper
PORT_DIPNAME( 0x0080, 0x0080, "Meter" )
PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
diff --git a/src/mame/drivers/sothello.c b/src/mame/drivers/sothello.c
index 12d2e26cb93..21b96512163 100644
--- a/src/mame/drivers/sothello.c
+++ b/src/mame/drivers/sothello.c
@@ -2,7 +2,7 @@
Super Othello (c)1986 Fujiwara/Success
driver by Tomasz Slanina
-
+
1 2 3 4 5 6 7 8 9 10 11 12
+---------------------------------------------------------------------------------+
| |
@@ -67,7 +67,7 @@ static WRITE8_HANDLER(bank_w)
case 2: bank=1; break;
case 4: bank=2; break;
case 8: bank=3; break;
- }
+ }
memory_set_bankptr(space->machine,1,&RAM[bank*0x4000+0x10000]);
}
@@ -119,9 +119,9 @@ static ADDRESS_MAP_START( maincpu_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE( 0x00, 0x0f) AM_READ_PORT("INPUT1")
AM_RANGE( 0x10, 0x1f) AM_READ_PORT("INPUT2")
AM_RANGE( 0x20, 0x2f) AM_READ_PORT("SYSTEM")
- AM_RANGE( 0x30, 0x30) AM_READ(subcpu_halt_set)
+ AM_RANGE( 0x30, 0x30) AM_READ(subcpu_halt_set)
AM_RANGE( 0x31, 0x31) AM_READ(subcpu_halt_clear)
- AM_RANGE( 0x32, 0x32) AM_READ(subcpu_comm_status)
+ AM_RANGE( 0x32, 0x32) AM_READ(subcpu_comm_status)
AM_RANGE( 0x33, 0x33) AM_READ(soundcpu_status_r)
AM_RANGE( 0x40, 0x4f) AM_WRITE(soundlatch_w)
AM_RANGE( 0x50, 0x50) AM_WRITE(bank_w)
@@ -143,12 +143,12 @@ static WRITE8_HANDLER(msm_cfg_w)
bit 1 = 4B/3B 0
bit 2 = S2 1
bit 3 = S1 2
-*/
+*/
msm5205_playmode_w(0, BITSWAP8((data>>1), 7,6,5,4,3,0,1,2)); /* or maybe 7,6,5,4,3,0,2,1 ??? */
msm5205_reset_w(0,data&1);
}
-static WRITE8_HANDLER( msm_data_w )
+static WRITE8_HANDLER( msm_data_w )
{
msm_data = data;
@@ -220,33 +220,33 @@ INPUT_PORTS_START( sothello )
PORT_START("INPUT1")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
-
+
PORT_START("INPUT2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
-
+
PORT_START("SYSTEM")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 )
-
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 )
+
PORT_BIT( 0xf2, IP_ACTIVE_LOW, IPT_UNUSED )
-
+
PORT_START("DSWA")
PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coinage ) )
PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) )
@@ -257,7 +257,7 @@ INPUT_PORTS_START( sothello )
PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ) )
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_3C ) )
PORT_DIPSETTING( 0x80, DEF_STR( 1C_4C ) )
-
+
PORT_DIPNAME( 0x1c, 0x10, "Timer" )
PORT_DIPSETTING( 0x1c, "15" )
PORT_DIPSETTING( 0x18, "20" )
@@ -267,31 +267,31 @@ INPUT_PORTS_START( sothello )
PORT_DIPSETTING( 0x08, "40" )
PORT_DIPSETTING( 0x04, "45" )
PORT_DIPSETTING( 0x00, "50" )
-
+
PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED )
-
+
PORT_START("DSWB")
PORT_DIPNAME( 0xc0, 0x80, DEF_STR( Difficulty ) )
PORT_DIPSETTING( 0xc0, DEF_STR( Easy ) )
PORT_DIPSETTING( 0x80, DEF_STR( Normal ) )
PORT_DIPSETTING( 0x40, DEF_STR( Hard ) )
PORT_DIPSETTING( 0x00, DEF_STR( Very_Hard ) )
-
+
PORT_DIPNAME( 0x30, 0x10, "Matta" ) /* undo moves */
PORT_DIPSETTING( 0x30, "0" )
PORT_DIPSETTING( 0x20, "1" )
PORT_DIPSETTING( 0x10, "2" )
PORT_DIPSETTING( 0x00, "3" )
-
+
PORT_DIPNAME( 0x08, 0x08, "Games for 2 players" )
PORT_DIPSETTING( 0x08, "1" )
PORT_DIPSETTING( 0x00, "2" )
-
+
PORT_BIT( 0x07, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
-static void irqhandler(running_machine *machine, int irq)
+static void irqhandler(running_machine *machine, int irq)
{
cpu_set_input_line(machine->cpu[2],0,irq ? ASSERT_LINE : CLEAR_LINE);
}
@@ -348,7 +348,7 @@ static const ym2203_interface ym2203_config =
static MACHINE_DRIVER_START( sothello )
/* basic machine hardware */
-
+
MDRV_CPU_ADD("main",Z80, MAINCPU_CLOCK)
MDRV_CPU_PROGRAM_MAP(maincpu_mem_map,0)
MDRV_CPU_IO_MAP(maincpu_io_map,0)
@@ -362,7 +362,7 @@ static MACHINE_DRIVER_START( sothello )
MDRV_CPU_PROGRAM_MAP(subcpu_mem_map,0)
MDRV_QUANTUM_TIME(HZ(600))
-
+
MDRV_MACHINE_RESET(sothello)
MDRV_SCREEN_ADD("main", RASTER)
@@ -386,7 +386,7 @@ static MACHINE_DRIVER_START( sothello )
MDRV_SOUND_ROUTE(3, "mono", 0.50)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
-
+
MDRV_SOUND_ADD("msm",MSM5205, MSM_CLOCK)
MDRV_SOUND_CONFIG(msm_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
@@ -404,11 +404,11 @@ ROM_START( sothello )
ROM_LOAD( "3.7c", 0x0000, 0x8000, CRC(47f97bd4) SHA1(52c9638f098fdcf66903fad7dafe3ab171758572) )
ROM_LOAD( "4.8c", 0x10000, 0x8000, CRC(a98414e9) SHA1(6d14e1f9c79b95101e0aa101034f398af09d7f32) )
ROM_LOAD( "5.9c", 0x18000, 0x8000, CRC(e5b5d61e) SHA1(2e4b3d85f41d0796a4d61eae40dd824769e1db86) )
-
+
ROM_REGION( 0x10000, "sound", 0 )
ROM_LOAD( "1.7a", 0x0000, 0x8000, CRC(6951536a) SHA1(64d07a692d6a167334c825dc173630b02584fdf6) )
ROM_LOAD( "2.8a", 0x8000, 0x8000, CRC(9c535317) SHA1(b2e69b489e111d6f8105e68fade6e5abefb825f7) )
-
+
ROM_REGION( 0x10000, "sub", 0 )
ROM_LOAD( "6.7f", 0x8000, 0x8000, CRC(ee80fc78) SHA1(9a9d7925847d7a36930f0761c70f67a9affc5e7c) )
ROM_END
diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c
index 04542a43729..19a21fb01f6 100644
--- a/src/mame/drivers/srmp5.c
+++ b/src/mame/drivers/srmp5.c
@@ -317,7 +317,7 @@ static ADDRESS_MAP_START( srmp5_mem, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x0a000000, 0x0a0fffff) AM_READWRITE(spr_r, spr_w)
AM_RANGE(0x0a100000, 0x0a17ffff) AM_READWRITE(srmp5_palette_r, srmp5_palette_w)
- //0クリアしないと進まないので
+ //0?N???A?????????i??????????
AM_RANGE(0x0a180000, 0x0a180003) AM_READNOP // write 0x00000400
AM_RANGE(0x0a180000, 0x0a18011f) AM_READWRITE(srmp5_vidregs_r, srmp5_vidregs_w)
AM_RANGE(0x0a200000, 0x0a3fffff) AM_READWRITE(tileram_r, tileram_w)
@@ -482,7 +482,7 @@ static const r3000_cpu_core config =
4096 /* data cache size */
};
-static const gfx_layout tile_16x8x8_layout =
+static const gfx_layout tile_16x8x8_layout =
{
16,8,
RGN_FRAC(1,1),
@@ -494,7 +494,7 @@ static const gfx_layout tile_16x8x8_layout =
};
#if 0
-static const gfx_layout tile_16x16x8_layout =
+static const gfx_layout tile_16x16x8_layout =
{
16,16,
RGN_FRAC(1,1),
@@ -508,7 +508,7 @@ static const gfx_layout tile_16x16x8_layout =
static GFXDECODE_START( srmp5 )
GFXDECODE_ENTRY( "gfx1", 0, tile_16x8x8_layout, 0x0, 0x800 )
-// GFXDECODE_ENTRY( "gfx1", 0, tile_16x16x8_layout, 0x0, 0x800 )
+// GFXDECODE_ENTRY( "gfx1", 0, tile_16x16x8_layout, 0x0, 0x800 )
GFXDECODE_END
static MACHINE_DRIVER_START( srmp5 )
@@ -521,7 +521,7 @@ static MACHINE_DRIVER_START( srmp5 )
MDRV_CPU_ADD("sub", R3000LE, 25000000)
MDRV_CPU_CONFIG(config)
MDRV_CPU_PROGRAM_MAP(srmp5_mem,0)
- //256は適当
+ //256???K??
MDRV_CPU_VBLANK_INT_HACK(irq4_gen, 256)
MDRV_QUANTUM_TIME(HZ(6000))
diff --git a/src/mame/drivers/vcombat.c b/src/mame/drivers/vcombat.c
index b74a5152a0c..44673b373ae 100644
--- a/src/mame/drivers/vcombat.c
+++ b/src/mame/drivers/vcombat.c
@@ -132,7 +132,7 @@ static VIDEO_UPDATE( vcombat )
for (i = 0; i < 2; ++i)
{
/* Vcombat's screen renders 'flopped' - very likely because VR headset displays may reflect off mirrors.
- Shadfgtr isn't flopped, so it's not a constant feature of the hardware. */
+ Shadfgtr isn't flopped, so it's not a constant feature of the hardware. */
/* Combine the two layers */
if ((m68k_pix & 0xff) == 0)
@@ -575,7 +575,7 @@ static MACHINE_DRIVER_START( vcombat )
#endif
/* Disabled for now as it can't handle multiple screens */
-// MDRV_MC6845_ADD("crtc", MC6845, 6000000 / 16, mc6845_intf)
+// MDRV_MC6845_ADD("crtc", MC6845, 6000000 / 16, mc6845_intf)
MDRV_DEFAULT_LAYOUT(layout_dualhsxs)
MDRV_SCREEN_ADD("main", RASTER)
diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c
index 671f13f1b88..bcd712e960f 100644
--- a/src/mame/drivers/yunsung8.c
+++ b/src/mame/drivers/yunsung8.c
@@ -57,7 +57,7 @@ static MACHINE_RESET( yunsung8 )
{
const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
UINT8* yunsung8_videoram = auto_malloc(0x4000);
-
+
yunsung8_videoram_0 = yunsung8_videoram + 0x0000; // Ram is banked
yunsung8_videoram_1 = yunsung8_videoram + 0x2000;
yunsung8_videobank_w(space,0,0);
@@ -535,11 +535,11 @@ static MACHINE_DRIVER_START( yunsung8 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD("ym", YM3812, 4000000)
+ MDRV_SOUND_ADD("ym", YM3812, 4000000)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
- MDRV_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb */
+ MDRV_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb */
MDRV_SOUND_CONFIG(yunsung8_msm5205_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.80)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.80)
diff --git a/src/mame/video/namcona1.c b/src/mame/video/namcona1.c
index 301285c04b6..d1143f21c86 100644
--- a/src/mame/video/namcona1.c
+++ b/src/mame/video/namcona1.c
@@ -105,7 +105,7 @@ static TILE_GET_INFO( roz_get_info )
else
{
UINT8 *mask_data = (UINT8 *)(shaperam+4*tile);
-
+
if (ENDIANNESS_NATIVE == ENDIANNESS_LITTLE)
{
UINT16 *source = (UINT16 *)mask_data;
diff --git a/src/version.c b/src/version.c
index dabe3b35521..f922b068635 100644
--- a/src/version.c
+++ b/src/version.c
@@ -9,4 +9,4 @@
***************************************************************************/
-const char build_version[] = "0.129u1 ("__DATE__")";
+const char build_version[] = "0.129u2 ("__DATE__")";