diff options
author | 2016-03-04 09:26:46 +0100 | |
---|---|---|
committer | 2016-03-04 09:27:47 +0100 | |
commit | 8d4f4d62aaac3edef42d4544387ca45b5f0d9cd6 (patch) | |
tree | 11513bf78b0b24ce4b7b4c90ab6c6fcc29d3b8cf | |
parent | c5836d89d765cf4894c0728d677ec5be666940d4 (diff) |
remove remaining files (nw)
-rw-r--r-- | scripts/target/mame/arcade.lua | 2 | ||||
-rw-r--r-- | src/mame/includes/sprcros2.h | 49 | ||||
-rw-r--r-- | src/mame/includes/svi318.h | 159 | ||||
-rw-r--r-- | src/mame/video/sprcros2.cpp | 187 |
4 files changed, 0 insertions, 397 deletions
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 4ae27d37cc3..9f17507c618 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -4472,8 +4472,6 @@ files { MAME_DIR .. "src/mame/drivers/splus.cpp", MAME_DIR .. "src/mame/drivers/spool99.cpp", MAME_DIR .. "src/mame/drivers/sprcros2.cpp", - MAME_DIR .. "src/mame/includes/sprcros2.h", - MAME_DIR .. "src/mame/video/sprcros2.cpp", MAME_DIR .. "src/mame/drivers/sshot.cpp", MAME_DIR .. "src/mame/drivers/ssingles.cpp", MAME_DIR .. "src/mame/drivers/sstrangr.cpp", diff --git a/src/mame/includes/sprcros2.h b/src/mame/includes/sprcros2.h deleted file mode 100644 index bc3a468306c..00000000000 --- a/src/mame/includes/sprcros2.h +++ /dev/null @@ -1,49 +0,0 @@ -// license:??? -// copyright-holders:insideoutboy -class sprcros2_state : public driver_device -{ -public: - sprcros2_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_master(*this,"master"), - m_slave(*this,"slave"), - m_gfxdecode(*this, "gfxdecode"), - m_palette(*this, "palette"), - m_fgvideoram(*this, "fgvideoram"), - m_bgvideoram(*this, "bgvideoram"), - m_spriteram(*this, "spriteram") { } - - required_device<cpu_device> m_master; - required_device<cpu_device> m_slave; - required_device<gfxdecode_device> m_gfxdecode; - required_device<palette_device> m_palette; - - required_shared_ptr<UINT8> m_fgvideoram; - required_shared_ptr<UINT8> m_bgvideoram; - required_shared_ptr<UINT8> m_spriteram; - - UINT8 m_s_port3; - UINT8 m_port7; - tilemap_t *m_bgtilemap; - tilemap_t *m_fgtilemap; - - DECLARE_WRITE8_MEMBER(m_port7_w); - DECLARE_WRITE8_MEMBER(s_port3_w); - DECLARE_WRITE8_MEMBER(fgvideoram_w); - DECLARE_WRITE8_MEMBER(bgvideoram_w); - DECLARE_WRITE8_MEMBER(bgscrollx_w); - DECLARE_WRITE8_MEMBER(bgscrolly_w); - - TILE_GET_INFO_MEMBER(get_bgtile_info); - TILE_GET_INFO_MEMBER(get_fgtile_info); - - virtual void machine_start() override; - virtual void video_start() override; - DECLARE_PALETTE_INIT(sprcros2); - - INTERRUPT_GEN_MEMBER(s_interrupt); - TIMER_DEVICE_CALLBACK_MEMBER(m_interrupt); - - UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); -}; diff --git a/src/mame/includes/svi318.h b/src/mame/includes/svi318.h deleted file mode 100644 index 1e0fc0d0d30..00000000000 --- a/src/mame/includes/svi318.h +++ /dev/null @@ -1,159 +0,0 @@ -// license:??? -// copyright-holders:Sean Young,Tomas Karlsson -/***************************************************************************** - * - * includes/svi318.h - * - * Spectravideo SVI-318 and SVI-328 - * - ****************************************************************************/ - -#ifndef SVI318_H_ -#define SVI318_H_ - -#include "cpu/z80/z80.h" -#include "machine/i8255.h" -#include "machine/ins8250.h" -#include "machine/wd_fdc.h" -#include "machine/ram.h" -#include "machine/buffer.h" -#include "imagedev/cassette.h" -#include "sound/dac.h" -#include "sound/ay8910.h" -#include "sound/wave.h" -#include "video/mc6845.h" -#include "video/tms9928a.h" -#include "bus/centronics/ctronics.h" -#include "bus/generic/slot.h" -#include "bus/generic/carts.h" - - -class svi318_state : public driver_device -{ -public: - svi318_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu"), - m_cassette(*this, "cassette"), - m_dac(*this, "dac"), - m_ppi(*this, "ppi8255"), - m_ram(*this, RAM_TAG), - m_centronics(*this, "centronics"), - m_cent_data_out(*this, "cent_data_out"), - m_ins8250_0(*this, "ins8250_0"), - m_ins8250_1(*this, "ins8250_1"), - m_cart(*this, "cartslot"), - m_fd1793(*this, "wd179x"), - m_floppy0(*this, "wd179x:0"), - m_floppy1(*this, "wd179x:1"), - m_crtc(*this, "crtc"), - m_line(*this, "LINE"), - m_joysticks(*this, "JOYSTICKS"), - m_buttons(*this, "BUTTONS"), - m_palette(*this, "palette"), - m_floppy(nullptr), - m_bank1(*this, "bank1"), - m_bank2(*this, "bank2"), - m_bank3(*this, "bank3"), - m_bank4(*this, "bank4") - { } - - DECLARE_FLOPPY_FORMATS(floppy_formats); - - // FDC - int m_drq; - int m_irq; - - DECLARE_WRITE8_MEMBER(ppi_w); - DECLARE_READ8_MEMBER(psg_port_a_r); - DECLARE_WRITE8_MEMBER(psg_port_b_w); - DECLARE_WRITE8_MEMBER(fdc_drive_motor_w); - DECLARE_WRITE8_MEMBER(fdc_density_side_w); - DECLARE_READ8_MEMBER(fdc_irqdrq_r); - DECLARE_WRITE8_MEMBER(svi806_ram_enable_w); - DECLARE_WRITE8_MEMBER(writemem1); - DECLARE_WRITE8_MEMBER(writemem2); - DECLARE_WRITE8_MEMBER(writemem3); - DECLARE_WRITE8_MEMBER(writemem4); - DECLARE_READ8_MEMBER(io_ext_r); - DECLARE_WRITE8_MEMBER(io_ext_w); - DECLARE_DRIVER_INIT(svi318); - DECLARE_DRIVER_INIT(svi328_806); - DECLARE_WRITE_LINE_MEMBER(vdp_interrupt); - DECLARE_WRITE_LINE_MEMBER(ins8250_interrupt); - DECLARE_READ8_MEMBER(ppi_port_a_r); - DECLARE_READ8_MEMBER(ppi_port_b_r); - DECLARE_WRITE8_MEMBER(ppi_port_c_w); - DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w); - DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); - bool cart_verify(UINT8 *ROM); - DECLARE_DEVICE_IMAGE_LOAD_MEMBER(svi318_cart); - DECLARE_WRITE_LINE_MEMBER(write_centronics_busy); - - virtual void machine_start() override; - virtual void machine_reset() override; - - MC6845_UPDATE_ROW(crtc_update_row); - memory_region *m_cart_rom; - memory_region *m_bios_rom; - -protected: - required_device<z80_device> m_maincpu; - required_device<cassette_image_device> m_cassette; - required_device<dac_device> m_dac; - required_device<i8255_device> m_ppi; - required_device<ram_device> m_ram; - required_device<centronics_device> m_centronics; - required_device<output_latch_device> m_cent_data_out; - required_device<ins8250_device> m_ins8250_0; - required_device<ins8250_device> m_ins8250_1; - required_device<generic_slot_device> m_cart; - required_device<fd1793_t> m_fd1793; - required_device<floppy_connector> m_floppy0; - required_device<floppy_connector> m_floppy1; - optional_device<mc6845_device> m_crtc; - required_ioport_array<11> m_line; - required_ioport m_joysticks; - required_ioport m_buttons; - optional_device<palette_device> m_palette; - -private: - - void set_banks(); - void postload(); - - // memory banking - UINT8 m_bank_switch; - UINT8 m_bank_low; - UINT8 m_bank_high; - - UINT8 m_bank_low_read_only; - UINT8 m_bank_high1_read_only; - UINT8 m_bank_high2_read_only; - - std::unique_ptr<UINT8[]> m_empty_bank; - UINT8 *m_bank_low_ptr; - UINT8 *m_bank_high1_ptr; - UINT8 *m_bank_high2_ptr; - - // keyboard - UINT8 m_keyboard_row; - - floppy_image_device *m_floppy; - - // centronics - int m_centronics_busy; - - // SVI-806 80 column card - UINT8 m_svi806_present; - UINT8 m_svi806_ram_enabled; - dynamic_buffer m_svi806_ram; - UINT8 *m_svi806_gfx; - - required_memory_bank m_bank1; - required_memory_bank m_bank2; - required_memory_bank m_bank3; - optional_memory_bank m_bank4; -}; - -#endif /* SVI318_H_ */ diff --git a/src/mame/video/sprcros2.cpp b/src/mame/video/sprcros2.cpp deleted file mode 100644 index a64da9bfafc..00000000000 --- a/src/mame/video/sprcros2.cpp +++ /dev/null @@ -1,187 +0,0 @@ -// license:??? -// copyright-holders:insideoutboy -/* -Super Cross II (JPN Ver.) -(c)1986 GM Shoji -*/ - -#include "emu.h" -#include "includes/sprcros2.h" - - -PALETTE_INIT_MEMBER(sprcros2_state, sprcros2) -{ - const UINT8 *color_prom = memregion("proms")->base(); - int i; - - /* create a lookup table for the palette */ - for (i = 0; i < 0x20; i++) - { - int bit0, bit1, bit2; - int r, g, b; - - /* red component */ - bit0 = (color_prom[i] >> 0) & 0x01; - bit1 = (color_prom[i] >> 1) & 0x01; - bit2 = (color_prom[i] >> 2) & 0x01; - r = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; - - /* green component */ - bit0 = (color_prom[i] >> 3) & 0x01; - bit1 = (color_prom[i] >> 4) & 0x01; - bit2 = (color_prom[i] >> 5) & 0x01; - g = 0x21 * bit0 + 0x47 * bit1 + 0x97 * bit2; - - /* blue component */ - bit0 = (color_prom[i] >> 6) & 0x01; - bit1 = (color_prom[i] >> 7) & 0x01; - b = 0x47 * bit0 + 0xb8 * bit1; - palette.set_pen_color(i,rgb_t(r,g,b)); - - palette.set_indirect_color(i, rgb_t(r, g, b)); - } - - /* color_prom now points to the beginning of the lookup table */ - color_prom += 0x20; - - /* bg */ - for (i = 0; i < 0x100; i++) - { - UINT8 ctabentry = (color_prom[i] & 0x0f) | ((color_prom[i + 0x100] & 0x0f) << 4); - palette.set_pen_indirect(i, ctabentry); - } - - /* sprites & fg */ - for (i = 0x100; i < 0x300; i++) - { - UINT8 ctabentry = color_prom[i + 0x100]; - palette.set_pen_indirect(i, ctabentry); - } -} - -WRITE8_MEMBER(sprcros2_state::fgvideoram_w) -{ - m_fgvideoram[offset] = data; - m_fgtilemap->mark_tile_dirty(offset&0x3ff); -} - -WRITE8_MEMBER(sprcros2_state::bgvideoram_w) -{ - m_bgvideoram[offset] = data; - m_bgtilemap->mark_tile_dirty(offset&0x3ff); -} - -WRITE8_MEMBER(sprcros2_state::bgscrollx_w) -{ - if(m_port7&0x02) - m_bgtilemap->set_scrollx(0, 0x100-data); - else - m_bgtilemap->set_scrollx(0, data); -} - -WRITE8_MEMBER(sprcros2_state::bgscrolly_w) -{ - m_bgtilemap->set_scrolly(0, data); -} - -TILE_GET_INFO_MEMBER(sprcros2_state::get_bgtile_info) -{ - UINT32 tile_number = m_bgvideoram[tile_index]; - UINT8 attr = m_bgvideoram[tile_index + 0x400]; - - //attr - //76543210 - //xxxx---- colour - //----x--- flipx - //-----xxx tile bank - - tile_number += (attr&0x07)<<8; - - SET_TILE_INFO_MEMBER(0, - tile_number, - (attr&0xf0)>>4, - (attr&0x08)?TILE_FLIPX:0); -} - -TILE_GET_INFO_MEMBER(sprcros2_state::get_fgtile_info) -{ - UINT32 tile_number = m_fgvideoram[tile_index]; - UINT8 attr = m_fgvideoram[tile_index + 0x400]; - int color = (attr&0xfc)>>2; - - tileinfo.group = color; - - //attr - //76543210 - //xxxxxx-- colour - //------xx tile bank - - tile_number += (attr&0x03)<<8; - - SET_TILE_INFO_MEMBER(2, - tile_number, - color, - 0); -} - -void sprcros2_state::video_start() -{ - m_bgtilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sprcros2_state::get_bgtile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - m_fgtilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(sprcros2_state::get_fgtile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 32, 32); - - m_fgtilemap->configure_groups(*m_gfxdecode->gfx(2), 0); -} - -void sprcros2_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) -{ - int offs,sx,sy,color,flipx,flipy; - - for (offs = m_spriteram.bytes()-4; offs >= 0; offs -= 4) - { - if (m_spriteram[offs]) - { - //offs - //76543210 - //x------- unused - //-xxxxxxx sprite number - //offs+1 - //76543210 - //xx------ unused - //--xxx--- colour (6/7 unused and blank in prom) - //-----x-- unused - //------x- flipx - //-------x unused - //offs+2 y pos - //offs+3 x pos - - sx = ((m_spriteram[offs+3]+0x10)%0x100)-0x10; - sy = 225-(((m_spriteram[offs+2]+0x10)%0x100)-0x10); - color = (m_spriteram[offs+1]&0x38)>>3; - flipx = m_spriteram[offs+1]&0x02; - flipy = 0; - - if (m_port7&0x02) - { - sx = 224-sx; - sy = 224-sy; - flipx = !flipx; - flipy = !flipy; - } - - m_gfxdecode->gfx(1)->transmask(bitmap,cliprect, - m_spriteram[offs], - color, - flipx,flipy, - sx,sy, - m_palette->transpen_mask(*m_gfxdecode->gfx(1), color, 0)); - } - } -} - -UINT32 sprcros2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - m_bgtilemap->draw(screen, bitmap, cliprect, 0, 0); - draw_sprites(bitmap, cliprect); - m_fgtilemap->draw(screen, bitmap, cliprect, 0, 0); - return 0; -} |