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
Michael Black
OpenXG UE
Commits
8deddbff
Commit
8deddbff
authored
Jun 18, 2019
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/eMTC-configuration_fix' into develop_integration_2019_w25
parents
039dedc0
db2d841f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf
ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf
+1
-1
openair2/ENB_APP/enb_config_eMTC.c
openair2/ENB_APP/enb_config_eMTC.c
+2
-2
openair2/ENB_APP/enb_paramdef_emtc.h
openair2/ENB_APP/enb_paramdef_emtc.h
+1
-1
No files found.
ci-scripts/conf_files/enb.band13.tm1.50PRB.emtc.conf
View file @
8deddbff
...
@@ -171,7 +171,7 @@ eNBs =
...
@@ -171,7 +171,7 @@ eNBs =
lastPreamble_r13
=
63
;
lastPreamble_r13
=
63
;
ra_ResponseWindowSize_r13
=
20
;
#0
ra_ResponseWindowSize_r13
=
20
;
#0
mac_ContentionResolutionTimer_r13
=
80
;
#0
mac_ContentionResolutionTimer_r13
=
80
;
#0
rar_HoppingConfig_r13
=
"off"
;
#1;
rar_HoppingConfig_r13
=
1
; //
Note
1
means
off
}
}
);
);
...
...
openair2/ENB_APP/enb_config_eMTC.c
View file @
8deddbff
...
@@ -933,8 +933,8 @@ void fill_eMTC_configuration(MessageDef *msg_p, ccparams_eMTC_t *eMTCconfig, in
...
@@ -933,8 +933,8 @@ void fill_eMTC_configuration(MessageDef *msg_p, ccparams_eMTC_t *eMTCconfig, in
}
}
RRC_CONFIGURATION_REQ
(
msg_p
).
rar_HoppingConfig_r13
[
cc_idx
][
rachCEInfoIndex
]
=
eMTCconfig
->
rar_HoppingConfig_r13
;
RRC_CONFIGURATION_REQ
(
msg_p
).
rar_HoppingConfig_r13
[
cc_idx
][
rachCEInfoIndex
]
=
eMTCconfig
->
rar_HoppingConfig_r13
;
AssertFatal
(
eMTCconfig
->
rar_HoppingConfig_r13
==
0
||
eMTCconfig
->
rar_HoppingConfig_r13
==
1
,
AssertFatal
(
eMTCconfig
->
rar_HoppingConfig_r13
==
1
,
"illegal rar_HoppingConfig_r13 %d
\n
"
,
eMTCconfig
->
rar_HoppingConfig_r13
);
"illegal rar_HoppingConfig_r13 %d
(should be 1 only for now, can be 0 when RAR frequency hopping is supported
\n
"
,
eMTCconfig
->
rar_HoppingConfig_r13
);
}
// end for loop (rach ce level info)
}
// end for loop (rach ce level info)
char
rsrpRangeListPath
[
MAX_OPTNAME_SIZE
*
2
];
char
rsrpRangeListPath
[
MAX_OPTNAME_SIZE
*
2
];
...
...
openair2/ENB_APP/enb_paramdef_emtc.h
View file @
8deddbff
...
@@ -364,7 +364,7 @@ typedef struct ccparams_eMTC_s {
...
@@ -364,7 +364,7 @@ typedef struct ccparams_eMTC_s {
{ENB_CONFIG_STRING_LAST_PREAMBLE_R13, NULL, 0, iptr:&eMTCconfig->lastPreamble_r13, defintval:63, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_LAST_PREAMBLE_R13, NULL, 0, iptr:&eMTCconfig->lastPreamble_r13, defintval:63, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_RA_RESPONSE_WINDOW_SIZE_R13, NULL, 0, iptr:&eMTCconfig->ra_ResponseWindowSize_r13, defintval:20, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_RA_RESPONSE_WINDOW_SIZE_R13, NULL, 0, iptr:&eMTCconfig->ra_ResponseWindowSize_r13, defintval:20, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_MAC_CONTENTION_RESOLUTION_TIMER_R13, NULL, 0, iptr:&eMTCconfig->mac_ContentionResolutionTimer_r13, defintval:80, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_MAC_CONTENTION_RESOLUTION_TIMER_R13, NULL, 0, iptr:&eMTCconfig->mac_ContentionResolutionTimer_r13, defintval:80, TYPE_UINT, 0}, \
{ENB_CONFIG_STRING_RAR_HOPPING_CONFIG_R13, NULL, 0, iptr:&eMTCconfig->rar_HoppingConfig_r13, defintval:
0
, TYPE_UINT, 0}\
{ENB_CONFIG_STRING_RAR_HOPPING_CONFIG_R13, NULL, 0, iptr:&eMTCconfig->rar_HoppingConfig_r13, defintval:
1
, TYPE_UINT, 0}\
}
}
#define PRACH_PARAMS_CE_R13_DESC(eMTCconfig) { \
#define PRACH_PARAMS_CE_R13_DESC(eMTCconfig) { \
...
...
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