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 7340d4b4a33d3965cc8121eee1f384afb8d7f2f5..9df77c46c4d0fe2d53aba12e19b7bd44b6c4277e 100644 (file)
--- 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;