Merge branch 'devel'

[palacios.git] / palacios / include / devices / generic.h

diff --git a/palacios/include/devices/generic.h b/palacios/include/devices/generic.h
index 7a43e81..664466e 100644 (file)
--- a/palacios/include/devices/generic.h
+++ b/palacios/include/devices/generic.h
@@ -1,9 +1,30 @@
-/* (c) 2008, Peter Dinda <pdinda@northwestern.edu> */
-/* (c) 2008, Jack Lange <jarusl@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 __GENERIC_H__
-#define __GENERIC_H__
+
+
+#ifndef __DEVICES_GENERIC_H__
+#define __DEVICES_GENERIC_H__
+
+#ifdef __V3VEE__
 
 
 #include <palacios/vm_dev.h>
@@ -36,6 +57,9 @@ int v3_generic_add_mem_range(struct vm_device * dev, void * start, void * end, u
 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 * create_generic();  
+struct vm_device * v3_create_generic();  
+
+
+#endif // ! __V3VEE__
 
 #endif