catarrh/pysim
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/pysim.git synced 2026-03-19 20:08:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

pySim-prog, pySim-read, do not echo reader id

Browse Source 
pySim-prog and pySim-read currently echo back the pcsc reader id (or
baudrate/socket, depending on the interface used). This makes the output
unecessarly undeterministic, which becomes a problem when verifying the
putput in tests. Lets not echo those variable, user supplied parameters
back. Also lets move the code that does the initalization to utils, so
that it can be used from pySim-prog and from pySim-read (code dup).

Change-Id: I243cc332f075d007b1c111292effcc610e874eb3
Related: OS#4503
This commit is contained in:
Philipp Maier
2020-05-12 17:24:18 +02:00
committed by laforge
parent b689754b49
commit ff84c23839
10 changed files with 32 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pySim/utils.py
View File

@@ -436,3 +436,22 @@ def dec_epdgid(hexstr):
s += "\t%s # %s\n" % (i2h(content), i2s(content))
return s
def init_reader(opts):
"""
Init card reader driver
"""
if opts.pcsc_dev is not None:
print("Using PC/SC reader interface")
from pySim.transport.pcsc import PcscSimLink
sl = PcscSimLink(opts.pcsc_dev)
elif opts.osmocon_sock is not None:
print("Using Calypso-based (OsmocomBB) reader interface")
from pySim.transport.calypso import CalypsoSimLink
sl = CalypsoSimLink(sock_path=opts.osmocon_sock)
else: # Serial reader is default
print("Using serial reader interface")
from pySim.transport.serial import SerialSimLink
sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate)
return sl