<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/24535">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">firmware: cardem: re-factor CARDINSERT command processing<br><br>move it out of the general command dispatch switch statement<br>and into a separate function.<br><br>Change-Id: Ia40c3d9999be68248da0dcc69d298450ca6e4869<br>---<br>M firmware/libcommon/source/mode_cardemu.c<br>1 file changed, 17 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/35/24535/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libcommon/source/mode_cardemu.c b/firmware/libcommon/source/mode_cardemu.c</span><br><span>index 8a59e16..3863767 100644</span><br><span>--- a/firmware/libcommon/source/mode_cardemu.c</span><br><span>+++ b/firmware/libcommon/source/mode_cardemu.c</span><br><span>@@ -652,6 +652,22 @@</span><br><span>        usb_buf_free(msg);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void process_card_insert(struct cardem_inst *ci, bool card_insert)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+     TRACE_INFO("%u: set card_insert to %s\r\n", ci->num, card_insert ? "INSERTED" : "REMOVED");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        if (!ci->pin_insert.pio) {</span><br><span style="color: hsl(120, 100%, 40%);">+         TRACE_INFO("%u: skipping unsupported card_insert to %s\r\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                           ci->num, card_insert ? "INSERTED" : "REMOVED");</span><br><span style="color: hsl(120, 100%, 40%);">+             return;</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%);">+   if (card_insert)</span><br><span style="color: hsl(120, 100%, 40%);">+              PIO_Set(&ci->pin_insert);</span><br><span style="color: hsl(120, 100%, 40%);">+      else</span><br><span style="color: hsl(120, 100%, 40%);">+          PIO_Clear(&ci->pin_insert);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* handle a single USB command as received from the USB host */</span><br><span> static void dispatch_usb_command_cardem(struct msgb *msg, struct cardem_inst *ci)</span><br><span> {</span><br><span>@@ -675,18 +691,7 @@</span><br><span>          break;</span><br><span>       case SIMTRACE_MSGT_DT_CEMU_CARDINSERT:</span><br><span>               cardins = (struct cardemu_usb_msg_cardinsert *) msg->l2h;</span><br><span style="color: hsl(0, 100%, 40%);">-            if (!ci->pin_insert.pio) {</span><br><span style="color: hsl(0, 100%, 40%);">-                   TRACE_INFO("%u: skipping unsupported card_insert to %s\r\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                             ci->num, cardins->card_insert ? "INSERTED" : "REMOVED");</span><br><span style="color: hsl(0, 100%, 40%);">-                   usb_buf_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">-                      break;</span><br><span style="color: hsl(0, 100%, 40%);">-          }</span><br><span style="color: hsl(0, 100%, 40%);">-               TRACE_INFO("%u: set card_insert to %s\r\n", ci->num,</span><br><span style="color: hsl(0, 100%, 40%);">-                          cardins->card_insert ? "INSERTED" : "REMOVED");</span><br><span style="color: hsl(0, 100%, 40%);">-               if (cardins->card_insert)</span><br><span style="color: hsl(0, 100%, 40%);">-                    PIO_Set(&ci->pin_insert);</span><br><span style="color: hsl(0, 100%, 40%);">-                else</span><br><span style="color: hsl(0, 100%, 40%);">-                    PIO_Clear(&ci->pin_insert);</span><br><span style="color: hsl(120, 100%, 40%);">+            process_card_insert(ci, cardins->card_insert);</span><br><span>            usb_buf_free(msg);</span><br><span>           break;</span><br><span>       case SIMTRACE_MSGT_BD_CEMU_STATUS:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/24535">change 24535</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/c/simtrace2/+/24535"/><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-Change-Id: Ia40c3d9999be68248da0dcc69d298450ca6e4869 </div>
<div style="display:none"> Gerrit-Change-Number: 24535 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>