Code Review
/
o-du
/
l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Encoding of MSG3 UL grant in RAR PDU [Issue-ID: ODUHIGH-342]"
[o-du/l2.git]
/
src
/
cm
/
du_app_mac_inf.h
diff --git
a/src/cm/du_app_mac_inf.h
b/src/cm/du_app_mac_inf.h
index
5b770d1
..
c5dbf84
100644
(file)
--- a/
src/cm/du_app_mac_inf.h
+++ b/
src/cm/du_app_mac_inf.h
@@
-600,12
+600,19
@@
typedef struct pdcchConfigCommon
uint8_t raSearchSpaceId;
}PdcchConfigCommon;
uint8_t raSearchSpaceId;
}PdcchConfigCommon;
-typedef struct pdschC
onfigCommon
+typedef struct pdschC
fgCommTimeDomRsrcAlloc
{
uint8_t k0;
uint8_t mappingType;
uint8_t startSymbol;
uint8_t lengthSymbol;
{
uint8_t k0;
uint8_t mappingType;
uint8_t startSymbol;
uint8_t lengthSymbol;
+}PdschCfgCommTimeDomRsrcAlloc;
+
+typedef struct pdschConfigCommon
+{
+ uint8_t numTimeDomAlloc;
+ /* PDSCH time domain DL resource allocation list */
+ PdschCfgCommTimeDomRsrcAlloc timeDomRsrcAllocList[MAX_NUM_DL_ALLOC];
}PdschConfigCommon;
typedef struct pucchConfigCommon
}PdschConfigCommon;
typedef struct pucchConfigCommon
@@
-614,13
+621,22
@@
typedef struct pucchConfigCommon
uint8_t pucchGroupHopping;
}PucchConfigCommon;
uint8_t pucchGroupHopping;
}PucchConfigCommon;
+/* PUSCH Time Domain Resource Allocation */
+typedef struct puschTimeDomRsrcAlloc
+{
+ uint8_t k2;
+ CommonMappingType mappingType;
+ uint8_t startSymbol;
+ uint8_t symbolLength;
+ uint8_t startSymbolAndLength;
+}PuschTimeDomRsrcAlloc;
+
+
typedef struct puschConfigCommon
{
/* PUSCH-TimeDomainResourceAllocation info */
typedef struct puschConfigCommon
{
/* PUSCH-TimeDomainResourceAllocation info */
- uint8_t k2;
- uint8_t mappingType;
- uint8_t startSymbol;
- uint8_t lengthSymbol;
+ uint8_t numTimeDomRsrcAlloc;
+ PuschTimeDomRsrcAlloc timeDomRsrcAllocList[MAX_NUM_UL_ALLOC]; /* PUSCH time domain UL resource allocation list */
}PuschConfigCommon;
typedef struct bwpDlConfig
}PuschConfigCommon;
typedef struct bwpDlConfig
@@
-791,6
+807,7
@@
typedef struct pdcchConfig
/* PDSCH time domain resource allocation */
typedef struct pdschTimeDomRsrcAlloc
{
/* PDSCH time domain resource allocation */
typedef struct pdschTimeDomRsrcAlloc
{
+ uint8_t *k0;
CommonMappingType mappingType;
uint8_t startSymbol;
uint8_t symbolLength;
CommonMappingType mappingType;
uint8_t startSymbol;
uint8_t symbolLength;
@@
-1041,16
+1058,6
@@
typedef struct dmrsUlCfg
TransPrecodDisabled transPrecodDisabled; /* Transform precoding disabled */
}DmrsUlCfg;
TransPrecodDisabled transPrecodDisabled; /* Transform precoding disabled */
}DmrsUlCfg;
-/* PUSCH Time Domain Resource Allocation */
-typedef struct puschTimeDomRsrcAlloc
-{
- uint8_t k2;
- CommonMappingType mappingType;
- uint8_t startSymbol;
- uint8_t symbolLength;
- uint8_t startSymbolAndLength;
-}PuschTimeDomRsrcAlloc;
-
/* PUSCH Configuration */
typedef struct puschCfg
{
/* PUSCH Configuration */
typedef struct puschCfg
{
@@
-1252,14
+1259,14
@@
typedef struct ueCfgRsp
typedef struct ueDelete
{
uint16_t cellId;
typedef struct ueDelete
{
uint16_t cellId;
- uint8_t ueId
x
;
+ uint8_t ueId;
uint16_t crnti;
}MacUeDelete;
typedef struct ueDeleteRsp
{
uint16_t cellId;
uint16_t crnti;
}MacUeDelete;
typedef struct ueDeleteRsp
{
uint16_t cellId;
- uint8_t ueId
x
;
+ uint8_t ueId;
UeDeleteStatus result;
}MacUeDeleteRsp;
UeDeleteStatus result;
}MacUeDeleteRsp;
@@
-1272,8
+1279,7
@@
typedef struct macCellDeleteRsp
{
uint16_t cellId;
CellDeleteStatus result;
{
uint16_t cellId;
CellDeleteStatus result;
-}
-MacCellDeleteRsp;
+}MacCellDeleteRsp;
/* Functions for slot Ind from MAC to DU APP*/
typedef uint8_t (*DuMacCellUpInd) ARGS((
/* Functions for slot Ind from MAC to DU APP*/
typedef uint8_t (*DuMacCellUpInd) ARGS((