From 5933c3b88d4decbae73b81d20fe5bceaba17eaab Mon Sep 17 00:00:00 2001
From: Robert Falkenberg <robert.falkenberg@tu-dortmund.de>
Date: Mon, 17 May 2021 18:24:23 +0200
Subject: [PATCH] pySim-read: adjust meaning of HPLMN/OPLMN flags in EF_SPN

The updated wording better reflects the actual meaning
of a set or unset flag, especially as OPLMN is inverted.

Change-Id: I65c6f0e9bc1a12a4a74c4274eebb8e612296888f
---
 pySim-read.py                    | 4 ++--
 pysim-testdata/Fairwaves-SIM.ok  | 4 ++--
 pysim-testdata/Wavemobile-SIM.ok | 4 ++--
 pysim-testdata/fakemagicsim.ok   | 4 ++--
 pysim-testdata/sysmoISIM-SJA2.ok | 4 ++--
 pysim-testdata/sysmoUSIM-SJS1.ok | 4 ++--
 pysim-testdata/sysmosim-gr1.ok   | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pySim-read.py b/pySim-read.py
index 1614a390..1f2e1238 100755
--- a/pySim-read.py
+++ b/pySim-read.py
@@ -126,8 +126,8 @@ if __name__ == '__main__':
 		(res, sw) = card.read_spn()
 		if sw == '9000':
 			print("SPN: %s" % (res[0] or "Not available"))
-			print("Display HPLMN: %s" % (res[1],))
-			print("Display OPLMN: %s" % (res[2],))
+			print("Show in HPLMN: %s" % (res[1],))
+			print("Hide in OPLMN: %s" % (res[2],))
 		else:
 			print("SPN: Can't read, response code = %s" % (sw,))
 	except Exception as e:
diff --git a/pysim-testdata/Fairwaves-SIM.ok b/pysim-testdata/Fairwaves-SIM.ok
index eebf9658..2a912e2b 100644
--- a/pysim-testdata/Fairwaves-SIM.ok
+++ b/pysim-testdata/Fairwaves-SIM.ok
@@ -7,8 +7,8 @@ GID1: ffffffffffffffff
 GID2: ffffffffffffffff
 SMSP: e1ffffffffffffffffffffffff0581005155f5ffffffffffff000000ffffffffffffffffffffffffffff
 SPN: Fairwaves
-Display HPLMN: False
-Display OPLMN: False
+Show in HPLMN: False
+Hide in OPLMN: False
 PLMNsel: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 PLMNwAcT:
 	ffffff0000 # unused
diff --git a/pysim-testdata/Wavemobile-SIM.ok b/pysim-testdata/Wavemobile-SIM.ok
index a6bdeaaf..0eb8cc82 100644
--- a/pysim-testdata/Wavemobile-SIM.ok
+++ b/pysim-testdata/Wavemobile-SIM.ok
@@ -7,8 +7,8 @@ GID1: Can't read file -- SW match failed! Expected 9000 and got 6a82.
 GID2: Can't read file -- SW match failed! Expected 9000 and got 6a82.
 SMSP: e1ffffffffffffffffffffffff0581005155f5ffffffffffff000000ffffffffffffffffffffffffffff
 SPN: wavemobile
-Display HPLMN: False
-Display OPLMN: False
+Show in HPLMN: False
+Hide in OPLMN: False
 PLMNsel: 00f110ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 PLMNwAcT:
 	00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT
diff --git a/pysim-testdata/fakemagicsim.ok b/pysim-testdata/fakemagicsim.ok
index 11296f5a..805b3606 100644
--- a/pysim-testdata/fakemagicsim.ok
+++ b/pysim-testdata/fakemagicsim.ok
@@ -8,8 +8,8 @@ GID1: Can't read file -- SW match failed! Expected 9000 and got 9404.
 GID2: Can't read file -- SW match failed! Expected 9000 and got 9404.
 SMSP: ffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000
 SPN: Magic
-Display HPLMN: True
-Display OPLMN: False
+Show in HPLMN: True
+Hide in OPLMN: False
 PLMNsel: 00f110ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 PLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404.
 OPLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404.
diff --git a/pysim-testdata/sysmoISIM-SJA2.ok b/pysim-testdata/sysmoISIM-SJA2.ok
index 8a5d30a3..87cb8578 100644
--- a/pysim-testdata/sysmoISIM-SJA2.ok
+++ b/pysim-testdata/sysmoISIM-SJA2.ok
@@ -7,8 +7,8 @@ GID1: ffffffffffffffffffff
 GID2: ffffffffffffffffffff
 SMSP: ffffffffffffffffffffffffffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000
 SPN: Magic
-Display HPLMN: True
-Display OPLMN: True
+Show in HPLMN: True
+Hide in OPLMN: True
 PLMNsel: 00f110ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 PLMNwAcT:
 	00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT
diff --git a/pysim-testdata/sysmoUSIM-SJS1.ok b/pysim-testdata/sysmoUSIM-SJS1.ok
index ab15f103..e65f276d 100644
--- a/pysim-testdata/sysmoUSIM-SJS1.ok
+++ b/pysim-testdata/sysmoUSIM-SJS1.ok
@@ -7,8 +7,8 @@ GID1: ffffffffffffffffffff
 GID2: ffffffffffffffffffff
 SMSP: ffffffffffffffffffffffffffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000
 SPN: Magic
-Display HPLMN: True
-Display OPLMN: True
+Show in HPLMN: True
+Hide in OPLMN: True
 PLMNsel: 00f110ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 PLMNwAcT:
 	00f110ffff # MCC: 001 MNC: 01 AcT: UTRAN, E-UTRAN WB-S1, E-UTRAN NB-S1, GSM, GSM COMPACT, cdma2000 HRPD, cdma2000 1xRTT
diff --git a/pysim-testdata/sysmosim-gr1.ok b/pysim-testdata/sysmosim-gr1.ok
index 3aff2a39..60c568b3 100644
--- a/pysim-testdata/sysmosim-gr1.ok
+++ b/pysim-testdata/sysmosim-gr1.ok
@@ -8,8 +8,8 @@ GID1: Can't read file -- SW match failed! Expected 9000 and got 9404.
 GID2: Can't read file -- SW match failed! Expected 9000 and got 9404.
 SMSP: ffffffffffffffffffffffffe1ffffffffffffffffffffffff0581005155f5ffffffffffff000000
 SPN: Not available
-Display HPLMN: False
-Display OPLMN: False
+Show in HPLMN: False
+Hide in OPLMN: False
 PLMNsel: 00f110ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 PLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404.
 OPLMNwAcT: Can't read file -- SW match failed! Expected 9000 and got 9404.