X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fsimple_pic.c;h=96907df2823ad31b190b1ed9286d99846dd72f70;hp=11848e0cffc2cbcf068618960d959f3728731c16;hb=571979dad8fc2138a7e11c4fe61e812a0a0b17d1;hpb=7bb4a918835892e9071ffbdef1ea8e57f9a12950

diff --git a/palacios/src/devices/simple_pic.c b/palacios/src/devices/simple_pic.c
index 11848e0..96907df 100644
--- a/palacios/src/devices/simple_pic.c
+++ b/palacios/src/devices/simple_pic.c
@@ -17,82 +17,85 @@
  * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
  */
 
-#include <devices/simple_pic.h>
+
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_types.h>
 #include <palacios/vmm.h>
 
 struct pic_internal {
-  int pending_irq;
+    int pending_irq;
 
 };
 
 
 static int pic_intr_pending(void * private_data) {
-  struct pic_internal * data = (struct pic_internal *)private_data;
+    struct pic_internal * data = (struct pic_internal *)private_data;
   
-  return (data->pending_irq > 0);
+    return (data->pending_irq > 0);
 }
 
 static int pic_raise_intr(void * private_data, int irq) {
-  struct pic_internal * data = (struct pic_internal *)private_data;
+    struct pic_internal * data = (struct pic_internal *)private_data;
 
-  data->pending_irq = irq;
+    data->pending_irq = irq;
 
 
-  return 0;
+    return 0;
 }
 
 
 static int pic_get_intr_number(void * private_data) {
-  struct pic_internal * data = (struct pic_internal *)private_data;
+    struct pic_internal * data = (struct pic_internal *)private_data;
 
-  return data->pending_irq;
+    return data->pending_irq;
 }
 
 
 static struct intr_ctrl_ops intr_ops = {
-  .intr_pending = pic_intr_pending,
-  .get_intr_number = pic_get_intr_number,
-  .raise_intr = pic_raise_intr
+    .intr_pending = pic_intr_pending,
+    .get_intr_number = pic_get_intr_number,
+    .raise_intr = pic_raise_intr
 };
 
 
 
 
-static int pic_init_device(struct vm_device * dev) {
-  struct pic_internal * data = (struct pic_internal *)dev->private_data;
-  v3_register_intr_controller(dev->vm, &intr_ops, data);
-  data->pending_irq = 0;
 
-  return 0;
+
+static int pic_free(struct vm_device * dev) {
+    return 0;
 }
 
 
-static int pic_deinit_device(struct vm_device * dev) {
-  return 0;
-}
 
 
+static struct v3_device_ops dev_ops = { 
+    .free = pic_free,
+    .reset = NULL,
+    .start = NULL,
+    .stop = NULL
+};
 
 
 
-static struct vm_device_ops dev_ops = {
-  .init = pic_init_device,
-  .deinit = pic_deinit_device,
-  .reset = NULL,
-  .start = NULL,
-  .stop = NULL
-};
 
+static int pic_init(struct guest_info * vm, void * cfg_data) {
+    struct pic_internal * state = NULL;
+    state = (struct pic_internal *)V3_Malloc(sizeof(struct pic_internal));
+    V3_ASSERT(state != NULL);
+
+    struct vm_device * dev = v3_allocate_device("SIMPLE_PIC", &dev_ops, state);
 
-struct vm_device * v3_create_simple_pic() {
-  struct pic_internal * state = NULL;
-  state = (struct pic_internal *)V3_Malloc(sizeof(struct pic_internal));
-  V3_ASSERT(state != NULL);
+    if (v3_attach_device(vm, dev) == -1) {
+        PrintError("Could not attach device %s\n", "SIMPLE_PIC");
+        return -1;
+    }
 
-  struct vm_device * pic_dev = v3_create_device("Simple Pic", &dev_ops, state);
 
+    v3_register_intr_controller(vm, &intr_ops, state);
+    state->pending_irq = 0;
 
-  return pic_dev;
+    return 0;
 }
+
+device_register("SIMPLE_PIC", pic_init)