diff options
Diffstat (limited to 'src/mame/includes/spectrum.h')
-rw-r--r-- | src/mame/includes/spectrum.h | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/src/mame/includes/spectrum.h b/src/mame/includes/spectrum.h index 2605cc29a8b..4f936da6bab 100644 --- a/src/mame/includes/spectrum.h +++ b/src/mame/includes/spectrum.h @@ -14,8 +14,6 @@ #include "machine/spec_snqk.h" #include "bus/spectrum/exp.h" -#include "bus/generic/carts.h" -#include "bus/generic/slot.h" #include "imagedev/cassette.h" #include "imagedev/snapquik.h" #include "machine/ram.h" @@ -73,7 +71,6 @@ public: m_ram(*this, RAM_TAG), m_speaker(*this, "speaker"), m_exp(*this, "exp"), - m_dock(*this, "dockslot"), m_io_line0(*this, "LINE0"), m_io_line1(*this, "LINE1"), m_io_line2(*this, "LINE2"), @@ -95,9 +92,6 @@ public: void spectrum_common(machine_config &config); void spectrum(machine_config &config); - void ts2068(machine_config &config); - void uk2086(machine_config &config); - void tc2048(machine_config &config); void spectrum_128(machine_config &config); void init_spectrum(); @@ -154,32 +148,15 @@ protected: DECLARE_WRITE8_MEMBER(spectrum_128_port_7ffd_w); DECLARE_READ8_MEMBER(spectrum_128_ula_r); - DECLARE_READ8_MEMBER(ts2068_port_f4_r); - DECLARE_WRITE8_MEMBER(ts2068_port_f4_w); - DECLARE_READ8_MEMBER(ts2068_port_ff_r); - DECLARE_WRITE8_MEMBER(ts2068_port_ff_w); - DECLARE_WRITE8_MEMBER(tc2048_port_ff_w); - DECLARE_MACHINE_RESET(spectrum); DECLARE_VIDEO_START(spectrum); void spectrum_palette(palette_device &palette) const; - DECLARE_MACHINE_RESET(tc2048); DECLARE_VIDEO_START(spectrum_128); DECLARE_MACHINE_RESET(spectrum_128); - DECLARE_MACHINE_RESET(ts2068); - DECLARE_VIDEO_START(ts2068); uint32_t screen_update_spectrum(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - uint32_t screen_update_tc2048(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - uint32_t screen_update_ts2068(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE_LINE_MEMBER(screen_vblank_spectrum); - DECLARE_WRITE_LINE_MEMBER(screen_vblank_timex); INTERRUPT_GEN_MEMBER(spec_interrupt); - // for timex cart only - DECLARE_DEVICE_IMAGE_LOAD_MEMBER(timex_cart); - int m_dock_cart_type, m_ram_chunks; - memory_region *m_dock_crt; - unsigned int m_previous_border_x, m_previous_border_y; bitmap_ind16 m_border_bitmap; unsigned int m_previous_screen_x, m_previous_screen_y; @@ -187,7 +164,7 @@ protected: void spectrum_128_update_memory(); virtual void plus3_update_memory() { } - void ts2068_update_memory(); + virtual void ts2068_update_memory() { } DECLARE_SNAPSHOT_LOAD_MEMBER(spectrum); DECLARE_QUICKLOAD_LOAD_MEMBER(spectrum); @@ -201,16 +178,11 @@ protected: void spectrum_io(address_map &map); void spectrum_mem(address_map &map); void spectrum_fetch(address_map &map); - void tc2048_io(address_map &map); - void tc2048_mem(address_map &map); - void ts2068_io(address_map &map); - void ts2068_mem(address_map &map); required_device<cassette_image_device> m_cassette; required_device<ram_device> m_ram; required_device<speaker_sound_device> m_speaker; optional_device<spectrum_expansion_slot_device> m_exp; - optional_device<generic_slot_device> m_dock; // Regular spectrum ports; marked as optional because of other subclasses optional_ioport m_io_line0; @@ -239,9 +211,6 @@ protected: void spectrum_UpdateScreenBitmap(bool eof = false); inline unsigned char get_display_color(unsigned char color, int invert); inline void spectrum_plot_pixel(bitmap_ind16 &bitmap, int x, int y, uint32_t color); - void ts2068_hires_scanline(bitmap_ind16 &bitmap, int y, int borderlines); - void ts2068_64col_scanline(bitmap_ind16 &bitmap, int y, int borderlines, unsigned short inkcolor); - void ts2068_lores_scanline(bitmap_ind16 &bitmap, int y, int borderlines, int screen); virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // snapshot helpers |