1 files changed, 3 insertions, 60 deletions
diff --git a/decoder/include/opencsd/etmv4/trc_pkt_proc_etmv4.h b/decoder/include/opencsd/etmv4/trc_pkt_proc_etmv4.h
index 0d9ccea2be54..25bdf5109558 100644
--- a/decoder/include/opencsd/etmv4/trc_pkt_proc_etmv4.h
+++ b/decoder/include/opencsd/etmv4/trc_pkt_proc_etmv4.h
@@ -35,70 +35,13 @@
 #ifndef ARM_TRC_PKT_PROC_ETMV4_H_INCLUDED
 #define ARM_TRC_PKT_PROC_ETMV4_H_INCLUDED
 
+// split I & D into separate files, retain this header for backward compatibility
+// for now just include the I packet processor as that is the only one implemented.
 
 #include "trc_pkt_types_etmv4.h"
+#include "trc_pkt_proc_etmv4i.h"
 #include "common/trc_pkt_proc_base.h"
 
-class EtmV4IPktProcImpl;    /**< ETMv4 I channel packet processor */
-class EtmV4DPktProcImpl;    /**< ETMv4 D channel packet processor */
-class EtmV4ITrcPacket;
-class EtmV4DTrcPacket;
-class EtmV4Config;
-
-/** @addtogroup ocsd_pkt_proc
-@{*/
-
-class TrcPktProcEtmV4I : public TrcPktProcBase< EtmV4ITrcPacket,  ocsd_etmv4_i_pkt_type, EtmV4Config>
-{
-public:
-    TrcPktProcEtmV4I();
-    TrcPktProcEtmV4I(int instIDNum);
-    virtual ~TrcPktProcEtmV4I();
-
-protected:
-    /* implementation packet processing interface */
-    virtual ocsd_datapath_resp_t processData(  const ocsd_trc_index_t index,
-                                                const uint32_t dataBlockSize,
-                                                const uint8_t *pDataBlock,
-                                                uint32_t *numBytesProcessed);
-    virtual ocsd_datapath_resp_t onEOT();
-    virtual ocsd_datapath_resp_t onReset();
-    virtual ocsd_datapath_resp_t onFlush();
-    virtual ocsd_err_t onProtocolConfig();
-    virtual const bool isBadPacket() const;
-
-    friend class EtmV4IPktProcImpl;
-
-    EtmV4IPktProcImpl *m_pProcessor;
-};
-
-
-class TrcPktProcEtmV4D : public TrcPktProcBase< EtmV4DTrcPacket,  ocsd_etmv4_d_pkt_type, EtmV4Config>
-{
-public:
-    TrcPktProcEtmV4D();
-    TrcPktProcEtmV4D(int instIDNum);
-    virtual ~TrcPktProcEtmV4D();
-
-protected:
-    /* implementation packet processing interface */
-    virtual ocsd_datapath_resp_t processData(  const ocsd_trc_index_t index,
-                                                const uint32_t dataBlockSize,
-                                                const uint8_t *pDataBlock,
-                                                uint32_t *numBytesProcessed);
-    virtual ocsd_datapath_resp_t onEOT();
-    virtual ocsd_datapath_resp_t onReset();
-    virtual ocsd_datapath_resp_t onFlush();
-    virtual ocsd_err_t onProtocolConfig();
-    virtual const bool isBadPacket() const;
-
-    friend class EtmV4DPktProcImpl;
-
-    EtmV4DPktProcImpl *m_pProcessor;
-};
-
-/** @}*/
-
 #endif // ARM_TRC_PKT_PROC_ETMV4_H_INCLUDED
 
 /* End of File trc_pkt_proc_etmv4.h */