Module Name: xsrc
Committed By: mrg
Date: Mon Feb 21 05:45:08 UTC 2011
Modified Files:
xsrc/external/mit/libpciaccess/dist/src: common_bridge.c
Removed Files:
xsrc/external/mit/libpciaccess/dist/m4: ac_define_dir.m4 libtool.m4
ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4
xsrc/external/mit/libpciaccess/dist/src: scanpci.c scanpci.man
Log Message:
merge libpciaccess 0.12.1
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libpciaccess/dist/m4/ac_define_dir.m4 \
xsrc/external/mit/libpciaccess/dist/m4/libtool.m4 \
xsrc/external/mit/libpciaccess/dist/m4/ltoptions.m4 \
xsrc/external/mit/libpciaccess/dist/m4/ltsugar.m4 \
xsrc/external/mit/libpciaccess/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/libpciaccess/dist/m4/ltversion.m4
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/libpciaccess/dist/src/common_bridge.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libpciaccess/dist/src/scanpci.c \
xsrc/external/mit/libpciaccess/dist/src/scanpci.man
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libpciaccess/dist/src/common_bridge.c
diff -u xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.4 xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.5
--- xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.4 Sat May 22 10:29:41 2010
+++ xsrc/external/mit/libpciaccess/dist/src/common_bridge.c Mon Feb 21 05:45:08 2011
@@ -273,10 +273,6 @@
return ENODEV;
}
- if (!priv->bridge.pci) {
- return ENODEV;
- }
-
switch ((dev->device_class >> 8) & 0x0ff) {
case 0x00:
/* What to do for host bridges? I'm pretty sure this isn't right.
@@ -297,7 +293,7 @@
case 0x04:
if (priv->bridge.pci == NULL)
read_bridge_info(priv);
- if (priv->header_type == 0x01) {
+ if ((priv->header_type & 0x7f) == 0x01) {
*primary_bus = priv->bridge.pci->primary_bus;
*secondary_bus = priv->bridge.pci->secondary_bus;
*subordinate_bus = priv->bridge.pci->subordinate_bus;
@@ -311,7 +307,7 @@
case 0x07:
if (priv->bridge.pcmcia == NULL)
read_bridge_info(priv);
- if (priv->header_type == 0x02) {
+ if ((priv->header_type & 0x7f) == 0x02) {
*primary_bus = priv->bridge.pcmcia->primary_bus;
*secondary_bus = priv->bridge.pcmcia->card_bus;
*subordinate_bus = priv->bridge.pcmcia->subordinate_bus;
