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
ZhouShuya
OpenXG-RAN
Commits
b350f855
Commit
b350f855
authored
Jan 21, 2018
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes for broken automatic indentation in MAC #1
parent
5dc0d7cc
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4106 additions
and
4994 deletions
+4106
-4994
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/config.c
+139
-142
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+447
-594
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
+273
-517
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+3247
-3741
No files found.
openair2/LAYER2/MAC/config.c
View file @
b350f855
...
@@ -251,7 +251,7 @@ void config_mib(int Mod_idP,
...
@@ -251,7 +251,7 @@ void config_mib(int Mod_idP,
cfg
->
rf_config
.
dl_channel_bandwidth
.
value
=
to_prb
(
dl_BandwidthP
);
cfg
->
rf_config
.
dl_channel_bandwidth
.
value
=
to_prb
(
dl_BandwidthP
);
cfg
->
rf_config
.
dl_channel_bandwidth
.
tl
.
tag
=
NFAPI_RF_CONFIG_DL_CHANNEL_BANDWIDTH_TAG
;
cfg
->
rf_config
.
dl_channel_bandwidth
.
tl
.
tag
=
NFAPI_RF_CONFIG_DL_CHANNEL_BANDWIDTH_TAG
;
cfg
->
num_tlv
++
;
cfg
->
num_tlv
++
;
LOG_E
(
PHY
,
"%s() dl_BandwidthP:%d
\n
"
,
__FUNCTION__
,
dl_BandwidthP
);
LOG_E
(
PHY
,
"%s() dl_BandwidthP:%d
\n
"
,
__FUNCTION__
,
dl_BandwidthP
);
cfg
->
rf_config
.
ul_channel_bandwidth
.
value
=
to_prb
(
dl_BandwidthP
);
cfg
->
rf_config
.
ul_channel_bandwidth
.
value
=
to_prb
(
dl_BandwidthP
);
cfg
->
rf_config
.
ul_channel_bandwidth
.
tl
.
tag
=
NFAPI_RF_CONFIG_UL_CHANNEL_BANDWIDTH_TAG
;
cfg
->
rf_config
.
ul_channel_bandwidth
.
tl
.
tag
=
NFAPI_RF_CONFIG_UL_CHANNEL_BANDWIDTH_TAG
;
...
@@ -312,7 +312,7 @@ LOG_E(PHY,"%s() dl_BandwidthP:%d\n", __FUNCTION__, dl_BandwidthP);
...
@@ -312,7 +312,7 @@ LOG_E(PHY,"%s() dl_BandwidthP:%d\n", __FUNCTION__, dl_BandwidthP);
#endif
#endif
"
\n
"
"
\n
"
,
__FUNCTION__
,
__FUNCTION__
,
cfg
->
num_tlv
`
,
cfg
->
num_tlv
,
cfg
->
rf_config
.
dl_channel_bandwidth
.
value
,
cfg
->
rf_config
.
dl_channel_bandwidth
.
value
,
cfg
->
rf_config
.
ul_channel_bandwidth
.
value
,
cfg
->
rf_config
.
ul_channel_bandwidth
.
value
,
NcpP
,
p_eNBP
,
NcpP
,
p_eNBP
...
@@ -434,16 +434,13 @@ config_sib2(int Mod_idP,
...
@@ -434,16 +434,13 @@ config_sib2(int Mod_idP,
cfg
->
pucch_config
.
n1_pucch_an
.
tl
.
tag
=
NFAPI_PUCCH_CONFIG_N1_PUCCH_AN_TAG
;
cfg
->
pucch_config
.
n1_pucch_an
.
tl
.
tag
=
NFAPI_PUCCH_CONFIG_N1_PUCCH_AN_TAG
;
cfg
->
num_tlv
++
;
cfg
->
num_tlv
++
;
if
(
radioResourceConfigCommonP
->
pusch_ConfigCommon
.
ul_ReferenceSignalsPUSCH
.
groupHoppingEnabled
==
true
)
if
(
radioResourceConfigCommonP
->
pusch_ConfigCommon
.
ul_ReferenceSignalsPUSCH
.
groupHoppingEnabled
==
true
)
{
{
cfg
->
uplink_reference_signal_config
.
uplink_rs_hopping
.
value
=
1
;
cfg
->
uplink_reference_signal_config
.
uplink_rs_hopping
.
value
=
1
;
}
}
else
if
(
radioResourceConfigCommonP
->
pusch_ConfigCommon
.
ul_ReferenceSignalsPUSCH
.
sequenceHoppingEnabled
==
true
)
else
if
(
radioResourceConfigCommonP
->
pusch_ConfigCommon
.
ul_ReferenceSignalsPUSCH
.
sequenceHoppingEnabled
==
true
)
{
{
cfg
->
uplink_reference_signal_config
.
uplink_rs_hopping
.
value
=
2
;
cfg
->
uplink_reference_signal_config
.
uplink_rs_hopping
.
value
=
2
;
}
}
else
// No hopping
else
{
{
cfg
->
uplink_reference_signal_config
.
uplink_rs_hopping
.
value
=
0
;
cfg
->
uplink_reference_signal_config
.
uplink_rs_hopping
.
value
=
0
;
}
}
cfg
->
uplink_reference_signal_config
.
uplink_rs_hopping
.
tl
.
tag
=
NFAPI_UPLINK_REFERENCE_SIGNAL_CONFIG_UPLINK_RS_HOPPING_TAG
;
cfg
->
uplink_reference_signal_config
.
uplink_rs_hopping
.
tl
.
tag
=
NFAPI_UPLINK_REFERENCE_SIGNAL_CONFIG_UPLINK_RS_HOPPING_TAG
;
...
@@ -998,13 +995,13 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
...
@@ -998,13 +995,13 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
mbms_SessionList
[
i
]
->
list
.
count
);
mbms_SessionList
[
i
]
->
list
.
count
);
}
}
}
}
}
}
#endif
#endif
LOG_E
(
MAC
,
"%s() %s:%d RC.mac[Mod_idP]->if_inst->PHY_config_req:%p
\n
"
,
__FUNCTION__
,
__FILE__
,
__LINE__
,
RC
.
mac
[
Mod_idP
]
->
if_inst
->
PHY_config_req
);
LOG_E
(
MAC
,
"%s() %s:%d RC.mac[Mod_idP]->if_inst->PHY_config_req:%p
\n
"
,
__FUNCTION__
,
__FILE__
,
__LINE__
,
RC
.
mac
[
Mod_idP
]
->
if_inst
->
PHY_config_req
);
// if in nFAPI mode
// if in nFAPI mode
if
(
if
(
(
nfapi_mode
==
1
||
nfapi_mode
==
2
)
&&
(
nfapi_mode
==
1
||
nfapi_mode
==
2
)
&&
(
RC
.
mac
[
Mod_idP
]
->
if_inst
->
PHY_config_req
==
NULL
)
(
RC
.
mac
[
Mod_idP
]
->
if_inst
->
PHY_config_req
==
NULL
)
)
{
)
{
...
@@ -1015,7 +1012,7 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
...
@@ -1015,7 +1012,7 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
}
}
}
}
if
(
radioResourceConfigCommon
!=
NULL
)
{
if
(
radioResourceConfigCommon
!=
NULL
)
{
PHY_Config_t
phycfg
;
PHY_Config_t
phycfg
;
phycfg
.
Mod_id
=
Mod_idP
;
phycfg
.
Mod_id
=
Mod_idP
;
phycfg
.
CC_id
=
CC_idP
;
phycfg
.
CC_id
=
CC_idP
;
...
@@ -1026,7 +1023,7 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
...
@@ -1026,7 +1023,7 @@ rrc_mac_config_req_eNB(module_id_t Mod_idP,
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG
,
VCD_FUNCTION_OUT
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG
,
VCD_FUNCTION_OUT
);
}
}
return
(
0
);
return
(
0
);
}
}
int
int
...
...
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
b350f855
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/eNB_scheduler_RA.c
View file @
b350f855
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
b350f855
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