Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangwenhui
OpenXG-RAN
Commits
4b58b9d3
Commit
4b58b9d3
authored
Jul 02, 2020
by
laurent
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gcc warnings
parent
12e5fe33
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
20 additions
and
21 deletions
+20
-21
common/utils/ocp_itti/intertask_interface.h
common/utils/ocp_itti/intertask_interface.h
+1
-1
executables/nr-ru.c
executables/nr-ru.c
+2
-2
executables/nr-uesoftmodem.c
executables/nr-uesoftmodem.c
+2
-2
openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
+1
-1
openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
+2
-2
openair1/PHY/NR_TRANSPORT/nr_dci.c
openair1/PHY/NR_TRANSPORT/nr_dci.c
+1
-1
openair1/PHY/NR_TRANSPORT/nr_pbch.c
openair1/PHY/NR_TRANSPORT/nr_pbch.c
+1
-1
openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
+3
-3
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+2
-4
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_config.c
+2
-2
openair2/F1AP/f1ap_cu_ue_context_management.c
openair2/F1AP/f1ap_cu_ue_context_management.c
+1
-1
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+1
-1
openair2/RRC/NR/rrc_gNB_nsa.c
openair2/RRC/NR/rrc_gNB_nsa.c
+1
-0
No files found.
common/utils/ocp_itti/intertask_interface.h
View file @
4b58b9d3
...
...
@@ -415,7 +415,7 @@ static const message_info_t messages_info[] = {
#undef MESSAGE_DEF
};
typedef
struct
__attribute__
((
__packed__
))
MessageDef_s
{
typedef
struct
MessageDef_s
{
MessageHeader
ittiMsgHeader
;
/**< Message header */
msg_t
ittiMsg
;
}
MessageDef
;
...
...
executables/nr-ru.c
View file @
4b58b9d3
...
...
@@ -772,8 +772,8 @@ void tx_rf(RU_t *ru,int frame,int slot, uint64_t timestamp) {
siglen
+
sf_extension
,
ru
->
nb_tx
,
flags
);
LOG_D
(
PHY
,
"[TXPATH] RU %d tx_rf, writing to TS %llu, frame %d, unwrapped_frame %d, slot %d
\n
"
,
ru
->
idx
,
(
long
long
unsigned
int
)
timestamp
,
frame
,
proc
->
frame_tx_unwrap
,
slot
);
LOG_D
(
PHY
,
"[TXPATH] RU %d tx_rf, writing to TS %llu, frame %d, unwrapped_frame %d, slot %d
i, returned %d
\n
"
,
ru
->
idx
,
(
long
long
unsigned
int
)
timestamp
,
frame
,
proc
->
frame_tx_unwrap
,
slot
,
txs
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE
,
0
);
//AssertFatal(txs == 0,"trx write function error %d\n", txs);
}
...
...
executables/nr-uesoftmodem.c
View file @
4b58b9d3
...
...
@@ -71,8 +71,8 @@ unsigned short config_frames[4] = {2,9,11,13};
#include "PHY/INIT/phy_init.h"
#include "system.h"
#include <openair2/RRC/NR_UE/rrc_proto.h>
#include
"NR_MAC_UE/mac_defs.h"
#include
"NR_MAC_UE/mac_proto.h"
#include
<openair2/LAYER2/NR_MAC_UE/mac_defs.h>
#include
<openair2/LAYER2/NR_MAC_UE/mac_proto.h>
#include <openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h>
#include <openair1/SCHED_NR_UE/fapi_nr_ue_l1.h>
...
...
openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
View file @
4b58b9d3
...
...
@@ -146,7 +146,7 @@ void polar_encoder_dci(uint32_t *in,
uint16_t
n_RNTI
);
void
polar_encoder_fast
(
uint64_t
*
A
,
uint32_t
*
out
,
void
*
out
,
int32_t
crcmask
,
uint8_t
ones_flag
,
t_nrPolar_params
*
polarParams
);
...
...
openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
View file @
4b58b9d3
...
...
@@ -408,7 +408,7 @@ void build_polar_tables(t_nrPolar_params *polarParams) {
}
void
polar_encoder_fast
(
uint64_t
*
A
,
uint32_t
*
out
,
void
*
out
,
int32_t
crcmask
,
uint8_t
ones_flag
,
t_nrPolar_params
*
polarParams
)
{
...
...
@@ -676,5 +676,5 @@ void polar_encoder_fast(uint64_t *A,
}
}
memset
((
void
*
)
out
,
0
,
polarParams
->
encoderLength
>>
3
);
polar_rate_matching
(
polarParams
,(
void
*
)
D
,
(
void
*
)
out
);
polar_rate_matching
(
polarParams
,(
void
*
)
D
,
out
);
}
openair1/PHY/NR_TRANSPORT/nr_dci.c
View file @
4b58b9d3
...
...
@@ -237,7 +237,7 @@ uint8_t nr_generate_dci_top(nfapi_nr_dl_tti_pdcch_pdu *pdcch_pdu,
pdcch_pdu_rel15
->
dci_pdu
.
PayloadSizeBits
[
d
],
pdcch_pdu_rel15
->
dci_pdu
.
AggregationLevel
[
d
],
0
,
NULL
);
polar_encoder_fast
((
uint64_t
*
)
pdcch_pdu_rel15
->
dci_pdu
.
Payload
[
d
],
encoder_output
,
n_RNTI
,
1
,
currentPtr
);
polar_encoder_fast
((
uint64_t
*
)
pdcch_pdu_rel15
->
dci_pdu
.
Payload
[
d
],
(
void
*
)
encoder_output
,
n_RNTI
,
1
,
currentPtr
);
#ifdef DEBUG_CHANNEL_CODING
printf
(
"polar rnti %x,length %d, L %d
\n
"
,
n_RNTI
,
pdcch_pdu_rel15
->
dci_pdu
.
PayloadSizeBits
[
d
],
pdcch_pdu_rel15
->
dci_pdu
.
AggregationLevel
[
d
]);
printf
(
"DCI PDU: [0]->0x%lx
\t
[1]->0x%lx
\n
"
,
...
...
openair1/PHY/NR_TRANSPORT/nr_pbch.c
View file @
4b58b9d3
...
...
@@ -297,7 +297,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
a_reversed
|=
(((
uint64_t
)
pbch
->
pbch_a_prime
>>
i
)
&
1
)
<<
(
31
-
i
);
/// CRC, coding and rate matching
polar_encoder_fast
(
&
a_reversed
,
(
uint32_t
*
)
pbch
->
pbch_e
,
0
,
0
,
polar_encoder_fast
(
&
a_reversed
,
(
void
*
)
pbch
->
pbch_e
,
0
,
0
,
nr_polar_params
(
NR_POLAR_PBCH_MESSAGE_TYPE
,
NR_POLAR_PBCH_PAYLOAD_BITS
,
NR_POLAR_PBCH_AGGREGATION_LEVEL
,
0
,
NULL
)
);
#ifdef DEBUG_PBCH_ENCODING
...
...
openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
View file @
4b58b9d3
...
...
@@ -962,7 +962,7 @@ void nr_generate_pucch2(PHY_VARS_NR_UE *ue,
uint64_t
b
[
16
];
// limit to 1024-bit encoded length
// M_bit is the number of bits of block b (payload after encoding)
uint16_t
M_bit
;
nr_uci_encoding
(
payload
,
nr_bit
,
pucch_format2_nr
,
0
,
nrofSymbols
,
nrofPRB
,
1
,
0
,
0
,
&
b
,
&
M_bit
);
nr_uci_encoding
(
payload
,
nr_bit
,
pucch_format2_nr
,
0
,
nrofSymbols
,
nrofPRB
,
1
,
0
,
0
,
(
void
*
)
b
,
&
M_bit
);
/*
* Implementing TS 38.211
* Subclauses 6.3.2.5.1 Scrambling (PUCCH format 2)
...
...
@@ -1128,7 +1128,7 @@ void nr_generate_pucch3_4(PHY_VARS_NR_UE *ue,
printf
(
"
\t
[nr_generate_pucch3_4] start function at slot(nr_tti_tx)=%d with payload=%lu and nr_bit=%d
\n
"
,
nr_tti_tx
,
payload
,
nr_bit
);
#endif
// b is the block of bits transmitted on the physical channel after payload coding
uint64_t
b
;
uint64_t
b
[
16
]
;
// M_bit is the number of bits of block b (payload after encoding)
uint16_t
M_bit
;
// parameter PUCCH-F4-preDFT-OCC-length set of {2,4} -> to use table -1 or -2
...
...
@@ -1153,7 +1153,7 @@ void nr_generate_pucch3_4(PHY_VARS_NR_UE *ue,
//nrofPRB = 2; // only for test purposes
if
(
fmt
==
pucch_format4_nr
)
nrofPRB
=
1
;
nr_uci_encoding
(
payload
,
nr_bit
,
fmt
,
is_pi_over_2_bpsk_enabled
,
nrofSymbols
,
nrofPRB
,
n_SF_PUCCH_s
,
intraSlotFrequencyHopping
,
add_dmrs
,
&
b
,
&
M_bit
);
nr_uci_encoding
(
payload
,
nr_bit
,
fmt
,
is_pi_over_2_bpsk_enabled
,
nrofSymbols
,
nrofPRB
,
n_SF_PUCCH_s
,
intraSlotFrequencyHopping
,
add_dmrs
,
(
void
*
)
b
,
&
M_bit
);
/*
* Implementing TS 38.211
* Subclauses 6.3.2.6.1 Scrambling (PUCCH formats 3 and 4)
...
...
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
4b58b9d3
...
...
@@ -2753,10 +2753,8 @@ int nr_ue_pdcch_procedures(uint8_t gNB_id,
pdcch_vars
->
nb_search_space
);
#endif
fapi_nr_dci_indication_t
dci_ind
;
nr_downlink_indication_t
dl_indication
;
memset
((
void
*
)
&
dci_ind
,
0
,
sizeof
(
dci_ind
));
memset
((
void
*
)
&
dl_indication
,
0
,
sizeof
(
dl_indication
));
fapi_nr_dci_indication_t
dci_ind
=
{
0
};
nr_downlink_indication_t
dl_indication
=
{
0
};
dci_cnt
=
nr_dci_decoding_procedure
(
ue
,
proc
->
frame_rx
,
nr_tti_rx
,
...
...
openair2/ENB_APP/enb_config.c
View file @
4b58b9d3
...
...
@@ -1545,7 +1545,7 @@ int RCconfig_RRC(uint32_t i, eNB_RRC_INST *rrc, int macrlc_has_f1) {
RRC_CONFIGURATION_REQ
(
msg_p
).
eMBMS_configured
=
0
;
printf
(
"No eMBMS configuration, skipping it
\n
"
);
// eMTC configuration
char
brparamspath
[
MAX_OPTNAME_SIZE
*
2
+
16
];
char
brparamspath
[
MAX_OPTNAME_SIZE
*
2
+
16
0
];
sprintf
(
brparamspath
,
"%s.%s"
,
ccspath
,
ENB_CONFIG_STRING_EMTC_PARAMETERS
);
config_get
(
eMTCParams
,
sizeof
(
eMTCParams
)
/
sizeof
(
paramdef_t
),
brparamspath
);
RRC_CONFIGURATION_REQ
(
msg_p
).
eMTC_configured
=
eMTCconfig
.
eMTC_configured
&
1
;
...
...
@@ -1554,7 +1554,7 @@ int RCconfig_RRC(uint32_t i, eNB_RRC_INST *rrc, int macrlc_has_f1) {
else
printf
(
"No eMTC configuration, skipping it
\n
"
);
// Sidelink configuration
char
SLparamspath
[
MAX_OPTNAME_SIZE
*
2
+
16
];
char
SLparamspath
[
MAX_OPTNAME_SIZE
*
2
+
16
0
];
sprintf
(
SLparamspath
,
"%s.%s"
,
ccspath
,
ENB_CONFIG_STRING_SL_PARAMETERS
);
config_get
(
SLParams
,
sizeof
(
SLParams
)
/
sizeof
(
paramdef_t
),
SLparamspath
);
// Sidelink Resource pool information
...
...
openair2/F1AP/f1ap_cu_ue_context_management.c
View file @
4b58b9d3
...
...
@@ -226,7 +226,7 @@ int CU_send_UE_CONTEXT_SETUP_REQUEST(instance_t instance,
ie
->
value
.
choice
.
ResourceCoordinationTransferContainer
.
buf
=
malloc
(
4
);
ie
->
value
.
choice
.
ResourceCoordinationTransferContainer
.
size
=
4
;
strncpy
((
char
*
)
ie
->
value
.
choice
.
ResourceCoordinationTransferContainer
.
buf
,
"123"
,
3
);
strncpy
((
char
*
)
ie
->
value
.
choice
.
ResourceCoordinationTransferContainer
.
buf
,
"123"
,
4
);
OCTET_STRING_fromBuf
(
&
ie
->
value
.
choice
.
ResourceCoordinationTransferContainer
,
"asdsa1d32sa1d31asd31as"
,
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
4b58b9d3
...
...
@@ -272,7 +272,7 @@ int8_t nr_ue_decode_mib(module_id_t module_id,
uint16_t
frame_number_4lsb
=
0
;
for
(
int
i
=
0
;
i
<
4
;
i
++
)
frame_number_4lsb
|=
((
extra_bits
>>
i
)
&
1
)
<<
(
3
-
i
);
uint8_t
half_frame_bit
=
(
extra_bits
>>
4
)
&
0x1
;
// extra bits[4]
//
uint8_t half_frame_bit = ( extra_bits >> 4 ) & 0x1; // extra bits[4]
uint8_t
ssb_subcarrier_offset_msb
=
(
extra_bits
>>
5
)
&
0x1
;
// extra bits[5]
uint8_t
ssb_subcarrier_offset
=
(
uint8_t
)
mac
->
mib
->
ssb_SubcarrierOffset
;
...
...
openair2/RRC/NR/rrc_gNB_nsa.c
View file @
4b58b9d3
...
...
@@ -39,6 +39,7 @@
#include "openair2/LAYER2/NR_MAC_gNB/mac_proto.h"
#include "openair2/RRC/LTE/rrc_eNB_GTPV1U.h"
#include "executables/softmodem-common.h"
#include <openair2/RRC/NR/rrc_gNB_UE_context.h>
void
rrc_parse_ue_capabilities
(
gNB_RRC_INST
*
rrc
,
LTE_UE_CapabilityRAT_ContainerList_t
*
UE_CapabilityRAT_ContainerList
,
x2ap_ENDC_sgnb_addition_req_t
*
m
,
NR_CG_ConfigInfo_IEs_t
*
cg_config_info
)
{
struct
rrc_gNB_ue_context_s
*
ue_context_p
=
NULL
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment