X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvm_dev.h;h=acac3f11a44a97f78ddd3df0c617c91aaa487e85;hb=1bafb4aec89c2c611117ec6ccc17d0f22f392254;hp=e5f699aadfab401dadae56e4a5ce487b1da66188;hpb=4f7c3b759e3889870c5b5e7d09b3ffcc168e5632;p=palacios.git

diff --git a/palacios/include/palacios/vm_dev.h b/palacios/include/palacios/vm_dev.h
index e5f699a..acac3f1 100644
--- a/palacios/include/palacios/vm_dev.h
+++ b/palacios/include/palacios/vm_dev.h
@@ -1,9 +1,27 @@
-/* Northwestern University */
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+/*
+ * 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".
+ */
 
 #ifndef __VM_DEV_H
 #define __VM_DEV_H
 
+#ifdef __V3VEE__
+
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_list.h>
 #include <palacios/vmm_dev_mgr.h>
@@ -15,72 +33,59 @@ struct vm_device;
 
 
 struct vm_device_ops {
-  int (*init)(struct vm_device *dev);
-  int (*deinit)(struct vm_device *dev);
+    int (*init)(struct vm_device *dev);
+    int (*deinit)(struct vm_device *dev);
 
 
-  int (*reset)(struct vm_device *dev);
+    int (*reset)(struct vm_device *dev);
 
-  int (*start)(struct vm_device *dev);
-  int (*stop)(struct vm_device *dev);
+    int (*start)(struct vm_device *dev);
+    int (*stop)(struct vm_device *dev);
 
 
-  //int (*save)(struct vm_device *dev, struct *iostream);
-  //int (*restore)(struct vm_device *dev, struct *iostream);
+    //int (*save)(struct vm_device *dev, struct *iostream);
+    //int (*restore)(struct vm_device *dev, struct *iostream);
 };
 
 
 
 struct vm_device {
-  char name[32];
+    char name[32];
   
-  void *private_data;
-
-  struct vm_device_ops * ops;
+    void *private_data;
 
-  struct guest_info * vm;
+    struct vm_device_ops * ops;
 
-  struct list_head dev_link;
+    struct guest_info * vm;
 
+    struct list_head dev_link;
 
-  uint_t num_io_hooks;
-  struct list_head io_hooks;
-  uint_t num_mem_hooks;
-  struct list_head mem_hooks;
-  uint_t num_irq_hooks;
-  struct list_head irq_hooks;
 
+    uint_t num_io_hooks;
+    struct list_head io_hooks;
 };
 
 
 
-struct vm_device * allocate_device();
-struct vm_device * create_device(char * name, struct vm_device_ops * ops, void * private_data);
-void free_device(struct vm_device * dev);
+
+struct vm_device * v3_create_device(char * name, struct vm_device_ops * ops, void * private_data);
+void v3_free_device(struct vm_device * dev);
+
 
 
+int v3_dev_hook_io(struct vm_device   *dev,
+		   ushort_t            port,
+		   int (*read)(ushort_t port, void * dst, uint_t length, struct vm_device * dev),
+		   int (*write)(ushort_t port, void * src, uint_t length, struct vm_device * dev));
 
-int dev_hook_io(struct vm_device   *dev,
-		ushort_t            port,
-		int (*read)(ushort_t port, void * dst, uint_t length, struct vm_device * dev),
-		int (*write)(ushort_t port, void * src, uint_t length, struct vm_device * dev));
+int v3_dev_unhook_io(struct vm_device   *dev,
+		     ushort_t            port);
 
-int dev_unhook_io(struct vm_device   *dev,
-		  ushort_t            port);
 
-int dev_hook_mem(struct vm_device   *dev,
-		 void               *start,
-		 void               *end);
 
-int dev_unhook_mem(struct vm_device   * dev,
-		   void               * start,
-		   void               * end);
 
 
-int dev_hook_irq(struct vm_device * dev,
-		 uint_t irq, 
-		 int (*handler)(uint_t irq, struct vm_device * dev));
-int dev_unhook_irq(struct vm_device * dev, uint_t irq);
 
+#endif // ! __V3VEE__
 
 #endif