<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11491">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-*.py: print info about selected reader interface<br><br>Change-Id: Idd791d7ef635e15915aab13274aefc15e70777b0<br>---<br>M pySim-prog.py<br>M pySim-read.py<br>M pysim-testdata/fakemagicsim.ok<br>M pysim-testdata/sysmoUSIM-SJS1.ok<br>M pysim-testdata/sysmosim-gr1.ok<br>5 files changed, 15 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 d6d7ad5..2638eef 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -568,12 +568,18 @@</span><br><span> </span><br><span> # Init card reader driver</span><br><span> if opts.pcsc_dev is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Using PC/SC reader (dev=%d) interface"</span><br><span style="color: hsl(120, 100%, 40%);">+ % opts.pcsc_dev)</span><br><span> from pySim.transport.pcsc import PcscSimLink</span><br><span> sl = PcscSimLink(opts.pcsc_dev)</span><br><span> elif opts.osmocon_sock is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Using Calypso-based (OsmocomBB, sock=%s) reader interface"</span><br><span style="color: hsl(120, 100%, 40%);">+ % opts.osmocon_sock)</span><br><span> from pySim.transport.calypso import CalypsoSimLink</span><br><span> sl = CalypsoSimLink(sock_path=opts.osmocon_sock)</span><br><span> else: # Serial reader is default</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Using serial reader (port=%s, baudrate=%d) interface"</span><br><span style="color: hsl(120, 100%, 40%);">+ % (opts.device, opts.baudrate))</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><span>diff --git a/pySim-read.py b/pySim-read.py</span><br><span>index d4a9849..17fce61 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -76,12 +76,18 @@</span><br><span> </span><br><span> # Init card reader driver</span><br><span> if opts.pcsc_dev is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Using PC/SC reader (dev=%d) interface"</span><br><span style="color: hsl(120, 100%, 40%);">+ % opts.pcsc_dev)</span><br><span> from pySim.transport.pcsc import PcscSimLink</span><br><span> sl = PcscSimLink(opts.pcsc_dev)</span><br><span> elif opts.osmocon_sock is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Using Calypso-based (OsmocomBB, sock=%s) reader interface"</span><br><span style="color: hsl(120, 100%, 40%);">+ % opts.osmocon_sock)</span><br><span> from pySim.transport.calypso import CalypsoSimLink</span><br><span> sl = CalypsoSimLink(sock_path=opts.osmocon_sock)</span><br><span> else: # Serial reader is default</span><br><span style="color: hsl(120, 100%, 40%);">+ print("Using serial reader (port=%s, baudrate=%d) interface"</span><br><span style="color: hsl(120, 100%, 40%);">+ % (opts.device, opts.baudrate))</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><span>diff --git a/pysim-testdata/fakemagicsim.ok b/pysim-testdata/fakemagicsim.ok</span><br><span>index 7de421d..a1d9e9c 100644</span><br><span>--- a/pysim-testdata/fakemagicsim.ok</span><br><span>+++ b/pysim-testdata/fakemagicsim.ok</span><br><span>@@ -1,3 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader (dev=1) interface</span><br><span> Reading ...</span><br><span> ICCID: 1122334455667788990</span><br><span> IMSI: 001010000000102</span><br><span>diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>index 275e79e..3bbdc90 100644</span><br><span>--- a/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>+++ b/pysim-testdata/sysmoUSIM-SJS1.ok</span><br><span>@@ -1,3 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader (dev=0) interface</span><br><span> Reading ...</span><br><span> ICCID: 1122334455667788990</span><br><span> IMSI: 001010000000102</span><br><span>diff --git a/pysim-testdata/sysmosim-gr1.ok b/pysim-testdata/sysmosim-gr1.ok</span><br><span>index 6a66cda..a1a49fd 100644</span><br><span>--- a/pysim-testdata/sysmosim-gr1.ok</span><br><span>+++ b/pysim-testdata/sysmosim-gr1.ok</span><br><span>@@ -1,3 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+Using PC/SC reader (dev=2) interface</span><br><span> Reading ...</span><br><span> ICCID: 1122334455667788990</span><br><span> IMSI: 001010000000102</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11491">change 11491</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/11491"/><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: Idd791d7ef635e15915aab13274aefc15e70777b0 </div>
<div style="display:none"> Gerrit-Change-Number: 11491 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </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: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-CC: tnt <tnt@246tNt.com> </div>