X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_types.h;h=ef9e498699565cdd54d9a8d9631630be72286fa2;hb=564e23ffc7505181975a4f82a5e8b0c88e535945;hp=f885bf217d7adf80e7f286113c72367d56f90004;hpb=a109eb919a162bd7de58d62020801bc2e633be50;p=palacios.git

diff --git a/palacios/include/palacios/vmm_types.h b/palacios/include/palacios/vmm_types.h
index f885bf2..ef9e498 100644
--- a/palacios/include/palacios/vmm_types.h
+++ b/palacios/include/palacios/vmm_types.h
@@ -1,25 +1,68 @@
+/*
+ * 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 signed char s8;
+typedef signed char schar_t;
 typedef unsigned char uchar_t;
 
-typedef signed short s16;
+typedef signed short sshort_t;
 typedef unsigned short ushort_t;
 
-typedef signed int s32;
+typedef signed int sint_t;
 typedef unsigned int uint_t;
 
-typedef signed long long s64;
+typedef signed long long sllong_t;
 typedef unsigned long long ullong_t;
 
+typedef signed long slong_t;
 typedef unsigned long ulong_t;
 
-typedef unsigned long size_t;
+//typedef unsigned long size_t;
+       
+
+#define false 0
+#define true 1
+typedef uchar_t bool;
+
+
+
+typedef unsigned long long uint64_t;
+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