| fdc_cbus.c (132210) | fdc_cbus.c (132286) |
|---|---|
| 1/* | 1/*- |
| 2 * Copyright (c) 2004 Yoshihiro TAKAHASHI 3 * 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 9 * notice, this list of conditions, and the following disclaimer, --- 12 unchanged lines hidden (view full) --- 22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * SUCH DAMAGE. 27 */ 28 29#include <sys/cdefs.h> | 2 * Copyright (c) 2004 Yoshihiro TAKAHASHI 3 * 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 9 * notice, this list of conditions, and the following disclaimer, --- 12 unchanged lines hidden (view full) --- 22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * SUCH DAMAGE. 27 */ 28 29#include <sys/cdefs.h> |
| 30__FBSDID("$FreeBSD: head/sys/pc98/cbus/fdc_cbus.c 132210 2004-07-15 15:00:02Z nyan $"); | 30__FBSDID("$FreeBSD: head/sys/pc98/cbus/fdc_cbus.c 132286 2004-07-17 10:07:19Z nyan $"); |
| 31 32#include <sys/param.h> 33#include <sys/bio.h> 34#include <sys/bus.h> 35#include <sys/kernel.h> 36#include <sys/module.h> 37#include <sys/rman.h> 38#include <sys/systm.h> --- 88 unchanged lines hidden (view full) --- 127 128 fdc_release_resources(fdc); 129 return (error); 130} 131 132static int 133fdc_cbus_attach(device_t dev) 134{ | 31 32#include <sys/param.h> 33#include <sys/bio.h> 34#include <sys/bus.h> 35#include <sys/kernel.h> 36#include <sys/module.h> 37#include <sys/rman.h> 38#include <sys/systm.h> --- 88 unchanged lines hidden (view full) --- 127 128 fdc_release_resources(fdc); 129 return (error); 130} 131 132static int 133fdc_cbus_attach(device_t dev) 134{ |
| 135 int error; | |
| 136 struct fdc_data *fdc; | 135 struct fdc_data *fdc; |
| 136 int error; |
|
| 137 138 fdc = device_get_softc(dev); 139 140 if ((error = fdc_cbus_alloc_resources(dev, fdc)) != 0 || | 137 138 fdc = device_get_softc(dev); 139 140 if ((error = fdc_cbus_alloc_resources(dev, fdc)) != 0 || |
| 141 (error = fdc_attach(dev)) != 0) { | 141 (error = fdc_attach(dev)) != 0 || 142 (error = fdc_hints_probe(dev)) != 0) { |
| 142 fdc_release_resources(fdc); 143 return (error); 144 } 145 146 return (0); 147} 148 149static device_method_t fdc_methods[] = { --- 24 unchanged lines hidden --- | 143 fdc_release_resources(fdc); 144 return (error); 145 } 146 147 return (0); 148} 149 150static device_method_t fdc_methods[] = { --- 24 unchanged lines hidden --- |