More en masse cleanup (whitespace/newlines/headers/etc)

armsrc/LCD.c

@@ -1,4 +1,4 @@
-#include <proxmark3.h>
+#include "proxmark3.h"
 #include "apps.h"
 #include "LCD.h"
 

armsrc/LCD.h

@@ -1,5 +1,5 @@
-#ifndef __LCD
-#define __LCD
+#ifndef __LCD_H
+#define __LCD_H
 
 // The resolution of the LCD
 #define LCD_XRES	132
@@ -114,4 +114,5 @@ void LCDSetXY(unsigned char x, unsigned char y);
 void LCDSetPixel(unsigned char x, unsigned char y, unsigned char color);
 void LCDString (char *lcd_string, const char *font_style,unsigned char x, unsigned char y, unsigned char fcolor, unsigned char bcolor);
 void LCDFill (unsigned char xs,unsigned char ys,unsigned char width,unsigned char height, unsigned char color);
+
 #endif

armsrc/appmain.c

@@ -5,7 +5,7 @@
 // Edits by Gerhard de Koning Gans, Sep 2007 (##)
 //-----------------------------------------------------------------------------
 
-#include <proxmark3.h>
+#include "proxmark3.h"
 #include "apps.h"
 #include "legicrf.h"
 #ifdef WITH_LCD

armsrc/fonts.h

@@ -1,6 +1,8 @@
 #ifndef __FONTS_H
 #define __FONTS_H
+
 extern const char FONT6x8[97][8];
 extern const char FONT8x8F[97][8];
 extern const char FONT8x16[97][16];
+
 #endif

armsrc/fpgaloader.c

@@ -4,7 +4,7 @@
 //
 // Jonathan Westhues, April 2006
 //-----------------------------------------------------------------------------
-#include <proxmark3.h>
+#include "proxmark3.h"
 #include "apps.h"
 
 //-----------------------------------------------------------------------------

armsrc/hitag2.c

@@ -7,7 +7,7 @@
  * (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
  */
 
-#include <proxmark3.h>
+#include "proxmark3.h"
 #include <stdint.h>
 
 #include "apps.h"

armsrc/hitag2.h

@@ -4,7 +4,12 @@
  * (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
  */
 
+#ifndef __HITAG2_H
+#define __HITAG2_H
+
 typedef int (*hitag2_response_callback_t)(const char* response_data, const int response_length, const int fdt, void *cb_cookie);
 
 extern int hitag2_init(void);
 extern int hitag2_handle_command(const char* data, const int length, hitag2_response_callback_t cb, void *cb_cookie);
+
+#endif

armsrc/iso14443.c

@@ -4,7 +4,7 @@
 // supported.
 // Jonathan Westhues, split Nov 2006
 //-----------------------------------------------------------------------------
-#include <proxmark3.h>
+#include "proxmark3.h"
 #include "apps.h"
 #include "iso14443crc.h"
 

armsrc/iso14443a.c

@@ -3,7 +3,7 @@
 //
 // Gerhard de Koning Gans - May 2008
 //-----------------------------------------------------------------------------
-#include <proxmark3.h>
+#include "proxmark3.h"
 #include "apps.h"
 #include "iso14443crc.h"
 

armsrc/iso15693.c

@@ -8,7 +8,7 @@
 // Also added additional reader commands (SELECT, READ etc.)
 
 //-----------------------------------------------------------------------------
-#include <proxmark3.h>
+#include "proxmark3.h"
 #include "apps.h"
 
 // FROM winsrc\prox.h //////////////////////////////////

armsrc/legicrf.c

@@ -4,7 +4,7 @@
  * (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
  */
 
-#include <proxmark3.h>
+#include "proxmark3.h"
 
 #include "apps.h"
 #include "legicrf.h"

armsrc/legicrf.h

@@ -4,9 +4,10 @@
  * (c) 2009 Henryk Plötz <henryk@ploetzli.ch>
  */
 
-#ifndef LEGICRF_H_
-#define LEGICRF_H_
+#ifndef __LEGICRF_H
+#define __LEGICRF_H
 
 extern void LegicRfSimulate(void);
 extern void LegicRfReader(int bytes, int offset);
-#endif /* LEGICRF_H_ */
+
+#endif /* __LEGICRF_H */

armsrc/lfops.c

@@ -4,7 +4,7 @@
 // Also routines for raw mode reading/simulating of LF waveform
 //
 //-----------------------------------------------------------------------------
-#include <proxmark3.h>
+#include "proxmark3.h"
 #include "apps.h"
 #include "hitag2.h"
 #include "crc16.h"

armsrc/start.c

@@ -3,7 +3,7 @@
 // with the linker script.
 // Jonathan Westhues, Mar 2006
 //-----------------------------------------------------------------------------
-#include <proxmark3.h>
+#include "proxmark3.h"
 #include "apps.h"
 
 extern char __data_start__, __data_src_start__,  __data_end__, __bss_start__, __bss_end__;

armsrc/stdint.h

@@ -1,9 +1,9 @@
 /*
- * bits32/stdint.h
+ * Replacement stdint.h because GCC doesn't come with it yet (C99)
  */
 
-#ifndef _BITSIZE_STDINT_H
-#define _BITSIZE_STDINT_H
+#ifndef __STDINT_H
+#define __STDINT_H
 
 typedef signed char				int8_t;
 typedef short int				int16_t;
@@ -31,4 +31,4 @@ typedef unsigned int		uintptr_t;
 #define __PRIFAST_RANK			""
 #define __PRIPTR_RANK 			""
 
-#endif				/* _BITSIZE_STDINT_H */
+#endif /* __STDINT_H */

armsrc/util.c

@@ -2,7 +2,7 @@
 // Utility functions used in many places, not specific to any piece of code.
 // Jonathan Westhues, Sept 2005
 //-----------------------------------------------------------------------------
-#include <proxmark3.h>
+#include "proxmark3.h"
 #include "apps.h"
 
 void *memcpy(void *dest, const void *src, int len)

bootrom/stdint.h

@@ -1,9 +1,9 @@
 /*
- * bits32/stdint.h
+ * Replacement stdint.h because GCC doesn't come with it yet (C99)
  */
 
-#ifndef _BITSIZE_STDINT_H
-#define _BITSIZE_STDINT_H
+#ifndef __STDINT_H
+#define __STDINT_H
 
 typedef signed char				int8_t;
 typedef short int				int16_t;
@@ -31,4 +31,4 @@ typedef unsigned int		uintptr_t;
 #define __PRIFAST_RANK			""
 #define __PRIPTR_RANK 			""
 
-#endif				/* _BITSIZE_STDINT_H */
+#endif /* __STDINT_H */

common/default_version.c

@@ -1,4 +1,4 @@
-#include <proxmark3.h>
+#include "proxmark3.h"
 /* This is the default version.c file that Makefile.common falls back to if perl is not available */
 struct version_information __attribute__((section(".version_information"))) version_information = { 
 		VERSION_INFORMATION_MAGIC, 

include/crc.h

@@ -5,8 +5,8 @@
  *
  */
 
-#ifndef CRC_H_
-#define CRC_H_
+#ifndef __CRC_H
+#define __CRC_H
 
 #include <stdint.h>
 
@@ -44,4 +44,4 @@ extern uint32_t crc_finish(crc_t *crc);
 	.final_xor = (_final_xor), \
 	.mask = ((1L<<(_order))-1) }
 
-#endif /* CRC_H_ */
+#endif /* __CRC_H */

include/legic_prng.h

@@ -1,5 +1,5 @@
-#ifndef LEGIC_PRNG_H__
-#define LEGIC_PRNG_H__
+#ifndef __LEGIC_PRNG_H
+#define __LEGIC_PRNG_H
 
 #include <stdint.h>
 extern void legic_prng_init(uint8_t init);