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
alex037yang
OpenXG-RAN
Commits
fd3c5cce
Commit
fd3c5cce
authored
Jan 13, 2016
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
force MAX_NUM_CCs to 2 in ff-mac-sched-sap.h/ff-mac-csched-sap.h
to fit libscheduler.a
parent
82b4dba2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
openair2/LAYER2/MAC/ff-mac-csched-sap.h
openair2/LAYER2/MAC/ff-mac-csched-sap.h
+4
-2
openair2/LAYER2/MAC/ff-mac-sched-sap.h
openair2/LAYER2/MAC/ff-mac-sched-sap.h
+2
-1
No files found.
openair2/LAYER2/MAC/ff-mac-csched-sap.h
View file @
fd3c5cce
...
@@ -58,7 +58,8 @@ extern "C" {
...
@@ -58,7 +58,8 @@ extern "C" {
struct
CschedCellConfigReqParameters
struct
CschedCellConfigReqParameters
{
{
uint8_t
nr_carriers
;
uint8_t
nr_carriers
;
struct
CschedCellConfigReqParametersListElement
*
ccConfigList
[
MAX_NUM_CCs
];
#warning [31;46mMAX_NUM_CCs forced to 2 in structure CschedCellConfigReqParameters!![0m
struct
CschedCellConfigReqParametersListElement
*
ccConfigList
[
2
/*MAX_NUM_CCs*/
];
uint8_t
nr_vendorSpecificList
;
uint8_t
nr_vendorSpecificList
;
struct
VendorSpecificListElement_s
*
vendorSpecificList
;
struct
VendorSpecificListElement_s
*
vendorSpecificList
;
};
};
...
@@ -198,7 +199,8 @@ struct CschedUeConfigReqParameters
...
@@ -198,7 +199,8 @@ struct CschedUeConfigReqParameters
bool
crossCarrierSchedSupport
;
bool
crossCarrierSchedSupport
;
uint8_t
pcellCarrierIndex
;
uint8_t
pcellCarrierIndex
;
uint8_t
nr_scells
;
uint8_t
nr_scells
;
struct
ScellConfig_s
*
scellConfigList
[
MAX_NUM_CCs
-
1
];
#warning [31;46mMAX_NUM_CCs forced to 2 in structure CschedUeConfigReqParameters!![0m
struct
ScellConfig_s
*
scellConfigList
[
2
/* MAX_NUM_CCs */
-
1
];
uint8_t
scellDeactivationTimer
;
uint8_t
scellDeactivationTimer
;
uint8_t
nr_vendorSpecificList
;
uint8_t
nr_vendorSpecificList
;
...
...
openair2/LAYER2/MAC/ff-mac-sched-sap.h
View file @
fd3c5cce
...
@@ -235,7 +235,8 @@ struct SchedDlConfigIndParameters
...
@@ -235,7 +235,8 @@ struct SchedDlConfigIndParameters
/* mind: this is just number of elems in the next array (not actual number of PDCCH OFDM symbols) */
/* mind: this is just number of elems in the next array (not actual number of PDCCH OFDM symbols) */
uint8_t
nr_ofdmSymbolsCount
;
uint8_t
nr_ofdmSymbolsCount
;
struct
PdcchOfdmSymbolCountListElement_s
*
nrOfPdcchOfdmSymbols
[
MAX_NUM_CCs
];
#warning [31;46mMAX_NUM_CCs forced to 2 in structure SchedDlConfigIndParameters!![0m
struct
PdcchOfdmSymbolCountListElement_s
*
nrOfPdcchOfdmSymbols
[
2
/* MAX_NUM_CCs */
];
uint8_t
nr_vendorSpecificList
;
uint8_t
nr_vendorSpecificList
;
struct
VendorSpecificListElement_s
*
vendorSpecificList
;
struct
VendorSpecificListElement_s
*
vendorSpecificList
;
...
...
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