x86_32_common: fix some warnings

[openocd] / src / target / etb.h

diff --git a/src/target/etb.h b/src/target/etb.h
index 57c0dc62e60e40bcc0e321a239fa10a2bf2f9bf8..680c8a1ab8f80de721030a63528a58e85f5388ad 100644 (file)
--- a/src/target/etb.h
+++ b/src/target/etb.h
@@ -13,18 +13,14 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   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.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef ETB_H
-#define ETB_H
 
-#include "etm.h"
+#ifndef OPENOCD_TARGET_ETB_H
+#define OPENOCD_TARGET_ETB_H
 
 /* ETB registers */
-enum
-{
+enum {
        ETB_ID = 0x00,
        ETB_RAM_DEPTH = 0x01,
        ETB_RAM_WIDTH = 0x02,
@@ -36,32 +32,27 @@ enum
        ETB_CTRL = 0x08,
 };
 
-typedef struct etb_s
-{
-       etm_context_t *etm_ctx;
-       jtag_tap_t *tap;
-       u32 cur_scan_chain;
-       reg_cache_t *reg_cache;
+struct etb {
+       struct etm_context *etm_ctx;
+       struct jtag_tap *tap;
+       uint32_t cur_scan_chain;
+       struct reg_cache *reg_cache;
 
        /* ETB parameters */
-       u32 ram_depth;
-       u32 ram_width;
-} etb_t;
+       uint32_t ram_depth;
+       uint32_t ram_width;
 
-typedef struct etb_reg_s
-{
-       u32 addr;
-       etb_t *etb;
-} etb_reg_t;
+       /** how much trace buffer to fill after trigger */
+       unsigned trigger_percent;
+};
+
+struct etb_reg {
+       uint32_t addr;
+       struct etb *etb;
+};
 
-extern etm_capture_driver_t etb_capture_driver;
+extern struct etm_capture_driver etb_capture_driver;
 
-extern reg_cache_t* etb_build_reg_cache(etb_t *etb);
-extern int etb_read_reg(reg_t *reg);
-extern int etb_write_reg(reg_t *reg, u32 value);
-extern int etb_read_reg_w_check(reg_t *reg, uint8_t* check_value, uint8_t* check_mask);
-extern int etb_store_reg(reg_t *reg);
-extern int etb_set_reg(reg_t *reg, u32 value);
-extern int etb_set_reg_w_exec(reg_t *reg, uint8_t *buf);
+struct reg_cache *etb_build_reg_cache(struct etb *etb);
 
-#endif /* ETB_H */
+#endif /* OPENOCD_TARGET_ETB_H */