From 9db040fbaa3b0182b97916a8ffeb8f0ba0b05065 Mon Sep 17 00:00:00 2001
From: Axel Heider <axelheider@gmx.de>
Date: Mon, 15 Nov 2021 04:09:59 +0100
Subject: [PATCH] unify libsel4 type definitions

Signed-off-by: Axel Heider <axelheider@gmx.de>
---
 include/arch/arm/arch/types.h   | 10 ----------
 include/arch/riscv/arch/types.h |  9 ---------
 include/arch/x86/arch/types.h   | 10 ----------
 include/basic_types.h           | 10 ++++++++++
 4 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/include/arch/arm/arch/types.h b/include/arch/arm/arch/types.h
index 8f62c7d5b..8131c22d8 100644
--- a/include/arch/arm/arch/types.h
+++ b/include/arch/arm/arch/types.h
@@ -30,16 +30,6 @@ enum hwASIDConstants {
     hwASIDBits = 8
 };
 
-/* for libsel4 headers that the kernel shares */
-typedef word_t seL4_Word;
-typedef cptr_t seL4_CPtr;
-typedef uint32_t seL4_Uint32;
-typedef uint16_t seL4_Uint16;
-typedef uint8_t seL4_Uint8;
-typedef node_id_t seL4_NodeId;
-typedef dom_t seL4_Domain;
-typedef paddr_t seL4_PAddr;
-
 typedef struct kernel_frame {
     paddr_t paddr;
     pptr_t pptr;
diff --git a/include/arch/riscv/arch/types.h b/include/arch/riscv/arch/types.h
index ddf9d3366..946aca5c9 100644
--- a/include/arch/riscv/arch/types.h
+++ b/include/arch/riscv/arch/types.h
@@ -26,15 +26,6 @@ typedef word_t cpu_id_t;
 typedef word_t node_id_t;
 typedef word_t dom_t;
 
-/* for libsel4 headers that the kernel shares */
-typedef word_t seL4_Word;
-typedef cptr_t seL4_CPtr;
-typedef uint32_t seL4_Uint32;
-typedef uint8_t seL4_Uint8;
-typedef node_id_t seL4_NodeId;
-typedef paddr_t seL4_PAddr;
-typedef dom_t seL4_Domain;
-
 typedef uint64_t timestamp_t;
 
 #define wordBits BIT(wordRadix)
diff --git a/include/arch/x86/arch/types.h b/include/arch/x86/arch/types.h
index d62ae174a..8532edce2 100644
--- a/include/arch/x86/arch/types.h
+++ b/include/arch/x86/arch/types.h
@@ -25,14 +25,4 @@ typedef uint32_t logical_id_t;
 typedef word_t node_id_t;
 typedef word_t dom_t;
 
-/* for libsel4 headers that the kernel shares */
-typedef word_t seL4_Word;
-typedef cptr_t seL4_CPtr;
-typedef uint16_t seL4_Uint16;
-typedef uint32_t seL4_Uint32;
-typedef uint8_t seL4_Uint8;
-typedef node_id_t seL4_NodeId;
-typedef paddr_t seL4_PAddr;
-typedef dom_t seL4_Domain;
-
 typedef uint64_t timestamp_t;
diff --git a/include/basic_types.h b/include/basic_types.h
index 77757e823..a514860b0 100644
--- a/include/basic_types.h
+++ b/include/basic_types.h
@@ -67,3 +67,13 @@ typedef struct v_region {
 /* equivalent to a word_t except that we tell the compiler that we may alias with
  * any other type (similar to a char pointer) */
 typedef word_t __attribute__((__may_alias__)) word_t_may_alias;
+
+/* for libsel4 headers that the kernel shares */
+typedef uint8_t seL4_Uint8;
+typedef uint16_t seL4_Uint16;
+typedef uint32_t seL4_Uint32;
+typedef word_t seL4_Word;
+typedef cptr_t seL4_CPtr;
+typedef node_id_t seL4_NodeId;
+typedef paddr_t seL4_PAddr;
+typedef dom_t seL4_Domain;