X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fsimple_pic.c;h=cedec2a486a145b9858eb890993f66807c5ff272;hb=56f8088296ee4116a4811a2f4f843edd80a7748d;hp=a4e25f56fc8e4ac0ad4b808033eb20d979b6fcd5;hpb=a9ba0182142340a2dd7b6a0b7c63727e87b08c89;p=palacios-OLD.git

diff --git a/palacios/src/devices/simple_pic.c b/palacios/src/devices/simple_pic.c
index a4e25f5..cedec2a 100644
--- a/palacios/src/devices/simple_pic.c
+++ b/palacios/src/devices/simple_pic.c
@@ -1,3 +1,6 @@
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+
 #include <devices/simple_pic.h>
 #include <palacios/vmm_intr.h>
 #include <palacios/vmm_types.h>
@@ -5,27 +8,27 @@
 
 struct pic_internal {
   int pending_irq;
-  int error_code;
+
 };
 
 
-int pic_intr_pending(void * private_data) {
+static int pic_intr_pending(void * private_data) {
   struct pic_internal * data = (struct pic_internal *)private_data;
   
   return (data->pending_irq > 0);
 }
 
-int pic_raise_intr(void * private_data, int irq, int error_code) {
+static int pic_raise_intr(void * private_data, int irq) {
   struct pic_internal * data = (struct pic_internal *)private_data;
 
   data->pending_irq = irq;
-  data->error_code = error_code;
+
 
   return 0;
 }
 
 
-int pic_get_intr_number(void * private_data) {
+static int pic_get_intr_number(void * private_data) {
   struct pic_internal * data = (struct pic_internal *)private_data;
 
   return data->pending_irq;
@@ -67,9 +70,10 @@ static struct vm_device_ops dev_ops = {
 };
 
 
-struct vm_device * create_pic() {
+struct vm_device * create_simple_pic() {
   struct pic_internal * state = NULL;
-  VMMMalloc(struct pic_internal *, state, sizeof(struct pic_internal));
+  state = (struct pic_internal *)V3_Malloc(sizeof(struct pic_internal));
+  V3_ASSERT(state != NULL);
 
   struct vm_device * pic_dev = create_device("Simple Pic", &dev_ops, state);