summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Aaron Giles <aaron@aarongiles.com>2008-02-13 08:54:29 +0000
committerGravatarGravatar Aaron Giles <aaron@aarongiles.com>2008-02-13 08:54:29 +0000
commit072b71602b9a65be92b44f707c9d42bef6e5d7bf (patch)
tree347aeb14d59b3f9a60502816b65384cb3a8dd8f4
parent63576c78f0c4c9d423414d490327e005c9720ab9 (diff)
Cleanups and version bump for 0.123u1.mame0123u1
-rw-r--r--src/emu/cpu/m6502/m65ce02.c6
-rw-r--r--src/emu/drivers/xtal.h2
-rw-r--r--src/emu/timer.c6
-rw-r--r--src/mame/audio/exidy440.c16
-rw-r--r--src/mame/drivers/8080bw.c24
-rw-r--r--src/mame/drivers/cvs.c2
-rw-r--r--src/mame/drivers/dynax.c12
-rw-r--r--src/mame/drivers/funworld.c6
-rw-r--r--src/mame/drivers/naomi.c4
-rw-r--r--src/mame/drivers/tmaster.c20
-rw-r--r--src/mame/drivers/vcombat.c88
-rw-r--r--src/mame/machine/dc.c12
-rw-r--r--src/mame/machine/irem_cpu.c40
-rw-r--r--src/mame/mamedriv.c1
-rw-r--r--src/mame/video/dc.c10
-rw-r--r--src/mame/video/funworld.c2
-rw-r--r--src/mame/video/galivan.c28
-rw-r--r--src/mame/video/kangaroo.c4
-rw-r--r--src/mame/video/malzak.c4
-rw-r--r--src/mame/video/twincobr.c8
-rw-r--r--src/version.c2
21 files changed, 149 insertions, 148 deletions
diff --git a/src/emu/cpu/m6502/m65ce02.c b/src/emu/cpu/m6502/m65ce02.c
index 2ef267eb63b..5aab6f54425 100644
--- a/src/emu/cpu/m6502/m65ce02.c
+++ b/src/emu/cpu/m6502/m65ce02.c
@@ -237,7 +237,7 @@ static void m65ce02_set_irq_line(int irqline, int state)
/**************************************************************************
* Generic set_info
**************************************************************************/
-
+
static void m65ce02_set_info(UINT32 state, cpuinfo *info)
{
switch( state )
@@ -264,7 +264,7 @@ static void m65ce02_set_info(UINT32 state, cpuinfo *info)
case CPUINFO_PTR_M6502_WRITEINDEXED_CALLBACK: m65ce02.wrmem_id = (write8_handler) info->f; break;
}
}
-
+
/**************************************************************************
* Generic get_info
**************************************************************************/
@@ -314,7 +314,7 @@ void m65ce02_get_info(UINT32 state, cpuinfo *info)
case CPUINFO_INT_REGISTER+M65CE02_B: info->i = m65ce02.zp.b.h; break;
case CPUINFO_INT_REGISTER+M65CE02_EA: info->i = m65ce02.ea.w.l; break;
case CPUINFO_INT_REGISTER+M65CE02_ZP: info->i = m65ce02.zp.w.l; break;
-
+
/* --- the following bits of info are returned as pointers to data or functions --- */
case CPUINFO_PTR_SET_INFO: info->setinfo = m65ce02_set_info; break;
case CPUINFO_PTR_GET_CONTEXT: info->getcontext = m65ce02_get_context; break;
diff --git a/src/emu/drivers/xtal.h b/src/emu/drivers/xtal.h
index f35f5d179c8..a2f02cb74c4 100644
--- a/src/emu/drivers/xtal.h
+++ b/src/emu/drivers/xtal.h
@@ -55,7 +55,7 @@ enum
XTAL_6MHz = 6000000,
XTAL_6_144MHz = 6144000, /* Used on Alpha Denshi early 80's games sound board */
XTAL_7_15909MHz = 7159090, /* Blood Bros */
- XTAL_7_3728MHz = 7372800,
+ XTAL_7_3728MHz = 7372800,
XTAL_8MHz = 8000000,
XTAL_9_987MHz = 9987000, /* Crazy Balloon */
XTAL_10MHz = 10000000,
diff --git a/src/emu/timer.c b/src/emu/timer.c
index 5d873e14a00..1f04b121e5e 100644
--- a/src/emu/timer.c
+++ b/src/emu/timer.c
@@ -526,7 +526,7 @@ static void timer_remove(emu_timer *which)
***************************************************************************/
/*-------------------------------------------------
- timer_adjust_oneshot - adjust the time when this timer
+ timer_adjust_oneshot - adjust the time when this timer
will fire and disable any periodic firings
-------------------------------------------------*/
@@ -537,8 +537,8 @@ void timer_adjust_oneshot(emu_timer *which, attotime duration, INT32 param)
/*-------------------------------------------------
- timer_adjust_periodic - adjust the time when
- this timer will fire and specify a period for
+ timer_adjust_periodic - adjust the time when
+ this timer will fire and specify a period for
subsequent firings
-------------------------------------------------*/
diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c
index a913623fd99..530b16d39f2 100644
--- a/src/mame/audio/exidy440.c
+++ b/src/mame/audio/exidy440.c
@@ -941,15 +941,15 @@ MACHINE_DRIVER_START( exidy440_audio )
MDRV_SOUND_ROUTE(0, "left", 1.0)
MDRV_SOUND_ROUTE(1, "right", 1.0)
-// MDRV_SOUND_ADD(MC3418, EXIDY440_MC3418_CLOCK)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
+// MDRV_SOUND_ADD(MC3418, EXIDY440_MC3418_CLOCK)
+// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
-// MDRV_SOUND_ADD(MC3418, EXIDY440_MC3418_CLOCK)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
+// MDRV_SOUND_ADD(MC3418, EXIDY440_MC3418_CLOCK)
+// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
-// MDRV_SOUND_ADD(MC3417, EXIDY440_MC3417_CLOCK)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
+// MDRV_SOUND_ADD(MC3417, EXIDY440_MC3417_CLOCK)
+// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0)
-// MDRV_SOUND_ADD(MC3417, EXIDY440_MC3417_CLOCK)
-// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
+// MDRV_SOUND_ADD(MC3417, EXIDY440_MC3417_CLOCK)
+// MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c
index 18a6e3e714e..c4ce1202570 100644
--- a/src/mame/drivers/8080bw.c
+++ b/src/mame/drivers/8080bw.c
@@ -13,12 +13,12 @@
/* because according to KLOV, Midway was only allowed to make minor */
/* modifications of the Taito code. */
/* */
-/* - DIP Locations verified from manual for: */
-/* -sitv */
-/* -sicv */
-/* -invadpt2 */
-/* -lrescue */
-/* -invasion */
+/* - DIP Locations verified from manual for: */
+/* -sitv */
+/* -sicv */
+/* -invadpt2 */
+/* -lrescue */
+/* -invasion */
/* */
/* To Do: */
/* ----- */
@@ -127,8 +127,8 @@ static INPUT_PORTS_START( sicv )
PORT_DIPNAME( 0x08, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:4")
PORT_DIPSETTING( 0x08, "1000" )
PORT_DIPSETTING( 0x00, "1500" )
- /* SW1:5,6,7: In OFF, PL2 can have no control of joystick, going auto left/right and other problems like no laser gun.
- Be sure these are always ON */
+ /* SW1:5,6,7: In OFF, PL2 can have no control of joystick, going auto left/right and other problems like no laser gun.
+ Be sure these are always ON */
PORT_BIT( 0x70, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(invaders_in2_control_r, 0) PORT_DIPLOCATION("SW1:5,6,7") /* Labeled as "FACTORY" */
PORT_DIPNAME( 0x80, 0x00, "Coin Info" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
@@ -194,8 +194,8 @@ static INPUT_PORTS_START( sitv )
PORT_DIPNAME( 0x08, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:4")
PORT_DIPSETTING( 0x08, "1000" )
PORT_DIPSETTING( 0x00, "1500" )
- /* SW1:5,6,7: In OFF, PL2 can have no control of joystick, going auto left/right and other problems like no laser gun.
- Be sure these are always ON */
+ /* SW1:5,6,7: In OFF, PL2 can have no control of joystick, going auto left/right and other problems like no laser gun.
+ Be sure these are always ON */
PORT_BIT( 0x70, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(invaders_in2_control_r, 0) PORT_DIPLOCATION("SW1:5,6,7") /* Labeled as "FACTORY" */
PORT_DIPNAME( 0x80, 0x00, "Coin Info" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
@@ -259,8 +259,8 @@ static INPUT_PORTS_START( invadrmr )
PORT_DIPNAME( 0x08, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW1:4")
PORT_DIPSETTING( 0x00, "1500" )
PORT_DIPSETTING( 0x08, "3000" ) /* This is different to invaders */
- /* SW1:5,6,7: In OFF, PL2 can have no control of joystick, going auto left/right and other problems like no laser gun.
- Be sure these are always ON */
+ /* SW1:5,6,7: In OFF, PL2 can have no control of joystick, going auto left/right and other problems like no laser gun.
+ Be sure these are always ON */
PORT_BIT( 0x70, IP_ACTIVE_HIGH, IPT_SPECIAL ) PORT_CUSTOM(invaders_in2_control_r, 0) PORT_DIPLOCATION("SW1:5,6,7") /* Labeled as "FACTORY" */
PORT_DIPNAME( 0x80, 0x00, "Coin Info" ) PORT_DIPLOCATION("SW1:8")
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c
index 9015404edf7..8ce7d9f3f07 100644
--- a/src/mame/drivers/cvs.c
+++ b/src/mame/drivers/cvs.c
@@ -712,7 +712,7 @@ static INPUT_PORTS_START( darkwar )
#endif
/* DSW3 bits 0 to 3 are not read */
-INPUT_PORTS_END
+INPUT_PORTS_END
static INPUT_PORTS_START( spacefrt )
PORT_INCLUDE(cvs)
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index a292da0e61b..d9afb7c4f30 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -2484,9 +2484,9 @@ static INPUT_PORTS_START( mcnpshnt )
PORT_DIPNAME( 0x10, 0x10, "Buy Screen Bonus Points" ) /* Sets your points to 100 every time you arrive at the screen for buying special items. */
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- /* make your game last at least 4 or 5 minutes. Continue if necessary. Before the next round you begin,
- you will get some sort of message in Japanese stating that it is some sort of lucky time of day for you, and
- you get 100 bonus points (for purchasing items). */
+ /* make your game last at least 4 or 5 minutes. Continue if necessary. Before the next round you begin,
+ you will get some sort of message in Japanese stating that it is some sort of lucky time of day for you, and
+ you get 100 bonus points (for purchasing items). */
PORT_DIPNAME( 0x20, 0x20, "Lucky Time Of Day Bonus" )
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -2641,9 +2641,9 @@ static INPUT_PORTS_START( jantouki )
PORT_DIPNAME( 0x10, 0x10, "Buy Screen Bonus Points" ) /* Sets your points to 100 every time you arrive at the screen for buying special items. */
PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- /* make your game last at least 4 or 5 minutes. Continue if necessary. Before the next round you begin,
- you will get some sort of message in Japanese stating that it is some sort of lucky time of day for you, and
- you get 100 bonus points (for purchasing items). */
+ /* make your game last at least 4 or 5 minutes. Continue if necessary. Before the next round you begin,
+ you will get some sort of message in Japanese stating that it is some sort of lucky time of day for you, and
+ you get 100 bonus points (for purchasing items). */
PORT_DIPNAME( 0x20, 0x20, "Lucky Time Of Day Bonus" )
PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index 122c0d60924..d44e23c4ac5 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -1498,7 +1498,7 @@ static MACHINE_DRIVER_START( magiccrd )
MDRV_CPU_PROGRAM_MAP(magiccrd_map, 0)
MDRV_SCREEN_SIZE((123+1)*4, (36+1)*8) // Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1).
-// MDRV_SCREEN_VISIBLE_AREA(0*4, 112*4-1, 0*8, 34*8-1) // Taken from MC6845 init, registers 01 & 06.
+// MDRV_SCREEN_VISIBLE_AREA(0*4, 112*4-1, 0*8, 34*8-1) // Taken from MC6845 init, registers 01 & 06.
MDRV_SCREEN_VISIBLE_AREA(0*4, 98*4-1, 0*8, 32*8-1) // adjusted to screen for testing purposes.
MDRV_GFXDECODE(funworld)
@@ -1543,8 +1543,8 @@ static MACHINE_DRIVER_START( snookr10 )
MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
MDRV_SCREEN_SIZE((128+1)*4, (30+1)*8)
MDRV_SCREEN_VISIBLE_AREA(0*4, 96*4-1, 0*8, 30*8-1)
-// MDRV_SCREEN_SIZE((124+1)*4, (30+1)*8)
-// MDRV_SCREEN_VISIBLE_AREA(0*4, 96*4-1, 0*8, 29*8-1)
+// MDRV_SCREEN_SIZE((124+1)*4, (30+1)*8)
+// MDRV_SCREEN_VISIBLE_AREA(0*4, 96*4-1, 0*8, 29*8-1)
MDRV_GFXDECODE(sn10)
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index be2d525dd4e..5022bad7f9d 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -661,8 +661,8 @@ static NVRAM_HANDLER( naomi_eeproms )
{
EEPROM_init(&eeprom_interface_93C46);
/*if (file)
- EEPROM_load(file);
- else*/
+ EEPROM_load(file);
+ else*/
EEPROM_set_data((UINT8 *)"\011\241 0000000000000000", 48); // 2*checksum 30*unknown 16*serial
x76f100_init( 0, eeprom_romboard );
memcpy(eeprom_romboard+20,"\241\011 0000000000000000",48);
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index af2f58ed1fe..0403cabedf4 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -137,7 +137,7 @@ static READ16_HANDLER( tmaster_tscreen_y_lo_r ) { return 0x00; }
Offset: Bits: Value:
- 02
+ 02
fedc ba-- ---- ----
---- --9- ---- ---- Layer 1 Buffer To Display
---- ---8 ---- ---- Layer 0 Buffer To Display
@@ -152,7 +152,7 @@ static READ16_HANDLER( tmaster_tscreen_y_lo_r ) { return 0x00; }
0C Source Address (low)
0E Source Address (mid)
- 10 fedc ba98 ---- ----
+ 10 fedc ba98 ---- ----
---- ---- 7--- ---- Layer
---- ---- -6-- ---- Buffer
---- ---- --5- ---- Solid Fill
@@ -221,7 +221,7 @@ static VIDEO_UPDATE( tmaster )
}
#endif
-
+
if (layers_ctrl & 1) copybitmap (bitmap,tmaster_bitmap[0][(tmaster_regs[0x02/2]>>8)&1],0,0,0,0,&machine->screen[0].visarea);
else fillbitmap(bitmap,get_black_pen(machine),cliprect);
@@ -930,7 +930,7 @@ Board silkscreend 237-0211-00
Cartridge based mother board
Holds up to 4 cartridges
-Chips labeled
+Chips labeled
GALAXY U1 V1.90 12/1/98
GALAXY U2 V1.90 12/1/98
@@ -941,14 +941,14 @@ Motorola MC68HC000FN12
Xilinx XC5206
Xilinx XC5202
BT481AKPJ110 (Palette RAMDAC)
-NKK N341024SJ-15 x8 (128kB RAM)
+NKK N341024SJ-15 x8 (128kB RAM)
OKI M6295 8092352-2
-PAL16V8H-15 @ U24 Blue dot on it
-PAL16V8H-15 @ U25 Yellow dot on it
-PAL16V8H-15 @ U26 Red dot on it
-PAL16V8H-15 @ U27 Green dot on it
-PAL16V8H-15 @ U45 red dot on it
+PAL16V8H-15 @ U24 Blue dot on it
+PAL16V8H-15 @ U25 Yellow dot on it
+PAL16V8H-15 @ U26 Red dot on it
+PAL16V8H-15 @ U27 Green dot on it
+PAL16V8H-15 @ U45 red dot on it
***************************************************************************/
diff --git a/src/mame/drivers/vcombat.c b/src/mame/drivers/vcombat.c
index c5eb0d58404..ff621f19d46 100644
--- a/src/mame/drivers/vcombat.c
+++ b/src/mame/drivers/vcombat.c
@@ -13,57 +13,57 @@ Shadow Fighters (German) (c) Sega? 1989?
----
-There are two boards to this hardware. The upper, which contains the
+There are two boards to this hardware. The upper, which contains the
graphics ROMs and the i860, and the lower which contains the main
and sound CPU's. Virtual Combat sports two upper boards which presumably
output a different rasterization of the scene for each stereo eye.
UPPER:
- Intel I860 XR processor
- MB8298-25P-SK RAMS x12 (silkscreen said 62256)
- Analog device ADV476KN50E (silkscreen said BT476)
- 20 MHZ Oscillator
- 8-way DIP switch
- 574200D x4
- PAL palce24v10 x2 (next to the i860)
+ Intel I860 XR processor
+ MB8298-25P-SK RAMS x12 (silkscreen said 62256)
+ Analog device ADV476KN50E (silkscreen said BT476)
+ 20 MHZ Oscillator
+ 8-way DIP switch
+ 574200D x4
+ PAL palce24v10 x2 (next to the i860)
LOWER:
- Motorola MC68000P12 x2
- 12 MHz Oscillator x2
- Harris ADC0804LCN x2
- 4 MB8298-25P-SK RAMS (in groups of 2 off by themselves)
- 1 CXK58257SP-10L at each end of the SNDCPU ROMS and the CPU ROMS (4 chips total)
- Motorola MC6845P CRT controller
- 2x 27C010A containing sound code
- Xx 27C040 containing sound data (VOC files)
- Dallas DS1220Y - closest to pin 64 of CPU - read as a 2716 - (silkscreened "6116")
- Xx 27c040 containing program code, etc.
+ Motorola MC68000P12 x2
+ 12 MHz Oscillator x2
+ Harris ADC0804LCN x2
+ 4 MB8298-25P-SK RAMS (in groups of 2 off by themselves)
+ 1 CXK58257SP-10L at each end of the SNDCPU ROMS and the CPU ROMS (4 chips total)
+ Motorola MC6845P CRT controller
+ 2x 27C010A containing sound code
+ Xx 27C040 containing sound data (VOC files)
+ Dallas DS1220Y - closest to pin 64 of CPU - read as a 2716 - (silkscreened "6116")
+ Xx 27c040 containing program code, etc.
----
NOTES : Shadow Fighters appears to have been dumped from an earlier
- revision of the hardware. There are no IC labels, and
- lots of factory rework has been done to the bottom board.
- Because the board was so early for Shadow Fighters, there were
- no IC locations silkscreened on the PCB. The locations
- from Virtual Combat have been used.
- The Shadow Fighters bottom board has an extra 20 mhz xtal on it.
- The data stored in REGION_SOUND1 is simply a series of
- Creative Media VOC files concatenated to eachother.
- The sound program (REGION_CPU2) is about 640 bytes long.
- The graphics ROMs have had images successfully extracted from
- them. Pictures for Shadow Fighters can be found online.
- The hardware is said to run at medium resolution.
- The SRAM module dump can likely be thrown away for both games.
- The PAL that's dumped for Shadow Fighters looks pretty bad.
- Websites seem to say Shadow Fighters is a SEGA game, but I
- couldn't find a SEGA string anywhere in the ROMs. I also,
- however, could not find a VR8 string in the Virtual Combat
- ROMs, so who knows... Kyle's name is easily found in both
- though :).
-
-TODO : This is a skeleton driver. Nearly everything.
- i860XR-25 CPU core!
+ revision of the hardware. There are no IC labels, and
+ lots of factory rework has been done to the bottom board.
+ Because the board was so early for Shadow Fighters, there were
+ no IC locations silkscreened on the PCB. The locations
+ from Virtual Combat have been used.
+ The Shadow Fighters bottom board has an extra 20 mhz xtal on it.
+ The data stored in REGION_SOUND1 is simply a series of
+ Creative Media VOC files concatenated to eachother.
+ The sound program (REGION_CPU2) is about 640 bytes long.
+ The graphics ROMs have had images successfully extracted from
+ them. Pictures for Shadow Fighters can be found online.
+ The hardware is said to run at medium resolution.
+ The SRAM module dump can likely be thrown away for both games.
+ The PAL that's dumped for Shadow Fighters looks pretty bad.
+ Websites seem to say Shadow Fighters is a SEGA game, but I
+ couldn't find a SEGA string anywhere in the ROMs. I also,
+ however, could not find a VR8 string in the Virtual Combat
+ ROMs, so who knows... Kyle's name is easily found in both
+ though :).
+
+TODO : This is a skeleton driver. Nearly everything.
+ i860XR-25 CPU core!
*/
@@ -81,7 +81,7 @@ ADDRESS_MAP_END
/*
static ADDRESS_MAP_START( video_map, ADDRESS_SPACE_PROGRAM, 16 )
- AM_RANGE(0x000000, 0x1fffff) AM_ROM
+ AM_RANGE(0x000000, 0x1fffff) AM_ROM
ADDRESS_MAP_END
*/
@@ -96,9 +96,9 @@ static MACHINE_DRIVER_START( vcombat )
MDRV_CPU_ADD_TAG("sound", M68000, XTAL_12MHz)
MDRV_CPU_PROGRAM_MAP(sound_map,0)
/*
- Virtual combat has an i860 on each of its two upper boards.
- MDRV_CPU_ADD_TAG("video", i860, XTAL_20MHz)
- MDRV_CPU_PROGRAM_MAP(video_map,0)
+ Virtual combat has an i860 on each of its two upper boards.
+ MDRV_CPU_ADD_TAG("video", i860, XTAL_20MHz)
+ MDRV_CPU_PROGRAM_MAP(video_map,0)
*/
MDRV_VIDEO_ATTRIBUTES(VIDEO_TYPE_RASTER)
MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c
index f21e7458531..9981b0e4170 100644
--- a/src/mame/machine/dc.c
+++ b/src/mame/machine/dc.c
@@ -252,8 +252,8 @@ WRITE64_HANDLER( dc_sysctrl_w )
ddtdata.channel=2;
ddtdata.mode=25; //011001
/*if (pp == 1)
- if (sysctrl_regs[SB_C2DLEN] == 0x240)
- pp=pp+1;*/
+ if (sysctrl_regs[SB_C2DLEN] == 0x240)
+ pp=pp+1;*/
cpunum_set_info_ptr(0,CPUINFO_PTR_SH4_EXTERNAL_DDT_DMA,&ddtdata);
#if DEBUG_SYSCTRL
mame_printf_verbose("SYSCTRL: Ch2 dma %x from %08x to %08x (lmmode0=%d lmmode1=%d)\n", sysctrl_regs[SB_C2DLEN], ddtdata.source-ddtdata.length, sysctrl_regs[SB_C2DSTAT],sysctrl_regs[SB_LMMODE0],sysctrl_regs[SB_LMMODE1]);
@@ -279,7 +279,7 @@ WRITE64_HANDLER( dc_sysctrl_w )
update_interrupt_status();
#if DEBUG_SYSCTRL
- if ((reg != 0x40) && (reg != 0x42) && (reg > 2)) // filter out IRQ acks and ch2 dma
+ if ((reg != 0x40) && (reg != 0x42) && (reg > 2)) // filter out IRQ acks and ch2 dma
{
mame_printf_verbose("SYSCTRL: write %llx to %x (reg %x), mask %llx\n", data>>shift, offset, reg, /*sysctrl_names[reg],*/ mem_mask);
}
@@ -745,9 +745,9 @@ WRITE64_HANDLER( dc_rtc_w )
/*static void dc_rtc_increment(void)
{
- dc_rtcregister[RTC2] = (dc_rtcregister[RTC2] + 1) & 0xFFFF;
- if (dc_rtcregister[RTC2] == 0)
- dc_rtcregister[RTC1] = (dc_rtcregister[RTC1] + 1) & 0xFFFF;
+ dc_rtcregister[RTC2] = (dc_rtcregister[RTC2] + 1) & 0xFFFF;
+ if (dc_rtcregister[RTC2] == 0)
+ dc_rtcregister[RTC1] = (dc_rtcregister[RTC1] + 1) & 0xFFFF;
}*/
MACHINE_RESET( dc )
diff --git a/src/mame/machine/irem_cpu.c b/src/mame/machine/irem_cpu.c
index 0a849584362..62c95cf3b76 100644
--- a/src/mame/machine/irem_cpu.c
+++ b/src/mame/machine/irem_cpu.c
@@ -300,37 +300,37 @@ const UINT8 inthunt_decryption_table[256] = {
const UINT8 gussun_decryption_table[256] = {
0xcd,xxxx,xxxx,0x36,xxxx,0x52,0xb1,0x5b, 0x68,0xcd,xxxx,xxxx,xxxx,0xa8,xxxx,xxxx, /* 00 */
-// 0x63 gggg gggg gggg
+// 0x63 gggg gggg gggg
xxxx,xxxx,0x75,0x24,0x08,0x83,0x32,0xe9, xxxx,0x79,xxxx,0x8f,0x22,xxxx,0xac,xxxx, /* 10 */
-// ???? pppp gggg
+// ???? pppp gggg
0x5d,0xa5,0x11,0x51,0x0a,0x29,xxxx,xxxx ,0xf8,0x98,0x91,0x40,0x28,0x00,0x03,0x5f, /* 20 */
-// gggg pppp gggg gggg gggg gggg pppp
+// gggg pppp gggg gggg gggg gggg pppp
0x26,xxxx,xxxx,0x8b,0x2f,0x02,xxxx,xxxx, 0x8e,0xab,xxxx,xxxx,0xbc,0xf1,0xb3,xxxx, /* 30 */
-// gggg 0x90
+// gggg 0x90
0x19,xxxx,0xc6,xxxx,xxxx,0x3a,xxxx,xxxx, xxxx,0x74,0x61,xxxx,0x33,xxxx,xxxx,xxxx, /* 40 */
-// ????
+// ????
xxxx,0x53,0xa0,0xc0,0xc3,0x41,0xfc,0xe7, xxxx,0x2c,0x7c,0x2b,xxxx,xxxx,0xba,0x2a, /* 50 */
-// gggg gggg gggg pppp gggg
+// gggg gggg gggg pppp gggg
0xb0,xxxx,0x29,0x79,xxxx,xxxx,0xb5,0x07, 0xb9,xxxx,0x27,0x46,0xf9,xxxx,xxxx,xxxx, /* 60 */
-// ???? pppp gggg gggg
+// ???? pppp gggg gggg
xxxx,0xea,0x72,0x73,0xad,0xd1,0x3b,0x5e, 0xe5,0x57,xxxx,0x0d,xxxx,xxxx,0x42,0x3c, /* 70 */
-// gggg pppp ????
+// gggg pppp ????
xxxx,0x86,0x78,0x7d,0x30,0x25,0x2d,xxxx, 0x9a,0xeb,0x04,0x0b,0xa2,0xb8,0xf6,xxxx, /* 80 */
-// ???? pppp ???? pppp gggg
+// ???? pppp ???? pppp gggg
xxxx,xxxx,0x9d,xxxx,0xbb,xxxx,xxxx,0xcb, 0xa9,0xcf,xxxx,0x60,0x43,0x56,xxxx,xxxx, /* 90 */
-// gggg gggg
+// gggg gggg
xxxx,0xa3,xxxx,xxxx,xxxx,xxxx,0xfa,0xb4, xxxx,0x81,0xe6,0x48,0x80,0x8c,0xd4,xxxx, /* a0 */
-// gggg ???? gggg gggg
+// gggg ???? gggg gggg
xxxx,xxxx,0x84,0xb6,0x77,0x3d,0x3e,xxxx, xxxx,0xb7,0x4b,xxxx,xxxx,xxxx,xxxx,xxxx, /* b0 */
-// gggg ???? gggg gggg ???? pppp
+// gggg ???? gggg gggg ???? pppp
xxxx,0xff,0x47,xxxx,0x55,0x1e,xxxx,0x59, 0x93,xxxx,xxxx,xxxx,0x88,0xc1,0x01,0xb2, /* c0 */
-// gggg pppp
+// gggg pppp
0x01,0x2e,0x06,0xc7,0x05,xxxx,0x8a,0x5a, 0x58,0xbe,xxxx,0x4e,xxxx,0x1f,0x23,xxxx, /* d0 */
-// ???? gggg
+// ???? gggg
0xe8,xxxx,0x89,0xa1,0xd0,xxxx,xxxx,0xe2, 0x38,0xfe,0x50,0x9c,xxxx,xxxx,xxxx,0x49, /* e0 */
-// gggg gggg
+// gggg gggg
0xfb,0x20,0xf3,xxxx,xxxx,0x0f,xxxx,xxxx, xxxx,0x76,0xf7,0xbd,0x39,0x7e,0xbf,xxxx, /* f0 */
-// pppp gggg gggg gggg
+// pppp gggg gggg gggg
};
@@ -348,12 +348,12 @@ missing opcode:
.40 -> ??
j5a -> 78 (195eb - (222fc - routine from 222ed to ) (7x j...) no 70,79,7a,7b,7d,7f ok 78,7c,7e
.62 -> ?? (1cf86 1cfa3 - routine from 1cf61 to 1cff4) (water in level 1) (01 11 19 29)
-7e -> (1e073 -
-j82 -> 78 (78,7c,7e) ->
+7e -> (1e073 -
+j82 -> 78 (78,7c,7e) ->
.84 -> 18 (1d8f1 - routine from 1d8c7 to 1d8fc) - three bytes (00,08,18,28,30) (sprite animation)
ab -> 4f?
.b3 -> 19 (216b6 - 216cf
-b9 -> b7 (21210 - ) 2 bytes -
+b9 -> b7 (21210 - ) 2 bytes -
rz probably:
@@ -361,7 +361,7 @@ rz probably:
2d -> 00 (1df1d - routine from 1dee8 to 1df26) -> 00 - to handle sprite animation
63 -> 7d (1df7f, 1df8c, 1df95, 21f08 - routine from 1df27 to ) no 70,78,7a,7b,7c,7e,7f(ok) ok 79,7d
7b -> 0d
-83 -> 7f (194cd - routine from) no 70,78,79,7a,7b,7c,7d,7e ok 77(no) ok 7f
+83 -> 7f (194cd - routine from) no 70,78,79,7a,7b,7c,7d,7e ok 77(no) ok 7f
86 -> 2d
ba -> 4b (1094d, 10b28 - routine from 10948 to 10b73) one byte -> probably 4b
ce -> 01 (10236 - routine from 1017e to 10254) (01, 09, 19, 21, 29, 31) -> probably 01
diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c
index 0c6a669a367..6ca4d6a40da 100644
--- a/src/mame/mamedriv.c
+++ b/src/mame/mamedriv.c
@@ -2046,6 +2046,7 @@ const game_driver * const drivers[] =
DRIVER( hellfir1 ) /* B90 / TP-??? (c) 1989 Toaplan + Taito license */
DRIVER( hellfir2 ) /* B90 / TP-??? (c) 1989 Toaplan + Taito license */
DRIVER( zerowing ) /* TP-015 (c) 1989 Toaplan */
+ DRIVER( zerowng2 ) /* TP-015 (c) 1989 Toaplan */
DRIVER( demonwld ) /* TP-016 (c) 1990 Toaplan (+ Taito license when set to Japan) */
DRIVER( demonwl1 ) /* TP-016 (c) 1989 Toaplan + Taito license */
DRIVER( demonwl2 ) /* TP-016 (c) 1989 Toaplan */
diff --git a/src/mame/video/dc.c b/src/mame/video/dc.c
index 9ac96342a13..14d9a45c8b9 100644
--- a/src/mame/video/dc.c
+++ b/src/mame/video/dc.c
@@ -175,7 +175,7 @@ WRITE64_HANDLER( pvr_ta_w )
mame_printf_verbose("TA_ALLOC_CTRL %08x\n", pvrta_regs[TA_ALLOC_CTRL]);
mame_printf_verbose("TA_NEXT_OPB_INIT %08x\n", pvrta_regs[TA_NEXT_OPB_INIT]);
#endif
- pvrta_regs[TA_NEXT_OPB] = pvrta_regs[TA_NEXT_OPB_INIT];
+ pvrta_regs[TA_NEXT_OPB] = pvrta_regs[TA_NEXT_OPB_INIT];
pvrta_regs[TA_ITP_CURRENT] = pvrta_regs[TA_ISP_BASE];
break;
}
@@ -305,7 +305,7 @@ WRITE64_HANDLER( ta_fifo_poly_w )
update_interrupt_status();
tafifo_listtype= -1; // no list being received
}
- else if (paratype == 1)
+ else if (paratype == 1)
{
#if DEBUG_PVRDLIST
mame_printf_verbose("Para Type 1 User Tile Clip\n");
@@ -341,7 +341,7 @@ WRITE64_HANDLER( ta_fifo_poly_w )
}
if ((paratype == 4) || (paratype == 5))
- { // quad or polygon
+ { // quad or polygon
depthcomparemode=(tafifo_buff[1] >> 29) & 7;
cullingmode=(tafifo_buff[1] >> 27) & 3;
zwritedisable=(tafifo_buff[1] >> 26) & 1;
@@ -403,7 +403,7 @@ WRITE64_HANDLER( ta_fifo_poly_w )
}
mame_printf_verbose("\n");
#endif
- if (texture == 1)
+ if (texture == 1)
{
#if DEBUG_PVRDLIST
mame_printf_verbose(" %f %f %f %f %f %f\n",u2f(tafifo_buff[13] & 0xffff0000),u2f((tafifo_buff[13] & 0xffff) << 16),u2f(tafifo_buff[14] & 0xffff0000),u2f((tafifo_buff[14] & 0xffff) << 16),u2f(tafifo_buff[15] & 0xffff0000),u2f((tafifo_buff[15] & 0xffff) << 16));
@@ -580,7 +580,7 @@ static void testdrawscreen(bitmap_t *bitmap,const rectangle *cliprect)
static void pvr_build_parameterconfig(void)
{
int a,b,c,d,e,p;
-
+
for (a = 0;a <= 63;a++)
pvr_parameterconfig[a] = -1;
p=0;
diff --git a/src/mame/video/funworld.c b/src/mame/video/funworld.c
index 1e86baf3755..4fdfc98f87c 100644
--- a/src/mame/video/funworld.c
+++ b/src/mame/video/funworld.c
@@ -148,7 +148,7 @@ VIDEO_START(magiccrd)
VIDEO_START(snookr10)
{
-// mc6845 = mc6845_config(NULL);
+// mc6845 = mc6845_config(NULL);
bg_tilemap = tilemap_create(get_bg_tile_info, tilemap_scan_rows, 4, 8, 128, 32);
}
diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c
index 7842fa4bc01..cc282abeb39 100644
--- a/src/mame/video/galivan.c
+++ b/src/mame/video/galivan.c
@@ -116,20 +116,20 @@ PALETTE_INIT( galivan )
colortable_entry_set_value(machine->colortable, 0x180 + i_swapped, ctabentry);
}
-// for (i = 0;i < TOTAL_COLORS(2)/16;i++)
-// {
-// int j;
-
-// for (j = 0;j < 16;j++)
-// {
-// if (i & 8)
-// COLOR(2,i + j * (TOTAL_COLORS(2)/16)) = 128 + ((j & 0x0c) << 2) + (*color_prom & 0x0f);
-// else
-// COLOR(2,i + j * (TOTAL_COLORS(2)/16)) = 128 + ((j & 0x03) << 4) + (*color_prom & 0x0f);
-// }
-
-// color_prom++;
-// }
+// for (i = 0;i < TOTAL_COLORS(2)/16;i++)
+// {
+// int j;
+
+// for (j = 0;j < 16;j++)
+// {
+// if (i & 8)
+// COLOR(2,i + j * (TOTAL_COLORS(2)/16)) = 128 + ((j & 0x0c) << 2) + (*color_prom & 0x0f);
+// else
+// COLOR(2,i + j * (TOTAL_COLORS(2)/16)) = 128 + ((j & 0x03) << 4) + (*color_prom & 0x0f);
+// }
+
+// color_prom++;
+// }
}
diff --git a/src/mame/video/kangaroo.c b/src/mame/video/kangaroo.c
index 72e4c15d502..c9b62501cf0 100644
--- a/src/mame/video/kangaroo.c
+++ b/src/mame/video/kangaroo.c
@@ -51,7 +51,7 @@ static void videoram_write(UINT16 offset, UINT8 data, UINT8 mask)
if (data & 0x40) expdata |= 0x00aa0000;
if (data & 0x08) expdata |= 0x55000000;
if (data & 0x80) expdata |= 0xaa000000;
-
+
/* determine which layers are enabled */
layermask = 0;
if (mask & 0x08) layermask |= 0x30303030;
@@ -111,7 +111,7 @@ static void blitter_execute(void)
UINT8 width = kangaroo_video_control[4];
UINT8 mask = kangaroo_video_control[8];
int x, y;
-
+
/* during DMA operations, the top 2 bits are ORed together, as well as the bottom 2 bits */
/* adjust the mask to account for this */
if (mask & 0x0c) mask |= 0x0c;
diff --git a/src/mame/video/malzak.c b/src/mame/video/malzak.c
index 81ace515205..0282dd24486 100644
--- a/src/mame/video/malzak.c
+++ b/src/mame/video/malzak.c
@@ -62,8 +62,8 @@ VIDEO_START( malzak )
saa5050_vidram = auto_malloc(0x800);
/* configure the S2636 chips */
-// s2636_0 = s2636_config(malzak_s2636_0_ram, machine->screen[0].height, machine->screen[0].width, -8, -16);
-// s2636_1 = s2636_config(malzak_s2636_1_ram, machine->screen[0].height, machine->screen[0].width, -9, -16);
+// s2636_0 = s2636_config(malzak_s2636_0_ram, machine->screen[0].height, machine->screen[0].width, -8, -16);
+// s2636_1 = s2636_config(malzak_s2636_1_ram, machine->screen[0].height, machine->screen[0].width, -9, -16);
s2636_0 = s2636_config(malzak_s2636_0_ram, machine->screen[0].height, machine->screen[0].width, 0, -16);
s2636_1 = s2636_config(malzak_s2636_1_ram, machine->screen[0].height, machine->screen[0].width, 0, -16);
}
diff --git a/src/mame/video/twincobr.c b/src/mame/video/twincobr.c
index 35fe2312a7a..1d506020861 100644
--- a/src/mame/video/twincobr.c
+++ b/src/mame/video/twincobr.c
@@ -190,12 +190,12 @@ void twincobr_flipscreen(int flip)
WRITE16_HANDLER( twincobr_crtc_reg_sel_w )
{
-// mc6845_address_w(offset, data);
+// mc6845_address_w(offset, data);
}
WRITE16_HANDLER( twincobr_crtc_data_w )
{
-// mc6845_register_w(offset, data);
+// mc6845_register_w(offset, data);
}
WRITE16_HANDLER( twincobr_txoffs_w )
@@ -371,12 +371,12 @@ WRITE8_HANDLER( wardner_sprite_w )
WRITE8_HANDLER( wardner_CRTC_reg_sel_w )
{
-// mc6845_address_w(offset, data);
+// mc6845_address_w(offset, data);
}
WRITE8_HANDLER( wardner_CRTC_data_w )
{
-// mc6845_register_w(0, data);
+// mc6845_register_w(0, data);
}
diff --git a/src/version.c b/src/version.c
index d8f9601a104..a2cf48b79f5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -9,4 +9,4 @@
***************************************************************************/
-const char build_version[] = "0.123 ("__DATE__")";
+const char build_version[] = "0.123u1 ("__DATE__")";