| cardbus_cis.c (119418) | cardbus_cis.c (119690) |
|---|---|
| 1/* 2 * Copyright (c) 2000,2001 Jonathan Chen. 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 --- 14 unchanged lines hidden (view full) --- 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 30#include <sys/cdefs.h> | 1/* 2 * Copyright (c) 2000,2001 Jonathan Chen. 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 --- 14 unchanged lines hidden (view full) --- 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 30#include <sys/cdefs.h> |
| 31__FBSDID("$FreeBSD: head/sys/dev/cardbus/cardbus_cis.c 119418 2003-08-24 17:55:58Z obrien $"); | 31__FBSDID("$FreeBSD: head/sys/dev/cardbus/cardbus_cis.c 119690 2003-09-02 17:30:40Z jhb $"); |
| 32 33/* 34 * CIS Handling for the Cardbus Bus 35 */ 36 37#include <sys/param.h> 38#include <sys/systm.h> 39#include <sys/kernel.h> --- 999 unchanged lines hidden (view full) --- 1039 1040 /* 1041 * Try to pick up any resources that was not specified in CIS. 1042 * Some devices (eg, 3c656) does not list all resources required by 1043 * the driver in its CIS. 1044 * XXX: should we do this or use quirks? 1045 */ 1046 for (reg = 0; reg < dinfo->pci.cfg.nummaps; reg++) { | 32 33/* 34 * CIS Handling for the Cardbus Bus 35 */ 36 37#include <sys/param.h> 38#include <sys/systm.h> 39#include <sys/kernel.h> --- 999 unchanged lines hidden (view full) --- 1039 1040 /* 1041 * Try to pick up any resources that was not specified in CIS. 1042 * Some devices (eg, 3c656) does not list all resources required by 1043 * the driver in its CIS. 1044 * XXX: should we do this or use quirks? 1045 */ 1046 for (reg = 0; reg < dinfo->pci.cfg.nummaps; reg++) { |
| 1047 cardbus_add_map(cbdev, child, PCIR_MAPS + reg * 4); | 1047 cardbus_add_map(cbdev, child, PCIR_BAR(reg)); |
| 1048 } 1049 1050 for (q = &cardbus_quirks[0]; q->devid; q++) { 1051 if (q->devid == ((dinfo->pci.cfg.device << 16) | dinfo->pci.cfg.vendor) 1052 && q->type == CARDBUS_QUIRK_MAP_REG) { 1053 cardbus_add_map(cbdev, child, q->arg1); 1054 } 1055 } --- 125 unchanged lines hidden --- | 1048 } 1049 1050 for (q = &cardbus_quirks[0]; q->devid; q++) { 1051 if (q->devid == ((dinfo->pci.cfg.device << 16) | dinfo->pci.cfg.vendor) 1052 && q->type == CARDBUS_QUIRK_MAP_REG) { 1053 cardbus_add_map(cbdev, child, q->arg1); 1054 } 1055 } --- 125 unchanged lines hidden --- |