summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Angelo Salese <angelosa@users.noreply.github.com>2011-05-08 19:52:50 +0000
committerGravatarGravatar Angelo Salese <angelosa@users.noreply.github.com>2011-05-08 19:52:50 +0000
commit787811844666f4058bb408e9fbf00efc304c8e48 (patch)
tree3e393ead2773a45f963880594a48ebd64a332e27
parent2bb589beaf77f9ac14481cd2413bf610c97690f8 (diff)
Cleanups and version bumpmame0142u3
-rw-r--r--src/emu/clifront.c4
-rw-r--r--src/emu/cpu/drcbeut.c2
-rw-r--r--src/emu/cpu/drcbeut.h2
-rw-r--r--src/emu/cpu/drcbex86.h2
-rw-r--r--src/emu/devcb.c34
-rw-r--r--src/emu/devcb.h44
-rw-r--r--src/emu/devcpu.c6
-rw-r--r--src/emu/devcpu.h2
-rw-r--r--src/emu/devintrf.c16
-rw-r--r--src/emu/devintrf.h8
-rw-r--r--src/emu/dislot.c4
-rw-r--r--src/emu/dislot.h4
-rw-r--r--src/emu/driver.c4
-rw-r--r--src/emu/driver.h8
-rw-r--r--src/emu/machine.c2
-rw-r--r--src/emu/machine/6821pia.c2
-rw-r--r--src/emu/machine/6850acia.c2
-rw-r--r--src/emu/machine/6850acia.h2
-rw-r--r--src/emu/machine/i8255.h4
-rw-r--r--src/emu/machine/idectrl.c4
-rw-r--r--src/emu/machine/jvsdev.c2
-rw-r--r--src/emu/machine/mccs1850.c8
-rw-r--r--src/emu/machine/secflash.c2
-rw-r--r--src/emu/mconfig.c2
-rw-r--r--src/emu/screen.h4
-rw-r--r--src/emu/sound/lmc1992.c22
-rw-r--r--src/emu/sound/lmc1992.h6
-rw-r--r--src/emu/uimenu.c34
-rw-r--r--src/emu/video/crt9007.h2
-rw-r--r--src/lib/formats/flopimg.c2
-rw-r--r--src/mame/drivers/3do.c2
-rw-r--r--src/mame/drivers/aristmk4.c4
-rw-r--r--src/mame/drivers/armedf.c32
-rw-r--r--src/mame/drivers/badlands.c2
-rw-r--r--src/mame/drivers/bsktball.c4
-rw-r--r--src/mame/drivers/cavesh3.c12
-rw-r--r--src/mame/drivers/goldnpkr.c6
-rw-r--r--src/mame/drivers/konamigv.c14
-rw-r--r--src/mame/drivers/m92.c6
-rw-r--r--src/mame/drivers/midtunit.c4
-rw-r--r--src/mame/drivers/mpu4.c46
-rw-r--r--src/mame/drivers/multfish.c10
-rw-r--r--src/mame/drivers/overdriv.c2
-rw-r--r--src/mame/drivers/seta.c134
-rw-r--r--src/mame/drivers/sfbonus.c2
-rw-r--r--src/mame/drivers/srmp2.c8
-rw-r--r--src/mame/drivers/superwng.c56
-rw-r--r--src/mame/drivers/taito_l.c4
-rw-r--r--src/mame/drivers/taito_x.c16
-rw-r--r--src/mame/includes/bsktball.h2
-rw-r--r--src/mame/includes/btoads.h2
-rw-r--r--src/mame/includes/galivan.h4
-rw-r--r--src/mame/machine/maple-dc.c2
-rw-r--r--src/mame/machine/mie.h4
-rw-r--r--src/mame/machine/msx.c2
-rw-r--r--src/mame/machine/psxcd.h2
-rw-r--r--src/mame/mame.lst2
-rw-r--r--src/mame/video/armedf.c8
-rw-r--r--src/mame/video/seta.c2
-rw-r--r--src/mame/video/seta001.c28
-rw-r--r--src/mame/video/seta001.h18
-rw-r--r--src/mame/video/srmp2.c2
-rw-r--r--src/mame/video/taitoic.c2
-rw-r--r--src/version.c2
64 files changed, 343 insertions, 343 deletions
diff --git a/src/emu/clifront.c b/src/emu/clifront.c
index 57ef01ecde9..856523f7baf 100644
--- a/src/emu/clifront.c
+++ b/src/emu/clifront.c
@@ -583,8 +583,8 @@ void cli_frontend::listslots(const char *gamename)
{
// output the line, up to the list of extensions
printf("%-13s%-20s ", first ? drivlist.driver().name : "", slot->device().tag());
-
- // get the options and print them
+
+ // get the options and print them
const slot_interface* intf = slot->get_slot_interfaces();
for (int i = 0; intf[i].name != NULL; i++)
{
diff --git a/src/emu/cpu/drcbeut.c b/src/emu/cpu/drcbeut.c
index 883c3ba05ec..30f2861b78f 100644
--- a/src/emu/cpu/drcbeut.c
+++ b/src/emu/cpu/drcbeut.c
@@ -505,7 +505,7 @@ void drc_label_list::block_end(drcuml_block &block)
label_fixup *fixup;
while ((fixup = m_fixup_list.detach_head()) != NULL)
m_cache.dealloc(fixup, sizeof(*fixup));
-
+
// make sure the label list is clear, and fatalerror if we missed anything
reset(true);
}
diff --git a/src/emu/cpu/drcbeut.h b/src/emu/cpu/drcbeut.h
index fabd86100a7..83710ff82b3 100644
--- a/src/emu/cpu/drcbeut.h
+++ b/src/emu/cpu/drcbeut.h
@@ -170,7 +170,7 @@ private:
uml::code_label m_label; // the label specified
drccodeptr m_codeptr; // pointer to the relevant code
};
-
+
struct label_fixup
{
label_fixup *next() const { return m_next; }
diff --git a/src/emu/cpu/drcbex86.h b/src/emu/cpu/drcbex86.h
index a7ceb4d9bd1..cd7359c3d25 100644
--- a/src/emu/cpu/drcbex86.h
+++ b/src/emu/cpu/drcbex86.h
@@ -355,7 +355,7 @@ private:
void * m_hashstacksave; // saved stack pointer for hashjmp
UINT64 m_reslo; // extended low result
UINT64 m_reshi; // extended high result
-
+
drc_label_fixup_delegate m_fixup_label; // precomputed delegate for fixups
drc_oob_delegate m_fixup_exception; // precomputed delegate for exception fixups
diff --git a/src/emu/devcb.c b/src/emu/devcb.c
index 0799af35f4b..03c18f75c52 100644
--- a/src/emu/devcb.c
+++ b/src/emu/devcb.c
@@ -97,7 +97,7 @@ const input_port_config *devcb_resolver::resolve_port(const char *tag, device_t
device_t *devcb_resolver::resolve_device(int index, const char *tag, device_t &current)
{
device_t *result = NULL;
-
+
if (index == DEVCB_DEVICE_SELF)
result = &current;
else if (index == DEVCB_DEVICE_DRIVER)
@@ -130,7 +130,7 @@ device_execute_interface *devcb_resolver::resolve_execute_interface(const char *
device_execute_interface *exec;
if (!targetdev->interface(exec))
throw emu_fatalerror("Device '%s' (requested by %s '%s') has no execute interface", tag, current.name(), current.tag());
-
+
return exec;
}
@@ -156,7 +156,7 @@ address_space *devcb_resolver::resolve_space(int index, const char *tag, device_
address_space *result = memory->space(index);
if (result == NULL)
throw emu_fatalerror("Unable to find device '%s' space %d (requested by %s '%s')", tag, index, current.name(), current.tag());
-
+
return result;
}
@@ -192,12 +192,12 @@ void devcb_resolved_read_line::resolve(const devcb_read_line &desc, device_t &de
m_helper.null_indicator = &s_null;
*static_cast<devcb_read_line_delegate *>(this) = devcb_read_line_delegate(&devcb_resolved_read_line::from_constant, "(null)", this);
break;
-
+
case DEVCB_TYPE_IOPORT:
m_object.port = devcb_resolver::resolve_port(desc.tag, device);
*static_cast<devcb_read_line_delegate *>(this) = devcb_read_line_delegate(&devcb_resolved_read_line::from_port, desc.tag, this);
break;
-
+
case DEVCB_TYPE_DEVICE:
m_object.device = devcb_resolver::resolve_device(desc.index, desc.tag, device);
if (desc.readline != NULL)
@@ -286,7 +286,7 @@ void devcb_resolved_write_line::resolve(const devcb_write_line &desc, device_t &
m_helper.null_indicator = &s_null;
*static_cast<devcb_write_line_delegate *>(this) = devcb_write_line_delegate(&devcb_resolved_write_line::to_null, "(null)", this);
break;
-
+
case DEVCB_TYPE_IOPORT:
m_object.port = devcb_resolver::resolve_port(desc.tag, device);
*static_cast<devcb_write_line_delegate *>(this) = devcb_write_line_delegate(&devcb_resolved_write_line::to_port, desc.tag, this);
@@ -302,7 +302,7 @@ void devcb_resolved_write_line::resolve(const devcb_write_line &desc, device_t &
*static_cast<devcb_write_line_delegate *>(this) = devcb_write_line_delegate(&devcb_resolved_write_line::to_write8, desc.name, this);
}
break;
-
+
case DEVCB_TYPE_LEGACY_SPACE:
m_object.space = devcb_resolver::resolve_space(desc.index, desc.tag, device);
m_helper.write8_space = desc.writespace;
@@ -391,12 +391,12 @@ void devcb_resolved_read8::resolve(const devcb_read8 &desc, device_t &device)
m_helper.null_indicator = &s_null;
*static_cast<devcb_read8_delegate *>(this) = devcb_read8_delegate(&devcb_resolved_read8::from_constant, "(null)", this);
break;
-
+
case DEVCB_TYPE_IOPORT:
m_object.port = devcb_resolver::resolve_port(desc.tag, device);
*static_cast<devcb_read8_delegate *>(this) = devcb_read8_delegate(&devcb_resolved_read8::from_port, desc.tag, this);
break;
-
+
case DEVCB_TYPE_DEVICE:
m_object.device = devcb_resolver::resolve_device(desc.index, desc.tag, device);
if (desc.readdevice != NULL)
@@ -433,7 +433,7 @@ UINT8 devcb_resolved_read8::from_port(offs_t offset)
//-------------------------------------------------
-// from_read8 - helper to convert from a device
+// from_read8 - helper to convert from a device
// line read value to an 8-bit value
//-------------------------------------------------
@@ -484,7 +484,7 @@ void devcb_resolved_write8::resolve(const devcb_write8 &desc, device_t &device)
m_helper.null_indicator = &s_null;
*static_cast<devcb_write8_delegate *>(this) = devcb_write8_delegate(&devcb_resolved_write8::to_null, "(null)", this);
break;
-
+
case DEVCB_TYPE_IOPORT:
m_object.port = devcb_resolver::resolve_port(desc.tag, device);
*static_cast<devcb_write8_delegate *>(this) = devcb_write8_delegate(&devcb_resolved_write8::to_port, desc.tag, this);
@@ -500,7 +500,7 @@ void devcb_resolved_write8::resolve(const devcb_write8 &desc, device_t &device)
*static_cast<devcb_write8_delegate *>(this) = devcb_write8_delegate(&devcb_resolved_write8::to_writeline, desc.name, this);
}
break;
-
+
case DEVCB_TYPE_LEGACY_SPACE:
m_object.space = devcb_resolver::resolve_space(desc.index, desc.tag, device);
*static_cast<devcb_write8_delegate *>(this) = devcb_write8_delegate(desc.writespace, desc.name, m_object.space);
@@ -588,12 +588,12 @@ void devcb_resolved_read16::resolve(const devcb_read16 &desc, device_t &device)
m_helper.null_indicator = &s_null;
*static_cast<devcb_read16_delegate *>(this) = devcb_read16_delegate(&devcb_resolved_read16::from_constant, "(null)", this);
break;
-
+
case DEVCB_TYPE_IOPORT:
m_object.port = devcb_resolver::resolve_port(desc.tag, device);
*static_cast<devcb_read16_delegate *>(this) = devcb_read16_delegate(&devcb_resolved_read16::from_port, desc.tag, this);
break;
-
+
case DEVCB_TYPE_DEVICE:
m_object.device = devcb_resolver::resolve_device(desc.index, desc.tag, device);
if (desc.readdevice != NULL)
@@ -630,7 +630,7 @@ UINT16 devcb_resolved_read16::from_port(offs_t offset, UINT16 mask)
//-------------------------------------------------
-// from_read16 - helper to convert from a device
+// from_read16 - helper to convert from a device
// line read value to a 16-bit value
//-------------------------------------------------
@@ -681,7 +681,7 @@ void devcb_resolved_write16::resolve(const devcb_write16 &desc, device_t &device
m_helper.null_indicator = &s_null;
*static_cast<devcb_write16_delegate *>(this) = devcb_write16_delegate(&devcb_resolved_write16::to_null, "(null)", this);
break;
-
+
case DEVCB_TYPE_IOPORT:
m_object.port = devcb_resolver::resolve_port(desc.tag, device);
*static_cast<devcb_write16_delegate *>(this) = devcb_write16_delegate(&devcb_resolved_write16::to_port, desc.tag, this);
@@ -697,7 +697,7 @@ void devcb_resolved_write16::resolve(const devcb_write16 &desc, device_t &device
*static_cast<devcb_write16_delegate *>(this) = devcb_write16_delegate(&devcb_resolved_write16::to_writeline, desc.name, this);
}
break;
-
+
case DEVCB_TYPE_LEGACY_SPACE:
m_object.space = devcb_resolver::resolve_space(desc.index, desc.tag, device);
*static_cast<devcb_write16_delegate *>(this) = devcb_write16_delegate(desc.writespace, desc.name, m_object.space);
diff --git a/src/emu/devcb.h b/src/emu/devcb.h
index b45e4be3b3a..6ce7c70ca3f 100644
--- a/src/emu/devcb.h
+++ b/src/emu/devcb.h
@@ -179,7 +179,7 @@ void devcb_stub16(device_t *device, offs_t offset, UINT16 data)
#define DEVCB_LINE_VCC DEVCB_CONSTANT(1)
// read/write handlers for a given CPU's address space
-#define DEVCB_MEMORY_HANDLER(cpu,space,func) { DEVCB_TYPE_LEGACY_SPACE, AS_##space, (cpu), #func, NULL, NULL, func }
+#define DEVCB_MEMORY_HANDLER(cpu,space,func) { DEVCB_TYPE_LEGACY_SPACE, AS_##space, (cpu), #func, NULL, NULL, func }
// read handlers for an I/O port by tag
#define DEVCB_INPUT_PORT(tag) { DEVCB_TYPE_IOPORT, 0, (tag), NULL, NULL, NULL, NULL }
@@ -273,10 +273,10 @@ public:
// resolution
void resolve(const devcb_read_line &desc, device_t &device);
-
+
// override parent class' notion of NULL
bool isnull() const { return m_helper.null_indicator == &s_null; }
-
+
private:
// internal helpers
int from_port();
@@ -284,7 +284,7 @@ private:
int from_constant();
// internal state
- devcb_resolved_objects m_object;
+ devcb_resolved_objects m_object;
devcb_resolved_read_helpers m_helper;
static UINT8 s_null;
};
@@ -322,10 +322,10 @@ public:
// resolution
void resolve(const devcb_write_line &desc, device_t &device);
-
+
// override parent class' notion of NULL
bool isnull() const { return m_helper.null_indicator == &s_null; }
-
+
private:
// internal helpers
void to_null(int state);
@@ -334,8 +334,8 @@ private:
void to_input(int state);
// internal state
- devcb_resolved_objects m_object;
- devcb_resolved_write_helpers m_helper;
+ devcb_resolved_objects m_object;
+ devcb_resolved_write_helpers m_helper;
static UINT8 s_null;
};
@@ -372,10 +372,10 @@ public:
// resolution
void resolve(const devcb_read8 &desc, device_t &device);
-
+
// override parent class' notion of NULL
bool isnull() const { return m_helper.null_indicator == &s_null; }
-
+
private:
// internal helpers
UINT8 from_port(offs_t offset);
@@ -383,7 +383,7 @@ private:
UINT8 from_constant(offs_t offset);
// internal state
- devcb_resolved_objects m_object;
+ devcb_resolved_objects m_object;
devcb_resolved_read_helpers m_helper;
static UINT8 s_null;
};
@@ -421,10 +421,10 @@ public:
// resolution
void resolve(const devcb_write8 &desc, device_t &device);
-
+
// override parent class' notion of NULL
bool isnull() const { return m_helper.null_indicator == &s_null; }
-
+
private:
// internal helpers
void to_null(offs_t offset, UINT8 data);
@@ -433,8 +433,8 @@ private:
void to_input(offs_t offset, UINT8 data);
// internal state
- devcb_resolved_objects m_object;
- devcb_resolved_write_helpers m_helper;
+ devcb_resolved_objects m_object;
+ devcb_resolved_write_helpers m_helper;
static UINT8 s_null;
};
@@ -471,10 +471,10 @@ public:
// resolution
void resolve(const devcb_read16 &desc, device_t &device);
-
+
// override parent class' notion of NULL
bool isnull() const { return m_helper.null_indicator == &s_null; }
-
+
private:
// internal helpers
UINT16 from_port(offs_t offset, UINT16 mask);
@@ -482,7 +482,7 @@ private:
UINT16 from_constant(offs_t offset, UINT16 mask);
// internal state
- devcb_resolved_objects m_object;
+ devcb_resolved_objects m_object;
devcb_resolved_read_helpers m_helper;
static UINT8 s_null;
};
@@ -520,10 +520,10 @@ public:
// resolution
void resolve(const devcb_write16 &desc, device_t &device);
-
+
// override parent class' notion of NULL
bool isnull() const { return m_helper.null_indicator == &s_null; }
-
+
private:
// internal helpers
void to_null(offs_t offset, UINT16 data, UINT16 mask);
@@ -532,8 +532,8 @@ private:
void to_input(offs_t offset, UINT16 data, UINT16 mask);
// internal state
- devcb_resolved_objects m_object;
- devcb_resolved_write_helpers m_helper;
+ devcb_resolved_objects m_object;
+ devcb_resolved_write_helpers m_helper;
static UINT8 s_null;
};
diff --git a/src/emu/devcpu.c b/src/emu/devcpu.c
index 53b3907c751..0442b4746f5 100644
--- a/src/emu/devcpu.c
+++ b/src/emu/devcpu.c
@@ -251,7 +251,7 @@ UINT64 legacy_cpu_device::execute_cycles_to_clocks(UINT64 cycles) const
//-------------------------------------------------
-// execute_run - execute for the provided number
+// execute_run - execute for the provided number
// of cycles
//-------------------------------------------------
@@ -410,7 +410,7 @@ genf *legacy_cpu_device::get_legacy_fct(UINT32 state) const
//-------------------------------------------------
-// get_legacy_string - return a legacy
+// get_legacy_string - return a legacy
// string value
//-------------------------------------------------
@@ -424,7 +424,7 @@ const char *legacy_cpu_device::get_legacy_string(UINT32 state) const
//-------------------------------------------------
-// set_legacy_int - call the get info function
+// set_legacy_int - call the get info function
// to set an integer value
//-------------------------------------------------
diff --git a/src/emu/devcpu.h b/src/emu/devcpu.h
index e2bcfa75ac0..fecc9dd9bdc 100644
--- a/src/emu/devcpu.h
+++ b/src/emu/devcpu.h
@@ -412,7 +412,7 @@ protected:
protected:
// internal state
cpu_get_info_func m_get_info;
- address_space_config m_space_config[3]; // array of address space configs
+ address_space_config m_space_config[3]; // array of address space configs
void * m_token; // pointer to our state
cpu_set_info_func m_set_info; // extracted legacy function pointers
diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c
index 46dbb1cc274..bb5e60b439f 100644
--- a/src/emu/devintrf.c
+++ b/src/emu/devintrf.c
@@ -109,7 +109,7 @@ void device_list::set_machine_all(running_machine &machine)
{
// add exit and reset callbacks
m_machine = &machine;
-
+
// iterate over devices and set their machines as well
for (device_t *device = first(); device != NULL; device = device->next())
device->set_machine(machine);
@@ -143,7 +143,7 @@ void device_list::start_all()
void device_list::start_new_devices()
{
assert(m_machine != NULL);
-
+
// iterate through the devices
device_t *nextdevice;
for (device_t *device = first(); device != NULL; device = nextdevice)
@@ -158,7 +158,7 @@ void device_list::start_new_devices()
// if the device doesn't have a machine yet, set it first
if (device->m_machine == NULL)
device->set_machine(machine());
-
+
// now start the device
mame_printf_verbose("Starting %s '%s'\n", device->name(), device->tag());
device->start();
@@ -221,7 +221,7 @@ device_t *device_list::first(device_type type) const
//-------------------------------------------------
-// count - count the number of devices of the
+// count - count the number of devices of the
// given type
//-------------------------------------------------
@@ -290,7 +290,7 @@ void device_list::exit()
//-------------------------------------------------
-// presave_all - tell all the devices we are
+// presave_all - tell all the devices we are
// about to save
//-------------------------------------------------
@@ -302,7 +302,7 @@ void device_list::presave_all()
//-------------------------------------------------
-// postload_all - tell all the devices we just
+// postload_all - tell all the devices we just
// completed a load
//-------------------------------------------------
@@ -469,7 +469,7 @@ void device_t::config_complete()
// then notify the device itself
device_config_complete();
-
+
// then mark ourselves complete
m_config_complete = true;
}
@@ -517,7 +517,7 @@ void device_t::reset()
//-------------------------------------------------
-// set_unscaled_clock - sets the given device's
+// set_unscaled_clock - sets the given device's
// unscaled clock
//-------------------------------------------------
diff --git a/src/emu/devintrf.h b/src/emu/devintrf.h
index 7a8c85551d3..c0141209296 100644
--- a/src/emu/devintrf.h
+++ b/src/emu/devintrf.h
@@ -133,7 +133,7 @@ class device_list : public tagged_list<device_t>
public:
// construction/destruction
device_list(resource_pool &pool = global_resource_pool);
-
+
// getters
running_machine &machine() const { assert(m_machine != NULL); return *m_machine; }
@@ -160,7 +160,7 @@ public:
// provide interface-specific overrides
template<class _InterfaceClass>
bool first(_InterfaceClass *&intf) const;
-
+
private:
// internal helpers
void exit();
@@ -307,7 +307,7 @@ protected:
virtual void device_clock_changed();
virtual void device_debug_setup();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
-
+
//------------------- end derived class overrides
device_debug * m_debug;
@@ -376,7 +376,7 @@ protected:
operator _TargetType() { return m_target; }
operator _TargetType() const { return m_target; }
_TargetType operator->() { return m_target; }
-
+
// getter for explicit fetching
_TargetType target() const { return m_target; }
diff --git a/src/emu/dislot.c b/src/emu/dislot.c
index bbdc9a1e3d9..95563de34ea 100644
--- a/src/emu/dislot.c
+++ b/src/emu/dislot.c
@@ -22,14 +22,14 @@ void device_slot_interface::static_set_slot_info(device_t &device, const slot_in
device_slot_interface *slot;
if (!device.interface(slot))
throw emu_fatalerror("set_default_slot_card called on device '%s' with no slot interface", device.tag());
-
+
slot->m_slot_interfaces = slots_info;
slot->m_default_card = default_card;
}
device_t* device_slot_interface::get_card_device()
{
- const char *subtag = device().machine().options().value(device().tag());
+ const char *subtag = device().machine().options().value(device().tag());
device_t *dev = NULL;
if (subtag) {
device_slot_card_interface *intf = NULL;
diff --git a/src/emu/dislot.h b/src/emu/dislot.h
index c0e6bfe5e71..66805af9d0a 100644
--- a/src/emu/dislot.h
+++ b/src/emu/dislot.h
@@ -43,14 +43,14 @@ public:
// construction/destruction
device_slot_interface(const machine_config &mconfig, device_t &device);
virtual ~device_slot_interface();
-
+
static void static_set_slot_info(device_t &device, const slot_interface *slots_info, const char *default_card);
const slot_interface* get_slot_interfaces() const { return m_slot_interfaces; };
const char * get_default_card() const { return m_default_card; };
device_t* get_card_device();
protected:
const char *m_default_card;
- const slot_interface *m_slot_interfaces;
+ const slot_interface *m_slot_interfaces;
};
// ======================> device_slot_card_interface
diff --git a/src/emu/driver.c b/src/emu/driver.c
index eb0f7d785fc..9f3ef905a1f 100644
--- a/src/emu/driver.c
+++ b/src/emu/driver.c
@@ -212,7 +212,7 @@ driver_enumerator::~driver_enumerator()
machine_config &driver_enumerator::config(int index) const
{
assert(index >= 0 && index < s_driver_count);
-
+
// if we don't have it cached, add it
if (m_config[index] == NULL)
{
@@ -223,7 +223,7 @@ machine_config &driver_enumerator::config(int index) const
m_config[first->index()] = NULL;
m_config_cache.remove(*first);
}
-
+
// allocate the config and add it to the end of the list
machine_config *config = m_config[index] = global_alloc(machine_config(*s_drivers_sorted[index], m_options));
m_config_cache.append(*global_alloc(config_entry(*config, index)));
diff --git a/src/emu/driver.h b/src/emu/driver.h
index 641833100cc..bdb3544309f 100644
--- a/src/emu/driver.h
+++ b/src/emu/driver.h
@@ -206,24 +206,24 @@ private:
struct config_entry
{
friend class simple_list<config_entry>;
-
+
public:
// construction/destruction
config_entry(machine_config &config, int index);
~config_entry();
-
+
// getters
config_entry *next() const { return m_next; }
int index() const { return m_index; }
machine_config *config() const { return m_config; }
-
+
private:
// internal state
config_entry * m_next;
machine_config * m_config;
int m_index;
};
-
+
static const int CONFIG_CACHE_COUNT = 100;
// internal state
diff --git a/src/emu/machine.c b/src/emu/machine.c
index 81a392cb05d..87f76ea0193 100644
--- a/src/emu/machine.c
+++ b/src/emu/machine.c
@@ -191,7 +191,7 @@ running_machine::running_machine(const machine_config &_config, osd_interface &o
memset(gfx, 0, sizeof(gfx));
memset(&generic, 0, sizeof(generic));
memset(&m_base_time, 0, sizeof(m_base_time));
-
+
// set the machine on all devices
const_cast<device_list &>(devicelist()).set_machine_all(*this);
diff --git a/src/emu/machine/6821pia.c b/src/emu/machine/6821pia.c
index 9e51c467014..7672defa065 100644
--- a/src/emu/machine/6821pia.c
+++ b/src/emu/machine/6821pia.c
@@ -1058,7 +1058,7 @@ int pia6821_device::ca2_output()
//-------------------------------------------------
-// ca2_output_z - version of ca2_output which
+// ca2_output_z - version of ca2_output which
// takes account of internal pullup resistor
//-------------------------------------------------
diff --git a/src/emu/machine/6850acia.c b/src/emu/machine/6850acia.c
index cf100ad5985..3fe6cb64177 100644
--- a/src/emu/machine/6850acia.c
+++ b/src/emu/machine/6850acia.c
@@ -182,7 +182,7 @@ void acia6850_device::device_timer(emu_timer &timer, device_timer_id id, int par
tx_tick();
m_tx_counter = 0;
break;
-
+
case TIMER_ID_RECEIVE:
rx_tick();
m_rx_counter = 0;
diff --git a/src/emu/machine/6850acia.h b/src/emu/machine/6850acia.h
index 1657a353210..33e7e5325bb 100644
--- a/src/emu/machine/6850acia.h
+++ b/src/emu/machine/6850acia.h
@@ -74,7 +74,7 @@ class acia6850_device : public device_t,
public:
// construction/destruction
acia6850_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
// static configuration helpers
static void static_set_interface(device_t &device, const acia6850_interface &interface);
diff --git a/src/emu/machine/i8255.h b/src/emu/machine/i8255.h
index ae8db18cef3..15498292084 100644
--- a/src/emu/machine/i8255.h
+++ b/src/emu/machine/i8255.h
@@ -92,7 +92,7 @@ public:
DECLARE_READ8_MEMBER( pa_r );
UINT8 pa_r();
-
+
DECLARE_READ8_MEMBER( pb_r );
UINT8 pb_r();
@@ -130,7 +130,7 @@ private:
void output_pc();
void set_mode(UINT8 data);
void set_pc_bit(int bit, int state);
-
+
devcb_resolved_read8 m_in_port_func[3];
devcb_resolved_write8 m_out_port_func[3];
diff --git a/src/emu/machine/idectrl.c b/src/emu/machine/idectrl.c
index 501b4ee7761..f19536c2793 100644
--- a/src/emu/machine/idectrl.c
+++ b/src/emu/machine/idectrl.c
@@ -1252,8 +1252,8 @@ static void handle_command(ide_state *ide, UINT8 command)
default:
LOGPRINT(("IDE unknown command (%02X)\n", command));
ide->status |= IDE_STATUS_ERROR;
- ide->error = IDE_ERROR_UNKNOWN_COMMAND;
- signal_interrupt(ide);
+ ide->error = IDE_ERROR_UNKNOWN_COMMAND;
+ signal_interrupt(ide);
//debugger_break(ide->device->machine());
break;
}
diff --git a/src/emu/machine/jvsdev.c b/src/emu/machine/jvsdev.c
index 2137d7b0315..9c302d8bfc3 100644
--- a/src/emu/machine/jvsdev.c
+++ b/src/emu/machine/jvsdev.c
@@ -137,7 +137,7 @@ int jvs_device::handle_message(const UINT8 *send_buffer, UINT32 send_size, UINT8
return 0;
*recv_buffer++ = 0x01;
return switches(recv_buffer, send_buffer[1], send_buffer[2]) ? 3 : 0;
-
+
case 0x21:
if(send_size < 2)
return 0;
diff --git a/src/emu/machine/mccs1850.c b/src/emu/machine/mccs1850.c
index df35eddf300..38d446d577c 100644
--- a/src/emu/machine/mccs1850.c
+++ b/src/emu/machine/mccs1850.c
@@ -9,10 +9,10 @@
/*
- TODO:
+ TODO:
- - auto restart
- - test mode
+ - auto restart
+ - test mode
*/
@@ -457,7 +457,7 @@ WRITE_LINE_MEMBER( mccs1850_device::sck_w )
if (m_bits == 8)
{
if (LOG) logerror("MCCS1850 '%s' %s Address %u\n", tag(), BIT(m_address, 7) ? "Write" : "Read", m_address & 0x7f);
-
+
m_bits = 0;
m_state = STATE_DATA;
diff --git a/src/emu/machine/secflash.c b/src/emu/machine/secflash.c
index ffa07f15634..0744d86660b 100644
--- a/src/emu/machine/secflash.c
+++ b/src/emu/machine/secflash.c
@@ -4,7 +4,7 @@
device_secure_serial_flash::device_secure_serial_flash(const machine_config &mconfig,
device_type type,
const char *name, const char *tag,
- device_t *owner, UINT32 clock) :
+ device_t *owner, UINT32 clock) :
device_t(mconfig, type, name, tag, owner, clock),
device_nvram_interface(mconfig, *this)
{
diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c
index f62b99c6d3b..843ed020580 100644
--- a/src/emu/mconfig.c
+++ b/src/emu/mconfig.c
@@ -68,7 +68,7 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options)
(*gamedrv.machine_config)(*this, NULL);
// intialize slot devices - make sure that any required devices have been allocated
- device_slot_interface *slot = NULL;
+ device_slot_interface *slot = NULL;
for (bool gotone = m_devicelist.first(slot); gotone; gotone = slot->next(slot))
{
device_t &owner = slot->device();
diff --git a/src/emu/screen.h b/src/emu/screen.h
index be5cd66967a..027d4fd3e28 100644
--- a/src/emu/screen.h
+++ b/src/emu/screen.h
@@ -83,7 +83,7 @@ typedef void (*screen_eof_func)(screen_device *screen, running_machine &machine)
class screen_device : public device_t
{
friend class render_manager;
-
+
public:
// construction/destruction
screen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
@@ -238,7 +238,7 @@ private:
: m_next(NULL),
m_callback(callback) { }
callback_item *next() const { return m_next; }
-
+
callback_item * m_next;
vblank_state_delegate m_callback;
};
diff --git a/src/emu/sound/lmc1992.c b/src/emu/sound/lmc1992.c
index b42507b7fbc..2aa84de70ab 100644
--- a/src/emu/sound/lmc1992.c
+++ b/src/emu/sound/lmc1992.c
@@ -1,7 +1,7 @@
/**********************************************************************
- LMC1992 Digitally-Controlled Stereo Tone and Volume Circuit with
- Four-Channel Input-Selector emulation
+ LMC1992 Digitally-Controlled Stereo Tone and Volume Circuit with
+ Four-Channel Input-Selector emulation
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
@@ -13,11 +13,11 @@
TODO:
- inputs
- - outputs
- - bass
- - treble
- - volume
- - balance
+ - outputs
+ - bass
+ - treble
+ - volume
+ - balance
*/
@@ -73,7 +73,7 @@ const device_type LMC1992 = &device_creator<lmc1992_device>;
//**************************************************************************
//-------------------------------------------------
-// execute_command -
+// execute_command -
//-------------------------------------------------
inline void lmc1992_device::execute_command(int addr, int data)
@@ -181,7 +181,7 @@ void lmc1992_device::sound_stream_update(sound_stream &stream, stream_sample_t *
//-------------------------------------------------
-// clock_w -
+// clock_w -
//-------------------------------------------------
WRITE_LINE_MEMBER( lmc1992_device::clock_w )
@@ -202,7 +202,7 @@ WRITE_LINE_MEMBER( lmc1992_device::clock_w )
//-------------------------------------------------
-// data_w -
+// data_w -
//-------------------------------------------------
WRITE_LINE_MEMBER( lmc1992_device::data_w )
@@ -212,7 +212,7 @@ WRITE_LINE_MEMBER( lmc1992_device::data_w )
//-------------------------------------------------
-// enable_w -
+// enable_w -
//-------------------------------------------------
WRITE_LINE_MEMBER( lmc1992_device::enable_w )
diff --git a/src/emu/sound/lmc1992.h b/src/emu/sound/lmc1992.h
index fc67aa5cde9..0cc9965ad37 100644
--- a/src/emu/sound/lmc1992.h
+++ b/src/emu/sound/lmc1992.h
@@ -1,7 +1,7 @@
/**********************************************************************
- LMC1992 Digitally-Controlled Stereo Tone and Volume Circuit with
- Four-Channel Input-Selector emulation
+ LMC1992 Digitally-Controlled Stereo Tone and Volume Circuit with
+ Four-Channel Input-Selector emulation
Copyright MESS Team.
Visit http://mamedev.org for licensing and usage restrictions.
@@ -92,7 +92,7 @@ private:
inline void execute_command(int addr, int data);
sound_stream *m_stream[4];
-
+
int m_enable; // enable latch
int m_data; // data latch
int m_clk; // clock latch
diff --git a/src/emu/uimenu.c b/src/emu/uimenu.c
index dbe449581ff..f3a36c86ca3 100644
--- a/src/emu/uimenu.c
+++ b/src/emu/uimenu.c
@@ -1502,7 +1502,7 @@ static void ui_menu_keyboard_mode(running_machine &machine, ui_menu *menu, void
/*-------------------------------------------------
- ui_slot_get_current_index - returns
+ ui_slot_get_current_index - returns
-------------------------------------------------*/
int ui_slot_get_current_index(running_machine &machine, device_slot_interface *slot)
{
@@ -1516,7 +1516,7 @@ int ui_slot_get_current_index(running_machine &machine, device_slot_interface *s
}
/*-------------------------------------------------
- ui_slot_get_length - returns
+ ui_slot_get_length - returns
-------------------------------------------------*/
int ui_slot_get_length(running_machine &machine, device_slot_interface *slot)
{
@@ -1527,7 +1527,7 @@ int ui_slot_get_length(running_machine &machine, device_slot_interface *slot)
}
/*-------------------------------------------------
- ui_slot_get_next - returns
+ ui_slot_get_next - returns
-------------------------------------------------*/
const char *ui_slot_get_next(running_machine &machine, device_slot_interface *slot)
{
@@ -1537,18 +1537,18 @@ const char *ui_slot_get_next(running_machine &machine, device_slot_interface *sl
}
/*-------------------------------------------------
- ui_slot_get_prev - returns
+ ui_slot_get_prev - returns
-------------------------------------------------*/
const char *ui_slot_get_prev(running_machine &machine, device_slot_interface *slot)
{
int idx = ui_slot_get_current_index(machine, slot) - 1;
if (idx==-1) return "";
- if (idx==-2) idx = ui_slot_get_length(machine,slot) -1;
+ if (idx==-2) idx = ui_slot_get_length(machine,slot) -1;
return slot->get_slot_interfaces()[idx].name;
}
/*-------------------------------------------------
- ui_get_slot_device - returns
+ ui_get_slot_device - returns
-------------------------------------------------*/
const char *ui_get_slot_device(running_machine &machine, device_slot_interface *slot)
{
@@ -1562,12 +1562,12 @@ const char *ui_get_slot_device(running_machine &machine, device_slot_interface *
-------------------------------------------------*/
void ui_set_slot_device(running_machine &machine, device_slot_interface *slot, const char *val)
-{
+{
astring error;
machine.options().set_value(slot->device().tag(), val, OPTION_PRIORITY_CMDLINE, error);
assert(!error);
}
-
+
/*-------------------------------------------------
menu_slot_devices_populate - populates the main
slot device menu
@@ -1576,7 +1576,7 @@ void ui_set_slot_device(running_machine &machine, device_slot_interface *slot, c
static void menu_slot_devices_populate(running_machine &machine, ui_menu *menu, void *state)
{
device_slot_interface *slot = NULL;
-
+
/* cycle through all devices for this system */
for (bool gotone = machine.devicelist().first(slot); gotone; gotone = slot->next(slot))
{
@@ -1585,7 +1585,7 @@ static void menu_slot_devices_populate(running_machine &machine, ui_menu *menu,
ui_menu_item_append(menu, slot->device().tag(), strcmp(title,"")==0 ? "------" : title, MENU_FLAG_LEFT_ARROW | MENU_FLAG_RIGHT_ARROW, (void *)slot);
}
ui_menu_item_append(menu, MENU_SEPARATOR_ITEM, NULL, 0, NULL);
- ui_menu_item_append(menu, "Reset", NULL, 0, NULL);
+ ui_menu_item_append(menu, "Reset", NULL, 0, NULL);
}
/*-------------------------------------------------
@@ -1599,7 +1599,7 @@ static void ui_menu_slot_devices(running_machine &machine, ui_menu *menu, void *
/* if the menu isn't built, populate now */
if (!ui_menu_populated(menu))
{
- menu_slot_devices_populate(machine, menu, state);
+ menu_slot_devices_populate(machine, menu, state);
}
/* process the menu */
@@ -1607,11 +1607,11 @@ static void ui_menu_slot_devices(running_machine &machine, ui_menu *menu, void *
if (menu_event != NULL && menu_event->itemref != NULL)
{
- if (menu_event->iptkey == IPT_UI_LEFT || menu_event->iptkey == IPT_UI_RIGHT) {
- device_slot_interface *slot = (device_slot_interface *)menu_event->itemref;
+ if (menu_event->iptkey == IPT_UI_LEFT || menu_event->iptkey == IPT_UI_RIGHT) {
+ device_slot_interface *slot = (device_slot_interface *)menu_event->itemref;
const char *val = (menu_event->iptkey == IPT_UI_LEFT) ? ui_slot_get_prev(machine,slot) : ui_slot_get_next(machine,slot);
- ui_set_slot_device(machine,slot,val);
- ui_menu_reset(menu, UI_MENU_RESET_REMEMBER_REF);
+ ui_set_slot_device(machine,slot,val);
+ ui_menu_reset(menu, UI_MENU_RESET_REMEMBER_REF);
}
} else if (menu_event != NULL && menu_event->iptkey == IPT_UI_SELECT) {
machine.schedule_hard_reset();
@@ -1683,14 +1683,14 @@ static void menu_main_populate(running_machine &machine, ui_menu *menu, void *st
if (machine.devicelist().first(BITBANGER))
ui_menu_item_append(menu, "Bitbanger Control", NULL, 0, (void*)ui_mess_menu_bitbanger_control);
}
-
+
device_slot_interface *slot = NULL;
if (machine.devicelist().first(slot))
{
/* add image info menu */
ui_menu_item_append(menu, "Slot Devices", NULL, 0, (void*)ui_menu_slot_devices);
}
-
+
/* add keyboard mode menu */
if (input_machine_has_keyboard(machine) && inputx_can_post(machine))
ui_menu_item_append(menu, "Keyboard Mode", NULL, 0, (void *)ui_menu_keyboard_mode);
diff --git a/src/emu/video/crt9007.h b/src/emu/video/crt9007.h
index 79abc3db6dc..7bd30549fab 100644
--- a/src/emu/video/crt9007.h
+++ b/src/emu/video/crt9007.h
@@ -72,7 +72,7 @@ struct crt9007_interface
{
const char *m_screen_tag; /* screen we are acting on */
int hpixels_per_column; /* number of pixels per video memory address */
-
+
devcb_write_line m_out_int_cb;
devcb_write_line m_out_dmar_cb;
diff --git a/src/lib/formats/flopimg.c b/src/lib/formats/flopimg.c
index 49f01553289..17f30e192d6 100644
--- a/src/lib/formats/flopimg.c
+++ b/src/lib/formats/flopimg.c
@@ -320,7 +320,7 @@ static void floppy_close_internal(floppy_image *floppy, int close_file)
{
if (floppy) {
floppy_track_unload(floppy);
-
+
if(floppy->floppy_option->destruct)
floppy->floppy_option->destruct(floppy, floppy->floppy_option);
if (close_file)
diff --git a/src/mame/drivers/3do.c b/src/mame/drivers/3do.c
index 57db51ba1ae..f04451d6613 100644
--- a/src/mame/drivers/3do.c
+++ b/src/mame/drivers/3do.c
@@ -228,4 +228,4 @@ ROM_END
CONS( 1991, 3do, 0, 0, 3do, 3do, 0, "3DO", "3DO (NTSC)", GAME_NOT_WORKING | GAME_NO_SOUND )
CONS( 1991, 3do_pal, 3do, 0, 3do_pal, 3do, 0, "3DO", "3DO (PAL)", GAME_NOT_WORKING | GAME_NO_SOUND )
-//TODO: orbatak, Arcade prototype \ No newline at end of file
+//TODO: orbatak, Arcade prototype
diff --git a/src/mame/drivers/aristmk4.c b/src/mame/drivers/aristmk4.c
index e37bb30e6f3..91cb1587f5a 100644
--- a/src/mame/drivers/aristmk4.c
+++ b/src/mame/drivers/aristmk4.c
@@ -2165,8 +2165,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 0c924f2636c..b217a3d32a9 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 )
@@ -405,7 +405,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)
@@ -416,9 +416,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
@@ -436,7 +436,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)
@@ -458,7 +458,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)
@@ -492,7 +492,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)
@@ -691,7 +691,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/badlands.c b/src/mame/drivers/badlands.c
index 793d81dc910..739c7e9d791 100644
--- a/src/mame/drivers/badlands.c
+++ b/src/mame/drivers/badlands.c
@@ -720,7 +720,7 @@ static MACHINE_CONFIG_START( badlandsb, badlands_state )
MCFG_CPU_PROGRAM_MAP(bootleg_map)
MCFG_CPU_VBLANK_INT("screen", vblank_int)
-// MCFG_CPU_ADD("audiocpu", Z80, XTAL_20MHz/12) /* Divisor estimated */
+// MCFG_CPU_ADD("audiocpu", Z80, XTAL_20MHz/12) /* Divisor estimated */
// MCFG_CPU_PROGRAM_MAP(bootleg_soundmap)
MCFG_MACHINE_START(badlands)
diff --git a/src/mame/drivers/bsktball.c b/src/mame/drivers/bsktball.c
index b8b1d71a9fd..f67326c3b17 100644
--- a/src/mame/drivers/bsktball.c
+++ b/src/mame/drivers/bsktball.c
@@ -214,7 +214,7 @@ static MACHINE_START( bsktball )
bsktball_state *state = machine.driver_data<bsktball_state>();
state->save_item(NAME(state->m_nmi_on));
-// state->save_item(NAME(state->m_i256v));
+// state->save_item(NAME(state->m_i256v));
state->save_item(NAME(state->m_ld1));
state->save_item(NAME(state->m_ld2));
state->save_item(NAME(state->m_dir0));
@@ -232,7 +232,7 @@ static MACHINE_RESET( bsktball )
bsktball_state *state = machine.driver_data<bsktball_state>();
state->m_nmi_on = 0;
-// state->m_i256v = 0;
+// state->m_i256v = 0;
state->m_ld1 = 0;
state->m_ld2 = 0;
state->m_dir0 = 0;
diff --git a/src/mame/drivers/cavesh3.c b/src/mame/drivers/cavesh3.c
index 0685776f78b..4cc018c1b86 100644
--- a/src/mame/drivers/cavesh3.c
+++ b/src/mame/drivers/cavesh3.c
@@ -68,9 +68,9 @@ ROM_START( futari15 )
ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF)
ROM_LOAD("u2", 0x000000, 0x8400000, CRC(b9d815f9) SHA1(6b6f668b0bbb087ffac65e4f0d8bd9d5b28eeb28) )
- ROM_REGION( 0x800000, "samples", ROMREGION_ERASEFF)
+ ROM_REGION( 0x800000, "samples", ROMREGION_ERASEFF)
ROM_LOAD("u23", 0x000000, 0x400000, CRC(39f1e1f4) SHA1(53d12f59a56df35c705408c76e6e02118da656f1) )
- ROM_LOAD("u24", 0x400000, 0x400000, CRC(c631a766) SHA1(8bb6934a2f5b8a9841c3dcf85192b1743773dd8b) )
+ ROM_LOAD("u24", 0x400000, 0x400000, CRC(c631a766) SHA1(8bb6934a2f5b8a9841c3dcf85192b1743773dd8b) )
ROM_END
ROM_START( mushisam )
@@ -80,9 +80,9 @@ ROM_START( mushisam )
ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF)
ROM_LOAD("u2", 0x000000, 0x8400000, CRC(2cd13810) SHA1(40e45e201b60e63a060b68d4cc767eb64cfb99c2) )
- ROM_REGION( 0x800000, "samples", ROMREGION_ERASEFF)
+ ROM_REGION( 0x800000, "samples", ROMREGION_ERASEFF)
ROM_LOAD("u23", 0x000000, 0x400000, CRC(138e2050) SHA1(9e86489a4e65af5efb5495adf6d4b3e01d5b2816) )
- ROM_LOAD("u24", 0x400000, 0x400000, CRC(e3d05c9f) SHA1(130c3d62317da1729c85bd178bd51500edd73ada) )
+ ROM_LOAD("u24", 0x400000, 0x400000, CRC(e3d05c9f) SHA1(130c3d62317da1729c85bd178bd51500edd73ada) )
ROM_END
ROM_START( mushitam )
@@ -92,9 +92,9 @@ ROM_START( mushitam )
ROM_REGION( 0x8400000, "game", ROMREGION_ERASEFF)
ROM_LOAD("u2", 0x000000, 0x8400000, CRC(3f93ff82) SHA1(6f6c250aa7134016ffb288d056bc937ea311f538) )
- ROM_REGION( 0x800000, "samples", ROMREGION_ERASEFF)
+ ROM_REGION( 0x800000, "samples", ROMREGION_ERASEFF)
ROM_LOAD("u23", 0x000000, 0x400000, CRC(701a912a) SHA1(85c198946fb693d99928ea2595c84ba4d9dc8157) )
- ROM_LOAD("u24", 0x400000, 0x400000, CRC(6feeb9a1) SHA1(992711c80e660c32f97b343c2ce8184fddd7364e) )
+ ROM_LOAD("u24", 0x400000, 0x400000, CRC(6feeb9a1) SHA1(992711c80e660c32f97b343c2ce8184fddd7364e) )
ROM_END
diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c
index e40265c4a14..0a45464de62 100644
--- a/src/mame/drivers/goldnpkr.c
+++ b/src/mame/drivers/goldnpkr.c
@@ -267,9 +267,9 @@
* Witch Card (Proma)
-
- For the first time: You must coin-up and play at least one hand, then Payout
- to get the proper coinage settings.
+
+ For the first time: You must coin-up and play at least one hand, then Payout
+ to get the proper coinage settings.
*******************************************************************************
diff --git a/src/mame/drivers/konamigv.c b/src/mame/drivers/konamigv.c
index be4d66f2309..44e6f8eab07 100644
--- a/src/mame/drivers/konamigv.c
+++ b/src/mame/drivers/konamigv.c
@@ -76,12 +76,12 @@ GV999 PWB301949A
Notes:
- Simpsons Bowling and Dead Eye use a GV999 with a daughtercard containing flash ROMs and CPLDs:
- PWB402610
- Xilinx XC3020A
- Xilinx 1718DPC
- 74F244N (2 of these)
- LVT245SS (2 of theses)
-
+ PWB402610
+ Xilinx XC3020A
+ Xilinx 1718DPC
+ 74F244N (2 of these)
+ LVT245SS (2 of theses)
+
- 000180 is used for driving the RGB output. It's a very thin piece of very brittle ceramic
containing a circuit, a LM1203 chip, some smt transistors/caps/resistors etc (let's just say
placing this thing on the edge of the PCB wasn't a good design choice!)
@@ -685,7 +685,7 @@ static DRIVER_INIT( tokimosh )
/*
Dead Eye
-
+
CD:
P/N 002715
054
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index 3feb458bb44..b0189a12b5b 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -215,12 +215,12 @@ psoldier dip locations still need veritication.
static MACHINE_START( m92 )
{
m92_state *state = machine.driver_data<m92_state>();
- state->save_item(NAME(state->m_sound_status));
+ state->save_item(NAME(state->m_sound_status));
}
static MACHINE_RESET( m92 )
{
- m92_state *state = machine.driver_data<m92_state>();
+ m92_state *state = machine.driver_data<m92_state>();
state->m_sprite_buffer_busy = 1;
}
@@ -229,7 +229,7 @@ static MACHINE_RESET( m92 )
static TIMER_DEVICE_CALLBACK( m92_scanline_interrupt )
{
- running_machine &machine = timer.machine();
+ running_machine &machine = timer.machine();
m92_state *state = machine.driver_data<m92_state>();
int scanline = param;
diff --git a/src/mame/drivers/midtunit.c b/src/mame/drivers/midtunit.c
index 31e35029d1d..44ef962a410 100644
--- a/src/mame/drivers/midtunit.c
+++ b/src/mame/drivers/midtunit.c
@@ -183,7 +183,7 @@ static INPUT_PORTS_START( mk2 )
PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P2 Block") PORT_PLAYER(2)
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("P2 High Kick") PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
-
+
PORT_START("IN1")
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
@@ -210,7 +210,7 @@ static INPUT_PORTS_START( mk2 )
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("P2 Low Kick") PORT_PLAYER(2)
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("P2 Block 2") PORT_PLAYER(2)
PORT_BIT( 0xff80, IP_ACTIVE_LOW, IPT_UNUSED )
-
+
/*Note-the real MK2 board has a special cable designed for SF2 cab conversions that has the 2 SF2
Medium punch/kick buttons as block buttons for MK2. The secondary block button registers in test mode,
but does not have an indicator light show up. During gameplay, the second block only functions temporarily.
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index 807efb8dc0e..cd79b85c0c9 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -2661,14 +2661,14 @@ static DRIVER_INIT (connect4)
//static DRIVER_INIT (m_frkstn)
//{
-// mpu4_state *state = machine.driver_data<mpu4_state>();
-// state->m_reel_mux=STANDARD_REEL;
-// state->m_reels = 4;
+// mpu4_state *state = machine.driver_data<mpu4_state>();
+// state->m_reel_mux=STANDARD_REEL;
+// state->m_reels = 4;
//
-// // setup 4 default 96 half step reels with the mux board
-// mpu4_config_common_reels(machine,4);
+// // setup 4 default 96 half step reels with the mux board
+// mpu4_config_common_reels(machine,4);
//
-// //This is a Crystal ROM, needs UPD chip and Project Amber's ROM swizzle.
+// //This is a Crystal ROM, needs UPD chip and Project Amber's ROM swizzle.
//}
/* generate a 50 Hz signal (based on an RC time) */
@@ -2780,25 +2780,25 @@ static ADDRESS_MAP_START( mpu4_bwb_map, AS_PROGRAM, 8 )
ADDRESS_MAP_END
//static ADDRESS_MAP_START( mpu4_crystal_map, AS_PROGRAM, 8 )
-// AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
+// AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram")
//
-// AM_RANGE(0x0850, 0x0850) AM_WRITE(bankswitch_w) // write bank (rom page select)
+// AM_RANGE(0x0850, 0x0850) AM_WRITE(bankswitch_w) // write bank (rom page select)
//
-// AM_RANGE(0x0858, 0x0858) AM_WRITE(bankswitch_w) // write bank (rom page select)
-// AM_RANGE(0x0878, 0x0878) AM_WRITE(bankset_w) // write bank (rom page select)
+// AM_RANGE(0x0858, 0x0858) AM_WRITE(bankswitch_w) // write bank (rom page select)
+// AM_RANGE(0x0878, 0x0878) AM_WRITE(bankset_w) // write bank (rom page select)
//
//// AM_RANGE(0x08e0, 0x08e7) AM_READWRITE(68681_duart_r,68681_duart_w) //Runs hoppers
//
-// AM_RANGE(0x0900, 0x0907) AM_DEVREADWRITE_MODERN("ptm_ic2", ptm6840_device, read, write)/* PTM6840 IC2 */
+// AM_RANGE(0x0900, 0x0907) AM_DEVREADWRITE_MODERN("ptm_ic2", ptm6840_device, read, write)/* PTM6840 IC2 */
//
-// AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE_MODERN("pia_ic3", pia6821_device, read, write) /* PIA6821 IC3 */
-// AM_RANGE(0x0b00, 0x0b03) AM_DEVREADWRITE_MODERN("pia_ic4", pia6821_device, read, write) /* PIA6821 IC4 */
-// AM_RANGE(0x0c00, 0x0c03) AM_DEVREADWRITE_MODERN("pia_ic5", pia6821_device, read, write) /* PIA6821 IC5 */
-// AM_RANGE(0x0d00, 0x0d03) AM_DEVREADWRITE_MODERN("pia_ic6", pia6821_device, read, write) /* PIA6821 IC6 */
-// AM_RANGE(0x0e00, 0x0e03) AM_DEVREADWRITE_MODERN("pia_ic7", pia6821_device, read, write) /* PIA6821 IC7 */
-// AM_RANGE(0x0f00, 0x0f03) AM_DEVREADWRITE_MODERN("pia_ic8", pia6821_device, read, write) /* PIA6821 IC8 */
+// AM_RANGE(0x0a00, 0x0a03) AM_DEVREADWRITE_MODERN("pia_ic3", pia6821_device, read, write) /* PIA6821 IC3 */
+// AM_RANGE(0x0b00, 0x0b03) AM_DEVREADWRITE_MODERN("pia_ic4", pia6821_device, read, write) /* PIA6821 IC4 */
+// AM_RANGE(0x0c00, 0x0c03) AM_DEVREADWRITE_MODERN("pia_ic5", pia6821_device, read, write) /* PIA6821 IC5 */
+// AM_RANGE(0x0d00, 0x0d03) AM_DEVREADWRITE_MODERN("pia_ic6", pia6821_device, read, write) /* PIA6821 IC6 */
+// AM_RANGE(0x0e00, 0x0e03) AM_DEVREADWRITE_MODERN("pia_ic7", pia6821_device, read, write) /* PIA6821 IC7 */
+// AM_RANGE(0x0f00, 0x0f03) AM_DEVREADWRITE_MODERN("pia_ic8", pia6821_device, read, write) /* PIA6821 IC8 */
//
-// AM_RANGE(0x1000, 0xffff) AM_ROMBANK("bank1") // 64k paged ROM (4 pages)
+// AM_RANGE(0x1000, 0xffff) AM_ROMBANK("bank1") // 64k paged ROM (4 pages)
//ADDRESS_MAP_END */
@@ -2905,11 +2905,11 @@ static MACHINE_CONFIG_DERIVED( bwboki, mod4oki )
MACHINE_CONFIG_END
//static MACHINE_CONFIG_DERIVED(mpu4crys, mpu4mod2 )
-// MCFG_CPU_MODIFY("maincpu")
-// MCFG_CPU_PROGRAM_MAP(mpu4_crystal_map) // setup read and write memorymap
+// MCFG_CPU_MODIFY("maincpu")
+// MCFG_CPU_PROGRAM_MAP(mpu4_crystal_map) // setup read and write memorymap
//
-// MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
-// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
+// MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK)
+// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
//MACHINE_CONFIG_END
@@ -2987,7 +2987,7 @@ GAME( 198?, m_ccelbr,0, mpu4mod2, mpu4, m_ccelbr, ROT0, "Barcrest",
GAMEL(198?, m_gmball,0, mod4yam, gamball, m_gmball, ROT0, "Barcrest", "Gamball", GAME_REQUIRES_ARTWORK|GAME_MECHANICAL,layout_gamball )//Mechanical ball launcher
GAMEL(198?, m_grtecp,0, mod4oki, mpu4, m_grtecp, ROT0, "Barcrest", "Andy's Great Escape", GAME_NOT_WORKING|GAME_REQUIRES_ARTWORK,layout_mpu4ext )//5 reel meter mux
GAME(199?, m_blsbys,0, bwboki, mpu4, m_blsbys, ROT0, "Barcrest", "Blues Boys (Version 6)", GAME_NOT_WORKING|GAME_REQUIRES_ARTWORK )
-//GAME(199?, m_frkstn,0, mpu4crys, mpu4, m_frkstn, ROT0, "Crystal Gaming","Frank 'n' Stein (unencrypted)", GAME_NOT_WORKING|GAME_REQUIRES_ARTWORK|GAME_NO_SOUND )//hardware not connected
+//GAME(199?, m_frkstn,0, mpu4crys, mpu4, m_frkstn, ROT0, "Crystal Gaming","Frank 'n' Stein (unencrypted)", GAME_NOT_WORKING|GAME_REQUIRES_ARTWORK|GAME_NO_SOUND )//hardware not connected
//SWP
GAMEL(1989?,connect4, 0, mpu4mod2, connect4, connect4, ROT0, "Dolbeck Systems","Connect 4",GAME_IMPERFECT_GRAPHICS|GAME_REQUIRES_ARTWORK,layout_connect4 )
diff --git a/src/mame/drivers/multfish.c b/src/mame/drivers/multfish.c
index 3195dc8381d..6b4e396ba3e 100644
--- a/src/mame/drivers/multfish.c
+++ b/src/mame/drivers/multfish.c
@@ -1129,7 +1129,7 @@ ROM_END
ROM_START( mfish_3 ) // 021124
ROM_REGION( 0x40000, "maincpu", 0 )
ROM_LOAD( "mf021124.rom", 0x00000, 0x40000, CRC(59fd16f5) SHA1(ea132f68e9c09c40369d4cc02c670ee6e26bdcbe) )
-
+
ROM_REGION( 0x400000, "gfx", 0 )
ROM_LOAD( "multi_fish.001", 0x000000, 0x80000, CRC(2f2a7367) SHA1(ce7ee9ca4f374ec61edc3b89d4752f0edb64a910) )
ROM_LOAD( "multi_fish.002", 0x100000, 0x80000, CRC(606acd73) SHA1(ce5f7b1366dbb16d57fe4b7f395f08725e3cf756) )
@@ -1613,7 +1613,7 @@ ROM_END
ROM_START( fcockt_11 ) // 070822
ROM_REGION( 0x40000, "maincpu", 0 ) // z80 code, banked
ROM_LOAD( "fc_070822.rom", 0x00000, 0x40000, CRC(f156657d) SHA1(bd538e714a87461bdf84df18ae3f8caeee876747) )
-
+
ROM_REGION( 0x400000, "gfx", 0 )
ROM_LOAD( "fruitcocktail.001", 0x000000, 0x80000, CRC(735FBE79) SHA1(6ab590e00043dcb6648fd942e11747486d497df1) ) /* Only this set is listed as official hashes */
ROM_LOAD( "fruitcocktail.002", 0x100000, 0x80000, CRC(28fc888e) SHA1(2b8c55675bf61203682d560c9b3f29568719113f) )
@@ -1769,10 +1769,10 @@ ROM_START( lhaunt_8 ) // 070604
ROM_LOAD( "luckyhaunter_m.008", 0x380000, 0x80000, CRC(1bdf6252) SHA1(7b5ae82a95a744b236e109024d47b526dccf9c14) )
ROM_END
-
+
/*********************************************************
Garage
-
+
"Russia" sets use different gfx roms 1-4.
The official list of hashes shows only updated roms.
@@ -2199,7 +2199,7 @@ ROM_START( island_2 ) // 070409
ROM_LOAD( "island.008", 0x380000, 0x80000, CRC(ac6fba48) SHA1(64dd03d624f16da52bc7fa0702246e91ae39a806) )
ROM_END
-
+
/*********************************************************
Island 2
**********************************************************/
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index d44856619ff..f1d121b0feb 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -358,7 +358,7 @@ static MACHINE_CONFIG_START( overdriv, overdriv_state )
/* IRQ 5 is used only in test mode, to request the checksums of the gfx ROMs. */
MCFG_CPU_ADD("audiocpu", M6809,3579545) /* 1.789 MHz?? This might be the right speed, but ROM testing */
- MCFG_CPU_PROGRAM_MAP(overdriv_sound_map) /* takes a little too much (the counter wraps from 0000 to 9999). */
+ MCFG_CPU_PROGRAM_MAP(overdriv_sound_map) /* takes a little too much (the counter wraps from 0000 to 9999). */
/* This might just mean that the video refresh rate is less than */
/* 60 fps, that's how I fixed it for now. */
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index 2719bd7de2f..6dda802660d 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -1586,8 +1586,8 @@ static ADDRESS_MAP_START( tndrcade_map, AS_PROGRAM, 16 )
AM_RANGE(0x300000, 0x300001) AM_WRITENOP // ? 0 / 1
AM_RANGE(0x380000, 0x3803ff) AM_RAM AM_BASE_SIZE_MEMBER(seta_state, m_paletteram, m_paletteram_size) // Palette
/**/AM_RANGE(0x400000, 0x400001) AM_WRITENOP // ? $4000
-/**/AM_RANGE(0x600000, 0x6005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0x600600, 0x600607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0x600000, 0x6005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0x600600, 0x600607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0x800000, 0x800007) AM_WRITE(sub_ctrl_w) // Sub CPU Control?
AM_RANGE(0xa00000, 0xa00fff) AM_READWRITE(sharedram_68000_r,sharedram_68000_w) // Shared RAM
@@ -1616,8 +1616,8 @@ static ADDRESS_MAP_START( downtown_map, AS_PROGRAM, 16 )
AM_RANGE(0xa00000, 0xa00007) AM_WRITE(sub_ctrl_w) // Sub CPU Control?
AM_RANGE(0xb00000, 0xb00fff) AM_READWRITE(sharedram_68000_r,sharedram_68000_w) // Shared RAM
AM_RANGE(0xc00000, 0xc00001) AM_WRITENOP // ? $4000
- AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xf00000, 0xffffff) AM_RAM // RAM
ADDRESS_MAP_END
@@ -1676,8 +1676,8 @@ static ADDRESS_MAP_START( calibr50_map, AS_PROGRAM, 16 )
AM_RANGE(0x904000, 0x904fff) AM_RAM //
AM_RANGE(0xa00000, 0xa00019) AM_READ(calibr50_ip_r) // Input Ports
-/**/AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xb00000, 0xb00001) AM_READWRITE(soundlatch2_word_r,calibr50_soundlatch_w) // From Sub CPU
/**/AM_RANGE(0xc00000, 0xc00001) AM_RAM // ? $4000
@@ -1749,7 +1749,7 @@ static ADDRESS_MAP_START( usclssic_map, AS_PROGRAM, 16 )
AM_RANGE(0x000000, 0x07ffff) AM_ROM // ROM
AM_RANGE(0xff0000, 0xffffff) AM_RAM // RAM
AM_RANGE(0x800000, 0x8005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0x800600, 0x800607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0x800600, 0x800607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
/**/AM_RANGE(0x900000, 0x900001) AM_RAM // ? $4000
AM_RANGE(0xa00000, 0xa00005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_0) // VRAM Ctrl
/**/AM_RANGE(0xb00000, 0xb003ff) AM_RAM AM_BASE_SIZE_MEMBER(seta_state, m_paletteram, m_paletteram_size) // Palette
@@ -1782,8 +1782,8 @@ static ADDRESS_MAP_START( atehate_map, AS_PROGRAM, 16 )
AM_RANGE(0x500000, 0x500001) AM_WRITENOP // ? (end of lev 1: bit 4 goes 1,0,1)
AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r) // DSW
AM_RANGE(0x700000, 0x7003ff) AM_RAM AM_BASE_SIZE_MEMBER(seta_state, m_paletteram, m_paletteram_size) // Palette
- AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xb00000, 0xb00001) AM_READ_PORT("P1") // P1
AM_RANGE(0xb00002, 0xb00003) AM_READ_PORT("P2") // P2
AM_RANGE(0xb00004, 0xb00005) AM_READ_PORT("COINS") // Coins
@@ -1809,8 +1809,8 @@ static ADDRESS_MAP_START( blandia_map, AS_PROGRAM, 16 )
AM_RANGE(0x700000, 0x7003ff) AM_RAM // (rezon,jjsquawk)
AM_RANGE(0x700400, 0x700fff) AM_RAM AM_BASE_SIZE_MEMBER(seta_state, m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0x703c00, 0x7047ff) AM_RAM AM_BASE_SIZE_MEMBER(seta_state, m_paletteram2, m_paletteram2_size) // 2nd Palette for the palette offset effect
-/**/AM_RANGE(0x800000, 0x8005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0x800600, 0x800607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0x800000, 0x8005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0x800600, 0x800607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0x880000, 0x880001) AM_RAM // ? 0xc000
AM_RANGE(0x900000, 0x903fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
/**/AM_RANGE(0xa00000, 0xa00005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_0) // VRAM 0&1 Ctrl
@@ -1850,8 +1850,8 @@ static ADDRESS_MAP_START( blandiap_map, AS_PROGRAM, 16 )
AM_RANGE(0x884000, 0x88ffff) AM_RAM // (jjsquawk)
/**/AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_0) // VRAM 0&1 Ctrl
/**/AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_2) // VRAM 2&3 Ctrl
-/**/AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
/**/AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000
AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
@@ -1933,8 +1933,8 @@ static ADDRESS_MAP_START( wrofaero_map, AS_PROGRAM, 16 )
AM_RANGE(0x884000, 0x88ffff) AM_RAM // (jjsquawk)
/**/AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_0) // VRAM 0&1 Ctrl
/**/AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_2) // VRAM 2&3 Ctrl
-/**/AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
/**/AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000
AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
@@ -1976,8 +1976,8 @@ static ADDRESS_MAP_START( zingzipbl_map, AS_PROGRAM, 16 )
AM_RANGE(0x902010, 0x902013) AM_READ( zingzipbl_unknown_r )
/**/AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_2) // VRAM 2&3 Ctrl
-/**/AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
/**/AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000
AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xc00000, 0xc03fff) AM_RAM // soundram on original
@@ -2009,8 +2009,8 @@ static ADDRESS_MAP_START( jjsquawb_map, AS_PROGRAM, 16 )
AM_RANGE(0x884000, 0x88ffff) AM_RAM // (jjsquawk)
AM_RANGE(0x908000, 0x908005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_0) // VRAM 0&1 Ctrl
AM_RANGE(0x909000, 0x909005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_2) // VRAM 2&3 Ctrl
- AM_RANGE(0xa0a000, 0xa0a5ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // RZ: Sprites Y
- AM_RANGE(0xa0a600, 0xa0a607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0xa0a000, 0xa0a5ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // RZ: Sprites Y
+ AM_RANGE(0xa0a600, 0xa0a607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
// AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000
AM_RANGE(0xb0c000, 0xb0ffff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // RZ: Sprites Code + X + Attr
AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
@@ -2044,8 +2044,8 @@ static ADDRESS_MAP_START( orbs_map, AS_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb003ff) AM_RAM AM_BASE_SIZE_MEMBER(seta_state, m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
/**/AM_RANGE(0xd00000, 0xd00001) AM_RAM // ? 0x4000
-/**/AM_RANGE(0xe00000, 0xe005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xe00600, 0xe00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0xe00000, 0xe005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xe00600, 0xe00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
ADDRESS_MAP_END
/***************************************************************************
@@ -2130,8 +2130,8 @@ static ADDRESS_MAP_START( keroppi_map, AS_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb003ff) AM_RAM AM_BASE_SIZE_MEMBER(seta_state, m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
/**/AM_RANGE(0xd00000, 0xd00001) AM_RAM // ? 0x4000
-/**/AM_RANGE(0xe00000, 0xe005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xe00600, 0xe00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0xe00000, 0xe005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xe00600, 0xe00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
ADDRESS_MAP_END
static MACHINE_START( keroppi )
@@ -2162,8 +2162,8 @@ static ADDRESS_MAP_START( blockcar_map, AS_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb003ff) AM_RAM AM_BASE_SIZE_MEMBER(seta_state, m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
/**/AM_RANGE(0xd00000, 0xd00001) AM_RAM // ? 0x4000
-/**/AM_RANGE(0xe00000, 0xe005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xe00600, 0xe00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0xe00000, 0xe005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xe00600, 0xe00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
ADDRESS_MAP_END
@@ -2189,8 +2189,8 @@ static ADDRESS_MAP_START( daioh_map, AS_PROGRAM, 16 )
AM_RANGE(0x884000, 0x88ffff) AM_RAM //
AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_0) // VRAM 0&1 Ctrl
AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_2) // VRAM 2&3 Ctrl
- AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000
AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
@@ -2222,8 +2222,8 @@ static ADDRESS_MAP_START( drgnunit_map, AS_PROGRAM, 16 )
AM_RANGE(0xb00004, 0xb00005) AM_READ_PORT("COINS") // Coins
AM_RANGE(0xb00006, 0xb00007) AM_READNOP // unused (qzkklogy)
/**/AM_RANGE(0xc00000, 0xc00001) AM_RAM // ? $4000
-/**/AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
ADDRESS_MAP_END
@@ -2321,8 +2321,8 @@ static ADDRESS_MAP_START( extdwnhl_map, AS_PROGRAM, 16 )
AM_RANGE(0x884000, 0x88ffff) AM_RAM //
/**/AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_0) // VRAM 0&1 Ctrl
/**/AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_2) // VRAM 2&3 Ctrl
-/**/AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
/**/AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000
AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xb04000, 0xb13fff) AM_RAM //
@@ -2353,8 +2353,8 @@ static ADDRESS_MAP_START( kamenrid_map, AS_PROGRAM, 16 )
AM_RANGE(0x884000, 0x887fff) AM_RAM // tested
AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_0) // VRAM 0&1 Ctrl
AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_2) // VRAM 2&3 Ctrl
- AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? $4000
AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xb04000, 0xb07fff) AM_RAM // tested
@@ -2383,8 +2383,8 @@ static ADDRESS_MAP_START( madshark_map, AS_PROGRAM, 16 )
AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_0) // VRAM 0&1 Ctrl
AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_2) // VRAM 2&3 Ctrl
- AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? $4000
AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
#if __uPD71054_TIMER
@@ -2441,8 +2441,8 @@ static ADDRESS_MAP_START( krzybowl_map, AS_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb003ff) AM_RAM AM_BASE_SIZE_MEMBER(seta_state, m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
/**/AM_RANGE(0xd00000, 0xd00001) AM_RAM // ? 0x4000
-/**/AM_RANGE(0xe00000, 0xe005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xe00600, 0xe00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0xe00000, 0xe005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xe00600, 0xe00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
ADDRESS_MAP_END
@@ -2475,8 +2475,8 @@ static ADDRESS_MAP_START( msgundam_map, AS_PROGRAM, 16 )
AM_RANGE(0x500000, 0x500005) AM_RAM_WRITE(msgundam_vregs_w) AM_BASE_MEMBER(seta_state, m_vregs) // Coin Lockout + Video Registers
AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r) // DSW
AM_RANGE(0x700400, 0x700fff) AM_RAM AM_BASE_SIZE_MEMBER(seta_state, m_paletteram, m_paletteram_size) // Palette
- AM_RANGE(0x800000, 0x8005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0x800600, 0x800607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0x800000, 0x8005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0x800600, 0x800607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0x880000, 0x880001) AM_RAM // ? 0x4000
AM_RANGE(0x900000, 0x903fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xa00000, 0xa03fff) AM_RAM_WRITE(seta_vram_0_w) AM_BASE_MEMBER(seta_state, m_vram_0) // VRAM 0&1
@@ -2512,8 +2512,8 @@ static ADDRESS_MAP_START( oisipuzl_map, AS_PROGRAM, 16 )
AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE_MEMBER(seta_state, m_vram_2) // VRAM 2&3
/**/AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_0) // VRAM 0&1 Ctrl
/**/AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_2) // VRAM 2&3 Ctrl
-/**/AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
/**/AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000
AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xc00400, 0xc00fff) AM_RAM AM_BASE_SIZE_MEMBER(seta_state, m_paletteram, m_paletteram_size) // Palette
@@ -2541,8 +2541,8 @@ static ADDRESS_MAP_START( triplfun_map, AS_PROGRAM, 16 )
AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE_MEMBER(seta_state, m_vram_2) // VRAM 2&3
/**/AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_0) // VRAM 0&1 Ctrl
/**/AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_2) // VRAM 2&3 Ctrl
-/**/AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
/**/AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000
AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xc00400, 0xc00fff) AM_RAM AM_BASE_SIZE_MEMBER(seta_state, m_paletteram, m_paletteram_size) // Palette
@@ -2597,8 +2597,8 @@ static ADDRESS_MAP_START( kiwame_map, AS_PROGRAM, 16 )
AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE(kiwame_nvram_r, kiwame_nvram_w) AM_BASE_MEMBER(seta_state, m_kiwame_nvram) // NVRAM + Regs ?
AM_RANGE(0x800000, 0x803fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
/**/AM_RANGE(0x900000, 0x900001) AM_RAM // ? 0x4000
-/**/AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xb00000, 0xb003ff) AM_RAM AM_BASE_SIZE_MEMBER(seta_state, m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
AM_RANGE(0xd00000, 0xd00009) AM_READ(kiwame_input_r) // mahjong panel
@@ -2639,8 +2639,8 @@ static ADDRESS_MAP_START( thunderl_map, AS_PROGRAM, 16 )
AM_RANGE(0xb00008, 0xb00009) AM_READ_PORT("P3") // P3 (wits)
AM_RANGE(0xb0000a, 0xb0000b) AM_READ_PORT("P4") // P4 (wits)
/**/AM_RANGE(0xc00000, 0xc00001) AM_RAM // ? 0x4000
-/**/AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xe04000, 0xe07fff) AM_RAM // (wits)
ADDRESS_MAP_END
@@ -2663,8 +2663,8 @@ static ADDRESS_MAP_START( thunderlbl_map, AS_PROGRAM, 16 )
AM_RANGE(0xb00008, 0xb00009) AM_READ_PORT("P3") // P3 (wits)
AM_RANGE(0xb0000a, 0xb0000b) AM_READ_PORT("P4") // P4 (wits)
/**/AM_RANGE(0xc00000, 0xc00001) AM_RAM // ? 0x4000
-/**/AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xe04000, 0xe07fff) AM_RAM // (wits)
ADDRESS_MAP_END
@@ -2705,8 +2705,8 @@ static ADDRESS_MAP_START( wiggie_map, AS_PROGRAM, 16 )
AM_RANGE(0xb00008, 0xb00009) AM_READ_PORT("P3") // P3 (wits)
AM_RANGE(0xb0000a, 0xb0000b) AM_READ_PORT("P4") // P4 (wits)
/**/AM_RANGE(0xc00000, 0xc00001) AM_RAM // ? 0x4000
-/**/AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+/**/AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xe04000, 0xe07fff) AM_RAM // (wits)
ADDRESS_MAP_END
@@ -2735,8 +2735,8 @@ static ADDRESS_MAP_START( umanclub_map, AS_PROGRAM, 16 )
AM_RANGE(0x400004, 0x400005) AM_WRITENOP // ? (end of lev 2)
AM_RANGE(0x500000, 0x500001) AM_RAM_WRITE(seta_vregs_w) AM_BASE_MEMBER(seta_state, m_vregs) // Coin Lockout + Video Registers
AM_RANGE(0x600000, 0x600003) AM_READ(seta_dsw_r) // DSW
- AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
/**/AM_RANGE(0xa80000, 0xa80001) AM_RAM // ? 0x4000
AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xc00000, 0xc03fff) AM_DEVREADWRITE("x1snd", seta_sound_word_r,seta_sound_word_w) // Sound
@@ -2769,8 +2769,8 @@ static ADDRESS_MAP_START( utoukond_map, AS_PROGRAM, 16 )
AM_RANGE(0x880000, 0x883fff) AM_RAM_WRITE(seta_vram_2_w) AM_BASE_MEMBER(seta_state, m_vram_2) // VRAM 2&3
AM_RANGE(0x900000, 0x900005) AM_WRITEONLY AM_BASE_MEMBER(seta_state, m_vctrl_0)// VRAM 0&1 Ctrl
AM_RANGE(0x980000, 0x980005) AM_WRITEONLY AM_BASE_MEMBER(seta_state, m_vctrl_2)// VRAM 2&3 Ctrl
- AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xc00000, 0xc00001) AM_WRITE(utoukond_soundlatch_w) // To Sound CPU (cause an IRQ)
AM_RANGE(0xe00000, 0xe00001) AM_WRITENOP // ? ack
@@ -2813,8 +2813,8 @@ static ADDRESS_MAP_START( pairlove_map, AS_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb00fff) AM_RAM AM_BASE_SIZE_MEMBER(seta_state, m_paletteram, m_paletteram_size) // Palette
AM_RANGE(0xc00000, 0xc03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xd00000, 0xd00001) AM_RAM // ? 0x4000
- AM_RANGE(0xe00000, 0xe005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xe00600, 0xe00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0xe00000, 0xe005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xe00600, 0xe00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xf00000, 0xf0ffff) AM_RAM // RAM
ADDRESS_MAP_END
@@ -2840,8 +2840,8 @@ static ADDRESS_MAP_START( crazyfgt_map, AS_PROGRAM, 16 )
AM_RANGE(0x880000, 0x883fff) AM_WRITE(seta_vram_0_w) AM_BASE_MEMBER(seta_state, m_vram_0) // VRAM 0
AM_RANGE(0x900000, 0x900005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_2) // VRAM 2&3 Ctrl
AM_RANGE(0x980000, 0x980005) AM_RAM AM_BASE_MEMBER(seta_state, m_vctrl_0) // VRAM 0&1 Ctrl
- AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0xa00000, 0xa005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xa00600, 0xa00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xa80000, 0xa80001) AM_WRITENOP // ? 0x4000
AM_RANGE(0xb00000, 0xb03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
ADDRESS_MAP_END
@@ -2910,8 +2910,8 @@ static ADDRESS_MAP_START( inttoote_map, AS_PROGRAM, 16 )
AM_RANGE(0xc00000, 0xc00001) AM_RAM // ? 0x4000
- AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
@@ -2977,8 +2977,8 @@ static ADDRESS_MAP_START( jockeyc_map, AS_PROGRAM, 16 )
AM_RANGE(0xc00000, 0xc00001) AM_RAM // ? 0x4000
- AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
@@ -3754,7 +3754,7 @@ static INPUT_PORTS_START( setaroul )
PORT_DIPNAME( 0x0001, 0x0001, "0" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_BIT( 0x000e, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // rtc?
+ PORT_BIT( 0x000e, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // rtc?
PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x0010, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
@@ -3891,7 +3891,7 @@ static INPUT_PORTS_START( setaroul )
PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
-
+
PORT_START("UNK3")
PORT_DIPNAME( 0x0001, 0x0001, "3" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
@@ -3941,7 +3941,7 @@ static INPUT_PORTS_START( setaroul )
PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
-
+
PORT_START("UNK4")
PORT_DIPNAME( 0x0001, 0x0001, "4" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
@@ -3988,7 +3988,7 @@ static INPUT_PORTS_START( setaroul )
PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) )
PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
-
+
PORT_START("UNK5")
PORT_DIPNAME( 0x0001, 0x0001, "5" )
PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c
index f14c346f477..7bde1f23e85 100644
--- a/src/mame/drivers/sfbonus.c
+++ b/src/mame/drivers/sfbonus.c
@@ -5375,7 +5375,7 @@ ROM_START( atworldd1 )
ROM_END
/* Fruit Bonus 3G */
-/*
+/*
Version 1.0.1 roms need dumping. Board was reflashed (updated) to v1.0.3
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index f43e752ea5e..fc32321640e 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -396,7 +396,7 @@ static ADDRESS_MAP_START( srmp2_map, AS_PROGRAM, 16 )
AM_RANGE(0x0c0000, 0x0c3fff) AM_RAM AM_SHARE("nvram")
AM_RANGE(0x140000, 0x143fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) /* Sprites Code + X + Attr */
AM_RANGE(0x180000, 0x1805ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) /* Sprites Y */
- AM_RANGE(0x180600, 0x180607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0x180600, 0x180607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0x1c0000, 0x1c0001) AM_WRITENOP /* ??? */
AM_RANGE(0x800000, 0x800001) AM_WRITE(srmp2_flags_w) /* ADPCM bank, Color bank, etc. */
AM_RANGE(0x900000, 0x900001) AM_READ_PORT("SYSTEM") /* Coinage */
@@ -444,7 +444,7 @@ static ADDRESS_MAP_START( mjyuugi_map, AS_PROGRAM, 16 )
AM_RANGE(0xb00000, 0xb00003) AM_DEVWRITE8("aysnd", ay8910_address_data_w, 0x00ff)
AM_RANGE(0xc00000, 0xc00001) AM_WRITENOP /* ??? */
AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) /* Sprites Y */
- AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xd02000, 0xd023ff) AM_RAM /* ??? only writes $00fa */
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) /* Sprites Code + X + Attr */
@@ -477,7 +477,7 @@ static ADDRESS_MAP_START( srmp3_map, AS_PROGRAM, 8 )
AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_SHARE("nvram") /* work ram */
AM_RANGE(0xa800, 0xa800) AM_WRITENOP /* flag ? */
AM_RANGE(0xb000, 0xb2ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r8, spriteylow_w8)
- AM_RANGE(0xb300, 0xb303) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r8, spritectrl_w8)
+ AM_RANGE(0xb300, 0xb303) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r8, spritectrl_w8)
AM_RANGE(0xb800, 0xb800) AM_WRITENOP /* flag ? */
AM_RANGE(0xc000, 0xdfff) AM_RAM AM_DEVREADWRITE("spritegen", spritecodelow_r8, spritecodelow_w8) /* Sprites Code + X + Attr */
AM_RANGE(0xe000, 0xffff) AM_RAM AM_DEVREADWRITE("spritegen", spritecodehigh_r8, spritecodehigh_w8)
@@ -501,7 +501,7 @@ static ADDRESS_MAP_START( rmgoldyh_map, AS_PROGRAM, 8 )
AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank1") /* rom bank */
AM_RANGE(0xa000, 0xafff) AM_RAM AM_SHARE("nvram") /* work ram */
AM_RANGE(0xb000, 0xb2ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r8, spriteylow_w8)
- AM_RANGE(0xb300, 0xb303) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r8, spritectrl_w8)
+ AM_RANGE(0xb300, 0xb303) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r8, spritectrl_w8)
AM_RANGE(0xb800, 0xb800) AM_WRITENOP /* flag ? */
AM_RANGE(0xc000, 0xdfff) AM_RAM AM_DEVREADWRITE("spritegen", spritecodelow_r8, spritecodelow_w8) /* Sprites Code + X + Attr */
AM_RANGE(0xe000, 0xffff) AM_RAM AM_DEVREADWRITE("spritegen", spritecodehigh_r8, spritecodehigh_w8)
diff --git a/src/mame/drivers/superwng.c b/src/mame/drivers/superwng.c
index 8fb616cc0e1..3fb52df9898 100644
--- a/src/mame/drivers/superwng.c
+++ b/src/mame/drivers/superwng.c
@@ -1,14 +1,14 @@
/****************************************************************************************
Super Wing - (c) 1985 Wing (UPL?)
-
+
driver by Tomasz Slanina
-
+
Hardware a bit (interrupts, sound) similar to mouser
-
+
TODO:
-
+
- unused rom 6.8s (located on the pcb near the gfx rom 7.8p, but contains
- data (similar to the one in roms 4.5p and 5.5r).
+ data (similar to the one in roms 4.5p and 5.5r).
There are two possibilities: its bad dump of gfx rom (two extra bit layers
of current gfx) or it's banked at 0x4000 - 0x7fff area.
- missing color prom dump (missing on pcb)
@@ -17,9 +17,9 @@ TODO:
- tile and sprite flipping (both h and v controlled by the same bit?)
- sprite coords and tile num (is the >>2 correct ?) (name entry, flipped screen)
- measure clocks
-
+
To enter initials - use tilt. It's probably separate button (?), not a tilt sensor.
-
+
*****************************************************************************************/
#include "emu.h"
@@ -46,7 +46,7 @@ public:
device_t * m_maincpu;
device_t * m_audiocpu;
-
+
tilemap_t * m_bg_tilemap;
tilemap_t * m_fg_tilemap;
@@ -60,11 +60,11 @@ static TILE_GET_INFO( get_bg_tile_info )
code= (code&0x7f) | ((attr&0x40)<<1) | ((code&0x80)<<1);
code|=state->m_tile_bank?0x200:0;
-
+
int flipx=(attr&0x80) ? TILE_FLIPX : 0;
int flipy=(attr&0x80) ? TILE_FLIPY : 0;
- SET_TILE_INFO( 0, code, attr & 0xf, flipx|flipy);
+ SET_TILE_INFO( 0, code, attr & 0xf, flipx|flipy);
}
static TILE_GET_INFO( get_fg_tile_info )
@@ -74,9 +74,9 @@ static TILE_GET_INFO( get_fg_tile_info )
int attr = state->m_colorram_fg[tile_index];
code= (code&0x7f) | ((attr&0x40)<<1) | ((code&0x80)<<1);
-
+
code|=state->m_tile_bank?0x200:0;
-
+
int flipx=(attr&0x80) ? TILE_FLIPX : 0;
int flipy=(attr&0x80) ? TILE_FLIPY : 0;
@@ -98,7 +98,7 @@ static VIDEO_START( superwng )
superwng_state *state = machine.driver_data<superwng_state>();
state->m_bg_tilemap = tilemap_create(machine, get_bg_tile_info, tilemap_scan_rows, 8, 8, 32, 32);
state->m_fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows, 8, 8, 32, 32);
-
+
tilemap_set_scrollx(state->m_bg_tilemap, 0, 64);
}
@@ -106,10 +106,10 @@ static SCREEN_UPDATE( superwng )
{
superwng_state *state = screen->machine().driver_data<superwng_state>();
int flip=flip_screen_get(screen->machine());
-
+
tilemap_draw(bitmap, cliprect, state->m_bg_tilemap, 0, 0);
rectangle tmp=*cliprect;
-
+
if(flip)
{
tmp.min_x+=32;
@@ -120,17 +120,17 @@ static SCREEN_UPDATE( superwng )
tmp.max_x-=32;
tilemap_draw(bitmap, &tmp, state->m_fg_tilemap, 0, 0);
}
-
+
{
//sprites
-
+
for(int i=0x3e; i>=0; i-=2)
{
int code=(state->m_videoram_bg[i]>>2)+0x40;
int sx=256-state->m_videoram_bg[i+1]-8;
int sy = state->m_colorram_bg[i]+8;
int attr = state->m_colorram_bg[i+1];
-
+
if (flip)
{
sy-=8;
@@ -169,7 +169,7 @@ PALETTE_INIT( superwng )
for (i = 0; i < machine.total_colors(); i++)
{
int bit0, bit1, bit2, r, g, b;
-
+
bit0 = BIT(*ptr, 0);
bit1 = BIT(*ptr, 1);
bit2 = BIT(*ptr, 2);
@@ -286,7 +286,7 @@ static WRITE8_HANDLER(superwng_cointcnt2_w)
static ADDRESS_MAP_START( superwng_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x6fff) AM_ROM
- AM_RANGE(0x7000, 0x7fff) AM_RAM
+ AM_RANGE(0x7000, 0x7fff) AM_RAM
AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(superwng_bg_vram_w) AM_BASE_MEMBER(superwng_state, m_videoram_bg)
AM_RANGE(0x8400, 0x87ff) AM_RAM_WRITE(superwng_fg_vram_w) AM_BASE_MEMBER(superwng_state, m_videoram_fg)
AM_RANGE(0x8800, 0x8bff) AM_RAM_WRITE(superwng_bg_cram_w) AM_BASE_MEMBER(superwng_state, m_colorram_bg)
@@ -310,7 +310,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( superwng_sound_map, AS_PROGRAM, 8 )
AM_RANGE(0x0000, 0x1fff) AM_ROM
- AM_RANGE(0x2000, 0x23ff) AM_RAM
+ AM_RANGE(0x2000, 0x23ff) AM_RAM
AM_RANGE(0x3000, 0x3000) AM_WRITE(superwng_sound_nmi_clear_w)
AM_RANGE(0x4000, 0x4000) AM_DEVREADWRITE("ay1", ay8910_r, ay8910_data_w)
AM_RANGE(0x5000, 0x5000) AM_DEVWRITE("ay1", ay8910_address_w)
@@ -328,7 +328,7 @@ static INPUT_PORTS_START( superwng )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 )
-
+
PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME( "Launch Ball" ) PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME( "Right Flipper" ) PORT_COCKTAIL
@@ -374,7 +374,7 @@ static INPUT_PORTS_START( superwng )
PORT_DIPSETTING( 0x08, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x04, DEF_STR( 1C_1C ))
PORT_DIPSETTING( 0x00, DEF_STR( 1C_2C ) )
- PORT_DIPNAME( 0x30, 0x00, DEF_STR( Unknown ) ) //causes writes to 0xa000 every frame
+ PORT_DIPNAME( 0x30, 0x00, DEF_STR( Unknown ) ) //causes writes to 0xa000 every frame
PORT_DIPSETTING( 0x00, "0" )
PORT_DIPSETTING( 0x10, "1" )
PORT_DIPSETTING( 0x20, "2" )
@@ -391,7 +391,7 @@ static const gfx_layout charlayout =
{
8,8,
RGN_FRAC(1,1),
- 2,
+ 2,
{ 0,4 },
{8*8+0,8*8+1,8*8+2,8*8+3,0,1,2,3},
{8*0, 8*1, 8*2, 8*3, 8*4, 8*5, 8*6, 8*7},
@@ -402,14 +402,14 @@ static const gfx_layout spritelayout =
{
16,16,
RGN_FRAC(1,1),
- 2,
+ 2,
{ 0,4 },
{8*8+0,8*8+1,8*8+2,8*8+3,0,1,2,3,
-
+
16*8+8*8+0,16*8+8*8+1,16*8+8*8+2,16*8+8*8+3,16*8+0,16*8+1,16*8+2,16*8+3},
{8*0, 8*1, 8*2, 8*3, 8*4, 8*5, 8*6, 8*7,
16*8*2+8*0, 16*8*2+8*1, 16*8*2+8*2, 16*8*2+8*3, 16*8*2+8*4, 16*8*2+8*5, 16*8*2+8*6, 16*8*2+8*7,
-
+
},
16*8*4
};
@@ -513,7 +513,7 @@ ROM_START( superwng )
ROM_REGION( 0x4000, "gfx1", 0 )
ROM_LOAD( "7.8p", 0x0000, 0x4000, CRC(b472603c) SHA1(96f477a47a5be3db1292fea4f5c91ab155013f74) )
- ROM_REGION( 0x0040, "proms", 0 )
+ ROM_REGION( 0x0040, "proms", 0 )
ROM_LOAD( "bprom.bin", 0x0000, 0x0040, NO_DUMP)
ROM_END
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index 14fd3177c0c..e10088a598c 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -2659,7 +2659,7 @@ ROM_START( puzznic )
ROM_REGION( 0x20000, "gfx1", 0 )
ROM_LOAD( "c20-07.ic10", 0x00000, 0x10000, CRC(be12749a) SHA1(c67d1a434486843a6776d89e905362b7db595d8d) )
ROM_LOAD( "c20-06.ic9", 0x10000, 0x10000, CRC(ac85a9c5) SHA1(2d72dae86a191ccdac9648980aca832fb9886544) )
-
+
ROM_REGION( 0x0800, "pals", 0 )
ROM_LOAD( "mmipal20l8.ic3", 0x0000, 0x0800, NO_DUMP )
ROM_END
@@ -2675,7 +2675,7 @@ ROM_START( puzznicj )
ROM_REGION( 0x40000, "gfx1", 0 )
ROM_LOAD( "u10.ic10", 0x00000, 0x20000, CRC(4264056c) SHA1(d2d8a170ae0f361093a5384935238605a59e5938) )
ROM_LOAD( "u09.ic9", 0x20000, 0x20000, CRC(3c115f8b) SHA1(8d518be01b7c4d6d993d5d9b62aab719a5c8baca) )
-
+
ROM_REGION( 0x0800, "pals", 0 )
ROM_LOAD( "mmipal20l8.ic3", 0x0000, 0x0800, NO_DUMP )
ROM_END
diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c
index 7627b3d3786..7233d7e210c 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -433,8 +433,8 @@ static ADDRESS_MAP_START( superman_map, AS_PROGRAM, 16 )
AM_RANGE(0x900802, 0x900803) AM_READWRITE(cchip1_ctrl_r, cchip1_ctrl_w)
AM_RANGE(0x900c00, 0x900c01) AM_WRITE(cchip1_bank_w)
AM_RANGE(0xb00000, 0xb00fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram)
- AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xf00000, 0xf03fff) AM_RAM /* Main RAM */
ADDRESS_MAP_END
@@ -448,8 +448,8 @@ static ADDRESS_MAP_START( daisenpu_map, AS_PROGRAM, 16 )
AM_RANGE(0x800002, 0x800003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
AM_RANGE(0x900000, 0x90000f) AM_READWRITE(daisenpu_input_r, daisenpu_input_w)
AM_RANGE(0xb00000, 0xb00fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram)
- AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xf00000, 0xf03fff) AM_RAM /* Main RAM */
ADDRESS_MAP_END
@@ -463,8 +463,8 @@ static ADDRESS_MAP_START( gigandes_map, AS_PROGRAM, 16 )
AM_RANGE(0x800002, 0x800003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
AM_RANGE(0x900000, 0x90000f) AM_READWRITE(daisenpu_input_r, daisenpu_input_w)
AM_RANGE(0xb00000, 0xb00fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram)
- AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xf00000, 0xf03fff) AM_RAM /* Main RAM */
ADDRESS_MAP_END
@@ -478,8 +478,8 @@ static ADDRESS_MAP_START( ballbros_map, AS_PROGRAM, 16 )
AM_RANGE(0x800002, 0x800003) AM_DEVREADWRITE8("tc0140syt", tc0140syt_comm_r, tc0140syt_comm_w, 0x00ff)
AM_RANGE(0x900000, 0x90000f) AM_READWRITE(daisenpu_input_r, daisenpu_input_w)
AM_RANGE(0xb00000, 0xb00fff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram)
- AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
- AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
+ AM_RANGE(0xd00000, 0xd005ff) AM_RAM AM_DEVREADWRITE("spritegen", spriteylow_r16, spriteylow_w16) // Sprites Y
+ AM_RANGE(0xd00600, 0xd00607) AM_RAM AM_DEVREADWRITE("spritegen", spritectrl_r16, spritectrl_w16)
AM_RANGE(0xe00000, 0xe03fff) AM_RAM AM_DEVREADWRITE("spritegen", spritecode_r16, spritecode_w16) // Sprites Code + X + Attr
AM_RANGE(0xf00000, 0xf03fff) AM_RAM /* Main RAM */
ADDRESS_MAP_END
diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h
index 6eb2f769a48..56fc66d0912 100644
--- a/src/mame/includes/bsktball.h
+++ b/src/mame/includes/bsktball.h
@@ -28,7 +28,7 @@ public:
/* misc */
UINT32 m_nmi_on;
-// int m_i256v;
+// int m_i256v;
/* input-related */
int m_ld1;
diff --git a/src/mame/includes/btoads.h b/src/mame/includes/btoads.h
index 4e1d813e2a6..e6426ecf86c 100644
--- a/src/mame/includes/btoads.h
+++ b/src/mame/includes/btoads.h
@@ -71,7 +71,7 @@ protected:
// driver_device overrides
virtual void machine_start();
virtual void video_start();
-
+
// timer IDs
enum
{
diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h
index 5fa6fb8ca8e..bc2aca5dc98 100644
--- a/src/mame/includes/galivan.h
+++ b/src/mame/includes/galivan.h
@@ -12,7 +12,7 @@ public:
/* memory pointers */
UINT8 * m_videoram;
-// UINT8 * m_colorram;
+// UINT8 * m_colorram;
UINT8 * m_spriteram;
size_t m_videoram_size;
size_t m_spriteram_size;
@@ -22,7 +22,7 @@ public:
tilemap_t *m_tx_tilemap;
UINT16 m_scrollx;
UINT16 m_scrolly;
- UINT8 m_galivan_scrollx[2],m_galivan_scrolly[2];
+ UINT8 m_galivan_scrollx[2],m_galivan_scrolly[2];
UINT8 m_flipscreen;
UINT8 m_write_layers;
UINT8 m_layers;
diff --git a/src/mame/machine/maple-dc.c b/src/mame/machine/maple-dc.c
index 972c12ff1f8..f01269467b3 100644
--- a/src/mame/machine/maple-dc.c
+++ b/src/mame/machine/maple-dc.c
@@ -130,7 +130,7 @@ void maple_dc_device::dma_step()
// the MIE seems too slow for the correct timeout
// it's rather strange though
- // timer->adjust(attotime::from_nsec(40000 + 20*(msys>>16))); // The 40us represent the sending and reception time
+ // timer->adjust(attotime::from_nsec(40000 + 20*(msys>>16))); // The 40us represent the sending and reception time
timer->adjust(attotime::from_msec(5));
break;
case 2: // sdckb occupy permission (light gun protocol)
diff --git a/src/mame/machine/mie.h b/src/mame/machine/mie.h
index 91cba211f8f..7723480819e 100644
--- a/src/mame/machine/mie.h
+++ b/src/mame/machine/mie.h
@@ -67,7 +67,7 @@ public:
DECLARE_READ8_MEMBER(read_78xx);
static IRQ_CALLBACK(irq_callback_1);
-
+
void maple_w(const UINT32 *data, UINT32 in_size);
protected:
@@ -78,7 +78,7 @@ protected:
virtual void device_start();
virtual void device_reset();
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
-
+
private:
enum { TBUF_SIZE = 8 };
diff --git a/src/mame/machine/msx.c b/src/mame/machine/msx.c
index 9b52dd20d71..970fddf4429 100644
--- a/src/mame/machine/msx.c
+++ b/src/mame/machine/msx.c
@@ -772,7 +772,7 @@ static WRITE8_DEVICE_HANDLER ( msx_ppi_port_a_w )
static WRITE8_DEVICE_HANDLER ( msx_ppi_port_c_w )
{
msx_state *state = device->machine().driver_data<msx_state>();
-
+
state->keylatch = data & 0x0f;
/* caps lock */
diff --git a/src/mame/machine/psxcd.h b/src/mame/machine/psxcd.h
index c49a531ce2f..62efd5c024d 100644
--- a/src/mame/machine/psxcd.h
+++ b/src/mame/machine/psxcd.h
@@ -162,7 +162,7 @@ private:
emu_timer *m_timers[MAX_PSXCD_TIMERS];
event *m_eventfortimer[MAX_PSXCD_TIMERS];
bool m_timerinuse[MAX_PSXCD_TIMERS];
-
+
void add_system_event(event *ev);
};
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index f222c1e81eb..6da429d7c55 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -10433,7 +10433,7 @@ mfish_8 // (c) 2002
mfish_11 // (c) 2002
mfish_12 // (c) 2002
mfish_13 // (c) 2002
-mfish_14 // (c) 2002
+mfish_14 // (c) 2002
// Crazy Monkey
//crzmon // (c) 2003
diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c
index 67e0751385e..20882612a12 100644
--- a/src/mame/video/armedf.c
+++ b/src/mame/video/armedf.c
@@ -39,7 +39,7 @@ static TILE_GET_INFO( get_nb1414m4_tx_tile_info )
/* TODO: Armed F doesn't seem to use the NB1414M4! */
//if (state->m_scroll_type == 1)
- // attributes = state->m_text_videoram[tile_index + 0x800] & 0xff;
+ // attributes = state->m_text_videoram[tile_index + 0x800] & 0xff;
//else
{
attributes = state->m_text_videoram[tile_index + 0x400] & 0xff;
@@ -69,10 +69,10 @@ static TILE_GET_INFO( get_armedf_tx_tile_info )
attributes = state->m_text_videoram[tile_index + 0x800] & 0xff;
//else
//{
- // attributes = state->m_text_videoram[tile_index + 0x400] & 0xff;
+ // attributes = state->m_text_videoram[tile_index + 0x400] & 0xff;
//
- // if(tile_index < 0x12) /* don't draw the NB1414M4 params! TODO: could be a better fix */
- // tile_number = attributes = 0x00;
+ // if(tile_index < 0x12) /* don't draw the NB1414M4 params! TODO: could be a better fix */
+ // tile_number = attributes = 0x00;
//}
/* bit 3 controls priority, (0) nb1414m4 has priority over all the other video layers */
diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c
index 4a48695d5bf..2b8452b3458 100644
--- a/src/mame/video/seta.c
+++ b/src/mame/video/seta.c
@@ -825,7 +825,7 @@ static void draw_tilemap_palette_effect(running_machine &machine, bitmap_t *bitm
***************************************************************************/
-
+
/* For games without tilemaps */
SCREEN_UPDATE( seta_no_layers )
diff --git a/src/mame/video/seta001.c b/src/mame/video/seta001.c
index 08147cc186a..94d946634b1 100644
--- a/src/mame/video/seta001.c
+++ b/src/mame/video/seta001.c
@@ -16,8 +16,8 @@
note: the data bus is almost certainly 8-bit, dating back to the earliest
hardware the games were used on. the RAM arrangements changes
- slightly between games depending on how the RAM is hooked up to the
- main cpu.
+ slightly between games depending on how the RAM is hooked up to the
+ main cpu.
'y' low bits are NEVER buffered?
@@ -38,7 +38,7 @@ void seta001_device::device_start()
{
m_fg_flipxoffs = 0;
m_fg_noflipxoffs = 0;
-
+
m_fg_flipyoffs = 0;
m_fg_noflipyoffs = 0;
@@ -78,7 +78,7 @@ READ16_DEVICE_HANDLER( spritectrl_r16 )
WRITE16_DEVICE_HANDLER( spritectrl_w16 )
{
seta001_device *dev = (seta001_device *)device;
-
+
if (ACCESSING_BITS_0_7)
{
dev->m_spritectrl[offset] = data;
@@ -106,7 +106,7 @@ READ16_DEVICE_HANDLER( spriteylow_r16 )
WRITE16_DEVICE_HANDLER( spriteylow_w16 )
{
seta001_device *dev = (seta001_device *)device;
-
+
if (ACCESSING_BITS_0_7)
{
dev->m_spriteylow[offset] = data;
@@ -265,8 +265,8 @@ void seta001_device::seta001_draw_background( running_machine &machine, bitmap_t
else i = 32 * (col ^ 8) + 2 * (offs>>1) + (offs&1);
int code = ((m_spritecodehigh[i+0x400+bank]) << 8) | m_spritecodelow[i+0x400+bank];
- int color =((m_spritecodehigh[i+0x600+bank]) << 8) | m_spritecodelow[i+0x600+bank];
-
+ int color =((m_spritecodehigh[i+0x600+bank]) << 8) | m_spritecodelow[i+0x600+bank];
+
int flipx = code & 0x8000;
int flipy = code & 0x4000;
@@ -353,19 +353,19 @@ void seta001_device::seta001_draw_foreground( running_machine &machine, bitmap_t
code = char_pointer[i] + ((ctrl_pointer[i] & 0x3f) << 8);
color = (color_pointer[i] & 0xf8) >> 3;
-
-
+
+
sx = x_pointer[i] - ((color_pointer[i] & 1) << 8);
sy = (m_spriteylow[i] & 0xff);
flipx = ctrl_pointer[i] & 0x80;
flipy = ctrl_pointer[i] & 0x40;
-
+
if (m_bankcallback) code = m_bankcallback(machine, code, color_pointer[i]);
-
+
color %= total_color_codes;
color += m_colorbase;
-
+
if (screenflip)
{
sy = max_y - sy
@@ -408,12 +408,12 @@ void seta001_device::seta001_draw_foreground( running_machine &machine, bitmap_t
}
}
-
+
void seta001_device::setac_eof()
{
// is this handling right?
- // it differs to tnzs, and thundercade has sprite flickering issues (not related to the devicification)
+ // it differs to tnzs, and thundercade has sprite flickering issues (not related to the devicification)
int ctrl2 = m_spritectrl[1];
diff --git a/src/mame/video/seta001.h b/src/mame/video/seta001.h
index 432c540f27d..344b13c9d4a 100644
--- a/src/mame/video/seta001.h
+++ b/src/mame/video/seta001.h
@@ -5,15 +5,15 @@ class seta001_device : public device_t
{
public:
seta001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
+
void seta001_draw_sprites(running_machine &machine, bitmap_t *bitmap, const rectangle *cliprect, int bank_size, int setac);
-
+
void setac_eof( void );
void tnzs_eof( void );
-
+
UINT8 m_bgflag;
-
+
UINT8 m_spritectrl[4];
UINT8 m_spriteylow[0x300]; // 0x200 low y + 0x100 bg stuff
@@ -21,13 +21,13 @@ public:
UINT8 m_spritecodehigh[0x2000]; // ^
// position kludges for seta.c & srmp2.c
- void set_fg_xoffsets( int flip, int noflip ) { m_fg_flipxoffs = flip; m_fg_noflipxoffs = noflip; };
+ void set_fg_xoffsets( int flip, int noflip ) { m_fg_flipxoffs = flip; m_fg_noflipxoffs = noflip; };
int m_fg_flipxoffs, m_fg_noflipxoffs;
- void set_fg_yoffsets( int flip, int noflip ) { m_fg_flipyoffs = flip; m_fg_noflipyoffs = noflip; };
+ void set_fg_yoffsets( int flip, int noflip ) { m_fg_flipyoffs = flip; m_fg_noflipyoffs = noflip; };
int m_fg_flipyoffs, m_fg_noflipyoffs;
- void set_bg_yoffsets( int flip, int noflip ) { m_bg_flipyoffs = flip; m_bg_noflipyoffs = noflip; };
+ void set_bg_yoffsets( int flip, int noflip ) { m_bg_flipyoffs = flip; m_bg_noflipyoffs = noflip; };
int m_bg_flipyoffs, m_bg_noflipyoffs;
- void set_bg_xoffsets( int flip, int noflip ) { m_bg_flipxoffs = flip; m_bg_noflipxoffs = noflip; };
+ void set_bg_xoffsets( int flip, int noflip ) { m_bg_flipxoffs = flip; m_bg_noflipxoffs = noflip; };
int m_bg_flipxoffs, m_bg_noflipxoffs;
void set_transpen ( int pen ) { m_transpen = pen; };
@@ -51,7 +51,7 @@ protected:
private:
private:
-
+
void seta001_draw_background( running_machine &machine, bitmap_t *bitmap, const rectangle *cliprect, int bank_size, int setac_type);
void seta001_draw_foreground( running_machine &machine, bitmap_t *bitmap, const rectangle *cliprect, int bank_size);
diff --git a/src/mame/video/srmp2.c b/src/mame/video/srmp2.c
index cdc3e1f88fc..2db927150c1 100644
--- a/src/mame/video/srmp2.c
+++ b/src/mame/video/srmp2.c
@@ -92,7 +92,7 @@ SCREEN_UPDATE( mjyuugi )
screen->machine().device<seta001_device>("spritegen")->set_fg_xoffsets( 0x10, 0x10 );
screen->machine().device<seta001_device>("spritegen")->set_fg_yoffsets( 0x06, 0x06 );
screen->machine().device<seta001_device>("spritegen")->set_bg_yoffsets( 0x09, 0x07 );
-
+
screen->machine().device<seta001_device>("spritegen")->set_spritelimit( 0x1ff-6 );
screen->machine().device<seta001_device>("spritegen")->set_gfxbank_callback( srmp3_gfxbank_callback );
diff --git a/src/mame/video/taitoic.c b/src/mame/video/taitoic.c
index f04b635cdab..0c7e1389ef4 100644
--- a/src/mame/video/taitoic.c
+++ b/src/mame/video/taitoic.c
@@ -4749,7 +4749,7 @@ static DEVICE_START( tc0110pcr )
{
tc0110pcr_state *tc0110pcr = tc0110pcr_get_safe_token(device);
const tc0110pcr_interface *intf = tc0110pcr_get_interface(device);
-
+
tc0110pcr->m_machine = &device->machine();
tc0110pcr->pal_offs = intf->pal_offs;
diff --git a/src/version.c b/src/version.c
index aa209de0c99..732b55f4f9c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -38,4 +38,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.142u2 ("__DATE__")";
+const char build_version[] = "0.142u3 ("__DATE__")";