From e4f37ea7ba9c78a0ddbaeacdc2cc84a8029296bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20St=C3=B6neberg?= Date: Mon, 11 Feb 2013 08:38:01 +0000 Subject: [PATCH] added missing virtual to device-level overrides (nw) --- src/emu/cpu/psx/psx.h | 2 +- src/emu/machine/tms9901.h | 8 +++--- src/emu/machine/tms9902.h | 8 +++--- src/emu/sound/bsmt2000.h | 4 +-- src/emu/sound/ics2115.h | 2 +- src/emu/sound/qs1000.h | 4 +-- src/emu/sound/sn76496.h | 4 +-- src/emu/sound/tms5220.h | 8 +++--- src/emu/sound/votrax.h | 2 +- src/emu/video/k053250.h | 4 +-- src/mame/machine/jvs13551.h | 2 +- src/mame/machine/k573cass.h | 2 +- src/mame/machine/zndip.h | 2 +- src/mame/machine/znsec.h | 2 +- src/mess/includes/next.h | 2 +- src/mess/includes/pc4.h | 2 +- src/mess/machine/at29040a.h | 8 +++--- src/mess/machine/isa_ibm_mfc.h | 2 +- src/mess/machine/kc_rom.h | 4 +-- src/mess/machine/nextkbd.h | 2 +- src/mess/machine/psxcport.h | 2 +- src/mess/machine/smc92x4.h | 6 ++--- src/mess/machine/teleprinter.h | 2 +- src/mess/machine/ti99/bwg.h | 12 ++++----- src/mess/machine/ti99/datamux.h | 2 +- src/mess/machine/ti99/evpc.h | 10 ++++---- src/mess/machine/ti99/genboard.h | 20 +++++++-------- src/mess/machine/ti99/grom.h | 6 ++--- src/mess/machine/ti99/gromport.h | 42 ++++++++++++++++---------------- src/mess/machine/ti99/handset.h | 12 ++++----- src/mess/machine/ti99/hfdc.h | 12 ++++----- src/mess/machine/ti99/horizon.h | 8 +++--- src/mess/machine/ti99/hsgpl.h | 12 ++++----- src/mess/machine/ti99/joyport.h | 6 ++--- src/mess/machine/ti99/mapper8.h | 4 +-- src/mess/machine/ti99/mecmouse.h | 10 ++++---- src/mess/machine/ti99/memex.h | 8 +++--- src/mess/machine/ti99/myarcmem.h | 8 +++--- src/mess/machine/ti99/p_code.h | 12 ++++----- src/mess/machine/ti99/peribox.h | 14 +++++------ src/mess/machine/ti99/samsmem.h | 6 ++--- src/mess/machine/ti99/spchsyn.h | 10 ++++---- src/mess/machine/ti99/speech8.h | 8 +++--- src/mess/machine/ti99/ti32kmem.h | 4 +-- src/mess/machine/ti99/ti99_hd.h | 12 ++++----- src/mess/machine/ti99/ti_fdc.h | 12 ++++----- src/mess/machine/ti99/ti_rs232.h | 18 +++++++------- src/mess/machine/ti99/tn_ide.h | 10 ++++---- src/mess/machine/ti99/tn_usbsm.h | 10 ++++---- src/mess/machine/ti99/videowrp.h | 8 +++--- src/mess/video/hd44780.h | 2 +- 51 files changed, 191 insertions(+), 191 deletions(-) diff --git a/src/emu/cpu/psx/psx.h b/src/emu/cpu/psx/psx.h index 1e17be202e2..bef8ba3380a 100644 --- a/src/emu/cpu/psx/psx.h +++ b/src/emu/cpu/psx/psx.h @@ -172,7 +172,7 @@ protected: virtual void device_start(); virtual void device_reset(); virtual void device_post_load(); - machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const; // device_execute_interface overrides virtual UINT32 execute_min_cycles() const { return 1; } diff --git a/src/emu/machine/tms9901.h b/src/emu/machine/tms9901.h index d4b8c4351b4..21c2560304a 100644 --- a/src/emu/machine/tms9901.h +++ b/src/emu/machine/tms9901.h @@ -71,13 +71,13 @@ public: private: static const device_timer_id DECREMENTER = 0; - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); void timer_reload(void); void field_interrupts(void); - void device_start(void); - void device_stop(void); - void device_reset(void); + virtual void device_start(void); + virtual void device_stop(void); + virtual void device_reset(void); /* interrupt registers */ // mask: bit #n is set if pin #n is supported as an interrupt pin, diff --git a/src/emu/machine/tms9902.h b/src/emu/machine/tms9902.h index 6642c0d3721..db357fd9dd9 100644 --- a/src/emu/machine/tms9902.h +++ b/src/emu/machine/tms9902.h @@ -71,10 +71,10 @@ public: DECLARE_WRITE8_MEMBER( cruwrite ); protected: - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - void device_start(); - void device_reset(); - void device_stop(); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start(); + virtual void device_reset(); + virtual void device_stop(); private: void field_interrupts(); diff --git a/src/emu/sound/bsmt2000.h b/src/emu/sound/bsmt2000.h index 276050709f7..0093da67b34 100644 --- a/src/emu/sound/bsmt2000.h +++ b/src/emu/sound/bsmt2000.h @@ -84,8 +84,8 @@ public: protected: // device-level overrides - const rom_entry *device_rom_region() const; - machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const; virtual void device_start(); virtual void device_reset(); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/emu/sound/ics2115.h b/src/emu/sound/ics2115.h index d60dc6bcb40..03eb91b5bcd 100644 --- a/src/emu/sound/ics2115.h +++ b/src/emu/sound/ics2115.h @@ -114,7 +114,7 @@ protected: virtual void device_reset(); // internal callbacks - void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); // internal state void (*m_irq_cb)(device_t *device, int state); diff --git a/src/emu/sound/qs1000.h b/src/emu/sound/qs1000.h index 29a608fc2e7..e0520db625b 100644 --- a/src/emu/sound/qs1000.h +++ b/src/emu/sound/qs1000.h @@ -69,8 +69,8 @@ public: protected: // device-level overrides - const rom_entry *device_rom_region() const; - machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const; virtual void device_config_complete(); virtual void device_start(); virtual void device_reset(); diff --git a/src/emu/sound/sn76496.h b/src/emu/sound/sn76496.h index f6d03596edc..a3645657e0a 100644 --- a/src/emu/sound/sn76496.h +++ b/src/emu/sound/sn76496.h @@ -32,8 +32,8 @@ public: DECLARE_WRITE8_MEMBER( write ); protected: - void device_start(); - void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void device_start(); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); private: inline bool in_noise_mode(); diff --git a/src/emu/sound/tms5220.h b/src/emu/sound/tms5220.h index d8b27b898d1..372e8bbb829 100644 --- a/src/emu/sound/tms5220.h +++ b/src/emu/sound/tms5220.h @@ -137,8 +137,8 @@ class tms52xx_device : public device_t, public device_sound_interface { public: tms52xx_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, const struct tms5100_coeffs* coeffs, const int var, device_t *owner, UINT32 clock); - void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); DECLARE_WRITE_LINE_MEMBER( rsq_w ); DECLARE_WRITE_LINE_MEMBER( wsq_w ); @@ -150,8 +150,8 @@ public: double time_to_ready(); protected: - void device_start(); - void device_reset(); + virtual void device_start(); + virtual void device_reset(); private: // Methods diff --git a/src/emu/sound/votrax.h b/src/emu/sound/votrax.h index 07e51b9c8c9..6d7d2d83730 100644 --- a/src/emu/sound/votrax.h +++ b/src/emu/sound/votrax.h @@ -86,7 +86,7 @@ public: protected: // device-level overrides - const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const; virtual void device_start(); virtual void device_reset(); virtual void device_clock_changed(); diff --git a/src/emu/video/k053250.h b/src/emu/video/k053250.h index c87850e74f4..917e6d2b74e 100644 --- a/src/emu/video/k053250.h +++ b/src/emu/video/k053250.h @@ -29,8 +29,8 @@ public: void draw( bitmap_rgb32 &bitmap, const rectangle &cliprect, int colorbase, int flags, int priority ); protected: - void device_start(); - void device_reset(); + virtual void device_start(); + virtual void device_reset(); private: UINT8 regs[8]; diff --git a/src/mame/machine/jvs13551.h b/src/mame/machine/jvs13551.h index c33530663c8..b4462afb95f 100644 --- a/src/mame/machine/jvs13551.h +++ b/src/mame/machine/jvs13551.h @@ -26,7 +26,6 @@ class sega_837_13551 : public jvs_device public: sega_837_13551(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); static void static_set_port_tag(device_t &device, int port, const char *tag); - ioport_constructor device_input_ports() const; DECLARE_WRITE_LINE_MEMBER(jvs13551_coin_1_w); DECLARE_WRITE_LINE_MEMBER(jvs13551_coin_2_w); @@ -36,6 +35,7 @@ protected: // device-level overrides virtual void device_start(); virtual void device_reset(); + virtual ioport_constructor device_input_ports() const; // JVS device overrides virtual const char *device_id(); diff --git a/src/mame/machine/k573cass.h b/src/mame/machine/k573cass.h index e85f7bb2c23..683024bd437 100644 --- a/src/mame/machine/k573cass.h +++ b/src/mame/machine/k573cass.h @@ -13,7 +13,7 @@ public: konami573cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - void device_start(); + virtual void device_start(); private: virtual void data_in( int data, int mask ); diff --git a/src/mame/machine/zndip.h b/src/mame/machine/zndip.h index 8d1c468662f..612d32face8 100644 --- a/src/mame/machine/zndip.h +++ b/src/mame/machine/zndip.h @@ -20,7 +20,7 @@ public: void select(int select); protected: - void device_start(); + virtual void device_start(); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); private: diff --git a/src/mame/machine/znsec.h b/src/mame/machine/znsec.h index b2ff99bf345..f19ee859374 100644 --- a/src/mame/machine/znsec.h +++ b/src/mame/machine/znsec.h @@ -18,7 +18,7 @@ public: void select(int select); protected: - void device_start(); + virtual void device_start(); private: virtual void data_in( int data, int mask ); diff --git a/src/mess/includes/next.h b/src/mess/includes/next.h index 5574e275f77..6b3137c58a6 100644 --- a/src/mess/includes/next.h +++ b/src/mess/includes/next.h @@ -156,7 +156,7 @@ protected: virtual void machine_start(); virtual void machine_reset(); - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); void timer_start(); void timer_update(); diff --git a/src/mess/includes/pc4.h b/src/mess/includes/pc4.h index 8e49bf32c19..8f03d4ea73c 100644 --- a/src/mess/includes/pc4.h +++ b/src/mess/includes/pc4.h @@ -34,7 +34,7 @@ public: //LCD controller void update_ac(void); void set_busy_flag(UINT16 usec); - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); DECLARE_WRITE8_MEMBER(lcd_control_w); DECLARE_READ8_MEMBER(lcd_control_r); diff --git a/src/mess/machine/at29040a.h b/src/mess/machine/at29040a.h index 21b4a2bb45d..4a50e6e6b0c 100644 --- a/src/mess/machine/at29040a.h +++ b/src/mess/machine/at29040a.h @@ -50,10 +50,10 @@ public: DECLARE_WRITE8_MEMBER( write ); protected: - void device_start(void); - void device_reset(void); - void device_stop(void); - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start(void); + virtual void device_reset(void); + virtual void device_stop(void); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); void nvram_default(); void nvram_read(emu_file &file); diff --git a/src/mess/machine/isa_ibm_mfc.h b/src/mess/machine/isa_ibm_mfc.h index 1f61055137b..af4185bb60e 100644 --- a/src/mess/machine/isa_ibm_mfc.h +++ b/src/mess/machine/isa_ibm_mfc.h @@ -67,7 +67,7 @@ protected: virtual void device_reset(); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - const rom_entry* device_rom_region() const; + virtual const rom_entry* device_rom_region() const; private: void set_pc_interrupt(int src, int state); diff --git a/src/mess/machine/kc_rom.h b/src/mess/machine/kc_rom.h index 5d925de5ed6..1149ca44f4f 100644 --- a/src/mess/machine/kc_rom.h +++ b/src/mess/machine/kc_rom.h @@ -22,14 +22,14 @@ public: kc_8k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - const rom_entry *device_rom_region() const; protected: // device-level overrides virtual void device_start(); virtual void device_reset(); virtual void device_config_complete() { m_shortname = "kc_8k"; } - + virtual const rom_entry *device_rom_region() const; + // kcexp_interface overrides virtual UINT8 module_id_r() { return 0xfb; } virtual void control_w(UINT8 data); diff --git a/src/mess/machine/nextkbd.h b/src/mess/machine/nextkbd.h index 62a1dd60b50..9c7f9b64402 100644 --- a/src/mess/machine/nextkbd.h +++ b/src/mess/machine/nextkbd.h @@ -13,7 +13,6 @@ public: void setup(line_cb_t int_change_cb, line_cb_t _int_power_cb, line_cb_t _int_nmi_cb); DECLARE_ADDRESS_MAP(amap, 32); - ioport_constructor device_input_ports() const; DECLARE_READ32_MEMBER(ctrl_r); DECLARE_READ32_MEMBER(ctrl2_r); @@ -31,6 +30,7 @@ protected: virtual void device_start(); virtual void device_reset(); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual ioport_constructor device_input_ports() const; private: enum { FLAG_INT = 0x800000, FLAG_DATA = 0x400000, FLAG_RESET = 0x000200 }; diff --git a/src/mess/machine/psxcport.h b/src/mess/machine/psxcport.h index 847168708c7..0d716bb0da7 100644 --- a/src/mess/machine/psxcport.h +++ b/src/mess/machine/psxcport.h @@ -85,7 +85,7 @@ public: void ack(); protected: - void device_start(); + virtual void device_start(); private: virtual void data_in(int data, int mask); diff --git a/src/mess/machine/smc92x4.h b/src/mess/machine/smc92x4.h index 64f7f709863..f0cbd7ea759 100644 --- a/src/mess/machine/smc92x4.h +++ b/src/mess/machine/smc92x4.h @@ -91,8 +91,8 @@ public: void reset(); protected: - void device_start(void); - void device_reset(void); + virtual void device_start(void); + virtual void device_reset(void); private: devcb_resolved_write_line m_out_intrq; // INT line @@ -121,7 +121,7 @@ private: void timed_sector_write_request(); void timed_track_request(); void timed_seek_request(); - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); UINT8 cylinder_to_ident(int cylinder); int ident_to_cylinder(UINT8 ident); void update_id_regs(chrn_id_hd id); diff --git a/src/mess/machine/teleprinter.h b/src/mess/machine/teleprinter.h index 426f6699d36..e73e687e49f 100644 --- a/src/mess/machine/teleprinter.h +++ b/src/mess/machine/teleprinter.h @@ -33,7 +33,7 @@ public: protected: virtual void term_write(UINT8 data); virtual void device_reset(); - machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const; private: void scroll_line(); void write_char(UINT8 data); diff --git a/src/mess/machine/ti99/bwg.h b/src/mess/machine/ti99/bwg.h index 3f7a413521c..995e0f05687 100644 --- a/src/mess/machine/ti99/bwg.h +++ b/src/mess/machine/ti99/bwg.h @@ -31,17 +31,17 @@ public: void cruwrite(offs_t offset, UINT8 value); protected: - void device_start(void); - void device_reset(void); - const rom_entry *device_rom_region() const; - machine_config_constructor device_mconfig_additions() const; - ioport_constructor device_input_ports() const; + virtual void device_start(void); + virtual void device_reset(void); + virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const; private: void handle_hold(void); void set_all_geometries(floppy_type_t type); void set_geometry(device_t *drive, floppy_type_t type); - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); // Holds the status of the DRQ and IRQ lines. bool m_DRQ, m_IRQ; diff --git a/src/mess/machine/ti99/datamux.h b/src/mess/machine/ti99/datamux.h index 7120f531d6f..ec8fac3250d 100644 --- a/src/mess/machine/ti99/datamux.h +++ b/src/mess/machine/ti99/datamux.h @@ -78,7 +78,7 @@ protected: virtual void device_start(void); virtual void device_stop(void); virtual void device_reset(void); - ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const; private: // Ready line to the CPU diff --git a/src/mess/machine/ti99/evpc.h b/src/mess/machine/ti99/evpc.h index 299513691dc..e2a1de4de0f 100644 --- a/src/mess/machine/ti99/evpc.h +++ b/src/mess/machine/ti99/evpc.h @@ -40,12 +40,12 @@ public: void cruwrite(offs_t offset, UINT8 data); protected: - void device_start(void); - void device_reset(void); - void device_stop(void); + virtual void device_start(void); + virtual void device_reset(void); + virtual void device_stop(void); - const rom_entry *device_rom_region() const; - ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const; + virtual ioport_constructor device_input_ports() const; void nvram_default(); void nvram_read(emu_file &file); diff --git a/src/mess/machine/ti99/genboard.h b/src/mess/machine/ti99/genboard.h index e211c03afa4..e486dc18d7c 100644 --- a/src/mess/machine/ti99/genboard.h +++ b/src/mess/machine/ti99/genboard.h @@ -29,9 +29,9 @@ public: line_state left_button(); // left button is not connected to the V9938 but to a TMS9901 pin protected: - void device_start(); - void device_reset(); - ioport_constructor device_input_ports() const; + virtual void device_start(); + virtual void device_reset(); + virtual ioport_constructor device_input_ports() const; private: v9938_device* m_v9938; @@ -68,12 +68,12 @@ public: UINT8 get_recent_key(); protected: - void device_start(); - void device_reset(); - void device_config_complete(); - ioport_constructor device_input_ports() const; + virtual void device_start(); + virtual void device_reset(); + virtual void device_config_complete(); + virtual ioport_constructor device_input_ports() const; devcb_resolved_write_line m_interrupt; // Keyboard interrupt to console - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); private: void post_in_key_queue(int keycode); @@ -140,8 +140,8 @@ public: void clock_in(int state); protected: - void device_start(); - void device_reset(); + virtual void device_start(); + virtual void device_reset(); private: // GROM simulation diff --git a/src/mess/machine/ti99/grom.h b/src/mess/machine/ti99/grom.h index 9fe05efe1be..38b29e937ba 100644 --- a/src/mess/machine/ti99/grom.h +++ b/src/mess/machine/ti99/grom.h @@ -89,9 +89,9 @@ private: // CPU into wait state mode. A timer is set to raise READY again. void clear_ready(); - void device_start(void); - void device_reset(void); - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start(void); + virtual void device_reset(void); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); }; diff --git a/src/mess/machine/ti99/gromport.h b/src/mess/machine/ti99/gromport.h index b189b0aaa20..58b00492f4e 100644 --- a/src/mess/machine/ti99/gromport.h +++ b/src/mess/machine/ti99/gromport.h @@ -39,10 +39,10 @@ public: void cartridge_inserted(); protected: - void device_start(); - void device_reset(); - void device_config_complete(); - ioport_constructor device_input_ports() const; + virtual void device_start(); + virtual void device_reset(); + virtual void device_config_complete(); + virtual ioport_constructor device_input_ports() const; private: ti99_cartridge_connector_device* m_connector; @@ -78,10 +78,10 @@ public: void set_slot(int i); protected: - void device_start() { }; - void device_config_complete(); - machine_config_constructor device_mconfig_additions() const; - const rom_entry* device_rom_region() const; + virtual void device_start() { }; + virtual void device_config_complete(); + virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry* device_rom_region() const; // Image handling: implementation of methods which are abstract in the parent bool call_load(); @@ -150,10 +150,10 @@ public: void cruwrite(offs_t offset, UINT8 data); protected: - void device_start() { }; - void device_reset(); - machine_config_constructor device_mconfig_additions() const; - void device_config_complete(); + virtual void device_start() { }; + virtual void device_reset(); + virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_config_complete(); private: ti99_cartridge_device *m_cartridge; @@ -182,10 +182,10 @@ public: void remove(int index); protected: - void device_start(); - void device_reset(); - machine_config_constructor device_mconfig_additions() const; - ioport_constructor device_input_ports() const; + virtual void device_start(); + virtual void device_reset(); + virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const; private: int m_active_slot; @@ -217,12 +217,12 @@ public: DECLARE_INPUT_CHANGED_MEMBER( gk_changed ); protected: - void device_start(); - void device_reset(); + virtual void device_start(); + virtual void device_reset(); - machine_config_constructor device_mconfig_additions() const; - const rom_entry* device_rom_region() const; - ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry* device_rom_region() const; + virtual ioport_constructor device_input_ports() const; // device_nvram_interface void nvram_default(); diff --git a/src/mess/machine/ti99/handset.h b/src/mess/machine/ti99/handset.h index b05af4723aa..7aa2bf41b58 100644 --- a/src/mess/machine/ti99/handset.h +++ b/src/mess/machine/ti99/handset.h @@ -31,11 +31,11 @@ public: void write_dev(UINT8 data); protected: - void device_start(void); - void device_reset(void); - ioport_constructor device_input_ports() const; + virtual void device_start(void); + virtual void device_reset(void); + virtual ioport_constructor device_input_ports() const; - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); private: void do_task(); @@ -71,13 +71,13 @@ class ti99_twin_joystick : public joyport_attached_device public: ti99_twin_joystick(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER( read ); - void device_start(void); + virtual void device_start(void); UINT8 read_dev(); void write_dev(UINT8 data); protected: - ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const; private: // Which joystick is selected? diff --git a/src/mess/machine/ti99/hfdc.h b/src/mess/machine/ti99/hfdc.h index 6d8b1264042..14a8d381af3 100644 --- a/src/mess/machine/ti99/hfdc.h +++ b/src/mess/machine/ti99/hfdc.h @@ -41,12 +41,12 @@ public: DECLARE_WRITE8_MEMBER( write_buffer ); protected: - void device_start(void); - void device_reset(void); - const rom_entry *device_rom_region() const; - machine_config_constructor device_mconfig_additions() const; - ioport_constructor device_input_ports() const; - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start(void); + virtual void device_reset(void); + virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); private: diff --git a/src/mess/machine/ti99/horizon.h b/src/mess/machine/ti99/horizon.h index b64b460e14a..1377c8284f6 100644 --- a/src/mess/machine/ti99/horizon.h +++ b/src/mess/machine/ti99/horizon.h @@ -31,11 +31,11 @@ public: DECLARE_INPUT_CHANGED_MEMBER( ks_changed ); protected: - void device_start(); - void device_reset(); + virtual void device_start(); + virtual void device_reset(); - const rom_entry *device_rom_region() const; - ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const; + virtual ioport_constructor device_input_ports() const; void nvram_default(); void nvram_read(emu_file &file); diff --git a/src/mess/machine/ti99/hsgpl.h b/src/mess/machine/ti99/hsgpl.h index f9a63e38f30..733d9659a79 100644 --- a/src/mess/machine/ti99/hsgpl.h +++ b/src/mess/machine/ti99/hsgpl.h @@ -32,13 +32,13 @@ public: void cruwrite(offs_t offset, UINT8 data); protected: - void device_start(void); - void device_reset(void); - void device_stop(void); - void device_config_complete(void); - ioport_constructor device_input_ports() const; + virtual void device_start(void); + virtual void device_reset(void); + virtual void device_stop(void); + virtual void device_config_complete(void); + virtual ioport_constructor device_input_ports() const; - machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const; private: at29040a_device* m_dsr_eeprom; diff --git a/src/mess/machine/ti99/joyport.h b/src/mess/machine/ti99/joyport.h index fb4adacf392..1a578eb24f5 100644 --- a/src/mess/machine/ti99/joyport.h +++ b/src/mess/machine/ti99/joyport.h @@ -44,7 +44,7 @@ public: : device_t(mconfig, type, name, tag, owner, clock) { } protected: - void device_config_complete(); + virtual void device_config_complete(); joyport_device* m_joyport; private: @@ -64,8 +64,8 @@ public: void set_interrupt(int state); protected: - void device_start() { }; - void device_config_complete(); + virtual void device_start() { }; + virtual void device_config_complete(); private: devcb_resolved_write_line m_interrupt; diff --git a/src/mess/machine/ti99/mapper8.h b/src/mess/machine/ti99/mapper8.h index 0a834938326..66b86041420 100644 --- a/src/mess/machine/ti99/mapper8.h +++ b/src/mess/machine/ti99/mapper8.h @@ -113,8 +113,8 @@ public: void clock_in(int state); protected: - void device_start(void); - void device_reset(void); + virtual void device_start(void); + virtual void device_reset(void); private: bool search_logically_addressed_r(address_space& space, offs_t offset, UINT8 *value, UINT8 mem_mask ); diff --git a/src/mess/machine/ti99/mecmouse.h b/src/mess/machine/ti99/mecmouse.h index 75e5a159e05..5481134d92d 100644 --- a/src/mess/machine/ti99/mecmouse.h +++ b/src/mess/machine/ti99/mecmouse.h @@ -26,10 +26,11 @@ public: void write_dev(UINT8 data); protected: - void device_start(void); - void device_reset(void); - ioport_constructor device_input_ports() const; - + virtual void device_start(void); + virtual void device_reset(void); + virtual ioport_constructor device_input_ports() const; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + private: int m_last_select; bool m_read_y_axis; @@ -39,7 +40,6 @@ private: int m_y_buf; int m_last_mx; int m_last_my; - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); emu_timer *m_poll_timer; }; diff --git a/src/mess/machine/ti99/memex.h b/src/mess/machine/ti99/memex.h index 856bc917f53..03b6fd4e959 100644 --- a/src/mess/machine/ti99/memex.h +++ b/src/mess/machine/ti99/memex.h @@ -28,10 +28,10 @@ public: void cruwrite(offs_t offset, UINT8 value) { }; protected: - void device_start(); - void device_reset(); - ioport_constructor device_input_ports() const; - const rom_entry *device_rom_region() const; + virtual void device_start(); + virtual void device_reset(); + virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const; private: bool access_enabled(offs_t offset); diff --git a/src/mess/machine/ti99/myarcmem.h b/src/mess/machine/ti99/myarcmem.h index bd04f85f9d5..beb32611978 100644 --- a/src/mess/machine/ti99/myarcmem.h +++ b/src/mess/machine/ti99/myarcmem.h @@ -28,10 +28,10 @@ public: void cruwrite(offs_t offset, UINT8 data); protected: - void device_start(void); - void device_reset(void); - const rom_entry *device_rom_region(void) const; - ioport_constructor device_input_ports() const; + virtual void device_start(void); + virtual void device_reset(void); + virtual const rom_entry *device_rom_region(void) const; + virtual ioport_constructor device_input_ports() const; private: int get_base(int offset); diff --git a/src/mess/machine/ti99/p_code.h b/src/mess/machine/ti99/p_code.h index 7f9289a73ef..836ce4b9c2d 100644 --- a/src/mess/machine/ti99/p_code.h +++ b/src/mess/machine/ti99/p_code.h @@ -32,12 +32,12 @@ public: DECLARE_INPUT_CHANGED_MEMBER( switch_changed ); protected: - void device_start(); - void device_reset(); - void device_config_complete(); - const rom_entry *device_rom_region() const; - machine_config_constructor device_mconfig_additions() const; - ioport_constructor device_input_ports() const; + virtual void device_start(); + virtual void device_reset(); + virtual void device_config_complete(); + virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const; private: ti99_grom_device* m_grom[8]; diff --git a/src/mess/machine/ti99/peribox.h b/src/mess/machine/ti99/peribox.h index 796bceb1e94..f3ce05172a7 100644 --- a/src/mess/machine/ti99/peribox.h +++ b/src/mess/machine/ti99/peribox.h @@ -64,8 +64,8 @@ public: void set_genmod(bool set); protected: - void device_start(void); - void device_config_complete(void); + virtual void device_start(void); + virtual void device_config_complete(void); virtual machine_config_constructor device_mconfig_additions() const; @@ -103,7 +103,7 @@ public: peribox_ev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const; }; /* @@ -115,7 +115,7 @@ public: peribox_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const; }; /* @@ -127,7 +127,7 @@ public: peribox_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const; }; /***************************************************************************** @@ -159,8 +159,8 @@ public: device_t* get_drive(const char* name); protected: - void device_start(void); - void device_config_complete(void); + virtual void device_start(void); + virtual void device_config_complete(void); private: int get_index_from_tagname(); diff --git a/src/mess/machine/ti99/samsmem.h b/src/mess/machine/ti99/samsmem.h index c35ac9ed039..32cf1eca1a8 100644 --- a/src/mess/machine/ti99/samsmem.h +++ b/src/mess/machine/ti99/samsmem.h @@ -30,9 +30,9 @@ public: void cruwrite(offs_t offset, UINT8 data); protected: - void device_start(void); - void device_reset(void); - const rom_entry *device_rom_region(void) const; + virtual void device_start(void); + virtual void device_reset(void); + virtual const rom_entry *device_rom_region(void) const; private: UINT8* m_ram; diff --git a/src/mess/machine/ti99/spchsyn.h b/src/mess/machine/ti99/spchsyn.h index ae55296c8be..894ca159586 100644 --- a/src/mess/machine/ti99/spchsyn.h +++ b/src/mess/machine/ti99/spchsyn.h @@ -34,11 +34,11 @@ public: DECLARE_WRITE8_MEMBER( spchrom_read_and_branch ); protected: - void device_start(); - void device_reset(void); - const rom_entry *device_rom_region() const; - machine_config_constructor device_mconfig_additions() const; - void device_config_complete(); + virtual void device_start(); + virtual void device_reset(void); + virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_config_complete(); private: tmc0285n_device *m_vsp; diff --git a/src/mess/machine/ti99/speech8.h b/src/mess/machine/ti99/speech8.h index cfd8c5072e3..9528ed1e9d4 100644 --- a/src/mess/machine/ti99/speech8.h +++ b/src/mess/machine/ti99/speech8.h @@ -47,10 +47,10 @@ public: int m_select_value; protected: - void device_start(); - void device_reset(void); - const rom_entry *device_rom_region() const; - machine_config_constructor device_mconfig_additions() const; + virtual void device_start(); + virtual void device_reset(void); + virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const; private: tms5220n_device *m_vsp; diff --git a/src/mess/machine/ti99/ti32kmem.h b/src/mess/machine/ti99/ti32kmem.h index 3b258c02cb5..6a592483fae 100644 --- a/src/mess/machine/ti99/ti32kmem.h +++ b/src/mess/machine/ti99/ti32kmem.h @@ -27,8 +27,8 @@ public: void cruwrite(offs_t offset, UINT8 value); protected: - void device_start(); - const rom_entry *device_rom_region() const; + virtual void device_start(); + virtual const rom_entry *device_rom_region() const; private: UINT8* m_ram_ptr; }; diff --git a/src/mess/machine/ti99/ti99_hd.h b/src/mess/machine/ti99/ti99_hd.h index 2ccd2f97801..2f4cb397473 100644 --- a/src/mess/machine/ti99/ti99_hd.h +++ b/src/mess/machine/ti99/ti99_hd.h @@ -50,9 +50,9 @@ public: int get_track_length(); protected: - void device_start(); - void device_reset(); - machine_config_constructor device_mconfig_additions() const; + virtual void device_start(); + virtual void device_reset(); + virtual machine_config_constructor device_mconfig_additions() const; private: int find_block(const UINT8 *buffer, int start, int stop, UINT8 byte, size_t number); @@ -73,9 +73,9 @@ class ide_harddisk_device : public device_t public: ide_harddisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - void device_start() { }; - void device_reset() { }; - machine_config_constructor device_mconfig_additions() const; + virtual void device_start() { }; + virtual void device_reset() { }; + virtual machine_config_constructor device_mconfig_additions() const; }; #define MCFG_MFMHD_3_DRIVES_ADD() \ diff --git a/src/mess/machine/ti99/ti_fdc.h b/src/mess/machine/ti99/ti_fdc.h index fc2a3662251..b3fd1a8fe7e 100644 --- a/src/mess/machine/ti99/ti_fdc.h +++ b/src/mess/machine/ti99/ti_fdc.h @@ -32,16 +32,16 @@ public: void cruwrite(offs_t offset, UINT8 value); protected: - void device_start(void); - void device_reset(void); - const rom_entry *device_rom_region() const; - machine_config_constructor device_mconfig_additions() const; - + virtual void device_start(void); + virtual void device_reset(void); + virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + private: void handle_hold(void); void set_all_geometries(floppy_type_t type); void set_geometry(device_t *drive, floppy_type_t type); - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); // Holds the status of the DRQ and IRQ lines. diff --git a/src/mess/machine/ti99/ti_rs232.h b/src/mess/machine/ti99/ti_rs232.h index cb352f1e478..004b56c96a4 100644 --- a/src/mess/machine/ti99/ti_rs232.h +++ b/src/mess/machine/ti99/ti_rs232.h @@ -47,11 +47,11 @@ public: DECLARE_WRITE_LINE_MEMBER( senila ); protected: - void device_start(void); - void device_reset(void); - const rom_entry *device_rom_region(void) const; - machine_config_constructor device_mconfig_additions() const; - ioport_constructor device_input_ports() const; + virtual void device_start(void); + virtual void device_reset(void); + virtual const rom_entry *device_rom_region(void) const; + virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const; private: void incoming_dtr(int uartind, line_state value); @@ -119,10 +119,10 @@ public: const option_guide *create_option_guide() const { return NULL; } protected: - void device_start(void); + virtual void device_start(void); bool call_load(); void call_unload(); - void device_config_complete(); + virtual void device_config_complete(); private: int get_index_from_tagname(); @@ -147,10 +147,10 @@ public: const option_guide *create_option_guide() const { return NULL; } protected: - void device_start(void); + virtual void device_start(void); bool call_load(); void call_unload(); - void device_config_complete(); + virtual void device_config_complete(); }; #endif diff --git a/src/mess/machine/ti99/tn_ide.h b/src/mess/machine/ti99/tn_ide.h index 862ff107811..4e1b4b86ceb 100644 --- a/src/mess/machine/ti99/tn_ide.h +++ b/src/mess/machine/ti99/tn_ide.h @@ -36,11 +36,11 @@ public: DECLARE_WRITE_LINE_MEMBER(ide_interrupt_callback); protected: - void device_start(void); - void device_reset(void); - const rom_entry *device_rom_region() const; - machine_config_constructor device_mconfig_additions() const; - ioport_constructor device_input_ports() const; + virtual void device_start(void); + virtual void device_reset(void); + virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const; private: rtc65271_device* m_rtc; diff --git a/src/mess/machine/ti99/tn_usbsm.h b/src/mess/machine/ti99/tn_usbsm.h index 261414c2054..3f07007d2ce 100644 --- a/src/mess/machine/ti99/tn_usbsm.h +++ b/src/mess/machine/ti99/tn_usbsm.h @@ -30,11 +30,11 @@ public: void cruwrite(offs_t offset, UINT8 value); protected: - void device_start(void); - void device_reset(void); - const rom_entry *device_rom_region() const; - machine_config_constructor device_mconfig_additions() const; - ioport_constructor device_input_ports() const; + virtual void device_start(void); + virtual void device_reset(void); + virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const; private: UINT16 usbsm_mem_16_r(offs_t offset); diff --git a/src/mess/machine/ti99/videowrp.h b/src/mess/machine/ti99/videowrp.h index f26741d97ef..b119bad299f 100644 --- a/src/mess/machine/ti99/videowrp.h +++ b/src/mess/machine/ti99/videowrp.h @@ -62,7 +62,7 @@ public: void reset_vdp(int state) { m_v9938->reset_line(state); } protected: - void device_start(void); + virtual void device_start(void); v9938_device *m_v9938; }; @@ -97,7 +97,7 @@ public: DECLARE_WRITE_LINE_MEMBER( sound_ready ); // connect to console READY protected: - void device_start(void); + virtual void device_start(void); virtual machine_config_constructor device_mconfig_additions() const =0; private: @@ -115,7 +115,7 @@ public: : ti_sound_system_device(mconfig, TISOUND_94624, tag, "Onboard sound (SN94624)", owner, clock) { } protected: - machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const; }; /* @@ -128,7 +128,7 @@ public: : ti_sound_system_device(mconfig, TISOUND_76496, tag, "Onboard sound (SN76496)", owner, clock) { } protected: - machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const; }; diff --git a/src/mess/video/hd44780.h b/src/mess/video/hd44780.h index 5af553b2621..3a83c3e27c5 100644 --- a/src/mess/video/hd44780.h +++ b/src/mess/video/hd44780.h @@ -59,7 +59,7 @@ protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); // optional information overrides - const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const; // charset enum