diff options
| author | Dexter Morgan <dmorgan@mageia.org> | 2011-05-17 10:04:07 +0000 |
|---|---|---|
| committer | Dexter Morgan <dmorgan@mageia.org> | 2011-05-17 10:04:07 +0000 |
| commit | 53deffa95a32e6d946b004c3e83bee0865a7c01d (patch) | |
| tree | eef2635b0ee8659b460d677205af47a777cc5554 | |
| parent | f517e0fdddfadde37594b4e8806b2d8118b94349 (diff) | |
| download | ldetect-lst-0.1.291.tar ldetect-lst-0.1.291.tar.gz ldetect-lst-0.1.291.tar.bz2 ldetect-lst-0.1.291.tar.xz ldetect-lst-0.1.291.zip | |
Sync with mandriva0.1.291
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | NEWS | 12 | ||||
| -rwxr-xr-x | convert/merge2pcitable.pl | 12 | ||||
| -rw-r--r-- | lst/pcitable | 137 |
4 files changed, 101 insertions, 64 deletions
@@ -1,7 +1,7 @@ include Makefile.config NAME = ldetect-lst -VERSION := 0.1.289 +VERSION := 0.1.291 FILES = AUTHORS ChangeLog Makefile Makefile.config convert lst update-ldetect-lst @@ -29,7 +29,7 @@ install: build dist-svn: svn export -q -rBASE . $(NAME)-$(VERSION) - tar cfY ../$(NAME)-$(VERSION).tar.lzma $(NAME)-$(VERSION) + tar cfJ ../$(NAME)-$(VERSION).tar.xz $(NAME)-$(VERSION) rm -rf $(NAME)-$(VERSION) dist-git: @@ -1,5 +1,15 @@ +- add new ATI ids from the proprietary driver + +Version 0.1.291 - 22 March 2011 + +- add new NVIDIA ids from the proprietary driver +- add new ATI ids from the prorietary driver and the free driver +- update ATI ids from xf86-video-ati-6.14.1 + +Version 0.1.290 - 19 December 2010 + +- add new NVIDIA ids from the proprietary driver - update pci.ids usb.ids oui.txt -- add a new NVIDIA id from the proprietary driver Version 0.1.289 - 22 October 2010 diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl index 6837f317..15ca92b9 100755 --- a/convert/merge2pcitable.pl +++ b/convert/merge2pcitable.pl @@ -42,7 +42,7 @@ if ($0 =~ /merge2pcitable/) if ($format eq 'kernel_aliasmap' || $format eq 'fglrxko_pci_ids_h') { foreach (keys %$d_pci) { - if (member($d_pci->{$_}[0], ($ati_driver, $ati_driver_rhd, $ati_driver_vesa)) && !$d_in->{$_}[0]) { + if (member($d_pci->{$_}[0], ($ati_driver, $ati_driver_rhd, $ati_driver_vesa)) && !$d_in->{$_}) { # support dropped, handle: if ($d_pci->{$_}[0] eq $ati_driver) { $d_pci->{$_}[0] = $ati_free_only; @@ -53,7 +53,7 @@ if ($0 =~ /merge2pcitable/) } else { die 'not handled ' . $_; } - } elsif (member($d_pci->{$_}[0], ($ati_free_only, $ati_rhd_only)) && $d_in->{$_}[0]) { + } elsif (member($d_pci->{$_}[0], ($ati_free_only, $ati_rhd_only)) && $d_in->{$_}) { # support added for pre-existing entry, handle: if ($d_pci->{$_}[0] eq $ati_free_only) { $d_pci->{$_}[0] = $ati_driver; @@ -68,7 +68,7 @@ if ($0 =~ /merge2pcitable/) # Here we hack around so that drivers get used in order radeon, radeonhd, vesa: if ($format eq 'ati_pciids_csv') { foreach (keys %$d_pci) { - if (member($d_pci->{$_}[0], ($ati_driver, $ati_free_only)) && !$d_in->{$_}[0]) { + if (member($d_pci->{$_}[0], ($ati_driver, $ati_free_only)) && !$d_in->{$_}) { # support dropped, handle: if ($d_pci->{$_}[0] eq $ati_driver) { $d_pci->{$_}[0] = $ati_driver_vesa; @@ -77,7 +77,7 @@ if ($0 =~ /merge2pcitable/) } else { die 'not handled ' . $_; } - } elsif (member($d_pci->{$_}[0], ($ati_driver_rhd, $ati_driver_vesa, $ati_rhd_only)) && $d_in->{$_}[0]) { + } elsif (member($d_pci->{$_}[0], ($ati_driver_rhd, $ati_driver_vesa, $ati_rhd_only)) && $d_in->{$_}) { # support added for pre-existing entry, handle: next if $_ eq "10029610ffffffff"; # see Cards+ and #49824 if (member($d_pci->{$_}[0], ($ati_driver_rhd, $ati_driver_vesa))) { @@ -92,7 +92,7 @@ if ($0 =~ /merge2pcitable/) } if ($format eq 'rhd_id_c') { foreach (keys %$d_pci) { - if (member($d_pci->{$_}[0], ($ati_driver_rhd, $ati_rhd_only)) && !$d_in->{$_}[0]) { + if (member($d_pci->{$_}[0], ($ati_driver_rhd, $ati_rhd_only)) && !$d_in->{$_}) { # support dropped, handle: if ($d_pci->{$_}[0] eq $ati_driver_rhd) { $d_pci->{$_}[0] = $ati_driver_vesa; @@ -101,7 +101,7 @@ if ($0 =~ /merge2pcitable/) } else { die 'not handled ' . $_; } - } elsif ($d_pci->{$_}[0] eq $ati_driver_vesa && $d_in->{$_}[0]) { + } elsif ($d_pci->{$_}[0] eq $ati_driver_vesa && $d_in->{$_}) { # support added for pre-existing entry, handle: $d_pci->{$_}[0] = $ati_driver_rhd; } diff --git a/lst/pcitable b/lst/pcitable index a451e6e0..be4b5215 100644 --- a/lst/pcitable +++ b/lst/pcitable @@ -53,7 +53,6 @@ 0x1002 0x4158 "Card:ATI Mach 64-based cards" 0x1002 0x4237 "Card:ATI Radeon X1950 and earlier" 0x1002 0x4242 "Card:ATI Radeon X1950 and earlier" -0x1002 0x4243 "Card:ATI Radeon X1950 and earlier" 0x1002 0x4336 "Card:ATI Radeon X1950 and earlier" 0x1002 0x4337 "Card:ATI Radeon X1950 and earlier" 0x1002 0x4354 "Card:ATI Mach 64-based cards" @@ -258,56 +257,58 @@ 0x1002 0x5e4c "Card:ATI Radeon X1950 and earlier" 0x1002 0x5e4d "Card:ATI Radeon X1950 and earlier" 0x1002 0x5e4f "Card:ATI Radeon X1950 and earlier" -0x1002 0x6700 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6701 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6702 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6703 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6704 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6705 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6706 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6707 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6708 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6709 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6718 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6719 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x671c "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x671d "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6720 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6721 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6722 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6723 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6724 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6725 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6726 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6727 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6728 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6729 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6738 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6739 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6740 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6741 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6742 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6743 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6744 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6745 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6746 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6747 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6748 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6749 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6750 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6758 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6759 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6760 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6761 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6762 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6763 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6764 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6765 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6766 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6767 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6768 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6770 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x6779 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" +0x1002 0x6700 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6701 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6702 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6703 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6704 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6705 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6706 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6707 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6708 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6709 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6718 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6719 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x671c "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x671d "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x671f "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" +0x1002 0x6720 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6721 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6722 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6723 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6724 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6725 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6726 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6727 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6728 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6729 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6738 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6739 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x673e "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" +0x1002 0x6740 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6741 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6742 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6743 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6744 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6745 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6746 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6747 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6748 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6749 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6750 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6758 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6759 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6760 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6761 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6762 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6763 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6764 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6765 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6766 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6767 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6768 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6770 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x6779 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" 0x1002 0x6880 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" 0x1002 0x6888 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" 0x1002 0x6889 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" @@ -317,6 +318,7 @@ 0x1002 0x6890 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" 0x1002 0x6898 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" 0x1002 0x6899 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x689b "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" 0x1002 0x689c "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" 0x1002 0x689d "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" 0x1002 0x689e "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" @@ -328,7 +330,9 @@ 0x1002 0x68b1 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" 0x1002 0x68b8 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" 0x1002 0x68b9 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x68ba "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" 0x1002 0x68be "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x68bf "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" 0x1002 0x68c0 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" 0x1002 0x68c1 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" 0x1002 0x68c7 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" @@ -595,16 +599,30 @@ 0x1002 0x9643 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" 0x1002 0x9644 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" 0x1002 0x9645 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" +0x1002 0x9647 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" +0x1002 0x9648 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" +0x1002 0x9649 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" +0x1002 0x964a "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" +0x1002 0x964b "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" +0x1002 0x964c "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" +0x1002 0x964e "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" +0x1002 0x964f "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" 0x1002 0x9710 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" 0x1002 0x9711 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" 0x1002 0x9712 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" 0x1002 0x9713 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" 0x1002 0x9714 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" 0x1002 0x9715 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" -0x1002 0x9802 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x9803 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x9804 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" -0x1002 0x9805 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" +0x1002 0x9802 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x9803 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x9804 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x9805 "Card:ATI Radeon HD 2000 and later (radeon/fglrx)" +0x1002 0x9806 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" +0x1002 0x9807 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" +0x1002 0x9900 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" +0x1002 0x9901 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" +0x1002 0x9990 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" +0x1002 0x9991 "Card:ATI Radeon HD 2000 and later (vesa/fglrx)" 0x1005 0x2301 "Card:VESA driver (generic)" 0x1005 0x2302 "Card:VESA driver (generic)" 0x1005 0x2364 "Card:VESA driver (generic)" @@ -1461,6 +1479,8 @@ 0x10de 0x06d2 "Card:NVIDIA GeForce 400 series and later" 0x10de 0x06d8 "Card:NVIDIA GeForce 400 series and later" 0x10de 0x06d9 "Card:NVIDIA GeForce 400 series and later" +0x10de 0x06da "Card:NVIDIA GeForce 400 series and later" +0x10de 0x06dc "Card:NVIDIA GeForce 400 series and later" 0x10de 0x06dd "Card:NVIDIA GeForce 400 series and later" 0x10de 0x06de "Card:NVIDIA GeForce 400 series and later" 0x10de 0x06df "Card:NVIDIA GeForce 400 series and later" @@ -1536,6 +1556,7 @@ 0x10de 0x0a2d "Card:NVIDIA GeForce 6100 to GeForce 360" 0x10de 0x0a34 "Card:NVIDIA GeForce 6100 to GeForce 360" 0x10de 0x0a35 "Card:NVIDIA GeForce 6100 to GeForce 360" +0x10de 0x0a38 "Card:NVIDIA GeForce 400 series and later" 0x10de 0x0a3c "Card:NVIDIA GeForce 6100 to GeForce 360" 0x10de 0x0a60 "Card:NVIDIA GeForce 6100 to GeForce 360" 0x10de 0x0a61 "Card:NVIDIA GeForce 6100 to GeForce 360" @@ -1582,7 +1603,13 @@ 0x10de 0x0df3 "Card:NVIDIA GeForce 400 series and later" 0x10de 0x0df8 "Card:NVIDIA GeForce 400 series and later" 0x10de 0x0e22 "Card:NVIDIA GeForce 400 series and later" +0x10de 0x0e23 "Card:NVIDIA GeForce 400 series and later" 0x10de 0x0e24 "Card:NVIDIA GeForce 400 series and later" +0x10de 0x1080 "Card:NVIDIA GeForce 400 series and later" +0x10de 0x1081 "Card:NVIDIA GeForce 400 series and later" +0x10de 0x10c3 "Card:NVIDIA GeForce 400 series and later" +0x10de 0x10d8 "Card:NVIDIA GeForce 400 series and later" +0x10de 0x1200 "Card:NVIDIA GeForce 400 series and later" 0x10e0 0x9128 "Card:IMS TwinTurbo-based cards" 0x10e0 0x9135 "Card:IMS TwinTurbo-based cards" 0x10e3 0x0000 "Card:VESA driver (generic)" |