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
常顺宇
OpenXG-RAN
Commits
7474b69c
Commit
7474b69c
authored
6 years ago
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added missing files. updates for testing in eMTC configuration after merge.
parent
6266d5c3
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
1689 additions
and
9 deletions
+1689
-9
openair1/SCHED/fapi_l1.c
openair1/SCHED/fapi_l1.c
+2
-2
openair2/ENB_APP/enb_config_SL.c
openair2/ENB_APP/enb_config_SL.c
+293
-0
openair2/ENB_APP/enb_config_eMTC.c
openair2/ENB_APP/enb_config_eMTC.c
+1210
-0
openair2/ENB_APP/enb_paramdef_sidelink.h
openair2/ENB_APP/enb_paramdef_sidelink.h
+183
-0
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+0
-5
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+1
-2
No files found.
openair1/SCHED/fapi_l1.c
View file @
7474b69c
...
...
@@ -98,9 +98,9 @@ void handle_nfapi_hi_dci0_mpdcch_dci_pdu(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc
nfapi_hi_dci0_request_pdu_t
*
hi_dci0_config_pdu
)
{
int
idx
=
proc
->
subframe_tx
&
1
;
LTE_eNB_
PDCCH
*
pdcch_vars
=
&
eNB
->
mpdcch_vars
[
idx
];
LTE_eNB_
MPDCCH
*
pdcch_vars
=
&
eNB
->
mpdcch_vars
[
idx
];
// copy dci configuration in to eNB structure
fill_mpdcch_dci0
(
eNB
,
proc
,
&
pdcch_vars
->
dci_alloc
[
pdcch_vars
->
num_dci
],
&
hi_dci0_config_pdu
->
dci_pdu
);
fill_mpdcch_dci0
(
eNB
,
proc
,
&
pdcch_vars
->
m
dci_alloc
[
pdcch_vars
->
num_dci
],
&
hi_dci0_config_pdu
->
dci_pdu
);
}
void
handle_nfapi_hi_dci0_hi_pdu
(
PHY_VARS_eNB
*
eNB
,
int
frame
,
int
subframe
,
eNB_rxtx_proc_t
*
proc
,
...
...
This diff is collapsed.
Click to expand it.
openair2/ENB_APP/enb_config_SL.c
0 → 100644
View file @
7474b69c
This diff is collapsed.
Click to expand it.
openair2/ENB_APP/enb_config_eMTC.c
0 → 100644
View file @
7474b69c
This diff is collapsed.
Click to expand it.
openair2/ENB_APP/enb_paramdef_sidelink.h
0 → 100644
View file @
7474b69c
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
View file @
7474b69c
...
...
@@ -2743,7 +2743,6 @@ schedule_ue_spec_br(
struct
LTE_PUCCH_ConfigCommon_v1310
*
ext4_pucch
;
LTE_PRACH_ParametersListCE_r13_t
*
prach_ParametersListCE_r13
;
struct
LTE_N1PUCCH_AN_InfoList_r13
*
pucch_N1PUCCH_AN_InfoList_r13
;
LTE_PRACH_ParametersCE_r13_t
*
p
[
4
]
=
{
NULL
,
NULL
,
NULL
,
NULL
};
int
pucchreps
[
4
]
=
{
1
,
1
,
1
,
1
};
int
n1pucchan
[
4
]
=
{
0
,
0
,
0
,
0
};
uint32_t
ackNAK_absSF
;
...
...
@@ -2769,23 +2768,19 @@ schedule_ue_spec_br(
switch
(
prach_ParametersListCE_r13
->
list
.
count
)
{
case
4
:
p
[
3
]
=
prach_ParametersListCE_r13
->
list
.
array
[
3
];
n1pucchan
[
3
]
=
*
pucch_N1PUCCH_AN_InfoList_r13
->
list
.
array
[
3
];
AssertFatal
(
ext4_pucch
->
pucch_NumRepetitionCE_Msg4_Level3_r13
!=
NULL
,
"pucch_NumRepetitionCE_Msg4_Level3 shouldn't be NULL
\n
"
);
pucchreps
[
3
]
=
(
int
)
(
4
<<
*
ext4_pucch
->
pucch_NumRepetitionCE_Msg4_Level3_r13
);
case
3
:
p
[
2
]
=
prach_ParametersListCE_r13
->
list
.
array
[
2
];
n1pucchan
[
2
]
=
*
pucch_N1PUCCH_AN_InfoList_r13
->
list
.
array
[
2
];
AssertFatal
(
ext4_pucch
->
pucch_NumRepetitionCE_Msg4_Level2_r13
!=
NULL
,
"pucch_NumRepetitionCE_Msg4_Level2 shouldn't be NULL
\n
"
);
pucchreps
[
2
]
=
(
int
)
(
4
<<
*
ext4_pucch
->
pucch_NumRepetitionCE_Msg4_Level2_r13
);
case
2
:
p
[
1
]
=
prach_ParametersListCE_r13
->
list
.
array
[
1
];
n1pucchan
[
1
]
=
*
pucch_N1PUCCH_AN_InfoList_r13
->
list
.
array
[
1
];
AssertFatal
(
ext4_pucch
->
pucch_NumRepetitionCE_Msg4_Level1_r13
!=
NULL
,
"pucch_NumRepetitionCE_Msg4_Level1 shouldn't be NULL
\n
"
);
pucchreps
[
1
]
=
(
int
)
(
1
<<
*
ext4_pucch
->
pucch_NumRepetitionCE_Msg4_Level1_r13
);
case
1
:
p
[
0
]
=
prach_ParametersListCE_r13
->
list
.
array
[
0
];
n1pucchan
[
0
]
=
*
pucch_N1PUCCH_AN_InfoList_r13
->
list
.
array
[
0
];
AssertFatal
(
ext4_pucch
->
pucch_NumRepetitionCE_Msg4_Level0_r13
!=
NULL
,
"pucch_NumRepetitionCE_Msg4_Level0 shouldn't be NULL
\n
"
);
pucchreps
[
0
]
=
(
int
)
(
1
<<
*
ext4_pucch
->
pucch_NumRepetitionCE_Msg4_Level0_r13
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
7474b69c
...
...
@@ -2272,8 +2272,7 @@ uint8_t get_tmode(module_id_t module_idP, int CC_idP, int UE_idP)
eNB_MAC_INST
*
eNB
=
RC
.
mac
[
module_idP
];
COMMON_channels_t
*
cc
=
&
eNB
->
common_channels
[
CC_idP
];
struct
LTE_PhysicalConfigDedicated
*
physicalConfigDedicated
=
eNB
->
UE_list
.
physicalConfigDedicated
[
CC_idP
][
UE_idP
];
struct
LTE_PhysicalConfigDedicated
*
physicalConfigDedicated
=
&
eNB
->
UE_list
.
physicalConfigDedicated
[
CC_idP
][
UE_idP
];
if
(
physicalConfigDedicated
==
NULL
)
{
// RRCConnectionSetup not received by UE yet
AssertFatal
(
cc
->
p_eNB
<=
2
,
"p_eNB is %d, should be <2
\n
"
,
...
...
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