From e6caea2d662befd4f316413908319fa3a8002fa3 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 25 Aug 2017 18:54:35 +1000 Subject: appease msvc (nw) --- src/mame/drivers/deco32.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp index da802ad6c45..cf92de939e6 100644 --- a/src/mame/drivers/deco32.cpp +++ b/src/mame/drivers/deco32.cpp @@ -400,27 +400,27 @@ READ32_MEMBER(deco32_state::irq_controller_r) { switch (offset) { - case 2: /* Raster IRQ ACK - value read is not used */ - update_irq_state(RASTER_IRQ,false); - return 0; - - /* Irq controller - - Bit 0: 1 = Vblank active - Bit 1: ? (Hblank active? Captain America raster IRQ waits for this to go low) - Bit 2: - Bit 3: - Bit 4: VBL Irq - Bit 5: Raster IRQ - Bit 6: Lightgun IRQ (on Lock N Load only) - Bit 7: - */ - case 3: + case 2: /* Raster IRQ ACK - value read is not used */ + update_irq_state(RASTER_IRQ,false); + return 0; + + /* Irq controller + + Bit 0: 1 = Vblank active + Bit 1: ? (Hblank active? Captain America raster IRQ waits for this to go low) + Bit 2: + Bit 3: + Bit 4: VBL Irq + Bit 5: Raster IRQ + Bit 6: Lightgun IRQ (on Lock N Load only) + Bit 7: + */ + case 3: { /* ZV03082007 - video_screen_get_vblank() doesn't work for Captain America, as it expects that this bit is NOT set in rows 0-7. */ - bool hvblank = bool(m_screen->vblank() & m_screen->hblank()); - return 0xffffff80 | hvblank | m_screen->vblank()<<1 | (m_irq_cause); + bool const hvblank(m_screen->vblank() && m_screen->hblank()); + return 0xffffff80 | (hvblank ? 1 : 0) | (m_screen->vblank() ? 2 : 0) | m_irq_cause; } } -- cgit v1.2.3