X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fhla_target.c;h=487ffe7c9970439482f1d5545df0714457e0859f;hb=2053120ba10d68339c61cd2b247bde01bda41ab7;hp=78ec7e885943ee55ccc35393c31837172cbf90b3;hpb=08ee7bb982b16742f52cfdc6c649d82ffa2eb177;p=openocd.git

diff --git a/src/target/hla_target.c b/src/target/hla_target.c
index 78ec7e8859..487ffe7c99 100644
--- a/src/target/hla_target.c
+++ b/src/target/hla_target.c
@@ -37,6 +37,7 @@
 #include "target_type.h"
 #include "armv7m.h"
 #include "cortex_m.h"
+#include "arm_adi_v5.h"
 #include "arm_semihosting.h"
 #include "target_request.h"
 #include <rtt/rtt.h>
@@ -202,7 +203,7 @@ static int adapter_target_create(struct target *target,
 {
 	LOG_DEBUG("%s", __func__);
 	struct adiv5_private_config *pc = target->private_config;
-	if (pc != NULL && pc->ap_num > 0) {
+	if (pc && pc->ap_num != DP_APSEL_INVALID && pc->ap_num != 0) {
 		LOG_ERROR("hla_target: invalid parameter -ap-num (> 0)");
 		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
@@ -213,6 +214,8 @@ static int adapter_target_create(struct target *target,
 		return ERROR_FAIL;
 	}
 
+	cortex_m->common_magic = CORTEX_M_COMMON_MAGIC;
+
 	adapter_init_arch_info(target, cortex_m, target->tap);
 
 	return ERROR_OK;
@@ -620,7 +623,7 @@ static int adapter_write_memory(struct target *target, target_addr_t address,
 	return adapter->layout->api->write_mem(adapter->handle, address, size, count, buffer);
 }
 
-static const struct command_registration adapter_command_handlers[] = {
+static const struct command_registration hla_command_handlers[] = {
 	{
 		.chain = arm_command_handlers,
 	},
@@ -646,7 +649,7 @@ struct target_type hla_target = {
 	.target_create = adapter_target_create,
 	.target_jim_configure = adiv5_jim_configure,
 	.examine = cortex_m_examine,
-	.commands = adapter_command_handlers,
+	.commands = hla_command_handlers,
 
 	.poll = adapter_poll,
 	.arch_state = armv7m_arch_state,