From f16128d34b48cc13c931901c819ee568948e3a4d Mon Sep 17 00:00:00 2001 From: Curt Coder Date: Sun, 9 Sep 2012 12:58:21 +0000 Subject: [PATCH] (MESS) Cleanup. (nw) --- src/mess/machine/c1551.c | 10 ---------- src/mess/machine/c1551.h | 1 - src/mess/machine/c64exp.c | 16 ---------------- src/mess/machine/c64exp.h | 1 - src/mess/machine/plus4exp.c | 17 ----------------- src/mess/machine/plus4exp.h | 1 - src/mess/machine/vic1010.c | 17 ----------------- src/mess/machine/vic1010.h | 1 - src/mess/machine/vic10exp.c | 17 ----------------- src/mess/machine/vic10exp.h | 1 - src/mess/machine/vic20exp.c | 17 ----------------- src/mess/machine/vic20exp.h | 1 - 12 files changed, 100 deletions(-) diff --git a/src/mess/machine/c1551.c b/src/mess/machine/c1551.c index 6f2e9947df8..5560de15b3c 100644 --- a/src/mess/machine/c1551.c +++ b/src/mess/machine/c1551.c @@ -601,16 +601,6 @@ void c1551_device::plus4_cd_w(address_space &space, offs_t offset, UINT8 data, i } -//------------------------------------------------- -// plus4_screen_update - screen update -//------------------------------------------------- - -UINT32 c1551_device::plus4_screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - return m_exp->screen_update(screen, bitmap, cliprect); -} - - //------------------------------------------------- // plus4_breset_w - buffered reset write //------------------------------------------------- diff --git a/src/mess/machine/c1551.h b/src/mess/machine/c1551.h index d4c49f7891a..f1ed6e482fa 100644 --- a/src/mess/machine/c1551.h +++ b/src/mess/machine/c1551.h @@ -79,7 +79,6 @@ protected: // device_plus4_expansion_card_interface overrides virtual UINT8 plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h); virtual void plus4_cd_w(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h); - virtual UINT32 plus4_screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); virtual void plus4_breset_w(int state); private: diff --git a/src/mess/machine/c64exp.c b/src/mess/machine/c64exp.c index 3ffcaa210bc..b21ad4c233f 100644 --- a/src/mess/machine/c64exp.c +++ b/src/mess/machine/c64exp.c @@ -417,22 +417,6 @@ int c64_expansion_slot_device::exrom_r(offs_t offset, int ba, int rw, int hiram) } -//------------------------------------------------- -// screen_update - -//------------------------------------------------- - -UINT32 c64_expansion_slot_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - bool value = false; - - if (m_cart != NULL) - { - value = m_cart->c64_screen_update(screen, bitmap, cliprect); - } - - return value; -} - WRITE_LINE_MEMBER( c64_expansion_slot_device::port_reset_w ) { if (m_cart != NULL) m_cart->c64_reset_w(state); } diff --git a/src/mess/machine/c64exp.h b/src/mess/machine/c64exp.h index c51cebad00d..7d2451387e3 100644 --- a/src/mess/machine/c64exp.h +++ b/src/mess/machine/c64exp.h @@ -173,7 +173,6 @@ protected: virtual int c64_game_r(offs_t offset, int ba, int rw, int hiram) { return m_game; } virtual int c64_exrom_r(offs_t offset, int ba, int rw, int hiram) { return m_exrom; } virtual void c64_reset_w(int state) { }; - virtual UINT32 c64_screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { return 0; } c64_expansion_slot_device *m_slot; diff --git a/src/mess/machine/plus4exp.c b/src/mess/machine/plus4exp.c index 320494e9c9b..1297d034077 100644 --- a/src/mess/machine/plus4exp.c +++ b/src/mess/machine/plus4exp.c @@ -346,23 +346,6 @@ void plus4_expansion_slot_device::cd_w(address_space &space, offs_t offset, UINT } -//------------------------------------------------- -// screen_update - -//------------------------------------------------- - -UINT32 plus4_expansion_slot_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - bool value = false; - - if (m_cart != NULL) - { - value = m_cart->plus4_screen_update(screen, bitmap, cliprect); - } - - return value; -} - - //------------------------------------------------- // breset_w - buffered reset write //------------------------------------------------- diff --git a/src/mess/machine/plus4exp.h b/src/mess/machine/plus4exp.h index 0c34ea884c1..2f0196817c8 100644 --- a/src/mess/machine/plus4exp.h +++ b/src/mess/machine/plus4exp.h @@ -165,7 +165,6 @@ public: // runtime virtual UINT8 plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) { return data; }; virtual void plus4_cd_w(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) { }; - virtual UINT32 plus4_screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { return 0; } virtual void plus4_breset_w(int state) { }; protected: diff --git a/src/mess/machine/vic1010.c b/src/mess/machine/vic1010.c index 774f7441277..8a5380f5a17 100644 --- a/src/mess/machine/vic1010.c +++ b/src/mess/machine/vic1010.c @@ -135,23 +135,6 @@ void vic1010_device::vic20_cd_w(address_space &space, offs_t offset, UINT8 data, } -//------------------------------------------------- -// vic20_screen_update - screen update -//------------------------------------------------- - -UINT32 vic1010_device::vic20_screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - UINT32 data = 0; - - for (int i = 0; i < MAX_SLOTS; i++) - { - data |= m_expansion_slot[i]->screen_update(screen, bitmap, cliprect); - } - - return data; -} - - //------------------------------------------------- // vic20_res_w - reset write //------------------------------------------------- diff --git a/src/mess/machine/vic1010.h b/src/mess/machine/vic1010.h index b4c8632d4ae..8f0f64ffe37 100644 --- a/src/mess/machine/vic1010.h +++ b/src/mess/machine/vic1010.h @@ -56,7 +56,6 @@ protected: // device_vic20_expansion_card_interface overrides virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); - virtual UINT32 vic20_screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); virtual void vic20_res_w(int state); private: diff --git a/src/mess/machine/vic10exp.c b/src/mess/machine/vic10exp.c index 12c80eaa755..40eb24d9b76 100644 --- a/src/mess/machine/vic10exp.c +++ b/src/mess/machine/vic10exp.c @@ -278,23 +278,6 @@ const char * vic10_expansion_slot_device::get_default_card_software(const machin } -//------------------------------------------------- -// screen_update - -//------------------------------------------------- - -UINT32 vic10_expansion_slot_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - bool value = false; - - if (m_cart != NULL) - { - value = m_cart->vic10_screen_update(screen, bitmap, cliprect); - } - - return value; -} - - //------------------------------------------------- // cd_r - cartridge data read //------------------------------------------------- diff --git a/src/mess/machine/vic10exp.h b/src/mess/machine/vic10exp.h index 880298ac110..5beadcd2c17 100644 --- a/src/mess/machine/vic10exp.h +++ b/src/mess/machine/vic10exp.h @@ -167,7 +167,6 @@ protected: virtual void vic10_p0_w(int state) { }; virtual void vic10_sp_w(int state) { }; virtual void vic10_cnt_w(int state) { }; - virtual UINT32 vic10_screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { return 0; } virtual void vic10_res_w(int state) { }; vic10_expansion_slot_device *m_slot; diff --git a/src/mess/machine/vic20exp.c b/src/mess/machine/vic20exp.c index 66615384bc4..14739ca07a6 100644 --- a/src/mess/machine/vic20exp.c +++ b/src/mess/machine/vic20exp.c @@ -357,23 +357,6 @@ void vic20_expansion_slot_device::cd_w(address_space &space, offs_t offset, UINT } } - -//------------------------------------------------- -// screen_update - -//------------------------------------------------- - -UINT32 vic20_expansion_slot_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) -{ - bool value = false; - - if (m_cart != NULL) - { - value = m_cart->vic20_screen_update(screen, bitmap, cliprect); - } - - return value; -} - WRITE_LINE_MEMBER( vic20_expansion_slot_device::port_res_w ) { if (m_cart != NULL) m_cart->vic20_res_w(state); } WRITE_LINE_MEMBER( vic20_expansion_slot_device::irq_w ) { m_out_irq_func(state); } diff --git a/src/mess/machine/vic20exp.h b/src/mess/machine/vic20exp.h index 80e6a28931e..74b65034459 100644 --- a/src/mess/machine/vic20exp.h +++ b/src/mess/machine/vic20exp.h @@ -159,7 +159,6 @@ protected: // runtime virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { return data; }; virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { }; - virtual UINT32 vic20_screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { return 0; } virtual void vic20_res_w(int state) { }; vic20_expansion_slot_device *m_slot;