<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9846">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">simtrace: add dedicated power pins configuration for sniffing<br><br>Change-Id: Ie37edbae6ea42d2b0c2a30eb5590afd0be797d39<br>---<br>M firmware/libboard/simtrace/include/board.h<br>M firmware/libcommon/source/sniffer.c<br>2 files changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libboard/simtrace/include/board.h b/firmware/libboard/simtrace/include/board.h</span><br><span>index 00d32ee..8e832dd 100644</span><br><span>--- a/firmware/libboard/simtrace/include/board.h</span><br><span>+++ b/firmware/libboard/simtrace/include/board.h</span><br><span>@@ -14,6 +14,8 @@</span><br><span> #define PIN_BOOTLOADER_SW {PIO_PA31, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP}</span><br><span> /* Enable powering the card using the second 3.3 V output of the LDO (active high) */</span><br><span> #define SIM_PWEN_PIN {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}</span><br><span style="color: hsl(120, 100%, 40%);">+/* Enable powering the SIM card */</span><br><span style="color: hsl(120, 100%, 40%);">+#define PWR_PINS SIM_PWEN_PIN</span><br><span> /* Card presence pin */</span><br><span> #define SW_SIM PIO_PA8</span><br><span> /* Pull card presence pin high (shorted to ground in card slot when card is present) */</span><br><span>@@ -49,7 +51,7 @@</span><br><span> /* Pin used as clock input (to measure the ETU duration; connected to CLK_PHONE in schematic) */</span><br><span> #define PIN_PHONE_CLK_INPUT {PIO_PA29B_TCLK2, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/** Default configuration **/</span><br><span style="color: hsl(120, 100%, 40%);">+/** Default pin configuration **/</span><br><span> /* Disconnect VPP, CLK, and RST lines between card and phone using bus switch (high sets bus switch to high-impedance) */</span><br><span> #define PIN_SC_SW_DEFAULT {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}</span><br><span> /* Disconnect I/O line between card and phone using bus switch (high sets bus switch to high-impedance) */</span><br><span>@@ -64,16 +66,14 @@</span><br><span> #define PIN_IO_SW_SNIFF {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}</span><br><span> /* Connect all lines (VPP, CLK, RST, and I/O) between card and phone */</span><br><span> #define PINS_BUS_SNIFF PIN_SC_SW_SNIFF, PIN_IO_SW_SNIFF</span><br><span style="color: hsl(0, 100%, 40%);">-/* Use RST_SIM line to detect phone issued card reset */</span><br><span style="color: hsl(0, 100%, 40%);">-#define PIN_SIM_RST_SNIFF {PIO_PA7, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP | PIO_DEBOUNCE | PIO_DEGLITCH | PIO_IT_EDGE }</span><br><span> /* Pins used to sniff phone-card communication */</span><br><span style="color: hsl(0, 100%, 40%);">-#define PINS_SIM_SNIFF_SIM PIN_SIM_IO, PIN_SIM_CLK, PIN_SIM_RST_SNIFF</span><br><span style="color: hsl(120, 100%, 40%);">+#define PINS_SIM_SNIFF PIN_SIM_IO, PIN_SIM_CLK, PIN_SIM_RST</span><br><span> /* Disable power converter 4.5-6V to 3.3V (active high) */</span><br><span> #define PIN_SIM_PWEN_SNIFF {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}</span><br><span> /* Enable power switch to forward VCC_PHONE to VCC_SIM (active high) */</span><br><span> #define PIN_VCC_FWD_SNIFF {VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}</span><br><span> /* Use phone VCC to power card */</span><br><span style="color: hsl(0, 100%, 40%);">-#define PWR_PINS PIN_SIM_PWEN_SNIFF, PIN_VCC_FWD_SNIFF</span><br><span style="color: hsl(120, 100%, 40%);">+#define PINS_PWR_SNIFF PIN_SIM_PWEN_SNIFF, PIN_VCC_FWD_SNIFF</span><br><span> </span><br><span> /** CCID configuration */</span><br><span> /* Card RST reset signal input (active low; RST_SIM in schematic) */</span><br><span>diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c</span><br><span>index 7cc688b..61c8864 100644</span><br><span>--- a/firmware/libcommon/source/sniffer.c</span><br><span>+++ b/firmware/libcommon/source/sniffer.c</span><br><span>@@ -42,7 +42,7 @@</span><br><span> * Internal variables</span><br><span> *------------------------------------------------------------------------------*/</span><br><span> /* Pin configuration to sniff communication (using USART connection to SIM card) */</span><br><span style="color: hsl(0, 100%, 40%);">-static const Pin pins_sniff[] = { PINS_SIM_SNIFF_SIM };</span><br><span style="color: hsl(120, 100%, 40%);">+static const Pin pins_sniff[] = { PINS_SIM_SNIFF };</span><br><span> /* Connect phone to card using bus switch */</span><br><span> static const Pin pins_bus[] = { PINS_BUS_SNIFF };</span><br><span> /* Power card using phone VCC */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9846">change 9846</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9846"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ie37edbae6ea42d2b0c2a30eb5590afd0be797d39 </div>
<div style="display:none"> Gerrit-Change-Number: 9846 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>