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
promise
OpenXG-RAN
Commits
ae16b6fd
Commit
ae16b6fd
authored
Jan 13, 2020
by
Nick Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean warning at system level
parent
f51720c8
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
10 deletions
+10
-10
openair1/PHY/INIT/lte_init_NB_IoT.c
openair1/PHY/INIT/lte_init_NB_IoT.c
+2
-2
openair1/PHY/defs.h
openair1/PHY/defs.h
+1
-1
openair1/SCHED/defs_NB_IoT.h
openair1/SCHED/defs_NB_IoT.h
+1
-1
openair1/SCHED/phy_procedures_lte_common_NB_IoT.c
openair1/SCHED/phy_procedures_lte_common_NB_IoT.c
+1
-1
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+4
-4
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.c
+1
-1
No files found.
openair1/PHY/INIT/lte_init_NB_IoT.c
View file @
ae16b6fd
...
...
@@ -402,8 +402,8 @@ void phy_config_dedicated_eNB_NB_IoT(uint8_t Mod_id,
{
PHY_VARS_eNB_NB_IoT
*
eNB
=
PHY_vars_eNB_NB_IoT_g
[
Mod_id
][
CC_id
];
NB_IoT_eNB_NPDCCH_t
*
npdcch
;
uint8_t
UE_id
=
find_ue_NB_IoT
(
rnti
,
eNB
);
//
uint8_t UE_id = find_ue_NB_IoT(rnti,eNB);
uint8_t
UE_id
=
0
;
if
(
UE_id
==
-
1
)
{
LOG_E
(
PHY
,
"[eNB %"
PRIu8
"] find_ue() returns -1
\n
"
,
Mod_id
);
...
...
openair1/PHY/defs.h
View file @
ae16b6fd
...
...
@@ -300,7 +300,7 @@ typedef struct PHY_VARS_eNB_s {
void
(
*
fep
)(
struct
PHY_VARS_eNB_s
*
eNB
,
eNB_rxtx_proc_t
*
proc
);
int
(
*
td
)(
struct
PHY_VARS_eNB_s
*
eNB
,
int
UE_id
,
int
harq_pid
,
int
llr8_flag
);
int
(
*
te
)(
struct
PHY_VARS_eNB_s
*
,
uint8_t
*
,
uint8_t
,
LTE_eNB_DLSCH_t
*
,
int
,
uint8_t
,
time_stats_t
*
,
time_stats_t
*
,
time_stats_t
*
);
void
(
*
proc_uespec_rx
)(
struct
PHY_VARS_eNB_s
*
eNB
,
eNB_rxtx_proc_t
*
proc
,
const
relaying_type_t
r_type
);
void
(
*
proc_uespec_rx
)(
struct
PHY_VARS_eNB_s
*
eNB
,
eNB_rxtx_proc_t
*
proc
);
void
(
*
proc_tx
)(
struct
PHY_VARS_eNB_s
*
eNB
,
eNB_rxtx_proc_t
*
proc
,
relaying_type_t
r_type
,
PHY_VARS_RN
*
rn
);
void
(
*
tx_fh
)(
struct
PHY_VARS_eNB_s
*
eNB
,
eNB_rxtx_proc_t
*
proc
);
void
(
*
rx_fh
)(
struct
PHY_VARS_eNB_s
*
eNB
,
int
*
frame
,
int
*
subframe
);
...
...
openair1/SCHED/defs_NB_IoT.h
View file @
ae16b6fd
...
...
@@ -33,7 +33,7 @@ void generate_eNB_ulsch_params_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,nf
/*Generate the dlsch params and do the mapping for the FAPI style parameters to OAI, and then do the packing*/
void
generate_eNB_dlsch_params_NB_IoT
(
PHY_VARS_eNB
*
eNB
,
eNB_rxtx_proc_t
*
proc
,
nfapi_dl_config_request_pdu_t
*
dl_config_pdu
);
int8_t
find_ue_NB_IoT
(
uint16_t
rnti
,
PHY_VARS_eNB
_NB_IoT
*
eNB
);
int8_t
find_ue_NB_IoT
(
uint16_t
rnti
,
PHY_VARS_eNB
*
eNB
);
NB_IoT_DL_FRAME_PARMS
*
get_NB_IoT_frame_parms
(
module_id_t
Mod_id
,
uint8_t
CC_id
);
...
...
openair1/SCHED/phy_procedures_lte_common_NB_IoT.c
View file @
ae16b6fd
...
...
@@ -1094,7 +1094,7 @@ int8_t find_ue(uint16_t rnti, PHY_VARS_eNB *eNB)
return(-1);
}
*/
int8_t
find_ue_NB_IoT
(
uint16_t
rnti
,
PHY_VARS_eNB
_NB_IoT
*
eNB
)
int8_t
find_ue_NB_IoT
(
uint16_t
rnti
,
PHY_VARS_eNB
*
eNB
)
{
uint8_t
i
;
...
...
targets/RT/USER/lte-enb.c
View file @
ae16b6fd
...
...
@@ -649,7 +649,7 @@ static inline int rxtx(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc, char *thread_nam
// UE-specific RX processing for subframe n
///////////////////////////////////// for NB-IoT testing ////////////////////////
// for NB-IoT testing // activating only TX part
if
(
eNB
->
proc_uespec_rx
)
eNB
->
proc_uespec_rx
(
eNB
,
proc
,
no_relay
);
if
(
eNB
->
proc_uespec_rx
)
eNB
->
proc_uespec_rx
(
eNB
,
proc
);
////////////////////////////////////END///////////////////////
//npusch_procedures(eNB,proc,data_or_control);
...
...
@@ -2246,7 +2246,7 @@ void init_eNB(eNB_func_t node_function[], eNB_timing_t node_timing[],int nb_inst
eNB
->
fep
=
eNB_fep_full
;
//(single_thread_flag==1) ? eNB_fep_full_2thread : eNB_fep_full;
eNB
->
td
=
ulsch_decoding_data
;
//(single_thread_flag==1) ? ulsch_decoding_data_2thread : ulsch_decoding_data;
eNB
->
te
=
dlsch_encoding
;
//(single_thread_flag==1) ? dlsch_encoding_2threads : dlsch_encoding;
eNB
->
proc_uespec_rx
=
phy_procedures_eNB_uespec_RX
;
eNB
->
proc_uespec_rx
=
phy_procedures_eNB_uespec_RX
_NB_IoT
;
eNB
->
proc_tx
=
proc_tx_full
;
if
(
eNB
->
node_timing
==
synch_to_other
)
{
eNB
->
tx_fh
=
tx_fh_if5_mobipass
;
...
...
@@ -2280,7 +2280,7 @@ void init_eNB(eNB_func_t node_function[], eNB_timing_t node_timing[],int nb_inst
eNB
->
fep
=
NULL
;
eNB
->
td
=
ulsch_decoding_data
;
//(single_thread_flag==1) ? ulsch_decoding_data_2thread : ulsch_decoding_data;
eNB
->
te
=
dlsch_encoding
;
//(single_thread_flag==1) ? dlsch_encoding_2threads : dlsch_encoding;
eNB
->
proc_uespec_rx
=
phy_procedures_eNB_uespec_RX
;
eNB
->
proc_uespec_rx
=
phy_procedures_eNB_uespec_RX
_NB_IoT
;
eNB
->
proc_tx
=
proc_tx_high
;
eNB
->
tx_fh
=
tx_fh_if4p5
;
eNB
->
rx_fh
=
rx_fh_if4p5
;
...
...
@@ -2305,7 +2305,7 @@ void init_eNB(eNB_func_t node_function[], eNB_timing_t node_timing[],int nb_inst
eNB
->
td
=
ulsch_decoding_data
;
//(single_thread_flag==1) ? ulsch_decoding_data_2thread : ulsch_decoding_data;
eNB
->
te
=
dlsch_encoding
;
//(single_thread_flag==1) ? dlsch_encoding_2threads : dlsch_encoding;
eNB
->
proc_uespec_rx
=
phy_procedures_eNB_uespec_RX
;
eNB
->
proc_uespec_rx
=
phy_procedures_eNB_uespec_RX
_NB_IoT
;
eNB
->
proc_tx
=
proc_tx_high
;
eNB
->
tx_fh
=
tx_fh_if4p5
;
eNB
->
rx_fh
=
rx_fh_if4p5
;
...
...
targets/RT/USER/lte-softmodem.c
View file @
ae16b6fd
...
...
@@ -1848,7 +1848,7 @@ int main( int argc, char **argv ) {
PHY_vars_eNB_NB_IoT_g
[
0
][
CC_id
]
->
rx_total_gain_dB
=
(
int
)
rx_gain
[
CC_id
][
0
];
if
(
frame_parms_NB_IoT
[
CC_id
]
->
frame_type
==
FDD
)
{
if
(
frame_parms_NB_IoT
[
CC_id
]
->
frame_type
==
FDD
_NB_IoT
)
{
PHY_vars_eNB_NB_IoT_g
[
0
][
CC_id
]
->
N_TA_offset
=
0
;
}
else
{
if
(
frame_parms_NB_IoT
[
CC_id
]
->
N_RB_DL
==
100
)
...
...
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