Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
OpenXG
OpenXG UE
Commits
484b53c6
Commit
484b53c6
authored
Nov 23, 2018
by
Florian Kaltenberger
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop-nr' into nr_pdsch
parents
a592f59a
8c123603
Changes
10
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
729 additions
and
10 deletions
+729
-10
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+10
-1
openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c
openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c
+2
-2
openair1/PHY/phy_vars.h
openair1/PHY/phy_vars.h
+0
-2
openair1/PHY/phy_vars_nr_ue.h
openair1/PHY/phy_vars_nr_ue.h
+0
-2
openair1/PHY/phy_vars_ue.h
openair1/PHY/phy_vars_ue.h
+0
-3
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+2
-0
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair1/SCHED_UE/phy_procedures_lte_ue.c
+2
-0
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
+702
-0
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h
+2
-0
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
+9
-0
No files found.
cmake_targets/CMakeLists.txt
View file @
484b53c6
...
@@ -1608,7 +1608,13 @@ add_library(L2
...
@@ -1608,7 +1608,13 @@ add_library(L2
${
ENB_APP_SRC
}
${
ENB_APP_SRC
}
)
)
# ${OPENAIR2_DIR}/RRC/L2_INTERFACE/openair_rrc_L2_interface.c)
add_library
(
MAC_NR
${
MAC_NR_SRC
}
)
add_library
(
MAC_UE_NR
${
MAC_NR_SRC_UE
}
)
add_library
(
L2_NR
add_library
(
L2_NR
${
L2_NR_SRC
}
${
L2_NR_SRC
}
...
@@ -2559,6 +2565,9 @@ target_link_libraries(nr_dlschsim -Wl,--start-group UTIL SIMU PHY PHY_COMMON PH
...
@@ -2559,6 +2565,9 @@ target_link_libraries(nr_dlschsim -Wl,--start-group UTIL SIMU PHY PHY_COMMON PH
add_executable
(
nr_pbchsim
${
OPENAIR1_DIR
}
/SIMULATION/NR_PHY/pbchsim.c
${
T_SOURCE
}
)
add_executable
(
nr_pbchsim
${
OPENAIR1_DIR
}
/SIMULATION/NR_PHY/pbchsim.c
${
T_SOURCE
}
)
target_link_libraries
(
nr_pbchsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread
${
ATLAS_LIBRARIES
}
${
T_LIB
}
dl
)
target_link_libraries
(
nr_pbchsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB CONFIG_LIB -Wl,--end-group m pthread
${
ATLAS_LIBRARIES
}
${
T_LIB
}
dl
)
add_executable
(
nr_dlsim
${
OPENAIR1_DIR
}
/SIMULATION/NR_PHY/dlsim.c
${
T_SOURCE
}
)
target_link_libraries
(
nr_dlsim -Wl,--start-group UTIL SIMU PHY_COMMON PHY_NR PHY_NR_UE SCHED_NR_LIB SCHED_NR_UE_LIB MAC_NR MAC_UE_NR CONFIG_LIB -Wl,--end-group m pthread
${
ATLAS_LIBRARIES
}
${
T_LIB
}
dl
)
foreach
(
myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim
)
foreach
(
myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim
)
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c
View file @
484b53c6
...
@@ -91,7 +91,7 @@ uint16_t nr_pbch_extract(int **rxdataF,
...
@@ -91,7 +91,7 @@ uint16_t nr_pbch_extract(int **rxdataF,
for
(
rb
=
0
;
rb
<
20
;
rb
++
)
{
for
(
rb
=
0
;
rb
<
20
;
rb
++
)
{
j
=
0
;
j
=
0
;
if
(
symbol
==
1
||
symbol
==
7
)
{
if
(
symbol
==
1
||
symbol
==
3
)
{
for
(
i
=
0
;
i
<
12
;
i
++
)
{
for
(
i
=
0
;
i
<
12
;
i
++
)
{
if
((
i
!=
nushiftmod4
)
&&
if
((
i
!=
nushiftmod4
)
&&
(
i
!=
(
nushiftmod4
+
4
))
&&
(
i
!=
(
nushiftmod4
+
4
))
&&
...
@@ -147,7 +147,7 @@ uint16_t nr_pbch_extract(int **rxdataF,
...
@@ -147,7 +147,7 @@ uint16_t nr_pbch_extract(int **rxdataF,
for
(
rb
=
0
;
rb
<
20
;
rb
++
)
{
for
(
rb
=
0
;
rb
<
20
;
rb
++
)
{
j
=
0
;
j
=
0
;
if
(
symbol
==
1
||
symbol
==
7
)
{
if
(
symbol
==
1
||
symbol
==
3
)
{
for
(
i
=
0
;
i
<
12
;
i
++
)
{
for
(
i
=
0
;
i
<
12
;
i
++
)
{
if
((
i
!=
nushiftmod4
)
&&
if
((
i
!=
nushiftmod4
)
&&
(
i
!=
(
nushiftmod4
+
4
))
&&
(
i
!=
(
nushiftmod4
+
4
))
&&
...
...
openair1/PHY/phy_vars.h
View file @
484b53c6
...
@@ -59,8 +59,6 @@ unsigned short rev[2048],rev_times4[8192],rev_half[1024];
...
@@ -59,8 +59,6 @@ unsigned short rev[2048],rev_times4[8192],rev_half[1024];
unsigned
short
rev256
[
256
],
rev512
[
512
],
rev1024
[
1024
],
rev4096
[
4096
],
rev2048
[
2048
],
rev8192
[
8192
];
unsigned
short
rev256
[
256
],
rev512
[
512
],
rev1024
[
1024
],
rev4096
[
4096
],
rev2048
[
2048
],
rev8192
[
8192
];
char
mode_string
[
4
][
20
]
=
{
"NOT SYNCHED"
,
"PRACH"
,
"RAR"
,
"PUSCH"
};
short
conjugate
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
};
short
conjugate
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
};
short
conjugate2
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
};
short
conjugate2
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
};
...
...
openair1/PHY/phy_vars_nr_ue.h
View file @
484b53c6
...
@@ -55,8 +55,6 @@ unsigned short rev[2048],rev_times4[8192],rev_half[1024];
...
@@ -55,8 +55,6 @@ unsigned short rev[2048],rev_times4[8192],rev_half[1024];
unsigned
short
rev256
[
256
],
rev512
[
512
],
rev1024
[
1024
],
rev4096
[
4096
],
rev2048
[
2048
],
rev8192
[
8192
];
unsigned
short
rev256
[
256
],
rev512
[
512
],
rev1024
[
1024
],
rev4096
[
4096
],
rev2048
[
2048
],
rev8192
[
8192
];
char
mode_string
[
4
][
20
]
=
{
"NOT SYNCHED"
,
"PRACH"
,
"RAR"
,
"PUSCH"
};
short
conjugate
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
};
short
conjugate
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
};
short
conjugate2
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
};
short
conjugate2
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
};
...
...
openair1/PHY/phy_vars_ue.h
View file @
484b53c6
...
@@ -24,7 +24,6 @@
...
@@ -24,7 +24,6 @@
#include "PHY/types.h"
#include "PHY/types.h"
#include "PHY/defs_UE.h"
#include "PHY/defs_UE.h"
#include "PHY/phy_vars_ue.h"
#include "common/ran_context.h"
#include "common/ran_context.h"
...
@@ -54,8 +53,6 @@ unsigned short rev[2048],rev_times4[8192],rev_half[1024];
...
@@ -54,8 +53,6 @@ unsigned short rev[2048],rev_times4[8192],rev_half[1024];
unsigned
short
rev256
[
256
],
rev512
[
512
],
rev1024
[
1024
],
rev4096
[
4096
],
rev2048
[
2048
],
rev8192
[
8192
];
unsigned
short
rev256
[
256
],
rev512
[
512
],
rev1024
[
1024
],
rev4096
[
4096
],
rev2048
[
2048
],
rev8192
[
8192
];
char
mode_string
[
4
][
20
]
=
{
"NOT SYNCHED"
,
"PRACH"
,
"RAR"
,
"PUSCH"
};
short
conjugate
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
};
short
conjugate
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
};
short
conjugate2
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
};
short
conjugate2
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
};
...
...
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
484b53c6
...
@@ -88,6 +88,8 @@ fifo_dump_emos_UE emos_dump_UE;
...
@@ -88,6 +88,8 @@ fifo_dump_emos_UE emos_dump_UE;
#define NS_PER_SLOT 500000
#define NS_PER_SLOT 500000
char
mode_string
[
4
][
20
]
=
{
"NOT SYNCHED"
,
"PRACH"
,
"RAR"
,
"PUSCH"
};
extern
double
cpuf
;
extern
double
cpuf
;
...
...
openair1/SCHED_UE/phy_procedures_lte_ue.c
View file @
484b53c6
...
@@ -71,6 +71,8 @@
...
@@ -71,6 +71,8 @@
#define NS_PER_SLOT 500000
#define NS_PER_SLOT 500000
char
mode_string
[
4
][
20
]
=
{
"NOT SYNCHED"
,
"PRACH"
,
"RAR"
,
"PUSCH"
};
extern
double
cpuf
;
extern
double
cpuf
;
void
Msg1_transmitted
(
module_id_t
module_idP
,
uint8_t
CC_id
,
frame_t
frameP
,
uint8_t
eNB_id
);
void
Msg1_transmitted
(
module_id_t
module_idP
,
uint8_t
CC_id
,
frame_t
frameP
,
uint8_t
eNB_id
);
...
...
openair1/SIMULATION/NR_PHY/dlsim.c
0 → 100644
View file @
484b53c6
This diff is collapsed.
Click to expand it.
openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h
View file @
484b53c6
...
@@ -181,6 +181,8 @@ int8_t nr_ue_if_module_kill(uint32_t module_id);
...
@@ -181,6 +181,8 @@ int8_t nr_ue_if_module_kill(uint32_t module_id);
\param dl_info including dci_ind and rx_request messages*/
\param dl_info including dci_ind and rx_request messages*/
int8_t
nr_ue_dl_indication
(
nr_downlink_indication_t
*
dl_info
);
int8_t
nr_ue_dl_indication
(
nr_downlink_indication_t
*
dl_info
);
int8_t
nr_ue_ul_indication
(
nr_uplink_indication_t
*
ul_info
);
// TODO check
// TODO check
/**\brief handle BCCH-BCH message from dl_indication
/**\brief handle BCCH-BCH message from dl_indication
\param pduP pointer to bch pdu
\param pduP pointer to bch pdu
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
View file @
484b53c6
...
@@ -259,6 +259,15 @@ RUs = (
...
@@ -259,6 +259,15 @@ RUs = (
}
}
);
);
THREAD_STRUCT
= (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config
=
"PARALLEL_SINGLE_THREAD"
;
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config
=
"WORKER_DISABLE"
;
}
);
NETWORK_CONTROLLER
:
NETWORK_CONTROLLER
:
{
{
FLEXRAN_ENABLED
=
"no"
;
FLEXRAN_ENABLED
=
"no"
;
...
...
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