From f87a938f8a82f44cba05260672289a34292c0a00 Mon Sep 17 00:00:00 2001 From: Robbbert Date: Tue, 26 Apr 2022 20:26:38 +1000 Subject: Removed unwelcome fixes. --- src/mame/drivers/hp2640.cpp | 50 ++++++++++++++++++++++---------------------- src/mame/drivers/jaguar.cpp | 3 --- src/mame/drivers/ympsr60.cpp | 12 +++++------ 3 files changed, 31 insertions(+), 34 deletions(-) diff --git a/src/mame/drivers/hp2640.cpp b/src/mame/drivers/hp2640.cpp index 37f8751db47..a33f75820b8 100644 --- a/src/mame/drivers/hp2640.cpp +++ b/src/mame/drivers/hp2640.cpp @@ -244,15 +244,15 @@ protected: required_device m_tapes; memory_view m_io_view; - uint8_t m_mode_byte = 0; - bool m_timer_irq = false; - bool m_datacom_irq = false; - bool m_tape_irq = false; + uint8_t m_mode_byte; + bool m_timer_irq; + bool m_datacom_irq; + bool m_tape_irq; // Character generators required_region_ptr_array m_chargen; - const uint8_t m_chargen_set[ 4 ]{}; + const uint8_t m_chargen_set[ 4 ]; // Video DMA struct line_buffer { @@ -260,27 +260,27 @@ protected: uint8_t m_attrs[ VIDEO_VIS_COLS ]; }; struct line_buffer m_buffers[ 2 ]; - bool m_even = false; - bool m_dma_on = false; // U310-9 - bool m_line_done = false; - uint16_t m_dma_addr = 0; - uint8_t m_row_counter = 0; - bool m_row_clock = false; // U21-5 - bool m_row_reset = false; // U11-1 - bool m_eop = false; // U311-9 - bool m_eol = false; // U211-9 - bool m_skipeol = false; // U311-5 - bool m_en_skipeol = false; // U211-5 + bool m_even; + bool m_dma_on; // U310-9 + bool m_line_done; + uint16_t m_dma_addr; + uint8_t m_row_counter; + bool m_row_clock; // U21-5 + bool m_row_reset; // U11-1 + bool m_eop; // U311-9 + bool m_eol; // U211-9 + bool m_skipeol; // U311-5 + bool m_en_skipeol; // U211-5 // Video bitmap_rgb32 m_bitmap; - uint8_t m_cursor_x = 0; - uint8_t m_cursor_y = 0; - bool m_cursor_blink_inh = false; - bool m_blanking = false; + uint8_t m_cursor_x; + uint8_t m_cursor_y; + bool m_cursor_blink_inh; + bool m_blanking; // Async line interface - uint8_t m_async_control = 0; + uint8_t m_async_control; void update_irq(); uint8_t video_dma_get(); @@ -351,7 +351,7 @@ void hp2640_base_state::machine_reset() IRQ_CALLBACK_MEMBER(hp2640_base_state::irq_callback) { - uint8_t res = 0; + uint8_t res; // Encode interrupts in restart instruction (in order of decreasing priority) if (m_tape_irq) { @@ -722,7 +722,7 @@ void hp2640_base_state::video_render_buffer(unsigned video_scanline , unsigned l if (BIT(ch , 6)) { BIT_SET(ch_addr, 5); } - uint8_t byte = 0; + uint8_t byte; if ((ch <= 0x1f || ch >= 0x60) && (chargen_set & CHARGEN_C) == 0) { if (m_chargen[ char_set ].bytes() >= 0x800) { // Read from LC ROM @@ -737,8 +737,8 @@ void hp2640_base_state::video_render_buffer(unsigned video_scanline , unsigned l } else { byte = 0; } - uint16_t pixels_e = 0; - uint16_t pixels_o = 0; + uint16_t pixels_e; + uint16_t pixels_o; bool microvector = chargen_set & CHARGEN_B; if (cyen && (line_in_row == 11 || line_in_row == 12) && i == m_cursor_x) { diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp index f7417ff715d..6767856bfd6 100644 --- a/src/mame/drivers/jaguar.cpp +++ b/src/mame/drivers/jaguar.cpp @@ -1225,9 +1225,6 @@ void jaguarcd_state::butch_regs_w(offs_t offset, uint32_t data, uint32_t mem_mas { COMBINE_DATA(&m_butch_regs[offset]); - if (!m_cd_file) - return; - switch(offset*4) { case 8: //DS DATA diff --git a/src/mame/drivers/ympsr60.cpp b/src/mame/drivers/ympsr60.cpp index 4e7b63056eb..1173d400a42 100644 --- a/src/mame/drivers/ympsr60.cpp +++ b/src/mame/drivers/ympsr60.cpp @@ -144,12 +144,12 @@ private: attoseconds_t cv_handler(attotime const &curtime); - int m_acia_irq = CLEAR_LINE, m_ym_irq = CLEAR_LINE, m_drvif_irq = CLEAR_LINE, m_ym2154_irq = CLEAR_LINE; - u16 m_keyboard_select = 0; - u8 m_bbd_config = 0; - u8 m_drvif_data[2]{}; - u8 m_drvif_select = 0; - u8 m_sustain_fuzz = 0; + int m_acia_irq, m_ym_irq, m_drvif_irq, m_ym2154_irq; + u16 m_keyboard_select; + u8 m_bbd_config; + u8 m_drvif_data[2]; + u8 m_drvif_select; + u8 m_sustain_fuzz; WRITE_LINE_MEMBER(write_acia_clock) { m_acia->write_txc(state); m_acia->write_rxc(state); } WRITE_LINE_MEMBER(acia_irq_w) { m_acia_irq = state; recalc_irqs(); } -- cgit v1.2.3