Refactoring parts of the common USB OHCI code

[u-boot] / cpu / mpc8260 / serial_smc.c

diff --git a/cpu/mpc8260/serial_smc.c b/cpu/mpc8260/serial_smc.c
index b0e1ce4f877912919922a8ba2748a53c6667ed99..f3dffeb11993d81c70aeccb0199b841a75d3613a 100644 (file)
--- a/cpu/mpc8260/serial_smc.c
+++ b/cpu/mpc8260/serial_smc.c
@@ -34,6 +34,8 @@
 #include <mpc8260.h>
 #include <asm/cpm_8260.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #if defined(CONFIG_CONS_ON_SMC)
 
 #if CONFIG_CONS_INDEX == 1     /* Console on SMC1 */
@@ -74,7 +76,7 @@ static unsigned char brg_map[] = {
 
 int serial_init (void)
 {
-        volatile immap_t *im = (immap_t *)CFG_IMMR;
+       volatile immap_t *im = (immap_t *)CFG_IMMR;
        volatile smc_t *sp;
        volatile smc_uart_t *up;
        volatile cbd_t *tbdf, *rbdf;
@@ -170,8 +172,6 @@ int serial_init (void)
 void
 serial_setbrg (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
 #if defined(CONFIG_CONS_USE_EXTC)
        m8260_cpm_extcbrg(brg_map[SMC_INDEX], gd->baudrate,
                CONFIG_CONS_EXTC_RATE, CONFIG_CONS_EXTC_PINSEL);
@@ -186,7 +186,7 @@ serial_putc(const char c)
        volatile cbd_t          *tbdf;
        volatile char           *buf;
        volatile smc_uart_t     *up;
-        volatile immap_t       *im = (immap_t *)CFG_IMMR;
+       volatile immap_t        *im = (immap_t *)CFG_IMMR;
 
        if (c == '\n')
                serial_putc ('\r');
@@ -220,7 +220,7 @@ serial_getc(void)
        volatile cbd_t          *rbdf;
        volatile unsigned char  *buf;
        volatile smc_uart_t     *up;
-        volatile immap_t       *im = (immap_t *)CFG_IMMR;
+       volatile immap_t        *im = (immap_t *)CFG_IMMR;
        unsigned char           c;
 
        up = (smc_uart_t *)&(im->im_dprambase[PROFF_SMC]);
@@ -243,7 +243,7 @@ serial_tstc()
 {
        volatile cbd_t          *rbdf;
        volatile smc_uart_t     *up;
-        volatile immap_t       *im = (immap_t *)CFG_IMMR;
+       volatile immap_t        *im = (immap_t *)CFG_IMMR;
 
        up = (smc_uart_t *)&(im->im_dprambase[PROFF_SMC]);
 
@@ -289,7 +289,7 @@ serial_tstc()
 void
 kgdb_serial_init (void)
 {
-        volatile immap_t *im = (immap_t *)CFG_IMMR;
+       volatile immap_t *im = (immap_t *)CFG_IMMR;
        volatile smc_t *sp;
        volatile smc_uart_t *up;
        volatile cbd_t *tbdf, *rbdf;
@@ -360,10 +360,10 @@ kgdb_serial_init (void)
        /* Set up the baud rate generator.
        */
 #if defined(CONFIG_KGDB_USE_EXTC)
-       m8260_cpm_extcbrg(KGDB_SMC_INDEX, speed,
+       m8260_cpm_extcbrg(brg_map[KGDB_SMC_INDEX], speed,
                CONFIG_KGDB_EXTC_RATE, CONFIG_KGDB_EXTC_PINSEL);
 #else
-       m8260_cpm_setbrg(KGDB_SMC_INDEX, speed);
+       m8260_cpm_setbrg(brg_map[KGDB_SMC_INDEX], speed);
 #endif
 
        /* Make the first buffer the only buffer.
@@ -401,7 +401,7 @@ putDebugChar(const char c)
        volatile cbd_t          *tbdf;
        volatile char           *buf;
        volatile smc_uart_t     *up;
-        volatile immap_t       *im = (immap_t *)CFG_IMMR;
+       volatile immap_t        *im = (immap_t *)CFG_IMMR;
 
        if (c == '\n')
                putDebugChar ('\r');
@@ -435,7 +435,7 @@ getDebugChar(void)
        volatile cbd_t          *rbdf;
        volatile unsigned char  *buf;
        volatile smc_uart_t     *up;
-        volatile immap_t       *im = (immap_t *)CFG_IMMR;
+       volatile immap_t        *im = (immap_t *)CFG_IMMR;
        unsigned char           c;
 
        up = (smc_uart_t *)&(im->im_dprambase[KGDB_PROFF_SMC]);