pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/32017 )
Change subject: Use new GSM0408 defines for half-octet tags
......................................................................
Use new GSM0408 defines for half-octet tags
The old ones have been deprecated and shall not be used anymore·
Depends: libosmocore.git Change-Id I799e35dc8d4d153fa63bf50563a5482cdf4de2d7
Change-Id: Id3be8e38ec87ae39c4e1b4fab163563b24fb2cee
---
M TODO-RELEASE
M src/osmo-bsc/gsm_04_08_rr.c
2 files changed, 16 insertions(+), 3 deletions(-)
Approvals:
laforge: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 98023fc..2658cdd 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -12,4 +12,5 @@
osmo-bsc CTRL,VTY osmo_fsm instance IDs now use new
dynamic timeslot names 'DYNAMIC_OSMOCOM' and 'DYNAMIC_IPACCESS'
libosmogsm >1.8.0 circuit switched data stuff
(gsm0808_enc/dec_channel_type etc.)
libosmo-abis >1.4.0 osmo_ortp.h: add RTP_PT_CSDATA
-libosmo-sccp >1.7.0 osmo_sccp_{get,set}_priv()
\ No newline at end of file
+libosmo-sccp >1.7.0 osmo_sccp_{get,set}_priv()
+libosmocore >1.8.0 GSM48_IE_CIP_MODE_SET_HO and GSM48_IE_SYNC_IND_HO
\ No newline at end of file
diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c
index ee772df..8395dcf 100644
--- a/src/osmo-bsc/gsm_04_08_rr.c
+++ b/src/osmo-bsc/gsm_04_08_rr.c
@@ -565,7 +565,7 @@
* TODO: NCI (Normal cell indication), currently 0. */
const uint8_t sync_ind = async ? 0x00 : 0x01;
/* T (4 bit) + V (4 bit), see 3GPP TS 44.018, 10.5.2.39 */
- msgb_v_put(msg, GSM48_IE_SYNC_IND | (sync_ind & 0x0f));
+ msgb_v_put(msg, (GSM48_IE_SYNC_IND_HO << 4) | (sync_ind &
0x0f));
}
if (new_lchan->ts->hopping.enabled) {
@@ -595,7 +595,7 @@
if (new_lchan->encr.alg_a5_n > 0)
cms = (new_lchan->encr.alg_a5_n - 1) << 1 | 1;
/* T (4 bit) + V (4 bit), see 3GPP TS 44.018, 10.5.2.9 */
- msgb_v_put(msg, GSM48_IE_CIP_MODE_SET | (cms & 0x0f));
+ msgb_v_put(msg, (GSM48_IE_CIP_MODE_SET_HO << 4) | (cms & 0x0f));
}
/* in case of multi rate we need to attach a config */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32017
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Id3be8e38ec87ae39c4e1b4fab163563b24fb2cee
Gerrit-Change-Number: 32017
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
