minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

ppc4xx: Rework of 4xx serial driver (4)

Browse Source 
Change 4xx_uart.c:

- Use in_8/out_8 macros instead of in8/out8
- No need for UART_BASE marco anymore, now really handled via function
  parameter
- serial_init_common() introduced
- Further coding style cleanup

Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2007-10-22 16:22:40 +02:00
parent e61cb8163a
commit 3248f63ad8
1 changed files with 146 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

313
cpu/ppc4xx/4xx_uart.c
View File

@ -20,7 +20,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
/*------------------------------------------------------------------------------+ */
/* /*
* This source code has been made available to you by IBM on an AS-IS * This source code has been made available to you by IBM on an AS-IS
* basis. Anyone receiving this source is licensed under IBM * basis. Anyone receiving this source is licensed under IBM
@ -40,14 +40,11 @@
* COPYRIGHT I B M CORPORATION 1995 * COPYRIGHT I B M CORPORATION 1995
* LICENSED MATERIAL - PROGRAM PROPERTY OF I B M * LICENSED MATERIAL - PROGRAM PROPERTY OF I B M
*/ */
/*------------------------------------------------------------------------------- */
/*
* Travis Sawyer 15 September 2004
* Added CONFIG_SERIAL_MULTI support
*/
#include <common.h> #include <common.h>
#include <commproc.h> #include <commproc.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/io.h>
#include <watchdog.h> #include <watchdog.h>
#include "vecnum.h" #include "vecnum.h"
@ -142,12 +139,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define ACTING_UART1_BASE UART1_BASE #define ACTING_UART1_BASE UART1_BASE
#endif #endif
#if defined(CONFIG_SERIAL_MULTI)
#define UART_BASE dev_base
#else
#define UART_BASE ACTING_UART0_BASE
#endif
#if defined(CONFIG_405EP) && defined(CFG_EXT_SERIAL_CLOCK) #if defined(CONFIG_405EP) && defined(CFG_EXT_SERIAL_CLOCK)
#error "External serial clock not supported on AMCC PPC405EP!" #error "External serial clock not supported on AMCC PPC405EP!"
#endif #endif
@ -168,7 +159,6 @@ DECLARE_GLOBAL_DATA_PTR;
/*-----------------------------------------------------------------------------+ /*-----------------------------------------------------------------------------+
| Line Status Register. | Line Status Register.
+-----------------------------------------------------------------------------*/ +-----------------------------------------------------------------------------*/
/*#define asyncLSRport1 ACTING_UART0_BASE+0x05 */
#define asyncLSRDataReady1 0x01 #define asyncLSRDataReady1 0x01
#define asyncLSROverrunError1 0x02 #define asyncLSROverrunError1 0x02
#define asyncLSRParityError1 0x04 #define asyncLSRParityError1 0x04
@ -178,12 +168,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define asyncLSRTxShiftEmpty1 0x40 #define asyncLSRTxShiftEmpty1 0x40
#define asyncLSRRxFifoError1 0x80 #define asyncLSRRxFifoError1 0x80
/*-----------------------------------------------------------------------------+
| Miscellanies defines.
+-----------------------------------------------------------------------------*/
/*#define asyncTxBufferport1 ACTING_UART0_BASE+0x00 */
/*#define asyncRxBufferport1 ACTING_UART0_BASE+0x00 */
#ifdef CONFIG_SERIAL_SOFTWARE_FIFO #ifdef CONFIG_SERIAL_SOFTWARE_FIFO
/*-----------------------------------------------------------------------------+ /*-----------------------------------------------------------------------------+
| Fifo | Fifo
@ -197,8 +181,36 @@ typedef struct {
volatile static serial_buffer_t buf_info; volatile static serial_buffer_t buf_info;
#endif #endif
#if (defined(CONFIG_440) || defined(CONFIG_405EX)) && \ static void serial_init_common(u32 base, u32 udiv, u16 bdiv)
!defined(CFG_EXT_SERIAL_CLOCK) {
PPC4xx_SYS_INFO sys_info;
u8 val;
get_sys_info(&sys_info);
/* Correct UART frequency in bd-info struct now that
* the UART divisor is available
*/
#ifdef CFG_EXT_SERIAL_CLOCK
sys_info.freqUART = CFG_EXT_SERIAL_CLOCK;
#else
sys_info.freqUART = sys_info.freqUART / udiv;
#endif
out_8((u8 *)base + UART_LCR, 0x80); /* set DLAB bit */
out_8((u8 *)base + UART_DLL, bdiv); /* set baudrate divisor */
out_8((u8 *)base + UART_DLM, bdiv >> 8); /* set baudrate divisor */
out_8((u8 *)base + UART_LCR, 0x03); /* clear DLAB; set 8 bits, no parity */
out_8((u8 *)base + UART_FCR, 0x00); /* disable FIFO */
out_8((u8 *)base + UART_MCR, 0x00); /* no modem control DTR RTS */
val = in_8((u8 *)base + UART_LSR); /* clear line status */
val = in_8((u8 *)base + UART_RBR); /* read receive buffer */
out_8((u8 *)base + UART_SCR, 0x00); /* set scratchpad */
out_8((u8 *)base + UART_IER, 0x00); /* set interrupt enable reg */
}
#if (defined(CONFIG_440) || defined(CONFIG_405EX)) && \
!defined(CFG_EXT_SERIAL_CLOCK)
static void serial_divs (int baudrate, unsigned long *pudiv, static void serial_divs (int baudrate, unsigned long *pudiv,
unsigned short *pbdiv) unsigned short *pbdiv)
{ {
@ -264,8 +276,8 @@ static void serial_divs (int baudrate, unsigned long *pudiv,
get_sys_info(&sysinfo); get_sys_info(&sysinfo);
plloutb = ((CONFIG_SYS_CLK_FREQ * ((cpr_pllc & PLLC_SRC_MASK) ? plloutb = ((CONFIG_SYS_CLK_FREQ * ((cpr_pllc & PLLC_SRC_MASK) ?
sysinfo.pllFwdDivB : sysinfo.pllFwdDiv) * sysinfo.pllFbkDiv) / sysinfo.pllFwdDivB : sysinfo.pllFwdDiv) *
sysinfo.pllFwdDivB); sysinfo.pllFbkDiv) / sysinfo.pllFwdDivB);
udiv = 256; /* Assume lowest possible serial clk */ udiv = 256; /* Assume lowest possible serial clk */
div = plloutb / (16 * baudrate); /* total divisor */ div = plloutb / (16 * baudrate); /* total divisor */
umin = (plloutb / get_OPB_freq()) << 1; /* 2 x OPB divisor */ umin = (plloutb / get_OPB_freq()) << 1; /* 2 x OPB divisor */
@ -303,16 +315,11 @@ static void serial_divs (int baudrate, unsigned long *pudiv,
*/ */
#if defined(CONFIG_440) #if defined(CONFIG_440)
#if defined(CONFIG_SERIAL_MULTI) int serial_init_dev(unsigned long base)
int serial_init_dev (unsigned long dev_base)
#else
int serial_init(void)
#endif
{ {
unsigned long reg; unsigned long reg;
unsigned long udiv; unsigned long udiv;
unsigned short bdiv; unsigned short bdiv;
volatile char val;
#ifdef CFG_EXT_SERIAL_CLOCK #ifdef CFG_EXT_SERIAL_CLOCK
unsigned long tmp; unsigned long tmp;
#endif #endif
@ -325,18 +332,12 @@ int serial_init(void)
udiv = 1; udiv = 1;
tmp = gd->baudrate * 16; tmp = gd->baudrate * 16;
bdiv = (CFG_EXT_SERIAL_CLOCK + tmp / 2) / tmp; bdiv = (CFG_EXT_SERIAL_CLOCK + tmp / 2) / tmp;
gd->freqUART = CFG_EXT_SERIAL_CLOCK;
#else #else
/* For 440, the cpu clock is on divider chain A, UART on divider /* For 440, the cpu clock is on divider chain A, UART on divider
* chain B ... so cpu clock is irrelevant. Get the "optimized" * chain B ... so cpu clock is irrelevant. Get the "optimized"
* values that are subject to the 1/2 opb clock constraint * values that are subject to the 1/2 opb clock constraint
*/ */
serial_divs (gd->baudrate, &udiv, &bdiv); serial_divs (gd->baudrate, &udiv, &bdiv);
/* Correct UART frequency in bd-info struct now that
* the UART divisor is available
*/
gd->freqUART = gd->freqUART / udiv;
#endif #endif
reg |= (udiv - UDIV_SUBTRACT) << CR0_UDIV_POS; /* set the UART divisor */ reg |= (udiv - UDIV_SUBTRACT) << CR0_UDIV_POS; /* set the UART divisor */
@ -356,34 +357,20 @@ int serial_init(void)
MTREG(UART3_SDR, reg); MTREG(UART3_SDR, reg);
#endif #endif
out8(UART_BASE + UART_LCR, 0x80); /* set DLAB bit */ serial_init_common(base, udiv, bdiv);
out8(UART_BASE + UART_DLL, bdiv); /* set baudrate divisor */
out8(UART_BASE + UART_DLM, bdiv >> 8); /* set baudrate divisor */
out8(UART_BASE + UART_LCR, 0x03); /* clear DLAB; set 8 bits, no parity */
out8(UART_BASE + UART_FCR, 0x00); /* disable FIFO */
out8(UART_BASE + UART_MCR, 0x00); /* no modem control DTR RTS */
val = in8(UART_BASE + UART_LSR); /* clear line status */
val = in8(UART_BASE + UART_RBR); /* read receive buffer */
out8(UART_BASE + UART_SCR, 0x00); /* set scratchpad */
out8(UART_BASE + UART_IER, 0x00); /* set interrupt enable reg */
return (0); return (0);
} }
#else /* !defined(CONFIG_440) */ #else /* !defined(CONFIG_440) */
#if defined(CONFIG_SERIAL_MULTI) int serial_init_dev (unsigned long base)
int serial_init_dev (unsigned long dev_base)
#else
int serial_init (void)
#endif
{ {
unsigned long reg; unsigned long reg;
unsigned long tmp; unsigned long tmp;
unsigned long clk; unsigned long clk;
unsigned long udiv; unsigned long udiv;
unsigned short bdiv; unsigned short bdiv;
volatile char val;
#ifdef CONFIG_405EX #ifdef CONFIG_405EX
clk = tmp = 0; clk = tmp = 0;
@ -447,88 +434,42 @@ int serial_init (void)
bdiv = (clk + tmp / 2) / tmp; bdiv = (clk + tmp / 2) / tmp;
#endif /* CONFIG_405EX */ #endif /* CONFIG_405EX */
/* Correct UART frequency in bd-info struct now that serial_init_common(base, udiv, bdiv);
* the UART divisor is available
*/
#ifdef CFG_EXT_SERIAL_CLOCK
gd->freqUART = CFG_EXT_SERIAL_CLOCK;
#else
gd->freqUART = gd->freqUART / udiv;
#endif
out8(UART_BASE + UART_LCR, 0x80); /* set DLAB bit */
out8(UART_BASE + UART_DLL, bdiv); /* set baudrate divisor */
out8(UART_BASE + UART_DLM, bdiv >> 8); /* set baudrate divisor */
out8(UART_BASE + UART_LCR, 0x03); /* clear DLAB; set 8 bits, no parity */
out8(UART_BASE + UART_FCR, 0x00); /* disable FIFO */
out8(UART_BASE + UART_MCR, 0x00); /* no modem control DTR RTS */
val = in8(UART_BASE + UART_LSR); /* clear line status */
val = in8(UART_BASE + UART_RBR); /* read receive buffer */
out8(UART_BASE + UART_SCR, 0x00); /* set scratchpad */
out8(UART_BASE + UART_IER, 0x00); /* set interrupt enable reg */
return (0); return (0);
} }
#endif /* if defined(CONFIG_440) */ #endif /* if defined(CONFIG_440) */
#if defined(CONFIG_SERIAL_MULTI) void serial_setbrg_dev(unsigned long base)
void serial_setbrg_dev (unsigned long dev_base)
#else
void serial_setbrg (void)
#endif
{ {
#if defined(CONFIG_SERIAL_MULTI) serial_init_dev(base);
serial_init_dev(dev_base);
#else
serial_init();
#endif
} }
#if defined(CONFIG_SERIAL_MULTI) void serial_putc_dev(unsigned long base, const char c)
void serial_putc_dev (unsigned long dev_base, const char c)
#else
void serial_putc (const char c)
#endif
{ {
int i; int i;
if (c == '\n') if (c == '\n')
#if defined(CONFIG_SERIAL_MULTI) serial_putc_dev(base, '\r');
serial_putc_dev (dev_base, '\r');
#else
serial_putc ('\r');
#endif
/* check THRE bit, wait for transmiter available */ /* check THRE bit, wait for transmiter available */
for (i = 1; i < 3500; i++) { for (i = 1; i < 3500; i++) {
if ((in8 (UART_BASE + UART_LSR) & 0x20) == 0x20) if ((in_8((u8 *)base + UART_LSR) & 0x20) == 0x20)
break; break;
udelay (100); udelay (100);
} }
out8 (UART_BASE + UART_THR, c); /* put character out */
out_8((u8 *)base + UART_THR, c); /* put character out */
} }
#if defined(CONFIG_SERIAL_MULTI) void serial_puts_dev (unsigned long base, const char *s)
void serial_puts_dev (unsigned long dev_base, const char *s)
#else
void serial_puts (const char *s)
#endif
{ {
while (*s) { while (*s)
#if defined(CONFIG_SERIAL_MULTI) serial_putc_dev (base, *s++);
serial_putc_dev (dev_base, *s++);
#else
serial_putc (*s++);
#endif
}
} }
#if defined(CONFIG_SERIAL_MULTI) int serial_getc_dev (unsigned long base)
int serial_getc_dev (unsigned long dev_base)
#else
int serial_getc (void)
#endif
{ {
unsigned char status = 0; unsigned char status = 0;
@ -536,46 +477,45 @@ int serial_getc (void)
#if defined(CONFIG_HW_WATCHDOG) #if defined(CONFIG_HW_WATCHDOG)
WATCHDOG_RESET (); /* Reset HW Watchdog, if needed */ WATCHDOG_RESET (); /* Reset HW Watchdog, if needed */
#endif /* CONFIG_HW_WATCHDOG */ #endif /* CONFIG_HW_WATCHDOG */
status = in8 (UART_BASE + UART_LSR);
if ((status & asyncLSRDataReady1) != 0x0) { status = in_8((u8 *)base + UART_LSR);
if ((status & asyncLSRDataReady1) != 0x0)
break; break;
}
if ((status & ( asyncLSRFramingError1 | if ((status & ( asyncLSRFramingError1 |
asyncLSROverrunError1 | asyncLSROverrunError1 |
asyncLSRParityError1 | asyncLSRParityError1 |
asyncLSRBreakInterrupt1 )) != 0) { asyncLSRBreakInterrupt1 )) != 0) {
out8 (UART_BASE + UART_LSR, out_8((u8 *)base + UART_LSR,
asyncLSRFramingError1 | asyncLSRFramingError1 |
asyncLSROverrunError1 | asyncLSROverrunError1 |
asyncLSRParityError1 | asyncLSRParityError1 |
asyncLSRBreakInterrupt1); asyncLSRBreakInterrupt1);
} }
} }
return (0x000000ff & (int) in8 (UART_BASE));
return (0x000000ff & (int) in_8((u8 *)base));
} }
#if defined(CONFIG_SERIAL_MULTI) int serial_tstc_dev (unsigned long base)
int serial_tstc_dev (unsigned long dev_base)
#else
int serial_tstc (void)
#endif
{ {
unsigned char status; unsigned char status;
status = in8 (UART_BASE + UART_LSR); status = in_8((u8 *)base + UART_LSR);
if ((status & asyncLSRDataReady1) != 0x0) { if ((status & asyncLSRDataReady1) != 0x0)
return (1); return (1);
}
if ((status & ( asyncLSRFramingError1 | if ((status & ( asyncLSRFramingError1 |
asyncLSROverrunError1 | asyncLSROverrunError1 |
asyncLSRParityError1 | asyncLSRParityError1 |
asyncLSRBreakInterrupt1 )) != 0) { asyncLSRBreakInterrupt1 )) != 0) {
out8 (UART_BASE + UART_LSR, out_8((u8 *)base + UART_LSR,
asyncLSRFramingError1 | asyncLSRFramingError1 |
asyncLSROverrunError1 | asyncLSROverrunError1 |
asyncLSRParityError1 | asyncLSRParityError1 |
asyncLSRBreakInterrupt1); asyncLSRBreakInterrupt1);
} }
return 0; return 0;
} }
@ -588,11 +528,11 @@ void serial_isr (void *arg)
const int rx_get = buf_info.rx_get; const int rx_get = buf_info.rx_get;
int rx_put = buf_info.rx_put; int rx_put = buf_info.rx_put;
if (rx_get <= rx_put) { if (rx_get <= rx_put)
space = CONFIG_SERIAL_SOFTWARE_FIFO - (rx_put - rx_get); space = CONFIG_SERIAL_SOFTWARE_FIFO - (rx_put - rx_get);
} else { else
space = rx_get - rx_put; space = rx_get - rx_put;
}
while (serial_tstc_dev (ACTING_UART0_BASE)) { while (serial_tstc_dev (ACTING_UART0_BASE)) {
c = serial_getc_dev (ACTING_UART0_BASE); c = serial_getc_dev (ACTING_UART0_BASE);
if (space) { if (space) {
@ -603,8 +543,9 @@ void serial_isr (void *arg)
rx_put = 0; rx_put = 0;
if (space < CONFIG_SERIAL_SOFTWARE_FIFO / 4) { if (space < CONFIG_SERIAL_SOFTWARE_FIFO / 4) {
/* Stop flow by setting RTS inactive */ /* Stop flow by setting RTS inactive */
out8 (ACTING_UART0_BASE + UART_MCR, out_8((u8 *)ACTING_UART0_BASE + UART_MCR,
in8 (ACTING_UART0_BASE + UART_MCR) & (0xFF ^ 0x02)); in_8((u8 *)ACTING_UART0_BASE + UART_MCR) &
(0xFF ^ 0x02));
} }
} }
buf_info.rx_put = rx_put; buf_info.rx_put = rx_put;
@ -617,35 +558,35 @@ void serial_buffered_init (void)
buf_info.rx_put = 0; buf_info.rx_put = 0;
buf_info.rx_get = 0; buf_info.rx_get = 0;
if (in8 (ACTING_UART0_BASE + UART_MSR) & 0x10) { if (in_8((u8 *)ACTING_UART0_BASE + UART_MSR) & 0x10)
serial_puts ("Check CTS signal present on serial port: OK.\n"); serial_puts ("Check CTS signal present on serial port: OK.\n");
} else { else
serial_puts ("WARNING: CTS signal not present on serial port.\n"); serial_puts ("WARNING: CTS signal not present on serial port.\n");
}
irq_install_handler ( VECNUM_U0 /*UART0 */ /*int vec */ , irq_install_handler ( VECNUM_U0 /*UART0 */ /*int vec */ ,
serial_isr /*interrupt_handler_t *handler */ , serial_isr /*interrupt_handler_t *handler */ ,
(void *) &buf_info /*void *arg */ ); (void *) &buf_info /*void *arg */ );
/* Enable "RX Data Available" Interrupt on UART */ /* Enable "RX Data Available" Interrupt on UART */
/* out8(ACTING_UART0_BASE + UART_IER, in8(ACTING_UART0_BASE + UART_IER) |0x01); */ out_8(ACTING_UART0_BASE + UART_IER, 0x01);
out8 (ACTING_UART0_BASE + UART_IER, 0x01);
/* Set DTR active */ /* Set DTR active */
out8 (ACTING_UART0_BASE + UART_MCR, in8 (ACTING_UART0_BASE + UART_MCR) | 0x01); out_8(ACTING_UART0_BASE + UART_MCR,
in_8((u8 *)ACTING_UART0_BASE + UART_MCR) | 0x01);
/* Start flow by setting RTS active */ /* Start flow by setting RTS active */
out8 (ACTING_UART0_BASE + UART_MCR, in8 (ACTING_UART0_BASE + UART_MCR) | 0x02); out_8(ACTING_UART0_BASE + UART_MCR,
in_8((u8 *)ACTING_UART0_BASE + UART_MCR) | 0x02);
/* Setup UART FIFO: RX trigger level: 4 byte, Enable FIFO */ /* Setup UART FIFO: RX trigger level: 4 byte, Enable FIFO */
out8 (ACTING_UART0_BASE + UART_FCR, (1 << 6) | 1); out_8(ACTING_UART0_BASE + UART_FCR, (1 << 6) | 1);
} }
void serial_buffered_putc (const char c) void serial_buffered_putc (const char c)
{ {
/* Wait for CTS */ /* Wait for CTS */
#if defined(CONFIG_HW_WATCHDOG) #if defined(CONFIG_HW_WATCHDOG)
while (!(in8 (ACTING_UART0_BASE + UART_MSR) & 0x10)) while (!(in_8((u8 *)ACTING_UART0_BASE + UART_MSR) & 0x10))
WATCHDOG_RESET (); WATCHDOG_RESET ();
#else #else
while (!(in8 (ACTING_UART0_BASE + UART_MSR) & 0x10)); while (!(in_8((u8 *)ACTING_UART0_BASE + UART_MSR) & 0x10));
#endif #endif
serial_putc (c); serial_putc (c);
} }
@ -674,14 +615,15 @@ int serial_buffered_getc (void)
buf_info.rx_get = rx_get; buf_info.rx_get = rx_get;
rx_put = buf_info.rx_put; rx_put = buf_info.rx_put;
if (rx_get <= rx_put) { if (rx_get <= rx_put)
space = CONFIG_SERIAL_SOFTWARE_FIFO - (rx_put - rx_get); space = CONFIG_SERIAL_SOFTWARE_FIFO - (rx_put - rx_get);
} else { else
space = rx_get - rx_put; space = rx_get - rx_put;
}
if (space > CONFIG_SERIAL_SOFTWARE_FIFO / 2) { if (space > CONFIG_SERIAL_SOFTWARE_FIFO / 2) {
/* Start flow by setting RTS active */ /* Start flow by setting RTS active */
out8 (ACTING_UART0_BASE + UART_MCR, in8 (ACTING_UART0_BASE + UART_MCR) | 0x02); out_8(ACTING_UART0_BASE + UART_MCR,
in_8((u8 *)ACTING_UART0_BASE + UART_MCR) | 0x02);
} }
return c; return c;
@ -706,8 +648,8 @@ int serial_buffered_tstc (void)
#if (CONFIG_KGDB_SER_INDEX & 2) #if (CONFIG_KGDB_SER_INDEX & 2)
void kgdb_serial_init (void) void kgdb_serial_init (void)
{ {
volatile char val; u8 val;
unsigned short br_reg; u16 br_reg;
get_clocks (); get_clocks ();
br_reg = (((((gd->cpu_clk / 16) / 18) * 10) / CONFIG_KGDB_BAUDRATE) + br_reg = (((((gd->cpu_clk / 16) / 18) * 10) / CONFIG_KGDB_BAUDRATE) +
@ -715,16 +657,16 @@ void kgdb_serial_init (void)
/* /*
* Init onboard 16550 UART * Init onboard 16550 UART
*/ */
out8 (ACTING_UART1_BASE + UART_LCR, 0x80); /* set DLAB bit */ out_8((u8 *)ACTING_UART1_BASE + UART_LCR, 0x80); /* set DLAB bit */
out8 (ACTING_UART1_BASE + UART_DLL, (br_reg & 0x00ff)); /* set divisor for 9600 baud */ out_8((u8 *)ACTING_UART1_BASE + UART_DLL, (br_reg & 0x00ff)); /* set divisor for 9600 baud */
out8 (ACTING_UART1_BASE + UART_DLM, ((br_reg & 0xff00) >> 8)); /* set divisor for 9600 baud */ out_8((u8 *)ACTING_UART1_BASE + UART_DLM, ((br_reg & 0xff00) >> 8)); /* set divisor for 9600 baud */
out8 (ACTING_UART1_BASE + UART_LCR, 0x03); /* line control 8 bits no parity */ out_8((u8 *)ACTING_UART1_BASE + UART_LCR, 0x03); /* line control 8 bits no parity */
out8 (ACTING_UART1_BASE + UART_FCR, 0x00); /* disable FIFO */ out_8((u8 *)ACTING_UART1_BASE + UART_FCR, 0x00); /* disable FIFO */
out8 (ACTING_UART1_BASE + UART_MCR, 0x00); /* no modem control DTR RTS */ out_8((u8 *)ACTING_UART1_BASE + UART_MCR, 0x00); /* no modem control DTR RTS */
val = in8 (ACTING_UART1_BASE + UART_LSR); /* clear line status */ val = in_8((u8 *)ACTING_UART1_BASE + UART_LSR); /* clear line status */
val = in8 (ACTING_UART1_BASE + UART_RBR); /* read receive buffer */ val = in_8((u8 *)ACTING_UART1_BASE + UART_RBR); /* read receive buffer */
out8 (ACTING_UART1_BASE + UART_SCR, 0x00); /* set scratchpad */ out_8((u8 *)ACTING_UART1_BASE + UART_SCR, 0x00); /* set scratchpad */
out8 (ACTING_UART1_BASE + UART_IER, 0x00); /* set interrupt enable reg */ out_8((u8 *)ACTING_UART1_BASE + UART_IER, 0x00); /* set interrupt enable reg */
} }
void putDebugChar (const char c) void putDebugChar (const char c)
@ -732,17 +674,16 @@ void putDebugChar (const char c)
if (c == '\n') if (c == '\n')
serial_putc ('\r'); serial_putc ('\r');
out8 (ACTING_UART1_BASE + UART_THR, c); /* put character out */ out_8((u8 *)ACTING_UART1_BASE + UART_THR, c); /* put character out */
/* check THRE bit, wait for transfer done */ /* check THRE bit, wait for transfer done */
while ((in8 (ACTING_UART1_BASE + UART_LSR) & 0x20) != 0x20); while ((in_8((u8 *)ACTING_UART1_BASE + UART_LSR) & 0x20) != 0x20);
} }
void putDebugStr (const char *s) void putDebugStr (const char *s)
{ {
while (*s) { while (*s)
serial_putc (*s++); serial_putc (*s++);
}
} }
int getDebugChar (void) int getDebugChar (void)
@ -750,22 +691,23 @@ int getDebugChar (void)
unsigned char status = 0; unsigned char status = 0;
while (1) { while (1) {
status = in8 (ACTING_UART1_BASE + UART_LSR); status = in_8((u8 *)ACTING_UART1_BASE + UART_LSR);
if ((status & asyncLSRDataReady1) != 0x0) { if ((status & asyncLSRDataReady1) != 0x0)
break; break;
}
if ((status & ( asyncLSRFramingError1 | if ((status & (asyncLSRFramingError1 |
asyncLSROverrunError1 | asyncLSROverrunError1 |
asyncLSRParityError1 | asyncLSRParityError1 |
asyncLSRBreakInterrupt1 )) != 0) { asyncLSRBreakInterrupt1 )) != 0) {
out8 (ACTING_UART1_BASE + UART_LSR, out_8((u8 *)ACTING_UART1_BASE + UART_LSR,
asyncLSRFramingError1 | asyncLSRFramingError1 |
asyncLSROverrunError1 | asyncLSROverrunError1 |
asyncLSRParityError1 | asyncLSRParityError1 |
asyncLSRBreakInterrupt1); asyncLSRBreakInterrupt1);
} }
} }
return (0x000000ff & (int) in8 (ACTING_UART1_BASE));
return (0x000000ff & (int) in_8((u8 *)ACTING_UART1_BASE));
} }
void kgdb_interruptible (int yes) void kgdb_interruptible (int yes)
@ -813,10 +755,12 @@ int serial1_init(void)
{ {
return (serial_init_dev(UART1_BASE)); return (serial_init_dev(UART1_BASE));
} }
void serial0_setbrg (void) void serial0_setbrg (void)
{ {
serial_setbrg_dev(UART0_BASE); serial_setbrg_dev(UART0_BASE);
} }
void serial1_setbrg (void) void serial1_setbrg (void)
{ {
serial_setbrg_dev(UART1_BASE); serial_setbrg_dev(UART1_BASE);
@ -831,6 +775,7 @@ void serial1_putc(const char c)
{ {
serial_putc_dev(UART1_BASE, c); serial_putc_dev(UART1_BASE, c);
} }
void serial0_puts(const char *s) void serial0_puts(const char *s)
{ {
serial_puts_dev(UART0_BASE, s); serial_puts_dev(UART0_BASE, s);
@ -850,6 +795,7 @@ int serial1_getc(void)
{ {
return(serial_getc_dev(UART1_BASE)); return(serial_getc_dev(UART1_BASE));
} }
int serial0_tstc(void) int serial0_tstc(void)
{ {
return (serial_tstc_dev(UART0_BASE)); return (serial_tstc_dev(UART0_BASE));
@ -883,6 +829,39 @@ struct serial_device serial1_device =
serial1_putc, serial1_putc,
serial1_puts, serial1_puts,
}; };
#else
/*
* Wrapper functions
*/
int serial_init(void)
{
return serial_init_dev(ACTING_UART0_BASE);
}
void serial_setbrg(void)
{
serial_setbrg_dev(ACTING_UART0_BASE);
}
void serial_putc(const char c)
{
serial_putc_dev(ACTING_UART0_BASE, c);
}
void serial_puts(const char *s)
{
serial_puts_dev(ACTING_UART0_BASE, s);
}
int serial_getc(void)
{
return serial_getc_dev(ACTING_UART0_BASE);
}
int serial_tstc(void)
{
return serial_tstc_dev(ACTING_UART0_BASE);
}
#endif /* CONFIG_SERIAL_MULTI */ #endif /* CONFIG_SERIAL_MULTI */
#endif /* CONFIG_405GP || CONFIG_405CR */ #endif /* CONFIG_405GP || CONFIG_405CR */