diff options
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/clifront.c | 4 | ||||
| -rw-r--r-- | src/emu/cpu/drcbeut.c | 2 | ||||
| -rw-r--r-- | src/emu/cpu/drcbeut.h | 2 | ||||
| -rw-r--r-- | src/emu/cpu/drcbex86.h | 2 | ||||
| -rw-r--r-- | src/emu/devcb.c | 34 | ||||
| -rw-r--r-- | src/emu/devcb.h | 44 | ||||
| -rw-r--r-- | src/emu/devcpu.c | 6 | ||||
| -rw-r--r-- | src/emu/devcpu.h | 2 | ||||
| -rw-r--r-- | src/emu/devintrf.c | 16 | ||||
| -rw-r--r-- | src/emu/devintrf.h | 8 | ||||
| -rw-r--r-- | src/emu/dislot.c | 4 | ||||
| -rw-r--r-- | src/emu/dislot.h | 4 | ||||
| -rw-r--r-- | src/emu/driver.c | 4 | ||||
| -rw-r--r-- | src/emu/driver.h | 8 | ||||
| -rw-r--r-- | src/emu/machine.c | 2 | ||||
| -rw-r--r-- | src/emu/machine/6821pia.c | 2 | ||||
| -rw-r--r-- | src/emu/machine/6850acia.c | 2 | ||||
| -rw-r--r-- | src/emu/machine/6850acia.h | 2 | ||||
| -rw-r--r-- | src/emu/machine/i8255.h | 4 | ||||
| -rw-r--r-- | src/emu/machine/idectrl.c | 4 | ||||
| -rw-r--r-- | src/emu/machine/jvsdev.c | 2 | ||||
| -rw-r--r-- | src/emu/machine/mccs1850.c | 8 | ||||
| -rw-r--r-- | src/emu/machine/secflash.c | 2 | ||||
| -rw-r--r-- | src/emu/mconfig.c | 2 | ||||
| -rw-r--r-- | src/emu/screen.h | 4 | ||||
| -rw-r--r-- | src/emu/sound/lmc1992.c | 22 | ||||
| -rw-r--r-- | src/emu/sound/lmc1992.h | 6 | ||||
| -rw-r--r-- | src/emu/uimenu.c | 34 | ||||
| -rw-r--r-- | src/emu/video/crt9007.h | 2 |
29 files changed, 119 insertions, 119 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 ¤t) { device_t *result = NULL; - + if (index == DEVCB_DEVICE_SELF) result = ¤t; 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; |
