[Mplayer-cvslog] CVS: main/vidix/drivers cyberblade_vid.c,1.3,1.4 mach64_vid.c,1.31,1.32 mga_vid.c,1.20,1.21 pm3_vid.c,1.1,1.2 radeon_vid.c,1.70,1.71

[Tobias Diedrich CVS]

Update of /cvsroot/mplayer/main/vidix/drivers
In directory mail:/var/tmp.root/cvs-serv15747/vidix/drivers

Modified Files:
	cyberblade_vid.c mach64_vid.c mga_vid.c pm3_vid.c radeon_vid.c 
Log Message:
Ignore disabled cards.    (Jon Burgess <jburgess at uklinux.net>)


Index: cyberblade_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/cyberblade_vid.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cyberblade_vid.c	19 Jan 2003 16:10:38 -0000	1.3
+++ cyberblade_vid.c	31 Mar 2003 00:14:35 -0000	1.4
@@ -183,6 +183,11 @@
 				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));

Index: mach64_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/mach64_vid.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mach64_vid.c	31 Oct 2002 10:57:07 -0000	1.31
+++ mach64_vid.c	31 Mar 2003 00:14:35 -0000	1.32
@@ -421,6 +421,11 @@
 	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" : "");

Index: mga_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/mga_vid.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mga_vid.c	15 Mar 2003 21:03:24 -0000	1.20
+++ mga_vid.c	31 Mar 2003 00:14:35 -0000	1.21
@@ -1196,6 +1196,11 @@
 		    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:

Index: pm3_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/pm3_vid.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pm3_vid.c	31 May 2002 23:17:43 -0000	1.1
+++ pm3_vid.c	31 Mar 2003 00:14:35 -0000	1.2
@@ -112,6 +112,11 @@
 		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));

Index: radeon_vid.c
===================================================================
RCS file: /cvsroot/mplayer/main/vidix/drivers/radeon_vid.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- radeon_vid.c	7 Mar 2003 12:59:28 -0000	1.70
+++ radeon_vid.c	31 Mar 2003 00:14:36 -0000	1.71
@@ -925,6 +925,11 @@
 	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)
 	{