<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9841">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">enable (empty) sniffer support for SIMtrace board<br><br>Change-Id: I51619135fd6f5423542f261e7d76bab1a5713e2b<br>---<br>M firmware/libboard/simtrace/include/board.h<br>M firmware/libcommon/source/sniffer.c<br>2 files changed, 15 insertions(+), 8 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 742ce7c..3b8296b 100644</span><br><span>--- a/firmware/libboard/simtrace/include/board.h</span><br><span>+++ b/firmware/libboard/simtrace/include/board.h</span><br><span>@@ -11,7 +11,7 @@</span><br><span> /** Phone (SIM card emulator)/CCID Reader/MITM configuration **/</span><br><span> /* Normally the communication lines between phone and SIM card are disconnected */</span><br><span> // Disconnect SIM card I/O, VPP line from the phone lines</span><br><span style="color: hsl(0, 100%, 40%);">-// FIXME: Per default pins are input, therefore high-impedance, therefore they don not activate the bus switch, right?</span><br><span style="color: hsl(120, 100%, 40%);">+// FIXME: Per default pins are input, therefore high-impedance, therefore the bus switch is in an unknown state by default for hardware version <= 1.4. It should be pulled high by an external resistor to set the bus switch to high-impedance (e.g. off).</span><br><span> #define PIN_SC_SW_DEFAULT {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}</span><br><span> // Disconnect SIM card RST, CLK line from the phone lines</span><br><span> #define PIN_IO_SW_DEFAULT {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}</span><br><span>@@ -82,7 +82,7 @@</span><br><span> #define BOARD_DFU_USB_PRODUCT_ID USB_PRODUCT_SIMTRACE2_DFU</span><br><span> #define BOARD_USB_RELEASE 0x000</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-//#define HAVE_SNIFFER</span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_SNIFFER</span><br><span> #define HAVE_CCID</span><br><span> #define HAVE_CARDEM</span><br><span> //#define HAVE_MITM</span><br><span>diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c</span><br><span>index 67c11a2..06edb22 100644</span><br><span>--- a/firmware/libcommon/source/sniffer.c</span><br><span>+++ b/firmware/libcommon/source/sniffer.c</span><br><span>@@ -27,14 +27,15 @@</span><br><span> * ----------------------------------------------------------------------------</span><br><span> */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include "board.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "simtrace.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #ifdef HAVE_SNIFFER</span><br><span> </span><br><span> /*------------------------------------------------------------------------------</span><br><span> * Headers</span><br><span> *------------------------------------------------------------------------------*/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include "board.h"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #include <string.h></span><br><span> </span><br><span> /*------------------------------------------------------------------------------</span><br><span>@@ -67,6 +68,12 @@</span><br><span> .state = USART_RCV,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int check_data_from_phone(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO("check data from phone\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*-----------------------------------------------------------------------------</span><br><span> * Initialization routine</span><br><span> *-----------------------------------------------------------------------------*/</span><br><span>@@ -74,22 +81,22 @@</span><br><span> /* Called during USB enumeration after device is enumerated by host */</span><br><span> void Sniffer_configure(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO("Sniffer config\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO("Sniffer config\n\r");</span><br><span> }</span><br><span> </span><br><span> /* called when *different* configuration is set by host */</span><br><span> void Sniffer_exit(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO("Sniffer exit\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO("Sniffer exit\n\r");</span><br><span> USART_DisableIt(USART_PHONE, US_IER_RXRDY);</span><br><span> NVIC_DisableIRQ(USART1_IRQn);</span><br><span> USART_SetReceiverEnabled(USART_PHONE, 0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* called when *CCID* configuration is set by host */</span><br><span style="color: hsl(120, 100%, 40%);">+/* called when *Sniffer* configuration is set by host */</span><br><span> void Sniffer_init(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO("Sniffer Init\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO("Sniffer Init\n\r");</span><br><span> /* Configure ISO7816 driver */</span><br><span> PIO_Configure(pinsISO7816_sniff, PIO_LISTSIZE(pinsISO7816_sniff));</span><br><span> PIO_Configure(pins_bus, PIO_LISTSIZE(pins_bus));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9841">change 9841</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/9841"/><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: I51619135fd6f5423542f261e7d76bab1a5713e2b </div>
<div style="display:none"> Gerrit-Change-Number: 9841 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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>