| iir_pci.c (120477) | iir_pci.c (127135) |
|---|---|
| 1/*- 2 * Copyright (c) 2000-03 ICP vortex GmbH 3 * Copyright (c) 2002-03 Intel Corporation 4 * Copyright (c) 2003 Adaptec Inc. 5 * All Rights Reserved 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 17 unchanged lines hidden (view full) --- 26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 29 * SUCH DAMAGE. 30 */ 31 32#ident "$Id: iir_pci.c 1.2 2003/08/26 12:29:55 achim Exp $" 33#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2000-03 ICP vortex GmbH 3 * Copyright (c) 2002-03 Intel Corporation 4 * Copyright (c) 2003 Adaptec Inc. 5 * All Rights Reserved 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 17 unchanged lines hidden (view full) --- 26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 29 * SUCH DAMAGE. 30 */ 31 32#ident "$Id: iir_pci.c 1.2 2003/08/26 12:29:55 achim Exp $" 33#include <sys/cdefs.h> |
| 34__FBSDID("$FreeBSD: head/sys/dev/iir/iir_pci.c 120477 2003-09-26 15:36:47Z scottl $"); | 34__FBSDID("$FreeBSD: head/sys/dev/iir/iir_pci.c 127135 2004-03-17 17:50:55Z njl $"); |
| 35 36/* 37 * iir_pci.c: PCI Bus Attachment for Intel Integrated RAID Controller driver 38 * 39 * Written by: Achim Leubner <achim.leubner@intel.com> 40 * Written by: Achim Leubner <achim_leubner@adaptec.com> 41 * Fixes/Additions: Boji Tony Kannanthanam <boji.t.kannanthanam@intel.com> 42 * --- 144 unchanged lines hidden (view full) --- 187 struct gdt_softc *gdt; 188 struct resource *io = NULL, *irq = NULL; 189 int retries, rid, error = 0; 190 void *ih; 191 u_int8_t protocol; 192 193 /* map DPMEM */ 194 rid = PCI_DPMEM; | 35 36/* 37 * iir_pci.c: PCI Bus Attachment for Intel Integrated RAID Controller driver 38 * 39 * Written by: Achim Leubner <achim.leubner@intel.com> 40 * Written by: Achim Leubner <achim_leubner@adaptec.com> 41 * Fixes/Additions: Boji Tony Kannanthanam <boji.t.kannanthanam@intel.com> 42 * --- 144 unchanged lines hidden (view full) --- 187 struct gdt_softc *gdt; 188 struct resource *io = NULL, *irq = NULL; 189 int retries, rid, error = 0; 190 void *ih; 191 u_int8_t protocol; 192 193 /* map DPMEM */ 194 rid = PCI_DPMEM; |
| 195 io = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, 0, ~0, 1, RF_ACTIVE); | 195 io = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); |
| 196 if (io == NULL) { 197 device_printf(dev, "can't allocate register resources\n"); 198 error = ENOMEM; 199 goto err; 200 } 201 202 /* get IRQ */ 203 rid = 0; | 196 if (io == NULL) { 197 device_printf(dev, "can't allocate register resources\n"); 198 error = ENOMEM; 199 goto err; 200 } 201 202 /* get IRQ */ 203 rid = 0; |
| 204 irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, 205 RF_ACTIVE | RF_SHAREABLE); | 204 irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, 205 RF_ACTIVE | RF_SHAREABLE); |
| 206 if (io == NULL) { 207 device_printf(dev, "can't find IRQ value\n"); 208 error = ENOMEM; 209 goto err; 210 } 211 212 gdt = device_get_softc(dev); 213 bzero(gdt, sizeof(struct gdt_softc)); --- 271 unchanged lines hidden --- | 206 if (io == NULL) { 207 device_printf(dev, "can't find IRQ value\n"); 208 error = ENOMEM; 209 goto err; 210 } 211 212 gdt = device_get_softc(dev); 213 bzero(gdt, sizeof(struct gdt_softc)); --- 271 unchanged lines hidden --- |