This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17051 ) Change subject: gsm_rlcmac: Update : PACKET RESOURCE REQUEST to Release 14.0.0 ...................................................................... gsm_rlcmac: Update : PACKET RESOURCE REQUEST to Release 14.0.0 Port from wireshark.git 07fc801684ebff7aff02505cdb2c120caea846e0. Ported-by: Pau Espin Pedrol <pespin at sysmocom.de> Change-Id: Iceb59c58406180bc57fe6eb27127b4d11a0a3df7 --- M src/gsm_rlcmac.cpp M src/gsm_rlcmac.h 2 files changed, 295 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/51/17051/1 diff --git a/src/gsm_rlcmac.cpp b/src/gsm_rlcmac.cpp index c12cf69..16a378d 100644 --- a/src/gsm_rlcmac.cpp +++ b/src/gsm_rlcmac.cpp @@ -1131,6 +1131,152 @@ CSN_DESCR_END (EGPRS_BEP_LinkQualityMeasurements_t) static const +CSN_DESCR_BEGIN(IU_Mode_Channel_Request_Desk_t) + + M_UINT (IU_Mode_Channel_Request_Desk_t, RB_ID, 5), + M_UINT (IU_Mode_Channel_Request_Desk_t, RADIO_PRIORITY, 2), + + M_NEXT_EXIST (IU_Mode_Channel_Request_Desk_t, Exist_RLC_BLOCK_COUNT, 1), + M_UINT (IU_Mode_Channel_Request_Desk_t, RLC_BLOCK_COUNT, 8), + + M_NEXT_EXIST (IU_Mode_Channel_Request_Desk_t, Exist_Iu_Mode_ChRequestDesk, 1), /* Don't use M_REC_TARRAY as we don't support multiple TBFs */ + +CSN_DESCR_END (IU_Mode_Channel_Request_Desk_t) + +static const +CSN_DESCR_BEGIN(IU_Mode_Channel_Request_Desk_RNTI_t) + + M_NEXT_EXIST (IU_Mode_Channel_Request_Desk_RNTI_t, Exist_G_RNTI_Extension, 1), + M_UINT (IU_Mode_Channel_Request_Desk_RNTI_t, G_RNTI_Extension, 4), + + M_TYPE (IU_Mode_Channel_Request_Desk_RNTI_t, IU_Mode_Channel_Request_Desk, IU_Mode_Channel_Request_Desk_t), + +CSN_DESCR_END (IU_Mode_Channel_Request_Desk_RNTI_t) + + +static const +CSN_DESCR_BEGIN(Ext_Channel_Request_desc_t) + + M_UINT (Ext_Channel_Request_desc_t, PFI, 7), + M_UINT (Ext_Channel_Request_desc_t, RADIO_PRIORITY, 2), + M_UINT (Ext_Channel_Request_desc_t, RLC_Mode, 1), + + M_NEXT_EXIST (Ext_Channel_Request_desc_t, Exist_LCC_PDU, 1), + M_UINT (Ext_Channel_Request_desc_t, LCC_PDU, 1), + + M_NEXT_EXIST (Ext_Channel_Request_desc_t, Exist_Ext_Channel_Request_desc, 1), /* Don't use M_REC_TARRAY as we don't support multiple TBFs */ + +CSN_DESCR_END (Ext_Channel_Request_desc_t) + +static const +CSN_DESCR_BEGIN(EGPRS_BEP_LinkQualityMeasurements_type2_t) + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_GMSK_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, GMSK_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, GMSK_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_8PSK_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p8PSK_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p8PSK_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_QPSK_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, QPSK_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, QPSK_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_NSR_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_NSR_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_NSR_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_NSR_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_NSR_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_NSR_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_16QAM_HSR_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_HSR_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p16QAM_HSR_CV_BEP, 3), + + M_NEXT_EXIST (EGPRS_BEP_LinkQualityMeasurements_type2_t, Exist_32QAM_HSR_MEAN_BEP, 1), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_HSR_MEAN_BEP, 5), + M_UINT (EGPRS_BEP_LinkQualityMeasurements_type2_t, p32QAM_HSR_CV_BEP, 3), + +CSN_DESCR_END (EGPRS_BEP_LinkQualityMeasurements_type2_t) + +static const +CSN_DESCR_BEGIN(BEP_MeasurementReport_type2_t) + M_NEXT_EXIST (BEP_MeasurementReport_type2_t, Exist, 1), + M_UINT (BEP_MeasurementReport_type2_t, REPORTED_MODULATION, 2), + M_UINT (BEP_MeasurementReport_type2_t, MEAN_BEP_TN, 4), +CSN_DESCR_END (BEP_MeasurementReport_type2_t) + +static const +CSN_DESCR_BEGIN(InterferenceMeasurementReport_type2_t) + M_NEXT_EXIST (InterferenceMeasurementReport_type2_t, Exist, 1), + M_UINT (InterferenceMeasurementReport_type2_t, I_LEVEL, 4), +CSN_DESCR_END (InterferenceMeasurementReport_type2_t) +static const +CSN_DESCR_BEGIN(EGPRS_TimeslotLinkQualityMeasurements_type2_t) + M_NEXT_EXIST (EGPRS_TimeslotLinkQualityMeasurements_type2_t, Exist_BEP_MEASUREMENTS, 1), + M_TYPE_ARRAY (EGPRS_TimeslotLinkQualityMeasurements_type2_t, BEP_MEASUREMENTS, BEP_MeasurementReport_type2_t, 8), + + M_NEXT_EXIST (EGPRS_TimeslotLinkQualityMeasurements_type2_t, Exist_INTERFERENCE_MEASUREMENTS, 1), + M_TYPE_ARRAY (EGPRS_TimeslotLinkQualityMeasurements_type2_t, INTERFERENCE_MEASUREMENTS, InterferenceMeasurementReport_type2_t, 8), +CSN_DESCR_END (EGPRS_TimeslotLinkQualityMeasurements_type2_t) + +static const +CSN_DESCR_BEGIN(PRR_AdditionsR12_t) + + M_NEXT_EXIST (PRR_AdditionsR12_t, Exist_Downlink_eTFI, 1), + M_UINT (PRR_AdditionsR12_t, DOWNLINK_ETFI, 3), + +CSN_DESCR_END (PRR_AdditionsR12_t) + +static const +CSN_DESCR_BEGIN(PRR_AdditionsR10_t) + M_UINT (PRR_AdditionsR10_t, LOW_ACCESS_PRIORITY_SIGNALLING, 1), + + M_NEXT_EXIST_OR_NULL(PRR_AdditionsR10_t, Exist_AdditionsR12, 1), + M_TYPE (PRR_AdditionsR10_t, AdditionsR12, PRR_AdditionsR12_t), + +CSN_DESCR_END (PRR_AdditionsR10_t) + +static const +CSN_DESCR_BEGIN(PRR_AdditionsR7_t) + M_UINT (PRR_AdditionsR7_t, EARLY_TBF_ESTABLISHMENT, 1), + + M_NEXT_EXIST (PRR_AdditionsR7_t, Exist_EGPRS_BEP_LinkQualityMeasurements_type2, 1), + M_TYPE (PRR_AdditionsR7_t, EGPRS_BEP_LinkQualityMeasurements_type2, EGPRS_BEP_LinkQualityMeasurements_type2_t), + + M_NEXT_EXIST (PRR_AdditionsR7_t, Exist_EGPRS_TimeslotLinkQualityMeasurements_type2, 1), + M_TYPE (PRR_AdditionsR7_t, EGPRS_TimeslotLinkQualityMeasurements_type2, EGPRS_TimeslotLinkQualityMeasurements_type2_t), + + M_NEXT_EXIST_OR_NULL(PRR_AdditionsR7_t, Exist_AdditionsR10, 1), + M_TYPE (PRR_AdditionsR7_t, AdditionsR10, PRR_AdditionsR10_t), + +CSN_DESCR_END (PRR_AdditionsR7_t) + +static const +CSN_DESCR_BEGIN(PRR_AdditionsR6_t) + M_NEXT_EXIST (PRR_AdditionsR6_t, Exist_Ext_Channel_Request_desc, 1), + M_TYPE (PRR_AdditionsR6_t, Ext_Channel_Request_desc, Ext_Channel_Request_desc_t), + + M_NEXT_EXIST_OR_NULL(PRR_AdditionsR6_t, Exist_AdditionsR7, 1), + M_TYPE (PRR_AdditionsR6_t, AdditionsR7, PRR_AdditionsR7_t), + +CSN_DESCR_END (PRR_AdditionsR6_t) + +static const +CSN_DESCR_BEGIN(PRR_AdditionsR5_t) + M_NEXT_EXIST (PRR_AdditionsR5_t, Exist_Iu_Mode_ChRequestDesk, 1), + M_TYPE (PRR_AdditionsR5_t, IU_Mode_Channel_Request_Desk_RNTI, IU_Mode_Channel_Request_Desk_RNTI_t), + + M_NEXT_EXIST (PRR_AdditionsR5_t, Exist_HFN_LSB, 1), + M_UINT (PRR_AdditionsR5_t, HFN_LSb, 7), + + M_NEXT_EXIST_OR_NULL(PRR_AdditionsR5_t, Exist_AdditionsR6, 1), + M_TYPE (PRR_AdditionsR5_t, AdditionsR6, PRR_AdditionsR6_t), +CSN_DESCR_END (PRR_AdditionsR5_t) + +static const CSN_DESCR_BEGIN(PRR_AdditionsR99_t) M_NEXT_EXIST (PRR_AdditionsR99_t, Exist_EGPRS_BEP_LinkQualityMeasurements, 1), M_TYPE (PRR_AdditionsR99_t, EGPRS_BEP_LinkQualityMeasurements, EGPRS_BEP_LinkQualityMeasurements_t), @@ -1143,6 +1289,10 @@ M_UINT (PRR_AdditionsR99_t, MS_RAC_AdditionalInformationAvailable, 1), M_UINT (PRR_AdditionsR99_t, RetransmissionOfPRR, 1), + + M_NEXT_EXIST_OR_NULL(PRR_AdditionsR99_t, Exist_AdditionsR5, 1), + M_TYPE (PRR_AdditionsR99_t, AdditionsR5, PRR_AdditionsR5_t), + CSN_DESCR_END (PRR_AdditionsR99_t) static const diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index c1869ae..9e80f52 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -1443,6 +1443,148 @@ guint8 CV_BEP_8PSK; } EGPRS_BEP_LinkQualityMeasurements_t; +typedef struct{ +guint8 RB_ID; +guint8 RADIO_PRIORITY; + +gboolean Exist_RLC_BLOCK_COUNT; +guint8 RLC_BLOCK_COUNT; + +gboolean Exist_Iu_Mode_ChRequestDesk; +//IU_Mode_Channel_Request_Desk_t IU_Mode_Channel_Request_Desk1; + +} IU_Mode_Channel_Request_Desk_t; + +typedef struct{ + gboolean Exist_G_RNTI_Extension; + guint8 G_RNTI_Extension; + IU_Mode_Channel_Request_Desk_t IU_Mode_Channel_Request_Desk; + +} IU_Mode_Channel_Request_Desk_RNTI_t; + +typedef struct{ + guint8 PFI; + guint8 RADIO_PRIORITY; + guint8 RLC_Mode; + + gboolean Exist_LCC_PDU; + guint8 LCC_PDU; + + gboolean Exist_Ext_Channel_Request_desc; + +} Ext_Channel_Request_desc_t; + + +typedef struct{ + gboolean Exist_GMSK_MEAN_BEP; + guint8 GMSK_MEAN_BEP; + guint8 GMSK_CV_BEP; + + gboolean Exist_8PSK_MEAN_BEP; + guint8 p8PSK_MEAN_BEP; + guint8 p8PSK_CV_BEP; + + gboolean Exist_QPSK_MEAN_BEP; + guint8 QPSK_MEAN_BEP; + guint8 QPSK_CV_BEP; + + gboolean Exist_16QAM_NSR_MEAN_BEP; + guint8 p16QAM_NSR_MEAN_BEP; + guint8 p16QAM_NSR_CV_BEP; + + gboolean Exist_32QAM_NSR_MEAN_BEP; + guint8 p32QAM_NSR_MEAN_BEP; + guint8 p32QAM_NSR_CV_BEP; + + gboolean Exist_16QAM_HSR_MEAN_BEP; + guint8 p16QAM_HSR_MEAN_BEP; + guint8 p16QAM_HSR_CV_BEP; + + gboolean Exist_32QAM_HSR_MEAN_BEP; + guint8 p32QAM_HSR_MEAN_BEP; + guint8 p32QAM_HSR_CV_BEP; + +} EGPRS_BEP_LinkQualityMeasurements_type2_t; + +typedef struct +{ + gboolean Exist; + guint8 REPORTED_MODULATION; + guint8 MEAN_BEP_TN; + +} BEP_MeasurementReport_type2_t; + +typedef struct +{ + gboolean Exist; + guint8 I_LEVEL; +} InterferenceMeasurementReport_type2_t; + +typedef struct +{ + gboolean Exist_BEP_MEASUREMENTS; + BEP_MeasurementReport_type2_t BEP_MEASUREMENTS[8]; + + gboolean Exist_INTERFERENCE_MEASUREMENTS; + InterferenceMeasurementReport_type2_t INTERFERENCE_MEASUREMENTS[8]; + +} EGPRS_TimeslotLinkQualityMeasurements_type2_t; + + +typedef struct +{ + gboolean Exist_Downlink_eTFI; + guint8 DOWNLINK_ETFI; + +} PRR_AdditionsR12_t; + +typedef struct +{ + guint8 LOW_ACCESS_PRIORITY_SIGNALLING; + + gboolean Exist_AdditionsR12; + PRR_AdditionsR12_t AdditionsR12; + +} PRR_AdditionsR10_t; + +typedef struct +{ + guint8 EARLY_TBF_ESTABLISHMENT; + + gboolean Exist_EGPRS_BEP_LinkQualityMeasurements_type2; + EGPRS_BEP_LinkQualityMeasurements_type2_t EGPRS_BEP_LinkQualityMeasurements_type2; + + gboolean Exist_EGPRS_TimeslotLinkQualityMeasurements_type2; + EGPRS_TimeslotLinkQualityMeasurements_type2_t EGPRS_TimeslotLinkQualityMeasurements_type2; + + gboolean Exist_AdditionsR10; + PRR_AdditionsR10_t AdditionsR10; + +} PRR_AdditionsR7_t; + +typedef struct +{ + gboolean Exist_Ext_Channel_Request_desc; + Ext_Channel_Request_desc_t Ext_Channel_Request_desc; + + guint8 Exist_AdditionsR7; + PRR_AdditionsR7_t AdditionsR7; + +} PRR_AdditionsR6_t; + +typedef struct +{ + guint8 Exist_Iu_Mode_ChRequestDesk; + IU_Mode_Channel_Request_Desk_RNTI_t IU_Mode_Channel_Request_Desk_RNTI; + + guint8 Exist_HFN_LSB; + guint8 HFN_LSb; + + guint8 Exist_AdditionsR6; + PRR_AdditionsR6_t AdditionsR6; + +} PRR_AdditionsR5_t; + typedef struct { gboolean Exist_EGPRS_BEP_LinkQualityMeasurements; @@ -1456,6 +1598,9 @@ guint8 MS_RAC_AdditionalInformationAvailable; guint8 RetransmissionOfPRR; + + guint8 Exist_AdditionsR5; + PRR_AdditionsR5_t AdditionsR5; } PRR_AdditionsR99_t; typedef struct -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iceb59c58406180bc57fe6eb27127b4d11a0a3df7 Gerrit-Change-Number: 17051 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200128/55d0fe35/attachment.htm>