From 9f8125a24e9f1dd60a8726365fb070f0c4378093 Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Sun, 27 Nov 2011 14:06:49 +0000 Subject: [PATCH] Clean-ups and version bump --- src/emu/audio/generic.c | 16 ++++----- src/emu/emu.mak | 2 +- src/emu/imagedev/bitbngr.h | 4 +-- src/emu/imagedev/harddriv.c | 4 +-- src/emu/imagedev/harddriv.h | 6 ++-- src/emu/imagedev/snapquik.h | 10 +++--- src/emu/info.c | 2 +- src/emu/machine.h | 4 +-- src/emu/machine/amigafdc.c | 2 +- src/emu/machine/ram.c | 4 +-- src/emu/machine/v3021.c | 2 +- src/emu/mconfig.c | 2 +- src/emu/ui.c | 4 +-- src/emu/uimenu.c | 4 +-- src/emu/validity.c | 2 +- src/emu/video/polynew.h | 44 +++++++++++------------ src/emu/video/saa5050.c | 2 +- src/mame/drivers/4enraya.c | 30 ++++++++-------- src/mame/drivers/aces1.c | 4 +-- src/mame/drivers/acesp.c | 4 +-- src/mame/drivers/alien.c | 4 +-- src/mame/drivers/allied.c | 6 ++-- src/mame/drivers/alvg.c | 6 ++-- src/mame/drivers/astropc.c | 4 +-- src/mame/drivers/atari_s1.c | 6 ++-- src/mame/drivers/atari_s2.c | 6 ++-- src/mame/drivers/atari_s3.c | 6 ++-- src/mame/drivers/atronic.c | 4 +-- src/mame/drivers/belatra.c | 4 +-- src/mame/drivers/bfm_sc4.c | 8 ++--- src/mame/drivers/bfm_sc5.c | 4 +-- src/mame/drivers/bgt.c | 4 +-- src/mame/drivers/bingo.c | 26 +++++++------- src/mame/drivers/by17.c | 6 ++-- src/mame/drivers/by35.c | 6 ++-- src/mame/drivers/by6803.c | 6 ++-- src/mame/drivers/by68701.c | 6 ++-- src/mame/drivers/byvid.c | 6 ++-- src/mame/drivers/capcom.c | 6 ++-- src/mame/drivers/castle.c | 4 +-- src/mame/drivers/cesclass.c | 8 ++--- src/mame/drivers/comebaby.c | 6 ++-- src/mame/drivers/cps1.c | 14 ++++---- src/mame/drivers/cupidon.c | 4 +-- src/mame/drivers/de_1.c | 6 ++-- src/mame/drivers/de_2.c | 6 ++-- src/mame/drivers/de_3.c | 4 +-- src/mame/drivers/de_3b.c | 4 +-- src/mame/drivers/exidy.c | 2 +- src/mame/drivers/flicker.c | 6 ++-- src/mame/drivers/fortecar.c | 18 +++++----- src/mame/drivers/g627.c | 6 ++-- src/mame/drivers/gp_1.c | 6 ++-- src/mame/drivers/gp_2.c | 6 ++-- src/mame/drivers/gts1.c | 6 ++-- src/mame/drivers/gts3.c | 6 ++-- src/mame/drivers/gts80.c | 6 ++-- src/mame/drivers/gts80a.c | 10 +++--- src/mame/drivers/gts80b.c | 6 ++-- src/mame/drivers/hankin.c | 6 ++-- src/mame/drivers/hazelgr.c | 4 +-- src/mame/drivers/icecold.c | 6 ++-- src/mame/drivers/igspc.c | 4 +-- src/mame/drivers/inder.c | 6 ++-- src/mame/drivers/itgamble.c | 6 ++-- src/mame/drivers/jeutel.c | 6 ++-- src/mame/drivers/jp.c | 6 ++-- src/mame/drivers/jpmmps.c | 4 +-- src/mame/drivers/jpms80.c | 4 +-- src/mame/drivers/jpmsys7.c | 4 +-- src/mame/drivers/jvh.c | 6 ++-- src/mame/drivers/kissproto.c | 6 ++-- src/mame/drivers/konamim2.c | 4 +-- src/mame/drivers/konendev.c | 4 +-- src/mame/drivers/ltd.c | 6 ++-- src/mame/drivers/maygayep.c | 4 +-- src/mame/drivers/mephisto.c | 6 ++-- src/mame/drivers/micropin.c | 6 ++-- src/mame/drivers/midqslvr.c | 6 ++-- src/mame/drivers/mmm.c | 4 +-- src/mame/drivers/mpu2.c | 4 +-- src/mame/drivers/mpu5.c | 4 +-- src/mame/drivers/mrgame.c | 6 ++-- src/mame/drivers/namcops2.c | 6 ++-- src/mame/drivers/neptunp2.c | 8 ++--- src/mame/drivers/nsm.c | 6 ++-- src/mame/drivers/pacman.c | 14 ++++---- src/mame/drivers/play_1.c | 6 ++-- src/mame/drivers/play_2.c | 6 ++-- src/mame/drivers/play_3.c | 6 ++-- src/mame/drivers/play_5.c | 6 ++-- src/mame/drivers/proconn.c | 4 +-- src/mame/drivers/queen.c | 6 ++-- src/mame/drivers/rcorsair.c | 6 ++-- src/mame/drivers/rowamet.c | 6 ++-- src/mame/drivers/s11.c | 6 ++-- src/mame/drivers/s11a.c | 6 ++-- src/mame/drivers/s11b.c | 6 ++-- src/mame/drivers/s11c.c | 6 ++-- src/mame/drivers/s3.c | 6 ++-- src/mame/drivers/s4.c | 6 ++-- src/mame/drivers/s6.c | 6 ++-- src/mame/drivers/s6a.c | 6 ++-- src/mame/drivers/s7.c | 6 ++-- src/mame/drivers/s8.c | 8 ++--- src/mame/drivers/s9.c | 6 ++-- src/mame/drivers/savquest.c | 6 ++-- src/mame/drivers/segajw.c | 6 ++-- src/mame/drivers/sfbonus.c | 4 +-- src/mame/drivers/sleic.c | 8 ++--- src/mame/drivers/spectra.c | 6 ++-- src/mame/drivers/spinb.c | 6 ++-- src/mame/drivers/st_mp100.c | 6 ++-- src/mame/drivers/st_mp200.c | 6 ++-- src/mame/drivers/stellafr.c | 4 +-- src/mame/drivers/sumt8035.c | 4 +-- src/mame/drivers/taito.c | 6 ++-- src/mame/drivers/techno.c | 6 ++-- src/mame/drivers/tokyocop.c | 6 ++-- src/mame/drivers/turrett.c | 6 ++-- src/mame/drivers/unkpcp.c | 4 +-- src/mame/drivers/vd.c | 6 ++-- src/mame/drivers/vp101.c | 8 ++--- src/mame/drivers/wecleman.c | 2 +- src/mame/drivers/white_mod.c | 6 ++-- src/mame/drivers/wico.c | 6 ++-- src/mame/drivers/wms.c | 4 +-- src/mame/drivers/wpc_95.c | 6 ++-- src/mame/drivers/wpc_an.c | 6 ++-- src/mame/drivers/wpc_dcs.c | 6 ++-- src/mame/drivers/wpc_dot.c | 6 ++-- src/mame/drivers/wpc_flip1.c | 6 ++-- src/mame/drivers/wpc_flip2.c | 6 ++-- src/mame/drivers/wpc_s.c | 8 ++--- src/mame/drivers/xtom3d.c | 6 ++-- src/mame/drivers/zac_1.c | 6 ++-- src/mame/drivers/zac_2.c | 8 ++--- src/mame/includes/4enraya.h | 2 +- src/mame/includes/zerozone.h | 16 ++++----- src/mame/includes/zodiack.h | 20 +++++------ src/mame/machine/archimds.c | 2 +- src/mame/machine/snes.c | 6 ++-- src/mame/mame.lst | 2 +- src/mame/video/gaelco3d.c | 66 +++++++++++++++++------------------ src/mame/video/jagobj.c | 6 ++-- src/mame/video/midvunit.c | 2 +- src/mame/video/pacman.c | 2 +- src/osd/sdl/netdev_tap.c | 2 +- src/osd/sdl/sdlmain.c | 4 +-- src/osd/windows/netdev_pcap.c | 2 +- src/version.c | 2 +- 151 files changed, 497 insertions(+), 497 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 m_generic_paletteram; optional_shared_ptr 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 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: diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c index 6e4cf402fcf..91ec5719402 100644 --- a/src/mame/drivers/4enraya.c +++ b/src/mame/drivers/4enraya.c @@ -227,35 +227,35 @@ static INPUT_PORTS_START( pucky ) // guess PORT_DIPNAME( 0x01, 0x00, "0-0") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x01, DEF_STR( On ) ) - + PORT_DIPNAME( 0x02, 0x00, "0-1") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x02, DEF_STR( On ) ) - + PORT_DIPNAME( 0x04, 0x00, "0-2") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x04, DEF_STR( On ) ) - + PORT_DIPNAME( 0x08, 0x00, "0-3") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x08, DEF_STR( On ) ) - + PORT_DIPNAME( 0x10, 0x00, "0-4") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x10, DEF_STR( On ) ) - + PORT_DIPNAME( 0x20, 0x00, "0-5") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x20, DEF_STR( On ) ) - + PORT_DIPNAME( 0x40, 0x00, "0-6") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x40, DEF_STR( On ) ) - + PORT_DIPNAME( 0x80, 0x00, "0-7") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) - + PORT_START("IN1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) @@ -264,13 +264,13 @@ static INPUT_PORTS_START( pucky ) // guess PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_COIN5 ) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN6 ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN7 ) - + PORT_DIPNAME( 0x80, 0x80, "DIP8") PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) - - + + PORT_START("IN2") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) @@ -280,7 +280,7 @@ static INPUT_PORTS_START( pucky ) // guess PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON4 ) - + INPUT_PORTS_END static const gfx_layout charlayout = @@ -389,7 +389,7 @@ ROM_START(pucky) ROM_REGION(0x10000, "maincpu", 0) ROM_LOAD("1.u14", 0x00000, 0x2000, CRC(848c4143) SHA1(3cff26181c58e5f52f1ac81df7d5d43e644585a2)) ROM_LOAD("2.u46", 0x08000, 0x2000, CRC(9e6e0bd3) SHA1(f502132a0460108dad243632cc13d9116c534291)) - + ROM_REGION( 0x6000, "gfx1", 0 ) ROM_LOAD( "3.u20", 0x2000, 0x2000, CRC(d00b04ea) SHA1(e65901d8586507257d74ab103001207e28fa28af) ) ROM_LOAD( "4.u19", 0x4000, 0x2000, CRC(4a123a3d) SHA1(26300b8af0d0df0023a153a212699727311d1b74) ) @@ -400,9 +400,9 @@ static DRIVER_INIT( pucky ) { _4enraya_state *state = machine.driver_data<_4enraya_state>(); UINT8 *rom = machine.region("maincpu")->base(); - + state->m_snd_latch_bit = 2; - + { for(int i=0x8000;i<0xa000;++i) { diff --git a/src/mame/drivers/aces1.c b/src/mame/drivers/aces1.c index ea0d736a696..6e62d375818 100644 --- a/src/mame/drivers/aces1.c +++ b/src/mame/drivers/aces1.c @@ -23,9 +23,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/acesp.c b/src/mame/drivers/acesp.c index 73b59f81175..a49b4064eeb 100644 --- a/src/mame/drivers/acesp.c +++ b/src/mame/drivers/acesp.c @@ -19,9 +19,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/alien.c b/src/mame/drivers/alien.c index 7c4e38d1b76..2d67527fff5 100644 --- a/src/mame/drivers/alien.c +++ b/src/mame/drivers/alien.c @@ -31,10 +31,10 @@ public: DECLARE_READ64_MEMBER(test_r); protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); virtual void video_start(); diff --git a/src/mame/drivers/allied.c b/src/mame/drivers/allied.c index d9dad0c0639..27c7eaebcfc 100644 --- a/src/mame/drivers/allied.c +++ b/src/mame/drivers/allied.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/alvg.c b/src/mame/drivers/alvg.c index d379a118228..1886e69142c 100644 --- a/src/mame/drivers/alvg.c +++ b/src/mame/drivers/alvg.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/astropc.c b/src/mame/drivers/astropc.c index 4de57210966..25c7d6d951e 100644 --- a/src/mame/drivers/astropc.c +++ b/src/mame/drivers/astropc.c @@ -21,9 +21,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/atari_s1.c b/src/mame/drivers/atari_s1.c index d70f0fdc45f..e5cff8aad7a 100644 --- a/src/mame/drivers/atari_s1.c +++ b/src/mame/drivers/atari_s1.c @@ -15,12 +15,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/atari_s2.c b/src/mame/drivers/atari_s2.c index 0aac227a8d8..a254bc4fe00 100644 --- a/src/mame/drivers/atari_s2.c +++ b/src/mame/drivers/atari_s2.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/atari_s3.c b/src/mame/drivers/atari_s3.c index d144f59ee83..52da84e5ae7 100644 --- a/src/mame/drivers/atari_s3.c +++ b/src/mame/drivers/atari_s3.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/atronic.c b/src/mame/drivers/atronic.c index 3ac25d81c7c..6eb7bf5387b 100644 --- a/src/mame/drivers/atronic.c +++ b/src/mame/drivers/atronic.c @@ -24,9 +24,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/belatra.c b/src/mame/drivers/belatra.c index a03b3df49de..7cd9c0ccd35 100644 --- a/src/mame/drivers/belatra.c +++ b/src/mame/drivers/belatra.c @@ -50,9 +50,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/bfm_sc4.c b/src/mame/drivers/bfm_sc4.c index e4b5a848835..8fd5b3da6e9 100644 --- a/src/mame/drivers/bfm_sc4.c +++ b/src/mame/drivers/bfm_sc4.c @@ -58,9 +58,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; @@ -72,9 +72,9 @@ public: : sc4_state(mconfig, type, tag), m_adder4cpu(*this, "adder4") { } - + protected: - + // devices required_device m_adder4cpu; }; diff --git a/src/mame/drivers/bfm_sc5.c b/src/mame/drivers/bfm_sc5.c index 102b4cd5fd6..2597bfe11e3 100644 --- a/src/mame/drivers/bfm_sc5.c +++ b/src/mame/drivers/bfm_sc5.c @@ -27,9 +27,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/bgt.c b/src/mame/drivers/bgt.c index 4e3ff2e3a4f..644e3eebc63 100644 --- a/src/mame/drivers/bgt.c +++ b/src/mame/drivers/bgt.c @@ -19,9 +19,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/bingo.c b/src/mame/drivers/bingo.c index dcd8a6cd62a..9035a41d8ff 100644 --- a/src/mame/drivers/bingo.c +++ b/src/mame/drivers/bingo.c @@ -12,16 +12,16 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; - + static ADDRESS_MAP_START( bingo_map, AS_PROGRAM, 8, bingo_state ) AM_RANGE(0x0000, 0xffff) AM_NOP @@ -53,16 +53,16 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; - + static ADDRESS_MAP_START( seeben_map, AS_PROGRAM, 8, seeben_state ) ADDRESS_MAP_END @@ -91,15 +91,15 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); -}; +}; static ADDRESS_MAP_START( splin_map, AS_PROGRAM, 16, splin_state ) AM_RANGE(0x00000, 0x0bfff) AM_RAM @@ -291,7 +291,7 @@ ROM_START(tripjok) ROM_LOAD( "13006-2", 0x0000, 0x4000, CRC(c7104e8f) SHA1(a3737f70cb9c97df24b5da915ef53b6d30f2470d)) ROM_END - + GAME(1980, cntinntl, 0, bingo, bingo, bingo, ROT0, "Bally", "Continental (Bingo)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME(19??, goldgame, 0, splin, splin, splin, ROT0, "Splin", "Golden Game (Bingo)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) GAME(19??, goldgkitb, goldgame, splin, splin, splin, ROT0, "Splin", "Golden Game Kit Bingo Stake 6/10 (Bingo)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_MECHANICAL) diff --git a/src/mame/drivers/by17.c b/src/mame/drivers/by17.c index edbeab94aaa..593500149d1 100644 --- a/src/mame/drivers/by17.c +++ b/src/mame/drivers/by17.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/by35.c b/src/mame/drivers/by35.c index d8bef9b8be0..c40eddbddf2 100644 --- a/src/mame/drivers/by35.c +++ b/src/mame/drivers/by35.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/by6803.c b/src/mame/drivers/by6803.c index e4273c92b4b..3dac7b06169 100644 --- a/src/mame/drivers/by6803.c +++ b/src/mame/drivers/by6803.c @@ -15,12 +15,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/by68701.c b/src/mame/drivers/by68701.c index 0de9485484f..24e565d170c 100644 --- a/src/mame/drivers/by68701.c +++ b/src/mame/drivers/by68701.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/byvid.c b/src/mame/drivers/byvid.c index a9c7e3b4ad3..0f070d181cb 100644 --- a/src/mame/drivers/byvid.c +++ b/src/mame/drivers/byvid.c @@ -16,13 +16,13 @@ public: m_maincpu(*this, "maincpu"), m_videocpu(*this, "videocpu") { } - + protected: - + // devices required_device m_maincpu; required_device m_videocpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/capcom.c b/src/mame/drivers/capcom.c index ab6eb24a2fa..d619bdacf22 100644 --- a/src/mame/drivers/capcom.c +++ b/src/mame/drivers/capcom.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/castle.c b/src/mame/drivers/castle.c index 37787f4d586..b25e45794a8 100644 --- a/src/mame/drivers/castle.c +++ b/src/mame/drivers/castle.c @@ -53,9 +53,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/cesclass.c b/src/mame/drivers/cesclass.c index ec1c00c2de5..96f8f4193f6 100644 --- a/src/mame/drivers/cesclass.c +++ b/src/mame/drivers/cesclass.c @@ -16,14 +16,14 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + DECLARE_READ16_MEMBER(_60000_r); - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void video_start(); virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/comebaby.c b/src/mame/drivers/comebaby.c index bded108d227..32b9a5ce928 100644 --- a/src/mame/drivers/comebaby.c +++ b/src/mame/drivers/comebaby.c @@ -69,12 +69,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void video_start(); virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c index 8e172e04df3..7443af6ead5 100644 --- a/src/mame/drivers/cps1.c +++ b/src/mame/drivers/cps1.c @@ -4554,10 +4554,10 @@ ROM_START( ffightu1 ) ROM_LOAD16_BYTE( "ff_42.11h", 0x00001, 0x20000, CRC(65f11215) SHA1(5045a467f3e228c02b4a355b52f58263ffa90113) ) // in "35" socket ROM_LOAD16_BYTE( "ff_37.12f", 0x40000, 0x20000, CRC(e1033784) SHA1(38f44434c8befd623953ae23d6e5ff4e201d6627) ) // in "31" socket ROM_LOAD16_BYTE( "ffu_43.12h", 0x40001, 0x20000, CRC(4ca65947) SHA1(74ffe00df96273770a24d9a46f13e53ea8812670) ) // in "36" socket - ROM_LOAD16_BYTE( "ff_34.9f", 0x80000, 0x20000, CRC(0c8dc3fc) SHA1(edcce3efd9cdd131ef0c96df15a68722d5c3498e) ) // in "28" socket // == ff-32m.8h - ROM_LOAD16_BYTE( "ff_40.9h", 0x80001, 0x20000, CRC(8075bab9) SHA1(f9c7405133f6fc5557c90e60e8ccc459e4f6fd7d) ) // in "33" socket // == ff-32m.8h - ROM_LOAD16_BYTE( "ff_35.10f", 0xc0000, 0x20000, CRC(4a934121) SHA1(3982c261582755a0eac340d6d7ed96e6c263c8b6) ) // in "29" socket // == ff-32m.8h - ROM_LOAD16_BYTE( "ff_41.10h", 0xc0001, 0x20000, CRC(2af68154) SHA1(7d549cb38650b4b79c68ad6d0dfcefdd62be4e99) ) // in "34" socket // == ff-32m.8h + ROM_LOAD16_BYTE( "ff_34.9f", 0x80000, 0x20000, CRC(0c8dc3fc) SHA1(edcce3efd9cdd131ef0c96df15a68722d5c3498e) ) // in "28" socket // == ff-32m.8h + ROM_LOAD16_BYTE( "ff_40.9h", 0x80001, 0x20000, CRC(8075bab9) SHA1(f9c7405133f6fc5557c90e60e8ccc459e4f6fd7d) ) // in "33" socket // == ff-32m.8h + ROM_LOAD16_BYTE( "ff_35.10f", 0xc0000, 0x20000, CRC(4a934121) SHA1(3982c261582755a0eac340d6d7ed96e6c263c8b6) ) // in "29" socket // == ff-32m.8h + ROM_LOAD16_BYTE( "ff_41.10h", 0xc0001, 0x20000, CRC(2af68154) SHA1(7d549cb38650b4b79c68ad6d0dfcefdd62be4e99) ) // in "34" socket // == ff-32m.8h ROM_REGION( 0x200000, "gfx", 0 ) ROMX_LOAD( "ff-5m.7a", 0x000000, 0x80000, CRC(9c284108) SHA1(7868f5801347340867720255f8380548ad1a65a7) , ROM_GROUPWORD | ROM_SKIP(6) ) @@ -4591,7 +4591,7 @@ ROM_START( ffightua ) ROM_LOAD16_BYTE( "ffu_36.11f", 0x00000, 0x20000, CRC(e2a48af9) SHA1(11e06f95bdf575af396dded2b84d858f6c7388f1) ) // in "30" socket ROM_LOAD16_BYTE( "ffu_42.11h", 0x00001, 0x20000, CRC(f4bb480e) SHA1(32114df1d2f4f98a4a2280a330c7b6af8ab4d862) ) // in "35" socket ROM_LOAD16_BYTE( "ffu_37.12f", 0x40000, 0x20000, CRC(c371c667) SHA1(633977c91a8ff09b7fe83128eced7c4dee9aee1d) ) // in "31" socket - ROM_LOAD16_BYTE( "ffu_43.36", 0x40001, 0x20000, CRC(2f5771f9) SHA1(fb532402bc00b5619a23dfa7e4525f1717020303) ) // in "36" socket /* different CRC from ffightu, ffightu1 but same label, pcb verified */ + ROM_LOAD16_BYTE( "ffu_43.36", 0x40001, 0x20000, CRC(2f5771f9) SHA1(fb532402bc00b5619a23dfa7e4525f1717020303) ) // in "36" socket /* different CRC from ffightu, ffightu1 but same label, pcb verified */ ROM_LOAD16_WORD_SWAP( "ff-32m.8h", 0x80000, 0x80000, CRC(c747696e) SHA1(d3362dadded31ccb7eaf71ef282d698d18edd722) ) ROM_REGION( 0x200000, "gfx", 0 ) @@ -6311,7 +6311,7 @@ ROM_START( sf2jc ) ROMX_LOAD( "sf2_26.9d", 0x400006, 0x80000, CRC(0627c831) SHA1(f9a92d614e8877d648449de2612fc8b43c85e4c2) , ROM_GROUPWORD | ROM_SKIP(6) ) // == sf2-11m.5d ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */ - ROM_LOAD( "sf2_09.12a", 0x00000, 0x08000, CRC(a4823a1b) SHA1(7b6bf59dfd578bfbbdb64c27988796783442d659) ) // == sf2_9.12a // could be sf2j_09.12a + ROM_LOAD( "sf2_09.12a", 0x00000, 0x08000, CRC(a4823a1b) SHA1(7b6bf59dfd578bfbbdb64c27988796783442d659) ) // == sf2_9.12a // could be sf2j_09.12a ROM_CONTINUE( 0x10000, 0x08000 ) ROM_REGION( 0x40000, "oki", 0 ) /* Samples */ @@ -6619,7 +6619,7 @@ ROM_START( wonder3 ) ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */ ROM_LOAD( "rt_23.13b", 0x00000, 0x08000, CRC(abfca165) SHA1(428069d3bdc45775854cd0e8abe447f134fe5492) ) // == rt_9.12b -// ROM_LOAD( "rt_23.13b", 0x00000, 0x08000, CRC(7d5a77a7) SHA1(4f2a6534d7a9e518061102c1dd7d7aca39600c33) ) // one byte different, verification required +// ROM_LOAD( "rt_23.13b", 0x00000, 0x08000, CRC(7d5a77a7) SHA1(4f2a6534d7a9e518061102c1dd7d7aca39600c33) ) // one byte different, verification required ROM_CONTINUE( 0x10000, 0x08000 ) ROM_REGION( 0x40000, "oki", 0 ) /* Samples */ diff --git a/src/mame/drivers/cupidon.c b/src/mame/drivers/cupidon.c index 654fd341d30..296480abe3f 100644 --- a/src/mame/drivers/cupidon.c +++ b/src/mame/drivers/cupidon.c @@ -17,9 +17,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/de_1.c b/src/mame/drivers/de_1.c index 93cc97f08ec..6e05adddcf4 100644 --- a/src/mame/drivers/de_1.c +++ b/src/mame/drivers/de_1.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/de_2.c b/src/mame/drivers/de_2.c index 2beba737920..6bc54a73248 100644 --- a/src/mame/drivers/de_2.c +++ b/src/mame/drivers/de_2.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/de_3.c b/src/mame/drivers/de_3.c index 748975a48f3..765cd5ccc58 100644 --- a/src/mame/drivers/de_3.c +++ b/src/mame/drivers/de_3.c @@ -21,9 +21,9 @@ public: // devices required_device m_maincpu; required_device m_decobsmt; - + protected: - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/de_3b.c b/src/mame/drivers/de_3b.c index 89f15fba52a..f442c1d1882 100644 --- a/src/mame/drivers/de_3b.c +++ b/src/mame/drivers/de_3b.c @@ -21,9 +21,9 @@ public: // devices required_device m_maincpu; required_device m_decobsmt; - + protected: - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/exidy.c b/src/mame/drivers/exidy.c index b237f7aefff..3ebf47ef1aa 100644 --- a/src/mame/drivers/exidy.c +++ b/src/mame/drivers/exidy.c @@ -1239,7 +1239,7 @@ ROM_START( pepper2 ) ROM_END -ROM_START( pepper27 ) +ROM_START( pepper27 ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "p2l12ar7.bin", 0x9000, 0x1000, CRC(b3bc51cd) SHA1(12475ac5784bb2ab6887476ee8166c3585864cd6) ) ROM_LOAD( "p2l11ar7.bin", 0xa000, 0x1000, CRC(c8b834cd) SHA1(28b4de322de845effaa1d2fc6c9f129145965b8a) ) diff --git a/src/mame/drivers/flicker.c b/src/mame/drivers/flicker.c index b3b13192d7d..2172db9e2c3 100644 --- a/src/mame/drivers/flicker.c +++ b/src/mame/drivers/flicker.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c index 7f967417df7..6eb5bf157e5 100644 --- a/src/mame/drivers/fortecar.c +++ b/src/mame/drivers/fortecar.c @@ -60,7 +60,7 @@ FULL equivalent to MC6845P, UM6845R, EF6845P, HD6845P, etc. The ST93CS56 and ST93CS57 are 2K bit Electrically Erasable Programmable Memory (EEPROM) - fabricated with SGS-THOMSON’s High Endurance Single Polysilicon CMOS technology. The memory + fabricated with SGS-THOMSON?s High Endurance Single Polysilicon CMOS technology. The memory is accessed through a serial input D and output Q. The 2K bit memory is organized as 128 x 16 bit words.The memory is accessed by a set of instructions which include Read, Write, Page Write, Write All and instructions used to set the memory protection. A Read instruction loads the address of the @@ -230,7 +230,7 @@ static READ8_DEVICE_HANDLER( ppi0_portc_r ) static const ppi8255_interface ppi0intf = { /* Init with 0x9a... A, B and high C as input - Serial Eprom connected to Port C + Serial Eprom connected to Port C */ DEVCB_INPUT_PORT("SYSTEM"), /* Port A read */ @@ -279,7 +279,7 @@ Seems to work properly, but must be checked closely... watchdog_reset(device->machine()); } -// logerror("AY port B write %02x\n",data); +// logerror("AY port B write %02x\n",data); } @@ -312,7 +312,7 @@ static const mc6845_interface mc6845_intf = static const eeprom_interface forte_eeprom_intf = {/* Preliminary interface for NM93CS56N Serial EEPROM. - Correct address & data. Using 93C46 similar protocol. + Correct address & data. Using 93C46 similar protocol. */ 7, /* address bits */ 16, /* data bits */ @@ -450,7 +450,7 @@ GFXDECODE_END static MACHINE_RESET(fortecar) { -// fortecar_state *state = machine.driver_data(); +// fortecar_state *state = machine.driver_data(); } @@ -508,9 +508,9 @@ ROM_START( fortecar ) ROM_LOAD( "fortecar.u40", 0x20000, 0x10000, CRC(9693bb83) SHA1(e3e3bc750c89a1edd1072ce3890b2ce498dec633) ) /* took from the Spanish version, these are likely to be identical anyway */ -// ROM_REGION( 0x0800, "nvram", 0 ) /* default NVRAM */ -// ROM_LOAD( "fortecrd_nvram.u6", 0x0000, 0x0800, BAD_DUMP CRC(fd5be302) SHA1(862f584aa8073bcefeeb290b99643020413fb7ef) ) -// ROM_LOAD( "fortecrd_nvram.u6", 0x0000, 0x0800, CRC(71f70589) SHA1(020e17617f9545cab6d174c5577c0158922d2186) ) +// ROM_REGION( 0x0800, "nvram", 0 ) /* default NVRAM */ +// ROM_LOAD( "fortecrd_nvram.u6", 0x0000, 0x0800, BAD_DUMP CRC(fd5be302) SHA1(862f584aa8073bcefeeb290b99643020413fb7ef) ) +// ROM_LOAD( "fortecrd_nvram.u6", 0x0000, 0x0800, CRC(71f70589) SHA1(020e17617f9545cab6d174c5577c0158922d2186) ) ROM_REGION( 0x0100, "eeprom", 0 ) /* default serial EEPROM */ ROM_LOAD( "forte_card_93cs56.u13", 0x0000, 0x0100, BAD_DUMP CRC(13180f47) SHA1(bb04ea1eac5e53831aece3cfdf593ae824219c0e) ) @@ -530,7 +530,7 @@ ROM_START( fortecrd ) ROM_REGION( 0x0800, "nvram", 0 ) /* default NVRAM */ ROM_LOAD( "fortecrd_nvram.u6", 0x0000, 0x0800, CRC(fd5be302) SHA1(862f584aa8073bcefeeb290b99643020413fb7ef) ) -// ROM_LOAD( "fortecrd_nvram.u6", 0x0000, 0x0800, CRC(71f70589) SHA1(020e17617f9545cab6d174c5577c0158922d2186) ) +// ROM_LOAD( "fortecrd_nvram.u6", 0x0000, 0x0800, CRC(71f70589) SHA1(020e17617f9545cab6d174c5577c0158922d2186) ) ROM_REGION( 0x0100, "eeprom", 0 ) /* default serial EEPROM */ ROM_LOAD( "forte_card_93cs56.u13", 0x0000, 0x0100, CRC(13180f47) SHA1(bb04ea1eac5e53831aece3cfdf593ae824219c0e) ) diff --git a/src/mame/drivers/g627.c b/src/mame/drivers/g627.c index 6fe5b18d56d..cd3bdfd6226 100644 --- a/src/mame/drivers/g627.c +++ b/src/mame/drivers/g627.c @@ -18,12 +18,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/gp_1.c b/src/mame/drivers/gp_1.c index 994c771d528..6be23efa854 100644 --- a/src/mame/drivers/gp_1.c +++ b/src/mame/drivers/gp_1.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/gp_2.c b/src/mame/drivers/gp_2.c index c6450cd6ed2..f3c3aa7ffaf 100644 --- a/src/mame/drivers/gp_2.c +++ b/src/mame/drivers/gp_2.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/gts1.c b/src/mame/drivers/gts1.c index db42a66e66e..906c3de7444 100644 --- a/src/mame/drivers/gts1.c +++ b/src/mame/drivers/gts1.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/gts3.c b/src/mame/drivers/gts3.c index 7caa637722d..7765e333f63 100644 --- a/src/mame/drivers/gts3.c +++ b/src/mame/drivers/gts3.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/gts80.c b/src/mame/drivers/gts80.c index f2ab86af706..e3f8795f944 100644 --- a/src/mame/drivers/gts80.c +++ b/src/mame/drivers/gts80.c @@ -16,12 +16,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/gts80a.c b/src/mame/drivers/gts80a.c index e8d493e7dd7..a0f2bab1f8d 100644 --- a/src/mame/drivers/gts80a.c +++ b/src/mame/drivers/gts80a.c @@ -17,12 +17,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; @@ -34,9 +34,9 @@ public: : gts80a_state(mconfig, type, tag), m_videocpu(*this, "video_cpu") { } - + protected: - + // devices required_device m_videocpu; }; diff --git a/src/mame/drivers/gts80b.c b/src/mame/drivers/gts80b.c index 85f81eb6fd1..a2c79be31b8 100644 --- a/src/mame/drivers/gts80b.c +++ b/src/mame/drivers/gts80b.c @@ -16,12 +16,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/hankin.c b/src/mame/drivers/hankin.c index 03fa956a1a1..143e87b4bf9 100644 --- a/src/mame/drivers/hankin.c +++ b/src/mame/drivers/hankin.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/hazelgr.c b/src/mame/drivers/hazelgr.c index d0619f82d32..5acc3901d96 100644 --- a/src/mame/drivers/hazelgr.c +++ b/src/mame/drivers/hazelgr.c @@ -15,9 +15,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/icecold.c b/src/mame/drivers/icecold.c index 00606580716..177a440d484 100644 --- a/src/mame/drivers/icecold.c +++ b/src/mame/drivers/icecold.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/igspc.c b/src/mame/drivers/igspc.c index 72fa3b287a0..4bc6b259c5f 100644 --- a/src/mame/drivers/igspc.c +++ b/src/mame/drivers/igspc.c @@ -27,9 +27,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/inder.c b/src/mame/drivers/inder.c index 915a52a3e76..44185e4b750 100644 --- a/src/mame/drivers/inder.c +++ b/src/mame/drivers/inder.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/itgamble.c b/src/mame/drivers/itgamble.c index da0ad08ad20..47dde740836 100644 --- a/src/mame/drivers/itgamble.c +++ b/src/mame/drivers/itgamble.c @@ -67,12 +67,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); virtual void video_start(); diff --git a/src/mame/drivers/jeutel.c b/src/mame/drivers/jeutel.c index 5e392780ae7..3b28d132ab3 100644 --- a/src/mame/drivers/jeutel.c +++ b/src/mame/drivers/jeutel.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/jp.c b/src/mame/drivers/jp.c index 96607174955..8aba17eec37 100644 --- a/src/mame/drivers/jp.c +++ b/src/mame/drivers/jp.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/jpmmps.c b/src/mame/drivers/jpmmps.c index 8b0037302d3..c0a032317ba 100644 --- a/src/mame/drivers/jpmmps.c +++ b/src/mame/drivers/jpmmps.c @@ -35,9 +35,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/jpms80.c b/src/mame/drivers/jpms80.c index 556c62a767f..5d297e68be3 100644 --- a/src/mame/drivers/jpms80.c +++ b/src/mame/drivers/jpms80.c @@ -29,9 +29,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/jpmsys7.c b/src/mame/drivers/jpmsys7.c index 2f810f60ae1..41243099910 100644 --- a/src/mame/drivers/jpmsys7.c +++ b/src/mame/drivers/jpmsys7.c @@ -16,9 +16,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/jvh.c b/src/mame/drivers/jvh.c index 80ba8e8d2f6..cf3de4fa86f 100644 --- a/src/mame/drivers/jvh.c +++ b/src/mame/drivers/jvh.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/kissproto.c b/src/mame/drivers/kissproto.c index d286d7c7347..0ff5bb7e169 100644 --- a/src/mame/drivers/kissproto.c +++ b/src/mame/drivers/kissproto.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c index c751524e5d7..e25b2f9f24a 100644 --- a/src/mame/drivers/konamim2.c +++ b/src/mame/drivers/konamim2.c @@ -1282,8 +1282,8 @@ ROM_END ROM_START(3do_m2) ROM_REGION64_BE( 0x100000, "boot", 0 ) - ROM_SYSTEM_BIOS( 0, "panafz35", "Panasonic FZ-35S (3DO M2)" ) - ROMX_LOAD( "fz35_jpn.bin", 0x000000, 0x100000, CRC(e1c5bfd3) SHA1(0a3e27d672be79eeee1d2dc2da60d82f6eba7934), ROM_BIOS(1) ) + ROM_SYSTEM_BIOS( 0, "panafz35", "Panasonic FZ-35S (3DO M2)" ) + ROMX_LOAD( "fz35_jpn.bin", 0x000000, 0x100000, CRC(e1c5bfd3) SHA1(0a3e27d672be79eeee1d2dc2da60d82f6eba7934), ROM_BIOS(1) ) ROM_END static DRIVER_INIT( m2 ) diff --git a/src/mame/drivers/konendev.c b/src/mame/drivers/konendev.c index e70368d13b0..d0e7a42418b 100644 --- a/src/mame/drivers/konendev.c +++ b/src/mame/drivers/konendev.c @@ -23,9 +23,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/ltd.c b/src/mame/drivers/ltd.c index 143ab6bd7c6..8c071e90820 100644 --- a/src/mame/drivers/ltd.c +++ b/src/mame/drivers/ltd.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/maygayep.c b/src/mame/drivers/maygayep.c index 63e984c7676..621d09fae1a 100644 --- a/src/mame/drivers/maygayep.c +++ b/src/mame/drivers/maygayep.c @@ -38,9 +38,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/mephisto.c b/src/mame/drivers/mephisto.c index fd3e6bdc7d7..7a4fe3eb8cb 100644 --- a/src/mame/drivers/mephisto.c +++ b/src/mame/drivers/mephisto.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/micropin.c b/src/mame/drivers/micropin.c index 3de819c68e9..b2d436c5503 100644 --- a/src/mame/drivers/micropin.c +++ b/src/mame/drivers/micropin.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/midqslvr.c b/src/mame/drivers/midqslvr.c index eea55738071..107e1f64f87 100644 --- a/src/mame/drivers/midqslvr.c +++ b/src/mame/drivers/midqslvr.c @@ -42,12 +42,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void video_start(); virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/mmm.c b/src/mame/drivers/mmm.c index 51655deca08..bbe17bfce11 100644 --- a/src/mame/drivers/mmm.c +++ b/src/mame/drivers/mmm.c @@ -16,9 +16,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/mpu2.c b/src/mame/drivers/mpu2.c index 72f624fe0da..0d1a7874e68 100644 --- a/src/mame/drivers/mpu2.c +++ b/src/mame/drivers/mpu2.c @@ -47,9 +47,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/mpu5.c b/src/mame/drivers/mpu5.c index 264de3b33df..c4ab5210bc2 100644 --- a/src/mame/drivers/mpu5.c +++ b/src/mame/drivers/mpu5.c @@ -46,9 +46,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/mrgame.c b/src/mame/drivers/mrgame.c index 9c8e316c26b..b7fbbab6c9a 100644 --- a/src/mame/drivers/mrgame.c +++ b/src/mame/drivers/mrgame.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/namcops2.c b/src/mame/drivers/namcops2.c index 6a3e68cfb12..dbc1e8efc60 100644 --- a/src/mame/drivers/namcops2.c +++ b/src/mame/drivers/namcops2.c @@ -34,12 +34,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void video_start(); virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/neptunp2.c b/src/mame/drivers/neptunp2.c index dfc366278fc..040d37c33cb 100644 --- a/src/mame/drivers/neptunp2.c +++ b/src/mame/drivers/neptunp2.c @@ -19,14 +19,14 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + DECLARE_READ8_MEMBER(test_r); - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void video_start(); virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/nsm.c b/src/mame/drivers/nsm.c index 8995c022b51..be2a27e7136 100644 --- a/src/mame/drivers/nsm.c +++ b/src/mame/drivers/nsm.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index 0cd3ade7417..ab0d6732f37 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -907,20 +907,20 @@ static ADDRESS_MAP_START( birdiy_map, AS_PROGRAM, 8 ) AM_RANGE(0x0000, 0x3fff) AM_MIRROR(0x8000) AM_ROM AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_videoram_w) AM_BASE_MEMBER(pacman_state, m_videoram) AM_RANGE(0x4400, 0x47ff) AM_MIRROR(0xa000) AM_RAM_WRITE(pacman_colorram_w) AM_BASE_MEMBER(pacman_state, m_colorram) -// AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READ(pacman_read_nop) AM_WRITENOP +// AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0xa000) AM_READ(pacman_read_nop) AM_WRITENOP AM_RANGE(0x4c00, 0x4fef) AM_MIRROR(0xa000) AM_RAM AM_RANGE(0x4ff0, 0x4fff) AM_MIRROR(0xa000) AM_RAM AM_BASE_SIZE_GENERIC(spriteram) -// AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf38) AM_WRITE(interrupt_enable_w) +// AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf38) AM_WRITE(interrupt_enable_w) AM_RANGE(0x5001, 0x5001) AM_MIRROR(0xaf38) AM_DEVWRITE("namco", pacman_sound_enable_w) -// AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITENOP +// AM_RANGE(0x5002, 0x5002) AM_MIRROR(0xaf38) AM_WRITENOP AM_RANGE(0x5003, 0x5003) AM_MIRROR(0xaf38) AM_WRITE(pacman_flipscreen_w) -// AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_leds_w) -// AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_coin_lockout_global_w) +// AM_RANGE(0x5004, 0x5005) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_leds_w) +// AM_RANGE(0x5006, 0x5006) AM_MIRROR(0xaf38) AM_WRITENOP // AM_WRITE(pacman_coin_lockout_global_w) AM_RANGE(0x5007, 0x5007) AM_MIRROR(0xaf38) AM_WRITE(pacman_coin_counter_w) AM_RANGE(0x5080, 0x509f) AM_MIRROR(0xaf00) AM_DEVWRITE("namco", pacman_sound_w) AM_RANGE(0x50a0, 0x50af) AM_MIRROR(0xaf00) AM_WRITEONLY AM_BASE_GENERIC(spriteram2) -// AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITENOP -// AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITENOP +// AM_RANGE(0x5070, 0x507f) AM_MIRROR(0xaf00) AM_WRITENOP +// AM_RANGE(0x5080, 0x5080) AM_MIRROR(0xaf3f) AM_WRITENOP AM_RANGE(0x50c0, 0x50c0) AM_MIRROR(0xaf3f) AM_WRITE(watchdog_reset_w) AM_RANGE(0x5000, 0x5000) AM_MIRROR(0xaf3f) AM_READ_PORT("IN0") /* IN0 */ AM_RANGE(0x5040, 0x5040) AM_MIRROR(0xaf3f) AM_READ_PORT("IN1") /* IN1 */ diff --git a/src/mame/drivers/play_1.c b/src/mame/drivers/play_1.c index 6c341d768a4..7eb7184e23f 100644 --- a/src/mame/drivers/play_1.c +++ b/src/mame/drivers/play_1.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/play_2.c b/src/mame/drivers/play_2.c index 8710eab9991..913d862ecf7 100644 --- a/src/mame/drivers/play_2.c +++ b/src/mame/drivers/play_2.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/play_3.c b/src/mame/drivers/play_3.c index 8f6220c9f09..43fd6b0cf1c 100644 --- a/src/mame/drivers/play_3.c +++ b/src/mame/drivers/play_3.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/play_5.c b/src/mame/drivers/play_5.c index 65240dc5518..8f850191eb2 100644 --- a/src/mame/drivers/play_5.c +++ b/src/mame/drivers/play_5.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/proconn.c b/src/mame/drivers/proconn.c index d95a43c1452..950aa69b575 100644 --- a/src/mame/drivers/proconn.c +++ b/src/mame/drivers/proconn.c @@ -17,9 +17,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/queen.c b/src/mame/drivers/queen.c index 03174be0f71..2acb9320d13 100644 --- a/src/mame/drivers/queen.c +++ b/src/mame/drivers/queen.c @@ -32,12 +32,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void video_start(); virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/rcorsair.c b/src/mame/drivers/rcorsair.c index 64380c6a9c8..d69f0f71573 100644 --- a/src/mame/drivers/rcorsair.c +++ b/src/mame/drivers/rcorsair.c @@ -59,12 +59,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void video_start(); virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/rowamet.c b/src/mame/drivers/rowamet.c index 01ac2138f87..422a10edb59 100644 --- a/src/mame/drivers/rowamet.c +++ b/src/mame/drivers/rowamet.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/s11.c b/src/mame/drivers/s11.c index e135967567a..d4a28658482 100644 --- a/src/mame/drivers/s11.c +++ b/src/mame/drivers/s11.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/s11a.c b/src/mame/drivers/s11a.c index 9e9cc00826c..e0ae5fa265a 100644 --- a/src/mame/drivers/s11a.c +++ b/src/mame/drivers/s11a.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/s11b.c b/src/mame/drivers/s11b.c index 7ae0f460d30..965a1a75c34 100644 --- a/src/mame/drivers/s11b.c +++ b/src/mame/drivers/s11b.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/s11c.c b/src/mame/drivers/s11c.c index d8aea2884cf..c0b0d8990d2 100644 --- a/src/mame/drivers/s11c.c +++ b/src/mame/drivers/s11c.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/s3.c b/src/mame/drivers/s3.c index 783e1e65ba2..9a012dc3a8c 100644 --- a/src/mame/drivers/s3.c +++ b/src/mame/drivers/s3.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/s4.c b/src/mame/drivers/s4.c index 2ec9ecc891c..2f6ab8def8a 100644 --- a/src/mame/drivers/s4.c +++ b/src/mame/drivers/s4.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/s6.c b/src/mame/drivers/s6.c index 761a3655c6f..fdd23d4fafa 100644 --- a/src/mame/drivers/s6.c +++ b/src/mame/drivers/s6.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/s6a.c b/src/mame/drivers/s6a.c index 1bf24e053bf..584cb9ca396 100644 --- a/src/mame/drivers/s6a.c +++ b/src/mame/drivers/s6a.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/s7.c b/src/mame/drivers/s7.c index 5fc228b4230..dae0f397c83 100644 --- a/src/mame/drivers/s7.c +++ b/src/mame/drivers/s7.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/s8.c b/src/mame/drivers/s8.c index f3540a58f01..ec15888f5e8 100644 --- a/src/mame/drivers/s8.c +++ b/src/mame/drivers/s8.c @@ -14,14 +14,14 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides - virtual void machine_reset(); + virtual void machine_reset(); }; diff --git a/src/mame/drivers/s9.c b/src/mame/drivers/s9.c index 53a3d8f2ddf..d7cb028be10 100644 --- a/src/mame/drivers/s9.c +++ b/src/mame/drivers/s9.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/savquest.c b/src/mame/drivers/savquest.c index 3ea95e0a870..6d67c6796f5 100644 --- a/src/mame/drivers/savquest.c +++ b/src/mame/drivers/savquest.c @@ -44,12 +44,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void video_start(); virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/segajw.c b/src/mame/drivers/segajw.c index 62e6fcd9574..89ac233798d 100644 --- a/src/mame/drivers/segajw.c +++ b/src/mame/drivers/segajw.c @@ -32,12 +32,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_start(); virtual void machine_reset(); diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c index 3769d94a93d..2ca2c12bf77 100644 --- a/src/mame/drivers/sfbonus.c +++ b/src/mame/drivers/sfbonus.c @@ -5419,7 +5419,7 @@ ROM_START( fbdeluxe ) ROM_LOAD16_BYTE( "fbrom6.bin", 0x00001, 0x80000, CRC(ec47c758) SHA1(f8cb7f8cadc6d6b0b98bb71e78adcd9239ec734f) ) ROM_REGION( 0x1000, "defaults", 0 ) /* default settings */ - ROM_LOAD_OPTIONAL( "fbdeluxe.id", 0x00, 0x1000, CRC(4a4ab8f6) SHA1(12710cb4e5f94449a4899daac0ab9687dabd82cd) ) + ROM_LOAD_OPTIONAL( "fbdeluxe.id", 0x00, 0x1000, CRC(4a4ab8f6) SHA1(12710cb4e5f94449a4899daac0ab9687dabd82cd) ) ROM_END ROM_START( fbdeluxeo ) @@ -5438,7 +5438,7 @@ ROM_START( fbdeluxeo ) ROM_LOAD16_BYTE( "fbrom6.bin", 0x00001, 0x80000, CRC(ec47c758) SHA1(f8cb7f8cadc6d6b0b98bb71e78adcd9239ec734f) ) ROM_REGION( 0x1000, "defaults", 0 ) /* default settings */ - ROM_LOAD_OPTIONAL( "fbdeluxe.id", 0x00, 0x1000, CRC(4a4ab8f6) SHA1(12710cb4e5f94449a4899daac0ab9687dabd82cd) ) + ROM_LOAD_OPTIONAL( "fbdeluxe.id", 0x00, 0x1000, CRC(4a4ab8f6) SHA1(12710cb4e5f94449a4899daac0ab9687dabd82cd) ) ROM_END /* Fruit Bonus 3G */ diff --git a/src/mame/drivers/sleic.c b/src/mame/drivers/sleic.c index 340e52d0355..538c305d244 100644 --- a/src/mame/drivers/sleic.c +++ b/src/mame/drivers/sleic.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; @@ -65,7 +65,7 @@ ROM_START(sleicpin) ROM_REGION(0x10000, "cpu2", 0) ROM_LOAD("sp01-1_1.rom", 0x0000, 0x2000, CRC(240015bb) SHA1(0e647718173ad59dafbf3b5bc84bef3c33886e23)) - + ROM_REGION(0x10000, "cpu3", 0) ROM_LOAD("sp04-1_1.rom", 0x0000, 0x8000, CRC(84514cfa) SHA1(6aa87b86892afa534cf963821f08286c126b4245)) diff --git a/src/mame/drivers/spectra.c b/src/mame/drivers/spectra.c index d33584df2af..cef4648440d 100644 --- a/src/mame/drivers/spectra.c +++ b/src/mame/drivers/spectra.c @@ -16,12 +16,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/spinb.c b/src/mame/drivers/spinb.c index 206dcaa1cca..9a5e96c83ad 100644 --- a/src/mame/drivers/spinb.c +++ b/src/mame/drivers/spinb.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/st_mp100.c b/src/mame/drivers/st_mp100.c index b141f98734e..725818cd216 100644 --- a/src/mame/drivers/st_mp100.c +++ b/src/mame/drivers/st_mp100.c @@ -15,12 +15,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/st_mp200.c b/src/mame/drivers/st_mp200.c index e612926db51..5f313569a5a 100644 --- a/src/mame/drivers/st_mp200.c +++ b/src/mame/drivers/st_mp200.c @@ -15,12 +15,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/stellafr.c b/src/mame/drivers/stellafr.c index 440c12bca80..f07d56d603f 100644 --- a/src/mame/drivers/stellafr.c +++ b/src/mame/drivers/stellafr.c @@ -20,9 +20,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/sumt8035.c b/src/mame/drivers/sumt8035.c index 54405688c89..0693ad9db5d 100644 --- a/src/mame/drivers/sumt8035.c +++ b/src/mame/drivers/sumt8035.c @@ -22,9 +22,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/taito.c b/src/mame/drivers/taito.c index 4bc5be529ad..98bfdd95659 100644 --- a/src/mame/drivers/taito.c +++ b/src/mame/drivers/taito.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/techno.c b/src/mame/drivers/techno.c index 212c2ca1d7a..7cfedacf379 100644 --- a/src/mame/drivers/techno.c +++ b/src/mame/drivers/techno.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/tokyocop.c b/src/mame/drivers/tokyocop.c index ff67ad08a5b..8a587be5f31 100644 --- a/src/mame/drivers/tokyocop.c +++ b/src/mame/drivers/tokyocop.c @@ -29,12 +29,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void video_start(); virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/turrett.c b/src/mame/drivers/turrett.c index 01ce75c1555..eb679468223 100644 --- a/src/mame/drivers/turrett.c +++ b/src/mame/drivers/turrett.c @@ -70,12 +70,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void video_start(); virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/unkpcp.c b/src/mame/drivers/unkpcp.c index 01c587c0441..5c8d537e423 100644 --- a/src/mame/drivers/unkpcp.c +++ b/src/mame/drivers/unkpcp.c @@ -15,9 +15,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/vd.c b/src/mame/drivers/vd.c index 9e623451428..ce6e4d066ec 100644 --- a/src/mame/drivers/vd.c +++ b/src/mame/drivers/vd.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/vp101.c b/src/mame/drivers/vp101.c index 1dc90bd7ba6..c4a5b569f43 100644 --- a/src/mame/drivers/vp101.c +++ b/src/mame/drivers/vp101.c @@ -26,15 +26,15 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + DECLARE_READ32_MEMBER(tty_ready_r); DECLARE_WRITE32_MEMBER(tty_w); - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void video_start(); virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c index af329463f9e..853c33d5ca0 100644 --- a/src/mame/drivers/wecleman.c +++ b/src/mame/drivers/wecleman.c @@ -1109,7 +1109,7 @@ static MACHINE_RESET( hotchase ) int i; /* TODO: PCB reference clearly shows that the POST has random/filled data on the paletteram. - For now let's fill everything with white colors until we have better info about it */ + For now let's fill everything with white colors until we have better info about it */ for(i=0;i<0x2000/2;i++) { machine.generic.paletteram.u16[i] = 0xffff; diff --git a/src/mame/drivers/white_mod.c b/src/mame/drivers/white_mod.c index 96e3f0ba12a..072521f81c1 100644 --- a/src/mame/drivers/white_mod.c +++ b/src/mame/drivers/white_mod.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/wico.c b/src/mame/drivers/wico.c index cce0bd6a022..95e2e5180c1 100644 --- a/src/mame/drivers/wico.c +++ b/src/mame/drivers/wico.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/wms.c b/src/mame/drivers/wms.c index ac36b8e2d5e..fea5340b6bb 100644 --- a/src/mame/drivers/wms.c +++ b/src/mame/drivers/wms.c @@ -18,9 +18,9 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; }; diff --git a/src/mame/drivers/wpc_95.c b/src/mame/drivers/wpc_95.c index 10ef4409eec..77fb0d9c97c 100644 --- a/src/mame/drivers/wpc_95.c +++ b/src/mame/drivers/wpc_95.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/wpc_an.c b/src/mame/drivers/wpc_an.c index 41a14eff5ad..8fe25e41d18 100644 --- a/src/mame/drivers/wpc_an.c +++ b/src/mame/drivers/wpc_an.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/wpc_dcs.c b/src/mame/drivers/wpc_dcs.c index eae8f01c3b0..d357dc21c12 100644 --- a/src/mame/drivers/wpc_dcs.c +++ b/src/mame/drivers/wpc_dcs.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/wpc_dot.c b/src/mame/drivers/wpc_dot.c index 6efd5cf8c3f..6ee884a883a 100644 --- a/src/mame/drivers/wpc_dot.c +++ b/src/mame/drivers/wpc_dot.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/wpc_flip1.c b/src/mame/drivers/wpc_flip1.c index a6ad1cc9432..b71f1941b62 100644 --- a/src/mame/drivers/wpc_flip1.c +++ b/src/mame/drivers/wpc_flip1.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/wpc_flip2.c b/src/mame/drivers/wpc_flip2.c index ef0739b6f94..c4eab6ac9c9 100644 --- a/src/mame/drivers/wpc_flip2.c +++ b/src/mame/drivers/wpc_flip2.c @@ -10,12 +10,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/wpc_s.c b/src/mame/drivers/wpc_s.c index 4c22621aaef..149ab35e1fc 100644 --- a/src/mame/drivers/wpc_s.c +++ b/src/mame/drivers/wpc_s.c @@ -10,14 +10,14 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides - virtual void machine_reset(); + virtual void machine_reset(); }; diff --git a/src/mame/drivers/xtom3d.c b/src/mame/drivers/xtom3d.c index d9522b1fb33..cf9d3160cb5 100644 --- a/src/mame/drivers/xtom3d.c +++ b/src/mame/drivers/xtom3d.c @@ -56,12 +56,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void video_start(); virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); diff --git a/src/mame/drivers/zac_1.c b/src/mame/drivers/zac_1.c index a545f5ce55f..f65a749bf33 100644 --- a/src/mame/drivers/zac_1.c +++ b/src/mame/drivers/zac_1.c @@ -14,12 +14,12 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); }; diff --git a/src/mame/drivers/zac_2.c b/src/mame/drivers/zac_2.c index cfa92de867f..6783afd8cc0 100644 --- a/src/mame/drivers/zac_2.c +++ b/src/mame/drivers/zac_2.c @@ -14,15 +14,15 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } - + protected: - + // devices required_device m_maincpu; - + // driver_device overrides virtual void machine_reset(); - + }; diff --git a/src/mame/includes/4enraya.h b/src/mame/includes/4enraya.h index 1942bf2501a..795aa6ab3aa 100644 --- a/src/mame/includes/4enraya.h +++ b/src/mame/includes/4enraya.h @@ -21,7 +21,7 @@ public: int m_soundlatch; int m_last_snd_ctrl; int m_videoram_size; - + int m_snd_latch_bit; }; diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h index 7b2d43cdcff..47335e4fbf2 100644 --- a/src/mame/includes/zerozone.h +++ b/src/mame/includes/zerozone.h @@ -17,34 +17,34 @@ public: m_vram(*this, "videoram"), m_vram_size(*this, "videoram") { } - + // in drivers/zerozone.c DECLARE_WRITE16_MEMBER(sound_w); - + // in video/zerozone.c DECLARE_WRITE16_MEMBER(tilemap_w); DECLARE_WRITE16_MEMBER(tilebank_w); - + // devices required_device m_maincpu; required_device m_audiocpu; - + // shared pointers required_shared_ptr m_vram; required_shared_size m_vram_size; // currently this driver uses generic palette handling - + // state // video-related UINT16 m_tilebank; tilemap_t *m_zz_tilemap; - + protected: - + // driver_device overrides virtual void machine_start(); virtual void machine_reset(); - + virtual void video_start(); virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); }; diff --git a/src/mame/includes/zodiack.h b/src/mame/includes/zodiack.h index 622b7c58428..a46074bd9e9 100644 --- a/src/mame/includes/zodiack.h +++ b/src/mame/includes/zodiack.h @@ -30,14 +30,14 @@ public: DECLARE_WRITE8_MEMBER(videoram2_w); DECLARE_WRITE8_MEMBER(attributes_w); DECLARE_WRITE8_MEMBER(flipscreen_w); - + void draw_bullets(bitmap_t *bitmap, const rectangle *cliprect); void draw_sprites(bitmap_t *bitmap, const rectangle *cliprect); - + // devices required_device m_maincpu; required_device m_audiocpu; - + // shared pointers required_shared_ptr m_videoram; required_shared_ptr m_videoram_2; @@ -48,30 +48,30 @@ public: required_shared_size m_spriteram_size; required_shared_size m_bulletsram_size; // currently this driver uses generic palette handling - + // state // video-related tilemap_t *m_bg_tilemap; tilemap_t *m_fg_tilemap; - + // sound-related UINT8 m_nmi_enable; UINT8 m_sound_nmi_enabled; - + // misc int m_percuss_hardware; - + protected: - + // driver_device overrides virtual void machine_start(); virtual void machine_reset(); - + virtual void video_start(); virtual bool screen_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); }; -class percuss_state : public zodiack_state +class percuss_state : public zodiack_state { public: percuss_state(const machine_config &mconfig, device_type type, const char *tag) diff --git a/src/mame/machine/archimds.c b/src/mame/machine/archimds.c index 18de7441cdc..3ce47404615 100644 --- a/src/mame/machine/archimds.c +++ b/src/mame/machine/archimds.c @@ -700,7 +700,7 @@ READ32_HANDLER(archimedes_ioc_r) case 5: if (fdc) { switch(ioc_addr & 0xfffc) - { + { case 0x50: return 0; //fdc type, new model returns 5 here } } diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c index 417907a4f7e..bfe8f8aae5d 100644 --- a/src/mame/machine/snes.c +++ b/src/mame/machine/snes.c @@ -581,7 +581,7 @@ READ8_HANDLER( snes_r_io ) if (port != NULL) return input_port_read(space->machine(), "DSW"); else - return snes_open_bus_r(space, 0); + return snes_open_bus_r(space, 0); } // case 0x4101: //PC: a104 - a10e - a12a //only nss_actr // case 0x420c: //PC: 9c7d - 8fab //only nss_ssoc @@ -2148,8 +2148,8 @@ INLINE void snes_dma_transfer( address_space *space, UINT8 dma, UINT32 abus, UIN #if USE_CYCLE_STEAL /* every byte transfer takes 8 master cycles */ -// FIXME: this cycle steal makes Final Fantasy VI (III in US) very glitchy! -// device_adjust_icount(&space->device(),-8); +// FIXME: this cycle steal makes Final Fantasy VI (III in US) very glitchy! +// device_adjust_icount(&space->device(),-8); #endif if (state->m_dma_channel[dma].dmap & 0x80) /* PPU->CPU */ diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 771204b8538..21a27ebf583 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -5157,7 +5157,7 @@ ctisland3 // 16 // 17 1981.10 Bobbitto cexplore // 18 1982.02 Explorer cdiscon1 // 19 1982.04 Disco No.1 -csweetht // 19 Sweet Heart +csweetht // 19 Sweet Heart ctornado // 20 1982.05 Tornado cmissnx // 21 1982.04 Mission-X/Zoar cptennis // 22 1982.06 Pro Tennis diff --git a/src/mame/video/gaelco3d.c b/src/mame/video/gaelco3d.c index ab1b40806ae..c94c877f00e 100644 --- a/src/mame/video/gaelco3d.c +++ b/src/mame/video/gaelco3d.c @@ -437,43 +437,43 @@ SCREEN_UPDATE( gaelco3d ) int ret; /* - if (DISPLAY_TEXTURE && (screen->machine().input().code_pressed(KEYCODE_Z) || screen->machine().input().code_pressed(KEYCODE_X))) - { - static int xv = 0, yv = 0x1000; - UINT8 *base = state->m_texture; - int length = state->m_texture_size; + if (DISPLAY_TEXTURE && (screen->machine().input().code_pressed(KEYCODE_Z) || screen->machine().input().code_pressed(KEYCODE_X))) + { + static int xv = 0, yv = 0x1000; + UINT8 *base = state->m_texture; + int length = state->m_texture_size; - if (screen->machine().input().code_pressed(KEYCODE_X)) - { - base = state->m_texmask; - length = state->m_texmask_size; - } + if (screen->machine().input().code_pressed(KEYCODE_X)) + { + base = state->m_texmask; + length = state->m_texmask_size; + } - if (screen->machine().input().code_pressed(KEYCODE_LEFT) && xv >= 4) - xv -= 4; - if (screen->machine().input().code_pressed(KEYCODE_RIGHT) && xv < 4096 - 4) - xv += 4; + if (screen->machine().input().code_pressed(KEYCODE_LEFT) && xv >= 4) + xv -= 4; + if (screen->machine().input().code_pressed(KEYCODE_RIGHT) && xv < 4096 - 4) + xv += 4; - if (screen->machine().input().code_pressed(KEYCODE_UP) && yv >= 4) - yv -= 4; - if (screen->machine().input().code_pressed(KEYCODE_DOWN) && yv < 0x40000) - yv += 4; + if (screen->machine().input().code_pressed(KEYCODE_UP) && yv >= 4) + yv -= 4; + if (screen->machine().input().code_pressed(KEYCODE_DOWN) && yv < 0x40000) + yv += 4; - for (y = cliprect->min_y; y <= cliprect->max_y; y++) - { - UINT16 *dest = BITMAP_ADDR16(bitmap, y, 0); - for (x = cliprect->min_x; x <= cliprect->max_x; x++) - { - int offs = (yv + y - cliprect->min_y) * 4096 + xv + x - cliprect->min_x; - if (offs < length) - dest[x] = base[offs]; - else - dest[x] = 0; - } - } - popmessage("(%04X,%04X)", xv, yv); - } - else*/ + for (y = cliprect->min_y; y <= cliprect->max_y; y++) + { + UINT16 *dest = BITMAP_ADDR16(bitmap, y, 0); + for (x = cliprect->min_x; x <= cliprect->max_x; x++) + { + int offs = (yv + y - cliprect->min_y) * 4096 + xv + x - cliprect->min_x; + if (offs < length) + dest[x] = base[offs]; + else + dest[x] = 0; + } + } + popmessage("(%04X,%04X)", xv, yv); + } + else*/ { if (state->m_video_changed) copybitmap(bitmap, state->m_poly->screenbits(), 0,1, 0,0, cliprect); diff --git a/src/mame/video/jagobj.c b/src/mame/video/jagobj.c index 937f196b0dc..2eb73af2df5 100644 --- a/src/mame/video/jagobj.c +++ b/src/mame/video/jagobj.c @@ -972,8 +972,8 @@ static UINT32 *process_branch(running_machine &machine, UINT32 *objdata, int vc, UINT32 link = (lower >> 24) | ((upper & 0x7ff) << 8); int taken = 0; -// if ((ypos & 1) && ypos != 0x7ff) -// fprintf(stderr, " branch cc=%d ypos=%X link=%06X - \n", cc, ypos, link << 3); +// if ((ypos & 1) && ypos != 0x7ff) +// fprintf(stderr, " branch cc=%d ypos=%X link=%06X - \n", cc, ypos, link << 3); switch (cc) { @@ -1089,7 +1089,7 @@ static void process_object_list(running_machine &machine, int vc, UINT16 *_scanl logerror("stop = %08X-%08X\n", objdata[0], objdata[1]); if (interrupt) { -// fprintf(stderr, "stop int=%d\n", interrupt); +// fprintf(stderr, "stop int=%d\n", interrupt); cpu_irq_state |= 4; update_cpu_irq(machine); } diff --git a/src/mame/video/midvunit.c b/src/mame/video/midvunit.c index 9a9feb5de40..5015a41d880 100644 --- a/src/mame/video/midvunit.c +++ b/src/mame/video/midvunit.c @@ -54,7 +54,7 @@ VIDEO_START( midvunit ) { midvunit_state *state = machine.driver_data(); state->m_scanline_timer = machine.scheduler().timer_alloc(FUNC(scanline_timer_cb)); - + state->m_poly = auto_alloc(machine, midvunit_renderer(*state)); state_save_register_global_array(machine, state->m_video_regs); diff --git a/src/mame/video/pacman.c b/src/mame/video/pacman.c index 1d01d4372fd..cea6758f636 100644 --- a/src/mame/video/pacman.c +++ b/src/mame/video/pacman.c @@ -310,7 +310,7 @@ SCREEN_UPDATE( pacman ) drawgfx_transmask(bitmap,&spriteclip,screen->machine().gfx[1], ( spriteram[offs] >> 2 ) | (state->m_spritebank << 6), color, - fy,fx, //FIXME: flipping bits are really supposed to be inverted here? + fy,fx, //FIXME: flipping bits are really supposed to be inverted here? sx - 256,sy + state->m_xoffsethack, colortable_get_transpen_mask(screen->machine().colortable, screen->machine().gfx[1], color & 0x3f, 0)); } diff --git a/src/osd/sdl/netdev_tap.c b/src/osd/sdl/netdev_tap.c index ee44bac44ca..cc68c97c229 100644 --- a/src/osd/sdl/netdev_tap.c +++ b/src/osd/sdl/netdev_tap.c @@ -100,4 +100,4 @@ void init_tap() void deinit_tap() { clear_netdev(); -} \ No newline at end of file +} diff --git a/src/osd/sdl/sdlmain.c b/src/osd/sdl/sdlmain.c index 47d5ba8bcd4..b6b74c8d1c0 100644 --- a/src/osd/sdl/sdlmain.c +++ b/src/osd/sdl/sdlmain.c @@ -272,8 +272,8 @@ sdl_options::sdl_options() { astring ini_path(INI_PATH); add_entries(s_option_entries); - ini_path.replace(0, "APP_NAME", emulator_info::get_appname_lower()); - set_default_value(SDLOPTION_INIPATH, ini_path.cstr()); + ini_path.replace(0, "APP_NAME", emulator_info::get_appname_lower()); + set_default_value(SDLOPTION_INIPATH, ini_path.cstr()); } diff --git a/src/osd/windows/netdev_pcap.c b/src/osd/windows/netdev_pcap.c index 241ba54af0a..02887f3a831 100644 --- a/src/osd/windows/netdev_pcap.c +++ b/src/osd/windows/netdev_pcap.c @@ -122,7 +122,7 @@ void init_pcap() mame_printf_verbose("Unable to get network devices: %s\n", errbuf); return; } - + if (devs) { while(devs->next) diff --git a/src/version.c b/src/version.c index 377e1d518e7..1bb47688d9f 100644 --- a/src/version.c +++ b/src/version.c @@ -38,4 +38,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.144 ("__DATE__")"; +const char build_version[] = "0.144u1 ("__DATE__")";