diff options
Diffstat (limited to 'sys/dev/uart/uart_cpu_ia64.c')
| -rw-r--r-- | sys/dev/uart/uart_cpu_ia64.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/sys/dev/uart/uart_cpu_ia64.c b/sys/dev/uart/uart_cpu_ia64.c index 9340ae5..d5b773f 100644 --- a/sys/dev/uart/uart_cpu_ia64.c +++ b/sys/dev/uart/uart_cpu_ia64.c @@ -44,13 +44,6 @@ static int dig64_to_uart_parity[] = { UART_PARITY_ODD, UART_PARITY_MARK, UART_PARITY_SPACE }; -bus_addr_t -uart_cpu_busaddr(struct uart_bas *bas) -{ - - return (bas->bsh); -} - int uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2) { @@ -82,13 +75,13 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) continue; di->ops = uart_ns8250_ops; + di->bas.iobase = (ent->address.addr_high << 32) + + ent->address.addr_low; di->bas.bst = IA64_BUS_SPACE_IO; di->bas.bst = (ent->address.addr_space == 0) ? IA64_BUS_SPACE_MEM : IA64_BUS_SPACE_IO; - if (bus_space_map(di->bas.bst, - (ent->address.addr_high << 32) + - ent->address.addr_low, - 8, 0, &di->bas.bsh) != 0) + if (bus_space_map(di->bas.bst, di->bas.iobase, 8, 0, + &di->bas.bsh) != 0) return (ENXIO); di->bas.regshft = 0; di->bas.rclk = ent->pclock << 4; @@ -131,6 +124,7 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di) * ns8250 and successors on i386. */ di->ops = uart_ns8250_ops; + di->bas.iobase = ivar; di->bas.bst = IA64_BUS_SPACE_IO; if (bus_space_map(di->bas.bst, ivar, 8, 0, &di->bas.bsh) != 0) return (ENXIO); |
