[Mplayer-cvslog] CVS: main/libdha libdha.h,1.7,1.8 pci.c,1.11,1.12 test.c,1.1,1.2

[Tobias Diedrich CVS]

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

Modified Files:
	libdha.h pci.c test.c 
Log Message:
Ignore disabled cards.    (Jon Burgess <jburgess at uklinux.net>)


Index: libdha.h
===================================================================
RCS file: /cvsroot/mplayer/main/libdha/libdha.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libdha.h	19 Apr 2002 16:33:54 -0000	1.7
+++ libdha.h	31 Mar 2003 00:14:13 -0000	1.8
@@ -24,10 +24,12 @@
 #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;

Index: pci.c
===================================================================
RCS file: /cvsroot/mplayer/main/libdha/pci.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pci.c	4 Jan 2003 19:01:36 -0000	1.11
+++ pci.c	31 Mar 2003 00:14:13 -0000	1.12
@@ -504,6 +504,7 @@
   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 ;

Index: test.c
===================================================================
RCS file: /cvsroot/mplayer/main/libdha/test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test.c	4 Jan 2002 10:32:26 -0000	1.1
+++ test.c	31 Mar 2003 00:14:13 -0000	1.2
@@ -16,11 +16,11 @@
   }
   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;