summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/emu/machine/eepromdev.c4
-rw-r--r--src/emu/sound/psx.c8
-rw-r--r--src/emu/uimenu.c6
-rw-r--r--src/mame/drivers/atarig1.c4
-rw-r--r--src/mame/drivers/djmain.c12
-rw-r--r--src/mame/drivers/finalizr.c2
-rw-r--r--src/mame/drivers/junofrst.c2
-rw-r--r--src/mame/drivers/murogmbl.c6
-rw-r--r--src/mame/drivers/naomi.c52
-rw-r--r--src/mame/drivers/neogeo.c26
-rw-r--r--src/mame/drivers/pgm.c52
-rw-r--r--src/mame/drivers/sbasketb.c2
-rw-r--r--src/mame/drivers/system1.c200
-rw-r--r--src/mame/drivers/taito_l.c2
-rw-r--r--src/mame/drivers/tecmo16.c2
-rw-r--r--src/mame/drivers/thunderx.c2
-rw-r--r--src/mame/drivers/tp84.c2
-rw-r--r--src/mame/drivers/trackfld.c6
-rw-r--r--src/mame/drivers/unico.c2
-rw-r--r--src/mame/drivers/vball.c4
-rw-r--r--src/mame/includes/konamipt.h24
-rw-r--r--src/mame/machine/atari.c76
-rw-r--r--src/mame/machine/pgmcrypt.c4
-rw-r--r--src/mame/machine/tnzs.c8
-rw-r--r--src/mame/mamedriv.c1
-rw-r--r--src/mame/video/system1.c236
-rw-r--r--src/version.c2
27 files changed, 374 insertions, 373 deletions
diff --git a/src/emu/machine/eepromdev.c b/src/emu/machine/eepromdev.c
index 71723a73b6f..81d6c95659d 100644
--- a/src/emu/machine/eepromdev.c
+++ b/src/emu/machine/eepromdev.c
@@ -278,7 +278,7 @@ int eepromdev_read_bit(const device_config *device)
/*CUSTOM_INPUT( eeprom_bit_r )
{
- return eeprom_read_bit();
+ return eeprom_read_bit();
}*/
void eepromdev_set_cs_line(const device_config *device, int state)
@@ -366,7 +366,7 @@ static DEVICE_NVRAM( eeprom )
if (read_or_write)
eepromdev_save(device, file);
else
- if (file)
+ if (file)
eepromdev_load(device, file);
else
if ((config->default_data != NULL) && (config->default_data_size != 0))
diff --git a/src/emu/sound/psx.c b/src/emu/sound/psx.c
index 3b7bdb17d28..bd7ecdd5071 100644
--- a/src/emu/sound/psx.c
+++ b/src/emu/sound/psx.c
@@ -573,7 +573,7 @@ WRITE32_DEVICE_HANDLER( psx_spu_w )
chip->m_p_n_s1[ n_channel ] = 0;
chip->m_p_n_s2[ n_channel ] = 0;
chip->m_p_n_blockstatus[ n_channel ] = 1;
-
+
chip->m_p_n_envelopestate[ n_channel ] = e_attack;
}
}
@@ -582,7 +582,7 @@ WRITE32_DEVICE_HANDLER( psx_spu_w )
chip->m_n_voiceoff = 0;
COMBINE_DATA( &chip->m_n_voiceoff );
verboselog( machine, 1, "psx_spu_w() voice off = %08x\n", chip->m_n_voiceoff );
-
+
for( n_channel = 0; n_channel < MAX_CHANNEL; n_channel++ )
{
if( ( chip->m_n_voiceoff & ( 1 << n_channel ) ) != 0 )
@@ -591,8 +591,8 @@ WRITE32_DEVICE_HANDLER( psx_spu_w )
if (chip->m_p_n_envelopestate[ n_channel ] < e_release)
chip->m_p_n_envelopestate[ n_channel ] = e_release;
}
- }
-
+ }
+
break;
case SPU_REG( 0xd90 ):
COMBINE_DATA( &chip->m_n_modulationmode );
diff --git a/src/emu/uimenu.c b/src/emu/uimenu.c
index 20f5e484d3f..69cad7ea92c 100644
--- a/src/emu/uimenu.c
+++ b/src/emu/uimenu.c
@@ -3314,9 +3314,9 @@ static void menu_crosshair_populate(running_machine *machine, ui_menu *menu)
sprintf(temp_text, "%d", settings.auto_time);
ui_menu_item_append(menu, "Visible Delay", temp_text, flags, data);
}
-// else
-// /* leave a blank filler line when not in auto time so size does not rescale */
-// ui_menu_item_append(menu, "", "", NULL, NULL);
+// else
+// /* leave a blank filler line when not in auto time so size does not rescale */
+// ui_menu_item_append(menu, "", "", NULL, NULL);
}
diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c
index 3f3941f4f02..b98ca9961ba 100644
--- a/src/mame/drivers/atarig1.c
+++ b/src/mame/drivers/atarig1.c
@@ -628,8 +628,8 @@ ROM_START( hydrap2 )
ROM_END
-/*
-This (rev 7) is the most recent Pit Fighter pcb that we have documented.
+/*
+This (rev 7) is the most recent Pit Fighter pcb that we have documented.
It has printed Atari stickers that show the following:
2 main board stickers:
diff --git a/src/mame/drivers/djmain.c b/src/mame/drivers/djmain.c
index 9bf63fe6cb7..5eec882cc38 100644
--- a/src/mame/drivers/djmain.c
+++ b/src/mame/drivers/djmain.c
@@ -478,8 +478,8 @@ static ADDRESS_MAP_START( memory_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x590000, 0x590007) AM_WRITE(unknown590000_w) // ??
AM_RANGE(0x5a0000, 0x5a005f) AM_WRITE(K055555_long_w) // 055555: priority encoder
AM_RANGE(0x5b0000, 0x5b04ff) AM_READWRITE16(dual539_r, dual539_w, 0xffffffff) // SOUND regs
- AM_RANGE(0x5c0000, 0x5c0003) AM_READ8(inp1_r, 0xffffffff) // DSW3,BTN3,BTN2,BTN1 // input port control (buttons and DIP switches)
- AM_RANGE(0x5c8000, 0x5c8003) AM_READ8(inp2_r, 0xffffffff) // DSW1,DSW2,UNK2,UNK1 // input port control (DIP switches)
+ AM_RANGE(0x5c0000, 0x5c0003) AM_READ8(inp1_r, 0xffffffff) // DSW3,BTN3,BTN2,BTN1 // input port control (buttons and DIP switches)
+ AM_RANGE(0x5c8000, 0x5c8003) AM_READ8(inp2_r, 0xffffffff) // DSW1,DSW2,UNK2,UNK1 // input port control (DIP switches)
AM_RANGE(0x5d0000, 0x5d0003) AM_WRITE(light_ctrl_1_w) // light/coin blocker control
AM_RANGE(0x5d2000, 0x5d2003) AM_WRITE(light_ctrl_2_w) // light/coin blocker control
AM_RANGE(0x5d4000, 0x5d4003) AM_WRITE(v_ctrl_w) // VIDEO control
@@ -1109,9 +1109,9 @@ static INPUT_PORTS_START( popnmusic_btn )
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START("UNK2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- //PORT_START("TT1") /* turn table 1P */
+ //PORT_START("TT1") /* turn table 1P */
//PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_PLAYER(1)
- //PORT_START("TT2") /* turn table 2P */
+ //PORT_START("TT2") /* turn table 2P */
//PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_PLAYER(2)
INPUT_PORTS_END
#endif
@@ -1306,9 +1306,9 @@ static INPUT_PORTS_START( popnstage )
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START("UNK2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- //PORT_START("TT1") /* turn table 1P */
+ //PORT_START("TT1") /* turn table 1P */
//PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_PLAYER(1)
- //PORT_START("TT2") /* turn table 2P */
+ //PORT_START("TT2") /* turn table 2P */
//PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(30) PORT_KEYDELTA(15) PORT_PLAYER(2)
PORT_START("DSW1")
diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c
index 6477476e6b3..89e68d029df 100644
--- a/src/mame/drivers/finalizr.c
+++ b/src/mame/drivers/finalizr.c
@@ -161,7 +161,7 @@ static INPUT_PORTS_START( finalizr )
PORT_START("DSW1")
KONAMI_COINAGE_LOC(DEF_STR( Free_Play ), "No Coin B", SW1)
/* "No Coin B" = coins produce sound, but no effect on coin counter */
-
+
PORT_START("DSW2")
PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
PORT_DIPSETTING( 0x03, "2" )
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index c9ceff68288..c1e8cd636ec 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -229,7 +229,7 @@ static INPUT_PORTS_START( junofrst )
PORT_START("P1")
KONAMI8_MONO_B213_UNK
-
+
PORT_START("P2")
KONAMI8_COCKTAIL_B213_UNK
diff --git a/src/mame/drivers/murogmbl.c b/src/mame/drivers/murogmbl.c
index eb94bf2facc..f00ed2f2bc8 100644
--- a/src/mame/drivers/murogmbl.c
+++ b/src/mame/drivers/murogmbl.c
@@ -1,4 +1,4 @@
-/* Unknown - Poker (morugem
+/* Unknown - Poker (morugem
driver by Roberto Zandona'
thanks to Angelo Salese for some precious advice
@@ -13,14 +13,14 @@ N.revisione:
CPU:
1x unknown DIP40 (1ef)(missing)
1x TBA820 (14e)(sound)
-1x oscillator 12.000 (2f)
+1x oscillator 12.000 (2f)
ROMs:
2x TMS2532 (5b,5e)
1x TMS2516 (8b)
1x PROM SN74S288N (8a)
1x RAM MWS5101AEL2 (11e)
-4x RAM AM9114EPC (2b,3b,8e,9e)
+4x RAM AM9114EPC (2b,3b,8e,9e)
Note:
1x 22x2 edge connector
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index b4f4d18355a..ec0761cef57 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -4309,21 +4309,21 @@ ROM_END
/*
-Title TRF GDROM TBA EX SATL
-Media ID 92C5
-Media Config GD-ROM1/1
-Regions J
-Peripheral String 0000000
-Product Number GDT-0010C
-Version V4.000
-Release Date 20040608
+Title TRF GDROM TBA EX SATL
+Media ID 92C5
+Media Config GD-ROM1/1
+Regions J
+Peripheral String 0000000
+Product Number GDT-0010C
+Version V4.000
+Release Date 20040608
Manufacturer ID
-TOC DISC
-Track Start Sector End Sector Track Size
-track01.bin 150 599 1058400
-track02.raw 750 2101 3179904
-track03.bin 45150 549299 1185760800
+TOC DISC
+Track Start Sector End Sector Track Size
+track01.bin 150 599 1058400
+track02.raw 750 2101 3179904
+track03.bin 45150 549299 1185760800
*/
ROM_START( avalon13 )
@@ -4342,21 +4342,21 @@ ROM_END
/*
-Title TRF GDROM TBT SATL
-Media ID 1348
-Media Config GD-ROM1/1
-Regions J
-Peripheral String 0000000
-Product Number GDT-0017B
-Version V3.001
-Release Date 20041102
+Title TRF GDROM TBT SATL
+Media ID 1348
+Media Config GD-ROM1/1
+Regions J
+Peripheral String 0000000
+Product Number GDT-0017B
+Version V3.001
+Release Date 20041102
Manufacturer ID
-TOC DISC
-Track Start Sector End Sector Track Size
-track01.bin 150 599 1058400
-track02.raw 750 2101 3179904
-track03.bin 45150 549299 1185760800
+TOC DISC
+Track Start Sector End Sector Track Size
+track01.bin 150 599 1058400
+track02.raw 750 2101 3179904
+track03.bin 45150 549299 1185760800
*/
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 5fd57cfe98f..527c5781965 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -174,20 +174,20 @@ NOTE: On CTRG2-B, The "A" lines start at "A1". If you trace this on an
Mahjong Panel notes (2009-03 FP):
=================================
-
- * In Service Mode menu with mahjong panel active, controls are as
- follows:
- A = select / up (for options)
- B = down (for options)
- C = go to previous menu
- E = up (for menu entries)
- F = down (for menu entries)
- G = left (for options)
- H = right (for options)
+ * In Service Mode menu with mahjong panel active, controls are as
+ follows:
- * These only work with Japanese BIOS, but I think it's not a bug: I
- doubt other bios were programmed to be compatible with mahjong panels
+ A = select / up (for options)
+ B = down (for options)
+ C = go to previous menu
+ E = up (for menu entries)
+ F = down (for menu entries)
+ G = left (for options)
+ H = right (for options)
+
+ * These only work with Japanese BIOS, but I think it's not a bug: I
+ doubt other bios were programmed to be compatible with mahjong panels
****************************************************************************/
@@ -432,7 +432,7 @@ static void select_controller(UINT8 data)
static CUSTOM_INPUT( multiplexed_controller_r )
{
int port = (FPTR)param;
-
+
static const char *const cntrl[2][2] =
{
{ "IN0-0", "IN0-1" }, { "IN1-0", "IN1-1" }
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index 9daf9effab1..1e1c7a2bf1c 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -538,9 +538,9 @@ static ADDRESS_MAP_START( pgm_mem, ADDRESS_SPACE_PROGRAM, 16)
AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_BASE(&pgm_mainram) /* Main Ram */
-// AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */
-// AM_RANGE(0x904000, 0x905fff) AM_RAM_WRITE(pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */
-// AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram)
+// AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */
+// AM_RANGE(0x904000, 0x905fff) AM_RAM_WRITE(pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */
+// AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram)
AM_RANGE(0x900000, 0x907fff) AM_MIRROR(0x0f8000) AM_RAM_WRITE(pgm_videoram_w) AM_BASE(&pgm_videoram) /* IGS023 VIDEO CHIP */
AM_RANGE(0xa00000, 0xa011ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16)
AM_RANGE(0xb00000, 0xb0ffff) AM_RAM AM_BASE(&pgm_videoregs) /* Video Regs inc. Zoom Table */
@@ -571,9 +571,9 @@ static ADDRESS_MAP_START( killbld_mem, ADDRESS_SPACE_PROGRAM, 16)
AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_BASE(&pgm_mainram) /* Main Ram */
-// AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */
-// AM_RANGE(0x904000, 0x905fff) AM_RAM_WRITE(pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */
-// AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram)
+// AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */
+// AM_RANGE(0x904000, 0x905fff) AM_RAM_WRITE(pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */
+// AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram)
AM_RANGE(0x900000, 0x907fff) AM_MIRROR(0x0f8000) AM_RAM_WRITE(pgm_videoram_w) AM_BASE(&pgm_videoram) /* IGS023 VIDEO CHIP */
AM_RANGE(0xa00000, 0xa011ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16)
AM_RANGE(0xb00000, 0xb0ffff) AM_RAM AM_BASE(&pgm_videoregs) /* Video Regs inc. Zoom Table */
@@ -604,9 +604,9 @@ static ADDRESS_MAP_START( olds_mem, ADDRESS_SPACE_PROGRAM, 16)
AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_BASE(&pgm_mainram) /* Main Ram */
-// AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */
-// AM_RANGE(0x904000, 0x905fff) AM_RAM_WRITE(pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */
-// AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram)
+// AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */
+// AM_RANGE(0x904000, 0x905fff) AM_RAM_WRITE(pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */
+// AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram)
AM_RANGE(0x900000, 0x907fff) AM_MIRROR(0x0f8000) AM_RAM_WRITE(pgm_videoram_w) AM_BASE(&pgm_videoram) /* IGS023 VIDEO CHIP */
AM_RANGE(0xa00000, 0xa011ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16)
AM_RANGE(0xb00000, 0xb0ffff) AM_RAM AM_BASE(&pgm_videoregs) /* Video Regs inc. Zoom Table */
@@ -634,9 +634,9 @@ static ADDRESS_MAP_START( kov2_mem, ADDRESS_SPACE_PROGRAM, 16)
AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_BASE(&pgm_mainram) /* Main Ram */
-// AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */
-// AM_RANGE(0x904000, 0x905fff) AM_RAM_WRITE(pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */
-// AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram)
+// AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */
+// AM_RANGE(0x904000, 0x905fff) AM_RAM_WRITE(pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */
+// AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram)
AM_RANGE(0x900000, 0x907fff) AM_MIRROR(0x0f8000) AM_RAM_WRITE(pgm_videoram_w) AM_BASE(&pgm_videoram) /* IGS023 VIDEO CHIP */
AM_RANGE(0xa00000, 0xa011ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16)
AM_RANGE(0xb00000, 0xb0ffff) AM_RAM AM_BASE(&pgm_videoregs) /* Video Regs inc. Zoom Table */
@@ -668,9 +668,9 @@ static ADDRESS_MAP_START( cavepgm_mem, ADDRESS_SPACE_PROGRAM, 16)
AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_BASE(&pgm_mainram) /* Main Ram */
-// AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */
-// AM_RANGE(0x904000, 0x905fff) AM_RAM_WRITE(pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */
-// AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram)
+// AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */
+// AM_RANGE(0x904000, 0x905fff) AM_RAM_WRITE(pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */
+// AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram)
AM_RANGE(0x900000, 0x907fff) AM_MIRROR(0x0f8000) AM_RAM_WRITE(pgm_videoram_w) AM_BASE(&pgm_videoram) /* IGS023 VIDEO CHIP */
AM_RANGE(0xa00000, 0xa011ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16)
AM_RANGE(0xb00000, 0xb0ffff) AM_RAM AM_BASE(&pgm_videoregs) /* Video Regs inc. Zoom Table */
@@ -758,13 +758,13 @@ static WRITE16_HANDLER( kovsh_68k_protlatch_w )
switch (offset)
{
- case 1:
+ case 1:
{
- kovsh_highlatch_68k_w = data;
+ kovsh_highlatch_68k_w = data;
}
break;
- case 0:
+ case 0:
{
kovsh_lowlatch_68k_w = data;
}
@@ -795,9 +795,9 @@ static ADDRESS_MAP_START( kovsh_mem, ADDRESS_SPACE_PROGRAM, 16)
AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_BASE(&pgm_mainram) /* Main Ram */
-// AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */
-// AM_RANGE(0x904000, 0x905fff) AM_RAM_WRITE(pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */
-// AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram)
+// AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */
+// AM_RANGE(0x904000, 0x905fff) AM_RAM_WRITE(pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */
+// AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram)
AM_RANGE(0x900000, 0x907fff) AM_MIRROR(0x0f8000) AM_RAM_WRITE(pgm_videoram_w) AM_BASE(&pgm_videoram) /* IGS023 VIDEO CHIP */
AM_RANGE(0xa00000, 0xa011ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16)
AM_RANGE(0xb00000, 0xb0ffff) AM_RAM AM_BASE(&pgm_videoregs) /* Video Regs inc. Zoom Table */
@@ -904,9 +904,9 @@ static ADDRESS_MAP_START( svg_68k_mem, ADDRESS_SPACE_PROGRAM, 16)
AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_BASE(&pgm_mainram) /* Main Ram */
-// AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */
-// AM_RANGE(0x904000, 0x905fff) AM_RAM_WRITE(pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */
-// AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram)
+// AM_RANGE(0x900000, 0x903fff) AM_RAM_WRITE(pgm_bg_videoram_w) AM_BASE(&pgm_bg_videoram) /* Backgrounds */
+// AM_RANGE(0x904000, 0x905fff) AM_RAM_WRITE(pgm_tx_videoram_w) AM_BASE(&pgm_tx_videoram) /* Text Layer */
+// AM_RANGE(0x907000, 0x9077ff) AM_RAM AM_BASE(&pgm_rowscrollram)
AM_RANGE(0x900000, 0x907fff) AM_MIRROR(0x0f8000) AM_RAM_WRITE(pgm_videoram_w) AM_BASE(&pgm_videoram) /* IGS023 VIDEO CHIP */
AM_RANGE(0xa00000, 0xa011ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE(&paletteram16)
AM_RANGE(0xb00000, 0xb0ffff) AM_RAM AM_BASE(&pgm_videoregs) /* Video Regs inc. Zoom Table */
@@ -4067,8 +4067,8 @@ ROM_START( killbldp )
/* CPU2 = Z80, romless, code uploaded by 68k */
ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
- /* the first ~0x200 bytes of this are 'execute only' and can't be read directly, even when running code from internal/external ARM romspace */
- ROM_LOAD( "killbldp_igs027a.bin", 0x000000, 0x04000, BAD_DUMP CRC(9a73bf7d) SHA1(2ce1311b01e1124ad00af172f0670141bcb7a030) )
+ /* the first ~0x200 bytes of this are 'execute only' and can't be read directly, even when running code from internal/external ARM romspace */
+ ROM_LOAD( "killbldp_igs027a.bin", 0x000000, 0x04000, BAD_DUMP CRC(9a73bf7d) SHA1(2ce1311b01e1124ad00af172f0670141bcb7a030) )
ROM_REGION( 0x800000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
ROM_LOAD( "v300x.u26", 0x000000, 0x200000, CRC(144388c8) SHA1(d7469df077c1a674129f18210584ba4d05a61888) )
diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c
index 29620a480dc..f9d394a95ea 100644
--- a/src/mame/drivers/sbasketb.c
+++ b/src/mame/drivers/sbasketb.c
@@ -123,7 +123,7 @@ ADDRESS_MAP_END
static INPUT_PORTS_START( sbasketb )
PORT_START("SYSTEM")
KONAMI8_SYSTEM_UNK
-
+
PORT_START("P1")
KONAMI8_MONO_B123_UNK
diff --git a/src/mame/drivers/system1.c b/src/mame/drivers/system1.c
index aba2f5c41db..405111c6cff 100644
--- a/src/mame/drivers/system1.c
+++ b/src/mame/drivers/system1.c
@@ -21,106 +21,106 @@ TODO: - remove patch in nobb if possible and fully understand the
*******************************************************************************
- Main Snd Gfx1 Gfx2 Max Min
-Game ROMs ROMs ROMs ROMs Pal? Intf EPR# EPR#
------------ ----- ----- ----- ----- ---- ---- ---- ----
-starjack 6x8k 1x8k 6x8k 2x16k no ppi 5325(b) 5318
-starjacks 6x8k 1x8k 6x8k 2x16k no ppi license
+ Main Snd Gfx1 Gfx2 Max Min
+Game ROMs ROMs ROMs ROMs Pal? Intf EPR# EPR#
+----------- ----- ----- ----- ----- ---- ---- ---- ----
+starjack 6x8k 1x8k 6x8k 2x16k no ppi 5325(b) 5318
+starjacks 6x8k 1x8k 6x8k 2x16k no ppi license
-upndown 6x8k 1x8k 6x8k 2x16k no ppi 5521 5514
-upndownu 6x8k 1x8k 6x8k 2x16k no ppi 5684
+upndown 6x8k 1x8k 6x8k 2x16k no ppi 5521 5514
+upndownu 6x8k 1x8k 6x8k 2x16k no ppi 5684
-regulus 6x8k 1x8k 6x8k 2x16k no ppi 5645(a) 5638
-reguluso 6x8k 1x8k 6x8k 2x16k no ppi 5645
-regulusu 6x8k 1x8k 6x8k 2x16k no ppi 5955
+regulus 6x8k 1x8k 6x8k 2x16k no ppi 5645(a) 5638
+reguluso 6x8k 1x8k 6x8k 2x16k no ppi 5645
+regulusu 6x8k 1x8k 6x8k 2x16k no ppi 5955
-mrviking 6x8k 1x8k 6x8k 2x16k no ppi 5876 5749
-mrvikingj 6x8k 1x8k 6x8k 2x16k no ppi 5756
+mrviking 6x8k 1x8k 6x8k 2x16k no ppi 5876 5749
+mrvikingj 6x8k 1x8k 6x8k 2x16k no ppi 5756
-swat 6x8k 1x8k 6x8k 2x16k no ppi 5812 5805
+swat 6x8k 1x8k 6x8k 2x16k no ppi 5812 5805
-flickys1 4x8k 1x8k 6x8k 2x16k no ppi ???? 5855
-flickyo 4x8k 1x8k 6x8k 2x16k no ppi 5860(a)
-flicky 2x16k 1x8k 6x8k 2x16k no pio 5979(a)
-flickys2 2x16k 1x8k 6x8k 2x16k no pio 6622
+flickys1 4x8k 1x8k 6x8k 2x16k no ppi ???? 5855
+flickyo 4x8k 1x8k 6x8k 2x16k no ppi 5860(a)
+flicky 2x16k 1x8k 6x8k 2x16k no pio 5979(a)
+flickys2 2x16k 1x8k 6x8k 2x16k no pio 6622
-wmatch 6x8k 1x8k 6x8k 2x16k no ppi ???? ????
+wmatch 6x8k 1x8k 6x8k 2x16k no ppi ???? ????
-bullfgt 6x8k 1x8k 6x8k 2x16k no ppi ???? 6069
-thetogyu 3x16k 1x8k 6x8k 2x16k no pio 6073
+bullfgt 6x8k 1x8k 6x8k 2x16k no ppi ???? 6069
+thetogyu 3x16k 1x8k 6x8k 2x16k no pio 6073
-spatter 3x16k 1x8k 6x8k 4x16k no pio 6394 6306
-ssanchan 3x16k 1x8k 6x8k 4x16k no pio 6312
+spatter 3x16k 1x8k 6x8k 4x16k no pio 6394 6306
+ssanchan 3x16k 1x8k 6x8k 4x16k no pio 6312
-pitfall2 3x16k 1x8k 6x8k 2x16k no pio 6458(a) 6454
-pitfall2a 3x16k 1x8k 6x8k 2x16k no pio 6506
-pitfall2u 3x16k 1x8k 6x8k 2x16k no pio 6625(a)
+pitfall2 3x16k 1x8k 6x8k 2x16k no pio 6458(a) 6454
+pitfall2a 3x16k 1x8k 6x8k 2x16k no pio 6506
+pitfall2u 3x16k 1x8k 6x8k 2x16k no pio 6625(a)
-seganinj 3x16k 1x8k 6x8k 4x16k no pio ???? 6546
-seganinju 3x16k 1x8k 6x8k 4x16k no pio 7150
-nprinceso 3x16k 1x8k 6x8k 4x16k no pio 6552
-nprincesb 3x16k 1x8k 6x8k 4x16k no pio bootleg
-ninja 3x16k 1x8k 6x8k 4x16k no pio 6595
-nprinces 6x8k 1x8k 6x8k 4x16k no ppi 6617
-nprincesu 6x8k 1x8k 6x8k 4x16k no ppi 6578
+seganinj 3x16k 1x8k 6x8k 4x16k no pio ???? 6546
+seganinju 3x16k 1x8k 6x8k 4x16k no pio 7150
+nprinceso 3x16k 1x8k 6x8k 4x16k no pio 6552
+nprincesb 3x16k 1x8k 6x8k 4x16k no pio bootleg
+ninja 3x16k 1x8k 6x8k 4x16k no pio 6595
+nprinces 6x8k 1x8k 6x8k 4x16k no ppi 6617
+nprincesu 6x8k 1x8k 6x8k 4x16k no ppi 6578
-imsorry 3x16k 1x8k 6x8k 2x16k no pio 6678 6645
-imsorryj 3x16k 1x8k 6x8k 2x16k no pio 6649
+imsorry 3x16k 1x8k 6x8k 2x16k no pio 6678 6645
+imsorryj 3x16k 1x8k 6x8k 2x16k no pio 6649
-teddybb 3x16k 1x8k 6x8k 4x16k no pio 6770 6735
-teddybbo 3x16k 1x8k 6x8k 4x16k no pio 6741
+teddybb 3x16k 1x8k 6x8k 4x16k no pio 6770 6735
+teddybbo 3x16k 1x8k 6x8k 4x16k no pio 6741
-hvymetal 3x32k 1x32k 6x16k 4x32k yes 6790 6778
+hvymetal 3x32k 1x32k 6x16k 4x32k yes 6790 6778
-myhero 3x16k 1x8k 6x8k 4x16k no pio 6964 6921
-sscandal 3x16k 1x8k 6x8k 4x16k no pio 6927
-myherok 3x16k 1x8k 6x8k 4x16k no pio bootleg?
+myhero 3x16k 1x8k 6x8k 4x16k no pio 6964 6921
+sscandal 3x16k 1x8k 6x8k 4x16k no pio 6927
+myherok 3x16k 1x8k 6x8k 4x16k no pio bootleg?
-4dwarrio 3x16k 1x8k 6x8k 4x16k no pio ???? ????
+4dwarrio 3x16k 1x8k 6x8k 4x16k no pio ???? ????
-shtngmst 3x32k 1x32k 3x32k 7x32k yes 7102(a) 7104
-shtngmst1 3x32k 1x32k 3x32k 7x32k yes 7102
-shtngmsta 3x32k 1x32k 3x32k 7x32k yes license
+shtngmst 3x32k 1x32k 3x32k 7x32k yes 7102(a) 7104
+shtngmst1 3x32k 1x32k 3x32k 7x32k yes 7102
+shtngmsta 3x32k 1x32k 3x32k 7x32k yes license
-choplift 3x32k 1x32k 3x32k 4x32k yes 7126 7120
-chopliftu 3x32k 1x32k 3x32k 4x32k yes 7154
-chopliftbl 3x32k 1x32k 3x32k 4x32k yes bootleg
+choplift 3x32k 1x32k 3x32k 4x32k yes 7126 7120
+chopliftu 3x32k 1x32k 3x32k 4x32k yes 7154
+chopliftbl 3x32k 1x32k 3x32k 4x32k yes bootleg
-raflesia 3x16k 1x8k 6x8k 4x16k no pio 7413 7408
+raflesia 3x16k 1x8k 6x8k 4x16k no pio 7413 7408
-wboy2 6x8k 1x8k 6x8k 4x16k no ppi 7592 7485
-wboy2u 6x8k 1x8k 6x8k 4x16k no ppi ????
-wbdeluxe 6x8k 1x8k 6x8k 4x16k no ppi ????
-wboy 3x16k 1x8k 6x8k 4x16k no pio 7491
-wboyo 3x16k 1x8k 6x8k 4x16k no pio ????
-wboy3 3x16k 1x8k 6x8k 4x16k no pio ????
-wboyu 3x16k 1x8k 6x8k 4x16k no pio ????
-wboy4 2x32k 1x32k 3x16k 2x32k no ????
-wboysys2 2x32k 1x32k 3x32k 2x32k yes 7580
+wboy2 6x8k 1x8k 6x8k 4x16k no ppi 7592 7485
+wboy2u 6x8k 1x8k 6x8k 4x16k no ppi ????
+wbdeluxe 6x8k 1x8k 6x8k 4x16k no ppi ????
+wboy 3x16k 1x8k 6x8k 4x16k no pio 7491
+wboyo 3x16k 1x8k 6x8k 4x16k no pio ????
+wboy3 3x16k 1x8k 6x8k 4x16k no pio ????
+wboyu 3x16k 1x8k 6x8k 4x16k no pio ????
+wboy4 2x32k 1x32k 3x16k 2x32k no ????
+wboysys2 2x32k 1x32k 3x32k 2x32k yes 7580
-gardia 3x32k 1x16k 3x16k 4x32k yes 10255 10233
-gardiab 3x32k 1x16k 3x16k 4x32k yes bootleg
+gardia 3x32k 1x16k 3x16k 4x32k yes 10255 10233
+gardiab 3x32k 1x16k 3x16k 4x32k yes bootleg
-brain 3x32k 1x32k 3x16k 3x32k yes ???? ????
+brain 3x32k 1x32k 3x16k 3x32k yes ???? ????
-tokisens 3x32k 1x32k 3x32k 4x32k yes 10963 10957
+tokisens 3x32k 1x32k 3x32k 4x32k yes 10963 10957
-wbml 3x32k 1x32k 3x32k 4x32k yes 11033(a) 11027
-wbmljo 3x32k 1x32k 3x32k 4x32k yes 11033
-wbmljb 3x64k 1x32k 3x32k 4x32k yes bootleg
-wbmlb 3x64k 1x32k 3x32k 4x32k yes bootleg
-wbmlg 3x64k 1x32k 3x32k 4x32k yes bootleg
+wbml 3x32k 1x32k 3x32k 4x32k yes 11033(a) 11027
+wbmljo 3x32k 1x32k 3x32k 4x32k yes 11033
+wbmljb 3x64k 1x32k 3x32k 4x32k yes bootleg
+wbmlb 3x64k 1x32k 3x32k 4x32k yes bootleg
+wbmlg 3x64k 1x32k 3x32k 4x32k yes bootleg
-dakkochn 2x32k 1x32k 3x32k 4x32k yes 11225 11220
+dakkochn 2x32k 1x32k 3x32k 4x32k yes 11225 11220
-ufosensi 3x32k 1x32k 3x32k 4x32k yes 11663 11657
-ufosensib 3x64k 1x32k 3x32k 4x32k yes bootleg
+ufosensi 3x32k 1x32k 3x32k 4x32k yes 11663 11657
+ufosensib 3x64k 1x32k 3x32k 4x32k yes bootleg
-blockgal 2x16k 1x8k 6x8k 4x16k no ????
-blockgalb 1x64k 1x8k 6x8k 4x16k no bootleg
+blockgal 2x16k 1x8k 6x8k 4x16k no ????
+blockgalb 1x64k 1x8k 6x8k 4x16k no bootleg
-nob 3x32k 1x16k 3x32k 4x32k yes
-nobb 3x32k 1x16k 3x32k 4x32k yes
+nob 3x32k 1x16k 3x32k 4x32k yes
+nobb 3x32k 1x16k 3x32k 4x32k yes
*******************************************************************************
@@ -223,18 +223,18 @@ static UINT8 i8751_active;
*
*************************************/
-/*
- About main CPU clocking:
-
- A 20MHz crystal clocks an LS161 which counts up from either 10 or 11 to 16 before
- carrying out and forcing a reload. The low bit of the reload value comes from the
- Z80's /M1 signal. When /M1 is low (an opcode is being fetched), the reload count
- is 10, which means the 20MHz clock is divided by 6. When /M1 is high, the reload
- count is 11, which means the clock is divided by 5.
-
- To account for this, we install custom cycle tables for the Z80. We clock the Z80
- at 20MHz and count 5 cycles for each original Z80 cycle, plus an extra cycle for
- each opcode fetch.
+/*
+ About main CPU clocking:
+
+ A 20MHz crystal clocks an LS161 which counts up from either 10 or 11 to 16 before
+ carrying out and forcing a reload. The low bit of the reload value comes from the
+ Z80's /M1 signal. When /M1 is low (an opcode is being fetched), the reload count
+ is 10, which means the 20MHz clock is divided by 6. When /M1 is high, the reload
+ count is 11, which means the clock is divided by 5.
+
+ To account for this, we install custom cycle tables for the Z80. We clock the Z80
+ at 20MHz and count 5 cycles for each original Z80 cycle, plus an extra cycle for
+ each opcode fetch.
*/
static const UINT8 cc_op[0x100] = {
@@ -350,7 +350,7 @@ static const UINT8 cc_ex[0x100] = {
static MACHINE_START( system1 )
{
UINT32 numbanks = (memory_region_length(machine, "maincpu") - 0x10000) / 0x4000;
-
+
if (numbanks > 0)
memory_configure_bank(machine, 1, 0, numbanks, memory_region(machine, "maincpu") + 0x10000, 0x4000);
else
@@ -486,7 +486,7 @@ static WRITE8_HANDLER( videomode_w )
/* bit 0 is for the coin counters */
coin_counter_w(0, data & 1);
-
+
/* remaining signals are video-related */
system1_videomode_w(space, 0, data);
}
@@ -518,7 +518,7 @@ static void dakkochn_custom_w(running_machine *machine, UINT8 data, UINT8 prevda
/* bit 1 toggling on clocks the mux; we store the previous state in the high bit of dakkochn_mux_data */
if ((data & 0x02) && !(prevdata & 0x02))
dakkochn_mux_data = (dakkochn_mux_data + 1) % 7;
-
+
/* remaining stuff acts like bank0c */
bank0c_custom_w(machine, data, prevdata);
}
@@ -535,9 +535,9 @@ static WRITE8_DEVICE_HANDLER( sound_control_w )
{
/* bit 0 = MUTE */
sound_global_enable(~(data & 1));
-
+
/* bit 6 = feedback from sound board that read occurrred */
-
+
/* bit 7 controls the sound CPU's NMI line */
cputag_set_input_line(device->machine, "soundcpu", INPUT_LINE_NMI, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE);
@@ -550,7 +550,7 @@ static READ8_HANDLER( sound_data_r )
{
const device_config *ppi = devtag_get_device(space->machine, "ppi");
const device_config *pio = devtag_get_device(space->machine, "pio");
-
+
/* if we have an 8255 PPI, get the data from the port and toggle the ack */
if (ppi != NULL)
{
@@ -559,7 +559,7 @@ static READ8_HANDLER( sound_data_r )
ppi8255_set_port_c(ppi, initial_value | 0x40);
return soundlatch_r(space, offset);
}
-
+
/* if we have a Z80 PIO, just do a port read which will auto-ack */
else if (pio != NULL)
return z80pio_p_r(pio, 0);
@@ -2015,7 +2015,7 @@ static MACHINE_DRIVER_START( sys1ppi )
MDRV_MACHINE_START(system1)
MDRV_MACHINE_RESET(system1)
-
+
MDRV_PPI8255_ADD("ppi", ppi_interface)
/* video hardware */
@@ -2058,10 +2058,10 @@ MACHINE_DRIVER_END
/* revised board with 128kbit ROMs and a Z80 PIO for outputs */
static MACHINE_DRIVER_START( sys1pio )
MDRV_IMPORT_FROM( sys1ppi )
-
+
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_IO_MAP(system1_pio_io_map,0)
-
+
MDRV_PPI8255_REMOVE("ppi")
MDRV_Z80PIO_ADD("pio", pio_interface)
MACHINE_DRIVER_END
@@ -4514,11 +4514,11 @@ static DRIVER_INIT( dakkochn )
mc8123_decrypt_rom(machine, "maincpu", "key", 1, 4);
-// memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x00, 0x00, 0, 0, dakkochn_port_00_r);
-// memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x03, 0x03, 0, 0, dakkochn_port_03_r);
-// memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x04, 0x04, 0, 0, dakkochn_port_04_r);
+// memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x00, 0x00, 0, 0, dakkochn_port_00_r);
+// memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x03, 0x03, 0, 0, dakkochn_port_03_r);
+// memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x04, 0x04, 0, 0, dakkochn_port_04_r);
-// memory_install_write8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x15, 0x15, 0, 0, dakkochn_port_15_w);
+// memory_install_write8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x15, 0x15, 0, 0, dakkochn_port_15_w);
}
@@ -4526,7 +4526,7 @@ static DRIVER_INIT( myherok )
{
int A;
UINT8 *rom;
-
+
DRIVER_INIT_CALL(bank00);
/* additionally to the usual protection, all the program ROMs have data lines */
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index 502f7e110c0..2f154693acc 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -1701,7 +1701,7 @@ static INPUT_PORTS_START( plgirls )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_DIPNAME( 0x80, 0x80, "P1+P2 Start to Clear Round (Cheat)" )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
PORT_START("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index ff06a39f401..ee9f2454bc7 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -440,7 +440,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ginkun )
MDRV_IMPORT_FROM(fstarfrc)
-
+
MDRV_CPU_MODIFY("maincpu")
MDRV_CPU_PROGRAM_MAP(ginkun_map,0)
diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c
index 3c96004c6da..62137d6d5ff 100644
--- a/src/mame/drivers/thunderx.c
+++ b/src/mame/drivers/thunderx.c
@@ -486,7 +486,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( thunderx )
PORT_START("SYSTEM")
- KONAMI8_SYSTEM_10
+ KONAMI8_SYSTEM_10
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/tp84.c b/src/mame/drivers/tp84.c
index a00bab6f991..3dd1d6fb1c3 100644
--- a/src/mame/drivers/tp84.c
+++ b/src/mame/drivers/tp84.c
@@ -242,7 +242,7 @@ static INPUT_PORTS_START( tp84 )
INPUT_PORTS_END
static INPUT_PORTS_START( tp84a )
- PORT_INCLUDE( tp84 )
+ PORT_INCLUDE( tp84 )
PORT_MODIFY("DSW2")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) )
diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c
index 40dd417c9c1..163a67622c7 100644
--- a/src/mame/drivers/trackfld.c
+++ b/src/mame/drivers/trackfld.c
@@ -743,13 +743,13 @@ static MACHINE_DRIVER_START( hyprolyb )
MDRV_CPU_MODIFY("audiocpu")
MDRV_CPU_PROGRAM_MAP(hyprolyb_sound_map,0)
-
+
MDRV_CPU_ADD("adpcm", M6802, SOUND_CLOCK/8) /* unknown clock */
MDRV_CPU_PROGRAM_MAP(hyprolyb_adpcm_map,0)
/* sound hardware */
MDRV_SOUND_REMOVE("vlm")
-
+
MDRV_SOUND_ADD("msm", MSM5205, 384000)
MDRV_SOUND_CONFIG(msm5205_config)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
@@ -1180,7 +1180,7 @@ static DRIVER_INIT( wizzquiz )
/* decrypt questions roms */
for( i = 0; i < 0x40000; i++ )
ROM[i] = BITSWAP8(ROM[i],0,1,2,3,4,5,6,7);
-
+
memory_configure_bank(machine, 1, 0, 8, ROM, 0x8000);
}
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index 513b8f51a23..41e53ec694d 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -68,7 +68,7 @@ static ADDRESS_MAP_START( burglarx_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x80010c, 0x80010d) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrollx_0) // Scroll
AM_RANGE(0x80010e, 0x80010f) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrolly_0) //
AM_RANGE(0x800110, 0x800111) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrolly_2) //
- AM_RANGE(0x800114, 0x800115) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrollx_2) //
+ AM_RANGE(0x800114, 0x800115) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrollx_2) //
AM_RANGE(0x800116, 0x800117) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrollx_1) //
AM_RANGE(0x800120, 0x800121) AM_WRITE(SMH_RAM) AM_BASE(&unico_scrolly_1) //
AM_RANGE(0x800188, 0x800189) AM_DEVREADWRITE8("oki", okim6295_r, okim6295_w, 0x00ff) // Sound
diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c
index e179c1ac700..390917c3d83 100644
--- a/src/mame/drivers/vball.c
+++ b/src/mame/drivers/vball.c
@@ -292,10 +292,10 @@ static INPUT_PORTS_START( common )
PORT_DIPNAME( 0x80, 0x80, DEF_STR( Demo_Sounds ) )
PORT_DIPSETTING( 0x00, DEF_STR( Off ) )
PORT_DIPSETTING( 0x80, DEF_STR( On ) )
-
+
PORT_START("P3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
-
+
PORT_START("P4")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/includes/konamipt.h b/src/mame/includes/konamipt.h
index a53ab521ed8..9c63fcaaa3a 100644
--- a/src/mame/includes/konamipt.h
+++ b/src/mame/includes/konamipt.h
@@ -180,7 +180,7 @@
KONAMI8_LR_40( player, IPT_BUTTON3, IPT_BUTTON2, IPT_BUTTON1 )
-/* vendetta.c uses inputs with switched Left/Right directions. We add these inputs here as well
+/* vendetta.c uses inputs with switched Left/Right directions. We add these inputs here as well
because they just need a few lines of code */
#define KONAMI8_RL_B12_COIN( player ) \
KONAMI8_RL_40( player, IPT_BUTTON1, IPT_BUTTON2, IPT_UNKNOWN ) \
@@ -227,7 +227,7 @@ because they just need a few lines of code */
PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(player) \
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(player) \
PORT_BIT( 0x4000, IP_ACTIVE_LOW, button3 ) PORT_PLAYER(player)
-
+
#define KONAMI16_LSB( player, button3, start ) \
KONAMI16_LSB_40( player, button3 ) \
PORT_BIT( 0x0080, IP_ACTIVE_LOW, start )
@@ -255,18 +255,18 @@ because they just need a few lines of code */
/**************************** Coinage Dip Swicthes ****************************/
/* Konami games from 80s-90s basically use only two kind of coinage dips. The only
-difference is in the settings corresponding to 0x00, which could be either 4C_5C
-or a "Free_Play"-related option. Actually, in the latter case the behavior may change
-depending on the game code:
+difference is in the settings corresponding to 0x00, which could be either 4C_5C
+or a "Free_Play"-related option. Actually, in the latter case the behavior may change
+depending on the game code:
Coin A - 0x00 could produce the following effects
- Free_Play = nomen omen (for both players)
- Invalid = both coin slots disabled
+ Free_Play = nomen omen (for both players)
+ Invalid = both coin slots disabled
Coin B - 0x00 could produce the following effects
- Free_Play = nomen omen (for both players)
- No Coin B = coin slot B open (coins produce sound), but no effect on coin counter
- None = coin slot B disabled
- No Credits = both coin slots open, but no effect on coin counters
- Invalid = both coin slots disabled
+ Free_Play = nomen omen (for both players)
+ No Coin B = coin slot B open (coins produce sound), but no effect on coin counter
+ None = coin slot B disabled
+ No Credits = both coin slots open, but no effect on coin counters
+ Invalid = both coin slots disabled
Accordingly, we pass below different strings for different games */
#define KONAMI_COINAGE_LOC( STRING_A, STRING_B, DIPBANK ) \
diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c
index 0dfcc7ceca4..66554b1f2e3 100644
--- a/src/mame/machine/atari.c
+++ b/src/mame/machine/atari.c
@@ -256,29 +256,29 @@ void a800xl_mmu(running_machine *machine, UINT8 new_mmu)
/**************************************************************
- Keyboard inputs use 6bits to read the 64keys in the key matrix.
- We currently read the key matrix by lines and convert the input
- to the value expected by the POKEY (see the code below to
- determine atari_code values).
-
- K2,K1,K0 | 000 | 001 | 010 | 011 | 100 | 101 | 110 | 111 |
- K5,K4,K3
- ----------------------------------------------------------
- 000 | L | J | ; | (*) | | K | + | * |
- 001 | O | | P | U | Ret | I | - | = |
- 010 | V | | C | | | B | X | Z |
- 011 | 4 | | 3 | 6 | Esc | 5 | 2 | 1 |
- 100 | , | Spc | . | N | | M | / |Atari|
- 101 | R | | E | Y | Tab | T | W | Q |
- 110 | 9 | | 0 | 7 |Bkspc| 8 | < | > |
- 111 | F | H | D | | Caps| G | S | A |
-
- (*) We use this value to read Break, but in fact it would be read
- in KR2 bit. This has to be properly implemented for later
- Atari systems because here we would have F1.
-
- To Do: investigate implementation of KR2 to read accurately Break,
- Shift and Control keys.
+ Keyboard inputs use 6bits to read the 64keys in the key matrix.
+ We currently read the key matrix by lines and convert the input
+ to the value expected by the POKEY (see the code below to
+ determine atari_code values).
+
+ K2,K1,K0 | 000 | 001 | 010 | 011 | 100 | 101 | 110 | 111 |
+ K5,K4,K3
+ ----------------------------------------------------------
+ 000 | L | J | ; | (*) | | K | + | * |
+ 001 | O | | P | U | Ret | I | - | = |
+ 010 | V | | C | | | B | X | Z |
+ 011 | 4 | | 3 | 6 | Esc | 5 | 2 | 1 |
+ 100 | , | Spc | . | N | | M | / |Atari|
+ 101 | R | | E | Y | Tab | T | W | Q |
+ 110 | 9 | | 0 | 7 |Bkspc| 8 | < | > |
+ 111 | F | H | D | | Caps| G | S | A |
+
+ (*) We use this value to read Break, but in fact it would be read
+ in KR2 bit. This has to be properly implemented for later
+ Atari systems because here we would have F1.
+
+ To Do: investigate implementation of KR2 to read accurately Break,
+ Shift and Control keys.
**************************************************************/
@@ -345,24 +345,24 @@ void a800_handle_keyboard(running_machine *machine)
/**************************************************************
- A5200 keypad inputs use 4bits to read the 16keys in the key
- matrix. We currently read the key matrix by lines and convert
- the input to the value expected by the POKEY (see the code
- below to determine atari_code values).
+ A5200 keypad inputs use 4bits to read the 16keys in the key
+ matrix. We currently read the key matrix by lines and convert
+ the input to the value expected by the POKEY (see the code
+ below to determine atari_code values).
- K2,K1,K0 | 00x | 01x | 10x | 11x |
- K5,K4,K3
- ----------------------------------
- x00 | | # | 0 | * |
- x01 |Reset| 9 | 8 | 7 |
- x10 |Pause| 6 | 5 | 4 |
- x11 |Start| 3 | 2 | 1 |
+ K2,K1,K0 | 00x | 01x | 10x | 11x |
+ K5,K4,K3
+ ----------------------------------
+ x00 | | # | 0 | * |
+ x01 |Reset| 9 | 8 | 7 |
+ x10 |Pause| 6 | 5 | 4 |
+ x11 |Start| 3 | 2 | 1 |
- K0 & K5 are ignored (we send them as 1, see the code below where
- we pass "(atari_code << 1) | 0x21" )
+ K0 & K5 are ignored (we send them as 1, see the code below where
+ we pass "(atari_code << 1) | 0x21" )
- To Do: investigate implementation of KR2 to read accurately the
- secondary Fire button (primary read through GTIA).
+ To Do: investigate implementation of KR2 to read accurately the
+ secondary Fire button (primary read through GTIA).
**************************************************************/
diff --git a/src/mame/machine/pgmcrypt.c b/src/mame/machine/pgmcrypt.c
index 9f2548a4014..a0ac25a29c0 100644
--- a/src/mame/machine/pgmcrypt.c
+++ b/src/mame/machine/pgmcrypt.c
@@ -669,7 +669,7 @@ void pgm_puzzli2_decrypt(running_machine *machine)
static const UINT8 theglad_tab[256] = {
- 0x49, 0x47, 0x53, 0x30, 0x30, 0x30, 0x35, 0x52, 0x44, 0x31, 0x30, 0x32, 0x31, 0x32, 0x30, 0x33,
+ 0x49, 0x47, 0x53, 0x30, 0x30, 0x30, 0x35, 0x52, 0x44, 0x31, 0x30, 0x32, 0x31, 0x32, 0x30, 0x33,
0xC4, 0xA3, 0x46, 0x78, 0x30, 0xB3, 0x8B, 0xD5, 0x2F, 0xC4, 0x44, 0xBF, 0xDB, 0x76, 0xDB, 0xEA,
0xB4, 0xEB, 0x95, 0x4D, 0x15, 0x21, 0x99, 0xA1, 0xD7, 0x8C, 0x40, 0x1D, 0x43, 0xF3, 0x9F, 0x71,
0x3D, 0x8C, 0x52, 0x01, 0xAF, 0x5B, 0x8B, 0x63, 0x34, 0xC8, 0x5C, 0x1B, 0x06, 0x7F, 0x41, 0x96,
@@ -757,7 +757,7 @@ void pgm_oldsplus_decrypt(running_machine *machine)
for(i=0; i<rom_size/2; i++) {
unsigned short x = src[i];
- if((i & 0x040480) != 0x000080 )
+ if((i & 0x040480) != 0x000080 )
x ^= 0x0001;
if((i & 0x004008) == 0x004008 )
diff --git a/src/mame/machine/tnzs.c b/src/mame/machine/tnzs.c
index c2f18679c59..9d20f50aed8 100644
--- a/src/mame/machine/tnzs.c
+++ b/src/mame/machine/tnzs.c
@@ -490,12 +490,12 @@ interleave.
/*
static TIMER_CALLBACK( kludge_callback )
{
- tnzs_sharedram[0x0f10] = param;
+ tnzs_sharedram[0x0f10] = param;
}
static WRITE8_HANDLER( tnzs_sync_kludge_w )
{
- timer_call_after_resynch(space->machine, NULL, data,kludge_callback);
+ timer_call_after_resynch(space->machine, NULL, data,kludge_callback);
}
*/
@@ -533,7 +533,7 @@ DRIVER_INIT( tnzs )
{
mcu_type = MCU_TNZS;
/* we need to install a kludge to avoid problems with a bug in the original code */
-// memory_install_write8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xef10, 0xef10, 0, 0, tnzs_sync_kludge_w);
+// memory_install_write8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xef10, 0xef10, 0, 0, tnzs_sync_kludge_w);
}
DRIVER_INIT( tnzsb )
@@ -541,7 +541,7 @@ DRIVER_INIT( tnzsb )
mcu_type = MCU_NONE_TNZSB;
/* we need to install a kludge to avoid problems with a bug in the original code */
-// memory_install_write8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xef10, 0xef10, 0, 0, tnzs_sync_kludge_w);
+// memory_install_write8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xef10, 0xef10, 0, 0, tnzs_sync_kludge_w);
}
DRIVER_INIT( kabukiz )
diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c
index 8c8f4fced6c..6c4659b9796 100644
--- a/src/mame/mamedriv.c
+++ b/src/mame/mamedriv.c
@@ -7945,6 +7945,7 @@ Other Sun games
DRIVER( martmast ) /* (c) 2001 */
DRIVER( martmasc ) /* (c) 2001 */
DRIVER( theglad ) /* (c) 2001 */
+ DRIVER( theglada ) /* (c) 2001 */
DRIVER( dmnfrnt ) /* (c) 2002 */
DRIVER( dmnfrnta ) /* (c) 2002 */
DRIVER( kovshp )
diff --git a/src/mame/video/system1.c b/src/mame/video/system1.c
index ac773355ed9..23a4c0116c1 100644
--- a/src/mame/video/system1.c
+++ b/src/mame/video/system1.c
@@ -1,80 +1,80 @@
/*************************************************************************
- System1 / System 2
- original driver by Jarek Parchanski & Mirko Buffoni
+ System1 / System 2
+ original driver by Jarek Parchanski & Mirko Buffoni
- Many thanks to Roberto Ventura, for precious information about
- System 1 hardware.
+ Many thanks to Roberto Ventura, for precious information about
+ System 1 hardware.
**************************************************************************
- The System 1/System 2 video hardware is composed of two tilemap
- layers and a sprite layer.
-
- The tilemap layers are built up out of "pages" of 32x32 tilemaps.
- Each tile is described by two bytes, meaning each page is 2k bytes
- in size. One of the tilemaps is fixed in position, while the other
- has registers for scrolling that vary between board variants.
-
- The original System 1 hardware simply had two fixed pages. Page 0
- was the scrolling tilemap, and page 1 was the fixed tilemap.
-
- With later boards and the introduction of System 2, this was
- expanded to support up to 8 pages. The fixed tilemap was hard-
- coded to page 0, but the scrolling tilemap was extended. Instead
- of a single page, the scrolling tilemap consisted of 4 pages glued
- together to form an effective large 64x64 tilemap. Further, each
- of the 4 pages that made up the scrolling tilemap could be
- independently selected from one of the 8 available pages. This
- unique paged tilemap system would continue on to form the basis of
- Sega's tilemap systems for their 16-bit era.
-
- Up to 32 sprites can be displayed. They are rendered one scanline
- ahead of the beam into 12-bit line buffers which store the sprite
- pixel data and sprite index. During rendering, collisions are
- checked between sprites and if one is found a bit is set in a
- special 32x32x1 collision RAM indiciating which pair of sprites
- collided. Note that the sprite color is derived directly from the
- sprite index, giving each sprite its own set of 16 colors.
-
- The 11-bit output from the two tilemaps (3 bits of pixel data,
- 6 bits of color, 2 bits of priority), plus the 9-bit output from
- the sprite line buffer (4 bits of pixel data, 5 bits of color)
- are combined in a final step to produce the final pixel value. To
- do this, a lookup PROM is used which accepts as input the priority
- bits from the two tilemaps and the whether each of the incoming
- pixel values is transparent (color 0).
-
- The output of the lookup PROM is a 4-bit value. The lower 2 bits
- select sprite data (0), fixed tilemap (1) or scrolling tilemap (2).
- 9 bits of data from the appropriate source are used as a lookup
- into a palette RAM, and the lookup PROM's low 2 bits are used as
- the upper 2 bits of the palette RAM address, providing 512
- independent colors for each source.
-
- The upper 2 bits of the lookup PROM are used for an additional
- mixer collision detection. Bit 2 indicates that a collision
- should be recorded, and bit 3 indicates which of two banks of
- collision flags should be set. Each bank is 32 entries long, and
- the sprite index is used to select which bit within the bank to
- set.
-
- On the original System 1 hardware, the palette RAM value was used
- directly as RGB, with 3 bits each of red and green, and 2 bits of
- blue. Later hardware added an extra indirection layer, where the
- 8-bit palette RAM value passed into 3 256x4 palette PROMs, one for
- each color.
-
- Collision data is accessed via a 4k window that is broken into
- 4 equal-sized sections. The first section returns data from the
- 2x32x1 mixer collision; the data for the collision is returned in
- D0, and a summary bit indicating that some sort of collision has
- occurred is returned in D7. The specific collision bit is cleared
- by writing to the equivalent address in the same region. The
- collision summary bit is cleared by writing to the second region.
-
- The third and fourth collision regions operate similarly, but
- return data for the 32x32x1 sprite collisions.
+ The System 1/System 2 video hardware is composed of two tilemap
+ layers and a sprite layer.
+
+ The tilemap layers are built up out of "pages" of 32x32 tilemaps.
+ Each tile is described by two bytes, meaning each page is 2k bytes
+ in size. One of the tilemaps is fixed in position, while the other
+ has registers for scrolling that vary between board variants.
+
+ The original System 1 hardware simply had two fixed pages. Page 0
+ was the scrolling tilemap, and page 1 was the fixed tilemap.
+
+ With later boards and the introduction of System 2, this was
+ expanded to support up to 8 pages. The fixed tilemap was hard-
+ coded to page 0, but the scrolling tilemap was extended. Instead
+ of a single page, the scrolling tilemap consisted of 4 pages glued
+ together to form an effective large 64x64 tilemap. Further, each
+ of the 4 pages that made up the scrolling tilemap could be
+ independently selected from one of the 8 available pages. This
+ unique paged tilemap system would continue on to form the basis of
+ Sega's tilemap systems for their 16-bit era.
+
+ Up to 32 sprites can be displayed. They are rendered one scanline
+ ahead of the beam into 12-bit line buffers which store the sprite
+ pixel data and sprite index. During rendering, collisions are
+ checked between sprites and if one is found a bit is set in a
+ special 32x32x1 collision RAM indiciating which pair of sprites
+ collided. Note that the sprite color is derived directly from the
+ sprite index, giving each sprite its own set of 16 colors.
+
+ The 11-bit output from the two tilemaps (3 bits of pixel data,
+ 6 bits of color, 2 bits of priority), plus the 9-bit output from
+ the sprite line buffer (4 bits of pixel data, 5 bits of color)
+ are combined in a final step to produce the final pixel value. To
+ do this, a lookup PROM is used which accepts as input the priority
+ bits from the two tilemaps and the whether each of the incoming
+ pixel values is transparent (color 0).
+
+ The output of the lookup PROM is a 4-bit value. The lower 2 bits
+ select sprite data (0), fixed tilemap (1) or scrolling tilemap (2).
+ 9 bits of data from the appropriate source are used as a lookup
+ into a palette RAM, and the lookup PROM's low 2 bits are used as
+ the upper 2 bits of the palette RAM address, providing 512
+ independent colors for each source.
+
+ The upper 2 bits of the lookup PROM are used for an additional
+ mixer collision detection. Bit 2 indicates that a collision
+ should be recorded, and bit 3 indicates which of two banks of
+ collision flags should be set. Each bank is 32 entries long, and
+ the sprite index is used to select which bit within the bank to
+ set.
+
+ On the original System 1 hardware, the palette RAM value was used
+ directly as RGB, with 3 bits each of red and green, and 2 bits of
+ blue. Later hardware added an extra indirection layer, where the
+ 8-bit palette RAM value passed into 3 256x4 palette PROMs, one for
+ each color.
+
+ Collision data is accessed via a 4k window that is broken into
+ 4 equal-sized sections. The first section returns data from the
+ 2x32x1 mixer collision; the data for the collision is returned in
+ D0, and a summary bit indicating that some sort of collision has
+ occurred is returned in D7. The specific collision bit is cleared
+ by writing to the equivalent address in the same region. The
+ collision summary bit is cleared by writing to the second region.
+
+ The third and fourth collision regions operate similarly, but
+ return data for the 32x32x1 sprite collisions.
*************************************************************************/
@@ -124,13 +124,13 @@ static TILE_GET_INFO( tile_get_info )
static void video_start_common(running_machine *machine, int pagecount)
{
int pagenum;
-
+
/* allocate memory for the collision arrays */
mix_collide = auto_malloc(64);
memset(mix_collide, 0, 64);
sprite_collide = auto_malloc(1024);
memset(sprite_collide, 0, 1024);
-
+
/* allocate memory for videoram */
tilemap_pages = pagecount;
videoram = auto_malloc(0x800 * pagecount);
@@ -284,25 +284,25 @@ WRITE8_HANDLER( system1_paletteram_w )
int val,r,g,b;
/*
- There are two kind of color handling: in the System 1 games, values in the
- palette RAM are directly mapped to colors with the usual BBGGGRRR format;
- in the System 2 ones (Choplifter, WBML, etc.), the value in the palette RAM
- is a lookup offset for three palette PROMs in RRRRGGGGBBBB format.
-
- It's hard to tell for sure because they use resistor packs, but here's
- what I think the values are from measurment with a volt meter:
-
- Blue: .250K ohms
- Blue: .495K ohms
- Green:.250K ohms
- Green:.495K ohms
- Green:.995K ohms
- Red: .495K ohms
- Red: .250K ohms
- Red: .995K ohms
-
- accurate to +/- .003K ohms.
- */
+ There are two kind of color handling: in the System 1 games, values in the
+ palette RAM are directly mapped to colors with the usual BBGGGRRR format;
+ in the System 2 ones (Choplifter, WBML, etc.), the value in the palette RAM
+ is a lookup offset for three palette PROMs in RRRRGGGGBBBB format.
+
+ It's hard to tell for sure because they use resistor packs, but here's
+ what I think the values are from measurment with a volt meter:
+
+ Blue: .250K ohms
+ Blue: .495K ohms
+ Green:.250K ohms
+ Green:.495K ohms
+ Green:.995K ohms
+ Red: .495K ohms
+ Red: .250K ohms
+ Red: .995K ohms
+
+ accurate to +/- .003K ohms.
+ */
paletteram[offset] = data;
@@ -369,14 +369,14 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
UINT16 palettebase = spritenum * 0x10;
const UINT8 *gfxbankbase;
int x, y;
-
+
/* writing an 0xff into the first byte of sprite RAM seems to disable all sprites;
- not sure if this applies to each sprite or only to the first one; see pitfall2
- and wmatch for examples where this is done */
+ not sure if this applies to each sprite or only to the first one; see pitfall2
+ and wmatch for examples where this is done */
if (spritedata[0] == 0xff)
return;
- /* clamp the bank to the size of the sprite ROMs */
+ /* clamp the bank to the size of the sprite ROMs */
bank %= gfxbanks;
gfxbankbase = gfxbase + bank * 0x8000;
@@ -388,29 +388,29 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
bottom = 256 - temp;
}
- /* iterate over all rows of the sprite */
+ /* iterate over all rows of the sprite */
for (y = top; y < bottom; y++)
{
UINT16 *destbase = BITMAP_ADDR16(bitmap, y, 0);
UINT16 curaddr;
int addrdelta;
-
+
/* advance by the row counter */
srcaddr += stride;
-
+
/* skip if outside of our clipping area */
if (y < cliprect->min_y || y > cliprect->max_y)
continue;
-
+
/* iterate over X */
addrdelta = (srcaddr & 0x8000) ? -1 : 1;
for (x = xstart, curaddr = srcaddr; ; x += 2, curaddr += addrdelta)
{
UINT8 color1, color2;
UINT8 data;
-
+
data = gfxbankbase[curaddr & 0x7fff];
-
+
/* non-flipped case */
if (!(curaddr & 0x8000))
{
@@ -422,11 +422,11 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
color1 = data & 0x0f;
color2 = data >> 4;
}
-
+
/* stop when we see color 0x0f */
if (color1 == 0x0f)
break;
-
+
/* draw if non-transparent */
if (color1 != 0)
{
@@ -434,17 +434,17 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
if (effx >= cliprect->min_x && effx <= cliprect->max_x)
{
int prevpix = destbase[effx];
-
+
if ((prevpix & 0x0f) != 0)
sprite_collide[((prevpix >> 4) & 0x1f) + 32 * spritenum] = sprite_collide_summary = 1;
destbase[effx] = color1 | palettebase;
}
}
-
+
/* stop when we see color 0x0f */
if (color2 == 0x0f)
break;
-
+
/* draw if non-transparent */
if (color2 != 0)
{
@@ -452,7 +452,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta
if (effx >= cliprect->min_x && effx <= cliprect->max_x)
{
int prevpix = destbase[effx];
-
+
if ((prevpix & 0x0f) != 0)
sprite_collide[((prevpix >> 4) & 0x1f) + 32 * spritenum] = sprite_collide_summary = 1;
destbase[effx] = color2 | palettebase;
@@ -479,7 +479,7 @@ static void video_update_common(const device_config *screen, bitmap_t *bitmap, c
/* first clear the sprite bitmap and draw sprites within this area */
bitmap_fill(sprite_bitmap, cliprect, 0);
draw_sprites(screen->machine, sprite_bitmap, cliprect, spritexoffs);
-
+
/* iterate over rows */
for (y = cliprect->min_y; y <= cliprect->max_y; y++)
{
@@ -489,12 +489,12 @@ static void video_update_common(const device_config *screen, bitmap_t *bitmap, c
int bgy = (y + bgyscroll) & 0x1ff;
int bgxscroll = bgrowscroll[y / 8];
UINT16 *bgbase[2];
-
+
/* get the base of the left and right pixmaps for the effective background Y */
bgbase[0] = BITMAP_ADDR16(bgpixmaps[(bgy >> 8) * 2 + 0], bgy & 0xff, 0);
bgbase[1] = BITMAP_ADDR16(bgpixmaps[(bgy >> 8) * 2 + 1], bgy & 0xff, 0);
- /* iterate over pixels */
+ /* iterate over pixels */
for (x = cliprect->min_x; x <= cliprect->max_x; x++)
{
int bgx = (x - bgxscroll) & 0x1ff;
@@ -503,7 +503,7 @@ static void video_update_common(const device_config *screen, bitmap_t *bitmap, c
UINT16 sprpix = sprbase[x];
UINT8 lookup_index;
UINT8 lookup_value;
-
+
/* using the sprite, background, and foreground pixels, look up the color behavior */
lookup_index = (((sprpix & 0xf) == 0) << 0) |
(((fgpix & 7) == 0) << 1) |
@@ -512,7 +512,7 @@ static void video_update_common(const device_config *screen, bitmap_t *bitmap, c
(((bgpix >> 9) & 3) << 5);
lookup_value = lookup[lookup_index];
- /* compute collisions based on two of the PROM bits */
+ /* compute collisions based on two of the PROM bits */
if (!(lookup_value & 4))
mix_collide[((lookup_value & 8) << 2) | ((sprpix >> 4) & 0x1f)] = mix_collide_summary = 1;
@@ -565,7 +565,7 @@ VIDEO_UPDATE( system1 )
/* fill in the row scroll table */
for (y = 0; y < 32; y++)
bgrowscroll[y] = xscroll;
-
+
/* common update */
video_update_common(screen, bitmap, cliprect, fgpixmap, bgpixmaps, bgrowscroll, yscroll, 0);
return 0;
@@ -579,7 +579,7 @@ VIDEO_UPDATE( system2 )
int xscroll, yscroll;
int sprxoffset;
int y;
-
+
/* 4 independent background pages */
bgpixmaps[0] = tilemap_get_pixmap(tilemap_page[videoram[0x740] & 7]);
bgpixmaps[1] = tilemap_get_pixmap(tilemap_page[videoram[0x742] & 7]);
@@ -606,7 +606,7 @@ VIDEO_UPDATE( system2 )
/* fill in the row scroll table */
for (y = 0; y < 32; y++)
rowscroll[y] = xscroll;
-
+
/* common update */
video_update_common(screen, bitmap, cliprect, fgpixmap, bgpixmaps, rowscroll, yscroll, sprxoffset);
return 0;
@@ -619,7 +619,7 @@ VIDEO_UPDATE( system2_rowscroll )
int rowscroll[32];
int yscroll;
int y;
-
+
/* 4 independent background pages */
bgpixmaps[0] = tilemap_get_pixmap(tilemap_page[videoram[0x740] & 7]);
bgpixmaps[1] = tilemap_get_pixmap(tilemap_page[videoram[0x742] & 7]);
@@ -642,7 +642,7 @@ VIDEO_UPDATE( system2_rowscroll )
rowscroll[y] = 262+256 - ((((videoram[0x7fe - y * 2] | (videoram[0x7ff - y * 2] << 8)) / 2) & 0xff) - 256 + 5);
yscroll = 256+256 - videoram[0x784];
}
-
+
/* common update */
video_update_common(screen, bitmap, cliprect, fgpixmap, bgpixmaps, rowscroll, yscroll, 7);
return 0;
diff --git a/src/version.c b/src/version.c
index 388edcec246..5ce619f65aa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -9,4 +9,4 @@
***************************************************************************/
-const char build_version[] = "0.130u2 ("__DATE__")";
+const char build_version[] = "0.130u3 ("__DATE__")";