diff options
| author | rrs <rrs@FreeBSD.org> | 2009-10-29 15:55:25 +0000 |
|---|---|---|
| committer | rrs <rrs@FreeBSD.org> | 2009-10-29 15:55:25 +0000 |
| commit | 25289eefb57c6f6949f015c6021751ead54b13a0 (patch) | |
| tree | 4dc1c57f88735d648392919022d6c683da6f04fd /sys/mips/rmi/uart_cpu_mips_xlr.c | |
| parent | 8f48fd489ca9aedf98fa043f148f59c2317df2c0 (diff) | |
| download | FreeBSD-src-25289eefb57c6f6949f015c6021751ead54b13a0.zip FreeBSD-src-25289eefb57c6f6949f015c6021751ead54b13a0.tar.gz | |
more Updates on the RMI code close to compiling now ;-)
Diffstat (limited to 'sys/mips/rmi/uart_cpu_mips_xlr.c')
| -rw-r--r-- | sys/mips/rmi/uart_cpu_mips_xlr.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/sys/mips/rmi/uart_cpu_mips_xlr.c b/sys/mips/rmi/uart_cpu_mips_xlr.c index 09703f5..6cbea14 100644 --- a/sys/mips/rmi/uart_cpu_mips_xlr.c +++ b/sys/mips/rmi/uart_cpu_mips_xlr.c @@ -55,16 +55,18 @@ static int xlr_uart_probe(struct uart_bas *bas); static void xlr_uart_init(struct uart_bas *bas, int, int, int, int); static void xlr_uart_term(struct uart_bas *bas); static void xlr_uart_putc(struct uart_bas *bas, int); -static int xlr_uart_poll(struct uart_bas *bas); -static int xlr_uart_getc(struct uart_bas *bas); +/*static int xlr_uart_poll(struct uart_bas *bas);*/ +static int xlr_uart_getc(struct uart_bas *bas, struct mtx *hwmtx); struct mtx xlr_uart_mtx; /*UartLock*/ +extern struct uart_ops uart_ns8250_ops; + struct uart_ops xlr_uart_ns8250_ops = { .probe = xlr_uart_probe, .init = xlr_uart_init, .term = xlr_uart_term, .putc = xlr_uart_putc, - .poll = xlr_uart_poll, + /* .poll = xlr_uart_poll, ?? */ .getc = xlr_uart_getc, }; @@ -119,7 +121,7 @@ static void xlr_uart_putc(struct uart_bas *bas, int c) uart_ns8250_ops.putc(bas,c); xlr_uart_unlock(&xlr_uart_mtx); } - +/* static int xlr_uart_poll(struct uart_bas *bas) { int res; @@ -128,10 +130,11 @@ static int xlr_uart_poll(struct uart_bas *bas) xlr_uart_unlock(&xlr_uart_mtx); return res; } +*/ -static int xlr_uart_getc(struct uart_bas *bas) +static int xlr_uart_getc(struct uart_bas *bas, struct mtx *hwmtx) { - return uart_ns8250_ops.getc(bas); + return uart_ns8250_ops.getc(bas, hwmtx); } int @@ -144,7 +147,7 @@ uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2) int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - di->ops = xlr_uart_ns8250_ops; + di->ops = &xlr_uart_ns8250_ops; di->bas.chan = 0; di->bas.bst = uart_bus_space_mem; /* TODO Need to call bus_space_map() here */ |
