diff --git a/src/mess/includes/nes.h b/src/mess/includes/nes.h index e975278ac82..bfbcc1ff86d 100644 --- a/src/mess/includes/nes.h +++ b/src/mess/includes/nes.h @@ -461,10 +461,6 @@ public: m_cassette(*this, "tape") { } - /* input_related - this part has to be cleaned up (e.g. in_2 and in_3 are not really necessary here...) */ - nes_input m_in_0, m_in_1, m_in_2, m_in_3; - UINT8 m_fck_scan, m_fck_mode; - /* video-related */ int m_last_frame_flip; @@ -559,6 +555,7 @@ public: UINT8 m_zapper_latch[2][3]; UINT8 m_paddle_latch, m_paddle_btn_latch; UINT8 m_mjpanel_latch; + UINT8 m_fck_scan, m_fck_mode; protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mess/machine/nes.c b/src/mess/machine/nes.c index 458721a00b0..19746a6bd61 100644 --- a/src/mess/machine/nes.c +++ b/src/mess/machine/nes.c @@ -43,10 +43,6 @@ void nes_state::machine_reset() else if (m_cartslot) m_cartslot->pcb_reset(); - /* Reset the serial input ports */ - m_in_0.shift = 0; - m_in_1.shift = 0; - m_maincpu->reset(); memset(m_pad_latch, 0, sizeof(m_pad_latch));