From e25e1515c08938cf51889390a232cd661eb8019c Mon Sep 17 00:00:00 2001 From: ranma Date: Mon, 31 Mar 2003 00:14:36 +0000 Subject: Ignore disabled cards. (Jon Burgess ) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9768 b3059339-0415-0410-9bf9-f77b7e298cf2 --- vidix/drivers/cyberblade_vid.c | 5 +++++ vidix/drivers/mach64_vid.c | 5 +++++ vidix/drivers/mga_vid.c | 5 +++++ vidix/drivers/pm3_vid.c | 5 +++++ vidix/drivers/radeon_vid.c | 5 +++++ 5 files changed, 25 insertions(+) (limited to 'vidix') diff --git a/vidix/drivers/cyberblade_vid.c b/vidix/drivers/cyberblade_vid.c index 53ce138493..0c1f67dd79 100644 --- a/vidix/drivers/cyberblade_vid.c +++ b/vidix/drivers/cyberblade_vid.c @@ -183,6 +183,11 @@ int vixProbe(int verbose, int force) dname = pci_device_name(VENDOR_TRIDENT, lst[i].device); dname = dname ? dname : "Unknown chip"; printf("[cyberblade] Found chip: %s\n", dname); + if ((lst[i].command & PCI_COMMAND_IO) == 0) + { + printf("[cyberblade] Device is disabled, ignoring\n"); + continue; + } cyberblade_cap.device_id = lst[i].device; err = 0; memcpy(&pci_info, &lst[i], sizeof(pciinfo_t)); diff --git a/vidix/drivers/mach64_vid.c b/vidix/drivers/mach64_vid.c index 5f3228235d..4a6cf0df07 100644 --- a/vidix/drivers/mach64_vid.c +++ b/vidix/drivers/mach64_vid.c @@ -421,6 +421,11 @@ int vixProbe(int verbose,int force) dname = pci_device_name(VENDOR_ATI,lst[i].device); dname = dname ? dname : "Unknown chip"; printf("[mach64] Found chip: %s\n",dname); + if ((lst[i].command & PCI_COMMAND_IO) == 0) + { + printf("[mach64] Device is disabled, ignoring\n"); + continue; + } if(force > PROBE_NORMAL) { printf("[mach64] Driver was forced. Was found %sknown chip\n",idx == -1 ? "un" : ""); diff --git a/vidix/drivers/mga_vid.c b/vidix/drivers/mga_vid.c index f6b2236fc9..faff07038a 100644 --- a/vidix/drivers/mga_vid.c +++ b/vidix/drivers/mga_vid.c @@ -1196,6 +1196,11 @@ int vixProbe(int verbose,int force) i, lst[i].vendor, lst[i].device); if (lst[i].vendor == VENDOR_MATROX) { + if ((lst[i].command & PCI_COMMAND_IO) == 0) + { + printf("[mga] Device is disabled, ignoring\n"); + continue; + } switch(lst[i].device) { case DEVICE_MATROX_MGA_G550_AGP: diff --git a/vidix/drivers/pm3_vid.c b/vidix/drivers/pm3_vid.c index 73c30c5435..3c678e10fd 100644 --- a/vidix/drivers/pm3_vid.c +++ b/vidix/drivers/pm3_vid.c @@ -112,6 +112,11 @@ int vixProbe(int verbose, int force) dname = pci_device_name(VENDOR_3DLABS, lst[i].device); dname = dname ? dname : "Unknown chip"; printf("[pm3] Found chip: %s\n", dname); + if ((lst[i].command & PCI_COMMAND_IO) == 0) + { + printf("[pm3] Device is disabled, ignoring\n"); + continue; + } pm3_cap.device_id = lst[i].device; err = 0; memcpy(&pci_info, &lst[i], sizeof(pciinfo_t)); diff --git a/vidix/drivers/radeon_vid.c b/vidix/drivers/radeon_vid.c index f658902342..1981e42a68 100644 --- a/vidix/drivers/radeon_vid.c +++ b/vidix/drivers/radeon_vid.c @@ -925,6 +925,11 @@ int vixProbe( int verbose,int force ) dname = pci_device_name(VENDOR_ATI,lst[i].device); dname = dname ? dname : "Unknown chip"; printf(RADEON_MSG" Found chip: %s\n",dname); + if ((lst[i].command & PCI_COMMAND_IO) == 0) + { + printf("[radeon] Device is disabled, ignoring\n"); + continue; + } #ifndef RAGE128 if(idx != -1) { -- cgit v1.2.3