Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-21 13:18:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

added missing virtual to device-level overrides (nw)

Browse Source
This commit is contained in:
Oliver Stöneberg 2013-02-11 08:38:01 +00:00
parent 315adc4137
commit e4f37ea7ba
51 changed files with 191 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/cpu/psx/psx.h
View File

@ -172,7 +172,7 @@ protected:
virtual void device_start(); virtual void device_start();
virtual void device_reset(); virtual void device_reset();
virtual void device_post_load(); virtual void device_post_load();
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
// device_execute_interface overrides // device_execute_interface overrides
virtual UINT32 execute_min_cycles() const { return 1; } virtual UINT32 execute_min_cycles() const { return 1; }

8
src/emu/machine/tms9901.h
View File

@ -71,13 +71,13 @@ public:
private: private:
static const device_timer_id DECREMENTER = 0; 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 timer_reload(void);
void field_interrupts(void); void field_interrupts(void);
void device_start(void); virtual void device_start(void);
void device_stop(void); virtual void device_stop(void);
void device_reset(void); virtual void device_reset(void);
/* interrupt registers */ /* interrupt registers */
// mask: bit #n is set if pin #n is supported as an interrupt pin, // mask: bit #n is set if pin #n is supported as an interrupt pin,

8
src/emu/machine/tms9902.h
View File

@ -71,10 +71,10 @@ public:
DECLARE_WRITE8_MEMBER( cruwrite ); DECLARE_WRITE8_MEMBER( cruwrite );
protected: protected:
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 device_start(); virtual void device_start();
void device_reset(); virtual void device_reset();
void device_stop(); virtual void device_stop();
private: private:
void field_interrupts(); void field_interrupts();

4
src/emu/sound/bsmt2000.h
View File

@ -84,8 +84,8 @@ public:
protected: protected:
// device-level overrides // device-level overrides
const rom_entry *device_rom_region() const; virtual const rom_entry *device_rom_region() const;
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
virtual void device_start(); virtual void device_start();
virtual void device_reset(); virtual void device_reset();
virtual 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);

2
src/emu/sound/ics2115.h
View File

@ -114,7 +114,7 @@ protected:
virtual void device_reset(); virtual void device_reset();
// internal callbacks // 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 // internal state
void (*m_irq_cb)(device_t *device, int state); void (*m_irq_cb)(device_t *device, int state);

4
src/emu/sound/qs1000.h
View File

@ -69,8 +69,8 @@ public:
protected: protected:
// device-level overrides // device-level overrides
const rom_entry *device_rom_region() const; virtual const rom_entry *device_rom_region() const;
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
virtual void device_config_complete(); virtual void device_config_complete();
virtual void device_start(); virtual void device_start();
virtual void device_reset(); virtual void device_reset();

4
src/emu/sound/sn76496.h
View File

@ -32,8 +32,8 @@ public:
DECLARE_WRITE8_MEMBER( write ); DECLARE_WRITE8_MEMBER( write );
protected: protected:
void device_start(); virtual void device_start();
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);
private: private:
inline bool in_noise_mode(); inline bool in_noise_mode();

8
src/emu/sound/tms5220.h
View File

@ -137,8 +137,8 @@ class tms52xx_device : public device_t, public device_sound_interface
{ {
public: 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); 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); virtual 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 device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
DECLARE_WRITE_LINE_MEMBER( rsq_w ); DECLARE_WRITE_LINE_MEMBER( rsq_w );
DECLARE_WRITE_LINE_MEMBER( wsq_w ); DECLARE_WRITE_LINE_MEMBER( wsq_w );
@ -150,8 +150,8 @@ public:
double time_to_ready(); double time_to_ready();
protected: protected:
void device_start(); virtual void device_start();
void device_reset(); virtual void device_reset();
private: private:
// Methods // Methods

2
src/emu/sound/votrax.h
View File

@ -86,7 +86,7 @@ public:
protected: protected:
// device-level overrides // 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_start();
virtual void device_reset(); virtual void device_reset();
virtual void device_clock_changed(); virtual void device_clock_changed();

4
src/emu/video/k053250.h
View File

@ -29,8 +29,8 @@ public:
void draw( bitmap_rgb32 &bitmap, const rectangle &cliprect, int colorbase, int flags, int priority ); void draw( bitmap_rgb32 &bitmap, const rectangle &cliprect, int colorbase, int flags, int priority );
protected: protected:
void device_start(); virtual void device_start();
void device_reset(); virtual void device_reset();
private: private:
UINT8 regs[8]; UINT8 regs[8];

2
src/mame/machine/jvs13551.h
View File

@ -26,7 +26,6 @@ class sega_837_13551 : public jvs_device
public: public:
sega_837_13551(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); 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); 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_1_w);
DECLARE_WRITE_LINE_MEMBER(jvs13551_coin_2_w); DECLARE_WRITE_LINE_MEMBER(jvs13551_coin_2_w);
@ -36,6 +35,7 @@ protected:
// device-level overrides // device-level overrides
virtual void device_start(); virtual void device_start();
virtual void device_reset(); virtual void device_reset();
virtual ioport_constructor device_input_ports() const;
// JVS device overrides // JVS device overrides
virtual const char *device_id(); virtual const char *device_id();

2
src/mame/machine/k573cass.h
View File

@ -13,7 +13,7 @@ public:
konami573cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); konami573cassette_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected: protected:
void device_start(); virtual void device_start();
private: private:
virtual void data_in( int data, int mask ); virtual void data_in( int data, int mask );

2
src/mame/machine/zndip.h
View File

@ -20,7 +20,7 @@ public:
void select(int select); void select(int select);
protected: protected:
void device_start(); virtual void device_start();
virtual 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: private:

2
src/mame/machine/znsec.h
View File

@ -18,7 +18,7 @@ public:
void select(int select); void select(int select);
protected: protected:
void device_start(); virtual void device_start();
private: private:
virtual void data_in( int data, int mask ); virtual void data_in( int data, int mask );

2
src/mess/includes/next.h
View File

@ -156,7 +156,7 @@ protected:
virtual void machine_start(); virtual void machine_start();
virtual void machine_reset(); 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_start();
void timer_update(); void timer_update();

2
src/mess/includes/pc4.h
View File

@ -34,7 +34,7 @@ public:
//LCD controller //LCD controller
void update_ac(void); void update_ac(void);
void set_busy_flag(UINT16 usec); 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_WRITE8_MEMBER(lcd_control_w);
DECLARE_READ8_MEMBER(lcd_control_r); DECLARE_READ8_MEMBER(lcd_control_r);

8
src/mess/machine/at29040a.h
View File

@ -50,10 +50,10 @@ public:
DECLARE_WRITE8_MEMBER( write ); DECLARE_WRITE8_MEMBER( write );
protected: protected:
void device_start(void); virtual void device_start(void);
void device_reset(void); virtual void device_reset(void);
void device_stop(void); virtual void device_stop(void);
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 nvram_default(); void nvram_default();
void nvram_read(emu_file &file); void nvram_read(emu_file &file);

2
src/mess/machine/isa_ibm_mfc.h
View File

@ -67,7 +67,7 @@ protected:
virtual void device_reset(); virtual void device_reset();
virtual 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);
const rom_entry* device_rom_region() const; virtual const rom_entry* device_rom_region() const;
private: private:
void set_pc_interrupt(int src, int state); void set_pc_interrupt(int src, int state);

4
src/mess/machine/kc_rom.h
View File

@ -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); kc_8k_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides // optional information overrides
const rom_entry *device_rom_region() const;
protected: protected:
// device-level overrides // device-level overrides
virtual void device_start(); virtual void device_start();
virtual void device_reset(); virtual void device_reset();
virtual void device_config_complete() { m_shortname = "kc_8k"; } virtual void device_config_complete() { m_shortname = "kc_8k"; }
virtual const rom_entry *device_rom_region() const;
// kcexp_interface overrides // kcexp_interface overrides
virtual UINT8 module_id_r() { return 0xfb; } virtual UINT8 module_id_r() { return 0xfb; }
virtual void control_w(UINT8 data); virtual void control_w(UINT8 data);

2
src/mess/machine/nextkbd.h
View File

@ -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); 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); DECLARE_ADDRESS_MAP(amap, 32);
ioport_constructor device_input_ports() const;
DECLARE_READ32_MEMBER(ctrl_r); DECLARE_READ32_MEMBER(ctrl_r);
DECLARE_READ32_MEMBER(ctrl2_r); DECLARE_READ32_MEMBER(ctrl2_r);
@ -31,6 +30,7 @@ protected:
virtual void device_start(); virtual void device_start();
virtual void device_reset(); virtual void device_reset();
virtual 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);
virtual ioport_constructor device_input_ports() const;
private: private:
enum { FLAG_INT = 0x800000, FLAG_DATA = 0x400000, FLAG_RESET = 0x000200 }; enum { FLAG_INT = 0x800000, FLAG_DATA = 0x400000, FLAG_RESET = 0x000200 };

2
src/mess/machine/psxcport.h
View File

@ -85,7 +85,7 @@ public:
void ack(); void ack();
protected: protected:
void device_start(); virtual void device_start();
private: private:
virtual void data_in(int data, int mask); virtual void data_in(int data, int mask);

6
src/mess/machine/smc92x4.h
View File

@ -91,8 +91,8 @@ public:
void reset(); void reset();
protected: protected:
void device_start(void); virtual void device_start(void);
void device_reset(void); virtual void device_reset(void);
private: private:
devcb_resolved_write_line m_out_intrq; // INT line devcb_resolved_write_line m_out_intrq; // INT line
@ -121,7 +121,7 @@ private:
void timed_sector_write_request(); void timed_sector_write_request();
void timed_track_request(); void timed_track_request();
void timed_seek_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); UINT8 cylinder_to_ident(int cylinder);
int ident_to_cylinder(UINT8 ident); int ident_to_cylinder(UINT8 ident);
void update_id_regs(chrn_id_hd id); void update_id_regs(chrn_id_hd id);

2
src/mess/machine/teleprinter.h
View File

@ -33,7 +33,7 @@ public:
protected: protected:
virtual void term_write(UINT8 data); virtual void term_write(UINT8 data);
virtual void device_reset(); virtual void device_reset();
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
private: private:
void scroll_line(); void scroll_line();
void write_char(UINT8 data); void write_char(UINT8 data);

12
src/mess/machine/ti99/bwg.h
View File

@ -31,17 +31,17 @@ public:
void cruwrite(offs_t offset, UINT8 value); void cruwrite(offs_t offset, UINT8 value);
protected: protected:
void device_start(void); virtual void device_start(void);
void device_reset(void); virtual void device_reset(void);
const rom_entry *device_rom_region() const; virtual const rom_entry *device_rom_region() const;
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
private: private:
void handle_hold(void); void handle_hold(void);
void set_all_geometries(floppy_type_t type); void set_all_geometries(floppy_type_t type);
void set_geometry(device_t *drive, 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. // Holds the status of the DRQ and IRQ lines.
bool m_DRQ, m_IRQ; bool m_DRQ, m_IRQ;

2
src/mess/machine/ti99/datamux.h
View File

@ -78,7 +78,7 @@ protected:
virtual void device_start(void); virtual void device_start(void);
virtual void device_stop(void); virtual void device_stop(void);
virtual void device_reset(void); virtual void device_reset(void);
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
private: private:
// Ready line to the CPU // Ready line to the CPU

10
src/mess/machine/ti99/evpc.h
View File

@ -40,12 +40,12 @@ public:
void cruwrite(offs_t offset, UINT8 data); void cruwrite(offs_t offset, UINT8 data);
protected: protected:
void device_start(void); virtual void device_start(void);
void device_reset(void); virtual void device_reset(void);
void device_stop(void); virtual void device_stop(void);
const rom_entry *device_rom_region() const; virtual const rom_entry *device_rom_region() const;
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
void nvram_default(); void nvram_default();
void nvram_read(emu_file &file); void nvram_read(emu_file &file);

20
src/mess/machine/ti99/genboard.h
View File

@ -29,9 +29,9 @@ public:
line_state left_button(); // left button is not connected to the V9938 but to a TMS9901 pin line_state left_button(); // left button is not connected to the V9938 but to a TMS9901 pin
protected: protected:
void device_start(); virtual void device_start();
void device_reset(); virtual void device_reset();
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
private: private:
v9938_device* m_v9938; v9938_device* m_v9938;
@ -68,12 +68,12 @@ public:
UINT8 get_recent_key(); UINT8 get_recent_key();
protected: protected:
void device_start(); virtual void device_start();
void device_reset(); virtual void device_reset();
void device_config_complete(); virtual void device_config_complete();
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
devcb_resolved_write_line m_interrupt; // Keyboard interrupt to console 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: private:
void post_in_key_queue(int keycode); void post_in_key_queue(int keycode);
@ -140,8 +140,8 @@ public:
void clock_in(int state); void clock_in(int state);
protected: protected:
void device_start(); virtual void device_start();
void device_reset(); virtual void device_reset();
private: private:
// GROM simulation // GROM simulation

6
src/mess/machine/ti99/grom.h
View File

@ -89,9 +89,9 @@ private:
// CPU into wait state mode. A timer is set to raise READY again. // CPU into wait state mode. A timer is set to raise READY again.
void clear_ready(); void clear_ready();
void device_start(void); virtual void device_start(void);
void device_reset(void); virtual void device_reset(void);
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);
}; };

42
src/mess/machine/ti99/gromport.h
View File

@ -39,10 +39,10 @@ public:
void cartridge_inserted(); void cartridge_inserted();
protected: protected:
void device_start(); virtual void device_start();
void device_reset(); virtual void device_reset();
void device_config_complete(); virtual void device_config_complete();
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
private: private:
ti99_cartridge_connector_device* m_connector; ti99_cartridge_connector_device* m_connector;
@ -78,10 +78,10 @@ public:
void set_slot(int i); void set_slot(int i);
protected: protected:
void device_start() { }; virtual void device_start() { };
void device_config_complete(); virtual void device_config_complete();
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
const rom_entry* device_rom_region() const; virtual const rom_entry* device_rom_region() const;
// Image handling: implementation of methods which are abstract in the parent // Image handling: implementation of methods which are abstract in the parent
bool call_load(); bool call_load();
@ -150,10 +150,10 @@ public:
void cruwrite(offs_t offset, UINT8 data); void cruwrite(offs_t offset, UINT8 data);
protected: protected:
void device_start() { }; virtual void device_start() { };
void device_reset(); virtual void device_reset();
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
void device_config_complete(); virtual void device_config_complete();
private: private:
ti99_cartridge_device *m_cartridge; ti99_cartridge_device *m_cartridge;
@ -182,10 +182,10 @@ public:
void remove(int index); void remove(int index);
protected: protected:
void device_start(); virtual void device_start();
void device_reset(); virtual void device_reset();
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
private: private:
int m_active_slot; int m_active_slot;
@ -217,12 +217,12 @@ public:
DECLARE_INPUT_CHANGED_MEMBER( gk_changed ); DECLARE_INPUT_CHANGED_MEMBER( gk_changed );
protected: protected:
void device_start(); virtual void device_start();
void device_reset(); virtual void device_reset();
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
const rom_entry* device_rom_region() const; virtual const rom_entry* device_rom_region() const;
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
// device_nvram_interface // device_nvram_interface
void nvram_default(); void nvram_default();

12
src/mess/machine/ti99/handset.h
View File

@ -31,11 +31,11 @@ public:
void write_dev(UINT8 data); void write_dev(UINT8 data);
protected: protected:
void device_start(void); virtual void device_start(void);
void device_reset(void); virtual void device_reset(void);
ioport_constructor device_input_ports() const; 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: private:
void do_task(); void do_task();
@ -71,13 +71,13 @@ class ti99_twin_joystick : public joyport_attached_device
public: public:
ti99_twin_joystick(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ti99_twin_joystick(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
DECLARE_READ8_MEMBER( read ); DECLARE_READ8_MEMBER( read );
void device_start(void); virtual void device_start(void);
UINT8 read_dev(); UINT8 read_dev();
void write_dev(UINT8 data); void write_dev(UINT8 data);
protected: protected:
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
private: private:
// Which joystick is selected? // Which joystick is selected?

12
src/mess/machine/ti99/hfdc.h
View File

@ -41,12 +41,12 @@ public:
DECLARE_WRITE8_MEMBER( write_buffer ); DECLARE_WRITE8_MEMBER( write_buffer );
protected: protected:
void device_start(void); virtual void device_start(void);
void device_reset(void); virtual void device_reset(void);
const rom_entry *device_rom_region() const; virtual const rom_entry *device_rom_region() const;
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
ioport_constructor device_input_ports() const; 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: private:

8
src/mess/machine/ti99/horizon.h
View File

@ -31,11 +31,11 @@ public:
DECLARE_INPUT_CHANGED_MEMBER( ks_changed ); DECLARE_INPUT_CHANGED_MEMBER( ks_changed );
protected: protected:
void device_start(); virtual void device_start();
void device_reset(); virtual void device_reset();
const rom_entry *device_rom_region() const; virtual const rom_entry *device_rom_region() const;
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
void nvram_default(); void nvram_default();
void nvram_read(emu_file &file); void nvram_read(emu_file &file);

12
src/mess/machine/ti99/hsgpl.h
View File

@ -32,13 +32,13 @@ public:
void cruwrite(offs_t offset, UINT8 data); void cruwrite(offs_t offset, UINT8 data);
protected: protected:
void device_start(void); virtual void device_start(void);
void device_reset(void); virtual void device_reset(void);
void device_stop(void); virtual void device_stop(void);
void device_config_complete(void); virtual void device_config_complete(void);
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
private: private:
at29040a_device* m_dsr_eeprom; at29040a_device* m_dsr_eeprom;

6
src/mess/machine/ti99/joyport.h
View File

@ -44,7 +44,7 @@ public:
: device_t(mconfig, type, name, tag, owner, clock) { } : device_t(mconfig, type, name, tag, owner, clock) { }
protected: protected:
void device_config_complete(); virtual void device_config_complete();
joyport_device* m_joyport; joyport_device* m_joyport;
private: private:
@ -64,8 +64,8 @@ public:
void set_interrupt(int state); void set_interrupt(int state);
protected: protected:
void device_start() { }; virtual void device_start() { };
void device_config_complete(); virtual void device_config_complete();
private: private:
devcb_resolved_write_line m_interrupt; devcb_resolved_write_line m_interrupt;

4
src/mess/machine/ti99/mapper8.h
View File

@ -113,8 +113,8 @@ public:
void clock_in(int state); void clock_in(int state);
protected: protected:
void device_start(void); virtual void device_start(void);
void device_reset(void); virtual void device_reset(void);
private: private:
bool search_logically_addressed_r(address_space& space, offs_t offset, UINT8 *value, UINT8 mem_mask ); bool search_logically_addressed_r(address_space& space, offs_t offset, UINT8 *value, UINT8 mem_mask );

10
src/mess/machine/ti99/mecmouse.h
View File

@ -26,10 +26,11 @@ public:
void write_dev(UINT8 data); void write_dev(UINT8 data);
protected: protected:
void device_start(void); virtual void device_start(void);
void device_reset(void); virtual void device_reset(void);
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
private: private:
int m_last_select; int m_last_select;
bool m_read_y_axis; bool m_read_y_axis;
@ -39,7 +40,6 @@ private:
int m_y_buf; int m_y_buf;
int m_last_mx; int m_last_mx;
int m_last_my; int m_last_my;
void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr);
emu_timer *m_poll_timer; emu_timer *m_poll_timer;
}; };

8
src/mess/machine/ti99/memex.h
View File

@ -28,10 +28,10 @@ public:
void cruwrite(offs_t offset, UINT8 value) { }; void cruwrite(offs_t offset, UINT8 value) { };
protected: protected:
void device_start(); virtual void device_start();
void device_reset(); virtual void device_reset();
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
const rom_entry *device_rom_region() const; virtual const rom_entry *device_rom_region() const;
private: private:
bool access_enabled(offs_t offset); bool access_enabled(offs_t offset);

8
src/mess/machine/ti99/myarcmem.h
View File

@ -28,10 +28,10 @@ public:
void cruwrite(offs_t offset, UINT8 data); void cruwrite(offs_t offset, UINT8 data);
protected: protected:
void device_start(void); virtual void device_start(void);
void device_reset(void); virtual void device_reset(void);
const rom_entry *device_rom_region(void) const; virtual const rom_entry *device_rom_region(void) const;
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
private: private:
int get_base(int offset); int get_base(int offset);

12
src/mess/machine/ti99/p_code.h
View File

@ -32,12 +32,12 @@ public:
DECLARE_INPUT_CHANGED_MEMBER( switch_changed ); DECLARE_INPUT_CHANGED_MEMBER( switch_changed );
protected: protected:
void device_start(); virtual void device_start();
void device_reset(); virtual void device_reset();
void device_config_complete(); virtual void device_config_complete();
const rom_entry *device_rom_region() const; virtual const rom_entry *device_rom_region() const;
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
private: private:
ti99_grom_device* m_grom[8]; ti99_grom_device* m_grom[8];

14
src/mess/machine/ti99/peribox.h
View File

@ -64,8 +64,8 @@ public:
void set_genmod(bool set); void set_genmod(bool set);
protected: protected:
void device_start(void); virtual void device_start(void);
void device_config_complete(void); virtual void device_config_complete(void);
virtual machine_config_constructor device_mconfig_additions() const; 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); peribox_ev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected: 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); peribox_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected: 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); peribox_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected: 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); device_t* get_drive(const char* name);
protected: protected:
void device_start(void); virtual void device_start(void);
void device_config_complete(void); virtual void device_config_complete(void);
private: private:
int get_index_from_tagname(); int get_index_from_tagname();

6
src/mess/machine/ti99/samsmem.h
View File

@ -30,9 +30,9 @@ public:
void cruwrite(offs_t offset, UINT8 data); void cruwrite(offs_t offset, UINT8 data);
protected: protected:
void device_start(void); virtual void device_start(void);
void device_reset(void); virtual void device_reset(void);
const rom_entry *device_rom_region(void) const; virtual const rom_entry *device_rom_region(void) const;
private: private:
UINT8* m_ram; UINT8* m_ram;

10
src/mess/machine/ti99/spchsyn.h
View File

@ -34,11 +34,11 @@ public:
DECLARE_WRITE8_MEMBER( spchrom_read_and_branch ); DECLARE_WRITE8_MEMBER( spchrom_read_and_branch );
protected: protected:
void device_start(); virtual void device_start();
void device_reset(void); virtual void device_reset(void);
const rom_entry *device_rom_region() const; virtual const rom_entry *device_rom_region() const;
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
void device_config_complete(); virtual void device_config_complete();
private: private:
tmc0285n_device *m_vsp; tmc0285n_device *m_vsp;

8
src/mess/machine/ti99/speech8.h
View File

@ -47,10 +47,10 @@ public:
int m_select_value; int m_select_value;
protected: protected:
void device_start(); virtual void device_start();
void device_reset(void); virtual void device_reset(void);
const rom_entry *device_rom_region() const; virtual const rom_entry *device_rom_region() const;
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
private: private:
tms5220n_device *m_vsp; tms5220n_device *m_vsp;

4
src/mess/machine/ti99/ti32kmem.h
View File

@ -27,8 +27,8 @@ public:
void cruwrite(offs_t offset, UINT8 value); void cruwrite(offs_t offset, UINT8 value);
protected: protected:
void device_start(); virtual void device_start();
const rom_entry *device_rom_region() const; virtual const rom_entry *device_rom_region() const;
private: private:
UINT8* m_ram_ptr; UINT8* m_ram_ptr;
}; };

12
src/mess/machine/ti99/ti99_hd.h
View File

@ -50,9 +50,9 @@ public:
int get_track_length(); int get_track_length();
protected: protected:
void device_start(); virtual void device_start();
void device_reset(); virtual void device_reset();
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
private: private:
int find_block(const UINT8 *buffer, int start, int stop, UINT8 byte, size_t number); 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: public:
ide_harddisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ide_harddisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected: protected:
void device_start() { }; virtual void device_start() { };
void device_reset() { }; virtual void device_reset() { };
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
}; };
#define MCFG_MFMHD_3_DRIVES_ADD() \ #define MCFG_MFMHD_3_DRIVES_ADD() \

12
src/mess/machine/ti99/ti_fdc.h
View File

@ -32,16 +32,16 @@ public:
void cruwrite(offs_t offset, UINT8 value); void cruwrite(offs_t offset, UINT8 value);
protected: protected:
void device_start(void); virtual void device_start(void);
void device_reset(void); virtual void device_reset(void);
const rom_entry *device_rom_region() const; virtual const rom_entry *device_rom_region() const;
machine_config_constructor device_mconfig_additions() 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: private:
void handle_hold(void); void handle_hold(void);
void set_all_geometries(floppy_type_t type); void set_all_geometries(floppy_type_t type);
void set_geometry(device_t *drive, 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. // Holds the status of the DRQ and IRQ lines.

18
src/mess/machine/ti99/ti_rs232.h
View File

@ -47,11 +47,11 @@ public:
DECLARE_WRITE_LINE_MEMBER( senila ); DECLARE_WRITE_LINE_MEMBER( senila );
protected: protected:
void device_start(void); virtual void device_start(void);
void device_reset(void); virtual void device_reset(void);
const rom_entry *device_rom_region(void) const; virtual const rom_entry *device_rom_region(void) const;
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
private: private:
void incoming_dtr(int uartind, line_state value); void incoming_dtr(int uartind, line_state value);
@ -119,10 +119,10 @@ public:
const option_guide *create_option_guide() const { return NULL; } const option_guide *create_option_guide() const { return NULL; }
protected: protected:
void device_start(void); virtual void device_start(void);
bool call_load(); bool call_load();
void call_unload(); void call_unload();
void device_config_complete(); virtual void device_config_complete();
private: private:
int get_index_from_tagname(); int get_index_from_tagname();
@ -147,10 +147,10 @@ public:
const option_guide *create_option_guide() const { return NULL; } const option_guide *create_option_guide() const { return NULL; }
protected: protected:
void device_start(void); virtual void device_start(void);
bool call_load(); bool call_load();
void call_unload(); void call_unload();
void device_config_complete(); virtual void device_config_complete();
}; };
#endif #endif

10
src/mess/machine/ti99/tn_ide.h
View File

@ -36,11 +36,11 @@ public:
DECLARE_WRITE_LINE_MEMBER(ide_interrupt_callback); DECLARE_WRITE_LINE_MEMBER(ide_interrupt_callback);
protected: protected:
void device_start(void); virtual void device_start(void);
void device_reset(void); virtual void device_reset(void);
const rom_entry *device_rom_region() const; virtual const rom_entry *device_rom_region() const;
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
private: private:
rtc65271_device* m_rtc; rtc65271_device* m_rtc;

10
src/mess/machine/ti99/tn_usbsm.h
View File

@ -30,11 +30,11 @@ public:
void cruwrite(offs_t offset, UINT8 value); void cruwrite(offs_t offset, UINT8 value);
protected: protected:
void device_start(void); virtual void device_start(void);
void device_reset(void); virtual void device_reset(void);
const rom_entry *device_rom_region() const; virtual const rom_entry *device_rom_region() const;
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
ioport_constructor device_input_ports() const; virtual ioport_constructor device_input_ports() const;
private: private:
UINT16 usbsm_mem_16_r(offs_t offset); UINT16 usbsm_mem_16_r(offs_t offset);

8
src/mess/machine/ti99/videowrp.h
View File

@ -62,7 +62,7 @@ public:
void reset_vdp(int state) { m_v9938->reset_line(state); } void reset_vdp(int state) { m_v9938->reset_line(state); }
protected: protected:
void device_start(void); virtual void device_start(void);
v9938_device *m_v9938; v9938_device *m_v9938;
}; };
@ -97,7 +97,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( sound_ready ); // connect to console READY DECLARE_WRITE_LINE_MEMBER( sound_ready ); // connect to console READY
protected: protected:
void device_start(void); virtual void device_start(void);
virtual machine_config_constructor device_mconfig_additions() const =0; virtual machine_config_constructor device_mconfig_additions() const =0;
private: private:
@ -115,7 +115,7 @@ public:
: ti_sound_system_device(mconfig, TISOUND_94624, tag, "Onboard sound (SN94624)", owner, clock) { } : ti_sound_system_device(mconfig, TISOUND_94624, tag, "Onboard sound (SN94624)", owner, clock) { }
protected: 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) { } : ti_sound_system_device(mconfig, TISOUND_76496, tag, "Onboard sound (SN76496)", owner, clock) { }
protected: protected:
machine_config_constructor device_mconfig_additions() const; virtual machine_config_constructor device_mconfig_additions() const;
}; };

2
src/mess/video/hd44780.h
View File

@ -59,7 +59,7 @@ protected:
virtual 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);
// optional information overrides // optional information overrides
const rom_entry *device_rom_region() const; virtual const rom_entry *device_rom_region() const;
// charset // charset
enum enum