From 35a96edb0dc446ed1e09a932c8f41e748f571c19 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Mon, 29 Oct 2018 02:02:14 +0700 Subject: pySim-*.py: print info about selected reader interface Change-Id: Idd791d7ef635e15915aab13274aefc15e70777b0 --- pySim-prog.py | 6 ++++++ pySim-read.py | 6 ++++++ pysim-testdata/fakemagicsim.ok | 1 + pysim-testdata/sysmoUSIM-SJS1.ok | 1 + pysim-testdata/sysmosim-gr1.ok | 1 + 5 files changed, 15 insertions(+) diff --git a/pySim-prog.py b/pySim-prog.py index d6d7ad5..2638eef 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -568,12 +568,18 @@ if __name__ == '__main__': # Init card reader driver if opts.pcsc_dev is not None: + print("Using PC/SC reader (dev=%d) interface" + % opts.pcsc_dev) from pySim.transport.pcsc import PcscSimLink sl = PcscSimLink(opts.pcsc_dev) elif opts.osmocon_sock is not None: + print("Using Calypso-based (OsmocomBB, sock=%s) reader interface" + % opts.osmocon_sock) from pySim.transport.calypso import CalypsoSimLink sl = CalypsoSimLink(sock_path=opts.osmocon_sock) else: # Serial reader is default + print("Using serial reader (port=%s, baudrate=%d) interface" + % (opts.device, opts.baudrate)) from pySim.transport.serial import SerialSimLink sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) diff --git a/pySim-read.py b/pySim-read.py index d4a9849..17fce61 100755 --- a/pySim-read.py +++ b/pySim-read.py @@ -76,12 +76,18 @@ if __name__ == '__main__': # Init card reader driver if opts.pcsc_dev is not None: + print("Using PC/SC reader (dev=%d) interface" + % opts.pcsc_dev) from pySim.transport.pcsc import PcscSimLink sl = PcscSimLink(opts.pcsc_dev) elif opts.osmocon_sock is not None: + print("Using Calypso-based (OsmocomBB, sock=%s) reader interface" + % opts.osmocon_sock) from pySim.transport.calypso import CalypsoSimLink sl = CalypsoSimLink(sock_path=opts.osmocon_sock) else: # Serial reader is default + print("Using serial reader (port=%s, baudrate=%d) interface" + % (opts.device, opts.baudrate)) from pySim.transport.serial import SerialSimLink sl = SerialSimLink(device=opts.device, baudrate=opts.baudrate) diff --git a/pysim-testdata/fakemagicsim.ok b/pysim-testdata/fakemagicsim.ok index 7de421d..a1d9e9c 100644 --- a/pysim-testdata/fakemagicsim.ok +++ b/pysim-testdata/fakemagicsim.ok @@ -1,3 +1,4 @@ +Using PC/SC reader (dev=1) interface Reading ... ICCID: 1122334455667788990 IMSI: 001010000000102 diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok index 275e79e..3bbdc90 100644 --- a/pysim-testdata/sysmoUSIM-SJS1.ok +++ b/pysim-testdata/sysmoUSIM-SJS1.ok @@ -1,3 +1,4 @@ +Using PC/SC reader (dev=0) interface Reading ... ICCID: 1122334455667788990 IMSI: 001010000000102 diff --git a/pysim-testdata/sysmosim-gr1.ok b/pysim-testdata/sysmosim-gr1.ok index 6a66cda..a1a49fd 100644 --- a/pysim-testdata/sysmosim-gr1.ok +++ b/pysim-testdata/sysmosim-gr1.ok @@ -1,3 +1,4 @@ +Using PC/SC reader (dev=2) interface Reading ... ICCID: 1122334455667788990 IMSI: 001010000000102 -- cgit v1.2.3