From b5f78b5b9e844199d5ad5cc305924138ebcc472b Mon Sep 17 00:00:00 2001 From: AJR Date: Mon, 3 Jan 2022 19:57:27 -0500 Subject: [PATCH] nascom1.cpp: Remove some unused code built on obsolete assumptions * intv.cpp: Replace the preprocessor guard for some bitrotted cruft with #if 0 --- src/mame/drivers/nascom1.cpp | 24 ------------------------ src/mame/machine/intv.cpp | 4 ++-- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/src/mame/drivers/nascom1.cpp b/src/mame/drivers/nascom1.cpp index 375914206f2..8c7cd0a940b 100644 --- a/src/mame/drivers/nascom1.cpp +++ b/src/mame/drivers/nascom1.cpp @@ -97,16 +97,11 @@ protected: required_memory_region m_gfx1_region; required_ioport_array<8> m_keyboard; - int m_tape_size; - uint8_t *m_tape_image; - int m_tape_index; uint8_t m_kb_select; uint8_t m_kb_control; bool m_cassinbit, m_cassoutbit, m_cassold; u8 m_port00; - DECLARE_DEVICE_IMAGE_LOAD_MEMBER( load_nascom1_cassette ); - DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( unload_nascom1_cassette ); template DECLARE_SNAPSHOT_LOAD_MEMBER( snapshot_cb ); }; @@ -316,25 +311,6 @@ TIMER_DEVICE_CALLBACK_MEMBER( nascom2_state::nascom2_kansas_r ) } } -// This stuff has never been connected up - what's it for? -[[maybe_unused]] DEVICE_IMAGE_LOAD_MEMBER( nascom_state::load_nascom1_cassette ) -{ - m_tape_size = image.length(); - m_tape_image = (uint8_t*)image.ptr(); - - if (!m_tape_image) - return image_init_result::FAIL; - - m_tape_index = 0; - return image_init_result::PASS; -} - -[[maybe_unused]] DEVICE_IMAGE_UNLOAD_MEMBER( nascom_state::unload_nascom1_cassette ) -{ - m_tape_image = nullptr; - m_tape_size = m_tape_index = 0; -} - //************************************************************************** // SNAPSHOTS diff --git a/src/mame/machine/intv.cpp b/src/mame/machine/intv.cpp index 7cddd86c724..c580b93dc37 100644 --- a/src/mame/machine/intv.cpp +++ b/src/mame/machine/intv.cpp @@ -317,7 +317,7 @@ void set_tape_bit(int position, int data) } #endif -#if defined(LATER) +#if 0 int intvkbd_tape_init(int id) { FILE *tapefile; @@ -682,7 +682,7 @@ INTERRUPT_GEN_MEMBER(intv_state::intv_interrupt) m_stic->screenrefresh(); } -#if defined(LATER) +#if 0 INTERRUPT_GEN( intvkbd_interrupt2 ) {