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
zzha zzha
OpenXG-RAN
Commits
cc024256
Commit
cc024256
authored
Nov 28, 2018
by
Florian Kaltenberger
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'nr_pdsch' of
https://gitlab.eurecom.fr/oai/openairinterface5g
into nr_pdsch
parents
2bfbad92
252a1fbc
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
20 deletions
+8
-20
oaienv
oaienv
+2
-2
openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c
openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c
+4
-4
targets/ARCH/COMMON/common_lib.h
targets/ARCH/COMMON/common_lib.h
+0
-2
targets/RT/USER/nr-ru.c
targets/RT/USER/nr-ru.c
+0
-2
targets/RT/USER/nr-ue.c
targets/RT/USER/nr-ue.c
+2
-8
targets/RT/USER/nr-uesoftmodem.c
targets/RT/USER/nr-uesoftmodem.c
+0
-2
No files found.
oaienv
View file @
cc024256
...
...
@@ -18,6 +18,6 @@ alias oailte='cd $OPENAIR_TARGETS/RT/USER'
alias oais='cd $OPENAIR_TARGETS/SIMU/USER'
alias oaiex='cd $OPENAIR_TARGETS/SIMU/EXAMPLES'
#
export IIOD_REMOTE=192.168.121.32
export IIOD_REMOTE=192.168.1.11
export IIOD_REMOTE=192.168.121.32
#
export IIOD_REMOTE=192.168.1.11
openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c
View file @
cc024256
...
...
@@ -144,20 +144,20 @@ void nr_get_tbs(nfapi_nr_dl_config_dlsch_pdu *dlsch_pdu,
}
}
else
{
n
=
log2
(
Ninfo
)
-
29
;
n
=
log2
(
Ninfo
-
24
)
-
5
;
Ninfo_prime
=
max
(
3840
,
(
ROUNDIDIV
((
Ninfo
-
24
),(
1
<<
n
)))
<<
n
);
if
(
R
<
256
)
{
C
=
CEILIDIV
((
Ninfo_prime
+
24
),
3816
);
TBS
=
(
C
*
CEILIDIV
((
Ninfo_prime
+
24
),(
C
<<
3
)))
<<
3
;
TBS
=
(
C
<<
3
)
*
CEILIDIV
((
Ninfo_prime
+
24
),(
C
<<
3
))
-
24
;
}
else
{
if
(
Ninfo_prime
>
8424
)
{
C
=
CEILIDIV
((
Ninfo_prime
+
24
),
8424
);
TBS
=
(
C
*
CEILIDIV
((
Ninfo_prime
+
24
),(
C
<<
3
)))
<<
3
;
TBS
=
(
C
<<
3
)
*
CEILIDIV
((
Ninfo_prime
+
24
),(
C
<<
3
))
-
24
;
}
else
TBS
=
(
CEILIDIV
((
Ninfo_prime
+
24
),
8
)
-
24
)
<<
3
;
TBS
=
(
(
CEILIDIV
((
Ninfo_prime
+
24
),
8
))
<<
3
)
-
24
;
}
}
...
...
targets/ARCH/COMMON/common_lib.h
View file @
cc024256
...
...
@@ -205,9 +205,7 @@ typedef struct {
clock_source_t
clock_source
;
//! Manual SDR IP address
//#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
#ifndef OAI_ADRV9371_ZC706
char
*
sdr_addrs
;
#endif
//! Auto calibration flag
int
autocal
[
4
];
//! rf devices work with x bits iqs when oai have its own iq format
...
...
targets/RT/USER/nr-ru.c
View file @
cc024256
...
...
@@ -2443,11 +2443,9 @@ void RCconfig_RU(void) {
RC
.
ru
[
j
]
->
num_gNB
=
0
;
for
(
i
=
0
;
i
<
RC
.
ru
[
j
]
->
num_gNB
;
i
++
)
RC
.
ru
[
j
]
->
gNB_list
[
i
]
=
RC
.
gNB
[
RUParamList
.
paramarray
[
j
][
RU_ENB_LIST_IDX
].
iptr
[
i
]][
0
];
#ifndef OAI_ADRV9371_ZC706
if
(
config_isparamset
(
RUParamList
.
paramarray
[
j
],
RU_SDR_ADDRS
))
{
RC
.
ru
[
j
]
->
openair0_cfg
.
sdr_addrs
=
strdup
(
*
(
RUParamList
.
paramarray
[
j
][
RU_SDR_ADDRS
].
strptr
));
}
#endif
if
(
config_isparamset
(
RUParamList
.
paramarray
[
j
],
RU_SDR_CLK_SRC
))
{
if
(
strcmp
(
*
(
RUParamList
.
paramarray
[
j
][
RU_SDR_CLK_SRC
].
strptr
),
"internal"
)
==
0
)
{
...
...
targets/RT/USER/nr-ue.c
View file @
cc024256
...
...
@@ -825,7 +825,6 @@ void *UE_thread(void *arg) {
int
i
;
char
threadname
[
128
];
int
th_id
;
unsigned
char
nb_sf_init
=
10
;
UE
->
proc
.
proc_rxtx
[
0
].
counter_decoder
=
0
;
UE
->
proc
.
proc_rxtx
[
1
].
counter_decoder
=
0
;
UE
->
proc
.
proc_rxtx
[
2
].
counter_decoder
=
0
;
...
...
@@ -869,22 +868,17 @@ void *UE_thread(void *arg) {
}
#endif
#ifndef OAI_ADRV9371_ZC706
nb_sf_init
=
10
;
#else
nb_sf_init
=
5
;
#endif
if
(
instance_cnt_synch
<
0
)
{
// we can invoke the synch
// grab 10 ms of signal and wakeup synch thread
for
(
int
i
=
0
;
i
<
UE
->
frame_parms
.
nb_antennas_rx
;
i
++
)
rxp
[
i
]
=
(
void
*
)
&
UE
->
common_vars
.
rxdata
[
i
][
0
];
if
(
UE
->
mode
!=
loop_through_memory
)
AssertFatal
(
UE
->
frame_parms
.
samples_per_subframe
*
nb_sf_init
==
AssertFatal
(
UE
->
frame_parms
.
samples_per_subframe
*
10
==
UE
->
rfdevice
.
trx_read_func
(
&
UE
->
rfdevice
,
&
timestamp
,
rxp
,
UE
->
frame_parms
.
samples_per_subframe
*
nb_sf_init
,
UE
->
frame_parms
.
samples_per_subframe
*
10
,
UE
->
frame_parms
.
nb_antennas_rx
),
"error reading samples"
);
AssertFatal
(
0
==
pthread_mutex_lock
(
&
UE
->
proc
.
mutex_synch
),
""
);
...
...
targets/RT/USER/nr-uesoftmodem.c
View file @
cc024256
...
...
@@ -804,9 +804,7 @@ void init_openair0() {
openair0_cfg
[
card
].
rx_freq
[
i
]);
}
#ifndef OAI_ADRV9371_ZC706
if
(
usrp_args
)
openair0_cfg
[
card
].
sdr_addrs
=
usrp_args
;
#endif
if
(
usrp_clksrc
)
{
if
(
strcmp
(
usrp_clksrc
,
"internal"
)
==
0
)
{
openair0_cfg
[
card
].
clock_source
=
internal
;
...
...
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