From 1487880d2c5ca2b5054313b2c7bec0d3d48d334a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 18 Aug 2008 21:16:42 +0000 Subject: 2008-08-18 Joel Sherrill * libcsupport/include/rtems/libcsupport.h, libcsupport/src/scandir.c, libmisc/cpuuse/cpuusagereset.c, libmisc/monitor/mon-monitor.c, libmisc/serdbg/serdbg.c, libmisc/serdbg/serdbg.h, libnetworking/netinet/in_cksum_powerpc.h, shttpd/compat_rtems.h: Fix warnings. --- cpukit/ChangeLog | 8 ++++++++ cpukit/libcsupport/include/rtems/libcsupport.h | 1 + cpukit/libcsupport/src/scandir.c | 3 ++- cpukit/libmisc/cpuuse/cpuusagereset.c | 15 ++++++++++----- cpukit/libmisc/monitor/mon-monitor.c | 1 - cpukit/libmisc/serdbg/serdbg.c | 2 -- cpukit/libmisc/serdbg/serdbg.h | 5 +++++ cpukit/libnetworking/netinet/in_cksum_powerpc.h | 7 ++++--- cpukit/shttpd/compat_rtems.h | 1 + 9 files changed, 31 insertions(+), 12 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 8f3c1ec769..1c486cf7b5 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,11 @@ +2008-08-18 Joel Sherrill + + * libcsupport/include/rtems/libcsupport.h, libcsupport/src/scandir.c, + libmisc/cpuuse/cpuusagereset.c, libmisc/monitor/mon-monitor.c, + libmisc/serdbg/serdbg.c, libmisc/serdbg/serdbg.h, + libnetworking/netinet/in_cksum_powerpc.h, shttpd/compat_rtems.h: Fix + warnings. + 2008-08-18 Joel Sherrill * itron/include/rtems/itron/task.h, itron/src/def_cyc.c, diff --git a/cpukit/libcsupport/include/rtems/libcsupport.h b/cpukit/libcsupport/include/rtems/libcsupport.h index fb5ce94c14..40ce4bf9d2 100644 --- a/cpukit/libcsupport/include/rtems/libcsupport.h +++ b/cpukit/libcsupport/include/rtems/libcsupport.h @@ -40,6 +40,7 @@ extern void libc_init(void); extern int host_errno(void); extern void fix_syscall_errno(void); extern size_t malloc_free_space(void); +extern void open_dev_console(void); /* * Prototypes required to install newlib reentrancy user extension diff --git a/cpukit/libcsupport/src/scandir.c b/cpukit/libcsupport/src/scandir.c index 904104089a..7d75a4e155 100644 --- a/cpukit/libcsupport/src/scandir.c +++ b/cpukit/libcsupport/src/scandir.c @@ -132,7 +132,8 @@ scandir(dirname, namelist, select, dcomp) } closedir(dirp); if (nitems && dcomp != NULL){ - qsort(names, nitems, sizeof(struct dirent *), dcomp); + qsort(names, nitems, sizeof(struct dirent *), + (int (*)(const void *, const void *)) dcomp); } *namelist = names; return(nitems); diff --git a/cpukit/libmisc/cpuuse/cpuusagereset.c b/cpukit/libmisc/cpuuse/cpuusagereset.c index 167fe46868..b6920702e1 100644 --- a/cpukit/libmisc/cpuuse/cpuusagereset.c +++ b/cpukit/libmisc/cpuuse/cpuusagereset.c @@ -35,21 +35,26 @@ static void CPU_usage_Per_thread_handler( #endif } + +/* + * External data that is shared by cpu usage code but not declared in .h files. + */ +#ifdef RTEMS_ENABLE_NANOSECOND_CPU_USAGE_STATISTICS + extern struct timespec CPU_usage_Uptime_at_last_reset; +#else + extern uint32_t CPU_usage_Ticks_at_last_reset; +#endif + /* * rtems_cpu_usage_reset */ void rtems_cpu_usage_reset( void ) { #ifdef RTEMS_ENABLE_NANOSECOND_CPU_USAGE_STATISTICS - extern struct timespec CPU_usage_Uptime_at_last_reset; - _TOD_Get_uptime( &CPU_usage_Uptime_at_last_reset ); _Thread_Time_of_last_context_switch = CPU_usage_Uptime_at_last_reset; #else - extern uint32_t CPU_usage_Ticks_at_last_reset; - CPU_usage_Ticks_at_last_reset = _Watchdog_Ticks_since_boot; - #endif rtems_iterate_over_all_threads(CPU_usage_Per_thread_handler); diff --git a/cpukit/libmisc/monitor/mon-monitor.c b/cpukit/libmisc/monitor/mon-monitor.c index 8eec2133a2..9df8fcae87 100644 --- a/cpukit/libmisc/monitor/mon-monitor.c +++ b/cpukit/libmisc/monitor/mon-monitor.c @@ -555,7 +555,6 @@ rtems_monitor_task( for (;;) { - extern rtems_tcb * _Thread_Executing; rtems_monitor_command_entry_t *command; debugee = _Thread_Executing; diff --git a/cpukit/libmisc/serdbg/serdbg.c b/cpukit/libmisc/serdbg/serdbg.c index 4bca324934..ace431aab9 100644 --- a/cpukit/libmisc/serdbg/serdbg.c +++ b/cpukit/libmisc/serdbg/serdbg.c @@ -53,8 +53,6 @@ int serdbg_init_dbg static boolean is_initialized = FALSE; rtems_status_code rc = RTEMS_SUCCESSFUL; - extern void set_debug_traps(void); - extern void breakpoint(void); if (is_initialized) { return RTEMS_SUCCESSFUL; diff --git a/cpukit/libmisc/serdbg/serdbg.h b/cpukit/libmisc/serdbg/serdbg.h index 963c117877..8057ee3ae4 100644 --- a/cpukit/libmisc/serdbg/serdbg.h +++ b/cpukit/libmisc/serdbg/serdbg.h @@ -174,6 +174,11 @@ int getDebugChar | received character | \*=========================================================================*/ +/* + * Assumed to be provided by the BSP + */ +extern void set_debug_traps(void); +extern void breakpoint(void); #ifdef __cplusplus } #endif diff --git a/cpukit/libnetworking/netinet/in_cksum_powerpc.h b/cpukit/libnetworking/netinet/in_cksum_powerpc.h index fe2f04e246..9de5a95e35 100644 --- a/cpukit/libnetworking/netinet/in_cksum_powerpc.h +++ b/cpukit/libnetworking/netinet/in_cksum_powerpc.h @@ -38,9 +38,10 @@ int -in_cksum(m, len) - register struct mbuf *m; - register int len; +in_cksum( + struct mbuf *m, + int len +) { u_char junk; register u_short *w; diff --git a/cpukit/shttpd/compat_rtems.h b/cpukit/shttpd/compat_rtems.h index 6842bb97ed..aae550ca4b 100644 --- a/cpukit/shttpd/compat_rtems.h +++ b/cpukit/shttpd/compat_rtems.h @@ -13,6 +13,7 @@ #include #include +#include #include #include #include -- cgit v1.2.3