Remove local armsrc/stdint.h and fix some other #includes

armsrc/BigBuf.c

@@ -13,6 +13,7 @@
 #include "proxmark3.h"
 #include "apps.h"
 #include "string.h"
+#include "util.h"
 
 // BigBuf is the large multi-purpose buffer, typically used to hold A/D samples or traces.
 // Also used to hold various smaller buffers and the Mifare Emulator Memory.

armsrc/Makefile

@@ -33,9 +33,6 @@ APP_CFLAGS += $(ZLIB_CFLAGS)
 # zlib includes:
 APP_CFLAGS += -I../zlib
 
-# stdint.h provided locally until GCC 4.5 becomes C99 compliant
-APP_CFLAGS += -I.
-
 # Compile these in thumb mode (small size)
 THUMBSRC = start.c \
 	$(SRC_LCD) \

armsrc/appmain.c

@@ -10,20 +10,18 @@
 // executes.
 //-----------------------------------------------------------------------------
 
+#include <stdarg.h>
+
 #include "usb_cdc.h"
 #include "cmd.h"
-
 #include "proxmark3.h"
 #include "apps.h"
 #include "util.h"
 #include "printf.h"
 #include "string.h"
-
-#include <stdarg.h>
-
 #include "legicrf.h"
-#include <hitag2.h>
-#include <hitagS.h>
+#include "hitag2.h"
+#include "hitagS.h"
 #include "lfsampling.h"
 #include "BigBuf.h"
 #include "mifareutil.h"

armsrc/apps.h

@@ -15,6 +15,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include "common.h"
+#include "usb_cmd.h"
 #include "hitag2.h"
 #include "hitagS.h"
 #include "mifare.h"

armsrc/des.c

@@ -26,7 +26,7 @@
  * 
  */
 #include <stdint.h>
-#include <string.h>
+#include "string.h"
 
 const uint8_t sbox[256]  = {
   /* S-box 1 */

armsrc/epa.c

@@ -11,10 +11,14 @@
 // functions, You need to do the setup before calling them!
 //-----------------------------------------------------------------------------
 
+#include "apps.h"
 #include "iso14443a.h"
 #include "iso14443b.h"
 #include "epa.h"
 #include "cmd.h"
+#include "fpgaloader.h"
+#include "string.h"
+#include "util.h"
 
 // Protocol and Parameter Selection Request for ISO 14443 type A cards
 // use regular (1x) speed in both directions

armsrc/optimized_cipher.c

@@ -61,8 +61,7 @@
 **/
 
 #include "optimized_cipher.h"
-#include <stdlib.h>
-#include <string.h>
+#include <stddef.h>
 #include <stdbool.h>
 #include <stdint.h>
 

armsrc/pcf7931.c

@@ -2,6 +2,7 @@
 #include "apps.h"
 #include "lfsampling.h"
 #include "pcf7931.h"
+#include "util.h"
 #include "string.h"
 
 #define T0_PCF 8 //period for the pcf7931 in us

armsrc/printf.c

@@ -40,9 +40,6 @@
 #include "util.h"
 #include "string.h"
 
-typedef uint32_t uintmax_t;
-typedef int32_t intmax_t;
-
 typedef unsigned char u_char;
 typedef unsigned int u_int;
 typedef unsigned long u_long;

armsrc/string.h

@@ -13,7 +13,7 @@
 #define __STRING_H
 
 #include <stdint.h>
-#include <util.h>
+#include "util.h"
 
 int strlen(const char *str);
 RAMFUNC void *memcpy(void *dest, const void *src, int len);

include/hitag2.h

@@ -13,6 +13,12 @@
 #ifndef _HITAG2_H_
 #define _HITAG2_H_
 
+#ifdef _MSC_VER
+#define PACKED
+#else
+#define PACKED __attribute__((packed))
+#endif
+
 typedef enum {
 	RHTSF_CHALLENGE           = 01,
 	RHTSF_KEY                 = 02,

include/hitagS.h

@@ -10,13 +10,11 @@
 //-----------------------------------------------------------------------------
 
 
-#include <stdlib.h>
-#include <string.h>
-#include <hitag2.h>
-
 #ifndef _HITAGS_H_
 #define _HITAGS_H_
 
+#include "hitag2.h"
+
 typedef enum PROTO_STATE {READY=0,INIT,AUTHENTICATE,SELECTED,QUIET,TTF,FAIL} PSTATE;				//protocol-state
 typedef enum TAG_STATE   {NO_OP=0,READING_PAGE,WRITING_PAGE_ACK,WRITING_PAGE_DATA,WRITING_BLOCK_DATA} TSATE;	//tag-state
 typedef enum SOF_TYPE    {STANDARD=0,ADVANCED,FAST_ADVANCED,ONE,NO_BITS} stype;					//number of start-of-frame bits