<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/17046">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm_rlcmac.cpp: hanged all M_BIT macros to M_UINT, as M_BIT does not use the referenced hf.<br><br>Port from wireshark.git e97273a35d101516decbc7d98fcc6c6b3f193962.<br><br>Ported-by: Pau Espin Pedrol <pespin@sysmocom.de><br>Change-Id: Id20d31e9ebd851b45d5f3280f3e229d8d7ae2cea<br>---<br>M src/gsm_rlcmac.cpp<br>1 file changed, 61 insertions(+), 61 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/17046/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp</span><br><span>index d9a11eb..c12c3e5 100644</span><br><span>--- a/src/gsm_rlcmac.cpp</span><br><span>+++ b/src/gsm_rlcmac.cpp</span><br><span>@@ -104,7 +104,7 @@</span><br><span> M_UINT (GPRS_Power_Control_Parameters_t, ALPHA, 4),</span><br><span> M_UINT (GPRS_Power_Control_Parameters_t, T_AVG_W, 5),</span><br><span> M_UINT (GPRS_Power_Control_Parameters_t, T_AVG_T, 5),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (GPRS_Power_Control_Parameters_t, PC_MEAS_CHAN),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (GPRS_Power_Control_Parameters_t, PC_MEAS_CHAN, 1),</span><br><span> M_UINT (GPRS_Power_Control_Parameters_t, N_AVG_I, 4),</span><br><span> CSN_DESCR_END (GPRS_Power_Control_Parameters_t)</span><br><span> </span><br><span>@@ -258,8 +258,8 @@</span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(Group_Call_Reference_t)</span><br><span> M_UINT (Group_Call_Reference_t, value, 27),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Group_Call_Reference_t, SF),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Group_Call_Reference_t, AF),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Group_Call_Reference_t, SF, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Group_Call_Reference_t, AF, 1),</span><br><span> M_UINT (Group_Call_Reference_t, call_priority, 3),</span><br><span> M_UINT (Group_Call_Reference_t, Ciphering_information, 4),</span><br><span> CSN_DESCR_END (Group_Call_Reference_t)</span><br><span>@@ -542,7 +542,7 @@</span><br><span> M_UINT (Packet_Polling_Request_t, MESSAGE_TYPE, 6),</span><br><span> M_UINT (Packet_Polling_Request_t, PAGE_MODE, 2),</span><br><span> M_TYPE (Packet_Polling_Request_t, ID, PacketPollingID_t),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Packet_Polling_Request_t, TYPE_OF_ACK),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Packet_Polling_Request_t, TYPE_OF_ACK, 1),</span><br><span> M_PADDING_BITS(Packet_Polling_Request_t),</span><br><span> CSN_DESCR_END (Packet_Polling_Request_t)</span><br><span> </span><br><span>@@ -579,8 +579,8 @@</span><br><span> M_UINT (GPRS_Cell_Options_t, T3168, 3),</span><br><span> M_UINT (GPRS_Cell_Options_t, T3192, 3),</span><br><span> M_UINT (GPRS_Cell_Options_t, DRX_TIMER_MAX, 3),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (GPRS_Cell_Options_t, ACCESS_BURST_TYPE),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (GPRS_Cell_Options_t, CONTROL_ACK_TYPE),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (GPRS_Cell_Options_t, ACCESS_BURST_TYPE, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (GPRS_Cell_Options_t, CONTROL_ACK_TYPE, 1),</span><br><span> M_UINT (GPRS_Cell_Options_t, BS_CV_MAX, 4),</span><br><span> </span><br><span> M_NEXT_EXIST (GPRS_Cell_Options_t, Exist_PAN, 3),</span><br><span>@@ -595,7 +595,7 @@</span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(PBCCH_Not_present_t)</span><br><span> M_UINT (PBCCH_Not_present_t, RAC, 8),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (PBCCH_Not_present_t, SPGC_CCCH_SUP),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PBCCH_Not_present_t, SPGC_CCCH_SUP, 1),</span><br><span> M_UINT (PBCCH_Not_present_t, PRIORITY_ACCESS_THR, 3),</span><br><span> M_UINT (PBCCH_Not_present_t, NETWORK_CONTROL_ORDER, 2),</span><br><span> M_TYPE (PBCCH_Not_present_t, GPRS_Cell_Options, GPRS_Cell_Options_t),</span><br><span>@@ -676,8 +676,8 @@</span><br><span> M_UINT (Packet_TBF_Release_t, PAGE_MODE, 2),</span><br><span> M_FIXED (Packet_TBF_Release_t, 1, 0x00),</span><br><span> M_TYPE (Packet_TBF_Release_t, Global_TFI, Global_TFI_t),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Packet_TBF_Release_t, UPLINK_RELEASE),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Packet_TBF_Release_t, DOWNLINK_RELEASE),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Packet_TBF_Release_t, UPLINK_RELEASE, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Packet_TBF_Release_t, DOWNLINK_RELEASE, 1),</span><br><span> M_UINT (Packet_TBF_Release_t, TBF_RELEASE_CAUSE, 4),</span><br><span> M_PADDING_BITS(Packet_TBF_Release_t ),</span><br><span> CSN_DESCR_END (Packet_TBF_Release_t)</span><br><span>@@ -1044,8 +1044,8 @@</span><br><span> CSN_DESCR_BEGIN(Channel_Request_Description_t)</span><br><span> M_UINT (Channel_Request_Description_t, PEAK_THROUGHPUT_CLASS, 4),</span><br><span> M_UINT (Channel_Request_Description_t, RADIO_PRIORITY, 2),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Channel_Request_Description_t, RLC_MODE),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Channel_Request_Description_t, LLC_PDU_TYPE),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Channel_Request_Description_t, RLC_MODE, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Channel_Request_Description_t, LLC_PDU_TYPE, 1),</span><br><span> M_UINT (Channel_Request_Description_t, RLC_OCTET_COUNT, 16),</span><br><span> CSN_DESCR_END (Channel_Request_Description_t)</span><br><span> </span><br><span>@@ -1752,7 +1752,7 @@</span><br><span> static const</span><br><span> CSN_DESCR_BEGIN (PUA_GPRS_t)</span><br><span> M_UINT (PUA_GPRS_t, CHANNEL_CODING_COMMAND, 2),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (PUA_GPRS_t, TLLI_BLOCK_CHANNEL_CODING),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PUA_GPRS_t, TLLI_BLOCK_CHANNEL_CODING, 1),</span><br><span> M_TYPE (PUA_GPRS_t, Packet_Timing_Advance, Packet_Timing_Advance_t),</span><br><span> </span><br><span> M_NEXT_EXIST (PUA_GPRS_t, Exist_Frequency_Parameters, 1),</span><br><span>@@ -1903,14 +1903,14 @@</span><br><span> M_FIXED (Packet_Downlink_Assignment_t, 1, 0x00),/*-- Message escape */</span><br><span> </span><br><span> M_UINT (Packet_Downlink_Assignment_t, MAC_MODE, 2),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Packet_Downlink_Assignment_t, RLC_MODE),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Packet_Downlink_Assignment_t, CONTROL_ACK),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Packet_Downlink_Assignment_t, RLC_MODE, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Packet_Downlink_Assignment_t, CONTROL_ACK, 1),</span><br><span> M_UINT (Packet_Downlink_Assignment_t, TIMESLOT_ALLOCATION, 8),</span><br><span> M_TYPE (Packet_Downlink_Assignment_t, Packet_Timing_Advance, Packet_Timing_Advance_t),</span><br><span> </span><br><span> M_NEXT_EXIST (Packet_Downlink_Assignment_t, Exist_P0_and_BTS_PWR_CTRL_MODE, 3),</span><br><span> M_UINT (Packet_Downlink_Assignment_t, P0, 4),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Packet_Downlink_Assignment_t, BTS_PWR_CTRL_MODE),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Packet_Downlink_Assignment_t, BTS_PWR_CTRL_MODE, 1),</span><br><span> M_UINT (Packet_Downlink_Assignment_t, PR_MODE, 1),</span><br><span> </span><br><span> M_NEXT_EXIST (Packet_Downlink_Assignment_t, Exist_Frequency_Parameters, 1),</span><br><span>@@ -1951,7 +1951,7 @@</span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(DTM_Packet_Uplink_Assignment_t)</span><br><span> M_UINT (DTM_Packet_Uplink_Assignment_t, CHANNEL_CODING_COMMAND, 2),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (DTM_Packet_Uplink_Assignment_t, TLLI_BLOCK_CHANNEL_CODING),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (DTM_Packet_Uplink_Assignment_t, TLLI_BLOCK_CHANNEL_CODING, 1),</span><br><span> M_TYPE (DTM_Packet_Uplink_Assignment_t, Packet_Timing_Advance, Packet_Timing_Advance_t),</span><br><span> </span><br><span> M_UNION (DTM_Packet_Uplink_Assignment_t, 3),</span><br><span>@@ -1975,13 +1975,13 @@</span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(DTM_Packet_Downlink_Assignment_t)</span><br><span> M_UINT (DTM_Packet_Downlink_Assignment_t, MAC_MODE, 2),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (DTM_Packet_Downlink_Assignment_t, RLC_MODE),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (DTM_Packet_Downlink_Assignment_t, RLC_MODE ,1),</span><br><span> M_UINT (DTM_Packet_Downlink_Assignment_t, TIMESLOT_ALLOCATION, 8),</span><br><span> M_TYPE (DTM_Packet_Downlink_Assignment_t, Packet_Timing_Advance, Packet_Timing_Advance_t),</span><br><span> </span><br><span> M_NEXT_EXIST (DTM_Packet_Downlink_Assignment_t, Exist_P0_and_BTS_PWR_CTRL_MODE, 3),</span><br><span> M_UINT (DTM_Packet_Downlink_Assignment_t, P0, 4),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (DTM_Packet_Downlink_Assignment_t, BTS_PWR_CTRL_MODE),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (DTM_Packet_Downlink_Assignment_t, BTS_PWR_CTRL_MODE, 1),</span><br><span> M_UINT (DTM_Packet_Downlink_Assignment_t, PR_MODE, 1),</span><br><span> </span><br><span> M_NEXT_EXIST (DTM_Packet_Downlink_Assignment_t, Exist_Power_Control_Parameters, 1),</span><br><span>@@ -2876,7 +2876,7 @@</span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(GPRS_EUTRAN_MeasurementParametersDescription_t)</span><br><span> M_UINT (GPRS_EUTRAN_MeasurementParametersDescription_t, Qsearch_P_EUTRAN, 4),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (GPRS_EUTRAN_MeasurementParametersDescription_t, EUTRAN_REP_QUANT),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (GPRS_EUTRAN_MeasurementParametersDescription_t, EUTRAN_REP_QUANT, 1),</span><br><span> M_UINT (GPRS_EUTRAN_MeasurementParametersDescription_t, EUTRAN_MULTIRAT_REPORTING, 2),</span><br><span> M_TYPE (GPRS_EUTRAN_MeasurementParametersDescription_t, EUTRAN_REPORTING_THRESHOLD_OFFSET, EUTRAN_REPORTING_THRESHOLD_OFFSET_t),</span><br><span> CSN_DESCR_END (GPRS_EUTRAN_MeasurementParametersDescription_t)</span><br><span>@@ -2942,7 +2942,7 @@</span><br><span> </span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(EUTRAN_ParametersDescription_PMO_t)</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (EUTRAN_ParametersDescription_PMO_t, EUTRAN_CCN_ACTIVE),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (EUTRAN_ParametersDescription_PMO_t, EUTRAN_CCN_ACTIVE, 1),</span><br><span> </span><br><span> M_NEXT_EXIST (EUTRAN_ParametersDescription_PMO_t, existGPRS_EUTRAN_MeasurementParametersDescription, 1),</span><br><span> M_TYPE (EUTRAN_ParametersDescription_PMO_t, GPRS_EUTRAN_MeasurementParametersDescription, GPRS_EUTRAN_MeasurementParametersDescription_t),</span><br><span>@@ -2956,7 +2956,7 @@</span><br><span> CSN_DESCR_BEGIN(PSC_Pattern_t)</span><br><span> M_UINT (PSC_Pattern_t, PSC_Pattern_length, 3),</span><br><span> M_VAR_BITMAP (PSC_Pattern_t, PSC_Pattern, PSC_Pattern_length, 1),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (PSC_Pattern_t, PSC_Pattern_sense),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PSC_Pattern_t, PSC_Pattern_sense, 1),</span><br><span> CSN_DESCR_END (PSC_Pattern_t)</span><br><span> </span><br><span> static const</span><br><span>@@ -2990,13 +2990,13 @@</span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(Meas_Ctrl_Param_Desp_t)</span><br><span> M_NEXT_EXIST (Meas_Ctrl_Param_Desp_t, existMeasurement_Control_EUTRAN, 3),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Meas_Ctrl_Param_Desp_t, Measurement_Control_EUTRAN),</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (Meas_Ctrl_Param_Desp_t, EUTRAN_FREQUENCY_INDEX_top, 3),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Meas_Ctrl_Param_Desp_t, Measurement_Control_EUTRAN, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Meas_Ctrl_Param_Desp_t, EUTRAN_FREQUENCY_INDEX_top, 3),</span><br><span> M_REC_ARRAY (Meas_Ctrl_Param_Desp_t, EUTRAN_FREQUENCY_INDEX, Count_EUTRAN_FREQUENCY_INDEX, 3),</span><br><span> M_NEXT_EXIST (Meas_Ctrl_Param_Desp_t, existMeasurement_Control_UTRAN, 1),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Meas_Ctrl_Param_Desp_t, Measurement_Control_UTRAN),</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (Meas_Ctrl_Param_Desp_t, UTRAN_FREQUENCY_INDEX_top, 5),</span><br><span style="color: hsl(0, 100%, 40%);">- M_REC_ARRAY (Meas_Ctrl_Param_Desp_t, UTRAN_FREQUENCY_INDEX, Count_UTRAN_FREQUENCY_INDEX, 5),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Meas_Ctrl_Param_Desp_t, Measurement_Control_UTRAN, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Meas_Ctrl_Param_Desp_t, UTRAN_FREQUENCY_INDEX_top, 5),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_REC_ARRAY (Meas_Ctrl_Param_Desp_t, UTRAN_FREQUENCY_INDEX, Count_UTRAN_FREQUENCY_INDEX, 5),</span><br><span> CSN_DESCR_END (Meas_Ctrl_Param_Desp_t)</span><br><span> </span><br><span> static const</span><br><span>@@ -3134,8 +3134,8 @@</span><br><span> static const</span><br><span> CSN_DESCR_BEGIN (PMO_AdditionsR8_t)</span><br><span> M_NEXT_EXIST (PMO_AdditionsR8_t, existBA_IND_3G_PMO_IND, 2),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (PMO_AdditionsR8_t, BA_IND_3G),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (PMO_AdditionsR8_t, PMO_IND),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PMO_AdditionsR8_t, BA_IND_3G, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PMO_AdditionsR8_t, PMO_IND, 1),</span><br><span> M_NEXT_EXIST (PMO_AdditionsR8_t, existPriorityAndEUTRAN_ParametersDescription_PMO, 1),</span><br><span> M_TYPE (PMO_AdditionsR8_t, PriorityAndEUTRAN_ParametersDescription_PMO, PriorityAndEUTRAN_ParametersDescription_PMO_t),</span><br><span> M_NEXT_EXIST (PMO_AdditionsR8_t, existIndividualPriorities_PMO, 1),</span><br><span>@@ -3447,19 +3447,19 @@</span><br><span> M_NEXT_EXIST (UTRAN_CSG_Measurement_Report_t, Exist_PLMN_ID, 1),</span><br><span> M_TYPE (UTRAN_CSG_Measurement_Report_t, Plmn_ID, PLMN_t),</span><br><span> M_UINT (UTRAN_CSG_Measurement_Report_t, CSG_ID, 27),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (UTRAN_CSG_Measurement_Report_t, Access_Mode),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (UTRAN_CSG_Measurement_Report_t, Access_Mode, 1),</span><br><span> M_UINT (UTRAN_CSG_Measurement_Report_t, REPORTING_QUANTITY, 6),</span><br><span> CSN_DESCR_END (UTRAN_CSG_Measurement_Report_t)</span><br><span> </span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(EUTRAN_CSG_Measurement_Report_t)</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (EUTRAN_CSG_Measurement_Report_t, EUTRAN_CGI, 28),</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (EUTRAN_CSG_Measurement_Report_t, Tracking_Area_Code, 16),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (EUTRAN_CSG_Measurement_Report_t, EUTRAN_CGI, 28),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (EUTRAN_CSG_Measurement_Report_t, Tracking_Area_Code, 16),</span><br><span> M_NEXT_EXIST (EUTRAN_CSG_Measurement_Report_t, Exist_PLMN_ID, 1),</span><br><span> M_TYPE (EUTRAN_CSG_Measurement_Report_t, Plmn_ID, PLMN_t),</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (EUTRAN_CSG_Measurement_Report_t, CSG_ID, 27),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (EUTRAN_CSG_Measurement_Report_t, Access_Mode),</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (EUTRAN_CSG_Measurement_Report_t, REPORTING_QUANTITY, 6),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (EUTRAN_CSG_Measurement_Report_t, CSG_ID, 27),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (EUTRAN_CSG_Measurement_Report_t, Access_Mode, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (EUTRAN_CSG_Measurement_Report_t, REPORTING_QUANTITY, 6),</span><br><span> CSN_DESCR_END (EUTRAN_CSG_Measurement_Report_t)</span><br><span> </span><br><span> static const</span><br><span>@@ -3505,7 +3505,7 @@</span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(EMR_ServingCell_t)</span><br><span> /*CSN_MEMBER_BIT (EMR_ServingCell_t, DTX_USED),*/</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (EMR_ServingCell_t, DTX_USED),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (EMR_ServingCell_t, DTX_USED, 1),</span><br><span> M_UINT (EMR_ServingCell_t, RXLEV_VAL, 6),</span><br><span> M_UINT (EMR_ServingCell_t, RX_QUAL_FULL, 3),</span><br><span> M_UINT (EMR_ServingCell_t, MEAN_BEP, 5),</span><br><span>@@ -3699,7 +3699,7 @@</span><br><span> </span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(Eutran_Ccn_Measurement_Report_t)</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Eutran_Ccn_Measurement_Report_t, ThreeG_BA_USED),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Eutran_Ccn_Measurement_Report_t, ThreeG_BA_USED, 1),</span><br><span> M_UINT_OFFSET(Eutran_Ccn_Measurement_Report_t, N_EUTRAN, 2, 1),</span><br><span> M_VAR_TARRAY (Eutran_Ccn_Measurement_Report_t, Eutran_Ccn_Measurement_Report_Cell, Eutran_Ccn_Measurement_Report_Cell_t, N_EUTRAN),</span><br><span> CSN_DESCR_END (Eutran_Ccn_Measurement_Report_t)</span><br><span>@@ -3881,12 +3881,12 @@</span><br><span> </span><br><span> static const</span><br><span> CSN_DESCR_BEGIN (NC_MeasurementReport_t)</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (NC_MeasurementReport_t, NC_MODE),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (NC_MeasurementReport_t, NC_MODE, 1),</span><br><span> M_UNION (NC_MeasurementReport_t, 2),</span><br><span> M_TYPE (NC_MeasurementReport_t, u.BA_USED, BA_USED_t),</span><br><span style="color: hsl(0, 100%, 40%);">- M_UINT (NC_MeasurementReport_t, u.PSI3_CHANGE_MARK, 2),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (NC_MeasurementReport_t, PMO_USED),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (NC_MeasurementReport_t, SCALE),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (NC_MeasurementReport_t, u.PSI3_CHANGE_MARK, 2),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (NC_MeasurementReport_t, PMO_USED, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (NC_MeasurementReport_t, SCALE, 1),</span><br><span> </span><br><span> M_NEXT_EXIST (NC_MeasurementReport_t, Exist_ServingCellData, 1),</span><br><span> M_TYPE (NC_MeasurementReport_t, ServingCellData, ServingCellData_t),</span><br><span>@@ -3911,9 +3911,9 @@</span><br><span> CSN_DESCR_BEGIN (PHO_DownlinkAssignment_t)</span><br><span> M_UINT (PHO_DownlinkAssignment_t, TimeslotAllocation, 8),</span><br><span> M_UINT (PHO_DownlinkAssignment_t, PFI, 7),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (PHO_DownlinkAssignment_t, RLC_Mode),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PHO_DownlinkAssignment_t, RLC_Mode, 1),</span><br><span> M_UINT (PHO_DownlinkAssignment_t, TFI_Assignment, 5),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (PHO_DownlinkAssignment_t, ControlACK),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PHO_DownlinkAssignment_t, ControlACK, 1),</span><br><span> </span><br><span> M_NEXT_EXIST (PHO_DownlinkAssignment_t, Exist_EGPRS_WindowSize, 1),</span><br><span> M_UINT (PHO_DownlinkAssignment_t, EGPRS_WindowSize, 5),</span><br><span>@@ -3934,7 +3934,7 @@</span><br><span> static const</span><br><span> CSN_DESCR_BEGIN (PHO_UplinkAssignment_t)</span><br><span> M_UINT (PHO_UplinkAssignment_t, PFI, 7),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (PHO_UplinkAssignment_t, RLC_Mode),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PHO_UplinkAssignment_t, RLC_Mode, 1),</span><br><span> M_UINT (PHO_UplinkAssignment_t, TFI_Assignment, 5),</span><br><span> </span><br><span> M_NEXT_EXIST (PHO_UplinkAssignment_t, Exist_ChannelCodingCommand, 1),</span><br><span>@@ -3946,7 +3946,7 @@</span><br><span> M_NEXT_EXIST (PHO_UplinkAssignment_t, Exist_EGPRS_WindowSize, 1),</span><br><span> M_UINT (PHO_UplinkAssignment_t, EGPRS_WindowSize, 5),</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (PHO_UplinkAssignment_t, USF_Granularity),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PHO_UplinkAssignment_t, USF_Granularity, 1),</span><br><span> </span><br><span> M_NEXT_EXIST (PHO_UplinkAssignment_t, Exist_TBF_TimeslotAllocation, 1),</span><br><span> M_LEFT_VAR_BMP (PHO_UplinkAssignment_t, TBF_TimeslotAllocation, u.USF_AllocationArray.NBR_OfAllocatedTimeslots, 0),</span><br><span>@@ -4043,13 +4043,13 @@</span><br><span> </span><br><span> M_UINT (PHO_RadioResources_t, ARFCN, 10),</span><br><span> M_UINT (PHO_RadioResources_t, SI, 2),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (PHO_RadioResources_t, NCI),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PHO_RadioResources_t, NCI, 1),</span><br><span> M_UINT (PHO_RadioResources_t, BSIC, 6),</span><br><span> M_NEXT_EXIST (PHO_RadioResources_t, Exist_CCN_Active, 1),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (PHO_RadioResources_t, CCN_Active),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PHO_RadioResources_t, CCN_Active, 1),</span><br><span> </span><br><span> M_NEXT_EXIST (PHO_RadioResources_t, Exist_CCN_Active_3G, 1),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (PHO_RadioResources_t, CCN_Active_3G),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PHO_RadioResources_t, CCN_Active_3G, 1),</span><br><span> </span><br><span> M_NEXT_EXIST (PHO_RadioResources_t, Exist_CCN_Support_Description, 1),</span><br><span> M_TYPE (PHO_RadioResources_t, CCN_Support_Description, CCN_Support_Description_t),</span><br><span>@@ -4059,11 +4059,11 @@</span><br><span> M_NEXT_EXIST (PHO_RadioResources_t, Exist_PHO_TimingAdvance, 1),</span><br><span> M_TYPE (PHO_RadioResources_t, PHO_TimingAdvance, PHO_TimingAdvance_t),</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (PHO_RadioResources_t, Extended_Dynamic_Allocation),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (PHO_RadioResources_t, RLC_Reset),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PHO_RadioResources_t, Extended_Dynamic_Allocation, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PHO_RadioResources_t, RLC_Reset, 1),</span><br><span> M_NEXT_EXIST (PHO_RadioResources_t, Exist_PO_PR, 2),</span><br><span> M_UINT (PHO_RadioResources_t, PO, 4),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (PHO_RadioResources_t, PR_Mode),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (PHO_RadioResources_t, PR_Mode, 1),</span><br><span> </span><br><span> </span><br><span> M_NEXT_EXIST (PHO_RadioResources_t, Exist_UplinkControlTimeslot, 1),</span><br><span>@@ -4234,13 +4234,13 @@</span><br><span> </span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(Non_GPRS_Cell_Options_t)</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Non_GPRS_Cell_Options_t, ATT),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Non_GPRS_Cell_Options_t, ATT, 1),</span><br><span> </span><br><span> M_NEXT_EXIST (Non_GPRS_Cell_Options_t, Exist_T3212, 1),</span><br><span> M_UINT (Non_GPRS_Cell_Options_t, T3212, 8),</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Non_GPRS_Cell_Options_t, NECI),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Non_GPRS_Cell_Options_t, PWRC),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Non_GPRS_Cell_Options_t, NECI, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Non_GPRS_Cell_Options_t, PWRC, 1),</span><br><span> M_UINT (Non_GPRS_Cell_Options_t, DTX, 2),</span><br><span> M_UINT (Non_GPRS_Cell_Options_t, RADIO_LINK_TIMEOUT, 4),</span><br><span> M_UINT (Non_GPRS_Cell_Options_t, BS_AG_BLKS_RES, 3),</span><br><span>@@ -4248,7 +4248,7 @@</span><br><span> M_UINT (Non_GPRS_Cell_Options_t, BS_PA_MFRMS, 3),</span><br><span> M_UINT (Non_GPRS_Cell_Options_t, MAX_RETRANS, 2),</span><br><span> M_UINT (Non_GPRS_Cell_Options_t, TX_INTEGER, 4),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Non_GPRS_Cell_Options_t, EC),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Non_GPRS_Cell_Options_t, EC, 1),</span><br><span> M_UINT (Non_GPRS_Cell_Options_t, MS_TXPWR_MAX_CCCH, 5),</span><br><span> </span><br><span> M_NEXT_EXIST (Non_GPRS_Cell_Options_t, Exist_Extension_Bits, 1),</span><br><span>@@ -4327,8 +4327,8 @@</span><br><span> /*< Packet System Information Type 3 message content >*/</span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(Serving_Cell_params_t)</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Serving_Cell_params_t, CELL_BAR_ACCESS_2),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Serving_Cell_params_t, EXC_ACC),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Serving_Cell_params_t, CELL_BAR_ACCESS_2, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Serving_Cell_params_t, EXC_ACC, 1),</span><br><span> M_UINT (Serving_Cell_params_t, GPRS_RXLEV_ACCESS_MIN, 6),</span><br><span> M_UINT (Serving_Cell_params_t, GPRS_MS_TXPWR_MAX_CCH, 5),</span><br><span> M_NEXT_EXIST (Serving_Cell_params_t, Exist_HCS, 1),</span><br><span>@@ -4340,8 +4340,8 @@</span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(Gen_Cell_Sel_t)</span><br><span> M_UINT (Gen_Cell_Sel_t, GPRS_CELL_RESELECT_HYSTERESIS, 3),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Gen_Cell_Sel_t, C31_HYST),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (Gen_Cell_Sel_t, C32_QUAL),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Gen_Cell_Sel_t, C31_HYST, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (Gen_Cell_Sel_t, C32_QUAL, 1),</span><br><span> M_FIXED (Gen_Cell_Sel_t, 1, 0x01),</span><br><span> </span><br><span> M_NEXT_EXIST (Gen_Cell_Sel_t, Exist_T_RESEL, 1),</span><br><span>@@ -4355,9 +4355,9 @@</span><br><span> static const</span><br><span> CSN_DESCR_BEGIN(COMPACT_Cell_Sel_t)</span><br><span> M_UINT (COMPACT_Cell_Sel_t, bsic, 6),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (COMPACT_Cell_Sel_t, CELL_BAR_ACCESS_2),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (COMPACT_Cell_Sel_t, EXC_ACC),</span><br><span style="color: hsl(0, 100%, 40%);">- M_BIT (COMPACT_Cell_Sel_t, SAME_RA_AS_SERVING_CELL),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (COMPACT_Cell_Sel_t, CELL_BAR_ACCESS_2, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (COMPACT_Cell_Sel_t, EXC_ACC, 1),</span><br><span style="color: hsl(120, 100%, 40%);">+ M_UINT (COMPACT_Cell_Sel_t, SAME_RA_AS_SERVING_CELL, 1),</span><br><span> M_NEXT_EXIST (COMPACT_Cell_Sel_t, Exist_GPRS_RXLEV_ACCESS_MIN, 2),</span><br><span> M_UINT (COMPACT_Cell_Sel_t, GPRS_RXLEV_ACCESS_MIN, 6),</span><br><span> M_UINT (COMPACT_Cell_Sel_t, GPRS_MS_TXPWR_MAX_CCH, 5),</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/17046">change 17046</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-pcu/+/17046"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id20d31e9ebd851b45d5f3280f3e229d8d7ae2cea </div>
<div style="display:none"> Gerrit-Change-Number: 17046 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>