BUILD: fix compilation warning and circular dependency protection on header files
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
This commit is contained in:
@@ -543,7 +543,7 @@ void nr_generate_Msg2(module_id_t module_idP,
|
||||
sub_frame_t slotP){
|
||||
|
||||
int UE_id = 0, dci_formats[2], rnti_types[2], mcsIndex;
|
||||
int startSymbolAndLength = 0, StartSymbolIndex = -1, NrOfSymbols = 14, StartSymbolIndex_tmp, NrOfSymbols_tmp, x_Overhead, time_domain_assignment;
|
||||
int startSymbolAndLength = 0, StartSymbolIndex = -1, NrOfSymbols = 14, StartSymbolIndex_tmp, NrOfSymbols_tmp, x_Overhead, time_domain_assignment = 0;
|
||||
gNB_MAC_INST *nr_mac = RC.nrmac[module_idP];
|
||||
NR_COMMON_channels_t *cc = &nr_mac->common_channels[0];
|
||||
NR_RA_t *ra = &cc->ra[0];
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
* contact@openairinterface.org
|
||||
*/
|
||||
|
||||
#ifndef _ASN1_UTILS_H_
|
||||
#define _ASN1_UTILS_H_
|
||||
#ifndef _OPENAIR2_LAYER2_NR_RLC_ASN1_UTILS_H_
|
||||
#define _OPENAIR2_LAYER2_NR_RLC_ASN1_UTILS_H_
|
||||
|
||||
int decode_t_reassembly(int v);
|
||||
int decode_t_status_prohibit(int v);
|
||||
@@ -31,4 +31,4 @@ int decode_max_retx_threshold(int v);
|
||||
int decode_sn_field_length_um(int v);
|
||||
int decode_sn_field_length_am(int v);
|
||||
|
||||
#endif /* _ASN1_UTILS_H_ */
|
||||
#endif /* _OPENAIR2_LAYER2_NR_RLC_ASN1_UTILS_H_ */
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
* contact@openairinterface.org
|
||||
*/
|
||||
|
||||
#ifndef _ASN1_UTILS_H_
|
||||
#define _ASN1_UTILS_H_
|
||||
#ifndef _OPENAIR2_LAYER2_RLC_V2_ASN1_UTILS_H_
|
||||
#define _OPENAIR2_LAYER2_RLC_V2_ASN1_UTILS_H_
|
||||
|
||||
int decode_t_reordering(int v);
|
||||
int decode_t_status_prohibit(int v);
|
||||
@@ -30,4 +30,4 @@ int decode_poll_byte(int v);
|
||||
int decode_max_retx_threshold(int v);
|
||||
int decode_sn_field_length(int v);
|
||||
|
||||
#endif /* _ASN1_UTILS_H_ */
|
||||
#endif /* _OPENAIR2_LAYER2_RLC_V2_ASN1_UTILS_H_ */
|
||||
|
||||
Reference in New Issue
Block a user