X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fcurses_cons.c;h=9359ecc122a60100450a4c903938c1e4927c148a;hb=bc5ee3e07affac4810227d61c407011c05298518;hp=d712a58c588e3bd24d9850f7aeca312e5aa26898;hpb=b1a5e7177b66fa319c896492d87f6276508bcbce;p=palacios.git

diff --git a/palacios/src/devices/curses_cons.c b/palacios/src/devices/curses_cons.c
index d712a58..9359ecc 100644
--- a/palacios/src/devices/curses_cons.c
+++ b/palacios/src/devices/curses_cons.c
@@ -38,9 +38,8 @@
 
 #define SCREEN_SIZE (BYTES_PER_ROW * NUM_ROWS)
 
-struct cons_state 
-{
-    void * tty;
+struct cons_state {
+    v3_console_t cons;
     struct vm_device * frontend_dev;
 };
 
@@ -52,9 +51,14 @@ static int cursor_update(uint_t x, uint_t y, void *private_data)
 {
     struct vm_device *dev = (struct vm_device *) private_data;
     struct cons_state *state = (struct cons_state *) dev->private_data;
-    uint_t offset = (x * BYTES_PER_COL) + (y * BYTES_PER_ROW);
+    uint_t offset;
     uint_t last_x, last_y;
 
+    /* avoid out-of-range coordinates */
+    if (x >= NUM_COLS) x = NUM_COLS - 1;
+    if (y >= NUM_ROWS) y = NUM_ROWS - 1;
+    offset = (x * BYTES_PER_COL) + (y * BYTES_PER_ROW);
+
     /* unfortunately Palacios sometimes misses some writes, 
      * but if they are accompanied by a cursor move we may be able to 
      * detect this
@@ -68,14 +72,14 @@ static int cursor_update(uint_t x, uint_t y, void *private_data)
     }
     
     /* adjust cursor */	
-    if (V3_TtyCursorSet(state->tty, x, y) < 0) {
-	PrintError("V3_TtyCursorSet(0x%p, %d, %d) failed\n", state->tty, x, y);
+    if (v3_console_set_cursor(state->cons, x, y) < 0) {
+	PrintError("set cursor (0x%p, %d, %d) failed\n", state->cons, x, y);
 	return -1;
     }
     
     /* done with console update */
-    if (V3_TtyUpdate(state->tty) < 0) {
-	PrintError("V3_TtyUpdate(0x%p) failed\n", state->tty);
+    if (v3_console_update(state->cons) < 0) {
+	PrintError("console update (0x%p) failed\n", state->cons);
 	return -1;
     }
     
@@ -83,8 +87,8 @@ static int cursor_update(uint_t x, uint_t y, void *private_data)
 }
 
 static int screen_update(uint_t x, uint_t y, uint_t length, void * private_data) {
-    struct vm_device *dev = (struct vm_device *)private_data;
-    struct cons_state *state = (struct cons_state *)dev->private_data;
+    struct vm_device * dev = (struct vm_device *)private_data;
+    struct cons_state * state = (struct cons_state *)dev->private_data;
     uint_t offset = (x * BYTES_PER_COL) + (y * BYTES_PER_ROW);
     uint8_t fb_buf[length];
     int i;
@@ -104,9 +108,9 @@ static int screen_update(uint_t x, uint_t y, uint_t length, void * private_data)
 	col[1] = fb_buf[col_index + 1]; // Attribute
 	
 	/* update current character */
-	if (V3_TtyCharacterSet(state->tty, cur_x, cur_y, col[0], col[1]) < 0) {
-	    PrintError("V3_TtyCursorSet(0x%p, %d, %d, %d, %d) failed\n", 
-		       state->tty, cur_x, cur_y, col[1], col[0]);
+	if (v3_console_set_char(state->cons, cur_x, cur_y, col[0], col[1]) < 0) {
+	    PrintError("set cursor (0x%p, %d, %d, %d, %d) failed\n", 
+		       state->cons, cur_x, cur_y, col[1], col[0]);
 	    return -1;
 	}
 	
@@ -117,8 +121,8 @@ static int screen_update(uint_t x, uint_t y, uint_t length, void * private_data)
     }
     
     /* done with console update */
-    if (V3_TtyUpdate(state->tty) < 0) {
-	PrintError("V3_TtyUpdate(0x%p) failed\n", state->tty);
+    if (v3_console_update(state->cons) < 0) {
+	PrintError("console update(0x%p) failed\n", state->cons);
 	return -1;
     }
     
@@ -139,14 +143,14 @@ static int scroll(int rows, void * private_data) {
 
     if (rows > 0) {
 	/* scroll requested number of lines*/		
-	if (V3_TtyScroll(state->tty, rows) < 0) {
-	    PrintError("V3_TtyScroll(0x%p, %u) failed\n", state->tty, rows);
+	if (v3_console_scroll(state->cons, rows) < 0) {
+	    PrintError("console scroll (0x%p, %u) failed\n", state->cons, rows);
 	    return -1;
 	}
 
 	/* done with console update */
-	if (V3_TtyUpdate(state->tty) < 0) {
-	    PrintError("V3_TtyUpdate(0x%p) failed\n", state->tty);
+	if (v3_console_update(state->cons) < 0) {
+	    PrintError("console update (0x%p) failed\n", state->cons);
 	    return -1;
 	}
 		
@@ -156,6 +160,27 @@ static int scroll(int rows, void * private_data) {
     return 0;
 }
 
+
+static int cons_free(struct vm_device * dev) {
+    struct cons_state * state = (struct cons_state *)dev->private_data;
+
+    v3_console_close(state->cons);
+
+    // remove host event
+
+    V3_Free(state);
+
+    return 0;
+}
+
+static int console_event_handler(struct v3_vm_info * vm, 
+				 struct v3_console_event * evt, 
+				 void * priv_data) {
+    screen_update(0, 0, SCREEN_SIZE, priv_data);
+    
+    return 0;
+}
+
 static struct v3_console_ops cons_ops = {
     .update_screen = screen_update, 
     .update_cursor = cursor_update,
@@ -163,10 +188,7 @@ static struct v3_console_ops cons_ops = {
 };
 
 static struct v3_device_ops dev_ops = {
-    .free = NULL,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
+    .free = cons_free,
 };
 
 static int cons_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) 
@@ -176,7 +198,6 @@ static int cons_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg)
     const char * frontend_tag = v3_cfg_val(frontend_cfg, "tag");
     struct vm_device * frontend = v3_find_dev(vm, frontend_tag);
     char * dev_id = v3_cfg_val(cfg, "ID");
-    char * ttypath = v3_cfg_val(cfg, "tty");
 
     /* read configuration */
     V3_ASSERT(frontend_cfg);
@@ -187,14 +208,14 @@ static int cons_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg)
     /* allocate state */
     state = (struct cons_state *)V3_Malloc(sizeof(struct cons_state));
     V3_ASSERT(state);
+
     state->frontend_dev = frontend;
-    V3_ASSERT(ttypath);
 
     /* open tty for screen display */
-    state->tty = V3_TtyOpen(vm, ttypath, TTY_OPEN_MODE_READ | TTY_OPEN_MODE_WRITE);
+    state->cons = v3_console_open(vm, NUM_COLS, NUM_ROWS);
 
-    if (!state->tty) {
-	PrintError("Could not open tty %s\n", ttypath);
+    if (!state->cons) {
+	PrintError("Could not open console\n");
 	V3_Free(state);
 	return -1;
     }
@@ -213,6 +234,8 @@ static int cons_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg)
     /* attach to front-end display adapter */
     v3_console_register_cga(frontend, &cons_ops, dev);
 
+    v3_hook_host_event(vm, HOST_CONSOLE_EVT, V3_HOST_EVENT_HANDLER(console_event_handler), dev);
+
     return 0;
 }