<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9872">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;">USB device: add USB message structure for sniffer communication<br><br>Change-Id: Id2c6f32ade2fec9b9ef91bd8c5e1fd195f2d7351<br>---<br>M firmware/libcommon/include/simtrace_prot.h<br>1 file changed, 52 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libcommon/include/simtrace_prot.h b/firmware/libcommon/include/simtrace_prot.h</span><br><span>index 189264d..a43ac72 100644</span><br><span>--- a/firmware/libcommon/include/simtrace_prot.h</span><br><span>+++ b/firmware/libcommon/include/simtrace_prot.h</span><br><span>@@ -1,7 +1,3 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#pragma once</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdint.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* SIMtrace2 USB protocol */</span><br><span> </span><br><span> /* (C) 2015-2017 by Harald Welte <hwelte@hmw-consulting.de></span><br><span>@@ -21,6 +17,10 @@</span><br><span> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</span><br><span> *</span><br><span> */</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdint.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdbool.h></span><br><span> </span><br><span> /***********************************************************************</span><br><span> * COMMON HEADER</span><br><span>@@ -32,8 +32,8 @@</span><br><span> SIMTRACE_MSGC_CARDEM,</span><br><span> /* Modem Control (if modem is attached next to device) */</span><br><span> SIMTRACE_MSGC_MODEM,</span><br><span style="color: hsl(0, 100%, 40%);">- /* SIM protocol tracing */</span><br><span style="color: hsl(0, 100%, 40%);">- SIMTRACE_MSGC_TRACE,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Reader/phone-car/SIM communication sniff */</span><br><span style="color: hsl(120, 100%, 40%);">+ SIMTRACE_MSGC_SNIFF,</span><br><span> </span><br><span> /* first vendor-specific request */</span><br><span> _SIMTRACE_MGSC_VENDOR_FIRST = 127,</span><br><span>@@ -74,10 +74,18 @@</span><br><span> SIMTRACE_MSGT_BD_MODEM_STATUS,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* SIMTRACE_MSGC_TRACE */</span><br><span style="color: hsl(0, 100%, 40%);">-enum simtrace_msg_type_trace {</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME */</span><br><span style="color: hsl(0, 100%, 40%);">- _dummy,</span><br><span style="color: hsl(120, 100%, 40%);">+/* SIMTRACE_MSGC_SNIFF */</span><br><span style="color: hsl(120, 100%, 40%);">+enum simtrace_msg_type_sniff {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Status change (card inserted, reset, ...) */</span><br><span style="color: hsl(120, 100%, 40%);">+ SIMTRACE_MSGT_SNIFF_CHANGE = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Fi/Di baudrate change */</span><br><span style="color: hsl(120, 100%, 40%);">+ SIMTRACE_MSGT_SNIFF_FIDI,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* ATR data */</span><br><span style="color: hsl(120, 100%, 40%);">+ SIMTRACE_MSGT_SNIFF_ATR,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* PPS (request or response) data */</span><br><span style="color: hsl(120, 100%, 40%);">+ SIMTRACE_MSGT_SNIFF_PPS,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TPDU data */</span><br><span style="color: hsl(120, 100%, 40%);">+ SIMTRACE_MSGT_SNIFF_TPDU,</span><br><span> };</span><br><span> </span><br><span> /* common message header */</span><br><span>@@ -92,7 +100,7 @@</span><br><span> } __attribute__ ((packed));</span><br><span> </span><br><span> /***********************************************************************</span><br><span style="color: hsl(0, 100%, 40%);">- * CARD EMULATOR / FORWARDER</span><br><span style="color: hsl(120, 100%, 40%);">+ * Capabilities</span><br><span> ***********************************************************************/</span><br><span> </span><br><span> /* generic capabilities */</span><br><span>@@ -137,7 +145,6 @@</span><br><span> SIMTRACE_CAP_SYSMO_QMOD_RESET_HUB,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* SIMTRACE_CMD_BD_BOARD_INFO */</span><br><span> struct simtrace_board_info {</span><br><span> struct {</span><br><span>@@ -276,3 +283,36 @@</span><br><span> /* bit-field of changed status bits */</span><br><span> uint8_t changed_mask;</span><br><span> } __attribute__((packed));</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%);">+ * SNIFF</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%);">+/* SIMTRACE_MSGT_SNIFF_CHANGE flags */</span><br><span style="color: hsl(120, 100%, 40%);">+#define SNIFF_CHANGE_FLAG_CARD_INSERT (1<<0)</span><br><span style="color: hsl(120, 100%, 40%);">+#define SNIFF_CHANGE_FLAG_CARD_EJECT (1<<1)</span><br><span style="color: hsl(120, 100%, 40%);">+#define SNIFF_CHANGE_FLAG_RESET_HOLD (1<<2)</span><br><span style="color: hsl(120, 100%, 40%);">+#define SNIFF_CHANGE_FLAG_RESET_RELEASE (1<<3)</span><br><span style="color: hsl(120, 100%, 40%);">+#define SNIFF_CHANGE_FLAG_TIMEOUT_WT (1<<4)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* SIMTRACE_MSGT_SNIFF_CHANGE */</span><br><span style="color: hsl(120, 100%, 40%);">+struct sniff_change {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* SIMTRACE_MSGT_SNIFF_CHANGE flags */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t flags;</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* SIMTRACE_MSGT_SNIFF_FIDI */</span><br><span style="color: hsl(120, 100%, 40%);">+struct sniff_fidi {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Fi/Di values as encoded in TA1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t fidi;</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* SIMTRACE_MSGT_SNIFF_ATR, SIMTRACE_MSGT_SNIFF_PPS, SIMTRACE_MSGT_SNIFF_TPDU */</span><br><span style="color: hsl(120, 100%, 40%);">+struct sniff_data {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* if the data is complete (an error might have occurred during transmission */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool complete;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* data length */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t length;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* data */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t data[0];</span><br><span style="color: hsl(120, 100%, 40%);">+} __attribute__ ((packed));</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9872">change 9872</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/9872"/><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: Id2c6f32ade2fec9b9ef91bd8c5e1fd195f2d7351 </div>
<div style="display:none"> Gerrit-Change-Number: 9872 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </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>