diff options
| -rw-r--r-- | c/src/lib/libbsp/m68k/uC5282/clock/clock.c | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/mips/shared/clock/clockdrv.c | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon2/clock/ckinit.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/clock/ckinit.c | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/startup/bsppredriver.c | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/shared/gnatcommon.c | 12 | ||||
| -rw-r--r-- | c/src/lib/libcpu/sparc/access/access_le.c | 1 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/internal.h | 2 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/main_mdump.c | 6 |
9 files changed, 18 insertions, 25 deletions
diff --git a/c/src/lib/libbsp/m68k/uC5282/clock/clock.c b/c/src/lib/libbsp/m68k/uC5282/clock/clock.c index 7376b96cfd..4b7cee02ca 100644 --- a/c/src/lib/libbsp/m68k/uC5282/clock/clock.c +++ b/c/src/lib/libbsp/m68k/uC5282/clock/clock.c @@ -31,7 +31,7 @@ #define NSEC_PER_PITC __SRAMBASE.nsec_per_pitc #define FILTER_SHIFT 6 -uint32_t bsp_clock_nanoseconds_since_last_tick(void) +static uint32_t bsp_clock_nanoseconds_since_last_tick(void) { int i = MCF5282_PIT3_PCNTR; if (MCF5282_PIT3_PCSR & MCF5282_PIT_PCSR_PIF) @@ -39,7 +39,8 @@ uint32_t bsp_clock_nanoseconds_since_last_tick(void) return (PITC_PER_TICK - i) * NSEC_PER_PITC; } -#define Clock_driver_nanoseconds_since_last_tick bsp_clock_nanoseconds_since_last_tick +#define Clock_driver_nanoseconds_since_last_tick \ + bsp_clock_nanoseconds_since_last_tick /* * Periodic interval timer interrupt handler diff --git a/c/src/lib/libbsp/mips/shared/clock/clockdrv.c b/c/src/lib/libbsp/mips/shared/clock/clockdrv.c index 2e11c1f015..94892ebe6f 100644 --- a/c/src/lib/libbsp/mips/shared/clock/clockdrv.c +++ b/c/src/lib/libbsp/mips/shared/clock/clockdrv.c @@ -1,5 +1,5 @@ /* - * COPYRIGHT (c) 1989-2011. + * COPYRIGHT (c) 1989-2013. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -14,7 +14,6 @@ /* XXX convert to macros? Move to score/cpu? */ void mips_set_timer(uint32_t timer_clock_interval); uint32_t mips_get_timer(void); -uint32_t bsp_clock_nanoseconds_since_last_tick(void); /* XXX move to BSP.h or irq.h?? */ #define EXT_INT5 0x8000 /* external interrupt 5 */ @@ -23,7 +22,7 @@ uint32_t bsp_clock_nanoseconds_since_last_tick(void); extern uint32_t bsp_clicks_per_microsecond; -static uint32_t mips_timer_rate = 0; +static uint32_t mips_timer_rate = 0; /* refresh the internal CPU timer */ #define Clock_driver_support_at_tick() \ @@ -44,7 +43,7 @@ static uint32_t mips_timer_rate = 0; mips_enable_in_interrupt_mask(CLOCK_VECTOR_MASK); \ } while(0) -uint32_t bsp_clock_nanoseconds_since_last_tick(void) +static uint32_t bsp_clock_nanoseconds_since_last_tick(void) { return 0; } diff --git a/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c b/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c index a9c9db663f..d2d883ce61 100644 --- a/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c +++ b/c/src/lib/libbsp/sparc/leon2/clock/ckinit.c @@ -57,7 +57,7 @@ extern int CLOCK_SPEED; LEON_REG.Timer_Control_1 = 0; \ } while (0) -uint32_t bsp_clock_nanoseconds_since_last_tick(void) +static uint32_t bsp_clock_nanoseconds_since_last_tick(void) { uint32_t clicks; uint32_t usecs; diff --git a/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c b/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c index 8aa0af390f..e0556ba31a 100644 --- a/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c +++ b/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c @@ -93,12 +93,7 @@ static int clkirq; LEON3_Timer_Regs->timer[LEON3_CLOCK_INDEX].ctrl = 0; \ } while (0) -/* - * Prototype to avoid warnings and body of get nanoseconds since last tick - */ -uint32_t bsp_clock_nanoseconds_since_last_tick(void); - -uint32_t bsp_clock_nanoseconds_since_last_tick(void) +static uint32_t bsp_clock_nanoseconds_since_last_tick(void) { uint32_t clicks; uint32_t usecs; diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bsppredriver.c b/c/src/lib/libbsp/sparc/leon3/startup/bsppredriver.c index 4084b5ca97..b6788bccce 100644 --- a/c/src/lib/libbsp/sparc/leon3/startup/bsppredriver.c +++ b/c/src/lib/libbsp/sparc/leon3/startup/bsppredriver.c @@ -9,6 +9,7 @@ */ #include <bsp.h> +#include <bsp/bootcard.h> /* * bsp_predriver_hook diff --git a/c/src/lib/libbsp/sparc/shared/gnatcommon.c b/c/src/lib/libbsp/sparc/shared/gnatcommon.c index c44eacba2f..4128982dbb 100644 --- a/c/src/lib/libbsp/sparc/shared/gnatcommon.c +++ b/c/src/lib/libbsp/sparc/shared/gnatcommon.c @@ -16,9 +16,8 @@ * Synchronous trap handler. Map the trap number of SIGFPE, SIGSEGV * or SIGILL to generate the corresponding Ada exception. */ - -rtems_isr __gnat_exception_handler - (rtems_vector_number trap) +static rtems_isr +__gnat_exception_handler(rtems_vector_number trap) { uint32_t real_trap; uint32_t signal; @@ -46,9 +45,8 @@ rtems_isr __gnat_exception_handler * Asynchronous trap handler. As it happens, the interrupt trap numbers for * SPARC is 17 - 31, so we just map then directly on the same signal number. */ - -rtems_isr __gnat_interrupt_handler - (rtems_vector_number trap) +static rtems_isr +__gnat_interrupt_handler (rtems_vector_number trap) { uint32_t real_trap; @@ -62,7 +60,7 @@ rtems_isr __gnat_interrupt_handler * Default signal handler with error reporting */ -void +static void __gnat_signals_Abnormal_termination_handler (int signo) { switch (signo) diff --git a/c/src/lib/libcpu/sparc/access/access_le.c b/c/src/lib/libcpu/sparc/access/access_le.c index 15031ccf50..8e24300406 100644 --- a/c/src/lib/libcpu/sparc/access/access_le.c +++ b/c/src/lib/libcpu/sparc/access/access_le.c @@ -10,6 +10,7 @@ */ #include <libcpu/byteorder.h> +#include <libcpu/access.h> uint16_t _ld_le16(uint16_t *addr) { diff --git a/cpukit/libmisc/shell/internal.h b/cpukit/libmisc/shell/internal.h index 815c5e9661..d350bbc382 100644 --- a/cpukit/libmisc/shell/internal.h +++ b/cpukit/libmisc/shell/internal.h @@ -35,8 +35,6 @@ extern void rtems_shell_print_heap_info( ); -extern int rtems_shell_main_mdump(int argc, char *argv[]); - extern void rtems_shell_print_unified_work_area_message(void); extern int rtems_shell_main_rm(int argc, char *argv[]); diff --git a/cpukit/libmisc/shell/main_mdump.c b/cpukit/libmisc/shell/main_mdump.c index df0d95516b..83be087e84 100644 --- a/cpukit/libmisc/shell/main_mdump.c +++ b/cpukit/libmisc/shell/main_mdump.c @@ -35,7 +35,7 @@ static void mdumpC(void* addr, int m); int rtems_mdump(void* addr, int max, int sz); -int rtems_shell_main_mdump( +static int rtems_shell_main_mdump( int argc, char *argv[] ) @@ -49,7 +49,7 @@ int rtems_shell_main_mdump( return rtems_mdump(addr, max, sz); } -int rtems_shell_main_wdump( +static int rtems_shell_main_wdump( int argc, char *argv[] ) @@ -64,7 +64,7 @@ int rtems_shell_main_wdump( } -int rtems_shell_main_ldump( +static int rtems_shell_main_ldump( int argc, char *argv[] ) |