summary refs log tree commit diff stats
path: root/hw/integratorcp.c
diff options
context:
space:
mode:
authorpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2006-02-06 04:11:15 +0000
committerpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2006-02-06 04:11:15 +0000
commitbdd5003ae58baf4fb3fde9862630b97b2c1f058c (patch)
tree4ea47d8e7cb984adc94d0d5bc25b73609a6c1ee6 /hw/integratorcp.c
parenta41b2ff2ddd0ba05ac2ca1bb657603b1d09dc9bc (diff)
downloadfocaccia-qemu-bdd5003ae58baf4fb3fde9862630b97b2c1f058c.tar.gz
focaccia-qemu-bdd5003ae58baf4fb3fde9862630b97b2c1f058c.zip
Arm display emulation.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1746 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/integratorcp.c')
-rw-r--r--hw/integratorcp.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index d2b437ce13..0e3d1e3f02 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -27,8 +27,11 @@ void irq_info(void)
 {
 }
 
+static void *lcd;
+
 void vga_update_display(void)
 {
+    pl110_update_display(lcd);
 }
 
 void vga_screen_dump(const char *filename)
@@ -37,6 +40,7 @@ void vga_screen_dump(const char *filename)
 
 void vga_invalidate_display(void)
 {
+    pl110_invalidate_display(lcd);
 }
 
 void DMA_run (void)
@@ -1204,6 +1208,7 @@ static void integratorcp_init(int ram_size, int vga_ram_size, int boot_device,
             exit (1);
         }
     }
+    lcd = pl110_init(ds, 0xc0000000, pic, 22);
 
     /* Load the kernel.  */
     if (!kernel_filename) {