diff options
Diffstat (limited to 'src/mame/includes/spectrum.h')
-rw-r--r-- | src/mame/includes/spectrum.h | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/mame/includes/spectrum.h b/src/mame/includes/spectrum.h index 81333f31bf2..2605cc29a8b 100644 --- a/src/mame/includes/spectrum.h +++ b/src/mame/includes/spectrum.h @@ -17,10 +17,8 @@ #include "bus/generic/carts.h" #include "bus/generic/slot.h" #include "imagedev/cassette.h" -#include "imagedev/floppy.h" #include "imagedev/snapquik.h" #include "machine/ram.h" -#include "machine/upd765.h" #include "sound/spkrdev.h" #include "emupal.h" #include "screen.h" @@ -76,8 +74,6 @@ public: m_speaker(*this, "speaker"), m_exp(*this, "exp"), m_dock(*this, "dockslot"), - m_upd765(*this, "upd765"), - m_flop(*this, "upd765:%u", 0U), m_io_line0(*this, "LINE0"), m_io_line1(*this, "LINE1"), m_io_line2(*this, "LINE2"), @@ -102,12 +98,9 @@ public: void ts2068(machine_config &config); void uk2086(machine_config &config); void tc2048(machine_config &config); - void spectrum_plus3(machine_config &config); void spectrum_128(machine_config &config); void init_spectrum(); - void init_plus2(); - void init_plus3(); protected: enum @@ -123,8 +116,6 @@ protected: int m_port_ff_data; /* Display enhancement control */ int m_port_f4_data; /* Horizontal Select Register */ - int m_floppy; - /* video support */ int m_frame_invert_count; int m_frame_number; /* Used for handling FLASH 1 */ @@ -163,15 +154,6 @@ protected: DECLARE_WRITE8_MEMBER(spectrum_128_port_7ffd_w); DECLARE_READ8_MEMBER(spectrum_128_ula_r); - DECLARE_WRITE8_MEMBER(spectrum_plus3_bank1_w); - DECLARE_READ8_MEMBER(spectrum_plus3_bank1_r); - DECLARE_WRITE8_MEMBER(spectrum_plus3_port_3ffd_w); - DECLARE_READ8_MEMBER(spectrum_plus3_port_3ffd_r); - DECLARE_READ8_MEMBER(spectrum_plus3_port_2ffd_r); - DECLARE_WRITE8_MEMBER(spectrum_plus3_port_7ffd_w); - DECLARE_WRITE8_MEMBER(spectrum_plus3_port_1ffd_w); - void plus3_us_w(uint8_t data); - DECLARE_READ8_MEMBER(ts2068_port_f4_r); DECLARE_WRITE8_MEMBER(ts2068_port_f4_w); DECLARE_READ8_MEMBER(ts2068_port_ff_r); @@ -184,7 +166,6 @@ protected: DECLARE_MACHINE_RESET(tc2048); DECLARE_VIDEO_START(spectrum_128); DECLARE_MACHINE_RESET(spectrum_128); - DECLARE_MACHINE_RESET(spectrum_plus3); DECLARE_MACHINE_RESET(ts2068); DECLARE_VIDEO_START(ts2068); uint32_t screen_update_spectrum(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -204,9 +185,8 @@ protected: unsigned int m_previous_screen_x, m_previous_screen_y; bitmap_ind16 m_screen_bitmap; - DECLARE_FLOPPY_FORMATS(floppy_formats); void spectrum_128_update_memory(); - void spectrum_plus3_update_memory(); + virtual void plus3_update_memory() { } void ts2068_update_memory(); DECLARE_SNAPSHOT_LOAD_MEMBER(spectrum); @@ -221,8 +201,6 @@ protected: void spectrum_io(address_map &map); void spectrum_mem(address_map &map); void spectrum_fetch(address_map &map); - void spectrum_plus3_io(address_map &map); - void spectrum_plus3_mem(address_map &map); void tc2048_io(address_map &map); void tc2048_mem(address_map &map); void ts2068_io(address_map &map); @@ -233,8 +211,6 @@ protected: required_device<speaker_sound_device> m_speaker; optional_device<spectrum_expansion_slot_device> m_exp; optional_device<generic_slot_device> m_dock; - optional_device<upd765a_device> m_upd765; - optional_device_array<floppy_connector, 2> m_flop; // Regular spectrum ports; marked as optional because of other subclasses optional_ioport m_io_line0; |