May 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-trx[master]: devices: add freq/gain override for uhd

by pespin

Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32764 ) Change subject: devices: add freq/gain override for uhd ...................................................................... Patch Set 5: (5 comments) Patchset: PS5: commit description should be updated with more context regarding the use case. File Transceiver52M/device/uhd/UHDDevice.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/32764/comment/02c068bc_a3f4bf64 PS5, Line 298: if (cfg->overrides.ul_freq_override) I'm lost here. You are skipping setting the gain below if the ul frequency is overriden? why? https://gerrit.osmocom.org/c/osmo-trx/+/32764/comment/beacc409_6995352a PS5, Line 344: return 0.0f; I would expect the power atenuattion to be set to the overwriten value instead of returning? https://gerrit.osmocom.org/c/osmo-trx/+/32764/comment/6e73ed99_848f945b PS5, Line 635: if (cfg->overrides.dl_freq_override) { why are you doing it here instead of the place where the freq/gain is supposed to be updated? https://gerrit.osmocom.org/c/osmo-trx/+/32764/comment/aa8d7095_cb99a14b PS5, Line 1013: if (cfg->overrides.dl_freq_override || cfg->overrides.ul_freq_override) I would expected the overwritten frequency to be set here? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3c1b9a067cafc6d696b9aa2da8ee0480ec1e094f Gerrit-Change-Number: 32764 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 17 May 2023 17:12:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[L] Change in osmo-trx[master]: devices: unify band handling

by pespin

Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32763 ) Change subject: devices: unify band handling ...................................................................... Patch Set 5: (4 comments) Patchset: PS5: I don't personally see a big win with this, but fine with merging once the comments are discussed/addressed. File Transceiver52M/device/bladerf/bladerf.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/32763/comment/ce6b1b08_bf60e37e PS5, Line 405: reset(); where does this reset() come from? now that there's 2 superclasses it's a bit confusing. File Transceiver52M/device/common/bandmanager.h: https://gerrit.osmocom.org/c/osmo-trx/+/32763/comment/4a8aacc9_54d26c13 PS5, Line 100: void reset() ah here it is. band_reset() would be more descriptive imho. File Transceiver52M/device/lms/LMSDevice.h: https://gerrit.osmocom.org/c/osmo-trx/+/32763/comment/3449ae57_eded47b1 PS5, Line 97: using dev_band_key = std::tuple<lms_dev_type, gsm_band>; dev_band_key_t? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I64f5a462451e967d4750d8e4f1d5832cbab41cff Gerrit-Change-Number: 32763 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 17 May 2023 17:07:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[L] Change in osmo-trx[master]: transceiver: pass cfg struct instead of args

by pespin

Attention is currently required from: Hoernchen. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/32762 ) Change subject: transceiver: pass cfg struct instead of args ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: I find it difficult to review this patch because afaict there's several steps merged int one: - replacement of constructor params at different levels (could already be more than one patch) - replacement of open() method params - some sort of change with dev_args which I fail to easily understand with all the code changing around, and which looks at first glance unrelated to this patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I48386900d15ff4d770c70a4efc246d32f921904b Gerrit-Change-Number: 32762 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Wed, 17 May 2023 16:58:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[L] Change in osmo-trx[master]: devices: unify band handling

by Hoernchen

Attention is currently required from: Hoernchen. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/32763 to look at the new patch set (#5). Change subject: devices: unify band handling ...................................................................... devices: unify band handling This is basically common, but optional code. Change-Id: I64f5a462451e967d4750d8e4f1d5832cbab41cff --- M Transceiver52M/device/bladerf/bladerf.cpp M Transceiver52M/device/bladerf/bladerf.h A Transceiver52M/device/common/bandmanager.h M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h M Transceiver52M/device/uhd/UHDDevice.cpp M Transceiver52M/device/uhd/UHDDevice.h 7 files changed, 241 insertions(+), 325 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/63/32763/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I64f5a462451e967d4750d8e4f1d5832cbab41cff Gerrit-Change-Number: 32763 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[L] Change in osmo-trx[master]: transceiver: pass cfg struct instead of args

by Hoernchen

Attention is currently required from: Hoernchen. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/32762 to look at the new patch set (#3). Change subject: transceiver: pass cfg struct instead of args ...................................................................... transceiver: pass cfg struct instead of args Passing 7 args is a bit much, just pass the config struct instead. Change-Id: I48386900d15ff4d770c70a4efc246d32f921904b --- M CommonLibs/trx_vty.c M Transceiver52M/device/bladerf/bladerf.cpp M Transceiver52M/device/bladerf/bladerf.h M Transceiver52M/device/common/radioDevice.h M Transceiver52M/device/ipc/IPCDevice.cpp M Transceiver52M/device/ipc/IPCDevice.h M Transceiver52M/device/ipc/uhdwrap.cpp M Transceiver52M/device/ipc/uhdwrap.h M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h M Transceiver52M/device/uhd/UHDDevice.cpp M Transceiver52M/device/uhd/UHDDevice.h M Transceiver52M/device/usrp1/USRPDevice.cpp M Transceiver52M/device/usrp1/USRPDevice.h M Transceiver52M/osmo-trx.cpp 15 files changed, 161 insertions(+), 180 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/62/32762/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I48386900d15ff4d770c70a4efc246d32f921904b Gerrit-Change-Number: 32762 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: ctrl: Add bsic

by matanp

matanp has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32766 ) Change subject: ctrl: Add bsic ...................................................................... ctrl: Add bsic Change-Id: I5c941770924e5373733c3a3939671fab518f7a58 --- M src/osmo-bsc/bts_ctrl.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/66/32766/1 diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index 353af7f..5d90b4d 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -248,6 +248,7 @@ /* BTS related commands below */ CTRL_CMD_DEFINE_RANGE(bts_lac, "location-area-code", struct gsm_bts, location_area_code, 0, 65535); CTRL_CMD_DEFINE_RANGE(bts_ci, "cell-identity", struct gsm_bts, cell_identity, 0, 65535); +CTRL_CMD_DEFINE_RANGE(bts_bsic, "bsic", struct gsm_bts, bsic, 0, 63); static int set_bts_apply_config(struct ctrl_cmd *cmd, void *data) { @@ -1045,6 +1046,7 @@ rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_loc); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_lac); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_ci); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_bsic); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_apply_config); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_si); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_power_ctrl_defs); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5c941770924e5373733c3a3939671fab518f7a58 Gerrit-Change-Number: 32766 Gerrit-PatchSet: 1 Gerrit-Owner: matanp <matan1008(a)gmail.com> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[L] Change in osmo-trx[master]: trasnceiver: pass cfg struct instead of args

by Hoernchen

Attention is currently required from: Hoernchen. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/32762 to look at the new patch set (#2). Change subject: trasnceiver: pass cfg struct instead of args ...................................................................... trasnceiver: pass cfg struct instead of args Passing 7 args is a bit much, just pass the config struct instead. Change-Id: I48386900d15ff4d770c70a4efc246d32f921904b --- M CommonLibs/trx_vty.c M Transceiver52M/device/bladerf/bladerf.cpp M Transceiver52M/device/bladerf/bladerf.h M Transceiver52M/device/common/radioDevice.h M Transceiver52M/device/ipc/IPCDevice.cpp M Transceiver52M/device/ipc/IPCDevice.h M Transceiver52M/device/ipc/uhdwrap.cpp M Transceiver52M/device/ipc/uhdwrap.h M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h M Transceiver52M/device/uhd/UHDDevice.cpp M Transceiver52M/device/uhd/UHDDevice.h M Transceiver52M/device/usrp1/USRPDevice.cpp M Transceiver52M/device/usrp1/USRPDevice.h M Transceiver52M/osmo-trx.cpp 15 files changed, 161 insertions(+), 180 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/62/32762/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I48386900d15ff4d770c70a4efc246d32f921904b Gerrit-Change-Number: 32762 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[L] Change in osmo-trx[master]: devices: unify band handling

by Hoernchen

Attention is currently required from: Hoernchen. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/32763 to look at the new patch set (#2). Change subject: devices: unify band handling ...................................................................... devices: unify band handling This is basically common, but optional code. Change-Id: I64f5a462451e967d4750d8e4f1d5832cbab41cff --- M Transceiver52M/device/bladerf/bladerf.cpp M Transceiver52M/device/bladerf/bladerf.h A Transceiver52M/device/common/bandmanager.h M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h M Transceiver52M/device/uhd/UHDDevice.cpp M Transceiver52M/device/uhd/UHDDevice.h 7 files changed, 240 insertions(+), 325 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/63/32763/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I64f5a462451e967d4750d8e4f1d5832cbab41cff Gerrit-Change-Number: 32763 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[M] Change in osmocom-bb[master]: WIP: layer23: subscriber: Implement LOCIGPRS read/write for simcard b...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32765 ) Change subject: WIP: layer23: subscriber: Implement LOCIGPRS read/write for simcard backend ...................................................................... WIP: layer23: subscriber: Implement LOCIGPRS read/write for simcard backend Change-Id: Ida5bcfc896c75c238e2eb2d0aee742ae36fb5e16 --- M src/host/layer23/include/osmocom/bb/common/subscriber.h M src/host/layer23/src/common/subscriber.c 2 files changed, 139 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/65/32765/1 diff --git a/src/host/layer23/include/osmocom/bb/common/subscriber.h b/src/host/layer23/include/osmocom/bb/common/subscriber.h index 972f613..b6ba65a 100644 --- a/src/host/layer23/include/osmocom/bb/common/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/common/subscriber.h @@ -5,6 +5,7 @@ #include <osmocom/core/utils.h> #include <osmocom/gsm/protocol/gsm_23_003.h> +#include <osmocom/gsm/gsm48.h> /* GSM 04.08 4.1.2.2 SIM update status */ enum gsm_sub_sim_ustate { @@ -57,7 +58,6 @@ /* TMSI / LAI */ uint32_t tmsi; /* invalid tmsi: GSM_RESERVED_TMSI */ - uint32_t ptmsi; /* invalid tmsi: GSM_RESERVED_TMSI */ uint16_t mcc, mnc, lac; /* invalid lac: 0x0000 */ @@ -96,6 +96,13 @@ /* SMS */ char sms_sca[22]; + + struct { + uint8_t gu_state; /* GU, TS 24.008 */ + struct gprs_ra_id rai; + uint32_t ptmsi; /* invalid tmsi: GSM_RESERVED_TMSI */ + uint32_t ptmsi_sig; /* P-TMSI signature, 3 bytes */ + } gprs; }; int gsm_subscr_init(struct osmocom_ms *ms); @@ -108,6 +115,7 @@ int gsm_subscr_sim_pin(struct osmocom_ms *ms, const char *pin1, const char *pin2, int8_t mode); int gsm_subscr_write_loci(struct osmocom_ms *ms); +int gsm_subscr_write_locigprs(struct osmocom_ms *ms); int gsm_subscr_generate_kc(struct osmocom_ms *ms, uint8_t key_seq, const uint8_t *rand, bool no_sim); void new_sim_ustate(struct gsm_subscriber *subscr, int state); diff --git a/src/host/layer23/src/common/subscriber.c b/src/host/layer23/src/common/subscriber.c index c1f9806..5db7169 100644 --- a/src/host/layer23/src/common/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -58,6 +58,8 @@ static int gsm_subscr_write_loci_simcard(struct osmocom_ms *ms); +static int gsm_subscr_write_locigprs_simcard(struct osmocom_ms *ms); + static int gsm_subscr_sim_pin_simcard(struct osmocom_ms *ms, const char *pin1, const char *pin2, int8_t mode); @@ -105,7 +107,7 @@ /* set TMSI / LAC invalid */ subscr->tmsi = GSM_RESERVED_TMSI; - subscr->ptmsi = GSM_RESERVED_TMSI; + subscr->gprs.ptmsi = GSM_RESERVED_TMSI; subscr->lac = 0x0000; /* set key invalid */ @@ -305,6 +307,29 @@ } } +/* update LOCIGPRS on SIM */ +int gsm_subscr_write_locigprs(struct osmocom_ms *ms) +{ + struct gsm_subscriber *subscr = &ms->subscr; + + /* skip, if no real valid SIM */ + if (subscr->sim_type == GSM_SIM_TYPE_NONE || !subscr->sim_valid) + return 0; + + LOGP(DMM, LOGL_INFO, "Updating LOCIGPRS on SIM\n"); + + switch (subscr->sim_type) { + case GSM_SIM_TYPE_L1PHY: + case GSM_SIM_TYPE_SAP: + return gsm_subscr_write_locigprs_simcard(ms); + case GSM_SIM_TYPE_TEST: + LOGP(DMM, LOGL_NOTICE, "Updating LOCIGPRS on test SIM: not implemented!\n"); + return 0; /* TODO */ + default: + OSMO_ASSERT(0); + } +} + /* update plmn not allowed list on SIM */ static int subscr_write_plmn_na(struct osmocom_ms *ms) { @@ -452,8 +477,8 @@ (subscr->imsi_attached) ? "attached" : "detached"); if (subscr->tmsi != GSM_RESERVED_TMSI) print(priv, " TMSI 0x%08x", subscr->tmsi); - if (subscr->ptmsi != GSM_RESERVED_TMSI) - print(priv, " P-TMSI 0x%08x", subscr->ptmsi); + if (subscr->gprs.ptmsi != GSM_RESERVED_TMSI) + print(priv, " P-TMSI 0x%08x", subscr->gprs.ptmsi); if (subscr->lac > 0x0000 && subscr->lac < 0xfffe) { print(priv, "\n"); print(priv, " LAI: MCC %s MNC %s LAC 0x%04x " @@ -534,7 +559,7 @@ subscr->mnc = set->test_sim.rplmn_mnc; subscr->lac = set->test_sim.lac; subscr->tmsi = set->test_sim.tmsi; - subscr->ptmsi = GSM_RESERVED_TMSI; + subscr->gprs.ptmsi = GSM_RESERVED_TMSI; subscr->always_search_hplmn = set->test_sim.always; subscr->t6m_hplmn = 1; /* try to find home network every 6 min */ OSMO_STRLCPY_ARRAY(subscr->imsi, set->test_sim.imsi); @@ -677,6 +702,45 @@ return 0; } +static int subscr_sim_locigprs(struct osmocom_ms *ms, uint8_t *data, + uint8_t length) +{ + struct gsm_subscriber *subscr = &ms->subscr; + struct gsm1111_ef_locigprs *locigprs; + + if (length < 11) + return -EINVAL; + locigprs = (struct gsm1111_ef_locigprs *) data; + + /* P-TMSI, P-TMSI signature */ + subscr->gprs.ptmsi = ntohl(locigprs->ptmsi); + subscr->gprs.ptmsi_sig = (((uint32_t)locigprs->ptmsi_sig_hi) << 8) | locigprs->ptmsi_sig_lo; + + /* LAI */ + gsm48_decode_rai_hex(&locigprs->rai, &subscr->gprs.rai.mcc, &subscr->gprs.rai.mnc, + &subscr->gprs.rai.lac, &subscr->gprs.rai.rac); + /* TODO: ^ implement gsm48_decode_rai_hex in libosmocore */ + + /* routing area update status */ + switch (locigprs->rau_status & 0x07) { + case GSM1111_EF_LOCI_LUPD_ST_UPDATED: + subscr->gprs.gu_state = GSM_SIM_U1_UPDATED; /* TODO: use proper enums here */ + break; + case GSM1111_EF_LOCI_LUPD_ST_PLMN_NOT_ALLOWED: + case GSM1111_EF_LOCI_LUPD_ST_LA_NOT_ALLOWED: + subscr->gprs.gu_state = GSM_SIM_U3_ROAMING_NA; + break; + default: + subscr->gprs.gu_state = GSM_SIM_U2_NOT_UPDATED; + } + + LOGP(DMM, LOGL_INFO, "received LOCIGPRS from SIM (mcc=%s mnc=%s lac=0x%04x rac=0x%02x GU%d)\n", + gsm_print_mcc(subscr->gprs.rai.mcc), gsm_print_mnc(subscr->gprs.rai.mnc), + subscr->gprs.rai.lac, subscr->gprs.rai.rac, subscr->gprs.gu_state); + + return 0; +} + static int subscr_sim_msisdn(struct osmocom_ms *ms, uint8_t *data, uint8_t length) { @@ -909,6 +973,7 @@ { 1, { 0 }, 0x2fe2, SIM_JOB_READ_BINARY, subscr_sim_iccid }, { 1, { 0x7f20, 0 }, 0x6f07, SIM_JOB_READ_BINARY, subscr_sim_imsi }, { 1, { 0x7f20, 0 }, 0x6f7e, SIM_JOB_READ_BINARY, subscr_sim_loci }, + { 1, { 0x7f20, 0 }, 0x6f53, SIM_JOB_READ_BINARY, subscr_sim_locigprs }, { 0, { 0x7f20, 0 }, 0x6f20, SIM_JOB_READ_BINARY, subscr_sim_kc }, { 0, { 0x7f20, 0 }, 0x6f30, SIM_JOB_READ_BINARY, subscr_sim_plmnsel }, { 0, { 0x7f20, 0 }, 0x6f31, SIM_JOB_READ_BINARY, subscr_sim_hpplmn }, @@ -1231,6 +1296,58 @@ return 0; } +/* update LOCIGPRS on SIM */ +int gsm_subscr_write_locigprs_simcard(struct osmocom_ms *ms) +{ + struct gsm_subscriber *subscr = &ms->subscr; + struct msgb *nmsg; + struct sim_hdr *nsh; + struct gsm1111_ef_locigprs *locigprs; + + /* skip, if no real valid SIM */ + if (!GSM_SIM_IS_READER(subscr->sim_type) || !subscr->sim_valid) + return 0; + + LOGP(DMM, LOGL_INFO, "Updating LOCI on SIM\n"); + + /* write to SIM */ + nmsg = gsm_sim_msgb_alloc(subscr->sim_handle_update, + SIM_JOB_UPDATE_BINARY); + if (!nmsg) + return -ENOMEM; + nsh = (struct sim_hdr *) nmsg->data; + nsh->path[0] = 0x7f20; + nsh->path[1] = 0; + nsh->file = 0x6f53; + locigprs = (struct gsm1111_ef_locigprs *)msgb_put(nmsg, sizeof(*locigprs)); + + /* P-TMSI, P-TMSI signature */ + locigprs->ptmsi = htonl(subscr->gprs.ptmsi); + locigprs->ptmsi_sig_hi = htonl(subscr->gprs.ptmsi) >> 8; + locigprs->ptmsi_sig_lo = htonl(subscr->gprs.ptmsi) & 0xff; + + /* RAI */ + gsm48_encode_rai_hex(&locigprs->rai, subscr->gprs.rai.mcc, subscr->gprs.rai.mnc, + subscr->gprs.rai.lac, subscr->gprs.rai.rac); + /* TODO: ^ implement in libosmocore*/ + + /* location update status */ + switch (subscr->gprs.gu_state) { + case GSM_SIM_U1_UPDATED: /* TODO: proper GU state enum */ + locigprs->rau_status = GSM1111_EF_LOCIGPRS_RAU_ST_UPDATED; + break; + case GSM_SIM_U3_ROAMING_NA: + locigprs->rau_status = GSM1111_EF_LOCIGPRS_RAU_ST_RA_NOT_ALLOWED; + break; + default: + locigprs->rau_status = GSM1111_EF_LOCIGPRS_RAU_ST_NOT_UPDATED; + } + + sim_job(ms, nmsg); + + return 0; +} + static void subscr_sim_update_cb(struct osmocom_ms *ms, struct msgb *msg) { struct sim_hdr *sh = (struct sim_hdr *) msg->data; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ida5bcfc896c75c238e2eb2d0aee742ae36fb5e16 Gerrit-Change-Number: 32765 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[L] Change in osmo-trx[master]: trasnceiver: pass cfg struct instead of args

by Hoernchen

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/32762 ) Change subject: trasnceiver: pass cfg struct instead of args ...................................................................... trasnceiver: pass cfg struct instead of args Passing 7 args is a bit much, just pass the config struct instead. Change-Id: I48386900d15ff4d770c70a4efc246d32f921904b --- M CommonLibs/trx_vty.c M Transceiver52M/device/bladerf/bladerf.cpp M Transceiver52M/device/bladerf/bladerf.h M Transceiver52M/device/common/radioDevice.h M Transceiver52M/device/ipc/IPCDevice.cpp M Transceiver52M/device/ipc/IPCDevice.h M Transceiver52M/device/ipc/uhdwrap.cpp M Transceiver52M/device/ipc/uhdwrap.h M Transceiver52M/device/lms/LMSDevice.cpp M Transceiver52M/device/lms/LMSDevice.h M Transceiver52M/device/uhd/UHDDevice.cpp M Transceiver52M/device/uhd/UHDDevice.h M Transceiver52M/device/usrp1/USRPDevice.cpp M Transceiver52M/device/usrp1/USRPDevice.h M Transceiver52M/osmo-trx.cpp 15 files changed, 161 insertions(+), 180 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/62/32762/1 diff --git a/CommonLibs/trx_vty.c b/CommonLibs/trx_vty.c index ba55f92..6724189 100644 --- a/CommonLibs/trx_vty.c +++ b/CommonLibs/trx_vty.c @@ -607,7 +607,7 @@ vty_out(vty, " remote-ip %s%s", trx->cfg.remote_addr, VTY_NEWLINE); if (trx->cfg.base_port != DEFAULT_TRX_PORT) vty_out(vty, " base-port %u%s", trx->cfg.base_port, VTY_NEWLINE); - if (trx->cfg.dev_args) + if (strlen(trx->cfg.dev_args)) vty_out(vty, " dev-args %s%s", trx->cfg.dev_args, VTY_NEWLINE); if (trx->cfg.tx_sps != DEFAULT_TX_SPS) vty_out(vty, " tx-sps %u%s", trx->cfg.tx_sps, VTY_NEWLINE); @@ -760,6 +760,7 @@ trx->cfg.rx_sps = DEFAULT_RX_SPS; trx->cfg.filler = FILLER_ZERO; trx->cfg.rssi_offset = 0.0f; + trx->cfg.dev_args = ""; return trx; } diff --git a/Transceiver52M/device/bladerf/bladerf.cpp b/Transceiver52M/device/bladerf/bladerf.cpp index 4f0110b..3d9aab9 100644 --- a/Transceiver52M/device/bladerf/bladerf.cpp +++ b/Transceiver52M/device/bladerf/bladerf.cpp @@ -84,11 +84,10 @@ return desc.nom_uhd_tx_gain - (desc.nom_out_tx_power - tx_power_dbm); } -blade_device::blade_device(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset, - const std::vector<std::string> &tx_paths, const std::vector<std::string> &rx_paths) - : RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths), dev(nullptr), rx_gain_min(0.0), - rx_gain_max(0.0), band_ass_curr_sess(false), band((enum gsm_band)0), tx_spp(0), rx_spp(0), started(false), - aligned(false), drop_cnt(0), prev_ts(0), ts_initial(0), ts_offset(0), async_event_thrd(NULL) +blade_device::blade_device(InterfaceType iface, const struct trx_cfg *cfg) + : RadioDevice(iface, cfg), dev(nullptr), rx_gain_min(0.0), rx_gain_max(0.0), band_ass_curr_sess(false), + band((enum gsm_band)0), tx_spp(0), rx_spp(0), started(false), aligned(false), drop_cnt(0), prev_ts(0), + ts_initial(0), ts_offset(0), async_event_thrd(NULL) { } @@ -312,15 +311,15 @@ return desc.nom_out_tx_power; } -int blade_device::open(const std::string &args, int ref, bool swap_channels) +int blade_device::open() { bladerf_log_set_verbosity(BLADERF_LOG_LEVEL_VERBOSE); bladerf_set_usb_reset_on_open(true); - auto success = bladerf_open(&dev, args.c_str()); + auto success = bladerf_open(&dev, cfg->dev_args); if (success != 0) { struct bladerf_devinfo *info; auto num_devs = bladerf_get_device_list(&info); - LOGC(DDEV, ALERT) << "No bladerf devices found with identifier '" << args << "'"; + LOGC(DDEV, ALERT) << "No bladerf devices found with identifier '" << cfg->dev_args << "'"; if (num_devs) { for (int i = 0; i < num_devs; i++) LOGC(DDEV, ALERT) << "Found device:" << info[i].product << " serial " << info[i].serial; @@ -346,7 +345,7 @@ rx_gains.resize(chans); rx_buffers.resize(chans); - switch (ref) { + switch (cfg->clock_ref) { case REF_INTERNAL: case REF_EXTERNAL: break; @@ -355,7 +354,7 @@ return -1; } - if (ref == REF_EXTERNAL) { + if (cfg->clock_ref == REF_EXTERNAL) { bool is_locked; int status = bladerf_set_pll_enable(dev, true); CHKRET() @@ -374,7 +373,8 @@ } } - LOGC(DDEV, INFO) << "Selected clock source is " << ((ref == REF_INTERNAL) ? "internal" : "external 10Mhz"); + LOGC(DDEV, INFO) + << "Selected clock source is " << ((cfg->clock_ref == REF_INTERNAL) ? "internal" : "external 10Mhz"); set_rates(); @@ -687,8 +687,7 @@ return (double)2047; } -RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset, - const std::vector<std::string> &tx_paths, const std::vector<std::string> &rx_paths) +RadioDevice *RadioDevice::make(InterfaceType type, const struct trx_cfg *cfg) { - return new blade_device(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths); + return new blade_device(type, cfg); } diff --git a/Transceiver52M/device/bladerf/bladerf.h b/Transceiver52M/device/bladerf/bladerf.h index 07b7d6a..4db2569 100644 --- a/Transceiver52M/device/bladerf/bladerf.h +++ b/Transceiver52M/device/bladerf/bladerf.h @@ -54,11 +54,10 @@ class blade_device : public RadioDevice { public: - blade_device(size_t tx_sps, size_t rx_sps, InterfaceType type, size_t chan_num, double offset, - const std::vector<std::string> &tx_paths, const std::vector<std::string> &rx_paths); + blade_device(InterfaceType iface, const struct trx_cfg *cfg); ~blade_device(); - int open(const std::string &args, int ref, bool swap_channels); + int open(); bool start(); bool stop(); bool restart(); diff --git a/Transceiver52M/device/common/radioDevice.h b/Transceiver52M/device/common/radioDevice.h index 404ef75..5c6b513 100644 --- a/Transceiver52M/device/common/radioDevice.h +++ b/Transceiver52M/device/common/radioDevice.h @@ -51,13 +51,10 @@ MULTI_ARFCN, }; - static RadioDevice *make(size_t tx_sps, size_t rx_sps, InterfaceType type, - size_t chans = 1, double offset = 0.0, - const std::vector<std::string>& tx_paths = std::vector<std::string>(1, ""), - const std::vector<std::string>& rx_paths = std::vector<std::string>(1, "")); + static RadioDevice *make(InterfaceType type, const struct trx_cfg *cfg); /** Initialize the USRP */ - virtual int open(const std::string &args, int ref, bool swap_channels)=0; + virtual int open() = 0; virtual ~RadioDevice() { } @@ -164,23 +161,30 @@ double lo_offset; std::vector<std::string> tx_paths, rx_paths; std::vector<struct device_counters> m_ctr; + const struct trx_cfg *cfg; - RadioDevice(size_t tx_sps, size_t rx_sps, InterfaceType type, size_t chan_num, double offset, - const std::vector<std::string>& tx_paths, - const std::vector<std::string>& rx_paths): - tx_sps(tx_sps), rx_sps(rx_sps), iface(type), chans(chan_num), lo_offset(offset), - tx_paths(tx_paths), rx_paths(rx_paths), m_ctr(chans) - { - if (iface == MULTI_ARFCN) { - LOGC(DDEV, INFO) << "Multi-ARFCN: "<< chan_num << " logical chans -> 1 physical chans"; - chans = 1; - } +#define charp2str(a) ((a) ? std::string(a) : std::string("")) - for (size_t i = 0; i < chans; i++) { - memset(&m_ctr[i], 0, sizeof(m_ctr[i])); - m_ctr[i].chan = i; - } - } + RadioDevice(InterfaceType type, const struct trx_cfg *cfg) + : tx_sps(cfg->tx_sps), rx_sps(cfg->rx_sps), iface(type), chans(cfg->num_chans), lo_offset(cfg->offset), + m_ctr(chans), cfg(cfg) + { + /* Generate vector of rx/tx_path: */ + for (int i = 0; i < cfg->num_chans; i++) { + rx_paths.push_back(charp2str(cfg->chans[i].rx_path)); + tx_paths.push_back(charp2str(cfg->chans[i].tx_path)); + } + + if (iface == MULTI_ARFCN) { + LOGC(DDEV, INFO) << "Multi-ARFCN: " << chans << " logical chans -> 1 physical chans"; + chans = 1; + } + + for (size_t i = 0; i < chans; i++) { + memset(&m_ctr[i], 0, sizeof(m_ctr[i])); + m_ctr[i].chan = i; + } + } bool set_antennas() { unsigned int i; diff --git a/Transceiver52M/device/ipc/IPCDevice.cpp b/Transceiver52M/device/ipc/IPCDevice.cpp index 4b4ba37..1d2b89a 100644 --- a/Transceiver52M/device/ipc/IPCDevice.cpp +++ b/Transceiver52M/device/ipc/IPCDevice.cpp @@ -56,11 +56,10 @@ static int ipc_chan_sock_cb(struct osmo_fd *bfd, unsigned int flags); -IPCDevice::IPCDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset, - const std::vector<std::string> &tx_paths, const std::vector<std::string> &rx_paths) - : RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths), sk_chan_state(chans, ipc_per_trx_sock_state()), - tx_attenuation(), tmp_state(IPC_IF_MSG_GREETING_REQ), shm(NULL), shm_dec(0), - rx_buffers(chans), started(false), tx_gains(chans), rx_gains(chans) +IPCDevice::IPCDevice(InterfaceType iface, const struct trx_cfg *cfg) + : RadioDevice(iface, cfg), sk_chan_state(chans, ipc_per_trx_sock_state()), tx_attenuation(), + tmp_state(IPC_IF_MSG_GREETING_REQ), shm(NULL), shm_dec(0), rx_buffers(chans), started(false), tx_gains(chans), + rx_gains(chans) { LOGC(DDEV, INFO) << "creating IPC device..."; @@ -771,11 +770,12 @@ return rc; } -int IPCDevice::open(const std::string &args, int ref, bool swap_channels) +int IPCDevice::open() { std::string k, v; std::string::size_type keyend; int rc; + std::string args(cfg->dev_args); if ((keyend = args.find('=')) != std::string::npos) { k = args.substr(0, keyend++); @@ -810,7 +810,7 @@ while (tmp_state != IPC_IF_MSG_INFO_CNF) osmo_select_main(0); - ipc_tx_open_req(&master_sk_state, chans, ref); + ipc_tx_open_req(&master_sk_state, chans, cfg->clock_ref); /* Wait until confirmation is recieved */ while (tmp_state != IPC_IF_MSG_OPEN_CNF) osmo_select_main(0); @@ -1259,16 +1259,15 @@ return send_chan_wait_rsp(chan, msg, IPC_IF_MSG_SETFREQ_CNF); } -RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chans, double lo_offset, - const std::vector<std::string> &tx_paths, const std::vector<std::string> &rx_paths) +RadioDevice *RadioDevice::make(InterfaceType type, const struct trx_cfg *cfg) { - if (tx_sps != rx_sps) { + if (cfg->tx_sps != cfg->rx_sps) { LOGC(DDEV, ERROR) << "IPC Requires tx_sps == rx_sps"; return NULL; } - if (lo_offset != 0.0) { + if (cfg->offset != 0.0) { LOGC(DDEV, ERROR) << "IPC doesn't support lo_offset"; return NULL; } - return new IPCDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths); + return new IPCDevice(type, cfg); } diff --git a/Transceiver52M/device/ipc/IPCDevice.h b/Transceiver52M/device/ipc/IPCDevice.h index f70c95e..0cf3d46 100644 --- a/Transceiver52M/device/ipc/IPCDevice.h +++ b/Transceiver52M/device/ipc/IPCDevice.h @@ -115,12 +115,11 @@ int ipc_chan_sock_write(osmo_fd *bfd); /** Object constructor */ - IPCDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset, - const std::vector<std::string> &tx_paths, const std::vector<std::string> &rx_paths); + IPCDevice(InterfaceType iface, const struct trx_cfg *cfg); virtual ~IPCDevice() override; /** Instantiate the IPC */ - virtual int open(const std::string &args, int ref, bool swap_channels) override; + virtual int open() override; /** Start the IPC */ virtual bool start() override; diff --git a/Transceiver52M/device/ipc/uhdwrap.cpp b/Transceiver52M/device/ipc/uhdwrap.cpp index d7114da..302f763 100644 --- a/Transceiver52M/device/ipc/uhdwrap.cpp +++ b/Transceiver52M/device/ipc/uhdwrap.cpp @@ -35,9 +35,12 @@ #include "Threads.h" #include "Utils.h" -int uhd_wrap::open(const std::string &args, int ref, bool swap_channels) +// no vty source for cfg params here, so we have to build our own +static struct trx_cfg actual_cfg = {}; + +int uhd_wrap::open() { - int rv = uhd_device::open(args, ref, swap_channels); + int rv = uhd_device::open(); samps_per_buff_rx = rx_stream->get_max_num_samps(); samps_per_buff_tx = tx_stream->get_max_num_samps(); channel_count = usrp_dev->get_rx_num_channels(); @@ -84,36 +87,33 @@ extern "C" void *uhdwrap_open(struct ipc_sk_if_open_req *open_req) { - unsigned int rx_sps, tx_sps; + actual_cfg.num_chans = open_req->num_chans; + actual_cfg.swap_channels = false; + /* FIXME: this is actually the sps value, not the sample rate! + * sample rate is looked up according to the sps rate by uhd backend */ + actual_cfg.rx_sps = open_req->rx_sample_freq_num / open_req->rx_sample_freq_den; + actual_cfg.tx_sps = open_req->tx_sample_freq_num / open_req->tx_sample_freq_den; /* FIXME: dev arg string* */ /* FIXME: rx frontend bw? */ /* FIXME: tx frontend bw? */ - ReferenceType cref; switch (open_req->clockref) { case FEATURE_MASK_CLOCKREF_EXTERNAL: - cref = ReferenceType::REF_EXTERNAL; + actual_cfg.clock_ref = ReferenceType::REF_EXTERNAL; break; case FEATURE_MASK_CLOCKREF_INTERNAL: default: - cref = ReferenceType::REF_INTERNAL; + actual_cfg.clock_ref = ReferenceType::REF_INTERNAL; break; } - std::vector<std::string> tx_paths; - std::vector<std::string> rx_paths; for (unsigned int i = 0; i < open_req->num_chans; i++) { - tx_paths.push_back(open_req->chan_info[i].tx_path); - rx_paths.push_back(open_req->chan_info[i].rx_path); + actual_cfg.chans[i].rx_path = open_req->chan_info[i].tx_path; + actual_cfg.chans[i].tx_path = open_req->chan_info[i].rx_path; } - /* FIXME: this is actually the sps value, not the sample rate! - * sample rate is looked up according to the sps rate by uhd backend */ - rx_sps = open_req->rx_sample_freq_num / open_req->rx_sample_freq_den; - tx_sps = open_req->tx_sample_freq_num / open_req->tx_sample_freq_den; - uhd_wrap *uhd_wrap_dev = - new uhd_wrap(tx_sps, rx_sps, RadioDevice::NORMAL, open_req->num_chans, 0.0, tx_paths, rx_paths); - uhd_wrap_dev->open("", cref, false); + uhd_wrap *uhd_wrap_dev = new uhd_wrap(RadioDevice::NORMAL, &actual_cfg); + uhd_wrap_dev->open(); return uhd_wrap_dev; } diff --git a/Transceiver52M/device/ipc/uhdwrap.h b/Transceiver52M/device/ipc/uhdwrap.h index e235fe7..44cd9aa 100644 --- a/Transceiver52M/device/ipc/uhdwrap.h +++ b/Transceiver52M/device/ipc/uhdwrap.h @@ -41,7 +41,7 @@ // void ipc_sock_close() override {}; int wrap_read(TIMESTAMP *timestamp); - virtual int open(const std::string &args, int ref, bool swap_channels) override; + virtual int open() override; // bool start() override; // bool stop() override; diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index d1ec2e4..e336e77 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -131,12 +131,9 @@ return LMS_DEV_UNKNOWN; } -LMSDevice::LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset, - const std::vector<std::string>& tx_paths, - const std::vector<std::string>& rx_paths): - RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths), - m_lms_dev(NULL), started(false), band_ass_curr_sess(false), band((enum gsm_band)0), - m_dev_type(LMS_DEV_UNKNOWN) +LMSDevice::LMSDevice(InterfaceType iface, const struct trx_cfg *cfg) + : RadioDevice(iface, cfg), m_lms_dev(NULL), started(false), band_ass_curr_sess(false), band((enum gsm_band)0), + m_dev_type(LMS_DEV_UNKNOWN) { LOGC(DDEV, INFO) << "creating LMS device..."; @@ -264,7 +261,7 @@ desc = band_desc; } -int LMSDevice::open(const std::string &args, int ref, bool swap_channels) +int LMSDevice::open() { lms_info_str_t* info_list; lms_range_t range_sr; @@ -292,9 +289,9 @@ for (i = 0; i < n; i++) LOGC(DDEV, INFO) << "Device [" << i << "]: " << info_list[i]; - dev_id = info_list_find(info_list, n, args); + dev_id = info_list_find(info_list, n, cfg->dev_args); if (dev_id == -1) { - LOGC(DDEV, ERROR) << "No LMS device found with address '" << args << "'"; + LOGC(DDEV, ERROR) << "No LMS device found with address '" << cfg->dev_args << "'"; delete[] info_list; return -1; } @@ -312,13 +309,13 @@ m_dev_type = parse_dev_type(m_lms_dev); dev_desc = dev_param_map.at(m_dev_type); - if ((ref != REF_EXTERNAL) && (ref != REF_INTERNAL)){ + if ((cfg->clock_ref != REF_EXTERNAL) && (cfg->clock_ref != REF_INTERNAL)) { LOGC(DDEV, ERROR) << "Invalid reference type"; goto out_close; } /* if reference clock is external, setup must happen _before_ calling LMS_Init */ - if (ref == REF_EXTERNAL) { + if (cfg->clock_ref == REF_EXTERNAL) { LOGC(DDEV, INFO) << "Setting External clock reference to 10MHz"; /* FIXME: Assume an external 10 MHz reference clock. make external reference frequency configurable */ @@ -333,7 +330,7 @@ } /* if reference clock is internal, setup must happen _after_ calling LMS_Init */ - if (ref == REF_INTERNAL) { + if (cfg->clock_ref == REF_INTERNAL) { LOGC(DDEV, INFO) << "Setting Internal clock reference"; /* Internal freq param is not used */ if (!do_clock_src_freq(REF_INTERNAL, 0)) @@ -1060,18 +1057,15 @@ return true; } -RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps, - InterfaceType iface, size_t chans, double lo_offset, - const std::vector < std::string > &tx_paths, - const std::vector < std::string > &rx_paths) +RadioDevice *RadioDevice::make(InterfaceType type, const struct trx_cfg *cfg) { - if (tx_sps != rx_sps) { - LOGC(DDEV, ERROR) << "LMS Requires tx_sps == rx_sps"; + if (cfg->tx_sps != cfg->rx_sps) { + LOGC(DDEV, ERROR) << "LMS requires tx_sps == rx_sps"; return NULL; } - if (lo_offset != 0.0) { + if (cfg->offset != 0.0) { LOGC(DDEV, ERROR) << "LMS doesn't support lo_offset"; return NULL; } - return new LMSDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths); + return new LMSDevice(type, cfg); } diff --git a/Transceiver52M/device/lms/LMSDevice.h b/Transceiver52M/device/lms/LMSDevice.h index ab28250..75d11cf 100644 --- a/Transceiver52M/device/lms/LMSDevice.h +++ b/Transceiver52M/device/lms/LMSDevice.h @@ -107,23 +107,22 @@ public: /** Object constructor */ - LMSDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset, - const std::vector<std::string>& tx_paths, - const std::vector<std::string>& rx_paths); - ~LMSDevice(); + LMSDevice(InterfaceType iface, const struct trx_cfg *cfg); + ~LMSDevice(); - /** Instantiate the LMS */ - int open(const std::string &args, int ref, bool swap_channels); + /** Instantiate the LMS */ + int open(); - /** Start the LMS */ - bool start(); + /** Start the LMS */ + bool start(); - /** Stop the LMS */ - bool stop(); + /** Stop the LMS */ + bool stop(); - enum TxWindowType getWindowType() { - return TX_WINDOW_LMS1; - } + enum TxWindowType getWindowType() + { + return TX_WINDOW_LMS1; + } /** Read samples from the LMS. diff --git a/Transceiver52M/device/uhd/UHDDevice.cpp b/Transceiver52M/device/uhd/UHDDevice.cpp index f109660..a0021db 100644 --- a/Transceiver52M/device/uhd/UHDDevice.cpp +++ b/Transceiver52M/device/uhd/UHDDevice.cpp @@ -220,15 +220,10 @@ return desc.nom_uhd_tx_gain - (desc.nom_out_tx_power - tx_power_dbm); } -uhd_device::uhd_device(size_t tx_sps, size_t rx_sps, - InterfaceType iface, size_t chan_num, double lo_offset, - const std::vector<std::string>& tx_paths, - const std::vector<std::string>& rx_paths) - : RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths), - rx_gain_min(0.0), rx_gain_max(0.0), band_ass_curr_sess(false), - band((enum gsm_band)0), tx_spp(0), rx_spp(0), - started(false), aligned(false), drop_cnt(0), - prev_ts(0,0), ts_initial(0), ts_offset(0), async_event_thrd(NULL) +uhd_device::uhd_device(InterfaceType iface, const struct trx_cfg *cfg) + : RadioDevice(iface, cfg), rx_gain_min(0.0), rx_gain_max(0.0), band_ass_curr_sess(false), + band((enum gsm_band)0), tx_spp(0), rx_spp(0), started(false), aligned(false), drop_cnt(0), prev_ts(0, 0), + ts_initial(0), ts_offset(0), async_event_thrd(NULL) { } @@ -548,7 +543,7 @@ } } -int uhd_device::open(const std::string &args, int ref, bool swap_channels) +int uhd_device::open() { const char *refstr; int clock_lock_attempts = 15; @@ -564,10 +559,10 @@ #endif // Find UHD devices - uhd::device_addr_t addr(args); + uhd::device_addr_t addr(cfg->dev_args); uhd::device_addrs_t dev_addrs = uhd::device::find(addr); if (dev_addrs.size() == 0) { - LOGC(DDEV, ALERT) << "No UHD devices found with address '" << args << "'"; + LOGC(DDEV, ALERT) << "No UHD devices found with address '" << cfg->dev_args << "'"; return -1; } @@ -576,7 +571,7 @@ try { usrp_dev = uhd::usrp::multi_usrp::make(addr); } catch(uhd::key_error::exception &e) { - LOGC(DDEV, ALERT) << "UHD make failed, device " << args << ", exception:\n" << e.what(); + LOGC(DDEV, ALERT) << "UHD make failed, device " << cfg->dev_args << ", exception:\n" << e.what(); return -1; } @@ -590,8 +585,8 @@ } try { - set_channels(swap_channels); - } catch (const std::exception &e) { + set_channels(cfg->swap_channels); + } catch (const std::exception &e) { LOGC(DDEV, ALERT) << "Channel setting failed - " << e.what(); return -1; } @@ -607,7 +602,7 @@ rx_gains.resize(chans); rx_buffers.resize(chans); - switch (ref) { + switch (cfg->clock_ref) { case REF_INTERNAL: refstr = "internal"; break; @@ -1378,11 +1373,8 @@ } #ifndef IPCMAGIC -RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps, - InterfaceType iface, size_t chans, double lo_offset, - const std::vector<std::string>& tx_paths, - const std::vector<std::string>& rx_paths) +RadioDevice *RadioDevice::make(InterfaceType type, const struct trx_cfg *cfg) { - return new uhd_device(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths); + return new uhd_device(type, cfg); } #endif diff --git a/Transceiver52M/device/uhd/UHDDevice.h b/Transceiver52M/device/uhd/UHDDevice.h index 659fd18..299d98c 100644 --- a/Transceiver52M/device/uhd/UHDDevice.h +++ b/Transceiver52M/device/uhd/UHDDevice.h @@ -80,17 +80,17 @@ */ class uhd_device : public RadioDevice { public: - uhd_device(size_t tx_sps, size_t rx_sps, InterfaceType type, - size_t chan_num, double offset, - const std::vector<std::string>& tx_paths, - const std::vector<std::string>& rx_paths); - ~uhd_device(); + uhd_device(InterfaceType iface, const struct trx_cfg *cfg); + ~uhd_device(); - int open(const std::string &args, int ref, bool swap_channels); - bool start(); - bool stop(); - bool restart(); - enum TxWindowType getWindowType() { return tx_window; } + int open(); + bool start(); + bool stop(); + bool restart(); + enum TxWindowType getWindowType() + { + return tx_window; + } int readSamples(std::vector<short *> &bufs, int len, bool *overrun, TIMESTAMP timestamp, bool *underrun); diff --git a/Transceiver52M/device/usrp1/USRPDevice.cpp b/Transceiver52M/device/usrp1/USRPDevice.cpp index 5c40aa8..7e98972 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.cpp +++ b/Transceiver52M/device/usrp1/USRPDevice.cpp @@ -60,11 +60,7 @@ const double USRPDevice::masterClockRate = 52.0e6; -USRPDevice::USRPDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, - size_t chan_num, double lo_offset, - const std::vector<std::string>& tx_paths, - const std::vector<std::string>& rx_paths): - RadioDevice(tx_sps, rx_sps, iface, chan_num, lo_offset, tx_paths, rx_paths) +USRPDevice::USRPDevice(InterfaceType iface, const struct trx_cfg *cfg) : RadioDevice(iface, cfg) { LOGC(DDEV, INFO) << "creating USRP device..."; @@ -94,7 +90,7 @@ #endif } -int USRPDevice::open(const std::string &, int, bool) +int USRPDevice::open() { writeLock.unlock(); @@ -659,22 +655,19 @@ bool USRPDevice::setRxFreq(double wFreq) { return true;}; #endif -RadioDevice *RadioDevice::make(size_t tx_sps, size_t rx_sps, - InterfaceType iface, size_t chans, double lo_offset, - const std::vector<std::string>& tx_paths, - const std::vector<std::string>& rx_paths) +RadioDevice *RadioDevice::make(InterfaceType type, const struct trx_cfg *cfg) { - if (tx_sps != rx_sps) { - LOGC(DDEV, ERROR) << "USRP1 requires tx_sps == rx_sps"; - return NULL; - } - if (chans != 1) { - LOGC(DDEV, ERROR) << "USRP1 supports only 1 channel"; - return NULL; - } - if (lo_offset != 0.0) { - LOGC(DDEV, ERROR) << "USRP1 doesn't support lo_offset"; - return NULL; - } - return new USRPDevice(tx_sps, rx_sps, iface, chans, lo_offset, tx_paths, rx_paths); + if (cfg->tx_sps != cfg->rx_sps) { + LOGC(DDEV, ERROR) << "USRP1 requires tx_sps == rx_sps"; + return NULL; + } + if (cfg->num_chans != 1) { + LOGC(DDEV, ERROR) << "USRP1 supports only 1 channel"; + return NULL; + } + if (cfg->offset != 0.0) { + LOGC(DDEV, ERROR) << "USRP1 doesn't support lo_offset"; + return NULL; + } + return new USRPDevice(type, cfg); } diff --git a/Transceiver52M/device/usrp1/USRPDevice.h b/Transceiver52M/device/usrp1/USRPDevice.h index aa8dc69..4957ee6 100644 --- a/Transceiver52M/device/usrp1/USRPDevice.h +++ b/Transceiver52M/device/usrp1/USRPDevice.h @@ -104,20 +104,21 @@ public: /** Object constructor */ - USRPDevice(size_t tx_sps, size_t rx_sps, InterfaceType iface, size_t chan_num, double lo_offset, - const std::vector<std::string>& tx_paths, - const std::vector<std::string>& rx_paths); + USRPDevice(InterfaceType iface, const struct trx_cfg *cfg); - /** Instantiate the USRP */ - int open(const std::string &, int, bool); + /** Instantiate the USRP */ + int open(); - /** Start the USRP */ - bool start(); + /** Start the USRP */ + bool start(); - /** Stop the USRP */ - bool stop(); + /** Stop the USRP */ + bool stop(); - enum TxWindowType getWindowType() { return TX_WINDOW_USRP1; } + enum TxWindowType getWindowType() + { + return TX_WINDOW_USRP1; + } /** Read samples from the USRP. diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index ad41338..89a577b 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -571,24 +571,14 @@ static int trx_start(struct trx_ctx *trx) { int type, chans; - unsigned int i; - std::vector<std::string> rx_paths, tx_paths; RadioDevice::InterfaceType iface = RadioDevice::NORMAL; /* Create the low level device object */ if (trx->cfg.multi_arfcn) iface = RadioDevice::MULTI_ARFCN; - /* Generate vector of rx/tx_path: */ - for (i = 0; i < trx->cfg.num_chans; i++) { - rx_paths.push_back(charp2str(trx->cfg.chans[i].rx_path)); - tx_paths.push_back(charp2str(trx->cfg.chans[i].tx_path)); - } - - usrp = RadioDevice::make(trx->cfg.tx_sps, trx->cfg.rx_sps, iface, - trx->cfg.num_chans, trx->cfg.offset, - tx_paths, rx_paths); - type = usrp->open(charp2str(trx->cfg.dev_args), trx->cfg.clock_ref, trx->cfg.swap_channels); + usrp = RadioDevice::make(iface, &trx->cfg); + type = usrp->open(); if (type < 0) { LOG(ALERT) << "Failed to create radio device" << std::endl; goto shutdown; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/32762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I48386900d15ff4d770c70a4efc246d32f921904b Gerrit-Change-Number: 32762 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023