V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

serial: Implement CONFIG_SERIAL_MULTI into max3100 serial driver 

Implement support for CONFIG_SERIAL_MULTI into max3100 serial driver.
This driver was so far only usable directly, but this patch also adds
support for the multi method. This allows using more than one serial
driver alongside the max3100 driver. Also, add a weak implementation
of default_serial_console() returning this driver.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Tom Rini <trini@ti.com>
This commit is contained in:
Marek Vasut 2012-09-14 22:37:17 +02:00 committed by Tom Rini
parent 21310b5750
commit 7cd851a50b
2 changed files with 62 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/serial.c
View File

@ -86,6 +86,7 @@ serial_initfunc(ixp_serial_initialize);
serial_initfunc(ks8695_serial_initialize);
serial_initfunc(lh7a40x_serial_initialize);
serial_initfunc(lpc2292_serial_initialize);
serial_initfunc(max3100_serial_initialize);
void serial_register(struct serial_device *dev)
{
@ -150,6 +151,7 @@ void serial_initialize(void)
ks8695_serial_initialize();
lh7a40x_serial_initialize();
lpc2292_serial_initialize();
max3100_serial_initialize();
serial_assign(default_serial_console()->name);
}

76
drivers/serial/serial_max3100.c
View File

@ -25,6 +25,8 @@
#include <common.h>
#include <watchdog.h>
#include <serial.h>
#include <linux/compiler.h>
DECLARE_GLOBAL_DATA_PTR;
@ -149,7 +151,7 @@ static int rxfifo_in;
static int rxfifo_out;
static unsigned char rxfifo_buf[16];
static void max3100_putc(int c)
static void max3100_serial_putc_raw(int c)
{
unsigned int rx;
@ -164,7 +166,7 @@ static void max3100_putc(int c)
}
}
static int max3100_getc(void)
static int max3100_serial_getc(void)
{
int c;
unsigned int rx;
@ -190,7 +192,7 @@ static int max3100_getc(void)
return c;
}
static int max3100_tstc(void)
static int max3100_serial_tstc(void)
{
unsigned int rx;
@ -213,7 +215,7 @@ static int max3100_tstc(void)
return 1;
}
int serial_init(void)
static int max3100_serial_init(void)
{
unsigned int wconf, rconf;
int i;
@ -268,31 +270,73 @@ int serial_init(void)
return (0);
}
void serial_putc(const char c)
static void max3100_serial_putc(const char c)
{
if (c == '\n')
max3100_putc('\r');
max3100_serial_putc_raw('\r');
max3100_putc(c);
max3100_serial_putc_raw(c);
}
static void max3100_serial_puts(const char *s)
{
while (*s)
max3100_serial_putc_raw(*s++);
}
static void max3100_serial_setbrg(void)
{
}
#ifdef CONFIG_SERIAL_MULTI
static struct serial_device max3100_serial_drv = {
.name = "max3100_serial",
.start = max3100_serial_init,
.stop = NULL,
.setbrg = max3100_serial_setbrg,
.putc = max3100_serial_putc,
.puts = max3100_serial_puts,
.getc = max3100_serial_getc,
.tstc = max3100_serial_tstc,
};
void max3100_serial_initialize(void)
{
serial_register(&max3100_serial_drv);
}
__weak struct serial_device *default_serial_console(void)
{
return &max3100_serial_drv;
}
#else
int serial_init(void)
{
return max3100_serial_init();
}
void serial_setbrg(void)
{
max3100_serial_setbrg();
}
void serial_putc(const char c)
{
max3100_serial_putc(c);
}
void serial_puts(const char *s)
{
while (*s)
serial_putc (*s++);
max3100_serial_puts(s);
}
int serial_getc(void)
{
return max3100_getc();
return max3100_serial_getc();
}
int serial_tstc(void)
{
return max3100_tstc();
}
/* XXX WTF? */
void serial_setbrg(void)
{
return max3100_serial_tstc();
}
#endif