X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fetm_dummy.c;h=9f18d84a19475c9df1ad6b5557224d90066b197d;hp=881cd8735e2b577f62eb4f4f78d84bef498ff759;hb=57962f4d1c2db12dffa03c7357f5d7e0d8f71fb8;hpb=d47e1b8f362379d8a2307f49e2b42115a3f40524
diff --git a/src/target/etm_dummy.c b/src/target/etm_dummy.c
index 881cd8735e..9f18d84a19 100644
--- a/src/target/etm_dummy.c
+++ b/src/target/etm_dummy.c
@@ -13,101 +13,92 @@
* 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 . *
***************************************************************************/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include
-
+#include "arm.h"
#include "etm_dummy.h"
-#include "etm.h"
-#include "arm7_9_common.h"
-#include "log.h"
-#include "types.h"
-#include "binarybuffer.h"
-#include "target.h"
-#include "register.h"
-#include "jtag.h"
+COMMAND_HANDLER(handle_etm_dummy_config_command)
+{
+ struct target *target;
+ struct arm *arm;
-#include
+ target = get_target(CMD_ARGV[0]);
-int handle_etm_dummy_config_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
-{
- target_t *target;
- armv4_5_common_t *armv4_5;
- arm7_9_common_t *arm7_9;
-
- target = get_target_by_num(strtoul(args[0], NULL, 0));
-
- if (!target)
- {
- LOG_ERROR("target number '%s' not defined", args[0]);
- exit(-1);
+ if (!target) {
+ LOG_ERROR("target '%s' not defined", CMD_ARGV[0]);
+ return ERROR_FAIL;
}
-
- if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
- {
- command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target");
- return ERROR_OK;
- }
-
- if (arm7_9->etm_ctx)
- {
- arm7_9->etm_ctx->capture_driver_priv = NULL;
+
+ arm = target_to_arm(target);
+ if (!is_arm(arm)) {
+ command_print(CMD_CTX, "target '%s' isn't an ARM", CMD_ARGV[0]);
+ return ERROR_FAIL;
}
- else
- {
+
+ if (arm->etm)
+ arm->etm->capture_driver_priv = NULL;
+ else {
LOG_ERROR("target has no ETM defined, ETM dummy left unconfigured");
+ return ERROR_FAIL;
}
return ERROR_OK;
}
-int etm_dummy_register_commands(struct command_context_s *cmd_ctx)
-{
- command_t *etm_dummy_cmd;
-
- etm_dummy_cmd = register_command(cmd_ctx, NULL, "etm_dummy", NULL, COMMAND_ANY, "Dummy ETM capture driver");
-
- register_command(cmd_ctx, etm_dummy_cmd, "config", handle_etm_dummy_config_command, COMMAND_CONFIG, NULL);
-
- return ERROR_OK;
-}
+static const struct command_registration etm_dummy_config_command_handlers[] = {
+ {
+ .name = "config",
+ .handler = handle_etm_dummy_config_command,
+ .mode = COMMAND_CONFIG,
+ .usage = "target",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration etm_dummy_command_handlers[] = {
+ {
+ .name = "etm_dummy",
+ .mode = COMMAND_ANY,
+ .help = "Dummy ETM capture driver command group",
+ .chain = etm_dummy_config_command_handlers,
+ .usage = "",
+ },
+ COMMAND_REGISTRATION_DONE
+};
-int etm_dummy_init(etm_context_t *etm_ctx)
+static int etm_dummy_init(struct etm_context *etm_ctx)
{
return ERROR_OK;
}
-trace_status_t etm_dummy_status(etm_context_t *etm_ctx)
+static trace_status_t etm_dummy_status(struct etm_context *etm_ctx)
{
return TRACE_IDLE;
}
-int etm_dummy_read_trace(etm_context_t *etm_ctx)
+static int etm_dummy_read_trace(struct etm_context *etm_ctx)
{
return ERROR_OK;
}
-int etm_dummy_start_capture(etm_context_t *etm_ctx)
+static int etm_dummy_start_capture(struct etm_context *etm_ctx)
{
return ERROR_ETM_PORTMODE_NOT_SUPPORTED;
}
-int etm_dummy_stop_capture(etm_context_t *etm_ctx)
+static int etm_dummy_stop_capture(struct etm_context *etm_ctx)
{
return ERROR_OK;
}
-etm_capture_driver_t etm_dummy_capture_driver =
-{
+struct etm_capture_driver etm_dummy_capture_driver = {
.name = "dummy",
- .register_commands = etm_dummy_register_commands,
+ .commands = etm_dummy_command_handlers,
.init = etm_dummy_init,
.status = etm_dummy_status,
.start_capture = etm_dummy_start_capture,