openocd-commit Mailing List for OpenOCD - Open On-Chip Debugger (Page 250)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Author: duane
Date: 2009-06-21 05:23:28 +0200 (Sun, 21 Jun 2009)
New Revision: 2345

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

Modified: trunk/src/flash/flash.c
===================================================================

--- trunk/src/flash/flash.c	2009-06-21 03:22:10 UTC (rev 2344)
+++ trunk/src/flash/flash.c	2009-06-21 03:23:28 UTC (rev 2345)
@@ -92,7 +92,8 @@
 	retval=bank->driver->write(bank, buffer, offset, count);
 	if (retval!=ERROR_OK)
 	{
-		LOG_ERROR("error writing to flash at address 0x%08x at offset 0x%8.8x (%d)", bank->base, offset, retval);
+		LOG_ERROR("error writing to flash at address 0x%08" PRIx32 " at offset 0x%8.8" PRIx32 " (%d)", 
+			  bank->base, offset, retval);
 	}
 
 	return retval;
@@ -292,7 +293,7 @@
 
 			if ((retval=flash_drivers[i]->flash_bank_command(cmd_ctx, cmd, args, argc, c)) != ERROR_OK)
 			{
-				LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8x", args[0], c->base);
+				LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32 , args[0], c->base);
 				free(c);
 				return retval;
 			}
@@ -349,8 +350,14 @@
 			if ((retval = p->driver->auto_probe(p)) != ERROR_OK)
 				return retval;
 
-			command_print(cmd_ctx, "#%i: %s at 0x%8.8x, size 0x%8.8x, buswidth %i, chipwidth %i",
-						i, p->driver->name, p->base, p->size, p->bus_width, p->chip_width);
+			command_print(cmd_ctx, 
+				      "#%" PRIi32 " : %s at 0x%8.8" PRIx32 ", size 0x%8.8" PRIx32 ", buswidth %i, chipwidth %i",
+				      i,
+				      p->driver->name, 
+				      p->base, 
+				      p->size, 
+				      p->bus_width, 
+				      p->chip_width);
 			for (j = 0; j < p->num_sectors; j++)
 			{
 				char *protect_state;
@@ -362,9 +369,13 @@
 				else
 					protect_state = "protection state unknown";
 
-				command_print(cmd_ctx, "\t#%3i: 0x%8.8x (0x%x %ikB) %s",
-							j, p->sectors[j].offset, p->sectors[j].size, p->sectors[j].size>>10,
-							protect_state);
+				command_print(cmd_ctx, 
+					      "\t#%3i: 0x%8.8" PRIx32 " (0x%" PRIx32 " %" PRIi32 "kB) %s",
+					      j,
+					      p->sectors[j].offset, 
+					      p->sectors[j].size, 
+					      p->sectors[j].size>>10,
+					      protect_state);
 			}
 
 			*buf = '\0'; /* initialize buffer, otherwise it migh contain garbage if driver function fails */
@@ -393,16 +404,16 @@
 	{
 		if ((retval = p->driver->probe(p)) == ERROR_OK)
 		{
-			command_print(cmd_ctx, "flash '%s' found at 0x%8.8x", p->driver->name, p->base);
+			command_print(cmd_ctx, "flash '%s' found at 0x%8.8" PRIx32, p->driver->name, p->base);
 		}
 		else if (retval == ERROR_FLASH_BANK_INVALID)
 		{
-			command_print(cmd_ctx, "probing failed for flash bank '#%s' at 0x%8.8x",
+			command_print(cmd_ctx, "probing failed for flash bank '#%s' at 0x%8.8" PRIx32,
 						  args[0], p->base);
 		}
 		else
 		{
-			command_print(cmd_ctx, "unknown error when probing flash bank '#%s' at 0x%8.8x",
+			command_print(cmd_ctx, "unknown error when probing flash bank '#%s' at 0x%8.8" PRIx32,
 						  args[0], p->base);
 		}
 	}
@@ -434,7 +445,7 @@
 		}
 		else
 		{
-			command_print(cmd_ctx, "unknown error when checking erase state of flash bank #%s at 0x%8.8x",
+			command_print(cmd_ctx, "unknown error when checking erase state of flash bank #%s at 0x%8.8" PRIx32,
 				args[0], p->base);
 		}
 
@@ -449,9 +460,13 @@
 			else
 				erase_state = "erase state unknown";
 
-			command_print(cmd_ctx, "\t#%3i: 0x%8.8x (0x%x %ikB) %s",
-						j, p->sectors[j].offset, p->sectors[j].size, p->sectors[j].size>>10,
-						erase_state);
+			command_print(cmd_ctx,
+				      "\t#%3i: 0x%8.8" PRIx32 " (0x%" PRIx32 " %" PRIi32 "kB) %s",
+				      j, 
+				      p->sectors[j].offset, 
+				      p->sectors[j].size, 
+				      p->sectors[j].size>>10,
+				      erase_state);
 		}
 	}
 
@@ -525,11 +540,11 @@
 		}
 		else if (retval == ERROR_FLASH_OPERATION_FAILED)
 		{
-			command_print(cmd_ctx, "checking protection state failed (possibly unsupported) by flash #%s at 0x%8.8x", args[0], p->base);
+			command_print(cmd_ctx, "checking protection state failed (possibly unsupported) by flash #%s at 0x%8.8" PRIx32, args[0], p->base);
 		}
 		else
 		{
-			command_print(cmd_ctx, "unknown error when checking protection state of flash bank '#%s' at 0x%8.8x", args[0], p->base);
+			command_print(cmd_ctx, "unknown error when checking protection state of flash bank '#%s' at 0x%8.8" PRIx32, args[0], p->base);
 		}
 	}
 	else
@@ -693,9 +708,12 @@
 	}
 	if (retval == ERROR_OK)
 	{
-		command_print(cmd_ctx, "wrote %u byte from file %s in %s (%f kb/s)",
-				written, args[0], duration_text,
-				(float)written / 1024.0 / ((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0)));
+		command_print(cmd_ctx, 
+					  "wrote %" PRIu32 " byte from file %s in %s (%f kb/s)",
+					  written,
+					  args[0], 
+					  duration_text,
+					  (float)written / 1024.0 / ((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0)));
 	}
 	free(duration_text);
 
@@ -795,7 +813,8 @@
 		{
 			if (readback[i]!=chunk[i])
 			{
-				LOG_ERROR("Verfication error address 0x%08x, read back 0x%02x, expected 0x%02x", address + wrote + i, readback[i], chunk[i]);
+				LOG_ERROR("Verfication error address 0x%08" PRIx32 ", read back 0x%02x, expected 0x%02x", 
+						  address + wrote + i, readback[i], chunk[i]);
 				return ERROR_FAIL;
 			}
 		}
@@ -812,9 +831,12 @@
 		float speed;
 		speed=wrote / 1024.0;
 		speed/=((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0));
-		command_print(cmd_ctx, "wrote %d bytes to 0x%8.8x in %s (%f kb/s)",
-			count*wordsize, address, duration_text,
-			speed);
+		command_print(cmd_ctx, 
+					  "wrote %" PRId32 " bytes to 0x%8.8" PRIx32 " in %s (%f kb/s)",
+					  count*wordsize, 
+					  address, 
+					  duration_text,
+					  speed);
 	}
 	free(duration_text);
 	return ERROR_OK;
@@ -874,9 +896,14 @@
 	}
 	if (retval==ERROR_OK)
 	{
-	command_print(cmd_ctx, "wrote  %lld byte from file %s to flash bank %li at offset 0x%8.8x in %s (%f kb/s)",
-		fileio.size, args[1], strtoul(args[0], NULL, 0), offset, duration_text,
-		(float)fileio.size / 1024.0 / ((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0)));
+	command_print(cmd_ctx, 
+				  "wrote  %lld byte from file %s to flash bank %li at offset 0x%8.8" PRIx32 " in %s (%f kb/s)",
+				  fileio.size, 
+				  args[1], 
+				  strtoul(args[0], NULL, 0), 
+				  offset, 
+				  duration_text,
+				  (float)fileio.size / 1024.0 / ((float)duration.duration.tv_sec + ((float)duration.duration.tv_usec / 1000000.0)));
 	}
 	free(duration_text);
 
@@ -920,7 +947,7 @@
 		if ((addr >= c->base) && (addr <= c->base + (c->size - 1)) && target == c->target)
 			return c;
 	}
-	LOG_ERROR("No flash at address 0x%08x\n", addr);
+	LOG_ERROR("No flash at address 0x%08" PRIx32 "\n", addr);
 	return NULL;
 }
 
@@ -1056,7 +1083,7 @@
 		if (run_address + run_size - 1 > c->base + c->size - 1)
 		{
 			LOG_WARNING("writing %d bytes only - as image section is %d bytes and bank is only %d bytes", \
-					c->base + c->size - run_address, run_size, c->size);
+				    (int)(c->base + c->size - run_address), (int)(run_size), (int)(c->size));
 			run_size = c->base + c->size - run_address;
 		}
 




2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (75)
2009	Jan (70)	Feb (20)	Mar (52)	Apr (149)	May (387)	Jun (466)	Jul (133)	Aug (87)	Sep (122)	Oct (140)	Nov (185)	Dec (105)
2010	Jan (85)	Feb (45)	Mar (75)	Apr (17)	May (41)	Jun (52)	Jul (33)	Aug (29)	Sep (36)	Oct (15)	Nov (26)	Dec (34)
2011	Jan (26)	Feb (25)	Mar (26)	Apr (29)	May (20)	Jun (27)	Jul (15)	Aug (32)	Sep (13)	Oct (64)	Nov (60)	Dec (10)
2012	Jan (64)	Feb (63)	Mar (39)	Apr (43)	May (54)	Jun (11)	Jul (30)	Aug (45)	Sep (11)	Oct (70)	Nov (24)	Dec (23)
2013	Jan (17)	Feb (8)	Mar (35)	Apr (40)	May (20)	Jun (24)	Jul (36)	Aug (25)	Sep (42)	Oct (40)	Nov (9)	Dec (21)
2014	Jan (29)	Feb (24)	Mar (60)	Apr (22)	May (22)	Jun (46)	Jul (11)	Aug (23)	Sep (26)	Oct (10)	Nov (14)	Dec (2)
2015	Jan (28)	Feb (47)	Mar (33)	Apr (58)	May (5)	Jun (1)	Jul	Aug (8)	Sep (12)	Oct (25)	Nov (58)	Dec (21)
2016	Jan (12)	Feb (40)	Mar (2)	Apr (1)	May (67)	Jun (2)	Jul (5)	Aug (36)	Sep	Oct (24)	Nov (17)	Dec (50)
2017	Jan (14)	Feb (16)	Mar (2)	Apr (35)	May (14)	Jun (16)	Jul (3)	Aug (3)	Sep	Oct (19)	Nov	Dec (16)
2018	Jan (55)	Feb (11)	Mar (34)	Apr (14)	May (4)	Jun (20)	Jul (39)	Aug (16)	Sep (17)	Oct (16)	Nov (20)	Dec (30)
2019	Jan (29)	Feb (24)	Mar (37)	Apr (26)	May (19)	Jun (21)	Jul (2)	Aug (3)	Sep (9)	Oct (12)	Nov (12)	Dec (12)
2020	Jan (47)	Feb (36)	Mar (54)	Apr (44)	May (37)	Jun (19)	Jul (32)	Aug (13)	Sep (16)	Oct (24)	Nov (32)	Dec (11)
2021	Jan (14)	Feb (5)	Mar (40)	Apr (32)	May (42)	Jun (31)	Jul (29)	Aug (47)	Sep (38)	Oct (17)	Nov (74)	Dec (33)
2022	Jan (11)	Feb (15)	Mar (40)	Apr (21)	May (39)	Jun (44)	Jul (19)	Aug (46)	Sep (79)	Oct (35)	Nov (21)	Dec (15)
2023	Jan (56)	Feb (13)	Mar (43)	Apr (28)	May (60)	Jun (15)	Jul (29)	Aug (28)	Sep (32)	Oct (21)	Nov (42)	Dec (39)
2024	Jan (35)	Feb (17)	Mar (28)	Apr (7)	May (14)	Jun (35)	Jul (30)	Aug (35)	Sep (30)	Oct (28)	Nov (38)	Dec (18)
2025	Jan (21)	Feb (28)	Mar (36)	Apr (35)	May (34)	Jun (58)	Jul (9)	Aug (54)	Sep (47)	Oct (15)	Nov (61)	Dec

openocd-commit Mailing List for OpenOCD - Open On-Chip Debugger (Page 250)

The Open On-Chip Debugger

openocd-commit — OpenOCD commit maling list - read only