X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fetm_dummy.c;h=b18ce17449b0ca0bc22740c863e558115f7a7b95;hp=27a8eec1100121eda7722b68379ad97bb0c5ae96;hb=e59bb6c285d21ba59f785d4340048abda1c39466;hpb=a17caa387c0fb08ee2604e066b436d90d9cf0a2f
diff --git a/src/target/etm_dummy.c b/src/target/etm_dummy.c
index 27a8eec110..b18ce17449 100644
--- a/src/target/etm_dummy.c
+++ b/src/target/etm_dummy.c
@@ -13,18 +13,16 @@
* 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 "armv4_5.h"
+#include "arm.h"
#include "etm_dummy.h"
-
COMMAND_HANDLER(handle_etm_dummy_config_command)
{
struct target *target;
@@ -32,25 +30,20 @@ COMMAND_HANDLER(handle_etm_dummy_config_command)
target = get_target(CMD_ARGV[0]);
- if (!target)
- {
+ if (!target) {
LOG_ERROR("target '%s' not defined", CMD_ARGV[0]);
return ERROR_FAIL;
}
arm = target_to_arm(target);
- if (!is_arm(arm))
- {
+ 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;
}
@@ -61,9 +54,9 @@ COMMAND_HANDLER(handle_etm_dummy_config_command)
static const struct command_registration etm_dummy_config_command_handlers[] = {
{
.name = "config",
- .handler = &handle_etm_dummy_config_command,
+ .handler = handle_etm_dummy_config_command,
.mode = COMMAND_CONFIG,
- .usage = "",
+ .usage = "target",
},
COMMAND_REGISTRATION_DONE
};
@@ -77,11 +70,6 @@ static const struct command_registration etm_dummy_command_handlers[] = {
COMMAND_REGISTRATION_DONE
};
-static int etm_dummy_register_commands(struct command_context *cmd_ctx)
-{
- return register_commands(cmd_ctx, NULL, etm_dummy_command_handlers);
-}
-
static int etm_dummy_init(struct etm_context *etm_ctx)
{
return ERROR_OK;
@@ -107,10 +95,9 @@ 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,