diff options
Diffstat (limited to 'src')
191 files changed, 405 insertions, 399 deletions
diff --git a/src/mame/drivers/icecold.c b/src/mame/drivers/icecold.c index 2c048ae7ff0..a19d7a3a47f 100644 --- a/src/mame/drivers/icecold.c +++ b/src/mame/drivers/icecold.c @@ -41,8 +41,8 @@ public: // devices required_device<cpu_device> m_maincpu; - required_device<device_t> m_ay8910_0; - required_device<device_t> m_ay8910_1; + required_device<ay8910_device> m_ay8910_0; + required_device<ay8910_device> m_ay8910_1; required_device<pia6821_device> m_pia1; UINT8 m_digit; // scanlines from i8279 diff --git a/src/mame/drivers/pcxt.c b/src/mame/drivers/pcxt.c index d1af4896e41..40dc6752808 100644 --- a/src/mame/drivers/pcxt.c +++ b/src/mame/drivers/pcxt.c @@ -90,10 +90,10 @@ public: UINT8 m_at_pages[0x10]; UINT8 m_pc_spkrdata, m_pc_input; - required_device<device_t> m_pit8253; - required_device<device_t> m_pic8259_1; - required_device<device_t> m_pic8259_2; - required_device<device_t> m_dma8237_1; + required_device<pit8253_device> m_pit8253; + required_device<pic8259_device> m_pic8259_1; + required_device<pic8259_device> m_pic8259_2; + required_device<i8237_device> m_dma8237_1; DECLARE_READ8_MEMBER(disk_iobank_r); DECLARE_WRITE8_MEMBER(disk_iobank_w); diff --git a/src/mame/includes/cidelsa.h b/src/mame/includes/cidelsa.h index a170f750f6d..80ade50582b 100644 --- a/src/mame/includes/cidelsa.h +++ b/src/mame/includes/cidelsa.h @@ -83,7 +83,7 @@ public: m_psg(*this, AY8910_TAG) { } - required_device<device_t> m_psg; + required_device<ay8910_device> m_psg; virtual void machine_start(); diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index 6aaeab12704..9e6848b99f2 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -40,7 +40,7 @@ public: required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; optional_device<okim6295_device> m_oki; - optional_device<device_t> m_ymsnd; + optional_device<ym2151_device> m_ymsnd; optional_device<k053936_device> m_k053936; /* memory pointers */ optional_shared_ptr<UINT16> m_vram_0; diff --git a/src/mess/drivers/a5105.c b/src/mess/drivers/a5105.c index 0a58ced8219..0dbb604b478 100644 --- a/src/mess/drivers/a5105.c +++ b/src/mess/drivers/a5105.c @@ -53,7 +53,7 @@ public: required_device<cpu_device> m_maincpu; required_device<upd7220_device> m_hgdc; required_device<cassette_image_device> m_cass; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; required_device<upd765a_device> m_fdc; required_device<floppy_connector> m_floppy0; required_device<floppy_connector> m_floppy1; diff --git a/src/mess/drivers/alphatro.c b/src/mess/drivers/alphatro.c index de8516f5e70..cf88d89029f 100644 --- a/src/mess/drivers/alphatro.c +++ b/src/mess/drivers/alphatro.c @@ -48,7 +48,7 @@ public: required_device<mc6845_device> m_crtc; required_device<i8251_device> m_usart; required_device<cassette_image_device> m_cass; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; DECLARE_READ8_MEMBER(port10_r); DECLARE_WRITE8_MEMBER(port10_w); diff --git a/src/mess/drivers/apf.c b/src/mess/drivers/apf.c index a0a31350a0f..4df75476a2a 100644 --- a/src/mess/drivers/apf.c +++ b/src/mess/drivers/apf.c @@ -79,11 +79,11 @@ public: required_device<cpu_device> m_maincpu; required_device<mc6847_base_device> m_crtc; - required_device<device_t> m_speaker; - required_device<device_t> m_pia0; - optional_device<device_t> m_pia1; + required_device<speaker_sound_device> m_speaker; + required_device<pia6821_device> m_pia0; + optional_device<pia6821_device> m_pia1; optional_device<cassette_image_device> m_cass; - optional_device<device_t> m_fdc; + optional_device<wd1770_device> m_fdc; DECLARE_READ8_MEMBER(apf_mc6847_videoram_r); DECLARE_WRITE_LINE_MEMBER(apf_mc6847_fs_w); DECLARE_READ8_MEMBER(apf_m1000_pia_in_a_func); diff --git a/src/mess/drivers/apricot.c b/src/mess/drivers/apricot.c index 5fe5093e307..f9886f8116c 100644 --- a/src/mess/drivers/apricot.c +++ b/src/mess/drivers/apricot.c @@ -44,13 +44,13 @@ public: required_device<cpu_device> m_maincpu; required_device<ram_device> m_ram; - required_device<device_t> m_sn; + required_device<sn76489_device> m_sn; required_device<mc6845_device> m_crtc; required_device<i8255_device> m_ppi; - required_device<device_t> m_pic; - required_device<device_t> m_pit; - required_device<device_t> m_z80sio; - required_device<device_t> m_fdc; + required_device<pic8259_device> m_pic; + required_device<pit8253_device> m_pit; + required_device<z80sio_device> m_z80sio; + required_device<wd2793_device> m_fdc; DECLARE_READ8_MEMBER(apricot_sysctrl_r); DECLARE_WRITE8_MEMBER(apricot_sysctrl_w); DECLARE_WRITE_LINE_MEMBER(apricot_pit8253_out1); diff --git a/src/mess/drivers/bigbord2.c b/src/mess/drivers/bigbord2.c index 8460c87b160..5b89af07b7a 100644 --- a/src/mess/drivers/bigbord2.c +++ b/src/mess/drivers/bigbord2.c @@ -138,12 +138,12 @@ public: required_device<z80ctc_device> m_ctca; required_device<z80ctc_device> m_ctcb; required_device<z80dma_device> m_dma; - required_device<device_t> m_fdc; - required_device<device_t> m_floppy0; - required_device<device_t> m_floppy1; - required_device<device_t> m_floppy2; - required_device<device_t> m_floppy3; - required_device<device_t> m_beeper; + required_device<fd1793_device> m_fdc; + required_device<legacy_floppy_image_device> m_floppy0; + required_device<legacy_floppy_image_device> m_floppy1; + required_device<legacy_floppy_image_device> m_floppy2; + required_device<legacy_floppy_image_device> m_floppy3; + required_device<beep_device> m_beeper; DECLARE_DRIVER_INIT(bigbord2); TIMER_DEVICE_CALLBACK_MEMBER(ctc_tick); DECLARE_WRITE_LINE_MEMBER(bigbord2_interrupt); diff --git a/src/mess/drivers/bmjr.c b/src/mess/drivers/bmjr.c index a575363d668..d8fd6c1f6e4 100644 --- a/src/mess/drivers/bmjr.c +++ b/src/mess/drivers/bmjr.c @@ -32,7 +32,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cassette_image_device> m_cass; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; DECLARE_READ8_MEMBER(key_r); DECLARE_WRITE8_MEMBER(key_w); DECLARE_READ8_MEMBER(ff_r); diff --git a/src/mess/drivers/bml3.c b/src/mess/drivers/bml3.c index fcd2be66c1f..986e5943e09 100644 --- a/src/mess/drivers/bml3.c +++ b/src/mess/drivers/bml3.c @@ -55,7 +55,7 @@ public: required_device<cpu_device> m_maincpu; required_device<mc6845_device> m_crtc; //required_device<cassette_image_device> m_cass; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; DECLARE_WRITE8_MEMBER(bml3_6845_w); DECLARE_READ8_MEMBER(bml3_keyboard_r); DECLARE_WRITE8_MEMBER(bml3_hres_reg_w); diff --git a/src/mess/drivers/camplynx.c b/src/mess/drivers/camplynx.c index 9420240ad44..d66d6bb3232 100644 --- a/src/mess/drivers/camplynx.c +++ b/src/mess/drivers/camplynx.c @@ -96,10 +96,10 @@ public: required_device<cpu_device> m_maincpu; //required_device<cassette_image_device> m_cass; - //required_device<device_t> m_wave; - //required_device<device_t> m_printer; + //required_device<> m_wave; + //required_device<> m_printer; required_device<mc6845_device> m_crtc; - //optional_device<device_t> m_fdc; + //optional_device<> m_fdc; DECLARE_WRITE8_MEMBER(lynx48k_bank_w); DECLARE_WRITE8_MEMBER(lynx128k_bank_w); DECLARE_WRITE8_MEMBER(lynx128k_irq); diff --git a/src/mess/drivers/chessmst.c b/src/mess/drivers/chessmst.c index e9b29a5954b..f9a9f4f810b 100644 --- a/src/mess/drivers/chessmst.c +++ b/src/mess/drivers/chessmst.c @@ -24,7 +24,7 @@ public: m_speaker(*this, SPEAKER_TAG) { } - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; UINT16 m_matrix; UINT16 m_led_sel; diff --git a/src/mess/drivers/csc.c b/src/mess/drivers/csc.c index 6856b9da1e1..fd27a3df690 100644 --- a/src/mess/drivers/csc.c +++ b/src/mess/drivers/csc.c @@ -28,7 +28,7 @@ public: m_speech(*this, "speech") { } - required_device<device_t> m_speech; + required_device<s14001a_device> m_speech; virtual void machine_start(); diff --git a/src/mess/drivers/d6800.c b/src/mess/drivers/d6800.c index a4a25fd2267..a7af7769d51 100644 --- a/src/mess/drivers/d6800.c +++ b/src/mess/drivers/d6800.c @@ -70,7 +70,7 @@ public: bool m_screen_on; required_device<cpu_device> m_maincpu; required_device<cassette_image_device> m_cass; - required_device<device_t> m_pia; + required_device<pia6821_device> m_pia; required_device<dac_device> m_dac; required_shared_ptr<UINT8> m_videoram; private: diff --git a/src/mess/drivers/digel804.c b/src/mess/drivers/digel804.c index e9a6731db83..1f706496698 100644 --- a/src/mess/drivers/digel804.c +++ b/src/mess/drivers/digel804.c @@ -82,8 +82,8 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_terminal; - required_device<device_t> m_speaker; + required_device<generic_terminal_device> m_terminal; + required_device<speaker_sound_device> m_speaker; required_device<acia6551_device> m_acia; required_device<roc10937_t> m_vfd; required_device<mm74c922_device> m_kb; diff --git a/src/mess/drivers/dim68k.c b/src/mess/drivers/dim68k.c index 043fdf2bea2..1ad1814eb9e 100644 --- a/src/mess/drivers/dim68k.c +++ b/src/mess/drivers/dim68k.c @@ -50,7 +50,7 @@ public: required_device<cpu_device> m_maincpu; required_device<mc6845_device> m_crtc; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; DECLARE_READ16_MEMBER( dim68k_duart_r ); DECLARE_READ16_MEMBER( dim68k_fdc_r ); DECLARE_READ16_MEMBER( dim68k_game_switches_r ); diff --git a/src/mess/drivers/dolphunk.c b/src/mess/drivers/dolphunk.c index 80b6e466390..17ea9c4875d 100644 --- a/src/mess/drivers/dolphunk.c +++ b/src/mess/drivers/dolphunk.c @@ -91,7 +91,7 @@ public: UINT8 m_last_key; bool m_speaker_state; required_device<cpu_device> m_maincpu; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; }; WRITE8_MEMBER( dolphunk_state::port00_w ) diff --git a/src/mess/drivers/eacc.c b/src/mess/drivers/eacc.c index a47df46ef9a..2afeac096e0 100644 --- a/src/mess/drivers/eacc.c +++ b/src/mess/drivers/eacc.c @@ -73,7 +73,7 @@ public: bool m_cb2; bool m_nmi; required_device<cpu_device> m_maincpu; - required_device<device_t> m_pia; + required_device<pia6821_device> m_pia; required_shared_ptr<UINT8> m_p_nvram; virtual void machine_reset(); TIMER_DEVICE_CALLBACK_MEMBER(eacc_cb1); diff --git a/src/mess/drivers/esq1.c b/src/mess/drivers/esq1.c index 74ecc39fb93..6b1a65c8210 100644 --- a/src/mess/drivers/esq1.c +++ b/src/mess/drivers/esq1.c @@ -136,8 +136,8 @@ public: m_vfd(*this, "vfd") { } - required_device<device_t> m_maincpu; - required_device<device_t> m_duart; + required_device<cpu_device> m_maincpu; + required_device<duart68681_device> m_duart; optional_device<wd1772_t> m_fdc; optional_device<esq2x40_t> m_vfd; diff --git a/src/mess/drivers/esq5505.c b/src/mess/drivers/esq5505.c index 1f01e9ffa84..2f0b6be3a16 100644 --- a/src/mess/drivers/esq5505.c +++ b/src/mess/drivers/esq5505.c @@ -135,12 +135,12 @@ public: { } required_device<m68000_device> m_maincpu; - required_device<device_t> m_duart; + required_device<duart68681_device> m_duart; optional_device<wd1772_t> m_fdc; optional_device<esq1x22_t> m_epsvfd; optional_device<esq2x40_sq1_t> m_sq1vfd; optional_device<esq2x40_t> m_vfd; - optional_device<device_t> m_dmac; + optional_device<hd63450_device> m_dmac; virtual void machine_reset(); diff --git a/src/mess/drivers/fp1100.c b/src/mess/drivers/fp1100.c index 09679d11b08..b5ee7ef04c8 100644 --- a/src/mess/drivers/fp1100.c +++ b/src/mess/drivers/fp1100.c @@ -76,11 +76,11 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; //required_device<cassette_image_device> m_cass; - //required_device<device_t> m_wave; - //required_device<device_t> m_speaker; - //required_device<device_t> m_printer; + //required_device<> m_wave; + //required_device<> m_speaker; + //required_device<> m_printer; required_device<mc6845_device> m_crtc; - //required_device<device_t> m_fdc; + //required_device<> m_fdc; DECLARE_READ8_MEMBER(fp1100_mem_r); DECLARE_WRITE8_MEMBER(fp1100_mem_w); DECLARE_WRITE8_MEMBER(main_bank_w); diff --git a/src/mess/drivers/glasgow.c b/src/mess/drivers/glasgow.c index cd50e0f0667..f6f29f2bb65 100644 --- a/src/mess/drivers/glasgow.c +++ b/src/mess/drivers/glasgow.c @@ -63,7 +63,7 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; DECLARE_WRITE16_MEMBER(glasgow_lcd_w); DECLARE_WRITE16_MEMBER(glasgow_lcd_flag_w); DECLARE_READ16_MEMBER(glasgow_keys_r); diff --git a/src/mess/drivers/h19.c b/src/mess/drivers/h19.c index cee5e6759af..a04a2be63f3 100644 --- a/src/mess/drivers/h19.c +++ b/src/mess/drivers/h19.c @@ -55,8 +55,8 @@ public: required_device<cpu_device> m_maincpu; required_device<mc6845_device> m_crtc; - required_device<device_t> m_ace; - required_device<device_t> m_beep; + required_device<ins8250_device> m_ace; + required_device<beep_device> m_beep; DECLARE_READ8_MEMBER(h19_80_r); DECLARE_READ8_MEMBER(h19_a0_r); DECLARE_WRITE8_MEMBER(h19_c0_w); diff --git a/src/mess/drivers/h8.c b/src/mess/drivers/h8.c index a7961146f86..3ae5bfe467d 100644 --- a/src/mess/drivers/h8.c +++ b/src/mess/drivers/h8.c @@ -33,7 +33,7 @@ public: required_device<cpu_device> m_maincpu; //required_device<cassette_image_device> m_cass; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; DECLARE_READ8_MEMBER(h8_f0_r); DECLARE_WRITE8_MEMBER(h8_f0_w); DECLARE_WRITE8_MEMBER(h8_f1_w); diff --git a/src/mess/drivers/homelab.c b/src/mess/drivers/homelab.c index 480b4e91118..4570cc6e462 100644 --- a/src/mess/drivers/homelab.c +++ b/src/mess/drivers/homelab.c @@ -63,7 +63,7 @@ public: const UINT8 *m_p_videoram; bool m_nmi; required_device<cpu_device> m_maincpu; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<cassette_image_device> m_cass; DECLARE_DRIVER_INIT(brailab4); DECLARE_VIDEO_START(homelab2); diff --git a/src/mess/drivers/horizon.c b/src/mess/drivers/horizon.c index b8add30e569..861233c27b5 100644 --- a/src/mess/drivers/horizon.c +++ b/src/mess/drivers/horizon.c @@ -25,7 +25,7 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_terminal; + required_device<generic_terminal_device> m_terminal; DECLARE_WRITE8_MEMBER( kbd_put ); //UINT8 m_term_data; virtual void machine_reset(); diff --git a/src/mess/drivers/hp9k.c b/src/mess/drivers/hp9k.c index d8c8a84f6bc..a2d3c37feea 100644 --- a/src/mess/drivers/hp9k.c +++ b/src/mess/drivers/hp9k.c @@ -134,7 +134,7 @@ public: UINT8 kbdBit; required_device<cpu_device> m_maincpu; - //required_device<device_t> m_terminal; + //required_device<> m_terminal; required_device<mc6845_device> m_6845; UINT8 m_videoram[0x4000]; diff --git a/src/mess/drivers/ht68k.c b/src/mess/drivers/ht68k.c index 445f934d6c7..05ac552c0bc 100644 --- a/src/mess/drivers/ht68k.c +++ b/src/mess/drivers/ht68k.c @@ -48,7 +48,7 @@ public: required_device<cpu_device> m_maincpu; required_device<generic_terminal_device> m_terminal; - required_device<device_t> m_duart; + required_device<duart68681_device> m_duart; required_device<wd1770_t> m_fdc; DECLARE_WRITE8_MEMBER(kbd_put); DECLARE_WRITE_LINE_MEMBER(ht68k_fdc_intrq_w); diff --git a/src/mess/drivers/imds.c b/src/mess/drivers/imds.c index 614a9856bca..b0490dd3733 100644 --- a/src/mess/drivers/imds.c +++ b/src/mess/drivers/imds.c @@ -31,7 +31,7 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_terminal; + required_device<generic_terminal_device> m_terminal; DECLARE_READ8_MEMBER(term_r); DECLARE_READ8_MEMBER(term_status_r); DECLARE_WRITE8_MEMBER(kbd_put); diff --git a/src/mess/drivers/ipds.c b/src/mess/drivers/ipds.c index a2093b63a41..603f16d4829 100644 --- a/src/mess/drivers/ipds.c +++ b/src/mess/drivers/ipds.c @@ -22,7 +22,7 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_crtc; + required_device<i8275_device> m_crtc; DECLARE_READ8_MEMBER(ipds_b0_r); DECLARE_READ8_MEMBER(ipds_b1_r); DECLARE_READ8_MEMBER(ipds_c0_r); diff --git a/src/mess/drivers/iq151.c b/src/mess/drivers/iq151.c index ca1f1d21007..dd59cb08d25 100644 --- a/src/mess/drivers/iq151.c +++ b/src/mess/drivers/iq151.c @@ -73,8 +73,8 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_pic; - required_device<device_t> m_speaker; + required_device<pic8259_device> m_pic; + required_device<speaker_sound_device> m_speaker; required_device<cassette_image_device> m_cassette; DECLARE_READ8_MEMBER(keyboard_row_r); diff --git a/src/mess/drivers/junior.c b/src/mess/drivers/junior.c index 0df43bbc0cc..247b2cd9d63 100644 --- a/src/mess/drivers/junior.c +++ b/src/mess/drivers/junior.c @@ -36,7 +36,7 @@ public: m_riot(*this, "riot") { } - required_device<device_t> m_riot; + required_device<riot6532_device> m_riot; DECLARE_READ8_MEMBER(junior_riot_a_r); DECLARE_READ8_MEMBER(junior_riot_b_r); DECLARE_WRITE8_MEMBER(junior_riot_a_w); diff --git a/src/mess/drivers/kim1.c b/src/mess/drivers/kim1.c index 109cef241ac..685fb47af1b 100644 --- a/src/mess/drivers/kim1.c +++ b/src/mess/drivers/kim1.c @@ -111,7 +111,7 @@ public: m_cass(*this, CASSETTE_TAG) { } - required_device<device_t> m_riot2; + required_device<mos6530_device> m_riot2; required_device<cassette_image_device> m_cass; DECLARE_READ8_MEMBER(kim1_u2_read_a); DECLARE_WRITE8_MEMBER(kim1_u2_write_a); diff --git a/src/mess/drivers/lcmate2.c b/src/mess/drivers/lcmate2.c index 5a9dac2c9ef..74af1fd0d4c 100644 --- a/src/mess/drivers/lcmate2.c +++ b/src/mess/drivers/lcmate2.c @@ -50,7 +50,7 @@ public: required_device<cpu_device> m_maincpu; required_device<hd44780_device> m_lcdc; required_device<rp5c15_device> m_rtc; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; virtual void machine_start(); diff --git a/src/mess/drivers/lx800.c b/src/mess/drivers/lx800.c index e84a7250ec5..7590e09246a 100644 --- a/src/mess/drivers/lx800.c +++ b/src/mess/drivers/lx800.c @@ -35,7 +35,7 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; DECLARE_READ8_MEMBER(lx800_porta_r); DECLARE_WRITE8_MEMBER(lx800_porta_w); DECLARE_READ8_MEMBER(lx800_portc_r); diff --git a/src/mess/drivers/m20.c b/src/mess/drivers/m20.c index 661eaade742..51966076065 100644 --- a/src/mess/drivers/m20.c +++ b/src/mess/drivers/m20.c @@ -65,8 +65,8 @@ public: required_device<i8251_device> m_kbdi8251; required_device<i8251_device> m_ttyi8251; required_device<i8255_device> m_i8255; - required_device<device_t> m_i8259; - required_device<device_t> m_wd177x; + required_device<pic8259_device> m_i8259; + required_device<fd1797_device> m_wd177x; required_shared_ptr<UINT16> m_p_videoram; diff --git a/src/mess/drivers/mbc200.c b/src/mess/drivers/mbc200.c index d1d1e01ff8b..e57d3385ff6 100644 --- a/src/mess/drivers/mbc200.c +++ b/src/mess/drivers/mbc200.c @@ -41,17 +41,17 @@ public: m_fdc(*this, "fdc"), m_ppi(*this, "ppi8255_2"), m_floppy0(*this, FLOPPY_0), - m_floppy1(*this, FLOPPY_1) - , - m_vram(*this, "vram"){ } + m_floppy1(*this, FLOPPY_1), + m_vram(*this, "vram") + { } virtual void machine_start(); required_device<mc6845_device> m_6845; - required_device<device_t> m_fdc; + required_device<mb8876_device> m_fdc; required_device<i8255_device> m_ppi; - required_device<device_t> m_floppy0; - required_device<device_t> m_floppy1; + required_device<legacy_floppy_image_device> m_floppy0; + required_device<legacy_floppy_image_device> m_floppy1; DECLARE_READ8_MEMBER(from_master_r); DECLARE_WRITE8_MEMBER(porta_w); diff --git a/src/mess/drivers/mekd2.c b/src/mess/drivers/mekd2.c index 4bbb8c55dc4..aa02372f652 100644 --- a/src/mess/drivers/mekd2.c +++ b/src/mess/drivers/mekd2.c @@ -54,9 +54,9 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_pia_s; - required_device<device_t> m_pia_u; - required_device<device_t> m_acia; + required_device<pia6821_device> m_pia_s; + required_device<pia6821_device> m_pia_u; + required_device<acia6850_device> m_acia; DECLARE_READ_LINE_MEMBER( mekd2_key40_r ); DECLARE_READ8_MEMBER( mekd2_key_r ); DECLARE_WRITE_LINE_MEMBER( mekd2_nmi_w ); diff --git a/src/mess/drivers/mephisto.c b/src/mess/drivers/mephisto.c index a45113fcf22..b2d14ba1280 100644 --- a/src/mess/drivers/mephisto.c +++ b/src/mess/drivers/mephisto.c @@ -78,7 +78,7 @@ public: { } required_device<m65c02_device> m_maincpu; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; DECLARE_WRITE8_MEMBER(write_lcd); DECLARE_WRITE8_MEMBER(mephisto_NMI); DECLARE_READ8_MEMBER(read_keys); diff --git a/src/mess/drivers/merlin.c b/src/mess/drivers/merlin.c index 229e50eb7f9..edb2cbf0c4f 100644 --- a/src/mess/drivers/merlin.c +++ b/src/mess/drivers/merlin.c @@ -22,7 +22,7 @@ public: virtual void machine_start(); - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; DECLARE_READ8_MEMBER(read_k); DECLARE_WRITE16_MEMBER(write_o); diff --git a/src/mess/drivers/mk2.c b/src/mess/drivers/mk2.c index fcbbcce9e87..96c8fa3d693 100644 --- a/src/mess/drivers/mk2.c +++ b/src/mess/drivers/mk2.c @@ -65,8 +65,8 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_speaker; - required_device<device_t> m_miot; + required_device<speaker_sound_device> m_speaker; + required_device<mos6530_device> m_miot; DECLARE_READ8_MEMBER(mk2_read_a); DECLARE_WRITE8_MEMBER(mk2_write_a); DECLARE_READ8_MEMBER(mk2_read_b); diff --git a/src/mess/drivers/multi16.c b/src/mess/drivers/multi16.c index 49aa682349b..882009915ec 100644 --- a/src/mess/drivers/multi16.c +++ b/src/mess/drivers/multi16.c @@ -22,7 +22,7 @@ public: m_p_vram(*this, "p_vram"){ } required_device<cpu_device> m_maincpu; - required_device<device_t> m_pic; + required_device<pic8259_device> m_pic; required_device<mc6845_device> m_crtc; DECLARE_WRITE8_MEMBER(multi16_6845_address_w); DECLARE_WRITE8_MEMBER(multi16_6845_data_w); diff --git a/src/mess/drivers/multi8.c b/src/mess/drivers/multi8.c index 805bf326b8e..7a7db466b51 100644 --- a/src/mess/drivers/multi8.c +++ b/src/mess/drivers/multi8.c @@ -34,7 +34,7 @@ public: required_device<cpu_device> m_maincpu; required_device<i8255_device> m_ppi; required_device<mc6845_device> m_crtc; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; DECLARE_WRITE8_MEMBER(multi8_6845_w); DECLARE_READ8_MEMBER(key_input_r); DECLARE_READ8_MEMBER(key_status_r); diff --git a/src/mess/drivers/myb3k.c b/src/mess/drivers/myb3k.c index 1c95437cb74..e8425f52b98 100644 --- a/src/mess/drivers/myb3k.c +++ b/src/mess/drivers/myb3k.c @@ -29,7 +29,7 @@ public: m_p_vram(*this, "p_vram"){ } required_device<cpu_device> m_maincpu; - required_device<device_t> m_fdc; + required_device<mb8877_device> m_fdc; required_device<mc6845_device> m_crtc; DECLARE_WRITE8_MEMBER(myb3k_6845_address_w); DECLARE_WRITE8_MEMBER(myb3k_6845_data_w); diff --git a/src/mess/drivers/mycom.c b/src/mess/drivers/mycom.c index 509fd83048f..d5d80a937a5 100644 --- a/src/mess/drivers/mycom.c +++ b/src/mess/drivers/mycom.c @@ -81,9 +81,9 @@ public: required_device<i8255_device> m_ppi1; required_device<i8255_device> m_ppi2; required_device<cassette_image_device> m_cass; - required_device<device_t> m_wave; + required_device<wave_device> m_wave; required_device<mc6845_device> m_crtc; - required_device<device_t> m_fdc; + required_device<fd1771_device> m_fdc; required_device<sn76489_device> m_audio; required_device<msm5832_device> m_rtc; DECLARE_READ8_MEMBER( mycom_upper_r ); diff --git a/src/mess/drivers/nanos.c b/src/mess/drivers/nanos.c index 6098de7faf8..4b403518e7d 100644 --- a/src/mess/drivers/nanos.c +++ b/src/mess/drivers/nanos.c @@ -44,7 +44,7 @@ public: required_device<z80ctc_device> m_ctc_0; required_device<z80ctc_device> m_ctc_1; required_device<upd765a_device> m_fdc; - required_device<device_t> m_key_t; + required_device<timer_device> m_key_t; const UINT8 *m_p_chargen; UINT8 m_key_command; UINT8 m_last_code; diff --git a/src/mess/drivers/osbexec.c b/src/mess/drivers/osbexec.c index ae7034989ce..9e44d927cdb 100644 --- a/src/mess/drivers/osbexec.c +++ b/src/mess/drivers/osbexec.c @@ -35,12 +35,12 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_mb8877; + required_device<mb8877_device> m_mb8877; required_device<ram_device> m_messram; required_device<pia6821_device> m_pia_0; required_device<pia6821_device> m_pia_1; required_device<z80dart_device> m_sio; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; virtual void video_start(); diff --git a/src/mess/drivers/palm.c b/src/mess/drivers/palm.c index 06e9c4ceb46..e6a781beea8 100644 --- a/src/mess/drivers/palm.c +++ b/src/mess/drivers/palm.c @@ -29,7 +29,7 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_lsi; + required_device<mc68328_device> m_lsi; required_device<dac_device> m_dac; required_device<ram_device> m_ram; // mc68328 needs modernising diff --git a/src/mess/drivers/paso1600.c b/src/mess/drivers/paso1600.c index ed7adee43e4..505a634d6d4 100644 --- a/src/mess/drivers/paso1600.c +++ b/src/mess/drivers/paso1600.c @@ -29,8 +29,8 @@ public: m_p_gvram(*this, "p_gvram"){ } required_device<cpu_device> m_maincpu; - required_device<device_t> m_pic; - required_device<device_t> m_dma; + required_device<pic8259_device> m_pic; + required_device<i8237_device> m_dma; required_device<mc6845_device> m_crtc; DECLARE_READ8_MEMBER(paso1600_pcg_r); DECLARE_WRITE8_MEMBER(paso1600_pcg_w); diff --git a/src/mess/drivers/pb1000.c b/src/mess/drivers/pb1000.c index 794a1992ac9..af9fa554393 100644 --- a/src/mess/drivers/pb1000.c +++ b/src/mess/drivers/pb1000.c @@ -36,7 +36,7 @@ public: { } required_device<hd61700_cpu_device> m_maincpu; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; required_device<hd44352_device> m_hd44352; emu_timer *m_kb_timer; diff --git a/src/mess/drivers/pc2000.c b/src/mess/drivers/pc2000.c index ba19c7ddb0c..69cfc46f1eb 100644 --- a/src/mess/drivers/pc2000.c +++ b/src/mess/drivers/pc2000.c @@ -31,7 +31,7 @@ public: { } required_device<hd44780_device> m_lcdc; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; UINT8 m_mux_data; UINT8 m_beep_state; diff --git a/src/mess/drivers/pce220.c b/src/mess/drivers/pce220.c index d0b59c19c89..1c96da18bda 100644 --- a/src/mess/drivers/pce220.c +++ b/src/mess/drivers/pce220.c @@ -48,7 +48,7 @@ public: required_device<cpu_device> m_maincpu; required_device<ram_device> m_ram; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; required_device<pce220_serial_device> m_serial; // HD61202 LCD controller diff --git a/src/mess/drivers/pcm.c b/src/mess/drivers/pcm.c index 26752375c09..75bd999e65f 100644 --- a/src/mess/drivers/pcm.c +++ b/src/mess/drivers/pcm.c @@ -83,7 +83,7 @@ public: required_device<z80sio_device> m_sio; required_device<z80ctc_device> m_ctc_s; required_device<z80ctc_device> m_ctc_u; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<cassette_image_device> m_cass; DECLARE_READ8_MEMBER( pcm_85_r ); DECLARE_WRITE_LINE_MEMBER( pcm_82_w ); diff --git a/src/mess/drivers/pegasus.c b/src/mess/drivers/pegasus.c index 967c7fd7f02..b36ea1784eb 100644 --- a/src/mess/drivers/pegasus.c +++ b/src/mess/drivers/pegasus.c @@ -58,8 +58,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cassette_image_device> m_cass; - required_device<device_t> m_pia_s; - required_device<device_t> m_pia_u; + required_device<pia6821_device> m_pia_s; + required_device<pia6821_device> m_pia_u; DECLARE_READ8_MEMBER( pegasus_keyboard_r ); DECLARE_READ8_MEMBER( pegasus_protection_r ); DECLARE_READ8_MEMBER( pegasus_pcg_r ); diff --git a/src/mess/drivers/phunsy.c b/src/mess/drivers/phunsy.c index cc7dc8ebebf..027d543cd63 100644 --- a/src/mess/drivers/phunsy.c +++ b/src/mess/drivers/phunsy.c @@ -54,7 +54,7 @@ public: virtual void video_start(); UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); required_device<cpu_device> m_maincpu; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<cassette_image_device> m_cass; required_shared_ptr<UINT8> m_videoram; virtual void palette_init(); diff --git a/src/mess/drivers/ptcsol.c b/src/mess/drivers/ptcsol.c index f8dd419b5f1..1aacebe2c5c 100644 --- a/src/mess/drivers/ptcsol.c +++ b/src/mess/drivers/ptcsol.c @@ -162,8 +162,8 @@ public: required_device<cpu_device> m_maincpu; required_device<cassette_image_device> m_cass1; required_device<cassette_image_device> m_cass2; - required_device<device_t> m_uart; - required_device<device_t> m_uart_s; + required_device<ay31015_device> m_uart; + required_device<ay31015_device> m_uart_s; required_shared_ptr<const UINT8> m_p_videoram; required_ioport m_iop_arrows; required_ioport m_iop_config; diff --git a/src/mess/drivers/px4.c b/src/mess/drivers/px4.c index 4876eaa3203..6d013fe31c2 100644 --- a/src/mess/drivers/px4.c +++ b/src/mess/drivers/px4.c @@ -88,7 +88,7 @@ public: required_device<ram_device> m_ram; required_device<centronics_device> m_centronics; required_device<cassette_image_device> m_ext_cas; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<epson_sio_device> m_sio; /* gapnit register */ diff --git a/src/mess/drivers/pyl601.c b/src/mess/drivers/pyl601.c index 948855a5524..067eb3cd522 100644 --- a/src/mess/drivers/pyl601.c +++ b/src/mess/drivers/pyl601.c @@ -77,7 +77,7 @@ public: DECLARE_WRITE8_MEMBER(floppy_w); DECLARE_READ8_MEMBER(floppy_r); UINT8 selectedline(UINT16 data); - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<upd765a_device> m_fdc; required_device<ram_device> m_ram; DECLARE_DRIVER_INIT(pyl601); diff --git a/src/mess/drivers/qx10.c b/src/mess/drivers/qx10.c index d0479ad73cf..759eefda038 100644 --- a/src/mess/drivers/qx10.c +++ b/src/mess/drivers/qx10.c @@ -70,10 +70,10 @@ public: m_vram_bank(0) { } - required_device<device_t> m_pit_1; - required_device<device_t> m_pit_2; - required_device<device_t> m_pic_m; - required_device<device_t> m_pic_s; + required_device<pit8253_device> m_pit_1; + required_device<pit8253_device> m_pit_2; + required_device<pic8259_device> m_pic_m; + required_device<pic8259_device> m_pic_s; required_device<upd7201_device> m_scc; required_device<i8255_device> m_ppi; required_device<i8237_device> m_dma_1; diff --git a/src/mess/drivers/rainbow.c b/src/mess/drivers/rainbow.c index e37e5ddb9ef..9025bb7c022 100644 --- a/src/mess/drivers/rainbow.c +++ b/src/mess/drivers/rainbow.c @@ -84,10 +84,10 @@ public: { } - required_device<device_t> m_crtc; - required_device<device_t> m_i8088; - required_device<device_t> m_z80; - required_device<device_t> m_fdc; + required_device<vt100_video_device> m_crtc; + required_device<cpu_device> m_i8088; + required_device<cpu_device> m_z80; + required_device<fd1793_device> m_fdc; required_device<i8251_device> m_kbd8251; required_device<lk201_device> m_lk201; required_shared_ptr<UINT8> m_p_ram; @@ -198,7 +198,7 @@ INPUT_PORTS_END void rainbow_state::machine_reset() { - m_z80->execute().set_input_line(INPUT_LINE_HALT, ASSERT_LINE); + m_z80->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); m_zflip = true; m_z80_halted = true; @@ -278,28 +278,28 @@ WRITE8_MEMBER(rainbow_state::share_z80_w) READ8_MEMBER(rainbow_state::i8088_latch_r) { // printf("Read %02x from 8088 mailbox\n", m_8088_mailbox); - m_i8088->execute().set_input_line(INPUT_LINE_INT1, CLEAR_LINE); + m_i8088->set_input_line(INPUT_LINE_INT1, CLEAR_LINE); return m_8088_mailbox; } WRITE8_MEMBER(rainbow_state::i8088_latch_w) { // printf("%02x to Z80 mailbox\n", data); - m_z80->execute().set_input_line_and_vector(0, ASSERT_LINE, 0xf7); + m_z80->set_input_line_and_vector(0, ASSERT_LINE, 0xf7); m_z80_mailbox = data; } READ8_MEMBER(rainbow_state::z80_latch_r) { // printf("Read %02x from Z80 mailbox\n", m_z80_mailbox); - m_z80->execute().set_input_line(0, CLEAR_LINE); + m_z80->set_input_line(0, CLEAR_LINE); return m_z80_mailbox; } WRITE8_MEMBER(rainbow_state::z80_latch_w) { // printf("%02x to 8088 mailbox\n", data); - m_i8088->execute().set_input_line_and_vector(INPUT_LINE_INT1, ASSERT_LINE, 0x27); + m_i8088->set_input_line_and_vector(INPUT_LINE_INT1, ASSERT_LINE, 0x27); m_8088_mailbox = data; } @@ -325,7 +325,7 @@ INTERRUPT_GEN_MEMBER(rainbow_state::vblank_irq) WRITE8_MEMBER( rainbow_state::clear_video_interrupt ) { - m_i8088->execute().set_input_line(INPUT_LINE_INT0, CLEAR_LINE); + m_i8088->set_input_line(INPUT_LINE_INT0, CLEAR_LINE); } READ8_MEMBER( rainbow_state::diagnostic_r ) @@ -339,7 +339,7 @@ WRITE8_MEMBER( rainbow_state::diagnostic_w ) if (!(data & 1)) { - m_z80->execute().set_input_line(INPUT_LINE_HALT, ASSERT_LINE); + m_z80->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); m_z80_halted = true; } @@ -347,7 +347,7 @@ WRITE8_MEMBER( rainbow_state::diagnostic_w ) { m_zflip = true; m_z80_halted = false; - m_z80->execute().set_input_line(INPUT_LINE_HALT, CLEAR_LINE); + m_z80->set_input_line(INPUT_LINE_HALT, CLEAR_LINE); m_z80->reset(); } @@ -358,11 +358,11 @@ void rainbow_state::update_kbd_irq() { if ((m_kbd_rx_ready) || (m_kbd_tx_ready)) { - m_i8088->execute().set_input_line_and_vector(INPUT_LINE_INT2, ASSERT_LINE, 0x26); + m_i8088->set_input_line_and_vector(INPUT_LINE_INT2, ASSERT_LINE, 0x26); } else { - m_i8088->execute().set_input_line(INPUT_LINE_INT2, CLEAR_LINE); + m_i8088->set_input_line(INPUT_LINE_INT2, CLEAR_LINE); } } diff --git a/src/mess/drivers/rex6000.c b/src/mess/drivers/rex6000.c index 97953149de3..e3fd57ddc3f 100644 --- a/src/mess/drivers/rex6000.c +++ b/src/mess/drivers/rex6000.c @@ -66,7 +66,7 @@ public: required_device<cpu_device> m_maincpu; required_device<ram_device> m_ram; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; fujitsu_29dl16x_device *m_flash[4]; UINT8 m_bank[4]; diff --git a/src/mess/drivers/rx78.c b/src/mess/drivers/rx78.c index 520454dffc7..f0f229db2bd 100644 --- a/src/mess/drivers/rx78.c +++ b/src/mess/drivers/rx78.c @@ -63,7 +63,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cassette_image_device> m_cass; - required_device<device_t> m_wave; + required_device<wave_device> m_wave; DECLARE_READ8_MEMBER( key_r ); DECLARE_READ8_MEMBER( rx78_f0_r ); DECLARE_READ8_MEMBER( rx78_vram_r ); diff --git a/src/mess/drivers/sc1.c b/src/mess/drivers/sc1.c index 302a58894ba..d1cfc265a1d 100644 --- a/src/mess/drivers/sc1.c +++ b/src/mess/drivers/sc1.c @@ -51,7 +51,7 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; DECLARE_WRITE8_MEMBER( matrix_w ); DECLARE_WRITE8_MEMBER( pio_port_a_w ); diff --git a/src/mess/drivers/sc2.c b/src/mess/drivers/sc2.c index 8af42a73ed1..d1a66bd86f4 100644 --- a/src/mess/drivers/sc2.c +++ b/src/mess/drivers/sc2.c @@ -23,7 +23,7 @@ public: m_beep(*this, BEEPER_TAG) { } - required_device<device_t> m_beep; + required_device<beep_device> m_beep; DECLARE_READ8_MEMBER(pio_port_a_r); DECLARE_READ8_MEMBER(pio_port_b_r); DECLARE_WRITE8_MEMBER(pio_port_a_w); diff --git a/src/mess/drivers/sitcom.c b/src/mess/drivers/sitcom.c index 801e01c4ac2..fcb1800ff85 100644 --- a/src/mess/drivers/sitcom.c +++ b/src/mess/drivers/sitcom.c @@ -46,8 +46,8 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_ds0; - required_device<device_t> m_ds1; + required_device<dl1416_device> m_ds0; + required_device<dl1416_device> m_ds1; DECLARE_WRITE_LINE_MEMBER(sod_led); DECLARE_READ_LINE_MEMBER(sid_line); virtual void machine_reset(); diff --git a/src/mess/drivers/slc1.c b/src/mess/drivers/slc1.c index 5280d267dee..bd7be05c60d 100644 --- a/src/mess/drivers/slc1.c +++ b/src/mess/drivers/slc1.c @@ -62,7 +62,7 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; DECLARE_READ8_MEMBER( io_r ); DECLARE_WRITE8_MEMBER( io_w ); UINT8 m_digit; diff --git a/src/mess/drivers/sm1800.c b/src/mess/drivers/sm1800.c index c98150c819b..db155356d4b 100644 --- a/src/mess/drivers/sm1800.c +++ b/src/mess/drivers/sm1800.c @@ -32,9 +32,9 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_uart; - required_device<device_t> m_ppi; - required_device<device_t> m_crtc; + required_device<i8251_device> m_uart; + required_device<i8255_device> m_ppi; + required_device<i8275_device> m_crtc; DECLARE_WRITE8_MEMBER(sm1800_8255_portb_w); DECLARE_WRITE8_MEMBER(sm1800_8255_portc_w); DECLARE_READ8_MEMBER(sm1800_8255_porta_r); diff --git a/src/mess/drivers/socrates.c b/src/mess/drivers/socrates.c index dc0dcd1454b..f4b20c650dc 100644 --- a/src/mess/drivers/socrates.c +++ b/src/mess/drivers/socrates.c @@ -87,7 +87,7 @@ public: { } required_device<cpu_device> m_maincpu; required_device<screen_device> m_screen; - required_device<device_t> m_sound; + required_device<socrates_snd_device> m_sound; rgb_t m_palette[256]; diff --git a/src/mess/drivers/supercon.c b/src/mess/drivers/supercon.c index a234b887b69..8a683a47baa 100644 --- a/src/mess/drivers/supercon.c +++ b/src/mess/drivers/supercon.c @@ -33,7 +33,7 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; DECLARE_READ8_MEMBER(supercon_port1_r); DECLARE_READ8_MEMBER(supercon_port2_r); DECLARE_READ8_MEMBER(supercon_port3_r); diff --git a/src/mess/drivers/svmu.c b/src/mess/drivers/svmu.c index ca18fb6055d..e89c31e0a95 100644 --- a/src/mess/drivers/svmu.c +++ b/src/mess/drivers/svmu.c @@ -32,7 +32,7 @@ public: required_device<lc8670_cpu_device> m_maincpu; required_device<intelfsh8_device> m_flash; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; virtual void palette_init(); virtual void machine_reset(); diff --git a/src/mess/drivers/tec1.c b/src/mess/drivers/tec1.c index 0b418202235..078c211806a 100644 --- a/src/mess/drivers/tec1.c +++ b/src/mess/drivers/tec1.c @@ -90,9 +90,9 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; optional_device<cassette_image_device> m_cass; - optional_device<device_t> m_wave; + optional_device<wave_device> m_wave; emu_timer *m_kbd_timer; DECLARE_READ8_MEMBER( tec1_kbd_r ); DECLARE_READ8_MEMBER( latch_r ); diff --git a/src/mess/drivers/tm990189.c b/src/mess/drivers/tm990189.c index 470b72f7c88..b84a587d70d 100644 --- a/src/mess/drivers/tm990189.c +++ b/src/mess/drivers/tm990189.c @@ -81,7 +81,7 @@ public: { } required_device<tms9980a_device> m_tms9980a; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<cassette_image_device> m_cass; optional_device<tms9918_device> m_tms9918; diff --git a/src/mess/drivers/unixpc.c b/src/mess/drivers/unixpc.c index 6dde44c566f..80d7753676c 100644 --- a/src/mess/drivers/unixpc.c +++ b/src/mess/drivers/unixpc.c @@ -30,15 +30,14 @@ public: m_maincpu(*this, "maincpu"), m_ram(*this, RAM_TAG), m_wd2797(*this, "wd2797"), - m_floppy(*this, FLOPPY_0) - , - m_mapram(*this, "mapram"), - m_videoram(*this, "videoram"){ } + m_floppy(*this, FLOPPY_0), + m_mapram(*this, "mapram"), + m_videoram(*this, "videoram"){ } required_device<cpu_device> m_maincpu; required_device<ram_device> m_ram; - required_device<device_t> m_wd2797; - required_device<device_t> m_floppy; + required_device<wd2797_device> m_wd2797; + required_device<legacy_floppy_image_device> m_floppy; UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mess/drivers/v1050.c b/src/mess/drivers/v1050.c index bd350cda0c2..c7946125ef1 100644 --- a/src/mess/drivers/v1050.c +++ b/src/mess/drivers/v1050.c @@ -106,10 +106,6 @@ Notes: */ #include "includes/v1050.h" -#include "machine/scsibus.h" -#include "machine/scsicb.h" -#include "machine/scsihd.h" -#include "machine/s1410.h" void v1050_state::set_interrupt(UINT8 mask, int state) { @@ -1091,7 +1087,7 @@ static MACHINE_CONFIG_START( v1050, v1050_state ) MCFG_I8255A_ADD(I8255A_M6502_TAG, m6502_ppi_intf) MCFG_I8251_ADD(I8251A_KB_TAG, /*XTAL_16MHz/8,*/ kb_8251_intf) MCFG_I8251_ADD(I8251A_SIO_TAG, /*XTAL_16MHz/8,*/ sio_8251_intf) - MCFG_FD1793x_ADD(MB8877_TAG, XTAL_16MHz/2) + MCFG_FD1793x_ADD(MB8877_TAG, XTAL_16MHz/16 *8) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", v1050_floppies, "525dd", NULL, floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":1", v1050_floppies, "525dd", NULL, floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":2", v1050_floppies, NULL, NULL, floppy_image_device::default_floppy_formats) diff --git a/src/mess/drivers/vk100.c b/src/mess/drivers/vk100.c index 277907f7301..508472e5d4e 100644 --- a/src/mess/drivers/vk100.c +++ b/src/mess/drivers/vk100.c @@ -145,11 +145,11 @@ public: required_device<cpu_device> m_maincpu; required_device<screen_device> m_screen; required_device<mc6845_device> m_crtc; - required_device<device_t> m_speaker; - required_device<device_t> m_uart; - //required_device<device_t> m_i8251_rx_timer; - //required_device<device_t> m_i8251_tx_timer; - //required_device<device_t> m_sync_timer; + required_device<beep_device> m_speaker; + required_device<i8251_device> m_uart; + //required_device<> m_i8251_rx_timer; + //required_device<> m_i8251_tx_timer; + //required_device<> m_sync_timer; UINT8* m_vram; UINT8* m_trans; diff --git a/src/mess/drivers/votrtnt.c b/src/mess/drivers/votrtnt.c index f191806eb8a..ba7675ce193 100644 --- a/src/mess/drivers/votrtnt.c +++ b/src/mess/drivers/votrtnt.c @@ -56,7 +56,7 @@ public: required_device<cpu_device> m_maincpu; required_device<generic_terminal_device> m_terminal; - //required_device<device_t> m_acia; + //required_device<> m_acia; required_device<votrax_sc01_device> m_votrax; DECLARE_READ8_MEMBER(votrtnt_acia_status_r); DECLARE_READ8_MEMBER(votrtnt_acia_data_r); diff --git a/src/mess/drivers/vt100.c b/src/mess/drivers/vt100.c index 94375aaf5dd..c9c2d28992e 100644 --- a/src/mess/drivers/vt100.c +++ b/src/mess/drivers/vt100.c @@ -37,8 +37,8 @@ public: m_p_ram(*this, "p_ram"){ } required_device<cpu_device> m_maincpu; - required_device<device_t> m_crtc; - required_device<device_t> m_speaker; + required_device<vt100_video_device> m_crtc; + required_device<beep_device> m_speaker; DECLARE_READ8_MEMBER(vt100_flags_r); DECLARE_WRITE8_MEMBER(vt100_keyboard_w); DECLARE_READ8_MEMBER(vt100_keyboard_r); diff --git a/src/mess/drivers/vtech1.c b/src/mess/drivers/vtech1.c index 8ef8ecc3c21..6cfcfb63750 100644 --- a/src/mess/drivers/vtech1.c +++ b/src/mess/drivers/vtech1.c @@ -160,15 +160,12 @@ public: m_mc6847(*this, "mc6847"), m_speaker(*this, SPEAKER_TAG), m_cassette(*this, CASSETTE_TAG), - m_printer(*this, "printer") - , - m_videoram(*this, "videoram"){ } + m_videoram(*this, "videoram"){ } /* devices */ required_device<mc6847_base_device> m_mc6847; - optional_device<device_t> m_speaker; + optional_device<speaker_sound_device> m_speaker; optional_device<cassette_image_device> m_cassette; - optional_device<device_t> m_printer; UINT8 *m_ram; UINT32 m_ram_size; diff --git a/src/mess/drivers/wangpc.c b/src/mess/drivers/wangpc.c index 708362613cf..01facb9d09f 100644 --- a/src/mess/drivers/wangpc.c +++ b/src/mess/drivers/wangpc.c @@ -17,7 +17,6 @@ */ #include "includes/wangpc.h" -#include "formats/mfi_dsk.h" //************************************************************************** @@ -1197,6 +1196,7 @@ void wangpc_state::machine_reset() int wangpc_state::on_disk0_load(floppy_image_device *image) { on_disk0_unload(image); + return IMAGE_INIT_PASS; } @@ -1215,7 +1215,8 @@ void wangpc_state::on_disk0_unload(floppy_image_device *image) int wangpc_state::on_disk1_load(floppy_image_device *image) { - on_disk0_unload(image); + on_disk1_unload(image); + return IMAGE_INIT_PASS; } diff --git a/src/mess/drivers/xor100.c b/src/mess/drivers/xor100.c index faf6a462316..fc2e6e942fb 100644 --- a/src/mess/drivers/xor100.c +++ b/src/mess/drivers/xor100.c @@ -32,18 +32,6 @@ */ -#include "emu.h" -#include "cpu/z80/z80.h" -#include "formats/basicdsk.h" -#include "imagedev/flopdrv.h" -#include "machine/ram.h" -#include "machine/com8116.h" -#include "machine/ctronics.h" -#include "machine/i8255.h" -#include "machine/i8251.h" -#include "machine/terminal.h" -#include "machine/wd17xx.h" -#include "machine/z80ctc.h" #include "includes/xor100.h" /* Read/Write Handlers */ diff --git a/src/mess/drivers/z100.c b/src/mess/drivers/z100.c index 693398c8bc7..6dfc062e2df 100644 --- a/src/mess/drivers/z100.c +++ b/src/mess/drivers/z100.c @@ -166,11 +166,11 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_pia0; - required_device<device_t> m_pia1; - required_device<device_t> m_picm; - required_device<device_t> m_pics; - required_device<device_t> m_fdc; + required_device<pia6821_device> m_pia0; + required_device<pia6821_device> m_pia1; + required_device<pic8259_device> m_picm; + required_device<pic8259_device> m_pics; + required_device<fd1797_device> m_fdc; required_device<mc6845_device> m_crtc; DECLARE_READ8_MEMBER(z100_vram_r); DECLARE_WRITE8_MEMBER(z100_vram_w); diff --git a/src/mess/drivers/z9001.c b/src/mess/drivers/z9001.c index 18e04967bf2..e78f1170ed1 100644 --- a/src/mess/drivers/z9001.c +++ b/src/mess/drivers/z9001.c @@ -52,7 +52,7 @@ public: required_device<cpu_device> m_maincpu; UINT8 m_framecnt; - required_device<device_t> m_beeper; + required_device<beep_device> m_beeper; required_device<cassette_image_device> m_cass; required_shared_ptr<const UINT8> m_p_colorram; required_shared_ptr<const UINT8> m_p_videoram; diff --git a/src/mess/drivers/zrt80.c b/src/mess/drivers/zrt80.c index 54f2ab56371..c6d4a833ef8 100644 --- a/src/mess/drivers/zrt80.c +++ b/src/mess/drivers/zrt80.c @@ -36,7 +36,7 @@ public: required_device<cpu_device> m_maincpu; required_device<mc6845_device> m_crtc; required_device<ins8250_device> m_8250; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; DECLARE_READ8_MEMBER(zrt80_10_r); DECLARE_WRITE8_MEMBER(zrt80_30_w); DECLARE_WRITE8_MEMBER(zrt80_38_w); diff --git a/src/mess/includes/abc1600.h b/src/mess/includes/abc1600.h index feca1349161..04cddb7032d 100644 --- a/src/mess/includes/abc1600.h +++ b/src/mess/includes/abc1600.h @@ -83,12 +83,12 @@ public: required_device<z80dart_device> m_dart; required_device<scc8530_t> m_scc; required_device<z8536_device> m_cio; - required_device<device_t> m_fdc; + required_device<fd1797_device> m_fdc; required_device<e0516_device> m_rtc; required_device<nmc9306_device> m_nvram; required_device<mc6845_device> m_crtc; required_device<ram_device> m_ram; - required_device<device_t> m_floppy; + required_device<legacy_floppy_image_device> m_floppy; required_device<abc1600bus_slot_device> m_bus0i; required_device<abc1600bus_slot_device> m_bus0x; required_device<abc1600bus_slot_device> m_bus1; diff --git a/src/mess/includes/abc80.h b/src/mess/includes/abc80.h index 6ee641ab7e5..0cb162e4b2a 100644 --- a/src/mess/includes/abc80.h +++ b/src/mess/includes/abc80.h @@ -77,7 +77,7 @@ public: required_device<cpu_device> m_maincpu; required_device<z80pio_device> m_pio; - required_device<device_t> m_psg; + required_device<sn76477_device> m_psg; required_device<cassette_image_device> m_cassette; required_device<abcbus_slot_device> m_bus; required_device<abc80_keyboard_device> m_kb; diff --git a/src/mess/includes/abc80x.h b/src/mess/includes/abc80x.h index 64f76a17b87..97b9f0a46ab 100644 --- a/src/mess/includes/abc80x.h +++ b/src/mess/includes/abc80x.h @@ -93,7 +93,7 @@ public: required_device<z80ctc_device> m_ctc; required_device<z80dart_device> m_dart; required_device<z80dart_device> m_sio; - optional_device<device_t> m_discrete; + optional_device<discrete_sound_device> m_discrete; optional_device<cassette_image_device> m_cassette; required_device<ram_device> m_ram; @@ -212,7 +212,7 @@ public: { } required_device<mc6845_device> m_crtc; - optional_device<device_t> m_abc77; + optional_device<abc77_device> m_abc77; DECLARE_DRIVER_INIT(driver_init); virtual void machine_start(); @@ -255,7 +255,7 @@ public: required_device<mc6845_device> m_crtc; required_device<e0516_device> m_rtc; - optional_device<device_t> m_abc77; + optional_device<abc77_device> m_abc77; DECLARE_DRIVER_INIT(driver_init); virtual void machine_start(); diff --git a/src/mess/includes/ace.h b/src/mess/includes/ace.h index 631e106ee88..601db6000b7 100644 --- a/src/mess/includes/ace.h +++ b/src/mess/includes/ace.h @@ -33,7 +33,7 @@ public: required_device<cpu_device> m_maincpu; required_device<i8255_device> m_ppi; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<cassette_image_device> m_cassette; required_device<centronics_device> m_centronics; required_device<ram_device> m_ram; diff --git a/src/mess/includes/amstrad.h b/src/mess/includes/amstrad.h index d442c704171..9b533faeee3 100644 --- a/src/mess/includes/amstrad.h +++ b/src/mess/includes/amstrad.h @@ -7,6 +7,7 @@ #ifndef AMSTRAD_H_ #define AMSTRAD_H_ +#include "sound/ay8910.h" #include "machine/upd765.h" #include "video/mc6845.h" #include "machine/i8255.h" @@ -107,7 +108,7 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_ay; + required_device<ay8912_device> m_ay; optional_device<upd765_family_device> m_fdc; // not on a GX4000 required_device<mc6845_device> m_crtc; required_device<screen_device> m_screen; diff --git a/src/mess/includes/apple2gs.h b/src/mess/includes/apple2gs.h index 460814c0909..31b767e5203 100644 --- a/src/mess/includes/apple2gs.h +++ b/src/mess/includes/apple2gs.h @@ -66,7 +66,7 @@ public: required_device<cpu_device> m_maincpu; required_device<es5503_device> m_es5503; - required_device<device_t> m_fdc; + required_device<applefdc_base_device> m_fdc; UINT8 *m_slowmem; UINT8 m_newvideo; diff --git a/src/mess/includes/apricotf.h b/src/mess/includes/apricotf.h index b9fefdb3a4a..e0a207eb44e 100644 --- a/src/mess/includes/apricotf.h +++ b/src/mess/includes/apricotf.h @@ -56,8 +56,8 @@ public: required_device<cpu_device> m_maincpu; required_device<z80ctc_device> m_ctc; required_device<z80dart_device> m_sio; - required_device<device_t> m_fdc; - required_device<device_t> m_floppy0; + required_device<wd2797_device> m_fdc; + required_device<legacy_floppy_image_device> m_floppy0; required_device<centronics_device> m_centronics; int m_ctc_int; int m_sio_int; diff --git a/src/mess/includes/apricotp.h b/src/mess/includes/apricotp.h index d027df01783..afff244a644 100644 --- a/src/mess/includes/apricotp.h +++ b/src/mess/includes/apricotp.h @@ -73,13 +73,13 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; required_device<am9517a_device> m_dmac; - required_device<device_t> m_pic; - required_device<device_t> m_pit; + required_device<pic8259_device> m_pic; + required_device<pit8253_device> m_pit; required_device<z80dart_device> m_sio; - required_device<device_t> m_fdc; + required_device<wd2797_device> m_fdc; required_device<mc6845_device> m_crtc; required_device<ram_device> m_ram; - required_device<device_t> m_floppy0; + required_device<legacy_floppy_image_device> m_floppy0; required_device<centronics_device> m_centronics; virtual void machine_start(); diff --git a/src/mess/includes/at.h b/src/mess/includes/at.h index 9c8dca1bb60..771e9844afc 100644 --- a/src/mess/includes/at.h +++ b/src/mess/includes/at.h @@ -101,18 +101,18 @@ public: { } required_device<cpu_device> m_maincpu; - optional_device<device_t> m_pic8259_master; - optional_device<device_t> m_pic8259_slave; + optional_device<pic8259_device> m_pic8259_master; + optional_device<pic8259_device> m_pic8259_slave; optional_device<am9517a_device> m_dma8237_1; optional_device<am9517a_device> m_dma8237_2; - optional_device<device_t> m_pit8254; + optional_device<pit8254_device> m_pit8254; optional_device<cs8221_device> m_cs8221; optional_device<cs4031_device> m_cs4031; - optional_device<device_t> m_ide; + optional_device<ide_controller_device> m_ide; optional_device<at_keyboard_controller_device> m_keybc; optional_device<isa16_device> m_isabus; - required_device<device_t> m_speaker; - optional_device<device_t> m_ram; + required_device<speaker_sound_device> m_speaker; + optional_device<ram_device> m_ram; optional_device<mc146818_device> m_mc146818; optional_device<pc_kbdc_device> m_pc_kbdc; DECLARE_READ8_MEMBER(at_page8_r); diff --git a/src/mess/includes/atarist.h b/src/mess/includes/atarist.h index cd4996045ed..bcbbc7e47ac 100644 --- a/src/mess/includes/atarist.h +++ b/src/mess/includes/atarist.h @@ -77,7 +77,6 @@ public: m_fdc(*this, WD1772_TAG), m_mfp(*this, MC68901_TAG), m_centronics(*this, CENTRONICS_TAG), - //m_rs232(*this, RS232_TAG), m_ram(*this, RAM_TAG), m_acia_ikbd_irq(1), m_acia_midi_irq(1), @@ -93,7 +92,6 @@ public: required_device<wd1772_t> m_fdc; required_device<mc68901_device> m_mfp; required_device<centronics_device> m_centronics; - //required_device<device_t> m_rs232; required_device<ram_device> m_ram; void machine_start(); diff --git a/src/mess/includes/atom.h b/src/mess/includes/atom.h index 1817d1a0303..3c31dc60e29 100644 --- a/src/mess/includes/atom.h +++ b/src/mess/includes/atom.h @@ -55,7 +55,7 @@ public: required_device<mc6847_base_device> m_vdg; required_device<cassette_image_device> m_cassette; required_device<centronics_device> m_centronics; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; virtual void machine_start(); UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mess/includes/avigo.h b/src/mess/includes/avigo.h index 47ad217d334..3c22c19e136 100644 --- a/src/mess/includes/avigo.h +++ b/src/mess/includes/avigo.h @@ -39,7 +39,7 @@ public: required_device<cpu_device> m_maincpu; required_device<ram_device> m_ram; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<ns16550_device> m_uart; required_device<rs232_port_device> m_serport; diff --git a/src/mess/includes/beta.h b/src/mess/includes/beta.h index 0c6ded0d9dd..1d049ef5812 100644 --- a/src/mess/includes/beta.h +++ b/src/mess/includes/beta.h @@ -27,7 +27,7 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; virtual void machine_start(); diff --git a/src/mess/includes/bullet.h b/src/mess/includes/bullet.h index 3a9f13de051..5e4431bbd41 100644 --- a/src/mess/includes/bullet.h +++ b/src/mess/includes/bullet.h @@ -48,10 +48,10 @@ public: required_device<z80ctc_device> m_ctc; required_device<z80dart_device> m_dart; required_device<z80dma_device> m_dmac; - required_device<device_t> m_fdc; + required_device<mb8877_device> m_fdc; required_device<ram_device> m_ram; - required_device<device_t> m_floppy0; - required_device<device_t> m_floppy1; + required_device<legacy_floppy_image_device> m_floppy0; + required_device<legacy_floppy_image_device> m_floppy1; required_device<serial_terminal_device> m_terminal; required_device<centronics_device> m_centronics; diff --git a/src/mess/includes/coco.h b/src/mess/includes/coco.h index dba98095971..57ce6b0547f 100644 --- a/src/mess/includes/coco.h +++ b/src/mess/includes/coco.h @@ -101,7 +101,7 @@ public: required_device<pia6821_device> m_pia_0; required_device<pia6821_device> m_pia_1; required_device<dac_device> m_dac; - required_device<device_t> m_wave; + required_device<wave_device> m_wave; required_device<cococart_slot_device> m_cococart; required_device<ram_device> m_ram; required_device<cassette_image_device> m_cassette; diff --git a/src/mess/includes/compis.h b/src/mess/includes/compis.h index c74c8f4a29a..a24fd7b1e67 100644 --- a/src/mess/includes/compis.h +++ b/src/mess/includes/compis.h @@ -144,14 +144,14 @@ public: m_video_ram(*this, "video_ram") { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_8253; - required_device<device_t> m_8254; - required_device<device_t> m_8259m; - required_device<device_t> m_8259s; + required_device<pit8253_device> m_8253; + required_device<pit8254_device> m_8254; + required_device<pic8259_device> m_8259m; + required_device<pic8259_device> m_8259s; required_device<i8255_device> m_8255; required_device<centronics_device> m_centronics; required_device<i8251_device> m_uart; - required_device<device_t> m_rtc; + required_device<mm58274c_device> m_rtc; required_device<i8272a_device> m_fdc; required_device<upd7220_device> m_crtc; DECLARE_READ16_MEMBER(compis_usart_r); diff --git a/src/mess/includes/cosmicos.h b/src/mess/includes/cosmicos.h index 9b6f5fd8199..58207bd384e 100644 --- a/src/mess/includes/cosmicos.h +++ b/src/mess/includes/cosmicos.h @@ -54,7 +54,7 @@ public: required_device<cdp1864_device> m_cti; required_device<dm9368_device> m_led; required_device<cassette_image_device> m_cassette; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<ram_device> m_ram; virtual void machine_start(); diff --git a/src/mess/includes/cybiko.h b/src/mess/includes/cybiko.h index 577b07f1015..677253f4ab7 100644 --- a/src/mess/includes/cybiko.h +++ b/src/mess/includes/cybiko.h @@ -73,9 +73,9 @@ public: int cybiko_rs232_rx_queue(); required_device<hd66421_device> m_crtc; - required_device<device_t> m_speaker; - required_device<device_t> m_rtc; - optional_device<device_t> m_flash1; + required_device<speaker_sound_device> m_speaker; + required_device<pcf8593_device> m_rtc; + optional_device<at45db041_device> m_flash1; DECLARE_DRIVER_INIT(cybikoxt); DECLARE_DRIVER_INIT(cybikov1); DECLARE_DRIVER_INIT(cybikov2); diff --git a/src/mess/includes/dai.h b/src/mess/includes/dai.h index 57a5703d084..833cbef918a 100644 --- a/src/mess/includes/dai.h +++ b/src/mess/includes/dai.h @@ -58,7 +58,7 @@ public: m_sound(*this, "custom") { } - required_device<device_t> m_pit; + required_device<pit8253_device> m_pit; required_device<tms5501_device> m_tms5501; required_device<dai_sound_device> m_sound; diff --git a/src/mess/includes/dgnalpha.h b/src/mess/includes/dgnalpha.h index 637ba0a6e0f..faf87f4b0d4 100644 --- a/src/mess/includes/dgnalpha.h +++ b/src/mess/includes/dgnalpha.h @@ -45,8 +45,8 @@ public: } required_device<pia6821_device> m_pia_2; - required_device<device_t> m_ay8912; - required_device<device_t> m_fdc; + required_device<ay8912_device> m_ay8912; + required_device<wd2797_device> m_fdc; static const pia6821_interface pia2_config; static const ay8910_interface ay8912_interface; diff --git a/src/mess/includes/exp85.h b/src/mess/includes/exp85.h index 821f6d2583c..45708fe9b99 100644 --- a/src/mess/includes/exp85.h +++ b/src/mess/includes/exp85.h @@ -20,7 +20,7 @@ public: required_device<cpu_device> m_maincpu; required_device<serial_terminal_device> m_terminal; required_device<cassette_image_device> m_cassette; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; virtual void machine_start(); diff --git a/src/mess/includes/fidelz80.h b/src/mess/includes/fidelz80.h index c59bcb02fed..ca450fddfbe 100644 --- a/src/mess/includes/fidelz80.h +++ b/src/mess/includes/fidelz80.h @@ -9,6 +9,9 @@ #ifndef _FIDELZ80_H_ #define _FIDELZ80_H_ +#include "sound/beep.h" +#include "sound/s14001a.h" + class fidelz80_state : public driver_device { public: @@ -22,8 +25,8 @@ public: { } required_device<cpu_device> m_maincpu; - optional_device<device_t> m_speech; - optional_device<device_t> m_beep; + optional_device<s14001a_device> m_speech; + optional_device<beep_device> m_beep; optional_device<cpu_device> m_i8041; optional_device<i8243_device> m_i8243; diff --git a/src/mess/includes/intv.h b/src/mess/includes/intv.h index bd92507db60..ab9df0ab7b1 100644 --- a/src/mess/includes/intv.h +++ b/src/mess/includes/intv.h @@ -7,6 +7,9 @@ #ifndef INTV_H_ #define INTV_H_ +#include "sound/ay8910.h" +#include "sound/sp0256.h" + struct intv_sprite_type { int visible; @@ -41,9 +44,9 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_intellivoice; - required_device<device_t> m_sound; - optional_device<device_t> m_ecs_sound; + required_device<sp0256_device> m_intellivoice; + required_device<ay8914_device> m_sound; + optional_device<ay8914_device> m_ecs_sound; optional_shared_ptr<UINT16> m_intvkbd_dualport_ram; optional_shared_ptr<UINT8> m_videoram; diff --git a/src/mess/includes/irisha.h b/src/mess/includes/irisha.h index 9d31c0f7a1a..e8823790f97 100644 --- a/src/mess/includes/irisha.h +++ b/src/mess/includes/irisha.h @@ -24,8 +24,8 @@ public: m_speaker(*this, SPEAKER_TAG) { } - required_device<device_t> m_pit; - required_device<device_t> m_speaker; + required_device<pit8253_device> m_pit; + required_device<speaker_sound_device> m_speaker; int m_keyboard_mask; UINT8 m_keypressed; diff --git a/src/mess/includes/jtc.h b/src/mess/includes/jtc.h index c1bfa9b3aeb..e9f069a8ab6 100644 --- a/src/mess/includes/jtc.h +++ b/src/mess/includes/jtc.h @@ -31,7 +31,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cassette_image_device> m_cassette; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<centronics_device> m_centronics; virtual void machine_start(); diff --git a/src/mess/includes/kaypro.h b/src/mess/includes/kaypro.h index 136d22ac16c..47e68dd9c0b 100644 --- a/src/mess/includes/kaypro.h +++ b/src/mess/includes/kaypro.h @@ -36,9 +36,9 @@ public: required_device<z80sio_device> m_sio; optional_device<z80sio_device> m_sio2x; required_device<centronics_device> m_centronics; - required_device<device_t> m_fdc; + required_device<fd1793_device> m_fdc; optional_device<mc6845_device> m_crtc; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; DECLARE_READ8_MEMBER(kaypro2x_87_r); DECLARE_READ8_MEMBER(kaypro2x_system_port_r); DECLARE_READ8_MEMBER(kaypro2x_status_r); diff --git a/src/mess/includes/kc.h b/src/mess/includes/kc.h index a9887628041..ffcccf98539 100644 --- a/src/mess/includes/kc.h +++ b/src/mess/includes/kc.h @@ -69,7 +69,7 @@ public: required_device<z80pio_device> m_z80pio; required_device<z80ctc_device> m_z80ctc; required_device<ram_device> m_ram; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<cassette_image_device> m_cassette; // defined in machine/kc.c diff --git a/src/mess/includes/kyocera.h b/src/mess/includes/kyocera.h index 217426413da..f84c19b5311 100644 --- a/src/mess/includes/kyocera.h +++ b/src/mess/includes/kyocera.h @@ -84,7 +84,7 @@ public: required_device<hd44102_device> m_lcdc8; required_device<hd44102_device> m_lcdc9; required_device<centronics_device> m_centronics; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<cassette_image_device> m_cassette; required_device<ram_device> m_ram; @@ -173,7 +173,7 @@ public: required_device<rp5c01_device> m_rtc; required_device<hd61830_device> m_lcdc; required_device<centronics_device> m_centronics; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<cassette_image_device> m_cassette; required_device<ram_device> m_ram; diff --git a/src/mess/includes/lc80.h b/src/mess/includes/lc80.h index 7c06aa7e52f..fe931a51553 100644 --- a/src/mess/includes/lc80.h +++ b/src/mess/includes/lc80.h @@ -33,7 +33,7 @@ public: required_device<cpu_device> m_maincpu; required_device<z80pio_device> m_pio2; required_device<cassette_image_device> m_cassette; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<ram_device> m_ram; virtual void machine_start(); diff --git a/src/mess/includes/lisa.h b/src/mess/includes/lisa.h index e53f49dfe20..a7c3db84d68 100644 --- a/src/mess/includes/lisa.h +++ b/src/mess/includes/lisa.h @@ -99,7 +99,7 @@ public: m_fdc_rom(*this,"fdc_rom"), m_fdc_ram(*this,"fdc_ram") { } - required_device<device_t> m_maincpu; + required_device<cpu_device> m_maincpu; required_device<scc8530_t> m_scc; required_shared_ptr<UINT8> m_fdc_rom; diff --git a/src/mess/includes/llc.h b/src/mess/includes/llc.h index a85d8df7c32..44bc6bf7efe 100644 --- a/src/mess/includes/llc.h +++ b/src/mess/includes/llc.h @@ -36,7 +36,7 @@ public: DECLARE_READ8_MEMBER(llc2_port2_a_r); DECLARE_WRITE8_MEMBER(llc2_port1_b_w); const UINT8 *m_p_chargen; - optional_device<device_t> m_speaker; + optional_device<speaker_sound_device> m_speaker; optional_shared_ptr<UINT8> m_p_videoram; bool m_rv; UINT8 m_term_status; diff --git a/src/mess/includes/mbc55x.h b/src/mess/includes/mbc55x.h index aa0395caf35..13210cbfacf 100644 --- a/src/mess/includes/mbc55x.h +++ b/src/mess/includes/mbc55x.h @@ -103,11 +103,11 @@ public: required_device<cpu_device> m_maincpu; required_device<mc6845_device> m_crtc; required_device<i8251_device> m_kb_uart; - required_device<device_t> m_pit; + required_device<pit8253_device> m_pit; required_device<i8255_device> m_ppi; - required_device<device_t> m_pic; - required_device<device_t> m_fdc; - required_device<device_t> m_speaker; + required_device<pic8259_device> m_pic; + required_device<fd1793_device> m_fdc; + required_device<speaker_sound_device> m_speaker; required_device<ram_device> m_ram; //DECLARE_READ8_MEMBER(pic8259_r); //DECLARE_WRITE8_MEMBER(pic8259_w); diff --git a/src/mess/includes/mbee.h b/src/mess/includes/mbee.h index 58cc964f379..12bc22191e5 100644 --- a/src/mess/includes/mbee.h +++ b/src/mess/includes/mbee.h @@ -42,12 +42,12 @@ public: required_device<cpu_device> m_maincpu; required_device<z80pio_device> m_pio; required_device<cassette_image_device> m_cass; - required_device<device_t> m_wave; - required_device<device_t> m_speaker; + required_device<wave_device> m_wave; + required_device<speaker_sound_device> m_speaker; required_device<centronics_device> m_printer; required_device<mc6845_device> m_crtc; - optional_device<device_t> m_fdc; - optional_device<device_t> m_rtc; + optional_device<wd2793_device> m_fdc; + optional_device<mc146818_device> m_rtc; DECLARE_WRITE8_MEMBER( mbee_04_w ); DECLARE_WRITE8_MEMBER( mbee_06_w ); DECLARE_READ8_MEMBER( mbee_07_r ); diff --git a/src/mess/includes/mc1000.h b/src/mess/includes/mc1000.h index ea49109cdb7..bae2e8e9a20 100644 --- a/src/mess/includes/mc1000.h +++ b/src/mess/includes/mc1000.h @@ -5,6 +5,7 @@ #include "emu.h" #include "cpu/z80/z80.h" #include "imagedev/cassette.h" +#include "video/mc6845.h" #include "video/mc6847.h" #include "sound/ay8910.h" #include "machine/ctronics.h" @@ -31,14 +32,14 @@ public: m_crtc(*this, MC6845_TAG), m_centronics(*this, CENTRONICS_TAG), m_cassette(*this, CASSETTE_TAG), - m_ram(*this, RAM_TAG) - , - m_mc6845_video_ram(*this, "mc6845_vram"), - m_mc6847_video_ram(*this, "mc6847_vram"){ } + m_ram(*this, RAM_TAG), + m_mc6845_video_ram(*this, "mc6845_vram"), + m_mc6847_video_ram(*this, "mc6847_vram") + { } required_device<cpu_device> m_maincpu; required_device<mc6847_base_device> m_vdg; - optional_device<device_t> m_crtc; + optional_device<mc6845_device> m_crtc; required_device<centronics_device> m_centronics; required_device<cassette_image_device> m_cassette; required_device<ram_device> m_ram; diff --git a/src/mess/includes/micronic.h b/src/mess/includes/micronic.h index 2dc0666f0a3..3a08f6e4f3c 100644 --- a/src/mess/includes/micronic.h +++ b/src/mess/includes/micronic.h @@ -33,7 +33,7 @@ public: required_device<cpu_device> m_maincpu; required_device<hd61830_device> m_lcdc; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; required_device<mc146818_device> m_rtc; required_device<ram_device> m_ram; diff --git a/src/mess/includes/mikromik.h b/src/mess/includes/mikromik.h index f0d189e5e87..839b10a9a61 100644 --- a/src/mess/includes/mikromik.h +++ b/src/mess/includes/mikromik.h @@ -50,12 +50,12 @@ public: required_device<cpu_device> m_maincpu; required_device<i8212_device> m_iop; required_device<am9517a_device> m_dmac; - required_device<device_t> m_pit; - required_device<device_t> m_crtc; + required_device<pit8253_device> m_pit; + required_device<i8275_device> m_crtc; required_device<upd765a_device> m_fdc; required_device<upd7201_device> m_mpsc; required_device<upd7220_device> m_hgdc; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<floppy_image_device> m_floppy0; required_device<floppy_image_device> m_floppy1; required_device<ram_device> m_ram; diff --git a/src/mess/includes/mpf1.h b/src/mess/includes/mpf1.h index 0b89e71e7d0..d984ad74cfe 100644 --- a/src/mess/includes/mpf1.h +++ b/src/mess/includes/mpf1.h @@ -35,7 +35,7 @@ public: required_device<cpu_device> m_maincpu; required_device<z80ctc_device> m_ctc; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<cassette_image_device> m_cassette; virtual void machine_start(); diff --git a/src/mess/includes/msx.h b/src/mess/includes/msx.h index 4ddf05fb3ea..acfbb1d174b 100644 --- a/src/mess/includes/msx.h +++ b/src/mess/includes/msx.h @@ -112,7 +112,7 @@ public: optional_device<v9938_device> m_v9938; required_device<cassette_image_device> m_cass; - required_device<device_t> m_ym; + required_device<ym2413_device> m_ym; required_device<dac_device> m_dac; optional_device<rp5c01_device> m_rtc; DECLARE_READ8_MEMBER(msx_psg_port_a_r); diff --git a/src/mess/includes/mz80.h b/src/mess/includes/mz80.h index fd07819d80c..046282a1c62 100644 --- a/src/mess/includes/mz80.h +++ b/src/mess/includes/mz80.h @@ -20,20 +20,19 @@ class mz80_state : public driver_device public: mz80_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_pit(*this, "pit8253"), - m_ppi(*this, "ppi8255"), - m_cass(*this, CASSETTE_TAG), - m_speaker(*this, SPEAKER_TAG) - , + m_maincpu(*this, "maincpu"), + m_pit(*this, "pit8253"), + m_ppi(*this, "ppi8255"), + m_cass(*this, CASSETTE_TAG), + m_speaker(*this, SPEAKER_TAG), m_p_ram(*this, "p_ram"), m_p_videoram(*this, "p_videoram"){ } required_device<cpu_device> m_maincpu; - required_device<device_t> m_pit; + required_device<pit8253_device> m_pit; required_device<i8255_device> m_ppi; required_device<cassette_image_device> m_cass; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; DECLARE_READ8_MEMBER(mz80k_strobe_r); DECLARE_WRITE8_MEMBER(mz80k_strobe_w); DECLARE_READ8_MEMBER(mz80k_8255_portb_r); diff --git a/src/mess/includes/ob68k1a.h b/src/mess/includes/ob68k1a.h index 162aef29aa1..fba4b398a2c 100644 --- a/src/mess/includes/ob68k1a.h +++ b/src/mess/includes/ob68k1a.h @@ -29,7 +29,7 @@ public: required_device<cpu_device> m_maincpu; required_device<com8116_device> m_dbrg; - required_device<device_t> m_acia0; + required_device<acia6850_device> m_acia0; required_device<pia6821_device> m_pia0; required_device<pia6821_device> m_pia1; required_device<serial_terminal_device> m_terminal; diff --git a/src/mess/includes/osborne1.h b/src/mess/includes/osborne1.h index 6dea71cc926..e84a1f8df7f 100644 --- a/src/mess/includes/osborne1.h +++ b/src/mess/includes/osborne1.h @@ -42,8 +42,8 @@ public: required_device<cpu_device> m_maincpu; required_device<pia6821_device> m_pia0; required_device<pia6821_device> m_pia1; - required_device<device_t> m_fdc; - required_device<device_t> m_beep; + required_device<mb8877_device> m_fdc; + required_device<beep_device> m_beep; required_device<ram_device> m_ram; required_device<ieee488_device> m_ieee; diff --git a/src/mess/includes/osi.h b/src/mess/includes/osi.h index d2d7734e778..0bf821cda8d 100644 --- a/src/mess/includes/osi.h +++ b/src/mess/includes/osi.h @@ -34,12 +34,13 @@ public: m_cassette(*this, CASSETTE_TAG), m_discrete(*this, DISCRETE_TAG), m_ram(*this, RAM_TAG), - m_video_ram(*this, "video_ram"), - m_color_ram(*this, "color_ram"){ } + m_video_ram(*this, "video_ram"), + m_color_ram(*this, "color_ram") + { } required_device<cpu_device> m_maincpu; required_device<cassette_image_device> m_cassette; - optional_device<device_t> m_discrete; + optional_device<discrete_sound_device> m_discrete; required_device<ram_device> m_ram; virtual void machine_start(); @@ -76,7 +77,7 @@ public: m_beep(*this, BEEPER_TAG) { } - required_device<device_t> m_beep; + required_device<beep_device> m_beep; virtual void machine_start(); @@ -93,7 +94,7 @@ public: m_floppy(*this, FLOPPY_0) { } - required_device<device_t> m_floppy; + required_device<legacy_floppy_image_device> m_floppy; virtual void machine_start(); diff --git a/src/mess/includes/p2000t.h b/src/mess/includes/p2000t.h index e900e1355ca..4c2ab2c47f9 100644 --- a/src/mess/includes/p2000t.h +++ b/src/mess/includes/p2000t.h @@ -24,7 +24,7 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; DECLARE_READ8_MEMBER(p2000t_port_000f_r); DECLARE_READ8_MEMBER(p2000t_port_202f_r); DECLARE_WRITE8_MEMBER(p2000t_port_101f_w); diff --git a/src/mess/includes/pc1512.h b/src/mess/includes/pc1512.h index cc07c17ef25..86e4831debb 100644 --- a/src/mess/includes/pc1512.h +++ b/src/mess/includes/pc1512.h @@ -81,14 +81,14 @@ public: required_device<cpu_device> m_maincpu; required_device<am9517a_device> m_dmac; - required_device<device_t> m_pic; - required_device<device_t> m_pit; + required_device<pic8259_device> m_pic; + required_device<pit8253_device> m_pit; required_device<mc146818_device> m_rtc; required_device<pc_fdc_xt_device> m_fdc; required_device<ins8250_device> m_uart; required_device<ams40041_device> m_vdu; required_device<centronics_device> m_centronics; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<pc1512_keyboard_device> m_kb; required_device<ram_device> m_ram; required_device<floppy_image_device> m_floppy0; diff --git a/src/mess/includes/pc4.h b/src/mess/includes/pc4.h index d4ccca1b11c..0640c33b7fc 100644 --- a/src/mess/includes/pc4.h +++ b/src/mess/includes/pc4.h @@ -22,7 +22,7 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); virtual void machine_start(); diff --git a/src/mess/includes/pc8001.h b/src/mess/includes/pc8001.h index 9a11f471352..ab149d4a99c 100644 --- a/src/mess/includes/pc8001.h +++ b/src/mess/includes/pc8001.h @@ -42,11 +42,11 @@ public: required_device<cpu_device> m_maincpu; required_device<upd1990a_device> m_rtc; - required_device<device_t> m_dma; + required_device<i8257_device> m_dma; required_device<upd3301_device> m_crtc; required_device<cassette_image_device> m_cassette; required_device<centronics_device> m_centronics; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<ram_device> m_ram; virtual void machine_start(); diff --git a/src/mess/includes/pc8401a.h b/src/mess/includes/pc8401a.h index 82e8f952a7c..b8178f3ce07 100644 --- a/src/mess/includes/pc8401a.h +++ b/src/mess/includes/pc8401a.h @@ -44,7 +44,7 @@ public: required_device<upd1990a_device> m_rtc; required_device<sed1330_device> m_lcdc; required_device<mc6845_device> m_crtc; - required_device<device_t> m_screen_lcd; + required_device<screen_device> m_screen_lcd; required_device<ram_device> m_ram; virtual void machine_start(); diff --git a/src/mess/includes/pes.h b/src/mess/includes/pes.h index d40925eb734..cd64911d02a 100644 --- a/src/mess/includes/pes.h +++ b/src/mess/includes/pes.h @@ -10,6 +10,7 @@ #define _PES_H_ #include "machine/terminal.h" +#include "sound/tms5220.h" class pes_state : public driver_device { @@ -23,7 +24,7 @@ public: required_device<cpu_device> m_maincpu; required_device<generic_terminal_device> m_terminal; - required_device<device_t> m_speech; + required_device<tms5220_device> m_speech; UINT8 m_wsstate; // /WS UINT8 m_rsstate; // /RS diff --git a/src/mess/includes/plus4.h b/src/mess/includes/plus4.h index a162e7ccf4e..34c49135348 100644 --- a/src/mess/includes/plus4.h +++ b/src/mess/includes/plus4.h @@ -59,7 +59,7 @@ public: optional_device<acia6551_device> m_acia; optional_device<mos6529_device> m_spi_user; required_device<mos6529_device> m_spi_kb; - optional_device<device_t> m_t6721; + optional_device<t6721_device> m_t6721; required_device<cbm_iec_device> m_iec; required_device<plus4_expansion_slot_device> m_exp; optional_device<plus4_user_port_device> m_user; diff --git a/src/mess/includes/portfoli.h b/src/mess/includes/portfoli.h index ba5655bab65..b9229acd2dc 100644 --- a/src/mess/includes/portfoli.h +++ b/src/mess/includes/portfoli.h @@ -34,15 +34,15 @@ public: m_ppi(*this, M82C55A_TAG), m_uart(*this, M82C50A_TAG), m_speaker(*this, SPEAKER_TAG), - m_timer_tick(*this, TIMER_TICK_TAG) - , - m_contrast(*this, "contrast"){ } + m_timer_tick(*this, TIMER_TICK_TAG), + m_contrast(*this, "contrast") + { } required_device<cpu_device> m_maincpu; required_device<hd61830_device> m_lcdc; required_device<i8255_device> m_ppi; required_device<ins8250_device> m_uart; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<timer_device> m_timer_tick; virtual void machine_start(); diff --git a/src/mess/includes/psion.h b/src/mess/includes/psion.h index 482c9b30966..d0cb509659a 100644 --- a/src/mess/includes/psion.h +++ b/src/mess/includes/psion.h @@ -50,7 +50,7 @@ public: required_device<cpu_device> m_maincpu; required_device<hd44780_device> m_lcdc; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; required_device<datapack_device> m_pack1; required_device<datapack_device> m_pack2; diff --git a/src/mess/includes/ql.h b/src/mess/includes/ql.h index 9684023d737..b5ccd61e539 100644 --- a/src/mess/includes/ql.h +++ b/src/mess/includes/ql.h @@ -84,11 +84,11 @@ public: required_device<cpu_device> m_ipc; required_device<zx8301_device> m_zx8301; required_device<zx8302_device> m_zx8302; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<microdrive_image_device> m_mdv1; required_device<microdrive_image_device> m_mdv2; required_device<ram_device> m_ram; - required_device<device_t> m_fdc; + required_device<wd1772_device> m_fdc; required_device<printer_image_device> m_printer; virtual void machine_start(); diff --git a/src/mess/includes/rm380z.h b/src/mess/includes/rm380z.h index 757963a0819..34b3722bcc9 100644 --- a/src/mess/includes/rm380z.h +++ b/src/mess/includes/rm380z.h @@ -87,7 +87,7 @@ public: required_device<cpu_device> m_maincpu; required_device<ram_device> m_messram; - optional_device<device_t> m_fdc; + optional_device<fd1771_device> m_fdc; rm380z_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), diff --git a/src/mess/includes/sage2.h b/src/mess/includes/sage2.h index fd244e0369f..8f7d773d25d 100644 --- a/src/mess/includes/sage2.h +++ b/src/mess/includes/sage2.h @@ -48,7 +48,7 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_pic; + required_device<pic8259_device> m_pic; required_device<i8251_device> m_usart0; required_device<i8251_device> m_usart1; required_device<upd765a_device> m_fdc; diff --git a/src/mess/includes/sorcerer.h b/src/mess/includes/sorcerer.h index 01f0a2036be..596403e03e8 100644 --- a/src/mess/includes/sorcerer.h +++ b/src/mess/includes/sorcerer.h @@ -74,10 +74,10 @@ public: required_device<cpu_device> m_maincpu; required_device<cassette_image_device> m_cass1; required_device<cassette_image_device> m_cass2; - required_device<device_t> m_wave1; - required_device<device_t> m_wave2; + required_device<wave_device> m_wave1; + required_device<wave_device> m_wave2; required_device<dac_device> m_dac; - required_device<device_t> m_uart; + required_device<ay31015_device> m_uart; required_device<centronics_device> m_centronics; required_device<ram_device> m_ram; required_ioport m_iop_config; diff --git a/src/mess/includes/special.h b/src/mess/includes/special.h index 512423606b1..198766bb8b0 100644 --- a/src/mess/includes/special.h +++ b/src/mess/includes/special.h @@ -73,7 +73,7 @@ public: UINT8 m_RC_register; required_device<cpu_device> m_maincpu; optional_device<i8255_device> m_ppi; - optional_device<device_t> m_fdc; + optional_device<fd1793_device> m_fdc; optional_device<dac_device> m_dac; optional_device<cassette_image_device> m_cass; optional_device<ram_device> m_ram; diff --git a/src/mess/includes/studio2.h b/src/mess/includes/studio2.h index 5c140ee7609..ef4c7a93c4b 100644 --- a/src/mess/includes/studio2.h +++ b/src/mess/includes/studio2.h @@ -29,7 +29,7 @@ public: { } required_device<cosmac_device> m_maincpu; - required_device<device_t> m_speaker; + required_device<beep_device> m_speaker; optional_device<cdp1861_device> m_vdc; virtual void machine_start(); diff --git a/src/mess/includes/super80.h b/src/mess/includes/super80.h index 070628646d8..7ac7a97abd7 100644 --- a/src/mess/includes/super80.h +++ b/src/mess/includes/super80.h @@ -34,8 +34,8 @@ public: required_device<cpu_device> m_maincpu; required_device<z80pio_device> m_pio; required_device<cassette_image_device> m_cass; - required_device<device_t> m_wave; - required_device<device_t> m_speaker; + required_device<wave_device> m_wave; + required_device<speaker_sound_device> m_speaker; required_device<centronics_device> m_centronics; optional_device<mc6845_device> m_6845; DECLARE_READ8_MEMBER( super80v_low_r ); diff --git a/src/mess/includes/tandy2k.h b/src/mess/includes/tandy2k.h index d65050d8518..5d5defc4a8d 100644 --- a/src/mess/includes/tandy2k.h +++ b/src/mess/includes/tandy2k.h @@ -57,23 +57,23 @@ public: m_floppy0(*this, I8272A_TAG ":0:525qd"), m_floppy1(*this, I8272A_TAG ":1:525qd"), m_kb(*this, TANDY2K_KEYBOARD_TAG), - m_kbdclk(0) - , - m_hires_ram(*this, "hires_ram"), - m_char_ram(*this, "char_ram"){ } + m_kbdclk(0), + m_hires_ram(*this, "hires_ram"), + m_char_ram(*this, "char_ram") + { } required_device<cpu_device> m_maincpu; required_device<i8251_device> m_uart; - required_device<device_t> m_pit; + required_device<pit8253_device> m_pit; required_device<i8272a_device> m_fdc; - required_device<device_t> m_pic0; - required_device<device_t> m_pic1; + required_device<pic8259_device> m_pic0; + required_device<pic8259_device> m_pic1; required_device<crt9007_device> m_vpac; required_device<crt9212_device> m_drb0; required_device<crt9212_device> m_drb1; required_device<crt9021_device> m_vac; required_device<centronics_device> m_centronics; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<ram_device> m_ram; required_device<floppy_image_device> m_floppy0; required_device<floppy_image_device> m_floppy1; diff --git a/src/mess/includes/tdv2324.h b/src/mess/includes/tdv2324.h index 6e443fd6dfc..a0f3bd88b27 100644 --- a/src/mess/includes/tdv2324.h +++ b/src/mess/includes/tdv2324.h @@ -55,17 +55,17 @@ public: m_sio(*this, MK3887N4_TAG), m_pic(*this, P8259A_TAG), m_pit0(*this, P8253_5_0_TAG), - m_pit1(*this, P8253_5_1_TAG) - , - m_video_ram(*this, "video_ram"){ } + m_pit1(*this, P8253_5_1_TAG), + m_video_ram(*this, "video_ram") + { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; required_device<cpu_device> m_fdccpu; required_device<z80dart_device> m_sio; - required_device<device_t> m_pic; - required_device<device_t> m_pit0; - required_device<device_t> m_pit1; + required_device<pic8259_device> m_pic; + required_device<pit8253_device> m_pit0; + required_device<pit8253_device> m_pit1; virtual void video_start(); UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mess/includes/tek405x.h b/src/mess/includes/tek405x.h index 9ddaf9c5a95..e34c1d54f41 100644 --- a/src/mess/includes/tek405x.h +++ b/src/mess/includes/tek405x.h @@ -33,11 +33,11 @@ public: { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_gpib_pia; - required_device<device_t> m_com_pia; + required_device<pia6821_device> m_gpib_pia; + required_device<pia6821_device> m_com_pia; required_device<acia6850_device> m_acia; required_device<ieee488_device> m_gpib; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<ram_device> m_ram; virtual void machine_start(); diff --git a/src/mess/includes/ti85.h b/src/mess/includes/ti85.h index 4da9813df6d..2826fdd3c30 100644 --- a/src/mess/includes/ti85.h +++ b/src/mess/includes/ti85.h @@ -24,8 +24,8 @@ public: { } required_device<cpu_device> m_maincpu; - optional_device<device_t> m_speaker; - //optional_device<device_t> m_serial; + optional_device<speaker_sound_device> m_speaker; + //optional_device<> m_serial; optional_shared_ptr<UINT8> m_nvram; UINT8 m_LCD_memory_base; diff --git a/src/mess/includes/tiki100.h b/src/mess/includes/tiki100.h index 929bfa00e7b..d8a80ec765f 100644 --- a/src/mess/includes/tiki100.h +++ b/src/mess/includes/tiki100.h @@ -46,10 +46,10 @@ public: required_device<cpu_device> m_maincpu; required_device<z80ctc_device> m_ctc; - required_device<device_t> m_fdc; + required_device<fd1797_device> m_fdc; required_device<ram_device> m_ram; - required_device<device_t> m_floppy0; - required_device<device_t> m_floppy1; + required_device<legacy_floppy_image_device> m_floppy0; + required_device<legacy_floppy_image_device> m_floppy1; virtual void machine_start(); diff --git a/src/mess/includes/trs80.h b/src/mess/includes/trs80.h index d711b43168b..a92c4b714cd 100644 --- a/src/mess/includes/trs80.h +++ b/src/mess/includes/trs80.h @@ -38,9 +38,9 @@ public: required_device<cpu_device> m_maincpu; optional_device<centronics_device> m_printer; - optional_device<device_t> m_ay31015; - optional_device<device_t> m_fdc; - required_device<device_t> m_speaker; + optional_device<ay31015_device> m_ay31015; + optional_device<fd1793_device> m_fdc; + required_device<speaker_sound_device> m_speaker; required_device<cassette_image_device> m_cass; DECLARE_WRITE8_MEMBER ( trs80_ff_w ); DECLARE_WRITE8_MEMBER ( lnw80_fe_w ); diff --git a/src/mess/includes/trs80m2.h b/src/mess/includes/trs80m2.h index cbf8d810011..2ac2e9a92fd 100644 --- a/src/mess/includes/trs80m2.h +++ b/src/mess/includes/trs80m2.h @@ -53,9 +53,9 @@ public: required_device<z80ctc_device>m_ctc; required_device<z80pio_device> m_pio; required_device<mc6845_device> m_crtc; - required_device<device_t> m_fdc; + required_device<fd1791_device> m_fdc; required_device<centronics_device> m_centronics; - required_device<device_t> m_floppy; + required_device<legacy_floppy_image_device> m_floppy; required_device<ram_device> m_ram; required_device<trs80m2_keyboard_device> m_kb; @@ -124,7 +124,7 @@ public: { } required_device<cpu_device> m_subcpu; - required_device<device_t> m_pic; + required_device<pic8259_device> m_pic; virtual void machine_start(); diff --git a/src/mess/includes/tsispch.h b/src/mess/includes/tsispch.h index e135f8a4c9a..5936707f385 100644 --- a/src/mess/includes/tsispch.h +++ b/src/mess/includes/tsispch.h @@ -9,6 +9,8 @@ #ifndef _TSISPCH_H_ #define _TSISPCH_H_ +#include "machine/i8251.h" +#include "machine/pic8259.h" #include "machine/terminal.h" class tsispch_state : public driver_device @@ -25,9 +27,9 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_dsp; - required_device<device_t> m_terminal; - required_device<device_t> m_uart; - required_device<device_t> m_pic; + required_device<generic_terminal_device> m_terminal; + required_device<i8251_device> m_uart; + required_device<pic8259_device> m_pic; UINT8 m_infifo[32]; // input fifo UINT8 m_infifo_tail_ptr; // " tail diff --git a/src/mess/includes/v1050.h b/src/mess/includes/v1050.h index 77b447cf0e9..0145e2c9c70 100644 --- a/src/mess/includes/v1050.h +++ b/src/mess/includes/v1050.h @@ -15,7 +15,10 @@ #include "machine/i8255.h" #include "machine/msm58321.h" #include "machine/ram.h" +#include "machine/s1410.h" +#include "machine/scsibus.h" #include "machine/scsicb.h" +#include "machine/scsihd.h" #include "machine/v1050kb.h" #include "machine/wd1772.h" #include "video/mc6845.h" diff --git a/src/mess/includes/vector06.h b/src/mess/includes/vector06.h index 16614ad78f8..0defaaeef81 100644 --- a/src/mess/includes/vector06.h +++ b/src/mess/includes/vector06.h @@ -35,7 +35,7 @@ public: required_device<cpu_device> m_maincpu; required_device<cassette_image_device> m_cass; - required_device<device_t> m_fdc; + required_device<fd1793_device> m_fdc; required_device<i8255_device> m_ppi; required_device<i8255_device> m_ppi2; required_device<ram_device> m_ram; diff --git a/src/mess/includes/victor9k.h b/src/mess/includes/victor9k.h index 7587ccb8ad5..9efa2db5e68 100644 --- a/src/mess/includes/victor9k.h +++ b/src/mess/includes/victor9k.h @@ -61,15 +61,15 @@ public: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_fdc_cpu; required_device<ieee488_device> m_ieee488; - required_device<device_t> m_pic; + required_device<pic8259_device> m_pic; required_device<mc6852_device> m_ssda; required_device<via6522_device> m_via1; required_device<via6522_device> m_via2; - required_device<device_t> m_cvsd; + required_device<hc55516_device> m_cvsd; required_device<mc6845_device> m_crtc; required_device<ram_device> m_ram; - required_device<device_t> m_floppy0; - required_device<device_t> m_floppy1; + required_device<legacy_floppy_image_device> m_floppy0; + required_device<legacy_floppy_image_device> m_floppy1; required_device<victor9k_keyboard_device> m_kb; virtual void machine_start(); diff --git a/src/mess/includes/vidbrain.h b/src/mess/includes/vidbrain.h index 64428098393..660fc41d376 100644 --- a/src/mess/includes/vidbrain.h +++ b/src/mess/includes/vidbrain.h @@ -40,7 +40,7 @@ public: required_device<cpu_device> m_maincpu; required_device<f3853_device> m_smi; required_device<uv201_device> m_uv; - required_device<device_t> m_discrete; + required_device<discrete_sound_device> m_discrete; required_device<dac_device> m_dac; required_device<videobrain_expansion_slot_device> m_exp; diff --git a/src/mess/includes/vixen.h b/src/mess/includes/vixen.h index 4705adcad08..1027ae39773 100644 --- a/src/mess/includes/vixen.h +++ b/src/mess/includes/vixen.h @@ -32,19 +32,19 @@ public: m_srq(1), m_atn(1), m_rxrdy(0), - m_txrdy(0) - , - m_video_ram(*this, "video_ram"){ } + m_txrdy(0), + m_video_ram(*this, "video_ram") + { } required_device<cpu_device> m_maincpu; - required_device<device_t> m_fdc; - required_device<device_t> m_io_i8155; + required_device<fd1797_device> m_fdc; + required_device<i8155_device> m_io_i8155; required_device<i8251_device> m_usart; - required_device<device_t> m_discrete; + required_device<discrete_sound_device> m_discrete; required_device<ieee488_device> m_ieee488; required_device<ram_device> m_ram; - required_device<device_t> m_floppy0; - required_device<device_t> m_floppy1; + required_device<legacy_floppy_image_device> m_floppy0; + required_device<legacy_floppy_image_device> m_floppy1; virtual void machine_start(); virtual void machine_reset(); diff --git a/src/mess/includes/wangpc.h b/src/mess/includes/wangpc.h index 414f76571da..e035eb93dc1 100644 --- a/src/mess/includes/wangpc.h +++ b/src/mess/includes/wangpc.h @@ -77,9 +77,9 @@ public: required_device<cpu_device> m_maincpu; required_device<am9517a_device> m_dmac; - required_device<device_t> m_pic; + required_device<pic8259_device> m_pic; required_device<i8255_device> m_ppi; - required_device<device_t> m_pit; + required_device<pit8253_device> m_pit; required_device<im6402_device> m_uart; required_device<mc2661_device> m_epci; required_device<upd765a_device> m_fdc; diff --git a/src/mess/includes/x07.h b/src/mess/includes/x07.h index 904726b07f6..04cb654bf19 100644 --- a/src/mess/includes/x07.h +++ b/src/mess/includes/x07.h @@ -167,7 +167,7 @@ public: required_device<cpu_device> m_maincpu; required_device<printer_image_device> m_printer; - required_device<device_t> m_beep; + required_device<beep_device> m_beep; required_device<ram_device> m_ram; required_device<cassette_image_device> m_cassette; diff --git a/src/mess/includes/x1.h b/src/mess/includes/x1.h index 63152f11fc2..4f05bc322e6 100644 --- a/src/mess/includes/x1.h +++ b/src/mess/includes/x1.h @@ -190,7 +190,7 @@ public: required_device<cpu_device> m_x1_cpu; required_device<cassette_image_device> m_cass; - required_device<device_t> m_fdc; + required_device<mb8877_device> m_fdc; required_device<mc6845_device> m_crtc; required_device<z80ctc_device> m_ctc; DECLARE_DRIVER_INIT(x1_kanji); diff --git a/src/mess/includes/xor100.h b/src/mess/includes/xor100.h index 162a2e83424..ad4ef74e300 100644 --- a/src/mess/includes/xor100.h +++ b/src/mess/includes/xor100.h @@ -3,7 +3,17 @@ #ifndef __XOR100__ #define __XOR100__ +#include "emu.h" +#include "cpu/z80/z80.h" +#include "formats/basicdsk.h" +#include "imagedev/flopdrv.h" #include "machine/ram.h" +#include "machine/com8116.h" +#include "machine/ctronics.h" +#include "machine/i8255.h" +#include "machine/i8251.h" +#include "machine/terminal.h" +#include "machine/wd17xx.h" #include "machine/z80ctc.h" #define SCREEN_TAG "screen" @@ -35,12 +45,12 @@ public: required_device<cpu_device> m_maincpu; required_device<com8116_device> m_dbrg; required_device<i8251_device> m_uart_b; - required_device<device_t> m_fdc; + required_device<fd1795_device> m_fdc; required_device<z80ctc_device> m_ctc; required_device<ram_device> m_ram; required_device<generic_terminal_device> m_terminal; - required_device<device_t> m_floppy0; - required_device<device_t> m_floppy1; + required_device<legacy_floppy_image_device> m_floppy0; + required_device<legacy_floppy_image_device> m_floppy1; virtual void machine_start(); virtual void machine_reset(); diff --git a/src/mess/machine/a2arcadebd.h b/src/mess/machine/a2arcadebd.h index d4c1f872e4a..f68757e1a92 100644 --- a/src/mess/machine/a2arcadebd.h +++ b/src/mess/machine/a2arcadebd.h @@ -41,7 +41,7 @@ protected: virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); required_device<tms9918a_device> m_tms; - required_device<device_t> m_ay; + required_device<ay8910_device> m_ay; private: }; diff --git a/src/mess/machine/a2cffa.h b/src/mess/machine/a2cffa.h index 9b64ec265ae..7039194019a 100644 --- a/src/mess/machine/a2cffa.h +++ b/src/mess/machine/a2cffa.h @@ -12,6 +12,7 @@ #include "emu.h" #include "machine/a2bus.h" +#include "machine/idectrl.h" //************************************************************************** // TYPE DEFINITIONS @@ -40,7 +41,7 @@ protected: virtual UINT8 read_c800(address_space &space, UINT16 offset); virtual void write_c800(address_space &space, UINT16 offset, UINT8 data); - required_device<device_t> m_ide; + required_device<ide_controller_device> m_ide; UINT8 *m_rom; UINT8 m_eeprom[0x1000]; diff --git a/src/mess/machine/a2diskii.h b/src/mess/machine/a2diskii.h index f7c3b567516..79c952fb928 100644 --- a/src/mess/machine/a2diskii.h +++ b/src/mess/machine/a2diskii.h @@ -37,7 +37,7 @@ protected: virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); virtual UINT8 read_cnxx(address_space &space, UINT8 offset); - required_device<device_t> m_fdc; + required_device<applefdc_base_device> m_fdc; private: UINT8 *m_rom; diff --git a/src/mess/machine/a2echoii.h b/src/mess/machine/a2echoii.h index e1452d5338b..2e2d13fa4bd 100644 --- a/src/mess/machine/a2echoii.h +++ b/src/mess/machine/a2echoii.h @@ -11,6 +11,7 @@ #include "emu.h" #include "machine/a2bus.h" +#include "sound/tms5220.h" //************************************************************************** // TYPE DEFINITIONS @@ -28,7 +29,7 @@ public: // optional information overrides virtual machine_config_constructor device_mconfig_additions() const; - required_device<device_t> m_tms; + required_device<tms5220_device> m_tms; protected: virtual void device_start(); diff --git a/src/mess/machine/a2mockingboard.h b/src/mess/machine/a2mockingboard.h index 116718b0ec4..5c61f48b6d6 100644 --- a/src/mess/machine/a2mockingboard.h +++ b/src/mess/machine/a2mockingboard.h @@ -52,10 +52,10 @@ protected: required_device<via6522_device> m_via1; required_device<via6522_device> m_via2; - required_device<device_t> m_ay1; - required_device<device_t> m_ay2; - optional_device<device_t> m_ay3; - optional_device<device_t> m_ay4; + required_device<ay8913_device> m_ay1; + required_device<ay8913_device> m_ay2; + optional_device<ay8913_device> m_ay3; + optional_device<ay8913_device> m_ay4; bool m_isPhasor, m_PhasorNative; diff --git a/src/mess/machine/abc77.h b/src/mess/machine/abc77.h index 51564bc5066..e1e0e9489fe 100644 --- a/src/mess/machine/abc77.h +++ b/src/mess/machine/abc77.h @@ -105,7 +105,7 @@ protected: devcb_resolved_write_line m_out_keydown_func; required_device<cpu_device> m_maincpu; - required_device<device_t> m_discrete; + required_device<discrete_sound_device> m_discrete; int m_txd; // transmit data int m_keylatch; // keyboard row latch diff --git a/src/mess/machine/abc99.h b/src/mess/machine/abc99.h index 3dc8f687418..8c3a8f3337e 100644 --- a/src/mess/machine/abc99.h +++ b/src/mess/machine/abc99.h @@ -107,7 +107,7 @@ private: required_device<cpu_device> m_maincpu; required_device<cpu_device> m_mousecpu; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; int m_si; int m_si_en; diff --git a/src/mess/machine/abc_fd2.h b/src/mess/machine/abc_fd2.h index 5718224cdf0..3b75d565846 100644 --- a/src/mess/machine/abc_fd2.h +++ b/src/mess/machine/abc_fd2.h @@ -54,7 +54,7 @@ protected: private: required_device<cpu_device> m_maincpu; required_device<z80pio_device> m_pio; - required_device<device_t> m_fdc; + required_device<fd1771_device> m_fdc; required_device<legacy_floppy_image_device> m_image0; required_device<legacy_floppy_image_device> m_image1; }; diff --git a/src/mess/machine/abc_hdc.c b/src/mess/machine/abc_hdc.c index c4c7f89aad9..284caf20b78 100644 --- a/src/mess/machine/abc_hdc.c +++ b/src/mess/machine/abc_hdc.c @@ -8,9 +8,6 @@ *********************************************************************/ #include "abc_hdc.h" -#include "machine/scsibus.h" -#include "machine/scsicb.h" -#include "machine/scsihd.h" diff --git a/src/mess/machine/abc_hdc.h b/src/mess/machine/abc_hdc.h index 0bdd3e06c62..0cf6b85d592 100644 --- a/src/mess/machine/abc_hdc.h +++ b/src/mess/machine/abc_hdc.h @@ -17,6 +17,9 @@ #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" #include "machine/abcbus.h" +#include "machine/scsibus.h" +#include "machine/scsicb.h" +#include "machine/scsihd.h" @@ -48,7 +51,7 @@ protected: private: required_device<cpu_device> m_maincpu; - required_device<device_t> m_sasibus; + required_device<scsicb_device> m_sasibus; }; diff --git a/src/mess/machine/abc_xebec.c b/src/mess/machine/abc_xebec.c index 0563afee45a..50ee6849039 100644 --- a/src/mess/machine/abc_xebec.c +++ b/src/mess/machine/abc_xebec.c @@ -8,9 +8,6 @@ *********************************************************************/ #include "abc_xebec.h" -#include "machine/scsibus.h" -#include "machine/scsicb.h" -#include "machine/scsihd.h" diff --git a/src/mess/machine/abc_xebec.h b/src/mess/machine/abc_xebec.h index 4d5457729a0..2ad2349e91c 100644 --- a/src/mess/machine/abc_xebec.h +++ b/src/mess/machine/abc_xebec.h @@ -17,6 +17,9 @@ #include "cpu/z80/z80.h" #include "cpu/z80/z80daisy.h" #include "machine/abcbus.h" +#include "machine/scsibus.h" +#include "machine/scsicb.h" +#include "machine/scsihd.h" @@ -48,7 +51,7 @@ protected: private: required_device<cpu_device> m_maincpu; - required_device<device_t> m_sasibus; + required_device<scsicb_device> m_sasibus; }; diff --git a/src/mess/machine/c1551.h b/src/mess/machine/c1551.h index 89273113235..8a3e9b6105c 100644 --- a/src/mess/machine/c1551.h +++ b/src/mess/machine/c1551.h @@ -85,8 +85,8 @@ private: bool tpi1_selected(offs_t offset); required_device<m6510t_device> m_maincpu; - required_device<device_t> m_tpi0; - required_device<device_t> m_tpi1; + required_device<tpi6525_device> m_tpi0; + required_device<tpi6525_device> m_tpi1; required_device<c64h156_device> m_ga; required_device<pls100_device> m_pla; required_device<legacy_floppy_image_device> m_image; diff --git a/src/mess/machine/c1571.h b/src/mess/machine/c1571.h index 6bbd2bddf29..260357746f1 100644 --- a/src/mess/machine/c1571.h +++ b/src/mess/machine/c1571.h @@ -107,7 +107,7 @@ protected: required_device<via6522_device> m_via0; required_device<via6522_device> m_via1; required_device<mos6526_device> m_cia; - required_device<device_t> m_fdc; + required_device<wd1770_device> m_fdc; required_device<c64h156_device> m_ga; required_device<legacy_floppy_image_device> m_image; diff --git a/src/mess/machine/c1581.h b/src/mess/machine/c1581.h index 0392b338b29..bfdae82fafd 100644 --- a/src/mess/machine/c1581.h +++ b/src/mess/machine/c1581.h @@ -80,7 +80,7 @@ protected: required_device<cpu_device> m_maincpu; required_device<mos6526_device> m_cia; - required_device<device_t> m_fdc; + required_device<wd1770_device> m_fdc; required_device<legacy_floppy_image_device> m_image; int m_data_out; // serial data out diff --git a/src/mess/machine/c2040.h b/src/mess/machine/c2040.h index 05aa396798f..2c9ea2496b5 100644 --- a/src/mess/machine/c2040.h +++ b/src/mess/machine/c2040.h @@ -102,7 +102,7 @@ protected: required_device<m6504_device> m_fdccpu; required_device<riot6532_device> m_riot0; required_device<riot6532_device> m_riot1; - required_device<device_t> m_miot; + required_device<mos6530_device> m_miot; required_device<via6522_device> m_via; required_device<legacy_floppy_image_device> m_image0; optional_device<legacy_floppy_image_device> m_image1; diff --git a/src/mess/machine/c64_currah_speech.h b/src/mess/machine/c64_currah_speech.h index 9a59851d329..49e769de96a 100644 --- a/src/mess/machine/c64_currah_speech.h +++ b/src/mess/machine/c64_currah_speech.h @@ -49,7 +49,7 @@ protected: private: inline void set_osc1(int voice, int intonation); - required_device<device_t> m_nsp; + required_device<sp0256_device> m_nsp; }; diff --git a/src/mess/machine/c64_ieee488.h b/src/mess/machine/c64_ieee488.h index ce7c24bdd90..22c96be5a58 100644 --- a/src/mess/machine/c64_ieee488.h +++ b/src/mess/machine/c64_ieee488.h @@ -62,7 +62,7 @@ protected: virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw, int hiram); private: - required_device<device_t> m_tpi; + required_device<tpi6525_device> m_tpi; required_device<ieee488_device> m_bus; required_device<c64_expansion_slot_device> m_exp; diff --git a/src/mess/machine/c64_sfx_sound_expander.h b/src/mess/machine/c64_sfx_sound_expander.h index 3da10bf0547..f02f83897b0 100644 --- a/src/mess/machine/c64_sfx_sound_expander.h +++ b/src/mess/machine/c64_sfx_sound_expander.h @@ -58,7 +58,7 @@ protected: virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw, int hiram); private: - required_device<device_t> m_opl; + required_device<ym3526_device> m_opl; required_device<c64_expansion_slot_device> m_exp; }; diff --git a/src/mess/machine/comx_fd.h b/src/mess/machine/comx_fd.h index 32f36a0cef4..e41080a66fd 100644 --- a/src/mess/machine/comx_fd.h +++ b/src/mess/machine/comx_fd.h @@ -60,9 +60,9 @@ private: inline void update_ef4(); // internal state - required_device<device_t> m_fdc; - required_device<device_t> m_floppy0; - required_device<device_t> m_floppy1; + required_device<wd1770_device> m_fdc; + required_device<legacy_floppy_image_device> m_floppy0; + required_device<legacy_floppy_image_device> m_floppy1; // floppy state int m_ds; // device select diff --git a/src/mess/machine/cpc_ssa1.h b/src/mess/machine/cpc_ssa1.h index 7c091c88be2..bc89f57af01 100644 --- a/src/mess/machine/cpc_ssa1.h +++ b/src/mess/machine/cpc_ssa1.h @@ -80,7 +80,7 @@ private: UINT8 m_lrq; UINT8 m_sby; - required_device<device_t> m_sp0256_device; + required_device<sp0256_device> m_sp0256_device; }; class cpc_dkspeech_device : public device_t, @@ -117,7 +117,7 @@ private: UINT8 m_lrq; UINT8 m_sby; - required_device<device_t> m_sp0256_device; + required_device<sp0256_device> m_sp0256_device; }; // device type definition diff --git a/src/mess/machine/e01.h b/src/mess/machine/e01.h index 4345db36330..7214185f765 100644 --- a/src/mess/machine/e01.h +++ b/src/mess/machine/e01.h @@ -80,8 +80,8 @@ protected: virtual void econet_clk(int state); required_device<m65c02_device> m_maincpu; - required_device<device_t> m_fdc; - required_device<device_t> m_adlc; + required_device<wd2793_device> m_fdc; + required_device<mc6854_device> m_adlc; required_device<mc146818_device> m_rtc; required_device<ram_device> m_ram; required_device<scsicb_device> m_scsibus; diff --git a/src/mess/machine/ecb_grip.h b/src/mess/machine/ecb_grip.h index 35f09c0e6a8..f05941f6600 100644 --- a/src/mess/machine/ecb_grip.h +++ b/src/mess/machine/ecb_grip.h @@ -80,7 +80,7 @@ private: required_device<z80sti_device> m_sti; required_device<mc6845_device> m_crtc; required_device<centronics_device> m_centronics; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; // sound state int m_vol0; diff --git a/src/mess/machine/isa_ibm_mfc.h b/src/mess/machine/isa_ibm_mfc.h index 185cc2d3f95..a026acd5436 100644 --- a/src/mess/machine/isa_ibm_mfc.h +++ b/src/mess/machine/isa_ibm_mfc.h @@ -14,6 +14,7 @@ #include "machine/isa.h" #include "machine/i8255.h" #include "machine/i8251.h" +#include "machine/pit8253.h" #include "sound/2151intf.h" //************************************************************************** @@ -84,7 +85,7 @@ private: required_device<cpu_device> m_cpu; required_device<ym2151_device> m_ym2151; - required_device<device_t> m_d8253; + required_device<pit8253_device> m_d8253; required_device<i8251_device> m_d71051; required_device<i8255_device> m_d71055c_0; required_device<i8255_device> m_d71055c_1; diff --git a/src/mess/machine/kc_d004.h b/src/mess/machine/kc_d004.h index 2a18708a0d8..c4ec4ebcb19 100644 --- a/src/mess/machine/kc_d004.h +++ b/src/mess/machine/kc_d004.h @@ -103,7 +103,7 @@ public: DECLARE_WRITE8_MEMBER(gide_w); private: - required_device<device_t> m_ide; + required_device<ide_controller_device> m_ide; UINT16 m_ide_data; int m_lh; diff --git a/src/mess/machine/lux10828.h b/src/mess/machine/lux10828.h index 5f4b46cbce1..7594ba8c79b 100644 --- a/src/mess/machine/lux10828.h +++ b/src/mess/machine/lux10828.h @@ -99,7 +99,7 @@ protected: private: required_device<cpu_device> m_maincpu; required_device<z80pio_device> m_pio; - required_device<device_t> m_fdc; + required_device<mb8876_device> m_fdc; required_device<legacy_floppy_image_device> m_image0; required_device<legacy_floppy_image_device> m_image1; diff --git a/src/mess/machine/lux21046.h b/src/mess/machine/lux21046.h index 6750b2aa47c..0da0deb8886 100644 --- a/src/mess/machine/lux21046.h +++ b/src/mess/machine/lux21046.h @@ -95,7 +95,7 @@ protected: private: required_device<cpu_device> m_maincpu; required_device<z80dma_device> m_dma; - required_device<device_t> m_fdc; + required_device<fd1793_device> m_fdc; required_device<legacy_floppy_image_device> m_image0; required_device<legacy_floppy_image_device> m_image1; diff --git a/src/mess/machine/s100_dj2db.h b/src/mess/machine/s100_dj2db.h index 3bc3b53a259..5d58f030dda 100644 --- a/src/mess/machine/s100_dj2db.h +++ b/src/mess/machine/s100_dj2db.h @@ -61,7 +61,7 @@ protected: private: // internal state - required_device<device_t> m_fdc; + required_device<mb8866_device> m_fdc; required_device<com8116_device> m_dbrg; device_t* m_floppy0; device_t* m_floppy1; diff --git a/src/mess/machine/s100_wunderbus.h b/src/mess/machine/s100_wunderbus.h index 95bbadc5c37..5631e553fe7 100644 --- a/src/mess/machine/s100_wunderbus.h +++ b/src/mess/machine/s100_wunderbus.h @@ -40,7 +40,7 @@ public: // not really public DECLARE_WRITE_LINE_MEMBER( pic_int_w ); DECLARE_WRITE_LINE_MEMBER( rtc_tp_w ); - required_device<device_t> m_pic; + required_device<pic8259_device> m_pic; required_device<ins8250_device> m_ace1; required_device<ins8250_device> m_ace2; required_device<ins8250_device> m_ace3; diff --git a/src/mess/machine/southbridge.h b/src/mess/machine/southbridge.h index 921668ccf0b..3a7cf7ebbc1 100644 --- a/src/mess/machine/southbridge.h +++ b/src/mess/machine/southbridge.h @@ -74,14 +74,14 @@ public: //static IRQ_CALLBACK(at_irq_callback); required_device<cpu_device> m_maincpu; - required_device<device_t> m_pic8259_master; - required_device<device_t> m_pic8259_slave; - required_device<device_t> m_dma8237_1; - required_device<device_t> m_dma8237_2; - required_device<device_t> m_pit8254; + required_device<pic8259_device> m_pic8259_master; + required_device<pic8259_device> m_pic8259_slave; + required_device<device_t> m_dma8237_1; // TODO use correct type + required_device<device_t> m_dma8237_2; // TODO use correct type + required_device<pit8254_device> m_pit8254; required_device<at_keyboard_controller_device> m_keybc; required_device<isa16_device> m_isabus; - required_device<device_t> m_speaker; + required_device<speaker_sound_device> m_speaker; required_device<mc146818_device> m_mc146818; required_device<pc_kbdc_device> m_pc_kbdc; DECLARE_READ8_MEMBER(at_page8_r); diff --git a/src/mess/machine/tvc_hbf.h b/src/mess/machine/tvc_hbf.h index bb7515bf69a..1131d78898f 100644 --- a/src/mess/machine/tvc_hbf.h +++ b/src/mess/machine/tvc_hbf.h @@ -43,7 +43,7 @@ protected: private: // internal state - required_device<device_t> m_fdc; + required_device<fd1793_device> m_fdc; UINT8 * m_rom; UINT8 * m_ram; diff --git a/src/mess/machine/v1050kb.h b/src/mess/machine/v1050kb.h index 63a21041d22..696a4c5ec62 100644 --- a/src/mess/machine/v1050kb.h +++ b/src/mess/machine/v1050kb.h @@ -73,7 +73,7 @@ protected: private: required_device<cpu_device> m_maincpu; - required_device<device_t> m_discrete; + required_device<discrete_sound_device> m_discrete; UINT8 m_y; int m_so; |