ui: move files to ui/ and include/ui/

[qemu.git] / hw / tsc210x.c

diff --git a/hw/tsc210x.c b/hw/tsc210x.c
index 96446dd463c9be7ebed77ef6b7a480797570c802..2b3535d4fc04c1a34a94d458e1a02ca523ccbd85 100644 (file)
--- a/hw/tsc210x.c
+++ b/hw/tsc210x.c
@@ -22,7 +22,7 @@
 #include "hw.h"
 #include "audio/audio.h"
 #include "qemu-timer.h"
-#include "console.h"
+#include "ui/console.h"
 #include "omap.h"      /* For I2SCodec and uWireSlave */
 #include "devices.h"
 
@@ -1105,7 +1105,7 @@ uWireSlave *tsc2102_init(qemu_irq pint)
     TSC210xState *s;
 
     s = (TSC210xState *)
-            qemu_mallocz(sizeof(TSC210xState));
+            g_malloc0(sizeof(TSC210xState));
     memset(s, 0, sizeof(TSC210xState));
     s->x = 160;
     s->y = 160;
@@ -1154,7 +1154,7 @@ uWireSlave *tsc2301_init(qemu_irq penirq, qemu_irq kbirq, qemu_irq dav)
     TSC210xState *s;
 
     s = (TSC210xState *)
-            qemu_mallocz(sizeof(TSC210xState));
+            g_malloc0(sizeof(TSC210xState));
     memset(s, 0, sizeof(TSC210xState));
     s->x = 400;
     s->y = 240;