Some random cleanup

diff --git a/armsrc/stdint.h b/armsrc/stdint.h
index 86f5db8cbf4fad58e7c0ca624277c0fcfa347cf4..78a0b051281f867277c9cf216f7bcd7bb274f06c 100644 (file)
--- 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 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;
 
 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 */
 #endif /* __STDINT_H */

diff --git a/armsrc/string.h b/armsrc/string.h
index 6c380e5b51fe33e953715efca299ac971bf685fa..25fac90926770865bf3393246c99901cef8de963 100644 (file)
--- 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);
 
 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 86f5db8cbf4fad58e7c0ca624277c0fcfa347cf4..78a0b051281f867277c9cf216f7bcd7bb274f06c 100644 (file)
--- 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 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;
 
 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 */
 #endif /* __STDINT_H */

diff --git a/common/usb.c b/common/usb.c
index 1c29611557222cf60c9ac7c2e54241aec2639a89..3de7d369f28087cfb3c026e40d405d9097e25af1 100644 (file)
--- a/common/usb.c
+++ b/common/usb.c
@@ -8,7 +8,7 @@
 // The common USB driver used for both the bootloader and the application.
 //-----------------------------------------------------------------------------
 
 // The common USB driver used for both the bootloader and the application.
 //-----------------------------------------------------------------------------
 

-#include <proxmark3.h>
+#include "proxmark3.h"

 
 #define min(a, b) (((a) > (b)) ? (b) : (a))
 
 
 #define min(a, b) (((a) > (b)) ? (b) : (a))