Use stdint.h/stddef.h

Use clang's stdint.h and stddef.h instead of our own types.
tillitis · Sep 13, 2023 · 9ff4102 · 9ff4102
1 parent 299a77a
commit 9ff4102
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 31 deletions.
diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ libcrt0.a: libcrt0/crt0.o
 LIBOBJS=libcommon/assert.o libcommon/blake2s.o libcommon/led.o libcommon/lib.o libcommon/proto.o libcommon/qemu_debug.o
 libcommon.a: $(LIBOBJS)
 	llvm-ar -qc $@ $(LIBOBJS)
-$(LIBOBJS): include/blake2s.h include/types.h include/tk1_mem.h include/lib.h include/proto.h include/led.h include/assert.h include/qemu_debug.h
+$(LIBOBJS): include/blake2s.h include/tk1_mem.h include/lib.h include/proto.h include/led.h include/assert.h include/qemu_debug.h
 
 # Monocypher
 MONOOBJS=monocypher/monocypher.o monocypher/monocypher-ed25519.o

diff --git a/example-app/blue.c b/example-app/blue.c
@@ -1,7 +1,7 @@
 // Copyright (C) Tillitis AB
 // SPDX-License-Identifier: GPL-2.0-only
 
-#include <types.h>
+#include <stdint.h>
 #include <tk1_mem.h>
 #include <qemu_debug.h>
 

diff --git a/include/blake2s.h b/include/blake2s.h
@@ -4,7 +4,8 @@
 #ifndef BLAKE2S_H
 #define BLAKE2S_H
 
-#include <types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 // blake2s state context
 typedef struct {

diff --git a/include/led.h b/include/led.h
@@ -6,8 +6,8 @@
 #ifndef LED_H
 #define LED_H
 
+#include <stdint.h>
 #include <tk1_mem.h>
-#include <types.h>
 
 // clang-format off
 #define LED_BLACK 0

diff --git a/include/lib.h b/include/lib.h
@@ -4,7 +4,8 @@
 #ifndef LIB_H
 #define LIB_H
 
-#include <types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 void *memset(void *dest, int c, unsigned n);
 void *memcpy(void *dest, const void *src, unsigned n);

diff --git a/include/proto.h b/include/proto.h
@@ -1,7 +1,8 @@
 // Copyright (C) 2022, 2023 - Tillitis AB
 // SPDX-License-Identifier: GPL-2.0-only
 
-#include <types.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #ifndef PROTO_H
 #define PROTO_H

diff --git a/include/qemu_debug.h b/include/qemu_debug.h
@@ -4,7 +4,7 @@
 #ifndef QEMU_DEBUG_H
 #define QEMU_DEBUG_H
 
-#include <types.h>
+#include <stdint.h>
 
 #ifndef QEMU_DEBUG
 #define qemu_putchar(ch)

diff --git a/include/types.h b/include/types.h
diff --git a/libcommon/blake2s.c b/libcommon/blake2s.c
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
 #include <blake2s.h>
+#include <stdint.h>
 #include <tk1_mem.h>
-#include <types.h>
 
 typedef int (*fw_blake2s_p)(void *out, unsigned long outlen, const void *key,
 			    unsigned long keylen, const void *in,

diff --git a/libcommon/lib.c b/libcommon/lib.c
@@ -3,8 +3,8 @@
 
 #include <assert.h>
 #include <lib.h>
+#include <stdint.h>
 #include <tk1_mem.h>
-#include <types.h>
 
 void *memset(void *dest, int c, unsigned n)
 {

diff --git a/libcommon/qemu_debug.c b/libcommon/qemu_debug.c
@@ -3,8 +3,8 @@
 
 #include <lib.h>
 #include <qemu_debug.h>
+#include <stdint.h>
 #include <tk1_mem.h>
-#include <types.h>
 
 // clang-format off
 static volatile uint8_t* const debugtx = (volatile uint8_t *)TK1_MMIO_QEMU_DEBUG;

diff --git a/monocypher/monocypher.h b/monocypher/monocypher.h
@@ -54,7 +54,8 @@
 #ifndef MONOCYPHER_H
 #define MONOCYPHER_H
 
-#include <types.h>
+#include <stdint.h>
+#include <stddef.h>
 
 #ifdef MONOCYPHER_CPP_NAMESPACE
 namespace MONOCYPHER_CPP_NAMESPACE {