This is the mail archive of the ecos-patches@sources.redhat.com mailing list for the eCos project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Redboot diag_printf format patch


Hi,

Here's again a little patch to fix some more diag_printf format string
warnings in Redboot.

Index: packages/redboot/current/ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/ChangeLog,v
retrieving revision 1.227
diff -u -u -r1.227 ChangeLog
--- packages/redboot/current/ChangeLog	10 Jun 2005 13:25:59 -0000	1.227
+++ packages/redboot/current/ChangeLog	22 Jun 2005 15:34:47 -0000
@@ -1,3 +1,9 @@
+2005-06-22  Peter Korsgaard  <jacmet@sunsite.dk>
+
+	* src/flash.c (fis_list, fis_free, fis_create):
+	* src/iomem.c (do_iopeek): Fixed compiler warnings about formats
+	strings for diag_printf.
+
 2005-06-09  David Vrabel  <dvrabel@arcom.com>
 
 	* src/xyzModem.c: Use the Ymodem length field by #define'ing
Index: packages/redboot/current/src/flash.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/src/flash.c,v
retrieving revision 1.72
diff -u -u -r1.72 flash.c
--- packages/redboot/current/src/flash.c	7 Jun 2005 18:55:52 -0000	1.72
+++ packages/redboot/current/src/flash.c	22 Jun 2005 15:34:47 -0000
@@ -535,7 +535,7 @@
             img = (struct fis_image_desc *) fis_work_block;
             img += image_indx;
             diag_printf("%-16s  0x%08lX  0x%08lX  0x%08lX  0x%08lX\n", img->name, 
-                        img->flash_base, 
+                        (unsigned long)img->flash_base, 
 #ifdef CYGSEM_REDBOOT_FIS_CRC_CHECK
                         show_cksums ? img->file_cksum : img->mem_base, 
                         show_datalen ? img->data_length : img->size, 
@@ -543,7 +543,7 @@
                         img->mem_base, 
                         img->size, 
 #endif
-                        img->entry_point);
+                        (unsigned long)img->entry_point);
         }
         last_addr = lowest_addr;
     } while (image_found == true);
@@ -654,7 +654,9 @@
 
     num_chunks = find_free(chunks);
     for (idx = 0;  idx < num_chunks;  idx++) {
-        diag_printf("  0x%08lX .. 0x%08lX\n", chunks[idx].start, chunks[idx].end);
+        diag_printf("  0x%08lX .. 0x%08lX\n", 
+		    (unsigned long)chunks[idx].start,
+		    (unsigned long)chunks[idx].end);
     }
 #endif
 }
@@ -853,7 +855,7 @@
         if (flash_addr_set && (img->flash_base != flash_addr)) {
             diag_printf("Image found, but flash address (%p)\n"
                         "             is incorrect (present image location %p)\n",
-                        flash_addr, img->flash_base);
+                        (void*)flash_addr, (void*)img->flash_base);
             
             return;
         }
Index: packages/redboot/current/src/iomem.c
===================================================================
RCS file: /cvs/ecos/ecos/packages/redboot/current/src/iomem.c,v
retrieving revision 1.1
diff -u -u -r1.1 iomem.c
--- packages/redboot/current/src/iomem.c	11 Nov 2004 09:09:37 -0000	1.1
+++ packages/redboot/current/src/iomem.c	22 Jun 2005 15:34:47 -0000
@@ -157,15 +157,15 @@
     switch (size) {
     case 4:
         HAL_READ_UINT32 ( base, value );
-        diag_printf("0x%04x = 0x%08x\n", base, value );
+        diag_printf("0x%04lx = 0x%08x\n", base, value );
         break;
     case 2:
         HAL_READ_UINT16 ( base, value );
-        diag_printf("0x%04x = 0x%04x\n", base, value );
+        diag_printf("0x%04lx = 0x%04x\n", base, value );
         break;
     case 1: 
         HAL_READ_UINT8 ( base, value );
-        diag_printf("0x%04x = 0x%02x\n", base, value );
+        diag_printf("0x%04lx = 0x%02x\n", base, value );
         break;
     }
 }

-- 
Bye, Peter Korsgaard

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]