X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Ftrace.h;h=2966bbd94c34b5f51dde56269ca6f98d7cff932c;hb=17a052d6fe44fc265d48e94bdd3356d6f25ca064;hp=90bd600721f52740d053e2238f70ee1489698e6c;hpb=3c2eabd20f5182c53f0bfb0c6f2a9f2595434e87;p=openocd.git

diff --git a/src/target/trace.h b/src/target/trace.h
index 90bd600721..2966bbd94c 100644
--- a/src/target/trace.h
+++ b/src/target/trace.h
@@ -13,37 +13,36 @@
  *   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 TRACE_H
-#define TRACE_H
 
-#include "types.h"
+#ifndef OPENOCD_TARGET_TRACE_H
+#define OPENOCD_TARGET_TRACE_H
 
-struct target_s;
-struct command_context_s;
+struct target;
+struct command_context;
 
-typedef struct trace_point_s
-{
+struct trace_point {
 	uint32_t address;
-	u64 hit_counter;
-} trace_point_t;
+	uint64_t hit_counter;
+};
 
-typedef struct trace_s
-{
+struct trace {
 	uint32_t num_trace_points;
 	uint32_t trace_points_size;
-	trace_point_t *trace_points;
+	struct trace_point *trace_points;
 	uint32_t trace_history_size;
 	uint32_t *trace_history;
 	uint32_t trace_history_pos;
 	int trace_history_overflowed;
-} trace_t;
-
-typedef enum trace_status
-{
+};
+
+/**
+ * \todo This enum is one of the few things in this file related
+ * to *hardware* tracing ... split such "real" tracing out from
+ * the contrib/libdcc support.
+ */
+typedef enum trace_status {
 	TRACE_IDLE = 0x0,
 	TRACE_RUNNING = 0x1,
 	TRACE_TRIGGERED = 0x2,
@@ -51,10 +50,10 @@ typedef enum trace_status
 	TRACE_OVERFLOWED = 0x8,
 } trace_status_t;
 
-extern int trace_point(struct target_s *target, uint32_t number);
-extern int trace_register_commands(struct command_context_s *cmd_ctx);
+int trace_point(struct target *target, uint32_t number);
+int trace_register_commands(struct command_context *cmd_ctx);
 
-#define ERROR_TRACE_IMAGE_UNAVAILABLE		-(1500)
-#define ERROR_TRACE_INSTRUCTION_UNAVAILABLE	-(1501)
+#define ERROR_TRACE_IMAGE_UNAVAILABLE		(-1500)
+#define ERROR_TRACE_INSTRUCTION_UNAVAILABLE	(-1501)
 
-#endif /* TRACE_H */
+#endif /* OPENOCD_TARGET_TRACE_H */