[MERGED] osmo-bts[master]: gsm_pchan2chan_nr: move warning to pragma message and track ...

Harald Welte gerrit-no-reply at lists.osmocom.org
Mon Feb 5 13:15:23 UTC 2018


Harald Welte has submitted this change and it was merged.

Change subject: gsm_pchan2chan_nr: move warning to pragma message and track issue
......................................................................


gsm_pchan2chan_nr: move warning to pragma message and track issue

Take the chance to move the default option to the end as it's the
usually expected syntax.

Change-Id: I21298fcd0d1c1aafdd3dc1e8c8dae37b271b1d3d
---
M src/common/gsm_data_shared.c
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Max: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c
index aa012bc..9aa4ba1 100644
--- a/src/common/gsm_data_shared.c
+++ b/src/common/gsm_data_shared.c
@@ -675,15 +675,15 @@
 		cbits = 0x08;
 		cbits += lchan_nr;
 		break;
-	default:
 	case GSM_PCHAN_CCCH:
+	default:
 		/* OSMO_ASSERT(lchan_nr == 0);
 		 * FIXME: On octphy and litecell, we hit above assertion (see
 		 * Max's comment at https://gerrit.osmocom.org/589 ); disabled
 		 * for BTS until this is clarified; remove the #ifdef when it
-		 * is fixed.
+		 * is fixed. Tracked in OS#2906.
 		 */
-#warning "fix caller that passes lchan_nr != 0"
+#pragma message "fix caller that passes lchan_nr != 0"
 		cbits = 0x10;
 		break;
 	}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I21298fcd0d1c1aafdd3dc1e8c8dae37b271b1d3d
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>


More information about the gerrit-log mailing list