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
wangjie
OpenXG-RAN
Commits
1cc4a4f5
Commit
1cc4a4f5
authored
Sep 30, 2020
by
Florian Kaltenberger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing compiler warnings and hopefully if4.5 CI tests
parent
66b20f1a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
10 deletions
+10
-10
openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/if4_tools.c
+2
-2
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/prach.c
+1
-1
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
+3
-3
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+3
-3
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+1
-1
No files found.
openair1/PHY/LTE_TRANSPORT/if4_tools.c
View file @
1cc4a4f5
...
@@ -49,7 +49,7 @@ void send_IF4p5(RU_t *ru,
...
@@ -49,7 +49,7 @@ void send_IF4p5(RU_t *ru,
LTE_DL_FRAME_PARMS
*
fp
=
ru
->
frame_parms
;
LTE_DL_FRAME_PARMS
*
fp
=
ru
->
frame_parms
;
int32_t
**
txdataF
=
ru
->
common
.
txdataF_BF
;
int32_t
**
txdataF
=
ru
->
common
.
txdataF_BF
;
int32_t
**
rxdataF
=
ru
->
common
.
rxdataF
;
int32_t
**
rxdataF
=
ru
->
common
.
rxdataF
;
int16_t
**
prach_rxsigF
=
ru
->
prach_rxsigF
;
int16_t
**
prach_rxsigF
=
ru
->
prach_rxsigF
[
0
]
;
int16_t
***
prach_rxsigF_br
=
ru
->
prach_rxsigF_br
;
int16_t
***
prach_rxsigF_br
=
ru
->
prach_rxsigF_br
;
void
*
tx_buffer
=
ru
->
ifbuffer
.
tx
[
subframe
&
1
];
void
*
tx_buffer
=
ru
->
ifbuffer
.
tx
[
subframe
&
1
];
void
*
tx_buffer_prach
=
ru
->
ifbuffer
.
tx_prach
;
void
*
tx_buffer_prach
=
ru
->
ifbuffer
.
tx_prach
;
...
@@ -276,7 +276,7 @@ void recv_IF4p5(RU_t *ru,
...
@@ -276,7 +276,7 @@ void recv_IF4p5(RU_t *ru,
LTE_DL_FRAME_PARMS
*
fp
=
ru
->
frame_parms
;
LTE_DL_FRAME_PARMS
*
fp
=
ru
->
frame_parms
;
int32_t
**
txdataF
=
ru
->
common
.
txdataF_BF
;
int32_t
**
txdataF
=
ru
->
common
.
txdataF_BF
;
int32_t
**
rxdataF
=
ru
->
common
.
rxdataF
;
int32_t
**
rxdataF
=
ru
->
common
.
rxdataF
;
int16_t
**
prach_rxsigF
=
ru
->
prach_rxsigF
;
int16_t
**
prach_rxsigF
=
ru
->
prach_rxsigF
[
0
]
;
int16_t
***
prach_rxsigF_br
=
ru
->
prach_rxsigF_br
;
int16_t
***
prach_rxsigF_br
=
ru
->
prach_rxsigF_br
;
void
*
rx_buffer
=
ru
->
ifbuffer
.
rx
;
void
*
rx_buffer
=
ru
->
ifbuffer
.
rx
;
uint16_t
element_id
;
uint16_t
element_id
;
...
...
openair1/PHY/LTE_TRANSPORT/prach.c
View file @
1cc4a4f5
...
@@ -167,7 +167,7 @@ void rx_prach0(PHY_VARS_eNB *eNB,
...
@@ -167,7 +167,7 @@ void rx_prach0(PHY_VARS_eNB *eNB,
br_flag
,
ce_level
,
frame_prach
,
subframe
,
fp
->
prach_emtc_config_common
.
prach_ConfigInfo
.
prach_FreqOffset
[
ce_level
],
prach_ConfigIndex
);
br_flag
,
ce_level
,
frame_prach
,
subframe
,
fp
->
prach_emtc_config_common
.
prach_ConfigInfo
.
prach_FreqOffset
[
ce_level
],
prach_ConfigIndex
);
}
}
}
else
{
}
else
{
rxsigF
=
ru
->
prach_rxsigF
;
rxsigF
=
ru
->
prach_rxsigF
[
0
]
;
if
(
LOG_DEBUGFLAG
(
PRACH
))
{
if
(
LOG_DEBUGFLAG
(
PRACH
))
{
if
(((
frame_prach
)
&
1023
)
<
20
)
LOG_I
(
PHY
,
"PRACH (RU) : running rx_prach for subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d
\n
"
,
if
(((
frame_prach
)
&
1023
)
<
20
)
LOG_I
(
PHY
,
"PRACH (RU) : running rx_prach for subframe %d, prach_FreqOffset %d, prach_ConfigIndex %d
\n
"
,
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
View file @
1cc4a4f5
...
@@ -66,9 +66,9 @@ void fill_dci_search_candidates(NR_SearchSpace_t *ss,fapi_nr_dl_config_dci_dl_pd
...
@@ -66,9 +66,9 @@ void fill_dci_search_candidates(NR_SearchSpace_t *ss,fapi_nr_dl_config_dci_dl_pd
void
config_dci_pdu
(
NR_UE_MAC_INST_t
*
mac
,
fapi_nr_dl_config_dci_dl_pdu_rel15_t
*
rel15
,
fapi_nr_dl_config_request_t
*
dl_config
,
int
rnti_type
,
int
ss_id
,
uint8_t
dci_format
){
void
config_dci_pdu
(
NR_UE_MAC_INST_t
*
mac
,
fapi_nr_dl_config_dci_dl_pdu_rel15_t
*
rel15
,
fapi_nr_dl_config_request_t
*
dl_config
,
int
rnti_type
,
int
ss_id
,
uint8_t
dci_format
){
uint16_t
monitoringSymbolsWithinSlot
;
uint16_t
monitoringSymbolsWithinSlot
=
0
;
uint8_t
bwp_id
=
1
,
coreset_id
=
1
;
uint8_t
bwp_id
=
1
,
coreset_id
=
1
;
int
sps
;
//
int sps;
def_dci_pdu_rel15
=
calloc
(
1
,
sizeof
(
dci_pdu_rel15_t
));
def_dci_pdu_rel15
=
calloc
(
1
,
sizeof
(
dci_pdu_rel15_t
));
AssertFatal
(
mac
->
scc
!=
NULL
,
"scc is null
\n
"
);
AssertFatal
(
mac
->
scc
!=
NULL
,
"scc is null
\n
"
);
NR_ServingCellConfigCommon_t
*
scc
=
mac
->
scc
;
NR_ServingCellConfigCommon_t
*
scc
=
mac
->
scc
;
...
@@ -184,7 +184,7 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl
...
@@ -184,7 +184,7 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl
int
ss_id
;
int
ss_id
;
uint8_t
bwp_id
=
1
,
coreset_id
=
1
;
uint8_t
bwp_id
=
1
,
coreset_id
=
1
;
NR_ServingCellConfig_t
*
scd
=
mac
->
scg
->
spCellConfig
->
spCellConfigDedicated
;
//
NR_ServingCellConfig_t *scd = mac->scg->spCellConfig->spCellConfigDedicated;
NR_BWP_Downlink_t
*
bwp
=
mac
->
DLbwp
[
bwp_id
-
1
];
NR_BWP_Downlink_t
*
bwp
=
mac
->
DLbwp
[
bwp_id
-
1
];
#ifdef DEBUG_DCI
#ifdef DEBUG_DCI
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
1cc4a4f5
...
@@ -478,8 +478,8 @@ int8_t nr_ue_decode_mib(module_id_t module_id,
...
@@ -478,8 +478,8 @@ int8_t nr_ue_decode_mib(module_id_t module_id,
SFN_C_TYPE
sfn_c
=
SFN_C_IMPOSSIBLE
;
// only valid for mux=1
SFN_C_TYPE
sfn_c
=
SFN_C_IMPOSSIBLE
;
// only valid for mux=1
uint32_t
n_c
=
UINT_MAX
;
uint32_t
n_c
=
UINT_MAX
;
uint32_t
number_of_search_space_per_slot
=
UINT_MAX
;
uint32_t
number_of_search_space_per_slot
=
UINT_MAX
;
uint32_t
first_symbol_index
=
UINT_MAX
;
//
uint32_t first_symbol_index=UINT_MAX;
uint32_t
search_space_duration
;
// element of search space
//
uint32_t search_space_duration; // element of search space
// 38.213 table 10.1-1
// 38.213 table 10.1-1
/// MUX PATTERN 1
/// MUX PATTERN 1
...
@@ -2100,7 +2100,7 @@ int8_t nr_ue_process_dci_time_dom_resource_assignment(NR_UE_MAC_INST_t *mac,
...
@@ -2100,7 +2100,7 @@ int8_t nr_ue_process_dci_time_dom_resource_assignment(NR_UE_MAC_INST_t *mac,
uint8_t
time_domain_ind
uint8_t
time_domain_ind
){
){
int
dmrs_typeA_pos
=
mac
->
scc
->
dmrs_TypeA_Position
;
int
dmrs_typeA_pos
=
mac
->
scc
->
dmrs_TypeA_Position
;
uint8_t
k_offset
=
0
;
//
uint8_t k_offset=0;
uint8_t
sliv_S
=
0
;
uint8_t
sliv_S
=
0
;
uint8_t
sliv_L
=
0
;
uint8_t
sliv_L
=
0
;
uint8_t
table_5_1_2_1_1_2_time_dom_res_alloc_A
[
16
][
3
]
=
{
// for PDSCH from TS 38.214 subclause 5.1.2.1.1
uint8_t
table_5_1_2_1_1_2_time_dom_res_alloc_A
[
16
][
3
]
=
{
// for PDSCH from TS 38.214 subclause 5.1.2.1.1
...
...
targets/RT/USER/lte-enb.c
View file @
1cc4a4f5
...
@@ -1177,7 +1177,7 @@ void init_eNB_afterRU(void) {
...
@@ -1177,7 +1177,7 @@ void init_eNB_afterRU(void) {
for
(
i
=
0
;
i
<
eNB
->
RU_list
[
ru_id
]
->
nb_rx
;
aa
++
,
i
++
)
{
for
(
i
=
0
;
i
<
eNB
->
RU_list
[
ru_id
]
->
nb_rx
;
aa
++
,
i
++
)
{
LOG_I
(
PHY
,
"Attaching RU %d antenna %d to eNB antenna %d
\n
"
,
eNB
->
RU_list
[
ru_id
]
->
idx
,
i
,
aa
);
LOG_I
(
PHY
,
"Attaching RU %d antenna %d to eNB antenna %d
\n
"
,
eNB
->
RU_list
[
ru_id
]
->
idx
,
i
,
aa
);
eNB
->
prach_vars
.
rxsigF
[
0
][
aa
]
=
eNB
->
RU_list
[
ru_id
]
->
prach_rxsigF
[
i
];
eNB
->
prach_vars
.
rxsigF
[
0
][
aa
]
=
eNB
->
RU_list
[
ru_id
]
->
prach_rxsigF
[
0
][
i
];
for
(
int
ce_level
=
0
;
ce_level
<
4
;
ce_level
++
)
for
(
int
ce_level
=
0
;
ce_level
<
4
;
ce_level
++
)
eNB
->
prach_vars_br
.
rxsigF
[
ce_level
][
aa
]
=
eNB
->
RU_list
[
ru_id
]
->
prach_rxsigF_br
[
ce_level
][
i
];
eNB
->
prach_vars_br
.
rxsigF
[
ce_level
][
aa
]
=
eNB
->
RU_list
[
ru_id
]
->
prach_rxsigF_br
[
ce_level
][
i
];
...
...
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