From c1bd1140c4502c59a28c28f4ca9fadfa43e3ff3d Mon Sep 17 00:00:00 2001 From: marcansoft Date: Sun, 21 Feb 2010 00:13:08 +0000 Subject: [PATCH] Some random cleanup --- armsrc/stdint.h | 13 ------------- armsrc/string.h | 2 +- bootrom/stdint.h | 13 ------------- common/usb.c | 2 +- 4 files changed, 2 insertions(+), 28 deletions(-) diff --git a/armsrc/stdint.h b/armsrc/stdint.h index 86f5db8c..78a0b051 100644 --- a/armsrc/stdint.h +++ b/armsrc/stdint.h @@ -21,20 +21,7 @@ typedef unsigned short int uint16_t; typedef unsigned int uint32_t; typedef unsigned long long int uint64_t; -typedef int int_fast16_t; -typedef int int_fast32_t; - -typedef unsigned int uint_fast16_t; -typedef unsigned int uint_fast32_t; - typedef int intptr_t; typedef unsigned int uintptr_t; -#define __INT64_C(c) c ## LL -#define __UINT64_C(c) c ## ULL - -#define __PRI64_RANK "ll" -#define __PRIFAST_RANK "" -#define __PRIPTR_RANK "" - #endif /* __STDINT_H */ diff --git a/armsrc/string.h b/armsrc/string.h index 6c380e5b..25fac909 100644 --- a/armsrc/string.h +++ b/armsrc/string.h @@ -18,4 +18,4 @@ void *memset(void *dest, int c, int len); int memcmp(const void *av, const void *bv, int len); char *strncat(char *dest, const char *src, unsigned int n); -#endif /* __STRING_H */ \ No newline at end of file +#endif /* __STRING_H */ diff --git a/bootrom/stdint.h b/bootrom/stdint.h index 86f5db8c..78a0b051 100644 --- a/bootrom/stdint.h +++ b/bootrom/stdint.h @@ -21,20 +21,7 @@ typedef unsigned short int uint16_t; typedef unsigned int uint32_t; typedef unsigned long long int uint64_t; -typedef int int_fast16_t; -typedef int int_fast32_t; - -typedef unsigned int uint_fast16_t; -typedef unsigned int uint_fast32_t; - typedef int intptr_t; typedef unsigned int uintptr_t; -#define __INT64_C(c) c ## LL -#define __UINT64_C(c) c ## ULL - -#define __PRI64_RANK "ll" -#define __PRIFAST_RANK "" -#define __PRIPTR_RANK "" - #endif /* __STDINT_H */ diff --git a/common/usb.c b/common/usb.c index 1c296115..3de7d369 100644 --- a/common/usb.c +++ b/common/usb.c @@ -8,7 +8,7 @@ // The common USB driver used for both the bootloader and the application. //----------------------------------------------------------------------------- -#include +#include "proxmark3.h" #define min(a, b) (((a) > (b)) ? (b) : (a)) -- 2.39.2