Replaced generic gct* types by their definition

gctBOOL, gctPOINTER and gctUINT64 were replaced.
I left in gctHANDLE and gctPHYS_ADDR for now.

9 files changed, 12 insertions, 12 deletions

diff --git a/native/etnaviv/etna.c b/native/etnaviv/etna.c
index 6c68fc0..0fb5382 100644
--- a/native/etnaviv/etna.c
+++ b/native/etnaviv/etna.c
@@ -257,7 +257,7 @@ static int gpu_context_finish_up(struct etna_ctx *ctx)
     logical[ptr++] = VIV_FE_NOP_HEADER_OP_NOP;
     logical[ptr++] = VIV_FE_NOP_HEADER_OP_NOP;
     /* Append inUse (4 bytes) */
-    GCCTX(ctx)->inUse = (gctBOOL*)&logical[ptr];
+    GCCTX(ctx)->inUse = (int*)&logical[ptr];
     logical[ptr++] = 0;
     /* Update buffer size to final value */
     GCCTX(ctx)->bufferSize = ptr*4;
diff --git a/native/etnaviv/viv_internal.h b/native/etnaviv/viv_internal.h
index 48fde1d..e7633bb 100644
--- a/native/etnaviv/viv_internal.h
+++ b/native/etnaviv/viv_internal.h
@@ -78,7 +78,7 @@ static inline gceKERNEL_WHERE convert_where(enum viv_where where)
 #ifdef GCABI_UINT64_POINTERS
 /* imx6 BSP 4.x Vivante driver casts all pointers to 64 bit integers
  * provide macros to cast back and forth. */
-#define PTR_TO_VIV(x) ((gctUINT64)((size_t)(x)))
+#define PTR_TO_VIV(x) ((uint64_t)((size_t)(x)))
 #define VIV_TO_PTR(x) ((void*)((size_t)(x)))
 #define HANDLE_TO_VIV(x) (x)
 #define VIV_TO_HANDLE(x) (x)
@@ -86,7 +86,7 @@ static inline gceKERNEL_WHERE convert_where(enum viv_where where)
 #define PTR_TO_VIV(x) (x)
 #define VIV_TO_PTR(x) (x)
 #define HANDLE_TO_VIV(x) ((void*)((size_t)(x)))
-#define VIV_TO_HANDLE(x) ((gctUINT64)(size_t)(x))
+#define VIV_TO_HANDLE(x) ((uint64_t)(size_t)(x))
 #endif
 
 #endif
diff --git a/native/fb_old/fbtest.c b/native/fb_old/fbtest.c
index 4061324..0c3b27f 100644
--- a/native/fb_old/fbtest.c
+++ b/native/fb_old/fbtest.c
@@ -419,7 +419,7 @@ int main(int argc, char **argv)
     contextBuffer.physical = (void*)cbuf0_physical;
     contextBuffer.logical = cbuf0_logical;
     contextBuffer.link = ((uint32_t*)cbuf0_logical) + contextBuffer.linkIndex;
-    contextBuffer.inUse = (gctBOOL*)(((uint32_t*)cbuf0_logical) + contextBuffer.inUseIndex);
+    contextBuffer.inUse = (int*)(((uint32_t*)cbuf0_logical) + contextBuffer.inUseIndex);
     *contextBuffer.inUse = 0;
 
     /* Submit second command buffer, with updated context.
diff --git a/native/replay/cube.c b/native/replay/cube.c
index 84e7515..ded475d 100644
--- a/native/replay/cube.c
+++ b/native/replay/cube.c
@@ -392,7 +392,7 @@ int main(int argc, char **argv)
     contextBuffer.physical = (void*)cbuf0_physical;
     contextBuffer.logical = cbuf0_logical;
     contextBuffer.link = ((uint32_t*)cbuf0_logical) + contextBuffer.linkIndex;
-    contextBuffer.inUse = (gctBOOL*)(((uint32_t*)cbuf0_logical) + contextBuffer.inUseIndex);
+    contextBuffer.inUse = (int*)(((uint32_t*)cbuf0_logical) + contextBuffer.inUseIndex);
 
     /* Submit second command buffer, with updated context.
      * Second command buffer fills the background.
diff --git a/native/replay/cube_companion.c b/native/replay/cube_companion.c
index 91c899c..4ad866a 100644
--- a/native/replay/cube_companion.c
+++ b/native/replay/cube_companion.c
@@ -246,7 +246,7 @@ int main(int argc, char **argv)
     contextBuffer.physical = (void*)cbuf0_physical;
     contextBuffer.logical = cbuf0_logical;
     contextBuffer.link = ((uint32_t*)cbuf0_logical) + contextBuffer.linkIndex;
-    contextBuffer.inUse = (gctBOOL*)(((uint32_t*)cbuf0_logical) + contextBuffer.inUseIndex);
+    contextBuffer.inUse = (int*)(((uint32_t*)cbuf0_logical) + contextBuffer.inUseIndex);
 
     /* Create signal */
     int sig_id = 0;
diff --git a/native/replay/cube_etna.c b/native/replay/cube_etna.c
index 65a8af0..fbf1df4 100644
--- a/native/replay/cube_etna.c
+++ b/native/replay/cube_etna.c
@@ -987,7 +987,7 @@ int main(int argc, char **argv)
     contextBuffer.physical = (void*)cbuf0_physical;
     contextBuffer.logical = cbuf0_logical;
     contextBuffer.link = ((uint32_t*)cbuf0_logical) + contextBuffer.linkIndex;
-    contextBuffer.inUse = (gctBOOL*)(((uint32_t*)cbuf0_logical) + contextBuffer.inUseIndex);
+    contextBuffer.inUse = (int*)(((uint32_t*)cbuf0_logical) + contextBuffer.inUseIndex);
 
     /* Build second command buffer */
     commandBuffer.startOffset = commandBuffer.offset + 0x18;
diff --git a/native/replay/ps_sandbox_etna.c b/native/replay/ps_sandbox_etna.c
index 1a2eebb..aa551d0 100644
--- a/native/replay/ps_sandbox_etna.c
+++ b/native/replay/ps_sandbox_etna.c
@@ -763,7 +763,7 @@ int main(int argc, char **argv)
     contextBuffer.physical = (void*)cbuf0_physical;
     contextBuffer.logical = cbuf0_logical;
     contextBuffer.link = ((uint32_t*)cbuf0_logical) + contextBuffer.linkIndex;
-    contextBuffer.inUse = (gctBOOL*)(((uint32_t*)cbuf0_logical) + contextBuffer.inUseIndex);
+    contextBuffer.inUse = (int*)(((uint32_t*)cbuf0_logical) + contextBuffer.inUseIndex);
     *contextBuffer.inUse = 0;
 
     /* Build second command buffer */
diff --git a/native/replay/viv_raw.c b/native/replay/viv_raw.c
index 7e00ada..9b72e0f 100644
--- a/native/replay/viv_raw.c
+++ b/native/replay/viv_raw.c
@@ -433,7 +433,7 @@ int viv_free_vidmem(struct viv_conn *conn, gcuVIDMEM_NODE_PTR node)
     return viv_invoke(conn, &id);
 }
 
-int viv_map_user_memory(struct viv_conn *conn, void *memory, size_t size, gctPOINTER *info, viv_addr_t *address)
+int viv_map_user_memory(struct viv_conn *conn, void *memory, size_t size, void **info, viv_addr_t *address)
 {
     gcsHAL_INTERFACE id = {
         .command = gcvHAL_MAP_USER_MEMORY,
@@ -450,7 +450,7 @@ int viv_map_user_memory(struct viv_conn *conn, void *memory, size_t size, gctPOI
     return status;
 }
 
-int viv_unmap_user_memory(struct viv_conn *conn, void *memory, size_t size, gctPOINTER info, viv_addr_t address)
+int viv_unmap_user_memory(struct viv_conn *conn, void *memory, size_t size, void *info, viv_addr_t address)
 {
     gcsHAL_INTERFACE id = {
         .command = gcvHAL_UNMAP_USER_MEMORY,
diff --git a/native/replay/viv_raw.h b/native/replay/viv_raw.h
index e967981..b7b682e 100644
--- a/native/replay/viv_raw.h
+++ b/native/replay/viv_raw.h
@@ -138,11 +138,11 @@ int viv_free_vidmem(struct viv_conn *conn, gcuVIDMEM_NODE_PTR node);
 
 /**  Map user memory to GPU memory.
  */
-int viv_map_user_memory(struct viv_conn *conn, void *memory, size_t size, gctPOINTER *info, viv_addr_t *address);
+int viv_map_user_memory(struct viv_conn *conn, void *memory, size_t size, void **info, viv_addr_t *address);
 
 /**  Unmap user memory from GPU memory.
  */
-int viv_unmap_user_memory(struct viv_conn *conn, void *memory, size_t size, gctPOINTER info, viv_addr_t address);
+int viv_unmap_user_memory(struct viv_conn *conn, void *memory, size_t size, void *info, viv_addr_t address);
 
 /** Commit event queue.
  */