mirror of
https://github.com/holub/mame
synced 2025-05-04 21:43:05 +03:00
Replaced all device_t's with actual device classes. Regression test recommended. (nw)
This commit is contained in:
parent
e8b103c2cb
commit
abbfd858ea
@ -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
|
||||
|
@ -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);
|
||||
|
@ -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();
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -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();
|
||||
|
||||
|
@ -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:
|
||||
|
@ -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;
|
||||
|
@ -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 );
|
||||
|
@ -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 )
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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();
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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();
|
||||
|
@ -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];
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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();
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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 );
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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 );
|
||||
|
@ -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;
|
||||
|
@ -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();
|
||||
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
@ -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 );
|
||||
|
@ -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 );
|
||||
|
@ -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();
|
||||
|
@ -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;
|
||||
|
@ -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 */
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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];
|
||||
|
@ -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 );
|
||||
|
@ -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 );
|
||||
|
@ -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);
|
||||
|
@ -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();
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
@ -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];
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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();
|
||||
|
@ -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 );
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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 */
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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();
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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();
|
||||
|
@ -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);
|
||||
|
@ -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();
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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();
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user