Mercurial > ecos
changeset 2002:20fee0cef763
* src/net/enet.c (ntohs): Return type is a short.
* src/flash.c (fis_list, fis_free, fis_create):
* src/iomem.c (do_iopeek): Fixed compiler warnings about formats
strings for diag_printf.
| author | asl |
|---|---|
| date | Mon, 27 Jun 2005 18:17:36 +0000 |
| parents | 07de10fdb41e |
| children | 7725d216c7bc |
| files | packages/redboot/current/ChangeLog packages/redboot/current/include/net/net.h packages/redboot/current/src/flash.c packages/redboot/current/src/iomem.c packages/redboot/current/src/net/enet.c packages/redboot/current/src/net/ping.c |
| diffstat | 6 files changed, 22 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/redboot/current/ChangeLog +++ b/packages/redboot/current/ChangeLog @@ -1,3 +1,13 @@ +2005-06-27 Andrew Lunn <andrew.lunn@ascom.ch> + + * src/net/enet.c (ntohs): Return type is a short. + +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
--- a/packages/redboot/current/include/net/net.h +++ b/packages/redboot/current/include/net/net.h @@ -86,7 +86,7 @@ extern unsigned long get_ms_ticks(void); #define __LITTLE_ENDIAN__ #endif extern unsigned long ntohl(unsigned long x); -extern unsigned long ntohs(unsigned short x); +extern unsigned short ntohs(unsigned short x); #else #define ntohl(x) (x) #define ntohs(x) (x)
--- a/packages/redboot/current/src/flash.c +++ b/packages/redboot/current/src/flash.c @@ -535,7 +535,7 @@ fis_list(int argc, char *argv[]) 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 @@ fis_list(int argc, char *argv[]) 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 @@ fis_free(int argc, char *argv[]) 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 @@ fis_create(int argc, char *argv[]) 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; }
--- a/packages/redboot/current/src/iomem.c +++ b/packages/redboot/current/src/iomem.c @@ -157,15 +157,15 @@ do_iopeek(int argc, char *argv[]) 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; } }
--- a/packages/redboot/current/src/net/enet.c +++ b/packages/redboot/current/src/net/enet.c @@ -238,7 +238,7 @@ ntohl(unsigned long x) ((x & 0xFF000000) >> 24)); } -unsigned long +unsigned short ntohs(unsigned short x) { return (((x & 0x00FF) << 8) |
--- a/packages/redboot/current/src/net/ping.c +++ b/packages/redboot/current/src/net/ping.c @@ -232,7 +232,7 @@ do_ping(int argc, char *argv[]) if (icmp_received) { received++; if (verbose) { - diag_printf(" seq: %ld, time: %ld (ticks)\n", + diag_printf(" seq: %d, time: %ld (ticks)\n", ntohs(hold_hdr.seqnum), end_time-start_time); } }