Merge branch 'new_iso_init' (sniffer not working)

Conflicts:
	firmware/src_simtrace/phone.c
	firmware/src_simtrace/simtrace.h
This commit is contained in:
Christina Quast
2015-04-12 13:31:01 +02:00
10 changed files with 123 additions and 174 deletions

View File

@@ -12,6 +12,7 @@
#include "iso7816_4.h"
#include "led.h"
#include "cciddriver.h"
#include "usart.h"
#include "USBD.h"
#include "USBD_Config.h"

View File

@@ -26,6 +26,8 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ----------------------------------------------------------------------------
*/
#include <stdbool.h>
#include "board.h"
//------------------------------------------------------------------------------
/** \file
@@ -67,7 +69,11 @@
/*------------------------------------------------------------------------------
* Exported functions
*----------------------------------------------------------------------------*/
extern void ISO7816_Init( const Pin *pPinIso7816RstMC );
extern void ISO7816_Init( Usart_info *base_usart, bool master_clock );
extern void ISO7816_Set_Reset_Pin(const Pin *pPinIso7816RstMC);
extern uint32_t ISO7816_SendChar( uint8_t CharToSend, Usart_info *usart );
extern uint32_t ISO7816_GetChar( uint8_t *pCharToReceive, Usart_info *usart);
extern void ISO7816_IccPowerOff(void);
extern uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
uint8_t *pMessage,