integrated new configuration system

[palacios.git] / palacios / src / devices / cga.c

diff --git a/palacios/src/devices/cga.c b/palacios/src/devices/cga.c
index aabe810..ee94f84 100644 (file)
--- a/palacios/src/devices/cga.c
+++ b/palacios/src/devices/cga.c
@@ -28,12 +28,12 @@
 
 
 
-/*
+
 #ifndef DEBUG_CGA
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
-*/
+
 
 #define START_ADDR 0xB8000
 #define END_ADDR 0xC0000
@@ -58,9 +58,11 @@ struct video_internal {
 
     uint8_t crtc_index_reg;          // io port 3D4
     uint8_t crtc_data_regs[25];      // io port 3D5
-
+    
+    /* IMPORTANT: These are column offsets _NOT_ byte offsets */
     uint16_t screen_offset; // relative to the framebuffer
     uint16_t cursor_offset; // relative to the framebuffer
+    /* ** */
 
     // updating the screen offset is not atomic, 
     // so we need a temp variable to hold the partial update
@@ -308,18 +310,20 @@ static struct v3_device_ops dev_ops = {
     .stop = NULL,
 };
 
-static int cga_init(struct guest_info * vm, void * cfg_data) {
+static int cga_init(struct guest_info * vm, v3_cfg_tree_t * cfg) {
     struct video_internal * video_state = (struct video_internal *)V3_Malloc(sizeof(struct video_internal));
     addr_t frame_buf_pa = 0;
-    uint32_t enable_passthrough = (uint32_t)(addr_t)cfg_data;
+    int enable_passthrough = 0;
+    char * name = v3_cfg_val(cfg, "name");
 
+    enable_passthrough = (strcasecmp(v3_cfg_val(cfg, "passthrough"), "enable") == 0) ? 1 : 0;
 
     PrintDebug("video: init_device\n");
 
-    struct vm_device * dev = v3_allocate_device("CGA_VIDEO", &dev_ops, video_state);
+    struct vm_device * dev = v3_allocate_device(name, &dev_ops, video_state);
 
     if (v3_attach_device(vm, dev) == -1) {
-       PrintError("Could not attach device %s\n", "CGA_VIDEO");
+       PrintError("Could not attach device %s\n", name);
        return -1;
     }