diff options
| author | Kévin Redon <kredon@sysmocom.de> | 2018-06-11 13:42:23 +0200 |
|---|---|---|
| committer | King Kévin <kingkevin@cuvoodoo.info> | 2018-07-04 14:28:17 +0200 |
| commit | ee62a9da56ed7af62c48fbf0e08c880cd74f7d9f (patch) | |
| tree | dde4f4fc91be7a7442c0b3b73826e11dc6d63503 /firmware | |
| parent | 45ad62d8d4f1aec17cb63acd3de4628fe3939215 (diff) | |
simtrace: add dedicated power pins configuration for sniffing
Change-Id: Ie37edbae6ea42d2b0c2a30eb5590afd0be797d39
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/libboard/simtrace/include/board.h | 10 | ||||
| -rw-r--r-- | firmware/libcommon/source/sniffer.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/firmware/libboard/simtrace/include/board.h b/firmware/libboard/simtrace/include/board.h index 00d32ee..8e832dd 100644 --- a/firmware/libboard/simtrace/include/board.h +++ b/firmware/libboard/simtrace/include/board.h @@ -14,6 +14,8 @@ #define PIN_BOOTLOADER_SW {PIO_PA31, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP} /* Enable powering the card using the second 3.3 V output of the LDO (active high) */ #define SIM_PWEN_PIN {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT} +/* Enable powering the SIM card */ +#define PWR_PINS SIM_PWEN_PIN /* Card presence pin */ #define SW_SIM PIO_PA8 /* Pull card presence pin high (shorted to ground in card slot when card is present) */ @@ -49,7 +51,7 @@ /* Pin used as clock input (to measure the ETU duration; connected to CLK_PHONE in schematic) */ #define PIN_PHONE_CLK_INPUT {PIO_PA29B_TCLK2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT} -/** Default configuration **/ +/** Default pin configuration **/ /* Disconnect VPP, CLK, and RST lines between card and phone using bus switch (high sets bus switch to high-impedance) */ #define PIN_SC_SW_DEFAULT {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT} /* Disconnect I/O line between card and phone using bus switch (high sets bus switch to high-impedance) */ @@ -64,16 +66,14 @@ #define PIN_IO_SW_SNIFF {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT} /* Connect all lines (VPP, CLK, RST, and I/O) between card and phone */ #define PINS_BUS_SNIFF PIN_SC_SW_SNIFF, PIN_IO_SW_SNIFF -/* Use RST_SIM line to detect phone issued card reset */ -#define PIN_SIM_RST_SNIFF {PIO_PA7, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | PIO_DEBOUNCE | PIO_DEGLITCH | PIO_IT_EDGE } /* Pins used to sniff phone-card communication */ -#define PINS_SIM_SNIFF_SIM PIN_SIM_IO, PIN_SIM_CLK, PIN_SIM_RST_SNIFF +#define PINS_SIM_SNIFF PIN_SIM_IO, PIN_SIM_CLK, PIN_SIM_RST /* Disable power converter 4.5-6V to 3.3V (active high) */ #define PIN_SIM_PWEN_SNIFF {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT} /* Enable power switch to forward VCC_PHONE to VCC_SIM (active high) */ #define PIN_VCC_FWD_SNIFF {VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT} /* Use phone VCC to power card */ -#define PWR_PINS PIN_SIM_PWEN_SNIFF, PIN_VCC_FWD_SNIFF +#define PINS_PWR_SNIFF PIN_SIM_PWEN_SNIFF, PIN_VCC_FWD_SNIFF /** CCID configuration */ /* Card RST reset signal input (active low; RST_SIM in schematic) */ diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c index 7cc688b..61c8864 100644 --- a/firmware/libcommon/source/sniffer.c +++ b/firmware/libcommon/source/sniffer.c @@ -42,7 +42,7 @@ * Internal variables *------------------------------------------------------------------------------*/ /* Pin configuration to sniff communication (using USART connection to SIM card) */ -static const Pin pins_sniff[] = { PINS_SIM_SNIFF_SIM }; +static const Pin pins_sniff[] = { PINS_SIM_SNIFF }; /* Connect phone to card using bus switch */ static const Pin pins_bus[] = { PINS_BUS_SNIFF }; /* Power card using phone VCC */ |