<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12428">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">host/layer23: rename GSM_SIM_TYPE_READER to GSM_SIM_TYPE_L1PHY<br><br>Since we have two ways to interact with a physical SIM:<br><br> - using built-in SIM reader of the L1 PHY (via L1CTL),<br> - using remote reader via (BT)SAP protocol,<br><br>name 'GSM_SIM_TYPE_READER' looks quite confusing. Let's rename it<br>in order to explicitly indicate the role of L1 PHY.<br><br>Change-Id: I0f83f365ed50cfd658fdd3a9d6866ed76c8c4009<br>---<br>M src/host/layer23/include/osmocom/bb/mobile/subscriber.h<br>M src/host/layer23/src/mobile/app_mobile.c<br>M src/host/layer23/src/mobile/settings.c<br>M src/host/layer23/src/mobile/subscriber.c<br>M src/host/layer23/src/mobile/vty_interface.c<br>5 files changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/28/12428/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h</span><br><span>index ac785d4..958700a 100644</span><br><span>--- a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h</span><br><span>+++ b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h</span><br><span>@@ -22,7 +22,7 @@</span><br><span> </span><br><span> enum {</span><br><span> GSM_SIM_TYPE_NONE = 0,</span><br><span style="color: hsl(0, 100%, 40%);">- GSM_SIM_TYPE_READER,</span><br><span style="color: hsl(120, 100%, 40%);">+ GSM_SIM_TYPE_L1PHY,</span><br><span> GSM_SIM_TYPE_TEST,</span><br><span> GSM_SIM_TYPE_SAP</span><br><span> };</span><br><span>diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c</span><br><span>index 84dec86..17c0c76 100644</span><br><span>--- a/src/host/layer23/src/mobile/app_mobile.c</span><br><span>+++ b/src/host/layer23/src/mobile/app_mobile.c</span><br><span>@@ -110,7 +110,7 @@</span><br><span> </span><br><span> /* insert test card, if enabled */</span><br><span> switch (set->sim_type) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_SIM_TYPE_READER:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_SIM_TYPE_L1PHY:</span><br><span> /* trigger sim card reader process */</span><br><span> gsm_subscr_simcard(ms);</span><br><span> break;</span><br><span>diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c</span><br><span>index a4bb4e3..388c754 100644</span><br><span>--- a/src/host/layer23/src/mobile/settings.c</span><br><span>+++ b/src/host/layer23/src/mobile/settings.c</span><br><span>@@ -49,7 +49,7 @@</span><br><span> sprintf(set->imeisv, "0000000000000000");</span><br><span> </span><br><span> /* SIM type */</span><br><span style="color: hsl(0, 100%, 40%);">- set->sim_type = GSM_SIM_TYPE_READER;</span><br><span style="color: hsl(120, 100%, 40%);">+ set->sim_type = GSM_SIM_TYPE_L1PHY;</span><br><span> </span><br><span> /* test SIM */</span><br><span> strcpy(set->test_imsi, "001010000000000");</span><br><span>diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c</span><br><span>index 7a01141..097f785 100644</span><br><span>--- a/src/host/layer23/src/mobile/subscriber.c</span><br><span>+++ b/src/host/layer23/src/mobile/subscriber.c</span><br><span>@@ -711,7 +711,7 @@</span><br><span> uint8_t job;</span><br><span> </span><br><span> /* skip, if no real valid SIM */</span><br><span style="color: hsl(0, 100%, 40%);">- if (subscr->sim_type != GSM_SIM_TYPE_READER)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (subscr->sim_type != GSM_SIM_TYPE_L1PHY)</span><br><span> return;</span><br><span> </span><br><span> switch (mode) {</span><br><span>@@ -764,7 +764,7 @@</span><br><span> gsm_subscr_exit(ms);</span><br><span> gsm_subscr_init(ms);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- subscr->sim_type = GSM_SIM_TYPE_READER;</span><br><span style="color: hsl(120, 100%, 40%);">+ subscr->sim_type = GSM_SIM_TYPE_L1PHY;</span><br><span> sprintf(subscr->sim_name, "sim");</span><br><span> subscr->sim_valid = 1;</span><br><span> subscr->ustate = GSM_SIM_U2_NOT_UPDATED;</span><br><span>@@ -790,7 +790,7 @@</span><br><span> #endif</span><br><span> </span><br><span> /* skip, if no real valid SIM */</span><br><span style="color: hsl(0, 100%, 40%);">- if (subscr->sim_type != GSM_SIM_TYPE_READER || !subscr->sim_valid)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (subscr->sim_type != GSM_SIM_TYPE_L1PHY || !subscr->sim_valid)</span><br><span> return 0;</span><br><span> </span><br><span> /* get tail list from "PLMN not allowed" */</span><br><span>@@ -844,7 +844,7 @@</span><br><span> struct gsm1111_ef_loci *loci;</span><br><span> </span><br><span> /* skip, if no real valid SIM */</span><br><span style="color: hsl(0, 100%, 40%);">- if (subscr->sim_type != GSM_SIM_TYPE_READER || !subscr->sim_valid)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (subscr->sim_type != GSM_SIM_TYPE_L1PHY || !subscr->sim_valid)</span><br><span> return 0;</span><br><span> </span><br><span> LOGP(DMM, LOGL_INFO, "Updating LOCI on SIM\n");</span><br><span>@@ -907,7 +907,7 @@</span><br><span> struct sim_hdr *nsh;</span><br><span> </span><br><span> /* not a SIM */</span><br><span style="color: hsl(0, 100%, 40%);">- if ((subscr->sim_type != GSM_SIM_TYPE_READER</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((subscr->sim_type != GSM_SIM_TYPE_L1PHY</span><br><span> && subscr->sim_type != GSM_SIM_TYPE_TEST)</span><br><span> || !subscr->sim_valid || no_sim) {</span><br><span> struct gsm48_mm_event *nmme;</span><br><span>diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c</span><br><span>index a0ad993..2001b88 100644</span><br><span>--- a/src/host/layer23/src/mobile/vty_interface.c</span><br><span>+++ b/src/host/layer23/src/mobile/vty_interface.c</span><br><span>@@ -1323,7 +1323,7 @@</span><br><span> case GSM_SIM_TYPE_NONE:</span><br><span> vty_out(vty, " sim none%s", VTY_NEWLINE);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case GSM_SIM_TYPE_READER:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSM_SIM_TYPE_L1PHY:</span><br><span> vty_out(vty, " sim reader%s", VTY_NEWLINE);</span><br><span> break;</span><br><span> case GSM_SIM_TYPE_TEST:</span><br><span>@@ -1608,7 +1608,7 @@</span><br><span> set->sim_type = GSM_SIM_TYPE_NONE;</span><br><span> break;</span><br><span> case 'r':</span><br><span style="color: hsl(0, 100%, 40%);">- set->sim_type = GSM_SIM_TYPE_READER;</span><br><span style="color: hsl(120, 100%, 40%);">+ set->sim_type = GSM_SIM_TYPE_L1PHY;</span><br><span> break;</span><br><span> case 't':</span><br><span> set->sim_type = GSM_SIM_TYPE_TEST;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12428">change 12428</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/12428"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I0f83f365ed50cfd658fdd3a9d6866ed76c8c4009 </div>
<div style="display:none"> Gerrit-Change-Number: 12428 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>