summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/cpu/adsp2100/2100ops.c30
-rw-r--r--src/emu/cpu/adsp2100/adsp2100.c28
-rw-r--r--src/emu/cpu/adsp2100/adsp2100.h20
-rw-r--r--src/emu/cpu/asap/asap.c8
-rw-r--r--src/emu/cpu/asap/asap.h4
-rw-r--r--src/emu/debug/debugcpu.c28
-rw-r--r--src/emu/debug/debugcpu.h8
-rw-r--r--src/emu/devcb.h2
-rw-r--r--src/emu/devintrf.c6
-rw-r--r--src/emu/devintrf.h42
-rw-r--r--src/emu/machine.h4
-rw-r--r--src/emu/machine/6522via.c4
-rw-r--r--src/emu/machine/8257dma.c4
-rw-r--r--src/emu/machine/intelfsh.c2
-rw-r--r--src/emu/machine/intelfsh.h28
-rw-r--r--src/emu/machine/mc146818.h16
-rw-r--r--src/emu/machine/nvram.c4
-rw-r--r--src/emu/machine/nvram.h2
-rw-r--r--src/emu/mame.c2
-rw-r--r--src/emu/mconfig.c2
-rw-r--r--src/emu/mconfig.h2
-rw-r--r--src/emu/memory.c12
-rw-r--r--src/emu/sound/asc.c2
-rw-r--r--src/emu/sound/okim6295.c2
-rw-r--r--src/emu/sound/okim6295.h2
-rw-r--r--src/emu/video/mc6845.c2
26 files changed, 133 insertions, 133 deletions
diff --git a/src/emu/cpu/adsp2100/2100ops.c b/src/emu/cpu/adsp2100/2100ops.c
index ffd666ca512..a9a613c2921 100644
--- a/src/emu/cpu/adsp2100/2100ops.c
+++ b/src/emu/cpu/adsp2100/2100ops.c
@@ -300,10 +300,10 @@ inline void adsp21xx_device::stat_stack_pop()
/*
inline int adsp21xx_device::condition(int c)
{
- if (c != 14)
- return m_condition_table[((c) << 8) | m_astat];
- else
- return slow_condition(c);
+ if (c != 14)
+ return m_condition_table[((c) << 8) | m_astat];
+ else
+ return slow_condition(c);
}
*/
@@ -367,22 +367,22 @@ void adsp21xx_device::write_reg1(int regnum, INT32 val)
m_i[index] = val & 0x3fff;
update_i(index);
break;
-
+
case 1:
m_m[index] = (INT32)(val << 18) >> 18;
break;
-
+
case 2:
- m_l[index] = val & 0x3fff;
+ m_l[index] = val & 0x3fff;
update_l(index);
break;
-
+
case 3:
logerror("ADSP %04x: Writing to an invalid register!\n", m_ppc);
break;
}
}
-
+
void adsp21xx_device::write_reg2(int regnum, INT32 val)
{
int index = 4 + (regnum & 3);
@@ -392,16 +392,16 @@ void adsp21xx_device::write_reg2(int regnum, INT32 val)
m_i[index] = val & 0x3fff;
update_i(index);
break;
-
+
case 1:
m_m[index] = (INT32)(val << 18) >> 18;
break;
-
+
case 2:
- m_l[index] = val & 0x3fff;
+ m_l[index] = val & 0x3fff;
update_l(index);
break;
-
+
case 3:
logerror("ADSP %04x: Writing to an invalid register!\n", m_ppc);
break;
@@ -413,7 +413,7 @@ void adsp21xx_device::write_reg3(int regnum, INT32 val)
switch (regnum)
{
case 0x00: m_astat = val & 0x00ff; break;
- case 0x01: m_mstat = val & m_mstat_mask; update_mstat(); break;
+ case 0x01: m_mstat = val & m_mstat_mask; update_mstat(); break;
case 0x03: m_imask = val & m_imask_mask; check_irqs(); break;
case 0x04: m_icntl = val & 0x001f; check_irqs(); break;
case 0x05: cntr_stack_push(); m_cntr = val & 0x3fff; break;
@@ -464,7 +464,7 @@ void adsp21xx_device::write_reg3(int regnum, INT32 val)
default: logerror("ADSP %04x: Writing to an invalid register!\n", m_ppc); break;
}
}
-
+
#define WRITE_REG(adsp,grp,reg,val) ((this->*wr_reg[grp][reg])(val))
diff --git a/src/emu/cpu/adsp2100/adsp2100.c b/src/emu/cpu/adsp2100/adsp2100.c
index 87875b6d2d1..a6e0dfbbf65 100644
--- a/src/emu/cpu/adsp2100/adsp2100.c
+++ b/src/emu/cpu/adsp2100/adsp2100.c
@@ -1,8 +1,8 @@
/***************************************************************************
- ADSP2100.c
+ ADSP2100.c
- ADSP-21xx series emulator.
+ ADSP-21xx series emulator.
****************************************************************************
@@ -190,12 +190,12 @@ device_config *adsp2100_device_config::static_alloc_device_config(const machine_
{
return global_alloc(adsp2100_device_config(mconfig, tag, owner, clock));
}
-
+
device_config *adsp2101_device_config::static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
{
return global_alloc(adsp2101_device_config(mconfig, static_alloc_device_config, "ADSP-2101", tag, owner, clock, CHIP_TYPE_ADSP2101));
}
-
+
device_config *adsp2181_device_config::static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock)
{
return global_alloc(adsp2181_device_config(mconfig, tag, owner, clock));
@@ -285,23 +285,23 @@ UINT32 adsp2181_device_config::execute_input_lines() const
const address_space_config *adsp2100_device_config::memory_space_config(int spacenum) const
{
- return (spacenum == AS_PROGRAM) ? &m_program_config :
- (spacenum == AS_DATA) ? &m_data_config :
+ return (spacenum == AS_PROGRAM) ? &m_program_config :
+ (spacenum == AS_DATA) ? &m_data_config :
NULL;
}
const address_space_config *adsp2101_device_config::memory_space_config(int spacenum) const
{
- return (spacenum == AS_PROGRAM) ? &m_program_config :
- (spacenum == AS_DATA) ? &m_data_config :
+ return (spacenum == AS_PROGRAM) ? &m_program_config :
+ (spacenum == AS_DATA) ? &m_data_config :
NULL;
}
const address_space_config *adsp2181_device_config::memory_space_config(int spacenum) const
{
- return (spacenum == AS_PROGRAM) ? &m_program_config :
- (spacenum == AS_DATA) ? &m_data_config :
- (spacenum == AS_IO) ? &m_io_config :
+ return (spacenum == AS_PROGRAM) ? &m_program_config :
+ (spacenum == AS_DATA) ? &m_data_config :
+ (spacenum == AS_IO) ? &m_io_config :
NULL;
}
@@ -369,8 +369,8 @@ adsp21xx_device::adsp21xx_device(running_machine &_machine, const adsp21xx_devic
m_ifc(0),
m_icount(0),
m_mstat_mask((config.m_chip_type >= adsp21xx_device_config::CHIP_TYPE_ADSP2101) ? 0x7f : 0x0f),
- m_imask_mask((config.m_chip_type >= adsp21xx_device_config::CHIP_TYPE_ADSP2181) ? 0x3ff :
- (config.m_chip_type >= adsp21xx_device_config::CHIP_TYPE_ADSP2101) ? 0x3f : 0x0f)
+ m_imask_mask((config.m_chip_type >= adsp21xx_device_config::CHIP_TYPE_ADSP2181) ? 0x3ff :
+ (config.m_chip_type >= adsp21xx_device_config::CHIP_TYPE_ADSP2101) ? 0x3f : 0x0f)
{
// initialize remaining state
memset(&m_core, 0, sizeof(m_core));
@@ -774,7 +774,7 @@ void adsp21xx_device::device_start()
state_add(ADSP2100_FL0, "FL0", m_fl0).mask(1);
state_add(ADSP2100_FL1, "FL1", m_fl1).mask(1);
state_add(ADSP2100_FL2, "FL2", m_fl2).mask(1);
-
+
// set our instruction counter
m_icountptr = &m_icount;
}
diff --git a/src/emu/cpu/adsp2100/adsp2100.h b/src/emu/cpu/adsp2100/adsp2100.h
index 4490f92d129..360d866006c 100644
--- a/src/emu/cpu/adsp2100/adsp2100.h
+++ b/src/emu/cpu/adsp2100/adsp2100.h
@@ -2,7 +2,7 @@
adsp2100.h
- ADSP-21xx series emulator.
+ ADSP-21xx series emulator.
****************************************************************************
@@ -137,7 +137,7 @@ protected:
// address spaces
const address_space_config m_program_config;
const address_space_config m_data_config;
-
+
// internal state
UINT32 m_chip_type;
};
@@ -192,7 +192,7 @@ protected:
inline void loop_stack_pop();
inline void stat_stack_push();
inline void stat_stack_pop();
-// inline int condition(int c);
+// inline int condition(int c);
int slow_condition();
inline void modify_address(UINT32 ireg, UINT32 mreg);
inline void data_write_dag1(UINT32 op, INT32 val);
@@ -233,11 +233,11 @@ protected:
inline INT32 read_reg1(int regnum);
inline INT32 read_reg2(int regnum);
inline INT32 read_reg3(int regnum);
-
+
// interrupts
virtual bool generate_irq(int which, int indx = 0) = 0;
virtual void check_irqs() = 0;
-
+
// internal state
static const int PC_STACK_DEPTH = 16;
static const int CNTR_STACK_DEPTH = 4;
@@ -381,13 +381,13 @@ protected:
direct_read_data * m_direct;
// tables
- UINT8 m_condition_table[0x1000];
+ UINT8 m_condition_table[0x1000];
UINT16 m_mask_table[0x4000];
UINT16 m_reverse_table[0x4000];
// debugging
#if ADSP_TRACK_HOTSPOTS
- UINT32 m_pcbucket[0x4000];
+ UINT32 m_pcbucket[0x4000];
#endif
// flag definitions
@@ -430,7 +430,7 @@ protected:
class adsp2100_device : public adsp21xx_device
{
friend class adsp2100_device_config;
-
+
// construction/destruction
adsp2100_device(running_machine &_machine, const adsp2100_device_config &config);
@@ -472,7 +472,7 @@ class adsp2101_device : public adsp21xx_device
friend class adsp2104_device_config;
friend class adsp2105_device_config;
friend class adsp2115_device_config;
-
+
protected:
// construction/destruction
adsp2101_device(running_machine &_machine, const adsp2101_device_config &config);
@@ -514,7 +514,7 @@ protected:
class adsp2181_device : public adsp21xx_device
{
friend class adsp2181_device_config;
-
+
// construction/destruction
adsp2181_device(running_machine &_machine, const adsp2181_device_config &config);
diff --git a/src/emu/cpu/asap/asap.c b/src/emu/cpu/asap/asap.c
index d99a3f5ebd3..6c71480252d 100644
--- a/src/emu/cpu/asap/asap.c
+++ b/src/emu/cpu/asap/asap.c
@@ -61,7 +61,7 @@ const int EXCEPTION_TRAP0 = 1;
const int EXCEPTION_TRAPF = 2;
const int EXCEPTION_INTERRUPT = 3;
-const int REGBASE = 0xffe0;
+const int REGBASE = 0xffe0;
@@ -146,9 +146,9 @@ const asap_device::ophandler asap_device::s_opcodetable[32][4] =
const asap_device::ophandler asap_device::s_conditiontable[16] =
{
- &asap_device::bsp, &asap_device::bmz, &asap_device::bgt, &asap_device::ble,
+ &asap_device::bsp, &asap_device::bmz, &asap_device::bgt, &asap_device::ble,
&asap_device::bge, &asap_device::blt, &asap_device::bhi, &asap_device::bls,
- &asap_device::bcc, &asap_device::bcs, &asap_device::bpl, &asap_device::bmi,
+ &asap_device::bcc, &asap_device::bcs, &asap_device::bpl, &asap_device::bmi,
&asap_device::bne, &asap_device::beq, &asap_device::bvc, &asap_device::bvs
};
@@ -336,7 +336,7 @@ void asap_device::device_start()
state_save_register_device_item(this, 0, m_ppc);
state_save_register_device_item(this, 0, m_nextpc);
state_save_register_device_item(this, 0, m_irq_state);
-
+
// set our instruction counter
m_icountptr = &m_icount;
}
diff --git a/src/emu/cpu/asap/asap.h b/src/emu/cpu/asap/asap.h
index 56b818b7b56..f0ec5055844 100644
--- a/src/emu/cpu/asap/asap.h
+++ b/src/emu/cpu/asap/asap.h
@@ -258,10 +258,10 @@ protected:
int m_icount;
address_space * m_program;
direct_read_data * m_direct;
-
+
// src2val table, registers are at the end
UINT32 m_src2val[65536];
-
+
// opcode/condition tables
typedef void (asap_device::*ophandler)();
diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c
index 9cb9575470a..72abfa14ac6 100644
--- a/src/emu/debug/debugcpu.c
+++ b/src/emu/debug/debugcpu.c
@@ -354,7 +354,7 @@ bool debug_comment_save(running_machine *machine)
if (curnode == NULL)
throw emu_exception();
xml_set_attribute(curnode, "tag", device->tag());
-
+
// export the comments
if (!device->debug()->comment_export(*curnode))
throw emu_exception();
@@ -1982,7 +1982,7 @@ void device_debug::instruction_hook(offs_t curpc)
if (global->execution_state == EXECUTION_STATE_STOPPED)
{
int firststop = true;
-
+
// load comments if we haven't yet
if (!global->comments_loaded)
{
@@ -2561,7 +2561,7 @@ offs_t device_debug::history_pc(int index) const
//-------------------------------------------------
-// comment_add - adds a comment to the list at
+// comment_add - adds a comment to the list at
// the given address
//-------------------------------------------------
@@ -2570,7 +2570,7 @@ void device_debug::comment_add(offs_t addr, const char *comment, rgb_t color)
// create a new item for the list
UINT32 crc = compute_opcode_crc32(addr);
dasm_comment *newcomment = auto_alloc(m_device.machine, dasm_comment(comment, addr, color, crc));
-
+
// figure out where to insert it
dasm_comment *prev = NULL;
dasm_comment *curr;
@@ -2581,14 +2581,14 @@ void device_debug::comment_add(offs_t addr, const char *comment, rgb_t color)
// we could be the new head
if (prev == NULL)
m_comment_list.prepend(*newcomment);
-
- // or else we just insert ourselves here
+
+ // or else we just insert ourselves here
else
{
newcomment->m_next = prev->m_next;
prev->m_next = newcomment;
}
-
+
// scan forward from here to delete any exact matches
for ( ; curr != NULL && curr->m_address == addr; curr = curr->next())
if (curr->m_crc == crc)
@@ -2603,7 +2603,7 @@ void device_debug::comment_add(offs_t addr, const char *comment, rgb_t color)
//-------------------------------------------------
-// comment_remove - removes a comment at the
+// comment_remove - removes a comment at the
// given address with a matching CRC
//-------------------------------------------------
@@ -2616,7 +2616,7 @@ bool device_debug::comment_remove(offs_t addr)
// if we're past the address, we failed
if (curr->m_address > addr)
break;
-
+
// find an exact match
if (curr->m_address == addr && curr->m_crc == crc)
{
@@ -2626,7 +2626,7 @@ bool device_debug::comment_remove(offs_t addr)
return true;
}
}
-
+
// failure is an option
return false;
}
@@ -2645,12 +2645,12 @@ const char *device_debug::comment_text(offs_t addr) const
// if we're past the address, we failed
if (curr->m_address > addr)
break;
-
+
// find an exact match
if (curr->m_address == addr && curr->m_crc == crc)
return curr->m_text;
}
-
+
// failure is an option
return NULL;
}
@@ -2694,7 +2694,7 @@ bool device_debug::comment_import(xml_data_node &cpunode)
rgb_t color = xml_get_attribute_int(datanode, "color", 0);
UINT32 crc;
sscanf(xml_get_attribute_string(datanode, "crc", 0), "%08X", &crc);
-
+
// add the new comment; we assume they were saved ordered
m_comment_list.append(*auto_alloc(m_device.machine, dasm_comment(datanode->value, address, color, crc)));
}
@@ -2742,7 +2742,7 @@ UINT32 device_debug::compute_opcode_crc32(offs_t address) const
address_space *space = m_memory->space(AS_PROGRAM);
if (space == NULL)
return 0;
-
+
// zero out the buffers
UINT8 opbuf[64], argbuf[64];
memset(opbuf, 0x00, sizeof(opbuf));
diff --git a/src/emu/debug/debugcpu.h b/src/emu/debug/debugcpu.h
index c536c7a5e4d..584e70d9147 100644
--- a/src/emu/debug/debugcpu.h
+++ b/src/emu/debug/debugcpu.h
@@ -53,7 +53,7 @@ const UINT8 WATCHPOINT_READ = 1;
const UINT8 WATCHPOINT_WRITE = 2;
const UINT8 WATCHPOINT_READWRITE = WATCHPOINT_READ | WATCHPOINT_WRITE;
-const int COMMENT_VERSION = 1;
+const int COMMENT_VERSION = 1;
@@ -205,7 +205,7 @@ public:
// hotspots
bool hotspot_tracking_enabled() const { return (m_hotspots != NULL); }
void hotspot_track(int numspots, int threshhold);
-
+
// comments
void comment_add(offs_t address, const char *comment, rgb_t color);
bool comment_remove(offs_t addr);
@@ -329,9 +329,9 @@ private:
{
public:
dasm_comment(const char *text, offs_t address, rgb_t color, UINT32 crc);
-
+
dasm_comment *next() const { return m_next; }
-
+
dasm_comment * m_next; // next comment in the list
offs_t m_address; // address in question
rgb_t m_color; // color to use
diff --git a/src/emu/devcb.h b/src/emu/devcb.h
index ad20fc30310..a0c6834e3b8 100644
--- a/src/emu/devcb.h
+++ b/src/emu/devcb.h
@@ -126,7 +126,7 @@ void devcb_stub(device_t *device, offs_t offset, UINT8 data)
#define DECLARE_READ_LINE_MEMBER(name) int name()
#define READ_LINE_MEMBER(name) int name()
#define DECLARE_WRITE_LINE_MEMBER(name) void name(ATTR_UNUSED int state)
-#define WRITE_LINE_MEMBER(name) void name(ATTR_UNUSED int state)
+#define WRITE_LINE_MEMBER(name) void name(ATTR_UNUSED int state)
/* macros for inline device handler initialization */
diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c
index a418deeecda..467ecddc6e5 100644
--- a/src/emu/devintrf.c
+++ b/src/emu/devintrf.c
@@ -148,7 +148,7 @@ void device_list::start_all()
mame_printf_verbose("Starting %s '%s'\n", device->name(), device->tag());
device->start();
}
-
+
// handle missing dependencies by moving the device to the end
catch (device_missing_dependencies &)
{
@@ -190,7 +190,7 @@ void device_list::static_exit(running_machine &machine)
// first let the debugger save comments
if ((machine.debug_flags & DEBUG_FLAG_ENABLED) != 0)
debug_comment_save(&machine);
-
+
// then nuke the devices
machine.m_devicelist.reset();
}
@@ -724,7 +724,7 @@ void device_t::start()
// force an update of the clock
notify_clock_changed();
-
+
// if we're debugging, create a device_debug object
if ((m_machine.debug_flags & DEBUG_FLAG_ENABLED) != 0)
{
diff --git a/src/emu/devintrf.h b/src/emu/devintrf.h
index a3c59940953..7a080f3820d 100644
--- a/src/emu/devintrf.h
+++ b/src/emu/devintrf.h
@@ -66,8 +66,8 @@ typedef _DeviceBase _DeviceClass; \
class _ConfigClass; \
\
class _ConfigClass : public _ConfigBase \
-{ \
-protected: \
+{ \
+protected: \
_ConfigClass(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock, UINT32 param = 0); \
\
public: \
@@ -80,17 +80,17 @@ public: \
_ConfigClass::_ConfigClass(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock, UINT32 param) \
: _ConfigBase(mconfig, static_alloc_device_config, _Name, tag, owner, clock, param) \
{ \
-} \
+} \
\
device_config *_ConfigClass::static_alloc_device_config(const machine_config &mconfig, const char *tag, const device_config *owner, UINT32 clock) \
-{ \
- return global_alloc(_ConfigClass(mconfig, tag, owner, clock, _Param)); \
-} \
+{ \
+ return global_alloc(_ConfigClass(mconfig, tag, owner, clock, _Param)); \
+} \
\
-device_t *_ConfigClass::alloc_device(running_machine &machine) const \
-{ \
- return auto_alloc(&machine, _DeviceClass(machine, *this)); \
-} \
+device_t *_ConfigClass::alloc_device(running_machine &machine) const \
+{ \
+ return auto_alloc(&machine, _DeviceClass(machine, *this)); \
+} \
@@ -501,12 +501,12 @@ protected:
// getters
virtual void findit(device_t &base) = 0;
-
+
// helpers
device_t *find_device(device_t &device, const char *tag);
void *find_shared_ptr(device_t &device, const char *tag);
size_t find_shared_size(device_t &device, const char *tag);
-
+
// internal state
auto_finder_base *m_next;
const char *m_tag;
@@ -518,8 +518,8 @@ protected:
{
public:
// construction/destruction
- auto_finder_type(device_t &base, const char *tag)
- : auto_finder_base(base, tag),
+ auto_finder_type(device_t &base, const char *tag)
+ : auto_finder_base(base, tag),
m_target(0) { }
// operators to make use transparent
@@ -538,7 +538,7 @@ protected:
// internal state
_TargetType m_target;
};
-
+
// optional device finder
template<class _DeviceClass>
class optional_device : public auto_finder_type<_DeviceClass *, false>
@@ -547,7 +547,7 @@ protected:
optional_device(device_t &base, const char *tag) : auto_finder_type<_DeviceClass *, false>(base, tag) { }
virtual void findit(device_t &base) { set_target(downcast<_DeviceClass *>(find_device(base, this->m_tag))); }
};
-
+
// required devices are similar but throw an error if they are not found
template<class _DeviceClass>
class required_device : public auto_finder_type<_DeviceClass *, true>
@@ -556,7 +556,7 @@ protected:
required_device(device_t &base, const char *tag) : auto_finder_type<_DeviceClass *, true>(base, tag) { }
virtual void findit(device_t &base) { set_target(downcast<_DeviceClass *>(find_device(base, this->m_tag))); }
};
-
+
// optional shared pointer finder
template<typename _PointerType>
class optional_shared_ptr : public auto_finder_type<_PointerType *, false>
@@ -565,7 +565,7 @@ protected:
optional_shared_ptr(device_t &base, const char *tag) : auto_finder_type<_PointerType *, false>(base, tag) { }
virtual void findit(device_t &base) { set_target(reinterpret_cast<_PointerType *>(find_shared_ptr(base, this->m_tag))); }
};
-
+
// required shared pointer finder
template<typename _PointerType>
class required_shared_ptr : public auto_finder_type<_PointerType *, true>
@@ -574,7 +574,7 @@ protected:
required_shared_ptr(device_t &base, const char *tag) : auto_finder_type<_PointerType *, true>(base, tag) { }
virtual void findit(device_t &base) { set_target(reinterpret_cast<_PointerType *>(find_shared_ptr(base, this->m_tag))); }
};
-
+
// optional shared pointer size finder
class optional_shared_size : public auto_finder_type<size_t, false>
{
@@ -582,7 +582,7 @@ protected:
optional_shared_size(device_t &base, const char *tag) : auto_finder_type<size_t, false>(base, tag) { }
virtual void findit(device_t &base) { set_target(find_shared_size(base, this->m_tag)); }
};
-
+
// required shared pointer size finder
class required_shared_size : public auto_finder_type<size_t, true>
{
@@ -590,7 +590,7 @@ protected:
required_shared_size(device_t &base, const char *tag) : auto_finder_type<size_t, true>(base, tag) { }
virtual void findit(device_t &base) { set_target(find_shared_size(base, this->m_tag)); }
};
-
+
// internal helpers
void register_auto_finder(auto_finder_base &autodev);
diff --git a/src/emu/machine.h b/src/emu/machine.h
index 82f5267aad4..3c298a21ebd 100644
--- a/src/emu/machine.h
+++ b/src/emu/machine.h
@@ -586,7 +586,7 @@ public:
{
return global_alloc(driver_device_config(mconfig, tag, owner));
}
-
+
virtual device_t *alloc_device(running_machine &machine) const
{
// we clear here for historical reasons, as many existing driver states
@@ -627,7 +627,7 @@ protected:
// device-level overrides
virtual void device_start();
virtual void device_reset();
-
+
// internal state
const driver_device_config_base &m_config;
};
diff --git a/src/emu/machine/6522via.c b/src/emu/machine/6522via.c
index 70de6dc87b5..cdcefc1d6bc 100644
--- a/src/emu/machine/6522via.c
+++ b/src/emu/machine/6522via.c
@@ -423,7 +423,7 @@ void via6522_device::device_timer(emu_timer &timer, device_timer_id id, int para
case TIMER_SHIFT:
shift();
break;
-
+
// t1 timeout
case TIMER_T1:
if (T1_CONTINUOUS (m_acr))
@@ -454,7 +454,7 @@ void via6522_device::device_timer(emu_timer &timer, device_timer_id id, int para
set_int(INT_T1);
}
break;
-
+
// t2 timeout
case TIMER_T2:
m_t2_active = 0;
diff --git a/src/emu/machine/8257dma.c b/src/emu/machine/8257dma.c
index 810b3ff1b98..962c660949b 100644
--- a/src/emu/machine/8257dma.c
+++ b/src/emu/machine/8257dma.c
@@ -289,11 +289,11 @@ void i8257_device::device_timer(emu_timer &timer, device_timer_id id, int param,
}
break;
}
-
+
case TIMER_MSBFLIP:
m_msb ^= 1;
break;
-
+
case TIMER_DRQ_SYNC:
{
int channel = param >> 1;
diff --git a/src/emu/machine/intelfsh.c b/src/emu/machine/intelfsh.c
index a7f8e32a500..28761177329 100644
--- a/src/emu/machine/intelfsh.c
+++ b/src/emu/machine/intelfsh.c
@@ -200,7 +200,7 @@ intelfsh_device_config::intelfsh_device_config(const machine_config &mconfig, de
map = ADDRESS_MAP_NAME( memory_map8_1Mb );
break;
}
-
+
int addrbits;
for (addrbits = 24; addrbits > 0; addrbits--)
if ((m_size & (1 << addrbits)) != 0)
diff --git a/src/emu/machine/intelfsh.h b/src/emu/machine/intelfsh.h
index 923646c8560..863b0444c91 100644
--- a/src/emu/machine/intelfsh.h
+++ b/src/emu/machine/intelfsh.h
@@ -88,12 +88,12 @@ protected:
// internal state
address_space_config m_space_config;
- UINT32 m_type;
- INT32 m_size;
- UINT8 m_bits;
- UINT8 m_device_id;
- UINT8 m_maker_id;
- bool m_sector_is_4k;
+ UINT32 m_type;
+ INT32 m_size;
+ UINT8 m_bits;
+ UINT8 m_device_id;
+ UINT8 m_maker_id;
+ bool m_sector_is_4k;
};
@@ -118,7 +118,7 @@ protected:
virtual void nvram_default();
virtual void nvram_read(mame_file &file);
virtual void nvram_write(mame_file &file);
-
+
// derived helpers
UINT32 read_full(UINT32 offset);
void write_full(UINT32 offset, UINT32 data);
@@ -126,10 +126,10 @@ protected:
// internal state
const intelfsh_device_config & m_config;
- UINT8 m_status;
- INT32 m_erase_sector;
- INT32 m_flash_mode;
- bool m_flash_master_lock;
+ UINT8 m_status;
+ INT32 m_erase_sector;
+ INT32 m_flash_mode;
+ bool m_flash_master_lock;
emu_timer * m_timer;
};
@@ -167,7 +167,7 @@ public:
// public interface
UINT8 read(offs_t offset) { return read_full(offset); }
void write(offs_t offset, UINT8 data) { write_full(offset, data); }
-
+
UINT8 read_raw(offs_t offset) { return m_addrspace[0]->read_byte(offset); }
void write_raw(offs_t offset, UINT8 data) { m_addrspace[0]->write_byte(offset, data); }
};
@@ -203,7 +203,7 @@ public:
// public interface
UINT16 read(offs_t offset) { return read_full(offset); }
void write(offs_t offset, UINT16 data) { write_full(offset, data); }
-
+
UINT16 read_raw(offs_t offset) { return m_addrspace[0]->read_word(offset * 2); }
void write_raw(offs_t offset, UINT16 data) { m_addrspace[0]->write_word(offset * 2, data); }
};
@@ -226,7 +226,7 @@ DECLARE_TRIVIAL_DERIVED_DEVICE(sharp_lh28f400_device_config, intelfsh16_device_c
DECLARE_TRIVIAL_DERIVED_DEVICE(intel_te28f160_device_config, intelfsh16_device_config, intel_te28f160_device, intelfsh16_device)
DECLARE_TRIVIAL_DERIVED_DEVICE(intel_e28f400_device_config, intelfsh16_device_config, intel_e28f400_device, intelfsh16_device)
DECLARE_TRIVIAL_DERIVED_DEVICE(sharp_unk128mbit_device_config, intelfsh16_device_config, sharp_unk128mbit_device, intelfsh16_device)
-
+
// device type definition
diff --git a/src/emu/machine/mc146818.h b/src/emu/machine/mc146818.h
index ec512175170..b9a59872b86 100644
--- a/src/emu/machine/mc146818.h
+++ b/src/emu/machine/mc146818.h
@@ -60,7 +60,7 @@ public:
protected:
// internal state
- mc146818_type m_type;
+ mc146818_type m_type;
};
@@ -92,21 +92,21 @@ protected:
// internal helpers
int dec_2_local(int a);
void set_base_datetime();
-
+
// internal state
static const int MC146818_DATA_SIZE = 0x80;
const mc146818_device_config & m_config;
- UINT8 m_index;
- UINT8 m_data[MC146818_DATA_SIZE];
+ UINT8 m_index;
+ UINT8 m_data[MC146818_DATA_SIZE];
- UINT16 m_eindex;
- UINT8 m_edata[0x2000];
+ UINT16 m_eindex;
+ UINT8 m_edata[0x2000];
- bool m_updated; /* update ended interrupt flag */
+ bool m_updated; /* update ended interrupt flag */
- attotime m_last_refresh;
+ attotime m_last_refresh;
};
diff --git a/src/emu/machine/nvram.c b/src/emu/machine/nvram.c
index 4ddacf04bc1..8f4472b0074 100644
--- a/src/emu/machine/nvram.c
+++ b/src/emu/machine/nvram.c
@@ -100,7 +100,7 @@ void nvram_device_config::static_set_default_value(device_config *device, defaul
//-------------------------------------------------
-// static_set_custom_handler - configuration
+// static_set_custom_handler - configuration
// helper to set a custom callback
//-------------------------------------------------
@@ -182,7 +182,7 @@ void nvram_device::nvram_default()
nvram[index] = mame_rand(&m_machine);
break;
}
-
+
// custom handler
case nvram_device_config::DEFAULT_CUSTOM:
m_custom_handler(*this, m_base, m_length);
diff --git a/src/emu/machine/nvram.h b/src/emu/machine/nvram.h
index 42952c5a62b..71783f0d39f 100644
--- a/src/emu/machine/nvram.h
+++ b/src/emu/machine/nvram.h
@@ -152,7 +152,7 @@ protected:
virtual void nvram_default();
virtual void nvram_read(mame_file &file);
virtual void nvram_write(mame_file &file);
-
+
// internal helpers
void determine_final_base();
diff --git a/src/emu/mame.c b/src/emu/mame.c
index 3ece8d55ec3..166ed0705c7 100644
--- a/src/emu/mame.c
+++ b/src/emu/mame.c
@@ -239,7 +239,7 @@ core_options *mame_options(void)
/*-------------------------------------------------
set_mame_options - set mame options, used by
- validate option
+ validate option
-------------------------------------------------*/
void set_mame_options(core_options *options)
diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c
index ad9537ca4ed..ccf153ac680 100644
--- a/src/emu/mconfig.c
+++ b/src/emu/mconfig.c
@@ -65,7 +65,7 @@ machine_config::machine_config(const game_driver &gamedrv)
{
// construct the config
(*gamedrv.machine_config)(*this, NULL);
-
+
// when finished, set the game driver
device_config *config = m_devicelist.find("root");
if (config == NULL)
diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h
index 27e2c9ef2bb..3646b2c4995 100644
--- a/src/emu/mconfig.h
+++ b/src/emu/mconfig.h
@@ -126,7 +126,7 @@ class machine_config
public:
machine_config(const game_driver &gamedrv);
~machine_config();
-
+
const game_driver &gamedrv() const { return m_gamedrv; }
attotime m_minimum_quantum; // minimum scheduling quantum
diff --git a/src/emu/memory.c b/src/emu/memory.c
index f08effd2173..671b6d11a72 100644
--- a/src/emu/memory.c
+++ b/src/emu/memory.c
@@ -399,14 +399,14 @@ public:
memory_share(size_t size, void *ptr = NULL)
: m_ptr(ptr),
m_size(size) { }
-
+
// getters
void *ptr() const { return m_ptr; }
size_t size() const { return m_size; }
-
+
// setters
void set_ptr(void *ptr) { m_ptr = ptr; }
-
+
private:
// internal state
void * m_ptr; // pointer to the memory backing the region
@@ -1698,7 +1698,7 @@ void memory_set_bankptr(running_machine *machine, const char *tag, void *base)
//-------------------------------------------------
-// memory_get_shared - get a pointer to a shared
+// memory_get_shared - get a pointer to a shared
// memory region by tag
//-------------------------------------------------
@@ -3010,14 +3010,14 @@ bool address_space::needs_backing_store(const address_map_entry *entry)
// if we are asked to provide a base pointer, then yes, we do need backing
if (entry->m_baseptr != NULL || entry->m_baseptroffs_plus1 != 0 || entry->m_genbaseptroffs_plus1 != 0)
return true;
-
+
// if we are sharing, and we don't have a pointer yet, create one
if (entry->m_share != NULL)
{
memory_share *share = m_machine.memory_data->sharemap.find(entry->m_share);
if (share != NULL && share->ptr() == NULL)
return true;
- }
+ }
// if we're writing to any sort of bank or RAM, then yes, we do need backing
if (entry->m_write.m_type == AMH_BANK || entry->m_write.m_type == AMH_RAM)
diff --git a/src/emu/sound/asc.c b/src/emu/sound/asc.c
index 5c7855a7e3a..c688baa55b1 100644
--- a/src/emu/sound/asc.c
+++ b/src/emu/sound/asc.c
@@ -4,7 +4,7 @@
Apple Sound Chip (ASC) 344S0063
Enhanced Apple Sound Chip (EASC) 343S1063
-
+
Emulation by R. Belmont
***************************************************************************/
diff --git a/src/emu/sound/okim6295.c b/src/emu/sound/okim6295.c
index a71cf97582a..7b44a610dbd 100644
--- a/src/emu/sound/okim6295.c
+++ b/src/emu/sound/okim6295.c
@@ -303,7 +303,7 @@ UINT8 okim6295_device::read_status()
return result;
}
-
+
//-------------------------------------------------
// read - memory interface for read
//-------------------------------------------------
diff --git a/src/emu/sound/okim6295.h b/src/emu/sound/okim6295.h
index 4e2300f3c96..8cdb8637271 100644
--- a/src/emu/sound/okim6295.h
+++ b/src/emu/sound/okim6295.h
@@ -122,7 +122,7 @@ public:
UINT8 read_status();
void write_command(UINT8 command);
-
+
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c
index 165badca61d..3b38f5ddb43 100644
--- a/src/emu/video/mc6845.c
+++ b/src/emu/video/mc6845.c
@@ -694,7 +694,7 @@ UINT16 mc6845_get_ma(running_device *device)
mc6845_t *mc6845 = get_safe_token(device);
mc6845_update_counters( mc6845 );
-
+
return ( mc6845->line_address + mc6845->character_counter ) & 0x3fff;
}