LAN9118 improvements

[qemu.git] / console.c

diff --git a/console.c b/console.c
index f7b5d49f7f8d587e1a65a54f25640b5eda4c742a..8086bd6f200299233862d0e63b68f9ce94313539 100644 (file)
--- a/console.c
+++ b/console.c
@@ -110,12 +110,12 @@ typedef enum {
     GRAPHIC_CONSOLE,
     TEXT_CONSOLE,
     TEXT_CONSOLE_FIXED_SIZE
-} e_console_type;
+} console_type_t;
 
 /* ??? This is mis-named.
    It is used for both text and graphical consoles.  */
 struct TextConsole {
-    e_console_type console_type;
+    console_type_t console_type;
     DisplayState *ds;
     /* Graphic console state.  */
     vga_hw_update_ptr hw_update;
@@ -183,7 +183,7 @@ void vga_hw_screen_dump(const char *filename)
     active_console = previous_active_console;
 }
 
-void vga_hw_text_update(a_console_ch *chardata)
+void vga_hw_text_update(console_ch_t *chardata)
 {
     if (active_console && active_console->hw_text_update)
         active_console->hw_text_update(active_console->hw, chardata);
@@ -1197,7 +1197,7 @@ static void text_console_invalidate(void *opaque)
     console_refresh(s);
 }
 
-static void text_console_update(void *opaque, a_console_ch *chardata)
+static void text_console_update(void *opaque, console_ch_t *chardata)
 {
     TextConsole *s = (TextConsole *) opaque;
     int i, j, src;
@@ -1236,7 +1236,7 @@ static TextConsole *get_graphic_console(DisplayState *ds)
     return NULL;
 }
 
-static TextConsole *new_console(DisplayState *ds, e_console_type console_type)
+static TextConsole *new_console(DisplayState *ds, console_type_t console_type)
 {
     TextConsole *s;
     int i;
@@ -1384,7 +1384,17 @@ static void text_console_do_init(CharDriverState *chr, DisplayState *ds, QemuOpt
     s->t_attrib = s->t_attrib_default;
     text_console_resize(s);
 
-    qemu_chr_reset(chr);
+    if (chr->label) {
+        char msg[128];
+        int len;
+
+        s->t_attrib.bgcol = COLOR_BLUE;
+        len = snprintf(msg, sizeof(msg), "%s console\r\n", chr->label);
+        console_puts(chr, (uint8_t*)msg, len);
+        s->t_attrib = s->t_attrib_default;
+    }
+
+    qemu_chr_generic_open(chr);
     if (chr->init)
         chr->init(chr);
 }