summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cc5f4c0)
raw | patch | inline | side by side (parent: cc5f4c0)
author | Eric Ruei <e-ruei1@ti.com> | |
Tue, 25 Nov 2014 23:17:52 +0000 (18:17 -0500) | ||
committer | Eric Ruei <e-ruei1@ti.com> | |
Tue, 25 Nov 2014 23:17:52 +0000 (18:17 -0500) |
src/v0/pa.c | patch | blob | history | |
src/v1/pa.c | patch | blob | history |
diff --git a/src/v0/pa.c b/src/v0/pa.c
index 18ef3748d0b1f0432e9640a0e36e188b3dc193a2..2aaa2291cf481a84415e3d94c9d34158fd78afec 100644 (file)
--- a/src/v0/pa.c
+++ b/src/v0/pa.c
paLnkHandle_t *vlinkHdl\r
)\r
{\r
- paInst_t *paInst = (paInst_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, iHandle);\r
- paVirtualLnk_t *vlnk = (paVirtualLnk_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, *vlinkHdl);\r
+ paInst_t *paInst = (paInst_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, iHandle);\r
+ paVirtualLnk_t *vlnk;\r
paReturn_t ret = pa_INVALID_INPUT_HANDLE;\r
- paVirtualLnk_t *vlnkTable = (paVirtualLnk_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, paInst->paBufs[PA_BUFFNUM_VIRTUAL_LNK_TABLE].base);\r
+ paVirtualLnk_t *vlnkTable = (paVirtualLnk_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, paInst->paBufs[PA_BUFFNUM_VIRTUAL_LNK_TABLE].base);\r
\r
if(vlinkHdl == NULL)\r
return(pa_INVALID_INPUT_POINTER);\r
+ \r
+ vlnk = (paVirtualLnk_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, *vlinkHdl); \r
\r
Pa_osalBeginMemAccess ((void *) vlnkTable,\r
paInst->paBufs[PA_BUFFNUM_VIRTUAL_LNK_TABLE].size);\r
{\r
\r
paInst_t *paInst = (paInst_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, iHandle);\r
- pafrmCommand_t *fcmd;\r
- pafrmCommandAddLut2_t *al2;\r
- paL2L3Header_t *hdr;\r
- paVirtualLnk_t *vhdr;\r
- paL4Entry_t *hl4;\r
- uint16_t csize;\r
- paReturn_t ret = pa_OK;\r
- paReturn_t ret1;\r
- uint32_t mtCsKey; \r
- int fReplace = (params->validBitMap & pa_LUT2_PARAM_VALID_CTRL_BITMAP) &&\r
- (params->ctrlFlags & pa_LUT2_INFO_CONTROL_FLAG_REPLACE);\r
- uint8_t virtualLinkFlag = FALSE; \r
- paL3Entry_t *l3Table = (paL3Entry_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, paInst->paBufs[PA_BUFFNUM_L3_TABLE].base);\r
- paVirtualLnk_t *vlnkTable = (paVirtualLnk_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, paInst->paBufs[PA_BUFFNUM_VIRTUAL_LNK_TABLE].base);\r
+ pafrmCommand_t *fcmd;\r
+ pafrmCommandAddLut2_t *al2;\r
+ paL2L3Header_t *hdr;\r
+ paVirtualLnk_t *vhdr;\r
+ paL4Entry_t *hl4;\r
+ uint16_t csize;\r
+ paReturn_t ret = pa_OK;\r
+ paReturn_t ret1;\r
+ uint32_t mtCsKey; \r
+ int fReplace;\r
+ uint8_t virtualLinkFlag = FALSE; \r
+ paL3Entry_t *l3Table = (paL3Entry_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, paInst->paBufs[PA_BUFFNUM_L3_TABLE].base);\r
+ paVirtualLnk_t *vlnkTable = (paVirtualLnk_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, paInst->paBufs[PA_BUFFNUM_VIRTUAL_LNK_TABLE].base);\r
\r
if((params == NULL) || (routeInfo == NULL) || (retHandle == NULL) || (cmd == NULL) || (cmdSize == NULL) || (reply == NULL) || (cmdDest == NULL))\r
return(pa_INVALID_INPUT_POINTER);\r
+ \r
+ fReplace = (params->validBitMap & pa_LUT2_PARAM_VALID_CTRL_BITMAP) &&\r
+ (params->ctrlFlags & pa_LUT2_INFO_CONTROL_FLAG_REPLACE); \r
\r
/* Future enhancement for RM protection of LUT2 entries */\r
#if 0\r
diff --git a/src/v1/pa.c b/src/v1/pa.c
index 12c5f5b082ae7c222d2873cb9b6651a609da2203..30240ecfe34e125b339e366b6b058ee58da8430a 100644 (file)
--- a/src/v1/pa.c
+++ b/src/v1/pa.c
paReturn_t ret = pa_OK;
uint32_t mtCsKey;
uint8_t pdsp = 0;
- paAclEntry_t *aclTable = (paAclEntry_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, paInst->paBufs[PA_BUFFNUM_ACL_TABLE].base);;
+ paAclEntry_t *aclTable = (paAclEntry_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, paInst->paBufs[PA_BUFFNUM_ACL_TABLE].base);
if((cmd == NULL) || (cmdSize == NULL) || (reply == NULL) || (cmdDest == NULL))
)
{
paInst_t *paInst = (paInst_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, iHandle);
- paVirtualLnk_t *vlnk = (paVirtualLnk_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, *vlinkHdl);
+ paVirtualLnk_t *vlnk;
paReturn_t ret = pa_INVALID_INPUT_HANDLE;
paVirtualLnk_t *vlnkTable = (paVirtualLnk_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, paInst->paBufs[PA_BUFFNUM_VIRTUAL_LNK_TABLE].base);
if(vlinkHdl == NULL)
return(pa_INVALID_INPUT_POINTER);
+
+ vlnk = (paVirtualLnk_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, *vlinkHdl);
Pa_osalBeginMemAccess ((void *) vlnkTable,
paInst->paBufs[PA_BUFFNUM_VIRTUAL_LNK_TABLE].size);
paInst_t *paInst = (paInst_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, iHandle);
paFcEntry_t *fcTable = (paFcEntry_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, paInst->paBufs[PA_BUFFNUM_FC_TABLE].base);
paFcEntry_t fcEntry;
- paFcEntry_t* pRepEntry = (paFcEntry_t*) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, *retHandle);
+ paFcEntry_t* pRepEntry;
pafrmCommand_t *fcmd;
pafrmCommandAddLut1_t *al1;
int i;
return(pa_INVALID_LUT1_INDEX);
}
+ pRepEntry = (paFcEntry_t*) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, *retHandle);
+
/* Sanity check the command buffer */
csize = sizeof(pafrmCommand_t)+sizeof(pafrmCommandAddLut1_t)-sizeof(uint32_t);
if (*cmdSize < csize)
{
paInst_t *paInst = (paInst_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, iHandle);
- pafrmCommand_t *fcmd;
- pafrmCommandAddLut2_t *al2;
- paL2L3Header_t *hdr;
- paL4Entry_t *hl4;
- uint16_t csize, srcVC;
- paReturn_t ret = pa_OK;
- paReturn_t ret1;
- uint32_t mtCsKey;
- int fReplace;
- paL3Entry_t *l3Table = (paL3Entry_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, paInst->paBufs[PA_BUFFNUM_L3_TABLE].base);
- paVirtualLnk_t *vlnkTable = (paVirtualLnk_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, paInst->paBufs[PA_BUFFNUM_VIRTUAL_LNK_TABLE].base);
+ pafrmCommand_t *fcmd;
+ pafrmCommandAddLut2_t *al2;
+ paL2L3Header_t *hdr;
+ paL4Entry_t *hl4;
+ uint16_t csize, srcVC;
+ paReturn_t ret = pa_OK;
+ paReturn_t ret1;
+ uint32_t mtCsKey;
+ int fReplace;
+ paL3Entry_t *l3Table = (paL3Entry_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, paInst->paBufs[PA_BUFFNUM_L3_TABLE].base);
+ paVirtualLnk_t *vlnkTable = (paVirtualLnk_t *)pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, paInst->paBufs[PA_BUFFNUM_VIRTUAL_LNK_TABLE].base);
if((params == NULL) || (routeInfo == NULL) || (retHandle == NULL) || (cmd == NULL) || (cmdSize == NULL) || (reply == NULL) || (cmdDest == NULL))
return(pa_INVALID_INPUT_POINTER);