1a2
> * Copyright (c) 2006 Marcel Moolenaar. All rights reserved.
27c28
< __FBSDID("$FreeBSD: head/sys/dev/uart/uart_bus_puc.c 120452 2003-09-26 05:14:56Z marcel $");
---
> __FBSDID("$FreeBSD: head/sys/dev/uart/uart_bus_puc.c 158124 2006-04-28 21:21:53Z marcel $");
34a36
>
39,40c41
< #include <dev/pci/pcivar.h>
< #include <dev/puc/pucvar.h>
---
> #include <dev/puc/puc_bus.h>
51a53,55
> /* Serdev interface */
> DEVMETHOD(serdev_ihand, uart_bus_ihand),
> DEVMETHOD(serdev_ipend, uart_bus_ipend),
66c70
< uintptr_t port, rclk, regshft, type;
---
> uintptr_t rclk, type;
71c75
< if (BUS_READ_IVAR(parent, dev, PUC_IVAR_SUBTYPE, &type))
---
> if (BUS_READ_IVAR(parent, dev, PUC_IVAR_TYPE, &type))
73,88c77
< switch (type) {
< case PUC_PORT_UART_NS8250:
< sc->sc_class = &uart_ns8250_class;
< port = 0;
< break;
< case PUC_PORT_UART_SAB82532:
< sc->sc_class = &uart_sab82532_class;
< if (BUS_READ_IVAR(parent, dev, PUC_IVAR_PORT, &port))
< port = 0;
< break;
< case PUC_PORT_UART_Z8530:
< sc->sc_class = &uart_z8530_class;
< if (BUS_READ_IVAR(parent, dev, PUC_IVAR_PORT, &port))
< port = 0;
< break;
< default:
---
> if (type != PUC_TYPE_SERIAL)
90d78
< }
92c80,82
< if (BUS_READ_IVAR(parent, dev, PUC_IVAR_FREQ, &rclk))
---
> sc->sc_class = &uart_ns8250_class;
>
> if (BUS_READ_IVAR(parent, dev, PUC_IVAR_CLOCK, &rclk))
94,96c84
< if (BUS_READ_IVAR(parent, dev, PUC_IVAR_REGSHFT, &regshft))
< regshft = 0;
< return (uart_bus_probe(dev, regshft, rclk, 0, port));
---
> return (uart_bus_probe(dev, 0, rclk, 0, 0));