From 7ec9bd5917d71f594da5890bc35aaec07352d5c1 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@oarcorp.com>
Date: Wed, 15 Oct 2014 09:31:41 -0500
Subject: mpc8260 libcpu and mpc6260ads BSP: Fix warnings

---
 c/src/lib/libcpu/powerpc/mpc8260/cpm/brg.c | 92 +++++++++++++++---------------
 1 file changed, 46 insertions(+), 46 deletions(-)

(limited to 'c/src/lib/libcpu/powerpc/mpc8260/cpm/brg.c')

diff --git a/c/src/lib/libcpu/powerpc/mpc8260/cpm/brg.c b/c/src/lib/libcpu/powerpc/mpc8260/cpm/brg.c
index aef8ca8a26..741f131a8d 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/cpm/brg.c
+++ b/c/src/lib/libcpu/powerpc/mpc8260/cpm/brg.c
@@ -10,7 +10,9 @@
  *
  *  *** All attempts to allocate a BRG or CLK line should be made via
  *      calls to these routines or they simply won't work.
- *
+ */
+
+/*
  *  Author: Andy Dachs <a.dachs@sstl.co.uk>
  *  Copyright Surrey Satellite Technology Limited (SSTL), 2001
  *
@@ -30,7 +32,7 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#include <rtems.h>
+#include <bsp.h>
 #include <mpc8260.h>
 #include <mpc8260/cpm.h>
 #include <rtems/bspIo.h>
@@ -43,7 +45,6 @@
 static unsigned long brg_spd[NUM_BRGS];
 static unsigned int brg_use_count[NUM_BRGS];
 
-
 /* Used to track the usage of the clock inputs */
 /* (initialised to zeros) */
 static unsigned int clk_use_count[NUM_BRGS];
@@ -66,7 +67,6 @@ m8xx_get_brg_cd (int baud)
     ((divisor - 1) << 1) | div16;
 }
 
-
 /*
  *  Allocates an existing brg if one is already programmed for the same
  *  baud rate.  Otherwise a new brg is assigned
@@ -80,7 +80,7 @@ m8xx_get_brg(unsigned brgmask, int baud)
 
   /* first try to find a BRG that is already at the right speed */
   for ( i = 0; i < NUM_BRGS; i++ ) {
-    if( (1 << i) & brgmask )		/* is this brg allowed? */
+    if ( (1 << i) & brgmask )    /* is this brg allowed? */
       if ( brg_spd[i] == baud ) {
         break;
     }
@@ -97,38 +97,38 @@ m8xx_get_brg(unsigned brgmask, int baud)
     brg_use_count[i]++;
     brg_spd[i]=baud;
     switch (i) {
-   	case 0:
-      		m8260.brgc1 = M8260_BRG_RST;
-      		m8260.brgc1 = m8xx_get_brg_cd(baud);
-      		break;
-    	case 1:
-      		m8260.brgc2 = M8260_BRG_RST;
-      		m8260.brgc2 = m8xx_get_brg_cd(baud);
-      		break;
-    	case 2:
-      		m8260.brgc3 = M8260_BRG_RST;
-      		m8260.brgc3 = m8xx_get_brg_cd(baud);
-      		break;
-    	case 3:
-      		m8260.brgc4 = M8260_BRG_RST;
-      		m8260.brgc4 = m8xx_get_brg_cd(baud);
-      		break;
-    	case 4:
-      		m8260.brgc5 = M8260_BRG_RST;
-      		m8260.brgc5 = m8xx_get_brg_cd(baud);
-      		break;
-    	case 5:
-      		m8260.brgc6 = M8260_BRG_RST;
-      		m8260.brgc6 = m8xx_get_brg_cd(baud);
-      		break;
-    	case 6:
-      		m8260.brgc7 = M8260_BRG_RST;
-      		m8260.brgc7 = m8xx_get_brg_cd(baud);
-      		break;
-    	case 7:
-      		m8260.brgc8 = M8260_BRG_RST;
-      		m8260.brgc8 = m8xx_get_brg_cd(baud);
-      		break;
+      case 0:
+        m8260.brgc1 = M8260_BRG_RST;
+        m8260.brgc1 = m8xx_get_brg_cd(baud);
+        break;
+      case 1:
+        m8260.brgc2 = M8260_BRG_RST;
+        m8260.brgc2 = m8xx_get_brg_cd(baud);
+        break;
+      case 2:
+        m8260.brgc3 = M8260_BRG_RST;
+        m8260.brgc3 = m8xx_get_brg_cd(baud);
+        break;
+      case 3:
+        m8260.brgc4 = M8260_BRG_RST;
+        m8260.brgc4 = m8xx_get_brg_cd(baud);
+        break;
+      case 4:
+        m8260.brgc5 = M8260_BRG_RST;
+        m8260.brgc5 = m8xx_get_brg_cd(baud);
+        break;
+      case 5:
+        m8260.brgc6 = M8260_BRG_RST;
+        m8260.brgc6 = m8xx_get_brg_cd(baud);
+        break;
+      case 6:
+        m8260.brgc7 = M8260_BRG_RST;
+        m8260.brgc7 = m8xx_get_brg_cd(baud);
+        break;
+      case 7:
+        m8260.brgc8 = M8260_BRG_RST;
+        m8260.brgc8 = m8xx_get_brg_cd(baud);
+        break;
     }
     return i;
   }
@@ -147,19 +147,19 @@ m8xx_get_brg(unsigned brgmask, int baud)
 void
 m8xx_free_brg( int brg_num )
 {
-  if( (brg_num>=0) && (brg_num<NUM_BRGS) )
-     if(brg_use_count[brg_num] > 0 )
-       brg_use_count[brg_num]--;
+  if ( (brg_num>=0) && (brg_num<NUM_BRGS) )
+    if (brg_use_count[brg_num] > 0 )
+      brg_use_count[brg_num]--;
 }
 
-
-void m8xx_dump_brgs( void )
+#ifdef DEBUG_BRG
+static void m8xx_dump_brgs( void )
 {
   int i;
-  for(i=0; i<NUM_BRGS; i++ )
+  for (i=0; i<NUM_BRGS; i++ )
     printk( "Brg[%d]: %d %d\n", i, brg_use_count[i], brg_spd[i] );
 }
-
+#endif
 
 /*
  * Reserve one of a range of clock inputs
@@ -192,7 +192,7 @@ m8xx_get_clk( unsigned clkmask )
 void
 m8xx_free_clk( int clk_num )
 {
-  if( (clk_num>=0) && (clk_num<NUM_BRGS) )
-     if(clk_use_count[clk_num] > 0 )
+  if ( (clk_num>=0) && (clk_num<NUM_BRGS) )
+     if (clk_use_count[clk_num] > 0 )
        clk_use_count[clk_num]--;
 }
-- 
cgit v1.2.3