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
df9c20c9
Commit
df9c20c9
authored
5 years ago
by
Sakthivel Velumani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed frequency variables to uint64
to support large values in FR2
parent
df791790
fr2-hw-test
develop-nr-fr2-rework
No related merge requests found
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
12 additions
and
12 deletions
+12
-12
executables/nr-softmodem-common.h
executables/nr-softmodem-common.h
+1
-1
executables/nr-softmodem.c
executables/nr-softmodem.c
+1
-1
executables/nr-softmodem.h
executables/nr-softmodem.h
+1
-1
executables/nr-ue.c
executables/nr-ue.c
+1
-1
executables/nr-uesoftmodem.c
executables/nr-uesoftmodem.c
+1
-1
openair1/PHY/defs_nr_common.h
openair1/PHY/defs_nr_common.h
+2
-2
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+1
-1
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+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
targets/RT/USER/lte-softmodem.h
targets/RT/USER/lte-softmodem.h
+1
-1
No files found.
executables/nr-softmodem-common.h
View file @
df9c20c9
...
...
@@ -126,7 +126,7 @@ extern pthread_mutex_t sync_mutex;
extern
int
sync_var
;
extern
uint
32
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
extern
uint
64
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
extern
int32_t
uplink_frequency_offset
[
MAX_NUM_CCs
][
4
];
extern
int
rx_input_level_dBm
;
...
...
This diff is collapsed.
Click to expand it.
executables/nr-softmodem.c
View file @
df9c20c9
...
...
@@ -114,7 +114,7 @@ int single_thread_flag=1;
static
int8_t
threequarter_fs
=
0
;
uint
32
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
uint
64
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
int32_t
uplink_frequency_offset
[
MAX_NUM_CCs
][
4
];
//Temp fix for inexisting NR upper layer
...
...
This diff is collapsed.
Click to expand it.
executables/nr-softmodem.h
View file @
df9c20c9
...
...
@@ -7,7 +7,7 @@
#include "PHY/defs_gNB.h"
#include "proto_agent.h"
#define DEFAULT_DLF 2
68
0000000
#define DEFAULT_DLF 2
810
0000000
/***************************************************************************************************************************************/
/* command line options definitions, CMDLINE_XXXX_DESC macros are used to initialize paramdef_t arrays which are then used as argument
...
...
This diff is collapsed.
Click to expand it.
executables/nr-ue.c
View file @
df9c20c9
...
...
@@ -175,7 +175,7 @@ static void UE_synch(void *arg) {
if
(
UE
->
UE_scan
==
0
)
{
get_band
(
downlink_frequency
[
CC_id
][
0
],
&
UE
->
frame_parms
.
eutra_band
,
&
uplink_frequency_offset
[
CC_id
][
0
],
&
UE
->
frame_parms
.
frame_type
);
LOG_I
(
PHY
,
"[SCHED][UE] Check absolute frequency DL %"
PRIu
32
", UL %"
PRIu32
" (oai_exit %d, rx_num_channels %d)
\n
"
,
LOG_I
(
PHY
,
"[SCHED][UE] Check absolute frequency DL %"
PRIu
64
", UL %"
PRIu64
" (oai_exit %d, rx_num_channels %d)
\n
"
,
downlink_frequency
[
0
][
0
],
downlink_frequency
[
0
][
0
]
+
uplink_frequency_offset
[
0
][
0
],
oai_exit
,
openair0_cfg
[
0
].
rx_num_channels
);
...
...
This diff is collapsed.
Click to expand it.
executables/nr-uesoftmodem.c
View file @
df9c20c9
...
...
@@ -122,7 +122,7 @@ static double snr_dB=20;
int
threequarter_fs
=
0
;
uint
32
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
uint
64
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
int32_t
uplink_frequency_offset
[
MAX_NUM_CCs
][
4
];
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/defs_nr_common.h
View file @
df9c20c9
...
...
@@ -230,9 +230,9 @@ typedef struct NR_DL_FRAME_PARMS {
/// EUTRA Band
uint16_t
eutra_band
;
/// DL carrier frequency
uint
32
_t
dl_CarrierFreq
;
uint
64
_t
dl_CarrierFreq
;
/// UL carrier frequency
uint
32
_t
ul_CarrierFreq
;
uint
64
_t
ul_CarrierFreq
;
/// TX attenuation
uint32_t
att_tx
;
/// RX attenuation
...
...
This diff is collapsed.
Click to expand it.
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
df9c20c9
...
...
@@ -143,7 +143,7 @@ int nr_generate_ue_ul_dlsch_params_from_dci(PHY_VARS_NR_UE *ue,
*/
#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR) || defined(OAI_ADRV9371_ZC706)
extern
uint
32
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
extern
uint
64
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
#endif
...
...
This diff is collapsed.
Click to expand it.
openair2/GNB_APP/gnb_config.c
View file @
df9c20c9
...
...
@@ -78,7 +78,7 @@
extern
uint16_t
sf_ahead
;
extern
int
config_check_band_frequencies
(
int
ind
,
int16_t
band
,
uint
32
_t
downlink_frequency
,
extern
int
config_check_band_frequencies
(
int
ind
,
int16_t
band
,
uint
64
_t
downlink_frequency
,
int32_t
uplink_frequency_offset
,
uint32_t
frame_type
);
void
RCconfig_nr_flexran
()
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
df9c20c9
...
...
@@ -127,7 +127,7 @@ int to_absslot(nfapi_nr_config_request_t *cfg,int frame,int slot);
int
get_symbolsperslot
(
nfapi_nr_config_request_t
*
cfg
);
void
get_band
(
uint
32
_t
downlink_frequency
,
uint16_t
*
current_band
,
int32_t
*
current_offset
,
lte_frame_type_t
*
current_type
);
void
get_band
(
uint
64
_t
downlink_frequency
,
uint16_t
*
current_band
,
int32_t
*
current_offset
,
lte_frame_type_t
*
current_type
);
uint64_t
from_nrarfcn
(
int
nr_bandP
,
uint32_t
dl_nrarfcn
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/nr_mac_common.c
View file @
df9c20c9
...
...
@@ -69,7 +69,7 @@ nr_bandentry_t nr_bandtable[] = {
#define NR_BANDTABLE_SIZE (sizeof(nr_bandtable)/sizeof(nr_bandentry_t))
void
get_band
(
uint
32
_t
downlink_frequency
,
void
get_band
(
uint
64
_t
downlink_frequency
,
uint16_t
*
current_band
,
int32_t
*
current_offset
,
lte_frame_type_t
*
current_type
)
...
...
This diff is collapsed.
Click to expand it.
targets/RT/USER/lte-softmodem.h
View file @
df9c20c9
...
...
@@ -264,7 +264,7 @@ extern pthread_cond_t sync_cond;
extern
pthread_mutex_t
sync_mutex
;
extern
int
sync_var
;
extern
uint
32
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
extern
uint
64
_t
downlink_frequency
[
MAX_NUM_CCs
][
4
];
extern
int32_t
uplink_frequency_offset
[
MAX_NUM_CCs
][
4
];
extern
int
rx_input_level_dBm
;
...
...
This diff is collapsed.
Click to expand it.
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