X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fsimple_pic.c;h=c0903ebbb10740337c10de394ec24a212a3894d9;hb=c239c2e1ab9410566f9e8eab435c2073ec449929;hp=c3539b70a2bed8a6cdf780b6c5c11464e1c1a6c9;hpb=159356d2478ab200cda0a0aa726d8f1bfa4ffeeb;p=palacios-OLD.git

diff --git a/palacios/src/devices/simple_pic.c b/palacios/src/devices/simple_pic.c
index c3539b7..c0903eb 100644
--- a/palacios/src/devices/simple_pic.c
+++ b/palacios/src/devices/simple_pic.c
@@ -1,3 +1,22 @@
+/*
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ *
+ * This is free software.  You are permitted to use,
+ * 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>
@@ -5,7 +24,7 @@
 
 struct pic_internal {
   int pending_irq;
-  int error_code;
+
 };
 
 
@@ -15,11 +34,11 @@ static int pic_intr_pending(void * private_data) {
   return (data->pending_irq > 0);
 }
 
-static 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;
 }
@@ -69,7 +88,8 @@ static struct vm_device_ops dev_ops = {
 
 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);