From a868a1340969917acaf1cccba4516f494389dd82 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Fri, 5 Jul 2019 14:51:29 +0100 Subject: [PATCH] Fix compilation error when PCSC is enabled. --- srsue/hdr/stack/upper/pcsc_usim.h | 2 +- srsue/src/stack/upper/pcsc_usim.cc | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/srsue/hdr/stack/upper/pcsc_usim.h b/srsue/hdr/stack/upper/pcsc_usim.h index 74d8acc69..a20deeb34 100644 --- a/srsue/hdr/stack/upper/pcsc_usim.h +++ b/srsue/hdr/stack/upper/pcsc_usim.h @@ -69,7 +69,7 @@ public: bool get_imsi_vec(uint8_t* imsi_, uint32_t n); bool get_imei_vec(uint8_t* imei_, uint32_t n); - bool get_home_plmn_id(asn1::rrc::plmn_id_s* home_plmn_id); + bool get_home_plmn_id(srslte::plmn_id_t* home_plmn_id); auth_result_t generate_authentication_response(uint8_t *rand, uint8_t *autn_enb, diff --git a/srsue/src/stack/upper/pcsc_usim.cc b/srsue/src/stack/upper/pcsc_usim.cc index e20c406a1..d897f4fcb 100644 --- a/srsue/src/stack/upper/pcsc_usim.cc +++ b/srsue/src/stack/upper/pcsc_usim.cc @@ -162,7 +162,7 @@ bool pcsc_usim::get_imei_vec(uint8_t* imei_, uint32_t n) return true; } -bool pcsc_usim::get_home_plmn_id(plmn_id_s* home_plmn_id) +bool pcsc_usim::get_home_plmn_id(srslte::plmn_id_t* home_plmn_id) { if (!initiated) { ERROR("USIM not initiated!\n"); @@ -184,13 +184,12 @@ bool pcsc_usim::get_home_plmn_id(plmn_id_s* home_plmn_id) plmn_str << (int)imsi_vec[i]; } - if (not string_to_plmn_id(*home_plmn_id, plmn_str.str())) { + if (not home_plmn_id->from_string(plmn_str.str())) { log->error("Error reading home PLMN from SIM.\n"); return false; } - log->info("Read Home PLMN Id=%s\n", - plmn_id_to_string(*home_plmn_id).c_str()); + log->info("Read Home PLMN Id=%s\n", plmn_str.str().c_str()); return true; }