Change in osmocom-bb[master]: host/layer23: rename GSM_SIM_TYPE_READER to GSM_SIM_TYPE_L1PHY

[Vadim Yanitskiy]

Vadim Yanitskiy has uploaded this change for review. ( https://gerrit.osmocom.org/12428


Change subject: host/layer23: rename GSM_SIM_TYPE_READER to GSM_SIM_TYPE_L1PHY
......................................................................

host/layer23: rename GSM_SIM_TYPE_READER to GSM_SIM_TYPE_L1PHY

Since we have two ways to interact with a physical SIM:

  - using built-in SIM reader of the L1 PHY (via L1CTL),
  - using remote reader via (BT)SAP protocol,

name 'GSM_SIM_TYPE_READER' looks quite confusing. Let's rename it
in order to explicitly indicate the role of L1 PHY.

Change-Id: I0f83f365ed50cfd658fdd3a9d6866ed76c8c4009
---
M src/host/layer23/include/osmocom/bb/mobile/subscriber.h
M src/host/layer23/src/mobile/app_mobile.c
M src/host/layer23/src/mobile/settings.c
M src/host/layer23/src/mobile/subscriber.c
M src/host/layer23/src/mobile/vty_interface.c
5 files changed, 10 insertions(+), 10 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/28/12428/1

diff --git a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h
index ac785d4..958700a 100644
--- a/src/host/layer23/include/osmocom/bb/mobile/subscriber.h
+++ b/src/host/layer23/include/osmocom/bb/mobile/subscriber.h
@@ -22,7 +22,7 @@
 
 enum {
 	GSM_SIM_TYPE_NONE = 0,
-	GSM_SIM_TYPE_READER,
+	GSM_SIM_TYPE_L1PHY,
 	GSM_SIM_TYPE_TEST,
 	GSM_SIM_TYPE_SAP
 };
diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c
index 84dec86..17c0c76 100644
--- a/src/host/layer23/src/mobile/app_mobile.c
+++ b/src/host/layer23/src/mobile/app_mobile.c
@@ -110,7 +110,7 @@
 
 		/* insert test card, if enabled */
 		switch (set->sim_type) {
-		case GSM_SIM_TYPE_READER:
+		case GSM_SIM_TYPE_L1PHY:
 			/* trigger sim card reader process */
 			gsm_subscr_simcard(ms);
 			break;
diff --git a/src/host/layer23/src/mobile/settings.c b/src/host/layer23/src/mobile/settings.c
index a4bb4e3..388c754 100644
--- a/src/host/layer23/src/mobile/settings.c
+++ b/src/host/layer23/src/mobile/settings.c
@@ -49,7 +49,7 @@
 	sprintf(set->imeisv, "0000000000000000");
 
 	/* SIM type */
-	set->sim_type = GSM_SIM_TYPE_READER;
+	set->sim_type = GSM_SIM_TYPE_L1PHY;
 
 	/* test SIM */
 	strcpy(set->test_imsi, "001010000000000");
diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c
index 7a01141..097f785 100644
--- a/src/host/layer23/src/mobile/subscriber.c
+++ b/src/host/layer23/src/mobile/subscriber.c
@@ -711,7 +711,7 @@
 	uint8_t job;
 
 	/* skip, if no real valid SIM */
-	if (subscr->sim_type != GSM_SIM_TYPE_READER)
+	if (subscr->sim_type != GSM_SIM_TYPE_L1PHY)
 		return;
 
 	switch (mode) {
@@ -764,7 +764,7 @@
 	gsm_subscr_exit(ms);
 	gsm_subscr_init(ms);
 
-	subscr->sim_type = GSM_SIM_TYPE_READER;
+	subscr->sim_type = GSM_SIM_TYPE_L1PHY;
 	sprintf(subscr->sim_name, "sim");
 	subscr->sim_valid = 1;
 	subscr->ustate = GSM_SIM_U2_NOT_UPDATED;
@@ -790,7 +790,7 @@
 #endif
 
 	/* skip, if no real valid SIM */
-	if (subscr->sim_type != GSM_SIM_TYPE_READER || !subscr->sim_valid)
+	if (subscr->sim_type != GSM_SIM_TYPE_L1PHY || !subscr->sim_valid)
 		return 0;
 
 	/* get tail list from "PLMN not allowed" */
@@ -844,7 +844,7 @@
 	struct gsm1111_ef_loci *loci;
 
 	/* skip, if no real valid SIM */
-	if (subscr->sim_type != GSM_SIM_TYPE_READER || !subscr->sim_valid)
+	if (subscr->sim_type != GSM_SIM_TYPE_L1PHY || !subscr->sim_valid)
 		return 0;
 
 	LOGP(DMM, LOGL_INFO, "Updating LOCI on SIM\n");
@@ -907,7 +907,7 @@
 	struct sim_hdr *nsh;
 
 	/* not a SIM */
-	if ((subscr->sim_type != GSM_SIM_TYPE_READER
+	if ((subscr->sim_type != GSM_SIM_TYPE_L1PHY
 	  && subscr->sim_type != GSM_SIM_TYPE_TEST)
 	 || !subscr->sim_valid || no_sim) {
 		struct gsm48_mm_event *nmme;
diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c
index a0ad993..2001b88 100644
--- a/src/host/layer23/src/mobile/vty_interface.c
+++ b/src/host/layer23/src/mobile/vty_interface.c
@@ -1323,7 +1323,7 @@
 		case GSM_SIM_TYPE_NONE:
 		vty_out(vty, " sim none%s", VTY_NEWLINE);
 		break;
-		case GSM_SIM_TYPE_READER:
+		case GSM_SIM_TYPE_L1PHY:
 		vty_out(vty, " sim reader%s", VTY_NEWLINE);
 		break;
 		case GSM_SIM_TYPE_TEST:
@@ -1608,7 +1608,7 @@
 		set->sim_type = GSM_SIM_TYPE_NONE;
 		break;
 	case 'r':
-		set->sim_type = GSM_SIM_TYPE_READER;
+		set->sim_type = GSM_SIM_TYPE_L1PHY;
 		break;
 	case 't':
 		set->sim_type = GSM_SIM_TYPE_TEST;

-- 
To view, visit https://gerrit.osmocom.org/12428
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f83f365ed50cfd658fdd3a9d6866ed76c8c4009
Gerrit-Change-Number: 12428
Gerrit-PatchSet: 1
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181224/315ae776/attachment.htm>