catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-19 23:08:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make build of CCID code succeed again on BOARD=simtrace

Browse Source
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
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 += $(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 BOARD_USB_RELEASE 0x000
//#define HAVE_SNIFFER //#define HAVE_SNIFFER
//#define HAVE_CCID #define HAVE_CCID
#define HAVE_CARDEM #define HAVE_CARDEM
//#define HAVE_MITM //#define HAVE_MITM

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

@@ -3,6 +3,7 @@
#include "ringbuffer.h" #include "ringbuffer.h"
#include "board.h" #include "board.h"
#include <usb/device/dfu/dfu.h>
/* Endpoint numbers */ /* Endpoint numbers */
#define DATAOUT 1 #define DATAOUT 1
@@ -71,6 +72,7 @@ typedef struct {
USBEndpointDescriptor bulkIn; USBEndpointDescriptor bulkIn;
/// Interrupt OUT endpoint descriptor /// Interrupt OUT endpoint descriptor
USBEndpointDescriptor interruptIn; USBEndpointDescriptor interruptIn;
DFURT_IF_DESCRIPTOR_STRUCT
} __attribute__ ((packed)) CCIDDriverConfigurationDescriptors; } __attribute__ ((packed)) CCIDDriverConfigurationDescriptors;
extern const USBConfigurationDescriptor *configurationDescriptorsArr[]; 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 #ifdef HAVE_CCID
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Headers * Headers
*------------------------------------------------------------------------------*/ *------------------------------------------------------------------------------*/
#include "board.h"
#include <string.h> #include <string.h>
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------