From 84586a697d1a1ea74bee5a41b4da5023a88ae9b1 Mon Sep 17 00:00:00 2001 From: mooglyguy Date: Sat, 1 Dec 2018 16:10:44 +0100 Subject: videopak.cpp: Fixed MT#06566, Mounting Data 20 Video Pak (videopak) causes exception. [Ryan Holtz] --- src/devices/bus/vic20/videopak.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/devices/bus/vic20/videopak.cpp b/src/devices/bus/vic20/videopak.cpp index 392b306eea7..f8caf7f5823 100644 --- a/src/devices/bus/vic20/videopak.cpp +++ b/src/devices/bus/vic20/videopak.cpp @@ -170,14 +170,12 @@ uint8_t vic20_video_pak_device::vic20_cd_r(address_space &space, offs_t offset, if (!blk1) { offs_t addr = m_bank_msb << 15 | m_bank_lsb << 14 | offset; - data = m_ram[addr]; } if (!blk2) { offs_t addr = m_bank_msb << 15 | m_bank_lsb << 14 | 0x2000 | offset; - data = m_ram[addr]; } } @@ -186,21 +184,18 @@ uint8_t vic20_video_pak_device::vic20_cd_r(address_space &space, offs_t offset, if (!blk1) { offs_t addr = m_bank_msb << 15 | offset; - data = m_ram[addr]; } if (!blk2) { offs_t addr = m_bank_msb << 15 | 0x2000 | offset; - data = m_ram[addr]; } if (!blk3) { offs_t addr = m_bank_msb << 15 | 0x4000 | offset; - data = m_ram[addr]; } } @@ -211,7 +206,8 @@ uint8_t vic20_video_pak_device::vic20_cd_r(address_space &space, offs_t offset, switch ((offset >> 11) & 0x03) { case 0: - data = m_blk5[offset & 0x7ff]; + if (m_blk5) + data = m_blk5[offset & 0x7ff]; break; case 3: -- cgit v1.2.3