diff options
Diffstat (limited to 'jacinto6/sgx_src/eurasia_km/include4/img_types.h')
-rw-r--r-- | jacinto6/sgx_src/eurasia_km/include4/img_types.h | 54 |
1 files changed, 35 insertions, 19 deletions
diff --git a/jacinto6/sgx_src/eurasia_km/include4/img_types.h b/jacinto6/sgx_src/eurasia_km/include4/img_types.h index 7f5137e..3e04e4a 100644 --- a/jacinto6/sgx_src/eurasia_km/include4/img_types.h +++ b/jacinto6/sgx_src/eurasia_km/include4/img_types.h | |||
@@ -75,17 +75,16 @@ typedef signed long IMG_INT32, *IMG_PINT32; | |||
75 | #endif | 75 | #endif |
76 | 76 | ||
77 | #if defined(USE_CODE) | 77 | #if defined(USE_CODE) |
78 | 78 | typedef unsigned __int64 IMG_UINT64, *IMG_PUINT64; | |
79 | typedef unsigned __int64 IMG_UINT64, *IMG_PUINT64; | 79 | typedef __int64 IMG_INT64, *IMG_PINT64; |
80 | typedef __int64 IMG_INT64, *IMG_PINT64; | 80 | #elif defined(LINUX) && defined (__x86_64) |
81 | 81 | typedef unsigned long IMG_UINT64, *IMG_PUINT64; | |
82 | typedef long IMG_INT64, *IMG_PINT64; | ||
83 | #elif defined(LINUX) || defined(__METAG) || defined (__QNXNTO__) | ||
84 | typedef unsigned long long IMG_UINT64, *IMG_PUINT64; | ||
85 | typedef long long IMG_INT64, *IMG_PINT64; | ||
82 | #else | 86 | #else |
83 | #if defined(LINUX) || defined(__METAG) || defined (__QNXNTO__) | 87 | #error("define an OS") |
84 | typedef unsigned long long IMG_UINT64, *IMG_PUINT64; | ||
85 | typedef long long IMG_INT64, *IMG_PINT64; | ||
86 | #else | ||
87 | #error("define an OS") | ||
88 | #endif | ||
89 | #endif | 88 | #endif |
90 | 89 | ||
91 | #if !(defined(LINUX) && defined (__KERNEL__)) | 90 | #if !(defined(LINUX) && defined (__KERNEL__)) |
@@ -107,11 +106,19 @@ typedef IMG_INT32 IMG_RESULT; | |||
107 | 106 | ||
108 | #if defined(_WIN64) | 107 | #if defined(_WIN64) |
109 | typedef unsigned __int64 IMG_UINTPTR_T; | 108 | typedef unsigned __int64 IMG_UINTPTR_T; |
109 | typedef signed __int64 IMG_INTPTR_T; | ||
110 | typedef signed __int64 IMG_PTRDIFF_T; | 110 | typedef signed __int64 IMG_PTRDIFF_T; |
111 | typedef IMG_UINT64 IMG_SIZE_T; | 111 | typedef IMG_UINT64 IMG_SIZE_T; |
112 | #else | 112 | #else |
113 | typedef unsigned int IMG_UINTPTR_T; | 113 | #if defined (__x86_64__) |
114 | typedef IMG_UINT32 IMG_SIZE_T; | 114 | typedef IMG_UINT64 IMG_SIZE_T; |
115 | typedef unsigned long IMG_UINTPTR_T; | ||
116 | typedef signed long IMG_INTPTR_T; | ||
117 | #else | ||
118 | typedef IMG_UINT32 IMG_SIZE_T; | ||
119 | typedef unsigned long IMG_UINTPTR_T; | ||
120 | typedef signed long IMG_INTPTR_T; | ||
121 | #endif | ||
115 | #endif | 122 | #endif |
116 | 123 | ||
117 | typedef IMG_PVOID IMG_HANDLE; | 124 | typedef IMG_PVOID IMG_HANDLE; |
@@ -121,9 +128,9 @@ typedef void** IMG_HVOID, * IMG_PHVOID; | |||
121 | #define IMG_NULL 0 | 128 | #define IMG_NULL 0 |
122 | 129 | ||
123 | /* services/stream ID */ | 130 | /* services/stream ID */ |
124 | typedef IMG_UINT32 IMG_SID; | 131 | typedef IMG_UINTPTR_T IMG_SID; |
125 | 132 | ||
126 | typedef IMG_UINT32 IMG_EVENTSID; | 133 | typedef IMG_UINTPTR_T IMG_EVENTSID; |
127 | 134 | ||
128 | /* | 135 | /* |
129 | * Address types. | 136 | * Address types. |
@@ -184,7 +191,12 @@ typedef IMG_UINT32 IMG_DEVMEM_SIZE_T; | |||
184 | typedef struct _IMG_CPU_PHYADDR | 191 | typedef struct _IMG_CPU_PHYADDR |
185 | { | 192 | { |
186 | /* variable sized type (32,64) */ | 193 | /* variable sized type (32,64) */ |
187 | IMG_UINTPTR_T uiAddr; | 194 | #if IMG_ADDRSPACE_PHYSADDR_BITS == 32 |
195 | /* variable sized type (32,64) */ | ||
196 | IMG_UINT32 uiAddr; | ||
197 | #else | ||
198 | IMG_UINT64 uiAddr; | ||
199 | #endif | ||
188 | } IMG_CPU_PHYADDR; | 200 | } IMG_CPU_PHYADDR; |
189 | 201 | ||
190 | /* device physical address */ | 202 | /* device physical address */ |
@@ -192,10 +204,9 @@ typedef struct _IMG_DEV_PHYADDR | |||
192 | { | 204 | { |
193 | #if IMG_ADDRSPACE_PHYSADDR_BITS == 32 | 205 | #if IMG_ADDRSPACE_PHYSADDR_BITS == 32 |
194 | /* variable sized type (32,64) */ | 206 | /* variable sized type (32,64) */ |
195 | IMG_UINTPTR_T uiAddr; | ||
196 | #else | ||
197 | IMG_UINT32 uiAddr; | 207 | IMG_UINT32 uiAddr; |
198 | IMG_UINT32 uiHighAddr; | 208 | #else |
209 | IMG_UINT64 uiAddr; | ||
199 | #endif | 210 | #endif |
200 | } IMG_DEV_PHYADDR; | 211 | } IMG_DEV_PHYADDR; |
201 | 212 | ||
@@ -203,7 +214,12 @@ typedef struct _IMG_DEV_PHYADDR | |||
203 | typedef struct _IMG_SYS_PHYADDR | 214 | typedef struct _IMG_SYS_PHYADDR |
204 | { | 215 | { |
205 | /* variable sized type (32,64) */ | 216 | /* variable sized type (32,64) */ |
206 | IMG_UINTPTR_T uiAddr; | 217 | #if IMG_ADDRSPACE_PHYSADDR_BITS == 32 |
218 | /* variable sized type (32,64) */ | ||
219 | IMG_UINT32 uiAddr; | ||
220 | #else | ||
221 | IMG_UINT64 uiAddr; | ||
222 | #endif | ||
207 | } IMG_SYS_PHYADDR; | 223 | } IMG_SYS_PHYADDR; |
208 | 224 | ||
209 | #include "img_defs.h" | 225 | #include "img_defs.h" |