diff options
| author | Vadim Yanitskiy <axilirator@gmail.com> | 2018-12-25 01:18:41 +0700 |
|---|---|---|
| committer | Vadim Yanitskiy <axilirator@gmail.com> | 2018-12-26 20:52:18 +0000 |
| commit | e11725aa868c8093288d0e1985854e15c7cb46e9 (patch) | |
| tree | fd60d677eb3128820a702fb040ce47908f8bcd85 /src/host/layer23/src/mobile/subscriber.c | |
| parent | b9073067c67196b4281ed57d5385a273fdab0406 (diff) | |
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
Diffstat (limited to 'src/host/layer23/src/mobile/subscriber.c')
| -rw-r--r-- | src/host/layer23/src/mobile/subscriber.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/host/layer23/src/mobile/subscriber.c b/src/host/layer23/src/mobile/subscriber.c index 7a011411..097f7859 100644 --- a/src/host/layer23/src/mobile/subscriber.c +++ b/src/host/layer23/src/mobile/subscriber.c @@ -711,7 +711,7 @@ void gsm_subscr_sim_pin(struct osmocom_ms *ms, char *pin1, char *pin2, 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 @@ int gsm_subscr_simcard(struct osmocom_ms *ms) 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 @@ static int subscr_write_plmn_na(struct osmocom_ms *ms) #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 @@ int gsm_subscr_write_loci(struct osmocom_ms *ms) 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 @@ int gsm_subscr_generate_kc(struct osmocom_ms *ms, uint8_t key_seq, 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; |