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
promise
OpenXG-RAN
Commits
e6debab9
Commit
e6debab9
authored
9 years ago
by
Florian Kaltenberger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modification from IS-Wireless regarding CQI feedback
parent
a1403400
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
115 additions
and
53 deletions
+115
-53
openair2/LAYER2/MAC/ff-mac-common.h
openair2/LAYER2/MAC/ff-mac-common.h
+96
-51
openair2/LAYER2/MAC/ff-mac-csched-sap.h
openair2/LAYER2/MAC/ff-mac-csched-sap.h
+9
-0
openair2/LAYER2/MAC/ff-mac-sched-sap.h
openair2/LAYER2/MAC/ff-mac-sched-sap.h
+10
-2
No files found.
openair2/LAYER2/MAC/ff-mac-common.h
View file @
e6debab9
...
...
@@ -41,7 +41,11 @@
#include <stdint.h>
#include <stdbool.h>
#if defined (__cplusplus)
extern
"C"
{
#endif
/**
* Constants. See section 4.4
*/
...
...
@@ -64,8 +68,8 @@
#define MAX_SI_MSG_SIZE 65535
#define MAX_CQI_LIST 30
#define MAX_UE_SELECTED_SB 6
#define MAX_HL_SB
25
#define MAX_UE_SELECTED_SB 6
//comes from Table 7.2.1-5, 36.213
#define MAX_HL_SB
13 //comes from Table 7.2.1-3, 36.213
#define MAX_SINR_RB_LIST 100
#define MAX_SR_LIST 30
#define MAX_MAC_CE_LIST 30
...
...
@@ -170,7 +174,7 @@ struct UlDciListElement_s
bool
cifPresent
;
uint8_t
cif
;
/// this is the carrier index where the DCI will be transmitted on
uint8_t
carrierIndex
;
uint8_t
servCellIndex
;
//definition according to 36.331 'ServCellIndex'
};
/**
...
...
@@ -240,7 +244,7 @@ struct PhichListElement_s
{
ACK
,
NACK
}
phich
;
uint8_t
carrierIndex
;
uint8_t
servCellIndex
;
//definition according to 36.331 'ServCellIndex'
};
/**
...
...
@@ -264,7 +268,7 @@ struct BuildDataListElement_s
uint8_t
ceBitmap
[
MAX_TB_LIST
];
uint8_t
nr_rlcPDU_List
;
struct
RlcPduListElement_s
*
rlcPduList
[
MAX_TB_LIST
];
uint8_t
carrierIndex
;
uint8_t
servCellIndex
;
//definition according to 36.331 'ServCellIndex'
/* Hex content of Activation/Deactivation MAC CE */
uint8_t
activationDeactivationCE
;
};
...
...
@@ -306,7 +310,7 @@ struct UlInfoListElement_s
Ok
,
NotOk
,
NotValid
}
receptionStatus
;
uint8_t
tpc
;
uint8_t
carrierIndex
;
uint8_t
servCellIndex
;
//definition according to 36.331 'ServCellIndex'
};
/**
...
...
@@ -449,75 +453,112 @@ struct DlInfoListElement_s
{
uint16_t
rnti
;
uint8_t
harqProcessId
;
uint8_t
nr_harqStatus
;
enum
HarqStatus_e
{
ff_ACK
,
ff_NACK
,
ff_DTX
}
harqStatus
[
MAX_TB_LIST
];
uint8_t
carrierIndex
;
uint8_t
servCellIndex
;
//definition according to 36.331 'ServCellIndex'
};
/**
* \brief See section 4.3.28 bwPart
*/
struct
BwPart_s
{
uint8_t
bwPartIndex
;
uint8_t
sb
;
uint8_t
cqi
;
};
/**
* \brief
See section 4.3.27 higherLayerSelected
* \brief
Represents types of SCI reports for all CSI reporting modes. \a mode indicates which structure is held in \a report union.
*/
struct
HigherLayerSelected
_s
struct
CsiReport
_s
{
uint8_t
sbPmi
;
uint8_t
sbCqi
[
MAX_TB_LIST
];
};
uint8_t
ri
;
/**
* \brief See section 4.3.26 ueSelected
*/
struct
UeSelected_s
{
uint8_t
sbList
[
MAX_UE_SELECTED_SB
];
uint8_t
sbPmi
;
uint8_t
sbCqi
[
MAX_TB_LIST
];
};
enum
CsiRepMode_e
{
P10
,
P11
,
P20
,
P21
,
A12
,
A22
,
A20
,
A30
,
A31
}
mode
;
/**
* \brief See section 4.3.25 sbMeasResult
*/
struct
SbMeasResult_s
{
struct
UeSelected_s
ueSelected
;
struct
HigherLayerSelected_s
higherLayerSelected
[
MAX_HL_SB
];
struct
BwPart_s
bwPart
;
union
{
struct
A12Csi_s
{
uint8_t
wbCqi
[
MAX_TB_LIST
];
uint8_t
sbPmi
[
MAX_HL_SB
];
}
A12Csi
;
struct
A30Csi_s
{
uint8_t
wbCqi
;
uint8_t
sbCqi
[
MAX_HL_SB
];
}
A30Csi
;
struct
A31Csi_s
{
uint8_t
wbCqi
[
MAX_TB_LIST
];
uint8_t
sbCqi
[
MAX_HL_SB
][
MAX_TB_LIST
];
uint8_t
wbPmi
;
}
A31Csi
;
struct
A20Csi_s
{
uint8_t
wbCqi
;
uint8_t
sbCqi
;
uint8_t
sbList
[
MAX_UE_SELECTED_SB
];
}
A20Csi
;
struct
A22Csi_s
{
uint8_t
wbCqi
[
MAX_TB_LIST
];
uint8_t
sbCqi
[
MAX_TB_LIST
];
uint8_t
wbPmi
;
uint8_t
sbPmi
;
uint8_t
sbList
[
MAX_UE_SELECTED_SB
];
}
A22Csi
;
struct
P10Csi_s
{
uint8_t
wbCqi
;
}
P10Csi
;
struct
P11Csi_s
{
uint8_t
wbCqi
[
MAX_TB_LIST
];
uint8_t
wbPmi
;
}
P11Csi
;
struct
P20Csi_s
{
uint8_t
wbCqi
;
uint8_t
sbCqi
;
uint8_t
bwPartIndex
;
//range 0-3; to cover maximum number of BW parts (J)
uint8_t
sbIndex
;
//range 0-3; to cover maximum number of subbands inside BW part (Nj)
}
P20Csi
;
struct
P21Csi_s
{
uint8_t
wbCqi
[
MAX_TB_LIST
];
uint8_t
wbPmi
;
uint8_t
sbCqi
[
MAX_TB_LIST
];
uint8_t
bwPartIndex
;
//range 0-3; to cover maximum number of BW parts (J)
uint8_t
sbIndex
;
//range 0-3; to cover maximum number of subbands inside BW part (Nj)
}
P21Csi
;
}
report
;
};
/**
* \brief
See section 4.3.24 cqiListElement
* \brief
Modified structure holding CSI report for single UE (for original structure see section 4.3.24 cqiListElement).
*/
struct
CqiListElement_s
{
uint16_t
rnti
;
uint8_t
ri
;
enum
CqiType_e
{
P10
,
P11
,
P20
,
P21
,
A12
,
A22
,
A20
,
A30
,
A31
}
cqiType
;
uint8_t
wbCqi
[
MAX_TB_LIST
];
uint8_t
wbPmi
;
struct
SbMeasResult_s
sbMeasResult
;
uint8_t
carrierIndex
;
struct
CsiReport_s
csiReport
;
uint8_t
servCellIndex
;
//definition according to 36.331 'ServCellIndex'
};
/**
* \brief See section 4.3.29 ulCQI
*/
struct
UlCqi_s
{
uint16_t
rnti
;
uint16_t
sinr
[
MAX_SINR_RB_LIST
];
enum
UlCqiType_e
{
...
...
@@ -527,7 +568,7 @@ struct UlCqi_s
ff_PUCCH_2
,
ff_PRACH
}
type
;
uint8_t
carrierIndex
;
uint8_t
servCellIndex
;
//definition according to 36.331 'ServCellIndex'
};
/**
...
...
@@ -566,4 +607,8 @@ struct PdcchOfdmSymbolCountListElement_s
uint8_t
pdcchOfdmSymbolCount
;
};
#if defined (__cplusplus)
}
#endif
#endif
/* FF_MAC_COMMON_H */
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/ff-mac-csched-sap.h
View file @
e6debab9
...
...
@@ -43,6 +43,10 @@
#include "ff-mac-common.h"
#if defined (__cplusplus)
extern
"C"
{
#endif
/**
* Parameters of the API primitives
*/
...
...
@@ -187,6 +191,7 @@ struct CschedUeConfigReqParameters
}
tddAckNackFeedbackMode
;
uint8_t
ackNackRepetitionFactor
;
bool
extendedBSRSizes
;
bool
caSupport
;
bool
crossCarrierSchedSupport
;
...
...
@@ -386,4 +391,8 @@ void CschedUeConfigUpdateInd (const struct CschedUeConfigUpdateIndParameters *pa
void
CschedCellConfigUpdateInd
(
const
struct
CschedCellConfigUpdateIndParameters
*
params
);
#if defined (__cplusplus)
}
#endif
#endif
/* FF_MAC_CSCHED_SAP_H */
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/ff-mac-sched-sap.h
View file @
e6debab9
...
...
@@ -43,6 +43,9 @@
#include "ff-mac-common.h"
#if defined (__cplusplus)
extern
"C"
{
#endif
/**
* Parameters of the API primitives
...
...
@@ -178,7 +181,7 @@ struct SchedUlMacCtrlInfoReqParameters
{
uint16_t
sfnSf
;
uint8_t
nr_macCEUL_List
;
struct
MacCeUlListElement_s
macCeUlList
;
struct
MacCeUlListElement_s
*
macCeUlList
;
uint8_t
nr_vendorSpecificList
;
struct
VendorSpecificListElement_s
*
vendorSpecificList
;
};
...
...
@@ -190,7 +193,8 @@ struct SchedUlMacCtrlInfoReqParameters
struct
SchedUlCqiInfoReqParameters
{
uint16_t
sfnSf
;
struct
UlCqi_s
ulCqi
;
uint8_t
nr_ulCqiList
;
struct
UlCqi_s
*
ulCqiList
;
uint8_t
nr_vendorSpecificList
;
struct
VendorSpecificListElement_s
*
vendorSpecificList
;
};
...
...
@@ -271,4 +275,8 @@ void SchedDlConfigInd (const struct SchedDlConfigIndParameters* params);
void
SchedUlConfigInd
(
const
struct
SchedUlConfigIndParameters
*
params
);
#if defined (__cplusplus)
}
#endif
#endif
/* FF_MAC_SCHED_SAP_H */
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