summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Ruei2016-11-17 14:55:48 -0600
committerEric Ruei2016-11-17 14:55:48 -0600
commite95de49323678a55072c90fb213b94f96cf494b1 (patch)
tree893f8a4dbd1dc4ec5be659f0fceabe30dd19aad8
parent0f3a42c650d8537cbbf01bcd980dce4dc18e8d05 (diff)
parent76c7c0ac878d0bf55089a8b1d4d604ef4f4d8a07 (diff)
downloadpa-lld-e95de49323678a55072c90fb213b94f96cf494b1.tar.gz
pa-lld-e95de49323678a55072c90fb213b94f96cf494b1.tar.xz
pa-lld-e95de49323678a55072c90fb213b94f96cf494b1.zip
Merge pull request #1 in PROCESSOR-SDK/pa-lld from PRSDK-1508 to masterDEV.PA_LLD.03.00.02.01
* commit '76c7c0ac878d0bf55089a8b1d4d604ef4f4d8a07': removed a comment, which does not makesense fixed few more base2offset and offset2base issues fixed the issue of treating offset as a base during Pa_addCustomLut1 API
-rw-r--r--docs/ReleaseNotes_PA_LLD.docbin713728 -> 715264 bytes
-rw-r--r--docs/ReleaseNotes_PA_LLD.pdfbin929891 -> 935876 bytes
-rw-r--r--src/v0/pa.c2
-rw-r--r--src/v1/pa.c8
4 files changed, 6 insertions, 4 deletions
diff --git a/docs/ReleaseNotes_PA_LLD.doc b/docs/ReleaseNotes_PA_LLD.doc
index 48d89a1..ce5c8b4 100644
--- a/docs/ReleaseNotes_PA_LLD.doc
+++ b/docs/ReleaseNotes_PA_LLD.doc
Binary files differ
diff --git a/docs/ReleaseNotes_PA_LLD.pdf b/docs/ReleaseNotes_PA_LLD.pdf
index b17e0ee..71a3c57 100644
--- a/docs/ReleaseNotes_PA_LLD.pdf
+++ b/docs/ReleaseNotes_PA_LLD.pdf
Binary files differ
diff --git a/src/v0/pa.c b/src/v0/pa.c
index c94bbd6..021d410 100644
--- a/src/v0/pa.c
+++ b/src/v0/pa.c
@@ -2979,7 +2979,7 @@ paReturn_t Pa_addIp2 (Pa_Handle iHandle,
2979 if (params->validBitMap & pa_PARAM_VALID_CTRLBITMAP) { 2979 if (params->validBitMap & pa_PARAM_VALID_CTRLBITMAP) {
2980 /* Check if replace command is set */ 2980 /* Check if replace command is set */
2981 if (params->ctrlBitMap & pa_PARAM_CTRL_REPLACE) { 2981 if (params->ctrlBitMap & pa_PARAM_CTRL_REPLACE) {
2982 paL3Entry_t *l3EntryRep = (paL3Entry_t *) *retHandle; 2982 paL3Entry_t *l3EntryRep = (paL3Entry_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr, *retHandle);
2983 /* If the replace index entry provided is not active, 2983 /* If the replace index entry provided is not active,
2984 * flag the error to application 2984 * flag the error to application
2985 * Also, The replace index requested can not be 2985 * Also, The replace index requested can not be
diff --git a/src/v1/pa.c b/src/v1/pa.c
index e58645e..a08bf43 100644
--- a/src/v1/pa.c
+++ b/src/v1/pa.c
@@ -2830,7 +2830,7 @@ paReturn_t Pa_getLUT1Info ( Pa_Handle iHandle,
2830 paHandleL2L3_t l2l3handle, 2830 paHandleL2L3_t l2l3handle,
2831 paLUT1Info_t *lut1Info) 2831 paLUT1Info_t *lut1Info)
2832{ 2832{
2833 paL2L3Header_t *hdr = (paL2L3Header_t *) l2l3handle; /* L2L3 header, Must be first entry */ 2833 paL2L3Header_t *hdr = (paL2L3Header_t *) pa_CONV_OFFSET_TO_BASE(paLObj.cfg.instPoolBaseAddr,l2l3handle);
2834 paReturn_t ret = pa_OK; 2834 paReturn_t ret = pa_OK;
2835 2835
2836 /* To get pass warnings of un-used variables */ 2836 /* To get pass warnings of un-used variables */
@@ -5210,7 +5210,9 @@ paReturn_t Pa_addAcl (Pa_Handle iHandle,
5210 } 5210 }
5211 5211
5212 /* Insert the entry to the Link List */ 5212 /* Insert the entry to the Link List */
5213 ret1 = pa_insert_entry(listElemTable, paInst->nAcl, listInfoTable, insertMode, nextEntry, i, &priority, *retHandle); 5213 ret1 = pa_insert_entry(listElemTable, paInst->nAcl, listInfoTable, insertMode,
5214 (paHandleAcl_t) (nextEntry?pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr,nextEntry):0),
5215 i, &priority, *retHandle);
5214 5216
5215 if (ret1 != pa_OK) { 5217 if (ret1 != pa_OK) {
5216 ret = ret1; 5218 ret = ret1;
@@ -6342,7 +6344,7 @@ Pa_addCustomLut1_send_cmd:
6342 /* Add the status and pdsp NUM */ 6344 /* Add the status and pdsp NUM */
6343 l3Entry.hdr.status = PA_TBL_STAT_PENDING_SUBS_REPLY; 6345 l3Entry.hdr.status = PA_TBL_STAT_PENDING_SUBS_REPLY;
6344 if (prevLink != NULL) 6346 if (prevLink != NULL)
6345 l3Entry.pHandle = (paLnkHandle_t)pa_CONV_BASE_TO_OFFSET(paLObj.cfg.instPoolBaseAddr, prevLink); 6347 l3Entry.pHandle = (paLnkHandle_t) prevLink;
6346 l3Entry.hdr.type = PA_TABLE_ENTRY_TYPE_L3; 6348 l3Entry.hdr.type = PA_TABLE_ENTRY_TYPE_L3;
6347 l3Entry.hdr.subType = PA_TABLE_ENTRY_SUBYTPE_CUSTOM; 6349 l3Entry.hdr.subType = PA_TABLE_ENTRY_SUBYTPE_CUSTOM;
6348 l3Entry.hdr.tableIdx = i; 6350 l3Entry.hdr.tableIdx = i;