2008-09-08 Joel Sherrill <joel.sherrill@oarcorp.com>

	* mpc8xx/clock/clock.c, mpc8xx/console-generic/console-generic.c,
	mpc8xx/timer/timer.c: Fix nested extern declaration warnings.

4 files changed, 11 insertions, 5 deletions

diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index 0b5b55f9ac..026ffb8399 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-08	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* mpc8xx/clock/clock.c, mpc8xx/console-generic/console-generic.c,
+	mpc8xx/timer/timer.c: Fix nested extern declaration warnings.
+
 2008-09-08	Thomas Doerfler <thomas.doerfler@embedded-brains.de>
 
 	* mpc8xx/clock/clock.c: adapt PIT driver to more complex PLL in
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/clock/clock.c b/c/src/lib/libcpu/powerpc/mpc8xx/clock/clock.c
index c6f76c914f..346e188a76 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/clock/clock.c
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/clock/clock.c
@@ -48,6 +48,8 @@ extern volatile m8xx_t m8xx;
 extern int BSP_get_clock_irq_level(void);
 extern int BSP_connect_clock_handler(rtems_isr_entry);
 extern int BSP_disconnect_clock_handler(void);
+extern uint32_t bsp_clicks_per_usec;
+extern uint32_t bsp_clock_speed;
 
 void Clock_exit( void );
 
@@ -74,8 +76,6 @@ void clockOn(void* unused)
   uint32_t   pit_value;
   uint32_t   extclk;
   bool force_prescaler = false;
-  extern uint32_t bsp_clicks_per_usec;
-  extern uint32_t bsp_clock_speed;
   uint32_t immr_val;
 
   if (bsp_clicks_per_usec == 0) {
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c b/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c
index ce33e151fa..574120bd4f 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/console-generic.c
@@ -61,6 +61,8 @@ int BSP_irq_enabled_at_cpm(const rtems_irq_number irqLine);
 /* BSP supplied routine */
 extern int mbx8xx_console_get_configuration(void);
 
+extern uint32_t bsp_clock_speed;
+
 /*
  * Interrupt-driven input buffer
  */
@@ -109,7 +111,6 @@ m8xx_get_brg_cd (int baud)
 {
   int divisor;
   int div16 = 0;
-  extern uint32_t bsp_clock_speed;
 
   divisor = ((bsp_clock_speed / 16) + (baud / 2)) / baud;
   if (divisor > 4096) {
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/timer/timer.c b/c/src/lib/libcpu/powerpc/mpc8xx/timer/timer.c
index d2996020c1..e73b30f52a 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/timer/timer.c
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/timer/timer.c
@@ -47,6 +47,8 @@
 
 static volatile uint32_t   Timer_starting;
 static bool benchmark_timer_find_average_overhead;
+extern uint32_t bsp_timer_least_valid;
+extern uint32_t bsp_timer_average_overhead;
 
 /*
  *  This is so small that this code will be reproduced where needed.
@@ -73,8 +75,6 @@ int benchmark_timer_read(void)
 {
   uint32_t   clicks;
   uint32_t   total;
-  extern uint32_t bsp_timer_least_valid;
-  extern uint32_t bsp_timer_average_overhead;
 
   clicks = get_itimer();