sim-card
/
simtrace2
mirror of https://gerrit.osmocom.org/simtrace2
10
0
Fork 0
Code Issues Releases Wiki Activity

Make build of CCID code succeed again on BOARD=simtrace

This commit is contained in:
Harald Welte 2017-11-28 20:58:06 +01:00
parent c35998e20d
commit 5e6e8dcbde
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/apps/cardem/Makefile
View File

@ -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

2
firmware/libboard/simtrace/include/board.h
View File

@ -82,6 +82,6 @@
#define BOARD_USB_RELEASE 0x000
//#define HAVE_SNIFFER
//#define HAVE_CCID
#define HAVE_CCID
#define HAVE_CARDEM
//#define HAVE_MITM

2
firmware/libcommon/include/simtrace.h
View File

@ -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[];

5
firmware/libcommon/source/ccid.c
View File

@ -27,14 +27,15 @@
* ----------------------------------------------------------------------------
*/
#include "board.h"
#include "simtrace.h"
#ifdef HAVE_CCID
/*------------------------------------------------------------------------------
* Headers
*------------------------------------------------------------------------------*/
#include "board.h"
#include <string.h>
/*------------------------------------------------------------------------------