catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-20 07:18:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

ISO7816_Init with more parameters, slave/master clock

Browse Source
This commit is contained in:
Christina Quast
2015-04-10 15:38:49 +02:00
parent 95d6616ba1
commit 3eab56e079
4 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/include_board/iso7816_4.h
View File

@@ -26,7 +26,7 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
*/ */
#include <stdbool.h>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
/** \file /** \file
* *
@@ -67,7 +67,7 @@
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* Exported functions * Exported functions
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
extern void ISO7816_Init( const Pin *pPinIso7816RstMC ); extern void ISO7816_Init( const Pin *pPinIso7816RstMC, Usart *base_usart, bool master_clock );
extern void ISO7816_IccPowerOff(void); extern void ISO7816_IccPowerOff(void);
extern uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU, extern uint32_t ISO7816_XfrBlockTPDU_T0(const uint8_t *pAPDU,
uint8_t *pMessage, uint8_t *pMessage,

30
firmware/src_board/iso7816_4.c
View File

@@ -57,11 +57,6 @@
#define USART_SEND 0 #define USART_SEND 0
#define USART_RCV 1 #define USART_RCV 1
#if !defined(BOARD_ISO7816_BASE_USART)
#define BOARD_ISO7816_BASE_USART USART1
#define BOARD_ISO7816_ID_USART ID_USART1
#endif
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
* Internal variables * Internal variables
*-----------------------------------------------------------------------------*/ *-----------------------------------------------------------------------------*/
@@ -619,16 +614,23 @@ void ISO7816_Decode_ATR( uint8_t* pAtr )
/** Initializes a ISO driver /** Initializes a ISO driver
* \param pPinIso7816RstMC Pin ISO 7816 Rst MC * \param pPinIso7816RstMC Pin ISO 7816 Rst MC
*/ */
void ISO7816_Init( const Pin *pPinIso7816RstMC ) void ISO7816_Init( const Pin *pPinIso7816RstMC, Usart *base_usart, bool master_clock )
{ {
uint32_t clk;
TRACE_DEBUG("ISO_Init\n\r"); TRACE_DEBUG("ISO_Init\n\r");
/* Pin ISO7816 initialize */ /* Pin ISO7816 initialize */
st_pinIso7816RstMC = (Pin *)pPinIso7816RstMC; st_pinIso7816RstMC = (Pin *)pPinIso7816RstMC;
USART_Configure( BOARD_ISO7816_BASE_USART, if (master_clock == true) {
clk = US_MR_USCLKS_MCK;
} else {
clk = US_MR_USCLKS_SCK;
}
USART_Configure( base_usart,
US_MR_USART_MODE_IS07816_T_0 US_MR_USART_MODE_IS07816_T_0
| US_MR_USCLKS_MCK | clk
| US_MR_NBSTOP_1_BIT | US_MR_NBSTOP_1_BIT
| US_MR_PAR_EVEN | US_MR_PAR_EVEN
| US_MR_CHRL_8_BIT | US_MR_CHRL_8_BIT
@@ -640,21 +642,21 @@ void ISO7816_Init( const Pin *pPinIso7816RstMC )
/* Configure USART */ /* Configure USART */
PMC_EnablePeripheral(BOARD_ISO7816_ID_USART); PMC_EnablePeripheral(BOARD_ISO7816_ID_USART);
/* Disable interrupts */ /* Disable interrupts */
BOARD_ISO7816_BASE_USART->US_IDR = (uint32_t) -1; base_usart->US_IDR = (uint32_t) -1;
BOARD_ISO7816_BASE_USART->US_FIDI = 372; /* by default */ base_usart->US_FIDI = 372; /* by default */
/* Define the baud rate divisor register */ /* Define the baud rate divisor register */
/* CD = MCK / SCK */ /* CD = MCK / SCK */
/* SCK = FIDI x BAUD = 372 x 9600 */ /* SCK = FIDI x BAUD = 372 x 9600 */
/* BOARD_MCK */ /* BOARD_MCK */
/* CD = MCK/(FIDI x BAUD) = 48000000 / (372x9600) = 13 */ /* CD = MCK/(FIDI x BAUD) = 48000000 / (372x9600) = 13 */
BOARD_ISO7816_BASE_USART->US_BRGR = BOARD_MCK / (372*9600); base_usart->US_BRGR = BOARD_MCK / (372*9600);
/* Write the Timeguard Register */ /* Write the Timeguard Register */
BOARD_ISO7816_BASE_USART->US_TTGR = 5; base_usart->US_TTGR = 5;
USART_SetTransmitterEnabled(BOARD_ISO7816_BASE_USART, 1); USART_SetTransmitterEnabled(base_usart, 1);
USART_SetReceiverEnabled(BOARD_ISO7816_BASE_USART, 1); USART_SetReceiverEnabled(base_usart, 1);
} }

2
firmware/src_simtrace/ccid.c
View File

@@ -162,7 +162,7 @@ void CCID_init( void )
/* power up the card */ /* power up the card */
// PIO_Set(&pinsPower[0]); // PIO_Set(&pinsPower[0]);
ISO7816_Init( &pinIso7816RstMC ) ; ISO7816_Init( &pinIso7816RstMC, USART_SIM, CLK_MASTER ) ;
/* Read ATR */ /* Read ATR */
ISO7816_warm_reset() ; ISO7816_warm_reset() ;

3
firmware/src_simtrace/simtrace.h
View File

@@ -12,6 +12,9 @@
#define PHONE_DATAIN 5 #define PHONE_DATAIN 5
#define PHONE_INT 6 #define PHONE_INT 6
#define CLK_MASTER 1
#define CLK_SLAVE 0
typedef struct ring_buffer typedef struct ring_buffer
{ {
uint8_t buf[BUFLEN*2]; // data buffer uint8_t buf[BUFLEN*2]; // data buffer