Deleted Added
full compact
uart_cpu_x86.c (120381) uart_cpu_x86.c (120452)
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_cpu_amd64.c 120381 2003-09-23 13:03:22Z nyan $");
28__FBSDID("$FreeBSD: head/sys/dev/uart/uart_cpu_amd64.c 120452 2003-09-26 05:14:56Z marcel $");
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/bus.h>
33
34#include <machine/bus.h>
35
36#include <dev/uart/uart.h>

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

70 if (resource_int_value("uart", i, "port", &ivar) != 0 ||
71 ivar == 0)
72 continue;
73 /*
74 * Got it. Fill in the instance and return it. We only have
75 * ns8250 and successors on i386.
76 */
77 di->ops = uart_ns8250_ops;
29
30#include <sys/param.h>
31#include <sys/systm.h>
32#include <sys/bus.h>
33
34#include <machine/bus.h>
35
36#include <dev/uart/uart.h>

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

70 if (resource_int_value("uart", i, "port", &ivar) != 0 ||
71 ivar == 0)
72 continue;
73 /*
74 * Got it. Fill in the instance and return it. We only have
75 * ns8250 and successors on i386.
76 */
77 di->ops = uart_ns8250_ops;
78 di->bas.iobase = ivar;
78 di->bas.chan = 0;
79 di->bas.bst = AMD64_BUS_SPACE_IO;
80 if (bus_space_map(di->bas.bst, ivar, 8, 0, &di->bas.bsh) != 0)
81 continue;
82 di->bas.regshft = 0;
83 di->bas.rclk = 0;
84 if (resource_int_value("uart", i, "baud", &ivar) != 0)
85 ivar = 0;
86 di->baudrate = ivar;
87 di->databits = 8;
88 di->stopbits = 1;
89 di->parity = UART_PARITY_NONE;
90 return (0);
91 }
92
93 return (ENXIO);
94}
79 di->bas.bst = AMD64_BUS_SPACE_IO;
80 if (bus_space_map(di->bas.bst, ivar, 8, 0, &di->bas.bsh) != 0)
81 continue;
82 di->bas.regshft = 0;
83 di->bas.rclk = 0;
84 if (resource_int_value("uart", i, "baud", &ivar) != 0)
85 ivar = 0;
86 di->baudrate = ivar;
87 di->databits = 8;
88 di->stopbits = 1;
89 di->parity = UART_PARITY_NONE;
90 return (0);
91 }
92
93 return (ENXIO);
94}