Missed RCTDL_ prefix (as it was mis-spelt) updated to OCSD_ on a data path response code. Result in minor changes to decoders / demux returning this value
Signed-off-by: Mike Leach mike.leach@linaro.org --- decoder/include/ocsd_if_types.h | 2 +- decoder/source/etmv3/trc_pkt_proc_etmv3_impl.cpp | 2 +- decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp | 16 ++++++++-------- decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.cpp | 2 +- decoder/source/ptm/trc_pkt_decode_ptm.cpp | 2 +- decoder/source/ptm/trc_pkt_proc_ptm.cpp | 2 +- decoder/source/stm/trc_pkt_proc_stm.cpp | 2 +- decoder/source/trc_frame_deformatter.cpp | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/decoder/include/ocsd_if_types.h b/decoder/include/ocsd_if_types.h index d17e254..3fa3032 100644 --- a/decoder/include/ocsd_if_types.h +++ b/decoder/include/ocsd_if_types.h @@ -179,7 +179,7 @@ typedef enum _ocsd_datapath_resp_t { OCSD_RESP_FATAL_NOT_INIT, /**< Processing Fatal Error : component unintialised. */ OCSD_RESP_FATAL_INVALID_OP, /**< Processing Fatal Error : invalid data path operation. */ OCSD_RESP_FATAL_INVALID_PARAM, /**< Processing Fatal Error : invalid parameter in datapath call. */ - RCDTL_RESP_FATAL_INVALID_DATA, /**< Processing Fatal Error : invalid trace data */ + OCSD_RESP_FATAL_INVALID_DATA, /**< Processing Fatal Error : invalid trace data */ OCSD_RESP_FATAL_SYS_ERR, /**< Processing Fatal Error : internal system error. */ } ocsd_datapath_resp_t;
diff --git a/decoder/source/etmv3/trc_pkt_proc_etmv3_impl.cpp b/decoder/source/etmv3/trc_pkt_proc_etmv3_impl.cpp index d6a4314..93111ff 100644 --- a/decoder/source/etmv3/trc_pkt_proc_etmv3_impl.cpp +++ b/decoder/source/etmv3/trc_pkt_proc_etmv3_impl.cpp @@ -109,7 +109,7 @@ ocsd_datapath_resp_t EtmV3PktProcImpl::processData(const ocsd_trc_index_t index, else { // bail out on any other error. - resp = RCDTL_RESP_FATAL_INVALID_DATA; + resp = OCSD_RESP_FATAL_INVALID_DATA; } } catch(...) diff --git a/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp b/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp index 9e96854..092f709 100644 --- a/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp +++ b/decoder/source/etmv4/trc_pkt_decode_etmv4i.cpp @@ -493,13 +493,13 @@ ocsd_datapath_resp_t TrcPktDecodeEtmV4I::decodePacket(bool &Complete) case ETM4_PKT_I_UNNUM_DS_MKR: /* Q packets */ case ETM4_PKT_I_Q: - resp = RCDTL_RESP_FATAL_INVALID_DATA; + resp = OCSD_RESP_FATAL_INVALID_DATA; LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_BAD_DECODE_PKT,"Unsupported packet type.")); break;
default: // any other packet - bad packet error - resp = RCDTL_RESP_FATAL_INVALID_DATA; + resp = OCSD_RESP_FATAL_INVALID_DATA; LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_BAD_DECODE_PKT,"Unknown packet type.")); break;
@@ -517,7 +517,7 @@ ocsd_datapath_resp_t TrcPktDecodeEtmV4I::decodePacket(bool &Complete) } else { - resp = RCDTL_RESP_FATAL_INVALID_DATA; + resp = OCSD_RESP_FATAL_INVALID_DATA; LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_BAD_DECODE_PKT,"Expected Address packet to follow exception packet.")); } } @@ -723,7 +723,7 @@ ocsd_datapath_resp_t TrcPktDecodeEtmV4I::commitElements(bool &Complete) if(pElem) err_idx = pElem->getRootIndex();
- resp = RCDTL_RESP_FATAL_INVALID_DATA; + resp = OCSD_RESP_FATAL_INVALID_DATA; LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_COMMIT_PKT_OVERRUN,err_idx,m_CSID,"Not enough elements to commit")); bPause = true; } @@ -861,7 +861,7 @@ ocsd_datapath_resp_t TrcPktDecodeEtmV4I::processAtom(const ocsd_atm_val atom, bo else { bCont = false; - resp = RCDTL_RESP_FATAL_INVALID_DATA; + resp = OCSD_RESP_FATAL_INVALID_DATA; LogError(ocsdError(OCSD_ERR_SEV_ERROR,err,pElem->getRootIndex(),m_CSID,"Error processing atom packet.")); return resp; } @@ -941,7 +941,7 @@ ocsd_datapath_resp_t TrcPktDecodeEtmV4I::processException() if(pElem->getP0Type() != P0_ADDR) { // no following address element - indicate processing error. - resp = RCDTL_RESP_FATAL_INVALID_DATA; + resp = OCSD_RESP_FATAL_INVALID_DATA; LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_BAD_PACKET_SEQ,pExceptElem->getRootIndex(),m_CSID,"Address missing in exception packet.")); } else @@ -1017,7 +1017,7 @@ ocsd_datapath_resp_t TrcPktDecodeEtmV4I::processException() } else { - resp = RCDTL_RESP_FATAL_INVALID_DATA; + resp = OCSD_RESP_FATAL_INVALID_DATA; LogError(ocsdError(OCSD_ERR_SEV_ERROR,err,m_excep_index,m_CSID,"Error processing exception packet.")); m_excep_proc = EXCEP_POP; // nothing more to do, reset to start of exception handling } @@ -1172,7 +1172,7 @@ ocsd_datapath_resp_t TrcPktDecodeEtmV4I::handleBadPacket(const char *reason) if(getComponentOpMode() && OCSD_OPFLG_PKTDEC_ERROR_BAD_PKTS) { // error out - stop decoding - resp = RCDTL_RESP_FATAL_INVALID_DATA; + resp = OCSD_RESP_FATAL_INVALID_DATA; LogError(ocsdError(OCSD_ERR_SEV_ERROR,OCSD_ERR_BAD_DECODE_PKT,reason)); } else diff --git a/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.cpp b/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.cpp index 89ea02c..0bc2e59 100644 --- a/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.cpp +++ b/decoder/source/etmv4/trc_pkt_proc_etmv4i_impl.cpp @@ -140,7 +140,7 @@ ocsd_datapath_resp_t EtmV4IPktProcImpl::processData( const ocsd_trc_index_t ind else { // bail out on any other error. - resp = RCDTL_RESP_FATAL_INVALID_DATA; + resp = OCSD_RESP_FATAL_INVALID_DATA; } } catch(...) diff --git a/decoder/source/ptm/trc_pkt_decode_ptm.cpp b/decoder/source/ptm/trc_pkt_decode_ptm.cpp index 8c3e4f3..2699637 100644 --- a/decoder/source/ptm/trc_pkt_decode_ptm.cpp +++ b/decoder/source/ptm/trc_pkt_decode_ptm.cpp @@ -506,7 +506,7 @@ ocsd_datapath_resp_t TrcPktDecodePtm::processAtomRange(const ocsd_atm_val A, con } else { - resp = RCDTL_RESP_FATAL_INVALID_DATA; + resp = OCSD_RESP_FATAL_INVALID_DATA; oss << "Error processing " << pkt_msg << " packet."; LogError(ocsdError(OCSD_ERR_SEV_ERROR,err,m_index_curr_pkt,m_CSID,oss.str())); return resp; diff --git a/decoder/source/ptm/trc_pkt_proc_ptm.cpp b/decoder/source/ptm/trc_pkt_proc_ptm.cpp index 8b329b5..33785b3 100644 --- a/decoder/source/ptm/trc_pkt_proc_ptm.cpp +++ b/decoder/source/ptm/trc_pkt_proc_ptm.cpp @@ -152,7 +152,7 @@ ocsd_datapath_resp_t TrcPktProcPtm::processData( const ocsd_trc_index_t index, else { // bail out on any other error. - resp = RCDTL_RESP_FATAL_INVALID_DATA; + resp = OCSD_RESP_FATAL_INVALID_DATA; } } catch(...) diff --git a/decoder/source/stm/trc_pkt_proc_stm.cpp b/decoder/source/stm/trc_pkt_proc_stm.cpp index 879630a..52b6c1f 100644 --- a/decoder/source/stm/trc_pkt_proc_stm.cpp +++ b/decoder/source/stm/trc_pkt_proc_stm.cpp @@ -130,7 +130,7 @@ ocsd_datapath_resp_t TrcPktProcStm::processData( const ocsd_trc_index_t index, else { // bail out on any other error. - resp = RCDTL_RESP_FATAL_INVALID_DATA; + resp = OCSD_RESP_FATAL_INVALID_DATA; } } catch(...) diff --git a/decoder/source/trc_frame_deformatter.cpp b/decoder/source/trc_frame_deformatter.cpp index 8e09045..07bed6f 100644 --- a/decoder/source/trc_frame_deformatter.cpp +++ b/decoder/source/trc_frame_deformatter.cpp @@ -274,7 +274,7 @@ ocsd_datapath_resp_t TraceFmtDcdImpl::processTraceData( } catch(const ocsdError &err) { LogError(err); - CollateDataPathResp(RCDTL_RESP_FATAL_INVALID_DATA); + CollateDataPathResp(OCSD_RESP_FATAL_INVALID_DATA); } catch(...) { LogError(ocsdError(OCSD_ERR_SEV_ERROR, OCSD_ERR_FAIL));