Deleted Added
full compact
uart_dev_lpc.c (260890) uart_dev_lpc.c (279724)
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 *

--- 11 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>
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 *

--- 11 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>
28__FBSDID("$FreeBSD: head/sys/dev/uart/uart_dev_lpc.c 260890 2014-01-19 19:39:13Z imp $");
28__FBSDID("$FreeBSD: head/sys/dev/uart/uart_dev_lpc.c 279724 2015-03-07 15:24:15Z ian $");
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/bus.h>
33#include <sys/conf.h>
34#include <machine/bus.h>
35#include <machine/fdt.h>
36
37#include <dev/uart/uart.h>
38#include <dev/uart/uart_cpu.h>
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/bus.h>
33#include <sys/conf.h>
34#include <machine/bus.h>
35#include <machine/fdt.h>
36
37#include <dev/uart/uart.h>
38#include <dev/uart/uart_cpu.h>
39#include <dev/uart/uart_cpu_fdt.h>
39#include <dev/uart/uart_bus.h>
40
41#include <dev/ic/ns16550.h>
42#include <arm/lpc/lpcreg.h>
43
44#include "uart_if.h"
45
46#define DEFAULT_RCLK (13 * 1000 * 1000)

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

416 KOBJMETHOD(uart_receive, lpc_ns8250_bus_receive),
417 KOBJMETHOD(uart_setsig, lpc_ns8250_bus_setsig),
418 KOBJMETHOD(uart_transmit, lpc_ns8250_bus_transmit),
419 KOBJMETHOD(uart_grab, lpc_ns8250_bus_grab),
420 KOBJMETHOD(uart_ungrab, lpc_ns8250_bus_ungrab),
421 { 0, 0 }
422};
423
40#include <dev/uart/uart_bus.h>
41
42#include <dev/ic/ns16550.h>
43#include <arm/lpc/lpcreg.h>
44
45#include "uart_if.h"
46
47#define DEFAULT_RCLK (13 * 1000 * 1000)

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

417 KOBJMETHOD(uart_receive, lpc_ns8250_bus_receive),
418 KOBJMETHOD(uart_setsig, lpc_ns8250_bus_setsig),
419 KOBJMETHOD(uart_transmit, lpc_ns8250_bus_transmit),
420 KOBJMETHOD(uart_grab, lpc_ns8250_bus_grab),
421 KOBJMETHOD(uart_ungrab, lpc_ns8250_bus_ungrab),
422 { 0, 0 }
423};
424
424struct uart_class uart_lpc_class = {
425static struct uart_class uart_lpc_class = {
425 "lpc_ns8250",
426 lpc_ns8250_methods,
427 sizeof(struct lpc_ns8250_softc),
428 .uc_ops = &uart_lpc_ns8250_ops,
429 .uc_range = 8,
430 .uc_rclk = DEFAULT_RCLK
431};
432
426 "lpc_ns8250",
427 lpc_ns8250_methods,
428 sizeof(struct lpc_ns8250_softc),
429 .uc_ops = &uart_lpc_ns8250_ops,
430 .uc_range = 8,
431 .uc_rclk = DEFAULT_RCLK
432};
433
434static struct ofw_compat_data compat_data[] = {
435 {"lpc,uart", (uintptr_t)&uart_lpc_class},
436 {NULL, (uintptr_t)NULL},
437};
438UART_FDT_CLASS_AND_DEVICE(compat_data);
439
433#define SIGCHG(c, i, s, d) \
434 if (c) { \
435 i |= (i & s) ? s : s | d; \
436 } else { \
437 i = (i & s) ? (i & ~s) | d : i; \
438 }
439
440static int

--- 487 unchanged lines hidden ---
440#define SIGCHG(c, i, s, d) \
441 if (c) { \
442 i |= (i & s) ? s : s | d; \
443 } else { \
444 i = (i & s) ? (i & ~s) | d : i; \
445 }
446
447static int

--- 487 unchanged lines hidden ---