summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Angelo Salese <angelosa@users.noreply.github.com>2011-04-25 15:20:42 +0000
committerGravatarGravatar Angelo Salese <angelosa@users.noreply.github.com>2011-04-25 15:20:42 +0000
commitb70104f84e0899ba7ce8dbaf2bba9f1403956147 (patch)
tree8eb6a3f9e064ee644e2e213c630d6744135035cf
parentc0de51821f3f76cafe1a962bfaceded462cf8e12 (diff)
Cleanups and version bumpmame0142u2
-rw-r--r--src/emu/machine/mm74c922.c6
-rw-r--r--src/emu/sound/cdp1863.c2
-rw-r--r--src/emu/sound/cdp1863.h6
-rw-r--r--src/emu/sound/cdp1864.h42
-rw-r--r--src/mame/drivers/alien.c2
-rw-r--r--src/mame/drivers/aristmk4.c4
-rw-r--r--src/mame/drivers/armedf.c32
-rw-r--r--src/mame/drivers/jaguar.c64
-rw-r--r--src/mame/drivers/megasys1.c2
-rw-r--r--src/mame/drivers/saturn.c2
-rw-r--r--src/version.c2
11 files changed, 82 insertions, 82 deletions
diff --git a/src/emu/machine/mm74c922.c b/src/emu/machine/mm74c922.c
index 61eea867700..a2c6424dd78 100644
--- a/src/emu/machine/mm74c922.c
+++ b/src/emu/machine/mm74c922.c
@@ -80,7 +80,7 @@ void mm74c922_device_config::static_set_config(device_config *device, int max_y)
//**************************************************************************
//-------------------------------------------------
-// change_output_lines -
+// change_output_lines -
//-------------------------------------------------
inline void mm74c922_device::change_output_lines()
@@ -97,7 +97,7 @@ inline void mm74c922_device::change_output_lines()
//-------------------------------------------------
-// clock_scan_counters -
+// clock_scan_counters -
//-------------------------------------------------
inline void mm74c922_device::clock_scan_counters()
@@ -215,7 +215,7 @@ void mm74c922_device::device_timer(emu_timer &timer, device_timer_id id, int par
//-------------------------------------------------
-// data_out_r -
+// data_out_r -
//-------------------------------------------------
UINT8 mm74c922_device::data_out_r()
diff --git a/src/emu/sound/cdp1863.c b/src/emu/sound/cdp1863.c
index 436bf34819b..8fd1dd88f61 100644
--- a/src/emu/sound/cdp1863.c
+++ b/src/emu/sound/cdp1863.c
@@ -82,7 +82,7 @@ device_t *cdp1863_device_config::alloc_device(running_machine &machine) const
void cdp1863_device_config::static_set_config(device_config *device, int clock2)
{
cdp1863_device_config *cdp1863 = downcast<cdp1863_device_config *>(device);
-
+
cdp1863->m_clock2 = clock2;
}
diff --git a/src/emu/sound/cdp1863.h b/src/emu/sound/cdp1863.h
index 85143f25a4a..aa77586fedc 100644
--- a/src/emu/sound/cdp1863.h
+++ b/src/emu/sound/cdp1863.h
@@ -77,9 +77,9 @@ class cdp1863_device : public device_t,
public:
DECLARE_WRITE8_MEMBER( str_w );
void str_w(UINT8 data);
-
+
DECLARE_WRITE_LINE_MEMBER( oe_w );
-
+
void set_clk1(int clock);
void set_clk2(int clock);
@@ -101,7 +101,7 @@ private:
int m_latch; // sound latch
INT16 m_signal; // current signal
int m_incr; // initial wave state
-
+
const cdp1863_device_config &m_config;
};
diff --git a/src/emu/sound/cdp1864.h b/src/emu/sound/cdp1864.h
index 98f6fadef33..aa938c89c93 100644
--- a/src/emu/sound/cdp1864.h
+++ b/src/emu/sound/cdp1864.h
@@ -6,27 +6,27 @@
Visit http://mamedev.org for licensing and usage restrictions.
**********************************************************************
- _____ _____
- INLACE 1 |* \_/ | 40 Vdd
- CLK IN_ 2 | | 39 AUD
- CLR OUT_ 3 | | 38 CLR IN_
- AOE 4 | | 37 DMA0_
- SC1 5 | | 36 INT_
- SC0 6 | | 35 TPA
- MRD_ 7 | | 34 TPB
- BUS 7 8 | | 33 EVS
- BUS 6 9 | | 32 V SYNC
- BUS 5 10 | CDP1864 | 31 H SYNC
- BUS 4 11 | | 30 C SYNC_
- BUS 3 12 | | 29 RED
- BUS 2 13 | | 28 BLUE
- BUS 1 14 | | 27 GREEN
- BUS 0 15 | | 26 BCK GND_
- CON_ 16 | | 25 BURST
- N2 17 | | 24 ALT
- EF_ 18 | | 23 R DATA
- N0 19 | | 22 G DATA
- Vss 20 |_____________| 21 B DATA
+ _____ _____
+ INLACE 1 |* \_/ | 40 Vdd
+ CLK IN_ 2 | | 39 AUD
+ CLR OUT_ 3 | | 38 CLR IN_
+ AOE 4 | | 37 DMA0_
+ SC1 5 | | 36 INT_
+ SC0 6 | | 35 TPA
+ MRD_ 7 | | 34 TPB
+ BUS 7 8 | | 33 EVS
+ BUS 6 9 | | 32 V SYNC
+ BUS 5 10 | CDP1864 | 31 H SYNC
+ BUS 4 11 | | 30 C SYNC_
+ BUS 3 12 | | 29 RED
+ BUS 2 13 | | 28 BLUE
+ BUS 1 14 | | 27 GREEN
+ BUS 0 15 | | 26 BCK GND_
+ CON_ 16 | | 25 BURST
+ N2 17 | | 24 ALT
+ EF_ 18 | | 23 R DATA
+ N0 19 | | 22 G DATA
+ Vss 20 |_____________| 21 B DATA
http://homepage.mac.com/ruske/cosmacelf/cdp1864.pdf
diff --git a/src/mame/drivers/alien.c b/src/mame/drivers/alien.c
index 7e6fec61cd2..a47f54fbee5 100644
--- a/src/mame/drivers/alien.c
+++ b/src/mame/drivers/alien.c
@@ -9,7 +9,7 @@
- Altera ACEX 1K PLD
- M48T35Y timekeeper device
- CF interface
- - YMZ770B-F
+ - YMZ770B-F
***********************************************************************************/
diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c
index 9d5856a97aa..6e717c945ee 100644
--- a/src/mame/drivers/aristmk4.c
+++ b/src/mame/drivers/aristmk4.c
@@ -2166,8 +2166,8 @@ ROM_START( 86lions )
ROM_LOAD( "gn1.u11", 0x08000, 0x1000, CRC(80dce6f4) SHA1(bf953eba9cb270297b0d0efffe15b926e94dfbe7) )
ROM_LOAD( "rd0.u13", 0x0a000, 0x1000, CRC(38c57504) SHA1(cc3ac1df644abc4586fc9f0e88531ba146b86b48) )
-// ROM_REGION( 0x200, "proms", 0 )
-// ROM_LOAD( "prom.x", 0x00, 0x20, NO_DUMP )
+// ROM_REGION( 0x200, "proms", 0 )
+// ROM_LOAD( "prom.x", 0x00, 0x20, NO_DUMP )
ROM_END
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index 54808e30500..0b2298649f9 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -303,14 +303,14 @@ Notes:
*************************************/
/*
- -x-- ---- ---- ---- trigger 1414M4 operation
- ---x ---- ---- ---- flip screen
- ---- x--- ---- ---- disable bg layer
- ---- -x-- ---- ---- disable fg layer
- ---- --x- ---- ---- disable sprite
- ---- ---x ---- ---- disable tx layer
- ---- ---- ---- --x- coin counter 1
- ---- ---- ---- ---x coin counter 0
+ -x-- ---- ---- ---- trigger 1414M4 operation
+ ---x ---- ---- ---- flip screen
+ ---- x--- ---- ---- disable bg layer
+ ---- -x-- ---- ---- disable fg layer
+ ---- --x- ---- ---- disable sprite
+ ---- ---x ---- ---- disable tx layer
+ ---- ---- ---- --x- coin counter 1
+ ---- ---- ---- ---x coin counter 0
*/
static WRITE16_HANDLER( terraf_io_w )
@@ -404,7 +404,7 @@ static ADDRESS_MAP_START( terraf_map, AS_PROGRAM, 16 )
AM_RANGE(0x078002, 0x078003) AM_READ_PORT("P2")
AM_RANGE(0x078004, 0x078005) AM_READ_PORT("DSW1")
AM_RANGE(0x078006, 0x078007) AM_READ_PORT("DSW2")
-// AM_RANGE(0x07c000, 0x07c001) AM_WRITE(terraf_io_w) handled in DRIVER_INIT
+// AM_RANGE(0x07c000, 0x07c001) AM_WRITE(terraf_io_w) handled in DRIVER_INIT
AM_RANGE(0x07c002, 0x07c003) AM_WRITE(armedf_bg_scrollx_w)
AM_RANGE(0x07c004, 0x07c005) AM_WRITE(armedf_bg_scrolly_w)
AM_RANGE(0x07c00a, 0x07c00b) AM_WRITE(sound_command_w)
@@ -415,9 +415,9 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( kozure_map, AS_PROGRAM, 16 )
AM_RANGE(0x060000, 0x060fff) AM_RAM AM_BASE_SIZE_GENERIC(spriteram)
AM_RANGE(0x061000, 0x063fff) AM_RAM
-// AM_RANGE(0x07c000, 0x07c001) AM_WRITE(kozure_io_w)
-// AM_RANGE(0x0c0000, 0x0c0001) AM_WRITENOP /* watchdog? */
-// AM_RANGE(0xffd000, 0xffd001) AM_WRITENOP /* ? */
+// AM_RANGE(0x07c000, 0x07c001) AM_WRITE(kozure_io_w)
+// AM_RANGE(0x0c0000, 0x0c0001) AM_WRITENOP /* watchdog? */
+// AM_RANGE(0xffd000, 0xffd001) AM_WRITENOP /* ? */
AM_IMPORT_FROM( terraf_map )
ADDRESS_MAP_END
@@ -435,7 +435,7 @@ static ADDRESS_MAP_START( cclimbr2_map, AS_PROGRAM, 16 )
AM_RANGE(0x078002, 0x078003) AM_READ_PORT("P2")
AM_RANGE(0x078004, 0x078005) AM_READ_PORT("DSW1")
AM_RANGE(0x078006, 0x078007) AM_READ_PORT("DSW2")
-// AM_RANGE(0x07c000, 0x07c001) AM_WRITE(io_w)
+// AM_RANGE(0x07c000, 0x07c001) AM_WRITE(io_w)
AM_RANGE(0x07c002, 0x07c003) AM_WRITE(armedf_bg_scrollx_w)
AM_RANGE(0x07c004, 0x07c005) AM_WRITE(armedf_bg_scrolly_w)
AM_RANGE(0x07c00a, 0x07c00b) AM_WRITE(sound_command_w)
@@ -457,7 +457,7 @@ static ADDRESS_MAP_START( legion_map, AS_PROGRAM, 16 )
AM_RANGE(0x078002, 0x078003) AM_READ_PORT("P2")
AM_RANGE(0x078004, 0x078005) AM_READ_PORT("DSW1")
AM_RANGE(0x078006, 0x078007) AM_READ_PORT("DSW2")
-// AM_RANGE(0x07c000, 0x07c001) AM_WRITE(legion_io_w)
+// AM_RANGE(0x07c000, 0x07c001) AM_WRITE(legion_io_w)
AM_RANGE(0x07c002, 0x07c003) AM_WRITE(armedf_bg_scrollx_w)
AM_RANGE(0x07c004, 0x07c005) AM_WRITE(armedf_bg_scrolly_w)
AM_RANGE(0x07c00a, 0x07c00b) AM_WRITE(sound_command_w)
@@ -491,7 +491,7 @@ static ADDRESS_MAP_START( legiono_map, AS_PROGRAM, 16 )
AM_RANGE(0x078002, 0x078003) AM_READ_PORT("P2")
AM_RANGE(0x078004, 0x078005) AM_READ_PORT("DSW1")
AM_RANGE(0x078006, 0x078007) AM_READ_PORT("DSW2")
-// AM_RANGE(0x07c000, 0x07c001) AM_WRITE(bootleg_io_w)
+// AM_RANGE(0x07c000, 0x07c001) AM_WRITE(bootleg_io_w)
AM_RANGE(0x07c002, 0x07c003) AM_WRITE(armedf_bg_scrollx_w)
AM_RANGE(0x07c004, 0x07c005) AM_WRITE(armedf_bg_scrolly_w)
AM_RANGE(0x07c00a, 0x07c00b) AM_WRITE(sound_command_w)
@@ -690,7 +690,7 @@ static ADDRESS_MAP_START( bigfghtr_map, AS_PROGRAM, 16 )
AM_RANGE(0x08c002, 0x08c003) AM_READ_PORT("P2")
AM_RANGE(0x08c004, 0x08c005) AM_READ_PORT("DSW0")
AM_RANGE(0x08c006, 0x08c007) AM_READ_PORT("DSW1")
- AM_RANGE(0x08d000, 0x08d001) AM_WRITE(terraf_io_w) //807b0
+ AM_RANGE(0x08d000, 0x08d001) AM_WRITE(terraf_io_w) //807b0
AM_RANGE(0x08d002, 0x08d003) AM_WRITE(armedf_bg_scrollx_w)
AM_RANGE(0x08d004, 0x08d005) AM_WRITE(armedf_bg_scrolly_w)
AM_RANGE(0x08d006, 0x08d007) AM_WRITE(armedf_fg_scrollx_w)
diff --git a/src/mame/drivers/jaguar.c b/src/mame/drivers/jaguar.c
index d383dde1743..fa28d240da0 100644
--- a/src/mame/drivers/jaguar.c
+++ b/src/mame/drivers/jaguar.c
@@ -1,12 +1,12 @@
/***************************************************************************
- Atari Jaguar (Home) & Atari CoJag (Arcade) hardware
+ Atari Jaguar (Home) & Atari CoJag (Arcade) hardware
- The CoJag arcade system is based on the Jaguar system, but with an upgraded
- main CPU (68020 or MIPS instead of the plain 68000 found in the Jaguar)
+ The CoJag arcade system is based on the Jaguar system, but with an upgraded
+ main CPU (68020 or MIPS instead of the plain 68000 found in the Jaguar)
driver by Aaron Giles
- console support originally by Nathan Woods
+ console support originally by Nathan Woods
CoJag Games supported:
* Area 51 (3 Sets)
@@ -18,14 +18,14 @@
To do:
* (CoJag) map out unused RAM per-game via memory_nop_read/write
- * (Jaguar) support is very poor, most games aren't properly playable
- or have severe performance issues or crashes related to the unsafe
- blitter code. Only Pinball Fantasies is fully playable albeit
- without sound.
- * The code (GPU/DSP access) should probably be refactored around the
- 16-bit interface from the plain 68k, the driver currently uses
- trampoline functions due to the original driver being entirely
- 32-bit due to the CPUs on CoJag.
+ * (Jaguar) support is very poor, most games aren't properly playable
+ or have severe performance issues or crashes related to the unsafe
+ blitter code. Only Pinball Fantasies is fully playable albeit
+ without sound.
+ * The code (GPU/DSP access) should probably be refactored around the
+ 16-bit interface from the plain 68k, the driver currently uses
+ trampoline functions due to the original driver being entirely
+ 32-bit due to the CPUs on CoJag.
Note: There is believed to be a 68020 version of Maximum Force
(not confirmed or dumped)
@@ -299,33 +299,33 @@ Notes:
Jaguar System Notes:
- Protection Check
+ Protection Check
- At power on, a checksum is performed on the cart to ensure it has been
- certified by Atari. The actual checksum calculation is performed by the GPU,
- the result being left in GPU RAM at address f03000. The GPU is instructed to
- do the calculation when the bios sends a 1 to f02114 while it is in the
- initialisation stage. The bios then loops, waiting for the GPU to finish the
- calculation. When it does, it sets bit 15 of f02114 high. The bios then does
- the compare of the checksum. The checksum algorithm is unknown, but the
- final result must be 03d0dead. The bios checks for this particular result,
- and if found, the cart is allowed to start. Otherwise, the background turns
- red, and the console freezes.
+ At power on, a checksum is performed on the cart to ensure it has been
+ certified by Atari. The actual checksum calculation is performed by the GPU,
+ the result being left in GPU RAM at address f03000. The GPU is instructed to
+ do the calculation when the bios sends a 1 to f02114 while it is in the
+ initialisation stage. The bios then loops, waiting for the GPU to finish the
+ calculation. When it does, it sets bit 15 of f02114 high. The bios then does
+ the compare of the checksum. The checksum algorithm is unknown, but the
+ final result must be 03d0dead. The bios checks for this particular result,
+ and if found, the cart is allowed to start. Otherwise, the background turns
+ red, and the console freezes.
- Jaguar Logo
+ Jaguar Logo
- A real Jaguar will show the red Jaguar logo, the falling white Atari letters,
- and the turning jaguar's head, accompanied by the sound of a flushing toilet.
- The cart will then start. All Jaguar emulators (including this one) skip the
- logo with the appropriate memory hack. The cart can also instruct the logo
- be skipped by placing non-zero at location 800408. We do the same thing when
- the cart is loaded (see the DEVICE_IMAGE_LOAD section below).
+ A real Jaguar will show the red Jaguar logo, the falling white Atari letters,
+ and the turning jaguar's head, accompanied by the sound of a flushing toilet.
+ The cart will then start. All Jaguar emulators (including this one) skip the
+ logo with the appropriate memory hack. The cart can also instruct the logo
+ be skipped by placing non-zero at location 800408. We do the same thing when
+ the cart is loaded (see the DEVICE_IMAGE_LOAD section below).
- Start Address
+ Start Address
- The start address of a cart may be found at 800404. It is normally 802000.
+ The start address of a cart may be found at 800404. It is normally 802000.
***************************************************************************/
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index 8884214956e..9adcd8b48ef 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -3390,7 +3390,7 @@ ROM_START( stdragona )
ROM_REGION( 0x080000, "gfx1", 0 ) /* Scroll 0 - scrambled */
ROM_LOAD( "e71-14.bin", 0x000000, 0x080000, CRC(8e26ff92) SHA1(06985056027facb1d3df08cf04277492c1be6102) )
-
+
ROM_REGION( 0x080000, "gfx2", 0 ) /* Scroll 1 */
ROM_LOAD( "e72-18.bin", 0x000000, 0x080000, CRC(0b234711) SHA1(1c5a8db28cef84434c526eab9cf9c4c123cebeea) )
diff --git a/src/mame/drivers/saturn.c b/src/mame/drivers/saturn.c
index 3bc4ac3ef40..7c4fd3baae0 100644
--- a/src/mame/drivers/saturn.c
+++ b/src/mame/drivers/saturn.c
@@ -1,4 +1,4 @@
-/*
+/*
Sega Saturn & Sega ST-V (Sega Titan Video)
Driver by David Haywood,Angelo Salese,Olivier Galibert & Mariusz Wojcieszek
diff --git a/src/version.c b/src/version.c
index dd9d226bf2e..aa209de0c99 100644
--- a/src/version.c
+++ b/src/version.c
@@ -38,4 +38,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.142u1 ("__DATE__")";
+const char build_version[] = "0.142u2 ("__DATE__")";