Deleted Added
full compact
uart_bus_puc.c (120452) uart_bus_puc.c (158124)
1/*-
1/*-
2 * Copyright (c) 2006 Marcel Moolenaar. All rights reserved.
2 * Copyright (c) 2002 JF Hay. All rights reserved.
3 * Copyright (c) 2001 M. Warner Losh. 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 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.

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

19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
3 * Copyright (c) 2002 JF Hay. All rights reserved.
4 * Copyright (c) 2001 M. Warner Losh. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.

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

20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
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 <sys/cdefs.h>
27__FBSDID("$FreeBSD: head/sys/dev/uart/uart_bus_puc.c 120452 2003-09-26 05:14:56Z marcel $");
28__FBSDID("$FreeBSD: head/sys/dev/uart/uart_bus_puc.c 158124 2006-04-28 21:21:53Z marcel $");
28
29#include <sys/param.h>
30#include <sys/systm.h>
31#include <sys/bus.h>
32#include <sys/conf.h>
33#include <sys/kernel.h>
34#include <sys/module.h>
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
35#include <machine/bus.h>
36#include <sys/rman.h>
37#include <machine/resource.h>
38
37#include <machine/bus.h>
38#include <sys/rman.h>
39#include <machine/resource.h>
40
39#include <dev/pci/pcivar.h>
40#include <dev/puc/pucvar.h>
41#include <dev/puc/puc_bus.h>
41
42#include <dev/uart/uart.h>
43#include <dev/uart/uart_bus.h>
44
45static int uart_puc_probe(device_t dev);
46
47static device_method_t uart_puc_methods[] = {
48 /* Device interface */
49 DEVMETHOD(device_probe, uart_puc_probe),
50 DEVMETHOD(device_attach, uart_bus_attach),
51 DEVMETHOD(device_detach, uart_bus_detach),
42
43#include <dev/uart/uart.h>
44#include <dev/uart/uart_bus.h>
45
46static int uart_puc_probe(device_t dev);
47
48static device_method_t uart_puc_methods[] = {
49 /* Device interface */
50 DEVMETHOD(device_probe, uart_puc_probe),
51 DEVMETHOD(device_attach, uart_bus_attach),
52 DEVMETHOD(device_detach, uart_bus_detach),
53 /* Serdev interface */
54 DEVMETHOD(serdev_ihand, uart_bus_ihand),
55 DEVMETHOD(serdev_ipend, uart_bus_ipend),
52 { 0, 0 }
53};
54
55static driver_t uart_puc_driver = {
56 uart_driver_name,
57 uart_puc_methods,
58 sizeof(struct uart_softc),
59};
60
61static int
62uart_puc_probe(device_t dev)
63{
64 device_t parent;
65 struct uart_softc *sc;
56 { 0, 0 }
57};
58
59static driver_t uart_puc_driver = {
60 uart_driver_name,
61 uart_puc_methods,
62 sizeof(struct uart_softc),
63};
64
65static int
66uart_puc_probe(device_t dev)
67{
68 device_t parent;
69 struct uart_softc *sc;
66 uintptr_t port, rclk, regshft, type;
70 uintptr_t rclk, type;
67
68 parent = device_get_parent(dev);
69 sc = device_get_softc(dev);
70
71
72 parent = device_get_parent(dev);
73 sc = device_get_softc(dev);
74
71 if (BUS_READ_IVAR(parent, dev, PUC_IVAR_SUBTYPE, &type))
75 if (BUS_READ_IVAR(parent, dev, PUC_IVAR_TYPE, &type))
72 return (ENXIO);
76 return (ENXIO);
73 switch (type) {
74 case PUC_PORT_UART_NS8250:
75 sc->sc_class = &uart_ns8250_class;
76 port = 0;
77 break;
78 case PUC_PORT_UART_SAB82532:
79 sc->sc_class = &uart_sab82532_class;
80 if (BUS_READ_IVAR(parent, dev, PUC_IVAR_PORT, &port))
81 port = 0;
82 break;
83 case PUC_PORT_UART_Z8530:
84 sc->sc_class = &uart_z8530_class;
85 if (BUS_READ_IVAR(parent, dev, PUC_IVAR_PORT, &port))
86 port = 0;
87 break;
88 default:
77 if (type != PUC_TYPE_SERIAL)
89 return (ENXIO);
78 return (ENXIO);
90 }
91
79
92 if (BUS_READ_IVAR(parent, dev, PUC_IVAR_FREQ, &rclk))
80 sc->sc_class = &uart_ns8250_class;
81
82 if (BUS_READ_IVAR(parent, dev, PUC_IVAR_CLOCK, &rclk))
93 rclk = 0;
83 rclk = 0;
94 if (BUS_READ_IVAR(parent, dev, PUC_IVAR_REGSHFT, &regshft))
95 regshft = 0;
96 return (uart_bus_probe(dev, regshft, rclk, 0, port));
84 return (uart_bus_probe(dev, 0, rclk, 0, 0));
97}
98
99DRIVER_MODULE(uart, puc, uart_puc_driver, uart_devclass, 0, 0);
85}
86
87DRIVER_MODULE(uart, puc, uart_puc_driver, uart_devclass, 0, 0);