From: pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 30 Jun 2007 14:07:13 +0000 (+0000)
Subject: PL110 versatile register hack fix (Adam Lackorzynski).
X-Git-Tag: release_0_9_1~861
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=64075cd76a1d78f37e4e436bd1e7d2376f6bd7c9;p=thirdparty%2Fqemu.git

PL110 versatile register hack fix (Adam Lackorzynski).


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3036 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/hw/pl110.c b/hw/pl110.c
index 7340d4b4a33..9df77c46c4d 100644
--- a/hw/pl110.c
+++ b/hw/pl110.c
@@ -302,8 +302,12 @@ static uint32_t pl110_read(void *opaque, target_phys_addr_t offset)
     case 5: /* LCDLPBASE */
         return s->lpbase;
     case 6: /* LCDIMSC */
+	if (s->versatile)
+	  return s->cr;
         return s->int_mask;
     case 7: /* LCDControl */
+	if (s->versatile)
+	  return s->int_mask;
         return s->cr;
     case 8: /* LCDRIS */
         return s->int_status;