<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9843">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sniff mode: handle USART 1 RX interrupt to show sniffer data<br><br>Change-Id: I5504369aed39844b7cf21e5b3ccb542daa6b946e<br>---<br>M firmware/apps/trace/main.c<br>M firmware/libcommon/include/simtrace.h<br>M firmware/libcommon/source/sniffer.c<br>3 files changed, 36 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/43/9843/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/apps/trace/main.c b/firmware/apps/trace/main.c</span><br><span>index 54b4242..6096362 100644</span><br><span>--- a/firmware/apps/trace/main.c</span><br><span>+++ b/firmware/apps/trace/main.c</span><br><span>@@ -54,6 +54,7 @@</span><br><span> .init = Sniffer_init,</span><br><span> .exit = Sniffer_exit,</span><br><span> .run = Sniffer_run,</span><br><span style="color: hsl(120, 100%, 40%);">+ .usart1_irq = Sniffer_usart1_irq,</span><br><span> },</span><br><span> #endif</span><br><span> #ifdef HAVE_CCID</span><br><span>diff --git a/firmware/libcommon/include/simtrace.h b/firmware/libcommon/include/simtrace.h</span><br><span>index 348cc57..21921ca 100644</span><br><span>--- a/firmware/libcommon/include/simtrace.h</span><br><span>+++ b/firmware/libcommon/include/simtrace.h</span><br><span>@@ -108,6 +108,8 @@</span><br><span> extern void mode_cardemu_run(void);</span><br><span> extern void MITM_run( void );</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* IRQ functions */</span><br><span style="color: hsl(120, 100%, 40%);">+extern void Sniffer_usart1_irq(void);</span><br><span> extern void mode_cardemu_usart0_irq(void);</span><br><span> extern void mode_cardemu_usart1_irq(void);</span><br><span> </span><br><span>diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c</span><br><span>index 06edb22..fa272eb 100644</span><br><span>--- a/firmware/libcommon/source/sniffer.c</span><br><span>+++ b/firmware/libcommon/source/sniffer.c</span><br><span>@@ -58,7 +58,7 @@</span><br><span> /* Enable power converter 4.5-6V to 3.3V; low: off */</span><br><span> {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT},</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Enable second power converter: VCC_PHONE to VCC_SIM; high: on */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Enable power forwarding: VCC_PHONE to VCC_SIM; high: on */</span><br><span> {VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}</span><br><span> };</span><br><span> </span><br><span>@@ -68,10 +68,37 @@</span><br><span> .state = USART_RCV,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Ring buffer to store sniffer communication data */</span><br><span style="color: hsl(120, 100%, 40%);">+static struct ringbuf sniff_buffer;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*------------------------------------------------------------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+ * Global functions</span><br><span style="color: hsl(120, 100%, 40%);">+ *------------------------------------------------------------------------------*/</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void Sniffer_usart1_irq(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Read channel status register */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t csr = usart_info.base->US_CSR & usart_info.base->US_IMR;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Verify if character has been received */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (csr & US_CSR_RXRDY) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Read communication data byte between phone and SIM */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t byte = usart_info.base->US_RHR;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Store sniffed data into buffer (also clear interrupt */ </span><br><span style="color: hsl(120, 100%, 40%);">+ rbuf_write(&sniff_buffer, byte);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*------------------------------------------------------------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+ * Internal functions</span><br><span style="color: hsl(120, 100%, 40%);">+ *------------------------------------------------------------------------------*/</span><br><span> </span><br><span> int check_data_from_phone(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- TRACE_INFO("check data from phone\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Display sniffed data */</span><br><span style="color: hsl(120, 100%, 40%);">+ while (!rbuf_is_empty(&sniff_buffer)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t byte = rbuf_read(&sniff_buffer);</span><br><span style="color: hsl(120, 100%, 40%);">+ TRACE_INFO_WP("0x%02x ", byte);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /*-----------------------------------------------------------------------------</span><br><span>@@ -97,6 +124,10 @@</span><br><span> void Sniffer_init(void)</span><br><span> {</span><br><span> TRACE_INFO("Sniffer Init\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Clear ring buffer containing the sniffed data */</span><br><span style="color: hsl(120, 100%, 40%);">+ rbuf_reset(&sniff_buffer);</span><br><span style="color: hsl(120, 100%, 40%);">+</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/9843">change 9843</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/9843"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I5504369aed39844b7cf21e5b3ccb542daa6b946e </div>
<div style="display:none"> Gerrit-Change-Number: 9843 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>