New patch to review for serialice: b02d462 Split up serialice init

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1060

-gerrit

commit b02d46259266226eb0378214a112b5add5856fab
Author: Patrick Georgi <[e-mail]>
Date:   Wed May 30 10:09:51 2012 +0200

    Split up serialice init
    
    Separate serial line init from "generic" initialization.
    
    Change-Id: Ib0d11007a6f5f836f39ffbabac15f3989962377e
    Signed-off-by: Patrick Georgi <[e-mail]>
---
 qemu-0.15.x/serialice.c |   24 ++++++++++++++----------
 qemu-0.15.x/serialice.h |    2 --
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/qemu-0.15.x/serialice.c b/qemu-0.15.x/serialice.c
index a91f9c6..f1d0c02 100644
--- a/qemu-0.15.x/serialice.c
+++ b/qemu-0.15.x/serialice.c
@@ -1111,16 +1111,8 @@ static void serialice_invalidate(void *opaque)
 // **************************************************************************
 // initialization and exit
 
-void serialice_init(void)
+static void serialice_serial_init(void)
 {
-    s = qemu_mallocz(sizeof(SerialICEState));
-
-    s->ds = graphic_console_init(serialice_refresh, serialice_invalidate,
-                                 NULL, NULL, s);
-    qemu_console_resize(s->ds, 320, 240);
-
-    printf("SerialICE: Open connection to target hardware...\n");
-
     if (serialice_device == NULL) {
         printf("You need to specify a serial device to use SerialICE.\n");
         exit(1);
@@ -1216,6 +1208,18 @@ void serialice_init(void)
     serialice_get_version();
 
     serialice_get_mainboard();
+}
+
+static void serialice_init(void)
+{
+    s = qemu_mallocz(sizeof(SerialICEState));
+
+    s->ds = graphic_console_init(serialice_refresh, serialice_invalidate,
+                                 NULL, NULL, s);
+    qemu_console_resize(s->ds, 320, 240);
+
+    printf("SerialICE: Open connection to target hardware...\n");
+    serialice_serial_init();
 
     printf("SerialICE: LUA init...\n");
     serialice_lua_init();
@@ -1224,7 +1228,7 @@ void serialice_init(void)
     serialice_active = 1;
 }
 
-void serialice_exit(void)
+static void serialice_exit(void)
 {
     serialice_lua_exit();
     qemu_free(s->command);
diff --git a/qemu-0.15.x/serialice.h b/qemu-0.15.x/serialice.h
index a651618..638f683 100644
--- a/qemu-0.15.x/serialice.h
+++ b/qemu-0.15.x/serialice.h
@@ -35,8 +35,6 @@
 extern const char *serialice_device;
 extern int serialice_active;
 
-void serialice_init(void);
-void serialice_exit(void);
 const char *serialice_lua_execute(const char *cmd);
 
 uint8_t serialice_inb(uint16_t port);