From: Toni Wilen <twilen@winuae.net>
Date: Wed, 2 Sep 2020 18:55:48 +0000 (+0300)
Subject: Fix CIA reset defaults and unused register return value.
X-Git-Tag: 4900~320
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=a08b05e7933596d03ecb279eec4371f6a171900f;p=francis%2Fwinuae.git

Fix CIA reset defaults and unused register return value.
---

diff --git a/cia.cpp b/cia.cpp
index 0043507e..a4f5ea01 100644
--- a/cia.cpp
+++ b/cia.cpp
@@ -1220,6 +1220,8 @@ static uae_u8 ReadCIAA (unsigned int addr, uae_u32 *flags)
 				return getciatod(ciaatol) >> 24;
 			else
 				return getciatod(ciaatod) >> 24;
+		} else {
+			return 0xff;
 		}
 		break;
 	case 12:
@@ -1378,6 +1380,8 @@ static uae_u8 ReadCIAB (unsigned int addr, uae_u32 *flags)
 				return getciatod(ciabtol) >> 24;
 			else
 				return getciatod(ciabtod) >> 24;
+		} else {
+			return 0xff;
 		}
 		break;
 	case 12:
@@ -1904,7 +1908,7 @@ void CIA_reset (void)
 		ciaapra = 0; ciaadra = 0;
 		ciaatod = ciabtod = 0; ciaatodon = ciabtodon = 0;
 		ciaaicr = ciabicr = ciaaimask = ciabimask = 0;
-		ciaacra = ciaacrb = ciabcra = ciabcrb = 0x4; /* outmode = toggle; */
+		ciaacra = ciaacrb = ciabcra = ciabcrb = 0;
 		ciaala = ciaalb = ciabla = ciablb = ciaata = ciaatb = ciabta = ciabtb = 0xFFFF;
 		ciaaalarm = ciabalarm = 0;
 		ciabpra = 0x8C; ciabdra = 0;