[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/scanpci pciid2c.pl, 1.1.4.1, 1.1.4.2 xf86PciStdIds.h, 1.1.4.2, 1.1.4.3 xf86ScanPci.c, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/scanpci
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/scanpci

Modified Files:
      Tag: XORG-CURRENT
	pciid2c.pl xf86PciStdIds.h xf86ScanPci.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: pciid2c.pl
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/scanpci/pciid2c.pl,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/pciid2c.pl	26 Nov 2003 22:49:03 -0000	1.1.4.1
+++ b/pciid2c.pl	15 Apr 2004 10:17:12 -0000	1.1.4.2
@@ -5,7 +5,7 @@
 #
 # It should be run as:
 #
-#   perl pciid2c.pl ../common/xf86PciInfo.h < pci.ids > xf86PciIds.h
+#   perl pciid2c.pl ../common/xf86PciInfo.h < pci.ids > xf86PciStdIds.h
 #
 #
 # Copyright © 2002 by The XFree86 Project, Inc.

Index: xf86PciStdIds.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/scanpci/xf86PciStdIds.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/xf86PciStdIds.h	20 Dec 2003 00:28:30 -0000	1.1.4.2
+++ b/xf86PciStdIds.h	15 Apr 2004 10:17:12 -0000	1.1.4.3
@@ -1,5 +1,4 @@
-/* $XdotOrg$ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86PciStdIds.h,v 1.15 2003/12/18 16:32:45 dawes Exp $ */
+/* $XFree86$ */
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT
@@ -40,11 +39,19 @@
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
 static const char pci_vendor_0070[] = "Hauppauge computer works Inc.";
+static const char pci_device_0070_4000[] = "WinTV PVR-350";
[...8932 lines suppressed...]
@@ -84942,6 +89758,9 @@
 	{0xe4bf, pci_vendor_e4bf, pci_ss_list_e4bf},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0xe55e, pci_vendor_e55e, pci_ss_list_e55e},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0xea01, pci_vendor_ea01, pci_ss_list_ea01},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
@@ -84973,6 +89792,9 @@
 	{0xfeda, pci_vendor_feda, pci_ss_list_feda},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO
+	{0xfede, pci_vendor_fede, pci_ss_list_fede},
+#endif
+#ifdef VENDOR_INCLUDE_NONVIDEO
 	{0xfffe, pci_vendor_fffe, pci_ss_list_fffe},
 #endif
 #ifdef VENDOR_INCLUDE_NONVIDEO

Index: xf86ScanPci.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/xf86ScanPci.c	5 Mar 2004 13:40:57 -0000	1.1.4.2
+++ b/xf86ScanPci.c	15 Apr 2004 10:17:13 -0000	1.1.4.3
@@ -96,7 +96,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,
@@ -113,7 +113,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,