[Openocd-svn] r2310 - trunk/src/target

[<du...@ma...>]

Author: duane
Date: 2009-06-21 05:15:59 +0200 (Sun, 21 Jun 2009)
New Revision: 2310

Modified:
   trunk/src/target/armv4_5_mmu.c
Log:
C99 printf() -Werror fixes

Modified: trunk/src/target/armv4_5_mmu.c
===================================================================
--- trunk/src/target/armv4_5_mmu.c	2009-06-21 03:15:51 UTC (rev 2309)
+++ trunk/src/target/armv4_5_mmu.c	2009-06-21 03:15:59 UTC (rev 2310)
@@ -43,7 +43,7 @@
 		4, 1, (uint8_t*)&first_lvl_descriptor);
 	first_lvl_descriptor = target_buffer_get_u32(target, (uint8_t*)&first_lvl_descriptor);
 
-	LOG_DEBUG("1st lvl desc: %8.8x", first_lvl_descriptor);
+	LOG_DEBUG("1st lvl desc: %8.8" PRIx32 "", first_lvl_descriptor);
 
 	if ((first_lvl_descriptor & 0x3) == 0)
 	{
@@ -88,7 +88,7 @@
 
 	second_lvl_descriptor = target_buffer_get_u32(target, (uint8_t*)&second_lvl_descriptor);
 
-	LOG_DEBUG("2nd lvl desc: %8.8x", second_lvl_descriptor);
+	LOG_DEBUG("2nd lvl desc: %8.8" PRIx32 "", second_lvl_descriptor);
 
 	if ((second_lvl_descriptor & 0x3) == 0)
 	{
@@ -200,7 +200,7 @@
 			switch (pa)
 			{
 				case ERROR_TARGET_TRANSLATION_FAULT:
-					command_print(cmd_ctx, "no valid translation for 0x%8.8x", va);
+					command_print(cmd_ctx, "no valid translation for 0x%8.8" PRIx32 "", va);
 					break;
 				default:
 					command_print(cmd_ctx, "unknown translation error");
@@ -208,8 +208,8 @@
 			return ERROR_OK;
 		}
 
-		command_print(cmd_ctx, "0x%8.8x -> 0x%8.8x, type: %s, cb: %i, domain: %i, ap: %2.2x",
-			va, pa, armv4_5_mmu_page_type_names[type], cb, domain, ap);
+		command_print(cmd_ctx, "0x%8.8" PRIx32 " -> 0x%8.8" PRIx32 ", type: %s, cb: %i, domain: %d, ap: %2.2x",
+			      va, pa, armv4_5_mmu_page_type_names[type], (int)cb, domain, (int)ap);
 	}
 
 	return ERROR_OK;
@@ -282,12 +282,12 @@
 	for (i = 0; i < count; i++)
 	{
 		if (i%8 == 0)
-			output_len += snprintf(output + output_len, 128 - output_len, "0x%8.8x: ", address + (i*size));
+			output_len += snprintf(output + output_len, 128 - output_len, "0x%8.8" PRIx32 ": ", address + (i*size));
 
 		switch (size)
 		{
 			case 4:
-				output_len += snprintf(output + output_len, 128 - output_len, "%8.8x ", target_buffer_get_u32(target, &buffer[i*4]));
+				output_len += snprintf(output + output_len, 128 - output_len, "%8.8" PRIx32 " ", target_buffer_get_u32(target, &buffer[i*4]));
 				break;
 			case 2:
 				output_len += snprintf(output + output_len, 128 - output_len, "%4.4x ", target_buffer_get_u16(target, &buffer[i*2]));