jtag/drivers/ftdi.c: removed memory leak

[fw/openocd] / src / target / etb.h

diff --git a/src/target/etb.h b/src/target/etb.h
index cc58b659a837b20f97cbf24c6ef1e2c2f569049a..d5cbd85c172194c1d9397bdbe7e0e835f95cdccf 100644 (file)
--- a/src/target/etb.h
+++ b/src/target/etb.h
@@ -15,16 +15,14 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
+
 #ifndef ETB_H
 #define ETB_H
 
-#include "etm.h"
-
 /* ETB registers */
-enum
-{
+enum {
        ETB_ID = 0x00,
        ETB_RAM_DEPTH = 0x01,
        ETB_RAM_WIDTH = 0x02,
@@ -36,26 +34,27 @@ enum
        ETB_CTRL = 0x08,
 };
 
-typedef struct etb_s
-{
-       etm_context_t *etm_ctx;
-       jtag_tap_t *tap;
+struct etb {
+       struct etm_context *etm_ctx;
+       struct jtag_tap *tap;
        uint32_t cur_scan_chain;
-       reg_cache_t *reg_cache;
+       struct reg_cache *reg_cache;
 
        /* ETB parameters */
        uint32_t ram_depth;
        uint32_t ram_width;
-} etb_t;
 
-typedef struct etb_reg_s
-{
+       /** how much trace buffer to fill after trigger */
+       unsigned trigger_percent;
+};
+
+struct etb_reg {
        uint32_t addr;
-       etb_t *etb;
-} etb_reg_t;
+       struct etb *etb;
+};
 
-extern etm_capture_driver_t etb_capture_driver;
+extern struct etm_capture_driver etb_capture_driver;
 
-reg_cache_t* etb_build_reg_cache(etb_t *etb);
+struct reg_cache *etb_build_reg_cache(struct etb *etb);
 
 #endif /* ETB_H */