summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/addrmap.h2
-rw-r--r--src/emu/cpu/m68000/68307bus.c2
-rw-r--r--src/emu/cpu/m68000/68307ser.c4
-rw-r--r--src/emu/cpu/m68000/68307sim.c4
-rw-r--r--src/emu/cpu/m68000/68307sim.h2
-rw-r--r--src/emu/cpu/m68000/68307tmu.c10
-rw-r--r--src/emu/cpu/m68000/68340dma.c4
-rw-r--r--src/emu/cpu/m68000/68340sim.c2
-rw-r--r--src/emu/cpu/m68000/68340tmu.c2
-rw-r--r--src/emu/cpu/m68000/m68kcpu.c30
-rw-r--r--src/emu/device.h12
-rw-r--r--src/emu/driver.h2
-rw-r--r--src/emu/gamedrv.h8
-rw-r--r--src/emu/info.c2
-rw-r--r--src/emu/memory.c8
-rw-r--r--src/emu/memory.h10
16 files changed, 52 insertions, 52 deletions
diff --git a/src/emu/addrmap.h b/src/emu/addrmap.h
index 3830d7d2bc9..f65d3d8b1f6 100644
--- a/src/emu/addrmap.h
+++ b/src/emu/addrmap.h
@@ -763,7 +763,7 @@ void _class :: _name(address_map &map, const device_t &device) \
#define AM_RAM_READ_LEGACY(_read) AM_READ_LEGACY(_read) AM_WRITEONLY
#define AM_RAM_WRITE_LEGACY(_write) AM_READONLY AM_WRITE_LEGACY(_write)
#define AM_RAM_DEVWRITE_LEGACY(_tag, _write) AM_READONLY AM_DEVWRITE_LEGACY(_tag, _write)
-
+
#define AM_BASE_SIZE(_base, _size) AM_BASE(_base) AM_SIZE(_size)
diff --git a/src/emu/cpu/m68000/68307bus.c b/src/emu/cpu/m68000/68307bus.c
index f1ec4925609..801c75deb6d 100644
--- a/src/emu/cpu/m68000/68307bus.c
+++ b/src/emu/cpu/m68000/68307bus.c
@@ -26,7 +26,7 @@ READ16_HANDLER( m68307_internal_mbus_r )
return 0x0000;
}
}
-
+
return 0xffff;
}
diff --git a/src/emu/cpu/m68000/68307ser.c b/src/emu/cpu/m68000/68307ser.c
index 4b11e027609..b1be95379bb 100644
--- a/src/emu/cpu/m68000/68307ser.c
+++ b/src/emu/cpu/m68000/68307ser.c
@@ -27,7 +27,7 @@ READ16_HANDLER( m68307_internal_serial_r )
case m68307SER_UISR_UIMR:
logerror("%08x m68307_internal_serial_r %08x, (%04x) (UISR - Interrupt Status Register)\n", pc, offset*2,mem_mask);
return space->machine().rand() & 0x87;
-
+
default:
logerror("%08x m68307_internal_serial_r %08x, (%04x)\n", pc, offset*2,mem_mask);
break;
@@ -52,7 +52,7 @@ WRITE16_HANDLER( m68307_internal_serial_w )
case m68307SER_USR_UCSR:
logerror("%08x m68307_internal_serial_r %08x, (%04x) (UCSR - Clock Select Register)\n", pc, offset*2,mem_mask);
break;
-
+
case m68307SER_URB_UTB:
logerror("%08x m68307_internal_serial_w %08x, %04x (%04x) (UTB - Transmit Buffer)\n", pc, offset*2,data,mem_mask);
break;
diff --git a/src/emu/cpu/m68000/68307sim.c b/src/emu/cpu/m68000/68307sim.c
index 32500eacc69..302ae4a9ea3 100644
--- a/src/emu/cpu/m68000/68307sim.c
+++ b/src/emu/cpu/m68000/68307sim.c
@@ -18,7 +18,7 @@ READ16_HANDLER( m68307_internal_sim_r )
{
case m68307SIM_PADAT: return sim->read_padat(space, mem_mask);
case m68307SIM_PBDAT: return sim->read_pbdat(space, mem_mask);
-
+
case m68307SIM_LICR2: return (sim->m_licr2);
case m68307SIM_BR0: return (sim->m_br[0]);
@@ -97,7 +97,7 @@ WRITE16_HANDLER( m68307_internal_sim_w )
logerror("%08x m68307_internal_sim_w %08x, %04x (%04x) (Peripheral Interrupt Control Register - PICR)\n", pc, offset*2,data,mem_mask);
sim->write_picr(data,mem_mask);
break;
-
+
case m68307SIM_PIVR:
logerror("%08x m68307_internal_sim_w %08x, %04x (%04x) (Peripheral Interrupt Vector Register - PIVR)\n", pc, offset*2,data,mem_mask);
sim->write_pivr(data,mem_mask);
diff --git a/src/emu/cpu/m68000/68307sim.h b/src/emu/cpu/m68000/68307sim.h
index 76b26391288..ff8e447dd00 100644
--- a/src/emu/cpu/m68000/68307sim.h
+++ b/src/emu/cpu/m68000/68307sim.h
@@ -67,4 +67,4 @@ class m68307_sim
void write_pivr(UINT16 data, UINT16 mem_mask);
void reset(void);
-}; \ No newline at end of file
+};
diff --git a/src/emu/cpu/m68000/68307tmu.c b/src/emu/cpu/m68000/68307tmu.c
index 74370482e79..104a65c6738 100644
--- a/src/emu/cpu/m68000/68307tmu.c
+++ b/src/emu/cpu/m68000/68307tmu.c
@@ -22,13 +22,13 @@ READ16_HANDLER( m68307_internal_timer_r )
return timer->read_tcn(mem_mask, which);
break;
-
+
default:
logerror("%08x m68307_internal_timer_r %08x, (%04x)\n", pc, offset*2,mem_mask);
break;
}
}
-
+
return 0x0000;
}
@@ -106,7 +106,7 @@ static TIMER_CALLBACK( m68307_timer0_callback )
m68ki_cpu_core* m68k = m68k_get_safe_token(dev);
m68307_single_timer* tptr = &m68k->m68307TIMER->singletimer[0];
tptr->regs[m68307TIMER_TMR] |= 0x2;
-
+
m68307_timer0_interrupt(dev);
tptr->mametimer->adjust(m68k->device->cycles_to_attotime(20000));
@@ -118,7 +118,7 @@ static TIMER_CALLBACK( m68307_timer1_callback )
m68ki_cpu_core* m68k = m68k_get_safe_token(dev);
m68307_single_timer* tptr = &m68k->m68307TIMER->singletimer[1];
tptr->regs[m68307TIMER_TMR] |= 0x2;
-
+
m68307_timer1_interrupt(dev);
tptr->mametimer->adjust(m68k->device->cycles_to_attotime(20000));
@@ -133,7 +133,7 @@ static TIMER_CALLBACK( m68307_wd_timer_callback )
void m68307_timer::init(legacy_cpu_device *device)
{
m68307_single_timer* tptr;
-
+
tptr = &singletimer[0];
tptr->mametimer = device->machine().scheduler().timer_alloc(FUNC(m68307_timer0_callback), device);
diff --git a/src/emu/cpu/m68000/68340dma.c b/src/emu/cpu/m68000/68340dma.c
index f2b3f987d47..2d52f3473cc 100644
--- a/src/emu/cpu/m68000/68340dma.c
+++ b/src/emu/cpu/m68000/68340dma.c
@@ -15,7 +15,7 @@ READ32_HANDLER( m68340_internal_dma_r )
int pc = cpu_get_pc(&space->device());
logerror("%08x m68340_internal_dma_r %08x, (%08x)\n", pc, offset*4,mem_mask);
}
-
+
return 0x00000000;
}
@@ -24,7 +24,7 @@ WRITE32_HANDLER( m68340_internal_dma_w )
m68ki_cpu_core *m68k = m68k_get_safe_token(&space->device());
m68340_dma* dma = m68k->m68340DMA;
assert(dma != NULL);
-
+
if (dma)
{
int pc = cpu_get_pc(&space->device());
diff --git a/src/emu/cpu/m68000/68340sim.c b/src/emu/cpu/m68000/68340sim.c
index 8733586696b..7cb2f3a4466 100644
--- a/src/emu/cpu/m68000/68340sim.c
+++ b/src/emu/cpu/m68000/68340sim.c
@@ -9,7 +9,7 @@ READ32_HANDLER( m68340_internal_sim_r )
m68ki_cpu_core *m68k = m68k_get_safe_token(&space->device());
m68340_sim* sim = m68k->m68340SIM;
assert(sim != NULL);
-
+
if (sim)
{
int pc = cpu_get_pc(&space->device());
diff --git a/src/emu/cpu/m68000/68340tmu.c b/src/emu/cpu/m68000/68340tmu.c
index 90354e95b08..b68718fa47b 100644
--- a/src/emu/cpu/m68000/68340tmu.c
+++ b/src/emu/cpu/m68000/68340tmu.c
@@ -16,7 +16,7 @@ READ32_HANDLER( m68340_internal_timer_r )
int pc = cpu_get_pc(&space->device());
logerror("%08x m68340_internal_timer_r %08x, (%08x)\n", pc, offset*4,mem_mask);
}
-
+
return 0x00000000;
}
diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c
index 38c1750e134..4e40f69bd7c 100644
--- a/src/emu/cpu/m68000/m68kcpu.c
+++ b/src/emu/cpu/m68000/m68kcpu.c
@@ -1326,43 +1326,43 @@ int m68307_calc_cs(m68ki_cpu_core *m68k, offs_t address)
UINT16 m68k_memory_interface::simple_read_immediate_16_m68307(offs_t address)
{
-// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
+// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
return m_direct->read_decrypted_word(address);
}
UINT8 m68k_memory_interface::read_byte_m68307(offs_t address)
{
-// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
+// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
return m_space->read_byte(address);
}
UINT16 m68k_memory_interface::read_word_m68307(offs_t address)
{
-// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
+// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
return m_space->read_word(address);
}
UINT32 m68k_memory_interface::read_dword_m68307(offs_t address)
{
-// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
+// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
return m_space->read_dword(address);
}
void m68k_memory_interface::write_byte_m68307(offs_t address, UINT8 data)
{
-// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
+// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
m_space->write_byte(address, data);
}
void m68k_memory_interface::write_word_m68307(offs_t address, UINT16 data)
{
-// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
+// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
m_space->write_word(address, data);
}
void m68k_memory_interface::write_dword_m68307(offs_t address, UINT32 data)
{
-// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
+// m_cpustate->m68307_currentcs = m68307_calc_cs(m_cpustate, address);
m_space->write_dword(address, data);
}
@@ -1956,7 +1956,7 @@ void m68307_timer1_interrupt(legacy_cpu_device *cpudev)
void m68307_serial_interrupt(legacy_cpu_device *cpudev)
{
- m68ki_cpu_core* m68k = m68k_get_safe_token(cpudev);
+ m68ki_cpu_core* m68k = m68k_get_safe_token(cpudev);
int prioritylevel = (m68k->m68307SIM->m_picr & 0x0070)>>4;
int vector = (m68k->m68307SERIAL->m_uivr);
m68307_set_interrupt(cpudev, prioritylevel, vector);
@@ -1964,7 +1964,7 @@ void m68307_serial_interrupt(legacy_cpu_device *cpudev)
void m68307_mbus_interrupt(legacy_cpu_device *cpudev)
{
- m68ki_cpu_core* m68k = m68k_get_safe_token(cpudev);
+ m68ki_cpu_core* m68k = m68k_get_safe_token(cpudev);
int prioritylevel = (m68k->m68307SIM->m_picr & 0x0007)>>0;
int vector = (m68k->m68307SIM->m_pivr & 0x00f0) | 0xd;
m68307_set_interrupt(cpudev, prioritylevel, vector);
@@ -1972,7 +1972,7 @@ void m68307_mbus_interrupt(legacy_cpu_device *cpudev)
void m68307_licr2_interrupt(legacy_cpu_device *cpudev)
{
- m68ki_cpu_core* m68k = m68k_get_safe_token(cpudev);
+ m68ki_cpu_core* m68k = m68k_get_safe_token(cpudev);
int prioritylevel = (m68k->m68307SIM->m_licr2 & 0x0007)>>0;
int vector = (m68k->m68307SIM->m_pivr & 0x00f0) | 0x9;
m68k->m68307SIM->m_licr2 |= 0x8;
@@ -2050,10 +2050,10 @@ static WRITE16_HANDLER( m68307_internal_base_w )
base = (m68k->m68307_base & 0x0fff) << 12;
//mask = (m68k->m68307_base & 0xe000) >> 13;
//if ( m68k->m68307_base & 0x1000 ) mask |= 7;
- m68k->internal->unmap_readwrite(base+0x000, base+0x04f);
- m68k->internal->unmap_readwrite(base+0x100, base+0x11f);
- m68k->internal->unmap_readwrite(base+0x120, base+0x13f);
- m68k->internal->unmap_readwrite(base+0x140, base+0x149);
+ m68k->internal->unmap_readwrite(base+0x000, base+0x04f);
+ m68k->internal->unmap_readwrite(base+0x100, base+0x11f);
+ m68k->internal->unmap_readwrite(base+0x120, base+0x13f);
+ m68k->internal->unmap_readwrite(base+0x140, base+0x149);
/* store new base address */
COMBINE_DATA(&m68k->m68307_base);
@@ -2061,7 +2061,7 @@ static WRITE16_HANDLER( m68307_internal_base_w )
/* install new internal handler */
base = (m68k->m68307_base & 0x0fff) << 12;
//mask = (m68k->m68307_base & 0xe000) >> 13;
- //if ( m68k->m68307_base & 0x1000 ) mask |= 7;
+ //if ( m68k->m68307_base & 0x1000 ) mask |= 7;
m68k->internal->install_legacy_readwrite_handler(base + 0x000, base + 0x04f, FUNC(m68307_internal_sim_r), FUNC(m68307_internal_sim_w));
m68k->internal->install_legacy_readwrite_handler(base + 0x100, base + 0x11f, FUNC(m68307_internal_serial_r), FUNC(m68307_internal_serial_w));
m68k->internal->install_legacy_readwrite_handler(base + 0x120, base + 0x13f, FUNC(m68307_internal_timer_r), FUNC(m68307_internal_timer_w));
diff --git a/src/emu/device.h b/src/emu/device.h
index df101d93911..0317dc17aa4 100644
--- a/src/emu/device.h
+++ b/src/emu/device.h
@@ -292,7 +292,7 @@ protected:
class finder_base
{
friend class device_t;
-
+
public:
// construction/destruction
finder_base(device_t &base, const char *tag);
@@ -344,7 +344,7 @@ protected:
// internal state
_DeviceClass *m_target;
};
-
+
// optional device finder
template<class _DeviceClass>
class optional_device : public device_finder<_DeviceClass, false>
@@ -360,7 +360,7 @@ protected:
public:
required_device(device_t &base, const char *tag) : device_finder<_DeviceClass, true>(base, tag) { }
};
-
+
// shared pointer finder template
template<typename _PointerType, bool _Required>
class shared_ptr_finder : public finder_base
@@ -373,7 +373,7 @@ protected:
m_bytes(0),
m_allocated(false),
m_width((width != 0) ? width : sizeof(_PointerType) * 8) { }
-
+
virtual ~shared_ptr_finder() { if (m_allocated) global_free(m_target); }
// operators to make use transparent
@@ -393,7 +393,7 @@ protected:
if (target == 0 && _Required)
throw emu_fatalerror("Unable to find required shared pointer '%s'", this->m_tag);
}
-
+
// dynamic allocation of a shared pointer
void allocate(UINT32 entries)
{
@@ -414,7 +414,7 @@ protected:
bool m_allocated;
UINT8 m_width;
};
-
+
// optional device finder
template<class _PointerType>
class optional_shared_ptr : public shared_ptr_finder<_PointerType, false>
diff --git a/src/emu/driver.h b/src/emu/driver.h
index 98731198924..b7b5c652bf7 100644
--- a/src/emu/driver.h
+++ b/src/emu/driver.h
@@ -114,7 +114,7 @@ public:
DECLARE_WRITE8_MEMBER( soundlatch2_clear_w );
DECLARE_WRITE8_MEMBER( soundlatch3_clear_w );
DECLARE_WRITE8_MEMBER( soundlatch4_clear_w );
-
+
// general palette helpers
void set_color_332(pen_t color, int rshift, int gshift, int bshift, UINT32 data);
void set_color_444(pen_t color, int rshift, int gshift, int bshift, UINT32 data);
diff --git a/src/emu/gamedrv.h b/src/emu/gamedrv.h
index bb5f2111618..5bc587a59ff 100644
--- a/src/emu/gamedrv.h
+++ b/src/emu/gamedrv.h
@@ -51,7 +51,7 @@
const int MAX_DRIVER_NAME_CHARS = 8;
// flags for game drivers
-const UINT32 ORIENTATION_MASK = 0x00000007;
+const UINT32 ORIENTATION_MASK = 0x00000007;
const UINT32 GAME_NOT_WORKING = 0x00000008;
const UINT32 GAME_UNEMULATED_PROTECTION = 0x00000010; // game's protection not fully emulated
const UINT32 GAME_WRONG_COLORS = 0x00000020; // colors are totally wrong
@@ -64,7 +64,7 @@ const UINT32 GAME_SUPPORTS_SAVE = 0x00000800; // game supports save states
const UINT32 GAME_IS_BIOS_ROOT = 0x00001000; // this driver entry is a BIOS root
const UINT32 GAME_NO_STANDALONE = 0x00002000; // this driver cannot stand alone
const UINT32 GAME_REQUIRES_ARTWORK = 0x00004000; // the driver requires external artwork for key elements of the game
-const UINT32 GAME_UNOFFICIAL = 0x00008000; // unofficial hardware change
+const UINT32 GAME_UNOFFICIAL = 0x00008000; // unofficial hardware change
const UINT32 GAME_NO_SOUND_HW = 0x00010000; // sound hardware not available
const UINT32 GAME_MECHANICAL = 0x00020000; // contains mechanical parts (pinball, redemption games,...)
const UINT32 GAME_TYPE_ARCADE = 0x00040000; // arcade machine (coin operated machines)
@@ -90,8 +90,8 @@ typedef void (*driver_init_func)(running_machine &machine);
template<class _DriverClass, void (_DriverClass::*_Function)()>
void driver_init_wrapper(running_machine &machine)
{
- _DriverClass *object = machine.driver_data<_DriverClass>();
- (object->*_Function)();
+ _DriverClass *object = machine.driver_data<_DriverClass>();
+ (object->*_Function)();
}
*/
diff --git a/src/emu/info.c b/src/emu/info.c
index e2c59d31e3e..cc39d76f85d 100644
--- a/src/emu/info.c
+++ b/src/emu/info.c
@@ -537,7 +537,7 @@ void info_xml_creator::output_rom(device_t &device)
hash_collection hashes(ROM_GETHASHDATA(rom));
if (!hashes.flag(hash_collection::FLAG_NO_DUMP))
merge_name = get_merge_name(hashes);
- if (&device != &m_drivlist.config().root_device())
+ if (&device != &m_drivlist.config().root_device())
merge_name = NULL;
// scan for a BIOS name
bios_name[0] = 0;
diff --git a/src/emu/memory.c b/src/emu/memory.c
index 78861eb89e0..d21b4d05de3 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -1578,7 +1578,7 @@ memory_manager::memory_manager(running_machine &machine)
//**************************************************************************
//-------------------------------------------------
-// configure_bank - configure the addresses for a
+// configure_bank - configure the addresses for a
// bank
//-------------------------------------------------
@@ -1604,7 +1604,7 @@ void memory_manager::configure_bank(device_t &device, const char *tag, int start
//-------------------------------------------------
-// configure_bank_decrypted - configure the
+// configure_bank_decrypted - configure the
// decrypted addresses for a bank
//-------------------------------------------------
@@ -1630,7 +1630,7 @@ void memory_manager::configure_bank_decrypted(device_t &device, const char *tag,
//-------------------------------------------------
-// set_bank - select one pre-configured entry to
+// set_bank - select one pre-configured entry to
// be the new bank base
//-------------------------------------------------
@@ -1697,7 +1697,7 @@ void memory_manager::set_bankptr(device_t &device, const char *tag, void *base)
//-------------------------------------------------
-// shared - get a pointer to a shared memory
+// shared - get a pointer to a shared memory
// region by tag
//-------------------------------------------------
diff --git a/src/emu/memory.h b/src/emu/memory.h
index aa81d9e8130..c7e96351cee 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -780,7 +780,7 @@ public:
// dump the internal memory tables to the given file
void dump(FILE *file);
-
+
// pointers to a bank pointer (internal usage only)
UINT8 **bank_pointer_addr(UINT8 index, bool decrypted = false) { return decrypted ? &m_bankd_ptr[index] : &m_bank_ptr[index]; }
@@ -795,14 +795,14 @@ private:
UINT8 * m_bank_ptr[256]; // array of bank pointers
UINT8 * m_bankd_ptr[256]; // array of decrypted bank pointers
- simple_list<address_space> m_spacelist; // list of address spaces
- simple_list<memory_block> m_blocklist; // head of the list of memory blocks
+ simple_list<address_space> m_spacelist; // list of address spaces
+ simple_list<memory_block> m_blocklist; // head of the list of memory blocks
- simple_list<memory_bank> m_banklist; // data gathered for each bank
+ simple_list<memory_bank> m_banklist; // data gathered for each bank
tagmap_t<memory_bank *> m_bankmap; // map for fast bank lookups
UINT8 m_banknext; // next bank to allocate
- tagged_list<memory_share> m_sharelist; // map for share lookups
+ tagged_list<memory_share> m_sharelist; // map for share lookups
};