diff options
| -rw-r--r-- | libdha/libdha.h | 2 | ||||
| -rw-r--r-- | libdha/pci.c | 1 | ||||
| -rw-r--r-- | libdha/test.c | 6 | ||||
| -rw-r--r-- | vidix/drivers/cyberblade_vid.c | 5 | ||||
| -rw-r--r-- | vidix/drivers/mach64_vid.c | 5 | ||||
| -rw-r--r-- | vidix/drivers/mga_vid.c | 5 | ||||
| -rw-r--r-- | vidix/drivers/pm3_vid.c | 5 | ||||
| -rw-r--r-- | vidix/drivers/radeon_vid.c | 5 |
8 files changed, 31 insertions, 3 deletions
diff --git a/libdha/libdha.h b/libdha/libdha.h index 54afad8b8c..3135b34b76 100644 --- a/libdha/libdha.h +++ b/libdha/libdha.h @@ -24,10 +24,12 @@ extern "C" { #define MAX_PCI_DEVICES_PER_BUS 32 #define MAX_PCI_DEVICES 64 #define PCI_MULTIFUNC_DEV 0x80 +#define PCI_COMMAND_IO 0x1 /* Enable response to I/O space */ typedef struct pciinfo_s { int bus,card,func; /* PCI/AGP bus:card:func */ + unsigned short command; /* Device control register */ unsigned short vendor,device; /* Card vendor+device ID */ unsigned base0,base1,base2,baserom; /* Memory and I/O base addresses */ // unsigned base0_limit, base1_limit, base2_limit, baserom_limit; diff --git a/libdha/pci.c b/libdha/pci.c index 7520ab8cae..adf0c5db82 100644 --- a/libdha/pci.c +++ b/libdha/pci.c @@ -504,6 +504,7 @@ static void identify_card(struct pci_config_reg *pcr, int idx) pci_lst[idx].bus = pcibus ; pci_lst[idx].card = pcicard ; pci_lst[idx].func = pcifunc ; + pci_lst[idx].command = pcr->_status_command & 0xFFFF; pci_lst[idx].vendor = pcr->_vendor ; pci_lst[idx].device = pcr->_device ; pci_lst[idx].base0 = 0xFFFFFFFF ; diff --git a/libdha/test.c b/libdha/test.c index 41aa466d1d..6538ab28c2 100644 --- a/libdha/test.c +++ b/libdha/test.c @@ -16,11 +16,11 @@ int main( void ) } else { - printf(" Bus:card:func vend:dev base0 :base1 :base2 :baserom\n"); + printf(" Bus:card:func vend:dev command base0 :base1 :base2 :baserom\n"); for(i=0;i<num_pci;i++) - printf("%04X:%04X:%04X %04X:%04X %08X:%08X:%08X:%08X\n" + printf("%04X:%04X:%04X %04X:%04X %04X %08X:%08X:%08X:%08X\n" ,lst[i].bus,lst[i].card,lst[i].func - ,lst[i].vendor,lst[i].device + ,lst[i].vendor,lst[i].device,lst[i].command ,lst[i].base0,lst[i].base1,lst[i].base2,lst[i].baserom); } return EXIT_SUCCESS; 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) { |