diff options
| -rw-r--r-- | c/src/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/libchip/shmdr/dump.c | 20 | ||||
| -rw-r--r-- | c/src/libchip/shmdr/shm_driver.h | 4 |
3 files changed, 17 insertions, 11 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 5bb3b2ecc9..51a4462d81 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,5 +1,9 @@ 2007-09-25 Joel Sherrill <joel.sherrill@OARcorp.com> + * libchip/shmdr/dump.c, libchip/shmdr/shm_driver.h: Fix warnings. + +2007-09-25 Joel Sherrill <joel.sherrill@OARcorp.com> + * nfsclient/Makefile.am: Fix errors. 2007-09-25 Joel Sherrill <joel.sherrill@OARcorp.com> diff --git a/c/src/libchip/shmdr/dump.c b/c/src/libchip/shmdr/dump.c index 4a122d41cf..73c2acee37 100644 --- a/c/src/libchip/shmdr/dump.c +++ b/c/src/libchip/shmdr/dump.c @@ -6,7 +6,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -18,6 +18,8 @@ #include <rtems.h> #include <stdio.h> +#include <inttypes.h> +#include <rtems/bspIo.h> #include "shm_driver.h" @@ -27,7 +29,7 @@ Shm_Print_statistics(void) uint32_t ticks; uint32_t ticks_per_second; uint32_t seconds; - int packets_per_second; + int packets_per_second; (void) rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &ticks ); (void) rtems_clock_get( RTEMS_CLOCK_GET_TICKS_PER_SECOND, &ticks_per_second ); @@ -40,11 +42,11 @@ Shm_Print_statistics(void) if ( (Shm_Receive_message_count % seconds) >= (seconds / 2) ) packets_per_second++; - printf( "\n\nSHMDR STATISTICS (NODE %d)\n", Shm_Local_node ); - printf( "TICKS SINCE BOOT = %d\n", ticks ); - printf( "TICKS PER SECOND = %d\n", ticks_per_second ); - printf( "ISRs=%d\n", Shm_Interrupt_count ); - printf( "RECV=%d\n", Shm_Receive_message_count ); - printf( "NULL=%d\n", Shm_Null_message_count ); - printf( "PKTS/SEC=%d\n", packets_per_second ); + printk( "\n\nSHMDR STATISTICS (NODE %" PRId32 ")\n", Shm_Local_node ); + printk( "TICKS SINCE BOOT = %" PRId32 "\n", ticks ); + printk( "TICKS PER SECOND = %" PRId32 "\n", ticks_per_second ); + printk( "ISRs=%" PRId32 "\n", Shm_Interrupt_count ); + printk( "RECV=%" PRId32 "\n", Shm_Receive_message_count ); + printk( "NULL=%" PRId32 "\n", Shm_Null_message_count ); + printk( "PKTS/SEC=%" PRId32 "\n", packets_per_second ); } diff --git a/c/src/libchip/shmdr/shm_driver.h b/c/src/libchip/shmdr/shm_driver.h index efff6835cc..33b9032cc0 100644 --- a/c/src/libchip/shmdr/shm_driver.h +++ b/c/src/libchip/shmdr/shm_driver.h @@ -6,7 +6,7 @@ * * Processor board dependencies are in other files. * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2007. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -423,7 +423,7 @@ struct shm_config_info { vol_u32 *base; /* base address of SHM */ vol_u32 length; /* length (in bytes) of SHM */ vol_u32 format; /* SHM is big or little endian */ - vol_u32 (*convert)();/* neutral conversion routine */ + uint32_t (*convert)();/* neutral conversion routine */ vol_u32 poll_intr;/* POLLED or INTR driven mode */ void (*cause_intr)( uint32_t); Shm_Interrupt_information Intr; /* cause intr information */ |