diff options
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/audio/generic.c | 16 | ||||
| -rw-r--r-- | src/emu/emu.mak | 2 | ||||
| -rw-r--r-- | src/emu/imagedev/bitbngr.h | 4 | ||||
| -rw-r--r-- | src/emu/imagedev/harddriv.c | 4 | ||||
| -rw-r--r-- | src/emu/imagedev/harddriv.h | 6 | ||||
| -rw-r--r-- | src/emu/imagedev/snapquik.h | 10 | ||||
| -rw-r--r-- | src/emu/info.c | 2 | ||||
| -rw-r--r-- | src/emu/machine.h | 4 | ||||
| -rw-r--r-- | src/emu/machine/amigafdc.c | 2 | ||||
| -rw-r--r-- | src/emu/machine/ram.c | 4 | ||||
| -rw-r--r-- | src/emu/machine/v3021.c | 2 | ||||
| -rw-r--r-- | src/emu/mconfig.c | 2 | ||||
| -rw-r--r-- | src/emu/ui.c | 4 | ||||
| -rw-r--r-- | src/emu/uimenu.c | 4 | ||||
| -rw-r--r-- | src/emu/validity.c | 2 | ||||
| -rw-r--r-- | src/emu/video/polynew.h | 44 | ||||
| -rw-r--r-- | src/emu/video/saa5050.c | 2 |
17 files changed, 57 insertions, 57 deletions
diff --git a/src/emu/audio/generic.c b/src/emu/audio/generic.c index ca7d81772b4..107a58112f7 100644 --- a/src/emu/audio/generic.c +++ b/src/emu/audio/generic.c @@ -128,13 +128,13 @@ WRITE16_HANDLER( soundlatch3_word_w ) { latch_w(space, 2, data); } WRITE8_HANDLER( soundlatch4_w ) { latch_w(space, 3, data); } WRITE16_HANDLER( soundlatch4_word_w ) { latch_w(space, 3, data); } -WRITE8_MEMBER( driver_device::soundlatch_w ) { latch_w(&space, 0, data); } +WRITE8_MEMBER( driver_device::soundlatch_w ) { latch_w(&space, 0, data); } WRITE16_MEMBER( driver_device::soundlatch_word_w ) { latch_w(&space, 0, data); } -WRITE8_MEMBER( driver_device::soundlatch2_w ) { latch_w(&space, 1, data); } +WRITE8_MEMBER( driver_device::soundlatch2_w ) { latch_w(&space, 1, data); } WRITE16_MEMBER( driver_device::soundlatch2_word_w ) { latch_w(&space, 1, data); } -WRITE8_MEMBER( driver_device::soundlatch3_w ) { latch_w(&space, 2, data); } +WRITE8_MEMBER( driver_device::soundlatch3_w ) { latch_w(&space, 2, data); } WRITE16_MEMBER( driver_device::soundlatch3_word_w ) { latch_w(&space, 2, data); } -WRITE8_MEMBER( driver_device::soundlatch4_w ) { latch_w(&space, 3, data); } +WRITE8_MEMBER( driver_device::soundlatch4_w ) { latch_w(&space, 3, data); } WRITE16_MEMBER( driver_device::soundlatch4_word_w ) { latch_w(&space, 3, data); } @@ -152,13 +152,13 @@ READ16_HANDLER( soundlatch3_word_r ) { return latch_r(space, 2); } READ8_HANDLER( soundlatch4_r ) { return latch_r(space, 3); } READ16_HANDLER( soundlatch4_word_r ) { return latch_r(space, 3); } -READ8_MEMBER( driver_device::soundlatch_r ) { return latch_r(&space, 0); } +READ8_MEMBER( driver_device::soundlatch_r ) { return latch_r(&space, 0); } READ16_MEMBER( driver_device::soundlatch_word_r ) { return latch_r(&space, 0); } -READ8_MEMBER( driver_device::soundlatch2_r ) { return latch_r(&space, 1); } +READ8_MEMBER( driver_device::soundlatch2_r ) { return latch_r(&space, 1); } READ16_MEMBER( driver_device::soundlatch2_word_r ) { return latch_r(&space, 1); } -READ8_MEMBER( driver_device::soundlatch3_r ) { return latch_r(&space, 2); } +READ8_MEMBER( driver_device::soundlatch3_r ) { return latch_r(&space, 2); } READ16_MEMBER( driver_device::soundlatch3_word_r ) { return latch_r(&space, 2); } -READ8_MEMBER( driver_device::soundlatch4_r ) { return latch_r(&space, 3); } +READ8_MEMBER( driver_device::soundlatch4_r ) { return latch_r(&space, 3); } READ16_MEMBER( driver_device::soundlatch4_word_r ) { return latch_r(&space, 3); } diff --git a/src/emu/emu.mak b/src/emu/emu.mak index 64a4c91b51f..d50730ce8d5 100644 --- a/src/emu/emu.mak +++ b/src/emu/emu.mak @@ -215,7 +215,7 @@ EMUMACHINEOBJS = \ $(EMUMACHINE)/msm5832.o \ $(EMUMACHINE)/msm58321.o \ $(EMUMACHINE)/msm6242.o \ - $(EMUMACHINE)/ncr539x.o \ + $(EMUMACHINE)/ncr539x.o \ $(EMUMACHINE)/nmc9306.o \ $(EMUMACHINE)/nvram.o \ $(EMUMACHINE)/pc16552d.o \ diff --git a/src/emu/imagedev/bitbngr.h b/src/emu/imagedev/bitbngr.h index 19ed122067c..25a25915537 100644 --- a/src/emu/imagedev/bitbngr.h +++ b/src/emu/imagedev/bitbngr.h @@ -75,10 +75,10 @@ struct _bitbanger_config int m_default_mode; /* output bits per second */ - int m_default_baud; + int m_default_baud; /* fine tune adjustment to the baud */ - int m_default_tune; + int m_default_tune; }; diff --git a/src/emu/imagedev/harddriv.c b/src/emu/imagedev/harddriv.c index 4e6bbc96c22..70cd764678a 100644 --- a/src/emu/imagedev/harddriv.c +++ b/src/emu/imagedev/harddriv.c @@ -214,7 +214,7 @@ int harddisk_image_device::internal_load_hd(const char *metadata) if (software_entry() != NULL) { m_chd = get_disk_handle(device().machine(), device().subtag(tempstring,"harddriv")); - } else { + } else { do { is_writeable = !is_readonly(); @@ -222,7 +222,7 @@ int harddisk_image_device::internal_load_hd(const char *metadata) err = chd_open_file(image_core_file(), is_writeable ? CHD_OPEN_READWRITE : CHD_OPEN_READ, NULL, &m_chd); /* special case; if we get CHDERR_FILE_NOT_WRITEABLE, make the - * image read only and repeat */ + * image read only and repeat */ if (err == CHDERR_FILE_NOT_WRITEABLE) make_readonly(); } diff --git a/src/emu/imagedev/harddriv.h b/src/emu/imagedev/harddriv.h index d5ff35f6f98..0bf0053f484 100644 --- a/src/emu/imagedev/harddriv.h +++ b/src/emu/imagedev/harddriv.h @@ -23,7 +23,7 @@ struct harddisk_interface device_image_load_func m_device_image_load; device_image_unload_func m_device_image_unload; const char * m_interface; - device_image_display_info_func m_device_displayinfo; + device_image_display_info_func m_device_displayinfo; }; // ======================> harddisk_image_device @@ -42,7 +42,7 @@ public: virtual bool call_create(int create_format, option_resolution *create_args); virtual void call_unload(); virtual void call_display_info() { if (m_device_displayinfo) m_device_displayinfo(*this); } - virtual bool call_softlist_load(char *swlist, char *swname, rom_entry *start_entry) { load_software_part_region(this, swlist, swname, start_entry ); return TRUE; } + virtual bool call_softlist_load(char *swlist, char *swname, rom_entry *start_entry) { load_software_part_region(this, swlist, swname, start_entry ); return TRUE; } virtual iodevice_t image_type() const { return IO_HARDDISK; } @@ -51,7 +51,7 @@ public: virtual bool is_creatable() const { return 0; } virtual bool must_be_loaded() const { return 0; } virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const { return m_interface; } + virtual const char *image_interface() const { return m_interface; } virtual const char *file_extensions() const { return "chd,hd"; } virtual const option_guide *create_option_guide() const; diff --git a/src/emu/imagedev/snapquik.h b/src/emu/imagedev/snapquik.h index 2604b9dd255..67bcdb17d42 100644 --- a/src/emu/imagedev/snapquik.h +++ b/src/emu/imagedev/snapquik.h @@ -22,7 +22,7 @@ public: virtual ~snapshot_image_device(); // image-level overrides - virtual bool call_load(); + virtual bool call_load(); virtual iodevice_t image_type() const { return IO_SNAPSHOT; } virtual bool is_readable() const { return 1; } @@ -33,7 +33,7 @@ public: virtual const char *image_interface() const { return NULL; } virtual const char *file_extensions() const { return m_file_extensions; } virtual const option_guide *create_option_guide() const { return NULL; } - + void timer_callback(); void set_handler(snapquick_load_func load, const char *ext, seconds_t sec) { m_load = load; m_file_extensions = ext; m_delay_seconds = sec; }; protected: @@ -44,8 +44,8 @@ protected: snapquick_load_func m_load; /* loading function */ const char * m_file_extensions; /* file extensions */ seconds_t m_delay_seconds; /* loading delay (seconds) */ - attoseconds_t m_delay_attoseconds; /* loading delay (attoseconds) */ - emu_timer *m_timer; + attoseconds_t m_delay_attoseconds; /* loading delay (attoseconds) */ + emu_timer *m_timer; }; // device type definition @@ -58,7 +58,7 @@ class quickload_image_device : public snapshot_image_device public: // construction/destruction quickload_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + virtual iodevice_t image_type() const { return IO_QUICKLOAD; } }; diff --git a/src/emu/info.c b/src/emu/info.c index b0817035461..77e8c6089a6 100644 --- a/src/emu/info.c +++ b/src/emu/info.c @@ -217,7 +217,7 @@ void info_xml_creator::output(FILE *out) astring dtd(s_dtd_string); dtd.replace(0,"__XML_ROOT__", emulator_info::get_xml_root()); dtd.replace(0,"__XML_TOP__", emulator_info::get_xml_top()); - + fprintf(m_output, "%s\n\n", dtd.cstr()); // top-level tag diff --git a/src/emu/machine.h b/src/emu/machine.h index 31e42867b94..444374db819 100644 --- a/src/emu/machine.h +++ b/src/emu/machine.h @@ -681,7 +681,7 @@ protected: virtual ioport_constructor device_input_ports() const; virtual void device_start(); virtual void device_reset(); - + // internal helpers inline UINT16 paletteram16_le(offs_t offset) const { return m_generic_paletteram[offset & ~1] | (m_generic_paletteram[offset | 1] << 8); } inline UINT16 paletteram16_be(offs_t offset) const { return m_generic_paletteram[offset | 1] | (m_generic_paletteram[offset & ~1] << 8); } @@ -693,7 +693,7 @@ protected: legacy_callback_func m_callbacks[CB_COUNT]; // generic legacy callbacks palette_init_func m_palette_init; // one-time palette init callback - + // generic pointers optional_shared_ptr<UINT8> m_generic_paletteram; optional_shared_ptr<UINT16> m_generic_paletteram16; diff --git a/src/emu/machine/amigafdc.c b/src/emu/machine/amigafdc.c index 22ecd710808..f470f36b673 100644 --- a/src/emu/machine/amigafdc.c +++ b/src/emu/machine/amigafdc.c @@ -204,7 +204,7 @@ void amiga_fdc::live_run(attotime limit) amiga_custom_w(space, REG_INTREQ, 0x8000 | INTENA_DSKSYN, 0xffff); } else dskbyt &= ~0x1000; - + if(cur_live.bit_counter == 8) { dskbyt = (dskbyt & 0xff00) | 0x8000 | (cur_live.shift_reg & 0xff); cur_live.bit_counter = 0; diff --git a/src/emu/machine/ram.c b/src/emu/machine/ram.c index 7deb867497d..3c69f5e54dd 100644 --- a/src/emu/machine/ram.c +++ b/src/emu/machine/ram.c @@ -72,7 +72,7 @@ void ram_device::device_start() //------------------------------------------------- // device_validity_check - device-specific validity -// checks +// checks //------------------------------------------------- bool ram_device::device_validity_check(emu_options &options, const game_driver &driver) const @@ -181,7 +181,7 @@ bool ram_device::device_validity_check(emu_options &options, const game_driver & //------------------------------------------------- // parse_string - convert a ram string to an -// integer value +// integer value //------------------------------------------------- UINT32 ram_device::parse_string(const char *s) diff --git a/src/emu/machine/v3021.c b/src/emu/machine/v3021.c index 364aad53646..35d1a201d6b 100644 --- a/src/emu/machine/v3021.c +++ b/src/emu/machine/v3021.c @@ -6,7 +6,7 @@ Serial Real Time Clock - - very preliminary, borrowed from hard-coded PGM implementation. + - very preliminary, borrowed from hard-coded PGM implementation. ***************************************************************************/ diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c index 1916a2a0fbe..f3bb54a5422 100644 --- a/src/emu/mconfig.c +++ b/src/emu/mconfig.c @@ -89,7 +89,7 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options) device_t::static_set_input_default(*new_dev, slot->input_ports_defaults()); } } - if (!found) + if (!found) throw emu_fatalerror("Unknown slot option '%s' in slot '%s'", selval, owner.tag()); } } diff --git a/src/emu/ui.c b/src/emu/ui.c index b9456617bf3..46e9b8fb0fe 100644 --- a/src/emu/ui.c +++ b/src/emu/ui.c @@ -963,7 +963,7 @@ static astring &warnings_string(running_machine &machine, astring &string) /* add the strings for these warnings */ if (machine.system().flags & GAME_UNEMULATED_PROTECTION) string.cat("The game has protection which isn't fully emulated.\n"); - if (machine.system().flags & GAME_NOT_WORKING) { + if (machine.system().flags & GAME_NOT_WORKING) { string.cat("\nTHIS "); string.cat(emulator_info::get_capgamenoun()); string.cat(" DOESN'T WORK. The emulation for this game is not yet complete. " @@ -974,7 +974,7 @@ static astring &warnings_string(running_machine &machine, astring &string) string.cat(emulator_info::get_gamenoun()); string.cat(" cannot be emulated as it requires actual physical interaction or consists of mechanical devices. " "It is not possible to fully play this "); - string.cat(emulator_info::get_gamenoun()); + string.cat(emulator_info::get_gamenoun()); string.cat(".\n"); } diff --git a/src/emu/uimenu.c b/src/emu/uimenu.c index 51435814c1e..f462433d521 100644 --- a/src/emu/uimenu.c +++ b/src/emu/uimenu.c @@ -1653,8 +1653,8 @@ static void menu_main_populate(running_machine &machine, ui_menu *menu, void *st } /* add input menu items */ - ui_menu_item_append(menu, "Input (general)", NULL, 0, (void *)menu_input_groups); - + ui_menu_item_append(menu, "Input (general)", NULL, 0, (void *)menu_input_groups); + menu_text.printf("Input (this %s)",emulator_info::get_capstartgamenoun()); ui_menu_item_append(menu, menu_text.cstr(), NULL, 0, (void *)menu_input_specific); diff --git a/src/emu/validity.c b/src/emu/validity.c index a5e0e17e742..31b149904a4 100644 --- a/src/emu/validity.c +++ b/src/emu/validity.c @@ -1254,7 +1254,7 @@ void validate_drivers(emu_options &options, const game_driver *curdriver) /* iterate over all drivers */ emu_options validation_options(options); validation_options.remove_device_options(); - + driver_enumerator drivlist(validation_options); while (drivlist.next()) { diff --git a/src/emu/video/polynew.h b/src/emu/video/polynew.h index 8ec5e7fe46f..4c59c492370 100644 --- a/src/emu/video/polynew.h +++ b/src/emu/video/polynew.h @@ -80,11 +80,11 @@ public: { vertex_t() { } vertex_t(_BaseType _x, _BaseType _y) { x = _x; y = _y; } - + _BaseType x, y; // X, Y coordinates _BaseType p[_MaxParams]; // interpolated parameters }; - + // a single extent describes a span and a list of parameter extents struct extent_t { @@ -98,17 +98,17 @@ public: // delegate type for scanline callbacks typedef delegate<void (INT32, const extent_t &, const _ObjectData &, int)> render_delegate; - + // construction/destruction poly_manager(running_machine &machine, UINT8 flags = 0); virtual ~poly_manager(); - + // getters running_machine &machine() const { return m_machine; } // synchronization void wait(const char *debug_reason = "general"); - + // object data allocators _ObjectData &object_data_alloc(); _ObjectData &object_data_last() const { return m_object.last(); } @@ -157,7 +157,7 @@ private: { // size of an item, rounded up to the cache line size static const int k_itemsize = ((sizeof(_Type) + CACHE_LINE_SIZE - 1) / CACHE_LINE_SIZE) * CACHE_LINE_SIZE; - + public: // construction poly_array(running_machine &machine, poly_manager &manager) @@ -166,14 +166,14 @@ private: m_next(0), m_max(0), m_waits(0) { } - + // destruction ~poly_array() { auto_free(m_manager.machine(), m_base); } // operators _Type &operator[](int index) const { assert(index >= 0 && index < _Count); return *reinterpret_cast<_Type *>(m_base + index * k_itemsize); } - - // getters + + // getters int count() const { return m_next; } int max() const { return m_max; } int waits() const { return m_waits; } @@ -186,7 +186,7 @@ private: _Type &next() { if (m_next > m_max) m_max = m_next; assert(m_next < _Count); return *new(m_base + m_next++ * k_itemsize) _Type; } _Type &last() const { return (*this)[m_next - 1]; } void wait_for_space(int count = 1) { while ((m_next + count) >= _Count) { m_waits++; m_manager.wait(""); } } - + private: // internal state poly_manager & m_manager; @@ -214,7 +214,7 @@ private: // wait for space in the polygon and unit arrays m_polygon.wait_for_space(); m_unit.wait_for_space((maxy - miny) / SCANLINES_PER_BUCKET + 2); - + // return and initialize the next one polygon_info &polygon = m_polygon.next(); polygon.m_owner = this; @@ -222,7 +222,7 @@ private: polygon.m_callback = callback; return polygon; } - + static void *work_item_callback(void *param, int threadid); void presave() { wait("pre-save"); } @@ -231,9 +231,9 @@ private: osd_work_queue * m_queue; // work queue // arrays - polygon_array m_polygon; // array of polygons + polygon_array m_polygon; // array of polygons objectdata_array m_object; // array of object data - unit_array m_unit; // array of work units + unit_array m_unit; // array of work units // misc data UINT8 m_flags; // flags @@ -317,7 +317,7 @@ poly_manager<_BaseType, _ObjectData, _MaxParams, _MaxPolys>::~poly_manager() conflicts += m_conflicts[i]; resolved += m_resolved[i]; } - + // output global stats printf("Total triangles = %d\n", m_triangles); printf("Total quads = %d\n", m_quads); @@ -470,7 +470,7 @@ UINT32 poly_manager<_BaseType, _ObjectData, _MaxParams, _MaxPolys>::render_tile( { const vertex_t *v1 = &_v1; const vertex_t *v2 = &_v2; - + // first sort by Y if (v2->y < v1->y) { @@ -490,7 +490,7 @@ UINT32 poly_manager<_BaseType, _ObjectData, _MaxParams, _MaxPolys>::render_tile( v2yclip = MIN(v2yclip, cliprect.max_y + 1); if (v2yclip - v1yclip <= 0) return 0; - + // determine total X extents _BaseType minx = v1->x; _BaseType maxx = v2->x; @@ -592,7 +592,7 @@ UINT32 poly_manager<_BaseType, _ObjectData, _MaxParams, _MaxPolys>::render_tile( //------------------------------------------------- -// render_triangle - render a single triangle +// render_triangle - render a single triangle // given 3 vertexes //------------------------------------------------- @@ -602,7 +602,7 @@ UINT32 poly_manager<_BaseType, _ObjectData, _MaxParams, _MaxPolys>::render_trian const vertex_t *v1 = &_v1; const vertex_t *v2 = &_v2; const vertex_t *v3 = &_v3; - + // first sort by Y if (v2->y < v1->y) { @@ -634,7 +634,7 @@ UINT32 poly_manager<_BaseType, _ObjectData, _MaxParams, _MaxPolys>::render_trian v3yclip = MIN(v3yclip, cliprect.max_y + 1); if (v3yclip - v1yclip <= 0) return 0; - + // determine total X extents _BaseType minx = v1->x; _BaseType maxx = v1->x; @@ -901,9 +901,9 @@ UINT32 poly_manager<_BaseType, _ObjectData, _MaxParams, _MaxPolys>::render_polyg minv = vertnum; else if (v[vertnum].y > v[maxv].y) maxv = vertnum; - if (v[vertnum].x < minx) + if (v[vertnum].x < minx) minx = v[vertnum].x; - else if (v[vertnum].x > maxx) + else if (v[vertnum].x > maxx) maxx = v[vertnum].x; } diff --git a/src/emu/video/saa5050.c b/src/emu/video/saa5050.c index bf290a5d265..89b0c5aa463 100644 --- a/src/emu/video/saa5050.c +++ b/src/emu/video/saa5050.c @@ -234,7 +234,7 @@ void saa5050_update( device_t *device, bitmap_t *bitmap, const rectangle *clipre { case 0x00: // Temporary hack until proper docs are found - if (saa5050->rev) // This is not ok, but it is done only in case of malzak + if (saa5050->rev) // This is not ok, but it is done only in case of malzak blank = 1; // code 0x00 should not display anything, unless HOLDGR is set break; case 0x01: case 0x02: case 0x03: case 0x04: |
