Merge pull request #251 from merlokk/reorg_includes

added PACKED attribute for structures and reorganize include folder

armsrc/Standalone/hf_young.c

@@ -8,14 +8,16 @@
 //-----------------------------------------------------------------------------
 // main code for HF standalone mode Mifare /sniff/emulation by Craig Young
 //-----------------------------------------------------------------------------
+
 #include "hf_young.h"
+#include "common.h"
 
 typedef struct {
     uint8_t uid[10];
     uint8_t uidlen;
     uint8_t atqa[2];
     uint8_t sak;
-} __attribute__((__packed__)) card_clone_t;
+} PACKED card_clone_t;
 
 
 void ModInfo(void) {

armsrc/appmain.c

@@ -13,6 +13,7 @@
 #include <inttypes.h>
 #include "usb_cdc.h"
 #include "proxmark3.h"
+#include "pmflash.h"
 #include "apps.h"
 #include "fpga.h"
 #include "util.h"

armsrc/flashmem.c

@@ -1,4 +1,5 @@
 #include "flashmem.h"
+#include "pmflash.h"
 
 /* here: use NCPS2 @ PA10: */
 #define SPI_CSR_NUM      2

armsrc/lfops.c

@@ -19,6 +19,7 @@
 #include "protocols.h"
 #include "usb_cdc.h" // for usb_poll_validate_length
 #include "common.h"
+#include "pmflash.h"
 #include "flashmem.h" // persistence on mem
 
 //#define START_GAP 31*8 // was 250 // SPEC:  1*8 to 50*8 - typ 15*8 (15fc)

armsrc/mifarecmd.c

@@ -14,8 +14,11 @@
 //-----------------------------------------------------------------------------
 
 #include "mifarecmd.h"
+
 #include <inttypes.h>
 
+#include "pmflash.h"
+
 #ifndef HARDNESTED_AUTHENTICATION_TIMEOUT
 # define HARDNESTED_AUTHENTICATION_TIMEOUT  848     // card times out 1ms after wrong authentication (according to NXP documentation)
 #endif