gerrit-log
Threads by month
- ----- 2026 -----
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
August 2022
- 3 participants
- 2402 discussions
Build failure of network:osmocom:nightly/osmo-upf in openSUSE_Tumbleweed/i586
by OBS Notification 23 Aug '22
by OBS Notification 23 Aug '22
23 Aug '22
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o…
Package network:osmocom:nightly/osmo-upf failed to build in openSUSE_Tumbleweed/i586
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-upf
Last lines of build log:
[ 37s] checking pkg-config is at least version 0.20... yes
[ 37s] checking for LIBOSMOCORE... yes
[ 37s] checking for LIBOSMOVTY... yes
[ 37s] checking for LIBOSMOCTRL... yes
[ 37s] checking for LIBOSMOGTLV... yes
[ 37s] checking for LIBOSMOPFCP... yes
[ 37s] checking for LIBGTPNL... yes
[ 37s] checking for LIBNFTNL... no
[ 37s] configure: error: Package requirements (libnftnl >= 1.2.1) were not met:
[ 37s]
[ 37s] Package 'libnftnl', required by 'virtual:world', not found
[ 37s]
[ 37s] Consider adjusting the PKG_CONFIG_PATH environment variable if you
[ 37s] installed software in a non-standard prefix.
[ 37s]
[ 37s] Alternatively, you may set the environment variables LIBNFTNL_CFLAGS
[ 37s] and LIBNFTNL_LIBS to avoid the need to call pkg-config.
[ 37s] See the pkg-config man page for more details.
[ 37s] error: Bad exit status from /var/tmp/rpm-tmp.xcMG5D (%build)
[ 37s]
[ 37s] RPM build errors:
[ 37s] Bad exit status from /var/tmp/rpm-tmp.xcMG5D (%build)
[ 37s] ### VM INTERACTION START ###
[ 37s] [ 32.309689][ T1] sysrq: Power Off
[ 37s] [ 32.312260][ T103] reboot: Power down
[ 37s] ### VM INTERACTION END ###
[ 37s]
[ 37s] lamb17 failed "build osmo-upf.spec" at Tue Aug 23 00:59:40 UTC 2022.
[ 37s]
--
Configure notifications at https://build.opensuse.org/my/subscriptions
openSUSE Build Service (https://build.opensuse.org/)
1
0
Build failure of network:osmocom:nightly/osmo-upf in Debian_Testing/x86_64
by OBS Notification 22 Aug '22
by OBS Notification 22 Aug '22
22 Aug '22
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o…
Package network:osmocom:nightly/osmo-upf failed to build in Debian_Testing/x86_64
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-upf
Last lines of build log:
[ 440s] #define VERSION "0.1.0.202208220052"
[ 440s] #define HAVE_STDIO_H 1
[ 440s] #define HAVE_STDLIB_H 1
[ 440s] #define HAVE_STRING_H 1
[ 440s] #define HAVE_INTTYPES_H 1
[ 440s] #define HAVE_STDINT_H 1
[ 440s] #define HAVE_STRINGS_H 1
[ 440s] #define HAVE_SYS_STAT_H 1
[ 440s] #define HAVE_SYS_TYPES_H 1
[ 440s] #define HAVE_UNISTD_H 1
[ 440s] #define STDC_HEADERS 1
[ 440s] #define HAVE_DLFCN_H 1
[ 440s] #define LT_OBJDIR ".libs/"
[ 440s]
[ 440s] configure: exit 1
[ 440s] dh_auto_configure: error: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1
[ 440s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 25
[ 440s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 440s] make: *** [debian/rules:45: build] Error 2
[ 440s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2
[ 440s] ### VM INTERACTION START ###
[ 441s] Failed to write wtmp record, ignoring: Read-only file system
[ 441s] Failed to write utmp record: Read-only file system
[ 441s] Powering off.
[ 441s] [ 412.223344][T13834] reboot: Power down
[ 441s] ### VM INTERACTION END ###
[ 441s]
[ 441s] lamb61 failed "build osmo-upf_0.1.0.202208220052.dsc" at Mon Aug 22 22:47:18 UTC 2022.
[ 441s]
--
Configure notifications at https://build.opensuse.org/my/subscriptions
openSUSE Build Service (https://build.opensuse.org/)
1
0
Build failure of network:osmocom:nightly/osmo-upf in Debian_Unstable/x86_64
by OBS Notification 22 Aug '22
by OBS Notification 22 Aug '22
22 Aug '22
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o…
Package network:osmocom:nightly/osmo-upf failed to build in Debian_Unstable/x86_64
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-upf
Last lines of build log:
[ 434s] #define VERSION "0.1.0.202208220052"
[ 434s] #define HAVE_STDIO_H 1
[ 434s] #define HAVE_STDLIB_H 1
[ 434s] #define HAVE_STRING_H 1
[ 434s] #define HAVE_INTTYPES_H 1
[ 434s] #define HAVE_STDINT_H 1
[ 434s] #define HAVE_STRINGS_H 1
[ 434s] #define HAVE_SYS_STAT_H 1
[ 434s] #define HAVE_SYS_TYPES_H 1
[ 434s] #define HAVE_UNISTD_H 1
[ 434s] #define STDC_HEADERS 1
[ 434s] #define HAVE_DLFCN_H 1
[ 434s] #define LT_OBJDIR ".libs/"
[ 434s]
[ 434s] configure: exit 1
[ 434s] dh_auto_configure: error: ./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --disable-option-checking --disable-silent-rules --libdir=\${prefix}/lib/x86_64-linux-gnu --libexecdir=\${prefix}/lib/x86_64-linux-gnu --disable-maintainer-mode --disable-dependency-tracking --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals returned exit code 1
[ 434s] make[1]: *** [debian/rules:50: override_dh_auto_configure] Error 25
[ 434s] make[1]: Leaving directory '/usr/src/packages/BUILD'
[ 434s] make: *** [debian/rules:45: build] Error 2
[ 434s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2
[ 434s] ### VM INTERACTION START ###
[ 434s] Failed to write wtmp record, ignoring: Read-only file system
[ 434s] Failed to write utmp record: Read-only file system
[ 434s] Powering off.
[ 434s] [ 400.840909][T13910] reboot: Power down
[ 434s] ### VM INTERACTION END ###
[ 434s]
[ 434s] lamb23 failed "build osmo-upf_0.1.0.202208220052.dsc" at Mon Aug 22 22:42:01 UTC 2022.
[ 434s]
--
Configure notifications at https://build.opensuse.org/my/subscriptions
openSUSE Build Service (https://build.opensuse.org/)
1
0
22 Aug '22
Attention is currently required from: osmith, neels, daniel.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29191 )
Change subject: scripts/osmo-deps.sh: use osmo_git_clone_url
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29191
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I700d608ff74eca3981ed41f04ee9ced9629436aa
Gerrit-Change-Number: 29191
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 22 Aug 2022 14:04:44 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
1
0
22 Aug '22
fixeria has removed Jenkins Builder from this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29194 )
Change subject: rlcmac: split ts_24_008.c out of ts_44_060.c
......................................................................
Removed reviewer Jenkins Builder with the following votes:
* Verified-1 by Jenkins Builder (1000002)
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29194
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Idedf52423fef18b929e8096fbe4e130b5a6c7d2c
Gerrit-Change-Number: 29194
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: deleteReviewer
1
0
22 Aug '22
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29194 )
Change subject: rlcmac: split ts_24_008.c out of ts_44_060.c
......................................................................
Patch Set 1: Verified+1
(1 comment)
Patchset:
PS1:
Linter does no apply here, I am simply moving code around.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29194
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Idedf52423fef18b929e8096fbe4e130b5a6c7d2c
Gerrit-Change-Number: 29194
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 22 Aug 2022 14:03:23 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
1
0
Change in libosmo-gprs[master]: rlcmac: split gprs_rlcmac.c onto ts_44_{060,018}.c
by fixeria 22 Aug '22
by fixeria 22 Aug '22
22 Aug '22
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29193 )
Change subject: rlcmac: split gprs_rlcmac.c onto ts_44_{060,018}.c
......................................................................
Patch Set 1: Verified+1
(1 comment)
Patchset:
PS1:
Linter does no apply here, I am simply moving code around.
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29193
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I2b941f06a70a25e92ba3fd2638f87360a5aa5435
Gerrit-Change-Number: 29193
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 22 Aug 2022 14:02:21 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
1
0
Change in libosmo-gprs[master]: rlcmac: split gprs_rlcmac.c onto ts_44_{060,018}.c
by fixeria 22 Aug '22
by fixeria 22 Aug '22
22 Aug '22
Attention is currently required from: fixeria.
fixeria has removed Jenkins Builder from this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29193 )
Change subject: rlcmac: split gprs_rlcmac.c onto ts_44_{060,018}.c
......................................................................
Removed reviewer Jenkins Builder with the following votes:
* Verified-1 by Jenkins Builder (1000002)
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29193
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I2b941f06a70a25e92ba3fd2638f87360a5aa5435
Gerrit-Change-Number: 29193
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: deleteReviewer
1
0
22 Aug '22
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29194 )
Change subject: rlcmac: split ts_24_008.c out of ts_44_060.c
......................................................................
rlcmac: split ts_24_008.c out of ts_44_060.c
Change-Id: Idedf52423fef18b929e8096fbe4e130b5a6c7d2c
---
M src/rlcmac/Makefile.am
A src/rlcmac/ts_24_008.c
M src/rlcmac/ts_44_060.c
3 files changed, 402 insertions(+), 363 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/94/29194/1
diff --git a/src/rlcmac/Makefile.am b/src/rlcmac/Makefile.am
index 95d5c03..803c5ea 100644
--- a/src/rlcmac/Makefile.am
+++ b/src/rlcmac/Makefile.am
@@ -22,6 +22,7 @@
$(NULL)
libosmo_gprs_rlcmac_la_SOURCES = \
+ ts_24_008.c \
ts_44_060.c \
ts_44_018.c \
$(NULL)
diff --git a/src/rlcmac/ts_24_008.c b/src/rlcmac/ts_24_008.c
new file mode 100644
index 0000000..b89e7c9
--- /dev/null
+++ b/src/rlcmac/ts_24_008.c
@@ -0,0 +1,399 @@
+/*
+ * CSN.1 definitions from 3GPP TS 44.060.
+ *
+ * Copyright (C) 2011 Ivan Klyuchnikov
+ *
+ * By Vincent Helfre, based on original code by Jari Sassi
+ * with the gracious authorization of STE
+ * Copyright (c) 2011 ST-Ericsson
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald(a)wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <assert.h>
+#include <arpa/inet.h>
+
+#include <osmocom/core/utils.h>
+#include <osmocom/core/bitvec.h>
+#include <osmocom/core/logging.h>
+
+#include <osmocom/csn1/csn1.h>
+#include <osmocom/gprs/rlcmac/gprs_rlcmac.h>
+
+/* FIXME: configurable logging category */
+#define DRLCMACDATA DLGLOBAL
+
+/*< MS Classmark 3 IE >*/
+#if 0
+static const
+CSN_DESCR_BEGIN(ARC_t)
+ M_UINT (ARC_t, A5_Bits, 4),
+ M_UINT (ARC_t, Arc2_Spare, 4),
+ M_UINT (ARC_t, Arc1, 4),
+CSN_DESCR_END (ARC_t)
+#endif
+
+#if 0
+static const
+CSN_ChoiceElement_t MultibandChoice[] =
+{
+ {3, 0x00, 0, M_UINT(Multiband_t, u.A5_Bits, 4)},
+ {3, 0x05, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)},
+ {3, 0x06, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)},
+ {3, 0x01, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)},
+ {3, 0x02, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)},
+ {3, 0x04, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)},
+};
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(Multiband_t)
+ M_CHOICE (Multiband_t, Multiband, MultibandChoice, ElementsOf(MultibandChoice)),
+CSN_DESCR_END (Multiband_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(EDGE_RF_Pwr_t)
+ M_NEXT_EXIST (EDGE_RF_Pwr_t, ExistEDGE_RF_PwrCap1, 1),
+ M_UINT (EDGE_RF_Pwr_t, EDGE_RF_PwrCap1, 2),
+
+ M_NEXT_EXIST (EDGE_RF_Pwr_t, ExistEDGE_RF_PwrCap2, 1),
+ M_UINT (EDGE_RF_Pwr_t, EDGE_RF_PwrCap2, 2),
+CSN_DESCR_END (EDGE_RF_Pwr_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(MS_Class3_Unpacked_t)
+ M_UINT (MS_Class3_Unpacked_t, Spare1, 1),
+ M_TYPE (MS_Class3_Unpacked_t, Multiband, Multiband_t),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_R_Support, 1),
+ M_UINT (MS_Class3_Unpacked_t, R_GSM_Arc, 3),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_MultiSlotCapability, 1),
+ M_UINT (MS_Class3_Unpacked_t, MultiSlotClass, 5),
+
+ M_UINT (MS_Class3_Unpacked_t, UCS2, 1),
+ M_UINT (MS_Class3_Unpacked_t, ExtendedMeasurementCapability, 1),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_MS_MeasurementCapability, 2),
+ M_UINT (MS_Class3_Unpacked_t, SMS_VALUE, 4),
+ M_UINT (MS_Class3_Unpacked_t, SM_VALUE, 4),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_MS_PositioningMethodCapability, 1),
+ M_UINT (MS_Class3_Unpacked_t, MS_PositioningMethod, 5),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_EDGE_MultiSlotCapability, 1),
+ M_UINT (MS_Class3_Unpacked_t, EDGE_MultiSlotClass, 5),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_EDGE_Struct, 2),
+ M_UINT (MS_Class3_Unpacked_t, ModulationCapability, 1),
+ M_TYPE (MS_Class3_Unpacked_t, EDGE_RF_PwrCaps, EDGE_RF_Pwr_t),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_GSM400_Info, 2),
+ M_UINT (MS_Class3_Unpacked_t, GSM400_Bands, 2),
+ M_UINT (MS_Class3_Unpacked_t, GSM400_Arc, 4),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_GSM850_Arc, 1),
+ M_UINT (MS_Class3_Unpacked_t, GSM850_Arc, 4),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_PCS1900_Arc, 1),
+ M_UINT (MS_Class3_Unpacked_t, PCS1900_Arc, 4),
+
+ M_UINT (MS_Class3_Unpacked_t, UMTS_FDD_Radio_Access_Technology_Capability, 1),
+ M_UINT (MS_Class3_Unpacked_t, UMTS_384_TDD_Radio_Access_Technology_Capability, 1),
+ M_UINT (MS_Class3_Unpacked_t, CDMA2000_Radio_Access_Technology_Capability, 1),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_DTM_GPRS_multislot_class, 3),
+ M_UINT (MS_Class3_Unpacked_t, DTM_GPRS_multislot_class, 2),
+ M_UINT (MS_Class3_Unpacked_t, Single_Slot_DTM, 1),
+ M_TYPE (MS_Class3_Unpacked_t, DTM_EGPRS_Params, DTM_EGPRS_t),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_SingleBandSupport, 1),
+ M_UINT (MS_Class3_Unpacked_t, GSM_Band, 4),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_GSM_700_Associated_Radio_Capability, 1),
+ M_UINT (MS_Class3_Unpacked_t, GSM_700_Associated_Radio_Capability, 4),
+
+ M_UINT (MS_Class3_Unpacked_t, UMTS_128_TDD_Radio_Access_Technology_Capability, 1),
+ M_UINT (MS_Class3_Unpacked_t, GERAN_Feature_Package_1, 1),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_Extended_DTM_multislot_class, 2),
+ M_UINT (MS_Class3_Unpacked_t, Extended_DTM_GPRS_multislot_class, 2),
+ M_UINT (MS_Class3_Unpacked_t, Extended_DTM_EGPRS_multislot_class, 2),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_HighMultislotCapability, 1),
+ M_UINT (MS_Class3_Unpacked_t, HighMultislotCapability, 2),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_GERAN_lu_ModeCapability, 1),
+ M_UINT (MS_Class3_Unpacked_t, GERAN_lu_ModeCapability, 4),
+
+ M_UINT (MS_Class3_Unpacked_t, GERAN_FeaturePackage_2, 1),
+
+ M_UINT (MS_Class3_Unpacked_t, GMSK_MultislotPowerProfile, 2),
+ M_UINT (MS_Class3_Unpacked_t, EightPSK_MultislotProfile, 2),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_TGSM_400_Bands, 2),
+ M_UINT (MS_Class3_Unpacked_t, TGSM_400_BandsSupported, 2),
+ M_UINT (MS_Class3_Unpacked_t, TGSM_400_AssociatedRadioCapability, 4),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_TGSM_900_AssociatedRadioCapability, 1),
+ M_UINT (MS_Class3_Unpacked_t, TGSM_900_AssociatedRadioCapability, 4),
+
+ M_UINT (MS_Class3_Unpacked_t, DownlinkAdvancedReceiverPerformance, 2),
+ M_UINT (MS_Class3_Unpacked_t, DTM_EnhancementsCapability, 1),
+
+ M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_DTM_GPRS_HighMultislotClass, 3),
+ M_UINT (MS_Class3_Unpacked_t, DTM_GPRS_HighMultislotClass, 3),
+ M_UINT (MS_Class3_Unpacked_t, OffsetRequired, 1),
+ M_TYPE (MS_Class3_Unpacked_t, DTM_EGPRS_HighMultislotClass, DTM_EGPRS_HighMultislotClass_t),
+
+ M_UINT (MS_Class3_Unpacked_t, RepeatedSACCH_Capability, 1),
+ M_UINT (MS_Class3_Unpacked_t, Spare2, 1),
+CSN_DESCR_END (MS_Class3_Unpacked_t)
+#endif
+
+/*< MS Radio Access capability IE >*/
+static const
+CSN_DESCR_BEGIN (DTM_EGPRS_t)
+ M_NEXT_EXIST (DTM_EGPRS_t, Exist_DTM_EGPRS_multislot_class, 1),
+ M_UINT (DTM_EGPRS_t, DTM_EGPRS_multislot_class, 2),
+CSN_DESCR_END (DTM_EGPRS_t)
+
+static const
+CSN_DESCR_BEGIN (DTM_EGPRS_HighMultislotClass_t)
+ M_NEXT_EXIST (DTM_EGPRS_HighMultislotClass_t, Exist_DTM_EGPRS_HighMultislotClass, 1),
+ M_UINT (DTM_EGPRS_HighMultislotClass_t, DTM_EGPRS_HighMultislotClass, 3),
+CSN_DESCR_END (DTM_EGPRS_HighMultislotClass_t)
+
+static const
+CSN_DESCR_BEGIN (DownlinkDualCarrierCapability_r7_t)
+ M_UINT (DownlinkDualCarrierCapability_r7_t, MultislotCapabilityReductionForDL_DualCarrier, 3),
+ M_UINT (DownlinkDualCarrierCapability_r7_t, DL_DualCarrierForDTM, 1),
+CSN_DESCR_END (DownlinkDualCarrierCapability_r7_t)
+
+static const
+CSN_DESCR_BEGIN (Multislot_capability_t)
+ M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_HSCSD_multislot_class, 1),
+ M_UINT (Multislot_capability_t, HSCSD_multislot_class, 5),
+
+ M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_GPRS_multislot_class, 2),
+ M_UINT (Multislot_capability_t, GPRS_multislot_class, 5),
+ M_UINT (Multislot_capability_t, GPRS_Extended_Dynamic_Allocation_Capability, 1),
+
+ M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_SM, 2),
+ M_UINT (Multislot_capability_t, SMS_VALUE, 4),
+ M_UINT (Multislot_capability_t, SM_VALUE, 4),
+
+ M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_ECSD_multislot_class, 1),
+ M_UINT (Multislot_capability_t, ECSD_multislot_class, 5),
+
+ M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_EGPRS_multislot_class, 2),
+ M_UINT (Multislot_capability_t, EGPRS_multislot_class, 5),
+ M_UINT (Multislot_capability_t, EGPRS_Extended_Dynamic_Allocation_Capability, 1),
+
+ M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_DTM_GPRS_multislot_class, 3),
+ M_UINT (Multislot_capability_t, DTM_GPRS_multislot_class, 2),
+ M_UINT (Multislot_capability_t, Single_Slot_DTM, 1),
+ M_TYPE (Multislot_capability_t, DTM_EGPRS_Params, DTM_EGPRS_t),
+CSN_DESCR_END (Multislot_capability_t)
+
+static const
+CSN_DESCR_BEGIN (Content_t)
+ M_UINT (Content_t, RF_Power_Capability, 3),
+
+ M_NEXT_EXIST_OR_NULL(Content_t, Exist_A5_bits, 1),
+ M_UINT_OR_NULL (Content_t, A5_bits, 7),
+
+ M_UINT_OR_NULL (Content_t, ES_IND, 1),
+ M_UINT_OR_NULL (Content_t, PS, 1),
+ M_UINT_OR_NULL (Content_t, VGCS, 1),
+ M_UINT_OR_NULL (Content_t, VBS, 1),
+
+ M_NEXT_EXIST_OR_NULL(Content_t, Exist_Multislot_capability, 1),
+ M_TYPE (Content_t, Multislot_capability, Multislot_capability_t),
+
+ M_NEXT_EXIST_OR_NULL(Content_t, Exist_Eight_PSK_Power_Capability, 1),
+ M_UINT (Content_t, Eight_PSK_Power_Capability, 2),
+
+ M_UINT_OR_NULL (Content_t, COMPACT_Interference_Measurement_Capability, 1),
+ M_UINT_OR_NULL (Content_t, Revision_Level_Indicator, 1),
+ M_UINT_OR_NULL (Content_t, UMTS_FDD_Radio_Access_Technology_Capability, 1),
+ M_UINT_OR_NULL (Content_t, UMTS_384_TDD_Radio_Access_Technology_Capability, 1),
+ M_UINT_OR_NULL (Content_t, CDMA2000_Radio_Access_Technology_Capability, 1),
+
+ M_UINT_OR_NULL (Content_t, UMTS_128_TDD_Radio_Access_Technology_Capability, 1),
+ M_UINT_OR_NULL (Content_t, GERAN_Feature_Package_1, 1),
+
+ M_NEXT_EXIST_OR_NULL(Content_t, Exist_Extended_DTM_multislot_class, 2),
+ M_UINT (Content_t, Extended_DTM_GPRS_multislot_class, 2),
+ M_UINT (Content_t, Extended_DTM_EGPRS_multislot_class, 2),
+
+ M_UINT_OR_NULL (Content_t, Modulation_based_multislot_class_support, 1),
+
+ M_NEXT_EXIST_OR_NULL(Content_t, Exist_HighMultislotCapability, 1),
+ M_UINT (Content_t, HighMultislotCapability, 2),
+
+ M_NEXT_EXIST_OR_NULL(Content_t, Exist_GERAN_lu_ModeCapability, 1),
+ M_UINT (Content_t, GERAN_lu_ModeCapability, 4),
+
+ M_UINT_OR_NULL (Content_t, GMSK_MultislotPowerProfile, 2),
+ M_UINT_OR_NULL (Content_t, EightPSK_MultislotProfile, 2),
+
+ M_UINT_OR_NULL (Content_t, MultipleTBF_Capability, 1),
+ M_UINT_OR_NULL (Content_t, DownlinkAdvancedReceiverPerformance, 2),
+ M_UINT_OR_NULL (Content_t, ExtendedRLC_MAC_ControlMessageSegmentionsCapability, 1),
+ M_UINT_OR_NULL (Content_t, DTM_EnhancementsCapability, 1),
+
+ M_NEXT_EXIST_OR_NULL(Content_t, Exist_DTM_GPRS_HighMultislotClass, 2),
+ M_UINT (Content_t, DTM_GPRS_HighMultislotClass, 3),
+ M_TYPE (Content_t, DTM_EGPRS_HighMultislotClass, DTM_EGPRS_HighMultislotClass_t),
+
+ M_UINT_OR_NULL (Content_t, PS_HandoverCapability, 1),
+
+ /* additions in release 7 */
+ M_UINT_OR_NULL (Content_t, DTM_Handover_Capability, 1),
+ M_NEXT_EXIST_OR_NULL(Content_t, Exist_DownlinkDualCarrierCapability_r7, 1),
+ M_TYPE_OR_NULL (Content_t, DownlinkDualCarrierCapability_r7, DownlinkDualCarrierCapability_r7_t),
+
+ M_UINT_OR_NULL (Content_t, FlexibleTimeslotAssignment, 1),
+ M_UINT_OR_NULL (Content_t, GAN_PS_HandoverCapability, 1),
+ M_UINT_OR_NULL (Content_t, RLC_Non_persistentMode, 1),
+ M_UINT_OR_NULL (Content_t, ReducedLatencyCapability, 1),
+ M_UINT_OR_NULL (Content_t, UplinkEGPRS2, 2),
+ M_UINT_OR_NULL (Content_t, DownlinkEGPRS2, 2),
+
+ /* additions in release 8 */
+ M_UINT_OR_NULL (Content_t, EUTRA_FDD_Support, 1),
+ M_UINT_OR_NULL (Content_t, EUTRA_TDD_Support, 1),
+ M_UINT_OR_NULL (Content_t, GERAN_To_EUTRAN_supportInGERAN_PTM, 2),
+ M_UINT_OR_NULL (Content_t, PriorityBasedReselectionSupport, 1),
+
+CSN_DESCR_END (Content_t)
+
+static gint16 Content_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data)
+{
+ if (ar->direction == 0)
+ {
+ return osmo_csn1_stream_encode(ar, CSNDESCR(Content_t), vector, readIndex, data);
+ }
+ else
+ {
+ return osmo_csn1_stream_decode(ar, CSNDESCR(Content_t), vector, readIndex, data);
+ }
+}
+
+static const
+CSN_DESCR_BEGIN (Additional_access_technologies_struct_t)
+ M_UINT (Additional_access_technologies_struct_t, Access_Technology_Type, 4),
+ M_UINT (Additional_access_technologies_struct_t, GMSK_Power_class, 3),
+ M_UINT (Additional_access_technologies_struct_t, Eight_PSK_Power_class, 2),
+CSN_DESCR_END (Additional_access_technologies_struct_t)
+
+static const
+CSN_DESCR_BEGIN (Additional_access_technologies_t)
+ M_REC_TARRAY (Additional_access_technologies_t, Additional_access_technologies, Additional_access_technologies_struct_t, Count_additional_access_technologies),
+CSN_DESCR_END (Additional_access_technologies_t)
+
+static gint16 Additional_access_technologies_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data)
+{
+ if (ar->direction == 0)
+ {
+ return osmo_csn1_stream_encode(ar, CSNDESCR(Additional_access_technologies_t), vector, readIndex, data);
+ }
+ else
+ {
+ return osmo_csn1_stream_decode(ar, CSNDESCR(Additional_access_technologies_t), vector, readIndex, data);
+ }
+}
+
+static const
+CSN_ChoiceElement_t MS_RA_capability_value_Choice[] =
+{
+ {4, AccTech_GSMP, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
+ {4, AccTech_GSME, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
+ {4, AccTech_GSMR, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
+ {4, AccTech_GSM1800, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
+ {4, AccTech_GSM1900, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
+ {4, AccTech_GSM450, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
+ {4, AccTech_GSM480, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
+ {4, AccTech_GSM850, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
+ {4, AccTech_GSM750, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
+ {4, AccTech_GSMT830, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
+ {4, AccTech_GSMT410, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
+ {4, AccTech_GSMT900, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
+ {4, AccTech_GSM710, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
+ {4, AccTech_GSMT810, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
+ {4, AccTech_GSMOther, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Additional_access_technologies, 7, Additional_access_technologies_Dissector)}, /* Short Form */
+};
+
+const
+CSN_DESCR_BEGIN(MS_RA_capability_value_t)
+ M_CHOICE (MS_RA_capability_value_t, IndexOfAccTech, MS_RA_capability_value_Choice, ElementsOf(MS_RA_capability_value_Choice)),
+CSN_DESCR_END (MS_RA_capability_value_t)
+
+static const
+CSN_DESCR_BEGIN (MS_Radio_Access_capability_t)
+ M_REC_TARRAY_1(MS_Radio_Access_capability_t, MS_RA_capability_value, MS_RA_capability_value_t, Count_MS_RA_capability_value),
+ M_PADDING_BITS(MS_Radio_Access_capability_t),
+CSN_DESCR_END (MS_Radio_Access_capability_t)
+
+int osmo_gprs_rlcmac_decode_ms_ra_cap(struct bitvec *vector, MS_Radio_Access_capability_t *data)
+{
+ csnStream_t ar;
+ int ret;
+ unsigned readIndex = 0;
+
+ osmo_csn1_stream_init(&ar, 0, 8 * vector->data_len);
+
+ /* recursive osmo_csn1_stream_decode call uses LOGPC everywhere, so we need to start the log somewhere... */
+ LOGP(DLCSN1, LOGL_INFO, "osmo_csn1_stream_decode (RAcap): ");
+ ret = osmo_csn1_stream_decode(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, &readIndex, data);
+
+ /* recursive osmo_csn1_stream_decode call uses LOGPC everywhere without trailing
+ newline, so as a caller we are responisble for submitting it */
+ LOGPC(DLCSN1, LOGL_INFO, "\n");
+
+ if (ret > 0) {
+ LOGP(DRLCMACDATA, LOGL_NOTICE, "RAcap: Got %d remaining bits unhandled by decoder at the end of bitvec\n", ret);
+ ret = 0;
+ }
+ return ret;
+}
+
+int osmo_gprs_rlcmac_encode_ms_ra_cap(struct bitvec *vector, MS_Radio_Access_capability_t *data)
+{
+ unsigned writeIndex = 0;
+ csnStream_t ar;
+ int ret;
+
+ osmo_csn1_stream_init(&ar, 0, vector->data_len * 8);
+
+ /* recursive osmo_csn1_stream_encode call uses LOGPC everywhere, so we need to start the log somewhere... */
+ LOGP(DLCSN1, LOGL_INFO, "osmo_csn1_stream_encode (RAcap): ");
+ ret = osmo_csn1_stream_encode(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, &writeIndex, data);
+ LOGPC(DLCSN1, LOGL_INFO, "\n");
+
+ if (ret > 0 || ret == CSN_ERROR_NEED_MORE_BITS_TO_UNPACK) {
+ LOGP(DRLCMACDATA, LOGL_ERROR, "Failed to encode MS RA Capability IE: not enough bits "
+ "in the output buffer (rc=%d)\n", ret);
+ ret = CSN_ERROR_NEED_MORE_BITS_TO_UNPACK;
+ }
+
+ return ret;
+}
diff --git a/src/rlcmac/ts_44_060.c b/src/rlcmac/ts_44_060.c
index 1dd1d85..aa12abc 100644
--- a/src/rlcmac/ts_44_060.c
+++ b/src/rlcmac/ts_44_060.c
@@ -41,6 +41,8 @@
#define PAYLOAD_TYPE_CTRL_OPT_OCTET 2
#define PAYLOAD_TYPE_RESERVED 3
+CSN_DESCR_EXTERN(MS_RA_capability_value_t);
+
/* CSN1 structures */
/*(not all parts of CSN_DESCR structure are always initialized.)*/
static const
@@ -413,330 +415,12 @@
CSN_DESCR_END (Receive_N_PDU_Number_list_t)
#endif
-/*< MS Radio Access capability IE >*/
-static const
-CSN_DESCR_BEGIN (DTM_EGPRS_t)
- M_NEXT_EXIST (DTM_EGPRS_t, Exist_DTM_EGPRS_multislot_class, 1),
- M_UINT (DTM_EGPRS_t, DTM_EGPRS_multislot_class, 2),
-CSN_DESCR_END (DTM_EGPRS_t)
-
-static const
-CSN_DESCR_BEGIN (DTM_EGPRS_HighMultislotClass_t)
- M_NEXT_EXIST (DTM_EGPRS_HighMultislotClass_t, Exist_DTM_EGPRS_HighMultislotClass, 1),
- M_UINT (DTM_EGPRS_HighMultislotClass_t, DTM_EGPRS_HighMultislotClass, 3),
-CSN_DESCR_END (DTM_EGPRS_HighMultislotClass_t)
-
-static const
-CSN_DESCR_BEGIN (DownlinkDualCarrierCapability_r7_t)
- M_UINT (DownlinkDualCarrierCapability_r7_t, MultislotCapabilityReductionForDL_DualCarrier, 3),
- M_UINT (DownlinkDualCarrierCapability_r7_t, DL_DualCarrierForDTM, 1),
-CSN_DESCR_END (DownlinkDualCarrierCapability_r7_t)
-
-static const
-CSN_DESCR_BEGIN (Multislot_capability_t)
- M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_HSCSD_multislot_class, 1),
- M_UINT (Multislot_capability_t, HSCSD_multislot_class, 5),
-
- M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_GPRS_multislot_class, 2),
- M_UINT (Multislot_capability_t, GPRS_multislot_class, 5),
- M_UINT (Multislot_capability_t, GPRS_Extended_Dynamic_Allocation_Capability, 1),
-
- M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_SM, 2),
- M_UINT (Multislot_capability_t, SMS_VALUE, 4),
- M_UINT (Multislot_capability_t, SM_VALUE, 4),
-
- M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_ECSD_multislot_class, 1),
- M_UINT (Multislot_capability_t, ECSD_multislot_class, 5),
-
- M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_EGPRS_multislot_class, 2),
- M_UINT (Multislot_capability_t, EGPRS_multislot_class, 5),
- M_UINT (Multislot_capability_t, EGPRS_Extended_Dynamic_Allocation_Capability, 1),
-
- M_NEXT_EXIST_OR_NULL(Multislot_capability_t, Exist_DTM_GPRS_multislot_class, 3),
- M_UINT (Multislot_capability_t, DTM_GPRS_multislot_class, 2),
- M_UINT (Multislot_capability_t, Single_Slot_DTM, 1),
- M_TYPE (Multislot_capability_t, DTM_EGPRS_Params, DTM_EGPRS_t),
-CSN_DESCR_END (Multislot_capability_t)
-
-static const
-CSN_DESCR_BEGIN (Content_t)
- M_UINT (Content_t, RF_Power_Capability, 3),
-
- M_NEXT_EXIST_OR_NULL(Content_t, Exist_A5_bits, 1),
- M_UINT_OR_NULL (Content_t, A5_bits, 7),
-
- M_UINT_OR_NULL (Content_t, ES_IND, 1),
- M_UINT_OR_NULL (Content_t, PS, 1),
- M_UINT_OR_NULL (Content_t, VGCS, 1),
- M_UINT_OR_NULL (Content_t, VBS, 1),
-
- M_NEXT_EXIST_OR_NULL(Content_t, Exist_Multislot_capability, 1),
- M_TYPE (Content_t, Multislot_capability, Multislot_capability_t),
-
- M_NEXT_EXIST_OR_NULL(Content_t, Exist_Eight_PSK_Power_Capability, 1),
- M_UINT (Content_t, Eight_PSK_Power_Capability, 2),
-
- M_UINT_OR_NULL (Content_t, COMPACT_Interference_Measurement_Capability, 1),
- M_UINT_OR_NULL (Content_t, Revision_Level_Indicator, 1),
- M_UINT_OR_NULL (Content_t, UMTS_FDD_Radio_Access_Technology_Capability, 1),
- M_UINT_OR_NULL (Content_t, UMTS_384_TDD_Radio_Access_Technology_Capability, 1),
- M_UINT_OR_NULL (Content_t, CDMA2000_Radio_Access_Technology_Capability, 1),
-
- M_UINT_OR_NULL (Content_t, UMTS_128_TDD_Radio_Access_Technology_Capability, 1),
- M_UINT_OR_NULL (Content_t, GERAN_Feature_Package_1, 1),
-
- M_NEXT_EXIST_OR_NULL(Content_t, Exist_Extended_DTM_multislot_class, 2),
- M_UINT (Content_t, Extended_DTM_GPRS_multislot_class, 2),
- M_UINT (Content_t, Extended_DTM_EGPRS_multislot_class, 2),
-
- M_UINT_OR_NULL (Content_t, Modulation_based_multislot_class_support, 1),
-
- M_NEXT_EXIST_OR_NULL(Content_t, Exist_HighMultislotCapability, 1),
- M_UINT (Content_t, HighMultislotCapability, 2),
-
- M_NEXT_EXIST_OR_NULL(Content_t, Exist_GERAN_lu_ModeCapability, 1),
- M_UINT (Content_t, GERAN_lu_ModeCapability, 4),
-
- M_UINT_OR_NULL (Content_t, GMSK_MultislotPowerProfile, 2),
- M_UINT_OR_NULL (Content_t, EightPSK_MultislotProfile, 2),
-
- M_UINT_OR_NULL (Content_t, MultipleTBF_Capability, 1),
- M_UINT_OR_NULL (Content_t, DownlinkAdvancedReceiverPerformance, 2),
- M_UINT_OR_NULL (Content_t, ExtendedRLC_MAC_ControlMessageSegmentionsCapability, 1),
- M_UINT_OR_NULL (Content_t, DTM_EnhancementsCapability, 1),
-
- M_NEXT_EXIST_OR_NULL(Content_t, Exist_DTM_GPRS_HighMultislotClass, 2),
- M_UINT (Content_t, DTM_GPRS_HighMultislotClass, 3),
- M_TYPE (Content_t, DTM_EGPRS_HighMultislotClass, DTM_EGPRS_HighMultislotClass_t),
-
- M_UINT_OR_NULL (Content_t, PS_HandoverCapability, 1),
-
- /* additions in release 7 */
- M_UINT_OR_NULL (Content_t, DTM_Handover_Capability, 1),
- M_NEXT_EXIST_OR_NULL(Content_t, Exist_DownlinkDualCarrierCapability_r7, 1),
- M_TYPE_OR_NULL (Content_t, DownlinkDualCarrierCapability_r7, DownlinkDualCarrierCapability_r7_t),
-
- M_UINT_OR_NULL (Content_t, FlexibleTimeslotAssignment, 1),
- M_UINT_OR_NULL (Content_t, GAN_PS_HandoverCapability, 1),
- M_UINT_OR_NULL (Content_t, RLC_Non_persistentMode, 1),
- M_UINT_OR_NULL (Content_t, ReducedLatencyCapability, 1),
- M_UINT_OR_NULL (Content_t, UplinkEGPRS2, 2),
- M_UINT_OR_NULL (Content_t, DownlinkEGPRS2, 2),
-
- /* additions in release 8 */
- M_UINT_OR_NULL (Content_t, EUTRA_FDD_Support, 1),
- M_UINT_OR_NULL (Content_t, EUTRA_TDD_Support, 1),
- M_UINT_OR_NULL (Content_t, GERAN_To_EUTRAN_supportInGERAN_PTM, 2),
- M_UINT_OR_NULL (Content_t, PriorityBasedReselectionSupport, 1),
-
-CSN_DESCR_END (Content_t)
-
-static gint16 Content_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data)
-{
- if (ar->direction == 0)
- {
- return osmo_csn1_stream_encode(ar, CSNDESCR(Content_t), vector, readIndex, data);
- }
- else
- {
- return osmo_csn1_stream_decode(ar, CSNDESCR(Content_t), vector, readIndex, data);
- }
-}
-
-static const
-CSN_DESCR_BEGIN (Additional_access_technologies_struct_t)
- M_UINT (Additional_access_technologies_struct_t, Access_Technology_Type, 4),
- M_UINT (Additional_access_technologies_struct_t, GMSK_Power_class, 3),
- M_UINT (Additional_access_technologies_struct_t, Eight_PSK_Power_class, 2),
-CSN_DESCR_END (Additional_access_technologies_struct_t)
-
-static const
-CSN_DESCR_BEGIN (Additional_access_technologies_t)
- M_REC_TARRAY (Additional_access_technologies_t, Additional_access_technologies, Additional_access_technologies_struct_t, Count_additional_access_technologies),
-CSN_DESCR_END (Additional_access_technologies_t)
-
-static gint16 Additional_access_technologies_Dissector(csnStream_t* ar, struct bitvec *vector, unsigned *readIndex, void* data)
-{
- if (ar->direction == 0)
- {
- return osmo_csn1_stream_encode(ar, CSNDESCR(Additional_access_technologies_t), vector, readIndex, data);
- }
- else
- {
- return osmo_csn1_stream_decode(ar, CSNDESCR(Additional_access_technologies_t), vector, readIndex, data);
- }
-}
-
-static const
-CSN_ChoiceElement_t MS_RA_capability_value_Choice[] =
-{
- {4, AccTech_GSMP, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
- {4, AccTech_GSME, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
- {4, AccTech_GSMR, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
- {4, AccTech_GSM1800, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
- {4, AccTech_GSM1900, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
- {4, AccTech_GSM450, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
- {4, AccTech_GSM480, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
- {4, AccTech_GSM850, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
- {4, AccTech_GSM750, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
- {4, AccTech_GSMT830, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
- {4, AccTech_GSMT410, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
- {4, AccTech_GSMT900, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
- {4, AccTech_GSM710, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
- {4, AccTech_GSMT810, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Content, 7, Content_Dissector)}, /* Long Form */
- {4, AccTech_GSMOther, 0, M_SERIALIZE (MS_RA_capability_value_t, u.Additional_access_technologies, 7, Additional_access_technologies_Dissector)}, /* Short Form */
-};
-
-static const
-CSN_DESCR_BEGIN(MS_RA_capability_value_t)
- M_CHOICE (MS_RA_capability_value_t, IndexOfAccTech, MS_RA_capability_value_Choice, ElementsOf(MS_RA_capability_value_Choice)),
-CSN_DESCR_END (MS_RA_capability_value_t)
-
-static const
-CSN_DESCR_BEGIN (MS_Radio_Access_capability_t)
- M_REC_TARRAY_1(MS_Radio_Access_capability_t, MS_RA_capability_value, MS_RA_capability_value_t, Count_MS_RA_capability_value),
- M_PADDING_BITS(MS_Radio_Access_capability_t),
-CSN_DESCR_END (MS_Radio_Access_capability_t)
-
/* TS44.060 section 12.30 "MS Radio Access Capability 2". Same as above but without spare bits */
static const
CSN_DESCR_BEGIN (MS_Radio_Access_capability2_t)
M_REC_TARRAY_1(MS_Radio_Access_capability_t, MS_RA_capability_value, MS_RA_capability_value_t, Count_MS_RA_capability_value),
CSN_DESCR_END (MS_Radio_Access_capability2_t)
-/*< MS Classmark 3 IE >*/
-#if 0
-static const
-CSN_DESCR_BEGIN(ARC_t)
- M_UINT (ARC_t, A5_Bits, 4),
- M_UINT (ARC_t, Arc2_Spare, 4),
- M_UINT (ARC_t, Arc1, 4),
-CSN_DESCR_END (ARC_t)
-#endif
-
-#if 0
-static const
-CSN_ChoiceElement_t MultibandChoice[] =
-{
- {3, 0x00, 0, M_UINT(Multiband_t, u.A5_Bits, 4)},
- {3, 0x05, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)},
- {3, 0x06, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)},
- {3, 0x01, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)},
- {3, 0x02, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)},
- {3, 0x04, 0, M_TYPE(Multiband_t, u.ARC, ARC_t)},
-};
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(Multiband_t)
- M_CHOICE (Multiband_t, Multiband, MultibandChoice, ElementsOf(MultibandChoice)),
-CSN_DESCR_END (Multiband_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(EDGE_RF_Pwr_t)
- M_NEXT_EXIST (EDGE_RF_Pwr_t, ExistEDGE_RF_PwrCap1, 1),
- M_UINT (EDGE_RF_Pwr_t, EDGE_RF_PwrCap1, 2),
-
- M_NEXT_EXIST (EDGE_RF_Pwr_t, ExistEDGE_RF_PwrCap2, 1),
- M_UINT (EDGE_RF_Pwr_t, EDGE_RF_PwrCap2, 2),
-CSN_DESCR_END (EDGE_RF_Pwr_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(MS_Class3_Unpacked_t)
- M_UINT (MS_Class3_Unpacked_t, Spare1, 1),
- M_TYPE (MS_Class3_Unpacked_t, Multiband, Multiband_t),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_R_Support, 1),
- M_UINT (MS_Class3_Unpacked_t, R_GSM_Arc, 3),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_MultiSlotCapability, 1),
- M_UINT (MS_Class3_Unpacked_t, MultiSlotClass, 5),
-
- M_UINT (MS_Class3_Unpacked_t, UCS2, 1),
- M_UINT (MS_Class3_Unpacked_t, ExtendedMeasurementCapability, 1),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_MS_MeasurementCapability, 2),
- M_UINT (MS_Class3_Unpacked_t, SMS_VALUE, 4),
- M_UINT (MS_Class3_Unpacked_t, SM_VALUE, 4),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_MS_PositioningMethodCapability, 1),
- M_UINT (MS_Class3_Unpacked_t, MS_PositioningMethod, 5),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_EDGE_MultiSlotCapability, 1),
- M_UINT (MS_Class3_Unpacked_t, EDGE_MultiSlotClass, 5),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_EDGE_Struct, 2),
- M_UINT (MS_Class3_Unpacked_t, ModulationCapability, 1),
- M_TYPE (MS_Class3_Unpacked_t, EDGE_RF_PwrCaps, EDGE_RF_Pwr_t),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_GSM400_Info, 2),
- M_UINT (MS_Class3_Unpacked_t, GSM400_Bands, 2),
- M_UINT (MS_Class3_Unpacked_t, GSM400_Arc, 4),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_GSM850_Arc, 1),
- M_UINT (MS_Class3_Unpacked_t, GSM850_Arc, 4),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_PCS1900_Arc, 1),
- M_UINT (MS_Class3_Unpacked_t, PCS1900_Arc, 4),
-
- M_UINT (MS_Class3_Unpacked_t, UMTS_FDD_Radio_Access_Technology_Capability, 1),
- M_UINT (MS_Class3_Unpacked_t, UMTS_384_TDD_Radio_Access_Technology_Capability, 1),
- M_UINT (MS_Class3_Unpacked_t, CDMA2000_Radio_Access_Technology_Capability, 1),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_DTM_GPRS_multislot_class, 3),
- M_UINT (MS_Class3_Unpacked_t, DTM_GPRS_multislot_class, 2),
- M_UINT (MS_Class3_Unpacked_t, Single_Slot_DTM, 1),
- M_TYPE (MS_Class3_Unpacked_t, DTM_EGPRS_Params, DTM_EGPRS_t),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_SingleBandSupport, 1),
- M_UINT (MS_Class3_Unpacked_t, GSM_Band, 4),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_GSM_700_Associated_Radio_Capability, 1),
- M_UINT (MS_Class3_Unpacked_t, GSM_700_Associated_Radio_Capability, 4),
-
- M_UINT (MS_Class3_Unpacked_t, UMTS_128_TDD_Radio_Access_Technology_Capability, 1),
- M_UINT (MS_Class3_Unpacked_t, GERAN_Feature_Package_1, 1),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_Extended_DTM_multislot_class, 2),
- M_UINT (MS_Class3_Unpacked_t, Extended_DTM_GPRS_multislot_class, 2),
- M_UINT (MS_Class3_Unpacked_t, Extended_DTM_EGPRS_multislot_class, 2),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_HighMultislotCapability, 1),
- M_UINT (MS_Class3_Unpacked_t, HighMultislotCapability, 2),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_GERAN_lu_ModeCapability, 1),
- M_UINT (MS_Class3_Unpacked_t, GERAN_lu_ModeCapability, 4),
-
- M_UINT (MS_Class3_Unpacked_t, GERAN_FeaturePackage_2, 1),
-
- M_UINT (MS_Class3_Unpacked_t, GMSK_MultislotPowerProfile, 2),
- M_UINT (MS_Class3_Unpacked_t, EightPSK_MultislotProfile, 2),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_TGSM_400_Bands, 2),
- M_UINT (MS_Class3_Unpacked_t, TGSM_400_BandsSupported, 2),
- M_UINT (MS_Class3_Unpacked_t, TGSM_400_AssociatedRadioCapability, 4),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_TGSM_900_AssociatedRadioCapability, 1),
- M_UINT (MS_Class3_Unpacked_t, TGSM_900_AssociatedRadioCapability, 4),
-
- M_UINT (MS_Class3_Unpacked_t, DownlinkAdvancedReceiverPerformance, 2),
- M_UINT (MS_Class3_Unpacked_t, DTM_EnhancementsCapability, 1),
-
- M_NEXT_EXIST (MS_Class3_Unpacked_t, Exist_DTM_GPRS_HighMultislotClass, 3),
- M_UINT (MS_Class3_Unpacked_t, DTM_GPRS_HighMultislotClass, 3),
- M_UINT (MS_Class3_Unpacked_t, OffsetRequired, 1),
- M_TYPE (MS_Class3_Unpacked_t, DTM_EGPRS_HighMultislotClass, DTM_EGPRS_HighMultislotClass_t),
-
- M_UINT (MS_Class3_Unpacked_t, RepeatedSACCH_Capability, 1),
- M_UINT (MS_Class3_Unpacked_t, Spare2, 1),
-CSN_DESCR_END (MS_Class3_Unpacked_t)
-#endif
-
static const
CSN_DESCR_BEGIN(Channel_Request_Description_t)
M_UINT (Channel_Request_Description_t, PEAK_THROUGHPUT_CLASS, 4),
@@ -5580,51 +5264,6 @@
}
}
-int osmo_gprs_rlcmac_decode_ms_ra_cap(struct bitvec *vector, MS_Radio_Access_capability_t *data)
-{
- csnStream_t ar;
- int ret;
- unsigned readIndex = 0;
-
- osmo_csn1_stream_init(&ar, 0, 8 * vector->data_len);
-
- /* recursive osmo_csn1_stream_decode call uses LOGPC everywhere, so we need to start the log somewhere... */
- LOGP(DLCSN1, LOGL_INFO, "osmo_csn1_stream_decode (RAcap): ");
- ret = osmo_csn1_stream_decode(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, &readIndex, data);
-
- /* recursive osmo_csn1_stream_decode call uses LOGPC everywhere without trailing
- newline, so as a caller we are responisble for submitting it */
- LOGPC(DLCSN1, LOGL_INFO, "\n");
-
- if (ret > 0) {
- LOGP(DRLCMACDATA, LOGL_NOTICE, "RAcap: Got %d remaining bits unhandled by decoder at the end of bitvec\n", ret);
- ret = 0;
- }
- return ret;
-}
-
-int osmo_gprs_rlcmac_encode_ms_ra_cap(struct bitvec *vector, MS_Radio_Access_capability_t *data)
-{
- unsigned writeIndex = 0;
- csnStream_t ar;
- int ret;
-
- osmo_csn1_stream_init(&ar, 0, vector->data_len * 8);
-
- /* recursive osmo_csn1_stream_encode call uses LOGPC everywhere, so we need to start the log somewhere... */
- LOGP(DLCSN1, LOGL_INFO, "osmo_csn1_stream_encode (RAcap): ");
- ret = osmo_csn1_stream_encode(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, &writeIndex, data);
- LOGPC(DLCSN1, LOGL_INFO, "\n");
-
- if (ret > 0 || ret == CSN_ERROR_NEED_MORE_BITS_TO_UNPACK) {
- LOGP(DRLCMACDATA, LOGL_ERROR, "Failed to encode MS RA Capability IE: not enough bits "
- "in the output buffer (rc=%d)\n", ret);
- ret = CSN_ERROR_NEED_MORE_BITS_TO_UNPACK;
- }
-
- return ret;
-}
-
const struct value_string osmo_gprs_rlcmac_egprs_pkt_ch_req_type_names[] = {
{ EGPRS_PKT_CHAN_REQ_ONE_PHASE, "One Phase Access" },
{ EGPRS_PKT_CHAN_REQ_SHORT, "Short Access" },
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29194
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: Idedf52423fef18b929e8096fbe4e130b5a6c7d2c
Gerrit-Change-Number: 29194
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
1
0
Change in libosmo-gprs[master]: rlcmac: split gprs_rlcmac.c onto ts_44_{060,018}.c
by fixeria 22 Aug '22
by fixeria 22 Aug '22
22 Aug '22
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29193 )
Change subject: rlcmac: split gprs_rlcmac.c onto ts_44_{060,018}.c
......................................................................
rlcmac: split gprs_rlcmac.c onto ts_44_{060,018}.c
Change-Id: I2b941f06a70a25e92ba3fd2638f87360a5aa5435
---
M src/rlcmac/Makefile.am
A src/rlcmac/ts_44_018.c
R src/rlcmac/ts_44_060.c
3 files changed, 613 insertions(+), 586 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/93/29193/1
diff --git a/src/rlcmac/Makefile.am b/src/rlcmac/Makefile.am
index 51e9ec1..95d5c03 100644
--- a/src/rlcmac/Makefile.am
+++ b/src/rlcmac/Makefile.am
@@ -22,7 +22,8 @@
$(NULL)
libosmo_gprs_rlcmac_la_SOURCES = \
- gprs_rlcmac.c \
+ ts_44_060.c \
+ ts_44_018.c \
$(NULL)
libosmo_gprs_rlcmac_la_LDFLAGS = \
diff --git a/src/rlcmac/ts_44_018.c b/src/rlcmac/ts_44_018.c
new file mode 100644
index 0000000..10ff872
--- /dev/null
+++ b/src/rlcmac/ts_44_018.c
@@ -0,0 +1,609 @@
+/*
+ * CSN.1 definitions from 3GPP TS 44.018.
+ *
+ * By Vincent Helfre, based on original code by Jari Sassi
+ * with the gracious authorization of STE
+ * Copyright (c) 2011 ST-Ericsson
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald(a)wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <assert.h>
+#include <arpa/inet.h>
+
+#include <osmocom/core/utils.h>
+#include <osmocom/core/bitvec.h>
+#include <osmocom/core/logging.h>
+
+#include <osmocom/csn1/csn1.h>
+#include <osmocom/gprs/rlcmac/gprs_rlcmac.h>
+
+/*<P1 Rest Octets>*/
+/*<P2 Rest Octets>*/
+#if 0
+static const
+CSN_DESCR_BEGIN(MobileAllocationIE_t)
+ M_UINT (MobileAllocationIE_t, Length, 8),
+ M_VAR_ARRAY (MobileAllocationIE_t, MA, Length, 0),
+CSN_DESCR_END (MobileAllocationIE_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(SingleRFChannel_t)
+ M_UINT (SingleRFChannel_t, spare, 2),
+ M_UINT (SingleRFChannel_t, ARFCN, 10),
+CSN_DESCR_END (SingleRFChannel_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(RFHoppingChannel_t)
+ M_UINT (RFHoppingChannel_t, MAIO, 6),
+ M_UINT (RFHoppingChannel_t, HSN, 6),
+CSN_DESCR_END (RFHoppingChannel_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(MobileAllocation_or_Frequency_Short_List_t)
+ M_UNION (MobileAllocation_or_Frequency_Short_List_t, 2),
+ M_BITMAP (MobileAllocation_or_Frequency_Short_List_t, u.Frequency_Short_List, 64),
+ M_TYPE (MobileAllocation_or_Frequency_Short_List_t, u.MA, MobileAllocationIE_t),
+CSN_DESCR_END (MobileAllocation_or_Frequency_Short_List_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(Channel_Description_t)
+ M_UINT (Channel_Description_t, Channel_type_and_TDMA_offset, 5),
+ M_UINT (Channel_Description_t, TN, 3),
+ M_UINT (Channel_Description_t, TSC, 3),
+
+ M_UNION (Channel_Description_t, 2),
+ M_TYPE (Channel_Description_t, u.SingleRFChannel, SingleRFChannel_t),
+ M_TYPE (Channel_Description_t, u.RFHoppingChannel, RFHoppingChannel_t),
+CSN_DESCR_END(Channel_Description_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(Group_Channel_Description_t)
+ M_TYPE (Group_Channel_Description_t, Channel_Description, Channel_Description_t),
+
+ M_NEXT_EXIST (Group_Channel_Description_t, Exist_Hopping, 1),
+ M_TYPE (Group_Channel_Description_t, MA_or_Frequency_Short_List, MobileAllocation_or_Frequency_Short_List_t),
+CSN_DESCR_END (Group_Channel_Description_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(Group_Call_Reference_t)
+ M_UINT (Group_Call_Reference_t, value, 27),
+ M_UINT (Group_Call_Reference_t, SF, 1),
+ M_UINT (Group_Call_Reference_t, AF, 1),
+ M_UINT (Group_Call_Reference_t, call_priority, 3),
+ M_UINT (Group_Call_Reference_t, Ciphering_information, 4),
+CSN_DESCR_END (Group_Call_Reference_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(Group_Call_information_t)
+ M_TYPE (Group_Call_information_t, Group_Call_Reference, Group_Call_Reference_t),
+
+ M_NEXT_EXIST (Group_Call_information_t, Exist_Group_Channel_Description, 1),
+ M_TYPE (Group_Call_information_t, Group_Channel_Description, Group_Channel_Description_t),
+CSN_DESCR_END (Group_Call_information_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN (P1_Rest_Octets_t)
+ M_NEXT_EXIST_LH(P1_Rest_Octets_t, Exist_NLN_PCH_and_NLN_status, 2),
+ M_UINT (P1_Rest_Octets_t, NLN_PCH, 2),
+ M_UINT (P1_Rest_Octets_t, NLN_status, 1),
+
+ M_NEXT_EXIST_LH(P1_Rest_Octets_t, Exist_Priority1, 1),
+ M_UINT (P1_Rest_Octets_t, Priority1, 3),
+
+ M_NEXT_EXIST_LH(P1_Rest_Octets_t, Exist_Priority2, 1),
+ M_UINT (P1_Rest_Octets_t, Priority2, 3),
+
+ M_NEXT_EXIST_LH(P1_Rest_Octets_t, Exist_Group_Call_information, 1),
+ M_TYPE (P1_Rest_Octets_t, Group_Call_information, Group_Call_information_t),
+
+ M_UINT_LH (P1_Rest_Octets_t, Packet_Page_Indication_1, 1),
+ M_UINT_LH (P1_Rest_Octets_t, Packet_Page_Indication_2, 1),
+CSN_DESCR_END (P1_Rest_Octets_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN (P2_Rest_Octets_t)
+ M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_CN3, 1),
+ M_UINT (P2_Rest_Octets_t, CN3, 2),
+
+ M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_NLN_and_status, 2),
+ M_UINT (P2_Rest_Octets_t, NLN, 2),
+ M_UINT (P2_Rest_Octets_t, NLN_status, 1),
+
+ M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_Priority1, 1),
+ M_UINT (P2_Rest_Octets_t, Priority1, 3),
+
+ M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_Priority2, 1),
+ M_UINT (P2_Rest_Octets_t, Priority2, 3),
+
+ M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_Priority3, 1),
+ M_UINT (P2_Rest_Octets_t, Priority3, 3),
+
+ M_UINT_LH (P2_Rest_Octets_t, Packet_Page_Indication_3, 1),
+CSN_DESCR_END (P2_Rest_Octets_t)
+#endif
+
+/* <IA Rest Octets>
+ * Note!!
+ * - first two bits skipped and frequencyparameters skipped
+ * - additions for R99 and EGPRS added
+ */
+#if 0
+static const
+CSN_DESCR_BEGIN(DynamicAllocation_t)
+ M_UINT (DynamicAllocation_t, USF, 3),
+ M_UINT (DynamicAllocation_t, USF_GRANULARITY, 1),
+
+ M_NEXT_EXIST (DynamicAllocation_t, Exist_P0_PR_MODE, 2),
+ M_UINT (DynamicAllocation_t, P0, 4),
+ M_UINT (DynamicAllocation_t, PR_MODE, 1),
+CSN_DESCR_END (DynamicAllocation_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(EGPRS_TwoPhaseAccess_t)
+ M_NEXT_EXIST (EGPRS_TwoPhaseAccess_t, Exist_ALPHA, 1),
+ M_UINT (EGPRS_TwoPhaseAccess_t, ALPHA, 4),
+
+ M_UINT (EGPRS_TwoPhaseAccess_t, GAMMA, 5),
+ M_TYPE (EGPRS_TwoPhaseAccess_t, TBF_STARTING_TIME, StartingTime_t),
+ M_UINT (EGPRS_TwoPhaseAccess_t, NR_OF_RADIO_BLOCKS_ALLOCATED, 2),
+
+ M_NEXT_EXIST (EGPRS_TwoPhaseAccess_t, Exist_P0_BTS_PWR_CTRL_PR_MODE, 3),
+ M_UINT (EGPRS_TwoPhaseAccess_t, P0, 4),
+ M_UINT (EGPRS_TwoPhaseAccess_t, BTS_PWR_CTRL_MODE, 1),
+ M_UINT (EGPRS_TwoPhaseAccess_t, PR_MODE, 1),
+CSN_DESCR_END (EGPRS_TwoPhaseAccess_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(EGPRS_OnePhaseAccess_t)
+ M_UINT (EGPRS_OnePhaseAccess_t, TFI_ASSIGNMENT, 5),
+ M_UINT (EGPRS_OnePhaseAccess_t, POLLING, 1),
+
+ M_UNION (EGPRS_OnePhaseAccess_t, 2),
+ M_TYPE (EGPRS_OnePhaseAccess_t, Allocation.DynamicAllocation, DynamicAllocation_t),
+ CSN_ERROR (EGPRS_OnePhaseAccess_t, "1 <Fixed Allocation>", CSN_ERROR_STREAM_NOT_SUPPORTED),
+
+ M_UINT (EGPRS_OnePhaseAccess_t, EGPRS_CHANNEL_CODING_COMMAND, 4),
+ M_UINT (EGPRS_OnePhaseAccess_t, TLLI_BLOCK_CHANNEL_CODING, 1),
+
+ M_NEXT_EXIST (EGPRS_OnePhaseAccess_t, Exist_BEP_PERIOD2, 1),
+ M_UINT (EGPRS_OnePhaseAccess_t, BEP_PERIOD2, 4),
+
+ M_UINT (EGPRS_OnePhaseAccess_t, RESEGMENT, 1),
+ M_UINT (EGPRS_OnePhaseAccess_t, EGPRS_WindowSize, 5),
+
+ M_NEXT_EXIST (EGPRS_OnePhaseAccess_t, Exist_ALPHA, 1),
+ M_UINT (EGPRS_OnePhaseAccess_t, ALPHA, 4),
+
+ M_UINT (EGPRS_OnePhaseAccess_t, GAMMA, 5),
+
+ M_NEXT_EXIST (EGPRS_OnePhaseAccess_t, Exist_TIMING_ADVANCE_INDEX, 1),
+ M_UINT (EGPRS_OnePhaseAccess_t, TIMING_ADVANCE_INDEX, 4),
+
+ M_NEXT_EXIST (EGPRS_OnePhaseAccess_t, Exist_TBF_STARTING_TIME, 1),
+ M_TYPE (EGPRS_OnePhaseAccess_t, TBF_STARTING_TIME, StartingTime_t),
+CSN_DESCR_END (EGPRS_OnePhaseAccess_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(IA_EGPRS_00_t)
+ M_UINT (IA_EGPRS_00_t, ExtendedRA, 5),
+
+ M_REC_ARRAY (IA_EGPRS_00_t, AccessTechnologyType, NrOfAccessTechnologies, 4),
+
+ M_UNION (IA_EGPRS_00_t, 2),
+ M_TYPE (IA_EGPRS_00_t, Access.TwoPhaseAccess, EGPRS_TwoPhaseAccess_t),
+ M_TYPE (IA_EGPRS_00_t, Access.OnePhaseAccess, EGPRS_OnePhaseAccess_t),
+CSN_DESCR_END (IA_EGPRS_00_t)
+#endif
+
+#if 0
+static const
+CSN_ChoiceElement_t IA_EGPRS_Choice[] =
+{
+ {2, 0x00, 0, M_TYPE (IA_EGPRS_t, u.IA_EGPRS_PUA, IA_EGPRS_00_t)},
+ {2, 0x01, 0, CSN_ERROR(IA_EGPRS_t, "01 <IA_EGPRS>", CSN_ERROR_STREAM_NOT_SUPPORTED)},
+ {1, 0x01, 0, CSN_ERROR(IA_EGPRS_t, "1 <IA_EGPRS>", CSN_ERROR_STREAM_NOT_SUPPORTED)}
+};
+#endif
+
+/* Please observe the double usage of UnionType element.
+ * First, it is used to store the second bit of LL/LH identification of EGPRS contents.
+ * Thereafter, UnionType will be used to store the index to detected choice.
+ */
+#if 0
+static const
+CSN_DESCR_BEGIN(IA_EGPRS_t)
+ M_UINT (IA_EGPRS_t, UnionType , 1 ),
+ M_CHOICE (IA_EGPRS_t, UnionType, IA_EGPRS_Choice, ElementsOf(IA_EGPRS_Choice)),
+CSN_DESCR_END (IA_EGPRS_t)
+
+static const
+CSN_DESCR_BEGIN(IA_FreqParamsBeforeTime_t)
+ M_UINT (IA_FreqParamsBeforeTime_t, Length, 6),
+ M_UINT (IA_FreqParamsBeforeTime_t, MAIO, 6),
+ M_VAR_ARRAY (IA_FreqParamsBeforeTime_t, MobileAllocation, Length, 8),
+CSN_DESCR_END (IA_FreqParamsBeforeTime_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN (GPRS_SingleBlockAllocation_t)
+ M_NEXT_EXIST (GPRS_SingleBlockAllocation_t, Exist_ALPHA, 1),
+ M_UINT (GPRS_SingleBlockAllocation_t, ALPHA, 4),
+
+ M_UINT (GPRS_SingleBlockAllocation_t, GAMMA, 5),
+ M_FIXED (GPRS_SingleBlockAllocation_t, 2, 0x01),
+ M_TYPE (GPRS_SingleBlockAllocation_t, TBF_STARTING_TIME, StartingTime_t), /*bit(16)*/
+
+ M_NEXT_EXIST_LH(GPRS_SingleBlockAllocation_t, Exist_P0_BTS_PWR_CTRL_PR_MODE, 3),
+ M_UINT (GPRS_SingleBlockAllocation_t, P0, 4),
+ M_UINT (GPRS_SingleBlockAllocation_t, BTS_PWR_CTRL_MODE, 1),
+ M_UINT (GPRS_SingleBlockAllocation_t, PR_MODE, 1),
+CSN_DESCR_END (GPRS_SingleBlockAllocation_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN (GPRS_DynamicOrFixedAllocation_t)
+ M_UINT (GPRS_DynamicOrFixedAllocation_t, TFI_ASSIGNMENT, 5),
+ M_UINT (GPRS_DynamicOrFixedAllocation_t, POLLING, 1),
+
+ M_UNION (GPRS_DynamicOrFixedAllocation_t, 2),
+ M_TYPE (GPRS_DynamicOrFixedAllocation_t, Allocation.DynamicAllocation, DynamicAllocation_t),
+ CSN_ERROR (GPRS_DynamicOrFixedAllocation_t, "1 <Fixed Allocation>", CSN_ERROR_STREAM_NOT_SUPPORTED),
+
+ M_UINT (GPRS_DynamicOrFixedAllocation_t, CHANNEL_CODING_COMMAND, 2),
+ M_UINT (GPRS_DynamicOrFixedAllocation_t, TLLI_BLOCK_CHANNEL_CODING, 1),
+
+ M_NEXT_EXIST (GPRS_DynamicOrFixedAllocation_t, Exist_ALPHA, 1),
+ M_UINT (GPRS_DynamicOrFixedAllocation_t, ALPHA, 4),
+
+ M_UINT (GPRS_DynamicOrFixedAllocation_t, GAMMA, 5),
+
+ M_NEXT_EXIST (GPRS_DynamicOrFixedAllocation_t, Exist_TIMING_ADVANCE_INDEX, 1),
+ M_UINT (GPRS_DynamicOrFixedAllocation_t, TIMING_ADVANCE_INDEX, 4),
+
+ M_NEXT_EXIST (GPRS_DynamicOrFixedAllocation_t, Exist_TBF_STARTING_TIME, 1),
+ M_TYPE (GPRS_DynamicOrFixedAllocation_t, TBF_STARTING_TIME, StartingTime_t),
+CSN_DESCR_END (GPRS_DynamicOrFixedAllocation_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(PU_IA_AdditionsR99_t)
+ M_NEXT_EXIST (PU_IA_AdditionsR99_t, Exist_ExtendedRA, 1),
+ M_UINT (PU_IA_AdditionsR99_t, ExtendedRA, 5),
+CSN_DESCR_END (PU_IA_AdditionsR99_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN (Packet_Uplink_ImmAssignment_t)
+ M_UNION (Packet_Uplink_ImmAssignment_t, 2),
+ M_TYPE (Packet_Uplink_ImmAssignment_t, Access.SingleBlockAllocation, GPRS_SingleBlockAllocation_t),
+ M_TYPE (Packet_Uplink_ImmAssignment_t, Access.DynamicOrFixedAllocation, GPRS_DynamicOrFixedAllocation_t),
+
+ M_NEXT_EXIST_OR_NULL_LH(Packet_Uplink_ImmAssignment_t, Exist_AdditionsR99, 1),
+ M_TYPE (Packet_Uplink_ImmAssignment_t, AdditionsR99, PU_IA_AdditionsR99_t),
+CSN_DESCR_END (Packet_Uplink_ImmAssignment_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(PD_IA_AdditionsR99_t)
+ M_UINT (PD_IA_AdditionsR99_t, EGPRS_WindowSize, 5),
+ M_UINT (PD_IA_AdditionsR99_t, LINK_QUALITY_MEASUREMENT_MODE, 2),
+
+ M_NEXT_EXIST (PD_IA_AdditionsR99_t, Exist_BEP_PERIOD2, 1),
+ M_UINT (PD_IA_AdditionsR99_t, BEP_PERIOD2, 4),
+CSN_DESCR_END (PD_IA_AdditionsR99_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(Packet_Downlink_ImmAssignment_t)
+ M_UINT (Packet_Downlink_ImmAssignment_t, TLLI, 32),
+
+ M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_TFI_to_TA_VALID, 6 + 1),
+ M_UINT (Packet_Downlink_ImmAssignment_t, TFI_ASSIGNMENT, 5),
+ M_UINT (Packet_Downlink_ImmAssignment_t, RLC_MODE, 1),
+ M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_ALPHA, 1),
+ M_UINT (Packet_Downlink_ImmAssignment_t, ALPHA, 4),
+ M_UINT (Packet_Downlink_ImmAssignment_t, GAMMA, 5),
+ M_UINT (Packet_Downlink_ImmAssignment_t, POLLING, 1),
+ M_UINT (Packet_Downlink_ImmAssignment_t, TA_VALID, 1),
+
+ M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_TIMING_ADVANCE_INDEX, 1),
+ M_UINT (Packet_Downlink_ImmAssignment_t, TIMING_ADVANCE_INDEX, 4),
+
+ M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_TBF_STARTING_TIME, 1),
+ M_TYPE (Packet_Downlink_ImmAssignment_t, TBF_STARTING_TIME, StartingTime_t),
+
+ M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_P0_PR_MODE, 3),
+ M_UINT (Packet_Downlink_ImmAssignment_t, P0, 4),
+ M_UINT (Packet_Downlink_ImmAssignment_t, BTS_PWR_CTRL_MODE, 1),
+ M_UINT (Packet_Downlink_ImmAssignment_t, PR_MODE, 1),
+
+ M_NEXT_EXIST_OR_NULL_LH(Packet_Downlink_ImmAssignment_t, Exist_AdditionsR99, 1),
+ M_TYPE (Packet_Downlink_ImmAssignment_t, AdditionsR99, PD_IA_AdditionsR99_t),
+CSN_DESCR_END (Packet_Downlink_ImmAssignment_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN (Second_Part_Packet_Assignment_t)
+ M_NEXT_EXIST_OR_NULL_LH(Second_Part_Packet_Assignment_t, Exist_SecondPart, 2),
+ M_NEXT_EXIST (Second_Part_Packet_Assignment_t, Exist_ExtendedRA, 1),
+ M_UINT (Second_Part_Packet_Assignment_t, ExtendedRA, 5),
+CSN_DESCR_END (Second_Part_Packet_Assignment_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(IA_PacketAssignment_UL_DL_t)
+ M_UNION (IA_PacketAssignment_UL_DL_t, 2),
+ M_TYPE (IA_PacketAssignment_UL_DL_t, ul_dl.Packet_Uplink_ImmAssignment, Packet_Uplink_ImmAssignment_t),
+ M_TYPE (IA_PacketAssignment_UL_DL_t, ul_dl.Packet_Downlink_ImmAssignment, Packet_Downlink_ImmAssignment_t),
+CSN_DESCR_END (IA_PacketAssignment_UL_DL_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(IA_PacketAssignment_t)
+ M_UNION (IA_PacketAssignment_t, 2),
+ M_TYPE (IA_PacketAssignment_t, u.UplinkDownlinkAssignment, IA_PacketAssignment_UL_DL_t),
+ M_TYPE (IA_PacketAssignment_t, u.UplinkDownlinkAssignment, Second_Part_Packet_Assignment_t),
+CSN_DESCR_END (IA_PacketAssignment_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(SI13_AdditionsR6)
+ M_NEXT_EXIST (SI13_AdditionsR6, Exist_LB_MS_TXPWR_MAX_CCH, 1),
+ M_UINT (SI13_AdditionsR6, LB_MS_TXPWR_MAX_CCH, 5),
+ M_UINT (SI13_AdditionsR6, SI2n_SUPPORT, 2),
+CSN_DESCR_END (SI13_AdditionsR6)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(SI13_AdditionsR4)
+ M_UINT (SI13_AdditionsR4, SI_STATUS_IND, 1),
+ M_NEXT_EXIST_OR_NULL_LH (SI13_AdditionsR4, Exist_AdditionsR6, 1),
+ M_TYPE (SI13_AdditionsR4, AdditionsR6, SI13_AdditionsR6),
+CSN_DESCR_END (SI13_AdditionsR4)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(SI13_AdditionR99)
+ M_UINT (SI13_AdditionR99, SGSNR, 1),
+ M_NEXT_EXIST_OR_NULL_LH (SI13_AdditionR99, Exist_AdditionsR4, 1),
+ M_TYPE (SI13_AdditionR99, AdditionsR4, SI13_AdditionsR4),
+CSN_DESCR_END (SI13_AdditionR99)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN (SI_13_t)
+ M_THIS_EXIST_LH (SI_13_t),
+
+ M_UINT (SI_13_t, BCCH_CHANGE_MARK, 3),
+ M_UINT (SI_13_t, SI_CHANGE_FIELD, 4),
+
+ M_NEXT_EXIST (SI_13_t, Exist_MA, 2),
+ M_UINT (SI_13_t, SI13_CHANGE_MARK, 2),
+ M_TYPE (SI_13_t, GPRS_Mobile_Allocation, GPRS_Mobile_Allocation_t),
+
+ M_UNION (SI_13_t, 2),
+ M_TYPE (SI_13_t, u.PBCCH_Not_present, PBCCH_Not_present_t),
+ M_TYPE (SI_13_t, u.PBCCH_present, PBCCH_present_t),
+
+ M_NEXT_EXIST_OR_NULL_LH(SI_13_t, Exist_AdditionsR99, 1),
+ M_TYPE (SI_13_t, AdditionsR99, SI13_AdditionR99),
+CSN_DESCR_END (SI_13_t)
+#endif
+
+/* Enhanced Measurement Report */
+#if 0
+static const
+CSN_DESCR_BEGIN (ServingCellData_t)
+ M_UINT (ServingCellData_t, RXLEV_SERVING_CELL, 6),
+ M_FIXED (ServingCellData_t, 1, 0),
+CSN_DESCR_END (ServingCellData_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN (Repeated_Invalid_BSIC_Info_t)
+ M_UINT (Repeated_Invalid_BSIC_Info_t, BCCH_FREQ_NCELL, 5),
+ M_UINT (Repeated_Invalid_BSIC_Info_t, BSIC, 6),
+ M_UINT (Repeated_Invalid_BSIC_Info_t, RXLEV_NCELL, 5),
+CSN_DESCR_END (Repeated_Invalid_BSIC_Info_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN (REPORTING_QUANTITY_t)
+ M_NEXT_EXIST (REPORTING_QUANTITY_t, Exist_REPORTING_QUANTITY, 1),
+ M_UINT (REPORTING_QUANTITY_t, REPORTING_QUANTITY, 6),
+CSN_DESCR_END (REPORTING_QUANTITY_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN (NC_MeasurementReport_t)
+ M_UINT (NC_MeasurementReport_t, NC_MODE, 1),
+ M_UNION (NC_MeasurementReport_t, 2),
+ M_TYPE (NC_MeasurementReport_t, u.BA_USED, BA_USED_t),
+ M_UINT (NC_MeasurementReport_t, u.PSI3_CHANGE_MARK, 2),
+ M_UINT (NC_MeasurementReport_t, PMO_USED, 1),
+ M_UINT (NC_MeasurementReport_t, SCALE, 1),
+
+ M_NEXT_EXIST (NC_MeasurementReport_t, Exist_ServingCellData, 1),
+ M_TYPE (NC_MeasurementReport_t, ServingCellData, ServingCellData_t),
+
+ M_REC_TARRAY (NC_MeasurementReport_t, Repeated_Invalid_BSIC_Info, Repeated_Invalid_BSIC_Info_t, Count_Repeated_Invalid_BSIC_Info),
+
+ M_NEXT_EXIST (NC_MeasurementReport_t, Exist_Repeated_REPORTING_QUANTITY, 1),
+ M_VAR_TARRAY (NC_MeasurementReport_t, Repeated_REPORTING_QUANTITY, REPORTING_QUANTITY_t, Count_Repeated_Reporting_Quantity),
+CSN_DESCR_END (NC_MeasurementReport_t)
+#endif
+
+/* SI1_RestOctet_t */
+#if 0
+static const
+CSN_DESCR_BEGIN (SI1_RestOctet_t)
+ M_NEXT_EXIST_LH(SI1_RestOctet_t, Exist_NCH_Position, 1),
+ M_UINT (SI1_RestOctet_t, NCH_Position, 5),
+
+ M_UINT_LH (SI1_RestOctet_t, BandIndicator, 1),
+CSN_DESCR_END (SI1_RestOctet_t)
+#endif
+
+/* SI3_Rest_Octet_t */
+#if 0
+static const
+CSN_DESCR_BEGIN(Selection_Parameters_t)
+ M_UINT (Selection_Parameters_t, CBQ, 1),
+ M_UINT (Selection_Parameters_t, CELL_RESELECT_OFFSET, 6),
+ M_UINT (Selection_Parameters_t, TEMPORARY_OFFSET, 3),
+ M_UINT (Selection_Parameters_t, PENALTY_TIME, 5),
+CSN_DESCR_END (Selection_Parameters_t)
+
+static const
+CSN_DESCR_BEGIN (SI3_Rest_Octet_t)
+ M_NEXT_EXIST_LH(SI3_Rest_Octet_t, Exist_Selection_Parameters, 1),
+ M_TYPE (SI3_Rest_Octet_t, Selection_Parameters, Selection_Parameters_t),
+
+ M_NEXT_EXIST_LH(SI3_Rest_Octet_t, Exist_Power_Offset, 1),
+ M_UINT (SI3_Rest_Octet_t, Power_Offset, 2),
+
+ M_UINT_LH (SI3_Rest_Octet_t, System_Information_2ter_Indicator, 1),
+ M_UINT_LH (SI3_Rest_Octet_t, Early_Classmark_Sending_Control, 1),
+
+ M_NEXT_EXIST_LH(SI3_Rest_Octet_t, Exist_WHERE, 1),
+ M_UINT (SI3_Rest_Octet_t, WHERE, 3),
+
+ M_NEXT_EXIST_LH(SI3_Rest_Octet_t, Exist_GPRS_Indicator, 2),
+ M_UINT (SI3_Rest_Octet_t, RA_COLOUR, 3),
+ M_UINT (SI3_Rest_Octet_t, SI13_POSITION, 1),
+
+ M_UINT_LH (SI3_Rest_Octet_t, ECS_Restriction3G, 1),
+
+ M_NEXT_EXIST_LH(SI3_Rest_Octet_t, ExistSI2quaterIndicator, 1),
+ M_UINT (SI3_Rest_Octet_t, SI2quaterIndicator, 1),
+CSN_DESCR_END (SI3_Rest_Octet_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN (SI4_Rest_Octet_t)
+ M_NEXT_EXIST_LH(SI4_Rest_Octet_t, Exist_Selection_Parameters, 1),
+ M_TYPE (SI4_Rest_Octet_t, Selection_Parameters, Selection_Parameters_t),
+
+ M_NEXT_EXIST_LH(SI4_Rest_Octet_t, Exist_Power_Offset, 1),
+ M_UINT (SI4_Rest_Octet_t, Power_Offset, 2),
+
+ M_NEXT_EXIST_LH(SI4_Rest_Octet_t, Exist_GPRS_Indicator, 2),
+ M_UINT (SI4_Rest_Octet_t, RA_COLOUR, 3),
+ M_UINT (SI4_Rest_Octet_t, SI13_POSITION, 1),
+CSN_DESCR_END (SI4_Rest_Octet_t)
+#endif
+
+/* SI6_RestOctet_t */
+
+#if 0
+static const
+CSN_DESCR_BEGIN(PCH_and_NCH_Info_t)
+ M_UINT (PCH_and_NCH_Info_t, PagingChannelRestructuring, 1),
+ M_UINT (PCH_and_NCH_Info_t, NLN_SACCH, 2),
+
+ M_NEXT_EXIST (PCH_and_NCH_Info_t, Exist_CallPriority, 1),
+ M_UINT (PCH_and_NCH_Info_t, CallPriority, 3),
+
+ M_UINT (PCH_and_NCH_Info_t, NLN_Status, 1),
+CSN_DESCR_END (PCH_and_NCH_Info_t)
+
+static const
+CSN_DESCR_BEGIN (SI6_RestOctet_t)
+ M_NEXT_EXIST_LH(SI6_RestOctet_t, Exist_PCH_and_NCH_Info, 1),
+ M_TYPE (SI6_RestOctet_t, PCH_and_NCH_Info, PCH_and_NCH_Info_t),
+
+ M_NEXT_EXIST_LH(SI6_RestOctet_t, Exist_VBS_VGCS_Options, 1),
+ M_UINT (SI6_RestOctet_t, VBS_VGCS_Options, 2),
+
+ M_NEXT_EXIST_LH(SI6_RestOctet_t, Exist_DTM_Support, 2),
+ M_UINT (SI6_RestOctet_t, RAC, 8),
+ M_UINT (SI6_RestOctet_t, MAX_LAPDm, 3),
+
+ M_UINT_LH (SI6_RestOctet_t, BandIndicator, 1),
+CSN_DESCR_END (SI6_RestOctet_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN(EMR_ServingCell_t)
+ /*CSN_MEMBER_BIT (EMR_ServingCell_t, DTX_USED),*/
+ M_UINT (EMR_ServingCell_t, DTX_USED, 1),
+ M_UINT (EMR_ServingCell_t, RXLEV_VAL, 6),
+ M_UINT (EMR_ServingCell_t, RX_QUAL_FULL, 3),
+ M_UINT (EMR_ServingCell_t, MEAN_BEP, 5),
+ M_UINT (EMR_ServingCell_t, CV_BEP, 3),
+ M_UINT (EMR_ServingCell_t, NBR_RCVD_BLOCKS, 5),
+CSN_DESCR_END(EMR_ServingCell_t)
+#endif
+
+#if 0
+static const
+CSN_DESCR_BEGIN (EnhancedMeasurementReport_t)
+ M_UINT (EnhancedMeasurementReport_t, RR_Short_PD, 1),
+ M_UINT (EnhancedMeasurementReport_t, MESSAGE_TYPE, 5),
+ M_UINT (EnhancedMeasurementReport_t, ShortLayer2_Header, 2),
+ M_TYPE (EnhancedMeasurementReport_t, BA_USED, BA_USED_t),
+ M_UINT (EnhancedMeasurementReport_t, BSIC_Seen, 1),
+ M_UINT (EnhancedMeasurementReport_t, SCALE, 1),
+ M_NEXT_EXIST (EnhancedMeasurementReport_t, Exist_ServingCellData, 1),
+ M_TYPE (EnhancedMeasurementReport_t, ServingCellData, EMR_ServingCell_t),
+ M_REC_TARRAY (EnhancedMeasurementReport_t, RepeatedInvalid_BSIC_Info, RepeatedInvalid_BSIC_Info_t,
+ Count_RepeatedInvalid_BSIC_Info),
+ M_NEXT_EXIST (EnhancedMeasurementReport_t, Exist_ReportBitmap, 1),
+ M_VAR_TARRAY (EnhancedMeasurementReport_t, REPORTING_QUANTITY_Instances, REPORTING_QUANTITY_Instance_t, Count_REPORTING_QUANTITY_Instances),
+CSN_DESCR_END (EnhancedMeasurementReport_t)
+#endif
diff --git a/src/rlcmac/gprs_rlcmac.c b/src/rlcmac/ts_44_060.c
similarity index 91%
rename from src/rlcmac/gprs_rlcmac.c
rename to src/rlcmac/ts_44_060.c
index 80b399b..1dd1d85 100644
--- a/src/rlcmac/gprs_rlcmac.c
+++ b/src/rlcmac/ts_44_060.c
@@ -1,6 +1,5 @@
-/* gsm_rlcmac.c
- * Routines for GSM RLC MAC control plane message dissection in wireshark.
- * TS 44.060 and 24.008
+/*
+ * CSN.1 definitions from 3GPP TS 44.060.
*
* Copyright (C) 2011 Ivan Klyuchnikov
*
@@ -8,8 +7,6 @@
* with the gracious authorization of STE
* Copyright (c) 2011 ST-Ericsson
*
- * $Id: packet-gsm_rlcmac.c 39164 2011-09-27 12:05:32Z etxrab $
- *
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald(a)wireshark.org>
* Copyright 1998 Gerald Combs
@@ -209,368 +206,6 @@
M_TYPE (EGPRS_AckNack_t, Desc, EGPRS_AckNack_w_len_t),
CSN_DESCR_END (EGPRS_AckNack_t)
-/*<P1 Rest Octets>*/
-/*<P2 Rest Octets>*/
-#if 0
-static const
-CSN_DESCR_BEGIN(MobileAllocationIE_t)
- M_UINT (MobileAllocationIE_t, Length, 8),
- M_VAR_ARRAY (MobileAllocationIE_t, MA, Length, 0),
-CSN_DESCR_END (MobileAllocationIE_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(SingleRFChannel_t)
- M_UINT (SingleRFChannel_t, spare, 2),
- M_UINT (SingleRFChannel_t, ARFCN, 10),
-CSN_DESCR_END (SingleRFChannel_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(RFHoppingChannel_t)
- M_UINT (RFHoppingChannel_t, MAIO, 6),
- M_UINT (RFHoppingChannel_t, HSN, 6),
-CSN_DESCR_END (RFHoppingChannel_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(MobileAllocation_or_Frequency_Short_List_t)
- M_UNION (MobileAllocation_or_Frequency_Short_List_t, 2),
- M_BITMAP (MobileAllocation_or_Frequency_Short_List_t, u.Frequency_Short_List, 64),
- M_TYPE (MobileAllocation_or_Frequency_Short_List_t, u.MA, MobileAllocationIE_t),
-CSN_DESCR_END (MobileAllocation_or_Frequency_Short_List_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(Channel_Description_t)
- M_UINT (Channel_Description_t, Channel_type_and_TDMA_offset, 5),
- M_UINT (Channel_Description_t, TN, 3),
- M_UINT (Channel_Description_t, TSC, 3),
-
- M_UNION (Channel_Description_t, 2),
- M_TYPE (Channel_Description_t, u.SingleRFChannel, SingleRFChannel_t),
- M_TYPE (Channel_Description_t, u.RFHoppingChannel, RFHoppingChannel_t),
-CSN_DESCR_END(Channel_Description_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(Group_Channel_Description_t)
- M_TYPE (Group_Channel_Description_t, Channel_Description, Channel_Description_t),
-
- M_NEXT_EXIST (Group_Channel_Description_t, Exist_Hopping, 1),
- M_TYPE (Group_Channel_Description_t, MA_or_Frequency_Short_List, MobileAllocation_or_Frequency_Short_List_t),
-CSN_DESCR_END (Group_Channel_Description_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(Group_Call_Reference_t)
- M_UINT (Group_Call_Reference_t, value, 27),
- M_UINT (Group_Call_Reference_t, SF, 1),
- M_UINT (Group_Call_Reference_t, AF, 1),
- M_UINT (Group_Call_Reference_t, call_priority, 3),
- M_UINT (Group_Call_Reference_t, Ciphering_information, 4),
-CSN_DESCR_END (Group_Call_Reference_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(Group_Call_information_t)
- M_TYPE (Group_Call_information_t, Group_Call_Reference, Group_Call_Reference_t),
-
- M_NEXT_EXIST (Group_Call_information_t, Exist_Group_Channel_Description, 1),
- M_TYPE (Group_Call_information_t, Group_Channel_Description, Group_Channel_Description_t),
-CSN_DESCR_END (Group_Call_information_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN (P1_Rest_Octets_t)
- M_NEXT_EXIST_LH(P1_Rest_Octets_t, Exist_NLN_PCH_and_NLN_status, 2),
- M_UINT (P1_Rest_Octets_t, NLN_PCH, 2),
- M_UINT (P1_Rest_Octets_t, NLN_status, 1),
-
- M_NEXT_EXIST_LH(P1_Rest_Octets_t, Exist_Priority1, 1),
- M_UINT (P1_Rest_Octets_t, Priority1, 3),
-
- M_NEXT_EXIST_LH(P1_Rest_Octets_t, Exist_Priority2, 1),
- M_UINT (P1_Rest_Octets_t, Priority2, 3),
-
- M_NEXT_EXIST_LH(P1_Rest_Octets_t, Exist_Group_Call_information, 1),
- M_TYPE (P1_Rest_Octets_t, Group_Call_information, Group_Call_information_t),
-
- M_UINT_LH (P1_Rest_Octets_t, Packet_Page_Indication_1, 1),
- M_UINT_LH (P1_Rest_Octets_t, Packet_Page_Indication_2, 1),
-CSN_DESCR_END (P1_Rest_Octets_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN (P2_Rest_Octets_t)
- M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_CN3, 1),
- M_UINT (P2_Rest_Octets_t, CN3, 2),
-
- M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_NLN_and_status, 2),
- M_UINT (P2_Rest_Octets_t, NLN, 2),
- M_UINT (P2_Rest_Octets_t, NLN_status, 1),
-
- M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_Priority1, 1),
- M_UINT (P2_Rest_Octets_t, Priority1, 3),
-
- M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_Priority2, 1),
- M_UINT (P2_Rest_Octets_t, Priority2, 3),
-
- M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_Priority3, 1),
- M_UINT (P2_Rest_Octets_t, Priority3, 3),
-
- M_UINT_LH (P2_Rest_Octets_t, Packet_Page_Indication_3, 1),
-CSN_DESCR_END (P2_Rest_Octets_t)
-#endif
-
-/* <IA Rest Octets>
- * Note!!
- * - first two bits skipped and frequencyparameters skipped
- * - additions for R99 and EGPRS added
- */
-#if 0
-static const
-CSN_DESCR_BEGIN(DynamicAllocation_t)
- M_UINT (DynamicAllocation_t, USF, 3),
- M_UINT (DynamicAllocation_t, USF_GRANULARITY, 1),
-
- M_NEXT_EXIST (DynamicAllocation_t, Exist_P0_PR_MODE, 2),
- M_UINT (DynamicAllocation_t, P0, 4),
- M_UINT (DynamicAllocation_t, PR_MODE, 1),
-CSN_DESCR_END (DynamicAllocation_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(EGPRS_TwoPhaseAccess_t)
- M_NEXT_EXIST (EGPRS_TwoPhaseAccess_t, Exist_ALPHA, 1),
- M_UINT (EGPRS_TwoPhaseAccess_t, ALPHA, 4),
-
- M_UINT (EGPRS_TwoPhaseAccess_t, GAMMA, 5),
- M_TYPE (EGPRS_TwoPhaseAccess_t, TBF_STARTING_TIME, StartingTime_t),
- M_UINT (EGPRS_TwoPhaseAccess_t, NR_OF_RADIO_BLOCKS_ALLOCATED, 2),
-
- M_NEXT_EXIST (EGPRS_TwoPhaseAccess_t, Exist_P0_BTS_PWR_CTRL_PR_MODE, 3),
- M_UINT (EGPRS_TwoPhaseAccess_t, P0, 4),
- M_UINT (EGPRS_TwoPhaseAccess_t, BTS_PWR_CTRL_MODE, 1),
- M_UINT (EGPRS_TwoPhaseAccess_t, PR_MODE, 1),
-CSN_DESCR_END (EGPRS_TwoPhaseAccess_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(EGPRS_OnePhaseAccess_t)
- M_UINT (EGPRS_OnePhaseAccess_t, TFI_ASSIGNMENT, 5),
- M_UINT (EGPRS_OnePhaseAccess_t, POLLING, 1),
-
- M_UNION (EGPRS_OnePhaseAccess_t, 2),
- M_TYPE (EGPRS_OnePhaseAccess_t, Allocation.DynamicAllocation, DynamicAllocation_t),
- CSN_ERROR (EGPRS_OnePhaseAccess_t, "1 <Fixed Allocation>", CSN_ERROR_STREAM_NOT_SUPPORTED),
-
- M_UINT (EGPRS_OnePhaseAccess_t, EGPRS_CHANNEL_CODING_COMMAND, 4),
- M_UINT (EGPRS_OnePhaseAccess_t, TLLI_BLOCK_CHANNEL_CODING, 1),
-
- M_NEXT_EXIST (EGPRS_OnePhaseAccess_t, Exist_BEP_PERIOD2, 1),
- M_UINT (EGPRS_OnePhaseAccess_t, BEP_PERIOD2, 4),
-
- M_UINT (EGPRS_OnePhaseAccess_t, RESEGMENT, 1),
- M_UINT (EGPRS_OnePhaseAccess_t, EGPRS_WindowSize, 5),
-
- M_NEXT_EXIST (EGPRS_OnePhaseAccess_t, Exist_ALPHA, 1),
- M_UINT (EGPRS_OnePhaseAccess_t, ALPHA, 4),
-
- M_UINT (EGPRS_OnePhaseAccess_t, GAMMA, 5),
-
- M_NEXT_EXIST (EGPRS_OnePhaseAccess_t, Exist_TIMING_ADVANCE_INDEX, 1),
- M_UINT (EGPRS_OnePhaseAccess_t, TIMING_ADVANCE_INDEX, 4),
-
- M_NEXT_EXIST (EGPRS_OnePhaseAccess_t, Exist_TBF_STARTING_TIME, 1),
- M_TYPE (EGPRS_OnePhaseAccess_t, TBF_STARTING_TIME, StartingTime_t),
-CSN_DESCR_END (EGPRS_OnePhaseAccess_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(IA_EGPRS_00_t)
- M_UINT (IA_EGPRS_00_t, ExtendedRA, 5),
-
- M_REC_ARRAY (IA_EGPRS_00_t, AccessTechnologyType, NrOfAccessTechnologies, 4),
-
- M_UNION (IA_EGPRS_00_t, 2),
- M_TYPE (IA_EGPRS_00_t, Access.TwoPhaseAccess, EGPRS_TwoPhaseAccess_t),
- M_TYPE (IA_EGPRS_00_t, Access.OnePhaseAccess, EGPRS_OnePhaseAccess_t),
-CSN_DESCR_END (IA_EGPRS_00_t)
-#endif
-
-#if 0
-static const
-CSN_ChoiceElement_t IA_EGPRS_Choice[] =
-{
- {2, 0x00, 0, M_TYPE (IA_EGPRS_t, u.IA_EGPRS_PUA, IA_EGPRS_00_t)},
- {2, 0x01, 0, CSN_ERROR(IA_EGPRS_t, "01 <IA_EGPRS>", CSN_ERROR_STREAM_NOT_SUPPORTED)},
- {1, 0x01, 0, CSN_ERROR(IA_EGPRS_t, "1 <IA_EGPRS>", CSN_ERROR_STREAM_NOT_SUPPORTED)}
-};
-#endif
-
-/* Please observe the double usage of UnionType element.
- * First, it is used to store the second bit of LL/LH identification of EGPRS contents.
- * Thereafter, UnionType will be used to store the index to detected choice.
- */
-#if 0
-static const
-CSN_DESCR_BEGIN(IA_EGPRS_t)
- M_UINT (IA_EGPRS_t, UnionType , 1 ),
- M_CHOICE (IA_EGPRS_t, UnionType, IA_EGPRS_Choice, ElementsOf(IA_EGPRS_Choice)),
-CSN_DESCR_END (IA_EGPRS_t)
-
-static const
-CSN_DESCR_BEGIN(IA_FreqParamsBeforeTime_t)
- M_UINT (IA_FreqParamsBeforeTime_t, Length, 6),
- M_UINT (IA_FreqParamsBeforeTime_t, MAIO, 6),
- M_VAR_ARRAY (IA_FreqParamsBeforeTime_t, MobileAllocation, Length, 8),
-CSN_DESCR_END (IA_FreqParamsBeforeTime_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN (GPRS_SingleBlockAllocation_t)
- M_NEXT_EXIST (GPRS_SingleBlockAllocation_t, Exist_ALPHA, 1),
- M_UINT (GPRS_SingleBlockAllocation_t, ALPHA, 4),
-
- M_UINT (GPRS_SingleBlockAllocation_t, GAMMA, 5),
- M_FIXED (GPRS_SingleBlockAllocation_t, 2, 0x01),
- M_TYPE (GPRS_SingleBlockAllocation_t, TBF_STARTING_TIME, StartingTime_t), /*bit(16)*/
-
- M_NEXT_EXIST_LH(GPRS_SingleBlockAllocation_t, Exist_P0_BTS_PWR_CTRL_PR_MODE, 3),
- M_UINT (GPRS_SingleBlockAllocation_t, P0, 4),
- M_UINT (GPRS_SingleBlockAllocation_t, BTS_PWR_CTRL_MODE, 1),
- M_UINT (GPRS_SingleBlockAllocation_t, PR_MODE, 1),
-CSN_DESCR_END (GPRS_SingleBlockAllocation_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN (GPRS_DynamicOrFixedAllocation_t)
- M_UINT (GPRS_DynamicOrFixedAllocation_t, TFI_ASSIGNMENT, 5),
- M_UINT (GPRS_DynamicOrFixedAllocation_t, POLLING, 1),
-
- M_UNION (GPRS_DynamicOrFixedAllocation_t, 2),
- M_TYPE (GPRS_DynamicOrFixedAllocation_t, Allocation.DynamicAllocation, DynamicAllocation_t),
- CSN_ERROR (GPRS_DynamicOrFixedAllocation_t, "1 <Fixed Allocation>", CSN_ERROR_STREAM_NOT_SUPPORTED),
-
- M_UINT (GPRS_DynamicOrFixedAllocation_t, CHANNEL_CODING_COMMAND, 2),
- M_UINT (GPRS_DynamicOrFixedAllocation_t, TLLI_BLOCK_CHANNEL_CODING, 1),
-
- M_NEXT_EXIST (GPRS_DynamicOrFixedAllocation_t, Exist_ALPHA, 1),
- M_UINT (GPRS_DynamicOrFixedAllocation_t, ALPHA, 4),
-
- M_UINT (GPRS_DynamicOrFixedAllocation_t, GAMMA, 5),
-
- M_NEXT_EXIST (GPRS_DynamicOrFixedAllocation_t, Exist_TIMING_ADVANCE_INDEX, 1),
- M_UINT (GPRS_DynamicOrFixedAllocation_t, TIMING_ADVANCE_INDEX, 4),
-
- M_NEXT_EXIST (GPRS_DynamicOrFixedAllocation_t, Exist_TBF_STARTING_TIME, 1),
- M_TYPE (GPRS_DynamicOrFixedAllocation_t, TBF_STARTING_TIME, StartingTime_t),
-CSN_DESCR_END (GPRS_DynamicOrFixedAllocation_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(PU_IA_AdditionsR99_t)
- M_NEXT_EXIST (PU_IA_AdditionsR99_t, Exist_ExtendedRA, 1),
- M_UINT (PU_IA_AdditionsR99_t, ExtendedRA, 5),
-CSN_DESCR_END (PU_IA_AdditionsR99_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN (Packet_Uplink_ImmAssignment_t)
- M_UNION (Packet_Uplink_ImmAssignment_t, 2),
- M_TYPE (Packet_Uplink_ImmAssignment_t, Access.SingleBlockAllocation, GPRS_SingleBlockAllocation_t),
- M_TYPE (Packet_Uplink_ImmAssignment_t, Access.DynamicOrFixedAllocation, GPRS_DynamicOrFixedAllocation_t),
-
- M_NEXT_EXIST_OR_NULL_LH(Packet_Uplink_ImmAssignment_t, Exist_AdditionsR99, 1),
- M_TYPE (Packet_Uplink_ImmAssignment_t, AdditionsR99, PU_IA_AdditionsR99_t),
-CSN_DESCR_END (Packet_Uplink_ImmAssignment_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(PD_IA_AdditionsR99_t)
- M_UINT (PD_IA_AdditionsR99_t, EGPRS_WindowSize, 5),
- M_UINT (PD_IA_AdditionsR99_t, LINK_QUALITY_MEASUREMENT_MODE, 2),
-
- M_NEXT_EXIST (PD_IA_AdditionsR99_t, Exist_BEP_PERIOD2, 1),
- M_UINT (PD_IA_AdditionsR99_t, BEP_PERIOD2, 4),
-CSN_DESCR_END (PD_IA_AdditionsR99_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(Packet_Downlink_ImmAssignment_t)
- M_UINT (Packet_Downlink_ImmAssignment_t, TLLI, 32),
-
- M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_TFI_to_TA_VALID, 6 + 1),
- M_UINT (Packet_Downlink_ImmAssignment_t, TFI_ASSIGNMENT, 5),
- M_UINT (Packet_Downlink_ImmAssignment_t, RLC_MODE, 1),
- M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_ALPHA, 1),
- M_UINT (Packet_Downlink_ImmAssignment_t, ALPHA, 4),
- M_UINT (Packet_Downlink_ImmAssignment_t, GAMMA, 5),
- M_UINT (Packet_Downlink_ImmAssignment_t, POLLING, 1),
- M_UINT (Packet_Downlink_ImmAssignment_t, TA_VALID, 1),
-
- M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_TIMING_ADVANCE_INDEX, 1),
- M_UINT (Packet_Downlink_ImmAssignment_t, TIMING_ADVANCE_INDEX, 4),
-
- M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_TBF_STARTING_TIME, 1),
- M_TYPE (Packet_Downlink_ImmAssignment_t, TBF_STARTING_TIME, StartingTime_t),
-
- M_NEXT_EXIST (Packet_Downlink_ImmAssignment_t, Exist_P0_PR_MODE, 3),
- M_UINT (Packet_Downlink_ImmAssignment_t, P0, 4),
- M_UINT (Packet_Downlink_ImmAssignment_t, BTS_PWR_CTRL_MODE, 1),
- M_UINT (Packet_Downlink_ImmAssignment_t, PR_MODE, 1),
-
- M_NEXT_EXIST_OR_NULL_LH(Packet_Downlink_ImmAssignment_t, Exist_AdditionsR99, 1),
- M_TYPE (Packet_Downlink_ImmAssignment_t, AdditionsR99, PD_IA_AdditionsR99_t),
-CSN_DESCR_END (Packet_Downlink_ImmAssignment_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN (Second_Part_Packet_Assignment_t)
- M_NEXT_EXIST_OR_NULL_LH(Second_Part_Packet_Assignment_t, Exist_SecondPart, 2),
- M_NEXT_EXIST (Second_Part_Packet_Assignment_t, Exist_ExtendedRA, 1),
- M_UINT (Second_Part_Packet_Assignment_t, ExtendedRA, 5),
-CSN_DESCR_END (Second_Part_Packet_Assignment_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(IA_PacketAssignment_UL_DL_t)
- M_UNION (IA_PacketAssignment_UL_DL_t, 2),
- M_TYPE (IA_PacketAssignment_UL_DL_t, ul_dl.Packet_Uplink_ImmAssignment, Packet_Uplink_ImmAssignment_t),
- M_TYPE (IA_PacketAssignment_UL_DL_t, ul_dl.Packet_Downlink_ImmAssignment, Packet_Downlink_ImmAssignment_t),
-CSN_DESCR_END (IA_PacketAssignment_UL_DL_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(IA_PacketAssignment_t)
- M_UNION (IA_PacketAssignment_t, 2),
- M_TYPE (IA_PacketAssignment_t, u.UplinkDownlinkAssignment, IA_PacketAssignment_UL_DL_t),
- M_TYPE (IA_PacketAssignment_t, u.UplinkDownlinkAssignment, Second_Part_Packet_Assignment_t),
-CSN_DESCR_END (IA_PacketAssignment_t)
-#endif
-
/* <Packet Polling Request> */
static const
CSN_ChoiceElement_t PacketPollingID[] =
@@ -674,53 +309,6 @@
M_TYPE (PBCCH_present_t, PBCCH_Description, PBCCH_Description_t),
CSN_DESCR_END (PBCCH_present_t)
-#if 0
-static const
-CSN_DESCR_BEGIN(SI13_AdditionsR6)
- M_NEXT_EXIST (SI13_AdditionsR6, Exist_LB_MS_TXPWR_MAX_CCH, 1),
- M_UINT (SI13_AdditionsR6, LB_MS_TXPWR_MAX_CCH, 5),
- M_UINT (SI13_AdditionsR6, SI2n_SUPPORT, 2),
-CSN_DESCR_END (SI13_AdditionsR6)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(SI13_AdditionsR4)
- M_UINT (SI13_AdditionsR4, SI_STATUS_IND, 1),
- M_NEXT_EXIST_OR_NULL_LH (SI13_AdditionsR4, Exist_AdditionsR6, 1),
- M_TYPE (SI13_AdditionsR4, AdditionsR6, SI13_AdditionsR6),
-CSN_DESCR_END (SI13_AdditionsR4)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN(SI13_AdditionR99)
- M_UINT (SI13_AdditionR99, SGSNR, 1),
- M_NEXT_EXIST_OR_NULL_LH (SI13_AdditionR99, Exist_AdditionsR4, 1),
- M_TYPE (SI13_AdditionR99, AdditionsR4, SI13_AdditionsR4),
-CSN_DESCR_END (SI13_AdditionR99)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN (SI_13_t)
- M_THIS_EXIST_LH (SI_13_t),
-
- M_UINT (SI_13_t, BCCH_CHANGE_MARK, 3),
- M_UINT (SI_13_t, SI_CHANGE_FIELD, 4),
-
- M_NEXT_EXIST (SI_13_t, Exist_MA, 2),
- M_UINT (SI_13_t, SI13_CHANGE_MARK, 2),
- M_TYPE (SI_13_t, GPRS_Mobile_Allocation, GPRS_Mobile_Allocation_t),
-
- M_UNION (SI_13_t, 2),
- M_TYPE (SI_13_t, u.PBCCH_Not_present, PBCCH_Not_present_t),
- M_TYPE (SI_13_t, u.PBCCH_present, PBCCH_present_t),
-
- M_NEXT_EXIST_OR_NULL_LH(SI_13_t, Exist_AdditionsR99, 1),
- M_TYPE (SI_13_t, AdditionsR99, SI13_AdditionR99),
-CSN_DESCR_END (SI_13_t)
-#endif
/************************************************************/
/* TS 44.060 messages */
/************************************************************/
@@ -4022,37 +3610,6 @@
M_TYPE (PMR_AdditionsR99_t, AdditionsR5, PMR_AdditionsR5_t),
CSN_DESCR_END (PMR_AdditionsR99_t)
-#if 0
-static const
-CSN_DESCR_BEGIN(EMR_ServingCell_t)
- /*CSN_MEMBER_BIT (EMR_ServingCell_t, DTX_USED),*/
- M_UINT (EMR_ServingCell_t, DTX_USED, 1),
- M_UINT (EMR_ServingCell_t, RXLEV_VAL, 6),
- M_UINT (EMR_ServingCell_t, RX_QUAL_FULL, 3),
- M_UINT (EMR_ServingCell_t, MEAN_BEP, 5),
- M_UINT (EMR_ServingCell_t, CV_BEP, 3),
- M_UINT (EMR_ServingCell_t, NBR_RCVD_BLOCKS, 5),
-CSN_DESCR_END(EMR_ServingCell_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN (EnhancedMeasurementReport_t)
- M_UINT (EnhancedMeasurementReport_t, RR_Short_PD, 1),
- M_UINT (EnhancedMeasurementReport_t, MESSAGE_TYPE, 5),
- M_UINT (EnhancedMeasurementReport_t, ShortLayer2_Header, 2),
- M_TYPE (EnhancedMeasurementReport_t, BA_USED, BA_USED_t),
- M_UINT (EnhancedMeasurementReport_t, BSIC_Seen, 1),
- M_UINT (EnhancedMeasurementReport_t, SCALE, 1),
- M_NEXT_EXIST (EnhancedMeasurementReport_t, Exist_ServingCellData, 1),
- M_TYPE (EnhancedMeasurementReport_t, ServingCellData, EMR_ServingCell_t),
- M_REC_TARRAY (EnhancedMeasurementReport_t, RepeatedInvalid_BSIC_Info, RepeatedInvalid_BSIC_Info_t,
- Count_RepeatedInvalid_BSIC_Info),
- M_NEXT_EXIST (EnhancedMeasurementReport_t, Exist_ReportBitmap, 1),
- M_VAR_TARRAY (EnhancedMeasurementReport_t, REPORTING_QUANTITY_Instances, REPORTING_QUANTITY_Instance_t, Count_REPORTING_QUANTITY_Instances),
-CSN_DESCR_END (EnhancedMeasurementReport_t)
-#endif
-
static const
CSN_DESCR_BEGIN (Packet_Measurement_Report_t)
/* Mac header */
@@ -4383,54 +3940,6 @@
M_PADDING_BITS(Packet_Serving_Cell_Data_t),
CSN_DESCR_END (Packet_Serving_Cell_Data_t)
-
-/* Enhanced Measurement Report */
-#if 0
-static const
-CSN_DESCR_BEGIN (ServingCellData_t)
- M_UINT (ServingCellData_t, RXLEV_SERVING_CELL, 6),
- M_FIXED (ServingCellData_t, 1, 0),
-CSN_DESCR_END (ServingCellData_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN (Repeated_Invalid_BSIC_Info_t)
- M_UINT (Repeated_Invalid_BSIC_Info_t, BCCH_FREQ_NCELL, 5),
- M_UINT (Repeated_Invalid_BSIC_Info_t, BSIC, 6),
- M_UINT (Repeated_Invalid_BSIC_Info_t, RXLEV_NCELL, 5),
-CSN_DESCR_END (Repeated_Invalid_BSIC_Info_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN (REPORTING_QUANTITY_t)
- M_NEXT_EXIST (REPORTING_QUANTITY_t, Exist_REPORTING_QUANTITY, 1),
- M_UINT (REPORTING_QUANTITY_t, REPORTING_QUANTITY, 6),
-CSN_DESCR_END (REPORTING_QUANTITY_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN (NC_MeasurementReport_t)
- M_UINT (NC_MeasurementReport_t, NC_MODE, 1),
- M_UNION (NC_MeasurementReport_t, 2),
- M_TYPE (NC_MeasurementReport_t, u.BA_USED, BA_USED_t),
- M_UINT (NC_MeasurementReport_t, u.PSI3_CHANGE_MARK, 2),
- M_UINT (NC_MeasurementReport_t, PMO_USED, 1),
- M_UINT (NC_MeasurementReport_t, SCALE, 1),
-
- M_NEXT_EXIST (NC_MeasurementReport_t, Exist_ServingCellData, 1),
- M_TYPE (NC_MeasurementReport_t, ServingCellData, ServingCellData_t),
-
- M_REC_TARRAY (NC_MeasurementReport_t, Repeated_Invalid_BSIC_Info, Repeated_Invalid_BSIC_Info_t, Count_Repeated_Invalid_BSIC_Info),
-
- M_NEXT_EXIST (NC_MeasurementReport_t, Exist_Repeated_REPORTING_QUANTITY, 1),
- M_VAR_TARRAY (NC_MeasurementReport_t, Repeated_REPORTING_QUANTITY, REPORTING_QUANTITY_t, Count_Repeated_Reporting_Quantity),
-CSN_DESCR_END (NC_MeasurementReport_t)
-#endif
-
-
/*< Packet Handover Command message content > */
static const
CSN_DESCR_BEGIN (GlobalTimeslotDescription_t)
@@ -5160,98 +4669,6 @@
CSN_DESCR_END (PSI13_t)
/*< End Packet System Information Type 13 message content >*/
-/* SI1_RestOctet_t */
-
-#if 0
-static const
-CSN_DESCR_BEGIN (SI1_RestOctet_t)
- M_NEXT_EXIST_LH(SI1_RestOctet_t, Exist_NCH_Position, 1),
- M_UINT (SI1_RestOctet_t, NCH_Position, 5),
-
- M_UINT_LH (SI1_RestOctet_t, BandIndicator, 1),
-CSN_DESCR_END (SI1_RestOctet_t)
-#endif
-
-/* SI3_Rest_Octet_t */
-#if 0
-static const
-CSN_DESCR_BEGIN(Selection_Parameters_t)
- M_UINT (Selection_Parameters_t, CBQ, 1),
- M_UINT (Selection_Parameters_t, CELL_RESELECT_OFFSET, 6),
- M_UINT (Selection_Parameters_t, TEMPORARY_OFFSET, 3),
- M_UINT (Selection_Parameters_t, PENALTY_TIME, 5),
-CSN_DESCR_END (Selection_Parameters_t)
-
-static const
-CSN_DESCR_BEGIN (SI3_Rest_Octet_t)
- M_NEXT_EXIST_LH(SI3_Rest_Octet_t, Exist_Selection_Parameters, 1),
- M_TYPE (SI3_Rest_Octet_t, Selection_Parameters, Selection_Parameters_t),
-
- M_NEXT_EXIST_LH(SI3_Rest_Octet_t, Exist_Power_Offset, 1),
- M_UINT (SI3_Rest_Octet_t, Power_Offset, 2),
-
- M_UINT_LH (SI3_Rest_Octet_t, System_Information_2ter_Indicator, 1),
- M_UINT_LH (SI3_Rest_Octet_t, Early_Classmark_Sending_Control, 1),
-
- M_NEXT_EXIST_LH(SI3_Rest_Octet_t, Exist_WHERE, 1),
- M_UINT (SI3_Rest_Octet_t, WHERE, 3),
-
- M_NEXT_EXIST_LH(SI3_Rest_Octet_t, Exist_GPRS_Indicator, 2),
- M_UINT (SI3_Rest_Octet_t, RA_COLOUR, 3),
- M_UINT (SI3_Rest_Octet_t, SI13_POSITION, 1),
-
- M_UINT_LH (SI3_Rest_Octet_t, ECS_Restriction3G, 1),
-
- M_NEXT_EXIST_LH(SI3_Rest_Octet_t, ExistSI2quaterIndicator, 1),
- M_UINT (SI3_Rest_Octet_t, SI2quaterIndicator, 1),
-CSN_DESCR_END (SI3_Rest_Octet_t)
-#endif
-
-#if 0
-static const
-CSN_DESCR_BEGIN (SI4_Rest_Octet_t)
- M_NEXT_EXIST_LH(SI4_Rest_Octet_t, Exist_Selection_Parameters, 1),
- M_TYPE (SI4_Rest_Octet_t, Selection_Parameters, Selection_Parameters_t),
-
- M_NEXT_EXIST_LH(SI4_Rest_Octet_t, Exist_Power_Offset, 1),
- M_UINT (SI4_Rest_Octet_t, Power_Offset, 2),
-
- M_NEXT_EXIST_LH(SI4_Rest_Octet_t, Exist_GPRS_Indicator, 2),
- M_UINT (SI4_Rest_Octet_t, RA_COLOUR, 3),
- M_UINT (SI4_Rest_Octet_t, SI13_POSITION, 1),
-CSN_DESCR_END (SI4_Rest_Octet_t)
-#endif
-
-/* SI6_RestOctet_t */
-
-#if 0
-static const
-CSN_DESCR_BEGIN(PCH_and_NCH_Info_t)
- M_UINT (PCH_and_NCH_Info_t, PagingChannelRestructuring, 1),
- M_UINT (PCH_and_NCH_Info_t, NLN_SACCH, 2),
-
- M_NEXT_EXIST (PCH_and_NCH_Info_t, Exist_CallPriority, 1),
- M_UINT (PCH_and_NCH_Info_t, CallPriority, 3),
-
- M_UINT (PCH_and_NCH_Info_t, NLN_Status, 1),
-CSN_DESCR_END (PCH_and_NCH_Info_t)
-
-static const
-CSN_DESCR_BEGIN (SI6_RestOctet_t)
- M_NEXT_EXIST_LH(SI6_RestOctet_t, Exist_PCH_and_NCH_Info, 1),
- M_TYPE (SI6_RestOctet_t, PCH_and_NCH_Info, PCH_and_NCH_Info_t),
-
- M_NEXT_EXIST_LH(SI6_RestOctet_t, Exist_VBS_VGCS_Options, 1),
- M_UINT (SI6_RestOctet_t, VBS_VGCS_Options, 2),
-
- M_NEXT_EXIST_LH(SI6_RestOctet_t, Exist_DTM_Support, 2),
- M_UINT (SI6_RestOctet_t, RAC, 8),
- M_UINT (SI6_RestOctet_t, MAX_LAPDm, 3),
-
- M_UINT_LH (SI6_RestOctet_t, BandIndicator, 1),
-CSN_DESCR_END (SI6_RestOctet_t)
-#endif
-
/* EGPRS Packet Channel Request (see 3GPP TS 44.060, table 11.2.5a.2) */
static const
CSN_DESCR_BEGIN(PacketChannelRequest_MC5P2RB3_t)
--
To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29193
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I2b941f06a70a25e92ba3fd2638f87360a5aa5435
Gerrit-Change-Number: 29193
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
1
0