X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fdevices%2Fgeneric.h;h=03c120c228f4d36e1f08cbca8c90e5719d20877e;hb=3cd1d3771e3f8e30b09f6c4995851979aaafc5ff;hp=51bed00d6ef536003ca2819cf9e9b6754d92f732;hpb=d38ca6817962f46012fae1b014a24372494f4d7c;p=palacios.git

diff --git a/palacios/include/devices/generic.h b/palacios/include/devices/generic.h
index 51bed00..03c120c 100644
--- a/palacios/include/devices/generic.h
+++ b/palacios/include/devices/generic.h
@@ -1,5 +1,31 @@
-#ifndef __GENERIC_H
-#define __GENERIC_H
+/* 
+ * 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, Peter Dinda <pdinda@northwestern.edu> 
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu>
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Peter Dinda <pdinda@northwestern.edu>
+ * 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".
+ */
+
+
+#ifndef __DEVICES_GENERIC_H__
+#define __DEVICES_GENERIC_H__
+
+#ifdef __V3VEE__
+
+
 
 #include <palacios/vm_dev.h>
 
@@ -25,18 +51,15 @@
 #define GENERIC_PRINT_AND_PASSTHROUGH 0
 #define GENERIC_PRINT_AND_IGNORE      1
 
-// A port range is low..high, inclusive, third value is one of the above
-typedef uint_t generic_port_range_type[3];
-// A memory range is low..high, inclusive
-typedef void *generic_address_range_type[3];
-// An interrupt ory map range is low..high, inclusive
-typedef uint_t generic_irq_range_type[3];
-
-struct vm_device *create_generic(generic_port_range_type    port_ranges[], 
-				 uint_t                     num_port_ranges,
-				 generic_address_range_type addess_ranges[],
-				 uint_t                     num_address_ranges,
-				 generic_irq_range_type     irq_ranges[],
-				 uint_t                     num_irqranges);
+
+int v3_generic_add_port_range(struct vm_device * dev, uint_t start, uint_t end, uint_t type);
+int v3_generic_add_mem_range(struct vm_device * dev, void * start, void * end, uint_t type);
+int v3_generic_add_irq_range(struct vm_device * dev, uint_t start, uint_t end, uint_t type);
+
+// The lists given are null terminated
+struct vm_device * v3_create_generic();  
+
+
+#endif // ! __V3VEE__
 
 #endif