/* (c) 2008, Peter Dinda <pdinda@northwestern.edu> */
+ /* (c) 2008, Jack Lange <jarusl@northwestern.edu> */
/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
- #ifndef __GENERIC_H
- #define __GENERIC_H
+ #ifndef __GENERIC_H__
+ #define __GENERIC_H__
+
+
#include <palacios/vm_dev.h>
//
int Start_Timer_MSecs(int msecs, timerCallback cb, void * arg);
int Start_Timer(int ticks, timerCallback, void * arg);
++
double Get_Remaining_Timer_Secs(int id);
int Get_Remaining_Timer_MSecs(int id);
int Get_Remaining_Timer_Ticks(int id);
/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
-#ifndef __VMCS_H
-#define __VMCS_H
++
+#ifndef __VMCS_H__
+#define __VMCS_H__
+
+#ifdef __V3VEE__
+
+
#include <palacios/vmm_types.h>
/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
-
-
+#ifndef __VMCS_GEN__
+#define __VMCS_GEN__
+
+#ifdef __V3VEE__
+
-#ifndef vmcs_gen
-#define vmcs_gen
#include <palacios/vmcs.h>
#include <palacios/vmm.h>
typedef ulong_t addr_t;
+#endif // ! __V3VEE__
+
#endif
+
+ #endif
/* (c) 2008, Peter Dinda <pdinda@northwestern.edu> */
/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+
++
++
#include <devices/generic.h>
#include <palacios/vmm.h>
#include <palacios/vmm_types.h>
switch (length) {
case 1:
++<<<<<<< HEAD:palacios/src/devices/generic.c
++=======
+
++>>>>>>> ramdisk:palacios/src/devices/generic.c
v3_outb(port,((uchar_t*)src)[0]);
break;
case 2:
break;
case 4:
v3_outdw(port,((uint_t*)src)[0]);
++<<<<<<< HEAD:palacios/src/devices/generic.c
++=======
+
++>>>>>>> ramdisk:palacios/src/devices/generic.c
break;
default:
for (i = 0; i < length; i++) {