X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fetm_dummy.c;h=0533d1e0d2fe58850af782c7ec5f69c96a1206af;hp=4d975c6a5174053e5d3278cc5a922c04c333a57e;hb=ed085f379e3fb53cce4d788d5b18cc5a7dcba026;hpb=e2001ba2116fe5c0c75f7953b5fbe35da65fa29d

diff --git a/src/target/etm_dummy.c b/src/target/etm_dummy.c
index 4d975c6a51..0533d1e0d2 100644
--- a/src/target/etm_dummy.c
+++ b/src/target/etm_dummy.c
@@ -15,42 +15,37 @@
  *   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.           *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "armv4_5.h"
+#include "arm.h"
 #include "etm_dummy.h"
 
-
 COMMAND_HANDLER(handle_etm_dummy_config_command)
 {
-	target_t *target;
+	struct target *target;
 	struct arm *arm;
 
-	target = get_target(args[0]);
+	target = get_target(CMD_ARGV[0]);
 
-	if (!target)
-	{
-		LOG_ERROR("target '%s' not defined", args[0]);
+	if (!target) {
+		LOG_ERROR("target '%s' not defined", CMD_ARGV[0]);
 		return ERROR_FAIL;
 	}
 
 	arm = target_to_arm(target);
-	if (!is_arm(arm))
-	{
-		command_print(cmd_ctx, "target '%s' isn't an ARM", args[0]);
+	if (!is_arm(arm)) {
+		command_print(CMD_CTX, "target '%s' isn't an ARM", CMD_ARGV[0]);
 		return ERROR_FAIL;
 	}
 
 	if (arm->etm)
-	{
 		arm->etm->capture_driver_priv = NULL;
-	}
-	else
-	{
+	else {
 		LOG_ERROR("target has no ETM defined, ETM dummy left unconfigured");
 		return ERROR_FAIL;
 	}
@@ -58,46 +53,53 @@ COMMAND_HANDLER(handle_etm_dummy_config_command)
 	return ERROR_OK;
 }
 
-static 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,
+	},
+	COMMAND_REGISTRATION_DONE
+};
 
-static int etm_dummy_init(etm_context_t *etm_ctx)
+static int etm_dummy_init(struct etm_context *etm_ctx)
 {
 	return ERROR_OK;
 }
 
-static 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;
 }
 
-static int etm_dummy_read_trace(etm_context_t *etm_ctx)
+static int etm_dummy_read_trace(struct etm_context *etm_ctx)
 {
 	return ERROR_OK;
 }
 
-static 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;
 }
 
-static int etm_dummy_stop_capture(etm_context_t *etm_ctx)
+static int etm_dummy_stop_capture(struct etm_context *etm_ctx)
 {
 	return ERROR_OK;
 }
 
-struct etm_capture_driver 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,