make/cmake add common_fpga

client/CMakeLists.txt

@@ -240,8 +240,8 @@ add_executable(
 target_compile_options(proxmark3 PUBLIC -Wall -Werror -O3)
 
 target_include_directories(proxmark3 PRIVATE
-        ..
         ../common
+        ../common_fpga
         ../include
         src
 )

client/Makefile

@@ -54,7 +54,7 @@ ZLIBPATH = ../common/zlib
 ZLIB = $(OBJDIR)/libz.a
 
 LIBS = -I$(LUALIBPATH) -I$(MBEDTLSLIBPATH) -I$(JANSSONLIBPATH) -I$(CBORLIBPATH) -I$(ZLIBPATH) -I$(REVENGPATH) -I$(AMIIBOLIBPATH) -I$(HARDNESTEDPATH) -I$(CLIPARSERPATH)
-INCLUDES_CLIENT = -I./src -I../include -I../common $(LIBS)
+INCLUDES_CLIENT = -I./src -I../include -I../common -I../common_fpga $(LIBS)
 CFLAGS ?= -Wall -Werror -O3
 # We cannot just use CFLAGS+=... because it has impact on sub-makes if CFLAGS is defined in env:
 PM3CFLAGS = $(CFLAGS) -std=c99 -D_ISOC99_SOURCE $(INCLUDES_CLIENT)

client/src/cmdhf.c

@@ -39,7 +39,7 @@
 #include "ui.h"
 #include "cmddata.h"
 #include "graph.h"
-#include "../../common_fpga/fpga.h"
+#include "fpga.h"
 
 static int CmdHelp(const char *Cmd);
 

client/src/mifare/desfire_crypto.h

@@ -4,9 +4,6 @@
 #include "common.h"
 #include "mifare.h" // structs
 #include "crc32.h"
-//#include "../../armsrc/printf.h"
-//#include "../../armsrc/desfire.h"
-//#include "../../armsrc/iso14443a.h"
 
 
 #define MAX_CRYPTO_BLOCK_SIZE 16