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
canghaiwuhen
OpenXG-RAN
Commits
609ec018
Commit
609ec018
authored
Oct 24, 2019
by
Florian Kaltenberger
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop-nr-fix-warnings' into integration-develop-nr-2019w43
parents
8a4fd4f0
b39ac889
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
7 deletions
+5
-7
executables/nr-ru.c
executables/nr-ru.c
+2
-2
openair1/PHY/defs_nr_common.h
openair1/PHY/defs_nr_common.h
+1
-1
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+1
-1
openair2/LAYER2/NR_MAC_gNB/nr_mac_common.c
openair2/LAYER2/NR_MAC_gNB/nr_mac_common.c
+1
-1
openair2/NETWORK_DRIVER/MESH/common.c
openair2/NETWORK_DRIVER/MESH/common.c
+0
-2
No files found.
executables/nr-ru.c
View file @
609ec018
...
@@ -720,14 +720,14 @@ void rx_rf(RU_t *ru,int *frame,int *slot) {
...
@@ -720,14 +720,14 @@ void rx_rf(RU_t *ru,int *frame,int *slot) {
void
tx_rf
(
RU_t
*
ru
,
int
frame
,
int
slot
,
uint64_t
timestamp
)
{
void
tx_rf
(
RU_t
*
ru
,
int
frame
,
int
slot
,
uint64_t
timestamp
)
{
RU_proc_t
*
proc
=
&
ru
->
proc
;
RU_proc_t
*
proc
=
&
ru
->
proc
;
NR_DL_FRAME_PARMS
*
fp
=
ru
->
nr_frame_parms
;
NR_DL_FRAME_PARMS
*
fp
=
ru
->
nr_frame_parms
;
nfapi_nr_config_request_t
*
cfg
=
&
ru
->
gNB_list
[
0
]
->
gNB_config
;
//
nfapi_nr_config_request_t *cfg = &ru->gNB_list[0]->gNB_config;
void
*
txp
[
ru
->
nb_tx
];
void
*
txp
[
ru
->
nb_tx
];
unsigned
int
txs
;
unsigned
int
txs
;
int
i
;
int
i
;
T
(
T_ENB_PHY_OUTPUT_SIGNAL
,
T_INT
(
0
),
T_INT
(
0
),
T_INT
(
frame
),
T_INT
(
slot
),
T
(
T_ENB_PHY_OUTPUT_SIGNAL
,
T_INT
(
0
),
T_INT
(
0
),
T_INT
(
frame
),
T_INT
(
slot
),
T_INT
(
0
),
T_BUFFER
(
&
ru
->
common
.
txdata
[
0
][
slot
*
fp
->
samples_per_slot
],
fp
->
samples_per_slot
*
4
));
T_INT
(
0
),
T_BUFFER
(
&
ru
->
common
.
txdata
[
0
][
slot
*
fp
->
samples_per_slot
],
fp
->
samples_per_slot
*
4
));
int
sf_extension
=
0
;
int
sf_extension
=
0
;
nr_subframe_t
SF_type
=
nr_slot_select
(
cfg
,
slot
%
fp
->
slots_per_frame
);
//
nr_subframe_t SF_type = nr_slot_select(cfg,slot%fp->slots_per_frame);
if
((
slot
==
0
)
||
if
((
slot
==
0
)
||
(
slot
==
1
))
{
(
slot
==
1
))
{
...
...
openair1/PHY/defs_nr_common.h
View file @
609ec018
...
@@ -228,7 +228,7 @@ typedef struct NR_DL_FRAME_PARMS {
...
@@ -228,7 +228,7 @@ typedef struct NR_DL_FRAME_PARMS {
/// Total Number of Resource Block Groups SubSets: this is P
/// Total Number of Resource Block Groups SubSets: this is P
uint8_t
N_RBGS
;
uint8_t
N_RBGS
;
/// EUTRA Band
/// EUTRA Band
uint
8
_t
eutra_band
;
uint
16
_t
eutra_band
;
/// DL carrier frequency
/// DL carrier frequency
uint32_t
dl_CarrierFreq
;
uint32_t
dl_CarrierFreq
;
/// UL carrier frequency
/// UL carrier frequency
...
...
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
609ec018
...
@@ -117,7 +117,7 @@ int to_absslot(nfapi_nr_config_request_t *cfg,int frame,int slot);
...
@@ -117,7 +117,7 @@ int to_absslot(nfapi_nr_config_request_t *cfg,int frame,int slot);
int
get_symbolsperslot
(
nfapi_nr_config_request_t
*
cfg
);
int
get_symbolsperslot
(
nfapi_nr_config_request_t
*
cfg
);
void
get_band
(
uint32_t
downlink_frequency
,
uint
8
_t
*
current_band
,
int32_t
*
current_offset
,
lte_frame_type_t
*
current_type
);
void
get_band
(
uint32_t
downlink_frequency
,
uint
16
_t
*
current_band
,
int32_t
*
current_offset
,
lte_frame_type_t
*
current_type
);
uint64_t
from_nrarfcn
(
int
nr_bandP
,
uint32_t
dl_nrarfcn
);
uint64_t
from_nrarfcn
(
int
nr_bandP
,
uint32_t
dl_nrarfcn
);
...
...
openair2/LAYER2/NR_MAC_gNB/nr_mac_common.c
View file @
609ec018
...
@@ -70,7 +70,7 @@ nr_bandentry_t nr_bandtable[] = {
...
@@ -70,7 +70,7 @@ nr_bandentry_t nr_bandtable[] = {
#define NR_BANDTABLE_SIZE (sizeof(nr_bandtable)/sizeof(nr_bandentry_t))
#define NR_BANDTABLE_SIZE (sizeof(nr_bandtable)/sizeof(nr_bandentry_t))
void
get_band
(
uint32_t
downlink_frequency
,
void
get_band
(
uint32_t
downlink_frequency
,
uint
8
_t
*
current_band
,
uint
16
_t
*
current_band
,
int32_t
*
current_offset
,
int32_t
*
current_offset
,
lte_frame_type_t
*
current_type
)
lte_frame_type_t
*
current_type
)
{
{
...
...
openair2/NETWORK_DRIVER/MESH/common.c
View file @
609ec018
...
@@ -386,10 +386,8 @@ void nas_COMMON_QOS_send(struct sk_buff *skb, struct cx_entity *cx, struct class
...
@@ -386,10 +386,8 @@ void nas_COMMON_QOS_send(struct sk_buff *skb, struct cx_entity *cx, struct class
pdcph
.
data_size
=
skb
->
len
;
pdcph
.
data_size
=
skb
->
len
;
pdcph
.
rb_id
=
(
gc
->
rb
)
->
rab_id
;
pdcph
.
rb_id
=
(
gc
->
rb
)
->
rab_id
;
pdcph
.
inst
=
inst
;
pdcph
.
inst
=
inst
;
#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
pdcph
.
sourceL2Id
=
0
;
pdcph
.
sourceL2Id
=
0
;
pdcph
.
destinationL2Id
=
0
;
pdcph
.
destinationL2Id
=
0
;
#endif
...
...
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