X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_types.h;h=8f898dc2db8828ffc5fa14857bbb8a6c282bacdd;hp=c9e47443d77f788a04895e09a1dd2c92e736dfd0;hb=5a354421360c38d0f4d90f03c25296b2b35eec0e;hpb=f9bb3db89469169bb5775dc031d89e570c6fed70

diff --git a/palacios/include/palacios/vmm_types.h b/palacios/include/palacios/vmm_types.h
index c9e4744..8f898dc 100644
--- a/palacios/include/palacios/vmm_types.h
+++ b/palacios/include/palacios/vmm_types.h
@@ -1,12 +1,42 @@
-/* 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 __VMM_TYPES_H
 #define __VMM_TYPES_H
 
-#include <geekos/ktypes.h>
+#ifdef __V3VEE__
+/* #include <palacios/vmm_stddef.h> */
+
+
+
+
+typedef enum {SHADOW_PAGING, NESTED_PAGING} v3_paging_mode_t;
+typedef enum {VM_RUNNING, VM_STOPPED, VM_SUSPENDED, VM_ERROR, VM_EMULATING} v3_vm_operating_mode_t;
+
+
+typedef enum {REAL, /*UNREAL,*/ PROTECTED, PROTECTED_PAE, LONG, LONG_32_COMPAT, LONG_16_COMPAT} v3_cpu_mode_t;
+typedef enum {PHYSICAL_MEM, VIRTUAL_MEM} v3_mem_mode_t;
+
+
+#define NULL ((void *)0)
+
 
-/*
 typedef signed char schar_t;
 typedef unsigned char uchar_t;
 
@@ -23,9 +53,11 @@ typedef signed long slong_t;
 typedef unsigned long ulong_t;
 
 typedef unsigned long size_t;
+typedef long ssize_t;       
 
-*/
-
+#define false 0
+#define true 1
+typedef uchar_t bool;
 
 
 
@@ -35,6 +67,15 @@ typedef long long sint64_t;
 typedef unsigned int uint32_t;
 typedef int sint32_t;
 
+
+typedef unsigned short uint16_t;
+typedef short sint16_t;
+
+typedef unsigned char uint8_t;
+typedef char sint8_t;
+
 typedef ulong_t addr_t;
+typedef ullong_t v3_reg_t;
+#endif /* ! __V3VEE__ */
 
 #endif