Deleted Added
full compact
uart_cpu_x86.c (120376) uart_cpu_x86.c (120378)
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 120376 2003-09-23 08:38:49Z nyan $");
28__FBSDID("$FreeBSD: head/sys/dev/uart/uart_cpu_amd64.c 120378 2003-09-23 09:25:38Z nyan $");
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>
37#include <dev/uart/uart_cpu.h>
38
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>
37#include <dev/uart/uart_cpu.h>
38
39bus_addr_t
40uart_cpu_busaddr(struct uart_bas *bas)
41{
42
43 return (bas->bsh);
44}
45
46int
47uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
48{
49
50 return ((b1->bsh == b2->bsh && b1->bst == b2->bst) ? 1 : 0);
51}
52
53int

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

77 if (resource_int_value("uart", i, "port", &ivar) != 0 ||
78 ivar == 0)
79 continue;
80 /*
81 * Got it. Fill in the instance and return it. We only have
82 * ns8250 and successors on i386.
83 */
84 di->ops = uart_ns8250_ops;
39int
40uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
41{
42
43 return ((b1->bsh == b2->bsh && b1->bst == b2->bst) ? 1 : 0);
44}
45
46int

--- 23 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;
85 di->bas.bst = AMD64_BUS_SPACE_IO;
86 if (bus_space_map(di->bas.bst, ivar, 8, 0, &di->bas.bsh) != 0)
87 return (ENXIO);
88 di->bas.regshft = 0;
89 di->bas.rclk = 0;
90 if (resource_int_value("uart", i, "baud", &ivar) != 0)
91 ivar = 0;
92 di->baudrate = ivar;
93 di->databits = 8;
94 di->stopbits = 1;
95 di->parity = UART_PARITY_NONE;
96 return (0);
97 }
98
99 return (ENXIO);
100}
79 di->bas.bst = AMD64_BUS_SPACE_IO;
80 if (bus_space_map(di->bas.bst, ivar, 8, 0, &di->bas.bsh) != 0)
81 return (ENXIO);
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}