[PATCH] osmo-bts[master]: octphy: remove old event control code

[dexter]

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

octphy: remove old event control code

Enable/Disable events is no longer required, this commit removes
the related code

Change-Id: I0652627495f6a9bcb0da2431b8beb839bc22062b
---
M src/osmo-bts-octphy/l1_oml.c
1 file changed, 1 insertion(+), 83 deletions(-)


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

diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c
index dcb8739c..abbb36c 100644
--- a/src/osmo-bts-octphy/l1_oml.c
+++ b/src/osmo-bts-octphy/l1_oml.c
@@ -1089,84 +1089,6 @@
 	return 0;
 }
 
-static int enable_events_compl_cb(struct octphy_hdl *fl1, struct msgb *resp, void *data)
-{
-	tOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_RSP *mser =
-		(tOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_RSP *) resp->l2h;
-
-	/* in a completion call-back, we take msgb ownership and must
-	 * release it before returning */
-
-	mOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_RSP_SWAP(mser);
-
-	LOGP(DL1C, LOGL_INFO, "Rx ENABLE-EVT-REC.resp\n");
-
-	msgb_free(resp);
-
-	return 0;
-}
-
-static int disable_events_compl_cb(struct octphy_hdl *fl1, struct msgb *resp, void *data)
-{
-	tOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_RSP *mser =
-		(tOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_RSP *) resp->l2h;
-
-	/* in a completion call-back, we take msgb ownership and must
-	 * release it before returning */
-
-	mOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_RSP_SWAP(mser);
-
-	LOGP(DL1C, LOGL_INFO, "Rx DISABLE-EVT-REC.resp\n");
-
-	msgb_free(resp);
-
-	return 0;
-}
-
-int l1if_enable_events(struct gsm_bts_trx *trx)
-{
-	struct phy_instance *pinst = trx_phy_instance(trx);
-	struct octphy_hdl *fl1h = pinst->phy_link->u.octphy.hdl;
-	struct msgb *msg = l1p_msgb_alloc();
-	tOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CMD *mse;
-
-	mse = (tOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CMD *)
-					msgb_put(msg, sizeof(*mse));
-	mOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CMD_DEF(mse);
-
-	l1if_fill_msg_hdr(&mse->Header, msg, fl1h, cOCTVC1_MSG_TYPE_COMMAND,
-			  cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CID);
-	mse->ulEvtActiveFlag = cOCT_TRUE;
-
-	mOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CMD_SWAP(mse);
-
-	LOGP(DL1C, LOGL_INFO, "Tx ENABLE-EVT-REC.req\n");
-
-	return l1if_req_compl(fl1h, msg, disable_events_compl_cb, 0);
-}
-
-int l1if_disable_events(struct gsm_bts_trx *trx)
-{
-	struct phy_instance *pinst = trx_phy_instance(trx);
-	struct octphy_hdl *fl1h = pinst->phy_link->u.octphy.hdl;
-	struct msgb *msg = l1p_msgb_alloc();
-	tOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CMD *mse;
-
-	mse = (tOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CMD *)
-					msgb_put(msg, sizeof(*mse));
-	mOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CMD_DEF(mse);
-
-	l1if_fill_msg_hdr(&mse->Header, msg, fl1h, cOCTVC1_MSG_TYPE_COMMAND,
-			  cOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CID);
-	mse->ulEvtActiveFlag = cOCT_FALSE;
-
-	mOCTVC1_MAIN_MSG_API_SYSTEM_MODIFY_SESSION_EVT_CMD_SWAP(mse);
-
-	LOGP(DL1C, LOGL_INFO, "Tx DISABLE-EVT-REC.req\n");
-
-	return l1if_req_compl(fl1h, msg, disable_events_compl_cb, 0);
-}
-
 #define talloc_replace(dst, ctx, src)			\
 	do {						\
 		if (dst)				\
@@ -1347,8 +1269,7 @@
 	octphy_hw_get_clock_sync_info(fl1h);
 	fl1h->opened = 1;
 
-	/* Temporary fix for enabling events after TRX Close + Reopen */
-	return l1if_enable_events(trx);
+	return 0;
 }
 
 int l1if_trx_open(struct gsm_bts_trx *trx)
@@ -1622,9 +1543,6 @@
 
 int bts_model_trx_close(struct gsm_bts_trx *trx)
 {
-	/* disable events */
-	l1if_disable_events(trx);
-
 	/* FIXME: close only one TRX */
 	return trx_close(trx);
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0652627495f6a9bcb0da2431b8beb839bc22062b
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: dexter <pmaier at sysmocom.de>