<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11482">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;">pySim-*.py: add command line option for Calypso reader<br><br>Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df<br>---<br>M pySim-prog.py<br>M pySim-read.py<br>2 files changed, 14 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-prog.py b/pySim-prog.py</span><br><span>index ba1b783..d6d7ad5 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -58,6 +58,10 @@</span><br><span>                      help="Which PC/SC reader number for SIM access",</span><br><span>                   default=None,</span><br><span>                )</span><br><span style="color: hsl(120, 100%, 40%);">+     parser.add_option("--osmocon", dest="osmocon_sock", metavar="PATH",</span><br><span style="color: hsl(120, 100%, 40%);">+                     help="Socket path for Calypso (e.g. Motorola C1XX) based reader (via OsmocomBB)",</span><br><span style="color: hsl(120, 100%, 40%);">+                   default=None,</span><br><span style="color: hsl(120, 100%, 40%);">+         )</span><br><span>    parser.add_option("-t", "--type", dest="type",</span><br><span>                         help="Card type (user -t list to view) [default: %default]",</span><br><span>                       default="auto",</span><br><span>@@ -566,6 +570,9 @@</span><br><span>      if opts.pcsc_dev is not None:</span><br><span>                from pySim.transport.pcsc import PcscSimLink</span><br><span>                 sl = PcscSimLink(opts.pcsc_dev)</span><br><span style="color: hsl(120, 100%, 40%);">+       elif opts.osmocon_sock is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+           from pySim.transport.calypso import CalypsoSimLink</span><br><span style="color: hsl(120, 100%, 40%);">+            sl = CalypsoSimLink(sock_path=opts.osmocon_sock)</span><br><span>     else: # Serial reader is default</span><br><span>             from pySim.transport.serial import SerialSimLink</span><br><span>             sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)</span><br><span>diff --git a/pySim-read.py b/pySim-read.py</span><br><span>index 066b0df..4356453 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -56,6 +56,10 @@</span><br><span>                         help="Which PC/SC reader number for SIM access",</span><br><span>                   default=None,</span><br><span>                )</span><br><span style="color: hsl(120, 100%, 40%);">+     parser.add_option("--osmocon", dest="osmocon_sock", metavar="PATH",</span><br><span style="color: hsl(120, 100%, 40%);">+                     help="Socket path for Calypso (e.g. Motorola C1XX) based reader (via OsmocomBB)",</span><br><span style="color: hsl(120, 100%, 40%);">+                   default=None,</span><br><span style="color: hsl(120, 100%, 40%);">+         )</span><br><span> </span><br><span>        (options, args) = parser.parse_args()</span><br><span> </span><br><span>@@ -74,6 +78,9 @@</span><br><span>        if opts.pcsc_dev is not None:</span><br><span>                from pySim.transport.pcsc import PcscSimLink</span><br><span>                 sl = PcscSimLink(opts.pcsc_dev)</span><br><span style="color: hsl(120, 100%, 40%);">+       elif opts.osmocon_sock is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+           from pySim.transport.calypso import CalypsoSimLink</span><br><span style="color: hsl(120, 100%, 40%);">+            sl = CalypsoSimLink(sock_path=opts.osmocon_sock)</span><br><span>     else: # Serial reader is default</span><br><span>             from pySim.transport.serial import SerialSimLink</span><br><span>             sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11482">change 11482</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/11482"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia895ced62d29e06ae8af05cd95c9d181fb53b9df </div>
<div style="display:none"> Gerrit-Change-Number: 11482 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Assignee: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-CC: tnt <tnt@246tNt.com> </div>