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
a8703d3c
Commit
a8703d3c
authored
Sep 10, 2021
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moving get_coreset_rballoc to nr_common
parent
7f64e0d5
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
29 additions
and
66 deletions
+29
-66
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+0
-1
common/utils/nr/nr_common.c
common/utils/nr/nr_common.c
+24
-0
common/utils/nr/nr_common.h
common/utils/nr/nr_common.h
+1
-0
openair1/PHY/NR_TRANSPORT/nr_dci.c
openair1/PHY/NR_TRANSPORT/nr_dci.c
+1
-0
openair1/PHY/NR_TRANSPORT/nr_dci.h
openair1/PHY/NR_TRANSPORT/nr_dci.h
+0
-2
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
+1
-0
openair1/PHY/NR_TRANSPORT/nr_dci_tools_common.c
openair1/PHY/NR_TRANSPORT/nr_dci_tools_common.c
+0
-62
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
+1
-1
openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
+1
-0
No files found.
cmake_targets/CMakeLists.txt
View file @
a8703d3c
...
...
@@ -1744,7 +1744,6 @@ set(PHY_SRC_UE
set
(
PHY_NR_SRC_COMMON
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_prach_common.c
${
OPENAIR1_DIR
}
/PHY/NR_TRANSPORT/nr_dci_tools_common.c
)
set
(
PHY_NR_SRC
...
...
common/utils/nr/nr_common.c
View file @
a8703d3c
...
...
@@ -231,6 +231,30 @@ uint32_t nr_get_code_rate(uint8_t Imcs, uint8_t table_idx) {
}
void
get_coreset_rballoc
(
uint8_t
*
FreqDomainResource
,
int
*
n_rb
,
int
*
rb_offset
)
{
uint8_t
count
=
0
,
start
=
0
,
start_set
=
0
;
uint64_t
bitmap
=
(((
uint64_t
)
FreqDomainResource
[
0
])
<<
37
)
|
(((
uint64_t
)
FreqDomainResource
[
1
])
<<
29
)
|
(((
uint64_t
)
FreqDomainResource
[
2
])
<<
21
)
|
(((
uint64_t
)
FreqDomainResource
[
3
])
<<
13
)
|
(((
uint64_t
)
FreqDomainResource
[
4
])
<<
5
)
|
(((
uint64_t
)
FreqDomainResource
[
5
])
>>
3
);
for
(
int
i
=
0
;
i
<
45
;
i
++
)
if
((
bitmap
>>
(
44
-
i
))
&
1
)
{
count
++
;
if
(
!
start_set
)
{
start
=
i
;
start_set
=
1
;
}
}
*
rb_offset
=
6
*
start
;
*
n_rb
=
6
*
count
;
}
int
get_dmrs_port
(
int
nl
,
uint16_t
dmrs_ports
)
{
if
(
dmrs_ports
==
0
)
return
0
;
// dci 1_0
...
...
common/utils/nr/nr_common.h
View file @
a8703d3c
...
...
@@ -50,6 +50,7 @@ typedef struct nr_bandentry_s {
extern
const
size_t
nr_bandtable_size
;
extern
nr_bandentry_t
nr_bandtable
[];
void
get_coreset_rballoc
(
uint8_t
*
FreqDomainResource
,
int
*
n_rb
,
int
*
rb_offset
);
uint16_t
get_band
(
uint64_t
downlink_frequency
,
int32_t
delta_duplex
);
int
NRRIV2BW
(
int
locationAndBandwidth
,
int
N_RB
);
int
NRRIV2PRBOFFSET
(
int
locationAndBandwidth
,
int
N_RB
);
...
...
openair1/PHY/NR_TRANSPORT/nr_dci.c
View file @
a8703d3c
...
...
@@ -35,6 +35,7 @@
#include "nr_dlsch.h"
#include "nr_sch_dmrs.h"
#include "PHY/MODULATION/nr_modulation.h"
#include "common/utils/nr/nr_common.h"
//#define DEBUG_PDCCH_DMRS
//#define DEBUG_DCI
...
...
openair1/PHY/NR_TRANSPORT/nr_dci.h
View file @
a8703d3c
...
...
@@ -59,6 +59,4 @@ void nr_fill_ul_dci(PHY_VARS_gNB *gNB,
void
nr_fill_cce_list
(
PHY_VARS_gNB
*
gNB
,
uint8_t
m
,
nfapi_nr_dl_tti_pdcch_pdu_rel15_t
*
);
void
get_coreset_rballoc
(
uint8_t
*
FreqDomainResource
,
int
*
n_rb
,
int
*
rb_offset
);
#endif //__PHY_NR_TRANSPORT_DCI__H
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
View file @
a8703d3c
...
...
@@ -31,6 +31,7 @@
*/
#include "nr_dci.h"
#include "common/utils/nr/nr_common.h"
//#define DEBUG_FILL_DCI
...
...
openair1/PHY/NR_TRANSPORT/nr_dci_tools_common.c
deleted
100644 → 0
View file @
7f64e0d5
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
/*! \file PHY/NR_TRANSPORT/nr_dci_tools_common.c
* \brief
* \author
* \date 2018
* \version 0.1
* \company Eurecom
* \email:
* \note
* \warning
*/
#include "nr_dci.h"
//#define DEBUG_FILL_DCI
#include "nr_dlsch.h"
void
get_coreset_rballoc
(
uint8_t
*
FreqDomainResource
,
int
*
n_rb
,
int
*
rb_offset
)
{
uint8_t
count
=
0
,
start
=
0
,
start_set
=
0
;
uint64_t
bitmap
=
(((
uint64_t
)
FreqDomainResource
[
0
])
<<
37
)
|
(((
uint64_t
)
FreqDomainResource
[
1
])
<<
29
)
|
(((
uint64_t
)
FreqDomainResource
[
2
])
<<
21
)
|
(((
uint64_t
)
FreqDomainResource
[
3
])
<<
13
)
|
(((
uint64_t
)
FreqDomainResource
[
4
])
<<
5
)
|
(((
uint64_t
)
FreqDomainResource
[
5
])
>>
3
);
for
(
int
i
=
0
;
i
<
45
;
i
++
)
if
((
bitmap
>>
(
44
-
i
))
&
1
)
{
count
++
;
if
(
!
start_set
)
{
start
=
i
;
start_set
=
1
;
}
}
*
rb_offset
=
6
*
start
;
*
n_rb
=
6
*
count
;
}
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
View file @
a8703d3c
...
...
@@ -45,7 +45,7 @@
#include "PHY/phy_extern_nr_ue.h"
#include "PHY/CODING/coding_extern.h"
#include "PHY/sse_intrin.h"
#include "
PHY/NR_TRANSPORT/nr_dci
.h"
#include "
common/utils/nr/nr_common
.h"
#include "assertions.h"
#include "T.h"
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
View file @
a8703d3c
...
...
@@ -38,6 +38,7 @@
#include "PHY/NR_UE_ESTIMATION/nr_estimation.h"
#include "SCHED_NR_UE/defs.h"
#include "common/utils/LOG/vcd_signal_dumper.h"
#include "common/utils/nr/nr_common.h"
#include "common_lib.h"
#include <math.h>
...
...
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