cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

Add version to phy_instance 

Change-Id: I5b2352b8d15e9b0d8616fcd526b4902d247e4693
Related: OS#1614
This commit is contained in:
Max 2017-05-29 16:23:02 +02:00 committed by Harald Welte
parent a8bf666a09
commit 9eeb0b1a13
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osmo-bts/phy_link.h
View File

@ -75,7 +75,7 @@ struct phy_instance {
struct llist_head list;
int num;
char *description;
char version[MAX_VERSION_LENGTH];
/* pointer to the PHY link to which we belong */
struct phy_link *phy_link;

5
src/osmo-bts-octphy/l1_oml.c
View File

@ -1140,14 +1140,14 @@ int l1if_check_app_sys_version(struct gsm_bts_trx *trx)
LOGP(DL1C, LOGL_INFO, "Tx APP-INFO-SYSTEM.req\n");
return l1if_req_compl(fl1h, msg, app_info_sys_compl_cb, 0);
return l1if_req_compl(fl1h, msg, app_info_sys_compl_cb, pinst);
}
static int app_info_compl_cb(struct octphy_hdl *fl1h, struct msgb *resp,
void *data)
{
char ver_hdr[32];
struct phy_instance *pinst = data;
tOCTVC1_MAIN_MSG_APPLICATION_INFO_RSP *air =
(tOCTVC1_MAIN_MSG_APPLICATION_INFO_RSP *) resp->l2h;
@ -1171,6 +1171,7 @@ static int app_info_compl_cb(struct octphy_hdl *fl1h, struct msgb *resp,
talloc_replace(fl1h->info.app.name, fl1h, air->szName);
talloc_replace(fl1h->info.app.description, fl1h, air->szDescription);
talloc_replace(fl1h->info.app.version, fl1h, air->szVersion);
osmo_strlcpy(pinst->version, ver_hdr, sizeof(pinst->version));
/* in a completion call-back, we take msgb ownership and must
* release it before returning */

4
src/osmo-bts-sysmo/l1_if.c
View File

@ -1875,6 +1875,10 @@ int bts_model_phy_link_open(struct phy_link *plink)
hdl = pinst->u.sysmobts.hdl;
osmo_strlcpy(bts->sub_model, sysmobts_model(hdl->hw_info.model_nr, hdl->hw_info.trx_nr), sizeof(bts->sub_model));
talloc_asprintf(pinst->version, "%u.%u dsp %u.%u.%u fpga %u.%u.%u",
hdl->hw_info.ver_major, hdl->hw_info.ver_minor,
hdl->hw_info.dsp_version[0], hdl->hw_info.dsp_version[1], hdl->hw_info.dsp_version[2],
hdl->hw_info.fpga_version[0], hdl->hw_info.fpga_version[1], hdl->hw_info.fpga_version[2]);
phy_link_state_set(plink, PHY_LINK_CONNECTED);