summaryrefslogtreecommitdiff
path: root/hw/pl110.c
diff options
context:
space:
mode:
authorpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2007-06-30 14:07:13 +0000
committerpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2007-06-30 14:07:13 +0000
commit64075cd76a1d78f37e4e436bd1e7d2376f6bd7c9 (patch)
tree1f51919d0d12347c4089f5e48f9d68908fc6d5b5 /hw/pl110.c
parente735b91cd44e5dafb83ed4158a4c6721c0b289aa (diff)
downloadqemu-64075cd76a1d78f37e4e436bd1e7d2376f6bd7c9.tar.gz
PL110 versatile register hack fix (Adam Lackorzynski).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3036 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/pl110.c')
-rw-r--r--hw/pl110.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/pl110.c b/hw/pl110.c
index 7340d4b4a3..9df77c46c4 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;