summaryrefslogtreecommitdiff
path: root/hw/pc.c
diff options
context:
space:
mode:
authorSon Hyunjun <hj79.son@samsung.com>2012-03-08 17:10:58 +0900
committerSon Hyunjun <hj79.son@samsung.com>2012-03-08 17:10:58 +0900
commitbfd2ee50a5ffae2c5a895ac4a8e2347a72fef4f3 (patch)
tree94c308128e72ed4fa11e8e18638fc3a577f511e4 /hw/pc.c
parenta972d4d88892efb06d920d74cc55a6a91a63a2a2 (diff)
downloadqemu-bfd2ee50a5ffae2c5a895ac4a8e2347a72fef4f3.tar.gz
qemu-bfd2ee50a5ffae2c5a895ac4a8e2347a72fef4f3.tar.bz2
qemu-bfd2ee50a5ffae2c5a895ac4a8e2347a72fef4f3.zip
add vga contents
Diffstat (limited to 'hw/pc.c')
-rw-r--r--hw/pc.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/hw/pc.c b/hw/pc.c
index 33778fe422..4ef1f8b655 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -44,6 +44,11 @@
#include "memory.h"
#include "exec-memory.h"
+#ifdef CONFIG_MARU
+#include "../tizen/src/hw/maru_overlay.h"
+#include "../tizen/src/hw/maru_brightness.h"
+#endif
+
/* output Bochs bios info messages */
//#define DEBUG_BIOS
@@ -1100,7 +1105,19 @@ void pc_vga_init(PCIBus *pci_bus)
} else {
isa_vga_init();
}
+#ifdef CONFIG_MARU
+ } else if (maru_vga_enabled) {
+ if (pci_bus) {
+ pci_vga_init(pci_bus);
+ pci_maru_overlay_init(pci_bus);
+ pci_maru_brightness_init(pci_bus);
+ } else {
+ isa_vga_init();
+ }
}
+#else
+ }
+#endif
}
static void cpu_request_exit(void *opaque, int irq, int level)