Commit 64075cd76a1d78f37e4e436bd1e7d2376f6bd7c9
1 parent
e735b91c
PL110 versatile register hack fix (Adam Lackorzynski).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3036 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
4 additions
and
0 deletions
hw/pl110.c
| @@ -302,8 +302,12 @@ static uint32_t pl110_read(void *opaque, target_phys_addr_t offset) | @@ -302,8 +302,12 @@ static uint32_t pl110_read(void *opaque, target_phys_addr_t offset) | ||
| 302 | case 5: /* LCDLPBASE */ | 302 | case 5: /* LCDLPBASE */ |
| 303 | return s->lpbase; | 303 | return s->lpbase; |
| 304 | case 6: /* LCDIMSC */ | 304 | case 6: /* LCDIMSC */ |
| 305 | + if (s->versatile) | ||
| 306 | + return s->cr; | ||
| 305 | return s->int_mask; | 307 | return s->int_mask; |
| 306 | case 7: /* LCDControl */ | 308 | case 7: /* LCDControl */ |
| 309 | + if (s->versatile) | ||
| 310 | + return s->int_mask; | ||
| 307 | return s->cr; | 311 | return s->cr; |
| 308 | case 8: /* LCDRIS */ | 312 | case 8: /* LCDRIS */ |
| 309 | return s->int_status; | 313 | return s->int_status; |