X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Frtos%2Fmqx.c;h=0ba462c9a7b5f7723a8db4e9d5b9ed4ba897beeb;hb=33d220d10a069be34095313f51ae22052a079b34;hp=bbb96b2f9ad1ec05200a5ad1acda7ce8c20b0e84;hpb=c50047bb418da6a4ed735ca87acee04e7fd2dbe7;p=openocd.git

diff --git a/src/rtos/mqx.c b/src/rtos/mqx.c
index bbb96b2f9a..0ba462c9a7 100644
--- a/src/rtos/mqx.c
+++ b/src/rtos/mqx.c
@@ -138,12 +138,12 @@ static int mqx_target_read_buffer(
 {
 	int status = mqx_valid_address_check(target->rtos, address);
 	if (status != ERROR_OK) {
-		LOG_WARNING("MQX RTOS - target address 0x%X is not allowed to read", address);
+		LOG_WARNING("MQX RTOS - target address 0x%" PRIx32 " is not allowed to read", address);
 		return status;
 	}
 	status = target_read_buffer(target, address, size, buffer);
 	if (status != ERROR_OK) {
-		LOG_ERROR("MQX RTOS - reading target address 0x%X failed", address);
+		LOG_ERROR("MQX RTOS - reading target address 0x%" PRIx32" failed", address);
 		return status;
 	}
 	return ERROR_OK;
@@ -181,7 +181,8 @@ static int mqx_get_member(
 		rtos->target, base_address + member_offset, member_width, result
 	);
 	if (status != ERROR_OK)
-		LOG_WARNING("MQX RTOS - cannot read \"%s\" at address 0x%X", member_name, base_address + member_offset);
+		LOG_WARNING("MQX RTOS - cannot read \"%s\" at address 0x%" PRIx32,
+			    member_name, (uint32_t)(base_address + member_offset));
 	return status;
 }
 
@@ -291,6 +292,12 @@ static int mqx_update_threads(
 	uint16_t task_queue_size = 0;
 	uint32_t active_td_addr = 0;
 
+	if (!rtos->rtos_specific_params)
+		return -3;
+
+	if (!rtos->symbols)
+		return -4;
+
 	/* clear old data */
 	rtos_free_threadlist(rtos);
 	/* check scheduler */
@@ -435,7 +442,7 @@ static int mqx_update_threads(
 		if (NULL == rtos->thread_details[i].extra_info_str)
 			return ERROR_FAIL;
 		snprintf(
-			rtos->thread_details[i].extra_info_str, extra_info_length, "%s : 0x%x : %u",
+			rtos->thread_details[i].extra_info_str, extra_info_length, "%s : 0x%"PRIx32 " : %" PRIu32,
 			state_name, task_addr, task_errno
 		);
 		/* set active thread */