<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11481">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-*.py: refactor card reader driver initialization<br><br>This would facilitate adding new card reader drivers.<br><br>Change-Id: Ia893537786c95a6aab3a51fb1ba7169023d5ef97<br>---<br>M pySim-prog.py<br>M pySim-read.py<br>2 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/pysim refs/changes/81/11481/1</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 ae5e482..ba1b783 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -562,13 +562,13 @@</span><br><span>       # Parse options</span><br><span>      opts = parse_options()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      # Connect to the card</span><br><span style="color: hsl(0, 100%, 40%);">-   if opts.pcsc_dev is None:</span><br><span style="color: hsl(0, 100%, 40%);">-               from pySim.transport.serial import SerialSimLink</span><br><span style="color: hsl(0, 100%, 40%);">-                sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)</span><br><span style="color: hsl(0, 100%, 40%);">-  else:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Init card reader driver</span><br><span style="color: hsl(120, 100%, 40%);">+     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%);">+       else: # Serial reader is default</span><br><span style="color: hsl(120, 100%, 40%);">+              from pySim.transport.serial import SerialSimLink</span><br><span style="color: hsl(120, 100%, 40%);">+              sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)</span><br><span> </span><br><span>   # Create command layer</span><br><span>       scc = SimCardCommands(transport=sl)</span><br><span>diff --git a/pySim-read.py b/pySim-read.py</span><br><span>index e807e3e..066b0df 100755</span><br><span>--- a/pySim-read.py</span><br><span>+++ b/pySim-read.py</span><br><span>@@ -70,13 +70,13 @@</span><br><span>   # Parse options</span><br><span>      opts = parse_options()</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      # Connect to the card</span><br><span style="color: hsl(0, 100%, 40%);">-   if opts.pcsc_dev is None:</span><br><span style="color: hsl(0, 100%, 40%);">-               from pySim.transport.serial import SerialSimLink</span><br><span style="color: hsl(0, 100%, 40%);">-                sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)</span><br><span style="color: hsl(0, 100%, 40%);">-  else:</span><br><span style="color: hsl(120, 100%, 40%);">+ # Init card reader driver</span><br><span style="color: hsl(120, 100%, 40%);">+     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%);">+       else: # Serial reader is default</span><br><span style="color: hsl(120, 100%, 40%);">+              from pySim.transport.serial import SerialSimLink</span><br><span style="color: hsl(120, 100%, 40%);">+              sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)</span><br><span> </span><br><span>   # Create command layer</span><br><span>       scc = SimCardCommands(transport=sl)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11481">change 11481</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/11481"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ia893537786c95a6aab3a51fb1ba7169023d5ef97 </div>
<div style="display:none"> Gerrit-Change-Number: 11481 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>