summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author Angelo Salese <angelosa@users.noreply.github.com>2011-07-11 19:36:26 +0000
committer Angelo Salese <angelosa@users.noreply.github.com>2011-07-11 19:36:26 +0000
commit192c9e04f5dc97e8f8b1ecf20f013b0c86de224d (patch)
tree5d821b272abd72624612ca09f17ad6c89c388e1e /src/emu
parent6d4235dcb0bf03f17aa238c7cf6767ba787589e1 (diff)
Clean-ups and version bumpmame0143u1
Diffstat (limited to 'src/emu')
-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
13 files changed, 25 insertions, 25 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();
}
//-------------------------------------------------