summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Angelo Salese <angelosa@users.noreply.github.com>2011-07-11 19:36:26 +0000
committerGravatarGravatar Angelo Salese <angelosa@users.noreply.github.com>2011-07-11 19:36:26 +0000
commit192c9e04f5dc97e8f8b1ecf20f013b0c86de224d (patch)
tree5d821b272abd72624612ca09f17ad6c89c388e1e
parent6d4235dcb0bf03f17aa238c7cf6767ba787589e1 (diff)
Clean-ups and version bumpmame0143u1
-rw-r--r--src/emu/addrmap.c4
-rw-r--r--src/emu/cpu/cosmac/cosmac.c2
-rw-r--r--src/emu/cpu/nec/v25.c4
-rw-r--r--src/emu/cpu/sh4/sh4comn.c2
-rw-r--r--src/emu/cpu/sh4/sh4regs.h6
-rw-r--r--src/emu/emuopts.c2
-rw-r--r--src/emu/emupal.c2
-rw-r--r--src/emu/imagedev/multcart.h2
-rw-r--r--src/emu/machine/generic.c2
-rw-r--r--src/emu/machine/idectrl.c12
-rw-r--r--src/emu/render.c8
-rw-r--r--src/emu/romload.c2
-rw-r--r--src/emu/sound/asc.c2
-rw-r--r--src/mame/drivers/aristmk6.c42
-rw-r--r--src/mame/drivers/mpu4.c2
-rw-r--r--src/mame/drivers/mpu4drvr.c4
-rw-r--r--src/mame/drivers/naomi.c114
-rw-r--r--src/mame/drivers/pgm.c8
-rw-r--r--src/mame/drivers/tapatune.c4
-rw-r--r--src/mame/machine/naomi.c4
-rw-r--r--src/mame/machine/naomibd.c6
-rw-r--r--src/mame/machine/pgmprot.c2
-rw-r--r--src/mame/mame.lst16
-rw-r--r--src/mame/video/dc.c10
-rw-r--r--src/tools/unidasm.c2
-rw-r--r--src/version.c2
26 files changed, 133 insertions, 133 deletions
diff --git a/src/emu/addrmap.c b/src/emu/addrmap.c
index 517d9d71184..7239901bd48 100644
--- a/src/emu/addrmap.c
+++ b/src/emu/addrmap.c
@@ -890,7 +890,7 @@ void address_map::uplift_submaps(running_machine &machine, device_t &device)
for (int slot=0; slot < max_slot_count; slot++)
if (global_mask & (1ULL << (slot * entry_bits)))
slot_offset[slot_count++] = slot * entry_bits;
-
+
// Merge in all the map contents in order
while (submap.m_entrylist.count())
{
@@ -963,7 +963,7 @@ void address_map::uplift_submaps(running_machine &machine, device_t &device)
address_map_entry *to_delete = entry;
entry = entry->next();
- m_entrylist.remove(*to_delete);
+ m_entrylist.remove(*to_delete);
}
else
{
diff --git a/src/emu/cpu/cosmac/cosmac.c b/src/emu/cpu/cosmac/cosmac.c
index 4686262a4ab..89bc3423ce3 100644
--- a/src/emu/cpu/cosmac/cosmac.c
+++ b/src/emu/cpu/cosmac/cosmac.c
@@ -341,7 +341,7 @@ void cosmac_device::state_import(const device_state_entry &entry)
case STATE_GENPC:
R[P] = m_pc;
break;
-
+
case STATE_GENFLAGS:
SET_FLAGS(m_flagsio);
break;
diff --git a/src/emu/cpu/nec/v25.c b/src/emu/cpu/nec/v25.c
index 140ed9da766..a598a7160b4 100644
--- a/src/emu/cpu/nec/v25.c
+++ b/src/emu/cpu/nec/v25.c
@@ -367,7 +367,7 @@ static void set_irq_line(v25_state_t *nec_state, int irqline, int state)
if (state == CLEAR_LINE)
nec_state->pending_irq &= ~INT_IRQ;
else
- {
+ {
nec_state->pending_irq |= INT_IRQ;
nec_state->halted = 0;
}
@@ -532,7 +532,7 @@ static CPU_EXECUTE( v25 )
debugger_instruction_hook(device, (Sreg(PS)<<4) + nec_state->ip);
return;
}
-
+
while(nec_state->icount>0) {
/* Dispatch IRQ */
if (nec_state->no_interrupt==0 && (nec_state->pending_irq & nec_state->unmasked_irq))
diff --git a/src/emu/cpu/sh4/sh4comn.c b/src/emu/cpu/sh4/sh4comn.c
index 0ddf9e4297b..7fc70281eef 100644
--- a/src/emu/cpu/sh4/sh4comn.c
+++ b/src/emu/cpu/sh4/sh4comn.c
@@ -634,7 +634,7 @@ UINT32 dmatcr, chcr, sar, dar;
{
if ((((chcr & CHCR_RS) >> 8) < 2) || (((chcr & CHCR_RS) >> 8) > 6))
return;
- if (!sh4->dma_timer_active[channel] && !(chcr & CHCR_TE) && !(sh4->m[DMAOR] & (DMAOR_AE | DMAOR_NMIF)))
+ if (!sh4->dma_timer_active[channel] && !(chcr & CHCR_TE) && !(sh4->m[DMAOR] & (DMAOR_AE | DMAOR_NMIF)))
{
if (((chcr & CHCR_RS) >> 8) > 3)
sh4_dma_transfer(sh4, channel, 1, chcr, &sar, &dar, &dmatcr);
diff --git a/src/emu/cpu/sh4/sh4regs.h b/src/emu/cpu/sh4/sh4regs.h
index e6c1aaa80c6..a8ef7066798 100644
--- a/src/emu/cpu/sh4/sh4regs.h
+++ b/src/emu/cpu/sh4/sh4regs.h
@@ -180,7 +180,7 @@
#define DMAOR_PR 0x0300
#define DMAOR_COD 0x0010
#define DMAOR_AE 0x0004
-#define DMAOR_NMIF 0x0002
+#define DMAOR_NMIF 0x0002
#define DMAOR_DME 0x0001
#define MMUCR_LRUI 0xfc000000
@@ -195,10 +195,10 @@
#define PVR_SH7091 0x040205c1
#define PVR_SH7750 0x04020500 // from TN-SH7-361B/E
#define PVR_SH7750S 0x04020600
-#define PVR_SH7750R 0x04050000
+#define PVR_SH7750R 0x04050000
#define PRR_SH7750R 0x00000100
#define PVR_SH7751 0x04110000
-#define PVR_SH7751R 0x04050000
+#define PVR_SH7751R 0x04050000
#define PRR_SH7751R 0x00000110
#endif /* __SH4REGS_H__ */
diff --git a/src/emu/emuopts.c b/src/emu/emuopts.c
index 5aa7b789913..d54df389173 100644
--- a/src/emu/emuopts.c
+++ b/src/emu/emuopts.c
@@ -346,7 +346,7 @@ bool emu_options::parse_slot_devices(int argc, char *argv[], astring &error_stri
add_device_options(false);
if (name && exists(name)) {
set_value(name, value, OPTION_PRIORITY_CMDLINE, error_string);
- }
+ }
isfirst = false;
}
result = core_options::parse_command_line(argc, argv, OPTION_PRIORITY_CMDLINE, error_string);
diff --git a/src/emu/emupal.c b/src/emu/emupal.c
index f925f152209..c92566d9a04 100644
--- a/src/emu/emupal.c
+++ b/src/emu/emupal.c
@@ -126,7 +126,7 @@ void palette_init(running_machine &machine)
break;
case BITMAP_FORMAT_INVALID:
- /* invalid format means no palette - or at least it should */
+ /* invalid format means no palette - or at least it should */
/* Do not assert for now, palette manager should be added */
/* in order to make possible adding of palette items per */
/* device otherwise we need to set total colors per driver */
diff --git a/src/emu/imagedev/multcart.h b/src/emu/imagedev/multcart.h
index a14c09a88d3..801e9daa7b1 100644
--- a/src/emu/imagedev/multcart.h
+++ b/src/emu/imagedev/multcart.h
@@ -137,7 +137,7 @@ int cartslot_get_resource_length(device_t *device, const char *socket_name);
#define DECLARE_LEGACY_CART_SLOT_DEVICE(name, basename) _DECLARE_LEGACY_DEVICE(name, basename, basename##_device, legacy_cart_slot_device_base)
#define DEFINE_LEGACY_CART_SLOT_DEVICE(name, basename) _DEFINE_LEGACY_DEVICE(name, basename, basename##_device, legacy_cart_slot_device_base)
-#define MCFG_MULTICARTSLOT_ADD(_tag) \
+#define MCFG_MULTICARTSLOT_ADD(_tag) \
MCFG_DEVICE_ADD(_tag, MULTICARTSLOT, 0) \
#define MCFG_MULTICARTSLOT_MODIFY(_tag) \
diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c
index 3bc469469d5..b2d2f6ee15e 100644
--- a/src/emu/machine/generic.c
+++ b/src/emu/machine/generic.c
@@ -313,7 +313,7 @@ void coin_lockout_global_w(running_machine &machine, int on)
/*-------------------------------------------------
nvram_filename - returns filename of system's
- NVRAM depending of selected BIOS
+ NVRAM depending of selected BIOS
-------------------------------------------------*/
static astring nvram_filename(running_machine &machine, astring &result)
diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c
index c307827deaa..c93d6c1844e 100644
--- a/src/emu/machine/idectrl.c
+++ b/src/emu/machine/idectrl.c
@@ -1253,13 +1253,13 @@ static void handle_command(ide_state *ide, UINT8 command)
ide->status &= ~IDE_STATUS_ERROR;
signal_interrupt(ide);
break;
-
+
case IDE_COMMAND_SEEK:
/*
- cur_cylinder, cur_sector and cur_head
- are all already set in this case so no need
- so that implements actual seek
- */
+ cur_cylinder, cur_sector and cur_head
+ are all already set in this case so no need
+ so that implements actual seek
+ */
/* clear the error too */
ide->error = IDE_ERROR_NONE;
@@ -1962,7 +1962,7 @@ static DEVICE_RESET( ide_controller )
LOG(("IDE controller reset performed\n"));
astring hardtag;
device->siblingtag(hardtag, "harddisk");
-
+
if (device->machine().device( hardtag.cstr() )) {
if (!ide->disk)
{
diff --git a/src/emu/render.c b/src/emu/render.c
index 6ed2d8b6275..b311ff281c4 100644
--- a/src/emu/render.c
+++ b/src/emu/render.c
@@ -1640,7 +1640,7 @@ void render_target::load_layout_files(const char *layoutfile, bool singlefile)
const game_driver &system = m_manager.machine().system();
if (!load_layout_file(basename, system.name))
have_default |= load_layout_file(basename, "default");
- else
+ else
have_default |= true;
// if a default view has been specified, use that as a fallback
@@ -1654,7 +1654,7 @@ void render_target::load_layout_files(const char *layoutfile, bool singlefile)
if (cloneof != -1) {
if (!load_layout_file(driver_list::driver(cloneof).name, driver_list::driver(cloneof).name))
have_default |= load_layout_file(driver_list::driver(cloneof).name, "default");
- else
+ else
have_default |= true;
}
int screens = m_manager.machine().devicelist().count(SCREEN);
@@ -1667,10 +1667,10 @@ void render_target::load_layout_files(const char *layoutfile, bool singlefile)
load_layout_file(NULL, layout_horizont);
assert_always(m_filelist.count() > 0, "Couldn't parse default layout??");
}
- if (!have_default)
+ if (!have_default)
{
if (screens == 0)
- {
+ {
load_layout_file(NULL, layout_noscreens);
assert_always(m_filelist.count() > 0, "Couldn't parse default layout??");
}
diff --git a/src/emu/romload.c b/src/emu/romload.c
index de55d36a6f3..6d9b68daf47 100644
--- a/src/emu/romload.c
+++ b/src/emu/romload.c
@@ -1601,4 +1601,4 @@ int rom_system_bios(running_machine &machine)
int rom_default_bios(running_machine &machine)
{
return machine.romload_data->default_bios;
-} \ No newline at end of file
+}
diff --git a/src/emu/sound/asc.c b/src/emu/sound/asc.c
index 5ed37ce8554..4d2707cbd7f 100644
--- a/src/emu/sound/asc.c
+++ b/src/emu/sound/asc.c
@@ -127,7 +127,7 @@ void asc_device::device_reset()
void asc_device::device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr)
{
- m_stream->update();
+ m_stream->update();
}
//-------------------------------------------------
diff --git a/src/mame/drivers/aristmk6.c b/src/mame/drivers/aristmk6.c
index a6d1355a48e..b1100a7252f 100644
--- a/src/mame/drivers/aristmk6.c
+++ b/src/mame/drivers/aristmk6.c
@@ -247,26 +247,26 @@ GAME( 200?, thaiprin, aristmk6, aristmk6, aristmk6, 0, ROT0, "Aristocra
/* Other Games on this HW (are any dumped?)
- AFRICAN DUSK
- GOLDEN PYRAMIDS (also on Mk5)
- SPRING CARNIVAL
- LOUISE GOLD
- BIG RED
- KING OF THE NILE
- GEISHA
- MR CASHMAN
- DOLLAR TREE
- MISS KITTY
- GRIZZLY
- MONEY TREE
- CALL OF THE WILD
- RED BARON
- MYSTIC MERMAID
- KOLA MINT
- LOVE STRUCK
- ENCHANTRESS
- ROLL UP ROLL UP
- VENETIAN
- POMPE11
+ AFRICAN DUSK
+ GOLDEN PYRAMIDS (also on Mk5)
+ SPRING CARNIVAL
+ LOUISE GOLD
+ BIG RED
+ KING OF THE NILE
+ GEISHA
+ MR CASHMAN
+ DOLLAR TREE
+ MISS KITTY
+ GRIZZLY
+ MONEY TREE
+ CALL OF THE WILD
+ RED BARON
+ MYSTIC MERMAID
+ KOLA MINT
+ LOVE STRUCK
+ ENCHANTRESS
+ ROLL UP ROLL UP
+ VENETIAN
+ POMPE11
*/
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index f6203b08312..8579304ca7c 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -400,7 +400,7 @@ public:
int m_gfx_index;
UINT16 * m_vid_vidram;
UINT16 * m_vid_mainram;
-// UINT8 m_scn2674_IR[16];
+// UINT8 m_scn2674_IR[16];
UINT8 m_scn2674_IR_pointer;
UINT8 m_scn2674_screen1_l;
UINT8 m_scn2674_screen1_h;
diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c
index fd2737b9fb3..9a49ef4de3e 100644
--- a/src/mame/drivers/mpu4drvr.c
+++ b/src/mame/drivers/mpu4drvr.c
@@ -171,7 +171,7 @@ TODO:
- Find out what causes the games to hang/reset in service mode
Probably down to AVDC interrupt timing, there seem to be a number of race conditions re: masks
that need sorting out with proper blank handling, etc. I'm using a scanline timer to drive an
- approximation of the SCN2674 scanline logic, but this is perhaps better served as a proper device.
+ approximation of the SCN2674 scanline logic, but this is perhaps better served as a proper device.
- Deal 'Em lockouts vary on certain cabinets (normally connected to AUX2, but not there?)
- Deal 'Em has bad tiles (apostrophe, logo, bottom corner), black should actually be transparent
to give black on green.
@@ -2369,7 +2369,7 @@ static void scn2674_line(running_machine &machine)
LOG2674(("SCN2674 Split Screen 1\n"));
state->m_scn2674_irq_state = 1;
update_mpu68_interrupts(machine);
-// machine.primary_screen->update_partial(state->m_linecounter);
+// machine.primary_screen->update_partial(state->m_linecounter);
}
}
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index b59a3595e80..b5ed928fb3d 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -20,62 +20,62 @@
Sega Naomi is Dreamcast based Arcade hardware.
TODO (general):
- - all games that uses YUV just updates one frame then dies, why?
- - SH to ARM sound streaming doesn't work (used by ADX compression system)
- - ngdup23a, ngdup23c: missing DIMM emulation, hence they can't possibly work, emulate the DIMM means to add an extra SH-4 ...
-
- - Following games doesn't boot, any attempt makes it to return to the system test mode (almost likely to be JVS related):
- * Death Crimson OX
- * La Keyboard
- * Lupin the Third
- * Moeru Casinyo
- * Puyo Puyo DA!
- * Puyo Puyo Fever
- * Samba de Amigo
- * Samba de Amigo Ver. 2000
- * Shootout Pool
- * Shootout Pool Medal
- * Shootout Pool Prize
- * Usagi Yamashiro Hen
- * Virtual On
- * WWF Royal Rumble
-
- - missing inputs (needs rotary channels):
- * Crakin' DJ
- * Dynamic Golf
- * Inu no Osampo
-
- - wrong JVS I/O specs, doesn't boot due of it:
- * Derby Owners Club II
- * Kick '4' Cash (hopper)
- * Sega Marine Fishing
- * Wave Runner GP
-
- - doesn't boot consistently (JVS checksum error?):
- * Cannon Spike;
- * Heavy Metal GeoMatrix;
- * Moeru Justice Gakuen;
- * Power Stone 2;
- * Spawn;
+ - all games that uses YUV just updates one frame then dies, why?
+ - SH to ARM sound streaming doesn't work (used by ADX compression system)
+ - ngdup23a, ngdup23c: missing DIMM emulation, hence they can't possibly work, emulate the DIMM means to add an extra SH-4 ...
+
+ - Following games doesn't boot, any attempt makes it to return to the system test mode (almost likely to be JVS related):
+ * Death Crimson OX
+ * La Keyboard
+ * Lupin the Third
+ * Moeru Casinyo
+ * Puyo Puyo DA!
+ * Puyo Puyo Fever
+ * Samba de Amigo
+ * Samba de Amigo Ver. 2000
+ * Shootout Pool
+ * Shootout Pool Medal
+ * Shootout Pool Prize
+ * Usagi Yamashiro Hen
+ * Virtual On
+ * WWF Royal Rumble
+
+ - missing inputs (needs rotary channels):
+ * Crakin' DJ
+ * Dynamic Golf
+ * Inu no Osampo
+
+ - wrong JVS I/O specs, doesn't boot due of it:
+ * Derby Owners Club II
+ * Kick '4' Cash (hopper)
+ * Sega Marine Fishing
+ * Wave Runner GP
+
+ - doesn't boot consistently (JVS checksum error?):
+ * Cannon Spike;
+ * Heavy Metal GeoMatrix;
+ * Moeru Justice Gakuen;
+ * Power Stone 2;
+ * Spawn;
TODO (game-specific):
- - 18th Wheeler Deluxe: "MOTOR NETWORK ERR IN 01 OUT FF" msg pops up during gameplay;
- - Airline Pilots Deluxe: returns error 03
- - Derby Owner Club: if you try to start a game, it moans about something and enters into some kind of JP test mode, pretty bogus behaviour;
- - Ferrari 355 Challenge: dies at the network check;
- - Giant Gram 2: no VMU emulation;
- - Gun Survivor 2: crashes during game loading;
- - Idol Janshi Suchie-Pai 3: returns "i/o board error" msg in game mode;
- - Monkey Ball: dies when attempts to load the gameplay;
- - Oinori-Daimyoujin Matsuri: reports "B. RAM error" in test mode, inputs doesn't seem to work after that point;
- - OutTrigger: crashes on naomibd_r();
- - Ringout 4x4: needs cabinet set to 4p, moans about not having two jamma i/o boards;
- - Super Major League '99: attract mode/gameplay bogusly have stop-motions from time to time;
- - The House of the Dead 2: game uses an earlier PVR so it has extra gfx issues;
- - The Typing of the Dead: missing keyboard inputs, doesn't enter into attract/test mode anymore (JVS issue);
- - Virtua Tennis: dies when accessing the gameplay or the attract mode (PVR or SH-4 bug, most likely);
- - World Kicks: MAME crashes even before showing Naomi logo;
- (more will come up soon ...)
+ - 18th Wheeler Deluxe: "MOTOR NETWORK ERR IN 01 OUT FF" msg pops up during gameplay;
+ - Airline Pilots Deluxe: returns error 03
+ - Derby Owner Club: if you try to start a game, it moans about something and enters into some kind of JP test mode, pretty bogus behaviour;
+ - Ferrari 355 Challenge: dies at the network check;
+ - Giant Gram 2: no VMU emulation;
+ - Gun Survivor 2: crashes during game loading;
+ - Idol Janshi Suchie-Pai 3: returns "i/o board error" msg in game mode;
+ - Monkey Ball: dies when attempts to load the gameplay;
+ - Oinori-Daimyoujin Matsuri: reports "B. RAM error" in test mode, inputs doesn't seem to work after that point;
+ - OutTrigger: crashes on naomibd_r();
+ - Ringout 4x4: needs cabinet set to 4p, moans about not having two jamma i/o boards;
+ - Super Major League '99: attract mode/gameplay bogusly have stop-motions from time to time;
+ - The House of the Dead 2: game uses an earlier PVR so it has extra gfx issues;
+ - The Typing of the Dead: missing keyboard inputs, doesn't enter into attract/test mode anymore (JVS issue);
+ - Virtua Tennis: dies when accessing the gameplay or the attract mode (PVR or SH-4 bug, most likely);
+ - World Kicks: MAME crashes even before showing Naomi logo;
+ (more will come up soon ...)
---------------------------------------------------------------------------------------------------------------------------------------------------
@@ -1610,8 +1610,8 @@ static ADDRESS_MAP_START( naomi2_map, AS_PROGRAM, 64 )
AM_RANGE(0x01010098, 0x0101009f) AM_MIRROR(0x02000000) AM_RAM // Naomi 2 BIOS tests this, needs to read back as written
AM_RANGE(0x0103ff00, 0x0103ffff) AM_MIRROR(0x02000000) AM_READWRITE( naomi_unknown1_r, naomi_unknown1_w ) // bios uses it, actual start and end addresses not known
-// AM_RANGE(0x025f6800, 0x025f69ff) AM_READWRITE( dc_sysctrl_r, dc_sysctrl_w ) // second PVR DMA!
-// AM_RANGE(0x025f7c00, 0x025f7cff) AM_READWRITE( pvr_ctrl_r, pvr_ctrl_w )
+// AM_RANGE(0x025f6800, 0x025f69ff) AM_READWRITE( dc_sysctrl_r, dc_sysctrl_w ) // second PVR DMA!
+// AM_RANGE(0x025f7c00, 0x025f7cff) AM_READWRITE( pvr_ctrl_r, pvr_ctrl_w )
AM_RANGE(0x025f8000, 0x025f9fff) AM_READWRITE( pvr2_ta_r, pvr2_ta_w )
/* Area 1 */
@@ -1624,7 +1624,7 @@ static ADDRESS_MAP_START( naomi2_map, AS_PROGRAM, 64 )
AM_RANGE(0x085f6800, 0x085f69ff) AM_WRITE( dc_sysctrl_w ) // writes to BOTH PVRs
AM_RANGE(0x085f8000, 0x085f9fff) AM_WRITE( pvrs_ta_w ) // writes to BOTH PVRs
AM_RANGE(0x08800000, 0x088000ff) AM_READWRITE32( elan_regs_r, elan_regs_w, U64(0xffffffffffffffff) ) // T&L chip registers
-// AM_RANGE(0x09000000, 0x09??????) T&L command processing
+// AM_RANGE(0x09000000, 0x09??????) T&L command processing
AM_RANGE(0x0a000000, 0x0bffffff) AM_RAM AM_BASE( &elan_ram ) // T&L chip RAM
/* Area 3 */
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index badc6ec8aa9..a540873faa8 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -1511,13 +1511,13 @@ MACHINE_CONFIG_END
static MACHINE_CONFIG_START( oldsplus, oldsplus_state )
MCFG_FRAGMENT_ADD(pgmbase)
-
+
MCFG_CPU_MODIFY("maincpu")
MCFG_CPU_VBLANK_INT_HACK(drgw_interrupt,2) // needs an extra IRQ, puzzli2 doesn't want this irq!
// Simulated for now
-// MCFG_CPU_ADD("prot", ARM7, 20000000)
-// MCFG_CPU_PROGRAM_MAP(svg_arm7_map)
+// MCFG_CPU_ADD("prot", ARM7, 20000000)
+// MCFG_CPU_PROGRAM_MAP(svg_arm7_map)
MACHINE_CONFIG_END
class cavepgm_state : public pgm_state
@@ -1587,7 +1587,7 @@ static MACHINE_CONFIG_START( cavepgm, cavepgm_state )
/*sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_ICS2115_ADD("ics", 0, sound_irq)
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0)
MACHINE_CONFIG_END
/*** Rom Loading *************************************************************/
diff --git a/src/mame/drivers/tapatune.c b/src/mame/drivers/tapatune.c
index 6df3e5109c9..556b7ea9a46 100644
--- a/src/mame/drivers/tapatune.c
+++ b/src/mame/drivers/tapatune.c
@@ -98,7 +98,7 @@ static WRITE16_HANDLER(write_to_z80)
{
case 0:
//if ( (data >> 8) & 0xff )
- // logerror("Command to Z80: %04x\n", data);
+ // logerror("Command to Z80: %04x\n", data);
state->m_68k_to_z80_index = data & 0xff;
state->m_68k_to_z80_data = (data >> 8) & 0xff;
cputag_set_input_line(space->machine(), "maincpu", 3, CLEAR_LINE);
@@ -177,7 +177,7 @@ static READ8_HANDLER(read_data_from_68k)
{
tapatune_state *state = space->machine().driver_data<tapatune_state>();
//if ( state->m_68k_to_z80_data != 0 )
- // logerror("Load command from 68K: %02x %02x\n", state->m_68k_to_z80_index, state->m_68k_to_z80_data);
+ // logerror("Load command from 68K: %02x %02x\n", state->m_68k_to_z80_index, state->m_68k_to_z80_data);
return state->m_68k_to_z80_data;
}
diff --git a/src/mame/machine/naomi.c b/src/mame/machine/naomi.c
index 1138ef34dbb..4257cd7a6b7 100644
--- a/src/mame/machine/naomi.c
+++ b/src/mame/machine/naomi.c
@@ -41,7 +41,7 @@ static READ64_HANDLER( naomi_biosh_idle_skip_r )
if (cpu_get_pc(&space->device())==0xc045ffc)
device_spin_until_time(&space->device(), attotime::from_usec(500));
-// printf("%08x\n", cpu_get_pc(&space->device()));
+// printf("%08x\n", cpu_get_pc(&space->device()));
return naomi_ram64[0x2b0600/8];
}
@@ -337,7 +337,7 @@ static READ64_HANDLER( hotd2_idle_skip_r )
device_spin_until_time(&space->device(), attotime::from_usec(500));
//device_spin_until_interrupt(&space->device());
// else
-// printf("%08x\n", cpu_get_pc(&space->device()));
+// printf("%08x\n", cpu_get_pc(&space->device()));
return naomi_ram64[0xa25fb8/8];
}
diff --git a/src/mame/machine/naomibd.c b/src/mame/machine/naomibd.c
index 6cdf1ad5f14..ce6ba2f9a9e 100644
--- a/src/mame/machine/naomibd.c
+++ b/src/mame/machine/naomibd.c
@@ -2100,9 +2100,9 @@ static DEVICE_START( naomibd )
break;
case DIMM_BOARD:
- assert((config->size >= 256) && !(config->size & 255)); // size multiple of 256 megabytes ?
- v->size = config->size << 20;
- v->memory = (UINT8 *)auto_alloc_array_clear(device->machine(), UINT8, v->size); // 0x40000000 is needed for some Chihiro sets, Naomi should be less
+ assert((config->size >= 256) && !(config->size & 255)); // size multiple of 256 megabytes ?
+ v->size = config->size << 20;
+ v->memory = (UINT8 *)auto_alloc_array_clear(device->machine(), UINT8, v->size); // 0x40000000 is needed for some Chihiro sets, Naomi should be less
v->gdromchd = get_disk_handle(device->machine(), config->gdromregiontag);
v->picdata = (UINT8 *)device->machine().region(config->picregiontag)->base();
if (v->memory != NULL && v->gdromchd != NULL && v->picdata != NULL)
diff --git a/src/mame/machine/pgmprot.c b/src/mame/machine/pgmprot.c
index 293c1cc935c..8898afe9fb0 100644
--- a/src/mame/machine/pgmprot.c
+++ b/src/mame/machine/pgmprot.c
@@ -1111,7 +1111,7 @@ WRITE16_HANDLER( oldsplus_w )
state->m_oldsplus_val = oldsplus_ae[state->m_oldsplus_int[0]];
break;
- case 0x9d:
+ case 0x9d:
state->m_oldsplus_val = oldsplus_9d[state->m_oldsplus_int[0]];
break;
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 3f9b2a1684a..004cc245f24 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -4762,7 +4762,7 @@ vtennisg // 1999.?? Virtua Tennis / Power Smash (GD-ROM)
vtennis // 1999.12 Virtua Tennis / Power Smash (cartridge)
alpiltdx // 1999.?? Airline Pilots Deluxe (Rev B)
// 1999.?? Charge'N'Blast
- // 1999.?? Pocket Shooting
+ // 1999.?? Pocket Shooting
spawn // 1999.?? Spawn In the Demon's Hand
18wheelr // 2000.01 18 Wheeler Deluxe (Rev A)
doa2m // 2000.01 Dead or Alive 2 Millenium
@@ -4814,7 +4814,7 @@ cvsgd // 2001.06 Capcom Vs. SNK Millenium Fight 2000 Pro
// 2001.06 Crackin' DJ Part 2
wsbbgd // 2001.06 Super Major League / World Series Baseball
starseek // 2001.07 Dokidoki Idol Star Seeker
-gunsur2 // 2001.07 Gun Survivor 2 Biohazard Code: Veronica
+gunsur2 // 2001.07 Gun Survivor 2 Biohazard Code: Veronica
spkrbtl // 2001.07 Spikers Battle
cvs2gd // 2001.08 Capcom Vs. SNK 2 Millionaire Fighting 2001 (Rev A)
wrungp // 2001.08 Wave Runner GP
@@ -4839,7 +4839,7 @@ cleoftp // 2002.05 Cleopatra Fortune Plus
ggxx // 2002.05 Guilty Gear XX
mok // 2002.05 The Maze of the Kings
chocomk // 2002.06 Musapey's Choco Marker (Rev A)
- // 2002.07 Mazan : Flash of the Blade
+ // 2002.07 Mazan : Flash of the Blade
// 2002.09 Yonin Uchi Mahjong MJ
azumanga // 2002.12 Azumanga Daiou Puzzle Bobble
moeru // 2002.12 Moeru Casinyo
@@ -4906,7 +4906,7 @@ illvelo // 2008.06 Illvelo (Illmatic Envelope)
// 2009.06 Radirgy Noah
// 2009.?? Project Cerberus (planned to be released in 2009)
-
+
ngdup23a // DIMM Firmware Updater
ngdup23c
@@ -4948,9 +4948,9 @@ clubkrte // 2002.?? Club Kart: European Session
initdexp // 2002.?? Initial D Arcade Stage (Export)
// 2002.?? Sega Driving Simulator
// 2003.03 World Club Champion Football Serie A 2001-2002 Ver.2
- // 2003.09 World Club Champion Football Serie A 2002-2003
+ // 2003.09 World Club Champion Football Serie A 2002-2003
// 2003.?? Club Kart Cycraft Edition
- // 2003.?? Club Kart Prize
+ // 2003.?? Club Kart Prize
// 2004.01 Initial D Arcade Stage Ver. 3 (export)
initdv3j // 2004.01 Initial D Arcade Stage Ver. 3 (Japan) (Rev C)
initdv3jb // 2004.01 Initial D Arcade Stage Ver. 3 (Japan) (Rev B)
@@ -5041,7 +5041,7 @@ outr2 // 2003.12 Outrun 2 (Rev A)
// 2004.03 Sega Network Taisen Mahjong MJ 2
ollie // 2004.03 Ollie King
// 2004.04 Sega Network Taisen Mahjong MJ 2 (Rev A)
- // 2004.07 Wangan Midnight Maximum Tune (Japan)
+ // 2004.07 Wangan Midnight Maximum Tune (Japan)
wangmid // 2004.07 Wangan Midnight Maximum Tune (export) (Rev B)
mj2 // 2004.07 Sega Network Taisen Mahjong MJ 2 (Rev B)
// 2004.09 Quest of D
@@ -5084,7 +5084,7 @@ scg06nt // 2005.12 Sega Golf Club 2006: Next Tours (Rev A)
// 2006.10 Quest of D ver.3.00 Oukoku no Syugosya
// 2006.11 Quest of D ver.3.01 Oukoku no Syugosya
// 2006.11 Mobile Suit Gundam 0079 Card Builder ver.2.02
-
+
// 2007.03 Mobile Suit Gundam 0083 Card Builder
// 2007.10 Mobile Suit Gundam 0083 Card Builder Ryouyuu Gekitotsu
// 2007.11 Quest of D The Battle Kingdom ver.4.00
diff --git a/src/mame/video/dc.c b/src/mame/video/dc.c
index aa835d5e0c1..6dacc76d011 100644
--- a/src/mame/video/dc.c
+++ b/src/mame/video/dc.c
@@ -2668,12 +2668,12 @@ READ64_HANDLER( pvr2_ta_r )
WRITE64_HANDLER( pvr2_ta_w )
{
-// int reg;
-// UINT64 shift;
-// UINT32 dat;
+// int reg;
+// UINT64 shift;
+// UINT32 dat;
-// reg = decode_reg_64(offset, mem_mask, &shift);
-// dat = (UINT32)(data >> shift);
+// reg = decode_reg_64(offset, mem_mask, &shift);
+// dat = (UINT32)(data >> shift);
//printf("PVR2 %08x %08x\n",reg,dat);
}
diff --git a/src/tools/unidasm.c b/src/tools/unidasm.c
index b56a668c5ff..ec9044d565b 100644
--- a/src/tools/unidasm.c
+++ b/src/tools/unidasm.c
@@ -442,7 +442,7 @@ static int parse_options(int argc, char *argv[], options *opts)
pending_skip = FALSE;
}
- // size
+ // size
else if (pending_count)
{
if (sscanf(curarg, "%d", &opts->count) != 1)
diff --git a/src/version.c b/src/version.c
index e008ad0b55d..6904f1a6b2d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -38,4 +38,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.143 ("__DATE__")";
+const char build_version[] = "0.143u1 ("__DATE__")";