Deleted Added
sdiff udiff text old ( 155324 ) new ( 158531 )
full compact
uart_cpu_at91usart.c (155324) uart_cpu_at91usart.c (158531)
1/*-
2 * Copyright (c) 2003 Marcel Moolenaar
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *

--- 13 unchanged lines hidden (view full) ---

22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include "opt_uart.h"
28
29#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2003 Marcel Moolenaar
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *

--- 13 unchanged lines hidden (view full) ---

22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include "opt_uart.h"
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/sys/arm/at91/uart_cpu_at91rm9200usart.c 155324 2006-02-04 23:32:13Z imp $");
30__FBSDID("$FreeBSD: head/sys/arm/at91/uart_cpu_at91rm9200usart.c 158531 2006-05-13 23:41:16Z cognet $");
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/bus.h>
35#include <sys/cons.h>
36#include <machine/bus.h>
37
38#include <dev/uart/uart.h>

--- 18 unchanged lines hidden (view full) ---

57{
58 di->ops = at91_usart_ops;
59 di->bas.chan = 0;
60 di->bas.bst = &at91_bs_tag;
61 /*
62 * XXX: Not pretty, but will work because we map VA == PA early
63 * for the last 1MB of memory.
64 */
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/bus.h>
35#include <sys/cons.h>
36#include <machine/bus.h>
37
38#include <dev/uart/uart.h>

--- 18 unchanged lines hidden (view full) ---

57{
58 di->ops = at91_usart_ops;
59 di->bas.chan = 0;
60 di->bas.bst = &at91_bs_tag;
61 /*
62 * XXX: Not pretty, but will work because we map VA == PA early
63 * for the last 1MB of memory.
64 */
65#ifdef USART0_CONSOLE
65#ifdef SKYEYE_WORKAROUNDS
66 di->bas.bsh = AT91RM92_BASE + AT91RM92_USART0_BASE;
66 di->bas.bsh = AT91RM92_BASE + AT91RM92_USART0_BASE;
67 di->bas.chan = 1;
68 di->baudrate = 38400;
69#else
70 di->bas.bsh = AT91RM92_BASE + AT91RM92_SYS_BASE + DBGU;
67 di->baudrate = 38400;
68#else
69 di->bas.bsh = AT91RM92_BASE + AT91RM92_SYS_BASE + DBGU;
71 di->bas.chan = 0;
72 di->baudrate = 115200;
73#endif
74 di->bas.regshft = 0;
75 di->bas.rclk = 0;
76 di->databits = 8;
77 di->stopbits = 1;
78 di->parity = UART_PARITY_NONE;
70 di->baudrate = 115200;
71#endif
72 di->bas.regshft = 0;
73 di->bas.rclk = 0;
74 di->databits = 8;
75 di->stopbits = 1;
76 di->parity = UART_PARITY_NONE;
77 uart_bus_space_io = &at91_bs_tag;
78 uart_bus_space_mem = NULL;
79 /* Check the environment for overrides */
80 if (uart_getenv(devtype, di) == 0)
81 return (0);
79 /* Check the environment for overrides */
80 if (uart_getenv(devtype, di) == 0)
81 return (0);
82
83 uart_bus_space_io = &at91_bs_tag;
84 uart_bus_space_mem = NULL;
85
86 return (0);
87}
82 return (0);
83}