X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fbochs_debug.c;h=4c1ab08546a61b12197a1839929500fd343f66da;hp=7ed8f8739b06cddefb36771ee6cc14b70c5807e5;hb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;hpb=1c46db5ec8d086d76f7120a638199564947694d3

diff --git a/palacios/src/devices/bochs_debug.c b/palacios/src/devices/bochs_debug.c
index 7ed8f87..4c1ab08 100644
--- a/palacios/src/devices/bochs_debug.c
+++ b/palacios/src/devices/bochs_debug.c
@@ -18,8 +18,9 @@
  */
 
 
-#include <devices/bochs_debug.h>
+
 #include <palacios/vmm.h>
+#include <palacios/vmm_dev_mgr.h>
 
 #define BUF_SIZE 1024
 
@@ -28,117 +29,142 @@
 #define BOCHS_INFO_PORT 0x402
 #define BOCHS_DEBUG_PORT 0x403
 
+#define BOCHS_CONSOLE_PORT 0xe9
 
 
 struct debug_state {
-  char debug_buf[BUF_SIZE];
-  uint_t debug_offset;
+    char debug_buf[BUF_SIZE];
+    uint_t debug_offset;
+
+    char info_buf[BUF_SIZE];
+    uint_t info_offset;
 
-  char info_buf[BUF_SIZE];
-  uint_t info_offset;
+    char cons_buf[BUF_SIZE];
+    uint_t cons_offset;
 };
 
 static int handle_info_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
-  struct debug_state * state = (struct debug_state *)dev->private_data;
+    struct debug_state * state = (struct debug_state *)dev->private_data;
 
-  state->info_buf[state->info_offset++] = *(char*)src;
+    state->info_buf[state->info_offset++] = *(char*)src;
 
-  if ((*(char*)src == 0xa) ||  (state->info_offset == (BUF_SIZE - 1))) {
-    PrintDebug("BOCHSINFO>%s", state->info_buf);
-    memset(state->info_buf, 0, BUF_SIZE);
-    state->info_offset = 0;
-  }
+    if ((*(char*)src == 0xa) ||  (state->info_offset == (BUF_SIZE - 1))) {
+	PrintDebug("BOCHSINFO>%s", state->info_buf);
+	memset(state->info_buf, 0, BUF_SIZE);
+	state->info_offset = 0;
+    }
 
-  return length;
+    return length;
 }
 
 
 static int handle_debug_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
-  struct debug_state * state = (struct debug_state *)dev->private_data;
+    struct debug_state * state = (struct debug_state *)dev->private_data;
 
-  state->debug_buf[state->debug_offset++] = *(char*)src;
+    state->debug_buf[state->debug_offset++] = *(char*)src;
 
-  if ((*(char*)src == 0xa) ||  (state->debug_offset == (BUF_SIZE - 1))) {
-    PrintDebug("BOCHSDEBUG>%s", state->debug_buf);
-    memset(state->debug_buf, 0, BUF_SIZE);
-    state->debug_offset = 0;
-  }
+    if ((*(char*)src == 0xa) ||  (state->debug_offset == (BUF_SIZE - 1))) {
+	PrintDebug("BOCHSDEBUG>%s", state->debug_buf);
+	memset(state->debug_buf, 0, BUF_SIZE);
+	state->debug_offset = 0;
+    }
 
-  return length;
+    return length;
 }
 
 
-static int handle_gen_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
+static int handle_console_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
+    struct debug_state * state = (struct debug_state *)dev->private_data;
 
-  switch (length) {
-  case 1:
-    PrintDebug(">0x%.2x\n", *(uchar_t*)src);
-    break;
-  case 2:
-    PrintDebug(">0x%.4x\n", *(ushort_t*)src);
-    break;
-  case 4:
-    PrintDebug(">0x%.8x\n", *(uint_t*)src);
-    break;
-  default:
-    PrintError("Invalid length in handle_gen_write\n");
-    return -1;
-    break;
-  }
-
-  return length;
-}
+    state->cons_buf[state->cons_offset++] = *(char*)src;
 
+    if ((*(char*)src == 0xa) ||  (state->cons_offset == (BUF_SIZE - 1))) {
+	PrintDebug("BOCHSCONSOLE>%s", state->cons_buf);
+	memset(state->cons_buf, 0, BUF_SIZE);
+	state->cons_offset = 0;
+    }
 
-static int debug_init(struct vm_device * dev) {
-  struct debug_state * state = (struct debug_state *)dev->private_data;
+    return length;
+}
 
-  state->debug_offset = 0;
-  state->info_offset = 0;
-  memset(state->debug_buf, 0, BUF_SIZE);
-  memset(state->info_buf, 0, BUF_SIZE);
 
+static int handle_gen_write(ushort_t port, void * src, uint_t length, struct vm_device * dev) {
 
-  dev_hook_io(dev, BOCHS_PORT1,  NULL, &handle_gen_write);
-  dev_hook_io(dev, BOCHS_PORT2, NULL, &handle_gen_write);
-  dev_hook_io(dev, BOCHS_INFO_PORT, NULL, &handle_info_write);
-  dev_hook_io(dev, BOCHS_DEBUG_PORT, NULL, &handle_debug_write);
-  
-  return 0;
+    switch (length) {
+	case 1:
+	    PrintDebug(">0x%.2x\n", *(uchar_t*)src);
+	    break;
+	case 2:
+	    PrintDebug(">0x%.4x\n", *(ushort_t*)src);
+	    break;
+	case 4:
+	    PrintDebug(">0x%.8x\n", *(uint_t*)src);
+	    break;
+	default:
+	    PrintError("Invalid length in handle_gen_write\n");
+	    return -1;
+	    break;
+    }
+
+    return length;
 }
 
-static int debug_deinit(struct vm_device * dev) {
-  dev_unhook_io(dev, BOCHS_PORT1);
-  dev_unhook_io(dev, BOCHS_PORT2);
-  dev_unhook_io(dev, BOCHS_INFO_PORT);
-  dev_unhook_io(dev, BOCHS_DEBUG_PORT);
 
-  return 0;
+
+
+static int debug_free(struct vm_device * dev) {
+    v3_dev_unhook_io(dev, BOCHS_PORT1);
+    v3_dev_unhook_io(dev, BOCHS_PORT2);
+    v3_dev_unhook_io(dev, BOCHS_INFO_PORT);
+    v3_dev_unhook_io(dev, BOCHS_DEBUG_PORT);
+
+    return 0;
 };
 
 
 
 
-static struct vm_device_ops dev_ops = {
-  .init = debug_init,
-  .deinit = debug_deinit,
-  .reset = NULL,
-  .start = NULL,
-  .stop = NULL,
+static struct v3_device_ops dev_ops = {
+    .free = debug_free,
+    .reset = NULL,
+    .start = NULL,
+    .stop = NULL,
 };
 
 
-struct vm_device * create_bochs_debug() {
-  struct debug_state * state = NULL;
 
-  state = (struct debug_state *)V3_Malloc(sizeof(struct debug_state));
 
-  V3_ASSERT(state != NULL);
+static int debug_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
+    struct debug_state * state = NULL;
+    char * name = v3_cfg_val(cfg, "name");
+
+    state = (struct debug_state *)V3_Malloc(sizeof(struct debug_state));
 
-  PrintDebug("Creating Bochs Debug Device\n");
-  struct vm_device * device = create_device("BOCHS Debug", &dev_ops, state);
+    V3_ASSERT(state != NULL);
 
+    PrintDebug("Creating Bochs Debug Device\n");
+    struct vm_device * dev = v3_allocate_device(name, &dev_ops, state);
+
+    if (v3_attach_device(vm, dev) == -1) {
+	PrintError("Could not attach device %s\n", name);
+	return -1;
+    }
+
+    state->debug_offset = 0;
+    state->info_offset = 0;
+    memset(state->debug_buf, 0, BUF_SIZE);
+    memset(state->info_buf, 0, BUF_SIZE);
 
 
-  return device;
+    v3_dev_hook_io(dev, BOCHS_PORT1,  NULL, &handle_gen_write);
+    v3_dev_hook_io(dev, BOCHS_PORT2, NULL, &handle_gen_write);
+    v3_dev_hook_io(dev, BOCHS_INFO_PORT, NULL, &handle_info_write);
+    v3_dev_hook_io(dev, BOCHS_DEBUG_PORT, NULL, &handle_debug_write);
+    v3_dev_hook_io(dev, BOCHS_CONSOLE_PORT, NULL, &handle_console_write);
+    
+  
+    return 0;
 }
+
+
+device_register("BOCHS_DEBUG", debug_init);