diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gsm_rlcmac.h | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index 10bb6afb..9e38966a 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -1224,10 +1224,6 @@ typedef struct } Content_t; -#define ABSOLUTE_MAX_BANDS 2 /* New fields for R4 extend the length of the capabilities message so we can only send 2 */ - -#define MAX_ACCESS_TECHNOLOGIES_COUNT 16 /* No more than 16 instances */ - typedef enum {/* See TS 24.008 table 10.5.146 */ AccTech_GSMP = 0x0, @@ -1246,14 +1242,9 @@ typedef enum AccTech_GSMT810 = 0xd, AccTech_GSMOther = 0xf } AccessTechnology_t; - -#if 0 -typedef struct -{ - guint8 CountAccessTechnologies; - AccessTechnology_t AccessTechnologies[MAX_ACCESS_TECHNOLOGIES_COUNT]; -} AccessTechnologiesRequest_t; -#endif +/* Maximum entries in one message, Enum above, appying restrictions from section + 12.30 "MS Radio Access Capability 2": */ +#define MAX_ACCESS_TECHNOLOGIES_COUNT 11 typedef struct { @@ -1266,8 +1257,8 @@ typedef struct { guint8 Count_additional_access_technologies; /* The value 0xf cannot be set for the first ATT, therefore we can only have - ABSOLUTE_MAX_BANDS-1 additional access technologies. */ - Additional_access_technologies_struct_t Additional_access_technologies[ABSOLUTE_MAX_BANDS-1]; + MAX_ACCESS_TECHNOLOGIES_COUNT-1 additional access technologies. */ + Additional_access_technologies_struct_t Additional_access_technologies[MAX_ACCESS_TECHNOLOGIES_COUNT-1]; } Additional_access_technologies_t; typedef struct @@ -1285,7 +1276,7 @@ typedef struct typedef struct { guint8 Count_MS_RA_capability_value; /* Recursive */ - MS_RA_capability_value_t MS_RA_capability_value[ABSOLUTE_MAX_BANDS]; + MS_RA_capability_value_t MS_RA_capability_value[MAX_ACCESS_TECHNOLOGIES_COUNT]; } MS_Radio_Access_capability_t; |