X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fdevices%2Fgeneric.h;h=77d3822052b5bb8b5b5552f15bbab11c7d2e0ba6;hb=17e0fe3ae80a90f7268462f6109ab68929b25e16;hp=c4a38b60c4fe138d064c46a06e094d8d74b5309c;hpb=56f8088296ee4116a4811a2f4f843edd80a7748d;p=palacios.git

diff --git a/palacios/include/devices/generic.h b/palacios/include/devices/generic.h
index c4a38b6..77d3822 100644
--- a/palacios/include/devices/generic.h
+++ b/palacios/include/devices/generic.h
@@ -1,10 +1,32 @@
-/* (c) 2008, Peter Dinda <pdinda@northwestern.edu> */
-/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+/* 
+ * 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/vmm_dev_mgr.h>
 
-#ifndef __GENERIC_H
-#define __GENERIC_H
-
-#include <palacios/vm_dev.h>
 
 //
 // The generic device simply hooks ranges of ports, addresses, and irqs
@@ -28,16 +50,12 @@
 #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, flags
-typedef void *generic_address_range_type[3];
-// An interrupt ory map range is low..high, inclusive, flags
-typedef uint_t generic_irq_range_type[3];
-
-// The lists given are null terminated
-struct vm_device *create_generic(generic_port_range_type    port_ranges[], 
-				 generic_address_range_type addess_ranges[],
-				 generic_irq_range_type     irq_ranges[]);  
+
+int v3_generic_add_port_range(struct vm_device * dev, uint_t start, uint_t end, uint_t type);
+
+ 
+
+
+#endif // ! __V3VEE__
 
 #endif