Change in osmo-pcu[master]: oc2g: Remove custom alarms

Daniel Willmann gerrit-no-reply at lists.osmocom.org
Wed Mar 27 16:46:39 UTC 2019


Daniel Willmann has submitted this change and it was merged. ( https://gerrit.osmocom.org/13360 )

Change subject: oc2g: Remove custom alarms
......................................................................

oc2g: Remove custom alarms

Don't try to send custom alarms that weren't included in upstream.

Change-Id: I51de826aa732a3875d75396b46b7d2821ef7417c
---
M src/osmo-bts-oc2g/oc2g_l1_if.c
1 file changed, 0 insertions(+), 7 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bts-oc2g/oc2g_l1_if.c b/src/osmo-bts-oc2g/oc2g_l1_if.c
index 80b9dbc..f9768ae 100644
--- a/src/osmo-bts-oc2g/oc2g_l1_if.c
+++ b/src/osmo-bts-oc2g/oc2g_l1_if.c
@@ -232,9 +232,6 @@
 	default:
 		LOGP(DL1IF, LOGL_NOTICE, "Rx PH-DATA.ind for unknown L1 SAPI %s\n",
 			get_value_string(oc2gbts_l1sapi_names, data_ind->sapi));
-		memcpy(alarm_sig_data.spare, &data_ind->sapi, sizeof(unsigned int));
-		osmo_signal_dispatch(SS_L_GLOBAL, S_PCU_NM_RX_UNKN_L1_SAP_ALARM, &alarm_sig_data);
-
 		break;
 	}
 
@@ -286,7 +283,6 @@
 		rc = handle_ph_ra_ind(fl1h, &l1p->u.phRaInd);
 		break;
 	default:
-		osmo_signal_dispatch(SS_L_GLOBAL, S_PCU_NM_RX_UNKN_L1_PRIM_ALARM, &alarm_sig_data);
 		break;
 	}
 
@@ -340,7 +336,6 @@
 	/* transmit */
 	if (osmo_wqueue_enqueue(&fl1h->write_q[MQ_PDTCH_WRITE], msg) != 0) {
 		LOGP(DL1IF, LOGL_ERROR, "PDTCH queue full. dropping message.\n");
-		osmo_signal_dispatch(SS_L_GLOBAL, S_PCU_NM_PDTCH_QUEUE_FULL_ALARM, &alarm_sig_data);
 		msgb_free(msg);
 	}
 
@@ -365,8 +360,6 @@
 
 	rc = l1if_transport_open(MQ_PDTCH_WRITE, fl1h);
 	if (rc < 0) {
-		alarm_sig_data.spare[0] = trx_no;
-		osmo_signal_dispatch(SS_L_GLOBAL, S_PCU_NM_FAIL_OPEN_L1_ALARM, &alarm_sig_data);
 		talloc_free(fl1h);
 		return NULL;
 	}

-- 
To view, visit https://gerrit.osmocom.org/13360
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I51de826aa732a3875d75396b46b7d2821ef7417c
Gerrit-Change-Number: 13360
Gerrit-PatchSet: 2
Gerrit-Owner: Daniel Willmann <dwillmann at sysmocom.de>
Gerrit-Reviewer: Daniel Willmann <dwillmann at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-CC: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190327/9ab719a2/attachment.html>


More information about the gerrit-log mailing list