[SerialICE] New patch to review for serialice: 072f1bb SerialICE: Minor cleanups

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1457

-gerrit

commit 072f1bbbe4e8cc3fdcf7c3a7f68a1ff58935cca1
Author: Kyösti Mälkki 
Date:   Sat Aug 18 16:28:51 2012 +0300

SerialICE: Minor cleanups

Drop serial comm headers.
    Move VNC screen init.
    Fix unused exit function.

Change-Id: Idc9b0d17e5d1bb3b2a88f93775653d9079cb2b46
    Signed-off-by: Kyösti Mälkki 
---
 qemu-0.15.x/serialice.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/qemu-0.15.x/serialice.c b/qemu-0.15.x/serialice.c
index 2408d8b..1e677bf 100644
--- a/qemu-0.15.x/serialice.c
+++ b/qemu-0.15.x/serialice.c
@@ -32,14 +32,6 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <string.h>
-#ifdef WIN32
-#include <windows.h>
-#include <conio.h>
-#else
-#include <fcntl.h>
-#include <termios.h>
-#include <sys/ioctl.h>
-#endif

/* Local includes */
 #include "hw/hw.h"
@@ -103,6 +95,13 @@ static void serialice_invalidate(void *opaque)
     screen_invalid = 1;
 }

+static void serialice_screen(void)
+{
+    ds = graphic_console_init(serialice_refresh, serialice_invalidate,
+                              NULL, NULL, ds);
+    qemu_console_resize(ds, 320, 240);
+}
+
 // **************************************************************************
 // high level communication with the SerialICE shell

@@ -352,9 +351,7 @@ int serialice_handle_store(uint32_t addr, uint32_t val, unsigned int data_size)

static void serialice_init(void)
 {
-    ds = graphic_console_init(serialice_refresh, serialice_invalidate,
-                              NULL, NULL, ds);
-    qemu_console_resize(ds, 320, 240);
+    serialice_screen();

printf("SerialICE: Open connection to target hardware...\n");
     serialice_serial_init();
@@ -371,9 +368,7 @@ static void serialice_init(void)
 static void serialice_exit(void)
 {
     serialice_lua_exit();
-    qemu_free(s->command);
-    qemu_free(s->buffer);
-    qemu_free(s);
+    serialice_serial_exit();
 }
 #endif