Deleted Added
sdiff udiff text old ( 158432 ) new ( 158531 )
full compact
uart_bus_at91usart.c (158432) uart_bus_at91usart.c (158531)
1/*-
2 * Copyright (c) 2005 Olivier Houchard. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

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

20 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
22 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */
24
25#include "opt_uart.h"
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2005 Olivier Houchard. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

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

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

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

71usart_at91rm92_probe(device_t dev)
72{
73 struct uart_softc *sc;
74
75 sc = device_get_softc(dev);
76 switch (device_get_unit(dev))
77 {
78 case 0:
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/bus.h>
33#include <sys/conf.h>
34#include <sys/kernel.h>
35#include <sys/module.h>
36#include <machine/bus.h>

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

71usart_at91rm92_probe(device_t dev)
72{
73 struct uart_softc *sc;
74
75 sc = device_get_softc(dev);
76 switch (device_get_unit(dev))
77 {
78 case 0:
79#ifdef SKYEYE_WORKAROUNDS
80 device_set_desc(dev, "USART0");
81#else
79 device_set_desc(dev, "DBGU");
82 device_set_desc(dev, "DBGU");
80#ifndef USART0_CONSOLE
83#endif
81 /*
82 * Setting sc_sysdev makes this device a 'system device' and
83 * indirectly makes it the system console.
84 */
85 sc->sc_sysdev = SLIST_FIRST(&uart_sysdevs);
86 bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas));
84 /*
85 * Setting sc_sysdev makes this device a 'system device' and
86 * indirectly makes it the system console.
87 */
88 sc->sc_sysdev = SLIST_FIRST(&uart_sysdevs);
89 bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas));
87#endif
88 break;
89 case 1:
90 device_set_desc(dev, "USART0");
90 break;
91 case 1:
92 device_set_desc(dev, "USART0");
91#ifdef USART0_CONSOLE
92 sc->sc_sysdev = SLIST_FIRST(&uart_sysdevs);
93 bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas));
94#endif
95 break;
96 case 2:
97 device_set_desc(dev, "USART1");
98 break;
99 case 3:
100 device_set_desc(dev, "USART2");
101 break;
102 case 4:
103 device_set_desc(dev, "USART3");
104 break;
105 }
106 sc->sc_class = &at91_usart_class;
93 break;
94 case 2:
95 device_set_desc(dev, "USART1");
96 break;
97 case 3:
98 device_set_desc(dev, "USART2");
99 break;
100 case 4:
101 device_set_desc(dev, "USART3");
102 break;
103 }
104 sc->sc_class = &at91_usart_class;
107 return (uart_bus_probe(dev, 0, 0, 0, 0));
105 return (uart_bus_probe(dev, 0, 0, 0, device_get_unit(dev)));
108}
109
110
111DRIVER_MODULE(uart, atmelarm, usart_at91rm92_driver, uart_devclass, 0, 0);
106}
107
108
109DRIVER_MODULE(uart, atmelarm, usart_at91rm92_driver, uart_devclass, 0, 0);