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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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-RAN
Commits
3514cadd
Commit
3514cadd
authored
Aug 06, 2020
by
Thomas Schlichter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor warning fixes
parent
00d9af7a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
+4
-4
openair1/PHY/TOOLS/nr_phy_scope.c
openair1/PHY/TOOLS/nr_phy_scope.c
+2
-1
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+1
-1
No files found.
openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
View file @
3514cadd
...
@@ -963,7 +963,7 @@ void nr_generate_pucch2(PHY_VARS_NR_UE *ue,
...
@@ -963,7 +963,7 @@ void nr_generate_pucch2(PHY_VARS_NR_UE *ue,
uint64_t
b
[
16
];
// limit to 1024-bit encoded length
uint64_t
b
[
16
];
// limit to 1024-bit encoded length
// M_bit is the number of bits of block b (payload after encoding)
// M_bit is the number of bits of block b (payload after encoding)
uint16_t
M_bit
;
uint16_t
M_bit
;
nr_uci_encoding
(
payload
,
nr_bit
,
pucch_format2_nr
,
0
,
nrofSymbols
,
nrofPRB
,
1
,
0
,
0
,
(
void
*
)
b
,
&
M_bit
);
nr_uci_encoding
(
payload
,
nr_bit
,
pucch_format2_nr
,
0
,
nrofSymbols
,
nrofPRB
,
1
,
0
,
0
,
&
b
[
0
]
,
&
M_bit
);
/*
/*
* Implementing TS 38.211
* Implementing TS 38.211
* Subclauses 6.3.2.5.1 Scrambling (PUCCH format 2)
* Subclauses 6.3.2.5.1 Scrambling (PUCCH format 2)
...
@@ -985,7 +985,7 @@ void nr_generate_pucch2(PHY_VARS_NR_UE *ue,
...
@@ -985,7 +985,7 @@ void nr_generate_pucch2(PHY_VARS_NR_UE *ue,
/*
/*
* Implementing TS 38.211 Subclause 6.3.2.5.1 scrambling format 2
* Implementing TS 38.211 Subclause 6.3.2.5.1 scrambling format 2
*/
*/
nr_pucch2_3_4_scrambling
(
M_bit
,
rnti
,
data_scrambling_id
,
b
,
btilde
);
nr_pucch2_3_4_scrambling
(
M_bit
,
rnti
,
data_scrambling_id
,
&
b
[
0
]
,
btilde
);
/*
/*
* Implementing TS 38.211 Subclause 6.3.2.5.2 modulation format 2
* Implementing TS 38.211 Subclause 6.3.2.5.2 modulation format 2
* btilde shall be modulated as described in subclause 5.1 using QPSK
* btilde shall be modulated as described in subclause 5.1 using QPSK
...
@@ -1154,7 +1154,7 @@ void nr_generate_pucch3_4(PHY_VARS_NR_UE *ue,
...
@@ -1154,7 +1154,7 @@ void nr_generate_pucch3_4(PHY_VARS_NR_UE *ue,
//nrofPRB = 2; // only for test purposes
//nrofPRB = 2; // only for test purposes
if
(
fmt
==
pucch_format4_nr
)
nrofPRB
=
1
;
if
(
fmt
==
pucch_format4_nr
)
nrofPRB
=
1
;
nr_uci_encoding
(
payload
,
nr_bit
,
fmt
,
is_pi_over_2_bpsk_enabled
,
nrofSymbols
,
nrofPRB
,
n_SF_PUCCH_s
,
intraSlotFrequencyHopping
,
add_dmrs
,
(
void
*
)
b
,
&
M_bit
);
nr_uci_encoding
(
payload
,
nr_bit
,
fmt
,
is_pi_over_2_bpsk_enabled
,
nrofSymbols
,
nrofPRB
,
n_SF_PUCCH_s
,
intraSlotFrequencyHopping
,
add_dmrs
,
&
b
[
0
]
,
&
M_bit
);
/*
/*
* Implementing TS 38.211
* Implementing TS 38.211
* Subclauses 6.3.2.6.1 Scrambling (PUCCH formats 3 and 4)
* Subclauses 6.3.2.6.1 Scrambling (PUCCH formats 3 and 4)
...
@@ -1176,7 +1176,7 @@ void nr_generate_pucch3_4(PHY_VARS_NR_UE *ue,
...
@@ -1176,7 +1176,7 @@ void nr_generate_pucch3_4(PHY_VARS_NR_UE *ue,
/*
/*
* Implementing TS 38.211 Subclause 6.3.2.6.1 scrambling formats 3 and 4
* Implementing TS 38.211 Subclause 6.3.2.6.1 scrambling formats 3 and 4
*/
*/
nr_pucch2_3_4_scrambling
(
M_bit
,
rnti
,
n_id
,
b
,
btilde
);
nr_pucch2_3_4_scrambling
(
M_bit
,
rnti
,
n_id
,
&
b
[
0
]
,
btilde
);
/*
/*
* Implementing TS 38.211 Subclause 6.3.2.6.2 modulation formats 3 and 4
* Implementing TS 38.211 Subclause 6.3.2.6.2 modulation formats 3 and 4
*
*
...
...
openair1/PHY/TOOLS/nr_phy_scope.c
View file @
3514cadd
...
@@ -400,7 +400,8 @@ static void *scope_thread_gNB(void *arg) {
...
@@ -400,7 +400,8 @@ static void *scope_thread_gNB(void *arg) {
// FILE *gNB_stats = fopen("gNB_stats.txt", "w");
// FILE *gNB_stats = fopen("gNB_stats.txt", "w");
//#endif
//#endif
size_t
stksize
=
0
;
size_t
stksize
=
0
;
pthread_attr_t
atr
=
{
0
};
pthread_attr_t
atr
;
pthread_attr_init
(
&
atr
);
pthread_attr_getstacksize
(
&
atr
,
&
stksize
);
pthread_attr_getstacksize
(
&
atr
,
&
stksize
);
pthread_attr_setstacksize
(
&
atr
,
32
*
1024
*
1024
);
pthread_attr_setstacksize
(
&
atr
,
32
*
1024
*
1024
);
sleep
(
3
);
// no clean interthread barriers
sleep
(
3
);
// no clean interthread barriers
...
...
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
View file @
3514cadd
...
@@ -2240,7 +2240,7 @@ void ulsch_scheduler_pre_ue_select_fairRR(
...
@@ -2240,7 +2240,7 @@ void ulsch_scheduler_pre_ue_select_fairRR(
uint8_t
first_ue_total
[
MAX_NUM_CCs
][
20
];
uint8_t
first_ue_total
[
MAX_NUM_CCs
][
20
];
uint8_t
first_ue_id
[
MAX_NUM_CCs
][
20
];
uint8_t
first_ue_id
[
MAX_NUM_CCs
][
20
];
uint8_t
ul_inactivity_num
[
MAX_NUM_CCs
];
uint8_t
ul_inactivity_num
[
MAX_NUM_CCs
];
uint8_t
ul_inactivity_id
[
MAX_NUM_CCs
][
20
]
=
{
0
};
uint8_t
ul_inactivity_id
[
MAX_NUM_CCs
][
20
]
=
{
{
0
}
};
// LTE_DL_FRAME_PARMS *frame_parms;
// LTE_DL_FRAME_PARMS *frame_parms;
uint8_t
ulsch_ue_max_num
[
MAX_NUM_CCs
];
uint8_t
ulsch_ue_max_num
[
MAX_NUM_CCs
];
uint16_t
saved_ulsch_dci
[
MAX_NUM_CCs
];
uint16_t
saved_ulsch_dci
[
MAX_NUM_CCs
];
...
...
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