| sio_puc.c (146734) | sio_puc.c (158124) |
|---|---|
| 1/*- 2 * Copyright (c) 2002 JF Hay. All rights reserved. 3 * Copyright (c) 2001 M. Warner Losh. 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 * 1. Redistributions of source code must retain the above copyright --- 10 unchanged lines hidden (view full) --- 19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 */ 25 26#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2002 JF Hay. All rights reserved. 3 * Copyright (c) 2001 M. Warner Losh. 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 * 1. Redistributions of source code must retain the above copyright --- 10 unchanged lines hidden (view full) --- 19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 */ 25 26#include <sys/cdefs.h> |
| 27__FBSDID("$FreeBSD: head/sys/dev/sio/sio_puc.c 146734 2005-05-29 04:42:30Z nyan $"); | 27__FBSDID("$FreeBSD: head/sys/dev/sio/sio_puc.c 158124 2006-04-28 21:21:53Z marcel $"); |
| 28 29#include <sys/param.h> 30#include <sys/systm.h> 31#include <sys/bus.h> 32#include <sys/conf.h> 33#include <sys/kernel.h> 34#include <sys/lock.h> 35#include <sys/malloc.h> 36#include <sys/mutex.h> 37#include <sys/module.h> 38#include <sys/tty.h> 39#include <machine/bus.h> 40#include <sys/timepps.h> 41 | 28 29#include <sys/param.h> 30#include <sys/systm.h> 31#include <sys/bus.h> 32#include <sys/conf.h> 33#include <sys/kernel.h> 34#include <sys/lock.h> 35#include <sys/malloc.h> 36#include <sys/mutex.h> 37#include <sys/module.h> 38#include <sys/tty.h> 39#include <machine/bus.h> 40#include <sys/timepps.h> 41 |
| 42#include <dev/pci/pcivar.h> 43#include <dev/puc/pucvar.h> | 42#include <dev/puc/puc_bus.h> 43 |
| 44#include <dev/sio/siovar.h> 45#include <dev/sio/sioreg.h> 46 47static int sio_puc_attach(device_t dev); 48static int sio_puc_probe(device_t dev); 49 50static device_method_t sio_puc_methods[] = { 51 /* Device interface */ --- 6 unchanged lines hidden (view full) --- 58 59static driver_t sio_puc_driver = { 60 sio_driver_name, 61 sio_puc_methods, 62 0, 63}; 64 65static int | 44#include <dev/sio/siovar.h> 45#include <dev/sio/sioreg.h> 46 47static int sio_puc_attach(device_t dev); 48static int sio_puc_probe(device_t dev); 49 50static device_method_t sio_puc_methods[] = { 51 /* Device interface */ --- 6 unchanged lines hidden (view full) --- 58 59static driver_t sio_puc_driver = { 60 sio_driver_name, 61 sio_puc_methods, 62 0, 63}; 64 65static int |
| 66sio_puc_attach(dev) 67 device_t dev; | 66sio_puc_attach(device_t dev) |
| 68{ 69 uintptr_t rclk; 70 | 67{ 68 uintptr_t rclk; 69 |
| 71 if (BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_FREQ, | 70 if (BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_CLOCK, |
| 72 &rclk) != 0) 73 rclk = DEFAULT_RCLK; 74 return (sioattach(dev, 0, rclk)); 75} 76 77static int | 71 &rclk) != 0) 72 rclk = DEFAULT_RCLK; 73 return (sioattach(dev, 0, rclk)); 74} 75 76static int |
| 78sio_puc_probe(dev) 79 device_t dev; | 77sio_puc_probe(device_t dev) |
| 80{ | 78{ |
| 81 uintptr_t rclk; | 79 device_t parent; 80 uintptr_t rclk, type; 81 int error; |
| 82 | 82 |
| 83 if (BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_FREQ, 84 &rclk) != 0) | 83 parent = device_get_parent(dev); 84 85 if (BUS_READ_IVAR(parent, dev, PUC_IVAR_TYPE, &type)) 86 return (ENXIO); 87 if (type != PUC_TYPE_SERIAL) 88 return (ENXIO); 89 90 if (BUS_READ_IVAR(parent, dev, PUC_IVAR_CLOCK, &rclk)) |
| 85 rclk = DEFAULT_RCLK; 86#ifdef PC98 87 SET_FLAG(dev, SET_IFTYPE(COM_IF_NS16550)); 88#endif | 91 rclk = DEFAULT_RCLK; 92#ifdef PC98 93 SET_FLAG(dev, SET_IFTYPE(COM_IF_NS16550)); 94#endif |
| 89 return (sioprobe(dev, 0, rclk, 1)); | 95 error = sioprobe(dev, 0, rclk, 1); 96 return ((error > 0) ? error : BUS_PROBE_LOW_PRIORITY); |
| 90} 91 92DRIVER_MODULE(sio, puc, sio_puc_driver, sio_devclass, 0, 0); | 97} 98 99DRIVER_MODULE(sio, puc, sio_puc_driver, sio_devclass, 0, 0); |