laforge has uploaded this change for review.

View Change

cards: all UICC should use sel_ctrl="0400" and SIM "0000"

Hence move this from the derived classes into the respective base
classes SimCardBase and UiccCardBase

Change-Id: Iad197c2b560c5ea05c54a122144361de5742aafd
---
M pySim/cards.py
M pySim/legacy/cards.py
2 files changed, 14 insertions(+), 6 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/97/33697/1

diff --git a/pySim/cards.py b/pySim/cards.py
index 5ee8b4a..4598217 100644
--- a/pySim/cards.py
+++ b/pySim/cards.py
@@ -79,6 +79,7 @@
     def __init__(self, scc: LinkBase):
         super(SimCardBase, self).__init__(scc)
         self._scc.cla_byte = "A0"
+        self._scc.sel_ctrl = "0000"
 
     name = 'SIM'
 
@@ -89,6 +90,7 @@
     def __init__(self, scc: LinkBase):
         super(UiccCardBase, self).__init__(scc)
         self._scc.cla_byte = "00"
+        self._scc.sel_ctrl = "0004"  # request an FCP
 	    # See also: ETSI TS 102 221, Table 9.3
         self._adm_chv_num = 0xA0
 
diff --git a/pySim/legacy/cards.py b/pySim/legacy/cards.py
index b865d4b..6a63182 100644
--- a/pySim/legacy/cards.py
+++ b/pySim/legacy/cards.py
@@ -892,7 +892,6 @@
 
     def __init__(self, ssc):
         super(SysmoUSIMSJS1, self).__init__(ssc)
-        self._scc.sel_ctrl = "0004"  # request an FCP
 
     @classmethod
     def autodetect(kls, scc):
@@ -1204,7 +1203,6 @@
     def __init__(self, ssc):
         super(WavemobileSim, self).__init__(ssc)
         self._adm_chv_num = 0x0A
-        self._scc.sel_ctrl = "0004"  # request an FCP
 
     @classmethod
     def autodetect(kls, scc):
@@ -1296,10 +1294,6 @@
 
     name = 'sysmoISIM-SJA2'
 
-    def __init__(self, ssc):
-        super(SysmoISIMSJA2, self).__init__(ssc)
-        self._scc.sel_ctrl = "0004"  # request an FCP
-
     @classmethod
     def autodetect(kls, scc):
         try:

To view, visit change 33697. To unsubscribe, or for help writing mail filters, visit settings.