| sio_puc.c (102892) | sio_puc.c (106590) |
|---|---|
| 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 102892 2002-09-03 11:17:38Z phk $"); | 27__FBSDID("$FreeBSD: head/sys/dev/sio/sio_puc.c 106590 2002-11-07 22:22:10Z jhb $"); |
| 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> --- 25 unchanged lines hidden (view full) --- 61 sio_puc_methods, 62 0, 63}; 64 65static int 66sio_puc_attach(dev) 67 device_t dev; 68{ | 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> --- 25 unchanged lines hidden (view full) --- 61 sio_puc_methods, 62 0, 63}; 64 65static int 66sio_puc_attach(dev) 67 device_t dev; 68{ |
| 69 u_int rclk; | 69 uintptr_t rclk; |
| 70 71 if (BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_FREQ, 72 &rclk) != 0) 73 rclk = DEFAULT_RCLK; 74 return (sioattach(dev, 0, rclk)); 75} 76 77static int 78sio_puc_probe(dev) 79 device_t dev; 80{ | 70 71 if (BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_FREQ, 72 &rclk) != 0) 73 rclk = DEFAULT_RCLK; 74 return (sioattach(dev, 0, rclk)); 75} 76 77static int 78sio_puc_probe(dev) 79 device_t dev; 80{ |
| 81 u_int rclk; | 81 uintptr_t rclk; |
| 82 83 if (BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_FREQ, 84 &rclk) != 0) 85 rclk = DEFAULT_RCLK; 86#ifdef PC98 87 SET_FLAG(dev, SET_IFTYPE(COM_IF_NS16550)); 88#endif | 82 83 if (BUS_READ_IVAR(device_get_parent(dev), dev, PUC_IVAR_FREQ, 84 &rclk) != 0) 85 rclk = DEFAULT_RCLK; 86#ifdef PC98 87 SET_FLAG(dev, SET_IFTYPE(COM_IF_NS16550)); 88#endif |
| 89 return (sioprobe(dev, 0, (u_long)rclk, 1)); | 89 return (sioprobe(dev, 0, rclk, 1)); |
| 90} 91 92DRIVER_MODULE(sio, puc, sio_puc_driver, sio_devclass, 0, 0); | 90} 91 92DRIVER_MODULE(sio, puc, sio_puc_driver, sio_devclass, 0, 0); |