From 5e6e8dcbde4b4257d3bf027fcc3335dde59e0884 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@gnumonks.org>
Date: Tue, 28 Nov 2017 20:58:06 +0100
Subject: [PATCH] Make build of CCID code succeed again on BOARD=simtrace

---
 firmware/apps/cardem/Makefile              | 2 +-
 firmware/libboard/simtrace/include/board.h | 2 +-
 firmware/libcommon/include/simtrace.h      | 2 ++
 firmware/libcommon/source/ccid.c           | 5 +++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/firmware/apps/cardem/Makefile b/firmware/apps/cardem/Makefile
index 8129b875..fc48e373 100644
--- a/firmware/apps/cardem/Makefile
+++ b/firmware/apps/cardem/Makefile
@@ -1,3 +1,3 @@
 C_FILES += $(C_LIBUSB_RT)
 
-C_FILES += card_emu.c ccid.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c simtrace_iso7816.c sniffer.c tc_etu.c usb.c
+C_FILES += card_emu.c ccid.c cciddriver.c iso7816_4.c iso7816_fidi.c mitm.c mode_cardemu.c simtrace_iso7816.c sniffer.c tc_etu.c usb.c
diff --git a/firmware/libboard/simtrace/include/board.h b/firmware/libboard/simtrace/include/board.h
index 53877b30..8fadb726 100644
--- a/firmware/libboard/simtrace/include/board.h
+++ b/firmware/libboard/simtrace/include/board.h
@@ -82,6 +82,6 @@
 #define BOARD_USB_RELEASE	0x000
 
 //#define HAVE_SNIFFER
-//#define HAVE_CCID
+#define HAVE_CCID
 #define HAVE_CARDEM
 //#define HAVE_MITM
diff --git a/firmware/libcommon/include/simtrace.h b/firmware/libcommon/include/simtrace.h
index b9589f33..348cc57f 100644
--- a/firmware/libcommon/include/simtrace.h
+++ b/firmware/libcommon/include/simtrace.h
@@ -3,6 +3,7 @@
 
 #include "ringbuffer.h"
 #include "board.h"
+#include <usb/device/dfu/dfu.h>
 
 /* Endpoint numbers */
 #define DATAOUT     1
@@ -71,6 +72,7 @@ typedef struct {
     USBEndpointDescriptor      bulkIn;
     /// Interrupt OUT endpoint descriptor
     USBEndpointDescriptor      interruptIn;
+    DFURT_IF_DESCRIPTOR_STRUCT
 } __attribute__ ((packed)) CCIDDriverConfigurationDescriptors;
 
 extern const USBConfigurationDescriptor *configurationDescriptorsArr[];
diff --git a/firmware/libcommon/source/ccid.c b/firmware/libcommon/source/ccid.c
index 770e296c..ff068c49 100644
--- a/firmware/libcommon/source/ccid.c
+++ b/firmware/libcommon/source/ccid.c
@@ -27,14 +27,15 @@
  * ----------------------------------------------------------------------------
  */
 
+#include "board.h"
+#include "simtrace.h"
+
 #ifdef HAVE_CCID
 
 /*------------------------------------------------------------------------------
  *          Headers
  *------------------------------------------------------------------------------*/
 
-#include "board.h"
-
 #include <string.h>
 
 /*------------------------------------------------------------------------------