[PATCH] osmo-bts[master]: Re-add version to phy_instance

[Max]

Review at  https://gerrit.osmocom.org/2844

Re-add version to phy_instance

This is resubmission of 9eeb0b1a136fc8c24a86cb4d832c264674c10db0 with
errorneous use of talloc_asprintf() removed which should fix OS#2316.

Change-Id: I02ae6fffdc808c1ea14185dbb4a720d27a62d4bb
Related: OS#1614
---
M include/osmo-bts/phy_link.h
M src/osmo-bts-octphy/l1_oml.c
M src/osmo-bts-sysmo/l1_if.c
3 files changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/44/2844/1

diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h
index e8fd7eb..4d1dadb 100644
--- a/include/osmo-bts/phy_link.h
+++ b/include/osmo-bts/phy_link.h
@@ -75,7 +75,7 @@
        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;
 
diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c
index 4652e10..ccef231 100644
--- a/src/osmo-bts-octphy/l1_oml.c
+++ b/src/osmo-bts-octphy/l1_oml.c
@@ -1140,14 +1140,14 @@
 
        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 @@
        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 */
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 60638e1..9d74c5e 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -1875,6 +1875,9 @@
 
        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));
+       osmo_strlcpy(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);
 

-- 
To view, visit https://gerrit.osmocom.org/2844
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02ae6fffdc808c1ea14185dbb4a720d27a62d4bb
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Max <msur...@sysmocom.de>