public/pysim
1
0
Fork 1
mirror of https://gitea.osmocom.org/sim-card/pysim.git synced 2026-03-25 23:08:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

pySim-*.py: refactor card reader driver initialization

Browse Source 
This would facilitate adding new card reader drivers.

Change-Id: Ia893537786c95a6aab3a51fb1ba7169023d5ef97
This commit is contained in:
Vadim Yanitskiy
2018-10-27 06:30:33 +07:00
parent 1381ff15af
commit 588f3aca3c
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pySim-prog.py
View File

@@ -562,13 +562,13 @@ if __name__ == '__main__':
# Parse options # Parse options
opts = parse_options() opts = parse_options()
# Connect to the card # Init card reader driver
if opts.pcsc_dev is None: if opts.pcsc_dev is not None:
from pySim.transport.serial import SerialSimLink
sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)
else:
from pySim.transport.pcsc import PcscSimLink from pySim.transport.pcsc import PcscSimLink
sl = PcscSimLink(opts.pcsc_dev) sl = PcscSimLink(opts.pcsc_dev)
else: # Serial reader is default
from pySim.transport.serial import SerialSimLink
sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)
# Create command layer # Create command layer
scc = SimCardCommands(transport=sl) scc = SimCardCommands(transport=sl)

10
pySim-read.py
View File

@@ -70,13 +70,13 @@ if __name__ == '__main__':
# Parse options # Parse options
opts = parse_options() opts = parse_options()
# Connect to the card # Init card reader driver
if opts.pcsc_dev is None: if opts.pcsc_dev is not None:
from pySim.transport.serial import SerialSimLink
sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)
else:
from pySim.transport.pcsc import PcscSimLink from pySim.transport.pcsc import PcscSimLink
sl = PcscSimLink(opts.pcsc_dev) sl = PcscSimLink(opts.pcsc_dev)
else: # Serial reader is default
from pySim.transport.serial import SerialSimLink
sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)
# Create command layer # Create command layer
scc = SimCardCommands(transport=sl) scc = SimCardCommands(transport=sl)