ts_51_011, utils: fix Access Technology Identifier coding
When the Access Technology Identifier encoder sets the bits for E-UTRAN
it does not respect that bit "100" is also a valid bit combination that
encodes E-UTRAN WB-S1 and E-UTRAN NB-S1. Lets encode this bit
combination if the user is just specifying "E-UTRAN" without further
spefication of WB or NB.
The decoder only looks at bit 14 and decodes "1xx" always to "E-UTRAN".
This is not specific enough. Lets make sure that the decoder is
complementary to the encoder.
Change-Id: Ibfe8883a05f9ad6988d8e212cb9a598229954296
Related: OS#4963
diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py
index 7e8e627..4189e6e 100644
--- a/pySim/ts_51_011.py
+++ b/pySim/ts_51_011.py
@@ -707,6 +707,8 @@
if 'cdma2000 1xRTT' in in_list:
u16 |= 0x0010
# E-UTRAN
+ if 'E-UTRAN' in in_list:
+ u16 |= 0x4000
if 'E-UTRAN WB-S1' in in_list:
u16 |= 0x6000
if 'E-UTRAN NB-S1' in in_list:
diff --git a/pySim/utils.py b/pySim/utils.py
index 2253482..e268e42 100644
--- a/pySim/utils.py
+++ b/pySim/utils.py
@@ -230,7 +230,20 @@
sel = []
for a in act_list:
if u16t & (1 << a['bit']):
- sel.append(a['name'])
+ if a['name'] == "E-UTRAN":
+ # The Access technology identifier of E-UTRAN
+ # allows a more detailed specification:
+ if u16t & (1 << 13) and u16t & (1 << 12):
+ sel.append("E-UTRAN WB-S1")
+ sel.append("E-UTRAN NB-S1")
+ elif u16t & (1 << 13):
+ sel.append("E-UTRAN WB-S1")
+ elif u16t & (1 << 12):
+ sel.append("E-UTRAN NB-S1")
+ else:
+ sel.append("E-UTRAN")
+ else:
+ sel.append(a['name'])
return sel
def dec_xplmn_w_act(fivehexbytes:Hexstr) -> Dict[str,Any]: