Commit 17480380 authored by jperaldi's avatar jperaldi

SIDL ACP version to 1.1.32

parent 32745594
......@@ -22,5 +22,5 @@
#pragma once
#define ACP_VERSION "1.1.31"
#define ACP_VERSION_CKSM "fc6be432378419cb932a2a16306ffbb4"
#define ACP_VERSION "1.1.32"
#define ACP_VERSION_CKSM "b796a588cd00cda1a638c14c27650a2a"
......@@ -62,6 +62,8 @@ const char* adbgUtilsSysPDCP_ActTime_TypeToStr(int select);
const char* adbgUtilsSysAS_Security_TypeToStr(int select);
const char* adbgUtilsSysPDCP_HandoverControlReq_TypeToStr(int select);
const char* adbgUtilsSysSystemRequest_TypeToStr(int select);
const char* adbgUtilsSysSystemConfirm_TypeToStr(int select);
......
......@@ -29718,6 +29718,38 @@ static void _adbgSys__PDCP_CountReq_Type(acpCtx_t _ctx, const struct PDCP_CountR
_adbgSys__PDCP_CountReq_Type_Value(_ctx, &p->v, p->d);
}
static void _adbgSys__PDCP_HandoverInit_Type(acpCtx_t _ctx, const struct PDCP_HandoverInit_Type* p)
{
adbgPrintLog(_ctx, "SourceCellId := %s (%d)", adbgSys__EUTRA_CellId_Type__ToString(p->SourceCellId), (int)p->SourceCellId);
}
static void _adbgSys__PDCP_HandoverControlReq_Type_Value(acpCtx_t _ctx, const union PDCP_HandoverControlReq_Type_Value* p, enum PDCP_HandoverControlReq_Type_Sel d)
{
if (d == PDCP_HandoverControlReq_Type_HandoverInit) {
adbgPrintLog(_ctx, "HandoverInit := { ");
_adbgSys__PDCP_HandoverInit_Type(_ctx, &p->HandoverInit);
adbgPrintLog(_ctx, " }");
return;
}
if (d == PDCP_HandoverControlReq_Type_HandoverComplete) {
adbgPrintLog(_ctx, "HandoverComplete := %s", (p->HandoverComplete ? "true" : "false"));
return;
}
adbgPrintLog(_ctx, "INVALID");
}
static void _adbgSys__PDCP_HandoverControlReq_Type(acpCtx_t _ctx, const struct PDCP_HandoverControlReq_Type* p)
{
_adbgSys__PDCP_HandoverControlReq_Type_Value(_ctx, &p->v, p->d);
}
static void _adbgSys__RA_PDCCH_Order_Type(acpCtx_t _ctx, const struct RA_PDCCH_Order_Type* p)
{
adbgPrintLog(_ctx, "PreambleIndex := %u", (unsigned int)p->PreambleIndex);
adbgPrintLog(_ctx, ", ");
adbgPrintLog(_ctx, "PrachMaskIndex := %u", (unsigned int)p->PrachMaskIndex);
}
static void _adbgSys__UE_Category_v1020_Type_ue_Category_V1020_Optional(acpCtx_t _ctx, const struct UE_Category_v1020_Type_ue_Category_V1020_Optional* p)
{
if (!p->d) { adbgPrintLog(_ctx, "omit"); return; }
......@@ -29888,6 +29920,18 @@ static void _adbgSys__SystemRequest_Type_Value(acpCtx_t _ctx, const union System
adbgPrintLog(_ctx, " }");
return;
}
if (d == SystemRequest_Type_PdcpHandoverControl) {
adbgPrintLog(_ctx, "PdcpHandoverControl := { ");
_adbgSys__PDCP_HandoverControlReq_Type(_ctx, &p->PdcpHandoverControl);
adbgPrintLog(_ctx, " }");
return;
}
if (d == SystemRequest_Type_PdcchOrder) {
adbgPrintLog(_ctx, "PdcchOrder := { ");
_adbgSys__RA_PDCCH_Order_Type(_ctx, &p->PdcchOrder);
adbgPrintLog(_ctx, " }");
return;
}
if (d == SystemRequest_Type_UE_Cat_Info) {
adbgPrintLog(_ctx, "UE_Cat_Info := { ");
_adbgSys__UE_CategoryInfo_Type(_ctx, &p->UE_Cat_Info);
......@@ -187,6 +187,15 @@ const char* adbgUtilsSysAS_Security_TypeToStr(int select)
}
}
const char* adbgUtilsSysPDCP_HandoverControlReq_TypeToStr(int select)
{
switch (select) {
case PDCP_HandoverControlReq_Type_HandoverInit: return "HandoverInit";
case PDCP_HandoverControlReq_Type_HandoverComplete: return "HandoverComplete";
default: return "unknown";
}
}
const char* adbgUtilsSysSystemRequest_TypeToStr(int select)
{
switch (select) {
......@@ -198,6 +207,8 @@ const char* adbgUtilsSysSystemRequest_TypeToStr(int select)
case SystemRequest_Type_Paging: return "Paging";
case SystemRequest_Type_L1MacIndCtrl: return "L1MacIndCtrl";
case SystemRequest_Type_PdcpCount: return "PdcpCount";
case SystemRequest_Type_PdcpHandoverControl: return "PdcpHandoverControl";
case SystemRequest_Type_PdcchOrder: return "PdcchOrder";
case SystemRequest_Type_UE_Cat_Info: return "UE_Cat_Info";
default: return "unknown";
}
......
......@@ -30490,6 +30490,57 @@ static int _serSysEncPDCP_CountReq_Type(unsigned char* _buffer, size_t _size, si
return SIDL_STATUS_OK;
}
static int _serSysEncPDCP_HandoverInit_Type(unsigned char* _buffer, size_t _size, size_t* _lidx, const struct PDCP_HandoverInit_Type* p)
{
(void)_size; // TODO: generate boundaries checking
{
size_t _tmp = (size_t)p->SourceCellId;
HTON_32(&_buffer[*_lidx], _tmp, _lidx);
}
return SIDL_STATUS_OK;
}
static int _serSysEncPDCP_HandoverControlReq_Type_Value(unsigned char* _buffer, size_t _size, size_t* _lidx, const union PDCP_HandoverControlReq_Type_Value* p, enum PDCP_HandoverControlReq_Type_Sel d)
{
(void)_size; // TODO: generate boundaries checking
if (d == PDCP_HandoverControlReq_Type_HandoverInit) {
_serSysEncPDCP_HandoverInit_Type(_buffer, _size, _lidx, &p->HandoverInit);
return SIDL_STATUS_OK;
}
if (d == PDCP_HandoverControlReq_Type_HandoverComplete) {
HTON_8(&_buffer[*_lidx], p->HandoverComplete, _lidx);
return SIDL_STATUS_OK;
}
return SIDL_STATUS_ERROR;
}
static int _serSysEncPDCP_HandoverControlReq_Type(unsigned char* _buffer, size_t _size, size_t* _lidx, const struct PDCP_HandoverControlReq_Type* p)
{
(void)_size; // TODO: generate boundaries checking
{
size_t _tmp = (size_t)p->d;
HTON_32(&_buffer[*_lidx], _tmp, _lidx);
}
_serSysEncPDCP_HandoverControlReq_Type_Value(_buffer, _size, _lidx, &p->v, p->d);
return SIDL_STATUS_OK;
}
static int _serSysEncRA_PDCCH_Order_Type(unsigned char* _buffer, size_t _size, size_t* _lidx, const struct RA_PDCCH_Order_Type* p)
{
(void)_size; // TODO: generate boundaries checking
HTON_8(&_buffer[*_lidx], p->PreambleIndex, _lidx);
HTON_8(&_buffer[*_lidx], p->PrachMaskIndex, _lidx);
return SIDL_STATUS_OK;
}
static int _serSysEncUE_Category_v1020_Type_ue_Category_V1020_Optional(unsigned char* _buffer, size_t _size, size_t* _lidx, const struct UE_Category_v1020_Type_ue_Category_V1020_Optional* p)
{
(void)_size; // TODO: generate boundaries checking
......@@ -30667,6 +30718,14 @@ static int _serSysEncSystemRequest_Type_Value(unsigned char* _buffer, size_t _si
_serSysEncPDCP_CountReq_Type(_buffer, _size, _lidx, &p->PdcpCount);
return SIDL_STATUS_OK;
}
if (d == SystemRequest_Type_PdcpHandoverControl) {
_serSysEncPDCP_HandoverControlReq_Type(_buffer, _size, _lidx, &p->PdcpHandoverControl);
return SIDL_STATUS_OK;
}
if (d == SystemRequest_Type_PdcchOrder) {
_serSysEncRA_PDCCH_Order_Type(_buffer, _size, _lidx, &p->PdcchOrder);
return SIDL_STATUS_OK;
}
if (d == SystemRequest_Type_UE_Cat_Info) {
_serSysEncUE_CategoryInfo_Type(_buffer, _size, _lidx, &p->UE_Cat_Info);
return SIDL_STATUS_OK;
......@@ -62285,6 +62344,59 @@ static int _serSysDecPDCP_CountReq_Type(const unsigned char* _buffer, size_t _si
return SIDL_STATUS_OK;
}
static int _serSysDecPDCP_HandoverInit_Type(const unsigned char* _buffer, size_t _size, size_t* _lidx, struct PDCP_HandoverInit_Type* p)
{
(void)_size; // TODO: generate boundaries checking
{
size_t _tmp;
NTOH_32(_tmp, &_buffer[*_lidx], _lidx);
p->SourceCellId = (EUTRA_CellId_Type)_tmp;
}
return SIDL_STATUS_OK;
}
static int _serSysDecPDCP_HandoverControlReq_Type_Value(const unsigned char* _buffer, size_t _size, size_t* _lidx, union PDCP_HandoverControlReq_Type_Value* p, enum PDCP_HandoverControlReq_Type_Sel d)
{
(void)_size; // TODO: generate boundaries checking
if (d == PDCP_HandoverControlReq_Type_HandoverInit) {
_serSysDecPDCP_HandoverInit_Type(_buffer, _size, _lidx, &p->HandoverInit);
return SIDL_STATUS_OK;
}
if (d == PDCP_HandoverControlReq_Type_HandoverComplete) {
NTOH_8(p->HandoverComplete, &_buffer[*_lidx], _lidx);
return SIDL_STATUS_OK;
}
return SIDL_STATUS_ERROR;
}
static int _serSysDecPDCP_HandoverControlReq_Type(const unsigned char* _buffer, size_t _size, size_t* _lidx, struct PDCP_HandoverControlReq_Type* p)
{
(void)_size; // TODO: generate boundaries checking
{
size_t _tmp;
NTOH_32(_tmp, &_buffer[*_lidx], _lidx);
p->d = (enum PDCP_HandoverControlReq_Type_Sel)_tmp;
}
_serSysDecPDCP_HandoverControlReq_Type_Value(_buffer, _size, _lidx, &p->v, p->d);
return SIDL_STATUS_OK;
}
static int _serSysDecRA_PDCCH_Order_Type(const unsigned char* _buffer, size_t _size, size_t* _lidx, struct RA_PDCCH_Order_Type* p)
{
(void)_size; // TODO: generate boundaries checking
NTOH_8(p->PreambleIndex, &_buffer[*_lidx], _lidx);
NTOH_8(p->PrachMaskIndex, &_buffer[*_lidx], _lidx);
return SIDL_STATUS_OK;
}
static int _serSysDecUE_Category_v1020_Type_ue_Category_V1020_Optional(const unsigned char* _buffer, size_t _size, size_t* _lidx, struct UE_Category_v1020_Type_ue_Category_V1020_Optional* p)
{
(void)_size; // TODO: generate boundaries checking
......@@ -62466,6 +62578,14 @@ static int _serSysDecSystemRequest_Type_Value(const unsigned char* _buffer, size
_serSysDecPDCP_CountReq_Type(_buffer, _size, _lidx, _mem, &p->PdcpCount);
return SIDL_STATUS_OK;
}
if (d == SystemRequest_Type_PdcpHandoverControl) {
_serSysDecPDCP_HandoverControlReq_Type(_buffer, _size, _lidx, &p->PdcpHandoverControl);
return SIDL_STATUS_OK;
}
if (d == SystemRequest_Type_PdcchOrder) {
_serSysDecRA_PDCCH_Order_Type(_buffer, _size, _lidx, &p->PdcchOrder);
return SIDL_STATUS_OK;
}
if (d == SystemRequest_Type_UE_Cat_Info) {
_serSysDecUE_CategoryInfo_Type(_buffer, _size, _lidx, &p->UE_Cat_Info);
return SIDL_STATUS_OK;
......@@ -781,6 +781,15 @@ struct L1Mac_IndicationControl_Type {
struct IndicationAndControlMode_Type_DC_PHR_Optional DC_PHR;
};
typedef uint8_t PrachPreambleIndex_Type;
typedef uint8_t PrachMaskIndex_Type;
struct RA_PDCCH_Order_Type {
PrachPreambleIndex_Type PreambleIndex;
PrachMaskIndex_Type PrachMaskIndex;
};
struct CellAttenuationConfig_Type_CellAttenuationList_Type_Dynamic {
size_t d;
struct CellAttenuationConfig_Type* v;
......@@ -795,6 +804,26 @@ struct RadioBearer_Type_RadioBearerList_Type_Dynamic {
typedef struct RadioBearer_Type_RadioBearerList_Type_Dynamic RadioBearerList_Type;
struct PDCP_HandoverInit_Type {
EUTRA_CellId_Type SourceCellId;
};
enum PDCP_HandoverControlReq_Type_Sel {
PDCP_HandoverControlReq_Type_UNBOUND_VALUE = 0,
PDCP_HandoverControlReq_Type_HandoverInit = 1,
PDCP_HandoverControlReq_Type_HandoverComplete = 2,
};
union PDCP_HandoverControlReq_Type_Value {
struct PDCP_HandoverInit_Type HandoverInit;
bool HandoverComplete;
};
struct PDCP_HandoverControlReq_Type {
enum PDCP_HandoverControlReq_Type_Sel d;
union PDCP_HandoverControlReq_Type_Value v;
};
enum SystemRequest_Type_Sel {
SystemRequest_Type_UNBOUND_VALUE = 0,
SystemRequest_Type_Cell = 1,
......@@ -805,6 +834,8 @@ enum SystemRequest_Type_Sel {
SystemRequest_Type_Paging = 7,
SystemRequest_Type_L1MacIndCtrl = 8,
SystemRequest_Type_PdcpCount = 10,
SystemRequest_Type_PdcpHandoverControl = 11,
SystemRequest_Type_PdcchOrder = 13,
SystemRequest_Type_UE_Cat_Info = 18,
};
......@@ -817,6 +848,8 @@ union SystemRequest_Type_Value {
struct PagingTrigger_Type Paging;
struct L1Mac_IndicationControl_Type L1MacIndCtrl;
struct PDCP_CountReq_Type PdcpCount;
struct PDCP_HandoverControlReq_Type PdcpHandoverControl;
struct RA_PDCCH_Order_Type PdcchOrder;
struct UE_CategoryInfo_Type UE_Cat_Info;
};
......
This diff is collapsed.
......@@ -439,9 +439,35 @@ struct L1Mac_IndicationControl_Type {
SIDL_OPTIONAL(IndicationAndControlMode_Type, DC_PHR);
};
typedef uint8_t PrachPreambleIndex_Type;
typedef uint8_t PrachMaskIndex_Type;
struct RA_PDCCH_Order_Type {
PrachPreambleIndex_Type PreambleIndex;
PrachMaskIndex_Type PrachMaskIndex;
};
typedef SIDL_DYNAMIC_OF_STRUCT(CellAttenuationConfig_Type, CellAttenuationList_Type);
typedef SIDL_DYNAMIC_OF_STRUCT(RadioBearer_Type, RadioBearerList_Type);
struct PDCP_HandoverInit_Type
{
EUTRA_CellId_Type SourceCellId;
};
SIDL_UNION_ENUM(PDCP_HandoverControlReq_Type) {
PDCP_HandoverControlReq_Type_UNBOUND_VALUE,
PDCP_HandoverControlReq_Type_HandoverInit,
PDCP_HandoverControlReq_Type_HandoverComplete
};
SIDL_UNION_BEGIN(PDCP_HandoverControlReq_Type) {
SIDL_UNION_CASE(PDCP_HandoverControlReq_Type_HandoverInit)
struct PDCP_HandoverInit_Type HandoverInit;
SIDL_UNION_CASE(PDCP_HandoverControlReq_Type_HandoverComplete)
bool HandoverComplete;
} SIDL_UNION_END;
SIDL_UNION_ENUM(SystemRequest_Type) {
SystemRequest_Type_UNBOUND_VALUE,
SystemRequest_Type_Cell,
......@@ -454,9 +480,9 @@ SIDL_UNION_ENUM(SystemRequest_Type) {
SystemRequest_Type_L1MacIndCtrl,
// SystemRequest_Type_RlcIndCtrl,
SystemRequest_Type_PdcpCount = 10,
// SystemRequest_Type_PdcpHandoverControl,
SystemRequest_Type_PdcpHandoverControl = 11,
// SystemRequest_Type_L1__TestMode,
// SystemRequest_Type_PdcchOrder,
SystemRequest_Type_PdcchOrder = 13,
// SystemRequest_Type_ActivateScell,
// SystemRequest_Type_MbmsConfig,
// SystemRequest_Type_PDCCH__MCCH__ChangeNotification,
......@@ -488,9 +514,11 @@ SIDL_UNION_BEGIN(SystemRequest_Type) {
// SIDL_UNION_CASE(SystemRequest_Type_RlcIndCtrl)
SIDL_UNION_CASE(SystemRequest_Type_PdcpCount)
struct PDCP_CountReq_Type PdcpCount;
// SIDL_UNION_CASE(SystemRequest_Type_PdcpHandoverControl)
SIDL_UNION_CASE(SystemRequest_Type_PdcpHandoverControl)
struct PDCP_HandoverControlReq_Type PdcpHandoverControl;
// SIDL_UNION_CASE(SystemRequest_Type_L1__TestMode)
// SIDL_UNION_CASE(SystemRequest_Type_PdcchOrder)
SIDL_UNION_CASE(SystemRequest_Type_PdcchOrder)
struct RA_PDCCH_Order_Type PdcchOrder;
// SIDL_UNION_CASE(SystemRequest_Type_ActivateScell)
// SIDL_UNION_CASE(SystemRequest_Type_MbmsConfig)
// SIDL_UNION_CASE(SystemRequest_Type_PDCCH__MCCH__ChangeNotification)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment