LC15: port litecell 1.5 support to recent osmo-bts master

This includes changes required for
* shared main() function accross all BTS models
* use of the new phy_link / phy_instance infrastructure as the basis
  for true multi-TRX operation

1 files changed, 3 insertions, 2 deletions

diff --git a/src/osmo-bts-litecell15/l1_transp_hw.c b/src/osmo-bts-litecell15/l1_transp_hw.c
index 00f1e0a3..68e7e6bb 100644
--- a/src/osmo-bts-litecell15/l1_transp_hw.c
+++ b/src/osmo-bts-litecell15/l1_transp_hw.c
@@ -240,6 +240,7 @@ static int l1fd_write_cb(struct osmo_fd *ofd, struct msgb *msg)
 
 int l1if_transport_open(int q, struct lc15l1_hdl *hdl)
 {
+	struct phy_link *plink = hdl->phy_inst->phy_link;
 	int rc;
         char buf[PATH_MAX];
 
@@ -248,7 +249,7 @@ int l1if_transport_open(int q, struct lc15l1_hdl *hdl)
 	struct osmo_wqueue *wq = &hdl->write_q[q];
 	struct osmo_fd *write_ofd = &hdl->write_q[q].bfd;
 
-        snprintf(buf, sizeof(buf)-1, "%s%d", rd_devnames[q], hdl->hw_info.trx_nr);
+        snprintf(buf, sizeof(buf)-1, "%s%d", rd_devnames[q], plink->num+1);
         buf[sizeof(buf)-1] = '\0';
 
 	rc = open(buf, O_RDONLY);
@@ -270,7 +271,7 @@ int l1if_transport_open(int q, struct lc15l1_hdl *hdl)
 		return rc;
 	}
 
-        snprintf(buf, sizeof(buf)-1, "%s%d", wr_devnames[q], hdl->hw_info.trx_nr);
+        snprintf(buf, sizeof(buf)-1, "%s%d", wr_devnames[q], plink->num+1);
         buf[sizeof(buf)-1] = '\0';
 
 	rc = open(buf, O_WRONLY);