IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7859 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1bc8f877ed6aed3ef249d0505f104492ce16297b
by git＠ipfire.org 16 May '13

16 May '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 1bc8f877ed6aed3ef249d0505f104492ce16297b (commit) via 7b91d99f45ba597e05ce0f837a0b16c445f89a78 (commit) via 409f70463134057f709bb120a6d6eac1a0b8d453 (commit) via 099f4a9ec705c0ed09ae11815c08381b1d61041b (commit) via 5d46c29e5afab019a7b160e344affec047ff0f91 (commit) from 7739c2dbaa8f4b6e19e01875f843c1b4dc23819f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1bc8f877ed6aed3ef249d0505f104492ce16297b Merge: 7739c2d 7b91d99 Author: Arne Fitzenreiter <Arne_F(a)ipfire.org> Date: Thu May 16 15:47:58 2013 +0200 Merge remote-tracking branch 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/68/filelists/files | 1 + config/rootfiles/packages/clamav | 6 +++--- doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 1 - doc/language_issues.fr | 1 - doc/language_issues.nl | 1 + doc/language_issues.pl | 1 - doc/language_issues.ru | 1 - html/cgi-bin/credits.cgi | 6 ------ html/html/themes/maniac/include/functions.pl | 3 ++- lfs/clamav | 8 ++++---- 12 files changed, 13 insertions(+), 18 deletions(-) Difference in files: diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files index 15680e6..30874a5 100644 --- a/config/rootfiles/core/68/filelists/files +++ b/config/rootfiles/core/68/filelists/files @@ -2,6 +2,7 @@ etc/system-release etc/issue etc/modprobe.d/blacklist srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index db38453..1f09b8d 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -10,15 +10,15 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.15 +usr/lib/libclamav.so.6.1.17 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.15 +usr/lib/libclamunrar.so.6.1.17 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.15 +usr/lib/libclamunrar_iface.so.6.1.17 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav diff --git a/doc/language_issues.de b/doc/language_issues.de index 65c0749..de0c4d3 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -294,6 +294,7 @@ WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries +WARNING: translation string unused: our donors WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname WARNING: translation string unused: override mtu diff --git a/doc/language_issues.en b/doc/language_issues.en index d05caf4..d7a7d72 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -321,6 +321,7 @@ WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries +WARNING: translation string unused: our donors WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname WARNING: translation string unused: override mtu diff --git a/doc/language_issues.es b/doc/language_issues.es index 538f240..0dea29c 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -578,7 +578,6 @@ WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other -WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group diff --git a/doc/language_issues.fr b/doc/language_issues.fr index dc14c54..bec7223 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -580,7 +580,6 @@ WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other -WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 932f272..c6fa36f 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -321,6 +321,7 @@ WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries +WARNING: translation string unused: our donors WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname WARNING: translation string unused: override mtu diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 538f240..0dea29c 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -578,7 +578,6 @@ WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other -WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 3f2ba5c..b513b59 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -561,7 +561,6 @@ WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other -WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: outgoing traffic in bytes per second WARNING: untranslated string: ovpn mtu-disc diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 3224267..d61019e 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -45,12 +45,6 @@ print <<END <strong>$Lang::tr{'donation'}</strong> </a> </div> -<br><br><hr><br> -<p style="text-align: center;"> - $Lang::tr{'our donors'}: - - <a href="http://www.irrsinn.de" target="_blank">irrsinn.de gmbh</a> -</p> END ; &Header::closebox(); diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl index eea8091..62bbf10 100644 --- a/html/html/themes/maniac/include/functions.pl +++ b/html/html/themes/maniac/include/functions.pl @@ -351,7 +351,8 @@ END &showsubsection($menu); &showsubsubsection($menu); - print <<END + print <<END + </div> </div> <br class="clear" /> <div id="footer" class="fixed"> diff --git a/lfs/clamav b/lfs/clamav index a2ed1f0..bae350c 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 0.97.6 +VER = 0.97.8 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 21 +PAK_VER = 22 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1dbdd803b37c0d9d222e4316049f46a2 +$(DL_FILE)_MD5 = ac52bcbad3ea72eac08fedb9772f648b install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7739c2dbaa8f4b6e19e01875f843c1b4dc23819f
by git＠ipfire.org 16 May '13

16 May '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 7739c2dbaa8f4b6e19e01875f843c1b4dc23819f (commit) from 6f615c1c4efcc100132797902856065bf7d0f442 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7739c2dbaa8f4b6e19e01875f843c1b4dc23819f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu May 16 10:19:50 2013 +0200 strace: New package. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/strace | 4 ++++ lfs/{git => strace} | 16 ++++++++-------- make.sh | 1 + 3 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 config/rootfiles/packages/strace copy lfs/{git => strace} (92%) Difference in files: diff --git a/config/rootfiles/packages/strace b/config/rootfiles/packages/strace new file mode 100644 index 0000000..4730d8c --- /dev/null +++ b/config/rootfiles/packages/strace @@ -0,0 +1,4 @@ +usr/bin/strace +#usr/bin/strace-graph +#usr/bin/strace-log-merge +#usr/share/man/man1/strace.1 diff --git a/lfs/strace b/lfs/strace new file mode 100644 index 0000000..f1ffc98 --- /dev/null +++ b/lfs/strace @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2013 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 4.7 + +THISAPP = strace-$(VER) +DL_FILE = $(THISAPP).tar.xz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = strace +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 6054c3880a00c6703f83b57f15e04642 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 9bd9465..65244c0 100755 --- a/make.sh +++ b/make.sh @@ -765,6 +765,7 @@ buildipfire() { ipfiremake nginx ipfiremake sendEmail ipfiremake sysbench + ipfiremake strace echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.13-core68, created. 7b91d99f45ba597e05ce0f837a0b16c445f89a78
by git＠ipfire.org 16 May '13

16 May '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The tag, v2.13-core68 has been created at 7b91d99f45ba597e05ce0f837a0b16c445f89a78 (commit) - Log ----------------------------------------------------------------- commit 7b91d99f45ba597e05ce0f837a0b16c445f89a78 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 14 11:40:25 2013 +0200 Update credits.cgi. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core68, updated. 7b91d99f45ba597e05ce0f837a0b16c445f89a78
by git＠ipfire.org 16 May '13

16 May '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core68 has been updated via 7b91d99f45ba597e05ce0f837a0b16c445f89a78 (commit) via 409f70463134057f709bb120a6d6eac1a0b8d453 (commit) from 099f4a9ec705c0ed09ae11815c08381b1d61041b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7b91d99f45ba597e05ce0f837a0b16c445f89a78 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 14 11:40:25 2013 +0200 Update credits.cgi. commit 409f70463134057f709bb120a6d6eac1a0b8d453 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 14 11:38:30 2013 +0200 Fix missing closing DIV tag in maniac's theme. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/68/filelists/files | 1 + doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 1 - doc/language_issues.fr | 1 - doc/language_issues.nl | 1 + doc/language_issues.pl | 1 - doc/language_issues.ru | 1 - html/cgi-bin/credits.cgi | 6 ------ html/html/themes/maniac/include/functions.pl | 3 ++- 10 files changed, 6 insertions(+), 11 deletions(-) Difference in files: diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files index 15680e6..30874a5 100644 --- a/config/rootfiles/core/68/filelists/files +++ b/config/rootfiles/core/68/filelists/files @@ -2,6 +2,7 @@ etc/system-release etc/issue etc/modprobe.d/blacklist srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi diff --git a/doc/language_issues.de b/doc/language_issues.de index 65c0749..de0c4d3 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -294,6 +294,7 @@ WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries +WARNING: translation string unused: our donors WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname WARNING: translation string unused: override mtu diff --git a/doc/language_issues.en b/doc/language_issues.en index d05caf4..d7a7d72 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -321,6 +321,7 @@ WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries +WARNING: translation string unused: our donors WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname WARNING: translation string unused: override mtu diff --git a/doc/language_issues.es b/doc/language_issues.es index 538f240..0dea29c 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -578,7 +578,6 @@ WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other -WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group diff --git a/doc/language_issues.fr b/doc/language_issues.fr index dc14c54..bec7223 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -580,7 +580,6 @@ WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other -WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 932f272..c6fa36f 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -321,6 +321,7 @@ WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries +WARNING: translation string unused: our donors WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname WARNING: translation string unused: override mtu diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 538f240..0dea29c 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -578,7 +578,6 @@ WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other -WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 3f2ba5c..b513b59 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -561,7 +561,6 @@ WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other -WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: outgoing traffic in bytes per second WARNING: untranslated string: ovpn mtu-disc diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 3224267..d61019e 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -45,12 +45,6 @@ print <<END <strong>$Lang::tr{'donation'}</strong> </a> </div> -<br><br><hr><br> -<p style="text-align: center;"> - $Lang::tr{'our donors'}: - - <a href="http://www.irrsinn.de" target="_blank">irrsinn.de gmbh</a> -</p> END ; &Header::closebox(); diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl index eea8091..62bbf10 100644 --- a/html/html/themes/maniac/include/functions.pl +++ b/html/html/themes/maniac/include/functions.pl @@ -351,7 +351,8 @@ END &showsubsection($menu); &showsubsubsection($menu); - print <<END + print <<END + </div> </div> <br class="clear" /> <div id="footer" class="fixed"> hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7b91d99f45ba597e05ce0f837a0b16c445f89a78
by git＠ipfire.org 16 May '13

16 May '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 7b91d99f45ba597e05ce0f837a0b16c445f89a78 (commit) via 409f70463134057f709bb120a6d6eac1a0b8d453 (commit) from 099f4a9ec705c0ed09ae11815c08381b1d61041b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7b91d99f45ba597e05ce0f837a0b16c445f89a78 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 14 11:40:25 2013 +0200 Update credits.cgi. commit 409f70463134057f709bb120a6d6eac1a0b8d453 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 14 11:38:30 2013 +0200 Fix missing closing DIV tag in maniac's theme. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/68/filelists/files | 1 + doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 1 - doc/language_issues.fr | 1 - doc/language_issues.nl | 1 + doc/language_issues.pl | 1 - doc/language_issues.ru | 1 - html/cgi-bin/credits.cgi | 6 ------ html/html/themes/maniac/include/functions.pl | 3 ++- 10 files changed, 6 insertions(+), 11 deletions(-) Difference in files: diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files index 15680e6..30874a5 100644 --- a/config/rootfiles/core/68/filelists/files +++ b/config/rootfiles/core/68/filelists/files @@ -2,6 +2,7 @@ etc/system-release etc/issue etc/modprobe.d/blacklist srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi diff --git a/doc/language_issues.de b/doc/language_issues.de index 65c0749..de0c4d3 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -294,6 +294,7 @@ WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries +WARNING: translation string unused: our donors WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname WARNING: translation string unused: override mtu diff --git a/doc/language_issues.en b/doc/language_issues.en index d05caf4..d7a7d72 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -321,6 +321,7 @@ WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries +WARNING: translation string unused: our donors WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname WARNING: translation string unused: override mtu diff --git a/doc/language_issues.es b/doc/language_issues.es index 538f240..0dea29c 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -578,7 +578,6 @@ WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other -WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group diff --git a/doc/language_issues.fr b/doc/language_issues.fr index dc14c54..bec7223 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -580,7 +580,6 @@ WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other -WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: ovpn mtu-disc WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 932f272..c6fa36f 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -321,6 +321,7 @@ WARNING: translation string unused: optionsfw warning WARNING: translation string unused: or WARNING: translation string unused: original WARNING: translation string unused: other countries +WARNING: translation string unused: our donors WARNING: translation string unused: out WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname WARNING: translation string unused: override mtu diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 538f240..0dea29c 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -578,7 +578,6 @@ WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other -WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 3f2ba5c..b513b59 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -561,7 +561,6 @@ WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other -WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: outgoing traffic in bytes per second WARNING: untranslated string: ovpn mtu-disc diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 3224267..d61019e 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -45,12 +45,6 @@ print <<END <strong>$Lang::tr{'donation'}</strong> </a> </div> -<br><br><hr><br> -<p style="text-align: center;"> - $Lang::tr{'our donors'}: - - <a href="http://www.irrsinn.de" target="_blank">irrsinn.de gmbh</a> -</p> END ; &Header::closebox(); diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl index eea8091..62bbf10 100644 --- a/html/html/themes/maniac/include/functions.pl +++ b/html/html/themes/maniac/include/functions.pl @@ -351,7 +351,8 @@ END &showsubsection($menu); &showsubsubsection($menu); - print <<END + print <<END + </div> </div> <br class="clear" /> <div id="footer" class="fixed"> hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1b81106bb84bdbbe9c54a814a543e42fe36051c4
by git＠ipfire.org 15 May '13

15 May '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 1b81106bb84bdbbe9c54a814a543e42fe36051c4 (commit) from 0a0354580a87301af07e283200439d7478da0ade (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1b81106bb84bdbbe9c54a814a543e42fe36051c4 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat May 11 19:43:17 2013 +0200 systemd: Update to 204. This is a major update to the latest availabel version. ----------------------------------------------------------------------- Summary of changes: systemd/systemd.nm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 9c1ca21..969951d 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -4,7 +4,7 @@ ############################################################################### name = systemd -version = 201 +version = 204 release = 1 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6f615c1c4efcc100132797902856065bf7d0f442
by git＠ipfire.org 11 May '13

11 May '13

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.13-core68, created. 099f4a9ec705c0ed09ae11815c08381b1d61041b
by git＠ipfire.org 11 May '13

11 May '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The tag, v2.13-core68 has been created at 099f4a9ec705c0ed09ae11815c08381b1d61041b (commit) - Log ----------------------------------------------------------------- commit 099f4a9ec705c0ed09ae11815c08381b1d61041b Merge: 5d46c29 3877f81 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat May 11 12:46:34 2013 +0200 Merge remote-tracking branch 'origin/next' ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core68, created. 099f4a9ec705c0ed09ae11815c08381b1d61041b
by git＠ipfire.org 11 May '13

11 May '13

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 099f4a9ec705c0ed09ae11815c08381b1d61041b
by git＠ipfire.org 11 May '13

11 May '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 099f4a9ec705c0ed09ae11815c08381b1d61041b (commit) via 3877f8174ac3959ee4ded54b689c6cf18599efbb (commit) via 31f31c43591c6a4e456c937b2005640abec24a60 (commit) via cfa7eab02f1b43394ad60bf196114e2827cf671b (commit) via 496df9728ea05c266ba72d6db311c92842744e2a (commit) via 2ad1a8bc0cc74ab98f0255657edcc53e54841680 (commit) via 83eb743523eae784bde6cc6b30dbe5d3af428d41 (commit) via 24131aadf415de3dca6bf62b6554a42827457112 (commit) via c295a7a80070aa6c049c7ef96983fb96b77bddcf (commit) via 987b6852bd0c11ecbe988b3a4ca436f0c5197261 (commit) via a9a58c609a4533ace92ae51e7e3e991a5409e97c (commit) via 96b397c47106189c2670560ace4a805e6adc1bb5 (commit) via c6556649c67e7cadfb16cb91c5c75534acc336b0 (commit) via ada69e1271313afb3124c97427bedec9759fb913 (commit) via 4ac2d1561a07c8188644825cc303a95dda16ae67 (commit) via 7aea4958781434960bf793d56317e2d65ca1a1b6 (commit) via f898e6ac5d5a5f852c80c572e9ffedf9b188bda9 (commit) via 76988c142d927837915fe6c0844c7b86302b9676 (commit) via 67fd2a703ddad53ad8045ecd9a03abe0aefbcc23 (commit) via c5259fab54427a6e39279aa6661db14f26974b94 (commit) via ea3224abc7b7cac5e7d40a8e89b629960e32ed2e (commit) via a9959ef3ea42e0874734c5ecb6e3b563a8b5091e (commit) via 311f1c634c1f902c92776afb9ef54c4d0c1623cb (commit) via 8e4c5bff4261fc2de5ae261bebc3e53f62122718 (commit) via e200ab58cc9a8e2c756c504de0e7403d195fe0c2 (commit) via fd073ae24070bb7ca5b9e2d70e7bcf8650b6c67c (commit) via f5fc6d319e0450155dec20c2516cbf02021ee345 (commit) via ab76260b918bd4caa8eb774a4e124e2d3ea203ef (commit) via 5d73f5158c1903ac9bbd697e956083ae5c986238 (commit) via 5cf2c339680b6922a08ebf1d44dab5c90ba2d5d4 (commit) via b376fae45ca8a9b5250a974b2b5247c854ed2782 (commit) via 910209a1e506e2ca70083ba02d3fd2bf1f8fbbc2 (commit) via ab4cf06cff961d50dbe1ac5ff37d1aaa6299e8a6 (commit) via 9a883f3f53819fcf0f7de3c6596451cfbc3bcd60 (commit) via 9b37e91ef6dfd93a257bf1ee802b1919e30d0f74 (commit) via 9856eec1cc29874d162fa67c9e9e1173d120aba2 (commit) via 158a431825715cbee07a12a78bea7f2430c4b58d (commit) via 3c836db413a0a9811e1cee698b3322824a494c7a (commit) via 62a13aec4ca768fcb03b8639e6c5ad1596a19ccd (commit) via 58ccbbd4f276050f7f2b5930725eae4cf5957887 (commit) via 514da48192e1e06449b9551a19a58211cf6eeecc (commit) via d2a94495fb8fe62ace4a86756a73106701c7c24f (commit) via 08434343ee20012f5c22f7fadc65181ad035b386 (commit) via 9709b039880baf9731f8270665db01ee704cee45 (commit) via 55afc9854f7b70ee31aca3753892736b9fce8991 (commit) via 22f94778487e86b3244c7f65af500598db4656f0 (commit) via fc0ecdda316ebda14177049a9b384c5c43bccae3 (commit) via c232d1b59a1882211479dea12a39bc066d6b1c5e (commit) via 2cec0cefc084bcd5c98dcf16cbd5219e4a5b7af9 (commit) via 12b8b77430dff255252c06414cdb6cf1c6d4f6c1 (commit) via 9b75c7cc65e4afddfd5a0d9ec780b2b8d7d8562a (commit) via 3ca08d602292f6183bda999df4d62aef86b7e1be (commit) via 48069b782eb549586b53db03f67ee0bf41c24096 (commit) via c99048fd983627e5a63e3fbe73da5233d3bbb9fe (commit) via 6641e7a1f0007c998c8301a7f74a9790ad3909f7 (commit) via 8832801c08263f3442eb1b2902b129ee687c33ec (commit) via 9d9479b5c15ffb88bbc229150df60deb4c34eaf9 (commit) via b8013a57adfbf8e9977e38c425e8bd0cdcfca047 (commit) via 5386d69ca03900fbd0218509b04874dd44592cd1 (commit) via 19d61ef8f4595948c2b7f59e3ffea1e91fc4e1eb (commit) via f6fdef38ca0a73caf56eadb246850c0214033973 (commit) via cf068ec48255c96cc5263c907143c7f6c0fbdcbb (commit) via 60a4bfc125fb89a5ee679ee7d5a6249662ea5b82 (commit) via 90dc87b7de182ae1b82179a1fb1dfab38bf80bb9 (commit) via e16ed29cb0cf2fd29f396e55473e47528d38e0f7 (commit) via 0e421e2723a5079ac39616e91abd07ddc05d427d (commit) via 37882beab7980b029ca777621157658956b6a0eb (commit) via 1580ba11750e3c5885becfbbbbb427535b799eb6 (commit) via c435d7dc16c0e5c83842be62e6a8681db6abe253 (commit) via e20d949dd89ec9ec8dde455a9c0a4b8f5e385a57 (commit) via d2be7786f155aeaff75bccb47a6be8b8c1ed4dca (commit) via 9235b5c54bcfb465c5be7958c8e7e564b8bcc2d4 (commit) via aa54efa329378b18f891f9e47531d6f38bbe336d (commit) via 262f429733acc2fbea21a5eaa3ba641502776f86 (commit) via c9a8dd4ca90dfa6c9997db18d48097d6e2f8895a (commit) via d7ae74183727a8f5ee99d151610099ec8ea9851d (commit) via 0cf124ab691a5502923ef69627b96069580861da (commit) via 49c7a4b8284bbf03019f7b1565ac7d55ba2eacec (commit) via 7e4a0896637b38cb37c3bdca6984f397fc9b16a7 (commit) via ff7aaa0721a4df126086e7b27be1519f2ab93255 (commit) via 35275bcd26cc471ae47b60e820366418f25d7823 (commit) via a3b3340bcca61cd0d0c5bc0d2e094c91c8226e79 (commit) via 7f88a71f90f733c2004bcaeeb9633fc51d2b049a (commit) via 431c0e69bcfc86bec5892c44a1ffc7dfc712fa37 (commit) via c1aa6aafc2efd276fc60c63c5dbd4bfb6b0f4ccb (commit) via 94ce2cc1b982640f43077584d3911151911e0226 (commit) via cc025d2a3e20b83e83b279170551409deba70070 (commit) via c99b595f5725750d377040ab5b03de7b3ab80d8f (commit) via 223fddd97a0f8c58322788f3e0fb6eb2eb7772cf (commit) via c1b27582428b8f181a40f1e36a095e23d753422d (commit) via 31f28b7b27a21c3f8a1ae7b6719676c46eea312e (commit) via 3687a2e2d8fcb9b0a6970b414f777a8c894fc160 (commit) via abfea151ced16d092a4f73da827705eef73b506a (commit) via c43ae64f998b82200c6249c002b4d08503c50787 (commit) via 70b1b5d22fb433154fc1143ff2bf7677dcaaf33a (commit) via 8999627f8abfc83172728c2e3d0f3cfbe1f1f1c4 (commit) via f4435fd9a53b3300ff540d81f881a3cca4709290 (commit) via f4c58dafc8f4856660fbfda3ac67fdc8f533f289 (commit) via 4312f128bf7e5d2a48572a96bff8ae2057a0b960 (commit) via d0d063fe14497c044c51991be1ed449fbd741b2b (commit) via 219c963e3b41487ea20e7512661ed2d08edd558a (commit) via 7b59d8389da56cd5119921f554dad4477967b30d (commit) via 5150d3730afb2d015f2e01aa2993b3866d18e267 (commit) via 1d795ec5a9c11f8512c77e1b51dfc88678f1f9e0 (commit) via eea1d2d7e167120d7af02fa27876bea164af7374 (commit) via 8ed76a233c2bc1ed31705be07d2eb2298c17f98b (commit) from 5d46c29e5afab019a7b160e344affec047ff0f91 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 099f4a9ec705c0ed09ae11815c08381b1d61041b Merge: 5d46c29 3877f81 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat May 11 12:46:34 2013 +0200 Merge remote-tracking branch 'origin/next' ----------------------------------------------------------------------- Summary of changes: config/backup/include | 3 + config/backup/includes/vdr | 2 +- config/cfgroot/general-functions.pl | 49 +- config/cfgroot/header.pl | 5 +- config/ovpn/verify | 70 +- config/rootfiles/common/armv5tel/glibc | 2 +- config/rootfiles/common/dejavu-fonts-ttf | 8 +- config/rootfiles/{packages => common}/freefont | 0 config/rootfiles/common/i586/glibc | 2 +- .../common/{HTML-Tagset => perl-Sort-Naturally} | 12 +- config/rootfiles/common/smartmontools | 4 +- config/rootfiles/common/stage2 | 1 + config/rootfiles/{oldcore/66 => core/68}/exclude | 1 + .../{oldcore/54 => core/68}/filelists/GeoIP | 0 .../66 => core/68}/filelists/dejavu-fonts-ttf | 0 config/rootfiles/core/68/filelists/files | 19 + config/rootfiles/core/68/filelists/freefont | 1 + .../{oldcore/58 => core/68}/filelists/hwdata | 0 .../core/68/filelists/perl-Sort-Naturally | 1 + .../34 => core/68}/filelists/smartmontools | 0 .../{oldcore/38 => core/68}/filelists/strongswan | 0 config/rootfiles/core/68/filelists/vlan | 1 + config/rootfiles/core/{67 => 68}/meta | 0 config/rootfiles/{oldcore/52 => core/68}/update.sh | 32 +- config/rootfiles/installer/network-modules | 1 - config/rootfiles/packages/samba | 1 + config/rootfiles/packages/sysbench | 1 + config/rootfiles/packages/vdr | 340 +- config/rootfiles/packages/vdr_epgsearch | 39 +- config/rootfiles/packages/vdr_softdevice | 26 - config/rootfiles/packages/vdr_streamdev | 8 + config/rootfiles/packages/vdr_vnsiserver3 | 4 + config/udev/blacklist | 4 + config/updxlrator/updxlrator | 18 +- config/vdr/bin/runvdr | 53 - config/vdr/bin/runvdr-soft | 5 - config/vdr/plugins.d/conflictcheckonly.conf | 7 + config/vdr/plugins.d/epgsearch.conf | 6 + config/vdr/plugins.d/epgsearchonly.conf | 7 + config/vdr/plugins.d/quickepgsearch.conf | 7 + config/vdr/plugins.d/streamdev-server.conf | 5 + config/vdr/plugins.d/vnsiserver3.conf | 5 + config/vdr/runvdr | 94 + config/vdr/vdr.sysconfig | 39 + config/vdradmin/install-ipfire.sh | 2 +- config/vdradmin/vdradmind.conf | 6 +- config/w_scan/w_scan_start | 38 +- doc/language_issues.de | 5 +- doc/language_issues.en | 6 +- doc/language_issues.es | 8 +- doc/language_issues.fr | 8 +- doc/language_issues.nl | 8 +- doc/language_issues.pl | 8 +- doc/language_issues.ru | 8 +- doc/language_missings | 36 + html/cgi-bin/connections.cgi | 127 +- html/cgi-bin/ovpnmain.cgi | 21 +- html/cgi-bin/samba.cgi | 6 +- html/cgi-bin/services.cgi | 4 +- html/cgi-bin/vpnmain.cgi | 7 +- html/html/include/jquery-1.2.6.min.js | 32 - html/html/include/jquery-1.9.1.min.js | 5 + html/html/themes/ipfire/include/functions.pl | 50 +- html/html/themes/ipfire/include/style.css | 8 +- html/html/themes/maniac/include/functions.pl | 149 +- html/html/themes/maniac/include/style.css | 10 +- langs/de/cgi-bin/de.pl | 9 + langs/en/cgi-bin/en.pl | 12 +- lfs/GeoIP | 4 +- lfs/initrd | 6 + lfs/{MIME-Tools => perl-Sort-Naturally} | 9 +- lfs/samba | 6 +- lfs/smartmontools | 4 +- lfs/squidclamav | 6 +- lfs/strip | 6 +- lfs/strongswan | 10 +- lfs/{stress => sysbench} | 13 +- lfs/transmission | 6 +- lfs/vdr | 111 +- lfs/vdr_epgsearch | 77 +- lfs/vdr_softdevice | 52 - lfs/{transmission => vdr_streamdev} | 54 +- lfs/{transmission => vdr_vnsiserver3} | 47 +- lfs/vdradmin | 16 +- lfs/vlan | 2 +- lfs/w_scan | 2 +- make.sh | 9 +- src/hwdata/pci.ids | 4040 +++++++++++++------- src/hwdata/usb.ids | 1064 +++++- src/initscripts/init.d/vdr | 20 +- src/paks/{transmission => vdr}/install.sh | 96 +- src/paks/{cacti => vdr}/uninstall.sh | 0 src/paks/{transmission => vdr}/update.sh | 11 +- src/paks/{default => vdradmin}/install.sh | 0 src/paks/{cacti => vdradmin}/uninstall.sh | 0 src/paks/{transmission => vdradmin}/update.sh | 10 + src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch | 82 + src/patches/vdr-streamdev_recordings-64.patch | 29 + src/scripts/consort.sh | 158 + 99 files changed, 5130 insertions(+), 2276 deletions(-) rename config/rootfiles/{packages => common}/freefont (100%) copy config/rootfiles/common/{HTML-Tagset => perl-Sort-Naturally} (53%) copy config/rootfiles/{oldcore/66 => core/68}/exclude (95%) copy config/rootfiles/{oldcore/54 => core/68}/filelists/GeoIP (100%) copy config/rootfiles/{oldcore/66 => core/68}/filelists/dejavu-fonts-ttf (100%) create mode 100644 config/rootfiles/core/68/filelists/files create mode 120000 config/rootfiles/core/68/filelists/freefont copy config/rootfiles/{oldcore/58 => core/68}/filelists/hwdata (100%) create mode 120000 config/rootfiles/core/68/filelists/perl-Sort-Naturally copy config/rootfiles/{oldcore/34 => core/68}/filelists/smartmontools (100%) copy config/rootfiles/{oldcore/38 => core/68}/filelists/strongswan (100%) create mode 120000 config/rootfiles/core/68/filelists/vlan copy config/rootfiles/core/{67 => 68}/meta (100%) copy config/rootfiles/{oldcore/52 => core/68}/update.sh (81%) delete mode 100644 config/rootfiles/installer/network-modules create mode 100644 config/rootfiles/packages/sysbench delete mode 100644 config/rootfiles/packages/vdr_softdevice create mode 100644 config/rootfiles/packages/vdr_streamdev create mode 100644 config/rootfiles/packages/vdr_vnsiserver3 delete mode 100755 config/vdr/bin/runvdr delete mode 100755 config/vdr/bin/runvdr-soft create mode 100644 config/vdr/plugins.d/conflictcheckonly.conf create mode 100644 config/vdr/plugins.d/epgsearch.conf create mode 100644 config/vdr/plugins.d/epgsearchonly.conf create mode 100644 config/vdr/plugins.d/quickepgsearch.conf create mode 100644 config/vdr/plugins.d/streamdev-server.conf create mode 100644 config/vdr/plugins.d/vnsiserver3.conf create mode 100644 config/vdr/runvdr create mode 100644 config/vdr/vdr.sysconfig delete mode 100644 html/html/include/jquery-1.2.6.min.js create mode 100644 html/html/include/jquery-1.9.1.min.js copy lfs/{MIME-Tools => perl-Sort-Naturally} (94%) copy lfs/{stress => sysbench} (86%) delete mode 100644 lfs/vdr_softdevice copy lfs/{transmission => vdr_streamdev} (69%) copy lfs/{transmission => vdr_vnsiserver3} (76%) copy src/paks/{transmission => vdr}/install.sh (55%) copy src/paks/{cacti => vdr}/uninstall.sh (100%) copy src/paks/{transmission => vdr}/update.sh (89%) copy src/paks/{default => vdradmin}/install.sh (100%) copy src/paks/{cacti => vdradmin}/uninstall.sh (100%) copy src/paks/{transmission => vdradmin}/update.sh (86%) create mode 100644 src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch create mode 100644 src/patches/vdr-streamdev_recordings-64.patch create mode 100644 src/scripts/consort.sh Difference in files: diff --git a/config/backup/include b/config/backup/include index a1d1fbc..9b08683 100644 --- a/config/backup/include +++ b/config/backup/include @@ -19,6 +19,9 @@ /var/ipfire/outgoing/macgroups /var/ipfire/outgoing/rules /var/ipfire/outgoing/p2protocols +/var/ipfire/dmzholes +/var/ipfire/xtaccess +/var/ipfire/portfw /var/ipfire/ovpn /var/ipfire/ppp /var/ipfire/proxy diff --git a/config/backup/includes/vdr b/config/backup/includes/vdr index d8d58a5..38bd82a 100644 --- a/config/backup/includes/vdr +++ b/config/backup/includes/vdr @@ -1 +1 @@ -/opt/vdr/etc/ +/etc/vdr diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index f94cdbf..a70f267 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -144,6 +144,10 @@ sub age my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) = stat $_[0]; my $now = time; + my $timestring = ''; + my $dset = 0; # Day is set, when > 0 + my $hset = 0; # Hour is set, when > 0 + my $mset = 0; # Minute is set, when > 0 my $totalsecs = $now - $mtime; my $days = int($totalsecs / 86400); @@ -153,7 +157,50 @@ sub age my $mins = $totalmins % 60; my $secs = $totalsecs % 60; - return "${days}d ${hours}h ${mins}m ${secs}s"; + if ($days > 1) { + ${timestring} .= ${days}.' '.$Lang::tr{'days'}.', '; + $dset = 1; + } + elsif ($days == 1) { + ${timestring} .= ${days}.' '.$Lang::tr{'day'}.', '; + $dset = 1; + } + + if (($hours > 1) && !($dset)) { + ${timestring} .= ${hours}.' '.$Lang::tr{'hours'}.', '; + $hset = 1; + } + elsif (($hours == 1) && !($dset)) { + ${timestring} .= ${hours}.' '.$Lang::tr{'hour'}.', '; + $hset = 1; + } + elsif ($dset) { + ${timestring} .= ${hours}.' '.$Lang::tr{'age shour'}.', '; + $hset = 1; + } + + if ((($mins > 1) || ($mins == 0)) && !($dset || $hset)) { + ${timestring} .= ${mins}.' '.$Lang::tr{'minutes'}.', '; + $mset = 1; + } + elsif (($mins == 1) && !($dset || $hset)) { + ${timestring} .= ${mins}.' '.$Lang::tr{'minute'}.', '; + $mset = 1; + } + else { + ${timestring} .= ${mins}.' '.$Lang::tr{'age sminute'}.', '; + $mset = 1; + } + + if ((($secs > 1) || ($secs == 0)) && !($dset || $hset || $mset)) { + ${timestring} .= ${secs}.' '.$Lang::tr{'age seconds'}; + } + elsif (($secs == 1) && !($dset || $hset || $mset)) { + ${timestring} .= $secs.' '.$Lang::tr{'age second'}; + } + else { ${timestring} .= $secs.' '.$Lang::tr{'age ssecond'}; } + + return ${timestring}; } sub validip diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index bbb0eca..0f10bf9 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -161,10 +161,9 @@ sub genmenu { sub showhttpheaders { - print "Pragma: no-cache\n"; - print "Cache-control: no-cache\n"; + print "Cache-control: private\n"; print "Connection: close\n"; - print "Content-type: text/html\n\n"; + print "Content-type: text/html; charset=UTF-8\n\n"; } sub is_menu_visible($) { diff --git a/config/ovpn/verify b/config/ovpn/verify index 8fbe59e..7233429 100644 --- a/config/ovpn/verify +++ b/config/ovpn/verify @@ -1,12 +1,58 @@ -#!/bin/sh -if [ $1 -eq 0 ]; then - name2=`echo $2` - name3=${name2##*/} - name4=${name3##*CN=} - clientdisabled=`/bin/grep -iwc off,.*,$name4 /var/ipfire/ovpn/ovpnconfig` - if [ "$clientdisabled" = "1" ]; then - exit 1 - fi - exit 0 -fi -exit 0 +#!/usr/bin/perl +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2013 IPFire Team <info(a)ipfire.org>. # +# # +############################################################################ + +require '/var/ipfire/general-functions.pl'; + +my $DEPTH = $ARGV[0]; +my $CN = $ARGV[1]; + +# Exit immediately for every certificate depth other than 0. +exit 0 unless ($DEPTH eq "0"); + +# Strip the CN from the X509 identifier. +$CN =~ /\/CN=(.*)$/i; +$CN = $1; + +my %confighash = (); +if (-f "${General::swroot}/ovpn/ovpnconfig"){ + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + foreach my $key (keys %confighash) { + my $cn = $confighash{$key}[2]; + + # Skip disabled connections. + next unless ($confighash{$key}[0] eq "on"); + + # Skip non-roadwarrior connections. + next unless ($confighash{$key}[3] eq "host"); + + # Search for a matching CN. + exit 0 if ($cn eq $CN); + + # Compatibility code for incorrectly saved CNs. + $cn =~ s/\ /_/; + exit 0 if ($cn eq $CN); + } +} + +# Return an error if ovpnconfig could not be found. +exit 1; diff --git a/config/rootfiles/common/armv5tel/glibc b/config/rootfiles/common/armv5tel/glibc index 42ae490..2810389 100644 --- a/config/rootfiles/common/armv5tel/glibc +++ b/config/rootfiles/common/armv5tel/glibc @@ -52,7 +52,7 @@ sbin/ldconfig #usr/bin/getent #usr/bin/iconv usr/bin/ldd -#usr/bin/locale +usr/bin/locale #usr/bin/localedef #usr/bin/mtrace #usr/bin/pcprofiledump diff --git a/config/rootfiles/common/dejavu-fonts-ttf b/config/rootfiles/common/dejavu-fonts-ttf index bfdfed8..0dfb503 100644 --- a/config/rootfiles/common/dejavu-fonts-ttf +++ b/config/rootfiles/common/dejavu-fonts-ttf @@ -8,10 +8,10 @@ usr/share/fonts/DejaVuSans.ttf #usr/share/fonts/DejaVuSansCondensed-BoldOblique.ttf #usr/share/fonts/DejaVuSansCondensed-Oblique.ttf #usr/share/fonts/DejaVuSansCondensed.ttf -#usr/share/fonts/DejaVuSansMono-Bold.ttf -#usr/share/fonts/DejaVuSansMono-BoldOblique.ttf -#usr/share/fonts/DejaVuSansMono-Oblique.ttf -#usr/share/fonts/DejaVuSansMono.ttf +usr/share/fonts/DejaVuSansMono-Bold.ttf +usr/share/fonts/DejaVuSansMono-BoldOblique.ttf +usr/share/fonts/DejaVuSansMono-Oblique.ttf +usr/share/fonts/DejaVuSansMono.ttf #usr/share/fonts/DejaVuSerif-Bold.ttf #usr/share/fonts/DejaVuSerif-BoldItalic.ttf #usr/share/fonts/DejaVuSerif-Italic.ttf diff --git a/config/rootfiles/common/freefont b/config/rootfiles/common/freefont new file mode 100644 index 0000000..7c3fbb8 --- /dev/null +++ b/config/rootfiles/common/freefont @@ -0,0 +1,15 @@ +#usr/share/fonts +#usr/share/fonts/default +#usr/share/fonts/default/TrueType +usr/share/fonts/default/TrueType/FreeMono.ttf +usr/share/fonts/default/TrueType/FreeMonoBold.ttf +usr/share/fonts/default/TrueType/FreeMonoBoldOblique.ttf +usr/share/fonts/default/TrueType/FreeMonoOblique.ttf +usr/share/fonts/default/TrueType/FreeSans.ttf +usr/share/fonts/default/TrueType/FreeSansBold.ttf +usr/share/fonts/default/TrueType/FreeSansBoldOblique.ttf +usr/share/fonts/default/TrueType/FreeSansOblique.ttf +usr/share/fonts/default/TrueType/FreeSerif.ttf +usr/share/fonts/default/TrueType/FreeSerifBold.ttf +usr/share/fonts/default/TrueType/FreeSerifBoldItalic.ttf +usr/share/fonts/default/TrueType/FreeSerifItalic.ttf diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc index ca62948..d17d7da 100644 --- a/config/rootfiles/common/i586/glibc +++ b/config/rootfiles/common/i586/glibc @@ -53,7 +53,7 @@ sbin/ldconfig #usr/bin/iconv usr/bin/ldd #usr/bin/lddlibc4 -#usr/bin/locale +usr/bin/locale #usr/bin/localedef #usr/bin/mtrace #usr/bin/pcprofiledump diff --git a/config/rootfiles/common/perl-Sort-Naturally b/config/rootfiles/common/perl-Sort-Naturally new file mode 100644 index 0000000..7ed6b56 --- /dev/null +++ b/config/rootfiles/common/perl-Sort-Naturally @@ -0,0 +1,6 @@ +usr/lib/perl5/site_perl/5.12.3/Sort +usr/lib/perl5/site_perl/5.12.3/Sort/Naturally.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Sort +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Sort/Naturally +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Sort/Naturally/.packlist +usr/share/man/man3/Sort::Naturally.3 diff --git a/config/rootfiles/common/smartmontools b/config/rootfiles/common/smartmontools index e37be6d..7080398 100644 --- a/config/rootfiles/common/smartmontools +++ b/config/rootfiles/common/smartmontools @@ -2,13 +2,15 @@ #usr/etc/rc.d/init.d #usr/etc/rc.d/init.d/smartd #usr/etc/smartd.conf +#usr/etc/smartd_warning.sh usr/sbin/smartctl #usr/sbin/smartd usr/sbin/update-smart-drivedb #usr/share/doc/smartmontools #usr/share/doc/smartmontools/AUTHORS -#usr/share/doc/smartmontools/CHANGELOG #usr/share/doc/smartmontools/COPYING +#usr/share/doc/smartmontools/ChangeLog +#usr/share/doc/smartmontools/ChangeLog-5.0-6.0 #usr/share/doc/smartmontools/INSTALL #usr/share/doc/smartmontools/NEWS #usr/share/doc/smartmontools/README diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index e10c649..1e91b37 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -71,6 +71,7 @@ usr/lib/libstdc++.so.6 #usr/local/bin/archive.files usr/local/bin/backupiso usr/local/bin/connscheduler +usr/local/bin/consort.sh usr/local/bin/dialctrl.pl usr/local/bin/hddshutdown usr/local/bin/httpscert diff --git a/config/rootfiles/core/68/exclude b/config/rootfiles/core/68/exclude new file mode 100644 index 0000000..321a931 --- /dev/null +++ b/config/rootfiles/core/68/exclude @@ -0,0 +1,17 @@ +srv/web/ipfire/html/proxy.pac +boot/config.txt +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/log/cache +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/68/filelists/GeoIP b/config/rootfiles/core/68/filelists/GeoIP new file mode 100644 index 0000000..0258236 --- /dev/null +++ b/config/rootfiles/core/68/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/68/filelists/dejavu-fonts-ttf b/config/rootfiles/core/68/filelists/dejavu-fonts-ttf new file mode 120000 index 0000000..0007a8b --- /dev/null +++ b/config/rootfiles/core/68/filelists/dejavu-fonts-ttf @@ -0,0 +1 @@ +../../../common/dejavu-fonts-ttf \ No newline at end of file diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files new file mode 100644 index 0000000..15680e6 --- /dev/null +++ b/config/rootfiles/core/68/filelists/files @@ -0,0 +1,19 @@ +etc/system-release +etc/issue +etc/modprobe.d/blacklist +srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/html/themes/ipfire/include/functions.pl +srv/web/ipfire/html/themes/ipfire/include/style.css +srv/web/ipfire/html/themes/maniac/include/functions.pl +srv/web/ipfire/html/themes/maniac/include/style.css +srv/web/ipfire/html/include/jquery-1.9.1.min.js +usr/bin/locale +usr/local/bin/consort.sh +var/ipfire/backup/include +var/ipfire/header.pl +var/ipfire/general-functions.pl +var/ipfire/langs +var/ipfire/ovpn/verify diff --git a/config/rootfiles/core/68/filelists/freefont b/config/rootfiles/core/68/filelists/freefont new file mode 120000 index 0000000..f0bbcef --- /dev/null +++ b/config/rootfiles/core/68/filelists/freefont @@ -0,0 +1 @@ +../../../common/freefont \ No newline at end of file diff --git a/config/rootfiles/core/68/filelists/hwdata b/config/rootfiles/core/68/filelists/hwdata new file mode 100644 index 0000000..5a9672f --- /dev/null +++ b/config/rootfiles/core/68/filelists/hwdata @@ -0,0 +1,2 @@ +usr/share/hwdata/pci.ids +usr/share/hwdata/usb.ids diff --git a/config/rootfiles/core/68/filelists/perl-Sort-Naturally b/config/rootfiles/core/68/filelists/perl-Sort-Naturally new file mode 120000 index 0000000..9d70650 --- /dev/null +++ b/config/rootfiles/core/68/filelists/perl-Sort-Naturally @@ -0,0 +1 @@ +../../../common/perl-Sort-Naturally \ No newline at end of file diff --git a/config/rootfiles/core/68/filelists/smartmontools b/config/rootfiles/core/68/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/core/68/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/68/filelists/strongswan b/config/rootfiles/core/68/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/68/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/68/filelists/vlan b/config/rootfiles/core/68/filelists/vlan new file mode 120000 index 0000000..4d32f23 --- /dev/null +++ b/config/rootfiles/core/68/filelists/vlan @@ -0,0 +1 @@ +../../../common/vlan \ No newline at end of file diff --git a/config/rootfiles/core/68/meta b/config/rootfiles/core/68/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/68/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/68/update.sh b/config/rootfiles/core/68/update.sh new file mode 100644 index 0000000..5ccf71e --- /dev/null +++ b/config/rootfiles/core/68/update.sh @@ -0,0 +1,75 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2013 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=68 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +# Remove meta's of packages that are now common... +# +rm -rf /opt/pakfire/db/*/meta-freefont + +# +#Stop services +/etc/init.d/ipsec stop + +# +#Extract files +extract_files + +# Regenerate ipsec configuration files. +/srv/web/ipfire/cgi-bin/vpnmain.cgi + +# +#Start services +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Regenerate font cache +fc-cache -f &>/dev/null + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 + diff --git a/config/rootfiles/installer/network-modules b/config/rootfiles/installer/network-modules deleted file mode 100644 index 6dabddf..0000000 --- a/config/rootfiles/installer/network-modules +++ /dev/null @@ -1 +0,0 @@ -lib/modules/KVER-ipfire/kernel/drivers/net diff --git a/config/rootfiles/packages/freefont b/config/rootfiles/packages/freefont deleted file mode 100644 index 7c3fbb8..0000000 --- a/config/rootfiles/packages/freefont +++ /dev/null @@ -1,15 +0,0 @@ -#usr/share/fonts -#usr/share/fonts/default -#usr/share/fonts/default/TrueType -usr/share/fonts/default/TrueType/FreeMono.ttf -usr/share/fonts/default/TrueType/FreeMonoBold.ttf -usr/share/fonts/default/TrueType/FreeMonoBoldOblique.ttf -usr/share/fonts/default/TrueType/FreeMonoOblique.ttf -usr/share/fonts/default/TrueType/FreeSans.ttf -usr/share/fonts/default/TrueType/FreeSansBold.ttf -usr/share/fonts/default/TrueType/FreeSansBoldOblique.ttf -usr/share/fonts/default/TrueType/FreeSansOblique.ttf -usr/share/fonts/default/TrueType/FreeSerif.ttf -usr/share/fonts/default/TrueType/FreeSerifBold.ttf -usr/share/fonts/default/TrueType/FreeSerifBoldItalic.ttf -usr/share/fonts/default/TrueType/FreeSerifItalic.ttf diff --git a/config/rootfiles/packages/samba b/config/rootfiles/packages/samba index fc8cc44..4238ae5 100644 --- a/config/rootfiles/packages/samba +++ b/config/rootfiles/packages/samba @@ -114,6 +114,7 @@ usr/sbin/winbindd #usr/share/locale/sv/LC_MESSAGES/pam_winbind.mo #usr/share/locale/zh_CN/LC_MESSAGES/pam_winbind.mo #usr/share/locale/zh_TW/LC_MESSAGES/pam_winbind.mo +#usr/share/man/man1/dbwrap_tool.1 #usr/share/man/man1/findsmb.1 #usr/share/man/man1/log2pcap.1 #usr/share/man/man1/nmblookup.1 diff --git a/config/rootfiles/packages/sysbench b/config/rootfiles/packages/sysbench new file mode 100644 index 0000000..3164256 --- /dev/null +++ b/config/rootfiles/packages/sysbench @@ -0,0 +1 @@ +usr/bin/sysbench diff --git a/config/rootfiles/packages/vdr b/config/rootfiles/packages/vdr index eee440e..4b6eaff 100644 --- a/config/rootfiles/packages/vdr +++ b/config/rootfiles/packages/vdr @@ -1,264 +1,84 @@ -#opt/vdr/etc -#opt/vdr/etc/plugins -#opt/vdr/locale/ca_ES -#opt/vdr/locale/ca_ES/LC_MESSAGES -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr.mo -#opt/vdr/locale/cs_CZ -#opt/vdr/locale/cs_CZ/LC_MESSAGES -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr.mo -#opt/vdr/locale/da_DK -#opt/vdr/locale/da_DK/LC_MESSAGES -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr.mo -#opt/vdr/locale/de_DE -#opt/vdr/locale/de_DE/LC_MESSAGES -#opt/vdr/locale/de_DE/LC_MESSAGES/vdr-epgsearch.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-hello.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-pictures.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/de_DE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/de_DE/LC_MESSAGES/vdr.mo -#opt/vdr/locale/el_GR -#opt/vdr/locale/el_GR/LC_MESSAGES -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr.mo -#opt/vdr/locale/es_ES -#opt/vdr/locale/es_ES/LC_MESSAGES -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr.mo -#opt/vdr/locale/et_EE -#opt/vdr/locale/et_EE/LC_MESSAGES -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr.mo -#opt/vdr/locale/fi_FI -#opt/vdr/locale/fi_FI/LC_MESSAGES -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr.mo -#opt/vdr/locale/fr_FR -#opt/vdr/locale/fr_FR/LC_MESSAGES -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr.mo -#opt/vdr/locale/hr_HR -#opt/vdr/locale/hr_HR/LC_MESSAGES -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr.mo -#opt/vdr/locale/hu_HU -#opt/vdr/locale/hu_HU/LC_MESSAGES -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr.mo -#opt/vdr/locale/it_IT -#opt/vdr/locale/it_IT/LC_MESSAGES -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr.mo -#opt/vdr/locale/nl_NL -#opt/vdr/locale/nl_NL/LC_MESSAGES -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr.mo -#opt/vdr/locale/nn_NO -#opt/vdr/locale/nn_NO/LC_MESSAGES -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr.mo -#opt/vdr/locale/pl_PL -#opt/vdr/locale/pl_PL/LC_MESSAGES -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr.mo -#opt/vdr/locale/pt_PT -#opt/vdr/locale/pt_PT/LC_MESSAGES -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr.mo -#opt/vdr/locale/ro_RO -#opt/vdr/locale/ro_RO/LC_MESSAGES -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr.mo -#opt/vdr/locale/ru_RU -#opt/vdr/locale/ru_RU/LC_MESSAGES -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr.mo -#opt/vdr/locale/sl_SI -#opt/vdr/locale/sl_SI/LC_MESSAGES -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr.mo -#opt/vdr/locale/sv_SE -#opt/vdr/locale/sv_SE/LC_MESSAGES -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr.mo -#opt/vdr/locale/tr_TR -#opt/vdr/locale/tr_TR/LC_MESSAGES -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr.mo -#opt/vdr/locale/uk_UA -#opt/vdr/locale/uk_UA/LC_MESSAGES -#opt/vdr/locale/uk_UA/LC_MESSAGES/vdr.mo -#opt/vdr/locale/zh_CN -#opt/vdr/locale/zh_CN/LC_MESSAGES -#opt/vdr/locale/zh_CN/LC_MESSAGES/vdr.mo -#opt/vdr -#opt/vdr/PLUGINS -#opt/vdr/PLUGINS/lib -#opt/vdr/PLUGINS/lib/libsoftdevice-dfb.so.1.6.0 -#opt/vdr/PLUGINS/lib/libsoftdevice-fb.so.1.6.0 -#opt/vdr/PLUGINS/lib/libsoftdevice-shm.so.1.6.0 -#opt/vdr/PLUGINS/lib/libvdr-conflictcheckonly.so.1.6.0 -#opt/vdr/PLUGINS/lib/libvdr-epgsearch.so.1.6.0 -#opt/vdr/PLUGINS/lib/libvdr-epgsearchonly.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-hello.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-osddemo.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-pictures.so.1.6.0 -#opt/vdr/PLUGINS/lib/libvdr-quickepgsearch.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-skincurses.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-sky.so.1.6.0 -#opt/vdr/PLUGINS/lib/libvdr-softdevice.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-status.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-streamdev-client.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-streamdev-server.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-svccli.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-svcsvr.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-svdrpdemo.so.1.6.0 -#opt/vdr/bin -opt/vdr/bin/runvdr -#opt/vdr/bin/runvdr-soft -opt/vdr/bin/svdrpsend.pl -opt/vdr/bin/vdr -#opt/vdr/locale -#opt/vdr/locale/ca_ES -#opt/vdr/locale/ca_ES/LC_MESSAGES -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/cs_CZ -#opt/vdr/locale/cs_CZ/LC_MESSAGES -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/da_DK -#opt/vdr/locale/da_DK/LC_MESSAGES -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/de_DE -#opt/vdr/locale/de_DE/LC_MESSAGES -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-hello.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-pictures.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/el_GR -#opt/vdr/locale/el_GR/LC_MESSAGES -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/es_ES -#opt/vdr/locale/es_ES/LC_MESSAGES -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/et_EE -#opt/vdr/locale/et_EE/LC_MESSAGES -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/fi_FI -#opt/vdr/locale/fi_FI/LC_MESSAGES -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/fr_FR -#opt/vdr/locale/fr_FR/LC_MESSAGES -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/hr_HR -#opt/vdr/locale/hr_HR/LC_MESSAGES -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/hu_HU -#opt/vdr/locale/hu_HU/LC_MESSAGES -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/it_IT -#opt/vdr/locale/it_IT/LC_MESSAGES -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/nl_NL -#opt/vdr/locale/nl_NL/LC_MESSAGES -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/nn_NO -#opt/vdr/locale/nn_NO/LC_MESSAGES -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/pl_PL -#opt/vdr/locale/pl_PL/LC_MESSAGES -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/pt_PT -#opt/vdr/locale/pt_PT/LC_MESSAGES -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ro_RO -#opt/vdr/locale/ro_RO/LC_MESSAGES -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ru_RU -#opt/vdr/locale/ru_RU/LC_MESSAGES -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/sl_SI -#opt/vdr/locale/sl_SI/LC_MESSAGES -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/sv_SE -#opt/vdr/locale/sv_SE/LC_MESSAGES -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/tr_TR -#opt/vdr/locale/tr_TR/LC_MESSAGES -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/share -#opt/vdr/share/man -#opt/vdr/share/man/man1 -#opt/vdr/share/man/man1/vdr.1.gz -#opt/vdr/share/man/man5 -#opt/vdr/share/man/man5/vdr.5.gz -#opt/vdr/video -#var/video -opt/vdr/etc/channels.conf -opt/vdr/etc/diseqc.conf -opt/vdr/etc/keymacros.conf -#var/video/plugins -opt/vdr/etc/plugins/streamdevhosts.conf -opt/vdr/etc/setup.conf -opt/vdr/etc/sources.conf -opt/vdr/etc/svdrphosts.conf etc/rc.d/init.d/vdr -etc/rc.d/rc3.d/S60vdr etc/rc.d/rc0.d/K40vdr +etc/rc.d/rc3.d/S60vdr etc/rc.d/rc6.d/K40vdr +etc/sysconfig/vdr +#etc/sysconfig/vdr-plugins.d +etc/vdr +etc/vdr/channels.conf +etc/vdr/diseqc.conf +etc/vdr/keymacros.conf +etc/vdr/scr.conf +etc/vdr/sources.conf +etc/vdr/svdrphosts.conf +usr/bin/svdrpsend +#usr/include/libsi +#usr/include/libsi/descriptor.h +#usr/include/libsi/headers.h +#usr/include/libsi/section.h +#usr/include/libsi/si.h +#usr/include/libsi/util.h +#usr/include/vdr +#usr/include/vdr/audio.h +#usr/include/vdr/channels.h +#usr/include/vdr/ci.h +#usr/include/vdr/config.h +#usr/include/vdr/cutter.h +#usr/include/vdr/device.h +#usr/include/vdr/diseqc.h +#usr/include/vdr/dvbci.h +#usr/include/vdr/dvbdevice.h +#usr/include/vdr/dvbplayer.h +#usr/include/vdr/dvbspu.h +#usr/include/vdr/dvbsubtitle.h +#usr/include/vdr/eit.h +#usr/include/vdr/eitscan.h +#usr/include/vdr/epg.h +#usr/include/vdr/filter.h +#usr/include/vdr/font.h +#usr/include/vdr/i18n.h +#usr/include/vdr/interface.h +#usr/include/vdr/keys.h +#usr/include/vdr/lirc.h +#usr/include/vdr/menu.h +#usr/include/vdr/menuitems.h +#usr/include/vdr/nit.h +#usr/include/vdr/osd.h +#usr/include/vdr/osdbase.h +#usr/include/vdr/pat.h +#usr/include/vdr/player.h +#usr/include/vdr/plugin.h +#usr/include/vdr/receiver.h +#usr/include/vdr/recorder.h +#usr/include/vdr/recording.h +#usr/include/vdr/remote.h +#usr/include/vdr/remux.h +#usr/include/vdr/ringbuffer.h +#usr/include/vdr/sdt.h +#usr/include/vdr/sections.h +#usr/include/vdr/shutdown.h +#usr/include/vdr/skinclassic.h +#usr/include/vdr/skinlcars.h +#usr/include/vdr/skins.h +#usr/include/vdr/skinsttng.h +#usr/include/vdr/sourceparams.h +#usr/include/vdr/sources.h +#usr/include/vdr/spu.h +#usr/include/vdr/status.h +#usr/include/vdr/svdrp.h +#usr/include/vdr/themes.h +#usr/include/vdr/thread.h +#usr/include/vdr/timers.h +#usr/include/vdr/tools.h +#usr/include/vdr/transfer.h +#usr/include/vdr/videodir.h +#usr/lib/vdr +#usr/lib/vdr/Make.global +#usr/lib/vdr/config.h +#usr/lib/vdr/device.h +usr/sbin/runvdr +usr/sbin/vdr +usr/share/vdr +var/cache/vdr var/ipfire/backup/addons/includes/vdr +#var/video diff --git a/config/rootfiles/packages/vdr_epgsearch b/config/rootfiles/packages/vdr_epgsearch index 1485d75..193d79f 100644 --- a/config/rootfiles/packages/vdr_epgsearch +++ b/config/rootfiles/packages/vdr_epgsearch @@ -1,25 +1,14 @@ -opt/vdr/PLUGINS/lib/libvdr-conflictcheckonly.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-epgsearch.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-epgsearchonly.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-quickepgsearch.so.1.6.0 -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-epgsearch.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-epgsearch.mo +etc/sysconfig/vdr-plugins.d/conflictcheckonly.conf +etc/sysconfig/vdr-plugins.d/epgsearch.conf +etc/sysconfig/vdr-plugins.d/epgsearchonly.conf +etc/sysconfig/vdr-plugins.d/quickepgsearch.conf +etc/vdr/plugins/epgsearch +etc/vdr/plugins/epgsearch/conf.d +usr/bin/createcats +usr/lib/vdr/libvdr-conflictcheckonly.so.2.0.0 +usr/lib/vdr/libvdr-epgsearch.so.2.0.0 +usr/lib/vdr/libvdr-epgsearchonly.so.2.0.0 +usr/lib/vdr/libvdr-quickepgsearch.so.2.0.0 +#var/lib/vdr +#var/lib/vdr/data +var/lib/vdr/data/epgsearch diff --git a/config/rootfiles/packages/vdr_softdevice b/config/rootfiles/packages/vdr_softdevice deleted file mode 100644 index de66a77..0000000 --- a/config/rootfiles/packages/vdr_softdevice +++ /dev/null @@ -1,26 +0,0 @@ -opt/vdr/bin/runvdr-soft -opt/vdr/PLUGINS/lib/libsoftdevice-dfb.so.1.6.0 -opt/vdr/PLUGINS/lib/libsoftdevice-fb.so.1.6.0 -opt/vdr/PLUGINS/lib/libsoftdevice-shm.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-softdevice.so.1.6.0 -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-softdevice.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-softdevice.mo diff --git a/config/rootfiles/packages/vdr_streamdev b/config/rootfiles/packages/vdr_streamdev new file mode 100644 index 0000000..458e7d8 --- /dev/null +++ b/config/rootfiles/packages/vdr_streamdev @@ -0,0 +1,8 @@ +etc/sysconfig/vdr-plugins.d/streamdev-server.conf +#etc/vdr/plugins +etc/vdr/plugins/streamdev-server +etc/vdr/plugins/streamdev-server/streamdevhosts.conf +#usr/lib/vdr +#usr/lib/vdr/bin +usr/lib/vdr/bin/externremux.sh +usr/lib/vdr/libvdr-streamdev-server.so.2.0.0 diff --git a/config/rootfiles/packages/vdr_vnsiserver3 b/config/rootfiles/packages/vdr_vnsiserver3 new file mode 100644 index 0000000..4eee282 --- /dev/null +++ b/config/rootfiles/packages/vdr_vnsiserver3 @@ -0,0 +1,4 @@ +etc/sysconfig/vdr-plugins.d/vnsiserver3.conf +etc/vdr/plugins/vnsiserver3 +etc/vdr/plugins/vnsiserver3/allowed_hosts.conf +usr/lib/vdr/libvdr-vnsiserver3.so.2.0.0 diff --git a/config/udev/blacklist b/config/udev/blacklist index 5e470a9..6b76366 100644 --- a/config/udev/blacklist +++ b/config/udev/blacklist @@ -1,2 +1,6 @@ blacklist crc_ccitt blacklist slhc + +# Intel MEI controllers +# makes some systems hang on reboot +blacklist mei diff --git a/config/updxlrator/updxlrator b/config/updxlrator/updxlrator index d72677c..cdfce26 100644 --- a/config/updxlrator/updxlrator +++ b/config/updxlrator/updxlrator @@ -155,13 +155,29 @@ while (<>) { # Section: Avast Downloads # ----------------------------------------------------------- - if ($source_url =~ m@^http://download[\d]+\.avast\.com/.*\.(exe|vpu)$@i) + if ($source_url =~ m@^http://(ion|download)[\d]+\.avast\.com/.*\.(exe|vpu|vpx)$@i) { $xlrator_url = &check_cache($source_url,$hostaddr,$username,"Avast",$mirror); } + # ----------------------------------------------------------- + # Section: Mozilla Downloads + # ----------------------------------------------------------- + + if ($source_url=~ m@^http://.*\.mozilla\.net/.*\.((complete|partial)\.mar|exe)$@i) + { + $xlrator_url = &check_cache($source_url,$hostaddr,$username,"Mozilla",$unique); + } + + # ----------------------------------------------------------- + # Section: Mcafee # ----------------------------------------------------------- + if ($source_url =~ m@^http://update\.nai\.com/.*\.(mcs|z|gem|dat|zip)$@i) + { + $xlrator_url = &check_cache($source_url,$hostaddr,$username,"mcafee",$mirror); + } + # ----------------------------------------------------------- # Section: Avira Downloads # ----------------------------------------------------------- diff --git a/config/vdr/bin/runvdr b/config/vdr/bin/runvdr deleted file mode 100755 index f17b70c..0000000 --- a/config/vdr/bin/runvdr +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# runvdr: Loads the DVB driver and runs VDR -# -# If VDR exits abnormally, the driver will be reloaded -# and VDR restarted. -# -# Any command line parameters will be passed on to the -# actual 'vdr' program. -# - -PLUGOPTS="-Pstreamdev-server" - -VDRPRG="./bin/vdr" -VDRCMD="/bin/nice --11 $VDRPRG -w 60 -c /opt/vdr/etc $PLUGOPTS $*" - -KILL="killall -q -TERM" - -if [ "$(ps -A | grep " vdr$")" != "" ]; then - echo Error! VDR is already running! - exit 1 -fi - -mkdir -p /var/video -cd /opt/vdr -while (true) do -# -# If you have stability Problems at tuning or similar -# unload and reload the dvb-modules here ... -# Example is for Hauppauge Nexus 2.0 -# -# rmmod dvb_ttpci -# rmmod stv0299 -# rmmod dvb_core -# modprobe dvb_ttpci -# sleep 5 -# -# Check if DVB device is present / remove this check if you -# would use vdr as streaming client only -# - if [ ! -e /dev/dvb/adapter0/frontend0 ]; then - echo No DVB tuner found! - exit 1 - fi -# -# Run VDR -# - eval "$VDRCMD" - if test $? -eq 0 -o $? -eq 2; then exit; fi - $KILL $VDRPRG - sleep 10 - echo "`date` restarting VDR" -done diff --git a/config/vdr/bin/runvdr-soft b/config/vdr/bin/runvdr-soft deleted file mode 100755 index 6f187eb..0000000 --- a/config/vdr/bin/runvdr-soft +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -clear -runvdr -P\'softdevice -vo fb:\' > /tmp/vdrsoft.log 2>&1 -tail /tmp/vdrsoft.log -rm /tmp/vdrsoft.log diff --git a/config/vdr/plugins.d/conflictcheckonly.conf b/config/vdr/plugins.d/conflictcheckonly.conf new file mode 100644 index 0000000..d514694 --- /dev/null +++ b/config/vdr/plugins.d/conflictcheckonly.conf @@ -0,0 +1,7 @@ +# Configuration snippet for vdr-conflictcheckonly -*- sh -*- +# +# Add command line options to pass to the conflictcheckonly plugin to +# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED. + +PLUGIN_ENABLED=false +PLUGIN_OPTIONS="" diff --git a/config/vdr/plugins.d/epgsearch.conf b/config/vdr/plugins.d/epgsearch.conf new file mode 100644 index 0000000..3c73119 --- /dev/null +++ b/config/vdr/plugins.d/epgsearch.conf @@ -0,0 +1,6 @@ +# Configuration snippet for vdr-epgsearch -*- sh -*- +# +# Add command line options to pass to the epgsearch plugin to PLUGIN_OPTIONS, +# see the epgsearch(1) man page for information about available options. + +PLUGIN_OPTIONS="-l /var/log/vdr/epgsearch.log" diff --git a/config/vdr/plugins.d/epgsearchonly.conf b/config/vdr/plugins.d/epgsearchonly.conf new file mode 100644 index 0000000..9208556 --- /dev/null +++ b/config/vdr/plugins.d/epgsearchonly.conf @@ -0,0 +1,7 @@ +# Configuration snippet for vdr-epgsearchonly -*- sh -*- +# +# Add command line options to pass to the epgsearchonly plugin to +# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED. + +PLUGIN_ENABLED=false +PLUGIN_OPTIONS="" diff --git a/config/vdr/plugins.d/quickepgsearch.conf b/config/vdr/plugins.d/quickepgsearch.conf new file mode 100644 index 0000000..e302850 --- /dev/null +++ b/config/vdr/plugins.d/quickepgsearch.conf @@ -0,0 +1,7 @@ +# Configuration snippet for vdr-quickepgsearch -*- sh -*- +# +# Add command line options to pass to the quickepgsearch plugin to +# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED. + +PLUGIN_ENABLED=false +PLUGIN_OPTIONS="" diff --git a/config/vdr/plugins.d/streamdev-server.conf b/config/vdr/plugins.d/streamdev-server.conf new file mode 100644 index 0000000..52c11cf --- /dev/null +++ b/config/vdr/plugins.d/streamdev-server.conf @@ -0,0 +1,5 @@ +# Configuration snippet for vdr-streamdev-server -*- sh -*- +# +# Add command line options to pass to the streamdev-server plugin to PLUGIN_OPTIONS. + +PLUGIN_OPTIONS="" diff --git a/config/vdr/plugins.d/vnsiserver3.conf b/config/vdr/plugins.d/vnsiserver3.conf new file mode 100644 index 0000000..7c9706d --- /dev/null +++ b/config/vdr/plugins.d/vnsiserver3.conf @@ -0,0 +1,5 @@ +# Configuration snippet for vdr-vnsiserver3 -*- sh -*- +# +# Add command line options to pass to the vnsiserver3 plugin to PLUGIN_OPTIONS. + +PLUGIN_OPTIONS="" diff --git a/config/vdr/runvdr b/config/vdr/runvdr new file mode 100644 index 0000000..5dcfd6c --- /dev/null +++ b/config/vdr/runvdr @@ -0,0 +1,94 @@ +#!/bin/bash + +# runvdr - VDR launcher +# +# runvdr [VDROPTION]... + +shopt -s extglob nocasematch nullglob + +VDR=/usr/sbin/vdr +PLUGINDIR=/usr/lib/vdr +PLUGINVER=VDR_PLUGIN_VERSION +PLUGINSUF=${PLUGINVER:+.$PLUGINVER} + +log() +{ + type -P logger &>/dev/null && \ + logger -s -p daemon.info -t ${0##*/} "$1" 2>&1 || echo "INFO: $1" +} + +plugconf() +{ + local plugin=$1 PLUGIN_OPTIONS= PLUGIN_ENABLED= + if [[ -e /etc/sysconfig/vdr-plugins.d/$plugin.conf ]] ; then + . /etc/sysconfig/vdr-plugins.d/$plugin.conf + case $PLUGIN_ENABLED in no|false|0) return ;; esac + fi + if [[ $PLUGIN_OPTIONS ]] ; then + VDR_OPTIONS+=( --plugin="$plugin $PLUGIN_OPTIONS" ) + else + VDR_OPTIONS+=( --plugin=$plugin ) + fi +} + +build_cmdline() +{ + local plugin= p= + # Add "priority" plugins. + for plugin in $VDR_PLUGIN_ORDER ; do + [[ -e $PLUGINDIR/libvdr-${plugin}.so$PLUGINSUF ]] && plugconf $plugin + done + # Add the rest available. + for plugin in $PLUGINDIR/libvdr-*.so$PLUGINSUF ; do + plugin=${plugin##*/libvdr-} + plugin=${plugin%.so$PLUGINSUF} + for p in $VDR_PLUGIN_ORDER ; do + if [[ $plugin == $p ]] ; then + # Already added. + continue 2 + fi + done + plugconf $plugin + done +} + +reload_dvb() +{ + local modules=$( /sbin/lsmod | \ + awk '/^dvb_core/ { gsub(","," ",$4) ; print $4 }' ) + if [[ $modules ]] ; then + log "Reloading DVB modules" + /sbin/modprobe -r $modules dvb_core + for module in $modules ; do + /sbin/modprobe $module + done + fi +} + +rc= +while true ; do + VDR_OPTIONS=() + [[ -f /etc/sysconfig/vdr ]] && . /etc/sysconfig/vdr + [[ $DAEMON_COREFILE_LIMIT ]] && \ + ulimit -S -c $DAEMON_COREFILE_LIMIT &>/dev/null && \ + VDR_OPTIONS+=( --userdump ) && cd ${TMPDIR:-/tmp} + build_cmdline + + $VDR "$@" "${VDR_OPTIONS[@]}" + rc=$? + + # 137: "kill -KILL" eg in killproc(), others: "man vdr" + case $rc in + 0|2|137) + log "VDR exited with status $rc, exiting" + break + ;; + *) + log "VDR exited with status $rc, attempting restart" + case $RELOAD_DVB in yes|true|1) reload_dvb ;; esac + ;; + esac + +done + +exit $rc diff --git a/config/vdr/vdr.sysconfig b/config/vdr/vdr.sysconfig new file mode 100644 index 0000000..a1cebf1 --- /dev/null +++ b/config/vdr/vdr.sysconfig @@ -0,0 +1,39 @@ +# System configuration for VDR -*- sh -*- + +# The "master" options. Some examples of options you may want to set +# here are -r, -t, and --rcu. See the vdr(1) man page for more info. +# +VDR_OPTIONS=(--vfat) + +# VDR_PLUGIN_ORDER is a space separated list of plugins that should be +# loaded in a specific order. This affects eg. the order the plugins' +# menu entries are displayed OSD menus by default. The plugins in this +# list don't need to be installed, but if they are, they will be loaded +# before other possibly installed plugins. Note that it is recommended +# to load output plugins before others so that all necessary features are +# present when needed by other plugins at startup/shutdown. +# +VDR_PLUGIN_ORDER=" +streamdev-server +epgsearch +vnsiserver3 +" + +# PATH where to find the internally used executables. +# +PATH="/usr/lib/vdr/bin:$PATH" + +# How many minutes before a recording should the VDR box wake up? +# Some CI/CAM combinations can take quite a long time to initialize, so +# we default to a pretty generous value here. +# +WAKEUP_BEFORE_RECORDING=10 + +# Try reloading DVB modules on unexpected exits? +# +#RELOAD_DVB=yes + +# For debugging: allow vdr to dump core. Note that depending on the operating +# environment, core dumps from setuid processes may be a security issue. +# +#DAEMON_COREFILE_LIMIT="unlimited" diff --git a/config/vdradmin/install-ipfire.sh b/config/vdradmin/install-ipfire.sh index 8eceaac..9a6655b 100755 --- a/config/vdradmin/install-ipfire.sh +++ b/config/vdradmin/install-ipfire.sh @@ -18,7 +18,7 @@ CACHEDIR=${CACHEDIR:-$DESTDIR/var/cache/vdradmin} PIDFILE=${PIDFILE:-$DESTDIR/var/run/vdradmind.pid} VIDEODIR=${VIDEODIR:-/var/video} EPGIMAGES=${EPGIMAGES:-$VIDEODIR/epgimages} -VDRCONF=${VDRCONF:-/opt/vdr/etc} +VDRCONF=${VDRCONF:-/etc/vdr} function usage() { diff --git a/config/vdradmin/vdradmind.conf b/config/vdradmin/vdradmind.conf index 022efe7..a3b2d48 100644 --- a/config/vdradmin/vdradmind.conf +++ b/config/vdradmin/vdradmind.conf @@ -31,7 +31,7 @@ ES_SORTBY = pattern GUEST_ACCOUNT = 0 GUI_POPUP_HEIGHT = 250 GUI_POPUP_WIDTH = 500 -LANG = +LANG = en_US.utf8 LOCAL_NET = 0.0.0.0/32 LOGFILE = vdradmind.log LOGGING = 0 @@ -81,8 +81,8 @@ TV_MIMETYPE = video/x-mpegurl TV_SIZE = half USERNAME = vdradmin USERNAME_GUEST = guest -VDRCONFDIR = /opt/vdr/etc +VDRCONFDIR = /etc/vdr VDR_HOST = localhost -VDR_PORT = 2001 +VDR_PORT = 6419 VIDEODIR = /var/video ZEITRAHMEN = 1 diff --git a/config/w_scan/w_scan_start b/config/w_scan/w_scan_start index 0f624ac..05d9a78 100755 --- a/config/w_scan/w_scan_start +++ b/config/w_scan/w_scan_start @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -19,7 +19,9 @@ # # ############################################################################### ############################################################################### -# w_scan_start for IPFire v 1.00 - 2012-11-15 Arne Fitzenreiter - inital vers.# +# w_scan_start for IPFire v 1.02 - 2013-04-30 Arne Fitzenreiter - add atsc # +# - 2013-04-20 Arne Fitzenreiter - path vdr 2 # +# - 2012-11-15 Arne Fitzenreiter - inital vers.# ############################################################################### err_msg () @@ -64,17 +66,19 @@ if [ "$(ps -A | grep " runvdr$")" != "" ] ;then /etc/init.d/vdr stop fi -# Select DVB type -whiptail --checklist "\nSelect DVB type" 12 40 3 \ +# Select system type +whiptail --checklist "\nSelect system type" 12 40 5 \ DVB-T "Terrestrial" yes \ - DVB-C "Cable" no \ - DVB-S "Satellite" no \ + DVB-C "Cable" no \ + DVB-S "Satellite" no \ + ATSC-T "Terrestrial" no \ + ATSC-C "Cable" no \ 2>/tmp/w_scan_type chk_cancel W_SCAN_TYPE=$(cat /tmp/w_scan_type) rm /tmp/w_scan_type -if [[ "$W_SCAN_TYPE" == *DVB-T* ]] || [[ "$W_SCAN_TYPE" == *DVB-C* ]]; then +if [[ "$W_SCAN_TYPE" == *ATSC* ]] || [[ "$W_SCAN_TYPE" == *DVB-T* ]] || [[ "$W_SCAN_TYPE" == *DVB-C* ]]; then # Generate and run separate country menubox and default germany echo '#!/bin/bash' > /tmp/w_scan_countryselect.sh echo 'whiptail --radiolist "\nSelect country" 19 70 10 \' >> /tmp/w_scan_countryselect.sh @@ -105,19 +109,27 @@ clear rm -rf /tmp/channels.conf if [[ "$W_SCAN_TYPE" == *DVB-T* ]]; then echo ":->W-SCAN DVB-T $(date +%Y%m%d%H%M)" >>/tmp/channels.conf - $WSCAN -f t -c $W_SCAN_COUNTRY -C UTF-8 >>/tmp/channels.conf + $WSCAN -f t -c $W_SCAN_COUNTRY -C UTF-8 -o 7 >>/tmp/channels.conf fi if [[ "$W_SCAN_TYPE" == *DVB-C* ]]; then echo ":->W-SCAN DVB-C $(date +%Y%m%d%H%M)" >>/tmp/channels.conf - $WSCAN -f c -c $W_SCAN_COUNTRY -C UTF-8 >>/tmp/channels.conf + $WSCAN -f c -c $W_SCAN_COUNTRY -C UTF-8 -o 7 >>/tmp/channels.conf fi if [[ "$W_SCAN_TYPE" == *DVB-S* ]]; then for SATELLITE in $W_SCAN_SATELLITE; do echo ":->W-SCAN DVB-S $SATELLITE $(date +%Y%m%d%H%M)" >>/tmp/channels.conf - $WSCAN -f s -s $SATELLITE -C UTF-8 >>/tmp/channels.conf + $WSCAN -f s -s $SATELLITE -C UTF-8 -o 7 >>/tmp/channels.conf done fi +if [[ "$W_SCAN_TYPE" == *ATSC-T* ]]; then + echo ":->W-SCAN ATSC-T $(date +%Y%m%d%H%M)" >>/tmp/channels.conf + $WSCAN -f a -A 1 -c $W_SCAN_COUNTRY -C UTF-8 -o 7 >>/tmp/channels.conf +fi +if [[ "$W_SCAN_TYPE" == *ATSC-C* ]]; then + echo ":->W-SCAN ATSC-C $(date +%Y%m%d%H%M)" >>/tmp/channels.conf + $WSCAN -f a -A 2 -c $W_SCAN_COUNTRY -C UTF-8 -o 7 >>/tmp/channels.conf +fi # Save result to current dir. cp /tmp/channels.conf w_scan-$(date +%Y%m%d%H%M).channels.conf @@ -127,9 +139,9 @@ echo Results saved to w_scan-$(date +%Y%m%d%H%M).channels.conf if [ -e /opt/pakfire/db/installed/meta-vdr ]; then yes_no "Install new channels-conf for VDR." # Backup old channels conf... - cp -f /opt/vdr/etc/channels.conf \ - /opt/vdr/etc/channels.conf.backup$(date +%Y%m%d%H%M) - cp -f /tmp/channels.conf /opt/vdr/etc/ + cp -f /etc/vdr/channels.conf \ + /etc/vdr/channels.conf.backup$(date +%Y%m%d%H%M) + cp -f /tmp/channels.conf /etc/vdr/ yes_no "Should i start the VDR?" clear /etc/init.d/vdr start diff --git a/doc/language_issues.de b/doc/language_issues.de index e3c8842..65c0749 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -368,8 +368,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -437,6 +435,8 @@ WARNING: translation string unused: updates is old1 WARNING: translation string unused: updates is old2 WARNING: translation string unused: updxlrtr children WARNING: translation string unused: updxlrtr invalid num of children +WARNING: translation string unused: updxlrtr sources +WARNING: translation string unused: updxlrtr standard view WARNING: translation string unused: updxlrtr unknown WARNING: translation string unused: updxlrtr update information WARNING: translation string unused: updxlrtr update notification @@ -448,6 +448,7 @@ WARNING: translation string unused: upload update file WARNING: translation string unused: upstream password WARNING: translation string unused: upstream proxy host:port WARNING: translation string unused: upstream username +WARNING: translation string unused: uptime WARNING: translation string unused: uptime and users WARNING: translation string unused: urlfilter background image WARNING: translation string unused: urlfilter background text diff --git a/doc/language_issues.en b/doc/language_issues.en index 6c1fc21..d05caf4 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -399,8 +399,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -468,9 +466,12 @@ WARNING: translation string unused: updates is old1 WARNING: translation string unused: updates is old2 WARNING: translation string unused: updxlrtr children WARNING: translation string unused: updxlrtr invalid num of children +WARNING: translation string unused: updxlrtr sources +WARNING: translation string unused: updxlrtr standard view WARNING: translation string unused: updxlrtr unknown WARNING: translation string unused: updxlrtr update information WARNING: translation string unused: updxlrtr update notification +WARNING: translation string unused: updxlrtr used by WARNING: translation string unused: upload fcdsl.o WARNING: translation string unused: upload file WARNING: translation string unused: upload static key @@ -480,6 +481,7 @@ WARNING: translation string unused: upload update file WARNING: translation string unused: upstream password WARNING: translation string unused: upstream proxy host:port WARNING: translation string unused: upstream username +WARNING: translation string unused: uptime WARNING: translation string unused: uptime and users WARNING: translation string unused: urlfilter background image WARNING: translation string unused: urlfilter background text diff --git a/doc/language_issues.es b/doc/language_issues.es index 2468981..538f240 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -396,8 +396,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -509,6 +507,11 @@ WARNING: untranslated string: Set time on boot WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: age second +WARNING: untranslated string: age seconds +WARNING: untranslated string: age shour +WARNING: untranslated string: age sminute +WARNING: untranslated string: age ssecond WARNING: untranslated string: attention WARNING: untranslated string: bytes WARNING: untranslated string: ccd add @@ -616,6 +619,7 @@ WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: uptime load average WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: wlanap country diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 70dbdc1..dc14c54 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -395,8 +395,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -508,6 +506,11 @@ WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: age second +WARNING: untranslated string: age seconds +WARNING: untranslated string: age shour +WARNING: untranslated string: age sminute +WARNING: untranslated string: age ssecond WARNING: untranslated string: attention WARNING: untranslated string: bytes WARNING: untranslated string: ccd add @@ -602,6 +605,7 @@ WARNING: untranslated string: snort working WARNING: untranslated string: static routes WARNING: untranslated string: system information WARNING: untranslated string: upload new ruleset +WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter file ext block WARNING: untranslated string: urlfilter mode block WARNING: untranslated string: visit us at diff --git a/doc/language_issues.nl b/doc/language_issues.nl index f17d07d..932f272 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -399,8 +399,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -508,6 +506,11 @@ WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy cache-digest +WARNING: untranslated string: age second +WARNING: untranslated string: age seconds +WARNING: untranslated string: age shour +WARNING: untranslated string: age sminute +WARNING: untranslated string: age ssecond WARNING: untranslated string: bytes WARNING: untranslated string: ccd iroute2 WARNING: untranslated string: new @@ -517,3 +520,4 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: uptime load average diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 2468981..538f240 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -396,8 +396,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -509,6 +507,11 @@ WARNING: untranslated string: Set time on boot WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: age second +WARNING: untranslated string: age seconds +WARNING: untranslated string: age shour +WARNING: untranslated string: age sminute +WARNING: untranslated string: age ssecond WARNING: untranslated string: attention WARNING: untranslated string: bytes WARNING: untranslated string: ccd add @@ -616,6 +619,7 @@ WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: uptime load average WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: wlanap country diff --git a/doc/language_issues.ru b/doc/language_issues.ru index d59f4f6..3f2ba5c 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -389,8 +389,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -500,6 +498,11 @@ WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: age second +WARNING: untranslated string: age seconds +WARNING: untranslated string: age shour +WARNING: untranslated string: age sminute +WARNING: untranslated string: age ssecond WARNING: untranslated string: attention WARNING: untranslated string: bytes WARNING: untranslated string: ccd add @@ -580,6 +583,7 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: static routes +WARNING: untranslated string: uptime load average WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: wlanap country diff --git a/doc/language_missings b/doc/language_missings index ac650b3..85e59ab 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -14,6 +14,11 @@ < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy +< age second +< age seconds +< age shour +< age sminute +< age ssecond < attention < ccd add < ccd choose net @@ -104,7 +109,11 @@ < snort working < static routes < system information +< updxlrtr sources +< updxlrtr standard view < upload new ruleset +< uptime +< uptime load average < urlfilter file ext block < urlfilter mode block < visit us at @@ -138,6 +147,11 @@ < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy +< age second +< age seconds +< age shour +< age sminute +< age ssecond < Async logging enabled < attention < ccd add @@ -244,6 +258,10 @@ < Set time on boot < static routes < system information +< updxlrtr sources +< updxlrtr standard view +< uptime +< uptime load average < visit us at < vpn keyexchange ############################################################################ @@ -255,6 +273,11 @@ < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy +< age second +< age seconds +< age shour +< age sminute +< age ssecond < attention < ccd add < ccd choose net @@ -336,6 +359,10 @@ < qos enter bandwidths < server restart < static routes +< updxlrtr sources +< updxlrtr standard view +< uptime +< uptime load average < visit us at < vpn keyexchange ############################################################################ @@ -348,6 +375,11 @@ < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy +< age second +< age seconds +< age shour +< age sminute +< age ssecond < attention < ccd add < ccd choose net @@ -433,6 +465,10 @@ < qos enter bandwidths < server restart < static routes +< updxlrtr sources +< updxlrtr standard view +< uptime +< uptime load average < visit us at < vpn keyexchange < week-graph diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index 1edf3e5..d566cf7 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -34,6 +34,31 @@ require "${General::swroot}/header.pl"; my $colour_multicast = "#A0A0A0"; +# sort arguments for connection tracking table +# the sort field. eg. 1=src IP, 2=dst IP, 3=src port, 4=dst port +my $SORT_FIELD = 0; +# the sort order. (a)scending orr (d)escending +my $SORT_ORDER = 0; +# cgi query arguments +my %cgiin; +# debug mode +my $debug = 0; + +# retrieve query arguments +# note: let a-z A-Z and 0-9 pass as value only +if (length ($ENV{'QUERY_STRING'}) > 0){ + my $name; + my $value; + my $buffer = $ENV{'QUERY_STRING'}; + my @pairs = split(/&/, $buffer); + foreach my $pair (@pairs){ + ($name, $value) = split(/=/, $pair); + $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg; # e.g. "%20" => " " + $value =~ s/[^a-zA-Z0-9]*//g; # a-Z 0-9 will pass + $cgiin{$name} = $value; + } +} + &Header::showhttpheaders(); my @network=(); @@ -43,12 +68,40 @@ my @colour=(); my %netsettings=(); &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); +# output cgi query arrguments to browser on debug +if ( $debug ){ + &Header::openbox('100%', 'center', 'DEBUG'); + my $debugCount = 0; + foreach my $line (sort keys %cgiin) { + print "$line = '$cgiin{$line}'<br />\n"; + $debugCount++; + } + print " Count: $debugCount\n"; + &Header::closebox(); +} + #workaround to suppress a warning when a variable is used only once my @dummy = ( ${Header::table1colour} ); undef (@dummy); -# Read the connection tracking table. -open(CONNTRACK, "/usr/local/bin/getconntracktable | sort -k 5,5 --numeric-sort --reverse |") or die "Unable to read conntrack table"; +# check sorting arguments +if ( $cgiin{'sort_field'} ~~ [ '1','2','3','4','5','6','7','8','9' ] ) { + $SORT_FIELD = $cgiin{'sort_field'}; + + if ( $cgiin{'sort_order'} ~~ [ 'a','d','A','D' ] ) { + $SORT_ORDER = lc($cgiin{'sort_order'}); + } +} + +# Read and sort the connection tracking table +# do sorting +if ($SORT_FIELD and $SORT_ORDER) { + # field sorting when sorting arguments are sane + open(CONNTRACK, "/usr/local/bin/getconntracktable | /usr/local/bin/consort.sh $SORT_FIELD $SORT_ORDER |") or die "Unable to read conntrack table"; +} else { + # default sorting with no query arguments + open(CONNTRACK, "/usr/local/bin/getconntracktable | sort -k 5,5 --numeric-sort --reverse |") or die "Unable to read conntrack table"; +} my @conntrack = <CONNTRACK>; close(CONNTRACK); @@ -263,21 +316,81 @@ print <<END; <br> END +if ($SORT_FIELD and $SORT_ORDER) { + my @sort_field_name = ( + $Lang::tr{'source ip'}, + $Lang::tr{'destination ip'}, + $Lang::tr{'source port'}, + $Lang::tr{'destination port'}, + $Lang::tr{'protocol'}, + $Lang::tr{'connection'}.' '.$Lang::tr{'status'}, + $Lang::tr{'expires'}.' ('.$Lang::tr{'seconds'}.')', + $Lang::tr{'download'}, + $Lang::tr{'upload'} + ); + my $sort_order_name; + if (lc($SORT_ORDER) eq "a") { + $sort_order_name = $Lang::tr{'sort ascending'}; + } else { + $sort_order_name = $Lang::tr{'sort descending'}; + } + +print <<END + <div style="font-weight:bold;margin:10px;font-size: 70%"> + $sort_order_name: $sort_field_name[$SORT_FIELD-1] + </div> +END +; +} + # Print table header. print <<END; <table width='100%'> - <tr> + <tr valign="top""> <th align='center'> - $Lang::tr{'protocol'} + <a href="?sort_field=5&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=5&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> + </th> + <th align='center' colspan="2"> + <a href="?sort_field=1&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=1&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> +          + <a href="?sort_field=3&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=3&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> + </th> + <th align='center' colspan="2"> + <a href="?sort_field=2&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=2&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> +        + <a href="?sort_field=4&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=4&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> </th> <th align='center'> - $Lang::tr{'source ip and port'} + <a href="?sort_field=8&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=8&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> +      + <a href="?sort_field=9&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=9&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> + </th> + <th align='center'> + <a href="?sort_field=6&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=6&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> </th> - <th> </th> <th align='center'> + <a href="?sort_field=7&sort_order=d"><img style="width:10px" src="/images/up.gif"></a> + <a href="?sort_field=7&sort_order=a"><img style="width:10px" src="/images/down.gif"></a> + </th> + </tr> + <tr valign="top""> + <th align='center'> + $Lang::tr{'protocol'} + </th> + <th align='center' colspan="2"> + $Lang::tr{'source ip and port'} + </th> + <th align='center' colspan="2"> $Lang::tr{'dest ip and port'} </th> - <th> </th> <th align='center'> $Lang::tr{'download'} / <br>$Lang::tr{'upload'} diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index cbaecd9..a4953ff 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -2375,7 +2375,7 @@ ADV_ERROR: } &Header::openbox('100%', 'LEFT', $Lang::tr{'advanced server'}); print <<END - <form method='post' enctype='multipart/form-data' disabled> + <form method='post' enctype='multipart/form-data'> <table width='100%' border=0> <tr> <td colspan='4'><b>$Lang::tr{'dhcp-options'}</b></td> @@ -3498,18 +3498,25 @@ if ($cgiparams{'TYPE'} eq 'host') { ### if ($cgiparams{'TYPE'} eq 'net') { - - if ($cgiparams{'DEST_PORT'} eq $vpnsettings{'DDEST_PORT'}) { + if ($cgiparams{'DEST_PORT'} eq $vpnsettings{'DDEST_PORT'}) { $errormessage = $Lang::tr{'openvpn destination port used'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } - - if ($cgiparams{'DEST_PORT'} eq '') { + #Bugfix 10357 + foreach my $key (sort keys %confighash){ + if ( ($confighash{$key}[22] eq $cgiparams{'DEST_PORT'} && $cgiparams{'NAME'} ne $confighash{$key}[1]) || ($confighash{$key}[29] eq $cgiparams{'DEST_PORT'} && $cgiparams{'NAME'} ne $confighash{$key}[1])){ $errormessage = $Lang::tr{'openvpn destination port used'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; + } + } + if ($cgiparams{'DEST_PORT'} eq '') { + $errormessage = $Lang::tr{'invalid port'}; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } @@ -3920,7 +3927,7 @@ if ($cgiparams{'TYPE'} eq 'net') { } } - # Save the config + # Save the config my $key = $cgiparams{'KEY'}; if (! $key) { diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index b3da32c..74f10bd 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -99,7 +99,7 @@ $sambasettings{'SYSLOGONLY'} = 'on'; $sambasettings{'DOSCHARSET'} = 'CP850'; $sambasettings{'UNIXCHARSET'} = 'UTF8'; $sambasettings{'DISPLAYCHARSET'} = 'CP850'; -$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE'; +$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=819200 SO_SNDBUF=819200 SO_KEEPALIVE'; $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; $sambasettings{'SMB2'} = 'off'; @@ -149,7 +149,7 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') system("/usr/local/bin/sambactrl smbglobalreset"); $sambasettings{'WORKGRP'} = 'homeip.net'; $sambasettings{'NETBIOSNAME'} = 'IPFire'; - $sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.0'; + $sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x'; $sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'share'; $sambasettings{'OSLEVEL'} = '65'; @@ -183,7 +183,7 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'LOCALMASTER'} = 'off'; $sambasettings{'DOMAINMASTER'} = 'off'; $sambasettings{'PREFERREDMASTER'} = 'off'; - $sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE'; + $sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=819200 SO_SNDBUF=819200 SO_KEEPALIVE'; $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; $sambasettings{'SMB2'} = 'off'; diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 22a9ac7..131cad8 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -125,11 +125,11 @@ END $lines++; if ($lines % 2){ print "<tr bgcolor='$color{'color22'}'>\n<td align='left'>"; - print %link->{$key}; + print $link{$key}; print "</td>\n"; }else{ print "<tr bgcolor='$color{'color20'}'>\n<td align='left'>"; - print %link->{$key}; + print $link{$key}; print "</td>\n"; } diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 161df4d..26f1793 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -245,9 +245,6 @@ sub writeipsecfiles { flock CONF, 2; flock SECRETS, 2; print CONF "version 2\n\n"; - print CONF "config setup\n"; - print CONF "\tcharondebug=\"dmn 0, mgr 0, ike 0, chd 0, job 0, cfg 0, knl 0, net 0, asn 0, enc 0, lib 0, esp 0, tls 0, tnc 0, imc 0, imv 0, pts 0\"\n"; - print CONF "\n"; print CONF "conn %default\n"; print CONF "\tkeyingtries=%forever\n"; print CONF "\n"; @@ -1832,11 +1829,11 @@ END $cgiparams{'IKE_ENCRYPTION'} = 'aes256|aes192|aes128|3des'; #[18]; $cgiparams{'IKE_INTEGRITY'} = 'sha2_256|sha|md5'; #[19]; $cgiparams{'IKE_GROUPTYPE'} = '8192|6144|4096|3072|2048|1536|1024'; #[20]; - $cgiparams{'IKE_LIFETIME'} = '1'; #[16]; + $cgiparams{'IKE_LIFETIME'} = '3'; #[16]; $cgiparams{'ESP_ENCRYPTION'} = 'aes256|aes192|aes128|3des'; #[21]; $cgiparams{'ESP_INTEGRITY'} = 'sha2_256|sha1|md5'; #[22]; $cgiparams{'ESP_GROUPTYPE'} = ''; #[23]; - $cgiparams{'ESP_KEYLIFE'} = '8'; #[17]; + $cgiparams{'ESP_KEYLIFE'} = '1'; #[17]; $cgiparams{'COMPRESSION'} = 'on'; #[13]; $cgiparams{'ONLY_PROPOSED'} = 'off'; #[24]; $cgiparams{'PFS'} = 'on'; #[28]; diff --git a/html/html/include/jquery-1.2.6.min.js b/html/html/include/jquery-1.2.6.min.js deleted file mode 100644 index 82b98e1..0000000 --- a/html/html/include/jquery-1.2.6.min.js +++ /dev/null @@ -1,32 +0,0 @@ -/* - * jQuery 1.2.6 - New Wave Javascript - * - * Copyright (c) 2008 John Resig (jquery.com) - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $ - * $Rev: 5685 $ - */ -(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else -return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:functio n(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this. domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else -return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else -selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}retu rn values;}else -return(this[0].value||"").replace(/\r/g,"");}return undefined;}if(value.constructor==Number)value+='';return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else -this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else -return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script "});else -jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&&copy&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQ uery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else -script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break ;}else -for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else -for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback .call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else -jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i ]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem==" string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0? div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else -ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&&notxml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&&notxml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&&notxml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha $[^)]*$/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else -while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else -while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.exte nd({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,f n);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.pa rentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseI nt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a .firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textar ea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)$"?'?(.*?(\(.*?$)?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(node Name=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j<rl;j++){var n=m=="~"||m=="+"?ret[j].nextSibling:ret[j].firstChild;for(;n;n=n.nextSibling)if(n.nodeType==1){var id=jQuery.data(n);if(m=="~"&&merge[id])break;if(!nodeName||n.nodeName.toUpperCase()==nodeName){if(m=="~")merge[id]=true;r.push(n);}if(m=="+")break;}}ret=r;t=jQuery.trim(t.replace(re,""));foundToken=true;}}if(t&&!foundToken){if(!t.indexOf(",")){if(context==ret[0])ret.shift();done=jQuery.merge(done,ret);r=ret=[context];t=" "+t.substr(1,t.length);}else{var re2=quickID;var m=re2.exec(t);if(m){m=[0,m[2],m[3],m[1]];}else{re2=quickClass;m=re2.exec(t);}m[2]=m[2].replace(/\\/g,"");var elem=ret[ret.length-1];if(m[1]=="#"&&elem&&elem.getElementById&&!jQuery.isXMLDoc(elem)){var oid=elem.getElementById(m[2]);if((jQuery.browser.m sie||jQuery.browser.opera)&&oid&&typeof oid.id=="string"&&oid.id!=m[2])oid=jQuery('[@id="'+m[2]+'"]',elem)[0];ret=r=oid&&(!m[3]||jQuery.nodeName(oid,m[3]))?[oid]:[];}else{for(var i=0;ret[i];i++){var tag=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];if(tag=="*"&&ret[i].nodeName.toLowerCase()=="object")tag="param";r=jQuery.merge(r,ret[i].getElementsByTagName(tag));}if(m[1]==".")r=jQuery.classFilter(r,m[2]);if(m[1]=="#"){var tmp=[];for(var i=0;r[i];i++)if(r[i].getAttribute("id")==m[2]){tmp=[r[i]];break;}r=tmp;}ret=r;}t=t.replace(re2,"");}}if(t){var val=jQuery.filter(t,r);ret=r=val.r;t=jQuery.trim(val.t);}}if(t)ret=[];if(ret&&context==ret[0])ret.shift();done=jQuery.merge(done,ret);return done;},classFilter:function(r,m,not){m=" "+m+" ";var tmp=[];for(var i=0;r[i];i++){var pass=(" "+r[i].className+" ").indexOf(m)>=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t) ;if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i<rl;i++){var a=r[i],z=a[jQuery.props[m[2]]||m[2]];if(z==null||/href|src|selected/.test(m[2]))z=jQuery.attr(a,m[2])||'';if((type==""&&!!z||type=="="&&z==m[5]||type=="!="&&z!=m[5]||type=="^="&&z&&!z.indexOf(m[5])||type=="$="&&z.substr(z.length-m[5].length)==m[5]||(type=="*="||type=="~=")&&z.indexOf(m[5])>=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i<rl;i++){var node=r[i],parentNode=node.parentNode,id=jQuery.data(parentNode);if(!merge[id]){var c=1;for(var n=parentNode.firstC hild;n;n=n.nextSibling)if(n.nodeType==1)n.nodeIndex=c++;merge[id]=true;}var add=false;if(first==0){if(node.nodeIndex==last)add=true;}else if((node.nodeIndex-last)%first==0&&(node.nodeIndex-last)/first>=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem =window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3|| elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else -for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(eve nt){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handle rs){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalE vent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid|| this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({ bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i<args.length)jQuery.event.proxy(fn,args[i++]);return this.click(jQuery.event.proxy(fn,function(event){this.lastToggle=(this.lastToggle||0)%i;event.preventDefault();return args[this.lastToggle++].apply(this,arguments)||false;}));},hover:function(fnOver,fnOut){return this .bind('mouseenter',fnOver).bind('mouseleave',fnOut);},ready:function(fn){bindReady();if(jQuery.isReady)fn.call(document,jQuery);else -jQuery.readyList.push(function(){return fn.call(this,jQuery);});return this;}});jQuery.extend({isReady:false,readyList:[],ready:function(){if(!jQuery.isReady){jQuery.isReady=true;if(jQuery.readyList){jQuery.each(jQuery.readyList,function(){this.call(document);});jQuery.readyList=null;}jQuery(document).triggerHandler("ready");}}});var readyBound=false;function bindReady(){if(readyBound)return;readyBound=true;if(document.addEventListener&&!jQuery.browser.opera)document.addEventListener("DOMContentLoaded",jQuery.ready,false);if(jQuery.browser.msie&&window==top)(function(){if(jQuery.isReady)return;try{document.documentElement.doScroll("left");}catch(error){setTimeout(arguments.callee,0);return;}jQuery.ready();})();if(jQuery.browser.opera)document.addEventListener("DOMContentLoaded",function(){if(jQuery.isReady)return;for(var i=0;i<document.styleSheets.length;i++)if(document.styleSheets[i].disabled){setTimeout(arguments.callee,0);return;}jQuery.ready();},false);if(jQuery.browser.safari){ var numStyles;(function(){if(jQuery.isReady)return;if(document.readyState!="loaded"&&document.readyState!="complete"){setTimeout(arguments.callee,0);return;}if(numStyles===undefined)numStyles=jQuery("style, link[rel=stylesheet]").length;if(document.styleSheets.length!=numStyles){setTimeout(arguments.callee,0);return;}jQuery.ready();})();}jQuery.event.add(window,"load",jQuery.ready);}jQuery.each(("blur,focus,load,resize,scroll,unload,click,dblclick,"+"mousedown,mouseup,mousemove,mouseover,mouseout,change,select,"+"submit,keydown,keypress,keyup,error").split(","),function(i,name){jQuery.fn[name]=function(fn){return fn?this.bind(name,fn):this.trigger(name);};});var withinElement=function(event,elem){var parent=event.relatedTarget;while(parent&&parent!=elem)try{parent=parent.parentNode;}catch(error){parent=elem;}return parent==elem;};jQuery(window).bind("unload",function(){jQuery("*").add(document).unbind();});jQuery.fn.extend({_load:jQuery.fn.load,load:function(url,params,callback){if( typeof url!='string')return this._load(url);var off=url.indexOf(" ");if(off>=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("<div/>").append(res.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}) .map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location. href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+ jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="c omplete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else -xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var mo dRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else -jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;}, httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else -for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else -s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",op acity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(thi s);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else -e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,f n){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.dis play="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;i<timers.length;i++)if(!timers[i]())timers.splice(i--,1);if(!timers.length){clearInterval(jQuery.timerId);jQuery.timerId=null;}},13);}},show:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.show=true;this.custom(0,this.cur());if(this.prop=="width"||this.prop=="height")this.elem.style[this.prop]="1px";jQuery(this.elem).show();},hi de:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0);},step:function(gotoEnd){var t=now();if(gotoEnd||t>this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")] (this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documen tElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(ele m){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuer y.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})(); \ No newline at end of file diff --git a/html/html/include/jquery-1.9.1.min.js b/html/html/include/jquery-1.9.1.min.js new file mode 100644 index 0000000..006e953 --- /dev/null +++ b/html/html/include/jquery-1.9.1.min.js @@ -0,0 +1,5 @@ +/*! jQuery v1.9.1 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license +//@ sourceMappingURL=jquery.min.map +*/(function(e,t){var n,r,i=typeof t,o=e.document,a=e.location,s=e.jQuery,u=e.$,l={},c=[],p="1.9.1",f=c.concat,d=c.push,h=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,b=function(e,t){return new b.fn.init(e,t,r)},x=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^[\],:{}\s]*$/,E=/(?:^|:|,)(?:\s*\[)+/g,S=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,j=/^-ms-/,D=/-([\da-z])/gi,L=function(e,t){return t.toUpperCase()},H=function(e){(o.addEventListener||"load"===e.type||"complete"===o.readyState)&&(q(),b.ready())},q=function(){o.addEventListener?(o.removeEventListener("DOMContentLoaded",H,!1),e.removeEventListener("load",H,!1)):(o.detachEvent("onreadystatechange",H),e.detachEvent("onload",H))};b.fn=b.prototype={jquery:p,constructor:b,init:function(e,n,r){var i,a;if(!e)return this;if("string"==typeof e) {if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof b?n[0]:n,b.merge(this,b.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,!0)),C.test(i[1])&&b.isPlainObject(n))for(i in n)b.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(a=o.getElementById(i[2]),a&&a.parentNode){if(a.id!==i[2])return r.find(e);this.length=1,this[0]=a}return this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):b.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),b.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return h.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=b.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:funct ion(e,t){return b.each(this,e,t)},ready:function(e){return b.ready.promise().done(e),this},slice:function(){return this.pushStack(h.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(b.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:d,sort:[].sort,splice:[].splice},b.fn.init.prototype=b.fn,b.extend=b.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||b.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(o=arguments[u]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(b.isPlainObject(r)||(n=b.isArray(r)))?(n?(n=!1,a=e&&b.isArray(e)?e:[]):a=e&&b.isPlainObject(e)?e:{},s[i]=b.extend(c,a,r)):r!==t&&(s[i]=r));return s},b.extend({noConflict:fun ction(t){return e.$===b&&(e.$=u),t&&e.jQuery===b&&(e.jQuery=s),b},isReady:!1,readyWait:1,holdReady:function(e){e?b.readyWait++:b.ready(!0)},ready:function(e){if(e===!0?!--b.readyWait:!b.isReady){if(!o.body)return setTimeout(b.ready);b.isReady=!0,e!==!0&&--b.readyWait>0||(n.resolveWith(o,[b]),b.fn.trigger&&b(o).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===b.type(e)},isArray:Array.isArray||function(e){return"array"===b.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==b.type(e)||e.nodeType||b.isWindow(e))return!1;try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||y.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;r eturn!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=b.buildFragment([e],t,i),i&&b(i).remove(),b.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=b.trim(n),n&&k.test(n.replace(S,"@").replace(A,"]").replace(E,"")))?Function("return "+n)():(b.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||b.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&b.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(j,"ms-").replace(D,L)},node Name:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:v&&!v.call("\ufeff\u00a0")?function(e){return null==e?"":v.call(e)}:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?b.merge(n,"string"==typeof e?[e]:e):d.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(g)return g.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r &&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return f.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),b.isFunction(e)?(r=h.call(arguments,2),i=function(){return e.apply(n||this,r.concat(h.call(arguments)))},i.guid=e.guid=e.guid||b.guid++,i):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===b.type(r)){o=!0;for(u in r)b.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,b.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(b(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),b.ready.promise=function(t){if(!n)if(n=b.Deferred(),"complete"===o.readyState)setTimeout(b.ready);else if(o.addEventListener)o.addEventListener("DOMContentLoaded",H,!1),e.addEv entListener("load",H,!1);else{o.attachEvent("onreadystatechange",H),e.attachEvent("onload",H);var r=!1;try{r=null==e.frameElement&&o.documentElement}catch(i){}r&&r.doScroll&&function a(){if(!b.isReady){try{r.doScroll("left")}catch(e){return setTimeout(a,50)}q(),b.ready()}}()}return n.promise(t)},b.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=b.type(e);return b.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=b(o);var _={};function F(e){var t=_[e]={};return b.each(e.match(w)||[],function(e,n){t[n]=!0}),t}b.Callbacks=function(e){e="string"==typeof e?_[e]||F(e):b.extend({},e);var n,r,i,o,a,s,u=[],l=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=u.length,n=!0;u&&o>a;a++)if(u[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,u&&(l?l.length&&c(l.shift()):r?u=[]:p.disable())},p={add:function( ){if(u){var t=u.length;(function i(t){b.each(t,function(t,n){var r=b.type(n);"function"===r?e.unique&&p.has(n)||u.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=u.length:r&&(s=t,c(r))}return this},remove:function(){return u&&b.each(arguments,function(e,t){var r;while((r=b.inArray(t,u,r))>-1)u.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?b.inArray(e,u)>-1:!(!u||!u.length)},empty:function(){return u=[],this},disable:function(){return u=l=r=t,this},disabled:function(){return!u},lock:function(){return l=t,r||p.disable(),this},locked:function(){return!l},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!u||i&&!l||(n?l.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},b.extend({Deferred:function(e){var t=[["resolve","done",b.Callbacks("once memory"),"resolved"],["reject","fail",b.Callbacks("once memory"),"rejected"],["notify","progress",b.Callbacks("memory")]],n="pending",r ={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return b.Deferred(function(n){b.each(t,function(t,o){var a=o[0],s=b.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&b.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?b.extend(e,r):r}},i={};return r.pipe=r.then,b.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=h.call(arguments),r=n.length,i=1!==r||e&&b.isFunction(e.promise)?r:0,o=1===i?e:b.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?h.call(arguments):r,n===s?o.notifyWith(t,n):-- i||o.resolveWith(t,n)}},s,u,l;if(r>1)for(s=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&b.isFunction(n[t].promise)?n[t].promise().done(a(t,l,n)).fail(o.reject).progress(a(t,u,s)):--i;return i||o.resolveWith(l,n),o.promise()}}),b.support=function(){var t,n,r,a,s,u,l,c,p,f,d=o.createElement("div");if(d.setAttribute("className","t"),d.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*"),r=d.getElementsByTagName("a")[0],!n||!r||!n.length)return{};s=o.createElement("select"),l=s.appendChild(o.createElement("option")),a=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={getSetAttribute:"t"!==d.className,leadingWhitespace:3===d.firstChild.nodeType,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:"/a"===r.getAttribute("href"),opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,check On:!!a.value,optSelected:l.selected,enctype:!!o.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==o.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===o.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},a.checked=!0,t.noCloneChecked=a.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!l.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}a=o.createElement("input"),a.setAttribute("value",""),t.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),t.radioValue="t"===a.value,a.setAttribute("checked","t"),a.setAttribute("name","t"),u=o.createDocumentFragment(),u.appendChild(a),t.appendChecked=a.checked,t.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bub bles"]=c in e||d.attributes[c].expando===!1;return d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip,b(function(){var n,r,a,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",u=o.getElementsByTagName("body")[0];u&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",u.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",a=d.getElementsByTagName("td"),a[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===a[0].offsetHeight,a[0].style.display="",a[1].style.display="none",t.reliableHiddenOffsets=p&&0===a[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1 %;",t.boxSizing=4===d.offsetWidth,t.doesNotIncludeMarginInBodyOffset=1!==u.offsetTop,e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(o.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(u.style.zoom=1)),u.removeChild(n),n=d=a=r=null)}),n=s=u=l=r=a=null,t}();var O=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,B=/([A-Z])/g;function P(e,n,r,i){if(b.acceptData(e)){var o,a,s=b.expando,u="string"==typeof n,l=e.nodeType,p=l?b.cache:e,f=l?e[s]:e[s]&&s; if(f&&p[f]&&(i||p[f].data)||!u||r!==t)return f||(l?e[s]=f=c.pop()||b.guid++:f=s),p[f]||(p[f]={},l||(p[f].toJSON=b.noop)),("object"==typeof n||"function"==typeof n)&&(i?p[f]=b.extend(p[f],n):p[f].data=b.extend(p[f].data,n)),o=p[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[b.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[b.camelCase(n)])):a=o,a}}function R(e,t,n){if(b.acceptData(e)){var r,i,o,a=e.nodeType,s=a?b.cache:e,u=a?e[b.expando]:b.expando;if(s[u]){if(t&&(o=n?s[u]:s[u].data)){b.isArray(t)?t=t.concat(b.map(t,b.camelCase)):t in o?t=[t]:(t=b.camelCase(t),t=t in o?[t]:t.split(" "));for(r=0,i=t.length;i>r;r++)delete o[t[r]];if(!(n?$:b.isEmptyObject)(o))return}(n||(delete s[u].data,$(s[u])))&&(a?b.cleanData([e],!0):b.support.deleteExpando||s!=s.window?delete s[u]:s[u]=null)}}}b.extend({cache:{},expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?b.cache[e[b.expando]]:e[ b.expando],!!e&&!$(e)},data:function(e,t,n){return P(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return P(e,t,n,!0)},_removeData:function(e,t){return R(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&b.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),b.fn.extend({data:function(e,n){var r,i,o=this[0],a=0,s=null;if(e===t){if(this.length&&(s=b.data(o),1===o.nodeType&&!b._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>a;a++)i=r[a].name,i.indexOf("data-")||(i=b.camelCase(i.slice(5)),W(o,i,s[i]));b._data(o,"parsedAttrs",!0)}return s}return"object"==typeof e?this.each(function(){b.data(this,e)}):b.access(this,function(n){return n===t?o?W(o,e,b.data(o,e)):null:(this.each(function(){b.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){b.removeData(this,e)})}});function W(e,n,r){if(r===t&&1===e.nodeType){var i="data -"+n.replace(B,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:O.test(r)?b.parseJSON(r):r}catch(o){}b.data(e,n,r)}else r=t}return r}function $(e){var t;for(t in e)if(("data"!==t||!b.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}b.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=b._data(e,n),r&&(!i||b.isArray(r)?i=b._data(e,n,b.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=b.queue(e,t),r=n.length,i=n.shift(),o=b._queueHooks(e,t),a=function(){b.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return b._data(e,n)||b._data(e,n,{empty:b.Callbacks("once memory").add(function(){b._removeData(e,t+"queue"),b._removeData(e,n)})})}}),b.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>a rguments.length?b.queue(this[0],e):n===t?this:this.each(function(){var t=b.queue(this,e,n);b._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&b.dequeue(this,e)})},dequeue:function(e){return this.each(function(){b.dequeue(this,e)})},delay:function(e,t){return e=b.fx?b.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=b.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=b._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var I,z,X=/[\t\r\n]/g,U=/\r/g,V=/^(?:input|select|textarea|button|object)$/i,Y=/^(?:a|area)$/i,J=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,G=/^(?:checked|selected)$/i,Q=b.support.getSetAttribute,K=b.support.input;b.fn.extend( {attr:function(e,t){return b.access(this,b.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){b.removeAttr(this,e)})},prop:function(e,t){return b.access(this,b.prop,e,t,arguments.length>1)},removeProp:function(e){return e=b.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=b.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&& (n.className?(" "+n.className+" ").replace(X," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?b.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return b.isFunction(e)?this.each(function(n){b(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=b(this),u=t,l=e.match(w)||[];while(o=l[a++])u=r?u:!s.hasClass(o),s[u?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&b._data(this,"__className__",this.className),this.className=this.className||e===!1?"":b._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(X," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=b.isFunction(e),this.each(function(n){var o,a=b(this);1===this.nodeType&&(o=i?e.call(this,n,a.val()):e,null== o?o="":"number"==typeof o?o+="":b.isArray(o)&&(o=b.map(o,function(e){return null==e?"":e+""})),r=b.valHooks[this.type]||b.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=b.valHooks[o.type]||b.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(U,""):null==n?"":n)}}}),b.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;for(;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(b.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&b.nodeName(n.parentNode,"optgroup"))){if(t=b(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=b.makeArray(t);return b(e).find("option").each(function(){this.selected=b.inArray(b(this).val(),n)>=0}),n.length| |(e.selectedIndex=-1),n}}},attr:function(e,n,r){var o,a,s,u=e.nodeType;if(e&&3!==u&&8!==u&&2!==u)return typeof e.getAttribute===i?b.prop(e,n,r):(a=1!==u||!b.isXMLDoc(e),a&&(n=n.toLowerCase(),o=b.attrHooks[n]||(J.test(n)?z:I)),r===t?o&&a&&"get"in o&&null!==(s=o.get(e,n))?s:(typeof e.getAttribute!==i&&(s=e.getAttribute(n)),null==s?t:s):null!==r?o&&a&&"set"in o&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r):(b.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=b.propFix[n]||n,J.test(n)?!Q&&G.test(n)?e[b.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:b.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!b.support.radioValue&&"radio"===t&&b.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",col span:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!b.isXMLDoc(e),a&&(n=b.propFix[n]||n,o=b.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):V.test(e.nodeName)||Y.test(e.nodeName)&&e.href?0:t}}}}),z={get:function(e,n){var r=b.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?K&&Q?null!=i:G.test(n)?e[b.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?b.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&b.propFix[n]||n,n):e[b.camelCase("default-"+n)]=e[n]=!0,n}},K&&Q||(b.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return b.nodeName(e,"input")?e.defaultValue:r&&r.specif ied?r.value:t},set:function(e,n,r){return b.nodeName(e,"input")?(e.defaultValue=n,t):I&&I.set(e,n,r)}}),Q||(I=b.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},b.attrHooks.contenteditable={get:I.get,set:function(e,t,n){I.set(e,""===t?!1:t,n)}},b.each(["width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),b.support.hrefNormalized||(b.each(["href","src","width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),b.each(["href","src"],function(e,t){b.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),b.support.style||(b.attrHooks.style={get:function(e ){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),b.support.optSelected||(b.propHooks.selected=b.extend(b.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),b.support.enctype||(b.propFix.enctype="encoding"),b.support.checkOn||b.each(["radio","checkbox"],function(){b.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),b.each(["radio","checkbox"],function(){b.valHooks[this]=b.extend(b.valHooks[this],{set:function(e,n){return b.isArray(n)?e.checked=b.inArray(b(e).val(),n)>=0:t}})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}b.event={global:{},add:function(e,n,r,o,a){var s,u,l,c,p,f,d,h,g,m,y,v=b._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=b.guid++),(u=v.events)||(u=v.eve nts={}),(f=v.handle)||(f=v.handle=function(e){return typeof b===i||e&&b.event.triggered===e.type?t:b.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(w)||[""],l=n.length;while(l--)s=rt.exec(n[l])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),p=b.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=b.event.special[g]||{},d=b.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&b.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=u[g])||(h=u[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),b.event.global[g]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,p,f,d,h,g,m=b.hasData(e)&&b._data(e);if(m&&(c=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(s=rt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort (),d){p=b.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));u&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||b.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)b.event.remove(e,d+t[l],n,r,!0);b.isEmptyObject(c)&&(delete m.handle,b._removeData(e,"events"))}},trigger:function(n,r,i,a){var s,u,l,c,p,f,d,h=[i||o],g=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];if(l=f=i=i||o,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+b.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),u=0>g.indexOf(":")&&"on"+g,n=n[b.expando]?n:new b.Event(g,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.) "+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:b.makeArray(r,[n]),p=b.event.special[g]||{},a||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!a&&!p.noBubble&&!b.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(l=l.parentNode);l;l=l.parentNode)h.push(l),f=l;f===(i.ownerDocument||o)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((l=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(b._data(l,"events")||{})[n.type]&&b._data(l,"handle"),s&&s.apply(l,r),s=u&&l[u],s&&b.acceptData(l)&&s.apply&&s.apply(l,r)===!1&&n.preventDefault();if(n.type=g,!(a||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===g&&b.nodeName(i,"a")||!b.acceptData(i)||!u||!i[g]||b.isWindow(i))){f=i[u],f&&(i[u]=null),b.event.triggered=g;try{i[g]()}catch(v){}b.event.triggered=t,f&&(i[u]=f)}return n.result}},dispatch:function(e){e=b.event.fix(e);var n,r,i,o,a,s=[],u=h.call(arguments),l=(b._data(this,"events")||{})[e.type]||[],c =b.event.special[e.type]||{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=b.event.handlers.call(this,e,l),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((b.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,u),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(1===l.nodeType&&(l.disabled!==!0||"click"!==e.type)){for(o=[],a=0;u>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?b(r,this).index(l)>=0:b.find(r,this,null,[l]).length),o[r]&&o.push(i);o.length&&s.push({elem:l,handlers:o})}return n.length>u&&s.push({elem:this,han dlers:n.slice(u)}),s},fix:function(e){if(e[b.expando])return e;var t,n,r,i=e.type,a=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new b.Event(a),t=r.length;while(t--)n=r[t],e[n]=a[n];return e.target||(e.target=a.srcElement||o),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,a):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,a,s=n.button,u=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||o,a=i.documen tElement,r=i.body,e.pageX=n.clientX+(a&&a.scrollLeft||r&&r.scrollLeft||0)-(a&&a.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(a&&a.scrollTop||r&&r.scrollTop||0)-(a&&a.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&u&&(e.relatedTarget=u===e.target?n.toElement:u),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return b.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==o.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===o.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=b.extend(new b.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?b.event.trigger(i,null,t):b.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},b.r emoveEvent=o.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},b.Event=function(e,n){return this instanceof b.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&b.extend(this,n),this.timeStamp=e&&e.timeStamp||b.now(),this[b.expando]=!0,t):new b.Event(e,n)},b.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagati on()}},b.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){b.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj; +return(!i||i!==r&&!b.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),b.support.submitBubbles||(b.event.special.submit={setup:function(){return b.nodeName(this,"form")?!1:(b.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=b.nodeName(n,"input")||b.nodeName(n,"button")?n.form:t;r&&!b._data(r,"submitBubbles")&&(b.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),b._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&b.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return b.nodeName(this,"form")?!1:(b.event.remove(this,"._submit"),t)}}),b.support.changeBubbles||(b.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(b.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),b.event.add (this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),b.event.simulate("change",this,e,!0)})),!1):(b.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!b._data(t,"changeBubbles")&&(b.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||b.event.simulate("change",this.parentNode,e,!0)}),b._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return b.event.remove(this,"._change"),!Z.test(this.nodeName)}}),b.support.focusinBubbles||b.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){b.event.simulate(t,e.target,b.event.fix(e),!0)};b.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),b.fn.extend({on:function(e,n,r ,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return b().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=b.guid++)),this.each(function(){b.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,b(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){b.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1=== arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},trigger:function(e,t){return this.each(function(){b.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?b.event.trigger(e,n,r,!0):t}}),function(e,t){var n,r,i,o,a,s,u,l,c,p,f,d,h,g,m,y,v,x="sizzle"+-new Date,w=e.document,T={},N=0,C=0,k=it(),E=it(),S=it(),A=typeof t,j=1<<31,D=[],L=D.pop,H=D.push,q=D.slice,M=D.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},_="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=F.replace("w","w#"),B="([*^$|!~]?=)",P="\\["+_+"*("+F+")"+_+"*(?:"+B+_+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+O+")|)|)"+_+"*\\]",R=":("+F+")(?:\$((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+P.replace(3,8)+")*)|.*)\$|)",W=RegExp("^"+_+"+|((?:^|[^\\\\])(?:\\\\.)*)"+_+"+$","g"),$=RegExp("^"+_+"*,"+_+"*"),I=RegExp("^"+_+"*([\\x20\\t\\r\\n\\f>+~])"+_+"*"),z=RegExp(R),X=RegExp("^"+O+"$"),U={ID:RegExp("^#("+F+")"),CLASS:RegExp("^\\.("+F +")"),NAME:RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:RegExp("^("+F.replace("w","w*")+")"),ATTR:RegExp("^"+P),PSEUDO:RegExp("^"+R),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\$"+_+"*(even|odd|(([+-]|)(\\d*)n|)"+_+"*(?:([+-]|)"+_+"*(\\d+)|))"+_+"*\$|)","i"),needsContext:RegExp("^"+_+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\$"+_+"*((?:-\\d)?\\d*)"+_+"*\$|)(?=[^-]|$)","i")},V=/[\x20\t\r\n\f]*[+~]/,Y=/^[^{]+\{\s*\[native code/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,G=/^(?:input|select|textarea|button)$/i,Q=/^h\d$/i,K=/'|\\/g,Z=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,et=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{q.call(w.documentElement.childNodes,0)[0].nodeType}catch(nt){q=function(e){var t,n=[];while(t=this[e++])n.push(t);return n}}function rt(e){return Y.test(e+"")}function it(){var e,t=[];return e=function(n,r){re turn t.push(n+=" ")>i.cacheLength&&delete e[t.shift()],e[n]=r}}function ot(e){return e[x]=!0,e}function at(e){var t=p.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function st(e,t,n,r){var i,o,a,s,u,l,f,g,m,v;if((t?t.ownerDocument||t:w)!==p&&c(t),t=t||p,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!d&&!r){if(i=J.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&y(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return H.apply(n,q.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&T.getByClassName&&t.getElementsByClassName)return H.apply(n,q.call(t.getElementsByClassName(a),0)),n}if(T.qsa&&!h.test(e)){if(f=!0,g=x,m=t,v=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){l=ft(e),(f=t.getAttribute("id"))?g=f.replace(K,"\\$&"):t.setAttribute("id",g),g="[id='"+g+"'] ",u=l.length;while(u--)l[u]=g+dt(l[u]);m =V.test(e)&&t.parentNode||t,v=l.join(",")}if(v)try{return H.apply(n,q.call(m.querySelectorAll(v),0)),n}catch(b){}finally{f||t.removeAttribute("id")}}}return wt(e.replace(W,"$1"),t,n,r)}a=st.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},c=st.setDocument=function(e){var n=e?e.ownerDocument||e:w;return n!==p&&9===n.nodeType&&n.documentElement?(p=n,f=n.documentElement,d=a(n),T.tagNameNoComments=at(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),T.attributes=at(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),T.getByClassName=at(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),T.getByName=at(function(e){e.id=x+0,e.innerHTML="<a name='"+x+"'>< /a><div name='"+x+"'></div>",f.insertBefore(e,f.firstChild);var t=n.getElementsByName&&n.getElementsByName(x).length===2+n.getElementsByName(x+0).length;return T.getIdNotName=!n.getElementById(x),f.removeChild(e),t}),i.attrHandle=at(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==A&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},T.getIdNotName?(i.find.ID=function(e,t){if(typeof t.getElementById!==A&&!d){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){return e.getAttribute("id")===t}}):(i.find.ID=function(e,n){if(typeof n.getElementById!==A&&!d){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==A&&r.getAttributeNode("id").value===e?[r]:t:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){var n=typeof e.getAttributeNode!= =A&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=T.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==A?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.NAME=T.getByName&&function(e,n){return typeof n.getElementsByName!==A?n.getElementsByName(name):t},i.find.CLASS=T.getByClassName&&function(e,n){return typeof n.getElementsByClassName===A||d?t:n.getElementsByClassName(e)},g=[],h=[":focus"],(T.qsa=rt(n.querySelectorAll))&&(at(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||h.push("\\["+_+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||h.push(":checked")}),at(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&h.push("[*^$]="+_+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").leng th||h.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),h.push(",.*:")})),(T.matchesSelector=rt(m=f.matchesSelector||f.mozMatchesSelector||f.webkitMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&at(function(e){T.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",R)}),h=RegExp(h.join("|")),g=RegExp(g.join("|")),y=rt(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},v=f.compareDocumentPosition?function(e,t){var r;return e===t?(u=!0,0):(r=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&r||e.parentNode&&11===e.parentNode.nodeType?e===n||y(w,e)?-1:t===n||y(w,t)?1:0:4&r?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l =[t];if(e===t)return u=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:0;if(o===a)return ut(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?ut(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},u=!1,[0,0].sort(v),T.detectDuplicates=u,p):p},st.matches=function(e,t){return st(e,null,null,t)},st.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Z,"='$1']"),!(!T.matchesSelector||d||g&&g.test(t)||h.test(t)))try{var n=m.call(e,t);if(n||T.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return st(t,p,null,[e]).length>0},st.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},st.attr=function(e,t){var n;return(e.ownerDocument||e)!==p&&c(e),d||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):d||T.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},st.error=function(e){throw Error("Syntax error, unrecognized expressi on: "+e)},st.uniqueSort=function(e){var t,n=[],r=1,i=0;if(u=!T.detectDuplicates,e.sort(v),u){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e};function ut(e,t){var n=t&&e,r=n&&(~t.sourceIndex||j)-(~e.sourceIndex||j);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function lt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ct(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function pt(e){return ot(function(t){return t=+t,ot(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}o=st.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=st.selectors={cacheLength:50,createPseudo:ot,match:U,find:{ },relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(et,tt),e[3]=(e[4]||e[5]||"").replace(et,tt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||st.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&st.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return U.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&z.test(n)&&(t=ft(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(et,tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[e+" "];return t||(t=RegExp("(^|"+_+")"+e+"("+_+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttr ibute!==A&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=st.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[x]||(m[x]={}),l=c[e]||[],d=l[0]===N&&l[1],f=l[0]===N&&l[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[N,d,f];break}}else if(v&&(l=(t[x]||(t[x] ={}))[e])&&l[0]===N)f=l[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[x]||(p[x]={}))[e]=[N,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||st.error("unsupported pseudo: "+e);return r[x]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?ot(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=M.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ot(function(e){var t=[],n=[],r=s(e.replace(W,"$1"));return r[x]?ot(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ot(function(e){return function(t){return st(e,t).length>0}}),contains:ot(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:ot(function(e){return X.test(e||"")||st.error("unsupported lang: "+ e),e=e.replace(et,tt).toLowerCase(),function(t){var n;do if(n=d?t.getAttribute("xml:lang")||t.getAttribute("lang"):t.lang)return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return Q.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},bu tton:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:pt(function(){return[0]}),last:pt(function(e,t){return[t-1]}),eq:pt(function(e,t,n){return[0>n?n+t:n]}),even:pt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:pt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:pt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:pt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[n]=lt(n);for(n in{submit:!0,reset:!0})i.pseudos[n]=ct(n);function ft(e,t){var n,r,o,a,s,u,l,c=E[e+" "];if(c)return t?0:c.slice(0);s=e,u=[],l=i.preFilter;while(s){(!n||(r=$.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),u.push(o=[])),n=!1,(r=I.exec(s))&&(n=r.shift(),o.push({value:n,type:r[0].replace(W," ")}),s=s.slice(n.length));for(a in i.filter)!(r=U[a].exec(s))||l[a]&&!(r=l[a](r))||(n=r.shift(),o.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?st.error(e):E(e,u).slice(0)}function dt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function ht(e,t,n){var i=t.dir,o=n&&"parentNode"===i,a=C++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,s){var u,l,c,p=N+" "+a;if(s){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[x]||(t[x]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,s)||r,l[1]===!0)return!0}}function gt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function mt(e,t,n,r,i){var o,a=[],s=0,u=e.length,l=null!=t;for(;u>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function yt(e,t,n,r,i,o){return r&&!r[x]&&(r=yt(r)) ,i&&!i[x]&&(i=yt(i,o)),ot(function(o,a,s,u){var l,c,p,f=[],d=[],h=a.length,g=o||xt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:mt(g,f,e,s,u),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,u),r){l=mt(y,d),r(l,[],s,u),c=l.length;while(c--)(p=l[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?M.call(o,p):f[c])>-1&&(o[l]=!(a[l]=p))}}else y=mt(y===a?y.splice(h,y.length):y),i?i(null,a,y,u):H.apply(a,y)})}function vt(e){var t,n,r,o=e.length,a=i.relative[e[0].type],s=a||i.relative[" "],u=a?1:0,c=ht(function(e){return e===t},s,!0),p=ht(function(e){return M.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>u;u++)if(n=i.relative[e[u].type])f=[ht(gt(f),n)];else{if(n=i.filter[e[u].type].apply(null,e[u].matches),n[x]){for(r=++u;o>r;r++)if(i.relative[e[r].type])break;return yt(u>1&&gt(f),u>1&&dt(e.slice(0,u-1)).replace(W,"$1"),n,r>u&&vt(e.slice(u,r)), o>r&&vt(e=e.slice(r)),o>r&&dt(e))}f.push(n)}return gt(f)}function bt(e,t){var n=0,o=t.length>0,a=e.length>0,s=function(s,u,c,f,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,T=l,C=s||a&&i.find.TAG("*",d&&u.parentNode||u),k=N+=null==T?1:Math.random()||.1;for(w&&(l=u!==p&&u,r=n);null!=(h=C[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,u,c)){f.push(h);break}w&&(N=k,r=++n)}o&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,o&&b!==v){g=0;while(m=t[g++])m(x,y,u,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=L.call(f));y=mt(y)}H.apply(f,y),w&&!s&&y.length>0&&v+t.length>1&&st.uniqueSort(f)}return w&&(N=k,l=T),x};return o?ot(s):s}s=st.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=ft(e)),n=t.length;while(n--)o=vt(t[n]),o[x]?r.push(o):i.push(o);o=S(e,bt(i,r))}return o};function xt(e,t,n){var r=0,i=t.length;for(;i>r;r++)st(e,t[r],n);return n}function wt(e,t,n,r){var o,a,u,l,c,p=ft(e);if(!r&&1===p.length){if(a=p[0]=p[0].slice(0),a.length>2&&"ID"===(u=a[0]).type&&9===t.nodeType&&!d&&i.relative[a[ 1].type]){if(t=i.find.ID(u.matches[0].replace(et,tt),t)[0],!t)return n;e=e.slice(a.shift().value.length)}o=U.needsContext.test(e)?0:a.length;while(o--){if(u=a[o],i.relative[l=u.type])break;if((c=i.find[l])&&(r=c(u.matches[0].replace(et,tt),V.test(a[0].type)&&t.parentNode||t))){if(a.splice(o,1),e=r.length&&dt(a),!e)return H.apply(n,q.call(r,0)),n;break}}}return s(e,p)(r,t,d,n,V.test(e)),n}i.pseudos.nth=i.pseudos.eq;function Tt(){}i.filters=Tt.prototype=i.pseudos,i.setFilters=new Tt,c(),st.attr=b.attr,b.find=st,b.expr=st.selectors,b.expr[":"]=b.expr.pseudos,b.unique=st.uniqueSort,b.text=st.getText,b.isXMLDoc=st.isXML,b.contains=st.contains}(e);var at=/Until$/,st=/^(?:parents|prev(?:Until|All))/,ut=/^.[^:#\[\.,]*$/,lt=b.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};b.fn.extend({find:function(e){var t,n,r,i=this.length;if("string"!=typeof e)return r=this,this.pushStack(b(e).filter(function(){for(t=0;i>t;t++)if(b.contains(r[t],this))return!0}));for(n=[],t=0;i>t;t++ )b.find(e,this[t],n);return n=this.pushStack(i>1?b.unique(n):n),n.selector=(this.selector?this.selector+" ":"")+e,n},has:function(e){var t,n=b(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(b.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1))},filter:function(e){return this.pushStack(ft(this,e,!0))},is:function(e){return!!e&&("string"==typeof e?lt.test(e)?b(e,this.context).index(this[0])>=0:b.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,o=[],a=lt.test(e)||"string"!=typeof e?b(e,t||this.context):0;for(;i>r;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&11!==n.nodeType){if(a?a.index(n)>-1:b.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}}return this.pushStack(o.length>1?b.unique(o):o)},index:function(e){return e?"string"==typeof e?b.inArray(this[0],b(e)):b.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?b(e,t):b.makeArray(e&&e.nodeType?[e]:e),r=b.merge(this.get(),n);return this.pushStack(b.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),b.fn.andSelf=b.fn.addBack;function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}b.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return b.dir(e,"parentNode")},parentsUntil:function(e,t,n){return b.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return b.dir(e,"nextSibling")},prevAll:function(e){return b.dir(e,"previousSibling")},nextUntil:function(e,t,n){return b.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return b.dir(e,"previousSibling",n)},siblings:function(e){return b.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return b.sibling(e.firstChild)},contents:function(e){return b.nodeName(e,"iframe")?e.contentD ocument||e.contentWindow.document:b.merge([],e.childNodes)}},function(e,t){b.fn[e]=function(n,r){var i=b.map(this,t,n);return at.test(e)||(r=n),r&&"string"==typeof r&&(i=b.filter(r,i)),i=this.length>1&&!ct[e]?b.unique(i):i,this.length>1&&st.test(e)&&(i=i.reverse()),this.pushStack(i)}}),b.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?b.find.matchesSelector(t[0],e)?[t[0]]:[]:b.find.matches(e,t)},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!b(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(t=t||0,b.isFunction(t))return b.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return b.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=b.grep(e,function(e){return 1===e.nodeType});if(ut.test(t))return b.filter(t,r,!n);t=b.filter(t,r)}return b.grep(e,function(e){retur n b.inArray(e,t)>=0===n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Nt=/^(?:checkbox|radio)$/i,Ct=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></tab le>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:b.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(o),Dt=jt.appendChild(o.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,b.fn.extend({text:function(e){return b.access(this,function(e){return e===t?b.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(b.isFunction(e))return this.each(function(t){b(this).wrapAll(e.call(this,t))});if(this[0]){var t=b(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return b.isFunction(e)?this.each(function(t){b(this).wrapInner(e.call(this,t))}):this.each(function(){var t=b(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=b .isFunction(e);return this.each(function(n){b(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){b.nodeName(this,"body")||b(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=0;for(;null!=(n=this[r]);r++)(!e||b.filter(e,[n]).length>0)&&(t||1!==n.nodeType||b.cleanData(Ot(n)),n.parentNode&&(t&&b.contains(n.ownerDocument,n)&&Mt(Ot(n,"script")),n.parentNode.removeChild(n )));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&b.cleanData(Ot(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&b.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return b.clone(this,e,t)})},html:function(e){return b.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!b.support.htmlSerialize&&mt.test(e)||!b.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(b.cleanData(Ot(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){var t=b.isFunction(e);return t||"string"==typeof e||(e=b(e).not(this).detach()),this.domManip([e],!0,function(e){var t=this.nextSibling,n=this.parentNode; n&&(b(this).remove(),n.insertBefore(e,t))})},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=f.apply([],e);var i,o,a,s,u,l,c=0,p=this.length,d=this,h=p-1,g=e[0],m=b.isFunction(g);if(m||!(1>=p||"string"!=typeof g||b.support.checkClone)&&Ct.test(g))return this.each(function(i){var o=d.eq(i);m&&(e[0]=g.call(this,i,n?o.html():t)),o.domManip(e,n,r)});if(p&&(l=b.buildFragment(e,this[0].ownerDocument,!1,this),i=l.firstChild,1===l.childNodes.length&&(l=i),i)){for(n=n&&b.nodeName(i,"tr"),s=b.map(Ot(l,"script"),Ht),a=s.length;p>c;c++)o=l,c!==h&&(o=b.clone(o,!0,!0),a&&b.merge(s,Ot(o,"script"))),r.call(n&&b.nodeName(this[c],"table")?Lt(this[c],"tbody"):this[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,b.map(s,qt),c=0;a>c;c++)o=s[c],kt.test(o.type||"")&&!b._data(o,"globalEval")&&b.contains(u,o)&&(o.src?b.ajax({url:o.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):b.globalEval((o.text||o.textContent||o.innerHTML||"").replace(St,"")));l=i=null}return thi s}});function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function Ht(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function Mt(e,t){var n,r=0;for(;null!=(n=e[r]);r++)b._data(n,"globalEval",!t||b._data(t[r],"globalEval"))}function _t(e,t){if(1===t.nodeType&&b.hasData(e)){var n,r,i,o=b._data(e),a=b._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)b.event.add(t,n,s[n][r])}a.data&&(a.data=b.extend({},a.data))}}function Ft(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!b.support.noCloneEvent&&t[b.expando]){i=b._data(t);for(r in i.events)b.removeEvent(t,r,i.handle);t.removeAttribute(b.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),b.support.html5Clone&&e.innerHTML&&!b.trim(t.innerHTML)& &(t.innerHTML=e.innerHTML)):"input"===n&&Nt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}b.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){b.fn[e]=function(e){var n,r=0,i=[],o=b(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),b(o[r])[t](n),d.apply(i,n.get());return this.pushStack(i)}});function Ot(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||b.nodeName(o,n)?s.push(o):b.merge(s,Ot(o,n));return n===t||n&&b.nodeName(e,n)?b.merge([e],s):s}function Bt(e){Nt.test(e.type)&&(e.defaultChecked=e.checked)}b.extend({clone:function(e,t,n){var r,i,o,a,s,u=b.contains(e.ownerDocument,e);if(b.supp ort.html5Clone||b.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(b.support.noCloneEvent&&b.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||b.isXMLDoc(e)))for(r=Ot(o),s=Ot(e),a=0;null!=(i=s[a]);++a)r[a]&&Ft(i,r[a]);if(t)if(n)for(s=s||Ot(e),r=r||Ot(o),a=0;null!=(i=s[a]);a++)_t(i,r[a]);else _t(e,o);return r=Ot(o,"script"),r.length>0&&Mt(r,!u&&Ot(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,u,l,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===b.type(o))b.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),u=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[u]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!b.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!b.support.tbody){o="table"!==u||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i =o&&o.childNodes.length;while(i--)b.nodeName(l=o.childNodes[i],"tbody")&&!l.childNodes.length&&o.removeChild(l) +}b.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),b.support.appendChecked||b.grep(Ot(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===b.inArray(o,r))&&(a=b.contains(o.ownerDocument,o),s=Ot(f.appendChild(o),"script"),a&&Mt(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,u=b.expando,l=b.cache,p=b.support.deleteExpando,f=b.event.special;for(;null!=(n=e[s]);s++)if((t||b.acceptData(n))&&(o=n[u],a=o&&l[o])){if(a.events)for(r in a.events)f[r]?b.event.remove(n,r):b.removeEvent(n,r,a.handle);l[o]&&(delete l[o],p?delete n[u]:typeof n.removeAttribute!==i?n.removeAttribute(u):n[u]=null,c.push(o))}}});var Pt,Rt,Wt,$t=/alpha$[^)]*$/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+x+")(.*)$","i"),Yt=RegExp("^("+x+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+x+ ")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===b.css(e,"display")||!b.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=b._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=b._data(r,"olddisplay",un(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&b._data(r,"olddisplay",i?n:b.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}b.fn.extend({css:function(e,n){return b.access(this,function(e,n,r){var i,o,a={},s=0;if(b.isArray(n)){for(o=Rt(e),i=n. length;i>s;s++)a[n[s]]=b.css(e,n[s],!1,o);return a}return r!==t?b.style(e,n,r):b.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?b(this).show():b(this).hide()})}}),b.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":b.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=b.camelCase(n),l=e.style;if(n=b.cssProps[u]||(b.cssProps[u]=tn(l,u)),s=b.cssHooks[n]||b.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(b.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||b.cssNumber[u]||(r+="px" ),b.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=b.camelCase(n);return n=b.cssProps[u]||(b.cssProps[u]=tn(e.style,u)),s=b.cssHooks[n]||b.cssHooks[u],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||b.isNumeric(o)?o||0:a):a},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s.getPropertyValue(n)||s[n]:t,l=e.style;return s&&(""!==u||b.contains(e.ownerDocument,e)||(u=b.style(e,n)),Yt.test(u)&&Ut.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):o.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle },Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),Yt.test(u)&&!zt.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=b.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=b.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=b.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=b.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=b.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(b.support.boxSizingReliable||i===e.style[t]),i=parse Float(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function un(e){var t=o,n=Gt[e];return n||(n=ln(e,t),"none"!==n&&n||(Pt=(Pt||b("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=ln(e,t),Pt.detach()),Gt[e]=n),n}function ln(e,t){var n=b(t.createElement(e)).appendTo(t.body),r=b.css(n[0],"display");return n.remove(),r}b.each(["height","width"],function(e,n){b.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(b.css(e,"display"))?b.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,i),i):0)}}}),b.support.opacity||(b.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":" "},set:function(e,t){var n=e.style,r=e.currentStyle,i=b.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===b.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),b(function(){b.support.reliableMarginRight||(b.cssHooks.marginRight={get:function(e,n){return n?b.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!b.support.pixelPosition&&b.fn.position&&b.each(["top","left"],function(e,n){b.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?b(e).position()[n]+"px":r):t}}})}),b.expr&&b.expr.filters&&(b.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!b.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||b.css(e,"display"))},b.expr.filters.visible=function(e){return!b.expr.filters.hidden(e)}),b.each({margin:"",padding:"",border:"Width"},function(e,t){b.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(b.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;b.fn.extend({serialize:function(){return b.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=b.prop(this,"elements");return e?b.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!b(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Nt.test(e))}).map(function(e,t){var n=b(this).val();return null==n?null:b.isArray(n)?b.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),b.param=function(e,n){var r,i=[],o=function(e,t){t=b.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=b.ajaxSettings&&b.ajaxSettings.traditional),b.isArra y(e)||e.jquery&&!b.isPlainObject(e))b.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(b.isArray(t))b.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==b.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}b.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){b.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),b.fn.hover=function(e,t){return this.mouseenter(e).mouseleave(t||e)};var mn,yn,vn=b.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Nn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Cn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=b.fn .load,An={},jn={},Dn="*/".concat("*");try{yn=a.href}catch(Ln){yn=o.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(w)||[];if(b.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(u){var l;return o[u]=!0,b.each(e[u]||[],function(e,u){var c=u(n,r,i);return"string"!=typeof c||a||o[c]?a?!(l=c):t:(n.dataTypes.unshift(c),s(c),!1)}),l}return s(n.dataTypes[0])||!o["*"]&&s("*")}function Mn(e,n){var r,i,o=b.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&b.extend(!0,e,r),e}b.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,u=e.indexOf(" ");return u>=0&&(i=e.slice(u,e.length),e=e.slice(0,u)),b.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&b.ajax({ url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?b("<div>").append(b.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},b.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){b.fn[t]=function(e){return this.on(t,e)}}),b.each(["get","post"],function(e,n){b[n]=function(e,r,i,o){return b.isFunction(r)&&(o=o||i,i=r,r=t),b.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),b.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Nn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":b.parseJSON,"text xml":b.parseXML} ,flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Mn(Mn(e,b.ajaxSettings),t):Mn(b.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,u,l,c,p=b.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?b(f):b.event,h=b.Deferred(),g=b.Callbacks("once memory"),m=p.statusCode||{},y={},v={},x=0,T="canceled",N={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return x||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)m[t]=[m[t],e[t]];else N.always(e[N.status]);return this},abort:function(e){var t=e||T;return l&&l.abort(t),k(0,t),this}};if(h.promise(N).complete=g.add,N.success=N.d one,N.error=N.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=b.trim(p.dataType||"*").toLowerCase().match(w)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?80:443))==(mn[3]||("http:"===mn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=b.param(p.data,p.traditional)),qn(An,p,n,N),2===x)return N;u=p.global,u&&0===b.active++&&b.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Cn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(b.lastModified[o]&&N.setRequestHeader("If-Modified-Since",b.lastModified[o]),b.etag[o]&&N.setRequestHeader("If-None-Match",b.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&N.setRequestHeader( "Content-Type",p.contentType),N.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)N.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,N,p)===!1||2===x))return N.abort();T="abort";for(i in{success:1,error:1,complete:1})N[i](p[i]);if(l=qn(jn,p,n,N)){N.readyState=1,u&&d.trigger("ajaxSend",[N,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){N.abort("timeout")},p.timeout));try{x=1,l.send(y,k)}catch(C){if(!(2>x))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,C=n;2!==x&&(x=2,s&&clearTimeout(s),l=t,a=i||"",N.readyState=e>0?4:0,r&&(w=_n(p,N,r)),e>=200&&300>e||304===e?(p.ifModified&&(T=N.getResponseHeader("Last-Modified"),T&&(b.lastModified[o]=T),T=N.getResponseHeader("etag"),T&&(b.etag[o]=T)),204===e?(c=!0,C="nocontent"):304===e?(c=!0,C="notmodified"):(c=Fn(p,w),C=c.state,y=c.data,v=c.error,c=!v)):(v=C,(e||!C)&&(C="er ror",0>e&&(e=0))),N.status=e,N.statusText=(n||C)+"",c?h.resolveWith(f,[y,C,N]):h.rejectWith(f,[N,C,v]),N.statusCode(m),m=t,u&&d.trigger(c?"ajaxSuccess":"ajaxError",[N,p,c?y:v]),g.fireWith(f,[N,C]),u&&(d.trigger("ajaxComplete",[N,p]),--b.active||b.event.trigger("ajaxStop")))}return N},getScript:function(e,n){return b.get(e,t,n,"script")},getJSON:function(e,t,n){return b.get(e,t,n,"json")}});function _n(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(s in c)s in r&&(n[c[s]]=r[s]);while("*"===l[0])l.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in u)if(u[s]&&u[s].test(o)){l.unshift(s);break}if(l[0]in r)a=l[0];else{for(s in r){if(!l[0]||e.converters[s+" "+l[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function Fn(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(i in e.converters)a[i.toLowerCase()]=e.converters[i];for(;r=u[++s];)if("*"!==r){if("*" !==l&&l!==r){if(i=a[l+" "+r]||a["* "+r],!i)for(n in a)if(o=n.split(" "),o[1]===r&&(i=a[l+" "+o[0]]||a["* "+o[0]])){i===!0?i=a[n]:a[n]!==!0&&(r=o[0],u.splice(s--,0,r));break}if(i!==!0)if(i&&e["throws"])t=i(t);else try{t=i(t)}catch(c){return{state:"parsererror",error:i?c:"No conversion from "+l+" to "+r}}}l=r}return{state:"success",data:t}}b.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return b.globalEval(e),e}}}),b.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),b.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||b("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readySta te))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var On=[],Bn=/(=)\?(?=&|$)|\?\?/;b.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=On.pop()||b.expando+"_"+vn++;return this[e]=!0,e}}),b.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return u||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=b.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||b.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,On.push(o)),s&&b.isFunction(a)&&a(s[0 ]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}b.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=b.ajaxSettings.xhr(),b.support.cors=!!Rn&&"withCredentials"in Rn,Rn=b.support.ajax=!!Rn,Rn&&b.ajaxTransport(function(n){if(!n.crossDomain||b.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data||null),r=function(e,i){var s,l,c,p;try{if(r&&(i||4===u.readyState))if(r=t,a&&(u.onreadystatechange=b.n oop,$n&&delete Pn[a]),i)4!==u.readyState&&u.abort();else{p={},s=u.status,l=u.getAllResponseHeaders(),"string"==typeof u.responseText&&(p.text=u.responseText);try{c=u.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,l)},n.async?4===u.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},b(e).unload($n)),Pn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+x+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n,r,i=this.createTween(e,t),o=Yn.exec(t),a=i.cur(),s=+a||0,u=1,l=20;if(o){if(n=+o[2],r=o[3]||(b.cssNumber[e]?"":"px"),"px"!==r&&s){s=b.css(i.elem,e,!0)||n||1;do u=u||".5",s/=u,b.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)*n:n}return i}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=b.now()}function Zn(e,t){b.each(t,function(t,n){var r=(Qn[t]||[]).concat (Qn["*"]),i=0,o=r.length;for(;o>i;i++)if(r[i].call(e,t,n))return})}function er(e,t,n){var r,i,o=0,a=Gn.length,s=b.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;for(;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:b.extend({},t),opts:b.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=b.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(tr(c,l.opts.specialEasing);a>o;o++)if(r=Gn[o].call(l,e,c,l.opts))return r;return Zn(l,c),b.isFunction(l.opts.start)&&l.opts.start.call(e,l),b.fx.tim er(b.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function tr(e,t){var n,r,i,o,a;for(i in e)if(r=b.camelCase(i),o=t[r],n=e[i],b.isArray(n)&&(o=n[1],n=e[i]=n[0]),i!==r&&(e[r]=n,delete e[i]),a=b.cssHooks[r],a&&"expand"in a){n=a.expand(n),delete e[r];for(i in n)i in e||(e[i]=n[i],t[i]=o)}else t[r]=o}b.Animation=b.extend(er,{tweener:function(e,t){b.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,u,l,c,p,f=this,d=e.style,h={},g=[],m=e.nodeType&&nn(e);n.queue||(c=b._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,p=c.empty.fire,c.empty.fire=function(){c.unqueued||p()}),c.unqueued++,f.always(function(){f.always(function(){c.unqueued--,b.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overfl ow=[d.overflow,d.overflowX,d.overflowY],"inline"===b.css(e,"display")&&"none"===b.css(e,"float")&&(b.support.inlineBlockNeedsLayout&&"inline"!==un(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",b.support.shrinkWrapBlocks||f.always(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(i in t)if(a=t[i],Vn.exec(a)){if(delete t[i],u=u||"toggle"===a,a===(m?"hide":"show"))continue;g.push(i)}if(o=g.length){s=b._data(e,"fxshow")||b._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?b(e).show():f.done(function(){b(e).hide()}),f.done(function(){var t;b._removeData(e,"fxshow");for(t in h)b.style(e,t,h[t])});for(i=0;o>i;i++)r=g[i],l=f.createTween(r,m?s[r]:0),h[r]=s[r]||b.style(e,r),r in s||(s[r]=l.start,m&&(l.end=l.start,l.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}b.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this .prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(b.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?b.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=b.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){b.fx.step[e.prop]?b.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[b.cssProps[e.prop]]||b.cssHooks[e.prop])?b.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scroll Top=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},b.each(["toggle","show","hide"],function(e,t){var n=b.fn[t];b.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),b.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=b.isEmptyObject(e),o=b.speed(t,n,r),a=function(){var t=er(this,b.extend({},e),o);a.finish=function(){t.stop(!0)},(i||b._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=b.timers,a=b._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].ele m!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&b.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=b._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=b.timers,a=r?r.length:0;for(n.finish=!0,b.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}b.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){b.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),b.speed=function(e,t,n){var r=e&&"object"==typeof e?b.extend({},e):{complete:n||!n&&t||b.isFunction(e)&&e,duration:e,easing:n&&t||t&&!b.i sFunction(t)&&t};return r.duration=b.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in b.fx.speeds?b.fx.speeds[r.duration]:b.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){b.isFunction(r.old)&&r.old.call(this),r.queue&&b.dequeue(this,r.queue)},r},b.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},b.timers=[],b.fx=rr.prototype.init,b.fx.tick=function(){var e,n=b.timers,r=0;for(Xn=b.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||b.fx.stop(),Xn=t},b.fx.timer=function(e){e()&&b.timers.push(e)&&b.fx.start()},b.fx.interval=13,b.fx.start=function(){Un||(Un=setInterval(b.fx.tick,b.fx.interval))},b.fx.stop=function(){clearInterval(Un),Un=null},b.fx.speeds={slow:600,fast:200,_default:400},b.fx.step={},b.expr&&b.expr.filters&&(b.expr.filters.animated=function(e){return b.grep(b.timers,function(t){return e===t.elem}).length}),b.fn.offset=function(e){if(arguments.leng th)return e===t?this:this.each(function(t){b.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,b.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},b.offset={setOffset:function(e,t,n){var r=b.css(e,"position");"static"===r&&(e.style.position="relative");var i=b(e),o=i.offset(),a=b.css(e,"top"),s=b.css(e,"left"),u=("absolute"===r||"fixed"===r)&&b.inArray("auto",[a,s])>-1,l={},c={},p,f;u?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),b.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(l.top=t.top-o.top+p),null!=t.left&&(l.left=t.left-o.left+f),"using"in t?t.using.call(e,l):i.css(l)}},b.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===b.css(r,"position")?t=r.getBoundingClientRect():(e=this.offse tParent(),t=this.offset(),b.nodeName(e[0],"html")||(n=e.offset()),n.top+=b.css(e[0],"borderTopWidth",!0),n.left+=b.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-b.css(r,"marginTop",!0),left:t.left-n.left-b.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||o.documentElement;while(e&&!b.nodeName(e,"html")&&"static"===b.css(e,"position"))e=e.offsetParent;return e||o.documentElement})}}),b.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);b.fn[e]=function(i){return b.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?b(a).scrollLeft():o,r?o:b(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return b.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}b.each({Height:"height",Width:"width"},function(e,n){b.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){b.fn[i]=function(i,o){var a=argu ments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return b.access(this,function(n,r,i){var o;return b.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?b.css(n,r,s):b.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=b,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return b})})(window); \ No newline at end of file diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index c681f80..c557e8b 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -143,14 +143,12 @@ sub openpage { } print <<END -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html> - <head> - <title>$title</title> - +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> + <title>$title</title> $extrahead - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> END ; if ($settings{'FX'} ne 'off') { @@ -179,7 +177,7 @@ END ; if ($settings{'SPEED'} ne 'off') { print <<END - <script type="text/javascript" src="/include/jquery-1.2.6.min.js"></script> + <script type="text/javascript" src="/include/jquery-1.9.1.min.js"></script> <script type="text/javascript"> var t_current; var t_last; @@ -278,14 +276,12 @@ sub openpagewithoutmenu { } print <<END -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html> - <head> - <title>$title</title> - - $extrahead - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> + <title>$title</title> + $extrahead END ; if ($settings{'FX'} ne 'off') { @@ -335,9 +331,14 @@ END } sub closepage () { - my $status = &connectionstatus(); - $uptime = `/usr/bin/uptime`; - + my $status = &connectionstatus(); + my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`; + $uptime =~ s/year(s|)/$Lang::tr{'year'}/; + $uptime =~ s/month(s|)/$Lang::tr{'month'}/; + $uptime =~ s/day(s|)/$Lang::tr{'day'}/; + $uptime =~ s/user(s|)/$Lang::tr{'user'}/; + $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; + print <<END </div> </div> @@ -351,12 +352,11 @@ END &showsubsubsection($menu); print <<END - </div> - </div> - - <br class="clear" /> - <div id="footer" class="fixed"> - <b>Status:</b> $status <b>Uptime:</b>$uptime + </div> + </div> + <br class="clear" /> + <div id="footer" class="fixed"> + <b>Status:</b> $status <b>Uptime:</b> $uptime END ; if ($settings{'SPEED'} ne 'off') { diff --git a/html/html/themes/ipfire/include/style.css b/html/html/themes/ipfire/include/style.css index 7529a55..2461a14 100644 --- a/html/html/themes/ipfire/include/style.css +++ b/html/html/themes/ipfire/include/style.css @@ -249,7 +249,7 @@ position: relative; { position: relative; font-size: 1.7em; -padding-bottom: 1.2em; +padding-bottom: 0.4em; } #main_inner .post ul.post_info @@ -433,3 +433,9 @@ max-width: 2.5em; position: relative; width: 100%; } + +/* FOOTER COLORIZE BANDWIDTH */ + +#rx_kbs { color: green; } + +#tx_kbs { color: red; } diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl index 4bd1ed6..eea8091 100644 --- a/html/html/themes/maniac/include/functions.pl +++ b/html/html/themes/maniac/include/functions.pl @@ -143,14 +143,12 @@ sub openpage { } print <<END -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html> - <head> - <title>$title</title> - +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> + <title>$title</title> $extrahead - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> END ; if ($settings{'FX'} ne 'off') { @@ -179,66 +177,53 @@ END ; if ($settings{'SPEED'} ne 'off') { print <<END - <script type="text/javascript" language="javascript"> - - var http_request = false; - - function LoadInetInfo(url) { - - http_request = false; - - if (window.XMLHttpRequest) { // Mozilla, Safari,... - http_request = new XMLHttpRequest(); - if (http_request.overrideMimeType) { - http_request.overrideMimeType('text/xml'); - // zu dieser Zeile siehe weiter unten - } - } else if (window.ActiveXObject) { // IE - try { - http_request = new ActiveXObject("Msxml2.XMLHTTP"); - } catch (e) { - try { - http_request = new ActiveXObject("Microsoft.XMLHTTP"); - } catch (e) {} - } - } - - if (!http_request) { - alert('Ende :( Kann keine XMLHTTP-Instanz erzeugen'); - return false; - } - http_request.onreadystatechange = DisplayInetInfo; - http_request.open('GET', url, true); - http_request.send(null); - - } - - function DisplayInetInfo() { - if (http_request.readyState == 4) { - var xmldoc = http_request.responseXML; - var root1_node = xmldoc.getElementsByTagName('rx_kbs').item(0); - var root2_node = xmldoc.getElementsByTagName('tx_kbs').item(0); - var root3_node = xmldoc.getElementsByTagName('rxb').item(0); - var root4_node = xmldoc.getElementsByTagName('txb').item(0); - - document.forms['speed'].txkb.value = root1_node.firstChild.data; - document.forms['speed'].rxkb.value = root2_node.firstChild.data; - - // document.getElementsByTagName("input")[0].style.color = "#00FF00"; - url = "/cgi-bin/speed.cgi?rxb_last=" + root3_node.firstChild.data + "&txb_last=" + root4_node.firstChild.data; - - window.setTimeout("LoadInetInfo(url)", 3000); - } - - } - </script> + <script type="text/javascript" src="/include/jquery-1.9.1.min.js"></script> + <script type="text/javascript"> + var t_current; + var t_last; + var rxb_current; + var rxb_last; + var txb_current; + var txb_last; + function refreshInetInfo() { + \$.ajax({ + url: '/cgi-bin/speed.cgi', + success: function(xml){ + t_current = new Date(); + var t_diff = t_current - t_last; + t_last = t_current; + + rxb_current = \$("rxb",xml).text(); + var rxb_diff = rxb_current - rxb_last; + rxb_last = rxb_current; + + var rx_kbs = rxb_diff/t_diff; + rx_kbs = Math.round(rx_kbs*10)/10; + + txb_current = \$("txb",xml).text(); + var txb_diff = txb_current - txb_last; + txb_last = txb_current; + + var tx_kbs = txb_diff/t_diff; + tx_kbs = Math.round(tx_kbs*10)/10; + + \$("#rx_kbs").text(rx_kbs + ' kb/s'); + \$("#tx_kbs").text(tx_kbs + ' kb/s'); + } + }); + window.setTimeout("refreshInetInfo()", 3000); + } + \$(document).ready(function(){ + refreshInetInfo(); + }); + </script> </head> - <body onLoad="LoadInetInfo('/cgi-bin/speed.cgi')"> + <body> END ; } else { -print "</head><body>";} +print "</head>\n<body>";} print <<END  @@ -291,14 +276,12 @@ sub openpagewithoutmenu { } print <<END -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html> - <head> - <title>$title</title> - - $extrahead - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> + <title>$title</title> + $extrahead END ; if ($settings{'FX'} ne 'off') { @@ -348,9 +331,14 @@ END } sub closepage () { - my $status = &connectionstatus(); - $uptime = `/usr/bin/uptime`; - + my $status = &connectionstatus(); + my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`; + $uptime =~ s/year(s|)/$Lang::tr{'year'}/; + $uptime =~ s/month(s|)/$Lang::tr{'month'}/; + $uptime =~ s/day(s|)/$Lang::tr{'day'}/; + $uptime =~ s/user(s|)/$Lang::tr{'user'}/; + $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; + print <<END </div> </div> @@ -365,20 +353,17 @@ END print <<END </div> - </div> - - <br class="clear" /> - <div id="footer" class="fixed"> - <b>Status:</b> $status <b>Uptime:</b>$uptime + <br class="clear" /> + <div id="footer" class="fixed"> + <b>Status:</b> $status <b>Uptime:</b> $uptime END ; if ($settings{'SPEED'} ne 'off') { print <<END <br /> - <form name='speed'> - <b>$Lang::tr{'bandwidth usage'}:</b> $Lang::tr{'incoming'}:<input type="text" name="rxkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:green; border: none; padding: 0; background-color: #000000; vertical-align: middle" /> - $Lang::tr{'outgoing'}: <input type="text" name="txkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:red; border: none; padding: 0; background-color: #000000; vertical-align: middle"/> - </form> + <b>$Lang::tr{'bandwidth usage'}:</b> + $Lang::tr{'incoming'}: <span id="rx_kbs"></span> $Lang::tr{'outgoing'}: <span id="tx_kbs"></span> + END ; } diff --git a/html/html/themes/maniac/include/style.css b/html/html/themes/maniac/include/style.css index 901f3f8..eca34cb 100644 --- a/html/html/themes/maniac/include/style.css +++ b/html/html/themes/maniac/include/style.css @@ -227,13 +227,13 @@ padding-top: 3.5em; { border-bottom: dotted 1px #E1E1E1; position: relative; +padding-bottom: 0.4em; } #main_inner h3 { font-size: 2.1em; padding-bottom: 0.1em; -margin-bottom: 0.8em; } #main_inner h4 @@ -253,7 +253,7 @@ position: relative; { position: relative; font-size: 1.7em; -padding-bottom: 1.2em; +padding-bottom: 0.4em; } #main_inner .post ul.post_info @@ -462,3 +462,9 @@ max-width: 2.5em; position: relative; width: 100%; } + +/* FOOTER COLORIZE BANDWIDTH */ + +#rx_kbs { color: green; } + +#tx_kbs { color: red; } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 2c01256..6275d8a 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -323,6 +323,11 @@ 'advproxy web browser' => 'Web-Browser', 'advproxy wednesday' => 'Mit', 'again' => 'Wiederholung:', +'age second' => 'Sekunde', +'age seconds' => 'Sekunden', +'age shour' => 'Std.', +'age sminute' => 'Min.', +'age ssecond' => 'Sek.', 'aktiv' => 'aktiv', 'album' => 'Album', 'alcatelusb help' => 'Um das Speedtouch-USB-Modem zu verwenden, mÃŒssen Sie die Firmware in Ihre IPFire Box hochladen. Bitte laden Sie das <b>Embedded Firmware</b> Paket von speedtouch.com herunter, entpacken es und laden dann die passende Datei fÃŒr Ihr Modem hoch: KQD6_3.xxx fÃŒr Revisionsnummern <4 oder ZZZL_3.xxx fÃŒr Rev.=4 mittels des unten angegebenen Formulars.', @@ -1896,6 +1901,8 @@ 'updxlrtr source' => 'Quelle', 'updxlrtr source checkup' => 'QuellenprÃŒfung', 'updxlrtr source checkup schedule' => 'Zeitplanung der QuellenprÃŒfung', +'updxlrtr sources' => 'Quellen', +'updxlrtr standard view' => 'Standard-Ansicht', 'updxlrtr statistics' => 'Statistik', 'updxlrtr statistics by source' => 'Statistik pro Quelle', 'updxlrtr summary' => 'Zusammenfassung', @@ -1927,7 +1934,9 @@ 'upstream password' => 'Proxy-Passwort:', 'upstream proxy host:port' => 'Vorgelagerter Proxy (hostname:port)', 'upstream username' => 'Proxy-Benutzername:', +'uptime' => 'Betriebszeit', 'uptime and users' => 'Uptime und Benutzer:', +'uptime load average' => 'Systemlast', 'url filter' => 'URL-Filter', 'urlfilter access' => 'Zugriff', 'urlfilter activity detection' => 'AktivitÃ€tserkennung', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 17b117f..75138f5 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -324,6 +324,11 @@ 'advproxy web browser' => 'Web browser', 'advproxy wednesday' => 'Wed', 'again' => 'Again:', +'age second' => 'second', +'age seconds' => 'seconds', +'age shour' => 'h', +'age sminute' => 'min', +'age ssecond' => 'sec', 'aktiv' => 'Active', 'album' => 'Album', 'alcatelusb help' => 'To utilise the Speedtouch 330 or Speedtouch USB modem you must upload the firmware to your IPFire box. Please download the <b>Embedded Firmware</b> package for SpeedTouch 330 from speedtouch.com, unzip and then upload the appropriate file for your modem : KQD6_3.xxx when Rev<4 or ZZZL_3.xxx for Rev=4 using the form below.', @@ -971,7 +976,7 @@ 'hostname not set' => 'Hostname not set.', 'hosts config added' => 'Hosts config added', 'hosts config changed' => 'Hosts config changed', -'hour' => 'Hour', +'hour' => 'hour', 'hour-graph' => 'Hour', 'hours' => 'hours', 'hours2' => 'Hours', @@ -1928,6 +1933,8 @@ 'updxlrtr source' => 'Source', 'updxlrtr source checkup' => 'Source checkup', 'updxlrtr source checkup schedule' => 'Source checkup schedule', +'updxlrtr sources' => 'Sources', +'updxlrtr standard view' => 'Standard view', 'updxlrtr statistics' => 'Statistics', 'updxlrtr statistics by source' => 'Statistics by source', 'updxlrtr summary' => 'Summary', @@ -1938,6 +1945,7 @@ 'updxlrtr update accelerator' => 'Update Accelerator', 'updxlrtr update information' => 'There is an updated version available for download. Visit <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> for more information.', 'updxlrtr update notification' => 'Update notification!', +'updxlrtr used by' => 'Used by', 'updxlrtr web proxy service required' => 'Web proxy service must be enabled to use Update Accelerator', 'updxlrtr week' => 'one week', 'updxlrtr weekly' => 'weekly', @@ -1960,7 +1968,9 @@ 'upstream password' => 'Upstream password:', 'upstream proxy host:port' => 'Upstream proxy (host:port)', 'upstream username' => 'Upstream username:', +'uptime' => 'Uptime', 'uptime and users' => 'Uptime and users:', +'uptime load average' => 'Load average', 'url filter' => 'Content Filter', 'urlfilter access' => 'Access', 'urlfilter activity detection' => 'Activity detection', diff --git a/lfs/GeoIP b/lfs/GeoIP index 7e1dc9a..040316d 100644 --- a/lfs/GeoIP +++ b/lfs/GeoIP @@ -25,7 +25,7 @@ include Config VER = 1.17 -DATVER = 05122012 +DATVER = 07052013 THISAPP = Geo-IP-PurePerl-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz $(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de -GeoIP.dat-$(DATVER).gz_MD5 = ab0f52a35128d1aced906ac4cbfbed9c +GeoIP.dat-$(DATVER).gz_MD5 = 634d72f4ffbb2de57efa468add572d38 install : $(TARGET) diff --git a/lfs/initrd b/lfs/initrd index 7403644..56e1967 100644 --- a/lfs/initrd +++ b/lfs/initrd @@ -64,6 +64,12 @@ $(TARGET) : -cd / && cpio -d -p /install/initrd < /tmp/ROOTFILES + # Copy hid and network modules + cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/hid \ + /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/ + cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/net \ + /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/ + cd /install/initrd/etc && rm -f fstab cp -aRf $(DIR_SRC)/config/install/* /install/initrd/etc/ rm -rf /install/initrd/usr/share/man diff --git a/lfs/perl-Sort-Naturally b/lfs/perl-Sort-Naturally new file mode 100644 index 0000000..30ea076 --- /dev/null +++ b/lfs/perl-Sort-Naturally @@ -0,0 +1,78 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2013 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.03 + +THISAPP = Sort-Naturally-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = fef2e36d1b1ea23ee79ec68b5872453f + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/samba b/lfs/samba index b843dcd..d8f6800 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@ include Config -VER = 3.6.12 +VER = 3.6.15 THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 46 +PAK_VER = 49 DEPS = "cups" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 430fd21a1acd26964d3ccf366df8709a +$(DL_FILE)_MD5 = d9424e9badb089bd51e6cfc752b21dfa install : $(TARGET) diff --git a/lfs/smartmontools b/lfs/smartmontools index a4ae11b..196b466 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -24,7 +24,7 @@ include Config -VER = 6.0 +VER = 6.1 THISAPP = smartmontools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5646a07f5f4bee8e2e649de8c6b7ae87 +$(DL_FILE)_MD5 = 83a3a681f8183ed858392d550ae1cca6 install : $(TARGET) diff --git a/lfs/squidclamav b/lfs/squidclamav index 8fcc3c2..86255f8 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -24,7 +24,7 @@ include Config -VER = 5.7 +VER = 5.11 THISAPP = squidclamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = squidclamav -PAK_VER = 14 +PAK_VER = 15 DEPS = "clamav" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 02207a95e2968998574e30d35e0d1f0e +$(DL_FILE)_MD5 = 87aef2eb48a41fa1e466c0174f2bac40 install : $(TARGET) diff --git a/lfs/strip b/lfs/strip index 30cb9b3..d07ff43 100644 --- a/lfs/strip +++ b/lfs/strip @@ -46,5 +46,9 @@ md5 : ############################################################################### $(TARGET) : + # Don't strip VDR binaries, because they use a weird plugin system + # which does not work when unneeded symbols get stripped from + # /usr/sbin/vdr. STRIP="/tools/bin/strip" $(DIR_SRC)/src/stripper / \ - --exclude=/usr/src --exclude=/tools + --exclude=/usr/src --exclude=/tools \ + --exclude=/usr/sbin/vdr --exclude=/usr/lib/vdr diff --git a/lfs/strongswan b/lfs/strongswan index 8e75329..b3ce846 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,10 +24,10 @@ include Config -VER = 5.0.2 +VER = 5.0.4 THISAPP = strongswan-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 77dc16443fd141f46183d3a4f60986ef +$(DL_FILE)_MD5 = 7085ac1d28dcc250096553fa51c3a4ea install : $(TARGET) @@ -75,7 +75,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.3_ipfire.patch @@ -104,5 +104,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ln -sf $(CONFIG_ROOT)/certs /etc/ipsec.d/certs ln -sf $(CONFIG_ROOT)/crls /etc/ipsec.d/crls - #@rm -rf $(DIR_APP) + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/sysbench b/lfs/sysbench new file mode 100644 index 0000000..b6e008e --- /dev/null +++ b/lfs/sysbench @@ -0,0 +1,72 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.4.12 + +THISAPP = sysbench-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = sysbench +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 3a6d54fdd3fe002328e4458206392b9d + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && touch AUTHORS NEWS + cd $(DIR_APP) && autoreconf -vfi + cd $(DIR_APP) && ./configure --prefix=/usr --without-mysql + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + rm -rvf /usr/share/doc/sysbench + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/transmission b/lfs/transmission index ab34ee3..083db58 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -24,7 +24,7 @@ include Config -VER = 2.76 +VER = 2.77 THISAPP = transmission-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = transmission -PAK_VER = 5 +PAK_VER = 6 DEPS = "libevent2" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9abbffe29ce9b5ee68a116d293c51111 +$(DL_FILE)_MD5 = 60c0e77a1852656215f7102a437b2a3d install : $(TARGET) diff --git a/lfs/vdr b/lfs/vdr index 46ea5d3..0dd2c0f 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,39 +24,44 @@ include Config -VER = 1.6.0 +VER = 2.0.1 +VDRPLUGVER = 2.0.0 THISAPP = vdr-$(VER) DL_FILE = $(THISAPP).tar.bz2 -DL_FILE1 = vdr-streamdev-20080325-http-0_4.tgz -DL_FILE2 = vdr-softdevice-0.5.0.tgz -DL_FILE3 = vidix-1.0.0.tar.bz2 -DL_FILE4 = vdr-epgsearch-0.9.24.tgz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr -PAK_VER = 5 - -DEPS = "freefont" +PAK_VER = 6 + +DEPS = "vdr_streamdev" + +MAKE_OPTIONS = \ + PREFIX=/usr \ + BINDIR=/usr/bin \ + CACHEDIR=/var/cache/vdr \ + CONFDIR=/etc/vdr \ + INCDIR=/usr/include \ + LIBDIR=/usr/lib/vdr \ + LOCDIR=/usr/share/locale \ + MANDIR=/usr/share/man \ + RESDIR=/usr/share/vdr \ + RUNDIR=/var/run \ + VARDIR=/var \ + VIDEODIR=/var/video \ + CFLAGS="$(CFLAGS)" \ + CXXFLAGS="$(CXXFLAGS)" ############################################################################### # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(DL_FILE1) $(DL_FILE2) $(DL_FILE3) $(DL_FILE4) +objects = $(DL_FILE) -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE1) = $(DL_FROM)/$(DL_FILE1) -$(DL_FILE2) = $(DL_FROM)/$(DL_FILE2) -$(DL_FILE3) = $(DL_FROM)/$(DL_FILE3) -$(DL_FILE4) = $(DL_FROM)/$(DL_FILE4) +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 76f4ebe6525a35e33313d27a3f8e80c0 -$(DL_FILE1)_MD5 = 874026c643601692077c42ee7a70b720 -$(DL_FILE2)_MD5 = e106876497db478f3b9ba4da0e5532f8 -$(DL_FILE3)_MD5 = 3471d1f385871f7e00e6e178ccdfff0b -$(DL_FILE4)_MD5 = 4f0b1d7bdc6f24478f2670769547d7db +$(DL_FILE)_MD5 = e1b7a76c57c96300829dccd39eb20e7d install : $(TARGET) @@ -90,42 +95,44 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - # Install obsolete V4L1 videodev header. - cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h - - # Accept also DVB_API_VERSION 5 - cd $(DIR_APP) && sed -i -e "s|DVB_API_VERSION != 3|& \&\& DVB_API_VERSION != 5|g" dvbdevice.h - - cd $(DIR_APP)/PLUGINS/src && tar zxf $(DIR_DL)/$(DL_FILE1) - cd $(DIR_APP)/PLUGINS/src && ln -s streamdev-0.3.3-20080325-http streamdev - cd $(DIR_APP)/PLUGINS/src && tar zxf $(DIR_DL)/$(DL_FILE2) - cd $(DIR_APP)/PLUGINS/src && ln -s softdevice-0.5.0 softdevice - cd $(DIR_APP)/PLUGINS/src/softdevice && ./configure - cd $(DIR_APP)/PLUGINS/src && tar jxf $(DIR_DL)/$(DL_FILE3) - cd $(DIR_APP)/PLUGINS/src && ln -s vidix-1.0.0 vidix - cd $(DIR_APP)/PLUGINS/src/vidix && ./configure - cd $(DIR_APP)/PLUGINS/src && tar xvf $(DIR_DL)/$(DL_FILE4) - cd $(DIR_APP)/PLUGINS/src && ln -s epgsearch-0.9.24 epgsearch - cd $(DIR_APP) && patch -Np1 -i PLUGINS/src/epgsearch/patches/MainMenuHooks-v1_0.patch - cd $(DIR_APP)/PLUGINS/src/epgsearch && sed -i '/include/a #include <langinfo.h>/' \ - epgsearch.c - cd $(DIR_APP)/PLUGINS/src/epgsearch && patch -Np1 < $(DIR_SRC)/src/patches/vdr-plugin-epgsearch-gcc44.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-1.6.0-gcc44-fixes.patch - cd $(DIR_APP) && make VIDEODIR=/var/video plugins $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make VIDEODIR=/var/video vdr $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make DFB_SUPPORT=1 FB_SUPPORT=1 VIDIX_SUPPORT=1 $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make PREFIX=. DESTDIR=/opt/vdr/ install - -mkdir -p /opt/vdr/etc - cd $(DIR_APP) && install *.conf /opt/vdr/etc/ - cp -Rvf $(DIR_SRC)/config/vdr /opt + # Compile main package. + cd $(DIR_APP) && make $(MAKE_OPTIONS) $(MAKETUNING) vdr include-dir + + # Compile bundled plugins. + #cd $(DIR_APP) && for plugin in ...; do \ + # make $(MAKETUNING) -C PLUGINS/src/$$plugin VDRDIR=$(DIR_APP) \ + # CFLAGS="$(CFLAGS) -I$(DIR_APP)/include" \ + # CXXFLAGS="$(CXXFLAGS) -I$(DIR_APP)/include" \ + # PLGCFG=$(DIR_APP)/plugins.mk all || exit 1; \ + #done + + # Install main package. + cd $(DIR_APP) && make install-bin install-dirs install-includes $(MAKE_OPTIONS) + mv -v /usr/bin/vdr /usr/sbin/vdr + + sed -e "s/VDR_PLUGIN_VERSION/$(VDRPLUGVER)/" \ + < $(DIR_SRC)/config/vdr/runvdr > /usr/sbin/runvdr + chmod 755 /usr/sbin/runvdr + + # Install configuration. + mkdir -pv /etc/vdr + mkdir -pv /etc/sysconfig/vdr-plugins.d + cd $(DIR_APP) && install -m 644 $(DIR_SRC)/config/vdr/vdr.sysconfig \ + /etc/sysconfig/vdr + cd $(DIR_APP) && install -m 644 *.conf /etc/vdr + + # Link development files. + mkdir -pv /usr/lib/vdr + cd $(DIR_APP) && cp -vf Make.global /usr/lib/vdr + ln -svf ../../include/vdr/config.h /usr/lib/vdr/config.h + ln -svf ../../include/vdr/device.h /usr/lib/vdr/device.h + + # Install start links and backup include file. ln -sf ../init.d/vdr /etc/rc.d/rc3.d/S60vdr ln -sf ../init.d/vdr /etc/rc.d/rc0.d/K40vdr ln -sf ../init.d/vdr /etc/rc.d/rc6.d/K40vdr install -v -m 644 $(DIR_SRC)/config/backup/includes/vdr \ - /var/ipfire/backup/addons/includes/vdr - - # Remove obsolete V4L1 videodev header. - rm -f /usr/include/linux/videodev.h + /var/ipfire/backup/addons/includes/vdr @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch index ead59a1..dfda864 100644 --- a/lfs/vdr_epgsearch +++ b/lfs/vdr_epgsearch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,29 +24,86 @@ include Config -VER = plugin +VER = 1.0.1.beta5 +THISAPP = vdr-epgsearch-$(VER) +DL_FILE = $(THISAPP).tgz -THISAPP = vdr_epgsearch-$(VER) -DIR_APP = $(DIR_SRC)/$(THISAPP) +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/epgsearch-$(VER) +TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr_epgsearch -PAK_VER = 5 +PAK_VER = 6 DEPS = "vdr" +VDRPLUGVER = 2.0.0 + ############################################################################### # Top-level Rules ############################################################################### +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 6e63cc29df02f48fabf6e12e1e71b2fc -install : +install : $(TARGET) -check : +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) -download : +download : $(patsubst %,$(DIR_DL)/%,$(objects)) -md5 : +md5 : $(subst %,%_MD5,$(objects)) dist: - $(PAK) + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) ############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch + + cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ + LOCALEDIR=$$(pwd)/locale all + + cd $(DIR_APP) && install -m 755 libvdr-conflictcheckonly.so \ + /usr/lib/vdr/libvdr-conflictcheckonly.so.$(VDRPLUGVER) + cd $(DIR_APP) && install -m 755 libvdr-epgsearchonly.so \ + /usr/lib/vdr/libvdr-epgsearchonly.so.$(VDRPLUGVER) + cd $(DIR_APP) && install -m 755 libvdr-epgsearch.so \ + /usr/lib/vdr/libvdr-epgsearch.so.$(VDRPLUGVER) + cd $(DIR_APP) && install -m 755 libvdr-quickepgsearch.so \ + /usr/lib/vdr/libvdr-quickepgsearch.so.$(VDRPLUGVER) + + install -m 644 \ + $(DIR_SRC)/config/vdr/plugins.d/epgsearch.conf \ + $(DIR_SRC)/config/vdr/plugins.d/epgsearchonly.conf \ + $(DIR_SRC)/config/vdr/plugins.d/conflictcheckonly.conf \ + $(DIR_SRC)/config/vdr/plugins.d/quickepgsearch.conf \ + /etc/sysconfig/vdr-plugins.d + + -mkdir -pv /etc/vdr/plugins/epgsearch/conf.d + -mkdir -pv /var/lib/vdr/data/epgsearch + + cd $(DIR_APP) && install -m 755 createcats /usr/bin/createcats + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/vdr_softdevice b/lfs/vdr_softdevice deleted file mode 100644 index c836e2e..0000000 --- a/lfs/vdr_softdevice +++ /dev/null @@ -1,52 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = plugin - -THISAPP = vdr_softdevice-$(VER) -DIR_APP = $(DIR_SRC)/$(THISAPP) -PROG = vdr_softdevice -PAK_VER = 5 - -DEPS = "vdr ffmpeg sdl alsa dfb++" - -############################################################################### -# Top-level Rules -############################################################################### - - -install : - -check : - -download : - -md5 : - -dist: - $(PAK) - -############################################################################### diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev new file mode 100644 index 0000000..59dbd04 --- /dev/null +++ b/lfs/vdr_streamdev @@ -0,0 +1,106 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.6.1 +GIT_VER = 10db11ac +THISAPP = vdr-streamdev-$(GIT_VER) +DL_FILE = $(THISAPP).tar.xz + +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = vdr_streamdev +PAK_VER = 1 + +DEPS = "vdr" + +VDRPLUGVER = 2.0.0 + +EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +CFLAGS += $(EXTRA_FLAGS) +CXXFLAGS += $(EXTRA_FLAGS) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = e5011fd1a4b0624b192911f37c6040e3 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download : $(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-streamdev_recordings-64.patch + + cd $(DIR_APP) && sed -i 's@$(VDRDIR)/device.h@/usr/include/vdr/device.h@' Makefile + cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ + LOCALEDIR=$$(pwd)/locale all + + -mkdir -pv /etc/vdr/plugins/streamdev-server /usr/lib/vdr/bin + cd $(DIR_APP) && install -m 755 server/libvdr-streamdev-server.so \ + /usr/lib/vdr/libvdr-streamdev-server.so.$(VDRPLUGVER) + ln -svf ../../svdrphosts.conf \ + /etc/vdr/plugins/streamdev-server/streamdevhosts.conf + cd $(DIR_APP) && install -m 755 streamdev-server/externremux.sh \ + /usr/lib/vdr/bin/externremux.sh + install -m 644 $(DIR_SRC)/config/vdr/plugins.d/streamdev-server.conf \ + /etc/sysconfig/vdr-plugins.d + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/vdr_vnsiserver3 b/lfs/vdr_vnsiserver3 new file mode 100644 index 0000000..73ee5e9 --- /dev/null +++ b/lfs/vdr_vnsiserver3 @@ -0,0 +1,99 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = cc03615 +THISAPP = vdr-vnsiserver3-$(VER) +DL_FILE = $(THISAPP).tar.xz + +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = vdr_vnsiserver3 +PAK_VER = 1 + +DEPS = "vdr" + +VDRPLUGVER = 2.0.0 + +EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +CFLAGS += $(EXTRA_FLAGS) +CXXFLAGS += $(EXTRA_FLAGS) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 5100b1cb1ee936f64b99a76c492fbc3f + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download : $(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ + LOCALEDIR=$$(pwd)/locale all + + -mkdir -pv /etc/vdr/plugins/vnsiserver3 + cd $(DIR_APP) && install -m 755 libvdr-vnsiserver3.so \ + /usr/lib/vdr/libvdr-vnsiserver3.so.$(VDRPLUGVER) + ln -svf ../../svdrphosts.conf /etc/vdr/plugins/vnsiserver3/allowed_hosts.conf + install -m 644 $(DIR_SRC)/config/vdr/plugins.d/vnsiserver3.conf \ + /etc/sysconfig/vdr-plugins.d + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/vdradmin b/lfs/vdradmin index 3bd788f..b38ecca 100644 --- a/lfs/vdradmin +++ b/lfs/vdradmin @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -25,7 +25,7 @@ include Config -VER = 3.6.7 +VER = 3.6.9 THISAPP = vdradmin-am-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -33,9 +33,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdradmin -PAK_VER = 4 +PAK_VER = 5 -DEPS = "perl-gettext vdr" +DEPS = "perl-gettext vdr vdr_epgsearch" ############################################################################### # Top-level Rules @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8b1b2f8bbff26cbb47e79d5b55dbd3c1 +$(DL_FILE)_MD5 = d5cd89325f5a5dca5846a905b17d0bc2 install : $(TARGET) @@ -83,8 +83,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./install-ipfire.sh install -v -m 644 $(DIR_SRC)/config/vdradmin/vdradmind.conf \ /etc/vdradmin/vdradmind.conf - mkdir /var/log/vdradmin - mkdir /var/run/vdradmin - mkdir /var/cache/vdradmin + mkdir -pv /var/log/vdradmin + mkdir -pv /var/run/vdradmin + mkdir -pv /var/cache/vdradmin @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/vlan b/lfs/vlan index 52cee41..6e862b9 100644 --- a/lfs/vlan +++ b/lfs/vlan @@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make purge vconfig cd $(DIR_APP) && install -c -p -m 0755 vconfig /sbin @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/w_scan b/lfs/w_scan index 7df4b42..a18a08a 100644 --- a/lfs/w_scan +++ b/lfs/w_scan @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = w_scan -PAK_VER = 3 +PAK_VER = 4 DEPS = "" diff --git a/make.sh b/make.sh index a8cd21e..84df80d 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.13" # Version number -CORE="67" # Core Level (Filename) -PAKFIRE_CORE="67" # Core Level (PAKFIRE) +CORE="68" # Core Level (Filename) +PAKFIRE_CORE="68" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -664,6 +664,9 @@ buildipfire() { ipfiremake faad2 ipfiremake ffmpeg ipfiremake vdr + ipfiremake vdr_streamdev + ipfiremake vdr_vnsiserver3 + ipfiremake vdr_epgsearch ipfiremake w_scan ipfiremake icecast ipfiremake icegenerator @@ -697,6 +700,7 @@ buildipfire() { ipfiremake mediatomb ipfiremake sslh ipfiremake perl-gettext + ipfiremake perl-Sort-Naturally ipfiremake vdradmin ipfiremake miau ipfiremake netsnmpd @@ -760,6 +764,7 @@ buildipfire() { ipfiremake avahi ipfiremake nginx ipfiremake sendEmail + ipfiremake sysbench echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild diff --git a/src/hwdata/pci.ids b/src/hwdata/pci.ids index 1beb52d..b2144f9 100644 --- a/src/hwdata/pci.ids +++ b/src/hwdata/pci.ids @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2012.09.06 -# Date: 2012-09-06 03:15:02 +# Version: 2013.05.04 +# Date: 2013-05-04 03:15:02 # # Maintained by Martin Mares <mj(a)ucw.cz> and other volunteers from the # PCI ID Project at http://pci-ids.ucw.cz/. @@ -21,44 +21,23 @@ # device device_name <-- single tab # subvendor subdevice subsystem_name <-- two tabs -0000 Gammagraphx, Inc. (or missing ID) -0010 Allied Telesis, Inc +0010 Allied Telesis, Inc (Wrong ID) # This is a relabelled RTL-8139 8139 AT-2500TX V3 Ethernet -001a Ascend Communications, Inc. 001c PEAK-System Technik GmbH 0001 PCAN-PCI CAN-Bus controller 001c 0004 2 Channel CAN Bus SJC1000 001c 0005 2 Channel CAN Bus SJC1000 (Optically Isolated) -0033 Paradyne corp. 003d Lockheed Martin-Marietta Corp # Real TJN ID is e159, but they got it wrong several times --mj 0059 Tiger Jet Network Inc. (Wrong ID) 0070 Hauppauge computer works Inc. - 0003 WinTV PVR-250 - 0009 WinTV PVR-150 - 0801 WinTV PVR-150 - 0807 WinTV PVR-150 - 4000 WinTV PVR-350 - 4001 WinTV PVR-250 (v1) - 4009 WinTV PVR-250 - 4800 WinTV PVR-350 - 4801 WinTV PVR-250 MCE - 4803 WinTV PVR-250 - 7444 WinTV HVR-1600 7801 WinTV HVR-1800 MCE - 8003 WinTV PVR-150 - 8801 WinTV PVR-150 - c108 WinTV-HVR-4400-HD model 1278 - c801 WinTV PVR-150 - e807 WinTV PVR-500 MCE (1st tuner) - e817 WinTV PVR-500 MCE (2nd tuner) 0071 Nebula Electronics Ltd. 0095 Silicon Image, Inc. (Wrong ID) 0680 Ultra ATA/133 IDE RAID CONTROLLER CARD # Wrong ID used in subsystem ID of the TELES.S0/PCI 2.x ISDN adapter 00a7 Teles AG (Wrong ID) -00f5 BFG Technologies, Inc. 0100 Ncipher Corp Ltd 0123 General Dynamics # 018a is not LevelOne but there is a board misprogrammed @@ -68,72 +47,28 @@ 021b Compaq Computer Corporation 8139 HNE-300 (RealTek RTL8139c) [iPaq Networking] 0270 Hauppauge computer works Inc. (Wrong ID) -0291 Davicom Semiconductor, Inc. - 8212 DM9102A(DM9102AE, SM9102AF) Ethernet 100/10 MBit(Rev 40) # SpeedStream is Efficient Networks, Inc, a Siemens Company 02ac SpeedStream 1012 1012 PCMCIA 10/100 Ethernet Card [RTL81xx] -02e0 XFX Pine Group Inc 0303 Hewlett-Packard Company (Wrong ID) -0308 ZyXEL Communications Corporation +0308 ZyXEL Communications Corporation (Wrong ID) 0315 SK-Electronics Co., Ltd. -0357 TTTech AG +0357 TTTech Computertechnik AG (Wrong ID) 000a TTP-Monitoring Card V2.0 -036f Trigem Computer Inc. -0403 Future Technology Devices International Ltd 0432 SCM Microsystems, Inc. 0001 Pluto2 DVB-T Receiver for PCMCIA [EasyWatch MobilSet] -0482 Kyocera -# vendor code used for (at a minimum) RSA cards -04b3 IBM Corp. - 4001 Remote System Administration device [RSA2] -050d Belkin -05a9 OmniVision - 8519 OV519 series -05e3 CyberDoor - 0701 CBD516 -066f SigmaTel - 3410 SMTP3410 - 3500 SMTP3500 0675 Dynalink 1700 IS64PH ISDN Adapter 1702 IS64PH ISDN Adapter 1703 ISDN Adapter (PCI Bus, DV, W) 1704 ISDN Adapter (PCI Bus, D, C) -069d Hughes Network Systems (HNS) 0721 Sapphire, Inc. 0777 Ubiquiti Networks, Inc. -# Atheros, 6th Generation, AR5414, 802.11a, 5GHz - 3005 XtremeRange5 0795 Wired Inc. 6663 Butane II (MPEG2 encoder board) 6666 MediaPress (MPEG2 encoder board) -07ca AVerMedia Technologies Inc. -# Expresscard DVB-T tuner sold by Fujitsu for notebooks - 534a Slim mobile Express DVB-T (Fujitsu) - a301 AVerTV 301 - b808 AVerTV DVB-T Volar (USB 2.0) -07d0 ITT Geospatial Systems 07d1 D-Link System Inc -07e2 ELMEG Communication Systems GmbH -0842 NPG, Personal Grand Technology -# Nee Gemplus International, SA -08e6 Gemalto NV -08ff AuthenTec - afe4 [Anchor] AF-S2 FingerLoc Sensor Module 0925 VIA Technologies, Inc. (Wrong ID) - 1234 VT82C686/A/B USB Controller -093a PixArt Imaging Inc. - 010e Innovage Mini Digital Camera - 010f SDC-300 Webcam - 020f Digital Photo Viewer - 2468 CIF Single Chip - 2600 PAC7311 - 2603 Philips Webcam SPC500NC - 2608 Maxell MaxCam RotaWeb - 2620 C3 Tech Mod. 153 -09c1 Arris - 0704 CM 200E Cable Modem 0a89 BREA Technologies Inc 0b0b Rhino Equipment Corp. 0105 Rhino R1T1 @@ -150,9 +85,6 @@ 0905 R1T3 Single T3 Digital Telephony Card 0906 RCB24FXX 24-channel modular analog telphony card 0a06 RCB672FXX 672-channel modular analog telphony card -0b3d Brontes Technologies -0ccd TerraTec Electronic GmbH - 0038 Cinergy T^2 DVB-T Receiver 0e11 Compaq Computer Corporation 0001 PCI to EISA Bridge 0002 PCI to ISA Bridge @@ -260,8 +192,6 @@ c000 Remote Insight Lights-Out Edition f130 NetFlex-3/P ThunderLAN 1.0 f150 NetFlex-3/P ThunderLAN 2.3 -0e21 Cowon Systems, Inc. -0e55 HaSoTec GmbH 0eac SHF Communication Technologies AG 0008 Ethernet Powerlink Managing Node 01 0f62 Acrox Technologies Co., Ltd. @@ -379,7 +309,21 @@ 005b MegaRAID SAS 2208 [Thunderbolt] 1000 9265 MegaRAID SAS 9265-8i 1000 9266 MegaRAID SAS 9266-8i + 1000 9267 MegaRAID SAS 9267-8i 1000 9268 MegaRAID SAS 9265CV-8i / 9270CV-8i + 1000 9269 MegaRAID SAS 9266-4i + 1000 9270 MegaRAID SAS 9270-8i + 1000 9271 MegaRAID SAS 9271-8i + 1000 9272 MegaRAID SAS 9272-8i + 1000 9273 MegaRAID SAS 9270CV-8i + 1000 9274 MegaRAID SAS 9270-4i + 1000 9275 MegaRAID SAS 9271-8iCC + 1000 9276 MegaRAID SAS 9271-4i + 1000 9285 MegaRAID SAS 9285-8e + 1000 9288 MegaRAID SAS 9285CV-8e + 1000 9290 MegaRAID SAS 9286-8e + 1000 9291 MegaRAID SAS 9286CV-8e + 1000 9295 MegaRAID SAS 9286CV-8eCC 1014 040b ServeRAID M5110 SAS/SATA Controller 1014 0412 ServeRAID M5110e SAS/SATA Controller 1028 1f2d PERC H810 Adapter @@ -614,32 +558,33 @@ 0016 PCI-MFB Analogue I/O board 0017 PROTO-3 PCI Prototyping board 9100 INI-9100/9100W SCSI Host -# nee ATI Technologies Inc. -1002 Advanced Micro Devices [AMD] nee ATI +# nee ATI Technologies, Inc. +1002 Advanced Micro Devices, Inc. [AMD/ATI] + 1304 Kaveri + 1305 Kaveri + 1306 Kaveri + 1307 Kaveri 1314 Wrestler HDMI Audio [Radeon HD 6250/6310] 174b 1001 Sapphire PURE Fusion Mini 1714 BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series] 103c 168b ProBook 4535s - 3150 M24 1P [Radeon Mobility X600] + 3150 RV380/M24 [Mobility Radeon X600] 103c 0934 nx8220 - 3151 M24 [FireMV 2400] - 3152 RV370 [Mobility Radeon X300] - 3154 M24GL [Mobility FireGL V3200] - 3171 M24 [FireMV 2400] (Secondary) - 3e50 RV380 0x3e50 [Radeon X600] - 3e54 RV380 0x3e54 [FireGL V3200] + 3151 RV380 GL [FireMV 2400] + 3152 RV370/M22 [Mobility Radeon X300] + 3154 RV380/M24 GL [Mobility FireGL V3200] + 3155 RV380 GL [FireMV 2400] + 3171 RV380 GL [FireMV 2400] (Secondary) + 3e50 RV380 [Radeon X600] + 3e54 RV380 GL [FireGL V3200] 3e70 RV380 [Radeon X600] (Secondary) - 4136 RS100 [Radeon IGP320(M)] - 4137 RS200 [Radeon IGP330/340/350] - 4144 R300 AD [Radeon 9500 Pro] - 4145 R300 AE [Radeon 9700 Pro] - 4146 R300 AF [Radeon 9700 Pro] - 4147 R300 AG [FireGL Z1/X1] - 4148 R350 AH [Radeon 9800] - 4149 R350 AI [Radeon 9800] - 414a R350 AJ [Radeon 9800] - 414b R350 AK [FireGL X2] - 4150 RV350 AP [Radeon 9600] + 4136 RS100 [Mobility IGP 320M] + 4137 RS200 [Radeon IGP 340] + 4144 R300 [Radeon 9500] + 4146 R300 [Radeon 9700 PRO] + 4147 R300 GL [FireGL Z1] + 4148 R350 [Radeon 9800/9800 SE] + 4150 RV350 [Radeon 9550/9600/X1050 Series] 1002 0002 R9600 Pro primary (Asus OEM for HP) 1002 0003 R9600 Pro secondary (Asus OEM for HP) 1002 4722 All-in-Wonder 2006 AGP Edition @@ -650,28 +595,28 @@ 174b 7c29 GC-R9600PRO [Sapphire] (Primary) 17ee 2002 Radeon 9600 256Mb Primary 18bc 0101 GC-R9600PRO (Primary) - 4151 RV350 AQ [Radeon 9600] + 4151 RV350 [Radeon 9600 Series] 1043 c004 A9600SE - 4152 RV350 AR [Radeon 9600] + 4152 RV360 [Radeon 9600/X1050 Series] 1002 0002 Radeon 9600XT 1002 4772 All-in-Wonder 9600 XT 1043 c002 Radeon 9600 XT TVD 1043 c01a A9600XT/TD + 1462 9510 RX9600XT (MS-8951) 174b 7c29 Sapphire Radeon 9600XT 1787 4002 Radeon 9600 XT - 4153 RV350 AS [Radeon 9550] + 4153 RV350 [Radeon 9550] 1043 010c A9550GE/TD 1462 932c RX9550SE-TD128 (MS-8932) - 4154 RV350 AT [FireGL T2] - 4155 RV350 AU [FireGL T2] - 4156 RV350 AV [FireGL T2] - 4157 RV350 AW [FireGL T2] + 4154 RV350 GL [FireGL T2] + 4155 RV350 [Radeon 9600] + 4157 RV350 GL [FireGL T2] 4158 68800AX [Mach32] - 4164 R300 AD [Radeon 9500 Pro] (Secondary) - 4165 R300 AE [Radeon 9700 Pro] (Secondary) - 4166 R300 AF [Radeon 9700 Pro] (Secondary) - 4168 R350 [Radeon 9800] (Secondary) - 4170 RV350 AP [Radeon 9600] (Secondary) + 4164 R300 [Radeon 9500 PRO] (Secondary) + 4165 R300 [Radeon 9700 PRO] (Secondary) + 4166 R300 [Radeon 9700 PRO] (Secondary) + 4168 RV350 [Radeon 9800 SE] (Secondary) + 4170 RV350 [Radeon 9550/9600/X1050 Series] (Secondary) 1002 0003 R9600 Pro secondary (Asus OEM for HP) 1002 4723 All-in-Wonder 2006 AGP Edition (Secondary) 1458 4025 Giga-Byte GV-R96128D (Secondary) @@ -679,26 +624,24 @@ 174b 7c28 GC-R9600PRO [Sapphire] (Secondary) 17ee 2003 Radeon 9600 256Mb (Secondary) 18bc 0100 GC-R9600PRO (Secondary) - 4171 RV350 AQ [Radeon 9600] (Secondary) + 4171 RV350 [Radeon 9600] (Secondary) 1043 c005 A9600SE (Secondary) - 4172 RV350 AR [Radeon 9600] (Secondary) + 4172 RV350 [Radeon 9600/X1050 Series] (Secondary) 1002 0003 Radeon 9600XT (Secondary) 1002 4773 All-in-Wonder 9600 XT (Secondary) 1043 c003 A9600XT (Secondary) 1043 c01b A9600XT/TD (Secondary) 174b 7c28 Sapphire Radeon 9600XT (Secondary) 1787 4003 Radeon 9600 XT (Secondary) - 4173 RV350 AS [Radeon 9550] (Secondary) + 4173 RV350 [Radeon 9550] (Secondary) 1043 010d A9550GE/TD (Secondary) - 4237 RS250 [Radeon Mobility 7000 IGP] - 4242 R200 BB [Radeon All in Wonder 8500DV] + 4242 R200 [All-In-Wonder Radeon 8500 DV] 1002 02aa Radeon 8500 AIW DV Edition - 4243 R200 BC [Radeon All in Wonder 8500] - 4336 RS100 [Radeon IGP320M] + 4336 RS100 [Radeon IGP 320M] 1002 4336 Pavilion ze4300 ATI Radeon Mobility U1 (IGP 320 M) 103c 0024 Pavilion ze4400 builtin Video 161f 2029 eMachines M5312 builtin Video - 4337 RS200 [Radeon IGP330M/340M/350M] + 4337 RS200M [Radeon IGP 330M/340M/345M/350M] 1014 053a ThinkPad R40e 103c 0850 Radeon IGP 345M 4341 IXP150 AC'97 Audio Controller @@ -709,7 +652,7 @@ 4349 Dual Channel Bus Master PCI IDE Controller 434d IXP AC'97 Modem 4353 SMBus - 4354 215CT [Mach64 CT] + 4354 215CT [Mach64 CT PCI] 4358 210888CX [Mach64 CX] 4361 IXP SB300 AC'97 Audio Controller 4363 SMBus @@ -781,6 +724,7 @@ 4381 SB400 SATA Controller (RAID 5 mode) 4382 SB600 AC97 Audio 4383 SBx00 Azalia (Intel HDA) + 1019 2120 A785GM-M 103c 1611 Pavilion DM1Z-3000 103c 280a DC5750 Microtower 1043 8230 M3A78-EH Motherboard @@ -792,6 +736,7 @@ 17f2 5000 KI690-AM2 Motherboard 4384 SBx00 PCI to PCI Bridge 4385 SBx00 SMBus Controller + 1019 2120 A785GM-M 103c 1611 Pavilion DM1Z-3000 103c 280a DC5750 Microtower 1043 82ef M3A78-EH Motherboard @@ -859,27 +804,33 @@ 4394 SB7x0/SB8x0/SB9x0 SATA Controller [AHCI mode] 4395 SB8x0/SB9x0 SATA Controller [Storage mode] 4396 SB7x0/SB8x0/SB9x0 USB EHCI Controller + 1019 2120 A785GM-M 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO 15d9 a811 H8DGU 174b 1001 Sapphire PURE Fusion Mini 4397 SB7x0/SB8x0/SB9x0 USB OHCI0 Controller + 1019 2120 A785GM-M 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO 15d9 a811 H8DGU 174b 1001 Sapphire PURE Fusion Mini 4398 SB7x0 USB OHCI1 Controller + 1019 2120 A785GM-M 1043 82ef M3A78-EH Motherboard 15d9 a811 H8DGU 4399 SB7x0/SB8x0/SB9x0 USB OHCI2 Controller + 1019 2120 A785GM-M 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO 174b 1001 Sapphire PURE Fusion Mini 439c SB7x0/SB8x0/SB9x0 IDE Controller + 1019 2120 A785GM-M 1043 82ef M3A78-EH Motherboard 439d SB7x0/SB8x0/SB9x0 LPC host controller + 1019 2120 A785GM-M 103c 1611 Pavilion DM1Z-3000 1043 82ef M3A78-EH Motherboard 1043 8443 M5A88-V EVO @@ -888,10 +839,10 @@ 43a1 SB700/SB800/SB900 PCI to PCI bridge (PCIE port 1) 43a2 SB900 PCI to PCI bridge (PCIE port 2) 43a3 SB900 PCI to PCI bridge (PCIE port 3) - 4437 RS250 [Radeon Mobility 7000 IGP] + 4437 RS250 [Mobility Radeon 7000 IGP] 4554 210888ET [Mach64 ET] 4654 Mach64 VT - 4742 3D Rage Pro AGP 1X/2X + 4742 3D Rage PRO AGP 2X 1002 0040 Rage Pro Turbo AGP 2X 1002 0044 Rage Pro Turbo AGP 2X 1002 0061 Rage Pro AIW AGP 2X @@ -907,14 +858,12 @@ 1028 c082 Rage Pro Turbo AGP 2X 8086 4152 Xpert 98D AGP 2X 8086 464a Rage Pro Turbo AGP 2X - 4744 3D Rage Pro AGP 1X + 4744 3D Rage PRO AGP 1X 1002 4744 Rage Pro Turbo AGP 8086 4d55 Rage 3D Pro AGP 1X [Intel MU440EX] - 4747 3D Rage Pro - 4749 3D Rage Pro + 4749 3D Rage PRO PCI 1002 0061 Rage Pro AIW 1002 0062 Rage Pro AIW - 474c Rage XC 474d Rage XL AGP 2X 1002 0004 Xpert 98 RXL AGP 2X 1002 0008 Xpert 98 RXL AGP 2X @@ -927,14 +876,13 @@ 474f Rage XL 1002 0008 Rage XL 1002 474f Rage XL - 4750 3D Rage Pro 215GP + 4750 3D Rage Pro PCI 1002 0040 Rage Pro Turbo 1002 0044 Rage Pro Turbo 1002 0080 Rage Pro Turbo 1002 0084 Rage Pro Turbo 1002 4750 Rage Pro Turbo - 4751 3D Rage Pro 215GQ - 4752 Rage XL + 4752 Rage XL PCI 0e11 001e Proliant Rage XL 1002 0008 Rage XL 1002 4752 Proliant Rage XL @@ -947,16 +895,18 @@ 1028 014a PowerEdge 1750 1028 0165 PowerEdge 750 103c 10e1 NetServer Rage XL + 103c 3208 ProLiant DL140 G2 107b 6400 6400 Server 1734 007a PRIMERGY RX/TX series onboard VGA + 1734 1073 Primergy Econel 200 D2020 mainboard 8086 3411 SDS2 Mainboard 8086 3427 S875WP1-E mainboard 8086 5744 S845WD1-E mainboard 4753 Rage XC 1002 4753 Rage XC - 4754 3D Rage I/II 215GT [Mach64 GT] - 4755 3D Rage II+ 215GTB [Mach64 GTB] - 4756 3D Rage IIC 215IIC [Mach64 GT IIC] + 4754 3D Rage II/II+ PCI [Mach64 GT] + 4755 3D Rage II+ PCI [Mach64 GTB] + 4756 3D Rage IIC PCI [Mach64 GT IIC] 1002 4756 Rage IIC 4757 3D Rage IIC AGP 1002 4757 Rage IIC AGP @@ -965,15 +915,13 @@ 1028 4082 Rage 3D IIC 1028 8082 Rage 3D IIC 1028 c082 Rage 3D IIC - 4758 210888GX [Mach64 GX] - 4759 3D Rage IIC + 4758 210888GX [Mach64 GX PCI] + 4759 3D Rage IIC PCI 475a 3D Rage IIC AGP 1002 0084 Rage 3D Pro AGP 2x XPERT 98 1002 0087 Rage 3D IIC 1002 475a Rage IIC AGP - 4964 RV250 Id [Radeon 9000] - 4965 RV250 Ie [Radeon 9000] - 4966 R250 If [Radeon 9000] + 4966 RV250 [Radeon 9000 Series] 10f1 0002 RV250 If [Tachyon G9000 PRO] 148c 2039 RV250 If [Radeon 9000 Pro "Evil Commando"] 1509 9a00 RV250 If [Radeon 9000 "AT009"] @@ -982,32 +930,29 @@ 174b 7192 RV250 If [Radeon 9000 "Atlantis"] 17af 2005 RV250 If [Excalibur Radeon 9000 Pro] 17af 2006 RV250 If [Excalibur Radeon 9000] - 4967 RV250 Ig [Radeon 9000] 496e RV250 [Radeon 9000] (Secondary) - 4a48 R420 JH [Radeon X800] - 4a49 R420 JI [Radeon X800PRO] - 4a4a R420 JJ [Radeon X800SE] - 4a4b R420 JK [Radeon X800] - 4a4c R420 JL [Radeon X800] - 4a4d R420 JM [FireGL X3] - 4a4e R420 JN [Mobility Radeon 9800] - 4a4f R420 [Radeon X800 AGP] - 4a50 R420 JP [Radeon X800XT] - 4a54 R420 [Radeon X800 VE] + 4a49 R420 [Radeon X800 PRO/GTO AGP] + 174b 2620 R420 [Radeon X800 GTO AGP] + 4a4a R420 [Radeon X800 GT AGP] + 4a4b R420 [Radeon X800 AGP Series] + 4a4d R420 GL [FireGL X3-256] + 4a4e RV420/M18 [Mobility Radeon 9800] + 4a4f R420 [Radeon X850 AGP] + 4a50 R420 [Radeon X800 XT Platinum Edition AGP] + 4a54 R420 [Radeon X800 VE AGP] + 1002 4422 All-In-Wonder X800 VE AGP 4a69 R420 [Radeon X800 PRO/GTO] (Secondary) 4a6a R420 [Radeon X800] (Secondary) - 4a6b R420 [Radeon X800] (Secondary) - 4a70 R420 [X800XT-PE] (Secondary) + 4a6b R420 [Radeon X800 XT AGP] (Secondary) + 4a70 R420 [Radeon X800 XT Platinum Edition AGP] (Secondary) 4a74 R420 [Radeon X800 VE] (Secondary) - 4b48 R481 [Radeon X850 PCIe] - 4b49 R480 [Radeon X850XT] - 4b4a R480 [Radeon X850SE AGP] - 4b4b R480 [Radeon X850Pro] - 4b4c R481 [Radeon X850XT-PE] - 4b69 R480 [Radeon X850XT] (Secondary) - 4b6b R480 [Radeon X850Pro] (Secondary) - 4b6c R481 [Radeon X850XT-PE] (Secondary) - 4c42 3D Rage LT Pro AGP-133 + 4b49 R481 [Radeon X850 XT AGP] + 4b4b R481 [Radeon X850 PRO AGP] + 4b4c R481 [Radeon X850 XT Platinum Edition AGP] + 4b69 R481 [Radeon X850 XT AGP] (Secondary) + 4b6b R481 [Radeon X850 PRO AGP] (Secondary) + 4b6c R481 [Radeon X850 XT Platinum Edition AGP] (Secondary) + 4c42 3D Rage LT PRO AGP 2X 0e11 b0e7 Rage LT Pro (Compaq Presario 5240) 0e11 b0e8 Rage 3D LT Pro 0e11 b10e 3D Rage LT Pro (Compaq Armada 1750) @@ -1016,19 +961,17 @@ 1002 4c42 Rage LT Pro AGP 2X 1002 8001 Rage LT Pro AGP 2X 1028 0085 Rage 3D LT Pro - 4c44 3D Rage LT Pro AGP-66 - 4c45 Rage Mobility M3 AGP - 4c46 Rage Mobility M3 AGP 2x + 4c46 Rage Mobility 128 AGP 2X/Mobility M3 1002 0155 IBM Thinkpad A22p 1014 0155 IBM Thinkpad A22p 1028 00b1 Latitude C600 - 4c47 3D Rage LT-G 215LG - 4c49 3D Rage LT Pro + 4c47 3D Rage IIC PCI / Mobility Radeon 7500/7500C + 4c49 3D Rage LT PRO PCI 1002 0004 Rage LT Pro 1002 0040 Rage LT Pro 1002 0044 Rage LT Pro 1002 4c49 Rage LT Pro - 4c4d Rage Mobility P/M AGP 2x + 4c4d Rage Mobility AGP 2x Series 0e11 b111 Armada M700 0e11 b160 Armada E500 1002 0084 Xpert 98 AGP 2X (Mobility) @@ -1037,23 +980,20 @@ 1028 00bb Latitude CPx 1179 ff00 Satellite 1715XCDS laptop 13bd 1019 PC-AR10 - 4c4e Rage Mobility L AGP 2x - 4c50 3D Rage LT Pro + 4c50 3D Rage LT PRO PCI 1002 4c50 Rage LT Pro - 4c51 3D Rage LT Pro - 4c52 Rage Mobility P/M + 4c52 Rage Mobility-M1 PCI 1033 8112 Versa Note VXi - 4c53 Rage Mobility L 4c54 264LT [Mach64 LT] - 4c57 RV200 [Mobility Radeon 7500] + 4c57 RV200/M7 [Mobility Radeon 7500] 1014 0517 ThinkPad T30 1014 0530 ThinkPad T42 2373-4WU 1028 00e6 Radeon Mobility M7 LW (Dell Inspiron 8100) 1028 012a Latitude C640 1043 1622 Mobility Radeon M7 (L3C/S) 144d c006 Radeon Mobility M7 LW in vpr Matrix 170B4 - 4c58 Radeon RV200 LX [Mobility FireGL 7800 M7] - 4c59 RV100 LY [Mobility Radeon 7000] + 4c58 RV200/M7 GL [Mobility FireGL 7800] + 4c59 RV100/M6 [Rage/Radeon Mobility Series] 0e11 b111 Evo N600c 1014 0235 ThinkPad A30/A30p (2652/2653) 1014 0239 ThinkPad X22/X23/X24 @@ -1061,66 +1001,55 @@ 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 104d 8140 PCG-Z1SP laptop 1509 1930 Medion MD9703 - 4c5a RV100 LZ [Mobility Radeon 7000] - 4c64 Radeon RV250 Ld [Radeon Mobility 9000 M9] - 4c65 Radeon RV250 Le [Radeon Mobility 9000 M9] - 4c66 Radeon RV250 [Mobility FireGL 9000] + 4c66 RV250/M9 GL [Mobility FireGL 9000/Radeon 9000] 1014 054d ThinkPad T41 - 4c67 Radeon RV250 Lg [Radeon Mobility 9000 M9] -# Secondary chip to the Lf - 4c6e Radeon RV250 Ln [Radeon Mobility 9000 M9] (Secondary) - 4d46 Rage Mobility M4 AGP - 4d4c Rage Mobility M4 AGP + 4c6e RV250/M9 [Mobility Radeon 9000] (Secondary) + 4d46 Rage Mobility 128 AGP 4X/Mobility M4 4d52 Theater 550 PRO PCI [ATI TV Wonder 550] 4d53 Theater 550 PRO PCIe - 4e44 Radeon R300 ND [Radeon 9700 Pro] + 4e44 R300 [Radeon 9700/9700 PRO] 1002 515e Radeon ES1000 1002 5965 Radeon ES1000 - 4e45 Radeon R300 NE [Radeon 9500 Pro] + 4e45 R300 [Radeon 9500 PRO/9700] 1002 0002 Radeon R300 NE [Radeon 9500 Pro] 1681 0002 Hercules 3D Prophet 9500 PRO [Radeon 9500 Pro] - 4e46 R300 NF [Radeon 9600 TX] - 4e47 Radeon R300 NG [FireGL X1] - 4e48 Radeon R350 [Radeon 9800 Pro] - 4e49 Radeon R350 [Radeon 9800] - 4e4a R360 NJ [Radeon 9800 XT] + 4e46 R300 [Radeon 9600 TX] + 4e47 R300 GL [FireGL X1] + 4e48 R350 [Radeon 9800 Series] + 4e49 R350 [Radeon 9800] + 4e4a R360 [Radeon 9800 XXL/XT] 1002 4e4a R360 [Radeon 9800 XT] - 4e4b R350 NK [FireGL X2] - 4e50 RV350 [Mobility Radeon 9600 M10] + 4e4b R350 GL [FireGL X2 AGP Pro] + 4e50 RV350/M10 [Mobility Radeon 9600 PRO Turbo] 1025 005a TravelMate 290 103c 088c NC8000 laptop 103c 0890 NC6000 laptop 144d c00c P35 notebook 1462 0311 MSI M510A 1734 1055 Amilo M1420W - 4e51 RV350 NQ [Mobility Radeon 9600] - 4e52 RV350 [Mobility Radeon 9600 M10] + 4e51 RV350 [Radeon 9550/9600/X1050 Series] + 4e52 RV350/M10 [Mobility Radeon 9500/9700 SE] 144d c00c P35 notebook - 4e53 RV350 NS [Mobility Radeon 9600] - 4e54 M10 NT [FireGL Mobility T2] - 4e56 M11 NV [FireGL Mobility T2e] - 4e64 Radeon R300 [Radeon 9700 Pro] (Secondary) - 4e65 Radeon R300 [Radeon 9500 Pro] (Secondary) + 4e54 RV350/M10 GL [Mobility FireGL T2] + 4e56 RV360/M12 [Mobility Radeon 9550] + 4e64 R300 [Radeon 9700 PRO] (Secondary) + 4e65 R300 [Radeon 9500 PRO] (Secondary) 1002 0003 Radeon R300 NE [Radeon 9500 Pro] 1681 0003 Hercules 3D Prophet 9500 PRO [Radeon 9500 Pro] (Secondary) - 4e66 RV350 NF [Radeon 9600] (Secondary) - 4e67 Radeon R300 [FireGL X1] (Secondary) - 4e68 Radeon R350 [Radeon 9800 Pro] (Secondary) - 4e69 Radeon R350 [Radeon 9800] (Secondary) - 4e6a RV350 NJ [Radeon 9800 XT] (Secondary) + 4e66 RV350 [Radeon 9600] (Secondary) + 4e67 R300 GL [FireGL X1] (Secondary) + 4e68 R350 [Radeon 9800 PRO] (Secondary) + 4e69 R350 [Radeon 9800] (Secondary) + 4e6a RV350 [Radeon 9800 XT] (Secondary) 1002 4e6a R360 [Radeon 9800 XT] (Secondary) 1002 4e71 M10 NQ [Radeon Mobility 9600] - 4e71 M10 NQ [Radeon Mobility 9600] (Secondary) + 4e71 RV350/M10 [Mobility Radeon 9600] (Secondary) 4f72 RV250 [Radeon 9000 Series] - 4f73 Radeon RV250 [Radeon 9000 Series] (Secondary) - 5041 Rage 128 PA/PRO - 5042 Rage 128 PB/PRO AGP 2x - 5043 Rage 128 PC/PRO AGP 4x - 5044 Rage 128 PD/PRO TMDS + 4f73 RV250 [Radeon 9000 Series] (Secondary) + 5044 All-In-Wonder 128 PCI 1002 0028 Rage 128 AIW 1002 0029 Rage 128 AIW - 5045 Rage 128 PE/PRO AGP 2x TMDS - 5046 Rage 128 PF/PRO AGP 4x TMDS + 5046 Rage 128 PRO AGP 4x TMDS 1002 0004 Rage Fury Pro 1002 0008 Rage Fury Pro/Xpert 2000 Pro 1002 0014 Rage Fury Pro @@ -1130,26 +1059,10 @@ 1002 0048 Rage Fury Pro 1002 2000 Rage Fury MAXX AGP 4x (TMDS) (VGA device) 1002 2001 Rage Fury MAXX AGP 4x (TMDS) (Extra device?!) - 5047 Rage 128 PG/PRO - 5048 Rage 128 PH/PRO AGP 2x - 5049 Rage 128 PI/PRO AGP 4x - 504a Rage 128 PJ/PRO TMDS - 504b Rage 128 PK/PRO AGP 2x TMDS - 504c Rage 128 PL/PRO AGP 4x TMDS - 504d Rage 128 PM/PRO - 504e Rage 128 PN/PRO AGP 2x - 504f Rage 128 PO/PRO AGP 4x - 5050 Rage 128 PP/PRO TMDS [Xpert 128] + 5050 Rage128 [Xpert 128 PCI] 1002 0008 Xpert 128 - 5051 Rage 128 PQ/PRO AGP 2x TMDS - 5052 Rage 128 PR/PRO AGP 4x TMDS - 5053 Rage 128 PS/PRO - 5054 Rage 128 PT/PRO AGP 2x - 5055 Rage 128 PU/PRO AGP 4x - 5056 Rage 128 PV/PRO TMDS - 5057 Rage 128 PW/PRO AGP 2x TMDS - 5058 Rage 128 PX/PRO AGP 4x TMDS - 5144 Radeon R100 QD [Radeon 7200] + 5052 Rage 128 PRO AGP 4X TMDS + 5144 R100 [Radeon 7200 / All-In-Wonder Radeon] 1002 0008 Radeon 7000/Radeon VE 1002 0009 Radeon 7000/Radeon 1002 000a Radeon 7000/Radeon @@ -1163,30 +1076,20 @@ 1002 028a Radeon 7000/Radeon 1002 02aa Radeon AIW 1002 053a Radeon 7000/Radeon - 5145 Radeon R100 QE - 5146 Radeon R100 QF - 5147 Radeon R100 QG - 5148 Radeon R200 QH [Radeon 8500] + 5148 R200 GL [FireGL 8800] 1002 010a FireGL 8800 64Mb 1002 0152 FireGL 8800 128Mb 1002 0162 FireGL 8700 32Mb 1002 0172 FireGL 8700 64Mb - 5149 Radeon R200 QI - 514a Radeon R200 QJ - 514b Radeon R200 QK - 514c Radeon R200 QL [Radeon 8500 LE] + 514c R200 [Radeon 8500/8500 LE] 1002 003a Radeon R200 QL [Radeon 8500 LE] 1002 013a Radeon 8500 148c 2026 R200 QL [Radeon 8500 Evil Master II Multi Display Edition] 1681 0010 Radeon 8500 [3D Prophet 8500 128Mb] 174b 7149 Radeon R200 QL [Sapphire Radeon 8500 LE] 1787 0f08 Radeon R200 QL [PowerMagic Radeon 8500] - 514d Radeon R200 QM [Radeon 9100] - 514e Radeon R200 QN [Radeon 8500LE] - 514f Radeon R200 QO [Radeon 8500LE] - 5154 R200 QT [Radeon 8500] - 5155 R200 QU [Radeon 9100] - 5157 RV200 QW [Radeon 7500] + 514d R200 [Radeon 9100] + 5157 RV200 [Radeon 7500/7500 LE] 1002 013a Radeon 7500 1002 0f2b ALL-IN-WONDER VE PCI 1002 103a Dell Optiplex GX260 @@ -1198,8 +1101,7 @@ 174b 7147 RV200 QW [Sapphire Radeon 7500LE] 174b 7161 Radeon RV200 QW [Radeon 7500 LE] 17af 0202 RV200 QW [Excalibur Radeon 7500LE] - 5158 RV200 QX [Radeon 7500] - 5159 RV100 QY [Radeon 7000/VE] + 5159 RV100 [Radeon 7000 / Radeon VE] 1002 000a Radeon 7000/Radeon VE 1002 000b Radeon 7000 1002 0038 Radeon 7000/Radeon VE @@ -1224,7 +1126,6 @@ 174b 7c28 Sapphire Radeon VE 7000 DDR 1787 0202 RV100 QY [Excalibur Radeon 7000] 17ee 1001 Radeon 7000 64MB DDR + DVI - 515a RV100 QZ [Radeon 7000/VE] 515e ES1000 1028 01bb PowerEdge 1955 Embedded ATI ES1000 1028 01df PowerEdge SC440 @@ -1240,45 +1141,32 @@ 1028 023c PowerEdge R200 Embedded ATI ES1000 103c 1304 Integrity iLO2 Advanced KVM VGA [AD307A] 15d9 8680 X7DVL-E-O motherboard + 15d9 9680 X7DBN Motherboard 8086 3476 S5000PSLSATA Server Board - 515f ES1000 - 5168 Radeon R200 Qh - 5169 Radeon R200 Qi - 516a Radeon R200 Qj - 516b Radeon R200 Qk -# This one is not in ATI documentation, but is in XFree86 source code - 516c Radeon R200 Ql - 5245 Rage 128 RE/SG + 5245 Rage 128 GL PCI 1002 0008 Xpert 128 1002 0028 Rage 128 AIW 1002 0029 Rage 128 AIW 1002 0068 Rage 128 AIW - 5246 Rage 128 RF/SG AGP + 5246 Rage Fury/Xpert 128/Xpert 2000 AGP 2x 1002 0004 Magnum/Xpert 128/Xpert 99 1002 0008 Magnum/Xpert128/X99/Xpert2000 1002 0028 Rage 128 AIW AGP 1002 0044 Rage Fury/Xpert 128/Xpert 2000 1002 0068 Rage 128 AIW AGP 1002 0448 Rage Fury - 5247 Rage 128 RG - 524b Rage 128 RK/VR - 524c Rage 128 RL/VR AGP + 524b Rage 128 VR PCI + 524c Rage 128 VR AGP 1002 0008 Xpert 99/Xpert 2000 1002 0088 Xpert 99 - 5345 Rage 128 SE/4x 5346 Rage 128 SF/4x AGP 2x 1002 0048 RAGE 128 16MB VGA TVOUT AMC PAL - 5347 Rage 128 SG/4x AGP 4x - 5348 Rage 128 SH - 534b Rage 128 SK/4x - 534c Rage 128 SL/4x AGP 2x - 534d Rage 128 SM/4x AGP 4x + 534d Rage 128 4X AGP 4x 1002 0008 Xpert 99/Xpert 2000 1002 0018 Xpert 2000 - 534e Rage 128 4x 5354 Mach 64 VT 1002 5654 Mach 64 reference - 5446 Rage 128 Pro Ultra TF + 5446 Rage 128 PRO Ultra AGP 4x 1002 0004 Rage Fury Pro 1002 0008 Rage Fury Pro/Xpert 2000 Pro 1002 0018 Rage Fury Pro/Xpert 2000 Pro @@ -1287,59 +1175,51 @@ 1002 002a Rage 128 AIW Pro AGP 1002 002b Rage 128 AIW 1002 0048 Xpert 2000 Pro - 544c Rage 128 Pro Ultra TL - 5452 Rage 128 Pro Ultra TR + 5452 Rage 128 PRO Ultra4XL VR-R AGP 1002 001c Rage 128 Pro 4XL 103c 1279 Rage 128 Pro 4XL - 5453 Rage 128 Pro Ultra TS - 5454 Rage 128 Pro Ultra TT - 5455 Rage 128 Pro Ultra TU - 5460 RV370 [Mobility Radeon X300] + 5460 RV370/M22 [Mobility Radeon X300] 1775 1100 CR11/VR11 Single Board Computer - 5461 RV370 [Mobility Radeon X300] - 5462 RV380 [Mobility Radeon X600] - 5464 RV370 [Mobility FireGL V3100] - 5548 R423 UH [Radeon X800 (PCIE)] - 5549 R423 UI [Radeon X800PRO (PCIE)] - 554a R423 UJ [Radeon X800LE (PCIE)] - 554b R423 UK [Radeon X800SE (PCIE)] - 554c R430 [Radeon X800XTP PCIe] - 554d R430 [Radeon X800 XL] (PCIe) + 5461 RV370/M22 [Mobility Radeon X300] + 5462 RV380/M24C [Mobility Radeon X600 SE] + 5464 RV370/M22 GL [Mobility FireGL V3100] + 5549 R423 [Radeon X800 GTO] + 554a R423 [Radeon X800 XT Platinum Edition] + 554b R423 [Radeon X800 GT/SE] + 1002 0302 Radeon X800 SE + 554d R430 [Radeon X800 XL] + 1002 0322 All-In-Wonder X800 XL 1458 2124 GV-R80L256V-B (AGP) - 554e R430 [Radeon X800 SE PCIe] - 554f R430 [Radeon X800 (PCIE)] - 5550 R423 [FireGL V7100] - 5551 R423 [FireGL V5100 (PCIE)] - 5552 R423 UR [FireGL V5100 (PCIE)] - 5554 R423 UT [FireGL V7100 (PCIE)] - 5555 R430 GL PRO - 5569 R423 UI [Radeon X800PRO (PCIE)] (Secondary) - 556b Radeon R423 UK (PCIE) [X800 SE] (Secondary) - 556d R430 [Radeon X800 XL] (PCIe) (Secondary) + 554e R430 [All-In-Wonder X800 GT] + 554f R430 [Radeon X800] + 5550 R423 GL [FireGL V7100] + 5551 R423 GL [FireGL V5100] + 5569 R423 [Radeon X800 PRO] (Secondary) + 556b R423 [Radeon X800 GT] (Secondary) + 556d R430 [Radeon X800 XL] (Secondary) 1458 2125 GV-R80L256V-B (AGP) - 556f R430 [Radeon X800] (PCIE) (Secondary) - 5571 R423GL-SE [FireGL V5100 (PCIE)] (Secondary) - 564a M26 [Mobility FireGL V5000] - 564b M26 [Mobility FireGL V5000] - 564f M26 [Radeon Mobility X700 XL (PCIE)] - 5652 M26 [Radeon Mobility X700] - 5653 Radeon Mobility X700 (PCIE) + 556f R430 [Radeon X800] (Secondary) + 5571 R423 GL [FireGL V5100] (Secondary) + 564b RV410/M26 GL [Mobility FireGL V5000] + 564f RV410/M26 [Mobility Radeon X700 XL] + 5652 RV410/M26 [Mobility Radeon X700] + 5653 RV410/M26 [Mobility Radeon X700] 1025 0080 Aspire 5024WLMi 103c 0940 HP Compaq NW8240 Mobile Workstation 5654 264VT [Mach64 VT] 1002 5654 Mach64VT Reference 5655 264VT3 [Mach64 VT3] 5656 264VT4 [Mach64 VT4] - 5657 Radeon X550/X700 Series (RV410) + 5657 RV410 [Radeon X550 XTX / X700] 5830 RS300 Host Bridge 5831 RS300 Host Bridge 5832 RS300 Host Bridge - 5833 Radeon 9100 IGP Host Bridge + 5833 RS300 Host Bridge 5834 RS300 [Radeon 9100 IGP] - 5835 RS300M AGP [Radeon Mobility 9100IGP] - 5838 Radeon 9100 IGP AGP Bridge - 5854 Radeon Xpress Series (RS480) - 5874 Radeon Xpress Series (RS482) + 5835 RS300M [Mobility Radeon 9100 IGP] + 5838 RS300 AGP Bridge + 5854 RS480 [Radeon Xpress 200 Series] (Secondary) + 5874 RS480 [Radeon Xpress 1150] (Secondary) 5940 RV280 [Radeon 9200 PRO] (Secondary) 17af 2021 Excalibur Radeon 9250 (Secondary) 5941 RV280 [Radeon 9200] (Secondary) @@ -1347,26 +1227,26 @@ 174b 7c12 Sapphire Radeon 9200 17af 200d Excalibur Radeon 9200 18bc 0050 GeXcube GC-R9200-C3 (Secondary) - 5944 RV280 [Radeon 9200 SE (PCI)] - 5950 RS480 Host Bridge + 5944 RV280 [Radeon 9200 SE PCI] + 5950 RS480/RS482/RS485 Host Bridge 1025 0080 Aspire 5024WLMMi 103c 280a DC5750 Microtower 103c 2a20 Pavilion t3030.de Desktop PC 103c 308b MX6125 1462 0131 MS-1013 Notebook 1462 7217 Aspire L250 - 5951 Radeon Xpress 200 (RS480/RS482/RX480/RX482) Chipset - Host bridge - 5952 RD580 [CrossFire Xpress 3200] Chipset Host Bridge - 5954 RS480 [Radeon Xpress 200G Series] + 5951 RX480/RX482 Host Bridge + 5952 RD580 Host Bridge + 5954 RS480 [Radeon Xpress 200 Series] 1002 5954 RV370 [Radeon Xpress 200G Series] - 5955 Radeon XPRESS 200M 5955 (PCIE) + 5955 RS480M [Mobility Radeon Xpress 200] 1002 5955 RS480 0x5955 [Radeon XPRESS 200M 5955 (PCIE)] 103c 308b MX6125 1462 0131 MS-1013 Notebook - 5956 RD790 Northbridge only dual slot PCI-e_GFX and HT3 K8 part - 5957 RX780/RX790 Chipset Host Bridge + 5956 RD790 Host Bridge + 5957 RX780/RX790 Host Bridge 1849 5957 A770CrossFire Motherboard - 5958 RD780 Northbridge only dual slot PCI-e_GFX and HT1 K8 part + 5958 RD780 Host Bridge 5960 RV280 [Radeon 9200 PRO] 17af 2020 Excalibur Radeon 9250 5961 RV280 [Radeon 9200] @@ -1392,12 +1272,11 @@ 17af 2012 Radeon 9200 SE Excalibur 18bc 0170 Sapphire Radeon 9200 SE 128MB Game Buster 18bc 0173 GC-R9200L(SE)-C3H [Radeon 9200 Game Buster] - 5965 RV280 [FireMV 2200 PCI] - 5969 ES1000 - 5974 RS482 [Radeon Xpress 200] + 5965 RV280 GL [FireMV 2200 PCI] + 5974 RS482/RS485 [Radeon Xpress 1100/1150] 103c 280a DC5750 Microtower 1462 7141 Aspire L250 - 5975 RS482 [Radeon Xpress 200M] + 5975 RS482M [Mobility Radeon Xpress 200] 5978 RD790 PCI to PCI bridge (external gfx0 port A) 1849 5957 A770CrossFire Motherboard 5979 RD790 PCI to PCI bridge (external gfx0 port B) @@ -1431,6 +1310,7 @@ 5a1e RD890 PCI to PCI bridge (external gfx1 port B) 5a1f RD890 PCI to PCI bridge (NB-SB link) 15d9 a811 H8DGU + 5a20 RD890S PCI Express bridge for GPP2 port 1 5a23 RD990 I/O Memory Management Unit (IOMMU) 5a33 Radeon Xpress 200 Host Bridge 5a34 RS480 PCI-X Root Port @@ -1443,12 +1323,10 @@ 5a3f RS480 PCI Bridge 1462 7217 Aspire L250 5a41 RS400 [Radeon Xpress 200] - 5a42 RS400 [Radeon Xpress 200M] - 5a43 Radeon Xpress Series (RS400) - 5a61 RC410 [Radeon Xpress 200] - 5a62 RC410 [Radeon Xpress 200M] - 5a63 Radeon Xpress Series (RC410) - 5b60 RV370 5B60 [Radeon X300 (PCIE)] + 5a42 RS400M [Radeon Xpress 200M] + 5a61 RC410 [Radeon Xpress 200/1100] + 5a62 RC410M [Mobility Radeon Xpress 200M] + 5b60 RV370 [Radeon X300] 1043 002a Extreme AX300SE-X 1043 032e Extreme AX300/TD 1458 2102 GV-RX30S128D (X300SE) @@ -1456,21 +1334,22 @@ 1462 0402 RX300SE-TD128E (MS-8940) 174b 0500 Radeon X300 (PCIE) 196d 1086 X300SE HM - 5b62 RV380 [Radeon X600 (PCIE)] - 5b63 RV370 [Radeon X550] - 5b64 RV370 5B64 [FireGL V3100 (PCIE)] - 5b65 RV370 5B65 [FireGL D1100 (PCIE)] + 5b62 RV370 [Radeon X600/X600 SE] + 5b63 RV370 [Radeon X300/X550/X1050 Series] + 5b64 RV370 GL [FireGL V3100] + 5b65 RV370 GL [FireMV 2200] 5b66 RV370X - 5b70 RV370 [Radeon X300SE] - 1462 0403 RX300SE-TD128E (MS-8940) (secondary display) - 174b 0501 Radeon X300SE - 196d 1087 X300SE HM - 5b72 RV380 [Radeon X600] - 5b73 RV370 secondary [Sapphire X550 Silent] - 5b74 RV370 5B64 [FireGL V3100 (PCIE)] (Secondary) - 5b75 RV370 5B75 [FireGL D1100 (PCIE)] (Secondary) - 5c61 M9+ 5C61 [Radeon Mobility 9200 (AGP)] - 5c63 M9+ 5C63 [Radeon Mobility 9200 (AGP)] + 5b70 RV370 [Radeon X300 SE] +# RX300SE-TD128E + 1462 0403 Radeon X300 SE 128MB DDR + 174b 0501 Sapphire Radeon X300 SE + 196d 1087 Radeon X300 SE HyperMemory + 5b72 RV380 [Radeon X300/X550/X1050 Series] (Secondary) + 5b73 RV370 [Radeon X300/X550/X1050 Series] (Secondary) + 5b74 RV370 GL [FireGL V3100] (Secondary) + 5b75 RV370 GL [FireMV 2200] (Secondary) + 5c61 RV280/M9+ [Mobility Radeon 9200 AGP] + 5c63 RV280/M9+ [Mobility Radeon 9200 AGP] 1002 5c63 Apple iBook G4 2004 144d c00c P30 notebook 5d44 RV280 [Radeon 9200 SE] (Secondary) @@ -1482,253 +1361,449 @@ 17af 2013 Radeon 9200 SE Excalibur (Secondary) 18bc 0171 Radeon 9200 SE 128MB Game Buster (Secondary) 18bc 0172 GC-R9200L(SE)-C3H [Radeon 9200 Game Buster] - 5d45 RV280 [FireMV 2200 PCI] (secondary) - 5d48 M28 [Radeon Mobility X800XT] - 5d49 M28 [Mobility FireGL V5100] - 5d4a Mobility Radeon X800 - 5d4c Radeon X850 (PCIE) - 5d4d R480 [Radeon X850XT Platinum (PCIE)] - 5d4e Radeon X850 SE (R480) (PCIE) - 5d4f R480 [Radeon X800 GTO (PCIE)] - 5d50 R480 [FireGL V7200 (PCIE)] - 5d51 R480 GL 12P - 5d52 R480 [Radeon X850XT (PCIE)] (Primary) + 5d45 RV280 GL [FireMV 2200 PCI] (Secondary) + 5d48 R423/M28 [Mobility Radeon X800 XT] + 5d49 R423/M28 GL [Mobility FireGL V5100] + 5d4a R423/M28 [Mobility Radeon X800] + 5d4d R480 [Radeon X850 XT Platinum Edition] + 5d4e R480 [Radeon X850 SE] + 5d4f R480 [Radeon X800 GTO] + 5d50 R480 GL [FireGL V7200] + 5d52 R480 [Radeon X850 XT] 1002 0b12 PowerColor X850XT PCIe (Primary) 1002 0b13 PowerColor X850XT PCIe (Secondary) - 5d57 R423 5F57 [Radeon X800XT (PCIE)] - 5d6d R480 [Radeon X850XT Platinum (PCIE)] (Secondary) - 5d6f R480 [Radeon X800 GTO (PCIE)] (Secondary) - 5d72 R480 [Radeon X850XT (PCIE)] (Secondary) - 5d77 R423 5F57 [Radeon X800XT (PCIE)] (Secondary) - 5e48 RV410 [FireGL V5000] - 5e49 RV410 [FireGL V3300] - 5e4a RV410 [Radeon X700XT] - 5e4b RV410 [Radeon X700 Pro (PCIE)] - 5e4c RV410 [Radeon X700SE] - 5e4d RV410 [Radeon X700 (PCIE)] + 5d57 R423 [Radeon X800 XT] + 5d6d R480 [Radeon X850 XT Platinum Edition] (Secondary) + 5d6f R480 [Radeon X800 GTO] (Secondary) + 5d72 R480 [Radeon X850 XT] (Secondary) + 5d77 R423 [Radeon X800 XT] (Secondary) + 5e48 RV410 GL [FireGL V5000] + 5e49 RV410 [Radeon X700 Series] + 5e4a RV410 [Radeon X700 XT] + 5e4b RV410 [Radeon X700 PRO] + 5e4c RV410 [Radeon X700 SE] + 5e4d RV410 [Radeon X700] 148c 2116 PowerColor Bravo X700 5e4f RV410 [Radeon X700] - 5e6b RV410 [Radeon X700 Pro (PCIE)] (Secondary) - 5e6d RV410 [Radeon X700 (PCIE)] (Secondary) + 1569 1e4f Radeon X550 XT + 5e6b RV410 [Radeon X700 PRO] (Secondary) + 5e6d RV410 [Radeon X700] (Secondary) 148c 2117 PowerColor Bravo X700 - 5f57 R423 [Radeon X800XT (PCIE)] + 5f57 R423 [Radeon X800 XT] + 6600 Mars [Radeon HD 8670A/8750M] + 6601 Mars [Radeon HD 8730M] + 6602 Mars + 6603 Mars + 6606 Mars XTX [Radeon HD 8790M] + 6607 Mars LE [Radeon HD 8530M] + 6610 Oland [Radeon HD 8600 Series] + 6611 Oland [Radeon HD 8500 Series] + 6613 Oland [Radeon HD 8500 Series] + 6620 Mars + 6621 Mars PRO + 6623 Mars + 6631 Oland + 6640 Saturn XT + 6641 Saturn PRO + 6649 Bonaire + 6650 Bonaire + 6651 Bonaire + 6658 Bonaire + 665c Bonaire XT [Radeon HD 7790/8770] + 1043 0452 Radeon HD 7790 DirectCU II OC +# R7790-1GD5/OC + 1462 2930 Radeon HD 7790 OC + 1462 2932 Radeon HD 8770 +# FX-779A-CDB4 / FX-779A-CDBC + 1682 3310 Radeon HD 7790 Black Edition 2 GB +# 100356OCL / 11210-01-20G + 174b e253 Radeon HD 7790 Dual-X OC + 1787 2329 Radeon HD 7790 TurboDuo + 6660 Sun XT [Radeon HD 8600M Series] + 6663 Sun PRO [Radeon HD 8500M Series] + 6667 Sun + 666f Sun LE + 6670 Hainan 6704 Cayman PRO GL [FirePro V7900] 6707 Cayman LE GL [FirePro V5900] 6718 Cayman XT [Radeon HD 6970] 6719 Cayman PRO [Radeon HD 6950] - 671d Antilles [AMD Radeon HD 6990] - 671f Cayman [Radeon HD 6900 Series] - 6720 Blackcomb [Radeon HD 6900M series] - 6738 Barts XT [Radeon HD 6800 Series] - 6739 Barts PRO [Radeon HD 6800 Series] + 671c Antilles [Radeon HD 6990] + 671d Antilles [Radeon HD 6990] + 671f Cayman CE [Radeon HD 6930] + 6720 Blackcomb [Radeon HD 6970M/6990M] + 1028 048f Radeon HD 6990M + 1028 0490 Alienware M17x R3 Radeon HD 6970M + 1028 04a4 FirePro M8900 + 1028 04ba Radeon HD 6990M + 1028 053f FirePro M8900 + 106b 0b00 Radeon HD 6970M + 1558 5102 Radeon HD 6970M + 1558 5104 Radeon HD 6990M + 1558 7201 Radeon HD 6990M + 174b e188 Radeon HD 6970M + 6724 Blackcomb [Mobility Radeon HD 6000 series] + 6725 Blackcomb [Radeon HD 6900M Series] + 6738 Barts XT [Radeon HD 6870] +# HD-687A-ZDFC + 1682 3103 Radeon HD 8670 + 1787 201a Barts XT [Radeon HD 6870 X2] + 1787 201b Barts XT [Radeon HD 6870 X2] + 6739 Barts PRO [Radeon HD 6850] 1043 03b4 EAH6850 [Radeon HD 6850] - 673e Barts LE [AMD Radeon HD 6700 Series] - 6740 Whistler XT [AMD Radeon HD 6700M Series] - 6741 Whistler [AMD Radeon HD 6600M Series] + 673e Barts LE [Radeon HD 6790] + 148c 7720 Radeon HD 7720 OEM + 6740 Whistler [Radeon HD 6730M/6770M/7690M XT] + 1028 04a3 Precision M4600 + 6741 Whistler [Radeon HD 6600M/6700M/7600M Series] 106b 00e2 MacBookPro8,2 [Core i7, 15", Late 2011] - 6742 Whistler LE [AMD Radeon HD 6625M Graphics] + 6742 Whistler LE [Radeon HD 6610M/7610M] + 1043 1d82 K53SK Laptop Radeon HD 7610M + 8086 2111 Radeon HD 6625M 6743 Whistler [Radeon E6760] - 6749 Turks [FirePro V4900] - 674a Turks [AMD FirePro V3900] - 6750 Turks [AMD Radeon HD 6570] - 6751 Turks [Radeon HD 7600A Series] - 6758 Turks [Radeon HD 6670] - 6759 Turks [Radeon HD 6570] - 675d Turks [Radeon HD 7500 Series] - 6760 Caicos [Radeon HD 6400M/7400M Series] + 6749 Turks GL [FirePro V4900] + 674a Turks GL [FirePro V3900] + 6750 Onega [Radeon HD 6650A / 7650A] + 6751 Turks XT [Radeon HD 7670A] + 6758 Turks XT [Radeon HD 6670] + 6759 Turks PRO [Radeon HD 6570] + 148c 7570 Radeon HD 7570 + 174b 7570 Radeon HD 7570 + 675d Turks PRO [Radeon HD 7570] + 675f Turks LE [Radeon HD 5570/6510/7510] + 148c 6510 Radeon HD 6510 + 174b 6510 Radeon HD 6510 + 174b 7510 Radeon HD 7510 + 1787 2012 Radeon HD 5570 2GB GDDR3 + 1787 2314 Radeon HD 5570 1GB DDR2/GDDR3 + 6760 Seymour [Radeon HD 6400M/7400M Series] 1028 04cc Vostro 3350 + 1043 84a0 Seymour XT [Radeon HD 6470M] 6761 Seymour LP [Radeon HD 6430M] 6763 Seymour [Radeon E6460] - 6770 Caicos [Radeon HD 6400 Series] - 6772 Caicos [Radeon HD 7400A Series] - 6778 Caicos [Radeon HD 7000 Series] + 6764 Seymour [Radeon HD 6400M Series] + 6765 Seymour [Radeon HD 6400M Series] + 6766 Caicos + 6767 Caicos + 6768 Caicos + 6770 Caicos [Radeon HD 6450A/7450A] + 6771 Caicos XTX [Radeon HD 8490] + 6772 Caicos [Radeon HD 7450A] + 6778 Caicos XT [Radeon HD 7470] + 1462 b493 Radeon HD 8470 OEM 6779 Caicos [Radeon HD 6450] - 174b e164 Sapphire HD 6450 1GB DDR3 - 677b Caicos [Radeon HD 7400 Series] + 148c 8450 Radeon HD 8450 OEM + 174b 7450 Radeon HD 7450 + 174b e164 Radeon HD 6450 1 GB DDR3 + 17af 8450 Radeon HD 8450 OEM + 677b Caicos PRO [Radeon HD 7450] + 6780 Tahiti XT GL [FirePro W9000] + 6784 Tahiti [ATI FirePro V (FireGL V) Graphics Adapter] + 6788 Tahiti [ATI FirePro V (FireGL V) Graphics Adapter] + 678a Tahiti PRO GL [FirePro Series] + 1002 030c FirePro W8000 + 1002 0310 FirePro S9000 + 1002 0b2a FirePro S10000 + 1028 030c FirePro W8000 + 6790 Tahiti + 6791 Tahiti + 6792 Tahiti 6798 Tahiti XT [Radeon HD 7970] - 6799 New Zealand [Radeon HD 7990] + 1002 3000 Tahiti XT2 [Radeon HD 7970 GHz Edition] + 1043 041c HD 7970 DirectCU II + 1043 0420 HD 7970 DirectCU II TOP + 1043 0444 HD 7970 DirectCU II TOP + 1043 0448 HD 7970 DirectCU II TOP + 1043 044a Tahiti XT2 [Matrix HD 7970] + 1043 044c Tahiti XT2 [Matrix HD 7970 Platinum] + 1043 9999 ARES II + 1092 3000 Tahiti XT2 [Radeon HD 7970 GHz Edition] + 1458 2261 Tahiti XT2 [Radeon HD 7970 GHz Edition OC] + 1682 3211 Double D HD 7970 Black Edition +# FX-797A-TNBC + 1682 3213 HD 7970 Black Edition + 1682 3214 Double D HD 7970 + 1787 201c HD 7970 IceQ XÂ² +# Radeon HD 7970 X2 + 1787 2317 Radeon HD 7990 + 1787 3000 Tahiti XT2 [Radeon HD 7970 GHz Edition] + 6799 New Zealand [Radeon HD 7900 Series] 679a Tahiti PRO [Radeon HD 7950] - 6800 WIMBLEDON XT [Radeon HD 7970M] - 6818 PITCAIRN [Radeon HD 7800] - 6819 PITCAIRN PRO [Radeon HD 7800 Series] - 682f Cape Verde [Radeon HD 7700M Series] - 683d Cape Verde [Radeon HD 7700 Series] - 683f Cape Verde PRO [Radeon HD 7700 Series] - 6840 Thames XT/GL [Radeon HD 7600M Series] - 6841 Thames [Radeon 7500M/7600M Series] + 1002 0b01 Radeon HD 8950 OEM + 1002 3000 Tahiti PRO2 [Radeon HD 7950 Boost] + 1462 3000 Radeon HD 8950 OEM + 679b Malta [Radeon HD 7990] + 679e Tahiti LE [Radeon HD 7870 XT] + 679f Tahiti + 6800 Wimbledon XT [Radeon HD 7970M] + 1002 0124 Radeon HD 7970M + 8086 2110 Radeon HD 7970M + 8086 2111 Radeon HD 7970M + 6801 Neptune [Radeon HD 8970M] + 1002 0124 Radeon HD 8970M + 8086 2110 Radeon HD 8970M + 8086 2111 Radeon HD 8970M + 6802 Wimbledon + 6806 Neptune + 6808 Pitcairn XT GL [FirePro W7000] + 1002 0310 FirePro S7000 + 6809 Pitcairn LE GL [FirePro W5000] + 6810 Pitcairn + 6811 Pitcairn + 6816 Pitcairn + 6817 Pitcairn + 6818 Pitcairn XT [Radeon HD 7870 GHz Edition] + 1002 0b05 Pitcairn XT [Radeon HD 8870 OEM] + 6819 Pitcairn PRO [Radeon HD 7850] + 174b e221 Sapphire Radeon HD 7850 2 GB GDDR5 DVI-I/DVI-D/HDMI/DP + 6820 Venus XTX [Radeon HD 8800M Series] + 6821 Venus XT [Radeon HD 8800M Series] + 6823 Venus PRO [Radeon HD 8800M Series] + 6824 Chelsea [Radeon HD 7700M Series] + 6825 Heathrow XT [Radeon HD 7870M] + 8086 2111 Chelsea PRO + 6826 Chelsea LP [Radeon HD 7700M Series] + 6827 Heathrow PRO [Radeon HD 7850M/8850M] + 6828 Cape Verde PRO [FirePro W600] + 6829 Cape Verde + 682b Venus LE [Radeon HD 8800M Series] + 682d Chelsea XT GL [FirePro M4000] + 682f Chelsea LP [Radeon HD 7730M] + 6830 Cape Verde [Radeon HD 7800M Series] + 6831 Cape Verde [AMD Radeon HD 7700M Series] + 6837 Cape Verde LE [Radeon HD 7730] + 1787 3000 Radeon HD 6570 + 6838 Cape Verde + 6839 Cape Verde + 683b Cape Verde [Radeon HD 7700 Series] + 683d Cape Verde XT [Radeon HD 7770 GHz Edition] + 1002 0030 Radeon HD 8760 OEM + 1019 0030 Radeon HD 8760 OEM + 103c 6890 Radeon HD 8760 OEM + 683f Cape Verde PRO [Radeon HD 7750] + 6840 Thames XT [Radeon HD 7670M] + 6841 Thames [Radeon 7550M/7570M/7650M] + 6842 Thames LE [Radeon HD 7000M Series] 6843 Thames [Radeon HD 7670M] - 6850 Lombok GL AIO [Radeon HD 7570] - 6858 Lombok [Radeon HD 7400 series] - 6889 Cypress [FirePro V7800] - 688c Cypress [AMD FireStream 9370] - 688d Cypress [AMD FireStream 9350] + 6849 Lombok [AMD Radeon HD 7400 Series] + 6880 Cypress + 6888 Cypress XT [FirePro V8800] + 6889 Cypress PRO [FirePro V7800] + 1002 0301 FirePro V7800P + 688a Cypress XT [FirePro V9800] + 1002 030c FirePro V9800P + 688c Cypress XT GL [FireStream 9370] + 688d Cypress PRO GL [FireStream 9350] 6898 Cypress XT [Radeon HD 5870] - 1462 8032 R5870 PM2D1G - 6899 Cypress PRO [Radeon HD 5800 Series] - 1043 0330 EAH5850 [Radeon HD5850] - 689b Cypress [Radeon HD 6800 Series] - 689c Hemlock [Radeon HD 5900 Series] - 689e Cypress LE [Radeon HD 5800 Series] - 68a0 Broadway XT [Mobility Radeon HD 5800 Series] - 103c 1520 Broadway XT [FirePro M7820] - 68a1 Broadway PRO [Mobility Radeon HD 5800 Series] - 68a8 Broadway [ATI Mobility Radeon HD 6800 Series] - 68a9 Juniper XT [FirePro 3D V5800] - 68b8 Juniper [Radeon HD 5700 Series] + 1002 0b00 Radeon HD 5870 Eyefinityâ¶ Edition + 106b 00d0 Radeon HD 5870 Mac Edition +# R5870-PM2D1G + 1462 8032 Radeon HD 5870 1 GB GDDR5 + 174b 6870 Radeon HD 6870 1600SP Edition + 6899 Cypress PRO [Radeon HD 5850] +# EAH5850 + 1043 0330 Radeon HD 5850 + 174b 237b Radeon HD 5850 X2 + 174b 6850 Radeon HD 6850 1440SP Edition + 689b Cypress PRO [Radeon HD 6800 Series] + 689c Hemlock [Radeon HD 5970] + 1043 0352 ARES + 689d Hemlock [Radeon HD 5970] + 689e Cypress LE [Radeon HD 5830] + 68a0 Broadway XT [Mobility Radeon HD 5870] + 1028 12ef FirePro M7820 + 103c 1520 FirePro M7820 + 68a1 Broadway PRO [Mobility Radeon HD 5850] + 106b 00cc iMac MC511 Mobility Radeon HD 5850 MXM Module + 68a8 Granville [Radeon HD 6850M/6870M] + 103c 159b Radeon HD 6850M + 68a9 Juniper XT [FirePro V5800] + 68b8 Juniper XT [Radeon HD 5770] 106b 00cf MacPro5,1 [Mac Pro 2.8GHz DDR3] - 68b9 Juniper [Radeon HD 5600/5700] - 68ba Juniper XT [AMD Radeon HD 6000 Series] - 68be Juniper [Radeon HD 5700 Series] - 68bf Juniper LE [Radeon HD 6700 Series] - 68c0 Madison [Mobility Radeon HD 5000 Series] + 68b9 Juniper LE [Radeon HD 5670 640SP Edition] + 68ba Juniper XT [Radeon HD 6770] + 68be Juniper PRO [Radeon HD 5750] + 148c 3000 Radeon HD 6750 + 68bf Juniper PRO [Radeon HD 6750] + 174b 6750 Radeon HD 6750 + 68c0 Madison [Mobility Radeon HD 5730 / 6570M] 103c 1521 Madison XT [FirePro M5800] - 68c1 Madison [Radeon HD 5000M Series] + 103c 1593 Mobility Radeon HD 6570 + 103c 1596 Mobility Radeon HD 6570 + 103c 1599 Mobility Radeon HD 6570 + 68c1 Madison [Mobility Radeon HD 5650/5750 / 6550M] 1025 033d Mobility Radeon HD 5650 1025 0347 Aspire 7740G 103c 1521 Madison Pro [FirePro M5800] - 68c7 Pinewood [Radeon HD 5570] - 68c8 FirePro V4800 - 68d8 Redwood [Radeon HD 5670] - 68d9 Redwood PRO [Radeon HD 5500 Series] - 68da Redwood PRO [Radeon HD 5500 Series] - 68e0 Manhattan [Mobility Radeon HD 5400 Series] + 68c7 Madison [Mobility Radeon HD 5570/6550A] + 68c8 Redwood XT GL [FirePro V4800] + 68c9 Redwood PRO GL [FirePro V3800] + 68d8 Redwood XT [Radeon HD 5670] + 1787 3000 Radeon HD 5730 + 68d9 Redwood PRO [Radeon HD 5570] + 148c 3000 Radeon HD 6510 + 148c 3001 Radeon HD 6610 + 68da Redwood LE [Radeon HD 5550] + 148c 3000 Radeon HD 6390 + 148c 3001 Radeon HD 6490 + 68de Redwood + 68e0 Park [Mobility Radeon HD 5430/5450/5470] 103c 1486 TouchSmart tm2-2050er discrete GPU (Mobility Radeon HD 5450) - 68e1 Manhattan [Mobility Radeon HD 5430 Series] - 68e4 Robson CE [AMD Radeon HD 6300 Series] - 68e5 Robson LE [AMD Radeon HD 6300M Series] - 68f1 Cedar [FirePro 2460] - 68f2 Cedar [FirePro 2270] - 68f9 Cedar PRO [Radeon HD 5450/6350] + 68e1 Park [Mobility Radeon HD 5430] + 148c 7350 Caicos [Radeon HD 7350] + 1545 5450 Caicos [Radeon HD 5450] + 174b 5470 Caicos [Radeon HD 5470] + 174b 6350 Caicos [Radeon HD 6350] + 17af 3015 Caicos [Radeon HD 7350] + 17af 8350 Caicos [Radeon HD 8350 OEM] + 68e4 Robson CE [Radeon HD 6370M/7370M] + 68e5 Robson LE [Radeon HD 6330M] + 148c 7350 Radeon HD 7350 + 68e8 Cedar + 68e9 Cedar [ATI FirePro (FireGL) Graphics Adapter] + 68f1 Cedar GL [FirePro 2460] + 68f2 Cedar GL [FirePro 2270] + 68f8 Cedar [Radeon HD 7300 Series] + 68f9 Cedar [Radeon HD 5000/6000/7350 Series] + 1019 0001 Radeon HD 5450 + 1019 0019 Radeon HD 6350 1028 010e XPS 8300 - 68fa EG Cedar [Radeon HD 7300 Series] - 700f PCI Bridge [IGP 320M] - 7010 PCI Bridge [IGP 340M] - 7100 R520 [Radeon X1800] - 7102 M58 [Radeon Mobility X1800] - 7103 M58 [Mobility FireGL V7200] - 7104 R520GL [FireGL V7200] (Primary) - 7105 R520 [FireGL] - 7106 M58 [Mobility FireGL V7100] - 7108 M58 [Radeon Mobility X1800] - 7109 R520 [Radeon X1800] + 1043 03c2 EAH5450 SILENT/DI/512MD2 (LP) + 148c 3001 Radeon HD 5530/6250 + 148c 3002 Radeon HD 6290 + 148c 3003 Radeon HD 6230 + 148c 3004 Radeon HD 6350 + 148c 7350 Radeon HD 7350 + 174b 5470 Radeon HD 5470 + 174b 5490 Radeon HD 5490 + 174b 5530 Radeon HD 5530 + 174b 7350 Radeon HD 7350 + 68fa Cedar [Radeon HD 7350] + 17af 3015 Radeon HD 7350 + 68fe Cedar LE + 700f RS100 AGP Bridge + 7010 RS200/RS250 AGP Bridge + 7100 R520 [Radeon X1800 XT] + 7101 R520/M58 [Mobility Radeon X1800 XT] + 7102 R520/M58 [Mobility Radeon X1800] + 7104 R520 GL [FireGL V7200] + 7109 R520 [Radeon X1800 XL] 1002 0322 All-in-Wonder X1800XL 1002 0d02 Radeon X1800 CrossFire Edition - 710a R520 [Radeon X1800] - 710b R520 [Radeon X1800] - 710c R520 [Radeon X1800] + 710a R520 [Radeon X1800 GTO] + 1002 0b12 Radeon X1800 GTOÂ² + 710b R520 [Radeon X1800 GTO] 7120 R520 [Radeon X1800] (Secondary) - 7124 R520GL [FireGL V7200] (Secondary) + 7124 R520 GL [FireGL V7200] (Secondary) 7129 R520 [Radeon X1800] (Secondary) - 1002 0323 All-in-Wonder X1800XL (Secondary) + 1002 0323 All-In-Wonder X1800 XL (Secondary) 1002 0d03 Radeon X1800 CrossFire Edition (Secondary) - 7140 RV515 [Radeon X1600] + 7140 RV515 [Radeon X1300/X1550/X1600 Series] 7142 RV515 PRO [Radeon X1300/X1550 Series] 1002 0322 All-in-Wonder 2006 PCI-E Edition 1043 0142 EAX1300PRO/TD/256M - 7143 RV505 [Radeon X1550 Series] - 7145 Radeon Mobility X1400 + 7143 RV505 [Radeon X1300/X1550 Series] + 7145 RV515/M54 [Mobility Radeon X1400] 17aa 2006 Thinkpad T60 model 2007 - 7146 RV515 [Radeon X1300] + 7146 RV515 [Radeon X1300/X1550] 1002 0322 All-in-Wonder 2006 PCI-E Edition 1545 1996 Radeon X1300 512MB PCI-e 7147 RV505 [Radeon X1550 64-bit] - 7149 M52 [Mobility Radeon X1300] - 714a M52 [Mobility Radeon X1300] - 714b M52 [Mobility Radeon X1300] - 714c M52 [Mobility Radeon X1300] - 714d RV515 [Radeon X1300] - 714e RV515LE [Radeon X1300] - 7152 RV515GL [FireGL V3300] (Primary) - 7153 RV515GL [FireGL V3350] - 715e RV515 [Radeon X1300] + 7149 RV515/M52 [Mobility Radeon X1300] + 714a RV515/M52 [Mobility Radeon X1300] + 7152 RV515 GL [FireGL V3300] + 7153 RV515 GL [FireGL V3350] 715f RV505 CE [Radeon X1550 64-bit] 7162 RV515 PRO [Radeon X1300/X1550 Series] (Secondary) 1002 0323 All-in-Wonder 2006 PCI-E Edition (Secondary) 7163 RV505 [Radeon X1550 Series] (Secondary) - 7166 RV515 [Radeon X1300] (Secondary) + 7166 RV515 [Radeon X1300/X1550 Series] (Secondary) 1002 0323 All-in-Wonder 2006 PCI-E Edition (Secondary) 1545 1997 Radeon X1300 512MB PCI-e (Secondary) 7167 RV515 [Radeon X1550 64-bit] (Secondary) - 716e RV515LE [Radeon X1300] Secondary - 7172 RV515GL [FireGL V3300] (Secondary) - 7173 RV515GL [FireGL V3350] (Secondary) - 7180 RV516 [Radeon X1300/X1550 Series] - 7181 RV516 XT Radeon X1600 Series (Primary) + 7172 RV515 GL [FireGL V3300] (Secondary) + 7173 RV515 GL [FireGL V3350] (Secondary) + 7181 RV516 [Radeon X1600/X1650 Series] 7183 RV516 [Radeon X1300/X1550 Series] - 7186 RV515 [Radeon Mobility X1450] + 7186 RV516/M64 [Mobility Radeon X1450] 7187 RV516 [Radeon X1300/X1550 Series] - 7188 M64-S [Mobility Radeon X2300] + 7188 RV516/M64-S [Mobility Radeon X2300] 103c 30c1 6910p - 718a Mobility Radeon X2300 - 718c M62CSP64 [Mobility Radeon X1350] - 718d M64CSP128 [Mobility Radeon X1450] + 718a RV516/M64 [Mobility Radeon X2300] + 718b RV516/M62 [Mobility Radeon X1350] + 718c RV516/M62-CSP64 [Mobility Radeon X1350] + 718d RV516/M64-CSP128 [Mobility Radeon X1450] 7193 RV516 [Radeon X1550 Series] - 7196 RV516 [Mobility Radeon X1350] - 719b FireMV 2250 - 719f RV516LE [Radeon X1550 64-bit] + 7196 RV516/M62-S [Mobility Radeon X1350] + 719b RV516 GL [FireMV 2250] + 719f RV516 [Radeon X1550 Series] 71a0 RV516 [Radeon X1300/X1550 Series] (Secondary) - 71a1 RV516 XT Radeon X1600 Series (Secondary) - 71a3 RV516 [Radeon X1300 Pro] (Secondary) + 71a1 RV516 [Radeon X1600/X1650 Series] (Secondary) + 71a3 RV516 [Radeon X1300/X1550 Series] (Secondary) 71a7 RV516 [Radeon X1300/X1550 Series] (Secondary) - 71bb FireMV 2250 (Secondary) - 71c0 RV530 [Radeon X1600] - 71c1 Radeon X1650 Pro - 71c2 RV530 [Radeon X1600] - 71c4 M56GL [Mobility FireGL V5200] + 71bb RV516 GL [FireMV 2250] (Secondary) + 71c0 RV530 [Radeon X1600 XT/X1650 GTO] + 1002 e160 Radeon X1650 GTO + 174b e160 Radeon X1650 GTO + 71c1 RV535 [Radeon X1650 PRO] + 174b 0880 Radeon X1700 FSC + 71c2 RV530 [Radeon X1600 PRO] + 71c4 RV530/M56 GL [Mobility FireGL V5200] 17aa 2007 ThinkPad T60p - 71c5 M56P [Radeon Mobility X1600] + 71c5 RV530/M56-P [Mobility Radeon X1600] 103c 309f Compaq nx9420 Notebook 103c 30a3 Compaq NW8440 1043 10b2 A6J-Q008 106b 0080 MacBook Pro 71c6 RV530LE [Radeon X1600/X1650 PRO] - 71c7 RV535 [Radeon X1650 Series] - 71ce RV530LE [Radeon X1600] - 71d2 RV530GL [FireGL V3400] - 71d4 M66GL [ATI Mobility FireGL V5250] - 71d5 M66-P [Mobility Radeon X1700] - 71d6 M66-XT [Mobility Radeon X1700] - 71de RV530LE [Radeon X1600] + 71c7 RV535 [Radeon X1650 PRO] + 1787 3000 PowerColor X1650 PRO AGP + 71ce RV530 [Radeon X1300 XT/X1600 PRO] + 71d2 RV530 GL [FireGL V3400] + 71d4 RV530/M66 GL [Mobility FireGL V5250] + 71d5 RV530/M66-P [Mobility Radeon X1700] + 71d6 RV530/M66-XT [Mobility Radeon X1700] + 71de RV530/M66 [Mobility Radeon X1700/X2500] 71e0 RV530 [Radeon X1600] (Secondary) - 71e1 Radeon X1650 Pro (Secondary) + 174b e161 Radeon X1600 GTO (Secondary) + 71e1 RV535 [Radeon X1650 PRO] (Secondary) + 174b 0881 Radeon X1700 FSC (Secondary) 71e2 RV530 [Radeon X1600] (Secondary) - 71e6 RV530LE [Radeon X1650 PRO] (Secondary) - 71e7 RV535 [Radeon X1650 Series] - 71f2 RV530GL [FireGL V3400 (Secondary)] - 7210 M71 [Mobility Radeon X2100] - 7211 M71 [Mobility Radeon X2100] (Secondary) - 7240 R580 [Radeon X1900] - 7241 R580 [Radeon X1900] - 7242 R580 [Radeon X1900] - 7243 R580 [Radeon X1900] - 7244 R580 [Radeon X1900] - 7245 R580 [Radeon X1900] - 7246 R580 [Radeon X1900] - 7247 R580 [Radeon X1900] - 7248 R580 [Radeon X1900] - 7249 R580 [Radeon X1900 XT] (Primary) - 724a R580 [Radeon X1900] - 724b R580 [Radeon X1900] + 71e6 RV530 [Radeon X1650] (Secondary) + 71e7 RV535 [Radeon X1650 PRO] (Secondary) + 1787 3001 Radeon X1650 PRO AGP + 71f2 RV530 GL [FireGL V3400] (Secondary) + 7210 RV550/M71 [Mobility Radeon HD 2300] + 7211 RV550/M71 [Mobility Radeon X2300 HD] + 7240 R580+ [Radeon X1950 XTX] + 1002 0d02 Radeon X1950 CrossFire Edition + 7244 R580+ [Radeon X1950 XT] + 7248 R580 [Radeon X1950] + 7249 R580 [Radeon X1900 XT] + 1002 0412 All-In-Wonder X1900 + 1002 0b12 Radeon X1900 XT/XTX + 1002 0d02 Radeon X1900 CrossFire Edition + 1043 0160 Radeon X1900 XTX 512 MB GDDR3 + 724b R580 [Radeon X1900 GT] 1002 0b12 Radeon X1900 (Primary) 1002 0b13 Radeon X1900 (Secondary) - 724c R580 [Radeon X1900] - 724d R580 [Radeon X1900] - 724e R580 [AMD Stream Processor] + 724e R580 GL [FireGL V7350] 7269 R580 [Radeon X1900 XT] (Secondary) - 726b R580 [Radeon X1900] + 726b R580 [Radeon X1900 GT] (Secondary) 726e R580 [AMD Stream Processor] (Secondary) - 7280 RV570 [Radeon X1950 Pro] - 7288 Radeon X1950 GT - 7291 Radeon X1650 XT (Primary) (PCIE) - 7293 Radeon X1650 Series - 72a0 RV570 [Radeon X1950 Pro] (secondary) - 72a8 Radeon X1950 GT (Secondary) - 72b1 Radeon X1650 XT (Secondary) (PCIE) - 72b3 Radeon X1650 Series (Secondary) - 7833 Radeon 9100 IGP Host Bridge - 7834 Radeon 9100 PRO IGP - 7835 Radeon Mobility 9200 IGP - 7838 Radeon 9100 IGP PCI/AGP Bridge + 7280 RV570 [Radeon X1950 PRO] + 7288 RV570 [Radeon X1950 GT] + 7291 RV560 [Radeon X1650 XT] + 1462 0810 Radeon X1700 SE + 7293 RV560 [Radeon X1650 GT] + 72a0 RV570 [Radeon X1950 PRO] (Secondary) + 72a8 RV570 [Radeon X1950 GT] (Secondary) + 72b1 RV560 [Radeon X1650 XT] (Secondary) + 72b3 RV560 [Radeon X1650 GT] (Secondary) + 7833 RS350 Host Bridge + 7834 RS350 [Radeon 9100 PRO/XT IGP] + 7835 RS350M [Mobility Radeon 9000 IGP] + 7838 RS350 AGP Bridge 7910 RS690 Host Bridge 1179 ff50 Satellite P305D-S8995E 17f2 5000 KI690-AM2 Motherboard @@ -1739,148 +1814,199 @@ 7916 RS690 PCI to PCI Bridge (PCI Express Port 2) 7917 RS690 PCI to PCI Bridge (PCI Express Port 3) 1002 7910 RS690 PCI to PCI Bridge - 7919 Radeon X1200 Series Audio Controller + 7919 RS690 HDMI Audio [Radeon Xpress 1200 Series] 1179 7919 Satellite P305D-S8995E 17f2 5000 KI690-AM2 Motherboard - 791e RS690 [Radeon X1200 Series] + 791e RS690 [Radeon X1200] 1462 7327 K9AG Neo2 17f2 5000 KI690-AM2 Motherboard - 791f RS690M [Radeon X1200 Series] + 791f RS690M [Radeon Xpress 1200/1250/1270] 1179 ff50 Satellite P305D-S8995E - 7930 Radeon Xpress 7930 Host Bridge - 7932 RS7932 PCI Bridge - 7933 RS7933 PCI Bridge - 7936 RS7936 PCI Bridge - 793b RS600 audio device [Radeon Xpress 12xx Series] - 793f RS600 [Radeon Xpress 1200 Series] - 7941 RS600 [Radeon Xpress 1200 Series] - 7942 Radeon Xpress 1250 - 796e Radeon 2100 - 7c37 RV350 AQ [Radeon 9600 SE] - 9400 R600 [Radeon HD 2900 Series] - 1002 3000 Sapphire Radeon HD 2900 XT + 7930 RS600 Host Bridge + 7932 RS600 PCI to PCI Bridge (Internal gfx) + 7933 RS600 PCI to PCI Bridge (PCI Express Graphics Port 0) + 7935 RS600 PCI to PCI Bridge (PCI Express Port 1) + 7936 RS600 PCI to PCI Bridge (PCI Express Port 2) + 7937 RS690 PCI to PCI Bridge (PCI Express Port 3) + 793b RS600 HDMI Audio [Radeon Xpress 1250] + 793f RS690M [Radeon Xpress 1200/1250/1270] (Secondary) + 7941 RS600 [Radeon Xpress 1250] + 7942 RS600M [Radeon Xpress 1250] + 796e RS740 [Radeon 2100] + 9400 R600 [Radeon HD 2900 PRO/XT] + 1002 2552 Radeon HD 2900 XT + 1002 3000 Radeon HD 2900 PRO 1002 3142 HIS Radeon HD 2900XT 512MB GDDR3 VIVO PCIe + 9401 R600 [Radeon HD 2900 XT] 9403 R600 [Radeon HD 2900 PRO] - 940a R600GL [Fire GL V8650] - 940b R600GL [Fire GL V8600] - 940f R600 [FireGL V7600] + 9405 R600 [Radeon HD 2900 GT] + 940a R600 GL [FireGL V8650] + 940b R600 GL [FireGL V8600] + 940f R600 GL [FireGL V7600] 9440 RV770 [Radeon HD 4870] 9441 R700 [Radeon HD 4870 X2] 9442 RV770 [Radeon HD 4850] - 1002 0502 MSI R4850-T2D512 - 174b e810 Sapphire HD 4850 512MB GDDR3 PCI-E Dual Slot Fansink - 9443 R700 [Radeon HD 4850] - 944a M98L [Mobility Radeon HD 4850] - 944c RV770 LE [Radeon HD 4800 Series] + 1002 0502 MSI Radeon HD 4850 512MB GDDR3 + 174b e810 Sapphire Radeon HD 4850 512MB GDDR3 + 9443 R700 [Radeon HD 4850 X2] + 9444 RV770 GL [FirePro V8750] + 9446 RV770 GL [FirePro V7760] + 944a RV770/M98L [Mobility Radeon HD 4850] + 944b RV770/M98 [Mobility Radeon HD 4850 X2] + 944c RV770 LE [Radeon HD 4830] 944e RV770 CE [Radeon HD 4710] - 9450 RV770 [FireStream 9270] - 9452 RV770 [FireStream 9250] - 945a M98 XT [Mobility Radeon HD 4870] + 174b 3261 Sapphire Radeon HD 4810 + 9450 RV770 GL [FireStream 9270] + 9452 RV770 GL [FireStream 9250] + 9456 RV770 GL [FirePro V8700] + 945a RV770/M98-XT [Mobility Radeon HD 4870] 9460 RV790 [Radeon HD 4890] - 9462 RV790LE [Radeon HD 4800 Series] - 9480 M96 [Mobility Radeon HD 4650] + 9462 RV790 [Radeon HD 4860] + 946a RV770 GL [FirePro M7750] + 9480 RV730/M96 [Mobility Radeon HD 4650/5165] 103c 3628 ATI Mobility Radeon HD 4650 [dv6-1190en] - 9485 RV740 Pro [Radeon HD 4770] - 9488 RV730 XT [Mobility Radeon HD 4670] - 9489 M96 XT [Mobility FireGL V5725] - 9490 RV730XT [Radeon HD 4670] + 9488 RV730/M96-XT [Mobility Radeon HD 4670] + 9489 RV730/M96 GL [Mobility FireGL V5725] + 9490 RV730 XT [Radeon HD 4670] 174b e880 Radeon HD 4670 512MB DDR3 - 9491 M96 CSP [ATI RADEON E4690] - 9495 RV730 Pro AGP [Radeon HD 4600 Series] - 1002 9495 RV730 XT [PowerColor Radeon HD4670 AGP 1GB DDR] - 1458 0028 HD4650 + 9491 RV730/M96-CSP [Radeon E4690] + 9495 RV730 [Radeon HD 4600 AGP Series] + 1002 0028 Radeon HD 4650/4670 AGP + 1092 0028 Radeon HD 4670 AGP 512MB DDR2 + 1458 0028 Radeon HD 4650 AGP + 1682 0028 Radeon HD 4650 AGP + 174b 0028 Radeon HD 4650 AGP DDR2 9498 RV730 PRO [Radeon HD 4650] - 949e RV370 [FirePro V5700] - 949f RV730 [FirePro V5700] - 94a0 Mobility Radeon HD 4830 [M97] - 94a1 [M97 XT] Mobility Radeon HD 4860 - 94a3 M97 GL [ATI FirePro M7740] - 94b3 Radeon HD 4770 [RV740] - 94b4 RV740 LE [ATI Radeon HD 4700 Series] - 94c1 RV610 [Radeon HD 2400 XT] + 949c RV730 GL [FirePro V7750] + 949e RV730 GL [FirePro V5700] + 949f RV730 GL [FirePro V3750] + 94a0 RV740/M97 [Mobility Radeon HD 4830] + 94a1 RV740/M97-XT [Mobility Radeon HD 4860] + 94a3 RV740/M97 GL [FirePro M7740] + 94b3 RV740 PRO [Radeon HD 4770] + 94b4 RV740 PRO [Radeon HD 4750] + 94c1 RV610 [Radeon HD 2400 PRO/XT] 1028 0211 Optiplex 755 1028 0d02 Optiplex 755 - 94c3 RV610 video device [Radeon HD 2400 PRO] - 1002 94c3 Radeon HD 2400PRO + 94c3 RV610 [Radeon HD 2400 PRO] 1028 0302 Radeon HD 2400 Pro - 174b e400 Sapphire HD 2400 PRO video device - 18bc 3550 GeCube Radeon HD2400 PRO - 94c4 RV610 LE AGP [Radeon HD 2400 PRO AGP] - 94c8 Radeon HD 2400 XT - 94c9 Mobility Radeon HD 2400 + 174b e400 Sapphire Radeon HD 2400 PRO + 18bc 3550 GeCube Radeon HD 2400 PRO + 94c4 RV610 LE [Radeon HD 2400 PRO AGP] + 94c5 RV610 [Radeon HD 2400 LE] + 94c7 RV610 [Radeon HD 2350] + 94c8 RV610/M74 [Mobility Radeon HD 2400 XT] + 94c9 RV610/M72-S [Mobility Radeon HD 2400] 1002 94c9 Radeon HD2400 - 94cb Radeon E2400 - 94cc RV610 LE [Radeon HD 2400 Pro PCI] + 94cb RV610 [Radeon E2400] + 94cc RV610 LE [Radeon HD 2400 PRO PCI] + 9500 RV670 [Radeon HD 3850 X2] 9501 RV670 [Radeon HD 3870] 174b e620 Sapphire Radeon HD 3870 PCIe 2.0 - 9504 RV670 [Mobility Radeon HD 3850] - 9505 RV670PRO [Radeon HD 3850] - 9507 RV670 [Radeon HD 3850] - 9508 M88 XT Mobility Radeon HD 3870] - 950f R680 [Radeon HD 3870 x2] - 9511 RV670 [FireGL 7700] - 9515 RV670 AGP [Radeon HD 3850] - 9519 RV670 [FireStream 9170] + 9504 RV670/M88 [Mobility Radeon HD 3850] + 9505 RV670 [Radeon HD 3690/3850] + 148c 3000 Radeon HD 3850 + 174b 3000 Radeon HD 3690/3850 + 1787 3000 Radeon HD 3690 + 9506 RV670/M88 [Mobility Radeon HD 3850 X2] + 9507 RV670 [Radeon HD 3830] + 9508 RV670/M88-XT [Mobility Radeon HD 3870] + 9509 RV670/M88 [Mobility Radeon HD 3870 X2] + 950f R680 [Radeon HD 3870 X2] + 9511 RV670 GL [FireGL V7700] + 9513 RV670 [Radeon HD 3850 X2] + 9515 RV670 PRO [Radeon HD 3850 AGP] + 9519 RV670 GL [FireStream 9170] 9540 RV710 [Radeon HD 4550] - 954f RV710 [Radeon HD 4350] + 954f RV710 [Radeon HD 4350/4550] 1462 1618 R4350 MD512H (MS-V161) - 9552 RV710 [Mobility Radeon HD 4300 Series] - 9553 RV710 [Mobility Radeon HD 4500/5100 Series] + 9552 RV710/M92 [Mobility Radeon HD 4330/4350/4550] + 1028 1103 M92 [Mobility Radeon HD 4330] +# GV-R435OC-512I/FF1 + 1458 21ac Radeon HD 4350 +# GV-R455HM-512I/F41 + 1458 21ed Radeon HD 4550 +# 113-100928-J01 + 148c 3000 Radeon HD 4350 Go! Green 512MB GDDR3 +# 113-2E172001-003 + 174b 3000 Radeon HD 4350/4550 HyperMemory DDR2 + 9553 RV710/M92 [Mobility Radeon HD 4530/4570/545v] 1179 ff82 Satellite L505-13T GPU (Mobility Radeon HD 5145) - 9555 RV710 [Mobility Radeon HD 4300/4500 Series] + 9555 RV710/M92 [Mobility Radeon HD 4350/4550] 103c 1411 ProBook 4720s GPU (Mobility Radeon HD 4350) - 9559 RV635 [Mobility Radeon HD 3600 Series] - 955f RV710 [Mobility Radeon HD 4330] - 9581 RV630 [Mobility Radeon HD 2600] - 9583 RV630 [Mobility Radeon HD 2600 XT] - 9586 RV 630 XT AGP [Radeon HD 2600 XT AGP] - 9587 RV630 PRO AGP [Radeon HD 2600 PRO AGP] - 9588 RV630 [Radeon HD 2600XT] + 9557 RV711 GL [FirePro RG220] + 955f RV710/M92 [Mobility Radeon HD 4330] + 9580 RV630 [Radeon HD 2600 PRO] + 9581 RV630/M76 [Mobility Radeon HD 2600] + 9583 RV630/M76 [Mobility Radeon HD 2600 XT/2700] + 106b 0083 iMac 7,1 + 1734 1107 Mobility Radeon HD 2700 + 9586 RV630 XT [Radeon HD 2600 XT AGP] + 9587 RV630 PRO [Radeon HD 2600 PRO AGP] + 9588 RV630 XT [Radeon HD 2600 XT] 1458 216c Radeon HD 2600 XT, 256MB GDDR3, 2x DVI, TV-out, PCIe (GV-RX26T256H) - 9589 RV630 [Radeon HD 2600 Series] - 958c RV630GL [FireGL v5600] - 958d RV630 [FireGL V3600] - 9591 RV635 [Mobility Radeon HD 3650] + 9589 RV630 PRO [Radeon HD 2600 PRO] +# Rebranded HD 2600 PRO + 1787 3000 Radeon HD 3610 + 958a RV630 [Radeon HD 2600 X2] + 958b RV630/M76 [Mobility Radeon HD 2600 XT] + 958c RV630 GL [FireGL V5600] + 958d RV630 GL [FireGL V3600] + 9591 RV635/M86 [Mobility Radeon HD 3650] 1002 9591 Mobility Radeon HD 3650 - 9593 RV635 [Mobility Radeon HD 3670] - 9595 M86GL [Mobility FireGL V5700] - 9596 RV635 PRO AGP [Radeon HD 3650] + 9593 RV635/M86 [Mobility Radeon HD 3670] + 9595 RV635/M86 GL [Mobility FireGL V5700] + 9596 RV635 PRO [Radeon HD 3650 AGP] 1043 0028 EAH3650 SILENT/HTDI/512M/A - 9598 RV630 [Radeon HD 3600 Series] + 9597 RV635 PRO [Radeon HD 3650 AGP] + 9598 RV635 [Radeon HD 3650/3750/4570/4580] 1002 9598 Mobility Radeon HD 3600 1043 01d6 EAH3650 Silent + 1043 3001 Radeon HD 4570 + 174b 3001 Radeon HD 3750 + 174b 4580 RV635 PRO [Radeon HD 4580] + 9599 RV635 PRO [Radeon HD 3650 AGP] 95c0 RV620 PRO [Radeon HD 3470] 1002 95c0 Mobility Radeon HD 3470 - 95c4 RV620 [Mobility Radeon HD 3400 Series] + 95c2 RV620/M82 [Mobility Radeon HD 3410/3430] + 95c4 RV620/M82 [Mobility Radeon HD 3450/3470] 1002 95c4 Mobility Radeon HD 3400 95c5 RV620 LE [Radeon HD 3450] 1028 0342 OptiPlex 980 - 95c6 RV620 LE AGP [Radeon HD 3450] - 95c7 RV620 CE [Radeon HD 3430] - 95c9 RV620 PCI [Radeon HD 3450] - 95cc RV620 [ATI FireGL V3700] - 95cd RV620 [FireMV 2450] - 95ce RV620 [FirePro 2260] - 95cf RV620 [FirePro 2260] - 960f RS780 HDMI Audio [Radeon HD 3000-3300 Series] + 95c6 RV620 LE [Radeon HD 3450 AGP] + 95c9 RV620 LE [Radeon HD 3450 PCI] + 95cc RV620 GL [FirePro V3700] + 95cf RV620 GL [FirePro 2260] + 960f RS780 HDMI Audio [Radeon (HD) 3000 Series] 9610 RS780 [Radeon HD 3200] 1458 d000 GA-MA78GM-S2H Motherboard - 9611 RS780C [Radeon HD 3100] - 9612 RS780M/RS780MN [Mobility Radeon HD 3200 Graphics] - 9613 RS780MC [Mobility Radeon HD 3100 Graphics] + 9611 RS780C [Radeon 3100] + 9612 RS780M [Mobility Radeon HD 3200] + 9613 RS780MC [Mobility Radeon HD 3100] 9614 RS780D [Radeon HD 3300] - 9615 RS780E [Radeon HD 3200] - 9616 RS780L [Radeon HD 3000] + 9616 RS780L [Radeon 3000] 9640 BeaverCreek [Radeon HD 6550D] - 9641 BeaverCreek [Mobility Radeon HD 6620G] + 9641 BeaverCreek [Radeon HD 6620G] + 9642 Sumo [Radeon HD 6370D] + 9643 Sumo [Radeon HD 6380G] + 9644 Sumo [Radeon HD 6410D] + 9645 Sumo [Radeon HD 6410D] 9647 BeaverCreek [Radeon HD 6520G] + 9648 Sumo [Radeon HD 6480G] + 9649 Sumo [Radeon HD 6480G] 964a BeaverCreek [Radeon HD 6530D] + 964b Sumo + 964c Sumo + 964e Sumo + 964f Sumo 970f RS880 HDMI Audio [Radeon HD 4200 Series] + 1019 2120 A785GM-M 1043 83a2 M4A785TD Motherboard 1043 843e M5A88-V EVO 9710 RS880 [Radeon HD 4200] + 1019 2120 A785GM-M 1043 83a2 M4A785TD Motherboard - 9712 RS880M [Mobility Radeon HD 4200 Series] + 9712 RS880M [Mobility Radeon HD 4225/4250] 9713 RS880M [Mobility Radeon HD 4100] 9714 RS880 [Radeon HD 4290] 9715 RS880 [Radeon HD 4250] @@ -1888,11 +2014,70 @@ # Radeon HD 6250 too? 9802 Wrestler [Radeon HD 6310] 174b 1001 Sapphire PURE Fusion Mini + 9803 Wrestler [Radeon HD 6310] 9804 Wrestler [Radeon HD 6250] + 9805 Wrestler [Radeon HD 6250] 9806 Wrestler [Radeon HD 6320] 9807 Wrestler [Radeon HD 6290] - aa00 R600 Audio Device [Radeon HD 2900 Series] - aa08 RV630 audio device [Radeon HD 2600 Series] + 9808 Wrestler [Radeon HD 7340] + 9809 Wrestler [Radeon HD 7310] + 980a Wrestler [Radeon HD 7290] + 9830 Kabini [Radeon HD 8400] + 9831 Kabini [Radeon HD 8400E] + 9832 Kabini [Radeon HD 8330] + 9833 Kabini [Radeon HD 8330E] + 9834 Kabini [Radeon HD 8210] + 9835 Kabini [Radeon HD 8310E] + 9836 Kabini [Radeon HD 8280] + 9837 Kabini [Radeon HD 8280E] + 9838 Kabini [Radeon HD 8240] + 9839 Kabini [Radeon HD 8180] + 983a Kabini + 983b Kabini + 983c Kabini + 983d Kabini [Radeon HD 8250] + 983e Kabini + 983f Kabini +# AMD A10-5800K CPU + 9901 Trinity [Radeon HD 7660D] + 9902 Trinity HDMI Audio Controller + 9903 Trinity [Radeon HD 7640G] + 9904 Trinity [Radeon HD 7560D] + 9905 Trinity [FirePro A300 Series Graphics] + 9906 Trinity [FirePro A300 Series Graphics] + 9907 Trinity [Radeon HD 7620G] + 9908 Trinity [Radeon HD 7600G] + 9909 Trinity [Radeon HD 7500G] + 990a Trinity [Radeon HD 7500G] + 990b Richland [Radeon HD 8650G] + 990c Richland [Radeon HD 8670D] + 990d Richland [Radeon HD 8550G] + 990e Richland [Radeon HD 8570D] + 990f Richland [Radeon HD 8610G] + 9910 Trinity [Radeon HD 7660G] + 9913 Trinity [Radeon HD 7640G] + 9917 Trinity [Radeon HD 7620G] + 9918 Trinity [Radeon HD 7600G] + 9919 Trinity [Radeon HD 7500G] + 9990 Trinity [Radeon HD 7520G] + 9991 Trinity [Radeon HD 7540D] + 9992 Trinity [Radeon HD 7420G] + 9993 Trinity [Radeon HD 7480D] + 9994 Trinity [Radeon HD 7400G] + 9995 Richland [Radeon HD 8450G] + 9996 Richland [Radeon HD 8470D] + 9997 Richland [Radeon HD 8350G] + 9998 Richland [Radeon HD 8370D] + 9999 Richland [Radeon HD 8510G] + 999a Richland [Radeon HD 8410G] + 999b Richland [Radeon HD 8310G] + 999c Richland + 999d Richland + 99a0 Trinity [Radeon HD 7520G] + 99a2 Trinity [Radeon HD 7420G] + 99a4 Trinity [Radeon HD 7400G] + aa00 R600 HDMI Audio [Radeon HD 2900 Series] + aa08 RV630 HDMI Audio [Radeon HD 2600 Series] aa10 RV610 HDMI Audio [Radeon HD 2350/2400 Series] 174b aa10 Sapphire HD 2400 PRO audio device 18bc aa10 GeCube Radeon HD 2400 PRO HDCP-capable digital-only audio device @@ -1915,16 +2100,18 @@ aa80 Cayman/Antilles HDMI Audio [Radeon HD 6900 Series] aa88 Barts HDMI Audio [Radeon HD 6800 Series] aa90 Turks/Whistler HDMI Audio [Radeon HD 6000 Series] + 1028 04a3 Precision M4600 aa98 Caicos HDMI Audio [Radeon HD 6400 Series] 174b aa98 Sapphire HD 6450 1GB DDR3 aaa0 Tahiti XT HDMI Audio [Radeon HD 7970 Series] + aab0 Cape Verde/Pitcairn HDMI Audio [Radeon HD 7700/7800 Series] ac00 Theater 600 Pro ac02 TV Wonder HD 600 PCIe ac12 Theater HD T507 (DVB-T) TV tuner/capture device - cab0 RS100 AGP Bridge [IGP 320M] - cab2 RS200/RS200M AGP Bridge [IGP 340M] - cab3 R200 AGP Bridge [Mobility Radeon 7000 IGP] - cbb2 RS200/RS200M AGP Bridge [IGP 340M] + cab0 RS100 Host Bridge + cab2 RS200 Host Bridge + cab3 RS250 Host Bridge + cbb2 RS200 Host Bridge 1003 ULSI Systems 0201 US201 1004 VLSI Technology Inc @@ -1984,6 +2171,7 @@ 103c 0024 Pavilion ze4400 builtin Network 12d9 000c Aculab E1/T1 PMXc cPCI carrier card 1385 f311 FA311 / FA312 (FA311 with WoL HW) + 1385 f312 FA312 (rev. A1) Fast Ethernet PCI Adapter 0021 PC87200 PCI to ISA Bridge 0022 DP83820 10/100/1000 Ethernet Controller 1186 4900 DGE-500T @@ -2225,7 +2413,6 @@ 0054 GXT500P/GXT550P Graphics Adapter 0057 MPEG PCI Bridge 0058 SSA Adapter [Advanced SerialRAID/X] - 005c i82557B 10/100 005e GXT800P Graphics Adapter 007c ATM Controller (14107c00) 007d 3780IDSP [MWave] @@ -2248,7 +2435,6 @@ 00be ATM 622MBPS Controller (1410be00) 00dc Advanced Systems Management Adapter (ASMA) 00fc CPC710 Dual Bridge and Memory Controller (PCI-64) - 0104 Gigabit Ethernet-SX Adapter 0105 CPC710 Dual Bridge and Memory Controller (PCI-32) 010f Remote Supervisor Adapter (RSA) 0142 Yotta Video Compositor Input @@ -2288,9 +2474,6 @@ 021b GXT6500P Graphics Adapter 021c GXT4500P Graphics Adapter 0233 GXT135P Graphics Adapter - 0266 PCI-X Dual Channel SCSI - 0268 Gigabit Ethernet-SX Adapter (PCI-X) - 0269 10/100/1000 Base-TX Ethernet Adapter (PCI-X) 028c Citrine chipset SCSI controller 1014 028d Dual Channel PCI-X DDR SAS RAID Adapter (572E) 1014 02be Dual Channel PCI-X DDR U320 SCSI RAID Adapter (571B) @@ -2309,6 +2492,7 @@ 0339 Obsidian-E PCI-E SCSI controller 1014 030a PCIe 3Gb SAS RAID Adapter (574E) 1014 033a PCIe 3Gb SAS Adapter (57B3) + 1014 035c PCIe x8 Internal 3Gb SAS adapter (57CC) 1014 0360 PCI-E Auxiliary Cache Adapter (57B7) 033d PCI-E IPR SAS Adapter (FPGA) 1014 033c PCIe2 1.8GB Cache 6Gb SAS RAID Adapter Tri-port (57B5) @@ -2322,6 +2506,7 @@ 1014 0357 PCIe2 6Gb SAS Adapter Quad-port (57C6) 1014 035d PCIe3 1.8GB Cache RAID SAS Adapter Quad-port 6GB (57C8) 1014 035e PCIe2 3.6GB Cache 6Gb SAS RAID Adapter Quad-port (57CE) + 1014 03fb PCIe3 28GB Cache RAID SAS Enclosure 6Gb x 16 (57D5) 3022 QLA3022 Network Adapter 4022 QLA3022 Network Adapter ffff MPIC-2 interrupt controller @@ -2393,7 +2578,7 @@ 101f PictureTel 1020 Hitachi Computer Products 1021 OKI Electric Industry Co. Ltd. -1022 Advanced Micro Devices [AMD] +1022 Advanced Micro Devices, Inc. [AMD] 1100 K8 [Athlon64/Opteron] HyperTransport Technology Configuration 1101 K8 [Athlon64/Opteron] Address Map 1102 K8 [Athlon64/Opteron] DRAM Controller @@ -2423,6 +2608,7 @@ 1417 Family 15h (Models 10h-1fh) Processor Root Port 1418 Family 15h (Models 10h-1fh) Processor Root Port 1419 Family 15h (Models 10h-1fh) I/O Memory Management Unit + 1439 Family 16h Processor Functions 5:1 1510 Family 14h Processor Root Complex 174b 1001 Sapphire PURE Fusion Mini 1512 Family 14h Processor Root Port @@ -2431,6 +2617,14 @@ 1514 Family 14h Processor Root Port 1515 Family 14h Processor Root Port 1516 Family 14h Processor Root Port + 1530 Family 16h Processor Function 0 + 1531 Family 16h Processor Function 1 + 1532 Family 16h Processor Function 2 + 1533 Family 16h Processor Function 3 + 1534 Family 16h Processor Function 4 + 1535 Family 16h Processor Function 5 + 1536 Family 16h Processor Root Complex + 1538 Family 16h Processor Function 0 1600 Family 15h Processor Function 0 1601 Family 15h Processor Function 1 1602 Family 15h Processor Function 2 @@ -2495,6 +2689,10 @@ 2097 CS5536 [Geode companion] UOC 209a CS5536 [Geode companion] IDE 3000 ELanSC520 Microcontroller + 43a0 Hudson PCI to PCI bridge (PCIE port 0) + 43a1 Hudson PCI to PCI bridge (PCIE port 1) + 43a2 Hudson PCI to PCI bridge (PCIE port 2) + 43a3 Hudson PCI to PCI bridge (PCIE port 3) 7006 AMD-751 [Irongate] System Controller 7007 AMD-751 [Irongate] AGP Bridge 700a AMD-IGR4 AGP Host to PCI Bridge @@ -2549,26 +2747,29 @@ 161f 3017 HDAMB 746e AMD-8111 MC97 Modem 756b AMD-8111 ACPI - 7800 Hudson SATA Controller [IDE mode] - 7801 Hudson SATA Controller [AHCI mode] - 7802 Hudson SATA Controller [RAID mode] - 7803 Hudson SATA Controller [RAID mode] - 7804 Hudson SATA Controller [AHCI mode] - 7805 Hudson SATA Controller [RAID mode] - 7806 Hudson SD Flash Controller - 7807 Hudson USB OHCI Controller - 7808 Hudson USB EHCI Controller - 7809 Hudson USB OHCI Controller - 780b Hudson SMBus Controller - 780c Hudson IDE Controller - 780d Hudson Azalia Controller - 103c 168b Integrated Device Technology, Inc. [IDT] 92HD87B1/3 Audio Processor - 780e Hudson LPC Bridge - 780f Hudson PCI Bridge - 7812 Hudson USB XHCI Controller + 7800 FCH SATA Controller [IDE mode] + 7801 FCH SATA Controller [AHCI mode] + 103c 168b ProBook 4535s Notebook + 7802 FCH SATA Controller [RAID mode] + 7803 FCH SATA Controller [RAID mode] + 7804 FCH SATA Controller [AHCI mode] + 7805 FCH SATA Controller [RAID mode] + 7806 FCH SD Flash Controller + 7807 FCH USB OHCI Controller + 7808 FCH USB EHCI Controller + 7809 FCH USB OHCI Controller + 780b FCH SMBus Controller + 780c FCH IDE Controller + 780d FCH Azalia Controller + 780e FCH LPC Bridge + 780f FCH PCI Bridge + 7812 FCH USB XHCI Controller + 7813 FCH SD Flash Controller + 7814 FCH USB XHCI Controller 9600 RS780 Host Bridge 1043 82f1 M3A78-EH Motherboard 9601 RS880 Host Bridge + 1019 2120 A785GM-M 1043 843e M5A88-V EVO 9602 RS780/RS880 PCI to PCI bridge (int gfx) 9603 RS780 PCI to PCI bridge (ext gfx port 0) @@ -2814,6 +3015,7 @@ 102b ff04 Marvel G200 AGP 110a 0032 MGA-G200 AGP 0522 MGA G200e [Pilot] ServerEngines (SEP1) + 103c 31fa ProLiant DL140 G3 0525 MGA G400/G450 0e11 b16f MGA-G400 AGP 102b 0328 Millennium G400 16Mb SDRAM @@ -3105,8 +3307,8 @@ 002a PowerVR 3D 002c Star Alpha 2 002d PCI to C-bus Bridge - 0035 USB - 1033 0035 Hama USB 2.0 CardBus + 0035 OHCI USB Controller + 1033 0035 USB Controller 103c 1293 USB add-in card 103c 1294 USB 2.0 add-in card 1179 0001 USB @@ -3140,7 +3342,7 @@ 12ee 8011 Root hub 00ce uPD72871 [Firewarden] IEEE1394a OHCI 1.0 Link/1-port PHY Controller 00df Vr4131 - 00e0 USB 2.0 + 00e0 uPD72010x USB 2.0 Controller 12ee 7001 Root hub 14c2 0205 PTI-205N USB 2.0 Host Controller 1799 0002 Root Hub @@ -3152,6 +3354,7 @@ 0125 uPD720400 PCI Express - PCI/PCI-X Bridge 013a Dual Tuner/MPEG Encoder 0194 uPD720200 USB 3.0 Host Controller + 1028 04a3 Precision M4600 1028 04b2 Vostro 3350 1028 04da Vostro 3750 1043 8413 P8P67 Deluxe Motherboard @@ -3305,6 +3508,7 @@ 7007 FireWire Controller 1462 701d MS-6701 7012 SiS7012 AC'97 Sound Controller + 1019 0f05 A928 (i-Buddie) 1039 7012 SiS 7012 onboard [Asus P4SC-EA] AC'97 Sound Controller 1043 818f A8S-X Motherboard 13f6 0300 CMI9739(A) on ECS K7SOM+ motherboard @@ -3347,9 +3551,6 @@ 103a Seiko Epson Corporation 103b Tatung Corp. Of America 103c Hewlett-Packard Company - 0025 XE4500 Notebook - 002a NX9000 Notebook - 08bc NX5000 Notebook 1005 A4977A Visualize EG 1008 Visualize FX 1028 Tach TL Fibre Channel Host Adapter @@ -3385,7 +3586,6 @@ 10ed TopTools Remote Control 10f0 rio System Bus Adapter 10f1 rio I/O Controller - 1200 82557B 10/100 NIC 1219 NetServer PCI Hot-Plug Controller 121a NetServer SMIC Controller 121b NetServer Legacy COM Port Decoder @@ -3402,22 +3602,10 @@ 12eb sx2000 System Bus Adapter 12ec sx2000 I/O Controller 12ee PCI-X 2.0 Local Bus Adapter - 12f8 Broadcom BCM4306 802.11b/g Wireless LAN - 12fa BCM4306 802.11b/g Wireless LAN Controller 1302 RMP-3 Shared Memory Driver 1303 RMP-3 (Remote Management Processor) - 1361 BCM4312 802.11a/b/g WLAN Controller - 1371 Broadcom Corporation BCM4312 802.11a/b/g (rev 02) - 1717 Intel 82571EB dual 1 Gb Ethernet controller - 179b EliteBook 8470p Notebook - 179d EliteBook 8470p Notebook 2910 E2910A PCIBus Exerciser 2925 E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer - 3080 Pavilion ze2028ea - 3085 Realtek RTL8139/8139C/8139C+ - 30a3 Compaq NW8440 Notebook - 30b5 Compaq Presario V3000Z - 31fb DL365 ATI ES1000 VGA controller 3206 Adaptec Embedded Serial ATA HostRAID 3220 Smart Array P600 103c 3225 3 Gb/s SAS RAID @@ -3444,6 +3632,17 @@ 103c 3352 P421 103c 3354 P420i 103c 3355 P220i +# New Smart Array controllers for Gen8+ servers + 323c Smart Array Gen8+ Controllers + 103c 1920 Smart Array + 103c 1921 Smart Array + 103c 1922 Smart Array + 103c 1923 Smart Array + 103c 1924 Smart Array + 103c 1925 Smart Array + 103c 1926 Smart Array + 103c 1927 Smart Array + 103c 1928 Smart Array 3300 Integrated Lights-Out Standard Virtual USB Controller 103c 3304 iLO2 103c 3305 iLO2 @@ -3466,6 +3665,8 @@ 103c 330e iLO3 103c 3381 iLO4 3307 Integrated Lights-Out Standard Management Processor Support and Messaging +# HP DL380 G6 + 103c 3309 iLO 2 103c 330e iLO3 103c 3381 iLO4 3308 Integrated Lights-Out Standard MS Watchdog Timer @@ -3477,7 +3678,6 @@ 4037 PCIe Local Bus Adapter 403b PCIe Root Port 60e8 NetRAID-2M : ZX1/M (OEM AMI MegaRAID 493) - 780d Hudson Azalia Controller (rev 01) - Soundcard 103e Solliday Engineering 103f Synopsys/Logic Modeling Group 1040 Accelgraphics Inc. @@ -3493,35 +3693,8 @@ 0675 1704 ISDN Adapter (PCI Bus, D, C) 0675 1707 ISDN Adapter (PCI Bus, DV, W) 10cf 105e ISDN Adapter (PCI Bus, DV, W) - 0c11 A7N8X Motherboard nForce2 IDE/USB/SMBus - 4015 v7100 SDRAM [GeForce2 MX] - 4021 v7100 Combo Deluxe [GeForce2 MX + TV tuner] - 4057 v8200 GeForce 3 - 8043 v8240 PAL 128M [P4T] Motherboard - 8047 v8420 Deluxe [GeForce4 Ti4200] - 807b v9280/TD [GeForce4 TI4200 8X With TV-Out and DVI] - 8095 A7N8X Motherboard nForce2 AC97 Audio - 80ac A7N8X Motherboard nForce2 AGP/Memory - 80bb v9180 Magic/T [GeForce4 MX440 AGP 8x 64MB TV-out] - 80c5 nForce3 chipset motherboard [SK8N] - 80df v9520 Magic/T - 815a A8N-SLI Motherboard nForce4 SATA - 8168 Realtek PCI-E Gigabit Ethernet Controller (RTL8111B) - 8187 802.11a/b/g Wireless LAN Card - 8188 Tiger Hybrid TV Capture Device -# Found on ASUS M2V motherboard - 81e7 Realtek ALC-660 6-channel CODEC - 81f4 EN7300TC512/TD/128M/A(C262G) [Graphics Card EN7300TC512] - 8233 EEE-PC 701 Netbook - 82ca G96 GeForce 9500 GT - 82e8 M3N72-D - 8383 P7P55D Series Motherboard - 83a4 Motherboard M2N68-AM SE2 -# Onboard audio for M4A89 series motherboards. - 8410 SBx00 [Azalia] - 843e M5A88-V EVO -# wrong vendor ID (should have been AMD) - 9602 RS880 PCI to PCI bridge (int gfx) +# Should be 1022:9602 + 9602 AMD RS780/RS880 PCI to PCI bridge (int gfx) 1043 83a2 M4A785TD Motherboard 1044 Adaptec (formerly DPT) 1012 Domino RAID Engine @@ -3607,6 +3780,9 @@ 0008 STG 2000X 0009 STG 1764X 0010 STG4000 [3D Prophet Kyro Series] + 104a 4018 ST PowerVR Kyro (64MB AGP TVO) + 1681 0028 3D Prophet 4000XT + 1681 c010 3D Prophet 4500 TV-Out 1681 c069 3D Prophet 4000XT 0201 STPC Vega Northbridge 0209 STPC Consumer/Industrial North- and Southbridge @@ -3702,7 +3878,7 @@ 8024 TSB43AB23 IEEE-1394a-2000 Controller (PHY/Link) 107d 6620 Winfast DV2000 FireWire Controller 1443 8024 FireBoard Blue - 1458 1000 GA-EP45-DS5/GA-EG45M-DS2H Motherboard + 1458 1000 Motherboard 8025 TSB82AA2 IEEE-1394b Link Layer Controller 1043 813c P5P series mainboard 1443 8025 FireBoard800 @@ -3716,6 +3892,7 @@ 103c 006a NX9500 1043 808d A7V333 mainboard. 8027 PCI4451 IEEE-1394 Controller + 1028 00e5 Latitude C810 1028 00e6 PCI4451 IEEE-1394 Controller (Dell Inspiron 8100) 8029 PCI4510 IEEE-1394 Controller 1028 0163 Latitude D505 @@ -3788,6 +3965,7 @@ 823f XIO2213A/B/XIO2221 IEEE-1394b OHCI Controller [Cheetah Express] 1546 803c FWB-PCIE1X11B 8240 XIO2001 PCI Express-to-PCI Bridge + 8241 TUSB73x0 SuperSpeed USB 3.0 xHCI Host Controller 8400 ACX 100 22Mbps Wireless Interface 1186 3b00 DWL-650+ PC Card cardbus 22Mbs Wireless Adapter [AirPlus] 1186 3b01 DWL-520+ 22Mbps PCI Wireless Adapter @@ -3800,6 +3978,8 @@ 0308 3404 G-102 v1 802.11g Wireless Cardbus Adapter 0308 3406 G-162 v2 802.11g Wireless Cardbus Adapter 104c 9066 WL212 Sitecom Wireless Network PCI-Card 100M (Version 1) +# Found in Philips ADSL ANNEX A WLAN Router SNA6500/18 sold by Belgacom + 104c 9067 TNETW1130GVF 104c 9096 Trendnet TEW-412PC Wireless PCI Adapter (Version A) 1186 3b04 DWL-G520+ Wireless PCI Adapter 1186 3b05 DWL-G650+ AirPlusG+ CardBus Wireless LAN @@ -3915,7 +4095,6 @@ 8056 Rockwell HCF 56K modem 808a Memory Stick Controller 81ce SxS Pro memory card - 902d VAIO VGN-NR120E 104e Oak Technology, Inc 0017 OTI-64017 0107 OTI-107 [Spitfire] @@ -4012,7 +4191,6 @@ 18c0 MPC8265A/8266/8272 18c1 MPC8271/MPC8272 3052 SM56 Data Fax Modem - 3055 SM56 Data Fax Modem 3410 DSP56361 Digital Signal Processor ecc0 0050 Gina24 rev.0 ecc0 0051 Gina24 rev.1 @@ -4068,6 +4246,7 @@ 1275 20275 3318 PDC20318 (SATA150 TX4) 3319 PDC20319 (FastTrak S150 TX4) + 105a 3319 FastTrak S150 TX4 4 port SATA PCI board 8086 3427 S875WP1-E mainboard 3371 PDC20371 (FastTrak S150 TX2plus) 3373 PDC20378 (FastTrak 378/SATA 378) @@ -4140,7 +4319,6 @@ c350 80333 [SuperTrak EX12350] e350 80333 [SuperTrak EX24350] 105b Foxconn International, Inc. - 0c4d SiS AC'97 Sound Controller 105c Wipro Infotech Limited 105d Number 9 Computer Company 2309 Imagine 128 @@ -4320,7 +4498,8 @@ 006a Intrepid2 Firewire 006b Intrepid2 GMAC (Sun GEM) 0074 U4 HT Bridge - 1645 Tigon3 Gigabit Ethernet NIC (BCM5701) +# should be 14e4:1645 + 1645 Broadcom NetXtreme BCM5701 Gigabit Ethernet 106c Hynix Semiconductor 8139 8139c 100BaseTX Ethernet Controller 8801 Dual Pentium ISA/PCI Motherboard @@ -4378,6 +4557,7 @@ 1240 ISP1240 SCSI Host Adapter 1280 ISP1280 SCSI Host Adapter 2020 ISP2020A Fast!SCSI Basic Adapter + 2031 ISP8324-based 16Gb Fibre Channel to PCI Express Adapter 2100 QLA2100 64-bit Fibre Channel Adapter 1077 0001 QLA2100 64-bit Fibre Channel Adapter 2200 QLA2200 64-bit Fibre Channel Adapter @@ -4420,6 +4600,11 @@ 8022 8200 Series 10GbE Converged Network Adapter (iSCSI) 103c 3347 CN1000Q Dual Port Converged Network Adapter 1077 0212 QME8242-k 10GbE Dual Port Mezzanine Card, iSCSI + 8030 ISP8324 1/10GbE Converged Network Controller + 1077 0243 8300 Series Single Port 10GbE Converged Network Adapter (TCP/IP Networking) + 1077 0246 8300 Series Dual Port 10GbE Converged Network Adapter (TCP/IP Networking) + 8031 8300 Series 10GbE Converged Network Adapter (FCoE) + 8032 8300 Series 10GbE Converged Network Adapter (iSCSI) 8432 ISP2432M-based 10GbE Converged Network Adapter (CNA) 1078 Cyrix Corporation 0000 5510 [Grappa] @@ -4436,15 +4621,11 @@ 0403 ZFMicro Expansion Bus 1079 I-Bus 107a NetWorth -107b Gateway 2000 +# formerly Gateway 2000 / acquired by Acer Inc. +107b Gateway, Inc. 107c LG Electronics [Lucky Goldstar Co. Ltd] 107d LeadTek Research Inc. 0000 P86C850 - 2134 WinFast 3D S320 II - 6609 Winfast TV 2000 XP RM - 6654 Conexant CX23883 [WinFast DTV1800 H] - 6f22 WinFast PxTV1200 - 6f34 WinFast DVR3100 H 107e Interphase Corporation 0001 5515 ATM Adapter [Flipper] 0002 100 VG AnyLan Controller @@ -4647,6 +4828,8 @@ 2ca0 PCI-6034E 2cc0 PXI-6608 2db0 PCI-6608 +# Low-Cost, High-Current, 96 Ch, 5 V TTL/CMOS Digital I/O + 7085 PCI-6509 70a9 PCI-6528 (Digital I/O at 60V) 70aa PCI-6229 70ab PCI-6259 @@ -4931,6 +5114,10 @@ 10b4 237e Velocity 4400 10b5 PLX Technology, Inc. 0001 i960 PCI bus interface + 0557 PCI9030 32-bit 33MHz PCI <-> IOBus Bridge + 10b5 9030 Digium Tormenta 2 T400P-SS7 or E400P-SS7 Quad T1 or E1 PCI card + 1000 PCI9030 32-bit 33MHz PCI <-> IOBus Bridge + 10b5 9030 ATCOM AT400P Quad T1 PCI card 1024 Acromag, Inc. IndustryPack Carrier Card 1042 Brandywine / jxi2, Inc. - PMC-SyncClock32, IRIG A & B, Nasa 36 106a Dual OX16C952 4 port serial adapter [Megawolf Romulus/4] @@ -4940,9 +5127,17 @@ 1103 VScom 200 2 port serial adaptor 1146 VScom 010 1 port parallel adaptor 1147 VScom 020 2 port parallel adaptor + 2000 PCI9030 32-bit 33MHz PCI <-> IOBus Bridge + 10b5 9030 ATCOM AE400P Quad E1 PCI card 2540 IXXAT CAN-Interface PC-I 04/PCI 2724 Thales PCSM Security Card 3376 Cosateq 4 Port CAN Card + 4000 PCI9030 32-bit 33MHz PCI <-> IOBus Bridge + 10b5 9030 Tormenta 3 Varion V400P/ATCOM TE400P Quad E1/T1/J1 PCI card + 4001 PCI9030 32-bit 33MHz PCI <-> IOBus Bridge + 10b5 9030 ATCOM A400PE Quad E1 PCI card + 4002 PCI9030 32-bit 33MHz PCI <-> IOBus Bridge + 10b5 9030 ATCOM A400PT Quad T1 PCI card 6140 PCI6140 32-bit 33MHz PCI-to-PCI Bridge 6150 PCI6150 32-bit 33MHz PCI-to-PCI Bridge 6152 PCI6152 32-bit 66MHz PCI-to-PCI Bridge @@ -4977,6 +5172,7 @@ 8547 PEX 8547 48-lane, 3-port PCI Express Switch 8548 PEX 8548 48-lane, 9-port PCI Express Switch 8604 PEX 8604 4-lane, 4-Port PCI Express Gen 2 (5.0 GT/s) Switch + 8605 PEX 8605 PCI Express 4-port Gen2 Switch 8606 PEX 8606 6 Lane, 6 Port PCI Express Gen 2 (5.0 GT/s) Switch 8608 PEX 8608 8-lane, 8-Port PCI Express Gen 2 (5.0 GT/s) Switch 8609 PEX 8609 8-lane, 8-Port PCI Express Gen 2 (5.0 GT/s) Switch with DMA @@ -4999,12 +5195,15 @@ 8664 PEX 8664 64-lane, 16-Port PCI Express Gen 2 (5.0 GT/s) Switch 8680 PEX 8680 80-lane, 20-Port PCI Express Gen 2 (5.0 GT/s) Multi-Root Switch 8696 PEX 8696 96-lane, 24-Port PCI Express Gen 2 (5.0 GT/s) Multi-Root Switch + 8717 PEX 8717 16-lane, 8-Port PCI Express Gen 3 (8.0 GT/s) Switch with DMA + 8718 PEX 8718 16-Lane, 5-Port PCI Express Gen 3 (8.0 GT/s) Switch 8732 PEX 8732 32-lane, 8-Port PCI Express Gen 3 (8.0 GT/s) Switch + 8734 PEX 8734 32-lane, 8-Port PCI Express Gen 3 (8.0GT/s) Switch # This is the Non-Transparent-Bridge Virtualized Port as presented by the PLX PEX 8732 chip, the physical bridges show up at 10b5:8732 87b0 PEX 8732 32-lane, 8-Port PCI Express Gen 3 (8.0 GT/s) Switch 9016 PLX 9016 8-port serial controller 9030 PCI9030 32-bit 33MHz PCI <-> IOBus Bridge - 10b5 2695 Hilscher CIF50-PB Profibus Master Board + 10b5 2695 Hilscher CIF50-PB/DPS Profibus 10b5 2862 Alpermann+Velte PCL PCI LV (3V/5V): Timecode Reader Board 10b5 2906 Alpermann+Velte PCI TS (3V/5V): Time Synchronisation Board 10b5 2940 Alpermann+Velte PCL PCI D (3V/5V): Timecode Reader Board @@ -5105,6 +5304,7 @@ 10b5 3354 Alpermann+Velte PCL PCIe LV: Timecode Reader Board 10b5 3355 Alpermann+Velte PCL PCIe L: Timecode Reader Board 10b5 3415 Alpermann+Velte PCIe TS: Time Synchronisation Board + 10b5 3493 Alpermann+Velte PCL PCIe 3G: Timecode Reader Board 1369 c001 LX6464ES 1369 c201 LX1616ES 14b4 d10a DekTec DTA-110T @@ -5137,6 +5337,15 @@ a100 Blackmagic Design DeckLink bb04 B&B 3PCIOSD1A Isolated PCI Serial c001 CronyxOmega-PCI (8-port RS232) + d00d PCI9030 32-bit 33MHz PCI <-> IOBus Bridge + 10b5 9030 Digium Tormenta 2 T400P or E400P Quad T1 or E1 PCI card + d33d PCI9030 32-bit 33MHz PCI <-> IOBus Bridge + 10b5 9030 Tormenta 3 Varion V401PT Quad T1/J1 PCI card + d44d PCI9030 32-bit 33MHz PCI <-> IOBus Bridge + 10b5 17f6 Allo CP100P/E 1-port E1/T1/J1 PCI/PCIe card + 10b5 17f7 Allo CP400P/E 4-port E1/T1/J1 PCI/PCIe card + 10b5 17f8 Allo CP200P/E 2-port E1/T1/J1 PCI/PCIe card + 10b5 9030 Tormenta 3 Varion V401PE Quad E1 PCI card 10b6 Madge Networks 0001 Smart 16/4 PCI Ringnode 0002 Smart 16/4 PCI Ringnode Mk2 @@ -5212,7 +5421,7 @@ 10b7 656b 3CCFEM656 10/100 LAN+56K Modem CardBus 6564 3cXFEM656C 10/100 LAN+Winmodem CardBus [Tornado] 7646 3cSOHO100-TX Hurricane - 7770 3CRWE777 PCI(PLX) Wireless Adaptor [Airconnect] + 7770 3CRWE777 PCI Wireless Adapter [Airconnect] 7940 3c803 FDDILink UTP Controller 7980 3c804 FDDILink SAS Controller 7990 3c805 FDDILink DAS Controller @@ -5452,7 +5661,6 @@ 10c1 ICM Co., Ltd. 10c2 Auspex Systems Inc. 10c3 Samsung Semiconductors, Inc. - 1100 Smartether100 SC1100 LAN Adapter (i82557B) 10c4 Award Software International Inc. 10c5 Xerox Corporation 10c6 Rambus Inc. @@ -5568,7 +5776,7 @@ 10de NVIDIA Corporation 0008 NV1 [EDGE 3D] 0009 NV1 [EDGE 3D] - 0020 NV4 [RIVA TNT] + 0020 NV4 [Riva TNT] 1043 0200 V3400 TNT 1048 0c18 Erazor II SGRAM 1048 0c19 Erazor II @@ -5592,7 +5800,7 @@ 10de 0020 Riva TNT 1102 1015 Graphics Blaster CT6710 1102 1016 Graphics Blaster RIVA TNT - 0028 NV5 [RIVA TNT2/TNT2 Pro] + 0028 NV5 [Riva TNT2 / TNT2 Pro] 1043 0200 AGP-V3800 SGRAM 1043 0201 AGP-V3800 SDRAM 1043 0205 PCI-V3800 @@ -5611,6 +5819,7 @@ 1092 4a00 Viper V770 1092 4a02 Viper V770 Ultra 1092 5a00 RIVA TNT2/TNT2 Pro + 1092 5a40 Viper V770D AGP 1092 6a02 Viper V770 Ultra 1092 7a02 Viper V770 Ultra 10de 0005 RIVA TNT2 Pro @@ -5619,7 +5828,7 @@ 1102 1026 3D Blaster RIVA TNT2 Digital 1462 8806 MS-8806 AGPhantom Graphics Card 14af 5810 Maxi Gamer Xentor - 0029 NV5 [RIVA TNT2 Ultra] + 0029 NV5 [Riva TNT2 Ultra] 1043 0200 AGP-V3800 Deluxe 1043 0201 AGP-V3800 Ultra SDRAM 1043 0205 PCI-V3800 Ultra @@ -5630,32 +5839,39 @@ 1102 1029 3D Blaster RIVA TNT2 Ultra 1102 102f 3D Blaster RIVA TNT2 Ultra 14af 5820 Maxi Gamer Xentor 32 + 4843 4f34 Dynamite 002a NV5 [Riva TNT2] 002b NV5 [Riva TNT2] - 002c NV6 [Vanta/Vanta LT] + 002c NV5 [Vanta / Vanta LT] 1043 0200 AGP-V3800 Combat SDRAM 1043 0201 AGP-V3800 Combat 1048 0c20 TNT2 Vanta 1048 0c21 TNT2 Vanta + 1048 0c25 TNT2 Vanta 16MB 1092 6820 Viper V730 1102 1031 CT6938 VANTA 8MB 1102 1034 CT6894 VANTA 16MB 14af 5008 Maxi Gamer Phoenix 2 - 002d NV5M64 [RIVA TNT2 Model 64/Model 64 Pro] + 002d NV5 [Riva TNT2 Model 64 / Model 64 Pro] 1043 0200 AGP-V3800M 1043 0201 AGP-V3800M 1048 0c3a Erazor III LT 1048 0c3b Erazor III LT + 107d 2137 WinFast 3D S325 10de 0006 RIVA TNT2 Model 64/Model 64 Pro 10de 001e M64 AGP4x 1102 1023 CT6892 RIVA TNT2 Value 1102 1024 CT6932 RIVA TNT2 Value 32Mb 1102 102c CT6931 RIVA TNT2 Value [Jumper] + 1102 1030 CT6931 RIVA TNT2 Value +# S26361-D1243-V116 + 110a 006f GM1000-16 +# S26361-D1243-V216 + 110a 0081 GM1000-16 1462 8808 MSI-8808 + 14af 5620 Gamer Cougar Video Edition 1554 1041 Pixelview RIVA TNT2 M64 1569 002d Palit Microsystems Daytona TNT2 M64 - 002e NV6 [Vanta] - 002f NV6 [Vanta] 0034 MCP04 SMBus 0035 MCP04 IDE 0036 MCP04 Serial ATA Controller @@ -5669,16 +5885,17 @@ 0040 NV40 [GeForce 6800 Ultra] 0041 NV40 [GeForce 6800] 1043 817b V9999 Gamer Edition - 0042 NV40.2 [GeForce 6800 LE] - 0043 NV40.3 [GeForce 6800 XE] + 107d 2992 WinFast A400 + 1458 310f Geforce 6800 GV-N6812 + 0042 NV40 [GeForce 6800 LE] + 107d 299b WinFast A400 LE + 0043 NV40 [GeForce 6800 XE] 0044 NV40 [GeForce 6800 XT] 0045 NV40 [GeForce 6800 GT] - 0046 NV45 [GeForce 6800 GT] + 1458 3140 GV-N68T256D 0047 NV40 [GeForce 6800 GS] 1682 2109 GeForce 6800 GS 0048 NV40 [GeForce 6800 XT] - 0049 NV40GL - 004d NV40GL [Quadro FX 4000] 004e NV40GL [Quadro FX 4000] 0050 CK804 ISA Bridge 1043 815a K8N4-E or A8N-E Mainboard @@ -5824,21 +6041,26 @@ 0092 G70 [GeForce 7800 GT] 0093 G70 [GeForce 7800 GS] 0095 G70 [GeForce 7800 SLI] - 0098 G70 [GeForce Go 7800] - 0099 G70 [GeForce Go 7800 GTX] + 0097 G70 [GeForce GTS 250] + 0098 G70M [GeForce Go 7800] + 0099 G70M [GeForce Go 7800 GTX] 009d G70GL [Quadro FX 4500] 00a0 NV5 [Aladdin TNT2] 14af 5810 Maxi Gamer Xentor 00c0 NV41 [GeForce 6800 GS] - 00c1 NV41.1 [GeForce 6800] - 00c2 NV41.2 [GeForce 6800 LE] - 00c3 NV42 [GeForce 6800 XT] - 00c8 NV41.8 [GeForce Go 6800] - 00c9 NV41.9 [GeForce Go 6800 Ultra] - 00cc NV41 [Quadro FX Go1400] - 00cd NV41 [Quadro FX 3450/4000 SDI] + 00c1 NV41 [GeForce 6800] + 00c2 NV41 [GeForce 6800 LE] + 00c3 NV41 [GeForce 6800 XT] + 00c5 NV41 + 00c6 NV41 + 00c7 NV41 + 00c8 NV41M [GeForce Go 6800] + 00c9 NV41M [GeForce Go 6800 Ultra] + 00cc NV41GLM [Quadro FX Go1400] + 00cd NV41GL [Quadro FX 3450/4000 SDI] 10de 029b wx4300 Workstation 00ce NV41GL [Quadro FX 1400] + 00cf NV41 00d0 nForce3 LPC Bridge 00d1 nForce3 Host Bridge 00d2 nForce3 AGP Bridge @@ -5905,7 +6127,6 @@ 147b 1c0b NF8 Mainboard 00ed nForce3 250Gb PCI-to-PCI Bridge 00ee nForce3 Serial ATA Controller 2 - 00f0 NV40 [GeForce 6800 Ultra] 00f1 NV43 [GeForce 6600 GT] 1043 81a6 N6600GT TD 128M AGP 1043 81c6 N6600GT TD 128M AGP @@ -5917,15 +6138,15 @@ 1682 211c GeForce 6600 256MB DDR DUAL DVI TV 00f3 NV43 [GeForce 6200] 00f4 NV43 [GeForce 6600 LE] - 00f5 G70 [GeForce 7800 GS] - 00f6 NV43 [GeForce 6800 GS] + 00f5 G71 [GeForce 7800 GS] + 00f6 NV43 [GeForce 6800 GS/XT] 1682 217e XFX GeForce 6800 XTreme 256MB DDR3 AGP - 00f8 NV45GL [Quadro FX 3400/4400] - 00f9 NV45 [GeForce 6800 GTO] + 00f8 NV40GL [Quadro FX 3400/4400] + 00f9 NV40 [GeForce 6800 GT/GTO/Ultra] 10de 00f9 NV40 [GeForce 6800 GT] 1682 2120 GEFORCE 6800 GT PCI-E 00fa NV36 [GeForce PCX 5750] - 00fb NV35 [GeForce PCX 5900] + 00fb NV38 [GeForce PCX 5900] 00fc NV37GL [Quadro FX 330/GeForce PCX 5300] 00fd NV37GL [Quadro PCI-E Series] 00fe NV38GL [Quadro FX 1300] @@ -5940,13 +6161,13 @@ 1048 0c48 Synergy Force 1102 102d CT6941 GeForce 256 14af 5022 3D Prophet SE - 0101 NV10DDR [GeForce 256 DDR] + 0101 NV10 [GeForce 256 DDR] 1043 0202 AGP-V6800 DDR 1043 400a AGP-V6800 DDR SGRAM 1043 400b AGP-V6800 DDR SDRAM 1048 0c42 Erazor X 107d 2822 WinFast GeForce 256 - 1102 102e CT6971 GeForce 256 DDR + 1102 102e CT6970/CT6971 14af 5021 3D Prophet DDR-DVI 0103 NV10GL [Quadro] 1048 0c40 GLoria II-64 @@ -5964,81 +6185,99 @@ 1048 0c64 Gladiac 511TV-OUT 64MB 1048 0c65 Gladiac 511TWIN 1048 0c66 Gladiac 311 + 10b0 0001 GeForce2 MX Jumbo TV 10de 0091 Dell OEM GeForce 2 MX 400 10de 00a1 Apple OEM GeForce2 MX + 1462 8523 MS-8852 1462 8817 MSI GeForce2 MX400 Pro32S [MS-8817] 14af 7102 3D Prophet II MX 14af 7103 3D Prophet II MX Dual-Display 1545 0023 Xtasy Rev. B2 - 0111 NV11DDR [GeForce2 MX200] - 0112 NV11 [GeForce2 Go] + 1554 1081 MVGA-NVG11AM(400) + 0111 NV11 [GeForce2 MX200] + 0112 NV11M [GeForce2 Go] 0113 NV11GL [Quadro2 MXR/EX/Go] 0140 NV43 [GeForce 6600 GT] + 1458 3125 GV-NX66T128D + 1458 3126 GV-NX66T256DE + 1462 8939 MS-8983 0141 NV43 [GeForce 6600] 1043 81b0 EN6600 Silencer + 107d 593a LR2A22 128MB TV OUT + 107d 597b WINFAST PX6600 1458 3124 GV-NX66128DP Turbo Force Edition 0142 NV43 [GeForce 6600 LE] 0143 NV43 [GeForce 6600 VE] - 0144 NV43 [GeForce Go 6600] + 0144 NV43M [GeForce Go 6600] 0145 NV43 [GeForce 6610 XL] - 0146 NV43 [GeForce Go 6600TE/6200TE] + 0146 NV43M [GeForce Go6200 TE / 6600 TE] 0147 NV43 [GeForce 6700 XL] - 0148 NV43 [GeForce Go 6600] - 0149 NV43 [GeForce Go 6600 GT] + 0148 NV43M [GeForce Go 6600] + 0149 NV43M [GeForce Go 6600 GT] 014a NV43 [Quadro NVS 440] - 014c NV43 [Quadro FX 540 MXM] + 014b NV43 014d NV43GL [Quadro FX 550] 014e NV43GL [Quadro FX 540] 014f NV43 [GeForce 6200] 0150 NV15 [GeForce2 GTS/Pro] 1043 4016 V7700 AGP Video Card + 1043 402a AGP-V7700 1048 0c50 Gladiac 1048 0c52 Gladiac-64 107d 2840 WinFast GeForce2 GTS with TV output 107d 2842 WinFast GeForce 2 Pro 10de 002e GeForce2 GTS + 1462 815a MS-8815 1462 8831 Creative GeForce2 Pro - 0151 NV15DDR [GeForce2 Ti] + 0151 NV15 [GeForce2 Ti] 1043 405f V7700Ti 1462 5506 Creative 3D Blaster GeForce2 Titanium - 0152 NV15BR [GeForce2 Ultra, Bladerunner] + 1462 8364 MS-8836 + 0152 NV15 [GeForce2 Ultra] 1048 0c56 GLADIAC Ultra 0153 NV15GL [Quadro2 Pro] 0160 NV44 [GeForce 6500] - 0161 NV44 [GeForce 6200 TurboCache(TM)] - 0162 NV44 [GeForce 6200SE TurboCache (TM)] + 0161 NV44 [GeForce 6200 TurboCache] + 0162 NV44 [GeForce 6200 SE TurboCache] 0163 NV44 [GeForce 6200 LE] - 0164 NV44 [GeForce Go 6200] + 0164 NV44M [GeForce Go 6200] 0165 NV44 [Quadro NVS 285] - 0166 NV44 [GeForce Go 6400] - 0167 NV44 [GeForce Go 6200] - 0168 NV44 [GeForce Go 6400] + 0166 NV44M [GeForce Go 6400] + 0167 NV44M [GeForce Go 6200] + 0168 NV44M [GeForce Go 6400] 0169 NV44 [GeForce 6250] 016a NV44 [GeForce 7100 GS] + 016d NV44 + 016e NV44 + 016f NV44 0170 NV17 [GeForce4 MX 460] + 1462 8630 MS-8863 0171 NV17 [GeForce4 MX 440] 10b0 0002 Gainward Pro/600 TV 10de 0008 Apple OEM GeForce4 MX 440 1462 8661 G4MX440-VTP 1462 8730 MX440SES-T (MS-8873) + 1462 8743 MS-8874 1462 8852 GeForce4 MX440 PCI 147b 8f00 Abit Siluro GeForce4MX440 0172 NV17 [GeForce4 MX 420] + 1462 8730 MS-8873 + 1462 8784 MS-8878 0173 NV17 [GeForce4 MX 440-SE] - 0174 NV17 [GeForce4 440 Go] - 0175 NV17 [GeForce4 420 Go] - 0176 NV17 [GeForce4 420 Go 32M] + 0174 NV17M [GeForce4 440 Go] + 0175 NV17M [GeForce4 420 Go] + 0176 NV17M [GeForce4 420 Go 32M] 103c 08b0 tc1100 tablet 144d c005 X10 Laptop 4c53 1090 Cx9 / Vx9 mainboard - 0177 NV17 [GeForce4 460 Go] + 0177 NV17M [GeForce4 460 Go] 0178 NV17GL [Quadro4 550 XGL] - 0179 NV17 [GeForce4 440 Go 64M] + 0179 NV17M [GeForce4 440 Go 64M] 10de 0179 GeForce4 MX (Mac) 017a NV17GL [Quadro NVS] 017b NV17GL [Quadro4 550 XGL] 017c NV17GL [Quadro4 500 GoGL] - 017d NV17 [GeForce4 410 Go 16M] + 017f NV17 0181 NV18 [GeForce4 MX 440 AGP 8x] 1043 8063 GeForce4 MX 440 AGP 8X 1043 806f V9180 Magic @@ -6059,14 +6298,16 @@ 018b NV18GL [Quadro4 380 XGL] 018c NV18GL [Quadro NVS 50 PCI] 018d NV18M [GeForce4 448 Go] + 018f NV18 + 0190 G80 [GeForce 8800 GTS / 8800 GTX] 0191 G80 [GeForce 8800 GTX] + 0192 G80 [GeForce 8800 GTS] 0193 G80 [GeForce 8800 GTS] 107d 20bd WinFast PX 8800 GTS TDH 0194 G80 [GeForce 8800 Ultra] -# Found in GPU server Tesla D870 and S870 - 0197 G80 [Tesla C870] - 019d G80 [Quadro FX 5600] - 019e G80 [Quadro FX 4600] + 0197 G80GL [Tesla C870] + 019d G80GL [Quadro FX 5600] + 019e G80GL [Quadro FX 4600] 01a0 nForce 220/420 NV11 [GeForce2 MX] 01a4 nForce CPU bridge 01ab nForce 420 Memory Controller (DDR) @@ -6084,9 +6325,12 @@ 01c3 nForce Ethernet Controller 01d0 G72 [GeForce 7350 LE] 01d1 G72 [GeForce 7300 LE] + 107d 5efa WinFast PX7300LE-TD128 + 107d 5efb WinFast PX7300LE-TD256 1462 0345 7300LE PCI Express Graphics Adapter 01d2 G72 [GeForce 7550 LE] - 01d3 G72 [GeForce 7300 SE/7200 GS] + 01d3 G72 [GeForce 7200 GS / 7300 SE] + 01d5 G72 01d6 G72M [GeForce Go 7200] 01d7 G72M [Quadro NVS 110M/GeForce Go 7300] 01d8 G72M [GeForce Go 7400] @@ -6094,11 +6338,11 @@ 01d9 G72M [GeForce Go 7450] 01da G72M [Quadro NVS 110M] 01db G72M [Quadro NVS 120M] - 01dc G72GL [Quadro FX 350M] + 01dc G72GLM [Quadro FX 350M] 01dd G72 [GeForce 7500 LE] 01de G72GL [Quadro FX 350] 10de 01dc Quadro FX Go350M - 01df G71 [GeForce 7300 GS] + 01df G72 [GeForce 7300 GS] 01e0 nForce2 IGP2 147b 1c09 NV7 Motherboard 01e8 nForce2 AGP @@ -6115,7 +6359,7 @@ a0a0 03b9 UK79G-1394 motherboard 01ef nForce2 Memory Controller 5 a0a0 03b9 UK79G-1394 motherboard - 01f0 NV18 [GeForce4 MX - nForce GPU] + 01f0 C17 [GeForce4 MX IGP] a0a0 03b5 UK79G-1394 motherboard 0200 NV20 [GeForce3] 1043 402f AGP-V8200 DDR @@ -6124,7 +6368,7 @@ 0202 NV20 [GeForce3 Ti 500] 1043 405b V8200 T5 1545 002f Xtasy 6964 - 0203 NV20DCC [Quadro DCC] + 0203 NV20GL [Quadro DCC] 0211 NV48 [GeForce 6800] 0212 NV48 [GeForce 6800 LE] 0215 NV48 [GeForce 6800 GT] @@ -6133,6 +6377,7 @@ 1043 81e1 N6200/TD/256M/A 3842 a341 256A8N341DX 0222 NV44 [GeForce 6200 A-LE] + 0224 NV44 0240 C51PV [GeForce 6150] 1043 81cd A8N-VM CSM 1462 7207 K8NGM2 series @@ -6257,7 +6502,7 @@ 0280 NV28 [GeForce4 Ti 4800] 0281 NV28 [GeForce4 Ti 4200 AGP 8x] 0282 NV28 [GeForce4 Ti 4800 SE] - 0286 NV28 [GeForce4 Ti 4200 Go AGP 8x] + 0286 NV28M [GeForce4 Ti 4200 Go AGP 8x] 0288 NV28GL [Quadro4 980 XGL] 0289 NV28GL [Quadro4 780 XGL] 028c NV28GLM [Quadro4 Go700] @@ -6271,15 +6516,16 @@ 1043 8225 GeForce 7950 GT 107d 2a68 WinFast PX7950GT TDH 1462 0663 NX7950GT-VT2D512EZ-HD - 0297 G71 [GeForce Go 7950 GTX] - 0298 G71 [GeForce Go 7900 GS] - 0299 G71 [GeForce Go 7900 GTX] - 029a G71 [Quadro FX 2500M] - 029b G71 [Quadro FX 1500M] - 029c G71 [Quadro FX 5500] + 0297 G71M [GeForce Go 7950 GTX] + 0298 G71M [GeForce Go 7900 GS] + 0299 G71M [GeForce Go 7900 GTX] + 029a G71GLM [Quadro FX 2500M] + 029b G71GLM [Quadro FX 1500M] + 029c G71GL [Quadro FX 5500] 029d G71GL [Quadro FX 3500] - 029e G71 [Quadro FX 1500] - 029f G70 [Quadro FX 4500 X2] + 1028 019b G71GLM [Quadro FX 3500M] + 029e G71GL [Quadro FX 1500] + 029f G71GL [Quadro FX 4500 X2] # Xbox Graphics Processing Unit (Integrated). GeForce3 derivative (NV20 < NV2A < NV25). 02a0 NV2A [XGPU] 02a5 MCPX CPU Bridge @@ -6313,6 +6559,7 @@ 1458 5000 GA-M55plus-S3G 1462 7207 K8NGM2 series 02f9 C51 Memory Controller 4 + 103c 2a34 Pavilion a1677c 103c 30b7 Presario V6133CL 1043 81cd A8N-VM CSM Mainboard 1458 5000 GA-M55plus-S3G @@ -6347,22 +6594,19 @@ 0309 NV30GL [Quadro FX 1000] 0311 NV31 [GeForce FX 5600 Ultra] 0312 NV31 [GeForce FX 5600] - 0313 NV31 0314 NV31 [GeForce FX 5600XT] 1043 814a V9560XT/TD 0316 NV31M - 0317 NV31M Pro + 0318 NV31GL 031a NV31M [GeForce FX Go5600] 031b NV31M [GeForce FX Go5650] - 031c NV31 [Quadro FX Go700] - 031d NV31GLM - 031e NV31GLM Pro - 031f NV31GLM Pro + 031c NV31GLM [Quadro FX Go700] 0320 NV34 [GeForce FX 5200] 0321 NV34 [GeForce FX 5200 Ultra] 0322 NV34 [GeForce FX 5200] 1043 02fb V9250 Magic 1043 8180 V9520-X/TD/128M + 107d 2967 WinFast A340T 128MB 1462 9110 MS-8911 (FX5200-TD128) 1462 9171 MS-8917 (FX5200-T128) 1462 9360 MS-8936 (FX5200-T128) @@ -6382,9 +6626,10 @@ 10de 0010 Powerbook G4 032a NV34GL [Quadro NVS 280 PCI] 032b NV34GL [Quadro FX 500/600 PCI] - 032c NV34GLM [GeForce FX Go 5300] - 032d NV34 [GeForce FX Go5100] - 032f NV34GL + 032c NV34M [GeForce FX Go5300 / Go5350] + 032d NV34M [GeForce FX Go5100] + 032e NV34 + 032f NV34 [GeForce FX 5200] 0330 NV35 [GeForce FX 5900 Ultra] 1043 8137 V9950 Ultra / 256 MB 0331 NV35 [GeForce FX 5900] @@ -6395,20 +6640,17 @@ 1462 9373 FX5900ZT-VTD128 (MS-8937) 0338 NV35GL [Quadro FX 3000] 033f NV35GL [Quadro FX 700] - 0341 NV36.1 [GeForce FX 5700 Ultra] + 0341 NV36 [GeForce FX 5700 Ultra] 1462 9380 MS-8938 (FX5700U-TD128) - 0342 NV36.2 [GeForce FX 5700] + 0342 NV36 [GeForce FX 5700] 0343 NV36 [GeForce FX 5700LE] - 0344 NV36.4 [GeForce FX 5700VE] - 0345 NV36.5 - 0347 NV36 [GeForce FX Go5700] + 0344 NV36 [GeForce FX 5700VE] + 0347 NV36M [GeForce FX Go5700] 103c 006a NX9500 - 0348 NV36 [GeForce FX Go5700] - 0349 NV36M Pro - 034b NV36MAP + 0348 NV36M [GeForce FX Go5700] 034c NV36 [Quadro FX Go1000] + 034d NV36 034e NV36GL [Quadro FX 1100] - 034f NV36GL 0360 MCP55 LPC Bridge 0361 MCP55 LPC Bridge 1028 0221 PowerEdge R805 MCP55 LPC Bridge @@ -6465,15 +6707,18 @@ 1462 0412 NX7300GT-TD256EH 0394 G73 [GeForce 7600 LE] 0395 G73 [GeForce 7300 GT] - 0397 G73 [GeForce Go 7700] - 0398 G73 [GeForce Go 7600] + 0396 G73 + 0397 G73M [GeForce Go 7700] + 0398 G73M [GeForce Go 7600] 1025 006c Acer 9814 WKMI - 0399 G73 [GeForce Go 7600 GT] + 0399 G73M [GeForce Go 7600 GT] 039a G73M [Quadro NVS 300M] - 039b G73 [GeForce Go 7900 SE] - 039c G73 [Quadro FX 550M] + 039b G73M [GeForce Go 7900 SE] + 039c G73GLM [Quadro FX 550M] 10de 039c Quadro FX 560M + 039d G73 039e G73GL [Quadro FX 560] + 039f G73 03a0 C55 Host Bridge 03a1 C55 Host Bridge 03a2 C55 Host Bridge @@ -6572,75 +6817,93 @@ 03f7 MCP61 SATA Controller 0400 G84 [GeForce 8600 GTS] 1043 8241 EN8600GTS - 0401 G84 [GeForce 8600GT] + 0401 G84 [GeForce 8600 GT] 0402 G84 [GeForce 8600 GT] 1458 3455 GV-NX86T512H 1462 0910 NX8600GT-T2D256EZ 0403 G84 [GeForce 8600 GS] 0404 G84 [GeForce 8400 GS] 1462 1230 NX8400GS-TD256E - 0405 G84 [GeForce 9500M GS] + 0405 G84M [GeForce 9500M GS] 0406 G84 [GeForce 8300 GS] - 0407 G84 [GeForce 8600M GT] - 0408 G84 [GeForce 9650M GS] - 0409 G84 [GeForce 8700M GT] - 040a G84 [Quadro FX 370] - 040b G84M [Quadro NVS 320M] - 040c G84M [Quadro FX 570M] + 0407 G84M [GeForce 8600M GT] + 0408 G84M [GeForce 9650M GS] + 0409 G84M [GeForce 8700M GT] + 040a G84GL [Quadro FX 370] + 040b G84GLM [Quadro NVS 320M] + 040c G84GLM [Quadro FX 570M] 17aa 20d9 ThinkPad T61p - 040d G84 [Quadro FX 1600M] - 040e G84 [Quadro FX 570] - 040f G84 [Quadro FX 1700] + 040d G84GLM [Quadro FX 1600M] + 040e G84GL [Quadro FX 570] + 040f G84GL [Quadro FX 1700] 0410 G92 [GeForce GT 330] + 0414 G92 [GeForce 9800 GT] 0420 G86 [GeForce 8400 SE] 0421 G86 [GeForce 8500 GT] 1462 0960 NX8500GT-TD512EH/M2 0422 G86 [GeForce 8400 GS] 0423 G86 [GeForce 8300 GS] 0424 G86 [GeForce 8400 GS] - 0425 G86 [GeForce 8600M GS] + 0425 G86M [GeForce 8600M GS] 1025 0121 Aspire 5920G - 0426 G86 [GeForce 8400M GT] - 0427 G86 [GeForce 8400M GS] + 0426 G86M [GeForce 8400M GT] + 0427 G86M [GeForce 8400M GS] 103c 30cc Pavilion dv6700 - 0428 G86 [GeForce 8400M G] - 0429 G86 [Quadro NVS 140M] + 103c 30cf Pavilion dv9668eg Laptop + 0428 G86M [GeForce 8400M G] + 0429 G86M [Quadro NVS 140M] 17aa 20d8 ThinkPad T61 042a G86M [Quadro NVS 130M] 042b G86M [Quadro NVS 135M] 042c G86 [GeForce 9400 GT] - 042d G86M [Quadro FX 360M] - 042e G86 [GeForce 9300M G] + 042d G86GLM [Quadro FX 360M] + 042e G86M [GeForce 9300M G] 042f G86 [Quadro NVS 290] 0440 MCP65 LPC Bridge 0441 MCP65 LPC Bridge 0442 MCP65 LPC Bridge + 103c 30cf Pavilion dv9668eg Laptop 0443 MCP65 LPC Bridge 0444 MCP65 Memory Controller + 103c 30cf Pavilion dv9668eg Laptop 0445 MCP65 Memory Controller 0446 MCP65 SMBus + 103c 30cf Pavilion dv9668eg Laptop 0447 MCP65 SMU + 103c 30cf Pavilion dv9668eg Laptop 0448 MCP65 IDE + 103c 30cf Pavilion dv9668eg Laptop 0449 MCP65 PCI bridge + 10de cb84 HP Pavilion dv9668eg Laptop 044a MCP65 High Definition Audio + 103c 30cf Pavilion dv9668eg Laptop 044b MCP65 High Definition Audio 044c MCP65 AHCI Controller 044d MCP65 AHCI Controller 044e MCP65 AHCI Controller 044f MCP65 AHCI Controller 0450 MCP65 Ethernet + 103c 30cf Pavilion dv9668eg Laptop 0451 MCP65 Ethernet 0452 MCP65 Ethernet 0453 MCP65 Ethernet - 0454 MCP65 USB Controller - 0455 MCP65 USB Controller + 0454 MCP65 USB 1.1 OHCI Controller + 103c 30cf Pavilion dv9668eg Laptop + 0455 MCP65 USB 2.0 EHCI Controller + 103c 30cf Pavilion dv9668eg Laptop 0456 MCP65 USB Controller 0457 MCP65 USB Controller 0458 MCP65 PCI Express bridge + 10de 0000 MCP65 PCI Express bridge 0459 MCP65 PCI Express bridge + 10de 0000 MCP65 PCI Express bridge 045a MCP65 PCI Express bridge + 10de 0000 MCP65 PCI Express bridge + 045b MCP65 PCI Express bridge + 10de 0000 MCP65 PCI Express bridge 045c MCP65 SATA Controller 045d MCP65 SATA Controller + 103c 30cf Pavilion dv9668eg Laptop 045e MCP65 SATA Controller 045f MCP65 SATA Controller 0531 C67 [GeForce 7150M / nForce 630M] @@ -6709,41 +6972,41 @@ 05be NF200 PCIe 2.0 switch for Quadro Plex S4 / Tesla S870 / Tesla S1070 / Tesla S2050 05e0 GT200b [GeForce GTX 295] 05e1 GT200 [GeForce GTX 280] -# GT200 [GTX 260] or GT200 [GTX 260-216] or GT200b [GTX 260-216] 05e2 GT200 [GeForce GTX 260] 05e3 GT200b [GeForce GTX 285] 05e6 GT200b [GeForce GTX 275] -# Found in GPU server Tesla S1070 - 05e7 GT200 [Tesla C1060] + 05e7 GT200GL [Tesla C1060 / M1060] 05ea GT200 [GeForce GTX 260] 05eb GT200 [GeForce GTX 295] 05ed GT200GL [Quadro Plex 2200 D2] + 05f1 GT200 [GeForce GTX 280] + 05f2 GT200 [GeForce GTX 260] 05f8 GT200GL [Quadro Plex 2200 S4] 05f9 GT200GL [Quadro CX] 05fd GT200GL [Quadro FX 5800] 05fe GT200GL [Quadro FX 4800] - 05ff GT200GL [NVIDIA Quadro FX 3800] + 05ff GT200GL [Quadro FX 3800] 0600 G92 [GeForce 8800 GTS 512] 0601 G92 [GeForce 9800 GT] 0602 G92 [GeForce 8800 GT] - 0603 G92 [GeForce GT 230] + 0603 G92 [GeForce GT 230 OEM] 0604 G92 [GeForce 9800 GX2] 0605 G92 [GeForce 9800 GT] 0606 G92 [GeForce 8800 GS] 0607 G92 [GeForce GTS 240] - 0608 G92 [GeForce 9800M GTX] - 0609 G92 [GeForce 8800M GTS] - 060a GT200 [GeForce GTX 280M] - 060b G92 [GeForce 9800M GT] - 060c G92 [GeForce 8800M GTX] + 0608 G92M [GeForce 9800M GTX] + 0609 G92M [GeForce 8800M GTS] + 060a G92M [GeForce GTX 280M] + 060b G92M [GeForce 9800M GT] + 060c G92M [GeForce 8800M GTX] 060d G92 [GeForce 8800 GS] - 060f G92 [GeForce GTX 285M] + 060f G92M [GeForce GTX 285M] 0610 G92 [GeForce 9600 GSO] 1682 2385 GeForce 9600 GSO 768mb 0611 G92 [GeForce 8800 GT] 107d 2ab0 Winfast PX8800 GT PCI-E 19da 1040 ZT-88TES2P-FSP - 0612 G92 [GeForce 9800 GTX] + 0612 G92 [GeForce 9800 GTX / 9800 GTX+] 0613 G92 [GeForce 9800 GTX+] 0614 G92 [GeForce 9800 GT] 107d 2ab3 WinFast PX9800 GT (S-Fanpipe) @@ -6754,15 +7017,17 @@ 3842 1155 GeForce GTS 250 P/N 01G-P3-1155-TR # Overclocked 3842 1156 GeForce GTS 250 P/N 01G-P3-1156-TR - 0617 G92 [GeForce 9800M GTX] - 0618 G92 [GeForce GTX 260M] + 0617 G92M [GeForce 9800M GTX] + 0618 G92M [GeForce GTX 260M] 0619 G92GL [Quadro FX 4700 X2] - 061a G92 [Quadro FX 3700] + 061a G92GL [Quadro FX 3700] 061b G92GL [Quadro VX 200] - 061c G92M [Quadro FX 3600M] - 061d G92 [Quadro FX 2800M] - 061e G92 [Quadro FX 3700M] - 061f G92 [Quadro FX 3800M] + 061c G92GLM [Quadro FX 3600M] + 061d G92GLM [Quadro FX 2800M] + 061e G92GLM [Quadro FX 3700M] + 061f G92GLM [Quadro FX 3800M] + 0620 G94 [GeForce 9800 GT] + 0621 G94 [GeForce GT 230] 0622 G94 [GeForce 9600 GT] 107d 2ac1 WinFast PX9600GT 1024MB 1458 3481 GV-NX96T512HP @@ -6771,72 +7036,106 @@ 0625 G94 [GeForce 9600 GSO 512] 0626 G94 [GeForce GT 130] 0627 G94 [GeForce GT 140] - 0628 G94 [GeForce 9800M GTS] - 062a G94 [GeForce 9700M GTS] - 062b G94 [GeForce 9800M GS] - 062c G94 [GeForce 9800M GTS] + 0628 G94M [GeForce 9800M GTS] + 062a G94M [GeForce 9700M GTS] + 062b G94M [GeForce 9800M GS] + 062c G94M [GeForce 9800M GTS] 062d G94 [GeForce 9600 GT] 062e G94 [GeForce 9600 GT] + 062f G94 [GeForce 9800 S] + 0630 G94 [GeForce 9600 GT] 0631 G94M [GeForce GTS 160M] 0632 G94M [GeForce GTS 150M] + 0633 G94 [GeForce GT 220] 0635 G94 [GeForce 9600 GSO] 0637 G94 [GeForce 9600 GT] - 0638 G94 [Quadro FX 1800] - 063a G94M [Quadro FX 2700M] + 0638 G94GL [Quadro FX 1800] + 063a G94GLM [Quadro FX 2700M] + 063f G94 [GeForce 9600 GE] 0640 G96 [GeForce 9500 GT] 0641 G96 [GeForce 9400 GT] 0643 G96 [GeForce 9500 GT] 0644 G96 [GeForce 9500 GS] 0645 G96 [GeForce 9500 GS] 0646 G96 [GeForce GT 120] - 0647 G96 [GeForce 9600M GT] - 0648 G96 [GeForce 9600M GS] - 0649 G96 [GeForce 9600M GT] - 064a G96 [GeForce 9700M GT] - 064b G96 [GeForce 9500M G] - 064c G96 [GeForce 9650M GT] - 0651 G96 [GeForce G 110M] - 0652 G96 [GeForce GT 130M] + 0647 G96M [GeForce 9600M GT] + 0648 G96M [GeForce 9600M GS] + 0649 G96M [GeForce 9600M GT] + 064a G96M [GeForce 9700M GT] + 064b G96M [GeForce 9500M G] + 064c G96M [GeForce 9650M GT] + 064d G96 [GeForce 9600 GT] + 064e G96 [GeForce 9600 GT / 9800 GT] + 0651 G96M [GeForce G 110M] + 0652 G96M [GeForce GT 130M] 0653 G96M [GeForce GT 120M] - 0654 G96 [GeForce GT 220M] + 0654 G96M [GeForce GT 220M] + 0655 G96 [GeForce GT 120] 0656 G96 [GeForce 9650 S] - 0658 G96 [Quadro FX 380] - 0659 G96 [Quadro FX 580] - 065a G96 [Quadro FX 1700M] + 0658 G96GL [Quadro FX 380] + 0659 G96GL [Quadro FX 580] + 065a G96GLM [Quadro FX 1700M] 065b G96 [GeForce 9400 GT] - 065c G96M [Quadro FX 770M] + 065c G96GLM [Quadro FX 770M] + 065d G96 [GeForce 9500 GA / 9600 GT / GTS 250] + 065f G96 [GeForce G210] 06c0 GF100 [GeForce GTX 480] + 06c4 GF100 [GeForce GTX 465] + 06ca GF100M [GeForce GTX 480M] + 06cb GF100 [GeForce GTX 480] 06cd GF100 [GeForce GTX 470] - 06d1 GF100 [Tesla C2050 / C2070] - 06d2 GF100 [Tesla M2070] + 06d1 GF100GL [Tesla C2050 / C2070] + 10de 0771 Tesla C2050 + 10de 0772 Tesla C2070 + 06d2 GF100GL [Tesla M2070] + 10de 0774 Tesla M2070 + 10de 0830 Tesla M2070 + 10de 0842 Tesla M2070 + 10de 088f Tesla X2070 + 10de 0908 Tesla M2070 06d8 GF100GL [Quadro 6000] 06d9 GF100GL [Quadro 5000] + 06da GF100GLM [Quadro 5000M] + 06dc GF100GL [Quadro 6000] 06dd GF100GL [Quadro 4000] - 06de GF100 [Tesla S2050] - 06df GF100 [Tesla M2070Q] + 06de GF100GL [Tesla T20 Processor] + 10de 0773 Tesla S2050 + 10de 082f Tesla M2050 + 10de 0840 Tesla X2070 + 10de 0842 Tesla M2050 + 10de 0846 Tesla M2050 + 10de 0866 Tesla M2050 + 10de 0907 Tesla M2050 + 10de 091e Tesla M2050 + 06df GF100GL [Tesla M2070-Q] + 10de 084d Tesla M2070-Q + 10de 087f Tesla M2070-Q 06e0 G98 [GeForce 9300 GE] 06e1 G98 [GeForce 9300 GS] 06e2 G98 [GeForce 8400] 06e3 G98 [GeForce 8300 GS] - 06e4 G98 [GeForce 8400 GS] + 06e4 G98 [GeForce 8400 GS Rev. 2] 1458 3475 GV-NX84S256HE [GeForce 8400 GS] - 06e5 G98 [GeForce 9300M GS] + 06e5 G98M [GeForce 9300M GS] 06e6 G98 [GeForce G 100] 06e7 G98 [GeForce 9300 SE] - 06e8 G98 [GeForce 9200M GS] - 06e9 G98 [GeForce 9300M GS] + 06e8 G98M [GeForce 9200M GS] + 06e9 G98M [GeForce 9300M GS] 1043 19b2 U6V laptop - 06ea G86M [Quadro NVS 150M] + 06ea G98M [Quadro NVS 150M] 06eb G98M [Quadro NVS 160M] 06ec G98M [GeForce G 105M] + 06ed G98 [GeForce 9600 GT / 9800 GT] + 06ee G98 [GeForce 9600 GT / 9800 GT] 06ef G98M [GeForce G 103M] 06f1 G98M [GeForce G 105M] 06f8 G98 [Quadro NVS 420] - 06f9 G98 [Quadro FX 370 LP] + 06f9 G98GL [Quadro FX 370 LP] 06fa G98 [Quadro NVS 450] - 06fb G98 [Quadro FX 370M] + 06fb G98GLM [Quadro FX 370M] 06fd G98 [Quadro NVS 295] 06ff G98 [HICx16 + Graphics] + 10de 0711 HICx8 + Graphics 0751 MCP78S [GeForce 8200] Memory Controller 103c 2a9e Pavilion p6310f 1043 82e8 M3N72-D @@ -6999,7 +7298,7 @@ 1849 0849 K10N78FullHD-hSLI R3.0 GeForce 8200 084a C77 [nForce 730a] 084b C77 [GeForce 8200] - 084c C77 [nForce 780a SLI] + 084c C77 [nForce 780a/980a SLI] 084d C77 [nForce 750a SLI] 1043 82e8 M3N72-D mGPU 084f C77 [GeForce 8100 / nForce 720a] @@ -7008,10 +7307,12 @@ 0862 C79 [GeForce 9400M G] 0863 C79 [GeForce 9400M] 0864 C79 [GeForce 9300] - 0865 C79 [GeForce 9300] + 0865 C79 [GeForce 9300/ION] 0866 C79 [GeForce 9400M G] 0867 C79 [GeForce 9400] + 106b 00ad iMac 9,1 0868 C79 [nForce 760i SLI] + 0869 MCP7A [GeForce 9400] 086a C79 [GeForce 9400] 086c C79 [GeForce 9300 / nForce 730i] 086d C79 [GeForce 9200] @@ -7028,21 +7329,28 @@ 19da a123 IONITX-F-E 087e ION LE VGA 087f ION LE VGA + 08a2 MCP89 [GeForce 320M] 08a3 MCP89 [GeForce 320M] 08a4 MCP89 [GeForce 320M] 0a20 GT216 [GeForce GT 220] 1043 8311 ENGT220/DI/1GD3(LP)/V2 - 0a23 GT218 [GeForce 210] - 0a28 GT216 [GeForce GT 230M] - 0a29 GT216 [GeForce GT 330M] - 0a2a GT216 [GeForce GT 230M] - 0a2b GT216 [GeForce GT 330M] - 0a2c GT216 [NVS 5100M] - 0a2d GT216 [GeForce GT 320M] - 0a34 GT216 [GeForce GT 240M] - 0a35 GT216 [GeForce GT 325M] + 0a21 GT216M [GeForce GT 330M] + 0a22 GT216 [GeForce 315] + 0a23 GT216 [GeForce 210] + 0a26 GT216 [GeForce 405] + 0a27 GT216 [GeForce 405] + 0a28 GT216M [GeForce GT 230M] + 0a29 GT216M [GeForce GT 330M] + 0a2a GT216M [GeForce GT 230M] + 0a2b GT216M [GeForce GT 330M] + 0a2c GT216M [NVS 5100M] + 0a2d GT216M [GeForce GT 320M] + 0a30 GT216 [GeForce 505] + 0a32 GT216 [GeForce GT 415] + 0a34 GT216M [GeForce GT 240M] + 0a35 GT216M [GeForce GT 325M] 0a38 GT216GL [Quadro 400] - 0a3c GT216 [Quadro FX 880M] + 0a3c GT216GLM [Quadro FX 880M] 0a60 GT218 [GeForce G210] 0a62 GT218 [GeForce 205] 0a63 GT218 [GeForce 310] @@ -7050,23 +7358,26 @@ 0a65 GT218 [GeForce 210] 1043 8334 EN210 SILENT 0a66 GT218 [GeForce 310] - 0a68 G98M [GeForce G105M] - 0a69 G98M [GeForce G105M] - 0a6a GT218 [NVS 2100M] - 0a6c GT218 [NVS 3100M] + 0a67 GT218 [GeForce 315] + 0a68 GT218M [GeForce G 105M] + 0a69 GT218M [GeForce G 105M] + 0a6a GT218M [NVS 2100M] + 0a6c GT218M [NVS 3100M] 1028 040b Latitude E6510 17aa 2142 ThinkPad T410 - 0a6e GT218 [GeForce 305M] + 0a6e GT218M [GeForce 305M] 0a6f GT218 [ION] - 0a70 GT218 [GeForce 310M] - 0a71 GT218 [GeForce 305M] - 0a72 GT218 [GeForce 310M] - 0a73 GT218 [GeForce 305M] - 0a74 GT218 [GeForce G210M] - 0a75 GT218 [GeForce 310M] + 0a70 GT218M [GeForce 310M] + 0a71 GT218M [GeForce 305M] + 0a72 GT218M [GeForce 310M] + 0a73 GT218M [GeForce 305M] + 0a74 GT218M [GeForce G210M] + 0a75 GT218M [GeForce 310M] 0a76 GT218 [ION 2] 0a78 GT218GL [Quadro FX 380 LP] - 0a7c GT218 [Quadro FX 380M] + 0a7a GT218M [GeForce 315M] + 0a7b GT218 [GeForce 505] + 0a7c GT218GLM [Quadro FX 380M] 0a80 MCP79 Host Bridge 0a81 MCP79 Host Bridge 0a82 MCP79 Host Bridge @@ -7077,30 +7388,42 @@ 0a87 MCP79 Host Bridge 0a88 MCP79 Memory Controller 0a89 MCP79 Memory Controller + 0a98 MCP79 Memory Controller + 10de cb79 iMac 9,1 0aa0 MCP79 PCI Express Bridge + 10de cb79 Apple iMac 9,1 0aa2 MCP79 SMBus + 10de cb79 Apple iMac 9,1 19da a123 IONITX-F-E 0aa3 MCP79 Co-processor + 10de cb79 Apple iMac 9,1 19da a123 IONITX-F-E 0aa4 MCP79 Memory Controller 19da a123 IONITX-F-E 0aa5 MCP79 OHCI USB 1.1 Controller + 10de cb79 Apple iMac 9,1 19da a123 IONITX-F-E 0aa6 MCP79 EHCI USB 2.0 Controller + 10de cb79 Apple iMac 9,1 19da a123 IONITX-F-E 0aa7 MCP79 OHCI USB 1.1 Controller + 10de cb79 Apple iMac 9,1 19da a123 IONITX-F-E 0aa8 MCP79 OHCI USB 1.1 Controller 0aa9 MCP79 EHCI USB 2.0 Controller + 10de cb79 Apple iMac 9,1 19da a123 IONITX-F-E 0aaa MCP79 EHCI USB 2.0 Controller 0aab MCP79 PCI Bridge + 10de cb79 Apple iMac 9,1 0aac MCP79 LPC Bridge 0aad MCP79 LPC Bridge 19da a123 IONITX-F-E 0aae MCP79 LPC Bridge + 10de cb79 Apple iMac 9,1 0aaf MCP79 LPC Bridge 0ab0 MCP79 Ethernet + 10de cb79 Apple iMac 9,1 19da a123 IONITX-F-E 0ab1 MCP79 Ethernet 0ab2 MCP79 Ethernet @@ -7112,6 +7435,7 @@ 0ab7 MCP79 SATA Controller 0ab8 MCP79 AHCI Controller 0ab9 MCP79 AHCI Controller + 10de cb79 Apple iMac 9,1 0aba MCP79 AHCI Controller 0abb MCP79 AHCI Controller 0abc MCP79 RAID Controller @@ -7119,13 +7443,17 @@ 0abe MCP79 RAID Controller 0abf MCP79 RAID Controller 0ac0 MCP79 High Definition Audio + 10de cb79 Apple iMac 9,1 0ac1 MCP79 High Definition Audio 0ac2 MCP79 High Definition Audio 0ac3 MCP79 High Definition Audio 0ac4 MCP79 PCI Express Bridge + 10de cb79 Apple iMac 9,1 0ac5 MCP79 PCI Express Bridge 0ac6 MCP79 PCI Express Bridge + 10de cb79 Apple iMac 9,1 0ac7 MCP79 PCI Express Bridge + 10de cb79 Apple iMac 9,1 0ac8 MCP79 PCI Express Bridge 0ad0 MCP78S [GeForce 8200] SATA Controller (non-AHCI mode) 1462 7508 K9N2GM-FIH @@ -7144,6 +7472,7 @@ 0be5 GF100 High Definition Audio Controller 0be9 GF106 High Definition Audio Controller 1558 8687 CLEVO/KAPOK W860CU + 3842 1452 GeForce GTS 450 0bea GF108 High Definition Audio Controller 3842 1430 GeForce GT 430 0beb GF104 High Definition Audio Controller @@ -7153,13 +7482,15 @@ 0ca2 GT215 [GeForce GT 320] 0ca3 GT215 [GeForce GT 240] 0ca4 GT215 [GeForce GT 340] + 0ca5 GT215 [GeForce GT 220] 0ca7 GT215 [GeForce GT 330] - 0ca8 GT215 [GeForce GTS 260M] - 0ca9 GT215 [GeForce GTS 250M] - 0caf GT215 [GeForce GT 335M] - 0cb0 GT215 [GeForce GTS 350M] - 0cb1 GT215 [GeForce GTS 360M] - 0cbc GT215 [Quadro FX 1800M] + 0ca8 GT215M [GeForce GTS 260M] + 0ca9 GT215M [GeForce GTS 250M] + 0cac GT215 [GeForce GT 220/315] + 0caf GT215M [GeForce GT 335M] + 0cb0 GT215M [GeForce GTS 350M] + 0cb1 GT215M [GeForce GTS 360M] + 0cbc GT215GLM [Quadro FX 1800M] 0d60 MCP89 HOST Bridge 0d68 MCP89 Memory Controller 0d69 MCP89 Memory Controller @@ -7176,81 +7507,287 @@ 0d94 MCP89 High Definition Audio 0d9c MCP89 OHCI USB 1.1 Controller 0d9d MCP89 EHCI USB 2.0 Controller + 0dc0 GF106 [GeForce GT 440] 0dc4 GF106 [GeForce GTS 450] - 0dcd GF106 [GeForce GT 555M] - 0dce GF106 [GeForce GT 555M] -# rev a1 - 0dd1 GF106 [GeForce GTX 460M] + 0dc5 GF106 [GeForce GTS 450 OEM] + 0dc6 GF106 [GeForce GTS 450] + 0dcd GF106M [GeForce GT 555M] + 0dce GF106M [GeForce GT 555M] + 0dd1 GF106M [GeForce GTX 460M] 1558 8687 CLEVO/KAPOK W860CU - 0dd2 GF106 [GeForce GT 445M] + 0dd2 GF106M [GeForce GT 445M] + 0dd3 GF106M [GeForce GT 435M] + 0dd6 GF106M [GeForce GT 550M] 0dd8 GF106GL [Quadro 2000] -# NVIDIA calls it GF106GML + 10de 0914 Quadro 2000D 0dda GF106GLM [Quadro 2000M] 0de0 GF108 [GeForce GT 440] 0de1 GF108 [GeForce GT 430] 3842 1430 GeForce GT 430 0de2 GF108 [GeForce GT 420] - 0de9 GeForce GT 630M -# Not fully sure that it's GF108, might also be GF106. - 0deb GF108 [GeForce GT 555M] - 0dee GF108 [GeForce GT 415M] - 0def GF108 [Quadro NVS 5400M] - 0df0 GF108 [GeForce GT 425M] - 0df2 GF108 [GeForce GT 435M] - 0df4 GF108 [GeForce GT 540M] - 0df5 GF108 [GeForce GT 540M] - 0df7 GF108 [GeForce GT 520M] -# NVIDIA calls it GL + 0de3 GF108M [GeForce GT 635M] + 0de4 GF108 [GeForce GT 520] + 0de5 GF108 [GeForce GT 530] + 0de8 GF108M [GeForce GT 620M] + 0de9 GF108M [GeForce GT 630M] + 0dea GF108M [GeForce 610M] + 17aa 365a GeForce 615 + 17aa 365b GeForce 615 + 17aa 365e GeForce 615 + 17aa 3660 GeForce 615 + 17aa 366c GeForce 615 + 0deb GF108M [GeForce GT 555M] + 0dec GF108M [GeForce GT 525M] + 0ded GF108M [GeForce GT 520M] + 0dee GF108M [GeForce GT 415M] + 0def GF108M [NVS 5400M] + 0df0 GF108M [GeForce GT 425M] + 0df1 GF108M [GeForce GT 420M] + 0df2 GF108M [GeForce GT 435M] + 0df3 GF108M [GeForce GT 420M] + 0df4 GF108M [GeForce GT 540M] + 0df5 GF108M [GeForce GT 525M] + 0df6 GF108M [GeForce GT 550M] + 0df7 GF108M [GeForce GT 520M] 0df8 GF108GL [Quadro 600] -# NVIDIA calls it GLM 0df9 GF108GLM [Quadro 500M] -# NVIDIA calls it GLM 0dfa GF108GLM [Quadro 1000M] + 0dfc GF108GLM [NVS 5200M] 0e08 GF119 HDMI Audio Controller +# 1024MB with passive cooling (heatsink) + 10b0 104a Gainward GeForce GT 610 0e09 GF110 High Definition Audio Controller 0e0a GK104 HDMI Audio Controller 0e0c GF114 HDMI Audio Controller + 0e1a GK110 HDMI Audio [GeForce GTX Titan] + 0e1b GK107 HDMI Audio Controller + 1043 8428 GTX650-DC-1GD5 0e22 GF104 [GeForce GTX 460] 1462 2322 N460GTX Cyclone 1GD5/OC - 0e3a GF104 [Quadro 3000M] - 0e3b GF104 [Quadro 4000M] - 0fd1 GK107 [GeForce GT 650M] - 0fd2 GK107 [GeForce GT 640M] - 0ffb GK107 [Quadro K2000M] - 0ffc GK107 [Quadro K1000M] + 0e23 GF104 [GeForce GTX 460 SE] + 0e24 GF104 [GeForce GTX 460 OEM] + 0e30 GF104M [GeForce GTX 470M] + 0e31 GF104M [GeForce GTX 485M] + 0e3a GF104GLM [Quadro 3000M] + 0e3b GF104GLM [Quadro 4000M] + 0f00 GF108 [GeForce GT 630] + 0f01 GF108 [GeForce GT 620] + 0fc0 GK107 [GeForce GT 640 OEM] + 0fc1 GK107 [GeForce GT 640] + 0fc2 GK107 [GeForce GT 630 OEM] + 0fc6 GK107 [GeForce GTX 650] + 1043 8428 GTX650-DC-1GD5 + 0fd1 GK107M [GeForce GT 650M] + 1043 1597 GeForce GT 650M + 1043 15a7 GeForce GT 650M + 1043 2103 N56VZ + 1043 2105 GeForce GT 650M + 1043 2141 GeForce GT 650M + 0fd2 GK107M [GeForce GT 640M] + 0fd3 GK107M [GeForce GT 640M LE] + 0fd4 GK107M [GeForce GTX 660M] + 0fd5 GK107M [GeForce GT 650M Mac Edition] + 0fd8 GK107M [GeForce GT 640M Mac Edition] + 0fd9 GK107M [GeForce GT 645M] + 0fdf GK107M [GeForce GT 740M] + 0fe0 GK107M [GeForce GTX 660M OEM] + 0fe1 GK107M [GeForce GT 730M] + 0fe3 GK107M [GeForce GT 745M] + 0fe4 GK107M [GeForce GT 750M] + 0fe5 GK107 [GeForce K340 USM] + 0fe6 GK107 [NVS K1 USM] + 0fef GK107GL [GRID K340] + 0ff1 GK107 [NVS 1000] + 0ff2 GK107GL [GRID K1] + 0ff5 GK107GL [Tesla K1 USM] + 0ff7 GK107GL [Quadro K1 USM] + 0ff9 GK107GL [Quadro K2000D] + 0ffa GK107GL [Quadro K600] + 0ffb GK107GLM [Quadro K2000M] + 0ffc GK107GLM [Quadro K1000M] + 0ffd GK107 [NVS 510] + 0ffe GK107GL [Quadro K2000] + 0fff GK107GL [Quadro 410] + 1003 GK110 [GeForce GTX Titan LE] + 1005 GK110 [GeForce GTX Titan] + 1043 8451 GTXTITAN-6GD5 +# Reference Model + 10de 1035 GeForce GTX Titan +# 06G-P4-2790-KR + 3842 2790 GeForce GTX Titan +# 06G-P4-2791-KR + 3842 2791 GeForce GTX Titan SC +# 06G-P4-2793-KR + 3842 2793 GeForce GTX Titan SC Signature +# 06G-P4-2794-KR + 3842 2794 GeForce GTX Titan SC Hydro Copper +# 06G-P4-2795-KR + 3842 2795 GeForce GTX Titan SC Hydro Copper Signature + 101f GK110GL [Tesla K20] + 1020 GK110GL [Tesla K20X] + 1021 GK110GL [Tesla K20Xm] + 1022 GK110GL [Tesla K20c] + 1026 GK110GL [Tesla K20s] + 1028 GK110GL [Tesla K20m] 1040 GF119 [GeForce GT 520] - 1050 GF119 [GeForce GT 520M] - 1051 GF119 [GeForce GT 520MX] - 1056 GF119 [Quadro NVS 4200M] - 1057 GF119 [Quadro NVS 4200M] - 105a GF119 [GeForce 610M] + 1042 GF119 [GeForce 510] + 1048 GF119 [GeForce 605] + 1049 GF119 [GeForce GT 620 OEM] + 104a GF119 [GeForce GT 610] +# 1024MB with passive cooling (heatsink) + 10b0 104a Gainward GeForce GT 610 + 104b GF119 [GeForce GT 625 OEM] + 1050 GF119M [GeForce GT 520M] + 1051 GF119M [GeForce GT 520MX] + 1052 GF119M [GeForce GT 520M] + 1054 GF119M [GeForce 410M] + 1055 GF119M [GeForce 410M] + 1056 GF119M [NVS 4200M] + 1057 GF119M [Quadro NVS 4200M] + 1058 GF119M [GeForce 610M] + 1043 10ac GeForce GT 610M + 1043 10bc GeForce GT 610M + 1043 1652 GeForce GT 610M + 105a GF119M [GeForce 610M] + 1043 2111 GeForce GT 610M + 1043 2112 GeForce GT 610M + 105b GF119M [GeForce 705M] + 107c GF119 [NVS 315] + 107d GF119 [NVS 310] 1080 GF110 [GeForce GTX 580] 1081 GF110 [GeForce GTX 570] 10de 087e Leadtek WinFast GTX 570 - 1082 GF110 [GeForce GTX 560 Ti] - 1086 GF110 [GeForce GTX 570 HD] + 1082 GF110 [GeForce GTX 560 Ti OEM] + 1084 GF110 [GeForce GTX 560 OEM] + 1086 GF110 [GeForce GTX 570 Rev. 2] 1087 GF110 [GeForce GTX 560 Ti 448 Cores] - 1091 Tesla M2090 - 1094 Tesla M2075 Dual-Slot Computing Processor Module - 1096 Tesla C2075 + 1088 GF110 [GeForce GTX 590] + 1089 GF110 [GeForce GTX 580] + 108b GF110 [GeForce GTX 580] + 108e GF110GL [Tesla C2090] + 1091 GF110GL [Tesla M2090] + 10de 088e Tesla X2090 + 10de 0891 Tesla X2090 + 1094 GF110GL [Tesla M2075] + 10de 0888 Tesla M2075 + 1096 GF110GL [Tesla C2050 / C2075] + 10de 0910 Tesla C2075 + 10de 0911 Tesla C2050 + 109a GF100GLM [Quadro 5010M] 109b GF100GL [Quadro 7000] - 10c3 GT218 [GeForce 8400 GS] - 10de 066d G98 [GeForce 8400GS] + 10de 0918 Quadro 7000 + 10c0 GT218 [GeForce 9300 GS Rev. 2] + 10c3 GT218 [GeForce 8400 GS Rev. 3] 10c5 GT218 [GeForce 405] - 10d8 GT218 [Quadro NVS 300] + 10d8 GT218 [NVS 300] + 1140 GF117M [GeForce 610M/710M / GT 620M/625M/630M/720M] + 1025 064a GeForce GT 620M + 1025 064c GeForce GT 620M + 1025 0691 GeForce 710M + 1025 0719 GeForce GT 620M + 1025 0725 GeForce GT 620M + 1025 072b GeForce GT 620M + 1025 0773 GeForce 710M + 1028 054d GeForce GT 630M + 1028 054e GeForce GT 630M + 1028 0554 GeForce GT 620M + 1028 0557 GeForce GT 620M + 1028 0565 GeForce GT 630M + 1043 10dd NVS 5200M + 1043 10ed NVS 5200M + 1043 11fd GeForce GT 720M + 1043 124d GeForce GT 720M + 1043 126d GeForce GT 720M + 1043 14c7 GeForce GT 720M + 1043 1507 GeForce GT 620M + 1043 2132 GeForce GT 620M + 1043 2136 NVS 5200M + 1043 21ba GeForce GT 720M + 1043 21fa GeForce GT 720M + 1043 220a GeForce GT 720M + 144d c0d7 GeForce GT 620M + 144d c652 GeForce GT 620M + 17aa 2200 NVS 5200M + 17aa 3901 GeForce 610M / GT 620M + 17aa 3904 GeForce GT 620M/625M + 17aa 3983 GeForce 610M + 17aa 500d GeForce GT 620M 1180 GK104 [GeForce GTX 680] + 3842 3682 GeForce GTX 680 Mac Edition 1183 GK104 [GeForce GTX 660 Ti] + 1185 GK104 [GeForce GTX 660 OEM] 1188 GK104 [GeForce GTX 690] 1189 GK104 [GeForce GTX 670] - 11bc GK104 [Quadro K5000M] - 11bd GK104 [Quadro K4000M] - 11be GK104 [Quadro K3000M] + 118a GK104GL [GRID K520] + 118b GK104 [GeForce K2 USM] + 118c GK104 [NVS K2 USM] + 118f GK104GL [Tesla K10] + 119f GK104M [GeForce GTX 780M] + 11a0 GK104M [GeForce GTX 680M] + 11a1 GK104M [GeForce GTX 670MX] + 11a2 GK104M [GeForce GTX 675MX Mac Edition] + 11a3 GK104M [GeForce GTX 680MX] + 11a7 GK104M [GeForce GTX 675MX] + 11b0 GK104GL [Quadro K2 USM] + 11b1 GK104GL [Tesla K2 USM] + 11ba GK104GL [Quadro K5000] + 11bb GK104GL [Quadro 4100] + 11bc GK104GLM [Quadro K5000M] + 11bd GK104GLM [Quadro K4000M] + 11be GK104GLM [Quadro K3000M] + 11bf GK104GL [GRID K2] + 11c0 GK106 [GeForce GTX 660] + 11c2 GK106 [GeForce GTX 650 Ti Boost] + 1043 845b GeForce GTX 650 Ti Boost DirectCU II OC + 1462 2874 GeForce GTX 650 Ti Boost TwinFrozr II OC + 1569 11c2 GeForce GTX 650 Ti Boost OC + 19da 1281 GeForce GTX 650 Ti Boost OC + 3842 3657 GeForce GTX 650 Ti Boost + 3842 3658 GeForce GTX 650 Ti Boost Superclocked + 11c3 GK106 [GeForce GTX 650 Ti OEM] + 10de 1030 GeForce GTX 650 Ti OEM + 11c4 GK106 [GeForce GTX 645 OEM] + 11c6 GK106 [GeForce GTX 650 Ti] + 11e0 GK106M [GeForce GTX 770M] + 11e2 GK106M [GeForce GTX 765M] + 11e3 GK106M [GeForce GTX 760M] + 11fa GK106GL [Quadro K4000] 1200 GF114 [GeForce GTX 560 Ti] 1201 GF114 [GeForce GTX 560] + 1202 GF114 [GeForce GTX 560 Ti OEM] + 1203 GF114 [GeForce GTX 460 SE v2] 1205 GF114 [GeForce GTX 460 v2] + 1206 GF114 [GeForce GTX 555] + 1207 GF114 [GeForce GT 645 OEM] + 1208 GF114 [GeForce GTX 560 SE] + 1210 GF114M [GeForce GTX 570M] + 1211 GF114M [GeForce GTX 580M] + 1212 GF114M [GeForce GTX 675M] + 1213 GF114M [GeForce GTX 670M] + 1241 GF116 [GeForce GT 545 OEM] + 1243 GF116 [GeForce GT 545] 1244 GF116 [GeForce GTX 550 Ti] - 1245 GF116 [GeForce GTS 450] - 1247 GF106 [GeForce GT 555M] + 1245 GF116 [GeForce GTS 450 Rev. 2] + 1246 GF116M [GeForce GT 550M] + 1247 GF116M [GeForce GT 555M/635M] + 1043 1752 GeForce GT 555M + 1043 2050 GeForce GT 555M + 1043 2051 GeForce GT 555M + 1043 212a GeForce GT 635M + 1043 212b GeForce GT 635M + 1043 212c GeForce GT 635M + 1248 GF116M [GeForce GT 555M] + 1249 GF116 [GeForce GTS 450 Rev. 3] + 124b GF116 [GeForce GT 640 OEM] + 124d GF116M [GeForce GT 555M/635M] + 1251 GF116M [GeForce GT 560M] + 1280 GK208 [GeForce GT 635] + 1290 GK208M [GeForce GT 730M] + 1291 GK208M [GeForce GT 735M] + 1292 GK208M [GeForce GT 740M] + 1293 GK208M [GeForce GT 730M] + 1294 GK208M [GeForce GT 740M] + 12a0 GK208 10df Emulex Corporation 0720 OneConnect NIC (Skyhawk) 0722 OneConnect iSCSI Initiator (Skyhawk) @@ -7390,21 +7927,10 @@ 8111 Twist3 Frame Grabber 10ec Realtek Semiconductor Co., Ltd. 0139 Zonet Zen3200 - 0260 Realtek 260 High Definition Audio - 0261 Realtek 261 High Definition Audio - 0262 Realtek 262 High Definition Audio - 0269 Realtek ALC269 High Definition Audio (82801G) - 0280 Realtek 280 High Definition Audio - 0660 Realtek 660 High Definition Audio - 0662 Realtek 662 High Definition Audio - 0861 Realtek 861 High Definition Audio - 0862 Realtek 862 High Definition Audio 0880 Realtek 880 High Definition Audio 0883 Realtek 883 High Definition Audio - 1025 1605 TravelMate 5600 series 0885 Realtek 885 High Definition Audio 0888 Realtek 888 High Definition Audio - 1028 020d Inspiron 530 0892 Realtek 892 High Definition Audio 5209 RTS5209 PCI Express Card Reader 5229 RTS5229 PCI Express Card Reader @@ -7477,8 +8003,8 @@ 1458 e000 GA-MA69G-S3H Motherboard 1462 235c P965 Neo MS-7235 mainboard 1462 236c 945P Neo3-F motherboard - 8168 RTL8111/8168B PCI Express Gigabit Ethernet controller - 1019 8168 MCP73PVT-SM + 8168 RTL8111/8168 PCI Express Gigabit Ethernet controller + 1019 8168 RTL8111/8168 PCI Express Gigabit Ethernet controller 1028 04b2 Vostro 3350 1028 04da Vostro 3750 103c 1611 Pavilion DM1Z-3000 @@ -7488,14 +8014,16 @@ 1043 82c6 M3A78-EH Motherboard 1043 83a3 M4A785TD Motherboard 1043 8432 P8P67 and other motherboards - 10ec 8168 TEG-ECTX Gigabit PCI-E Adapter [Trendnet] - 1458 e000 GA-EP45-DS5/GA-EG45M-DS2H Motherboard + 1043 8505 P8H77-I Motherboard + 105b 0d7c D270S/D250S Motherboard + 10ec 8168 RTL8111/8168 PCI Express Gigabit Ethernet controller + 1458 e000 Motherboard 1462 238c Onboard RTL8111b on MSI P965 Platinum Mainboard 1462 368c K9AG Neo2 1462 7522 X58 Pro-E 1775 11cc CC11/CL11 1849 8168 Motherboard (one of many) - 8086 d615 Desktop Board D510MO + 8086 d615 Desktop Board D510MO/D525MW 8169 RTL8169 PCI Gigabit Ethernet Controller 1025 0079 Aspire 5024WLMi 10bd 3202 EP-320G-TX1 32-bit PCI Gigabit Ethernet Adapter @@ -7503,6 +8031,7 @@ 1259 c107 CG-LAPCIGT 1371 434e ProG-2000L 1385 311a GA311 + 1385 5200 GA511 Gigabit PC Card 1458 e000 GA-8I915ME-G Mainboard 1462 030c K8N Neo-FSR v2.0 mainboard 1462 065c Hetis 865GV-E (MS-7065) @@ -7519,6 +8048,7 @@ 1a3b 1139 AW-NE139H Half-size Mini PCIe Card 8177 RTL8188CE 802.11b/g/n WiFi Adapter 8178 RTL8188CE 802.11b/g/n WiFi Adapter + 8179 RTL8188EE Wireless Network Adapter 8180 RTL8180L 802.11b MAC 1385 4700 MA521 802.11b Wireless PC Card 1737 0019 WPC11v4 802.11b Wireless-B Notebook Adapter @@ -7530,6 +8060,7 @@ 8197 SmartLAN56 56K Modem 8199 RTL8187SE Wireless LAN Controller 1462 6894 MN54G2 / MS-6894 Wireless Mini PCIe Card + 8723 RTL8723AE PCIe Wireless Network Adapter 10ed Ascii Corporation 7310 V7310 10ee Xilinx Corporation @@ -7624,6 +8155,7 @@ 1102 1002 SB Audigy2 Platinum 1102 1007 SB0240 Audigy 2 Platinum 6.1 1102 1009 SB Audigy2 OEM HP + 1102 2001 SB Audigy 2 ZS Platinum Pro 1102 2002 SB Audigy 2 ZS (SB0350) 1102 4001 E-MU 1010 1102 4002 E-MU 0404 @@ -7647,8 +8179,8 @@ 0009 [SB X-Fi Xtreme Audio] CA0110-IBG 1102 0010 [SB X-Fi Xtreme Audio] CA0110-IBG 1102 0018 SB1040 - 000b X-Fi Titanium series [EMU20k2] - 1102 0041 SB X-Fi Titanium PCI-e [SB0880] + 000b EMU20k2 [X-Fi Titanium Series] + 1102 0041 SB0880 [SoundBlaster X-Fi Titanium PCI-e] 4001 SB Audigy FireWire Port 1102 0010 SB Audigy FireWire Port 7002 SB Live! Game Port @@ -7752,6 +8284,7 @@ 147b a401 KT7/KT7-RAID/KT7A/KT7A-RAID Mainboard 0308 PT880 Ultra/PT894 Host Bridge 1043 8199 P4V800D-X Mainboard + 1849 0308 Motherboard 0314 CN700/VN800/P4M800CE/Pro Host Bridge 0324 CX700/VX700 Host Bridge 0327 P4M890 Host Bridge @@ -7762,9 +8295,6 @@ 0364 CN896/VN896/P4M900 Host Bridge 1043 81ce P5VD2-VM mothervoard 0391 VT8371 [KX133] - 0397 VT1708S HD Audio - 1043 836c P7H55 - 1043 83c7 P5KPL-AM EPU 0409 VX855/VX875 Host Bridge: Host Control 0410 VX900 Host Bridge: Host Control 0415 VT6415 PATA IDE Host Controller @@ -7790,7 +8320,8 @@ 1462 7120 KT4AV motherboard 1462 7181 K8MM3-V mainboard 147b 1407 KV8-MAX3 motherboard - 1849 0571 K7VT2/K7VT6 motherboard +# probably all K7VT2/4*/6 + 1849 0571 K7VT series Motherboards 0576 VT82C576 3V [Apollo Master] 0581 CX700/VX700 RAID Controller # Upgrade bios to get correct ID: 5324 instead of 0581 @@ -7902,7 +8433,8 @@ 1462 7181 K8MM3-V mainboard 147b 1407 KV8-MAX3 motherboard 182d 201d CN-029 USB2.0 4 port PCI Card - 1849 3038 K7VT6 +# probably all K7VT2/4*/6 + 1849 3038 K7VT series Motherboards 19da a179 ZBOX nano VD01 3040 VT82C586B ACPI 3043 VT86C100A [Rhine] @@ -7915,7 +8447,7 @@ 103c 2a20 Pavilion t3030.de Desktop PC 103c 2a3b Media Center PC m7590n 1043 808a A8V/A8N/P4P800 series motherboard - 1043 81fe M4A series motherboard + 1043 81fe Motherboard 1458 1000 GA-7VT600-1394 Motherboard 1462 207d K8NGM2 series motherboard 1462 217d Aspire L250 @@ -7972,7 +8504,8 @@ 1695 300c EP-8KRA2+ Mainboard 1849 0850 ASRock 775Dual-880 Pro onboard audio (Realtek ALC850) 1849 9739 P4VT8 Mainboard (C-Media CMI9739A codec) - 1849 9761 K7VT6 motherboard +# probably all K7VT2/4*/6 + 1849 9761 K7VT series Motherboards 4005 4710 MSI K7T266 Pro2-RU (MSI-6380 v2) onboard audio (Realtek/ALC 200/200P) a0a0 01b6 AK77-8XN onboard audio a0a0 0342 AK86-L motherboard @@ -7988,7 +8521,8 @@ 147b 1c09 NV7 Motherboard 1695 3005 VT6103 1695 300c Realtek ALC655 sound chip - 1849 3065 K7VT6 motherboard +# probably all K7VT2/4*/6 + 1849 3065 K7VT series Motherboards # This hosts more than just the Intel 537 codec, it also hosts PCtel (SIL33) and SmartLink (SIL34) codecs 3068 AC'97 Modem Controller 1462 309e MS-6309 Saturn Motherboard @@ -8007,6 +8541,7 @@ 1043 808c A7V8X motherboard 1043 80a1 A7V8X-X motherboard rev 1.01 1043 80ed A7V600/K8V-X/A8V Deluxe motherboard + 1106 3104 USB 2.0 Controller 1297 f641 FX41 motherboard 1458 5004 GA-7VAX Mainboard 1462 5901 KT6 Delta-FIS2R (MS-6590) @@ -8016,11 +8551,13 @@ 1462 7181 K8MM3-V mainboard 147b 1407 KV8-MAX3 motherboard 182d 201d CN-029 USB 2.0 4 port PCI Card - 1849 3104 K7VT6 motherboard +# probably all K7VT2/4*/6 + 1849 3104 K7VT series Motherboards 19da a179 ZBOX nano VD01 3106 VT6105/VT6106S [Rhine-III] 1106 0105 VT6106S [Rhine-III] 1186 1403 DFE-530TX rev C + 1186 1405 DFE-520TX Fast Ethernet PCI Adapter 1186 1406 DFE-530TX+ rev F2 1186 1407 DFE-538TX 3108 K8M800/K8N800/K8N800A [S3 UniChrome Pro] @@ -8064,7 +8601,8 @@ 1106 0000 KT4AV motherboard 1297 f641 FX41 motherboard 1458 5001 GA-7VAX Mainboard - 1849 3177 K7VT2 motherboard +# probably all K7VT2/4*/6 + 1849 3177 K7VT series Motherboards 3178 ProSavageDDR P4N333 Host Bridge 3188 VT8385 [K8T800 AGP] Host Bridge 1043 80a3 K8V Deluxe/K8V-X motherboard @@ -8073,7 +8611,8 @@ 1043 807f A7V8X motherboard 1106 0000 KT4AV motherboard (KT400A) 1458 5000 GA-7VAX Mainboard - 1849 3189 K7VT6 motherboard +# probably all K7VT2/4*/6 + 1849 3189 K7VT series Motherboards 3204 K8M800 Host Bridge 3205 VT8378 [KM400/A] Chipset Host Bridge 1458 5000 GA-7VM400M Motherboard @@ -8124,6 +8663,7 @@ 3409 VX855/VX875 DRAM Bus Control 3410 VX900 DRAM Bus Control 19da a179 ZBOX nano VD01 + 3432 VL80x xHCI USB 3.0 Controller 4149 VIA VT6420 (ATA133) Controller 4204 K8M800 Host Bridge 4208 PT890 Host Bridge @@ -8144,11 +8684,9 @@ 4351 VT3351 Host Bridge 4353 VX800/VX820 Power Management Control 4364 CN896/VN896/P4M900 Host Bridge - 4397 VT1708B/1702S/1708S HD audio codec 4409 VX855/VX875 Power Management Control 4410 VX900 Power Management and Chip Testing Control 19da a179 ZBOX nano VD01 - 4428 VT1718S HD Audio Codec 5030 VT82C596 ACPI [Apollo PRO] 5122 VX855/VX875 Chrome 9 HCM Integrated Graphics 5208 PT890 I/O APIC Interrupt Controller @@ -8168,6 +8706,7 @@ 5410 VX900 APIC and Central Traffic Control 6100 VT85C100A [Rhine II] 6287 SATA RAID Controller + 6290 K8M890CE Host Bridge 6327 P4M890 Security Device 6353 VX800/VX820 Scratch Registers 6364 CN896/VN896/P4M900 Security Device @@ -8233,6 +8772,7 @@ a353 VX8xx South-North Module Interface Control a364 CN896/VN896/P4M900 PCI to PCI Bridge Controller a409 VX855/VX875 USB Device Controller + a410 VX900 PCI Express Root Port 0 b091 VT8633 [Apollo Pro266 AGP] b099 VT8366/A/7 [Apollo KT266/A/333 AGP] b101 VT8653 AGP Bridge @@ -8247,6 +8787,7 @@ b198 VT8237/VX700 PCI Bridge b213 VPX/VPX2 I/O APIC Interrupt Controller b353 VX855/VX875/VX900 PCI to PCI Bridge + b410 VX900 PCI Express Root Port 1 b999 [K8T890 North / VT8237 South] PCI Bridge c208 PT890 PCI to PCI Bridge Controller c238 K8T890 PCI to PCI Bridge Controller @@ -8255,16 +8796,17 @@ c353 VX800/VX820 PCI Express Root Port c364 CN896/VN896/P4M900 PCI to PCI Bridge Controller c409 VX855/VX875 EIDE Controller + c410 VX900 PCI Express Root Port 2 d104 VT8237R USB UDCI Controller d208 PT890 PCI to PCI Bridge Controller d213 VPX/VPX2 PCI to PCI Bridge Controller d238 K8T890 PCI to PCI Bridge Controller d340 PT900 PCI to PCI Bridge Controller + d410 VX900 PCI Express Root Port 3 e208 PT890 PCI to PCI Bridge Controller e238 K8T890 PCI to PCI Bridge Controller e340 PT900 PCI to PCI Bridge Controller e353 VX800/VX820 PCI Express Root Port - e721 VT1708B 8-channel High Definition Audio CODEC f208 PT890 PCI to PCI Bridge Controller f238 K8T890 PCI to PCI Bridge Controller f340 PT900 PCI to PCI Bridge Controller @@ -8299,6 +8841,7 @@ 3142 SIMATIC NET CP 5613A1 (Profibus Adapter) 4021 SIMATIC NET CP 5512 (Profibus and MPI Cardbus Adapter) 4029 SIMATIC NET CP 5613A2 (Profibus Adapter) + 4035 SIMATIC NET CP 1613 A2 4942 FPGA I-Bus Tracer for MBD 6120 SZB6120 110b Chromatic Research Inc. @@ -8446,7 +8989,7 @@ 111b Teledyne Electronic Systems 111c Tricord Systems Inc. 0001 Powerbis Bridge -111d Integrated Device Technology, Inc. +111d Integrated Device Technology, Inc. [IDT] 0001 IDT77201/77211 155Mbps ATM SAR Controller [NICStAR] 0003 IDT77222/77252 155Mbps ATM MICRO ABR SAR Controller 0004 IDT77V252 155Mbps ATM MICRO ABR SAR Controller @@ -8595,6 +9138,7 @@ 1421 1370 Instant TV (saa7135) 1435 7330 VFG7330 1435 7350 VFG7350 + 1458 9001 GC-PTV-TAF Hybrid TV card 1458 9002 GT-PTV-TAF-RH DVB-T/Analog TV/FM tuner 1458 9003 GT-PTV-AF-RH Analog TV/FM tuner 1458 9004 GT-P8000 DVB-T/Analog TV/FM tuner @@ -8669,6 +9213,7 @@ 1894 a006 KNC One TV-Station DVR 1894 fe01 KNC One TV-Station RDS / Typhoon TV Tuner RDS 5168 0138 FLY TV PRIME 34FM + 5168 0300 FlyDVB-S 5ace 5070 Behold TV 507 FM 5ace 6070 Behold TV 607 FM 5ace 6071 Behold TV 607 FM @@ -8867,6 +9412,7 @@ 1137 0048 VIC M81KR Mezzanine FCoE HBA 1137 004f VIC 1280 Mezzanine FCoE HBA 004e VIC 82 PCIe Upstream Port + 00cf VIC Userspace NIC 1138 Ziatech Corporation 8905 8905 [STD 32 Bridge] 1139 Dynamic Pictures, Inc @@ -9309,6 +9855,7 @@ 1028 014f Latitude X300 laptop 1028 0188 Inspiron 6000 laptop 1043 1237 A6J-Q008 + 1043 1757 M2400N laptop 144d c005 X10 Laptop 144d c00c P30/P35 notebook 17aa 201e ThinkPad X60s @@ -9322,6 +9869,7 @@ 103c 30b5 Presario V3242AU 103c 30b7 Presario V6133CL 103c 30cc Pavilion dv6700 + 103c 30cf Pavilion dv9668eg Laptop 1043 1237 A6J-Q008 1043 1967 V6800V 144d c018 X20 IV @@ -9339,12 +9887,14 @@ 103c 30b7 Presario V6133CL 103c 30c1 Compaq 6910p 103c 30cc Pavilion dv6700 + 103c 30cf Pavilion dv9668eg Laptop 1043 1237 A6J-Q008 1043 1967 ASUS V6800V 10f7 8338 Panasonic CF-Y5 laptop 144d c018 X20 IV 17aa 201d ThinkPad X60s 17aa 20c7 ThinkPad T61 + 17aa 20c8 ThinkPad W500 0832 R5C832 IEEE 1394 Controller 1025 0121 Aspire 5920G 1028 01d7 XPS M1210 @@ -9353,6 +9903,7 @@ 103c 30b7 Presario V6133CL 103c 30c1 Compaq 6910p 103c 30cc Pavilion dv6700 + 103c 30cf Pavilion dv9668eg Laptop 0841 R5C841 CardBus/SD/SDIO/MMC/MS/MSPro/xD/IEEE1394 0843 R5C843 MMC Host Controller 1025 0121 Aspire 5920G @@ -9369,6 +9920,7 @@ 103c 30b5 Presario V3242AU 103c 30b7 Presario V6133CL 103c 30cc Pavilion dv6700 + 103c 30cf Pavilion dv9668eg Laptop 1043 1967 V6800V 1180 0852 Pavilion 2410us 1324 10cf P7120 @@ -9389,7 +9941,6 @@ 1184 Forks Inc 1185 Dataworld International Ltd 1186 D-Link System Inc - 0100 DC21041 1002 DL10050 Sundance Ethernet 1186 1002 DFE-550TX/FX 1186 1012 DFE-580TX @@ -9401,33 +9952,20 @@ 1186 1301 DFE-530TX+ 10/100 Ethernet Adapter 1186 1303 DFE-528TX 10/100 Fast Ethernet PCI Adapter 1340 DFE-690TXD CardBus PC Card - 1405 DFE-520TX Fast Ethernet PCI Adapter 1540 DFE-680TX 1541 DFE-680TXD CardBus PC Card 1561 DRP-32TXD Cardbus PC Card 3300 DWL-510 / DWL-610 802.11b [Realtek RTL8180L] 1186 3300 DWL-610 Wireless Cardbus Adapter 1186 3301 DWL-510 Wireless PCI Adapter - 3a03 AirPro DWL-A650 Wireless Cardbus Adapter(rev.B) - 3a04 AirPro DWL-AB650 Multimode Wireless Cardbus Adapter - 3a05 AirPro DWL-AB520 Multimode Wireless PCI Adapter - 3a07 AirXpert DWL-AG650 Wireless Cardbus Adapter - 3a08 AirXpert DWL-AG520 Wireless PCI Adapter 3a10 AirXpert DWL-AG650 Wireless Cardbus Adapter(rev.B) 3a11 AirXpert DWL-AG520 Wireless PCI Adapter(rev.B) - 3a12 AirPlus DWL-G650 Wireless Cardbus Adapter(rev.C) - 3a63 AirXpert DWL-AG660 Wireless Cardbus Adapter - 3a70 DWA-556 Xtreme N PCI Express Desktop Adapter - 3c00 D-link DWL-G650X - 3c09 AirPlus G DWL-G510 4000 DL2000-based Gigabit Ethernet 4001 DGE-550SX PCI-X Gigabit Ethernet Adapter 4300 DGE-528T Gigabit Ethernet Adapter # rev. B1; RealTek RTL8168E. 1186 4b10 DGE-560T PCI Express (x1) Gigabit Ethernet Adapter 4302 DGE-530T Gigabit Ethernet Adapter (rev.C1) [Realtek RTL8169] -# There are at least 3 revisions of this adapter; 4800 is board revision A1 as far as I can tell, revision B1 is 4c00. - 4800 DGE-530T Gigabit Ethernet Adapter (rev 11) 4b00 DGE-560T PCI Express Gigabit Ethernet Adapter 4b01 DGE-530T Gigabit Ethernet Adapter (rev 11) 4b02 DGE-560SX PCI Express Gigabit Ethernet Adapter @@ -9538,6 +10076,7 @@ 2a01 88W8335 [Libertas] 802.11b/g Wireless 2a02 88W8361 [TopDog] 802.11n Wireless 07d1 3b02 DIR-615 rev. A1 Mini PCI Wireless Module + 1385 7c00 WN511T RangeMax Next 300 Mbps Wireless PC Card 1385 7c01 WN511T RangeMax Next 300 Mbps Wireless Notebook Adapter 1385 7e00 WN311T RangeMax Next 300 Mbps Wireless PCI Adapter 1799 801b F5D8011 v2 802.11n N1 Wireless Notebook Card @@ -9618,6 +10157,7 @@ 4353 88E8039 PCI-E Fast Ethernet Controller 104d 902d VAIO VGN-NR120E 4354 88E8040 PCI-E Fast Ethernet Controller + 144d c072 Notebook N150P 4355 88E8040T PCI-E Fast Ethernet Controller 1179 ff50 Satellite P305D-S8995E 4356 88EC033 PCI-E Fast Ethernet Controller @@ -9679,6 +10219,7 @@ a0a0 0506 Marvell 88E8053 Gigabit Ethernet Controller (Aopen) 4363 88E8055 PCI-E Gigabit Ethernet Controller 4364 88E8056 PCI-E Gigabit Ethernet Controller + 1043 81f8 Motherboard 11ba 00ba 8056 Gigabit Ethernet Controller 4365 88E8070 based Ethernet Controller 4366 88EC036 PCI-E Gigabit Ethernet Controller @@ -9709,6 +10250,7 @@ 6042 88SX6042 PCI-X 4-Port SATA-II 6081 MV88SX6081 8-port SATA II PCI-X Controller 6101 88SE6101/6102 single-port PATA133 interface + 1043 82e0 P5K PRO Motherboard 6111 88SE6111 1-port PATA133(IDE) and 1-port SATA II Controllers 6121 88SE6121 SATA II / PATA Controller 6141 88SE614x SATA II PCI-E controller @@ -9890,9 +10432,7 @@ # InPorte Home Internal 56k Modem/fax/answering machine/SMS Features 048f V.92 56k WinModem 0620 Lucent V.92 Data/Fax Modem - 1040 HDA softmodem 2600 StarPro26XX family (SP2601, SP2603, SP2612) DSP - 3026 HDA Modem 5400 OR3TP12 FPSC 5656 Venus Modem 5801 USB @@ -9901,7 +10441,7 @@ 5811 FW322/323 [TrueFire] 1394a Controller 103c 2a34 Pavilion a1677c 103c 2a9e Pavilion p6310f - 1043 8294 IEEE 1394a Firewire Controller + 1043 8294 LSI FW322/323 IEEE 1394a FireWire Controller 8086 524c D865PERL mainboard dead 0800 FireWire Host Bus Adapter 5901 FW643 [TrueFire] PCIe 1394b Controller @@ -9954,19 +10494,8 @@ 11d2 Intercom Inc. 11d3 Trancell Systems Inc 11d4 Analog Devices - 0078 AD1986HD sound chip 1535 Blackfin BF535 processor 1805 SM56 PCI modem - 1889 AD1889 sound chip - 194a AD1984A sound chip - 1981 AD1981HD sound chip - 1983 AD1983HD sound chip - 1984 AD1984HD sound chip - 17aa 20bb T61p Notebook - 1986 AD1986A sound chip - 11d4 1986 Lenovo N100 B9G - 198b AD1988B Sound Chip - 5340 AD1881 sound chip 11d5 Ikon Corporation 0115 10115 0117 10117 @@ -10079,6 +10608,7 @@ 0805 RocketPort UPCI 8 port w/octa cable 080c RocketModem III 8 port 080d RocketModem III 4 port + 0810 RocketPort UPCI Plus 4 port RS232 0811 RocketPort UPCI Plus 8 port RS232 0812 RocketPort UPCI Plus 8 port RS422 0903 RocketPort Compact PCI 16 port w/external I/F @@ -10134,6 +10664,7 @@ 1179 ff50 Satellite P305D-S8995E 10f7 1394 OHCI Compliant Host Controller 11f7 OZ600 1394a-2000 Controller + 1028 04a3 Precision M4600 13f7 1394 OHCI Compliant Host Controller 6729 OZ6729 673a OZ6730 @@ -10172,7 +10703,11 @@ 7233 OZ711MP3/MS3 4-in-1 MemoryCardBus Controller 8120 Integrated MMC/SD Controller 8130 Integrated MS/MSPRO/xD Controller + 8320 OZ600 MMC/SD Controller + 1028 04a3 Precision M4600 8321 Integrated MMC/SD controller + 8330 OZ600 MS/xD Controller + 1028 04a3 Precision M4600 8331 O2 Flash Memory Card 1218 Hybricon Corp. 1219 First Virtual Corporation @@ -10364,7 +10899,8 @@ 5201 PCI-2000 1257 Vertex Networks, Inc. 1258 Gilbarco, Inc. -1259 Allied Telesyn International +# nee Allied Telesyn International +1259 Allied Telesis 2560 AT-2560 Fast Ethernet Adapter (i82557B) 2801 AT-2801FX (RTL-8139) a117 RTL81xx Fast Ethernet @@ -10404,6 +10940,7 @@ 125d 1989 ESS Modem 1998 ES1983S Maestro-3i PCI Audio Accelerator 1028 00b1 Latitude C600 + 1028 00e5 Latitude C810 1028 00e6 ES1983S Maestro-3i (Dell Inspiron 8100) 1999 ES1983S Maestro-3i PCI Modem Accelerator 199a ES1983S Maestro-3i PCI Audio Accelerator @@ -10804,7 +11341,6 @@ 0001 AceNIC Gigabit Ethernet 1014 0104 Gigabit Ethernet-SX PCI Adapter 12ae 0001 Gigabit Ethernet-SX (Universal) - 1410 0104 Gigabit Ethernet-SX PCI Adapter 0002 AceNIC Gigabit Ethernet (Copper) 10a9 8002 Acenic Gigabit Ethernet 12ae 0002 Gigabit Ethernet-T (3C986-T) @@ -10952,6 +11488,9 @@ 12d7 Biotronic SRL 12d8 Pericom Semiconductor 01a7 PI7C21P100 PCI to PCI Bridge + 400a PI7C9X442SL PCI Express Bridge Port + 400e PI7C9X442SL USB OHCI Controller + 400f PI7C9X442SL USB EHCI Controller 71e2 PI7C7300A/PI7C7300D PCI-to-PCI Bridge 71e3 PI7C7300A/PI7C7300D PCI-to-PCI Bridge (Secondary Bus 2) 8140 PI7C8140A PCI-to-PCI Bridge @@ -10961,6 +11500,7 @@ 8154 PI7C8154A/PI7C8154B/PI7C8154BI PCI-to-PCI Bridge e110 PI7C9X110 PCI Express to PCI bridge 1775 11cc CC11/CL11 CompactPCI Bridge + e111 PI7C9X111SL PCIe-to-PCI Reversible Bridge e130 PCI Express to PCI-XPI7C9X130 PCI-X Bridge 12d9 Aculab PLC 0002 PCI Prosody @@ -11279,7 +11819,8 @@ 134f Algo System Co Ltd 1350 Systec Co. Ltd 1351 Sonix Inc -1353 Thales Idatys +# nee Thales Idatys +1353 Vierling Communication SAS 0002 Proserver 0003 PCI-FUT 0004 PCI-S0 @@ -11437,20 +11978,9 @@ 1385 Netgear 006b WA301 802.11b Wireless PCI Adapter 4100 MA301 802.11b Wireless PCI Adapter - 4105 MA311 802.11b Wireless PCI Adapter - 4400 WAG511 802.11a/b/g Dual Band Wireless PC Card - 4600 WAG511 802.11a/b/g Dual Band Wireless PC Card 4601 WAG511 802.11a/b/g Dual Band Wireless PC Card - 4610 WAG511 802.11a/b/g Dual Band Wireless PC Card - 4a00 WAG311 802.11a/g Wireless PCI Adapter - 5200 GA511 Gigabit PC Card 620a GA620 Gigabit Ethernet 630a GA630 Gigabit Ethernet - 6d00 WPNT511 RangeMax 240 Mbps Wireless PC Card - 7b00 WN511B RangeMax Next 270 Mbps Wireless PC Card - 7c00 WN511T RangeMax Next 300 Mbps Wireless PC Card - f004 FA310TX - f312 FA312 REV-A1 Fast Ethernet PCI Adapter 1386 Video Domain Technologies 1387 Systran Corp 1388 Hitachi Information Technology Co Ltd @@ -11705,7 +12235,7 @@ 13f6 ffff CMI8338/C3DX PCI Audio Device 0101 CM8338B 13f6 0101 CMI8338-031 PCI Audio Device - 0111 CM8738 + 0111 CMI8738/CMI8768 PCI Audio 1019 0970 P6STP-FL motherboard 1043 8035 CUSI-FX motherboard 1043 8077 CMI8738 6-channel audio controller @@ -11727,6 +12257,8 @@ 584d 3771 X-Mystique 7.1 LP Value 7284 8384 Striker 7.1 0211 CM8738 + 5011 CM8888 [Oxygen Express] + 13f6 5011 HDA Controller 8788 CMI8788 [Oxygen HD Audio] 1043 8269 Virtuoso 200 (Xonar D2) 1043 8275 Virtuoso 100 (Xonar DX) @@ -11751,10 +12283,7 @@ 7284 9761 CLARO 7284 9781 CLARO halo 7284 9783 eCLARO - 8828 CM8828 [Oxygen Express] - 8888 CM8888 [Oxygen Express] - 1043 84d5 ROG Xonar Phoebus - 9880 CM9880 + 7284 9787 CLARO II 13f7 Wildfire Communications 13f8 Ad Lib Multimedia Inc 13f9 NTT Advanced Technology Corp. @@ -11941,6 +12470,7 @@ 153b 1151 PHASE88 16ce 1040 Edirol DA-2496 1724 VT1720/24 [Envy24PT/HT] PCI Multi-Channel Audio Controller + 10b0 0200 Hollywood@Home 7.1 1412 1724 Albatron PX865PE 7.1 1412 3630 M-Audio Revolution 7.1 1412 3631 M-Audio Revolution 5.1 @@ -11996,6 +12526,8 @@ 9521 OX16PCI952 (Dual 16950 UART) 9523 OX16PCI952 Integrated Parallel Port c158 OXPCIe952 Dual 16C950 UART + e4bf c504 CP4-SCAT Wireless Technologies Carrier Board + e4bf d551 DU1-MUSTANG Dual-Port RS-485 Interface c308 EX-44016 16-port serial 1416 Multiwave Innovation pte Ltd 1417 Convergenet Technologies Inc @@ -12036,8 +12568,19 @@ 4008 T420-CX Unified Wire Ethernet Controller 4009 T420-BT Unified Wire Ethernet Controller 400a T404-BT Unified Wire Ethernet Controller + 400b B420-SR Unified Wire Ethernet Controller + 400c B404-BT Unified Wire Ethernet Controller 400d T480 Unified Wire Ethernet Controller 400e T440-LP-CR Unified Wire Ethernet Controller + 400f T440 [Amsterdam] Unified Wire Ethernet Controller + 4080 T480-4080 T480 Unified Wire Ethernet Controller + 4081 T440F-4081 T440-FCoE Unified Wire Ethernet Controller + 4082 T420-4082 Unified Wire Ethernet Controller + 4083 T420X-4083 Unified Wire Ethernet Controller + 4084 T420-4084 Unified Wire Ethernet Controller + 4085 T420-4085 SFP+ Unified Wire Ethernet Controller + 4086 T440-4086 10Gbase-T Unified Wire Ethernet Controller + 4087 T440T-4087 Unified Wire Ethernet Controller 4401 T420-CR Unified Wire Ethernet Controller 4402 T422-CR Unified Wire Ethernet Controller 4403 T440-CR Unified Wire Ethernet Controller @@ -12048,8 +12591,19 @@ 4408 T420-CX Unified Wire Ethernet Controller 4409 T420-BT Unified Wire Ethernet Controller 440a T404-BT Unified Wire Ethernet Controller + 440b B420-SR Unified Wire Ethernet Controller + 440c B404-BT Unified Wire Ethernet Controller 440d T480 Unified Wire Ethernet Controller 440e T440-LP-CR Unified Wire Ethernet Controller + 440f T440 [Amsterdam] Unified Wire Ethernet Controller + 4480 T480-4080 T480 Unified Wire Ethernet Controller + 4481 T440F-4081 T440-FCoE Unified Wire Ethernet Controller + 4482 T420-4082 Unified Wire Ethernet Controller + 4483 T420X-4083 Unified Wire Ethernet Controller + 4484 T420-4084 Unified Wire Ethernet Controller + 4485 T420-4085 SFP+ Unified Wire Ethernet Controller + 4486 T440-4086 10Gbase-T Unified Wire Ethernet Controller + 4487 T440T-4087 Unified Wire Ethernet Controller 4501 T420-CR Unified Wire Storage Controller 4502 T422-CR Unified Wire Storage Controller 4503 T440-CR Unified Wire Storage Controller @@ -12060,8 +12614,19 @@ 4508 T420-CX Unified Wire Storage Controller 4509 T420-BT Unified Wire Storage Controller 450a T404-BT Unified Wire Storage Controller + 450b B420-SR Unified Wire Storage Controller + 450c B404-BT Unified Wire Storage Controller 450d T480 Unified Wire Storage Controller 450e T440-LP-CR Unified Wire Storage Controller + 450f T440 [Amsterdam] Unified Wire Storage Controller + 4580 T480-4080 T480 Unified Wire Storage Controller + 4581 T440F-4081 T440-FCoE Unified Wire Storage Controller + 4582 T420-4082 Unified Wire Storage Controller + 4583 T420X-4083 Unified Wire Storage Controller + 4584 T420-4084 Unified Wire Storage Controller + 4585 T420-4085 SFP+ Unified Wire Storage Controller + 4586 T440-4086 10Gbase-T Unified Wire Storage Controller + 4587 T440T-4087 Unified Wire Storage Controller 4601 T420-CR Unified Wire Storage Controller 4602 T422-CR Unified Wire Storage Controller 4603 T440-CR Unified Wire Storage Controller @@ -12072,8 +12637,19 @@ 4608 T420-CX Unified Wire Storage Controller 4609 T420-BT Unified Wire Storage Controller 460a T404-BT Unified Wire Storage Controller + 460b B420-SR Unified Wire Storage Controller + 460c B404-BT Unified Wire Storage Controller 460d T480 Unified Wire Storage Controller 460e T440-LP-CR Unified Wire Storage Controller + 460f T440 [Amsterdam] Unified Wire Storage Controller + 4680 T480-4080 T480 Unified Wire Storage Controller + 4681 T440F-4081 T440-FCoE Unified Wire Storage Controller + 4682 T420-4082 Unified Wire Storage Controller + 4683 T420X-4083 Unified Wire Storage Controller + 4684 T420-4084 Unified Wire Storage Controller + 4685 T420-4085 SFP+ Unified Wire Storage Controller + 4686 T440-4086 10Gbase-T Unified Wire Storage Controller + 4687 T440T-4087 Unified Wire Storage Controller 4701 T420-CR Unified Wire Ethernet Controller 4702 T422-CR Unified Wire Ethernet Controller 4703 T440-CR Unified Wire Ethernet Controller @@ -12084,8 +12660,19 @@ 4708 T420-CX Unified Wire Ethernet Controller 4709 T420-BT Unified Wire Ethernet Controller 470a T404-BT Unified Wire Ethernet Controller + 470b B420-SR Unified Wire Ethernet Controller + 470c B404-BT Unified Wire Ethernet Controller 470d T480 Unified Wire Ethernet Controller 470e T440-LP-CR Unified Wire Ethernet Controller + 470f T440 [Amsterdam] Unified Wire Ethernet Controller + 4780 T480-4080 T480 Unified Wire Ethernet Controller + 4781 T440F-4081 T440-FCoE Unified Wire Ethernet Controller + 4782 T420-4082 Unified Wire Ethernet Controller + 4783 T420X-4083 Unified Wire Ethernet Controller + 4784 T420-4084 Unified Wire Ethernet Controller + 4785 T420-4085 SFP+ Unified Wire Ethernet Controller + 4786 T440-4086 10Gbase-T Unified Wire Ethernet Controller + 4787 T440T-4087 Unified Wire Ethernet Controller 4801 T420-CR Unified Wire Ethernet Controller 4802 T422-CR Unified Wire Ethernet Controller 4803 T440-CR Unified Wire Ethernet Controller @@ -12096,8 +12683,133 @@ 4808 T420-CX Unified Wire Ethernet Controller 4809 T420-BT Unified Wire Ethernet Controller 480a T404-BT Unified Wire Ethernet Controller + 480b B420-SR Unified Wire Ethernet Controller + 480c B404-BT Unified Wire Ethernet Controller 480d T480 Unified Wire Ethernet Controller 480e T440-LP-CR Unified Wire Ethernet Controller + 480f T440 [Amsterdam] Unified Wire Ethernet Controller + 4880 T480-4080 T480 Unified Wire Ethernet Controller + 4881 T440F-4081 T440-FCoE Unified Wire Ethernet Controller + 4882 T420-4082 Unified Wire Ethernet Controller + 4883 T420X-4083 Unified Wire Ethernet Controller + 4884 T420-4084 Unified Wire Ethernet Controller + 4885 T420-4085 SFP+ Unified Wire Ethernet Controller + 4886 T440-4086 10Gbase-T Unified Wire Ethernet Controller + 4887 T440T-4087 Unified Wire Ethernet Controller + 5001 T520-CR Unified Wire Ethernet Controller + 5002 T522-CR Unified Wire Ethernet Controller + 5003 T540-CR Unified Wire Ethernet Controller + 5004 T520-BCH Unified Wire Ethernet Controller + 5005 T540-BCH Unified Wire Ethernet Controller + 5006 T540-CH Unified Wire Ethernet Controller + 5007 T520-SO Unified Wire Ethernet Controller + 5008 T520-CX Unified Wire Ethernet Controller + 5009 T520-BT Unified Wire Ethernet Controller + 500a T504-BT Unified Wire Ethernet Controller + 500b B520-SR Unified Wire Ethernet Controller + 500c B504-BT Unified Wire Ethernet Controller + 500d T580-CR Unified Wire Ethernet Controller + 500e T540-LP-CR Unified Wire Ethernet Controller + 500f T540 [Amsterdam] Unified Wire Ethernet Controller + 5010 T580-LP-CR Unified Wire Ethernet Controller + 5011 T520-LL-CR Unified Wire Ethernet Controller + 5012 T560-CR Unified Wire Ethernet Controller + 5013 T580-CR Unified Wire Ethernet Controller + 5401 T520-CR Unified Wire Ethernet Controller + 5402 T522-CR Unified Wire Ethernet Controller + 5403 T540-CR Unified Wire Ethernet Controller + 5404 T520-BCH Unified Wire Ethernet Controller + 5405 T540-BCH Unified Wire Ethernet Controller + 5406 T540-CH Unified Wire Ethernet Controller + 5407 T520-SO Unified Wire Ethernet Controller + 5408 T520-CX Unified Wire Ethernet Controller + 5409 T520-BT Unified Wire Ethernet Controller + 540a T504-BT Unified Wire Ethernet Controller + 540b B520-SR Unified Wire Ethernet Controller + 540c B504-BT Unified Wire Ethernet Controller + 540d T580-CR Unified Wire Ethernet Controller + 540e T540-LP-CR Unified Wire Ethernet Controller + 540f T540 [Amsterdam] Unified Wire Ethernet Controller + 5410 T580-LP-CR Unified Wire Ethernet Controller + 5411 T520-LL-CR Unified Wire Ethernet Controller + 5412 T560-CR Unified Wire Ethernet Controller + 5413 T580-CR Unified Wire Ethernet Controller + 5501 T520-CR Unified Wire Storage Controller + 5502 T522-CR Unified Wire Storage Controller + 5503 T540-CR Unified Wire Storage Controller + 5504 T520-BCH Unified Wire Storage Controller + 5505 T540-BCH Unified Wire Storage Controller + 5506 T540-CH Unified Wire Storage Controller + 5507 T520-SO Unified Wire Storage Controller + 5508 T520-CX Unified Wire Storage Controller + 5509 T520-BT Unified Wire Storage Controller + 550a T504-BT Unified Wire Storage Controller + 550b B520-SR Unified Wire Storage Controller + 550c B504-BT Unified Wire Storage Controller + 550d T580-CR Unified Wire Storage Controller + 550e T540-LP-CR Unified Wire Storage Controller + 550f T540 [Amsterdam] Unified Wire Storage Controller + 5510 T580-LP-CR Unified Wire Storage Controller + 5511 T520-LL-CR Unified Wire Storage Controller + 5512 T560-CR Unified Wire Storage Controller + 5513 T580-CR Unified Wire Storage Controller + 5601 T520-CR Unified Wire Storage Controller + 5602 T522-CR Unified Wire Storage Controller + 5603 T540-CR Unified Wire Storage Controller + 5604 T520-BCH Unified Wire Storage Controller + 5605 T540-BCH Unified Wire Storage Controller + 5606 T540-CH Unified Wire Storage Controller + 5607 T520-SO Unified Wire Storage Controller + 5608 T520-CX Unified Wire Storage Controller + 5609 T520-BT Unified Wire Storage Controller + 560a T504-BT Unified Wire Storage Controller + 560b B520-SR Unified Wire Storage Controller + 560c B504-BT Unified Wire Storage Controller + 560d T580-CR Unified Wire Storage Controller + 560e T540-LP-CR Unified Wire Storage Controller + 560f T540 [Amsterdam] Unified Wire Storage Controller + 5610 T580-LP-CR Unified Wire Storage Controller + 5611 T520-LL-CR Unified Wire Storage Controller + 5612 T560-CR Unified Wire Storage Controller + 5613 T580-CR Unified Wire Storage Controller + 5701 T520-CR Unified Wire Ethernet Controller + 5702 T522-CR Unified Wire Ethernet Controller + 5703 T540-CR Unified Wire Ethernet Controller + 5704 T520-BCH Unified Wire Ethernet Controller + 5705 T540-BCH Unified Wire Ethernet Controller + 5706 T540-CH Unified Wire Ethernet Controller + 5707 T520-SO Unified Wire Ethernet Controller + 5708 T520-CX Unified Wire Ethernet Controller + 5709 T520-BT Unified Wire Ethernet Controller + 570a T504-BT Unified Wire Ethernet Controller + 570b B520-SR Unified Wire Ethernet Controller + 570c B504-BT Unified Wire Ethernet Controller + 570d T580-CR Unified Wire Ethernet Controller + 570e T540-LP-CR Unified Wire Ethernet Controller + 570f T540 [Amsterdam] Unified Wire Ethernet Controller + 5710 T580-LP-CR Unified Wire Ethernet Controller + 5711 T520-LL-CR Unified Wire Ethernet Controller + 5712 T560-CR Unified Wire Ethernet Controller + 5713 T580-CR Unified Wire Ethernet Controller + 5801 T520-CR Unified Wire Ethernet Controller + 5802 T522-CR Unified Wire Ethernet Controller + 5803 T540-CR Unified Wire Ethernet Controller + 5804 T520-BCH Unified Wire Ethernet Controller + 5805 T540-BCH Unified Wire Ethernet Controller + 5806 T540-CH Unified Wire Ethernet Controller + 5807 T520-SO Unified Wire Ethernet Controller + 5808 T520-CX Unified Wire Ethernet Controller + 5809 T520-BT Unified Wire Ethernet Controller + 580a T504-BT Unified Wire Ethernet Controller + 580b B520-SR Unified Wire Ethernet Controller + 580c B504-BT Unified Wire Ethernet Controller + 580d T580-CR Unified Wire Ethernet Controller + 580e T540-LP-CR Unified Wire Ethernet Controller + 580f T540 [Amsterdam] Unified Wire Ethernet Controller + 5810 T580-LP-CR Unified Wire Ethernet Controller + 5811 T520-LL-CR Unified Wire Ethernet Controller + 5812 T560-CR Unified Wire Ethernet Controller + 5813 T580-CR Unified Wire Ethernet Controller a000 PE10K Unified Wire Ethernet Controller 1426 Storage Technology Corp. 1427 Better On-Line Solutions @@ -12165,8 +12877,6 @@ 144b Verint Systems Inc. 144c Catalina Research Inc 144d Samsung Electronics Co Ltd - c00c P35 laptop - c511 R20 Laptop 144e OLITEC 144f Askey Computer Corp. 1450 Octave Communications Ind. @@ -12176,9 +12886,7 @@ 1455 Logic Plus Plus Inc 1456 Advanced Hardware Architectures 1457 Nuera Communications Inc -1458 Giga-byte Technology - 9001 GC-PTV-TAF Hybrid TV card - e911 GN-WIAG02 +1458 Gigabyte Technology Co., Ltd 1459 DOOIN Electronics 145a Escalate Networks Inc 145b PRAIM SRL @@ -12195,25 +12903,6 @@ e836 M115S Hybrid Analog/DVB PAL/SECAM/NTSC Tuner f436 AVerTV Hybrid+FM 1462 Micro-Star International Co., Ltd. - 5501 nVidia NV15DDR [GeForce2 Ti] - 6819 Broadcom Corporation BCM4306 802.11b/g Wireless LAN Controller [MSI CB54G] - 6825 PCI Card wireless 11g [PC54G] - 6834 RaLink RT2500 802.11g [PC54G2] - 7125 MS-7125 [K8N Neo4 Platinum] - 7235 P965 Neo MS-7235 mainboard - 7242 K9AGM RS485 Motherboard - 7250 MS-7250 Motherboard [K9N Platinum SLI/non-SLI] - 7327 K9AGM2-FIH Motherboard - 7650 Hetis 865GV-E (MS-7065) - 8725 NVIDIA NV25 [GeForce4 Ti 4600] VGA Adapter - 9000 NVIDIA NV28 [GeForce4 Ti 4800] VGA Adapter - 9110 GeFORCE FX5200 - 9119 NVIDIA NV31 [GeForce FX 5600XT] VGA Adapter - 9123 NVIDIA NV31 [GeForce FX 5600] FX5600-VTDR128 [MS-8912] - 9510 Radeon 9600XT - 9511 Radeon 9600XT - 9591 nVidia Corporation NV36 [GeForce FX 5700LE] - b834 Wireless 11g Turbo G PCI card [MSI PC60G] 1463 Fast Corporation 1464 Interactive Circuits & Systems Ltd 1465 GN NETTEST Telecom DIV. @@ -12351,8 +13040,6 @@ 14c1 0008 10G-PCIE-8A 14c1 0009 10G-PCIE-8A (MSI-X firmware) 14c1 000a 10G-PCIE-8B - 14c1 000b 10G-PCIE-8B2 - 14c1 000c 10G-PCIE2-8B2 8043 Myrinet 2000 Scalable Cluster Interconnect 103c 1240 Myrinet M2L-PCI64/2-3.0 LANai 7.4 (HP OEM) 14c2 DTK Computer @@ -12445,6 +13132,7 @@ 1028 01c2 Latitude D620 103c 3015 PCIe LAN on Motherboard 107b 5048 E4500 Onboard + 1259 2705 AT-2711FX 1601 NetXtreme BCM5752M Gigabit Ethernet PCI Express 1612 BCM70012 Video Decoder [Crystal HD] 1615 BCM70015 Video Decoder [Crystal HD] @@ -12468,6 +13156,9 @@ 163d NetXtreme II BCM57811 10-Gigabit Ethernet 163e NetXtreme II BCM57811 10 Gigabit Ethernet Multi Function 163f NetXtreme II BCM57811 10-Gigabit Ethernet Virtual Function + 1641 NetXtreme BCM57787 Gigabit Ethernet PCIe + 1642 NetXtreme BCM57764 Gigabit Ethernet PCIe + 1643 NetXtreme BCM5725 Gigabit Ethernet PCIe 1644 NetXtreme BCM5700 Gigabit Ethernet 1014 0277 Broadcom Vigil B5700 1000Base-T 1028 00d1 Broadcom BCM5700 @@ -12567,6 +13258,7 @@ 103c 7058 NC532i Dual Port 10GbE Multifunction BL-C Adapter 1653 NetXtreme BCM5705 Gigabit Ethernet 0e11 00e3 NC7761 Gigabit Server Adapter + 1734 1073 Primergy Econel 200 D2020 mainboard 1654 NetXtreme BCM5705_2 Gigabit Ethernet 0e11 00e3 NC7761 Gigabit Server Adapter 103c 3100 NC1020 ProLiant Gigabit Server Adapter 32 PCI @@ -12604,6 +13296,7 @@ 165f NetXtreme BCM5720 Gigabit Ethernet PCIe 1662 NetXtreme II BCM57712 10 Gigabit Ethernet 1663 NetXtreme II BCM57712 10 Gigabit Ethernet Multi Function + 1665 NetXtreme BCM5717 Gigabit Ethernet PCIe 1668 NetXtreme BCM5714 Gigabit Ethernet 103c 7039 NC324i PCIe Dual Port Gigabit Server Adapter 1669 NetXtreme 5714S Gigabit Ethernet @@ -12650,9 +13343,13 @@ 1680 NetXtreme BCM5761e Gigabit Ethernet PCIe 1681 NetXtreme BCM5761 Gigabit Ethernet PCIe 1682 NetXtreme BCM57762 Gigabit Ethernet PCIe + 1683 NetXtreme BCM57767 Gigabit Ethernet PCIe 1684 NetXtreme BCM5764M Gigabit Ethernet PCIe 1685 NetXtreme II BCM57500S Gigabit Ethernet 1686 NetXtreme BCM57766 Gigabit Ethernet PCIe + 1687 NetXtreme BCM5762 Gigabit Ethernet PCIe + 1688 NetXtreme BCM5761 10/100/1000BASE-T Ethernet + 1259 2708 AT-2712 FX # The Broadcom 57800 device has two 1Gig ports and two 10Gig ports. The subsystem information can be used to differentiate. 168a NetXtreme II BCM57800 1/10 Gigabit Ethernet 1028 1f5c BCM57800 10-Gigabit Ethernet @@ -12661,6 +13358,7 @@ 1028 1f68 BCM57800 1-Gigabit Ethernet 168d NetXtreme II BCM57840 10/20 Gigabit Ethernet 168e NetXtreme II BCM57810 10 Gigabit Ethernet + 103c 1798 Flex-10 10Gb 2-port 530FLB Adapter [Meru] 1690 NetXtreme BCM57760 Gigabit Ethernet PCIe 1691 NetLink BCM57788 Gigabit Ethernet PCIe 1028 04aa XPS 8300 @@ -12754,6 +13452,7 @@ 14e4 0009 NetXtreme BCM5703 1000Base-T 14e4 000a NetXtreme BCM5703 1000Base-SX 16dd NetLink BCM5781 Gigabit Ethernet PCI Express + 16f3 NetXtreme BCM5727 Gigabit Ethernet PCIe 16f7 NetXtreme BCM5753 Gigabit Ethernet PCI Express 16fd NetXtreme BCM5753M Gigabit Ethernet PCI Express 103c 309f Compaq nx9420 Notebook @@ -12821,6 +13520,7 @@ 103c 1372 Broadcom 802.11a/b/g WLAN 103c 1373 Broadcom 802.11a/b/g WLAN 103c 30b5 Presario V3242AU + 106b 0089 AirPort Extreme 1371 103c Broadcom 802.11 Multiband-netwerkadapter(6715s) 4313 BCM4311 802.11a 4315 BCM4312 802.11b/g LP-PHY @@ -12883,7 +13583,7 @@ 185f 1220 TravelMate 290E WLAN Mini-PCI Card 4321 BCM4321 802.11a Wireless Network Controller 4322 BCM4322 802.11bgn Wireless Network Controller - 4324 BCM4306 802.11a/b/g + 4324 BCM4309 802.11abg Wireless Network Controller 1028 0001 Truemobile 1400 1028 0002 TrueMobile 1400 Dual Band WLAN PC Card 1028 0003 Truemobile 1450 MiniPCI @@ -12901,6 +13601,11 @@ 103c 1367 BCM4321 802.11a/b/g/n Wireless LAN Controller 103c 1368 BCM4321 802.11a/b/g/n Wireless LAN Controller 103c 1369 BCM4321 802.11a/b/g/n Wireless LAN Controller + 106b 0087 AirPort Extreme + 106b 0088 AirPort Extreme + 106b 008b AirPort Extreme + 106b 008c AirPort Extreme + 106b 0090 AirPort Extreme 14e4 4328 BCM4328 802.11a/b/g/n 1737 0066 WPC600N v1 802.11a/b/g/n Wireless-N CardBus Adapter 1737 0068 WEC600N v1 802.11a/b/g/n Wireless-N ExpressCard @@ -12911,16 +13616,28 @@ 432a BCM4321 802.11an Wireless Network Controller 432b BCM4322 802.11a/b/g/n Wireless LAN Controller 1028 000d Wireless 1510 Wireless-N WLAN Mini-Card + 106b 008d AirPort Extreme 106b 008e AirPort Extreme 432c BCM4322 802.11b/g/n 1799 d311 Dynex DX-NNBX 802.11n WLAN Cardbus Card 432d BCM4322 802.11an Wireless Network Controller 4331 BCM4331 802.11a/b/g/n 106b 00d6 AirPort Extreme + 106b 00e4 AirPort Extreme + 106b 00ef AirPort Extreme + 106b 00f4 AirPort Extreme + 106b 00f5 AirPort Extreme + 106b 010e AirPort Extreme + 106b 010f AirPort Extreme + 4333 Serial (EDGE/GPRS modem part of Option GT Combo Edge) 4344 EDGE/GPRS data and 802.11b/g combo cardbus [GC89] + 4350 BCM43222 Wireless Network Adapter 4353 BCM43224 802.11a/b/g/n 1028 000e Wireless 1520 Half-size Mini PCIe Card 103c 1509 WMIB-275N Half-size Mini PCIe Card + 106b 0093 AirPort Extreme + 106b 00d1 AirPort Extreme + 106b 00e9 AirPort Extreme 4357 BCM43225 802.11b/g/n 105b e021 T77H103.00 Wireless Half-size Mini PCIe Card 4358 BCM43227 802.11b/g/n @@ -12929,6 +13646,7 @@ 103c 182c BCM943228HM4L 802.11a/b/g/n 2x2 Wi-Fi Adapter 4365 BCM43142 802.11b/g/n 1028 0016 Wireless 1704 802.11n + BT 4.0 + 43b1 BCM4352 802.11ac Wireless Network Adapter 4401 BCM4401 100Base-T 1025 0035 TravelMate 660 103c 08b0 tc1100 tablet @@ -12985,7 +13703,12 @@ 5840 BCM5840 Crypto Accelerator 5841 BCM5841 Crypto Accelerator 5850 BCM5850 Crypto Accelerator + 8602 BCM7400/BCM7405 Serial ATA Controller + a8d8 BCM43224/5 Wireless Network Adapter + b302 BCM56302 StrataXGS 24x1GE 2x10GE Switch Controller + b334 BCM56334 StrataXGS 24x1GE 4x10GE Switch Controller b800 BCM56800 StrataXGS 10GE Switch Controller + b842 BCM56842 Trident 10GE Switch Controller 14e5 Pixelfusion Ltd 14e6 SHINING Technology Inc 14e7 3CX @@ -13138,8 +13861,6 @@ 2464 HSF 56k Data/Fax/Voice Modem (Mob SmartDAA) 2465 HSF 56k Data/Fax/Voice/Spkp (w/HS) Modem (Mob SmartDAA) 2466 HSF 56k Data/Fax/Voice/Spkp Modem (Mob SmartDAA) - 2bfa D110 HDAudio Soft Data Fax Modem with SmartCP - 1025 0009 Aspire 5622WLMi 2f00 HSF 56k HSFi Modem 13e0 8d84 IBM HSFi V.90 13e0 8d85 Compaq Stinger @@ -13152,16 +13873,15 @@ 2f30 SoftV92 SpeakerPhone SoftRing Modem with SmartSP 14f1 2014 Devolo MikroLink 56K Modem PCI 2f50 Conexant SoftK56 Data/Fax Modem - 5045 CX20549 (Venice) - 5047 High Definition Audio [Waikiki] - 5051 High Definition Audio (HERMOSA) 5b7a CX23418 Single-Chip MPEG-2 Encoder with Integrated Analog Video/Broadcast Audio Decoder 0070 7444 WinTV HVR-1600 + 107d 6f34 WinFast DVR3100 H 5854 3343 GoTView PCI DVD3 Hybrid 8200 CX25850 8234 RS8234 ATM SAR Controller [ServiceSAR Plus] 8800 CX23880/1/2/3 PCI Video and Audio Decoder 0070 2801 Hauppauge WinTV 28xxx (Roslyn) models + 0070 3400 WinTV 34604 0070 3401 Hauppauge WinTV 34xxx models 0070 6902 WinTV HVR-4000-HD 0070 7801 WinTV HVR-1800 MCE @@ -13239,6 +13959,7 @@ 0070 9402 WinTV-HVR1100 DVB-T/Hybrid 7063 5500 pcHDTV HD-5500 8811 CX23880/1/2/3 PCI Video and Audio Decoder [Audio Port] + 0070 3400 WinTV 34604 0070 3401 Hauppauge WinTV 34xxx models 0070 6902 WinTV HVR-4000-HD 0070 9402 WinTV-HVR1100 DVB-T/Hybrid @@ -13251,7 +13972,9 @@ 5654 2388 GoTView PCI Hybrid Audio Capture Device 8852 CX23885 PCI Video and Audio Decoder 0070 8010 Hauppauge WinTV HVR-1400 ExpressCard + 107d 6f22 WinFast PxTV1200 1461 c039 AVerTV Hybrid Express (A577) + 153b 117e Cinergy T PCIe Dual 18ac db78 FusionHDTV DVB-T Dual Express 8880 CX23887/8 PCIe Broadcast Audio and Video Decoder with 3D Comb 0070 c108 WinTV-HVR-4400-HD model 1278 @@ -13438,7 +14161,6 @@ 9260 RCIM-II Real-Time Clock & Interrupt Module 1543 SILICON Laboratories 3052 Intel 537 [Winmodem] - 3155 Motorola SM56 Speakerphone Modem 4c22 Si3036 MC'97 DAA 1544 DCM DATA Systems 1545 VISIONTEK @@ -13588,6 +14310,7 @@ 0740 Virtual Machine Communication Interface 0770 USB2 EHCI Controller 0774 USB1.1 UHCI Controller + 0778 USB3 xHCI Controller 0790 PCI bridge 07a0 PCI Express Root Port 07b0 VMXNET3 Ethernet Controller @@ -13602,13 +14325,14 @@ 15b3 Mellanox Technologies 0191 MT25408 [ConnectX IB Flash Recovery] 01f6 MT27500 Family [ConnectX-3 Flash Recovery] + 01ff MT27600 Family [Connect-IB Flash Recovery] 1002 MT25400 Family [ConnectX-2 Virtual Function] 1003 MT27500 Family [ConnectX-3] 1004 MT27500 Family [ConnectX-3 Virtual Function] 1005 MT27510 Family 1006 MT27511 Family - 1007 MT27520 Family - 1008 MT27521 Family + 1007 MT27520 Family [ConnectX-3 Pro] + 1008 MT27520 Family [ConnectX-3 Pro Virtual Function] 1009 MT27530 Family 100a MT27531 Family 100b MT27540 Family @@ -13617,6 +14341,12 @@ 100e MT27551 Family 100f MT27560 Family 1010 MT27561 Family + 1011 MT27600 [Connect-IB] + 1012 MT27600 Family [Connect-IB Virtual Function] + 1013 MT27620 Family + 1014 MT27621 Family + 1015 MT27630 Family + 1016 MT27631 Family 5274 MT21108 InfiniBridge 5a44 MT23108 InfiniHost 5a45 MT23108 [Infinihost HCA Flash Recovery] @@ -13706,6 +14436,7 @@ 15cd Dreamtech Co Ltd 15ce Genrad Inc 15cf Hilscher GmbH + 0000 CIFX 50E-DP(M/S) 15d1 Infineon Technologies AG 15d2 FIC (First International Computer Inc) 15d3 NDS Technologies Israel Ltd @@ -13865,7 +14596,8 @@ 1682 XFX Pine Group Inc. 1688 CastleNet Technology Inc. 1170 WLAN 802.11b card -168c Atheros Communications Inc. +# nee Atheros Communications, Inc. +168c Qualcomm Atheros 0007 AR5210 Wireless Network Adapter [AR5000 802.11a] 1737 0007 WPC54A Wireless PC Card 1b47 0100 Harmony 8450CN Wireless CardBus Module @@ -13873,6 +14605,9 @@ 8086 2501 PRO/Wireless 5000 LAN PCI Adapter Module 0011 AR5211 Wireless Network Adapter [AR5001A 802.11a] 0012 AR5211 Wireless Network Adapter [AR5001X 802.11ab] + 1186 3a03 AirPro DWL-A650 Wireless Cardbus Adapter (rev.B) + 1186 3a04 AirPro DWL-AB650 Multimode Wireless Cardbus Adapter + 1186 3a05 AirPro DWL-AB520 Multimode Wireless PCI Adapter 126c 8031 2201 Mobile Adapter 1385 4400 WAB501 802.11ab Wireless CardBus Card 1b47 aa00 8460 802.11ab Wireless CardBus Adapter @@ -13889,6 +14624,8 @@ 1154 034e Buffalo WLI-CB-AG108HP 802.11abg Cardbus Adapter 1186 3202 DWL-G650 (Rev B3,B5) Wireless cardbus adapter 1186 3203 AirPlus DWL-G520 Wireless PCI Adapter (rev. A) + 1186 3a07 AirXpert DWL-AG650 Wireless Cardbus Adapter + 1186 3a08 AirXpert DWL-AG520 Wireless PCI Adapter 1186 3a12 D-Link AirPlus DWL-G650 Wireless Cardbus Adapter(rev.C) 1186 3a13 AirPlus DWL-G520 Wireless PCI Adapter (rev. B) 1186 3a14 AirPremier AG DWL-AG530 Wireless PCI Adapter (rev.A) @@ -13899,14 +14636,17 @@ 1186 3a93 Conceptronic C54I Wireless 801.11g PCI card 1186 3a94 Conceptronic C54C 802.11g Wireless Cardbus Adapter 1186 3ab0 Allnet ALL0281 Wireless PCI Card + 1385 4600 WAG511 802.11a/b/g Dual Band Wireless PC Card + 1385 4610 WAG511 802.11a/b/g Dual Band Wireless PC Card 1385 4900 WG311v1 802.11g Wireless PCI Adapter + 1385 4a00 WAG311 802.11a/g Wireless PCI Adapter 1385 4b00 WG511T 108 Mbps Wireless PC Card (rev.A/B) 1385 4d00 WG311T 108 Mbps Wireless PCI Adapter (rev.A2) 1385 4f00 WG511U Double 108 Mbps Wireless PC Card 1385 5a00 WG311T 108 Mbps Wireless PCI Adapter (rev.A3) 1385 5b00 WG511T 108 Mbps Wireless PC Card (rev.C) 1385 5d00 WPN511 RangeMax Wireless PC Card - 1458 e911 Gigabyte GN-WIAG02 + 1458 e911 GN-WIAG02 1468 0403 U10H014 802.11g Cardbus Adapter 1468 0408 ThinkPad 11b/g Wireless LAN Mini PCI Adapter 14b7 0a10 8480-WD 802.11abg Cardbus Adapter @@ -13958,6 +14698,8 @@ 17f9 0008 DX-WGNBC 802.11bg Wireless CardBus Adapter 17f9 0018 DX-WGDTC 802.11bg Wireless PCI Adapter 001b AR5413/AR5414 Wireless Network Adapter [AR5006X(S) 802.11abg] +# Atheros AR5414 32-bit mini-PCI type IIIB + 0777 1107 UB5 802.11a Wireless Mini PCI Adapter 0777 3002 XR2 802.11g Wireless Mini PCI Adapter 0777 3005 XR5 802.11a Wireless Mini PCI Adapter 0777 3009 XR9 900MHz Wireless Mini PCI Adapter @@ -13979,7 +14721,7 @@ 001c AR242x / AR542x Wireless Network Adapter (PCI-Express) 0777 3006 SRX 802.11abg Wireless ExpressCard Adapter 103c 137a AR5BXB63 (Foxconn) 802.11bg Mini PCIe NIC - 106b 0086 AR5BXB6 802.11abg Wireless Mini PCIe Card + 106b 0086 AirPort Extreme 144f 7106 WLL3140 (Toshiba PA3501U-1MPC) 802.11bg Wireless Mini PCIe Card 144f 7128 WLL3141 (Toshiba PA3613U-1MPC) 802.11bg Wireless Mini PCIe Card 1468 0428 AR5BXB63 802.11bg NIC @@ -14017,17 +14759,20 @@ 187e 3411 NWD-370N 802.11n Wireless PCI Adapter 1976 2008 TEW-621PC 802.11bgn Wireless CardBus Adapter 0024 AR5418 Wireless Network Adapter [AR5008E 802.11(a)bgn] (PCI-Express) - 106b 0087 AR5BXB72 802.11abgn Mini PCIe Card [AR5008E-3NX] + 106b 0087 AirPort Extreme + 1186 3a70 DWA-556 Xtreme N PCI Express Desktop Adapter 0027 AR9160 Wireless Network Adapter [AR9001 802.11(a)bgn] 0777 4082 SR71-A 802.11abgn Wireless Mini PCI Adapter 0029 AR922X Wireless Network Adapter 0777 4005 SR71-15 802.11an Mini PCI Adapter 1186 3a7a DWA-552 802.11n Xtreme N Desktop Adapter (rev A2) + 1186 3a7d DWA-552 802.11n Xtreme N Desktop Adapter (rev A3) 002a AR928X Wireless Network Adapter (PCI-Express) 0777 4f05 SR71-X 802.11abgn Wireless ExpressCard Adapter [AR9280] 103c 3041 AR5BHB92-H 802.11abgn Wireless Half-size Mini PCIe Card [AR9280] 105b e006 T77H053.00 802.11bgn Wireless Mini PCIe Card [AR9281] 105b e01f T77H047.31 802.11bgn Wireless Half-size Mini PCIe Card [AR9283] + 106b 008f AirPort Extreme 11ad 6600 WN6600A 802.11bgn Wireless Mini PCIe Card [AR9281] 144f 7141 WLL6080 802.11bgn Wireless Mini PCIe Card [AR9281] 168c 0203 DW1525 802.11abgn WLAN PCIe Card [AR9280] @@ -14041,6 +14786,7 @@ 103c 303f U98Z062.10 802.11bgn Wireless Half-size Mini PCIe Card 103c 3040 U98Z062.12 802.11bgn Wireless Half-size Mini PCIe Card 105b e017 T77H126.00 802.11bgn Wireless Half-size Mini PCIe Card + 105b e023 T77H121.04 802.11bgn Wireless Half-size Mini PCIe Card 1113 e811 WN7811A (Toshiba PA3722U-1MPC) 802.11bgn Wireless Half-size Mini PCIe Card 185f 30af DNXA-95 802.11bgn Wireless Half-size Mini PCIe Card 1931 0023 Option GTM67x PCIe WiFi Adapter @@ -14051,21 +14797,27 @@ 002c AR2427 802.11bg Wireless Network Adapter (PCI-Express) 002d AR9227 Wireless Network Adapter 002e AR9287 Wireless Network Adapter (PCI-Express) - 0030 AR9300 Wireless LAN adaptor + 0030 AR93xx Wireless Network Adapter 103c 1627 AR9380/HB112 802.11abgn 3Ã3 Wi-Fi Adapter + 106b 009a AirPort Extreme + 1186 3a7e DWA-566 Wireless N 300 Dual Band PCIe Desktop Adapter 1a56 2000 Killer Wireless-N 1102 Half-size Mini PCIe Card [AR9382] 1a56 2001 Killer Wireless-N 1103 Half-size Mini PCIe Card [AR9380] 0032 AR9485 Wireless Network Adapter 103c 1838 AR9485/HB125 802.11bgn 1Ã1 Wi-Fi Adapter 0033 AR9580 Wireless Network Adapter 0034 AR9462 Wireless Network Adapter + 0036 QCA9565 / AR9565 Wireless Network Adapter + 003c QCA988x 802.11ac Wireless Network Adapter 0207 AR5210 Wireless Network Adapter [AR5000 802.11a] 1014 AR5212 802.11abg NIC 1014 058a ThinkPad 11a/b/g Wireless LAN Mini Express Adapter (AR5BXB6) 9013 AR5002X Wireless Network Adapter ff19 AR5006X Wireless Network Adapter ff1c AR5008 Wireless Network Adapter - ff1d AR5008 Wireless Network Adapter + ff1d AR922x Wireless Network Adapter +# Found in "AVM Fritz!Box FON WLAN 7270v3" + 168c ee1c AR9220-AC1A [AVM Fritz!Box FON WLAN 7270 v3] 1695 EPoX Computer Co., Ltd. 169c Netcell Corporation 0044 Revolution Storage Processing Card @@ -14158,6 +14910,10 @@ 5807 XMC-SLX150: Reconfigurable Spartan-6 FPGA with plug-in I/O 5808 XMC-SLX150-1M: Reconfigurable Spartan-6 FPGA with plug-in I/O 5901 APCe8650 PCI Express IndustryPack Carrier Card + 6301 XMC Module with user-configurable Virtex-6 FPGA, 240k logic cells, SFP front I/O + 6302 XMC Module with user-configurable Virtex-6 FPGA, 365k logic cells, SFP front I/O + 6303 XMC Module with user-configurable Virtex-6 FPGA, 240k logic cells, no front I/O + 6304 XMC Module with user-configurable Virtex-6 FPGA, 365k logic cells, no front I/O 16da Advantech Co., Ltd. 0011 INES GPIB-PCI 16df PIKA Technologies Inc. @@ -14191,10 +14947,8 @@ 7174 VSC7174 PCI/PCI-X Serial ATA Host Bus Controller 172a Accelerated Encryption 13c8 AEP SureWare Runner 1000V3 +# nee Fujitsu Siemens Computers GmbH 1734 Fujitsu Technology Solutions - 1078 Amilo Pro v2010 - 1085 Celsius M450 - 1098 Amilo L 1310G 1735 Aten International Co. Ltd. 1737 Linksys 0029 WPG54G ver. 4 PCI Card @@ -14242,6 +14996,9 @@ 0091 Octeon II CN68XX Network Processor 0092 Octeon II CN65XX Network Processor 0093 Octeon II CN61XX Network Processor + 0094 Octeon Fusion CNF71XX Cell processor + 0095 Octeon III CN78XX Network Processor + 0096 Octeon III CN70XX Network Processor 1787 Hightech Information System Ltd. 1789 Ennyah Technologies Corp. # also used by Struck Innovative Systeme for joint developments @@ -14300,7 +15057,7 @@ 0017 StorSecure 300 GZIP Compression and AES Encryption Card 17c0 Wistron Corp. 17c2 Newisys, Inc. -17cb Airgo Networks Inc +17cb Airgo Networks, Inc. 0001 AGN100 802.11 a/b/g True MIMO Wireless Card 1385 5c00 WGM511 Pre-N 802.11g Wireless CardBus Adapter 1737 0045 WMP54GX v1 802.11g Wireless-G PCI Adapter with SRX @@ -14463,7 +15220,9 @@ 13bd 1057 GN-WS32L-RH Half-size Mini PCIe Card 3091 RT3091 Wireless 802.11n 1T/2R PCIe 3092 RT3092 Wireless 802.11n 2T/2R PCIe - 3592 RT3592 Wireless 802.11an 2T/2R PCIe + 3290 RT3290 Wireless 802.11n 1T/1R PCIe + 3298 RT3290 Bluetooth + 3592 RT3592 Wireless 802.11abgn 2T/2R PCIe 5360 RT5360 Wireless 802.11n 1T/1R 1186 3c05 DWA-525 Wireless N 150 Desktop Adapter (rev.A2) 20f4 703a TEW-703PI N150 Wireless PCI Adapter @@ -14522,7 +15281,7 @@ a101 VigraWATCH PCI a102 VigraWATCH PMC a103 Vigra I/O -187e ZyXEL Communication Corporation +187e ZyXEL Communications Corporation 3403 ZyAir G-110 802.11g 340e M-302 802.11g XtremeMIMO 1885 Avvida Systems Inc. @@ -14643,33 +15402,53 @@ 0091 NT20X Capture Card [New Rev] 00a1 NT4E-STD Capture Card 00a4 NT4E-STD Inline Card +# 8 x 1 Gbps / 10 Gbps PCIe Optical Bypass Adapter + 00b1 NTBPE Optical Bypass Adapter 00c5 NT20E2 Network Adapter 2x10Gb 00d5 NT40E2-4 Network Adapter 4x10Gb 00e5 NT40E2-1 Network Adapter 1x40Gb +# 4-Port Adapter for 1 GbE In-Line Bypass Applications + 00f5 NT4E2-4T-BP Network Adapter 4x1Gb with Electrical Bypass 18f6 NextIO 1000 [Nexsis] Switch Virtual P2P PCIe Bridge + 1001 [Texsis] Switch Virtual P2P PCIe Bridge 1050 [Nexsis] Switch Virtual P2P PCI Bridge + 1051 [Texsis] Switch Virtual P2P PCI Bridge 2000 [Nexsis] Switch Integrated Mgmt. Endpoint + 2001 [Texsis] Switch Integrated Mgmt. Endpoint 18f7 Commtech, Inc. - 0001 Fastcom ESCC-PCI-335 - 0002 Fastcom 422/4-PCI-335 - 0003 Fastcom 232/4-1M-PCI - 0004 Fastcom 422/2-PCI-335 - 0005 Fastcom IGESCC-PCI-ISO/1 - 000a Fastcom 232/4-PCI-335 - 000b Fastcom 232/8-PCI-335 Async 8-Port RS-232 Serial PCI Adapter - 000f Fastcom FSCC - 0010 Fastcom GSCC - 0011 Fastcom QSSB - 0014 SuperFSCC - 0015 SuperFSCC-104 - 0016 Fastcom FSCC-232 Sync/Async 2-Port RS-232 Serial PCI Adapter (F-Core) - 0017 SuperFSCC-104-NOUART - 0018 Fastcom SuperFSCC/4 Sync/Async 4-Port RS-422 Serial PCI Adapter with DMA (F-Core) - 0019 SuperFSCC with soft UARTs - 001a Fastcom SuperFSCC-104-LVDS Sync/Async 2-Port RS-644 Serial PC/104+ Adapter with DMA (F-Core) - 001b Fastcom FSCC/4 Sync/Async 4-Port RS-422 Serial PCI Adapter (F-Core) - 001c Fastcom SuperFSCC/4-LVDSSync/Async 4-Port RS-644 Serial PCI Adapter with DMA (F-Core) + 0001 ESCC-PCI-335 Serial PCI Adapter [Fastcom] + 0002 422/4-PCI-335 Serial PCI Adapter [Fastcom] + 0003 232/4-1M-PCI Serial PCI Adapter [Fastcom] + 0004 422/2-PCI-335 Serial PCI Adapter [Fastcom] + 0005 IGESCC-PCI-ISO/1 Serial PCI Adapter [Fastcom] + 000a 232/4-PCI-335 Serial PCI Adapter [Fastcom] + 000b 232/8-PCI-335 Serial PCI Adapter [Fastcom] + 000f FSCC Serial PCI Adapter [Fastcom] + 0010 GSCC Serial PCI Adapter [Fastcom] + 0011 QSSB Serial PCI Adapter [Fastcom] + 0014 SuperFSCC Serial PCI Adapter [Fastcom] + 0015 SuperFSCC-104-LVDS Serial PC/104+ Adapter [Fastcom] + 0016 FSCC-232 RS-232 Serial PCI Adapter [Fastcom] +# Software UARTs + 0017 SuperFSCC-104 Serial PC/104+ Adapter [Fastcom] +# Software UARTs + 0018 SuperFSCC/4 Serial PCI Adapter [Fastcom] +# Software UARTs + 0019 SuperFSCC Serial PCI Adapter [Fastcom] + 001a SuperFSCC-LVDS Serial PCI Adapter [Fastcom] +# Software UARTs + 001b FSCC/4 Serial PCI Adapter [Fastcom] +# RS-644 Only + 001c SuperFSCC/4-LVDS Serial PCI Adapter [Fastcom] +# Software UARTs + 001d FSCC Serial PCI Adapter [Fastcom] + 001e SuperFSCC/4 Serial PCIe Adapter [Fastcom] + 001f SuperFSCC/4 Serial cPCI Adapter [Fastcom] + 0020 422/4-PCIe Serial PCIe Adapter [Fastcom] + 0021 422/8-PCIe Serial PCIe Adapter [Fastcom] +# RS-644 Only + 0022 SuperFSCC/4-LVDS Serial PCIe Adapter [Fastcom] 18fb Resilience Corporation 1904 Hangzhou Silan Microelectronics Co., Ltd. 2031 SC92031 PCI Fast Ethernet Adapter @@ -14680,6 +15459,8 @@ 0011 SH7757 PCIe End-Point [PBI] 0012 SH7757 PCIe-PCI Bridge [PPB] 0013 SH7757 PCIe Switch [PS] + 0014 uPD720201 USB 3.0 Host Controller + 0015 uPD720202 USB 3.0 Host Controller 1919 Soltek Computer Inc. 1923 Sangoma Technologies Corp. 0040 A200/Remora FXO/FXS Analog AFT card @@ -14717,36 +15498,38 @@ 1924 5201 SFN4112F-R1 1924 5202 SFN4112F-R2 0803 SFC9020 [Solarstorm] - 1924 6200 SFN5122F-R0 - 1924 6201 SFN5122F-R1 - 1924 6202 SFN5122F-R2 - 1924 6204 SFN5122F-R4 - 1924 6205 SFN5122F-R5 - 1924 6206 SFN5122F-R6 - 1924 6207 SFN5122F-R7 - 1924 6210 SFN5322F-R0 - 1924 6211 SFN5322F-R1 - 1924 6217 SFN5322F-R7 - 1924 6227 SFN6122F-R7 - 1924 6237 SFN6322F-R7 - 1924 6501 SFN5802K-R1 - 1924 6511 SFN5814H-R1 - 1924 6521 SFN5812H-R1 - 1924 6a05 SFN5112F-R5 - 1924 6a06 SFN5112F-R6 - 1924 7206 SFN5162F-R6 - 1924 7207 SFN5162F-R7 - 1924 7a06 SFN5152F-R6 - 1924 7a07 SFN5152F-R7 + 1924 1201 SFA6902F-R1 SFP+ AOE Adapter + 1924 6200 SFN5122F-R0 SFP+ Server Adapter + 1924 6201 SFN5122F-R1 SFP+ Server Adapter + 1924 6202 SFN5122F-R2 SFP+ Server Adapter + 1924 6204 SFN5122F-R4 SFP+ Server Adapter + 1924 6205 SFN5122F-R5 SFP+ Server Adapter + 1924 6206 SFN5122F-R6 SFP+ Server Adapter + 1924 6207 SFN5122F-R7 SFP+ Server Adapter + 1924 6210 SFN5322F-R0 SFP+ Precision Time Synchronization Server Adapter + 1924 6211 SFN5322F-R1 SFP+ Precision Time Synchronization Server Adapter + 1924 6217 SFN5322F-R7 SFP+ Precision Time Synchronization Server Adapter + 1924 6227 SFN6122F-R7 SFP+ Server Adapter + 1924 6237 SFN6322F-R7 SFP+ Precision Time Synchronization Server Adapter + 1924 6501 SFN5802K-R1 Mezzanine Adapter + 1924 6511 SFN5814H-R1 Mezzanine Adapter + 1924 6521 SFN5812H-R1 Mezzanine Adapter + 1924 6562 SFN6832F-R2 SFP+ Mezzanine Adapter + 1924 6a05 SFN5112F-R5 SFP+ Server Adapter + 1924 6a06 SFN5112F-R6 SFP+ Server Adapter + 1924 7206 SFN5162F-R6 SFP+ Server Adapter + 1924 7207 SFN5162F-R7 SFP+ Server Adapter + 1924 7a06 SFN5152F-R6 SFP+ Server Adapter + 1924 7a07 SFN5152F-R7 SFP+ Server Adapter 0813 SFL9021 [Solarstorm] - 1924 6100 SFN5121T-R0 - 1924 6102 SFN5121T-R2 - 1924 6103 SFN5121T-R3 - 1924 6104 SFN5121T-R4 - 1924 6902 SFN5111T-R2 - 1924 6904 SFN5111T-R4 - 1924 7104 SFN5161T-R4 - 1924 7904 SFN5151T-R4 + 1924 6100 SFN5121T-R0 10GBASE-T Server Adapter + 1924 6102 SFN5121T-R2 10GBASE-T Server Adapter + 1924 6103 SFN5121T-R3 10GBASE-T Server Adapter + 1924 6104 SFN5121T-R4 10GBASE-T Server Adapter + 1924 6902 SFN5111T-R2 10GBASE-T Server Adapter + 1924 6904 SFN5111T-R4 10GBASE-T Server Adapter + 1924 7104 SFN5161T-R4 10GBASE-T Server Adapter + 1924 7904 SFN5151T-R4 10GBASE-T Server Adapter 1803 SFC9020 Virtual Function [Solarstorm] 1813 SFL9021 Virtual Function [Solarstorm] 6703 SFC4000 rev A iSCSI/Onload [Solarstorm] @@ -14878,8 +15661,8 @@ 1966 Orad Hi-Tec Systems 1975 DVG64 family 1977 DVG128 family -# nee Attansic Technology Corp. -1969 Atheros Communications Inc. +# nee Atheros Communications, Inc. nee Attansic Technology Corp. +1969 Qualcomm Atheros 1026 AR8121/AR8113/AR8114 Gigabit or Fast Ethernet 1043 8304 P5KPL-CM Motherboard 1048 Attansic L1 Gigabit Ethernet @@ -14887,15 +15670,19 @@ 1062 AR8132 Fast Ethernet 1063 AR8131 Gigabit Ethernet 1458 e000 GA-G31M-ES2L Motherboard - 1066 L2c Gigabit Ethernet - 1067 L1c Gigabit Ethernet + 1066 Attansic L2c Gigabit Ethernet + 1067 Attansic L1c Gigabit Ethernet 1073 AR8151 v1.0 Gigabit Ethernet 1083 AR8151 v2.0 Gigabit Ethernet 1090 AR8162 Fast Ethernet 1091 AR8161 Gigabit Ethernet - 2048 L2 Fast Ethernet + 1043 1477 N56VZ + 10a0 QCA8172 Fast Ethernet + 10a1 QCA8171 Gigabit Ethernet + 2048 Attansic L2 Fast Ethernet 2060 AR8152 v1.1 Fast Ethernet 2062 AR8152 v2.0 Fast Ethernet + e091 Killer E2200 Gigabit Ethernet Controller 196a Sensory Networks Inc. 0101 NodalCore C-1000 Content Classification Accelerator 0102 NodalCore C-2000 Content Classification Accelerator @@ -14918,7 +15705,7 @@ 1043 8460 P8P67 Deluxe Motherboard 2363 JMB363 SATA/IDE Controller 1043 81e4 P5B [JMB363] - 1458 b000 GA-EP45-DS5 Motherboard + 1458 b000 Motherboard 1849 2363 Motherboard (one of many) 2364 JMB364 AHCI Controller 2365 JMB365 AHCI/IDE @@ -15016,6 +15803,7 @@ 1a08 Sierra semiconductor 0000 SC15064 1a0e DekTec Digital Video B.V. + 083f DTA-2111 VHF/UHF Modulator 1a17 Force10 Networks, Inc. 8002 PB-10GE-2P 10GbE Security Card 1a1d GFaI e.V. @@ -15039,9 +15827,27 @@ 0200 TILE-Gx36 processor 1a4a SLAC National Accelerator Lab PPA-REG 1000 MCOR Power Supply Controller + 1010 AMC EVR - Stockholm Timing Board 2000 PGPCard - 4 Lane 2010 PCI-Express EVR 1a51 Hectronic AB +1a55 Rohde & Schwarz DVS GmbH + 0010 SDStationOEM + 0011 SDStationOEM II + 0020 Centaurus + 0021 Centaurus II + 0022 Centaurus II LT + 0030 CLIPSTER-VPU 1.x (Hugo) + 0040 Hydra Cinema (JPEG) + 0050 CLIPSTER-VPU 2.x (DigiLab) + 0060 CLIPSTER-DCI 2.x (HydraX) + 0061 Atomix + 0062 Atomix LT + 0063 Atomix HDMI + 0064 Atomix STAN + 0065 Atomix HDMI STAN + 0070 RED Rocket + 0090 CinePlay 1a56 Bigfoot Networks, Inc. 1a57 Highly Reliable Systems 1a58 Razer USA Ltd. @@ -15060,8 +15866,7 @@ 1a78 0037 FlashMAX PCIe SSD [rev 3D] 1a78 0038 FlashMAX PCIe SSD [rev 4] 1a78 0039 FlashMAX PCIe SSD [rev 4D] - 0040 Virident FlashMAX Drive V2 - 1a78 0040 PCIe SSD [LP Z1] + 0040 FlashMAX II 1a84 Commex Technologies 0001 Vulcan SP HT6210 10-Gigabit Ethernet (rev 02) 1a88 MEN Mikro Elektronik @@ -15118,6 +15923,9 @@ 1001 Virtio block device 1002 Virtio memory balloon 1003 Virtio console + 1004 Virtio SCSI + 1005 Virtio RNG + 1009 Virtio filesystem 1af5 Netezza Corp. 1afa J & W Electronics Co., Ltd. 1b03 Magnum Semiconductor, Inc, @@ -15157,7 +15965,8 @@ 917a 88SE9172 SATA III 6Gb/s RAID Controller 9192 88SE9172 SATA III 6Gb/s RAID Controller 91a0 88SE91A0 SATA 6Gb/s Controller - 91a4 88SE9128 IDE Controller + 91a4 88SE912x IDE Controller + 9230 88SE9230 PCIe SATA 6Gb/s Controller 9480 88SE9480 SAS/SATA 6Gb/s RAID controller 1b55 NetUP Inc. 2a2c Dual DVB-S2-CI card @@ -15167,9 +15976,11 @@ f1c4 Dual ASI-RX/TX-CI card 1b6f Etron Technology, Inc. 7023 EJ168 USB 3.0 Host Controller + 7052 EJ188/EJ198 USB 3.0 Host Controller 1b73 Fresco Logic 1000 FL1000G USB 3.0 Host Controller 1d5c 1000 Anker USB 3.0 Express Card + 1009 FL1009 USB 3.0 Host Controller 1b74 OpenVox Communication Co. Ltd. 0115 D115P/D115E Single-port E1/T1 card d130 D130P/D130E Single-port E1/T1 card (3rd GEN) @@ -15182,6 +15993,8 @@ 1b96 Western Digital 1b9a XAVi Technologies Corp. 1bad ReFLEX CES +1bb0 SimpliVity Corporation + 0002 OmniCube Accelerator OA-3000 1bb3 Bluecherry 4304 BC-04120A MPEG4 4 port video encoder / decoder 4309 BC-08240A MPEG4 4 port video encoder / decoder @@ -15195,6 +16008,7 @@ 1bb5 Quantenna Communications, Inc. 1bbf Maxeler Technologies Ltd. 0003 MAX3 + 0004 MAX4 1bf4 VTI Instruments Corporation 1c1c Symphony 0001 82C101 @@ -15203,11 +16017,15 @@ 1c32 Highland Technology, Inc. 1c3b Accensus, LLC 0200 Telas2 +# http://www.accensusllc.com/accensustelas2.html + 0300 Telas 2.V 1c44 Enmotus Inc 8000 8000 Storage IO Controller 1c7f Elektrobit Austria GmbH 5100 EB5100 1c8a TSF5 Corporation + 0001 Hunter PCI Express +1cb1 Collion UG & Co.KG 1d44 DPT a400 PM2x24/PM3224 1d5c Fantasia Trading LLC @@ -15262,8 +16080,6 @@ 20f4 TRENDnet 2116 ZyDAS Technology Corp. 21c3 21st Century Computer Corp. -# (Probably only the Mobile Phone Division) -22b8 Motorola, Inc. 2304 Colorgraphic Communications Corp. 2348 Racore 2010 8142 100VG/AnyLAN @@ -15271,12 +16087,13 @@ 270b Xantel Corporation 270f Chaintech Computer Co. Ltd 2711 AVID Technology Inc. -29b4 82q35 Express MEI Controller +2955 Connectix Virtual PC + 6e61 OHCI USB 1.1 controller 2a15 3D Vision(???) 3000 Hansol Electronics Inc. -3020 LSI SAS2 9211-8i -3080 LSI SAS2 9200-8e 3142 Post Impression Systems. +31ab Zonet + 1faa ZEW1602 802.11b/g Wireless Adapter 3388 Hint Corp 0013 HiNT HC4 PCI to ISDN bridge, Multimedia audio controller 0014 HiNT HC4 PCI to ISDN bridge, Network controller @@ -15599,7 +16416,7 @@ 0301 FlyDVB-T 5301 Alliance Semiconductor Corp. 0001 ProMotion aT3D -5333 S3 Inc. +5333 S3 Graphics Ltd. 0551 Plato/PX (system) 5631 86c325 [ViRGE] 8800 86c866 [Vision 866] @@ -15705,12 +16522,12 @@ 1179 0001 ViRGE/MX 8c02 ViRGE/MX+ 8c03 ViRGE/MX+MV - 8c10 86C270-294 Savage/MX-MV - 8c11 82C270-294 Savage/MX - 8c12 86C270-294 Savage/IX-MV + 8c10 86C270-294 [SavageMX-MV] + 8c11 82C270-294 [SavageMX] + 8c12 86C270-294 [SavageIX-MV] 1014 017f ThinkPad T20/T22 1179 0001 86C584 SuperSavage/IXC Toshiba - 8c13 86C270-294 Savage/IX + 8c13 86C270-294 [SavageIX] 1179 0001 Magnia Z310 8c22 SuperSavage MX/128 8c24 SuperSavage MX/64 @@ -15726,10 +16543,15 @@ 8d02 VT8636A [ProSavage KN133] AGP4X VGA Controller (TwisterK) 8d03 VT8751 [ProSavageDDR P4M266] 8d04 VT8375 [ProSavage8 KM266/KL266] + 8e00 DeltaChrome + 8e26 ProSavage 8e40 2300E Graphics Processor - 8e48 Chrome S27 PCIE + 8e48 Matrix [Chrome S25 / S27] 5333 0130 Chrome S27 256M DDR2 - 9102 86C410 Savage 2000 + 9043 Chrome 430 GT + 9045 Chrome 430 ULP / 435 ULP / 440 GTX + 9060 Chrome 530 GT + 9102 86C410 [Savage 2000] 1092 5932 Viper II Z200 1092 5934 Viper II Z200 1092 5952 Viper II Z200 @@ -15786,6 +16608,7 @@ 1022 4 photo couple 4 relay Card 1025 16 photo couple 16 relay Card 4000 WatchDog Card +6688 Zycoo Co., Ltd # nee Qumranet 6900 Red Hat, Inc. 7063 pcHDTV @@ -15812,6 +16635,7 @@ 0043 Core Processor Secondary PCI Express Root Port 0044 Core Processor DRAM Controller 1025 0347 Aspire 7740G + 1025 0487 TravelMate 5742 e4bf 50c1 PC1-GROOVE 0045 Core Processor PCI Express x16 Root Port 0046 Core Processor Integrated Graphics Controller @@ -15823,13 +16647,13 @@ 004b Core Processor Secondary PCI Express Root Port 0050 Core Processor Thermal Management Controller 0069 Core Processor DRAM Controller - 0082 Centrino Advanced-N 6205 + 0082 Centrino Advanced-N 6205 [Taylor Peak] 8086 1301 Centrino Advanced-N 6205 AGN 8086 1306 Centrino Advanced-N 6205 ABG 8086 1307 Centrino Advanced-N 6205 BG 8086 1321 Centrino Advanced-N 6205 AGN 8086 1326 Centrino Advanced-N 6205 ABG - 0083 Centrino Wireless-N 1000 + 0083 Centrino Wireless-N 1000 [Condor Peak] 8086 1205 Centrino Wireless-N 1000 BGN 8086 1206 Centrino Wireless-N 1000 BG 8086 1225 Centrino Wireless-N 1000 BGN @@ -15838,35 +16662,35 @@ 8086 1306 Centrino Wireless-N 1000 BG 8086 1325 Centrino Wireless-N 1000 BGN 8086 1326 Centrino Wireless-N 1000 BG - 0084 Centrino Wireless-N 1000 + 0084 Centrino Wireless-N 1000 [Condor Peak] 8086 1215 Centrino Wireless-N 1000 BGN 8086 1216 Centrino Wireless-N 1000 BG 8086 1315 Centrino Wireless-N 1000 BGN 8086 1316 Centrino Wireless-N 1000 BG - 0085 Centrino Advanced-N 6205 + 0085 Centrino Advanced-N 6205 [Taylor Peak] 8086 1311 Centrino Advanced-N 6205 AGN 8086 1316 Centrino Advanced-N 6205 ABG - 0087 Centrino Advanced-N + WiMAX 6250 + 0087 Centrino Advanced-N + WiMAX 6250 [Kilmer Peak] 8086 1301 Centrino Advanced-N + WiMAX 6250 2x2 AGN 8086 1306 Centrino Advanced-N + WiMAX 6250 2x2 ABG 8086 1321 Centrino Advanced-N + WiMAX 6250 2x2 AGN 8086 1326 Centrino Advanced-N + WiMAX 6250 2x2 ABG - 0089 Centrino Advanced-N + WiMAX 6250 + 0089 Centrino Advanced-N + WiMAX 6250 [Kilmer Peak] 8086 1311 Centrino Advanced-N + WiMAX 6250 2x2 AGN 8086 1316 Centrino Advanced-N + WiMAX 6250 2x2 ABG - 008a Centrino Wireless-N 1030 + 008a Centrino Wireless-N 1030 [Rainbow Peak] 8086 5305 Centrino Wireless-N 1030 BGN 8086 5307 Centrino Wireless-N 1030 BG 8086 5325 Centrino Wireless-N 1030 BGN 8086 5327 Centrino Wireless-N 1030 BG - 008b Centrino Wireless-N 1030 + 008b Centrino Wireless-N 1030 [Rainbow Peak] 8086 5315 Centrino Wireless-N 1030 BGN 8086 5317 Centrino Wireless-N 1030 BG - 0090 Centrino Advanced-N 6230 + 0090 Centrino Advanced-N 6230 [Rainbow Peak] 8086 5211 Centrino Advanced-N 6230 AGN 8086 5215 Centrino Advanced-N 6230 BGN 8086 5216 Centrino Advanced-N 6230 ABG - 0091 Centrino Advanced-N 6230 + 0091 Centrino Advanced-N 6230 [Rainbow Peak] 8086 5201 Centrino Advanced-N 6230 AGN 8086 5205 Centrino Advanced-N 6230 BGN 8086 5206 Centrino Advanced-N 6230 ABG @@ -15881,7 +16705,9 @@ 1028 04b2 Vostro 3350 106b 00dc MacBookPro8,2 [Core i7, 15", 2011] 0102 2nd Generation Core Processor Family Integrated Graphics Controller + 1028 04aa XPS 8300 0104 2nd Generation Core Processor Family DRAM Controller + 1028 04a3 Precision M4600 1028 04b2 Vostro 3350 1028 04da Vostro 3750 106b 00dc MacBookPro8,2 [Core i7, 15", 2011] @@ -15902,9 +16728,17 @@ 0126 2nd Generation Core Processor Family Integrated Graphics Controller 1028 04cc Vostro 3350 0150 Xeon E3-1200 v2/3rd Gen Core processor DRAM Controller + 1043 84ca P8H77-I Motherboard 0151 Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port + 1043 1477 N56VZ + 1043 84ca P8H77-I Motherboard 0152 Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller + 1043 84ca P8H77-I Motherboard + 0153 3rd Gen Core Processor Thermal Subsystem + 1043 1517 Zenbook Prime UX31A 0154 3rd Gen Core processor DRAM Controller + 1043 1477 N56VZ + 1043 1517 Zenbook Prime UX31A 0155 Xeon E3-1200 v2/3rd Gen Core processor PCI Express Root Port 0156 3rd Gen Core processor Graphics Controller 0158 Xeon E3-1200 v2/Ivy Bridge DRAM Controller @@ -15915,14 +16749,18 @@ 015e Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller 0162 Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller 0166 3rd Gen Core processor Graphics Controller + 1043 1517 Zenbook Prime UX31A + 1043 2103 N56VZ 016a Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller 0172 Xeon E3-1200 v2/3rd Gen Core processor Graphics Controller 0176 3rd Gen Core processor Graphics Controller 0309 80303 I/O Processor PCI-to-PCI Bridge 030d 80312 I/O Companion Chip PCI-to-PCI Bridge 0326 6700/6702PXH I/OxAPIC Interrupt Controller A + 103c 3208 ProLiant DL140 G2 1775 1100 CR11/VR11 Single Board Computer 0327 6700PXH I/OxAPIC Interrupt Controller B + 103c 3208 ProLiant DL140 G2 1775 1100 CR11/VR11 Single Board Computer 0329 6700PXH PCI Express-to-PCI Bridge A 032a 6700PXH PCI Express-to-PCI Bridge B @@ -15941,13 +16779,13 @@ 0372 80333 Segment-B PCI Express-to-PCI Express Bridge 0373 80333 B-Bus IOAPIC 0374 80333 Address Translation Unit - 0402 Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller - 0406 4th Gen Core Processor Integrated Graphics Controller - 040a Xeon E3-1200 v3 Processor Integrated Graphics Controller - 0412 Xeon E3-1200 v3/4th Gen Core Processor Integrated Graphics Controller - 0416 4th Gen Core Processor Integrated Graphics Controller - 041a Xeon E3-1200 v3 Processor Integrated Graphics Controller - 0436 DH89xxCC Gigabit SGMII Connection + 0402 Haswell Integrated Graphics Controller + 0406 Haswell Integrated Graphics Controller + 040a Haswell Integrated Graphics Controller + 0412 Haswell Integrated Graphics Controller + 0416 Haswell Integrated Graphics Controller + 041a Haswell Integrated Graphics Controller + 0436 DH8900CC Null Device 0438 DH8900CC Series Gigabit Network Connection 043a DH8900CC Series Gigabit Fiber Network Connection 043c DH8900CC Series Gigabit Backplane Network Connection @@ -16067,6 +16905,100 @@ 08af Centrino Wireless-N 100 8086 1015 Centrino Wireless-N 100 BGN 8086 1017 Centrino Wireless-N 100 BG + 08b1 Wireless 7260 +# Wilkins Peak 2 2x2 AGN + BT + 8086 4060 Dual Band Wireless-N 7260 +# Wilkins Peak 2 BGN + BT + 8086 4062 Wireless-N 7260 +# Wilkins Peak 2 2x2 80MHz + BT + 8086 4070 Dual Band Wireless-AC 7260 +# Wilkins Peak 2 2x2 AGN + BT + 8086 4160 Dual Band Wireless-N 7260 +# Wilkins Peak 2 BGN + BT + 8086 4162 Wireless-N 7260 +# Wilkins Peak 2 2x2 80MHz + BT + 8086 4170 Dual Band Wireless-AC 7260 +# Wilkins Peak 2 AGN + BT + 8086 4460 Dual Band Wireless-N 7260 +# Wilkins Peak 2 BGN + BT + 8086 4462 Wireless-N 7260 +# Wilkins Peak 2 2x2 80MHz + BT + 8086 4470 Dual Band Wireless-AC 7260 +# Wilkins Peak 2 2x2 80MHz + BT + 8086 486e Dual Band Wireless-AC 7260 +# Wilkins Peak 2 2x2 80MHz + BT + 8086 4870 Dual Band Wireless-AC 7260 +# Wilkins Peak 2 2x2 80MHz + BT + 8086 4a6c Dual Band Wireless-AC 7260 +# Wilkins Peak 2 2x2 80MHz + BT + 8086 4a6e Dual Band Wireless-AC 7260 +# Wilkins Peak 2 2x2 80MHz + BT + 8086 4a70 Dual Band Wireless-AC 7260 +# Wilkins Peak 2 2x2 80MHz (No BT) + 8086 c020 Dual Band Wireless-N 7260 +# Wilkins Peak 2 2x2 AGN + BT + 8086 c060 Dual Band Wireless-N 7260 +# Wilkins Peak 2 BGN + BT + 8086 c062 Wireless-N 7260 +# Wilkins Peak 2 2x2 80MHz + BT + 8086 c070 Dual Band Wireless-AC 7260 +# Wilkins Peak 2 2x2 AGN + BT + 8086 c160 Dual Band Wireless-N 7260 +# Wilkins Peak 2 BGN + BT + 8086 c162 Wireless-N 7260 +# Wilkins Peak 2 2x2 80MHz + BT + 8086 c170 Dual Band Wireless-AC 7260 +# Wilkins Peak 2 2x2 AGN (No BT) - Dell + 8086 c420 Dual Band Wireless-N 7260 +# Wilkins Peak 2 AGN + BT + 8086 c460 Dual Band Wireless-N 7260 +# Wilkins Peak 2 BGN + BT + 8086 c462 Wireless-N 7260 +# Wilkins Peak 2 2x2 80MHz + BT + 8086 c470 Dual Band Wireless-AC 7260 + 08b2 Wireless 7260 +# Wilkins Peak 2 2x2 AGN (No BT) - Lenovo/HP + 8086 4220 Dual Band Wireless-N 7260 +# Wilkins Peak 2 2x2 AGN + BT - Lenovo/HP + 8086 4260 Dual Band Wireless-N 7260 +# Wilkins Peak 2 2x2 BGN + BT - Dell + 8086 4262 Wireless-N 7260 +# Wilkins Peak 2 2x2 80MHz + BT - Lenovo/HP + 8086 4270 Dual Band Wireless-AC 7260 +# Wilkins Peak 2 2x2 80MHz (No BT) - Lenovo/HP + 8086 c220 Dual Band Wireless-N 7260 +# Wilkins Peak 2 2x2 AGN + BT - Lenovo/HP + 8086 c260 Dual Band Wireless-N 7260 +# Wilkins Peak 2 2x2 BGN + BT - Dell + 8086 c262 Wireless-N 7260 +# Wilkins Peak 2 2x2 80MHz + BT - Lenovo/HP + 8086 c270 Dual Band Wireless-AC 7260 + 08b3 Wireless 3160 +# Wilkins Peak 1 1x1 AGN + BT + 8086 0060 Dual Band Wireless-N 3160 +# Wilkins Peak 1 1x1 BGN + BT + 8086 0062 Wireless-N 3160 +# Wilkins Peak 1 1x1 80Mhz + BT + 8086 0070 Dual Band Wireless-AC 3160 +# Wilkins Peak 1 1x1 80Mhz + BT + 8086 0170 Dual Band Wireless-AC 3160 +# Wilkins Peak 1 1x1 80Mhz + BT + 8086 0470 Dual Band Wireless-AC 3160 +# Wilkins Peak 1 1x1 AGN + BT + 8086 8060 Dual Band Wireless N-3160 +# Wilkins Peak 1 1x1 BGN + BT + 8086 8062 Wireless N-3160 +# Wilkins Peak 1 1x1 80Mhz + BT + 8086 8070 Dual Band Wireless AC 3160 +# Wilkins Peak 1 1x1 80Mhz + BT + 8086 8170 Dual Band Wireless AC 3160 +# Wilkins Peak 1 1x1 80Mhz + BT + 8086 8470 Dual Band Wireless AC 3160 + 08b4 Wireless 3160 +# Wilkins Peak 1 1x1 80Mhz + BT - lenovo/HP + 8086 0270 Dual Band Wireless-AC 3160 +# Wilkins Peak 1 1x1 80Mhz + BT - lenovo/HP + 8086 8270 Dual Band Wireless AC 3160 0960 80960RP (i960RP) Microprocessor/Bridge 0962 80960RM (i960RM) Bridge 0964 80960RP (i960RP) Microprocessor/Bridge @@ -16078,6 +17010,7 @@ 0a2a Haswell-ULT Integrated Graphics Controller 0be0 Atom Processor D2xxx/N2xxx Integrated Graphics Controller 0be1 Atom Processor D2xxx/N2xxx Integrated Graphics Controller + 105b 0d7c D270S/D250S Motherboard 0be2 Atom Processor D2xxx/N2xxx Integrated Graphics Controller 0be3 Atom Processor D2xxx/N2xxx Integrated Graphics Controller 0be4 Atom Processor D2xxx/N2xxx Integrated Graphics Controller @@ -16098,43 +17031,61 @@ 0bf3 Atom Processor D2xxx/N2xxx DRAM Controller 0bf4 Atom Processor D2xxx/N2xxx DRAM Controller 0bf5 Atom Processor D2xxx/N2xxx DRAM Controller + 105b 0d7c D270S/D250S Motherboard 0bf6 Atom Processor D2xxx/N2xxx DRAM Controller 0bf7 Atom Processor D2xxx/N2xxx DRAM Controller - 0c00 4th Gen Core Processor DRAM Controller - 0c01 Xeon E3-1200 v3/4th Gen Core Processor PCI Express x16 Controller - 0c04 Xeon E3-1200 v3/4th Gen Core Processor DRAM Controller - 0c05 Xeon E3-1200 v3/4th Gen Core Processor PCI Express x8 Controller - 0c08 Xeon E3-1200 v3 Processor DRAM Controller - 0c09 Xeon E3-1200 v3/4th Gen Core Processor PCI Express x4 Controller - 0c0c Xeon E3-1200 v3/4th Gen Core Processor HD Audio Controller - 0c46 Centerton PCI Express Root Port 1 - 0c47 Centerton PCI Express Root Port 2 - 0c48 Centerton PCI Express Root Port 3 - 0c49 Centerton PCI Express Root Port 4 - 0c4e Centerton NTB Primary - 0c54 Centerton Internal Management - 0c59 Centerton SMBus 2.0 Controller 0 - 0c5a Centerton SMBus 2.0 Controller 1 - 0c5f Centerton UART - 0c60 Centerton Integrated Legacy Bus - 0c70 Centerton Internal Fabric - 0c71 Centerton Internal Fabric - 0c72 Centerton Internal Fabric - 0c73 Centerton Internal Fabric - 0c74 Centerton Internal Fabric - 0c75 Centerton Internal Fabric - 0c76 Centerton Internal Fabric - 0c77 Centerton Internal Fabric - 0c78 Centerton Internal Fabric - 0c79 Centerton Internal Fabric - 0c7a Centerton Internal Fabric - 0c7b Centerton Internal Fabric - 0c7c Centerton Internal Fabric - 0c7d Centerton Internal Fabric - 0c7e Centerton Internal Fabric - 0c7f Centerton Internal Fabric + 0c00 Haswell DRAM Controller + 0c01 Haswell PCI Express x16 Controller + 0c04 Haswell DRAM Controller + 0c05 Haswell PCI Express x8 Controller + 0c08 Haswell DRAM Controller + 0c09 Haswell PCI Express x4 Controller + 0c0c Haswell HD Audio Controller + 0c46 Atom Processor S1200 PCI Express Root Port 1 + 0c47 Atom Processor S1200 PCI Express Root Port 2 + 0c48 Atom Processor S1200 PCI Express Root Port 3 + 0c49 Atom Processor S1200 PCI Express Root Port 4 + 0c4e Atom Processor S1200 NTB Primary + 0c54 Atom Processor S1200 Internal + 0c55 Atom Processor S1200 DFX 1 + 0c56 Atom Processor S1200 DFX 2 + 0c59 Atom Processor S1200 SMBus 2.0 Controller 0 + 0c5a Atom Processor S1200 SMBus 2.0 Controller 1 + 0c5b Atom Processor S1200 SMBus Controller 2 + 0c5c Atom Processor S1200 SMBus Controller 3 + 0c5d Atom Processor S1200 SMBus Controller 4 + 0c5e Atom Processor S1200 SMBus Controller 5 + 0c5f Atom Processor S1200 UART + 0c60 Atom Processor S1200 Integrated Legacy Bus + 0c70 Atom Processor S1200 Internal + 0c71 Atom Processor S1200 Internal + 0c72 Atom Processor S1200 Internal + 0c73 Atom Processor S1200 Internal + 0c74 Atom Processor S1200 Internal + 0c75 Atom Processor S1200 Internal + 0c76 Atom Processor S1200 Internal + 0c77 Atom Processor S1200 Internal + 0c78 Atom Processor S1200 Internal + 0c79 Atom Processor S1200 Internal + 0c7a Atom Processor S1200 Internal + 0c7b Atom Processor S1200 Internal + 0c7c Atom Processor S1200 Internal + 0c7d Atom Processor S1200 Internal + 0c7e Atom Processor S1200 Internal + 0c7f Atom Processor S1200 Internal + 0d00 Crystal Well DRAM Controller + 0d01 Crystal Well PCI Express x16 Controller + 0d04 Crystal Well DRAM Controller + 0d05 Crystal Well PCI Express x8 Controller + 0d09 Crystal Well PCI Express x4 Controller + 0d0c Crystal Well HD Audio Controller + 0d16 Crystal Well Integrated Graphics Controller + 0d26 Crystal Well Integrated Graphics Controller + 0d36 Crystal Well Integrated Graphics Controller 0e00 Ivytown DMI2 0e01 Ivytown PCI Express Root Port in DMI2 Mode + 0e02 Ivytown PCI Express Root Port 1a + 0e03 Ivytown PCI Express Root Port 1b 0e04 Ivytown PCI Express Root Port 2a 0e05 Ivytown PCI Express Root Port 2b 0e06 Ivytown PCI Express Root Port 2c @@ -16202,7 +17153,8 @@ 0eb3 Ivytown Integrated Memory Controller 1 Channel 0-3 ERROR Registers 1 0eb4 Ivytown Integrated Memory Controller 1 Channel 0-3 Thermal Control 2 0eb5 Ivytown Integrated Memory Controller 1 Channel 0-3 Thermal Control 3 - 0eb7 Ivytown Integrated Memory Controller 1 Channel 0-3 ERROR Registers 2 + 0eb6 Ivytown Integrated Memory Controller 1 Channel 0-3 ERROR Registers 2 + 0eb7 Ivytown Integrated Memory Controller 1 Channel 0-3 ERROR Registers 3 0ec0 Ivytown Power Control Unit 0 0ec1 Ivytown Power Control Unit 1 0ec2 Ivytown Power Control Unit 2 @@ -16235,9 +17187,10 @@ 0ef0 Ivytown Integrated Memory Controller 0 Channel 0-3 Thermal Control 0 0ef1 Ivytown Integrated Memory Controller 0 Channel 0-3 Thermal Control 1 0ef2 Ivytown Integrated Memory Controller 0 Channel 0-3 ERROR Registers 0 - 0ef3 Ivytown Integrated Memory Controller 0 Channel 0-3 ERROR Registers 2 + 0ef3 Ivytown Integrated Memory Controller 0 Channel 0-3 ERROR Registers 1 0ef4 Ivytown Integrated Memory Controller 0 Channel 0-3 Thermal Control 2 0ef5 Ivytown Integrated Memory Controller 0 Channel 0-3 Thermal Control 3 + 0ef6 Ivytown Integrated Memory Controller 0 Channel 0-3 ERROR Registers 2 0ef7 Ivytown Integrated Memory Controller 0 Channel 0-3 ERROR Registers 3 0ef8 Ivytown DDRIO 0ef9 Ivytown DDRIO @@ -16495,7 +17448,7 @@ 8086 a11f PRO/10GbE LR Server Adapter 1049 82566MM Gigabit Network Connection 103c 30c1 Compaq 6910p - 17aa 20b9 ThinkPad T61 + 17aa 20b9 ThinkPad T61/R61 104a 82566DM Gigabit Network Connection 104b 82566DC Gigabit Network Connection 104c 82562V 10/100 Network Connection @@ -16618,6 +17571,7 @@ 1094 PRO/100 VE Network Connection 1095 PRO/100 VE Network Connection 1096 80003ES2LAN Gigabit Ethernet Controller (Copper) + 15d9 1096 Motherboard 15d9 8680 X7DVL-E-O motherboard 8086 3476 Intel S5000PSLSATA Server Board 1097 631xESB/632xESB DPT LAN Controller (Fiber) @@ -16706,6 +17660,7 @@ 10d3 82574L Gigabit Network Connection 103c 3250 NC112T PCI Express single Port Gigabit Server Adapter 10a9 8029 Prism XL Single Port Gigabit Ethernet + 15d9 060a X7SPA-H/X7SPA-HF Motherboard 8086 0001 Gigabit CT2 Desktop Adapter 8086 a01f Gigabit CT Desktop Adapter e4bf 50c1 PC1-GROOVE @@ -16758,19 +17713,22 @@ 8086 a06f 10-Gigabit XF LR Server Adapter 10f5 82567LM Gigabit Network Connection 10f6 82574L Gigabit Network Connection - 10f7 82599EB 10-Gigabit KX4 Network Connection + 10f7 10 Gigabit BR KX4 Dual Port Network Connection 108e 7b12 Sun Dual 10GbE PCIe 2.0 FEM 8086 000d Ethernet Mezzanine Adapter X520-KX4-2 - 10f8 82599EB 10 Gigabit Dual Port Backplane Connection + 10f8 82599 10 Gigabit Dual Port Backplane Connection 1028 1f63 10GbE 2P X520k bNDC 103c 17d2 Ethernet 10Gb 2-port 560M Adapter 103c 18d0 Ethernet 10Gb 2-port 560FLB Adapter 8086 000c Ethernet X520 10GbE Dual Port KX4-KR Mezz - 10f9 82599EB 10 Gigabit CX4 Dual Port Network Connection + 10f9 82599 10 Gigabit Dual Port Network Connection 10fb 82599EB 10-Gigabit SFI/SFP+ Network Connection + 1028 1f72 Ethernet 10G 4P X520/I350 rNDC 103c 17d0 Ethernet 10Gb 2-port 560FLR-SFP+ Adapter 103c 17d2 Ethernet 10Gb 2-port 560M Adapter 103c 17d3 Ethernet 10Gb 2-port 560SFP+ Adapter + 103c 211b Ethernet 10Gb 1-port P560FLR-SFP+ Adapter + 103c 2147 Ethernet 10Gb 1-port 561i Adapter 108e 7b11 Ethernet Server Adapter X520-2 1734 11a9 10 Gigabit Dual Port Network Connection 8086 0002 Ethernet Server Adapter X520-DA2 @@ -16780,7 +17738,7 @@ 8086 000c Ethernet Server Adapter X520-2 8086 7a11 Ethernet Server Adapter X520-2 8086 7a12 Ethernet Server Adapter X520-2 - 10fc 82599EB 10-Gigabit XAUI/BX4 Network Connection + 10fc 82599 10 Gigabit Dual Port Network Connection 10fe 82552 10/100 Network Connection 1107 PRO/1000 MF Server Adapter (LX) 1130 82815 815 Chipset Host Bridge and Memory Controller Hub @@ -17003,9 +17961,10 @@ 1462 82870P2 P64H2 Hot Plug Controller 1501 82567V-3 Gigabit Network Connection 1502 82579LM Gigabit Network Connection + 1028 04a3 Precision M4600 1503 82579V Gigabit Network Connection 1043 849c P8P67 Deluxe Motherboard - 1507 82599EB 10 Gigabit Network Connection + 1507 Ethernet Express Module X520-P2 1508 82598EB Gigabit BX Network Connection 150a 82576NS Gigabit Network Connection 150b 82598EB 10-Gigabit AT2 Server Adapter @@ -17022,7 +17981,7 @@ 150f 82580 Gigabit Fiber Network Connection 1510 82580 Gigabit Backplane Connection 1511 82580 Gigabit SFP Connection - 1514 82599EB 10 Gigabit KX4 Network Connection + 1514 Ethernet X520 10GbE Dual Port KX4 Mezz 8086 000b Ethernet X520 10GbE Dual Port KX4 Mezz 1515 X540 Ethernet Controller Virtual Function 1516 82580 Gigabit Network Connection @@ -17031,15 +17990,16 @@ 1517 82599ES 10 Gigabit Network Connection 1137 006a UCS CNA M61KR-I Intel Converged Network Adapter 1518 82576NS SerDes Gigabit Network Connection - 151c 82599EB 10 Gigabit TN Network Connection + 151c 82599 10 Gigabit TN Network Connection 108e 7b13 Dual 10GBASE-T LP 1520 I350 Ethernet Controller Virtual Function 1521 I350 Gigabit Network Connection 1028 1f60 Intel GbE 4P I350crNDC 1028 1f62 Intel GbE 2P I350crNDC + 103c 17d1 Ethernet 1Gb 4-port 366FLR Adapter 103c 337f Ethernet 1Gb 2-port 361i Adapter 103c 3380 Ethernet 1Gb 4-port 366i Adapter - 103c 339e Ethernet 1Gb 2-port 361T Adapter [Wharton Stony Lake] + 103c 339e Ethernet 1Gb 2-port 361T Adapter 108e 7b16 Quad Port GbE PCIe 2.0 ExpressModule, UTP 108e 7b18 Quad Port GbE PCIe 2.0 Low Profile Adapter, UTP 10a9 802a UV2-BaseIO dual-port GbE @@ -17058,9 +18018,9 @@ 8086 00a3 Ethernet Server Adapter I350-F4 8086 00a4 Ethernet Server Adapter I350-F2 1523 I350 Gigabit Backplane Connection - 103c 1784 Ethernet 1Gb 2-port 361FLB Adapter [Badger Flat] + 103c 1784 Ethernet 1Gb 2-port 361FLB Adapter 103c 18d1 Ethernet 1Gb 2-port 361FLB Adapter - 103c 339f Ethernet 1Gb 4-port 366M Adapter [Vaca Key] + 103c 339f Ethernet 1Gb 4-port 366M Adapter 8086 1f52 1GbE 4P I350 Mezz 1524 I350 Gigabit Connection 1525 82567V-4 Gigabit Network Connection @@ -17071,7 +18031,9 @@ 8086 0001 Ethernet Server Adapter I340-F4 8086 0002 Ethernet Server Adapter I340-F4 1528 Ethernet Controller 10-Gigabit X540-AT2 + 1028 1f61 Ethernet 10G 4P X540/I350 rNDC 103c 192d 561FLR-T 2-port 10Gb Ethernet Adapter + 103c 211a Ethernet 10Gb 2-port 561T Adapter 108e 7b14 Sun Dual Port 10 GbE PCIe 2.0 ExpressModule, Base-T 108e 7b15 Sun Dual Port 10 GbE PCIe 2.0 Low Profile Adapter, Base-T 1137 00bf Ethernet Converged Network Adapter X540-T2 @@ -17081,8 +18043,17 @@ 8086 00a2 Ethernet Converged Network Adapter X540-T1 8086 1f61 Ethernet 10G 4P X540/I350 rNDC 8086 5003 Ethernet 10G 2P X540-t Adapter - 1529 82599 10 Gigabit Dual Port Backplane Connection with FCoE - 152a 82599 10 Gigabit Dual port Network Connection with FCoE + 1529 82599 10 Gigabit Dual Port Network Connection with FCoE + 152a 82599 10 Gigabit Dual Port Backplane Connection with FCoE + 1533 I210 Gigabit Network Connection + 103c 0003 Ethernet Server Adapter I210-T1 + 8086 0001 Ethernet Server Adapter I210-T1 + 8086 0002 Ethernet Server Adapter I210-T1 + 1534 I210 Gigabit Network Connection + 1536 I210 Gigabit Fiber Network Connection + 1537 I210 Gigabit Backplane Connection + 1538 I210 Gigabit Network Connection + 1539 I211 Gigabit Network Connection 153a Ethernet Connection I217-LM 153b Ethernet Connection I217-V 1547 DSL3510 Thunderbolt Port [Cactus Ridge] @@ -17091,8 +18062,13 @@ 8086 011a Ethernet Converged Network Adapter X520-4 8086 011b Ethernet Converged Network Adapter X520-4 8086 011c Ethernet Converged Network Adapter X520-4 - 154d 82599EB 10-Gigabit SFP+ Network Connection + 154d Ethernet 10G 2P X520 Adapter 8086 7b11 10GbE 2P X520 Adapter + 1557 82599 10 Gigabit Network Connection + 1559 Ethernet Connection I218-V + 155a Ethernet Connection I218-LM + 1560 Ethernet Controller X540-AT1 + 157b I210 Gigabit Network Connection 1960 80960RP (i960RP) Microprocessor 101e 0431 MegaRAID 431 RAID Controller 101e 0438 MegaRAID 438 Ultra2 LVD RAID Controller @@ -17142,6 +18118,7 @@ 1028 04aa XPS 8300 1043 844d P8P67 Deluxe Motherboard 1c03 6 Series/C200 Series Chipset Family 6 port SATA AHCI Controller + 1028 04a3 Precision M4600 1028 04b2 Vostro 3350 1028 04da Vostro 3750 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] @@ -17150,14 +18127,17 @@ 1c08 6 Series/C200 Series Chipset Family 2 port SATA IDE Controller 1c09 6 Series/C200 Series Chipset Family 2 port SATA IDE Controller 1c10 6 Series/C200 Series Chipset Family PCI Express Root Port 1 + 1028 04aa XPS 8300 1028 04da Vostro 3750 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c12 6 Series/C200 Series Chipset Family PCI Express Root Port 2 + 1028 04aa XPS 8300 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c14 6 Series/C200 Series Chipset Family PCI Express Root Port 3 1028 04da Vostro 3750 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c16 6 Series/C200 Series Chipset Family PCI Express Root Port 4 + 1028 04aa XPS 8300 1c18 6 Series/C200 Series Chipset Family PCI Express Root Port 5 1028 04da Vostro 3750 1c1a 6 Series/C200 Series Chipset Family PCI Express Root Port 6 @@ -17166,12 +18146,16 @@ 1c1e 6 Series/C200 Series Chipset Family PCI Express Root Port 8 1c20 6 Series/C200 Series Chipset Family High Definition Audio Controller 1028 0490 Alienware M17x R3 + 1028 04a3 Precision M4600 1028 04aa XPS 8300 1028 04b2 Vostro 3350 1028 04da Vostro 3750 1043 8418 P8P67 Deluxe Motherboard +# Realtek ALC888 audio codec + 8086 2008 DQ67SW board 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c22 6 Series/C200 Series Chipset Family SMBus Controller + 1028 04a3 Precision M4600 1028 04aa XPS 8300 1028 04b2 Vostro 3350 1028 04da Vostro 3750 @@ -17180,6 +18164,7 @@ 1c24 6 Series/C200 Series Chipset Family Thermal Management Controller 1c25 6 Series/C200 Series Chipset Family DMI to PCI Bridge 1c26 6 Series/C200 Series Chipset Family USB Enhanced Host Controller #1 + 1028 04a3 Precision M4600 1028 04aa XPS 8300 1028 04b2 Vostro 3350 1028 04da Vostro 3750 @@ -17190,6 +18175,7 @@ 1c2c 6 Series/C200 Series Chipset Family USB Universal Host Controller #5 8086 7270 Apple MacBookPro8,2 [Core i7, 15", 2011] 1c2d 6 Series/C200 Series Chipset Family USB Enhanced Host Controller #2 + 1028 04a3 Precision M4600 1028 04aa XPS 8300 1028 04b2 Vostro 3350 1028 04da Vostro 3750 @@ -17198,6 +18184,7 @@ 1c33 6 Series/C200 Series Chipset Family LAN Controller 1c35 6 Series/C200 Series Chipset Family VECI Controller 1c3a 6 Series/C200 Series Chipset Family MEI Controller #1 + 1028 04a3 Precision M4600 1028 04aa XPS 8300 1028 04b2 Vostro 3350 1028 04da Vostro 3750 @@ -17227,6 +18214,7 @@ 1c4d QS67 Express Chipset Family LPC Controller 1c4e Q67 Express Chipset Family LPC Controller 1c4f QM67 Express Chipset Family LPC Controller + 1028 04a3 Precision M4600 1c50 B65 Express Chipset Family LPC Controller 1c51 6 Series/C200 Series Chipset Family LPC Controller 1c52 C202 Chipset Family LPC Controller @@ -17310,7 +18298,10 @@ 1e00 7 Series/C210 Series Chipset Family 4-port SATA Controller [IDE mode] 1e01 7 Series Chipset Family 4-port SATA Controller [IDE mode] 1e02 7 Series/C210 Series Chipset Family 6-port SATA Controller [AHCI mode] + 1043 84ca P8H77-I Motherboard 1e03 7 Series Chipset Family 6-port SATA Controller [AHCI mode] + 1043 1477 N56VZ + 1043 1517 Zenbook Prime UX31A 1e04 7 Series/C210 Series Chipset Family SATA Controller [RAID mode] 1e05 7 Series Chipset SATA Controller [RAID mode] 1e06 7 Series/C210 Series Chipset Family SATA Controller [RAID mode] @@ -17319,22 +18310,48 @@ 1e09 7 Series Chipset Family 2-port SATA Controller [IDE mode] 1e0e 7 Series/C210 Series Chipset Family SATA Controller [RAID mode] 1e10 7 Series/C210 Series Chipset Family PCI Express Root Port 1 + 1043 1477 N56VZ + 1043 1517 Zenbook Prime UX31A + 1043 84ca P8H77-I Motherboard 1e12 7 Series/C210 Series Chipset Family PCI Express Root Port 2 + 1043 1477 N56VZ + 1043 1517 Zenbook Prime UX31A 1e14 7 Series/C210 Series Chipset Family PCI Express Root Port 3 1e16 7 Series/C210 Series Chipset Family PCI Express Root Port 4 + 1043 1477 N56VZ 1e18 7 Series/C210 Series Chipset Family PCI Express Root Port 5 + 1043 84ca P8H77-I Motherboard 1e1a 7 Series/C210 Series Chipset Family PCI Express Root Port 6 1e1c 7 Series/C210 Series Chipset Family PCI Express Root Port 7 1e1e 7 Series/C210 Series Chipset Family PCI Express Root Port 8 1e20 7 Series/C210 Series Chipset Family High Definition Audio Controller + 1043 1477 N56VZ + 1043 1517 Zenbook Prime UX31A + 1043 8415 P8H77-I Motherboard 1e22 7 Series/C210 Series Chipset Family SMBus Controller + 1043 1477 N56VZ + 1043 1517 Zenbook Prime UX31A + 1043 84ca P8H77-I Motherboard 1e24 7 Series/C210 Series Chipset Family Thermal Management Controller + 1043 1517 Zenbook Prime UX31A 1e25 7 Series/C210 Series Chipset Family DMI to PCI Bridge 1e26 7 Series/C210 Series Chipset Family USB Enhanced Host Controller #1 + 1043 1477 N56VZ + 1043 1517 Zenbook Prime UX31A + 1043 84ca P8H77-I Motherboard 1e2d 7 Series/C210 Series Chipset Family USB Enhanced Host Controller #2 + 1043 1477 N56VZ + 1043 1517 Zenbook Prime UX31A + 1043 84ca P8H77-I Motherboard 1e31 7 Series/C210 Series Chipset Family USB xHCI Host Controller + 1043 1477 N56VZ + 1043 1517 Zenbook Prime UX31A + 1043 84ca P8H77-I Motherboard 1e33 7 Series/C210 Series Chipset Family LAN Controller 1e3a 7 Series/C210 Series Chipset Family MEI Controller #1 + 1043 1477 N56VZ + 1043 1517 Zenbook Prime UX31A + 1043 84ca P8H77-I Motherboard 1e3b 7 Series/C210 Series Chipset Family MEI Controller #2 1e3c 7 Series/C210 Series Chipset Family IDE-r Controller 1e3d 7 Series/C210 Series Chipset Family KT Controller @@ -17348,6 +18365,7 @@ 1e48 Q75 Express Chipset LPC Controller 1e49 B75 Express Chipset LPC Controller 1e4a H77 Express Chipset LPC Controller + 1043 84ca P8H77-I Motherboard 1e4b 7 Series Chipset Family LPC Controller 1e4c 7 Series Chipset Family LPC Controller 1e4d 7 Series Chipset Family LPC Controller @@ -17363,12 +18381,73 @@ 1e57 HM77 Express Chipset LPC Controller 1e58 UM77 Express Chipset LPC Controller 1e59 HM76 Express Chipset LPC Controller + 1043 1477 N56VZ + 1043 1517 Zenbook Prime UX31A 1e5a 7 Series Chipset Family LPC Controller 1e5b UM77 Express Chipset LPC Controller 1e5c 7 Series Chipset Family LPC Controller 1e5d HM75 Express Chipset LPC Controller 1e5e 7 Series Chipset Family LPC Controller 1e5f 7 Series Chipset Family LPC Controller + 1f00 Avoton SSA-Cunit + 1f01 Avoton SSA-Cunit + 1f02 Avoton SSA-Cunit + 1f03 Avoton SSA-Cunit + 1f04 Avoton SSA-Cunit + 1f05 Avoton SSA-Cunit + 1f06 Avoton SSA-Cunit + 1f07 Avoton SSA-Cunit + 1f08 Avoton SSA-Cunit + 1f09 Avoton SSA-Cunit + 1f0a Avoton SSA-Cunit + 1f0b Avoton SSA-Cunit + 1f0c Avoton SSA-Cunit + 1f0d Avoton SSA-Cunit + 1f0e Avoton SSA-Cunit + 1f0f Avoton SSA-Cunit + 1f10 Avoton PCIe Root Port 1 + 1f11 Avoton PCIe Root Port 2 + 1f12 Avoton PCIe Root Port 3 + 1f13 Avoton PCIe Root Port 4 + 1f14 Avoton RAS + 1f15 Avoton SMBus 2.0 + 1f16 Avoton RCEC + 1f18 Avoton nCPM + 1f19 Avoton nCPM + 1f20 Avoton 4-Port IDE SATA2 Controller + 1f21 Avoton 4-Port IDE SATA2 Controller + 1f22 Avoton AHCI SATA2 Controller + 1f23 Avoton AHCI SATA2 Controller + 1f24 Avoton RAID SATA2 Controller + 1f25 Avoton RAID SATA2 Controller + 1f26 Avoton RAID SATA2 Controller + 1f27 Avoton RAID SATA2 Controller + 1f2c Avoton USB Enhanced Host Controller + 1f2e Avoton RAID SATA2 Controller + 1f2f Avoton RAID SATA2 Controller + 1f30 Avoton 2-Port IDE SATA3 Controller + 1f31 Avoton 2-Port IDE SATA3 Controller + 1f32 Avoton AHCI SATA3 Controller + 1f33 Avoton AHCI SATA3 Controller + 1f34 Avoton RAID SATA3 Controller + 1f35 Avoton RAID SATA3 Controller + 1f36 Avoton RAID SATA3 Controller + 1f37 Avoton RAID SATA3 Controller + 1f38 Avoton PCU + 1f39 Avoton PCU + 1f3a Avoton PCU + 1f3b Avoton PCU + 1f3c Avoton PCU SMBus + 1f3d Avoton PCU SMBus + 1f3e Avoton RAID SATA3 Controller + 1f3f Avoton RAID SATA3 Controller + 1f40 Avoton GbE x4 1000base-KX + 1f41 Avoton GbE x4 SGMII + 1f42 Avoton GbE + 1f43 Avoton GbE EEPROM-less + 1f44 Avoton GbE Virtual Function + 1f45 Avoton GbE 2500base-KX + 2250 Xeon Phi Coprocessor 5110P 2310 DH89xxCC LPC Controller 2323 DH89xxCC 4 Port SATA AHCI Controller 2330 DH89xxCC SMBus Controller @@ -17472,9 +18551,13 @@ 103c 30a3 Compaq nw8440 103c 30c1 Compaq 6910p 104d 902d VAIO VGN-NR120E + 105b 0d7c D270S/D250S Motherboard 144d c00c P30 notebook + 144d c072 Notebook N150P + 1458 5000 GA-D525TUD 1734 1055 Amilo M1420 17aa 20ae ThinkPad T61 + 8086 544b Desktop Board D425KT e4bf cc47 CCG-RUMBA 2449 82801BA/BAM/CA/CAM Ethernet Controller 0e11 0012 EtherExpress PRO/100 VM @@ -17529,8 +18612,12 @@ 1028 0211 Optiplex 755 1028 02da OptiPlex 980 103c 2a3b Pavilion A1512X + 103c 31fe ProLiant DL140 G3 103c 330b ProLiant ML150 G6 Server - 1458 5000 GA-EP45-DS5 Motherboard +# same ID possibly also on other ASUS boards + 1043 8277 P5K PRO Motherboard + 1458 5000 Motherboard + 15d9 9680 X7DBN Motherboard 1775 11cc CC11/CL11 2450 82801E ISA Bridge (LPC) 2452 82801E USB Controller @@ -17681,7 +18768,7 @@ 103c 088c NC8000 laptop 103c 0890 NC6000 laptop 103c 08b0 tc1100 tablet - 1043 1713 M6800N + 1043 1713 M2400N/M6800N laptop 1043 80b0 P4B533 1071 8160 MIM2000 1179 0201 Toshiba Tecra M1 @@ -17702,6 +18789,7 @@ 103c 088c NC8000 laptop 103c 0890 NC6000 laptop 103c 08b0 tc1100 tablet + 1043 1716 M2400N laptop 1043 1826 M6800N 1071 8160 MIM2000 134d 4c21 Latitude D500 @@ -17793,6 +18881,7 @@ 1028 0169 Precision 470 1028 019a PowerEdge SC1425 103c 12bc d530 CMT (DG746A) + 103c 3208 ProLiant DL140 G2 1043 80a6 P4P800 series motherboard 1458 24d1 GA-8IPE1000 Pro2 motherboard (865PE) 1462 7280 865PE Neo2 (MS-6728) @@ -17814,6 +18903,7 @@ 1028 019a PowerEdge SC1425 103c 006a NX9500 103c 12bc d530 CMT (DG746A) + 103c 3208 ProLiant DL140 G2 1043 80a6 P4P800/P5P800 series motherboard 1458 24d2 GA-8IPE1000/8KNXP motherboard 1462 7280 865PE Neo2 (MS-6728) @@ -17830,6 +18920,7 @@ 1028 0156 Precision 360 1028 0169 Precision 470 103c 12bc d330 uT + 103c 3208 ProLiant DL140 G2 1043 80a6 P4P800/P5P800 series motherboard 1458 24d2 GA-8IPE1000 Pro2 motherboard (865PE) 1462 7280 865PE Neo2 (MS-6728) @@ -17852,6 +18943,7 @@ 1028 019a PowerEdge SC1425 103c 006a NX9500 103c 12bc d530 CMT (DG746A) + 103c 3208 ProLiant DL140 G2 1043 80a6 P4P800/P5P800 series motherboard 1458 24d2 GA-8IPE1000 Pro2 motherboard (865PE) 1462 7280 865PE Neo2 (MS-6728) @@ -17935,6 +19027,7 @@ 1028 019a PowerEdge SC1425 103c 006a NX9500 103c 12bc d530 CMT (DG746A) + 103c 3208 ProLiant DL140 G2 1043 80a6 P4P800/P5P800 series motherboard 1458 5006 GA-8IPE1000 Pro2 motherboard (865PE) 1462 7280 865PE Neo2 (MS-6728) @@ -18069,18 +19162,21 @@ e4bf 58b1 XB1 25a1 6300ESB LPC Interface Controller 25a2 6300ESB PATA Storage Controller + 1734 1073 Primergy Econel 200 D2020 mainboard 1775 10d0 V5D Single Board Computer IDE 1775 1100 CR11/VR11 Single Board Computer 1775 ce90 CE9 4c53 10b0 CL9 mainboard 4c53 10e0 PSL09 PrPMC 25a3 6300ESB SATA Storage Controller + 1734 1073 Primergy Econel 200 D2020 mainboard 1775 1100 CR11/VR11 Single Board Computer 1775 ce90 CE9 4c53 10b0 CL9 mainboard 4c53 10d0 Telum ASLP10 Processor AMC 4c53 10e0 PSL09 PrPMC 25a4 6300ESB SMBus Controller + 1734 1073 Primergy Econel 200 D2020 mainboard 1775 10d0 V5D Single Board Computer 1775 1100 CR11/VR11 Single Board Computer 1775 ce90 CE9 @@ -18093,6 +19189,7 @@ 4c53 10b0 CL9 mainboard 25a7 6300ESB AC'97 Modem Controller 25a9 6300ESB USB Universal Host Controller + 1734 1073 Primergy Econel 200 D2020 mainboard 1775 10d0 V5D Single Board Computer USB 1775 1100 CR11/VR11 Single Board Computer 1775 ce90 CE9 @@ -18100,12 +19197,14 @@ 4c53 10d0 Telum ASLP10 Processor AMC 4c53 10e0 PSL09 PrPMC 25aa 6300ESB USB Universal Host Controller + 1734 1073 Primergy Econel 200 D2020 mainboard 1775 1100 CR11/VR11 Single Board Computer 1775 ce90 CE9 4c53 10b0 CL9 mainboard 4c53 10d0 Telum ASLP10 Processor AMC 4c53 10e0 PSL09 PrPMC 25ab 6300ESB Watchdog Timer + 1734 1073 Primergy Econel 200 D2020 mainboard 1775 10d0 V5D Single Board Computer 1775 1100 CR11/VR11 Single Board Computer 1775 ce90 CE9 @@ -18113,6 +19212,7 @@ 4c53 10d0 Telum ASLP10 Processor AMC 4c53 10e0 PSL09 PrPMC 25ac 6300ESB I/O Advanced Programmable Interrupt Controller + 1734 1073 Primergy Econel 200 D2020 mainboard 1775 10d0 V5D Single Board Computer 1775 1100 CR11/VR11 Single Board Computer 1775 ce90 CE9 @@ -18120,6 +19220,7 @@ 4c53 10d0 Telum ASLP10 Processor AMC 4c53 10e0 PSL09 PrPMC 25ad 6300ESB USB2 Enhanced Host Controller + 1734 1073 Primergy Econel 200 D2020 mainboard 1775 10d0 V5D Single Board Computer USB 2.0 1775 1100 CR11/VR11 Single Board Computer 1775 ce90 CE9 @@ -18136,7 +19237,8 @@ 25d4 5000V Chipset Memory Controller Hub 15d9 8680 X7DVL-E-O motherboard 25d8 5000P Chipset Memory Controller Hub - 8086 3476 Intel S5000PSLSATA Server Board + 15d9 9680 X7DBN Motherboard + 8086 3476 S5000PSLSATA Server Board 25e2 5000 Series Chipset PCI Express x4 Port 2 25e3 5000 Series Chipset PCI Express x4 Port 3 25e4 5000 Series Chipset PCI Express x4 Port 4 @@ -18145,20 +19247,30 @@ 25e7 5000 Series Chipset PCI Express x4 Port 7 25f0 5000 Series Chipset FSB Registers 1028 01bb PowerEdge 1955 FSB Registers + 103c 31fd ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard - 8086 3476 Intel S5000PSLSATA Server Board + 15d9 9680 X7DBN Motherboard + 8086 3476 S5000PSLSATA Server Board 25f1 5000 Series Chipset Reserved Registers + 103c 31fd ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard - 8086 3476 Intel S5000PSLSATA Server Board + 15d9 9680 X7DBN Motherboard + 8086 3476 S5000PSLSATA Server Board 25f3 5000 Series Chipset Reserved Registers + 103c 31fd ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard - 8086 3476 Intel S5000PSLSATA Server Board + 15d9 9680 X7DBN Motherboard + 8086 3476 S5000PSLSATA Server Board 25f5 5000 Series Chipset FBD Registers + 103c 31fd ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard - 8086 3476 Intel S5000PSLSATA Server Board + 15d9 9680 X7DBN Motherboard + 8086 3476 S5000PSLSATA Server Board 25f6 5000 Series Chipset FBD Registers + 103c 31fd ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard - 8086 3476 Intel S5000PSLSATA Server Board + 15d9 9680 X7DBN Motherboard + 8086 3476 S5000PSLSATA Server Board 25f7 5000 Series Chipset PCI Express x8 Port 2-3 25f8 5000 Series Chipset PCI Express x8 Port 4-5 25f9 5000 Series Chipset PCI Express x8 Port 6-7 @@ -18355,11 +19467,15 @@ e4bf 0cd3 CD3-JIVE e4bf 58b1 XB1 2670 631xESB/632xESB/3100 Chipset LPC Interface Controller + 103c 31fe ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard + 15d9 9680 X7DBN Motherboard 8086 3476 Intel S5000PSLSATA Server Board 2680 631xESB/632xESB/3100 Chipset SATA IDE Controller 2681 631xESB/632xESB SATA AHCI Controller + 103c 31fe ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard + 15d9 9680 X7DBN Motherboard 8086 3476 Intel S5000PSLSATA Server Board 2682 631xESB/632xESB SATA RAID Controller 103c 31fe Adaptec Serial ATA HostRAID @@ -18367,16 +19483,22 @@ 2688 631xESB/632xESB/3100 Chipset UHCI USB Controller #1 1028 01bb PowerEdge 1955 onboard USB 1028 01f0 PowerEdge R900 onboard USB + 103c 31fe ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard + 15d9 9680 X7DBN Motherboard 8086 3476 Intel S5000PSLSATA Server Board 2689 631xESB/632xESB/3100 Chipset UHCI USB Controller #2 1028 01bb PowerEdge 1955 onboard USB 1028 01f0 PowerEdge R900 onboard USB + 103c 31fe ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard + 15d9 9680 X7DBN Motherboard 8086 3476 Intel S5000PSLSATA Server Board 268a 631xESB/632xESB/3100 Chipset UHCI USB Controller #3 1028 01f0 PowerEdge R900 onboard USB + 103c 31fe ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard + 15d9 9680 X7DBN Motherboard 8086 3476 Intel S5000PSLSATA Server Board 268b 631xESB/632xESB/3100 Chipset UHCI USB Controller #4 1028 01f0 PowerEdge R900 onboard USB @@ -18385,20 +19507,29 @@ 268c 631xESB/632xESB/3100 Chipset EHCI USB2 Controller 1028 01bb PowerEdge 1955 onboard USB 1028 01f0 PowerEdge R900 onboard USB + 103c 31fe ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard + 15d9 9680 X7DBN Motherboard 8086 3476 Intel S5000PSLSATA Server Board 2690 631xESB/632xESB/3100 Chipset PCI Express Root Port 1 + 103c 31fe ProLiant DL140 G3 + 15d9 9680 X7DBN Motherboard 2692 631xESB/632xESB/3100 Chipset PCI Express Root Port 2 + 103c 31fe ProLiant DL140 G3 2694 631xESB/632xESB/3100 Chipset PCI Express Root Port 3 2696 631xESB/632xESB/3100 Chipset PCI Express Root Port 4 2698 631xESB/632xESB AC '97 Audio Controller 2699 631xESB/632xESB AC '97 Modem Controller 269a 631xESB/632xESB High Definition Audio Controller 269b 631xESB/632xESB/3100 Chipset SMBus Controller + 103c 31fe ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard + 15d9 9680 X7DBN Motherboard 8086 3476 Intel S5000PSLSATA Server Board 269e 631xESB/632xESB IDE Controller + 103c 31fe ProLiant DL140 G3 15d9 8680 X7DVL-E-O motherboard + 15d9 9680 X7DBN Motherboard 2770 82945G/GZ/P/PL Memory Controller Hub 1028 01ad OptiPlex GX620 103c 2a3b Pavilion A1512X @@ -18472,10 +19603,14 @@ 10f7 8338 Panasonic CF-Y5 laptop 17aa 2009 ThinkPad T60/R60 series 27bc NM10 Family LPC Controller + 105b 0d7c D270S/D250S Motherboard + 144d c072 Notebook N150P + 1458 5001 GA-D525TUD 8086 4f4d DeskTop Board D510MO + 8086 544b Desktop Board D425KT 27bd 82801GHM (ICH7-M DH) LPC Interface Bridge 1025 006c 9814 WKMI - 27c0 N10/ICH7 Family SATA Controller [IDE mode] + 27c0 NM10/ICH7 Family SATA Controller [IDE mode] 1028 01ad OptiPlex GX620 1028 01df PowerEdge SC440 1028 01e6 PowerEdge 860 @@ -18484,10 +19619,14 @@ 1462 2310 MSI Hetis 945 1462 7236 945P Neo3-F Rev. 2.2 motherboard 1775 11cc CC11/CL11 + 8086 544b Desktop Board D425KT 8086 544e DeskTop Board D945GTP - 27c1 N10/ICH7 Family SATA Controller [AHCI mode] + 27c1 NM10/ICH7 Family SATA Controller [AHCI mode] 1028 01df PowerEdge SC440 103c 2a3b Pavilion A1512X + 105b 0d7c D270S/D250S Motherboard + 144d c072 Notebook N150P + 1458 b005 GA-D525TUD 1775 11cc CC11/CL11 8086 4f4d DeskTop Board D510MO 8086 5842 DeskTop Board D975XBX @@ -18503,7 +19642,7 @@ 103c 30a3 Compaq nw8440 17aa 200d ThinkPad T60/R60 series 27c6 82801GHM (ICH7-M DH) SATA Controller [RAID mode] - 27c8 N10/ICH 7 Family USB UHCI Controller #1 + 27c8 NM10/ICH7 Family USB UHCI Controller #1 1025 006c 9814 WKMI 1028 01ad OptiPlex GX620 1028 01d7 XPS M1210 @@ -18515,12 +19654,16 @@ 103c 30a3 Compaq nw8440 1043 1237 A6J-Q008 1043 8179 P5KPL-VM,P5LD2-VM Mainboard + 105b 0d7c D270S/D250S Motherboard 107b 5048 E4500 + 144d c072 Notebook N150P + 1458 5004 GA-D525TUD 1775 11cc CC11/CL11 17aa 200a ThinkPad T60/R60 series 8086 4f4d DeskTop Board D510MO + 8086 544b Desktop Board D425KT 8086 544e DeskTop Board D945GTP - 27c9 N10/ICH 7 Family USB UHCI Controller #2 + 27c9 NM10/ICH7 Family USB UHCI Controller #2 1025 006c 9814 WKMI 1028 01ad OptiPlex GX620 1028 01d7 XPS M1210 @@ -18532,12 +19675,16 @@ 103c 30a3 Compaq nw8440 1043 1237 A6J-Q008 1043 8179 P5KPL-VM,P5LD2-VM Mainboard + 105b 0d7c D270S/D250S Motherboard 107b 5048 E4500 + 144d c072 Notebook N150P + 1458 5004 GA-D525TUD 1775 11cc CC11/CL11 17aa 200a ThinkPad T60/R60 series 8086 4f4d DeskTop Board D510MO + 8086 544b Desktop Board D425KT 8086 544e DeskTop Board D945GTP - 27ca N10/ICH 7 Family USB UHCI Controller #3 + 27ca NM10/ICH7 Family USB UHCI Controller #3 1025 006c 9814 WKMI 1028 01ad OptiPlex GX620 1028 01d7 XPS M1210 @@ -18549,12 +19696,15 @@ 103c 30a3 Compaq nw8440 1043 1237 A6J-Q008 1043 8179 P5KPL-VM,P5LD2-VM Mainboard + 105b 0d7c D270S/D250S Motherboard 107b 5048 E4500 + 144d c072 Notebook N150P + 1458 5004 GA-D525TUD 1775 11cc CC11/CL11 17aa 200a ThinkPad T60/R60 series 8086 4f4d DeskTop Board D510MO 8086 544e DeskTop Board D945GTP - 27cb N10/ICH 7 Family USB UHCI Controller #4 + 27cb NM10/ICH7 Family USB UHCI Controller #4 1025 006c 9814 WKMI 1028 01ad OptiPlex GX620 1028 01d7 XPS M1210 @@ -18565,12 +19715,15 @@ 103c 30a3 Compaq nw8440 1043 1237 A6J-Q008 1043 8179 P5KPL-VM,P5LD2-VM Mainboard + 105b 0d7c D270S/D250S Motherboard 107b 5048 E4500 + 144d c072 Notebook N150P + 1458 5004 GA-D525TUD 1775 11cc CC11/CL11 17aa 200a ThinkPad T60/R60 series 8086 4f4d DeskTop Board D510MO 8086 544e DeskTop Board D945GTP - 27cc N10/ICH 7 Family USB2 EHCI Controller + 27cc NM10/ICH7 Family USB2 EHCI Controller 1025 006c 9814 WKMI 1028 01ad OptiPlex GX620 1028 01d7 XPS M1210 @@ -18582,24 +19735,37 @@ 103c 30a3 Compaq nw8440 1043 1237 A6J-Q008 1043 8179 P5KPL-VM,P5LD2-VM Mainboard + 105b 0d7c D270S/D250S Motherboard + 144d c072 Notebook N150P + 1458 5006 GA-D525TUD 1775 11cc CC11/CL11 17aa 200b ThinkPad T60/R60 series 8086 4f4d DeskTop Board D510MO + 8086 544b Desktop Board D425KT 8086 544e DeskTop Board D945GTP - 27d0 N10/ICH 7 Family PCI Express Port 1 + 27d0 NM10/ICH7 Family PCI Express Port 1 103c 309f Compaq nx9420 Notebook 103c 30a3 Compaq nw8440 + 144d c072 Notebook N150P + 1458 5001 GA-D525TUD 1775 11cc CC11/CL11 - 27d2 N10/ICH 7 Family PCI Express Port 2 + 8086 544b Desktop Board D425KT + 27d2 NM10/ICH7 Family PCI Express Port 2 103c 309f Compaq nx9420 Notebook 103c 30a3 Compaq nw8440 + 144d c072 Notebook N150P 1775 11cc CC11/CL11 - 27d4 N10/ICH 7 Family PCI Express Port 3 + 8086 544b Desktop Board D425KT + 27d4 NM10/ICH7 Family PCI Express Port 3 + 144d c072 Notebook N150P 1775 11cc CC11/CL11 - 27d6 N10/ICH 7 Family PCI Express Port 4 + 8086 544b Desktop Board D425KT + 27d6 NM10/ICH7 Family PCI Express Port 4 103c 30a3 Compaq nw8440 + 144d c072 Notebook N150P 1775 11cc CC11/CL11 - 27d8 N10/ICH 7 Family High Definition Audio Controller + 8086 544b Desktop Board D425KT + 27d8 NM10/ICH7 Family High Definition Audio Controller 1025 006c 9814 WKMI 1028 01d7 XPS M1210 103c 2a3b Pavilion A1512X @@ -18611,11 +19777,14 @@ 1043 817f P5LD2-VM Mainboard (Realtek ALC 882 codec) 1043 8290 P5KPL-VM Motherboard 1043 82ea P5KPL-CM Motherboard + 105b 0d7c D270S/D250S Motherboard 107b 5048 E4500 10f7 8338 Panasonic CF-Y5 laptop 1179 ff10 Toshiba Satellite A100-796 audio (Realtek ALC861) 1179 ff31 AC97 Data Fax SoftModem with SmartCP 1447 1043 Asus A8JP (Analog Devices AD1986A) + 144d c072 Notebook N150P + 1458 a002 GA-D525TUD (Realtek ALC887) 1458 a102 GA-8I945PG-RH Mainboard 152d 0753 Softmodem 1734 10ad Conexant softmodem SmartCP @@ -18625,7 +19794,7 @@ 8086 27d8 DeskTop Board D945GTP 8086 d618 DeskTop Board D510MO 8384 7680 STAC9221 HD Audio Codec - 27da N10/ICH 7 Family SMBus Controller + 27da NM10/ICH7 Family SMBus Controller 1025 006c 9814 WKMI 1028 01ad OptiPlex GX620 1028 01d7 XPS M1210 @@ -18633,14 +19802,17 @@ 1028 01e6 PowerEdge 860 103c 2a3b Pavilion A1512X 1043 8179 P5KPL-VM Motherboard + 105b 0d7c D270S/D250S Motherboard 10f7 8338 Panasonic CF-Y5 laptop - 1458 5001 GA-8I945PG-RH Mainboard + 144d c072 Notebook N150P + 1458 5001 GA-8I945PG-RH/GA-D525TUD Mainboard 1775 11cc CC11/CL11 17aa 200f ThinkPad T60/R60 series 8086 4f4d DeskTop Board D510MO + 8086 544b Desktop Board D425KT 8086 544e DeskTop Board D945GTP 8086 5842 DeskTop Board D975XBX - 27dc N10/ICH 7 Family LAN Controller + 27dc NM10/ICH7 Family LAN Controller 103c 2a3b Pavilion A1512X 8086 308d DeskTop Board D945GTP 27dd 82801G (ICH7 Family) AC'97 Modem Controller @@ -18666,7 +19838,6 @@ 1775 11cc CC11/CL11 27e2 82801GR/GH/GHM (ICH7 Family) PCI Express Port 6 1775 11cc CC11/CL11 - 2802 82GL40 [Cantiga] High Definition Audio HDMI Service 2810 82801HB/HR (ICH8/R) LPC Interface Controller 1043 81ec P5B 2811 82801HEM (ICH8M-E) LPC Interface Controller @@ -18689,12 +19860,14 @@ 2821 82801HR/HO/HH (ICH8R/DO/DH) 6 port SATA Controller [AHCI mode] 2822 82801 SATA Controller [RAID mode] 1028 020d Inspiron 530 + 2823 Wellsburg sSATA RAID Controller 2824 82801HB (ICH8) 4 port SATA Controller [AHCI mode] 1043 81ec P5B 2825 82801HR/HO/HH (ICH8R/DO/DH) 2 port SATA Controller [IDE mode] 1028 01da OptiPlex 745 1462 7235 P965 Neo MS-7235 mainboard 2826 C600/X79 series chipset SATA RAID Controller + 2827 Wellsburg sSATA RAID Controller 2828 82801HM/HEM (ICH8M/ICH8M-E) SATA Controller [IDE mode] 1028 01f3 Inspiron 1420 103c 30c0 Compaq 6710b @@ -18877,6 +20050,7 @@ 1028 0211 Optiplex 755 2916 82801IR (ICH9R) LPC Interface Controller 1028 020d Inspiron 530 + 1043 8277 P5K PRO Motherboard 8086 5044 Desktop Board DP35DP 2917 ICH9M-E LPC Interface Controller e4bf cc4d CCM-BOOGIE @@ -18890,6 +20064,7 @@ 1028 0210 PowerEdge T300 onboard SATA Controller 1028 0211 Optiplex 755 1028 023c PowerEdge R200 onboard SATA Controller + 1043 8277 P5K PRO Motherboard 2921 82801IB (ICH9) 2 port SATA Controller [IDE mode] 1028 0235 PowerEdge R710 SATA IDE Controller 1028 0236 PowerEdge R610 SATA IDE Controller @@ -18906,6 +20081,7 @@ 1028 020f PowerEdge R300 onboard SATA Controller 1028 0210 PowerEdge T300 onboard SATA Controller 1028 0211 Optiplex 755 + 1043 8277 P5K PRO Motherboard 1462 7360 G33/P35 Neo 2928 82801IBM/IEM (ICH9M/ICH9M-E) 2 port SATA Controller [IDE mode] 2929 82801IBM/IEM (ICH9M/ICH9M-E) 4 port SATA Controller [AHCI mode] @@ -18918,6 +20094,7 @@ 1028 020d Inspiron 530 1028 0211 Optiplex 755 103c 3628 dv6-1190en + 1043 8277 P5K PRO Motherboard 1462 7360 G33/P35 Neo 8086 5044 Desktop Board DP35DP e4bf cc4d CCM-BOOGIE @@ -18935,6 +20112,7 @@ 1028 0287 PowerEdge M610 onboard UHCI 1028 029c PowerEdge M710 USB UHCI Controller 1028 2011 Optiplex 755 + 1043 8277 P5K PRO Motherboard 1462 7360 G33/P35 Neo 8086 5044 Desktop Board DP35DP e4bf cc4d CCM-BOOGIE @@ -18949,6 +20127,7 @@ 1028 023c PowerEdge R200 onboard UHCI 1028 0287 PowerEdge M610 onboard UHCI 1028 029c PowerEdge M710 USB UHCI Controller + 1043 8277 P5K PRO Motherboard 1462 7360 G33/P35 Neo 8086 5044 Desktop Board DP35DP e4bf cc4d CCM-BOOGIE @@ -18961,6 +20140,7 @@ 1028 023c PowerEdge R200 onboard UHCI 1028 0287 PowerEdge M610 onboard UHCI 1028 029c PowerEdge M710 USB UHCI Controller + 1043 8277 P5K PRO Motherboard 1462 7360 G33/P35 Neo 8086 5044 Desktop Board DP35DP e4bf cc4d CCM-BOOGIE @@ -18973,6 +20153,7 @@ 1028 0287 PowerEdge M610 onboard UHCI 1028 029c PowerEdge M710 USB UHCI Controller 1028 2011 Optiplex 755 + 1043 8277 P5K PRO Motherboard 1462 7360 G33/P35 Neo 8086 2937 Optiplex 755 8086 2942 828011 (ICH9 Family ) USB UHCI Controller @@ -18986,6 +20167,7 @@ 1028 0237 PowerEdge T610 USB UHCI Controller 1028 0287 PowerEdge M610 onboard UHCI 1028 029c PowerEdge M710 USB UHCI Controller + 1043 8277 P5K PRO Motherboard 1462 7360 G33/P35 Neo 8086 2938 Optiplex 755 8086 5044 Desktop Board DP35DP @@ -18994,6 +20176,7 @@ 1028 020d Inspiron 530 1028 0210 PowerEdge T300 onboard UHCI 1028 0237 PowerEdge T610 USB UHCI Controller + 1043 8277 P5K PRO Motherboard 1462 7360 G33/P35 Neo 8086 5044 Desktop Board DP35DP e4bf cc4d CCM-BOOGIE @@ -19008,6 +20191,7 @@ 1028 023c PowerEdge R200 onboard EHCI 1028 0287 PowerEdge M610 onboard EHCI 1028 029c PowerEdge M710 USB EHCI Controller + 1043 8277 P5K PRO Motherboard 1462 7360 G33/P35 Neo 8086 5044 Desktop Board DP35DP e4bf cc4d CCM-BOOGIE @@ -19019,6 +20203,7 @@ 1028 0237 PowerEdge T610 USB EHCI Controller 1028 0287 PowerEdge M610 onboard EHCI 1028 029c PowerEdge M710 USB EHCI Controller + 1043 8277 P5K PRO Motherboard 1462 7360 G33/P35 Neo 8086 293c Optiplex 755 8086 5044 Desktop Board DP35DP @@ -19027,6 +20212,7 @@ 1028 020d Inspiron 530 1028 0211 Optiplex 755 103c 3628 dv6-1190en + 1043 829f P5K PRO Motherboard 1462 7360 G33/P35 Neo 8086 293e Optiplex 755 8086 2940 Optiplex 755 @@ -19034,6 +20220,8 @@ 2940 82801I (ICH9 Family) PCI Express Port 1 1028 020d Inspiron 530 1028 0211 Optiplex 755 +# same ID possibly also on other ASUS boards + 1043 8277 P5K PRO Motherboard 8086 2940 Optiplex 755 2942 82801I (ICH9 Family) PCI Express Port 2 1028 020d Inspiron 530 @@ -19043,8 +20231,12 @@ 1028 020d Inspiron 530 2948 82801I (ICH9 Family) PCI Express Port 5 1028 020d Inspiron 530 +# same ID possibly also on other ASUS boards + 1043 8277 P5K PRO Motherboard 294a 82801I (ICH9 Family) PCI Express Port 6 1028 020d Inspiron 530 +# same ID possibly also on other ASUS boards + 1043 8277 P5K PRO Motherboard 294c 82566DC-2 Gigabit Network Connection 17aa 302e 82566DM-2 Gigabit Network Connection 2970 82946GZ/PL/GL Memory Controller Hub @@ -19097,11 +20289,15 @@ 1028 0211 OptiPlex 755 29c0 82G33/G31/P35/P31 Express DRAM Controller 1028 020d Inspiron 530 +# same ID possibly also on other ASUS boards + 1043 8276 P5K PRO Motherboard 1043 82b0 P5KPL-VM Motherboard 1462 7360 G33/P35 Neo 8086 5044 Desktop Board DP35DP 29c1 82G33/G31/P35/P31 Express PCI Express Root Port 1028 020d Inspiron 530 +# same ID possibly also on other ASUS boards + 1043 8276 P5K PRO Motherboard 29c2 82G33/G31 Express Integrated Graphics Controller 1028 020d Inspiron 530 1043 82b0 P5KPL-VM Motherboard @@ -19146,7 +20342,7 @@ 104d 9005 Vaio VGN-FZ260E 104d 902d VAIO VGN-NR120E 17aa 20b1 ThinkPad T61 - 17aa 20b3 T61 + 17aa 20b3 ThinkPad T61/R61 e4bf cc47 CCG-RUMBA 2a01 Mobile PM965/GM965/GL960 PCI Express Root Port 2a02 Mobile GM965/GL960 Integrated Graphics Controller (primary) @@ -19155,14 +20351,14 @@ 103c 30c0 Compaq 6710b 103c 30d9 Presario C700 104d 902d VAIO VGN-NR120E - 17aa 20b5 T61 + 17aa 20b5 ThinkPad T61/R61 e4bf cc47 CCG-RUMBA 2a03 Mobile GM965/GL960 Integrated Graphics Controller (secondary) 1028 01f3 Dell Inspiron 1420 103c 30c0 Compaq 6710b 103c 30d9 Presario C700 104d 902d VAIO VGN-NR120E - 17aa 20b5 T61 + 17aa 20b5 ThinkPad T61/R61 e4bf cc47 CCG-RUMBA 2a04 Mobile PM965/GM965 MEI Controller 103c 30c1 Compaq 6910p @@ -19425,6 +20621,133 @@ 2e94 4 Series Chipset HECI Controller 2e95 4 Series Chipset HECI Controller 2e96 4 Series Chipset PT IDER Controller + 2f00 Haswell-E DMI2 + 2f01 Haswell-E PCI Express Root Port 0 + 2f02 Haswell-E PCI Express Root Port 1 + 2f03 Haswell-E PCI Express Root Port 1 + 2f04 Haswell-E PCI Express Root Port 2 + 2f05 Haswell-E PCI Express Root Port 2 + 2f06 Haswell-E PCI Express Root Port 2 + 2f07 Haswell-E PCI Express Root Port 2 + 2f08 Haswell-E PCI Express Root Port 3 + 2f09 Haswell-E PCI Express Root Port 3 + 2f0a Haswell-E PCI Express Root Port 3 + 2f0b Haswell-E PCI Express Root Port 3 + 2f1d Haswell-E PCIe Ring Interface + 2f1e Haswell-E Scratchpad & Semaphore Registers + 2f1f Haswell-E Scratchpad & Semaphore Registers + 2f20 Haswell-E DMA Channel 0 + 2f21 Haswell-E DMA Channel 1 + 2f22 Haswell-E DMA Channel 2 + 2f23 Haswell-E DMA Channel 3 + 2f24 Haswell-E DMA Channel 4 + 2f25 Haswell-E DMA Channel 5 + 2f26 Haswell-E DMA Channel 6 + 2f27 Haswell-E DMA Channel 7 + 2f28 Haswell-E Address Map, VTd_Misc, System Management + 2f29 Haswell-E Hot Plug + 2f2a Haswell-E RAS, Control Status and Global Errors + 2f2c Haswell-E I/O Apic + 2f2e Haswell-E RAID 5/6 + 2f2f Haswell-E RAID 5/6 + 2f30 Haswell-E Home Agent 0 + 2f32 Haswell-E QPI Link 0 + 2f33 Haswell-E QPI Link 1 + 2f34 Haswell-E PCIe Ring Interface + 2f36 Haswell-E R3 QPI Link 0 & 1 Monitoring + 2f37 Haswell-E R3 QPI Link 0 & 1 Monitoring + 2f38 Haswell-E Home Agent 1 + 2f3a Haswell-E QPI Link 2 + 2f3e Haswell-E R3 QPI Link 2 Monitoring + 2f3f Haswell-E R3 QPI Link 2 Monitoring + 2f40 Haswell-E QPI Link 2 + 2f41 Haswell-E R3 QPI Link 2 Monitoring + 2f43 Haswell-E QPI Link 2 + 2f60 Haswell-E Home Agent 1 + 2f68 Haswell-E Integrated Memory Controller 1 Target Address, Thermal & RAS Registers + 2f6a Haswell-E Integrated Memory Controller 1 Channel Target Address Decoder + 2f6b Haswell-E Integrated Memory Controller 1 Channel Target Address Decoder + 2f6c Haswell-E Integrated Memory Controller 1 Channel Target Address Decoder + 2f6d Haswell-E Integrated Memory Controller 1 Channel Target Address Decoder + 2f6e Haswell-E DDRIO Channel 2/3 Broadcast + 2f6f Haswell-E DDRIO Global Broadcast + 2f70 Haswell-E Home Agent 0 Debug + 2f71 Haswell-E Integrated Memory Controller 0 Target Address, Thermal & RAS Registers + 2f78 Haswell-E Home Agent 1 Debug + 2f79 Haswell-E Integrated Memory Controller 1 Target Address, Thermal & RAS Registers + 2f7d Haswell-E Scratchpad & Semaphore Registers + 2f80 Haswell-E QPI Link 0 + 2f81 Haswell-E R3 QPI Link 0 & 1 Monitoring + 2f83 Haswell-E QPI Link 0 + 2f90 Haswell-E QPI Link 1 + 2f93 Haswell-E QPI Link 1 + 2fa0 Haswell-E Home Agent 0 + 2fa8 Haswell-E Integrated Memory Controller 0 Target Address, Thermal & RAS Registers + 2faa Haswell-E Integrated Memory Controller 0 Channel Target Address Decoder + 2fab Haswell-E Integrated Memory Controller 0 Channel Target Address Decoder + 2fac Haswell-E Integrated Memory Controller 0 Channel Target Address Decoder + 2fad Haswell-E Integrated Memory Controller 0 Channel Target Address Decoder + 2fae Haswell-E DDRIO Channel 0/1 Broadcast + 2faf Haswell-E DDRIO Global Broadcast + 2fb0 Haswell-E Integrated Memory Controller 0 Channel 0 Thermal Control + 2fb1 Haswell-E Integrated Memory Controller 0 Channel 1 Thermal Control + 2fb2 Haswell-E Integrated Memory Controller 0 Channel 0 ERROR Registers + 2fb3 Haswell-E Integrated Memory Controller 0 Channel 1 ERROR Registers + 2fb4 Haswell-E Integrated Memory Controller 0 Channel 2 Thermal Control + 2fb5 Haswell-E Integrated Memory Controller 0 Channel 3 Thermal Control + 2fb8 Haswell-E DDRIO (VMSE) 2 & 3 + 2fb9 Haswell-E DDRIO (VMSE) 2 & 3 + 2fba Haswell-E DDRIO (VMSE) 2 & 3 + 2fbb Haswell-E DDRIO (VMSE) 2 & 3 + 2fbc Haswell-E DDRIO (VMSE) 0 & 1 + 2fbd Haswell-E DDRIO (VMSE) 0 & 1 + 2fbe Haswell-E DDRIO (VMSE) 0 & 1 + 2fbf Haswell-E DDRIO (VMSE) 0 & 1 + 2fc0 Haswell-E Power Control Unit + 2fc1 Haswell-E Power Control Unit + 2fc2 Power Control Unit + 2fc3 Power Control Unit + 2fc4 Power Control Unit + 2fc5 Power Control Unit + 2fd0 Haswell-E Integrated Memory Controller 1 Channel 0 Thermal Control + 2fd1 Haswell-E Integrated Memory Controller 1 Channel 1 Thermal Control + 2fd2 Haswell-E Integrated Memory Controller 1 Channel 0 ERROR Registers + 2fd3 Haswell-E Integrated Memory Controller 1 Channel 1 ERROR Registers + 2fd4 Haswell-E Integrated Memory Controller 1 Channel 2 Thermal Control + 2fd5 Haswell-E Integrated Memory Controller 1 Channel 3 Thermal Control + 2fd6 Haswell-E Integrated Memory Controller 1 Channel 2 ERROR Registers + 2fd7 Haswell-E Integrated Memory Controller 1 Channel 3 ERROR Registers + 2fe0 Haswell-E Unicast Registers + 2fe1 Haswell-E Unicast Registers + 2fe2 Haswell-E Unicast Registers + 2fe3 Haswell-E Unicast Registers + 2fe4 Haswell-E Unicast Registers + 2fe5 Haswell-E Unicast Registers + 2fe6 Haswell-E Unicast Registers + 2fe7 Haswell-E Unicast Registers + 2fe8 Haswell-E Unicast Registers + 2fe9 Haswell-E Unicast Registers + 2fea Haswell-E Unicast Registers + 2feb Haswell-E Unicast Registers + 2fec Haswell-E Unicast Registers + 2fed Haswell-E Unicast Registers + 2fee Haswell-E Unicast Registers + 2fef Haswell-E Unicast Registers + 2ff0 Haswell-E Unicast Registers + 2ff1 Haswell-E Unicast Registers + 2ff2 Haswell-E Unicast Registers + 2ff3 Haswell-E Unicast Registers + 2ff4 Haswell-E Unicast Registers + 2ff5 Haswell-E Unicast Registers + 2ff6 Haswell-E Unicast Registers + 2ff7 Haswell-E Unicast Registers + 2ff8 Haswell-E Buffered Ring Agent + 2ff9 Haswell-E Buffered Ring Agent + 2ffa Haswell-E Buffered Ring Agent + 2ffb Haswell-E Buffered Ring Agent + 2ffc Haswell-E System Address Decoder & Broadcast Registers + 2ffd Haswell-E System Address Decoder & Broadcast Registers + 2ffe Haswell-E System Address Decoder & Broadcast Registers 3200 GD31244 PCI-X SATA HBA 1775 c200 C2K onboard SATA host bus adapter 3310 IOP348 I/O Processor @@ -19501,16 +20824,23 @@ 3433 5520/5500/X58 Chipset QuickData Technology Device 3438 7500/5520/5500/X58 I/O Hub Throttle Registers 3500 6311ESB/6321ESB PCI Express Upstream Port + 103c 31fe ProLiant DL140 G3 + 15d9 9680 X7DBN Motherboard 3501 6310ESB PCI Express Upstream Port 3504 6311ESB/6321ESB I/OxAPIC Interrupt Controller 3505 6310ESB I/OxAPIC Interrupt Controller 350c 6311ESB/6321ESB PCI Express to PCI-X Bridge + 103c 31fe ProLiant DL140 G3 + 15d9 9680 X7DBN Motherboard 350d 6310ESB PCI Express to PCI-X Bridge 3510 6311ESB/6321ESB PCI Express Downstream Port E1 + 103c 31fe ProLiant DL140 G3 + 15d9 9680 X7DBN Motherboard 3511 6310ESB PCI Express Downstream Port E1 3514 6311ESB/6321ESB PCI Express Downstream Port E2 3515 6310ESB PCI Express Downstream Port E2 3518 6311ESB/6321ESB PCI Express Downstream Port E3 + 15d9 9680 X7DBN Motherboard 3519 6310ESB PCI Express Downstream Port E3 3575 82830M/MG/MP Host Bridge 0e11 0030 Evo N600c @@ -19593,9 +20923,12 @@ 3591 E7525/E7520 Error Reporting Registers 1014 02dd eServer xSeries server mainboard 1028 0169 Precision 470 + 103c 3208 ProLiant DL140 G2 4c53 10d0 Telum ASLP10 Processor AMC 3592 E7320 Memory Controller Hub + 1734 1073 Primergy Econel 200 D2020 mainboard 3593 E7320 Error Reporting Registers + 1734 1073 Primergy Econel 200 D2020 mainboard 3594 E7520 DMA Controller 1775 1100 CR11/VR11 Single Board Computer 4c53 10d0 Telum ASLP10 Processor AMC @@ -19731,19 +21064,19 @@ 1028 028d PowerEdge T410 USB UHCI Controller 103c 330b ProLiant G6 series 1043 82d4 P5Q Deluxe Motherboard - 1458 5004 GA-EP45-DS5/GA-EG45M-DS2H Motherboard + 1458 5004 Motherboard 3a38 82801JI (ICH10 Family) USB UHCI Controller #5 1028 028c PowerEdge R410 USB UHCI Controller 1028 028d PowerEdge T410 USB UHCI Controller 103c 330b ProLiant ML150 G6 Server 1043 82d4 P5Q Deluxe Motherboard - 1458 5004 GA-EP45-DS5/GA-EG45M-DS2H Motherboard + 1458 5004 Motherboard 3a39 82801JI (ICH10 Family) USB UHCI Controller #6 1028 028c PowerEdge R410 USB UHCI Controller 1028 028d PowerEdge T410 USB UHCI Controller 103c 330b ProLiant ML150 G6 Server 1043 82d4 P5Q Deluxe Motherboard - 1458 5004 GA-EP45-DS5/GA-EG45M-DS2H Motherboard + 1458 5004 Motherboard 3a3a 82801JI (ICH10 Family) USB2 EHCI Controller #1 1028 028c PowerEdge R410 USB EHCI Controller 1028 028d PowerEdge T410 USB EHCI Controller @@ -20023,6 +21356,7 @@ 4220 PRO/Wireless 2200BG [Calexico2] Network Connection 103c 0934 Compaq nw8240/nx8220 103c 12f6 nc6120/nx8220/nw8240 + 8086 2701 WM3B2300BG Mini-PCI Card 8086 2712 IBM ThinkPad R50e 8086 2721 Dell B130 laptop integrated WLAN 8086 2722 Dell Latitude D600 @@ -20328,80 +21662,141 @@ 8817 Platform Controller Hub EG20T I2C Controller 8818 Platform Controller Hub EG20T Controller Area Network (CAN) Controller 8819 Platform Controller Hub EG20T IEEE 1588 Hardware Assist - 8c00 8 Series/C220 Series Chipset Family 4-port SATA Controller 1 [IDE mode] - 8c01 8 Series Chipset Family 4-port SATA Controller 1 [IDE mode] - 8c02 8 Series/C220 Series Chipset Family 6-port SATA Controller 1 [AHCI mode] - 8c03 8 Series/C220 Series Chipset Family 6-port SATA Controller 1 [AHCI mode] - 8c04 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] - 8c05 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] - 8c06 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] - 8c07 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] - 8c08 8 Series/C220 Series Chipset Family 2-port SATA Controller 2 [IDE mode] - 8c09 8 Series/C220 Series Chipset Family 2-port SATA Controller 2 [IDE mode] - 8c0e 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] - 8c0f 8 Series/C220 Series Chipset Family SATA Controller 1 [RAID mode] - 8c10 8 Series/C220 Series Chipset Family PCI Express Root Port #1 - 8c11 8 Series/C220 Series Chipset Family PCI Express Root Port #1 - 8c12 8 Series/C220 Series Chipset Family PCI Express Root Port #2 - 8c13 8 Series/C220 Series Chipset Family PCI Express Root Port #2 - 8c14 8 Series/C220 Series Chipset Family PCI Express Root Port #3 - 8c15 8 Series/C220 Series Chipset Family PCI Express Root Port #3 - 8c16 8 Series/C220 Series Chipset Family PCI Express Root Port #4 - 8c17 8 Series/C220 Series Chipset Family PCI Express Root Port #4 - 8c18 8 Series/C220 Series Chipset Family PCI Express Root Port #5 - 8c19 8 Series/C220 Series Chipset Family PCI Express Root Port #5 - 8c1a 8 Series/C220 Series Chipset Family PCI Express Root Port #6 - 8c1b 8 Series/C220 Series Chipset Family PCI Express Root Port #6 - 8c1c 8 Series/C220 Series Chipset Family PCI Express Root Port #7 - 8c1d 8 Series/C220 Series Chipset Family PCI Express Root Port #7 - 8c1e 8 Series/C220 Series Chipset Family PCI Express Root Port #8 - 8c1f 8 Series/C220 Series Chipset Family PCI Express Root Port #8 - 8c20 8 Series/C220 Series Chipset High Definition Audio Controller - 8c21 8 Series/C220 Series Chipset High Definition Audio Controller - 8c22 8 Series/C220 Series Chipset Family SMBus Controller - 8c23 8 Series Chipset Family CHAP Counters - 8c24 8 Series Chipset Family Thermal Management Controller - 8c26 8 Series/C220 Series Chipset Family USB EHCI #1 - 8c2d 8 Series/C220 Series Chipset Family USB EHCI #2 - 8c31 8 Series/C220 Series Chipset Family USB xHCI - 8c33 8 Series/C220 Series Chipset Family LAN Controller - 8c34 8 Series/C220 Series Chipset Family NAND Controller - 8c3a 8 Series/C220 Series Chipset Family MEI Controller #1 - 8c3b 8 Series/C220 Series Chipset Family MEI Controller #2 - 8c3c 8 Series/C220 Series Chipset Family IDE-r Controller - 8c3d 8 Series/C220 Series Chipset Family KT Controller - 8c40 8 Series/C220 Series Chipset Family LPC Controller - 8c41 8 Series Chipset Family Mobile Super SKU LPC Controller - 8c42 8 Series/C220 Series Chipset Family Desktop Super SKU LPC Controller - 8c43 8 Series/C220 Series Chipset Family LPC Controller - 8c44 Z87 Express Chipset LPC Controller - 8c45 8 Series/C220 Series Chipset Family LPC Controller - 8c46 Z85 Express Chipset LPC Controller - 8c47 8 Series/C220 Series Chipset Family LPC Controller - 8c48 8 Series/C220 Series Chipset Family LPC Controller - 8c49 HM86 Express Chipset LPC Controller - 8c4a H87 Express Chipset LPC Controller - 8c4b HM87 Express Chipset LPC Controller - 8c4c Q85 Express Chipset LPC Controller - 8c4d 8 Series/C220 Series Chipset Family LPC Controller - 8c4e Q87 Express Chipset LPC Controller - 8c4f QM87 Express Chipset LPC Controller - 8c50 B85 Express Chipset LPC Controller - 8c51 8 Series/C220 Series Chipset Family LPC Controller - 8c52 C222 Series Chipset Family Server Essential SKU LPC Controller - 8c53 8 Series/C220 Series Chipset Family LPC Controller - 8c54 C224 Series Chipset Family Server Standard SKU LPC Controller - 8c55 8 Series/C220 Series Chipset Family LPC Controller - 8c56 C226 Series Chipset Family Server Advanced SKU LPC Controller - 8c57 8 Series/C220 Series Chipset Family LPC Controller - 8c58 8 Series/C220 Series Chipset Family WS SKU LPC Controller - 8c59 8 Series/C220 Series Chipset Family LPC Controller - 8c5a 8 Series/C220 Series Chipset Family LPC Controller - 8c5b 8 Series/C220 Series Chipset Family LPC Controller - 8c5c H81 Express Chipset/C220 Series Chipset Family LPC Controller - 8c5d 8 Series/C220 Series Chipset Family LPC Controller - 8c5e 8 Series/C220 Series Chipset Family LPC Controller - 8c5f 8 Series/C220 Series Chipset Family LPC Controller + 8c00 Lynx Point 4-port SATA Controller 1 [IDE mode] + 8c01 Lynx Point 4-port SATA Controller 1 [IDE mode] + 8c02 Lynx Point 6-port SATA Controller 1 [AHCI mode] + 8c03 Lynx Point 6-port SATA Controller 1 [AHCI mode] + 8c04 Lynx Point SATA Controller 1 [RAID mode] + 8c05 Lynx Point SATA Controller 1 [RAID mode] + 8c06 Lynx Point SATA Controller 1 [RAID mode] + 8c07 Lynx Point SATA Controller 1 [RAID mode] + 8c08 Lynx Point 2-port SATA Controller 2 [IDE mode] + 8c09 Lynx Point 2-port SATA Controller 2 [IDE mode] + 8c0e Lynx Point SATA Controller 1 [RAID mode] + 8c0f Lynx Point SATA Controller 1 [RAID mode] + 8c10 Lynx Point PCI Express Root Port #1 + 8c11 Lynx Point PCI Express Root Port #1 + 8c12 Lynx Point PCI Express Root Port #2 + 8c13 Lynx Point PCI Express Root Port #2 + 8c14 Lynx Point PCI Express Root Port #3 + 8c15 Lynx Point PCI Express Root Port #3 + 8c16 Lynx Point PCI Express Root Port #4 + 8c17 Lynx Point PCI Express Root Port #4 + 8c18 Lynx Point PCI Express Root Port #5 + 8c19 Lynx Point PCI Express Root Port #5 + 8c1a Lynx Point PCI Express Root Port #6 + 8c1b Lynx Point PCI Express Root Port #6 + 8c1c Lynx Point PCI Express Root Port #7 + 8c1d Lynx Point PCI Express Root Port #7 + 8c1e Lynx Point PCI Express Root Port #8 + 8c1f Lynx Point PCI Express Root Port #8 + 8c20 Lynx Point High Definition Audio Controller + 8c21 Lynx Point High Definition Audio Controller + 8c22 Lynx Point SMBus Controller + 8c23 Lynx Point CHAP Counters + 8c24 Lynx Point Thermal Management Controller + 8c26 Lynx Point USB Enhanced Host Controller #1 + 8c2d Lynx Point USB Enhanced Host Controller #2 + 8c31 Lynx Point USB xHCI Host Controller + 8c33 Lynx Point LAN Controller + 8c34 Lynx Point NAND Controller + 8c3a Lynx Point MEI Controller #1 + 8c3b Lynx Point MEI Controller #2 + 8c3c Lynx Point IDE-r Controller + 8c3d Lynx Point KT Controller + 8c40 Lynx Point LPC Controller + 8c41 Lynx Point LPC Controller + 8c42 Lynx Point LPC Controller + 8c43 Lynx Point LPC Controller + 8c44 Lynx Point LPC Controller + 8c45 Lynx Point LPC Controller + 8c46 Lynx Point LPC Controller + 8c47 Lynx Point LPC Controller + 8c48 Lynx Point LPC Controller + 8c49 Lynx Point LPC Controller + 8c4a Lynx Point LPC Controller + 8c4b Lynx Point LPC Controller + 8c4c Lynx Point LPC Controller + 8c4d Lynx Point LPC Controller + 8c4e Lynx Point LPC Controller + 8c4f Lynx Point LPC Controller + 8c50 Lynx Point LPC Controller + 8c51 Lynx Point LPC Controller + 8c52 Lynx Point LPC Controller + 8c53 Lynx Point LPC Controller + 8c54 Lynx Point LPC Controller + 8c55 Lynx Point LPC Controller + 8c56 Lynx Point LPC Controller + 8c57 Lynx Point LPC Controller + 8c58 Lynx Point LPC Controller + 8c59 Lynx Point LPC Controller + 8c5a Lynx Point LPC Controller + 8c5b Lynx Point LPC Controller + 8c5c Lynx Point LPC Controller + 8c5d Lynx Point LPC Controller + 8c5e Lynx Point LPC Controller + 8c5f Lynx Point LPC Controller + 8d00 Wellsburg 4-port SATA Controller [IDE mode] + 8d02 Wellsburg 6-Port SATA Controller [AHCI mode] + 8d04 Wellsburg SATA Controller [RAID mode] + 8d06 Wellsburg SATA Controller [RAID mode] + 8d08 Wellsburg 2-port SATA Controller [IDE mode] + 8d0e Wellsburg SATA Controller [RAID mode] + 8d10 Wellsburg PCI Express Root Port #1 + 8d11 Wellsburg PCI Express Root Port #1 + 8d12 Wellsburg PCI Express Root Port #2 + 8d13 Wellsburg PCI Express Root Port #2 + 8d14 Wellsburg PCI Express Root Port #3 + 8d15 Wellsburg PCI Express Root Port #3 + 8d16 Wellsburg PCI Express Root Port #4 + 8d17 Wellsburg PCI Express Root Port #4 + 8d18 Wellsburg PCI Express Root Port #5 + 8d19 Wellsburg PCI Express Root Port #5 + 8d1a Wellsburg PCI Express Root Port #6 + 8d1b Wellsburg PCI Express Root Port #6 + 8d1c Wellsburg PCI Express Root Port #7 + 8d1d Wellsburg PCI Express Root Port #7 + 8d1e Wellsburg PCI Express Root Port #8 + 8d1f Wellsburg PCI Express Root Port #8 + 8d20 Wellsburg HD Audio Controller + 8d21 Wellsburg HD Audio Controller + 8d22 Wellsburg SMBus Controller + 8d24 Wellsburg Thermal Subsystem + 8d26 Wellsburg USB Enhanced Host Controller #1 + 8d2d Wellsburg USB Enhanced Host Controller #2 + 8d31 Wellsburg USB xHCI Host Controller + 8d33 Wellsburg LAN Controller + 8d34 Wellsburg NAND Controller + 8d3a Wellsburg MEI Controller #1 + 8d3b Wellsburg MEI Controller #2 + 8d3c Wellsburg IDE-r Controller + 8d3d Wellsburg KT Controller + 8d40 Wellsburg LPC Controller + 8d41 Wellsburg LPC Controller + 8d42 Wellsburg LPC Controller + 8d43 Wellsburg LPC Controller + 8d44 Wellsburg LPC Controller + 8d45 Wellsburg LPC Controller + 8d46 Wellsburg LPC Controller + 8d47 Wellsburg LPC Controller + 8d48 Wellsburg LPC Controller + 8d49 Wellsburg LPC Controller + 8d4a Wellsburg LPC Controller + 8d4b Wellsburg LPC Controller + 8d4c Wellsburg LPC Controller + 8d4d Wellsburg LPC Controller + 8d4e Wellsburg LPC Controller + 8d4f Wellsburg LPC Controller + 8d60 Wellsburg sSATA Controller [IDE mode] + 8d62 Wellsburg sSATA Controller [AHCI mode] + 8d64 Wellsburg sSATA Controller [RAID mode] + 8d66 Wellsburg sSATA Controller [RAID mode] + 8d68 Wellsburg sSATA Controller [IDE mode] + 8d6e Wellsburg sSATA Controller [RAID mode] + 8d7c Wellsburg EPSS + 8d7d Wellsburg MS SMBus 0 + 8d7e Wellsburg MS SMBus 1 + 8d7f Wellsburg MS SMBus 2 9000 IXP2000 Family Network Processor 9001 IXP2400 Network Processor 9002 IXP2300 Network Processor @@ -20438,12 +21833,17 @@ 9c19 Lynx Point-LP PCI Express Root Port 5 9c1a Lynx Point-LP PCI Express Root Port 6 9c1b Lynx Point-LP PCI Express Root Port 6 + 9c1c Lynx Point-LP PCI Express Root Port 7 + 9c1d Lynx Point-LP PCI Express Root Port 7 + 9c1e Lynx Point-LP PCI Express Root Port 8 + 9c1f Lynx Point-LP PCI Express Root Port 8 9c20 Lynx Point-LP HD Audio Controller 9c21 Lynx Point-LP HD Audio Controller 9c22 Lynx Point-LP SMBus Controller 9c23 Lynx Point-LP CHAP Counters 9c24 Lynx Point-LP Thermal 9c26 Lynx Point-LP USB EHCI #1 + 9c2d Lynx Point-LP USB EHCI #2 9c31 Lynx Point-LP USB xHCI HC 9c35 Lynx Point-LP SDIO Controller 9c36 Lynx Point-LP Audio DSP Controller @@ -20467,14 +21867,21 @@ 9c65 Lynx Point-LP SPI Controller #0 9c66 Lynx Point-LP SPI Controller #1 a000 Atom Processor D4xx/D5xx/N4xx/N5xx DMI Bridge + 1458 5000 GA-D525TUD 8086 4f4d DeskTop Board D510MO + 8086 544b Desktop Board D425KT a001 Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller + 1458 d000 GA-D525TUD 8086 4f4d DeskTop Board D510MO + 8086 544b Desktop Board D425KT a002 Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller a003 Atom Processor D4xx/D5xx/N4xx/N5xx CHAPS counter a010 Atom Processor D4xx/D5xx/N4xx/N5xx DMI Bridge + 144d c072 Notebook N150P a011 Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller + 144d c072 Notebook N150P a012 Atom Processor D4xx/D5xx/N4xx/N5xx Integrated Graphics Controller + 144d c072 Notebook N150P a013 Atom Processor D4xx/D5xx/N4xx/N5xx CHAPS counter a620 6400/6402 Advanced Memory Buffer (AMB) b152 21152 PCI-to-PCI Bridge @@ -20515,16 +21922,6 @@ cafe VirtualBox Guest Service 8322 Sodick America Corp. 8384 SigmaTel - 7618 High Definition Audio Codec - 7634 9250 HD Audio Codec - 7662 High Definition Audio Codec - 104d 1e00 High Definition Audio Codec [STAC9872AK] - 7664 High Definition Audio Codec - 7670 9770 High Definition Audio - 7672 9772 High Definition Audio - 7682 IDT High Definition Audio Codec - 7690 9200 HD Audio Codec - 1028 01c1 Precision 490 8401 TRENDware International Inc. 8686 ScaleMP 1010 vSMPowered system controller [vSMP CTL] @@ -20649,6 +22046,7 @@ 9004 7888 AHA-2930UW SCSI Controller 8b78 ABA-1030 ec78 AHA-4944W/UW +# acquired by PMC-Sierra 9005 Adaptec 0010 AHA-2940U2/U2W 9005 2180 AHA-2940U2 SCSI Controller @@ -20895,6 +22293,9 @@ 801f AIC-7902 U320 1734 1011 PRIMERGY RX300 onboard SCSI 8080 ASC-29320A U320 w/HostRAID + 8081 PMC-Sierra PM8001 SAS HBA [Series 6H] + 8088 PMC-Sierra PM8018 SAS HBA [Series 7H] + 8089 PMC-Sierra PM8019 SAS encryption HBA [Series 7He] 808f AIC-7901 U320 w/HostRAID 8090 ASC-39320 U320 w/HostRAID 8091 ASC-39320D U320 w/HostRAID @@ -20918,7 +22319,8 @@ 0001 JusonTech Gigabit Ethernet Controller 9699 Omni Media Technology Inc 6565 6565 -9710 NetMos Technology +# nee Netmos Technology +9710 MosChip Semiconductor Technology Ltd. 9250 PCI-to-PCI bridge [MCS9250] 9805 PCI 1 port parallel adapter 9815 PCI 9815 Multi-I/O Controller @@ -20982,6 +22384,8 @@ b1d9 ATCOM Technology co., LTD. # Pinnacle should be 11bd, but they got it wrong several times --mj bd11 Pinnacle Systems, Inc. (Wrong ID) bdbd Blackmagic Design +# HD/SDI input and output card for PCI Express 1x + a11b DeckLink SDI c001 TSI Telsys c0a9 Micron/Crucial Technology c0de Motorola @@ -20991,6 +22395,7 @@ cace CACE Technologies, Inc. 0001 TurboCap Port A 0002 TurboCap Port B 0023 AirPcap N +caed Canny Edge cafe Chrysalis-ITS 0003 Luna K3 Hardware Security Module 0006 Luna PCI-e 3000 Hardware Security Module @@ -21033,6 +22438,10 @@ dada Datapath Limited db10 Diablo Technologies dcba Dynamic Engineering 0046 PCIeAlteraCycloneIV +# VPX format Receiver Controller Board + 0047 VPX-RCB +# PMC Format FPGA design with 8 high speed UART channels + 0048 PMC-Biserial-III-BAE9 dd01 Digital Devices GmbH 0003 Octopus LE DVB adapter dead Indigita Corporation @@ -21162,7 +22571,6 @@ feda Broadcom Inc a10e BCM4230 iLine10 HomePNA 2.0 fede Fedetec Inc. 0003 TABIC PCI v3 -ffee FNK Tech fffd XenSource, Inc. 0101 PCI Event Channel Controller # Used in some old VMWare products before they got a real ID assigned diff --git a/src/hwdata/usb.ids b/src/hwdata/usb.ids index 1b8f2c6..859d3b3 100644 --- a/src/hwdata/usb.ids +++ b/src/hwdata/usb.ids @@ -9,8 +9,8 @@ # The latest version can be obtained from # http://www.linux-usb.org/usb.ids # -# Version: 2012.07.30 -# Date: 2012-07-30 20:34:03 +# Version: 2013.03.25 +# Date: 2013-03-25 20:34:03 # # Vendors, devices and interfaces. Please keep sorted. @@ -35,6 +35,8 @@ 145f NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211] 0145 Unknown 0112 Card Reader +017c MLK + 145f Trust Deskset 0204 Chipsbank Microelectronics Co., Ltd 6025 CBM2080 Flash drive controller 6026 CBM1180 Flash drive controller @@ -50,6 +52,8 @@ ac02 ATV Turbo / Rally2 Dual Channel USB 2.0 Flash Drive 0386 LTS 0001 PSX for USB Converter +03d9 Shenzhen Sinote Tech-Electron Co., Ltd + 0499 SE340D PC Remote Control 03da Bernd Walter Computer Technology 0002 HD44780 LCD interface 03e8 EndPoints, Inc. @@ -103,6 +107,7 @@ 210d XPLAIN evaluation kit (CDC ACM) 2122 XMEGA-A1 Explained evaluation kit 2310 EVK11xx evaluation board + 2fe4 ATxmega32A4U DFU bootloader 2ffb at90usb AVR DFU bootloader 2ffd at89c5130/c5131 DFU bootloader 2fff at89c5132/c51snd1c DFU bootloader @@ -405,12 +410,14 @@ 3717 EWS UPD 3724 Webcam 3802 PhotoSmart 100 + 3807 c485w Flash Drive 3817 LaserJet P2015 series 3902 PhotoSmart 130 3a02 PhotoSmart 7150 3a11 OfficeJet 5500 series 3a17 Printing Support 3b02 PhotoSmart 7150~ + 3b05 Scanjet N8460 3b11 PSC 1300 series 3b17 LaserJet M1005 MFP 3c02 PhotoSmart 7350 @@ -441,6 +448,7 @@ 4417 EWS UPD 4502 PhotoSmart 945 (PTP mode) 4505 ScanJet G4010 + 4507 External HDD 4511 PhotoSmart 2600 4512 E709n [Officejet 6500 Wireless] 4517 EWS UPD @@ -476,6 +484,7 @@ 5a11 PhotoSmart C7100 series 5b11 OfficeJet J2100 series 5c11 PhotoSmart C4200 Printer series + 5c12 OfficeJet 6700 5c17 LaserJet P2055 series 5d11 PhotoSmart C5200 series 5e11 PhotoSmart D7400 series @@ -555,6 +564,7 @@ 8417 LaserJet M9040 MFP 8504 DeskJet 6600 series 8604 DeskJet 5440 + 8607 Optical Mobile Mouse 8704 DeskJet 5940 8711 Deskjet 2050 J510 8804 DeskJet 6980 series @@ -572,11 +582,13 @@ 9902 PhotoSmart M630 series 9a02 PhotoSmart E330 series 9b02 PhotoSmart M540 series + 9b07 Portable Drive 9c02 PhotoSmart M440 series a004 DeskJet 5850c a011 Deskjet 3050A b002 PhotoSmart 7200 series b102 PhotoSmart 7200 series + b107 v255w/c310w Flash Drive b116 Webcam b202 PhotoSmart 7600 series b302 PhotoSmart 7600 series @@ -642,7 +654,7 @@ 1001 Mustek BearPaw 2400 Scanner 1237 Hub a000 Smart Display Reference Device - c359 Logitech Harmony (Boot loader mode) + c359 Logitech Harmony c35b Printing Support c55d Rigol Technologies DS5000USB Oscilloscope 0401 National Registry, Inc. @@ -674,12 +686,14 @@ 6011 FT4232H Quad HS USB-UART/FIFO IC 6014 FT232H Single HS USB-UART/FIFO IC 6015 Bridge(I2C/SPI/UART/FIFO) + 8028 Dev board JTAG (FT232H based) 8040 4 Port Hub 8070 7 Port Hub 8370 7 Port Hub 8371 PS/2 Keyboard And Mouse 8372 FT8U100AX Serial Port 8a28 Rainforest Automation ZigBee Controller + 8a98 TIAO Multi-Protocol Adapter 9e90 Marvell OpenRD Base/Client 9f80 Ewert Energy Systems CANdapter a6d0 Texas Instruments XDS100v2 JTAG / BeagleBone A3 @@ -688,7 +702,8 @@ b810 US Interface Navigator (CAT and 2nd PTT lines) b811 US Interface Navigator (WKEY and FSK lines) b812 US Interface Navigator (RS232 and CONFIG lines) - baf8 Amontec JTAGkey - Open On-Chip Debugger + b9b0 Fujitsu SK-16FX-100PMC V1.1 + baf8 Amontec JTAGkey bcd8 Stellaris Development Board bcd9 Stellaris Evaluation Board bcda Stellaris ICDI Board @@ -714,11 +729,12 @@ cc48 Tactrix OpenPort 1.3 Mitsubishi cc49 Tactrix OpenPort 1.3 Subaru cc4a Tactrix OpenPort 1.3 Universal - cff8 Distortec JTAG-lock-pick + cff8 Amontec JTAGkey d010 SCS PTC-IIusb d011 SCS Position-Tracker/TNC d012 SCS DRAGON 1 d013 SCS DRAGON 1 + d491 Zolix Omni 1509 monochromator d578 Accesio USB-COM-4SM d6f8 UNI Black BOX d738 Propox JTAGcable II @@ -735,6 +751,8 @@ e88a Expert mouseCLOCK USB II e88b Precision Clock MSF USB e88c Expert mouseCLOCK USB II HBG + e8d8 Aaronia AG Spectran Spectrum Analyzer + e8dc Aaronia AG UBBV Preamplifier ea90 Eclo 1-Wire Adapter ed71 HAMEG HO870 Serial Port ed72 HAMEG HO720 Serial Port @@ -757,6 +775,7 @@ fa02 Matrix Orbital MX4 or MX5 fa03 Matrix Orbital VK/LK202 Family fa04 Matrix Orbital VK/LK204 Family + fa20 Ross-Tech HEX-USB fc08 Crystalfontz CFA-632 USB LCD fc09 Crystalfontz CFA-634 USB LCD fc0b Crystalfontz CFA-633 USB LCD @@ -975,6 +994,7 @@ 05d4 EasyShare C180 Digital Camera 1001 EasyShare SV811 Digital Picture Frame 4000 InkJet Color Printer + 4022 1400 Digital Photo Printer 4056 ESP 7200 Series AiO 4109 EasyShare Printer Dock Series 3 410d EasyShare G600 Printer Dock @@ -1036,6 +1056,7 @@ 00da WLI-U2-KG54L 802.11bg [ZyDAS ZD1211B] 00db External Hard Drive HD-PF32OU2 [Buffalo Ministation] 00e8 WLI-UC-G300N Wireless LAN Adapter [Ralink RT2870] + 0105 External Hard Drive HD-CEU2 [Drive Station] 012e WLI-UC-AG300N Wireless LAN Adapter 0148 WLI-UC-G300HP Wireless LAN Adapter 0150 WLP-UC-AG300 Wireless LAN Adapter @@ -1047,7 +1068,10 @@ 019e WLI-UC-GNP Wireless LAN Adapter 01a1 MiniStation Metro 01a2 WLI-UC-GNM Wireless LAN Adapter [Ralink RT8070] + 01dc Ultra-Slim Portable DVD Writer (DVSM-PC58U2V) + 01de External Hard Drive HD-PCTU3 [Buffalo MiniStation] 01ee WLI-UC-GNM2 Wireless LAN Adapter [Ralink RT3070] + 01f1 SATA Adapter [HD-LBU3] 01fd WLI-UC-G450 Wireless LAN Adapter 0412 Award Software International 0413 Leadtek Research, Inc. @@ -1099,6 +1123,7 @@ 3811 Generic Controller - Single interface 3812 Smart Card Controller_2Interface 3813 Panel Display + 5011 Virtual Com Port 5518 4-Port Hub 551a PC Sync Keypad 551b PC Async Keypad @@ -1153,6 +1178,7 @@ 3090 Sound Blaster Digital Music SX 30d3 Sound Blaster Play! 3121 WoW tap chat + 3220 Sound Blaster Tactic(3D) Sigma sound card 3f00 E-Mu Xboard 25 MIDI Controller 3f02 E-Mu 0202 3f04 E-Mu 0404 @@ -1214,6 +1240,7 @@ 406c Live! Cam Sync [VF0520] 4083 Live! Cam Socialize [VF0640] 4087 Live! Cam Socialize HD 1080 [VF0680] + 4088 Live! Cam Chat HD [VF0700] 4100 Nomad Jukebox 2 4101 Nomad Jukebox 3 4102 NOMAD MuVo^2 @@ -1241,7 +1268,7 @@ 412b MuVo N200 with FM radio 412f Dell Digital Jukebox 2.Gen 4130 Zen Micro (mtp) - 4131 Zen Touch (mtp) + 4131 DAP-HD0014 [Zen Touch] (MTP) 4133 Mass Storage Device 4134 Zen Neeon 4136 Zen Sleek @@ -1312,6 +1339,7 @@ 02e2 5230 (Multimedia mode) 02e3 5230 (PC-Suite mode) 02e4 5230 (Imaging mode) + 0360 C1-01 Ovi Suite Mode 03a4 C5 (Storage mode) 03c0 C7-00 03d1 N950 @@ -1369,6 +1397,9 @@ 0471 6110 Navigator 0485 MTP Device 04b9 5300 + 04bc 5200 (Nokia mode) + 04bd 5200 (Storage mode) + 04be 5200 (MTP mode) 04c3 N800 Internet Tablet 04ce E90 Communicator (PC Suite mode) 04cf E90 Communicator (Storage mode) @@ -1379,6 +1410,7 @@ 0518 N9 Phone 0600 Digital Pen SU-1B 0610 CS-15 (Internet Stick 3G modem) + 0661 Lumia 920 0800 Connectivity Cable DKU-5 0801 Data Cable DKU-6 0802 CA-42 Phone Parent @@ -1407,6 +1439,7 @@ 223a 8-in-1 Card Reader 2503 USB 2.0 Hub 2504 USB 2.0 Hub + 2507 hub 2512 USB 2.0 Hub 2513 2.0 Hub 2514 USB 2.0 Hub @@ -1416,7 +1449,10 @@ 2640 USB 2.0 Hub 4060 Ultra Fast Media Reader 4064 Ultra Fast Media Reader + 7500 LAN7500 Ethernet 10/100/1000 Adapter + 9512 LAN9500 Ethernet 10/100 Adapter / SMSC9512/9514 Hub a700 2 Port Hub + ec00 SMSC9512/9514 Fast Ethernet Adapter 0425 Motorola Semiconductors HK, Ltd 0101 G-Tech Wireless Mouse & Keyboard f102 G-Tech U+P Wireless Mouse @@ -1445,6 +1481,10 @@ 0100 3-button Mouse 100e 24.1" LCD Monitor v4 / FID-638 Mouse 36ba Bus Powered Hub + a101 remote key/mouse for P3 chip + a102 remote key/mouse/storage for P3 chip + a103 remote storage for P3 chip + a4a2 Ethernet (RNDIS and CDC ethernet) cdab Raritan KVM dongle 0431 Itac Systems, Inc. 0100 Mouse-Trak 3-button Track Ball @@ -1560,7 +1600,7 @@ 0079 InkJet Color Printer 007a Generic Hub 007b InkJet Color Printer - 007c Lexmark X1110/X1130/X1140/X1150/X1170/X1180/X1185 + 007c X1110/X1130/X1140/X1150/X1170/X1180/X1185 007d Photo 3150 008a 4200 series 008b InkJet Color Printer @@ -1655,18 +1695,21 @@ ffff Compaq Bluetooth Multiport Module 044f ThrustMaster, Inc. 0400 HOTAS Cougar + 044f GP XID a003 Rage 3D Game Pad a01b PK-GP301 Driving Wheel a0a0 Top Gun Joystick a0a1 Top Gun Joystick (rev2) a0a3 Fusion Digital GamePad a201 PK-GP201 PlayStick + b108 T-Flight Hotas X Flight Stick b10a T.16000M Joystick b203 360 Modena Pro Wheel b300 Firestorm Dual Power b304 Firestorm Dual Power b307 vibrating Upad b30b Wireless VibrationPad + b315 Firestorm Dual Analog 3 b323 Dual Trigger 3-in-1 (PC Mode) b324 Dual Trigger 3-in-1 (PS3 Mode) b603 force feedback Wheel @@ -1693,6 +1736,7 @@ 6060 RNDIS/BeWAN ADSL2+ 6070 RNDIS/BeWAN ADSL2+ 625f TUSB6250 ATA Bridge + 8042 Hub dbc0 Device Bay Controller e001 GraphLink e003 TI-84 Plus Calculator @@ -1745,6 +1789,7 @@ 0072 Navigator 335 0083 Bluetooth Dongle 0087 Ergo 525V Laser Mouse + 00ca Pen Mouse 0100 EasyPen Tablet 0101 CueCat 011b NetScroll T220 @@ -1898,6 +1943,7 @@ 009c Wireless Transceiver for Bluetooth 2.0 009d Wireless Optical Desktop 3.0 00a0 eHome Infrared Receiver + 00a4 Compact Optical Mouse, model 1016 00b0 Digital Media Pro Keyboard 00b4 Digital Media Keyboard 1.0A 00b9 Wireless Optical Mouse 3.0 @@ -2084,14 +2130,18 @@ 0724 SideWinder Mouse 0730 Digital Media Keyboard 3000 0734 Wireless Optical Desktop 700 + 0736 Sidewinder X5 Mouse 0737 Compact Optical Mouse 500 0745 Nano Transceiver v1.0 for Bluetooth 0750 Wired Keyboard 600 0752 Wired Keyboard 400 075d LifeCam Cinema + 0766 LifeCam VX-800 0768 Sidewinder X4 + 076c Comfort Mouse 4500 076d LifeCam HD-5000 0772 LifeCam Studio + 0779 LifeCam HD-3000 930a ISOUSB.SYS Intel 82930 Isochronous IO Test Board fff8 Keyboard ffff Windows CE Mass Storage @@ -2154,7 +2204,9 @@ 4d2c PoPo Mini Pointer Mouse (HID) 4d2e Optical Mobile Mouse (HID) 4d51 0Y357C PMX-MMOCZUL (B) [Dell Laser Mouse] + 4d62 HP Laser Mobile Mini Mouse 4d75 Rocketfish RF-FLBTAD Bluetooth Adapter + 4d81 Dell N889 Optical Mouse 4de7 webcam 0463 MGE UPS Systems 0001 UPS @@ -2171,7 +2223,7 @@ 0010 SmartBoard XX44 0011 G83 (RS 6000) Keyboard 0021 CyMotion Expert Combo - 0023 CyMotion Master Linux Keyboard + 0023 CyMotion Master Linux Keyboard G230 0027 CyMotion Master Solar Keyboard 002a Wireless Mouse & Keyboard 002d SmartTerminal XX44 @@ -2212,6 +2264,7 @@ 0821 HD Webcam C910 0825 Webcam C270 0828 HD Webcam B990 + 082d HD Pro Webcam C920 0830 QuickClip 0840 QuickCam Express 0850 QuickCam Web @@ -2313,7 +2366,8 @@ 0a0c Clear Chat Comfort USB Headset 0a13 Z-5 Speakers 0a17 G330 Headset - 0b02 BT Mini-Receiver (HID proxy mode) + 0a1f G930 + 0b02 C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode) 8801 Video Camera b305 BT Mini-Receiver bfe4 Premium Optical Wheel Mouse @@ -2361,7 +2415,7 @@ c044 LX3 Optical Mouse c045 Optical Mouse c046 RX1000 Laser Mouse - c047 Laser Mouse + c047 Laser Mouse M-UAL120 c048 G9 Laser Mouse c049 G5 Laser Mouse c050 RX 250 Optical Mouse @@ -2369,21 +2423,27 @@ c053 Laser Mouse c054 Bluetooth mini-receiver c058 M115 Mouse - c05a Optical Mouse M90 + c05a M90/M100 Optical Mouse c05b M-U0004 810-001317 [B110 Optical USB Mouse] c05d Optical Mouse + c05f M115 Optical Mouse c061 RX1500 Laser Mouse - c062 LS1 Laser Mouse, corded + c062 M-UAS144 [LS1 Laser Mouse] c063 DELL Laser Mouse c068 G500 Laser Mouse c069 M500 Laser Mouse + c06a USB Optical Mouse c06b G700 Wireless Gaming Mouse c06c Optical Mouse c101 UltraX Media Remote - c110 Harmony 885 Remote + c110 Harmony 785/885 Remote c111 Harmony 525 Remote - c11f Harmony 900 Remote + c112 Harmony 890 Remote + c11f Harmony 900/1100 Remote + c121 Harmony One Remote c122 Harmony 700 Remote + c124 Harmony 300 Remote + c125 Harmony 200 Remote c201 WingMan Extreme Joystick with Throttle c202 WingMan Formula c207 WingMan Extreme Digital 3D @@ -2417,6 +2477,7 @@ c22b Gaming Keyboard G110 G-keys c22d G510 Gaming Keyboard c22e G510 Gaming Keyboard onboard audio + c245 G400 Optical Mouse c246 Gaming Mouse G300 c281 WingMan Force c283 WingMan Force 3D @@ -2449,13 +2510,14 @@ c311 Y-UF49 [Internet Pro Keyboard] c312 DeLuxe 250 Keyboard c313 Internet 350 Keyboard - c315 Classic New Touch Keyboard + c315 Classic Keyboard 200 c316 HID-Compliant Keyboard c317 Wave Corded Keyboard c318 Illuminated Keyboard c31a Comfort Wave 450 c31b Compact Keyboard K300 c31c Keyboard K120 for Business + c31d Media Keyboard K200 c401 TrackMan Marble Wheel c402 Marble Mouse (2-button) c403 Turbo TrackMan Marble FX @@ -2486,9 +2548,10 @@ c521 Cordless Mouse Receiver c525 MX Revolution Cordless Mouse c526 Nano Receiver - c529 diNovo Keyboard for notebooks + c529 Logitech Keyboard + Mice c52b Unifying Receiver - c52f Wireless Mouse M305 + c52f Unifying Receiver + c532 Unifying Receiver c623 3Dconnexion Space Traveller 3D Mouse c625 3Dconnexion Space Pilot 3D Mouse c626 3Dconnexion Space Navigator 3D Mouse @@ -2629,6 +2692,7 @@ 2088 MCE IR Receiver with ALS- Spinel plus for ASUS 209e PTA01 Wireless Adapter 20b6 GoGear Vibe + 20d0 SPZ2000 Webcam [PixArt PAC7332] 20e3 GoGear Raga 262c SPC230NC Webcam 485d Senselock SenseIV v2.x @@ -2740,6 +2804,7 @@ 2030 PilotBoard Wireless 2034 SlimBlade Media Notebook Set 2041 SlimBlade Trackball + 2048 Orbit Trackball with Scroll Ring 4003 Gravis Xterminator Digital Gamepad 4005 Gravis Eliminator GamePad Pro 4006 Gravis Eliminator AfterShock @@ -2760,6 +2825,7 @@ 0411 Savi Office Base Station 0ca1 USB DSP v4 Audio Interface 4254 BUA-100 Bluetooth Adapter + ac01 Savi 7xx ad01 GameCom 777 5.1 Headset 0480 Toshiba America Info. Systems, Inc. 0001 InTouch Module @@ -2779,12 +2845,12 @@ 0108 Digital Camera Device 0203 AH-K3001V 0204 iBurst Terminal -0483 SGS Thomson Microelectronics +0483 STMicroelectronics 0137 BeWAN ADSL USB ST (blue or green) 0138 Unicorn II (ST70138B + MTC-20174TQ chipset) 1307 Cytronix 6in1 Card Reader 163d Cool Icam Digi-MP3 - 2015 TouchChip® Fingerprint Reader + 2015 TouchChipÂ® Fingerprint Reader 2016 Fingerprint Reader 2017 Biometric Smart Card Reader 2018 BioSimKey @@ -2798,6 +2864,7 @@ 5001 ST Micro Bluetooth Device 5710 Joystick in FS Mode 5721 Hantek DDS-3X25 Arbitrary Waveform Generator + 5740 STM32F407 7270 ST Micro Serial Bridge 7554 56k SoftModem df11 STM Device in DFU Mode @@ -2822,8 +2889,10 @@ 048a S-MOS Systems, Inc. 048c Alps Electric Ireland, Ltd 048d Integrated Technology Express, Inc. + 1165 IT1165 Flash Controller 1336 SD/MMC Cardreader 1345 Multi Cardreader + 9006 IT9135 BDA Afatech DVB-T HDTV Dongle 9009 Zolid HD DVD Maker 9135 Zolid Mini DVB-T Stick 048f Eicon Tech. @@ -3314,6 +3383,8 @@ 26b0 MF4600 series 26b4 MF4010 series 26b5 MF4200 series + 26da LBP3010B printer + 26e6 iR1024 2737 MF4410 3041 PowerShot S10 3042 CanoScan FS4000US Film Scanner @@ -3365,7 +3436,7 @@ 3078 ZR70MC Digital Camcorder 307a MV650i (normal mode) 307b MV630i Digital Video Camera - 307c MV630i (normal mode) + 307c CP-200 307d CP-300 307f Optura 20 3080 MVX150i (normal mode) / Optura 20 (normal mode) @@ -3417,6 +3488,7 @@ 30f0 PowerShot S2 IS (PTP mode) 30f2 Digital IXUS 700 (normal mode) / Digital IXUS 700 (PTP mode) / IXY Digital 600 (normal mode) / PowerShot SD500 (normal mode) / PowerShot SD500 (PTP mode) 30f4 PowerShot SD30 / Ixus iZoom / IXY DIGITAL L3 + 30f5 SELPHY CP500 30f6 SELPHY CP400 30f8 Powershot A430 30f9 PowerShot A410 (PTP mode) @@ -3433,24 +3505,40 @@ 3117 PowerShot A700 3119 PowerShot SD700 IS / Digital IXUS 800 IS / IXY Digital 800 IS 311b PowerShot A540 + 3127 SELPHY CP710 + 3128 SELPHY CP510 312d Elura 100 3138 PowerShot A710 IS + 3141 SELPHY ES1 + 3142 SELPHY CP730 + 3143 SELPHY CP720 + 3145 EOS 450D 3147 EOS 1Ds Mark III 314f Powershot SD1000 3155 PowerShot A450 315a PowerShot G9 315d PowerShot A720 3160 Digital IXUS 860 IS + 3170 SELPHY CP750 + 3171 SELPHY CP740 3175 IXY Digital 25 IS 3176 PowerShot A590 - 317a Powershot A470 + 317a PC1267 [Powershot A470] 3184 Digital IXUS 80 IS (PTP mode) + 3185 SELPHY ES2 + 3186 SELPHY ES20 3192 PowerShot SX110 IS 319a EOS 7D + 31aa SELPHY CP770 + 31ab SELPHY CP760 31ad PowerShot E1 + 31af SELPHY ES3 + 31b0 SELPHY ES30 + 31b1 SELPHY CP530 31bc PowerShot D10 31bf PowerShot A480 31c0 PowerShot SX200 IS + 31dd SELPHY CP780 31e5 Digital IXUS 200 IS 31ee SELPHY ES40 31ef PowerShot A495 @@ -3463,6 +3551,7 @@ 31f7 Powershot SD4000 IS / IXUS 300 HS / IXY 30S 31f8 Powershot SD4500 IS / IXUS 1000 HS / IXY 50S 31ff Digital IXUS 55 + 3209 Vixia HF S21 A 3210 Powershot SX30 IS 3211 PowerShot SX130 IS 3212 Powershot S95 @@ -3472,14 +3561,33 @@ 3224 PowerShot A3200 IS 3226 PowerShow A800 3228 PowerShot SX230 HS - 3229 IXUS 220 HS + 3229 PowerShot ELPH 300 HS / IXUS 220 HS 322a PowerShot A2200 322b Powershot A1200 + 3233 PowerShot G1 X + 3234 PowerShot SX150 IS + 3236 PowerShot S100 + 3237 PowerShot ELPH 310 HS / IXUS 230 HS 3238 PowerShot SX40 HS + 323b EOS Rebel T4i + 323e PowerShot A1300 323f PowerShot A810 + 3240 PowerShot ELPH 320 HS / IXUS 240 HS + 3241 PowerShot ELPH 110 HS / IXUS 125 HS 3243 PowerShot A4000 IS 3244 PowerShot SX260 HS 3245 PowerShot SX240 HS + 3247 PowerShot ELPH 520 HS / IXUS 500 HS + 3248 PowerShot A3400 IS + 3249 PowerShot A2400 IS + 324a PowerShot A2300 + 3255 SELPHY CP900 + 3256 SELPHY CP810 + 3258 PowerShot G15 + 3259 PowerShot SX50 HS + 325a PowerShot SX160 IS + 325b PowerShot S110 + 325c PowerShot SX500 IS 04aa DaeWoo Telecom, Ltd 04ab Chromatic Research 04ac Micro Audiometrics Corp. @@ -3550,6 +3658,7 @@ 0413 D40 (mass storage mode) 041e D60 digital camera (mass storage mode) 0422 D700 (ptp) + 0424 D3000 0425 D300S 042a D800 (ptp) 0f03 PD-10 Wireless Printer Adapter @@ -3580,6 +3689,7 @@ 4482 Serial Converter 4485 Serial Converter 4525 Double sided CRT + 4535 4610 Suremark Printer 4550 NVRAM (128 KB) 4554 Cash Drawer 4580 Hub w/ NVRAM @@ -3626,6 +3736,7 @@ f000 CY30700 Licorice evaluation board f111 CY8CKIT-002 PSoC MiniProg3 Rev A Program and debug kit f115 PSoC FirstTouch Programmer + fd13 Programmable power socket 04b5 ROHM LSI Systems USA, LLC 3064 Hantek DSO-3064 04b6 Hint Corp. @@ -3638,6 +3749,7 @@ 0005 Printer 0006 Printer 0007 Printer + 0015 Stylus Photo R3000 0101 GT-7000U [Perfection 636] 0102 GT-2200 0103 GT-6600U [Perfection 610] @@ -3688,7 +3800,7 @@ 0142 GT-F730 [GT-S630/Perfection V33/V330 Photo] 0143 GT-S55 0144 GT-S85 - 0202 Receipt Printer M129C + 0202 Receipt Printer M129C/TM-T70 0401 CP 800 Digital Camera 0402 PhotoPC 850z 0403 PhotoPC 3000z @@ -3732,37 +3844,81 @@ 0824 Storage Device 0825 MFP Composite Device 0826 Storage Device - 0827 Stylus Photo RX560/580/590 (PM-A820) - 0828 (PM-A970) - 0829 (PM-T990) - 082a (PM-A920) - 082b Stylus DX5050 + 0827 PM-A820 [Stylus Photo RX560/RX580/RX585/RX590] + 0828 PM-A970 + 0829 PM-T990 + 082a PM-A920 + 082b Stylus CX5900/CX5000/DX5000/DX5050 082c Storage Device 082d Storage Device - 082e 0x082e DX-60x0 MFP scanner - 082f Stylus DX4050 - 0830 Stylus CX2800/CX2900/ME200 - 0831 MFP Composite Device + 082e PX-A720 [Stylus CX5900/CX6000/DX6000] + 082f PX-A620 [Stylus CX3900/DX4000/DX4050] + 0830 ME 200 [Stylus CX2800/CX2900] + 0831 Stylus CX6900F/CX7000F/DX7000F 0832 MFP Composite Device - 0833 (LP-M5600) - 0834 MFP Composite Device + 0833 LP-M5600 + 0834 LP-M6000 0835 AcuLaser CX21 - 0836 MFP Composite Device - 0837 MFP Composite Device - 0838 CX7300/CX7400/DX7400 - 0839 CX8300/CX8400/DX8400 - 083a CX9300F/CX9400Fax/DX9400F + 0836 PM-T960 + 0837 PM-A940 [Stylus Photo RX680/RX685/RX690] + 0838 PX-A640 [CX7300/CX7400/DX7400] + 0839 PX-A740 [CX8300/CX8400/DX8400] + 083a PX-FA700 [CX9300F/CX9400Fax/DX9400F] 083b MFP Composite Device - 083c MFP Composite Device + 083c PM-A840S [Stylus Photo RX595/RX610] 083d MFP Composite Device 083e MFP Composite Device - 083f Stylus DX4450 + 083f Stylus CX4300/CX4400/CX5500/CX5600/DX4400/DX4450 + 0841 PX-401A [ME 300/Stylus NX100] + 0843 LP-M5000 + 0844 EP-901A/EP-901F [Artisan 800/Stylus Photo PX800FW] + 0846 EP-801A [Artisan 700/Stylus Photo PX700W/TX700W] + 0847 PX-601F [ME Office 700FW/Stylus Office BX600FW/TX600FW] + 0848 ME Office 600F/Stylus Office BX300F/TX300F 0849 Stylus SX205 - 084d Stylus SX115 + 084a PX-501A [Stylus NX400] + 084d PX-402A [Stylus SX115/Stylus NX110 Series] + 084f ME OFFICE 510 + 0850 EP-702A [Stylus Photo PX650/TX650 Series] 0851 Stylus SX410 - 0856 Stylus SX515W - 085c Stylus SX125 - 087b Stylus Photo PX730WD (Printer, Scanner, Copier) + 0852 EP-802A [Artisan 710 Series/Stylus Photo PX710W/TX720W Series] + 0853 EP-902A [Artisan 810 Series/Stylus Photo PX810FW Series] + 0854 ME OFFICE 650FN Series/Stylus Office BX310FN/TX520FN Series + 0855 PX-602F [Stylus Office BX610FW/TX620FW Series] + 0856 PX-502A [Stylus SX515W] + 085c ME 320/330 Series [Stylus SX125] + 085d PX-603F [ME OFFICE 960FWD Series/Stylus Office BX625FWD/TX620FWD Series] + 085e PX-503A [ME OFFICE 900WD Series/Stylus Office BX525WD] + 085f Stylus Office BX320FW/TX525FW Series + 0860 EP-903A/EP-903F [Artisan 835/Stylus Photo PX820FWD Series] + 0861 EP-803A/EP-803AW [Artisan 725/Stylus Photo PX720WD/TX720WD Series] + 0862 EP-703A [Stylus Photo PX660 Series] + 0863 ME OFFICE 620F Series/Stylus Office BX305F/BX305FW/TX320F + 0864 ME OFFICE 560W Series + 0865 ME OFFICE 520 Series + 0866 AcuLaser MX20DN/MX20DNF/MX21DNF + 0869 PX-1600F + 086a PX-673F [Stylus Office BX925FWD] + 0870 Stylus Office BX305FW Plus + 0871 K200 Series + 0872 K300 Series + 0873 L200 Series + 0878 EP-704A + 0879 EP-904A/EP-904F [Artisan 837/Stylus Photo PX830FWD Series] + 087b EP-804A/EP-804AR/EP-804AW [Stylus Photo PX730WD/Artisan 730 Series] + 087c PX-1700F + 087d PX-B750F + 087f PX-403A + 0880 PX-434A [Stylus NX330 Series] + 0881 PX-404A [ME OFFICE 535] + 0883 ME 340 Series/Stylus NX130 Series + 0884 Stylus NX430W Series + 0885 Stylus NX230 Series + 088f Stylus Office BX635FWD + 0890 ME OFFICE 940FW Series/Stylus Office BX630FW Series + 0891 Stylus Office BX535WD + 0892 Stylus Office BX935FWD + 0893 EP-774A 04b9 Rainbow Technologies, Inc. 0300 SafeNet USB SuperPro/UltraPro 1000 iKey 1000 Token @@ -3886,6 +4042,7 @@ 04ca Lite-On Technology Corp. 1766 HID Monitor Controls 9304 Hub + f01c TT1280DA DVB-T TV Tuner 04cb Fuji Photo Film Co., Ltd 0100 FinePix 30i/40i/50i, A101/201, 1300/2200, 1400/2400/2600/2800/4500/4700/4800/4900/6800/6900 Zoom 0103 FinePix NX-500/NX-700 printer @@ -3974,6 +4131,7 @@ 023e FinePix AX300 0240 FinePix S2950 Digital Camera 0241 FinePix S3200 Digital Camera + 0278 FinePix JV300 04cc ST-Ericsson 1122 Hub 1520 USB 2.0 Hub (Avocent KVM) @@ -4027,8 +4185,13 @@ 8000 In-Circuit Debugger 8001 ICD2 in-circuit debugger 8101 PIC24F Starter Kit + 8107 Microstick II 900a PICkit3 c001 PicoLCD 20x4 + f8da Hughski Ltd. ColorHug + faff Dangerous Prototypes BusPirate v4 Bootloader mode + fb00 Dangerous Prototypes BusPirate v4 + fbb2 GCUSB-nStep stepper motor controller fbba DiscFerret Magnetic Disc Analyser (bootloader mode) fbbb DiscFerret Magnetic Disc Analyser (active mode) fc92 Open Bench Logic Sniffer @@ -4043,6 +4206,8 @@ 1603 Keyboard 2013 Keyboard [Das Keyboard] 2221 Keyboard + 2323 Keyboard + 2832 1channel Telephone line recorder a055 Keyboard 04da Panasonic (Matsushita) 0901 LS-120 Camera @@ -4055,6 +4220,8 @@ 0d0d CDRCB03 0d0e DVD-ROM & CD-R/RW 0f40 Printer + 104d Elite Panaboard UB-T880 (HID) + 104e Elite Panaboard Pen Adaptor (HID) 1500 MFSUSB Driver 1800 DY-WL10 802.11abgn Adapter [Broadcom BCM4323] 1b00 MultiMediaCard @@ -4066,8 +4233,8 @@ 231a NV-GS11/230/250 (DV mode) 231d DVC Web Camera Device 231e DVC DV Stream Device - 2372 Lumix Camera - 2374 DMC-FZ18/FZ20 + 2372 Lumix Camera (Storage mode) + 2374 Lumix Camera (PTP mode) 2451 HDC-SD9 2497 HDC-TM700 250c Gobi Wireless Modem (QDL mode) @@ -4218,8 +4385,10 @@ 0100 Kingston Flash Drive (128MB) 0110 Connect3D Flash Drive 0111 Connect3D Flash Drive + 0300 E2530 Phone (Mass storage mode) 1003 MP3 Player and Recorder 1006 SDC-200Z + 130c NX100 1f06 HX-MU064DA portable harddisk 2018 WIS09ABGN LinkStick Wireless LAN Adapter 2035 Digital Photo Frame Mass Storage @@ -4261,6 +4430,10 @@ 3292 ML-1640 Series Laser Printer 3296 ML-2580N Mono Laser Printer 3297 ML-191x/ML-252x Laser Printer + 329f CLP-325 Color Laser Printer + 330c ML-1865 + 3310 ML-331x Series Laser Printer + 3315 ML-2540 Series Laser Printer 3409 SCX-4216F Scanner 340c SCX-5x15 series 340d SCX-6x20 series @@ -4277,6 +4450,7 @@ 341f Composite Device 3420 Composite Device 3426 SCX-4500 Laser Printer + 344f SCX-3400 Series 3605 InkJet Color Printer 3606 InkJet Color Printer 3609 InkJet Color Printer @@ -4369,6 +4543,7 @@ 663e D900e Phone 663f SGH-E720/SGH-E840 6640 Usb Modem Enumerator + 6651 i8510 Innov8 6702 X830 6708 U600 Phone 6709 U600 @@ -4383,8 +4558,11 @@ 6807 Composite HSPA device 681c Galaxy Portal/Spica/S 681d Galaxy Portal/Spica Android Phone + 6843 E2530 Phone (Samsung Kies mode) 684e Wave (GT-S8500) 685b GT-I9100 Phone [Galaxy S II] (mass storage mode) + 685c GT-I9250 Phone [Galaxy Nexus] + 685d GT-I9100 Phone [Galaxy S II] (Download mode) 685e GT-I9100 Phone [Galaxy S II] (USB Debugging mode) 6860 GT-I9100 Phone [Galaxy S II], GT-I9300 Phone [Galaxy S III], GT-P7500 [Galaxy Tab 10.1] 6865 GT-I9300 Phone [Galaxy S III] (PTP mode) @@ -4406,6 +4584,7 @@ e020 SERI E02 SCOM 6200 UMTS Phone e021 SERI E02 SCOM 6200 Virtual UARTs e022 SERI E02 SCOM 6200 Flash Load Disk + f000 Intensity 3 (Mass Storage Mode) ff30 SG_iMON 04e9 PC-Tel, Inc. 04ea Brooktree Corp. @@ -4432,12 +4611,14 @@ 0111 KU-9908 Keyboard 0112 KU-8933 Keyboard with PS/2 Mouse port 0116 KU-2971/KU-0325 Keyboard + 0200 KBR-0108 0201 Gaming Keyboard KPD0250 0220 Wireless HID Receiver 0402 Genius LuxeMate i200 Keyboard 0403 KU-0420 keyboard 0418 KU-0418 Tactical Pad 0760 Acer KU-0760 Keyboard + 0841 HP Multimedia Keyboard 0860 2.4G Multimedia Wireless Kit a001 E-Video DC-100 Camera a120 ORITE CCD Webcam(PC370R) @@ -4479,26 +4660,34 @@ b104 CNF7069 Webcam b107 CNF7070 Webcam b14c CNF8050 Webcam + b15c Sony Vaio Integrated Camera b175 4-Port Hub b1aa Webcam-101 b1b4 Lenovo Integrated Camera b1b9 Asus Integrated Webcam b1cf Lenovo Integrated Camera + b1d6 CNF9055 Toshiba Webcam + b213 Fujitsu Integrated Camera b217 Lenovo Integrated Camera (0.3MP) b221 integrated camera b230 Integrated HP HD Webcam b257 Lenovo Integrated Camera b26b Sony Visual Communication Camera b272 Lenovo EasyCamera + b2b0 Camera b2b9 Lenovo Integrated Camera UVC + b2ea Integrated Camera [ThinkPad] + b330 Asus 720p CMOS webcam 04f3 Elan Microelectronics Corp. + 0103 ActiveJet K-2024 Multimedia Keyboard 01a4 Wireless Keyboard - 0210 AM-400 Hama Optical Mouse + 0210 Optical Mouse 0212 Laser Mouse 0214 Lynx M9 Optical Mouse 0230 3D Optical Mouse 0232 Mouse 02f4 2.4G Cordless Mouse + 04a0 Dream Cheeky Stress/Panic Button 04f4 Harting Elektronik, Inc. 04f5 Fujitsu-ICL Systems, Inc. 04f6 Norand Corp. @@ -4543,6 +4732,7 @@ 002c Printer 002d Printer 0039 HL-5340 series + 0042 HL-2270DW Laser Printer 0100 MFC8600/9650 series 0101 MFC9600/9870 series 0102 MFC9750/1200 series @@ -4694,6 +4884,7 @@ 01eb MFC-7320 01f4 MFC-5890CN 0223 DCP-365CN + 0248 DCP-7055 scanner/printer 1000 Printer 1002 Printer 2002 PTUSB Printing @@ -4715,6 +4906,7 @@ 0015 ViewMate Desktop Mouse CC2201 00d3 00052486 / Laser Mouse M1052 [hama] 0171 SPCA1527A/SPCA1528 SD card camera (Mass Storage mode) + 0201 RS232C Adapter 0232 Fingerprint 0538 Wireless Optical Mouse 2.4G [Bright] 0561 Flexcam 100 @@ -4753,6 +4945,7 @@ 16e3 n30 Handheld Sync 3202 Liquid 3203 Liquid (Debug mode) + 3317 Liquid 3325 Iconia tablet A500 3341 Iconia tablet A500 d001 Divio NW801/DVC-V6+ Digital Camera @@ -4823,7 +5016,7 @@ 0307 USB 2.0 - 7 ports Hub [FSU307] 0409 F5U409 Serial 0551 F6C550-AVR UPS - 0706 2-N-1 USB 2.0 7-Port Hub (Lower half) + 0706 2-N-1 7-Port Hub (Lower half) 0802 Nostromo n40 Gamepad 0803 Nostromo 1745 GamePad 0805 Nostromo N50 GamePad @@ -4833,9 +5026,11 @@ 1004 F9L1004 802.11n Surf N300 XR Wireless Adapter [Realtek RTL8192CU] 1102 F7D1102 N150/Surf Micro Wireless Adapter v1000 [Realtek RTL8188CUS] 1103 F9L1103 N750 DB 802.11abgn 2x3:3 [Ralink RT3573] + 11f2 ISY Wireless Micro Adapter IWL 2000 [RTL8188CUS] 1202 F5U120-PC Parallel Printer Port 1203 F5U120-PC Serial Port 2103 F7D2102 802.11n N300 Micro Wireless Adapter v3000 [Realtek RTL8192CU] + 21f1 N300 WLAN N Adapter [ISY] 258a F5U258 Host to Host cable 3101 F1DF102U/F1DG102U Flip Hub 3201 F1DF102U/F1DG102U Flip KVM @@ -4850,7 +5045,7 @@ 705b Wireless G Adapter 705c F5D7050 Wireless G Adapter v4000 [Zydas ZD1211B] 705e F5D7050 Wireless G Adapter v5000 [Realtek RTL8187B] - 706a 2-N-1 USB 2.0 7-Port Hub (Lower half) + 706a 2-N-1 7-Port Hub (Upper half) 8053 F5D8053 N Wireless USB Adapter v1000/v4000 [Ralink RT2870] 805c F5D8053 N Wireless Adapter v3000 [Ralink RT2870] 805e F5D8053 N Wireless USB Adapter v5000 [Realtek RTL8192U] @@ -4865,7 +5060,7 @@ 935b F6D4050 N150 Enhanced Wireless Network Adapter v2000 [Ralink RT3070] 945a F7D1101 v1 Basic Wireless Adapter [Realtek RTL8188SU] 945b F7D1101 v2 Basic Wireless Adapter [Ralink RT3370] - d321 Dynex DX-NUSB 802.11bgn Wireless Adapter + d321 Dynex DX-NUSB 802.11bgn Wireless Adapter [Broadcom BCM43231] 050e Neon Technology, Inc. 050f KC Technology, Inc. 0001 Hub @@ -4877,6 +5072,7 @@ 1000 Keyboard with PS/2 Mouse Port e001 Mouse 0511 N'Able (DataBook) Technologies, Inc. + 002b AOC DVB 0512 Hualon Microelectronics Corp. 0513 digital-X, Inc. 0514 FCI Electronics @@ -4953,6 +5149,7 @@ 050c eToken Pro v4.1.5.x 0514 eToken Pro v4.2.5.4 0600 eToken Pro 64k (4.2) + 0620 Token JC 052a Crescent Heart Software 052b Tekom Technologies, Inc. 0102 Ca508A HP1020 Camera v.1.3.1.6 @@ -5069,7 +5266,7 @@ 002b Portable USB Harddrive V2 002c USB Floppy Disk Drive 002d MSAC-US1 MemoryStick Reader - 002e Sony HandyCam MemoryStick Reader + 002e HandyCam MemoryStick Reader 0030 Storage Adapter V2 (TPP) 0032 MemoryStick MSC-U01 Reader 0035 Network Walkman (E) @@ -5102,7 +5299,7 @@ 0085 Net MD 0086 Net MD 008b Micro Vault 64M Mass Storage - 0095 Sony Clie s360 + 0095 Clie s360 0099 Clie NR70 PDA Mass Storage 009a Clie NR70 PDA Serial 00ab Visual Communication Camera (PCGA-UVC10) @@ -5115,7 +5312,7 @@ 00c9 Net MD 00ca MZ-DN430 Minidisc Walkman 00cb MSAC-US20 Memory Stick Reader - 00da Sony Clie nx60 + 00da Clie nx60 00e8 Network Walkman (MS) 00e9 Handheld 00eb Net MD @@ -5166,7 +5363,7 @@ 01e9 Net MD 01ea Hi-MD WALKMAN 01ee IC RECORDER - 01fa Sony IC Recorder (P) + 01fa IC Recorder (P) 01fb NW-E405 Network Walkman 020f Device 0210 ATRAC HDD PA @@ -5211,19 +5408,22 @@ 0317 WALKMAN 031a Walkman NWD-B103F 031e PRS-300/PRS-505 eBook reader - 033e DSC-W120 + 0325 NWZ-A818 + 033e DSC-W120/W290 0346 Handycam DCR-SR55E 0348 HandyCam HDR-TG3E 035b Walkman NWZ-A828 035c NWZ-A726/A728/A729 0382 Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1) 0385 Walkman NWZ-E436F - 0387 Sony IC Recorder (P) + 0387 IC Recorder (P) 03bc Webbie HD - MHS-CM1 + 03d1 DPF-X95 03d3 DR-BT100CX 03d5 PlayStation Move motion controller 03fc WALKMAN [NWZ-E345] 03fd Walkman NWZ-E443 + 042f PlayStation Move navigation controller 0440 DSC-H55 0485 MHS-PM5 HD camcorder 04cb WALKMAN NWZ-E354 @@ -5246,7 +5446,7 @@ 0151 Digital Blue QX5 Microscope 0200 Dual-mode Camera0 0201 Dual-mode Camera1 - 0202 Aiptek PenCam 1 + 0202 STV0680 Camera 0674 Multi-mode Camera 0679 NMS Video Camera (Webcam) 1002 Che-ez! Splash @@ -5376,6 +5576,7 @@ 2801 MIC K/B Mouse 2802 Kbd Hub 3004 Genius KB-29E + 3107 Keyboard 0567 Xyratex International, Ltd 0568 Quartz Ingenierie 0569 SegaSoft @@ -5391,7 +5592,7 @@ 0014 Graphire 3 6x8 0015 Graphire 4 4x5 0016 Graphire 4 6x8 - 0017 Bamboo Fun 4x5 + 0017 CTE-450 [Bamboo Fun] 0018 Bamboo Fun 6x8 0019 Bamboo One Medium 0020 Intuos 4x5 @@ -5399,6 +5600,11 @@ 0022 Intuos 9x12 0023 Intuos 12x12 0024 Intuos 12x18 + 0026 Intuos5 touch S + 0027 Intuos5 touch M + 0028 Intuos5 touch L + 0029 Intuos5 S + 002a Intuos5 M 0030 PL400 0031 PL500 0032 PL600 @@ -5408,7 +5614,7 @@ 0037 PL700 0038 PL510 0039 DTU-710 - 003f Cintiq 21UX + 003f Cintiq 21UX (DTZ-2100) 0041 Intuos2 4x5 0042 Intuos2 6x8 0043 Intuos2 9x12 @@ -5442,9 +5648,14 @@ 00c5 Cintiq 20WSX 00c6 Cintiq 12WX 00c7 DTU-1931 + 00cc Cintiq 21UX (DTK-2100) 00d1 Bamboo Pen & Touch (CTH-460-DE) 00d3 Bamboo Fun (CTH-661) + 00d6 Bamboo Pen & Touch (CTH-460) 00db Bamboo Fun (CTH-661SE-NL) + 00dd Bamboo Pen (CTL-470) + 00f6 Cintiq 24HD touch (DTH-2400) touchscreen + 00f8 Cintiq 24HD touch (DTH-2400) tablet 0400 PenPartner 4x5 4850 PenPartner 6x8 056b Decicon, Inc. @@ -5493,6 +5704,7 @@ 262a tm5600 Video & Audio Grabber Capture 8390 WinFast PalmTop/Novo TV Video 8392 WinFast PalmTop/Novo TV Video + cafc CX861xx ROM Boot Loader cafe AccessRunner ADSL Modem cb00 ADSL Modem cb01 ADSL Modem @@ -5612,14 +5824,14 @@ 0580 Denron, Inc. 0581 Racal Data Group 0582 Roland Corp. - 0000 UA-100 + 0000 UA-100(G) 0002 UM-4/MPU-64 MIDI Interface 0003 SoundCanvas SC-8850 0004 U-8 - 0005 Edirol UM-2 MIDI Adapter + 0005 UM-2(C/EX) 0007 SoundCanvas SC-8820 0008 PC-300 - 0009 Edirol UM-1SX MIDI Adapter + 0009 UM-1(E/S/X) 000b SK-500 000c SC-D70 0010 EDIROL UA-5 @@ -5651,6 +5863,7 @@ 0030 VariOS 0033 EDIROL PCR 0034 EDIROL PCR + 0035 M-1000 0037 Digital Piano 0038 Digital Piano 003b BOSS GS-10 @@ -5690,6 +5903,8 @@ 007d EDIROL UA-101 0080 G-70 0081 G-70 + 0084 V-SYNTH XT + 0089 BOSS GT-PRO 008b EDIROL PC-50 008c EDIROL PC-50 008d EDIROL UA-101 USB1 @@ -5698,17 +5913,80 @@ 0096 EDIROL UA-1EX 009a EDIROL UM-3EX 009d EDIROL UM-1 + 00a0 MD-P1 00a2 Digital Piano 00a3 EDIROL UA-4FX 00a6 Juno-G + 00a9 MC-808 00ad SH-201 + 00b2 VG-99 + 00b3 VG-99 + 00b7 BK-7m/VIMA JM-5/8 + 00c2 SonicCell 00c4 EDIROL M-16DX + 00c5 SP-555 + 00c7 V-Synth GT + 00d1 Music Atelier + 00d3 M-380/400 + 00da BOSS GT-10 00db BOSS GT-10 Guitar Effects Processor - 00de Fantom-G7 + 00dc BOSS GT-10B + 00de Fantom G 00e6 EDIROL UA-25EX (Advanced mode) 00e7 EDIROL UA-25EX + 00e9 UA-1G + 00eb VS-100 + 00f6 GW-8/AX-Synth + 00f8 JUNO Series + 00fc VS-700C + 00fd VS-700 + 00fe VS-700 M1 + 00ff VS-700 M2 + 0100 VS-700 + 0101 VS-700 M2 + 0102 VB-99 + 0104 UM-1G + 0106 UM-2G + 0108 UM-3G + 0109 eBand JS-8 + 010d A-500S 010f A-PRO 0110 A-PRO + 0111 GAIA SH-01 + 0113 ME-25 + 0114 SD-50 + 0116 WAVE/MP3 RECORDER R-05 + 0117 VS-20 + 0119 OCTAPAD SPD-30 + 011c Lucina AX-09 + 011e BR-800 + 0120 OCTA-CAPTURE + 0121 OCTA-CAPTURE + 0123 JUNO-Gi + 0124 M-300 + 0127 GR-55 + 012a UM-ONE + 012b DUO-CAPTURE + 012f QUAD-CAPTURE + 0130 MICRO BR BR-80 + 0132 TRI-CAPTURE + 0134 V-Mixer + 0138 Boss RC-300 (Audio mode) + 0139 Boss RC-300 (Storage mode) + 013a JUPITER-80 + 013e R-26 + 0145 SPD-SX + 014b eBand JS-10 + 014d GT-100 + 0150 TD-15 + 0151 TD-11 + 0154 JUPITER-50 + 0156 A-Series + 0158 TD-30 + 0159 DUO-CAPTURE EX + 015b INTEGRA-7 + 015d R-88 + 0505 EDIROL UA-101 0583 Padix Co., Ltd (Rockfire) 0001 4 Axis 12 button +POV 0002 4 Axis 12 button +POV @@ -5827,6 +6105,7 @@ 0589 Victron 058a Nohau Corp. 058b Infineon Technologies + 001c Flash Drive 058c In Focus Systems 0007 Flash 0008 LP130 @@ -5847,6 +6126,7 @@ 001d Projector 001e Projector 001f Projector + ffe5 IN34 Projector 058d Micrel Semiconductor 058e Tripath Technology, Inc. 058f Alcor Micro Corp. @@ -5893,7 +6173,7 @@ 0590 Omron Corp. 0004 Cable Modem 000b MR56SVS - 0028 HJ-720IT Pedometer / Blood Pressure Monitor HEM-7080IT-E + 0028 HJ-720IT / HEM-7080IT-E / HEM-790IT 0591 Questra Consulting 0592 Powerware Corp. 0002 UPS (X-Slot) @@ -5924,6 +6204,7 @@ 0042 Rev 70 GB 0050 Zip CD 650 Writer 0053 CDRW55292EXT CD-RW External Drive + 0056 External CD-RW Drive Enclosure 0057 Mass Storage Device 005d Mass Storage Device 005f CDRW64892EXT3-C CD-RW 52x24x52x External Drive @@ -5947,9 +6228,11 @@ 017c HDD/1394B 0251 Optical 0252 Optical + 0278 LDHD-UPS [Professional Desktop Hard Drive eSATA / USB2.0] 027a LPHD250-U [Portable Hard Drive Silver Series 250 Go] 0470 Prestige Portable Hard Drive 047a Select Portable Hard Drive + 0571 Prestige Portable Hard Drive 0579 eGo Portable Hard Drive 1052 DVD+RW External Drive 059c A-Trend Technology Co., Ltd @@ -5971,6 +6254,7 @@ 1027 iamaKey V2 102a Rikiki Hard Drive 1049 rikiki Harddrive + 1052 P'9220 Mobile Drive a601 HardDrive a602 CD R/W 05a0 Vetronix Corp. @@ -5979,11 +6263,13 @@ 05a3 ARC International 8388 Marvell 88W8388 802.11a/b/g WLAN 05a4 Ortek Technology, Inc. + 1000 WKB-1000S Wireless Ergo Keyboard with Touchpad 2000 WKB-2000 Wireless Keyboard with Touchpad 9720 Keyboard Mouse 9722 Keyboard 9731 MCK-600W/MCK-800USB Keyboard 9783 Wireless Keypad + 9881 IR receiver [VRC-1100 Vista MCE Remote Control] 05a5 Sampo Technology Corp. 05a6 Cisco Systems, Inc. 0001 CVA124 Cable Voice Adapter (WDM) @@ -6076,23 +6362,28 @@ 0245 Internal Keyboard/Trackpad (ANSI) 0246 Internal Keyboard/Trackpad (ISO) 0247 Internal Keyboard/Trackpad (JIS) - 0250 MP110Z/B + 024a Internal Keyboard/Trackpad (MacBook Air) (ISO) + 024d Internal Keyboard/Trackpad (MacBook Air) (ISO) + 0250 Aluminium Keyboard (ISO) 0252 Internal Keyboard/Trackpad (ANSI) 0253 Internal Keyboard/Trackpad (ISO) 0254 Internal Keyboard/Trackpad (JIS) + 0263 Apple Internal Keyboard / Trackpad (MacBook Retina) 0301 USB Mouse [Mitsumi, M4848] 0302 Optical Mouse [Fujitsu] 0304 Optical USB Mouse [Mitsumi] 0306 Optical USB Mouse [Fujitsu] 030a Internal Trackpad 030b Internal Trackpad - 030e Wireless Trackpad [Magic Trackpad] + 030d Magic Mouse + 030e MC380Z/A [Magic Trackpad] 1000 Bluetooth HCI MacBookPro (HID mode) 1001 Keyboard Hub [ALPS] 1002 Extended Keyboard Hub [Mitsumi] 1003 Hub in Pro Keyboard [Mitsumi, A1048] 1006 Hub in Aluminum Keyboard 1101 Speakers + 1105 Audio in LED Cinema Display 1107 Thunderbolt Display Audio 1201 3G iPod 1202 iPod 2G @@ -6135,33 +6426,46 @@ 129f iPad 2 12a0 iPhone 4S 12a2 iPad 2 (3G; 64GB) + 12a6 iPad 3 (3G, 16 GB) + 12a9 iPad 2 + 12aa iPod Touch 5.Gen [A1421] 1300 iPod Shuffle 1301 iPod Shuffle 2.Gen 1302 iPod Shuffle 3.Gen 1303 iPod Shuffle 4.Gen 1401 Modem 1402 Ethernet Adapter [A1277] + 1500 SuperDrive [A1379] 8202 HCF V.90 Data/Fax Modem 8203 Bluetooth HCI - 8204 Bluetooth HCI [Bluetooth 2.0 + EDR, built-in] + 8204 Built-in Bluetooth 2.0+EDR HCI 8205 Bluetooth HCI 8206 Bluetooth HCI + 820a Bluetooth HID Keyboard + 820b Bluetooth HID Mouse 820f Bluetooth HCI - 8215 Bluetooth USB Host Controller + 8213 Bluetooth Host Controller + 8215 Built-in Bluetooth 2.0+EDR HCI 8216 Bluetooth USB Host Controller 8217 Bluetooth USB Host Controller 8218 Bluetooth Host Controller 821a Bluetooth Host Controller - 8240 IR Receiver [built-in] - 8241 IR Receiver [built-in] - 8242 IR Receiver [built-in] + 821f Built-in Bluetooth 2.0+EDR HCI + 8240 Built-in IR Receiver + 8241 Built-in IR Receiver + 8242 Built-in IR Receiver + 8286 Bluetooth Host Controller 8300 Built-in iSight (no firmware loaded) 8403 Internal Memory Card Reader + 8404 Internal Memory Card Reader 8501 Built-in iSight [Micron] 8502 Built-in iSight 8505 Built-in iSight 8507 Built-in iSight + 8508 iSight in LED Cinema Display 8509 FaceTime HD Camera + 850a FaceTime Camera + 8510 FaceTime HD Camera (Built-in) 911c Hub in A1082 [Cinema HD Display 23"] 912f Hub in 30" Cinema Display 9215 Studio Display 15" @@ -6171,6 +6475,7 @@ 921c A1082 [Cinema HD Display 23"] 921e Cinema Display 24" 9221 30" Cinema Display + 9226 LED Cinema Display 9227 Thunderbolt Display 9232 Cinema HD Display 30" ffff Bluetooth in DFU mode - Driver @@ -6226,6 +6531,7 @@ 9002 Gobi Wireless Modem 9008 Gobi Wireless Modem (QDL mode) 9018 Qualcomm HSUSB Device + 9025 Qualcomm HSUSB Device 9201 Gobi Wireless Modem (QDL mode) 9202 Gobi Wireless Modem 9203 Gobi Wireless Modem @@ -6524,9 +6830,11 @@ a731 JumpDrive FireFly a790 JumpDrive 2GB a811 16GB Gizmo! + a813 16gB flash thumb drive b002 USB CF Reader b018 Multi-Card Reader b047 SDHC Reader [RW047-7000] + c753 JumpDrive TwistTurn 05dd Delta Electronics, Inc. ff31 AWU-120 ff32 FriendlyNET AeroLAN AL2011 @@ -6549,6 +6857,7 @@ 0892 STK013 Camera 0895 STK016 Camera 0896 STK017 Camera + 2010 ARCTIC Sound P261 Headphones 05e2 ElecVision, Inc. 05e3 Genesys Logic, Inc. 000a Keyboard with PS/2 Port @@ -6570,7 +6879,7 @@ 0503 Webcam 0504 HID Keyboard Filter 0604 USB 1.1 Hub - 0605 USB 2.0 Hub [ednet] + 0605 USB 2.0 Hub 0606 USB 2.0 Hub / D-Link DUB-H4 USB 2.0 Hub 0607 Logitech G110 Hub 0608 USB-2.0 4-Port HUB @@ -6601,6 +6910,7 @@ 0723 GL827L SD/MMC/MS Flash Card Reader 0726 SD Card Reader 0727 microSD Reader/Writer + 0736 microSD Reader/Writer 0760 USB 2.0 Card Reader/Writer 0761 Genesys Mass Storage Device 0780 USBFS DFU Adapter @@ -6650,8 +6960,10 @@ 05f6 AOC International 05f7 RFC Distribution(s) PTE, Ltd 05f9 PSC Scanning, Inc. - 2206 Gryphon Barcode Scanner + 1104 Magellan 2200VS + 2206 Datalogic Gryphon GFS4170 2602 Datalogic Magellan 1100i Barcode Scanner + 5204 Datalogic Gryphon GFS4170 (config mode) 05fa Siemens Telecommunications Systems, Ltd 3301 Keyboard with PS/2 Mouse Port 3302 Keyboard @@ -6708,6 +7020,7 @@ 6001 SolidTek USB 2p HUB 6002 SolidTek USB Keyboard 6003 Japanese Keyboard - 600HM + 6231 Thermaltake eSPORTS Meka Keyboard 8007 P-W1G1F12 VER:1 [Macally MegaCam] a001 Maxwell Compact Pc PM3 060c EEH Datalink GmbH @@ -6753,6 +7066,8 @@ 0623 Littelfuse, Inc. 0624 Avocent Corp. 0294 Dell 03R874 KVM dongle + 0402 Cisco Virtual Keyboard and Mouse + 0403 Cisco Virtual Mass Storage 0625 TiMedia Technology Co., Ltd 0626 Nippon Systems Development Co., Ltd 0627 Adomax Technology Co., Ltd @@ -6836,14 +7151,17 @@ a102 Acer/Lenovo Webcam [CN0316] a103 Acer/HP Integrated Webcam [CN0314] a110 HP Webcam + a114 Lemote Webcam a136 Asus Integrated Webcam [CN031B] a219 1.3M WebCam (notebook emachines E730, Acer sub-brand) c107 HP webcam [dv6-1190en] d101 Acer CrystalEye Webcam e201 Lenovo Integrated Webcam e203 Lenovo Integrated Webcam + e258 HP TrueVision HD Integrated Webcam f102 Lenovo Integrated Webcam [R5U877] f103 Lenovo Integrated Webcam [R5U877] + f300 UVC 0.3M Webcam 064f WIBU-Systems AG 03e9 CmStick (article no. 1001) 03f2 CmStick/M (article no. 1010) @@ -6865,7 +7183,8 @@ 0658 Sigma Designs, Inc. 0659 Aethra 065a Optoelectronics Co., Ltd - 0001 Barcode scanner + 0001 Barcode scanner / NLV-1001 (keyboard mode) + 0009 NLV-1001 (serial mode) / OPN-2001 [Opticon] 065b Tracewell Systems 065e Silicon Graphics 065f Good Way Technology Co., Ltd & GWC technology Inc. @@ -7010,6 +7329,7 @@ 8230 MP3 Player 829c MP3 Player 82e0 MP3 Player + 8320 TrekStor i.Beat fun 835d MP3 Player 9000 MP3 Player 9001 MP3 Player @@ -7039,6 +7359,7 @@ 0001 PL2302 USB-USB Bridge 0307 Motorola Serial Adapter 04bb PL2303 Serial (IODATA USB-RSAQ2) + 0600 IDE Bridge 0610 Onext EG210U MODEM 0611 AlDiga AL-11U Quad-band GSM/GPRS/EDGE modem 2303 PL2303 Serial Port @@ -7050,9 +7371,11 @@ 2316 Flash Disk Security Device 2317 Mass Storage Device 2501 PL2501 USB-USB Bridge (USB 2.0) + 2506 Kaser 8gB micro hard drive 2507 PL2507 Hi-speed USB to IDE bridge controller 2515 Flash Disk Embedded Hub 2517 Flash Disk Mass Storage Device + 2528 Storage device (8gB thumb drive) 25a1 PL25A1 Host-Host Bridge 3400 Hi-Speed Flash Disk with TruePrint AES3400 3500 Hi-Speed Flash Disk with TruePrint AES3500 @@ -7192,6 +7515,7 @@ 069b Thomson, Inc. 0704 DCM245 Cable Modem 0705 THG540K Cable Modem + 0709 Lyra PDP2424 070c MP3 Player 070d MP3 Player 070e MP3 Player @@ -7243,9 +7567,14 @@ 075c X52 Flight Controller 0762 Saitek X52 Pro Flight Control System 0763 Pro Flight Rudder Pedals + 0764 Flight Pro Combat Rudder 0805 R440 Force Wheel + 0b4e Pro Flight Backlit Information Panel 0bac Pro Flight Yoke 0c2d Pro Flight Quadrant + 0d05 Pro Flight Radio Panel + 0d06 Flight Pro Multi Panel + 0d67 Pro Flight Switch Panel 1003 GM2 Action Pad 1009 Action Pad 100a SP550 Pad and Joystick Combo @@ -7268,6 +7597,7 @@ 806f P2000 Tilt Pad 80c0 Pro Gamer Command Unit 80c1 Cyborg Command Pad Unit + a2ae Pro Flight Instrument Panel a502 Gaming Mouse f518 P3200 Rumble Force Game Pad ff04 R440 Force Wheel @@ -7310,6 +7640,7 @@ 06bb EDA, Inc. 06bc Oki Data Corp. 000b Okipage 14ex Printer + 0027 Okipage 14e 0a91 B2500MFP (printer+scanner) 3801 B6100 Laser Printer 06bd AGFA-Gevaert NV @@ -7595,6 +7926,7 @@ 3004 Hercules Classic Silver 3005 Hercules Dualpix Exchange 3007 Hercules Dualpix Chat and Show + 3020 Hercules Webcam EC300 a300 Dual Analog Leader GamePad b000 Hercules DJ Console c000 Hercules Muse Pocket @@ -7667,7 +7999,11 @@ 0067 Flash Drive 0068 Flash Drive 0084 Flash Drive Mini + 043c Flash drive 16GB [Nano Pro] 0582 Revo Flash Drive + 0622 TDK Trans-It 4GB + 0624 TDK Trans-It 16GB + 1120 RDX External dock (redbud) d000 Disc Stakka CD/DVD Manager 0719 Tremon Enterprises Co., Ltd 071b Domain Technologies, Inc. @@ -7853,6 +8189,7 @@ 5001 Huey PRO Colorimeter d094 X-Rite DTP94 [Quato Silver Haze Pro] 0766 Jess-Link Products Co., Ltd + 001b Packard Bell Go 0204 TopSpeed Cyberlink Remote Control 0767 Tokheim Corp. 0768 Camtel Technology Corp. @@ -7936,12 +8273,15 @@ 5150 SDCZ2 Cruzer Mini Flash Drive (thin) 5151 Cruzer Micro Flash Drive 5153 Cruzer Flash Drive + 5204 Cruzer Crossfire 5402 U3 Cruzer Micro 5406 Cruzer Micro U3 5408 Cruzer Titanium U3 540e Cruzer Contour Flash Drive 5530 Cruzer 5567 Cruzer Blade + 5571 Cruzer Fit + 5580 SDCZ80 Flash Drive 5e10 Encrypted 6100 Ultra II SD Plus 2GB 7100 Cruzer Mini @@ -7997,6 +8337,7 @@ 9797 ImageMate MS-PRO 9919 Card Reader 9999 SDDR-99 5-in-1 Reader + a7c1 Storage device (SD card reader) a7e8 SDDR-113 MicroMate SDHC Reader b2b3 SDDR-103 MobileMate SD+ Reader b4b5 SDDR-89 V4 ImageMate 12-in-1 Reader @@ -8174,7 +8515,8 @@ 0413 OpticSlim 1200 Scanner 0601 OpticPro ST24 Scanner 0800 OpticPro ST48 Scanner - 0906 OpticBook 3600 Scanner + 0900 OpticBook 3600 Scanner + 090c OpticBook 3600 Plus Scanner 0a06 TVcam VD100 0b00 SmartPhoto F50 0c03 OpticPro ST64+ Scanner @@ -8182,6 +8524,9 @@ 0c0c PL806 Scanner 0c26 OpticBook 4600 Scanner 0c2b Mobile Office D428 Scanner + 0e08 Plustek OpticBook A300 Scanner + 1300 OpticBook 3800 Scanner + 1301 OpticBook 4800 Scanner 07b4 Olympus Optical Co., Ltd 0100 Camedia C-2100/C-3000 Ultra Zoom Camera 0102 Camedia E-10/C-220/C-50 Camera @@ -8191,7 +8536,7 @@ 0112 MAUSB-100 xD Card Reader 0113 Mju 500 0114 C-350Z Camera - 0118 Digital Camera + 0118 Mju Mini Digital/Mju Digital 500 Camera / Stylus 850 SW 0184 P-S100 port 0203 Digital Voice Recorder DW-90 0206 Digital Voice Recorder DS-330 @@ -8304,6 +8649,7 @@ b006 USB to PCMCIA b00a USB to CF+SD Drive(LC1) b00b USB to Memory Stick(LC1) + c010 Kingston FCR-HS2/ATA Card Reader 07c5 APG Cash Drawer 07c6 ShareWave, Inc. 0002 Bodega Wireless Access Point @@ -8320,11 +8666,13 @@ 0837 H837 Hybrid ATSC/QAM 1228 MPEG-2 Capture Device (M038) 1830 AVerTV Volar Video Capture (H830) + 3835 AVerTV Volar Green HD (A835B) 850a AverTV Volar Black HD (A850) 850b AverTV Red HD+ (A850T) a309 AVerTV DVB-T (A309) a801 AVerTV DVB-T (A800) a815 AVerTV DVB-T Volar X (A815) + a827 AVerTV Hybrid Volar HX (A827) a867 AVerTV DVB-T (A867) b800 MR800 FM Radio e880 MPEG-2 Capture Device (E880) @@ -8397,7 +8745,9 @@ 1004 Exilim EX-Z120 1011 USB-CASIO PC CAMERA 1116 EXILIM EX-Z19 + 1125 Exilim EX-H10 Digital Camera (mass storage mode) 1133 Exilim EX-Z350 Digital Camera (mass storage mode) + 1225 Exilim EX-H10 Digital Camera (PictBridge mode) 1233 Exilim EX-Z350 Digital Camera (PictBridge mode) 2002 E-125 Cassiopeia Pocket PC 3801 WMP-1 MP3-Watch @@ -8547,6 +8897,7 @@ 0810 Personal Communication Systems, Inc. 0001 Dual PSX Adaptor 0002 Dual PCS Adaptor + 0003 PlayStation Gamepad 0813 Mattel, Inc. 0001 Intel Play QX3 Microscope 0002 Dual Mode Camera Plus @@ -8625,6 +8976,8 @@ 012e KeikaiDenwa 8 with charger 039f KeikaiDenwa 8 0835 Action Star Enterprise Co., Ltd +0836 TrekStor + 2836 i.Beat mood 0839 Samsung Techwin Co., Ltd 0005 Digimax Camera 0008 Digimax 230 Camera @@ -8697,7 +9050,6 @@ 4220 WG111(v1) 54 Mbps Wireless [Intersil ISL3886] 4230 MA111(v2) 802.11b Wireless [SIS SIS 162] 4240 WG111(v1) rev 2 54 Mbps Wireless [Intersil ISL3887] - 4250 WG111T 802.11g Wireless Adapter [Atheros AR5523] 4260 WG111v3 54 Mbps Wireless [realtek RTL8187B] 4300 WG111U Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX] 4301 WG111U (no firmware) Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX] @@ -8832,13 +9184,15 @@ 087d Jaton Corp. 5704 Ethernet 087e Fujitsu Computer Products of America -087f Virtual IP Group, Inc. +087f QualCore Logic Inc. 0880 APT Technologies, Inc. 0883 Recording Industry Association of America (RIAA) 0885 Boca Research, Inc. 0886 XAC Automation Corp. 0630 Intel PC Camera CS630 0887 Hannstar Electronics Corp. +088a TechTools + 1002 DigiView DV3100 088b MassWorks, Inc. 4944 MassWorks ID-75 TouchScreen 088c Swecoin AB @@ -8854,7 +9208,16 @@ 089e NST Co., Ltd 089f Primex Aerospace Co. 08a5 e9, Inc. +08a6 Toshiba TEC + 0051 B-SV4 08a8 Andrea Electronics +08a9 CWAV Inc. + 0005 USBee ZX + 0009 USBee SX + 0012 USBee AX-Standard + 0013 USBee AX-Plus + 0014 USBee AX-Pro + 0015 USBee DX 08ae Macally (Mace Group, Inc.) 08b4 Sorenson Vision, Inc. 08b7 NATSU @@ -8862,8 +9225,10 @@ 08b8 J. Gordon Electronic Design, Inc. 01f4 USBSIMM1 08b9 RadioShack Corp. (Tandy) -08bb Texas Instruments Japan +08bb Texas Instruments 2702 Speakers + 2704 Audio Codec + 2706 PCM2706 Audio Codec 2900 PCM2900 Audio Codec 2901 PCM2901 Audio Codec 2902 PCM2902 Audio Codec @@ -8981,6 +9346,7 @@ 3437 GemPC Twin SmartCard Reader 3438 GemPC Key SmartCard Reader 3478 PinPad Smart Card Reader + 34ec Compact Smart Card Reader Writer 4433 GemPC433-Swap 5501 GemProx-PU Contactless Smart Card Reader ace0 UA HYBRID TOKEN @@ -9005,7 +9371,7 @@ 0014 TravelDrive 2C 0015 Kingston DataTraveler ELITE 0016 Kingston DataTraveler U3 - 0020 TravelDrive + 0020 TravelDrive Intuix U3 2GB 0021 TravelDrive 0022 TravelDrive 0023 TravelDrive @@ -9150,7 +9516,7 @@ 0373 Silicon Motion Camera 037a Silicon Motion Camera 037b Silicon Motion Camera - 1000 64MB QDI U2 DISK + 1000 Flash Drive 1132 5-in-1 Card Reader 337b Silicon Motion Camera 3710 Silicon Motion Camera @@ -9159,6 +9525,7 @@ 37c0 Silicon Motion Camera 6000 SD/SDHC Card Reader (SG365 / FlexiDrive XC+) 6200 microSD card reader + 71b3 SM731 Camera 837b Silicon Motion Camera 937b Silicon Motion Camera b370 Silicon Motion SM370 Camera @@ -9210,12 +9577,18 @@ 0200 Data Card Programmer (install) 1200 Data Card Programmer 21a5 etrex Cx (msc) + 2236 nuvi 360 2271 Edge 605/705 2295 Colorado 300 22b6 eTrex Vista HCx (Mass Storage mode) + 231b Oregon 400t 2353 NÃŒvi 205T + 2380 Oregon series + 23cc nÃŒvi 1350 + 2459 GPSmap 62/78 series 2519 eTrex 30 2535 Edge 800 + 255b Nuvi 2505LM 0920 Echelon Co. 7500 Network Interface 0921 GoHubs, Inc. @@ -9234,16 +9607,19 @@ 420f WorkCentre PE220 Series 421f M20 Scanner 423b Printing Support + 4274 Xerox Phaser 3635MFPX ffef WorkCenter M15 fffb DocuPrint M750 (X750_USB) 0925 Lakeview Research 0005 Gamtec.,Ltd SmartJoy PLUS Adapter + 3881 Saleae Logic 8101 Phidgets, Inc., 1-Motor PhidgetServo v2.0 8104 Phidgets, Inc., 4-Motor PhidgetServo v2.0 8800 WiseGroup Ltd, MP-8800 Quad Joypad 8866 WiseGroup Ltd, MP-8866 Dual Joypad 0927 Summus, Ltd -0928 Oxford Semiconductor, Ltd +0928 PLX Technology, Inc. (formerly Oxford Semiconductor, Ltd) + 8000 Firmware uploader 0929 American Biometric Co. 092a Toshiba Information & Industrial Sys. And Services 092b Sena Technologies, Inc. @@ -9338,7 +9714,7 @@ 1112 Veo Web Camera a311 Video Enhancement Device 0933 Quantum Corp. -0934 Netcom Systems +0934 Spirent Communications 0936 NuTesla 0030 Composite Device, Mass Storage Device (Flash Drive) amd HID 003c Rhythmedics HID Bootloader @@ -9416,23 +9792,34 @@ 1603 DataTraveler 1GB/2GB Pen Drive 1606 Eee PC 701 SD Card Reader [ENE UB6225] 1607 DataTraveler 100 + 160d DataTraveler Vault Privacy 1613 DataTraveler DT101C Flash Drive 1616 DataTraveler Locker 4GB - 1624 DataTraveler G2 4GB Pen Drive + 1621 DataTraveler 150 (32GB) + 1624 DataTraveler G2 1625 DataTraveler 101 II 162a DataTraveler 112 4GB Pen Drive + 162d DataTraveler 102 + 1630 DataTraveler 200 (32GB) 1642 DT101 G2 - 1643 DataTraveler G3 4GB + 1643 DataTraveler G3 1653 Data Traveler 100 G2 8 GiB + 1656 DataTraveler Ultimate G2 + 1689 DataTraveler SE9 + 168a DataTraveler Micro + 168c DT Elite 3.0 0954 RPM Systems Corp. 0955 NVidia Corp. + 7030 Tegra 3 (recovery mode) 7100 Notion Ink Adam 0956 BSquare Corp. 0957 Agilent Technologies, Inc. 0200 E-Video DC-350 Camera 0202 E-Video DC-350 Camera 0518 82357B GPIB Interface + 0a07 34411A Multimeter 1745 Test and Measurement Device (IVI) + 2918 U2702A oscilloscope 0958 CompuLink Research, Inc. 0959 Cologne Chip AG 2bd0 Intelligent ISDN (Ver. 3.60.04) @@ -9446,7 +9833,9 @@ 0204 WarpLink 802.11b Adapter 0968 Catalyst Enterprises, Inc. 096e Feitian Technologies, Inc. + 0120 Microcosm Ltd Dinkey 0802 ePass2000 (G&D STARCOS SPK 2.4) + 0807 ePass2003 0971 Gretag-Macbeth AG 2003 Eye-One display 2005 Huey @@ -9472,6 +9861,7 @@ 097f Barun Electronics Co., Ltd 0981 Oak Technology, Ltd 0984 Apricorn + 0040 SATA Wire (2.5") 0200 Hard Drive Storage (TPP) 0985 cab Produkttechnik GmbH & Co KG 0045 Mach4/200 Label Printer @@ -9565,8 +9955,10 @@ 002a Wireless Optical Mouse NB-30 022b Wireless Mouse (Battery Free) 024f RF Receiver and G6-20D Wireless Optical Mouse + 0260 KV-300H Isolation Keyboard 032b Wireless Mouse (Battery Free) 8090 X-718BK Oscar Optical Gaming Mouse + 9033 X-718BK Optical Mouse 9090 XL-750BK Laser Mouse 09db Measurement Computing Corp. 0075 MiniLab 1008 @@ -9613,6 +10005,8 @@ 09ff Gain Technology Corp. 0a00 Liquid Audio 0a01 ViA, Inc. +0a05 Unknown Manufacturer + 7211 hub 0a07 Ontrak Control Systems Inc. 0064 ADU100 Data Acquisition Interface 0078 ADU120 Data Acquisition Interface @@ -9787,7 +10181,7 @@ 2100 Bluetooth 2.0+eDR dongle 2101 BCM2045 Bluetooth 2102 ANYCOM Blue USB-200/250 - 2110 Bluetooth Controller + 2110 BCM2045B (BDC-2) [Bluetooth Controller] 2111 ANYCOM Blue USB-UHE 200/250 2120 2045 Bluetooth 2.0 USB-UHE Device with trace filter 2121 BCM2210 Bluetooth @@ -9795,11 +10189,14 @@ 2123 Bluetooth dongle 2130 2045 Bluetooth 2.0 USB-UHE Device with trace filter 2131 2045 Bluetooth 2.0 Device with trace filter - 2145 Bluetooth with Enhanced Data Rate II + 2145 BCM2045B (BDC-2.1) [Bluetooth Controller] 2148 BCM92046DG-CL1ROM Bluetooth 2.1 Adapter 2150 BCM2046 Bluetooth Device 2151 Bluetooth - 217f Bluetooth Controller + 2154 BCM92046DG-CL1ROM Bluetooth 2.1 UHE Dongle + 217d HP Bluethunder + 217f BCM2045B (BDC-2.1) + 2198 Bluetooth 3.0 Device 219b Bluetooth 2.1 Device 21b1 HP Bluetooth Module 21b4 BCM2070 Bluetooth 2.1 + EDR @@ -9808,6 +10205,12 @@ 21bb BCM2070 Bluetooth 2.1 + EDR 21bc BCM2070 Bluetooth 2.1 + EDR 21bd BCM2070 Bluetooth 2.1 + EDR + 21d7 BCM43142 Bluetooth 4.0 + 21e1 HP Portable SoftSailing + 21e3 HP Portable Valentine + 21e6 BCM20702 Bluetooth 4.0 [ThinkPad] + 21e8 BCM20702A0 Bluetooth 4.0 + 21f1 HP Portable Bumble Bee 22be BCM2070 Bluetooth 3.0 + HS 4500 BCM2046B1 USB 2.0 Hub (part of BCM2046 Bluetooth) 4502 Keyboard (Boot Interface Subclass) @@ -9819,6 +10222,7 @@ 6300 Pirelli Remote NDIS Device bd11 TiVo AG0100 802.11bg Wireless Adapter [Broadcom BCM4320] bd13 BCM4323 802.11abgn Wireless Adapter + bd17 BCM43236 802.11abgn Wireless Adapter d11b Eminent EM4045 [Broadcom 4320 USB] 0a5d Diatrend Corp. 0a5f Zebra @@ -9844,6 +10248,8 @@ 0a71 VIPColor Technologies USA, Inc. 0001 VP485 Printer 0a72 Sanwa Denshi +0a73 Mackie Designs + 0002 XD-2 [Spike] 0a7d NSTL, Inc. 0a7e Octagon Systems Corp. 0a80 Rexon Technology Corp., Ltd @@ -9853,6 +10259,7 @@ 0203 Mouse 0205 PS/2 Keyboard+Mouse Adapter 0701 USB Missile Launcher + ff01 Wireless Missile Launcher 0a82 Syscan 4600 TravelScan 460/464 0a83 NextComm, Inc. @@ -10128,6 +10535,12 @@ 179f Eee Note EA800 (tablet mode) 17a1 Eee Note EA800 (mass storage mode) 17ab USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU] + 4c80 Transformer Pad TF300TG + 4c90 Transformer Pad Infinity TF700 + 4c91 Transformer Pad Infinity TF700 (Debug mode) + 4d00 Transformer Prime TF201 + 4d01 Transformer Prime TF201 (debug mode) + 4daf Transformer Pad Infinity TF700 (Fastboot) 6101 Cable Modem 620a Remote NDIS Device b700 Broadcom Bluetooth 2.1 @@ -10143,6 +10556,7 @@ 0000 CenturyCD 0b0e GN Netcom 1022 Jabra PRO 9450, Type 9400BS (DECT Headset) + 620c Jabra BT620s 0b0f AVID Technology 0b10 Pcally 0b11 I Tech Solutions Co., Ltd @@ -10246,6 +10660,7 @@ 0b65 Expert Magnetics Corp. 0b69 CacheVision 0b6a Maxim Integrated Products + a132 WUP-005 [Nintendo Wii U Pro Controller] 0b6f Nagano Japan Radio Co., Ltd 0b70 PortalPlayer, Inc. 00ba iRiver H10 20GB @@ -10283,12 +10698,14 @@ 0b88 Sigma Koki Co., Ltd, Technology Center 0b89 Advanced Digital Broadcast, Ltd 0b8c SMART Technologies Inc. + 0001 Interactive Whiteboard Controller (SB6) (HID) 00c3 Sympodium ID350 0b95 ASIX Electronics Corp. 1720 10/100 Ethernet 1780 AX88178 7720 AX88772 772a AX88772A Fast Ethernet + 772b AX88772B 7e2b AX88772B 0b96 Sewon Telecom 0b97 O2 Micro, Inc. @@ -10515,7 +10932,7 @@ 0ca2 Desire HD (debug mode) 0ca5 Android Phone [Evo Shift 4G] 0ff8 Desire HD (Tethering Mode) - 0ff9 Desire / Desire HD / Hero (Charge Mode) + 0ff9 Desire / Desire HD / Hero / Thunderbolt (Charge Mode) 0ffe Desire HD (modem mode) 0fff Android Fastboot Bootloader 0bb5 Murata Manufacturing Co., Ltd @@ -10530,13 +10947,21 @@ 0bc0 Knilink Technology, Inc. 0bc1 Fuw Yng Electronics Co., Ltd 0bc2 Seagate RSS LLC + 0502 ST3300601CB-RK 300 GB External Hard Drive + 0503 ST3250824A [Barracuda 7200.9] 2000 Storage Adapter V3 (TPP) 2200 FreeAgent Go FW 2300 Expansion Portable + 2320 USB 3.0 bridge [Portable Expansion Drive] + 3320 SRD00F2 [Expansion Desktop Drive] 3332 Expansion 5021 FreeAgent GoFlex USB 2.0 5031 FreeAgent GoFlex USB 3.0 + 50a1 FreeAgent GoFlex Desk 50a5 FreeAgent GoFlex Desk USB 3.0 + 5121 FreeAgent GoFlex + 5161 FreeAgent GoFlex dock + a003 Backup Plus 0bc3 IPWireless, Inc. 0001 UMTS-TDD (TD-CDMA) modem 0bc4 Microcube Corp. @@ -10570,27 +10995,30 @@ 0106 Mass Storage Device 0107 Mass Storage Device 0108 Mass Storage Device - 0111 Card Reader + 0111 RTS5111 Card Reader Controller 0113 Mass Storage Device 0115 Mass Storage Device (Multicard Reader) - 0116 Mass Storage Device + 0116 RTS5116 Card Reader Controller 0117 Mass Storage Device 0118 Mass Storage Device - 0138 Card reader - 0139 Card reader + 0119 Storage Device (SD card reader) + 0129 RTS5129 Card Reader Controller + 0138 RTS5138 Card Reader Controller + 0139 RTS5139 Card Reader Controller 0151 Mass Storage Device (Multicard Reader) 0152 Mass Storage Device 0153 Mass Storage Device 0156 Mass Storage Device 0157 Mass Storage Device 0158 USB 2.0 multicard reader - 0159 Digital Media Card Reader + 0159 RTS5159 Card Reader Controller 0161 Mass Storage Device 0168 Mass Storage Device 0169 Mass Storage Device 0171 Mass Storage Device 0176 Mass Storage Device 0178 Mass Storage Device + 0184 RTS5182 Card Reader 0186 Card Reader 2831 RTL2831U DVB-T 2832 RTL2832U DVB-T @@ -10605,10 +11033,11 @@ 817f RTL8188RU 802.11n WLAN Adapter 8187 RTL8187 Wireless Adapter 8189 RTL8187B Wireless 802.11g 54Mbps Network Adapter - 8192 RTL8192U 802.11n Wireless Adapter + 8192 RTL8191SU 802.11n Wireless Adapter 8193 RTL8192DU 802.11an WLAN Adapter 8197 RTL8187B Wireless Adapter 8198 RTL8187B Wireless Adapter + 8199 RTL8187SU 802.11g WLAN Adapter 0bdb Ericsson Business Mobile Networks BV 1000 BV Bluetooth Device 1002 Bluetooth Device 1.2 @@ -10628,8 +11057,8 @@ 0be4 Elka International, Ltd 0be5 DOME imaging systems, Inc. 0be6 Dong Guan Humen Wonderful Wire Cable Factory -0bed Silicon Labs - 1100 MEI (TM) Cashflow-SC Bill/Voucher Acceptor +0bed MEI + 1100 CASHFLOW SC 1101 Series 2000 Combo Acceptor 0bee LTK Industries, Ltd 0bef Way2Call Communications @@ -10727,12 +11156,15 @@ 0018 USB-Serial Controller [Icom Inc. OPC-478UC] 0c27 RFIDeas, Inc 3bfa pcProx Card Reader -0c2e Metro +0c2e Metrologic Instruments 0007 Metrologic MS7120 Barcode Scanner (IBM SurePOS mode) 0200 Metrologic Scanner 0204 Metrologic MS7120 Barcode Scanner (keyboard mode) + 0206 Metrologic MS4980 Barcode Scanner 0700 Metrologic MS7120 Barcode Scanner (uni-directional serial mode) 0720 Metrologic MS7120 Barcode Scanner (bi-directional serial mode) + 0b61 Vuquest 3310g + 0b6a Vuquest 3310 Area-Imaging Scanner 0c35 Eagletron, Inc. 0c36 E Ink Corp. 0c37 e.Digital @@ -10750,6 +11182,7 @@ 41d9 i1 phone 0c45 Microdia 0011 EBUDDY + 1018 Compact Flash storage memory card reader 1020 Mass Storage Reader 1028 Mass Storage Reader 1030 Mass Storage Reader @@ -10876,8 +11309,10 @@ 6417 Integrated Webcam 641d 1.3 MPixel Integrated Webcam 6480 Sonix 1.3 MP Laptop Integrated Webcam + 648b Integrated Webcam 64bd Sony Visual Communication Camera 7402 TEMPerHUM Temperature & Humidity Sensor + 7403 Foot Switch 8000 DC31VC 8006 Dual Mode Camera (8006 VGA) 800a Vivitar Vivicam3350B @@ -10888,6 +11323,7 @@ 0c4b Reiner SCT Kartensysteme GmbH 0100 cyberJack e-com/pinpad 0300 cyberJack pinpad(a) + 0501 cyberJack RFID comfort dual interface smartcard reader 9102 cyberJack RFID basis contactless smartcard reader 0c4c Needham's Electronics 0021 EMP-21 Universal Programmer @@ -10963,10 +11399,13 @@ 0c65 Eminence Enterprise Co., Ltd 0c66 Rexon Electronics Corp. 0c67 Concept Telecom, Ltd +0c6a ACS + 0005 Color 320 x 240 LCD Display Terminal with Touchscreen 0c6c JETI Technische Instrumente GmbH 04b2 Specbos 1201 0c70 MCT Elektronikladen 0000 USB08 Development board + 0747 Eye Movement Recorder [Visagraph]/[ReadAlyzer] 0c72 PEAK System 000c PCAN-USB 000d PCAN Pro @@ -10980,6 +11419,7 @@ 0005 Transcend Flash disk 0006 Transcend JetFlash 0007 Mass Storage Device + 1600 Ion Quick Play LP turntable 1605 SSS Headphone Set 1607 audio controller 0c77 Sipix Group, Ltd @@ -11098,6 +11538,7 @@ 00a5 Cinergy Hybrid Stick 00a9 RTL2838 DVB-T COFDM Demodulator [TerraTec Cinergy T Stick Black] 00b3 NOXON DAB/DAB+ Stick + 10a7 TerraTec G3 0cd4 Bang Olufsen 0101 BeolinkPC2 0cd5 LabJack Corporation @@ -11134,7 +11575,7 @@ 0ce5 Validation Technologies International 0003 Matrix 0ce9 pico Technology - 1001 PicoScope3204 + 1001 PicoScope3000 series PC Oscilloscope 0cf1 e-Conn Electronic Co., Ltd 0cf2 ENE Technology, Inc. 6220 SD Card Reader (SG361) @@ -11151,10 +11592,11 @@ 1002 TP-Link TL-WN821N v2 802.11n [Atheros AR9170] 1006 TP-Link TL-WN322G v3 / TL-WN422G v2 802.11g [Atheros AR9271] 1010 3Com 3CRUSBN275 802.11abgn Wireless Adapter [Atheros AR9170] - 20ff Virtual CD-ROM + 20ff AR7010 (no firmware) 3000 AR3011 Bluetooth (no firmware) 3002 AR3011 Bluetooth 3005 AR3011 Bluetooth + 3008 Bluetooth (AR3011) 7015 TP-Link TL-WN821N v3 802.11n [Atheros AR7010+AR9287] 9170 AR9170 802.11n 9271 AR9271 802.11n @@ -11225,6 +11667,10 @@ 4000 mIDentity (mass storage) 4001 mIDentity Basic/Classic (composite device) 4081 mIDentity Basic/Classic (installationless) +0d48 Promethean Limited + 0001 ACTIVboard + 0004 ACTIVboard + 0100 Audio 0d49 Maxtor 3000 Drive 3010 3000LE Drive @@ -11235,6 +11681,7 @@ 5020 Mobile Hard Disk Drive 7000 OneTouch 7010 OneTouch + 7100 OneTouch II 300GB External Hard Disk 7410 Mobile Hard Disk Drive (1TB) 7450 Basics Portable USB Device 0d4a NF Corp. @@ -11450,6 +11897,7 @@ 1967 Bluetooth Dongle 3801 Motorola Bluetooth 2.1+EDR Device 4011 Medion Flash XL V2.0 Card Reader + 4023 Lexar Mobile Card Reader 4600 802.11b/g Turbo Wireless Adapter 5501 Mass Storage Device 5502 Mass Storage Device @@ -11563,6 +12011,10 @@ 0ddd Datelink Technology Co., Ltd 0dde Ubicom, Inc. 0de0 BD Consumer Healthcare +0de7 USBmicro + 0191 U401 Interface card + 01a5 U421 interface card + 01c3 U451 relay interface card 0dea UTECH Electronic (D.G.) Co., Ltd. 0ded Novasonics 0dee Lifetime Memory Products @@ -11644,6 +12096,7 @@ f80a Smoker FX2 0e16 JMTek, LLC 0e17 Walex Electronic, Ltd +0e1a Unisys 0e1b Crewave 0e20 Pegasus Technologies Ltd. 0101 NoteTaker @@ -11680,7 +12133,10 @@ 0010 Handyscope HS2 0011 TiePieSCOPE HS805 (br) 0012 TiePieSCOPE HS805 + 0013 Handyprobe HP3 + 0014 Handyprobe HP3 0018 Handyprobe HP2 + 001b Handyscope HS5 0042 TiePieSCOPE HS801 00fd USB To Parallel adapter 00fe USB To Parallel adapter @@ -11692,6 +12148,7 @@ 0e3b Mansella, Ltd 0e41 Line6, Inc. 4147 TonePort GX + 414d Pod HD500 4156 POD HD Desktop 4250 BassPODxt 4252 BassPODxt Pro @@ -11756,6 +12213,7 @@ 1332 5 IMT 1416 32 IT 1417 A43 IT + 150e 80 G9 0e7b On-Tech Industry Co., Ltd 0e7e Gmate, Inc. 0001 Yopy 3000 PDA @@ -11766,7 +12224,10 @@ 0e8d MediaTek Inc. 0003 MT6227 phone 0004 MT6227 phone + 0023 S103 + 1806 Samsung SE-208AB Slim Portable DVD Writer 1836 Samsung SE-S084 Super WriteMaster Slim External DVD writer + 3329 Qstarz BT-Q1000XT 0e8f GreenAsia Inc. 0003 MaxFire Blaze2 0012 USB Wireless 2.4GHz Gamepad @@ -11813,6 +12274,8 @@ 0eb2 Y-S Electronic Co., Ltd 0eb3 Saint Technology Corp. 0eb7 Endor AG +0eb8 Mettler Toledo + f000 PS60 Scale 0ebe VWeb Corp. 0ebf Omega Technology of Taiwan, Inc. 0ec0 LHI Technology (China) Co., Ltd @@ -11865,6 +12328,8 @@ 0ef7 SM Tech Co., Ltd (Tulip) 0efd Oasis Semiconductor 0efe Wem Technology, Inc. +0f03 Unitek UPS Systems + 0001 Alpha 1200Sx 0f06 Visual Frontier Enterprise Co., Ltd 0f08 CSL Wire & Plug (Shen Zhen) Co. 0f0c CAS Corp. @@ -12020,13 +12485,21 @@ 8001 Blackberry Handheld 8004 Blackberry Handheld 8007 Blackberry Handheld + 8010 Blackberry Playbook (Connect to Windows mode) + 8011 Blackberry Playbook (Connect to Mac mode) + 8020 Blackberry Playbook (CD-Rom mode) 0fce Sony Ericsson Mobile Communications AB 0076 W910i (Multimedia mode) 00af V640i Phone [PTP Camera] 00d4 C902 [MTP] 00d9 C702 Phone 0112 W995 Walkman Phone + 015a Xperia Pro [Media Transfer Protocol] 0166 Xperia Mini Pro + 0169 Xperia S + 0172 Xperia P + 0177 Xperia Ion [Mass Storage] + 0dde Xperia Mini Pro Bootloader 1010 WMC Modem 10af V640i Phone [PictBridge] 10d4 C902 Phone [PictBridge] @@ -12037,8 +12510,13 @@ 3137 Xperia X10 mini 3138 Xperia X10 mini pro 3149 Xperia X8 + 5177 Xperia Ion [Debug Mode] 614f Xperia X12 (debug mode) + 6166 Xperia Mini Pro + 715a Xperia Pro [Tethering] + 7177 Xperia Ion [Tethering] 8004 9000 Phone [Mass Storage] + adde Boot loader d008 V800-Vodafone 802SE Phone d016 K750i Phone d017 K608i Phone @@ -12054,11 +12532,13 @@ d065 W960i Phone (PC Suite) d076 W910i (Phone mode) d089 W580i Phone (mass storage) + d0a1 K810 d0af V640i Phone d0cf MD300 Mobile Broadband Modem d0d4 C902 Phone [Modem] d0e1 MD400 Mobile Broadband Modem d12e Xperia X10 + e000 K810 (PictBridge mode) e039 K800i (msc mode) e042 W810i Phone e043 V630i Phone [Mass Storage] @@ -12066,6 +12546,7 @@ e076 W910i (Mass storage) e089 W580i Phone e090 W200 Phone (Mass Storage) + e0a1 K810 (Mass Storage mode) e0a3 W660i e0af V640i Phone [Mass Storage] e0d4 C902 Phone [Mass Storage] @@ -12076,11 +12557,15 @@ e12e X10i Phone e133 Vivaz e14f Xperia Arc/X12 + e15a Xperia Pro [Mass Storage Class] e161 Xperia Ray + e166 Xperia Mini Pro + e167 XPERIA mini 0fcf Dynastream Innovations, Inc. 1003 ANT Development Board 1004 ANT2USB 1006 ANT Development Board + 1008 Mini stick Suunto 0fd0 Tulip Computers B.V. 0fd1 Giant Electronics Ltd. 0fd4 Tenovis GmbH & Co., KG @@ -12094,6 +12579,8 @@ 002c EyeTV DTT Deluxe v2 0033 Video Capture 0037 Video Capture v2 +0fda Quantec Networks GmbH + 0100 quanton flight control 0fdc Micro Plus 0fe0 Osterhout Design Group 0100 Bluetooth Mouse @@ -12130,13 +12617,14 @@ 0100 SD9/SD10 1004 LG Electronics, Inc. 1fae U8120 3G Cellphone - 6000 KU330/KU990/VX4400/VX6000 + 6000 Various Mobile Phones 6005 T5100 6018 GM360/GD510/GW520/KP501 618e Ally/Optimus One/Vortex (debug mode) 618f Ally/Optimus One 61c6 Vortex (msc) 61cc Optimus S + 61fc Optimus 3 6800 CDMA Modem 7000 LG LDP-7024D(LD)USB a400 Renoir (KC910) @@ -12265,15 +12753,16 @@ 1056 Hsin Chen Ent Co., Ltd 1057 ON Semiconductor 1058 Western Digital Technologies, Inc. - 0200 Firewire USB Combo + 0200 FireWire USB Combo 0400 External HDD 0500 hub 0702 Passport External HDD 0704 Passport External HDD 070a My Passport Essential SE 071a My Passport 1TB - 0740 My Passport 1TB + 0740 My Passport 0742 My Passport Essential SE + 0748 My Passport 1TB USB 3.0 0900 MyBook Essential External HDD 0901 MyBook External HDD 0903 My Book Premium Edition @@ -12285,7 +12774,9 @@ 1023 Elements SE 1103 My Book Studio 1104 MyBook Mirror Edition External HDD + 1105 My Book Studio II 1123 My Book 3.0 + 1140 My Book Essential USB3.0 1059 Giesecke & Devrient GmbH 000b StarSign Bio Token 3.0 105c Hong Ji Electric Wire & Cable (Dongguan) Co., Ltd @@ -12339,6 +12830,8 @@ 3702 Pantech PX-500 3714 PANTECH USB MODEM [UM175] 3716 UMW190 Modem + 3721 Option Beemo (GI0801) LTE surfstick + 3b14 Option Beemo (GI0801) LTE surfstick 3eb4 Packet Service Diagnostic Serial Port (WDM) 4101 Packet Service Diagnostic Serial Port (WDM) 4102 Packet Service @@ -12437,6 +12930,7 @@ 10c4 Cygnal Integrated Products, Inc. 0002 F32x USBXpress Device 0003 CommandIR + 8030 K4JRG Ham Radio devices 8044 USB Debug Adapter 804e Software Bisque Paramount ME 80a9 CP210x to UART Bridge Controller @@ -12450,8 +12944,11 @@ 8460 Sangoma Wanpipe VoiceTime 8461 Sangoma U100 8477 Balluff RFID Reader + 8605 dilitronics ESoLUX solar lighting controller 86bc C8051F34x AudioDelay [AD-340] 8789 C8051F34x Extender & EDID MGR [EMX-DVI] + 87be C8051F34x HDMI Audio Extractor [EMX-HD-AUD] + 8863 C8051F34x Bootloader ea60 CP210x UART Bridge / myAVR mySmartUSB light ea61 CP210x UART Bridge ea70 CP210x UART Bridge @@ -12500,6 +12997,7 @@ 10f1 Importek 1a08 Internal Webcam 1a1e Laptop Integrated Webcam 1.3M + 1a2a Laptop Integrated Webcam 10f5 Turtle Beach 0200 Audio Advantage Roadie 10fb Pictos Technologies, Inc. @@ -12508,6 +13006,8 @@ 804d Typhoon Webshot II Webcam [zc0301] 8050 FlyCAM-USB 300 XP2 de00 WinFast WalkieTV WDM Capture Driver. +10fe Thrane & Thrane + 000c TT-3750 BGAN-XL Radio Module 1100 VirTouch, Ltd 0001 VTPlayer VTP-1 Braille Mouse 1101 EasyPass Industrial Co., Ltd @@ -12549,9 +13049,11 @@ 112f Cellon International, Inc. 1130 Tenx Technology, Inc. 0002 iBuddy + 0202 Rocket Launcher 6604 MCE IR-Receiver 660c Foot Pedal/Thermometer 6806 Keychain photo frame + c301 Digital Photo viewer [Wallet Pix] f211 TP6911 Audio Headset 1131 Integrated System Solution Corp. 1001 KY-BT100 Bluetooth Adapter @@ -12645,6 +13147,7 @@ 6832 MC8780 Device 6833 MC8781 Device 683a MC8785 Device + 683c MC8790 Device 6850 AirCard 880 Device 6851 AirCard 881 Device 6852 AirCard 880E Device @@ -12655,6 +13158,7 @@ 6871 MC8781 Device 6893 MC8777 Device 68a3 MC8700 Modem + 68aa 4G LTE adapter 9000 Gobi 2000 Wireless Modem (QDL mode) 9001 Gobi 2000 Wireless Modem 9002 Gobi 2000 Wireless Modem @@ -12677,6 +13181,8 @@ 11aa GlobalMedia Group, LLC 1518 iREZ K2 11ab Exito Electronics Co., Ltd +11ac Nike + 6565 FuelBand 11b0 ATECH FLASH TECHNOLOGY 11c5 Inmax 0521 IMT-0521 Smartcard Reader @@ -12717,13 +13223,16 @@ 5677 FUSB200 mp3 player 1234 Brain Actuated Technologies 0000 Neural Impulse Actuator Prototype 1.0 [NIA] + 4321 Human Interface Device ed02 Emotiv EPOC Developer Headset Wireless Dongle 1235 Novation EMS 0001 ReMOTE Audio/XStation 0002 Speedio 0003 ReMOTE ZeRO SL 4661 ReMOTE25 + 8006 Focusrite Scarlett 2i2 1241 Belkin + 0504 Wireless Trackball Keyboard 1111 Mouse 1122 Typhoon Stream Optical Mouse USB+PS/2 1155 PS2/USB Browser Combo Mouse @@ -12731,6 +13240,7 @@ 1177 F8E842-DL Mouse 1503 Keyboard 1603 Keyboard + f767 Keyboard 124a AirVast 168b PRISM3 WLAN Adapter 4017 PC-Chips 802.11b Adapter @@ -12746,8 +13256,10 @@ 312a Superior S102 312b Superior S102 Pro a91a Portable HDD CH91 + c08a C008 Flash Drive c81a Flash drive c93a 4GB Pen Drive + c96a C906 Flash Drive 1260 Standard Microsystems Corp. ee22 SMC2862W-G v3 EZ Connect 802.11g Adapter [Intersil ISL3887] 1264 Covidien Energy-based Devices @@ -12763,6 +13275,7 @@ 126d Bel Stewart 126e Strobe Data, Inc. 126f TwinMOS + 0163 Storage device (2gB thumb drive) 1325 Mobile Disk 2168 Mobile Disk III a006 G240 802.11bg @@ -12802,7 +13315,7 @@ 1286 Marvell Semiconductor, Inc. 1fab 88W8338 [Libertas] 802.11g 2001 88W8388 802.11a/b/g WLAN - 2006 88W8360 802.11n WLAN + 2006 88W8362 802.11n WLAN 8001 BLOB boot loader firmware 1291 Qualcomm Flarion Technologies, Inc. / Leadtek Research, Inc. 0010 FDM 2xxx Flash-OFDM modem @@ -12822,7 +13335,9 @@ 12a7 Trendchip Technologies Corp. 12ab Honey Bee Electronic International Ltd. 12b8 Zhejiang Xinya Electronic Technology Co., Ltd. +12b9 E28 12ba Licensed by Sony Computer Entertainment America + 00ff Rocksmith Guitar Adapter 0100 RedOctane Guitar for PlayStation(R)3 0120 RedOctane Drum Kit for PlayStation(R)3 0200 Harmonix Guitar for PlayStation(R)3 @@ -12836,13 +13351,20 @@ 1004 E220 (bis) 1009 U120 1010 ETS2252+ CDMA Fixed Wireless Terminal + 1021 U8520 1035 U8120 1037 Ideos 1038 Ideos (debug mode) 1039 Ideos (tethering mode) 1406 E1750 140b EC1260 Wireless Data Modem HSD USB Card + 140c E180v + 1412 EC168c + 1436 E173 3G Modem (modem-mode) 1446 E1552/E1800/E173 (HSPA modem) + 1465 K3765 HSPA + 14c3 K5005 Vodafone LTE/UMTS/GSM Modem/Networkcard + 14c8 K5005 Vodafone LTE/UMTS/GSM MOdem/Networkcard 14c9 K3770 3G Modem 14d1 K3770 3G Modem (Mass Storage Mode) 14f1 Gobi 3000 HSPA+ Modem @@ -12877,6 +13399,7 @@ 1307 Transcend Information, Inc. 0163 256MB/512MB/1GB Flash Drive 0165 2GB/4GB Flash Drive + 0190 Ut190 8 GB Flash Drive with MicroSD reader 0310 SD/MicroSD CardReader [hama] 0330 63-in-1 Multi-Card Reader/Writer 0361 CR-75: 51-in-1 Card Reader/Writer [Sakar] @@ -12888,6 +13411,8 @@ 1310 Roper 0001 Class 1 Bluetooth Dongle 1312 ICS Electronics +1313 ThorLabs + 8070 PM100D 131d Natural Point 0155 TrackIR 3 Pro Head Tracker 0156 TrackIR 4 Pro Head Tracker @@ -12932,6 +13457,7 @@ 0304 EasiDock Ethernet 1345 Sino Lite Technology Corp. 001c Xbox Controller Hub + 6006 Defender Wireless Controller 1347 Moravian Instruments 0400 G2CCD USB 1.1 obsolete 0401 G2CCD-S with Sony ICX285 CCD @@ -12976,6 +13502,7 @@ 4251 WG111T (no firmware) 5f00 WPN111 RangeMax(TM) Wireless USB 2.0 Adapter 5f01 WPN111 (no firmware) + 5f02 WPN111 (no firmware) 6e00 WPNT121 802.11g 240Mbps Wireless Adapter [Airgo AGN300] 138a Validity Sensors, Inc. 0001 VFS101 Fingerprint Reader @@ -12983,6 +13510,7 @@ 0007 VFS451 Fingerprint Reader 0008 VFS300 Fingerprint Reader 0011 VFS5011 Fingerprint Reader + 0018 Fingerprint scanner 003c VFS471 Fingerprint Reader 138e Jungo LTD 9000 Raisonance S.A. STM32 ARM evaluation board @@ -13017,6 +13545,7 @@ 0024 WUSBF54G v1.1 802.11bg 0026 WUSB54GSC v1 802.11g Adapter [Broadcom 4320 USB] 0028 WUSB200 802.11g Adapter [Ralink RT2671] + 0029 WUSB300N 802.11bgn Wireless Adapter [Marvell 88W8362+88W8060] 002f AE1000 v1 802.11n [Ralink RT3572] 0031 AM10 v1 802.11n [Ralink RT3072] 0039 AE1200 802.11bgn Wireless Adapter [Broadcom BCM43235] @@ -13025,8 +13554,10 @@ 13b2 Alesis 0030 Multimix 8 13b3 Nippon Dics Co., Ltd. -13ba Unknown +13ba PCPlay + 0001 KÃ¶nig Electronic CMP-KEYPAD12 Numeric Keypad 0017 PS/2 Keyboard+Mouse Adapter + 0018 Barcode PCP-BCG4209 13be Ricoh Printing Systems, Ltd. 13ca JyeTai Precision Industrial Co., Ltd. 13cf Wisair Ltd. @@ -13076,13 +13607,18 @@ 3274 DVB-T Dongle [RTL2832U] 3282 DVB-T + GPS Minicard [RTL2832U] 3284 Wireless LAN USB Mini-Card + 3304 Asus Integrated Bluetooth module [AR3011] 3306 Mediao 802.11n WLAN [Realtek RTL8191SU] 3315 Bluetooth module + 3375 Atheros AR3012 Bluetooth 4.0 Adapter 5070 Webcam 5111 Integrated Webcam 5115 Integrated Webcam 5116 Integrated Webcam + 5126 PC Cam 5702 UVC VGA Webcam + 5710 UVC VGA Webcam + 5716 UVC VGA Webcam 7020 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) 7022 DTV-DVB UDST7022BDA DVB-S Box(Without HID) 13dc ALEREON, INC. @@ -13099,20 +13635,26 @@ 13ee MosArt 0003 Optical Mouse 13fd Initio Corporation + 0840 INIC-1618L SATA 0841 Samsung SE-T084M DVD-RW 1340 Hi-Speed USB to SATA Bridge 160f RocketFish SATA Bridge [INIC-1611] - 1640 ASUS SDRW-08D1S-U DVD-RW - 1840 Shintaro SH23SDOCK Hard Drive Docker [INIC-1608L] + 1640 INIC-1610L SATA Bridge + 1840 INIC-1608 SATA bridge 13fe Kingston Technology Company Inc. 1a00 512MB/1GB Flash Drive 1a23 512MB Flash Drive 1d00 DataTraveler 2.0 1GB/4GB Flash Drive / Patriot Xporter 4GB Flash Drive 1e00 Flash Drive 2 GB [ICIDU 2 GB] + 1e50 U3 Smart Drive 1f00 DataTraveler 2.0 4GB Flash Drive / Patriot Xporter 32GB (PEF32GUSB) Flash Drive + 1f23 2Gb 2240 microSD card reader 3100 2/4 GB stick + 3123 Verbatim STORE N GO 4GB 3800 Rage XT Flash Drive + 3e00 Flash Drive + 5100 Flash Drive 1400 Axxion Group Corp. 1402 Bowe Bell & Howell 1403 Sitronix @@ -13133,8 +13675,10 @@ 2420 Expedite EU850D/EU860D/EU870D 4100 U727 4400 Ovation MC930D/MC950D + 9010 Expedite E362 a001 Gobi Wireless Modem a008 Gobi Wireless Modem (QDL mode) + b001 Ovation MC551 1415 Nam Tai E&E Products Ltd. or OmniVision Technologies, Inc. 0000 Sony SingStar USBMIC 0020 Sony Wireless SingStar @@ -13148,6 +13692,7 @@ 142b Arbiter Systems, Inc. 03a5 933A Portable Power Sentinel 1430 RedOctane + 0150 wireless receiver for skylanders wii 4734 Guitar Hero4 hub 474b Guitar Hero MIDI interface 1431 Pertech Resources, Inc. @@ -13162,7 +13707,9 @@ 1436 Denali Software, Inc. 143c Altek Corporation 1443 Digilent - 0007 CoolRunner-II CPLD Starter Kit + 0007 Development board JTAG +1446 X.J.GROUP + 6a73 Stamps.com Model 510 5LB Scale 1453 Radio Shack 4026 26-183 Serial Cable 1456 Extending Wire & Cable Co., Ltd. @@ -13183,6 +13730,7 @@ 015a WB-8300X 2MP Webcam 0161 15901 802.11bg Wireless Adapter [Realtek RTL8187L] 0167 Widescreen 3MP Webcam + 0176 Isla Keyboard 1460 Tatung Co. 9150 eHome Infrared Transceiver 1461 Staccato Communications @@ -13204,7 +13752,9 @@ 147e Upek 1000 Biometric Touchchip/Touchstrip Fingerprint Sensor 1001 TCS5B Fingerprint sensor + 1002 Biometric Touchchip/Touchstrip Fingerprint Sensor 2016 Biometric Touchchip/Touchstrip Fingerprint Sensor + 2020 TouchChip Fingerprint Coprocessor (WBF advanced mode) 3000 TCS1C EIM/Cypress Fingerprint sensor 3001 TCS1C EIM/STM32 Fingerprint sensor 147f Hama GmbH & Co., KG @@ -13231,12 +13781,15 @@ 3072 RT3072 Wireless Adapter 3370 RT3370 Wireless Adapter 3572 RT3572 Wireless Adapter - 3573 TEW-684UB + 3573 RT3573 Wireless Adapter 5370 RT5370 Wireless Adapter + 5372 RT5372 Wireless Adapter + 5572 RT5572 Wireless Adapter 9020 RT2500USB Wireless Adapter 9021 RT2501USB Wireless Adapter 1491 Futronic Technology Co. Ltd. 0020 FS81 Fingerprint Scanner Module +1493 Suunto 1497 Panstrong Company Ltd. 1498 Microtek International Inc. a090 DVB-T Tuner @@ -13268,6 +13821,7 @@ 3c25 DrayTek Vigor N61 802.11bgn Wireless Adapter [Ralink RT2870] 3c27 Airlink101 AWLL6070 802.11bgn Wireless Adapter [Ralink RT2770] 3c28 Conceptronic C300RU v2 802.11bgn Wireless Adapter [Ralink RT2770] + 3c2b NEC NP02LM 802.11bgn Wireless Adapter [Ralink RT3072] 3c2c Keebox W150NU 802.11bgn Wireless Adapter [Ralink RT3070] 14c0 Rockwell Automation, Inc. 14c2 Gemlight Computer, Ltd @@ -13277,6 +13831,7 @@ 14cd Super Top 121c microSD card reader 123a SD/MMC/RS-MMC Card Reader + 125c SD card reader 127b SDXC Reader 6116 M6116 SATA Bridge 6600 USB 2.0 IDE DEVICE @@ -13295,6 +13850,7 @@ ab11 GU-1000T ab13 GW-US54Mini 802.11bg 14ed Shure Inc. + 29b6 X2u Adapter 14f7 TechniSat Digital GmbH 0001 SkyStar 2 HD CI 0002 SkyStar 2 HD CI @@ -13325,7 +13881,9 @@ 0201 YAP Phone 1529 UBIQUAM Co., Ltd. 3100 CDMA 1xRTT USB Modem (U-100/105/200/300/520) +152a Thesycon Systemsoftware & Consulting GmbH 152d JMicron Technology Corp. / JMicron USA Technology Corp. + 0539 JMS539 SuperSpeed SATA II 3.0G Bridge 2329 JM20329 SATA Bridge 2335 ATA/ATAPI Bridge 2336 Hard Disk Drive @@ -13341,22 +13899,32 @@ 0001 RZ01-020300 Optical Mouse [Diamondback] 0003 Krait Mouse 0007 DeathAdder Mouse + 0013 Orochi mouse 0016 DeathAdder Mouse - 0017 Imperator Mouse + 0017 RZ01-0035 Laser Gaming Mouse [Imperator] 001c RZ01-0036 Optical Gaming Mouse [Abyssus] + 0024 Razer Mamba + 0036 RZ01-0075, Gaming Mouse [Naga Hex] 0101 Copperhead Mouse 0102 Tarantula Keyboard 0109 Lycosa Keyboard + 0300 RZ06-0063 Motion Sensing Controllers [Hydra] 1546 U-Blox AG +1547 SG Intec Ltd & Co KG + 1000 SG-Lock[U2] 154a Celectronic GmbH 8180 CARD STAR/medic2 154b PNY 0010 USB 2.0 Flash Drive + 004d 8 GB Flash Drive + 0057 32GB Micro Slide Attache Flash Drive 6545 FD Device 154d ConnectCounty Holdings Berhad 154e D&M Holdings, Inc. (Denon/Marantz) 3000 Marantz RC9001 Remote Control +154f SNBC CO., Ltd 1554 Prolink Microsystems Corp. + 5010 PV-D231U(RN)-F [PixelView PlayTV SBTVD Full-Seg] 1557 OQO 0002 model 01 WiFi interface 0003 model 01 Bluetooth interface @@ -13372,10 +13940,16 @@ 3007 TEW-444UB EU (no firmware) 300a TEW-429UB 802.11bg 300b TEW-429UB 802.11bg + 300c TEW-429UF A1 802.11bg Wireless Adapter [ZyDAS ZD1211B] 300d TEW-429UB C1 802.11bg + 300e SMC SMCWUSB-N 802.11bgn 2x2:2 Wireless Adapter [Ralink RT2870] + 3012 TEW-604UB 802.11bg Wireless Adapter [Atheros AR5523] + 3013 TEW-645UB 802.11bgn 1x2:2 Wireless Adapter [Ralink RT2770] 3204 Allnet ALL0298 v2 802.11bg 3205 Allnet ALL0283 [AR5523] 3206 Allnet ALL0283 [AR5523](no firmware) + 3207 TEW-509UB A1 802.11abg Wireless Adapter [ZyDAS ZD1211] + 3208 TEW-509UB 1.1R 802.11abg Wireless Adapter 1582 Fiberline 6003 WL-430U 802.11bg 1587 SMA Technologie AG @@ -13384,6 +13958,7 @@ 0820 SmartPocket Class Device 1598 Kunshan Guoji Electronics Co., Ltd. 15a2 Freescale Semiconductor, Inc. + 003b USB2CAN Application for ColdFire DEMOJM board 0042 OSBDM - Debug Port 004f i.MX28 SystemOnChip in RecoveryMode 0052 i.MX50 SystemOnChip in RecoveryMode @@ -13396,6 +13971,7 @@ 9016 AF9015 DVB-T USB2.0 stick 15a8 Teams Power Limited 15a9 Gemtek + 0002 SparkLAN WL-682 802.11bg Wireless Adapter [Intersil ISL3887] 0004 WUBR-177G [Ralink RT2571W] 0006 Wireless 11n USB Adapter 0010 802.11n USB Wireless Card @@ -13406,6 +13982,7 @@ 0003 OpenOCD JTAG 0004 OpenOCD JTAG TINY 002a ARM-USB-TINY-H JTAG interface + 002b ARM-USB-OCD-H JTAG+RS232 15c0 XL Imaging 0001 2M pixel Microscope Camera 0002 3M pixel Microscope Camera @@ -13431,6 +14008,11 @@ 1001 DigistimSP (warm) 1002 DigimapSP USB (cold) 1003 DigimapSP USB (warm) + 1004 DigistimSP (cold) + 1005 DigistimSP (warm) + 1100 Odyssee (cold) + 1101 Odyssee (warm) + 1200 Digispy 15c8 KTF Technologies 3201 EVER EV-W100/EV-W250 15c9 D-Box Technologies @@ -13565,6 +14147,8 @@ 1a17 Agilent Technologies (E6473) 160a VIA Technologies, Inc. 3184 VIA VNT-6656 [WiFi 802.11b/g USB Dongle] +160e INRO + 0001 E2USBKey 1614 Amoi Electronics 0404 WMA9109 UMTS Phone 0600 Vodafone VDA GPS / Toschiba Protege G710 @@ -13576,6 +14160,7 @@ 162f WiQuest Communications, Inc. 1630 2Wire, Inc. 0005 802.11g Wireless Adapter [Intersil ISL3886] + 0011 PC Port 10 Mps Adapter ff81 802.11b Wireless Adapter [Lucent/Agere Hermes I] 1631 Good Way Technology 6200 GWUSB2E @@ -13616,6 +14201,8 @@ 165b Frontier Design Group 8101 Tranzport Control Surface fad1 Alphatrack Control Surface +165c Kondo Kagaku + 0002 Serial Adapter 1660 Creatix Polymedia GmbH 1668 Actiontec Electronics, Inc. [hex] 0009 Gateway @@ -13634,10 +14221,18 @@ 3441 IBM Integrated Bluetooth III 6010 Gateway 6097 802.11b Wireless Adapter - 6106 ROPEX FreeLan 802.11b + 6106 802UI3(B) 802.11b Wireless Adapter [Intersil PRISM 3] 7605 UAT1 Wireless Ethernet Adapter 1669 PiKRON Ltd. [hex] 1001 uLan2USB Converter - PS1 protocol +166a Clipsal + 0101 C-Bus Multi-room Audio Matrix Switcher + 0201 C-Bus Pascal Automation Controller + 0301 C-Bus Wireless PC Interface + 0303 C-Bus interface + 0304 C-Bus Black and White Touchscreen + 0305 C-Bus Spectrum Colour Touchscreen + 0401 C-Bus Architectural Dimmer 1677 China Huada Integrated Circuit Design (Group) Co., Ltd. (CIDC Group) 0103 Token 1679 Total Phase @@ -13658,10 +14253,13 @@ 5289 FlashDisk 6211 FlashDisk 1688 Saab AB +1689 Razer USA, Ltd + fd00 Onza Tournament Edition controller 168c Atheros Communications 0001 AR5523 0002 AR5523 (no firmware) 1690 Askey Computer Corp. [hex] + 0001 Arcaze Gamepad 0101 Creative Modem Blaster DE5670 0102 V1456 VQE-R2 Modem [conexant] 0103 1456 VQE-R3 Modem [conexant] @@ -13707,7 +14305,7 @@ 0801 U43 16b5 Persentec, Inc. 0002 Otto driving companion -16c0 VOTI +16c0 Van Ooijen Technische Informatica 03e8 free for internal lab use 1000 03e9 free for internal lab use 1001 03ea free for internal lab use 1002 @@ -13738,8 +14336,11 @@ 0488 Teensyduino Flight Sim Controls 05dc shared ID for use with libusb 05dd BlackcatUSB2 - 05e1 CDC-ACM class devices (modems) - 05e4 MIDI class devices + 05df HID device except mice, keyboards, and joysticks + 05e1 Free shared USB VID/PID pair for CDC devices + 05e4 Free shared USB VID/PID pair for MIDI devices + 06b4 USB2LPT with 2 interfaces + 06b5 USB2LPT with 3 interfaces (native, HID, printer) 076b OpenPCD 13.56MHz RFID Reader 076c OpenPICC 13.56MHz RFID Simulator (native) 08ac OpenBeacon USB stick @@ -13747,16 +14348,27 @@ 08cb Alpermann+Velte Studio Clock 08cc Alpermann+Velte SAM7S MT Boot Loader 08cd Alpermann+Velte SAM7X MT Boot Loader + 0a32 jbmedia Light-Manager Pro + 27d8 libusb-bound devices + 27d9 HID device except mice, keyboards, and joysticks 27da Mouse 27db Keyboard 27dc Joystick 27dd CDC-ACM class devices (modems) 27de MIDI class devices + 294a Eye Movement Recorder [Visagraph] + 294b Eye Movement Recorder [ReadAlyzer] 16ca Wireless Cables, Inc. 1502 Bluetooth Dongle 16cc silex technology, Inc. -16d0 GrauTec - 054b ReelBox OLED Display (external) +16d0 MCS + 0498 Braintechnology USB-LPS + 0504 RETRO Innovations ZoomFloppy + 054b GrauTec ReelBox OLED Display (external) + 05be EasyLogic Board + 0753 Digistump DigiSpark + 075c AB-1.x UAC1 [Audio Widget] + 075d AB-1.x UAC2 [Audio Widget] 16d3 Frontline Test Equipment, Inc. 16d5 AnyDATA Corporation 6202 CDMA/UMTS/GPRS modem @@ -13780,6 +14392,10 @@ 16dc Wiener, Plein & Baus 0001 CC 000b VM + 0010 PL512 Power Supply System + 0011 MARATON Power Supply System + 0012 MPOD Multi Channel Power Supply System + 0015 CML Control, Measurement and Data Logging System 16df King Billion Electronics Co., Ltd. 16f0 GN ReSound A/S 0001 Speedlink Programming Interface @@ -13811,11 +14427,11 @@ 0101 RF Wireless Optical Mouse OP-701 1736 CANON IMAGING SYSTEM TECHNOLOGIES INC. 1737 Linksys - 0039 USB1000 + 0039 USB1000 Gigabit Notebook Adapter 0070 WUSB100 v1 RangePlus Wireless Network Adapter [Ralink RT2870] 0071 WUSB600N v1 Dual-Band Wireless-N Network Adapter [Ralink RT2870] 0073 WUSB54GC v2 802.11g Adapter [Realtek RTL8187B] - 0075 WUSB54GSC v2 802.11g Adapter + 0075 WUSB54GSC v2 802.11g Adapter [Broadcom 4326U] 0077 WUSB54GC v3 802.11g Adapter [Ralink RT2070L] 0078 WUSB100 v2 RangePlus Wireless Network Adapter [Ralink RT3070] 0079 WUSB600N v2 Dual-Band Wireless-N Network Adapter [Ralink RT3572] @@ -13825,6 +14441,7 @@ 1000 NUB-350 802.11g Wireless Adapter [Intersil ISL3887] 2000 NUB-8301 802.11bg 3701 EUB-3701 EXT 802.11g Wireless Adapter [Ralink RT2571W] + 9603 RTL8188S WLAN Adapter 9701 EnGenius 802.11n Wireless USB Adapter 9702 EnGenius 802.11n Wireless USB Adapter 9703 EnGenius 802.11n Wireless USB Adapter @@ -13834,6 +14451,7 @@ 1743 General Atomics 174c ASMedia Technology Inc. 5106 Transcend StoreJet 25M3 + 55aa ASMedia 2105 SATA bridge 174f Syntek 1105 SM-MS/Pro-MMC-XD Card Reader 110b HP Webcam @@ -13863,6 +14481,7 @@ 1776 Arowana 501c 300K CMOS Camera 177f Sweex + 0004 MM004V5 Photo Key Chain (Digital Photo Frame) 1.5" 0153 LW153 802.11n Adapter [ralink rt3070] 0154 LW154 802.11bgn (1x1:1) Wireless Adapter [Realtek RTL8188SU] 0313 LW313 802.11n Adapter [ralink rt2770 + rt2720] @@ -13881,12 +14500,14 @@ 0007 eHome Infrared Transceiver 0008 eHome Infrared Transceiver 000a eHome Infrared Transceiver + 0011 eHome Infrared Transceiver 1787 ATI AIB 1788 ShenZhen Litkconn Technology Co., Ltd. 1796 Printrex, Inc. 1797 JALCO CO., LTD. -1799 Belkin Components - 7051 F5D7051 802.11g Adapter v1000 [Broadcom 4320] +1799 Thales Norway A/S + 7051 Belkin F5D7051 802.11g Adapter v1000 [Broadcom 4320] + 8051 Belkin F5D8051 v2 802.11bgn Wireless Adapter [Marvell 88W8362] 179d Ricavision International, Inc. 0010 Internal Infrared Transceiver 17a0 Samson Technologies Corp. @@ -13904,6 +14525,9 @@ 0002 Performance Monitor 4 17a5 Advanced Connection Technology Inc. 17a7 MICOMSOFT CO., LTD. +17a8 Kamstrup A/S + 0001 Optical Eye/3-wire + 0005 M-Bus Master MultiPort 250D 17b3 Grey Innovation 0004 Linux-USB Midi Gadget 17ba SAURIS GmbH @@ -13940,6 +14564,7 @@ 037b Plugable USB-VGA-165 037c Plugable DC-125 037d Plugable USB2-HDMI-165 + 430a HP Port Replicator (Composite Device) 17eb Cornice, Inc. 17ef Lenovo 1003 Integrated Smart Card Reader @@ -13963,10 +14588,20 @@ 6007 Smartcard Keyboard 6009 ThinkPad Keyboard with TrackPoint 6014 Mini Wireless Keyboard N5901 + 7423 IdeaPad A1 Tablet + 7435 A789 (Mass Storage mode, with debug) + 743a A789 (Mass Storage mode) + 7497 A789 (MTP mode) + 7498 A789 (MTP mode, with debug) + 749a A789 (PTP mode) + 749b A789 (PTP mode, with debug) +17f4 WaveSense + aaaa Jazz Blood Glucose Meter 17f5 K.K. Rocky 17f6 Unicomp, Inc 0709 Model M Keyboard 1809 Advantech + 4604 USB-4604 4761 USB-4761 Portable Data Acquisition Module 1822 Twinhan 3201 VisionDTV USB-Ter/HAMA USB DVB-T device cold @@ -13990,6 +14625,7 @@ 1870 Nexio Co., Ltd 0001 iNexio Touchscreen controller 1871 Aveo Technology Corp. + 0101 UVC camera (Bresser microscope) 0d01 USB2.0 Camera 1873 Navilock ee93 EasyLogger @@ -14008,6 +14644,8 @@ 5632 Atek Tote Remote 5641 TSAM-004 Presentation Remote 1897 Evertop Wire Cable Co. +189f 3Shape A/S + 0002 Legato2 3D Scanner 18a4 CSSN 0001 Snapshell IDR 18a5 Verbatim, Ltd @@ -14015,7 +14653,9 @@ 0216 External Hard Drive 0218 External Hard Drive 0227 Pocket Hard Drive + 022b Portable Hard Drive (Store'n'Go) 0237 Portable Harddrive (500 GB) + 0302 32GB Flash Drive 18b1 Petalynx 0037 Maxter Remote Control 18b4 e3C Technologies @@ -14033,6 +14673,9 @@ 18cd Ecamm cafe Pico iMage 18d1 Google Inc. + 0d02 Celkon A88 + 2d00 Android-powered device in accessory mode + 2d01 Android-powered device in accessory mode with ADB support 4e11 Nexus One 4e12 Nexus One (debug) 4e13 Nexus One (tether) @@ -14040,10 +14683,20 @@ 4e21 Nexus S 4e22 Nexus S (debug) 4e24 Nexus S (tether) + 4e40 Nexus 7 (fastboot) + 4e41 ASUS Nexus 7 (MTP modus) + 4e42 Nexus 7 (debug) + 4e43 ASUS Nexus 7 (PTP modus) + 4ee1 Nexus 4 + 4ee2 Nexus 4 (debug) + 4ee3 Nexus 4 (tether) + 4ee4 Nexus 4 (debug + tether) 7102 Toshiba Thrive tablet + b004 Pandigital / B&N Novel 9" tablet 18d5 Starline International Group Limited 18d9 Kaba 01a0 B-Net 91 07 +18dc LKC Technologies, Inc. 18dd Planon System Solutions Inc. 1000 DocuPen RC800 18e3 Fitipower Integrated Technology Inc @@ -14062,6 +14715,8 @@ 18ec Arkmicro Technologies Inc. 3118 USB to IrDA adapter [ARK3116T] 3188 ARK3188 UVC Webcam + 3299 Webcam Carrefour + 3366 Bresser Biolux NV 18fd FineArch Inc. 1908 GEMBIRD 1320 PhotoFrame PF-15-1 @@ -14103,6 +14758,8 @@ 0087 1950 HID Touchscreen 192f Avago Technologies, Pte. 0000 Mouse + 0416 ADNS-5700 Optical Mouse Controller (3-button) + 0616 ADNS-5700 Optical Mouse Controller (5-button) 1930 Shenzhen Xianhe Technology Co., Ltd. 1931 Ningbo Broad Telecommunication Co., Ltd. 1934 Feature Integration Technology Inc. (Fintek) @@ -14118,9 +14775,16 @@ 2257 Model 2257 4 Channel Capture Card a250 Model 2250 MPEG and JPEG Capture Card (cold) a253 Model 2253 Audio/Video Codec Card (cold) -1949 Lab126 +1949 Lab126, Inc. 0002 Amazon Kindle - 0004 Amazon Kindle 3/4 + 0004 Amazon Kindle 3/4/Paperwhite + 0006 Kindle Fire + 0008 Amazon Kindle Fire HD 8.9" +194f PreSonus Audio Electronics, Inc. + 0101 AudioBox 22 VSL + 0102 AudioBox 44 VSL + 0103 AudioBox 1818 VSL + 0301 AudioBox 1951 Hyperstone AG 1953 Ironkey Inc. 1954 Radiient Technologies @@ -14129,14 +14793,19 @@ 7006 Libra-Q26 / 1.0 Remote 7777 Scorpius wireless keyboard 7779 Scorpius-P20MT +1965 Uniden Corporation + 0016 HomePatrol-1 1967 CASIO HITACHI Mobile Communications Co., Ltd. 196b Wispro Technology Inc. 1970 Dane-Elec Corp. USA + 0000 Z Mate 16GB 1975 Dongguan Guneetal Wire & Cable Co., Ltd. 1976 Chipsbrand Microelectronics (HK) Co., Ltd. 6025 Flash Drive 512 MB 1977 T-Logic 0111 TL203 MP3 Player and Voice Recorder +197d Leuze electronic + 0222 BCL 508i 1989 Nuconn Technology Corp. 198f Beceem Communications Inc. 0210 BCS200 WiMAX Adapter @@ -14145,6 +14814,8 @@ 1995 Trillium Technology Pty. Ltd. 3202 REC-ADPT-USB (recorder) 3203 REC-A-ADPT-USB (recorder) +199b MicroStrain, Inc. + 3065 3DM-GX3-25 Orientation Sensor 199e The Imaging Source Europe GmbH 8101 DFx 21BU04 Camera 199f Benica Corporation @@ -14165,6 +14836,8 @@ 19b6 Infotech Logistic, LLC 19b9 Data Robotics 8d20 Drobo Elite +19c2 Futuba + 6a11 MDM166A Fluorescent Display 19ca Mindtribe 0001 Sandio 3D HID Mouse 19cf Parrot SA @@ -14177,8 +14850,19 @@ 0064 MF627 AU 0083 MF190 0103 MF112 + 0104 K4505-Z + 0146 MF 195E (HSPA+ Modem) + 0167 MF820 4G LTE 0172 AX226 WIMAX MODEM (After Modeswitch) + 0325 LTE4G O2 ZTE MF821D LTE/UMTS/GSM Modem/Networkcard + 0326 LTE4G O2 ZTE MF821D LTE/UMTS/GSM Modem/Networkcard + 1008 K3570-Z + 1010 K3571-Z + 1017 K5006-Z vodafone LTE/UMTS/GSM Modem/Networkcard + 1018 K5006-Z vodafone LTE/UMTS/GSM Modem/Networkcard 1203 MF691 [ T-Mobile webConnect Rocket 2.0] + 1217 MF652 + 1218 MF652 2000 MF627/MF628/MF628+/MF636+ HSDPA/HSUPA fff2 Gobi Wireless Modem (QDL mode) fff3 Gobi Wireless Modem @@ -14200,8 +14884,13 @@ 0407 Mimi WiFi speakers 1a25 Amphenol East Asia Ltd. 1a2a Seagate Branded Solutions +1a2c China Resource Semico Co., Ltd + 0021 Keyboard + 0024 Multimedia Keyboard 1a32 Quanta Microsystems, Inc. 0304 802.11n Wireless LAN Card +1a34 ACRUX + 0802 Gamepad 1a36 Biwin Technology Ltd. 1a40 Terminus Technology Inc. 0101 4-Port HUB @@ -14211,11 +14900,15 @@ 0001 Digipass 905 SmartCard Reader 1a4a Silicon Image 1a4b SafeBoot International B.V. +1a5a Tandberg Data 1a61 Abbott Diabetes Care + 3410 CoPilot System Cable 1a6a Spansion Inc. 1a6d SamYoung Electronics Co., Ltd 1a6e Global Unichip Corp. 1a6f Sagem Orga GmbH +1a72 Physik Instrumente + 1008 E-861 PiezoWalk NEXACT Controller 1a79 Bayer Health Care LLC 1a7b Lumberg Connect GmbH & Co. KG 1a7c Evoluent @@ -14225,7 +14918,9 @@ 1a81 Holtek Semiconductor, Inc. 2203 Laser Gaming mouse 2204 Optical Mouse + 2205 Laser Mouse 1a86 QinHeng Electronics + 5512 CH341 in EPP/MEM/I2C mode, EPP/I2C adapter 5523 CH341 in serial mode, usb to serial port converter 5584 CH341 in parallel mode, usb to printer port converter 7523 HL-340 USB-Serial adapter @@ -14237,11 +14932,13 @@ 1a8d BandRich, Inc. 1002 BandLuxe 3.5G HSDPA Adapter 1009 BandLuxe 3.5G HSPA Adapter -1a90 Corsair Voyager GT 16GB + 100d 4G LTE adapter 1a98 Leica Camera AG 1aa4 Data Drive Thru, Inc. 1aa5 UBeacon Technologies, Inc. 1aa6 eFortune Technology Corp. +1aad KeeTouch + 0001 Touchscreen 1ab1 Rigol Technologies 0588 DS1000 SERIES 1acb Salcomp Plc @@ -14252,10 +14949,15 @@ 1ae4 ic-design Reinhard Gottinger GmbH 1ae7 X-TENSIONS 0381 VS-DVB-T 380U (af9015 based) - 2001 SpeedLink SL-6825 + 2001 SpeedLink Snappy Mic webcam (SL-6825-SBK) + 9003 SpeedLink Vicious And Devine Laplace webcam, white (VD-1504-SWT) + 9004 SpeedLink Vicious And Devine Laplace webcam, black (VD-1504-SBK) 1aed High Top Precision Electronic Co., Ltd. 1aef Conntech Electronic (Suzhou) Corporation -1b04 Meilhaus Electronic GmBH +1af1 Connect One Ltd. +1afe A. Eberle GmbH & Co. KG + 0001 PQ Box 100 +1b04 Meilhaus Electronic GmbH 0630 ME-630 0940 ME-94 0950 ME-95 @@ -14334,9 +15036,14 @@ 820b ME-8200B 1b0e BLUTRONICS S.r.l. 1078 BLUDRIVE II CCID + 1079 BLUDRIVE II CCID + 1080 WRITECHIP II CCID 1b1c Corsair 0890 Flash Padlock 0a00 SP2500 Speakers + 0a60 Vengeance K60 Keyboard + 1a01 Flash Voyager GT + 1a0a Survivor Stealth Flash Drive 1a90 Flash Voyager GT 1b20 MStar Semiconductor, Inc. 1b22 WiLinx Corp. @@ -14372,6 +15079,8 @@ 2968 PC Camera/Webcam controller 2969 PC Camera/Webcam controller 1b3f Generalplus Technology Inc. + 0c52 808 Camera #9 (mass storage mode) + 2002 808 Camera #9 (web-cam mode) 1b47 Energizer Holdings, Inc. 0001 CHUSB Duo Charger (NiMH AA/AAA USB smart charger) 1b48 Plastron Precision Co., Ltd. @@ -14383,6 +15092,7 @@ 1000 xHC1 Controller 1b75 Ovislink Corp. 3072 AirLive WN-360USB adapter + 8171 WN-370USB 802.11bgn Wireless Adapter [Realtek RTL8188SU] 8187 AirLive WL-1600USB 802.11g Adapter [Realtek RTL8187L] 9170 AirLive X.USB 802.11abgn [Atheros AR9170+AR9104] a200 AirLive WN-200USB wireless 11b/g/n dongle @@ -14401,6 +15111,7 @@ e399 DVB-T KWorld PlusTV 399U [af9015] e39a DVB-T395U [af9015] e39b DVB-T395U [af9015] + e401 Sveon STV22 DVB-T [af9015] e409 IT9137FN Dual DVB-T [KWorld UB499-2T] 1b86 Dongguan Guanshang Electronics Co., Ltd. 1b88 ShenMing Electron (Dong Guan) Co., Ltd. @@ -14426,6 +15137,14 @@ 1bbb T & A Mobile Phones 1bc4 Ford Motor Co. 1bc5 AVIXE Technology (China) Ltd. +1bc7 Telit + 0020 HE863 + 0021 HE910 + 1003 UC864-E + 1004 UC864-G + 1005 CC864-DUAL + 1006 CC864-SINGLE + 1010 DE910-DUAL 1bce Contac Cable Industrial Limited 1bcf Sunplus Innovation Technology Inc. 0007 Optical Mouse @@ -14433,6 +15152,8 @@ 05c5 SPRF2413A [2.4GHz Wireless Keyboard/Mouse Receiver] 05cf Micro keyboard & mouse receiver 0c31 SPIF30x Serial-ATA bridge + 2885 ASUS Webcam + 2888 HP Universal Camera 1bd0 Hangzhou Riyue Electronic Co., Ltd. 1bd5 BG Systems, Inc. 1bde P-TWO INDUSTRIES, INC. @@ -14451,6 +15172,8 @@ 6968 Touch Screen 1c02 Kreton Corporation 1c04 QNAP System Inc. +1c0c Ionics EMS, Inc. + 0102 Plug Computer 1c0d Relm Wireless 1c10 Lanterra Industrial Co., Ltd. 1c13 ALECTRONIC LIMITED @@ -14478,7 +15201,9 @@ 0002 Keyboard TRACER Gamma Ivory 0003 HID controller 000e Genius KB-120 Keyboard + 0026 Keyboard 3000 Micro USB Web Camera + 3002 WebCam SiGma Micro 1c6b Philips & Lite-ON Digital Solutions Corporation a222 DVD Writer Slimtype eTAU108 1c6c Skydigital Inc. @@ -14490,6 +15215,8 @@ 1c7a LighTuning Technology Inc. 0801 Fingerprint Reader 1c7b LUXSHARE PRECISION INDUSTRY (SHENZHEN) CO., LTD. +1c83 SchomÃ€cker GmbH + 0001 RS150 V2 1c87 2N TELEKOMUNIKACE a.s. 1c88 Somagic, Inc. 0007 SMI Grabber (EasyCAP DC60+ clone) (no firmware) [SMI-2021CBE] @@ -14500,12 +15227,18 @@ 1c9e OMEGA TECHNOLOGY 6061 WL-72B 3.5G MODEM 1ca0 ACCARIO Inc. +1ca1 Symwave + 18ab SATA bridge 1cac Kinstone a332 C8 Webcam b288 C18 Webcam 1cb3 Aces Electronic Co., Ltd. 1cb4 OPEX CORPORATION +1cb6 IdeaCom Technology Inc. + 6681 IDC6681 1cbe Luminary Micro Inc. + 00fd In-Circuit Debug Interface + 00ff Stellaris ROM DFU Bootloader 1cbf FORTAT SKYMARK INDUSTRIAL COMPANY 1cc0 PlantSense 1cca NextWave Broadband Inc. @@ -14517,6 +15250,20 @@ 1cdf WonTen Technology Co., Ltd. 1ce0 EDIMAX TECHNOLOGY CO., LTD. 1ce1 Amphenol KAE +1cf1 Dresden Elektronik + 0001 Sensor Terminal Board + 0004 Wireless Handheld Terminal + 0017 deRFusbSniffer 2.4 GHz + 0018 deRFusb24E001 + 0019 deRFusb14E001 + 001a deRFusb23E00 + 001b deRFusb13E00 + 001c deRFnode + 001d deRFnode / gateway + 0022 deUSB level shifter + 0023 deRFusbSniffer Sub-GHz + 0025 deRFusb23E06 + 0027 deRFusb13E06 1cfc ANDES TECHNOLOGY CORPORATION 1cfd Flextronics Digital Design Japan, LTD. 1d03 iCON @@ -14527,6 +15274,7 @@ 1026 HSUPA Modem FLYING-LARK46-VER0.07 [Flying Angel] 1d0a Johnson Controls, Inc. The Automotive Business Unit 1d0b HAN HUA CABLE & WIRE TECHNOLOGY (J.X.) CO., LTD. +1d0f Sonix Technology Co., Ltd. 1d14 ALPHA-SAT TECHNOLOGY LIMITED 1d17 C-Thru Music Ltd. 0001 AXiS-49 Harmonic Table MIDI Keyboard @@ -14538,12 +15286,21 @@ 8202 DK DVBC/T DONGLE 1d1f Diostech Co., Ltd. 1d20 SAMTACK INC. +1d27 ASUS +1d34 Dream Cheeky + 0001 Dream Cheeky Fidget + 0004 Dream Cheeky Webmail Notifier + 0008 Dream Cheeky button + 000a Dream Cheeky Mailbox Friends Alert + 000d Dream Cheeky Big Red Button + 0013 Dream Cheeky LED Message Board 1d4d PEGATRON CORPORATION 0002 Ralink RT2770/2720 802.11b/g/n Wireless LAN Mini-USB Device 000c Ralink RT3070 802.11b/g/n Wireless Lan USB Device 000e Ralink RT3070 802.11b/g/n Wireless Lan USB Device 1d50 OpenMoko, Inc. 5119 GTA01/GTA02 U-Boot Bootloader + 602b FPGALink 1d57 Xenta 0005 Wireless Receiver (Keyboard and Mouse) 0006 Wireless Receiver (RC Laser Pointer) @@ -14552,6 +15309,7 @@ 32da 2.4GHz Receiver (Keyboard and Mouse) 83d0 Click-mouse! ac01 Wireless Receiver (Keyboard and Mouse) + ad02 SE340D PC Remote Control af01 AUVIO Universal Remote Receiver for PlayStation 3 1d5b Smartronix, Inc. 1d6b Linux Foundation @@ -14569,6 +15327,7 @@ 1101 Generic Display Device (Mass storage mode) c101 Generic Display Device 1e0e Qualcomm / Option + f000 iCON 210 UMTS Surfstick 1e10 Point Grey Research, Inc. 2004 Sony 1.3MP 1/3" ICX445 IIDC video camera [Chameleon] 1e17 Mirion Technologies Dosimetry Services Division @@ -14589,12 +15348,20 @@ 0408 LPC2378 [Robotino-Arm] 0409 LPC2378 [Robotino-Arm Bootloader] 040a LPC2378 [Robotino Bootloader] + 040b LPC2378 [Robotino XT] + 040c LPC2378 [Robotino XT Bootloader] + 040d LPC2378 [Robotino 3] + 040e LPC2378 [Robotino 3 Bootloader] 0501 CP2102 [CMSP] 0601 CMMP-AS 1e3d Chipsbank Microelectronics Co., Ltd + 2093 CBM209x Flash Drive (OEM) 4082 CBM4082 SD Card Reader 1e41 Cleverscope 0001 CS328A PC Oscilloscope +1e4e Cubeternet + 0100 WebCam + 0102 GL-UPC822 UVC WebCam 1e54 TypeMatrix 2030 2030 USB Keyboard 1e68 TrekStor GmbH & Co. KG @@ -14603,10 +15370,12 @@ 0001 Avatar Optical Mouse 1e74 Coby Electronics Corporation 2211 MP300 + 2647 2 GB 2 Go Video MP3 Player [MP601-2G] 2659 Coby 4GB Go Video MP3 Player [MP620-4G] 4641 A8705 MP3/Video Player 6511 MP705-8G MP3 player 6512 MP705-4G + 7111 MP957 Music and Video Player 1e7d ROCCAT 2c24 Pyra Mouse (wired) 2ced Kone Mouse @@ -14633,8 +15402,17 @@ 0021 CD INSTALLER USB Device 1f44 The Neat Company 0001 NM-1000 scanner +1f48 H-TRONIC GmbH + 0627 Data capturing system + 0628 Data capturing and control module 1f4d G-Tek Electronics Group b803 Lifeview LV5TDLX DVB-T [RTL2832U] +1f6f Aliph + 0023 Jawbone Jambox + 8000 Jawbone Jambox - Updating +1f75 Innostor Technology Corporation + 0888 IS888 SATA Storage Controller + 0902 IS902 UFD controller 1f82 TANDBERG 0001 PrecisionHD Camera 1f84 Alere, Inc. @@ -14642,18 +15420,26 @@ 0002 Multi-touch HID Controller 1f9b Ubiquiti Networks, Inc. 0241 AirView2-EXT +1fab Samsung Opto-Electroncs Co., Ltd. + 104d ES65 1fbd Delphin Technology AG 0001 Expert Key - Data aquisition system 1fc9 NXP Semiconductors + 0003 LPC1343 010b PR533 1fde ILX Lightwave Corporation 0001 UART Bridge 1fe7 Vertex Wireless Co., Ltd. 1000 VW100 series CDMA EV-DO Rev.A modem +1ff7 CVT Electronics.Co.,Ltd + 0013 CVTouch Screen (HID) + 001a Human Interface Device +1fff Ideofy Inc. 2001 D-Link Corp. 0001 DWL-120 WIRELESS ADAPTER 0201 DHN-120 10Mb Home Phoneline Adapter - 1a00 10/100 Ethernet + 1a00 DUB-E100 Fast Ethernet Adapter(rev.A) [ASIX AX88172] + 1a02 DUB-E100 Fast Ethernet Adapter(rev.C1) [ASIX AX88772] 200c 10/100 Ethernet 3200 DWL-120 802.11b Wireless Adapter(rev.E1) [Atmel at76c503a] 3301 DWA-130 802.11n Wireless N Adapter(rev.C1) [Realtek RTL8192U] @@ -14684,8 +15470,12 @@ 3c00 AirPlus G DWL-G122 Wireless Adapter(rev.B1) [Ralink RT2571] 3c01 AirPlus AG DWL-AG122 Wireless Adapter 3c02 AirPlus G DWL-G122 Wireless Adapter - 3c05 DUB-E100 Fast Ethernet [asix] + 3c05 DUB-E100 Fast Ethernet Adapter(rev.B1) [ASIX AX88772] + 3c15 DWA-140 RangeBooster N Adapter(rev.B3) [Ralink RT5372] + 3c17 DWA-123 Wireless N 150 Adapter(rev.A1) [Ralink RT3370] 3c19 DWA-125 Wireless N 150 Adapter(rev.A3) [Ralink RT5370] + 3c1a DWA-160 802.11abgn Xtreme N Dual Band Adapter(rev.B2) [Ralink RT5572] + 3c1b DWA-127 Wireless N 150 High-Gain Adapter(rev.A1) [Ralink RT3070] 4000 DSB-650C Ethernet [klsi] 4001 DSB-650TX Ethernet [pegasus] 4002 DSB-650TX Ethernet [pegasus] @@ -14708,6 +15498,8 @@ f117 Formosa 3 f118 Formosa 4 2002 DAP Technologies +200c Reloop + 100b Play audio soundcard 2013 PCTV Systems 0245 PCTV 73ESE 0246 PCTV 74E @@ -14715,7 +15507,9 @@ 024f nanoStick T2 290e 2019 PLANEX 3220 GW-US11S WLAN [Atmel AT76C503A] + 4901 GW-USSuper300 802.11bgn Wireless Adapter [Realtek RTL8191SU] 4903 GW-USFang300 802.11abgn Wireless Adapter [Realtek RTL8192DU] + 4904 GW-USUltra300 802.11abgn Wireless Adapter [Realtek RTL8192DU] 5303 GW-US54GXS 802.11bg 5304 GWUS300 802.11n ab01 GW-US54HP @@ -14724,6 +15518,7 @@ ab28 GW-USNano ab29 GW-USMicro300 ab2a GW-USNano2 802.11n Wireless Adapter [Realtek RTL8188CUS] + ab2b GW-USEco300 802.11bgn Wireless Adapter [Realtek RTL8192CU] ab2c GW-USDual300 802.11abgn Wireless Adapter [Realtek RTL8192DU] ab50 GW-US54Mini2 c002 GW-US54SG @@ -14732,7 +15527,9 @@ ed06 GW-US300MiniW 802.11bgn Wireless Adapter ed10 GW-US300Mini2 ed14 GW-USMicroN + ed16 GW-USMicroN2W 802.11bgn Wireless Adapter [Realtek RTL8188SU] ed17 GW-USValue-EZ 802.11n Wireless Adapter [Realtek RTL8188CUS] + ed18 GW-USHyper300 / GW-USH300N 802.11bgn Wireless Adapter [Realtek RTL8191SU] 2040 Hauppauge 0c80 Windham 0c90 Windham @@ -14981,12 +15778,15 @@ 0043 Uno R3 (CDC ACM) 0044 Mega ADK R3 (CDC ACM) 0045 Serial R3 (CDC ACM) + 8036 Leonardo (CDC ACM, HID) 2373 Pumatronix Ltda 0001 5 MegaPixel Digital Still Camera [DSC5M] 2375 Digit@lway, Inc. 0001 Digital Audio Player 2406 SANHO Digital Electronics Co., Ltd. 6688 PD7X Portable Storage +2443 Aessent Technology Ltd + 00dc aes220 FPGA Mini-Module 2478 Tripp-Lite 2008 U209-000-R Serial Port 2632 TwinMOS @@ -15002,6 +15802,11 @@ 1206 MediaTV DVB-T MiniPCIe 1207 Sundtek HD Capture 1208 Sundtek SkyTV Ultimate III + 1209 MediaTV Analog/FM/ATSC MiniPCIe + 1210 MediaTV Pro III (EU) + 1211 MediaTV Pro III (US) + 1212 MediaTV Pro III MiniPCIe (EU) + 1213 MediaTV Pro III MiniPCIe (US) 2730 Citizen 200f CT-S310 Label printer 2735 DigitalWay @@ -15284,6 +16089,9 @@ 4971 SimpleTech cb01 SP-U25/120G ce17 1TB SimpleDrive II USB External Hard Drive +4d46 Musical Fidelity + 0001 V-Link + 0002 V-DAC II 5032 Grandtec 0bb8 Grandtec USB1.1 DVB-T (cold) 0bb9 Grandtec USB1.1 DVB-T (warm) diff --git a/src/initscripts/init.d/vdr b/src/initscripts/init.d/vdr index e42887f..759ad34 100644 --- a/src/initscripts/init.d/vdr +++ b/src/initscripts/init.d/vdr @@ -18,23 +18,13 @@ case "${1}" in start) boot_mesg "Starting Video Disk Recorder..." - if [ "$(ps -A | grep runvdr)" != "" ]; then - boot_mesg "Error! Already running!" - echo_failure - exit 1; - fi - if [ ! -e /dev/dvb/adapter0/frontend0 ]; then - boot_mesg "Error! No DVB tuner found." - echo_failure - exit 0; - fi - loadproc screen -dmS vdr /opt/vdr/bin/runvdr + /usr/sbin/runvdr >/dev/null 2>&1 & + evaluate_retval ;; stop) boot_mesg "Stopping Video Disk Recorder..." - killall -s KILL -w runvdr - killproc /opt/vdr/bin/vdr + killproc /usr/sbin/vdr ;; restart) @@ -44,8 +34,8 @@ case "${1}" in ;; status) - statusproc /opt/vdr/bin/runvdr - statusproc /opt/vdr/bin/vdr + statusproc /usr/sbin/runvdr + statusproc /usr/sbin/vdr ;; *) diff --git a/src/paks/vdr/install.sh b/src/paks/vdr/install.sh new file mode 100644 index 0000000..3e92d32 --- /dev/null +++ b/src/paks/vdr/install.sh @@ -0,0 +1,115 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} + +# Automatically add the GREEN network to svdrphosts.conf +( + eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) + + GREEN_PREFIX= + case "${GREEN_NETMASK}" in + 255.255.255.252) + GREEN_PREFIX=30 + ;; + 255.255.255.248) + GREEN_PREFIX=29 + ;; + 255.255.255.240) + GREEN_PREFIX=28 + ;; + 255.255.255.224) + GREEN_PREFIX=27 + ;; + 255.255.255.192) + GREEN_PREFIX=26 + ;; + 255.255.255.128) + GREEN_PREFIX=25 + ;; + 255.255.255.0) + GREEN_PREFIX=24 + ;; + 255.255.254.0) + GREEN_PREFIX=23 + ;; + 255.255.252.0) + GREEN_PREFIX=22 + ;; + 255.255.248.0) + GREEN_PREFIX=21 + ;; + 255.255.240.0) + GREEN_PREFIX=20 + ;; + 255.255.224.0) + GREEN_PREFIX=19 + ;; + 255.255.192.0) + GREEN_PREIFX=18 + ;; + 255.255.128.0) + GREEN_PREFIX=17 + ;; + 255.255.0.0) + GREEN_PREFIX=16 + ;; + 255.254.0.0) + GREEN_PREFIX=15 + ;; + 255.252.0.0) + GREEN_PREFIX=14 + ;; + 255.248.0.0) + GREEN_PREFIX=13 + ;; + 255.240.0.0) + GREEN_PREFIX=12 + ;; + 255.224.0.0) + GREEN_PREFIX=11 + ;; + 255.192.0.0) + GREEN_PREFIX=10 + ;; + 255.128.0.0) + GREEN_PREFIX=9 + ;; + 255.0.0.0) + GREEN_PREFIX=8 + ;; + esac + + if [ -n "${GREEN_NETADDRESS}" ] && [ -n "${GREEN_PREFIX}" ]; then + echo "${GREEN_NETADDRESS}/${GREEN_PREFIX}" >> /etc/vdr/svdrphosts.conf + fi +) || : + +start_service --background ${NAME} + +# Create video directory if it does not exist, yet. +if [ ! -e "/var/video" ]; then + mkdir -p /var/video +fi diff --git a/src/paks/vdr/uninstall.sh b/src/paks/vdr/uninstall.sh new file mode 100644 index 0000000..a7b8a53 --- /dev/null +++ b/src/paks/vdr/uninstall.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +make_backup ${NAME} +remove_files diff --git a/src/paks/vdr/update.sh b/src/paks/vdr/update.sh new file mode 100644 index 0000000..2e11608 --- /dev/null +++ b/src/paks/vdr/update.sh @@ -0,0 +1,36 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh + +OLD_DIR="/opt/vdr/etc" +NEW_DIR="/etc/vdr" + +for conf in ${OLD_DIR}/*.conf; do + [ -f "${conf}" ] && continue + + conf="$(basename ${conf})" + mv -b "${OLD_DIR}/${conf}" "${NEW_DIR}/${conf}" +done diff --git a/src/paks/vdradmin/install.sh b/src/paks/vdradmin/install.sh new file mode 100644 index 0000000..31c5fec --- /dev/null +++ b/src/paks/vdradmin/install.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} +start_service --background ${NAME} diff --git a/src/paks/vdradmin/uninstall.sh b/src/paks/vdradmin/uninstall.sh new file mode 100644 index 0000000..a7b8a53 --- /dev/null +++ b/src/paks/vdradmin/uninstall.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +make_backup ${NAME} +remove_files diff --git a/src/paks/vdradmin/update.sh b/src/paks/vdradmin/update.sh new file mode 100644 index 0000000..72d3185 --- /dev/null +++ b/src/paks/vdradmin/update.sh @@ -0,0 +1,37 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +./uninstall.sh +./install.sh + +# Update configuration options for new versions of VDR. +stop_service ${NAME} + +sed -i /etc/vdradmin/vdradmind.conf \ + -e "s@^LANG = .*@LANG = en_US.utf8@g" \ + -e "s@^VDR_PORT = .*@VDR_PORT = 6419@g" \ + -e "s@^VDRCONFDIR = .*@VDRCONFDIR = /etc/vdr@g" + +start_service ${NAME} diff --git a/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch b/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch new file mode 100644 index 0000000..d8319c0 --- /dev/null +++ b/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch @@ -0,0 +1,82 @@ +diff -up epgsearch-1.0.1.beta2/epgsearch.c~ epgsearch-1.0.1.beta2/epgsearch.c +--- epgsearch-1.0.1.beta2/epgsearch.c~ 2012-06-11 20:01:54.000000000 +0300 ++++ epgsearch-1.0.1.beta2/epgsearch.c 2012-06-12 22:20:38.740086339 +0300 +@@ -446,16 +446,16 @@ bool cPluginEpgsearch::Start(void) + LoadConfD(); + LoadUserVars(); + +- ChannelGroups.Load(AddDirectory(CONFIGDIR, "epgsearchchangrps.conf"), true); +- Blacklists.Load(AddDirectory(CONFIGDIR, "epgsearchblacklists.conf")); +- SearchExts.Load(AddDirectory(CONFIGDIR, "epgsearch.conf")); +- SearchTemplates.Load(AddDirectory(CONFIGDIR, "epgsearchtemplates.conf")); +- RecsDone.Load(AddDirectory(CONFIGDIR, "epgsearchdone.data")); +- SwitchTimers.Load(AddDirectory(CONFIGDIR, "epgsearchswitchtimers.conf")); +- NoAnnounces.Load(AddDirectory(CONFIGDIR, "noannounce.conf")); +- DefTimerCheckModes.Load(AddDirectory(CONFIGDIR, "deftimerchkmodes.conf")); +- TimersDone.Load(AddDirectory(CONFIGDIR, "timersdone.conf")); +- PendingNotifications.Load(AddDirectory(CONFIGDIR, "pendingnotifications.conf")); ++ ChannelGroups.Load("/var/lib/vdr/data/epgsearch/epgsearchchangrps.conf", true); ++ Blacklists.Load("/var/lib/vdr/data/epgsearch/epgsearchblacklists.conf"); ++ SearchExts.Load("/var/lib/vdr/data/epgsearch/epgsearch.conf"); ++ SearchTemplates.Load("/var/lib/vdr/data/epgsearch/epgsearchtemplates.conf"); ++ RecsDone.Load("/var/lib/vdr/data/epgsearch/epgsearchdone.data"); ++ SwitchTimers.Load("/var/lib/vdr/data/epgsearch/epgsearchswitchtimers.conf"); ++ NoAnnounces.Load("/var/lib/vdr/data/epgsearch/noannounce.conf"); ++ DefTimerCheckModes.Load("/var/lib/vdr/data/epgsearch/deftimerchkmodes.conf"); ++ TimersDone.Load("/var/lib/vdr/data/epgsearch/timersdone.conf"); ++ PendingNotifications.Load("/var/lib/vdr/data/epgsearch/pendingnotifications.conf"); + + cSearchTimerThread::Init(this); + cSwitchTimerThread::Init(); +diff -up epgsearch-1.0.1.beta2/epgsearchcfg.c~ epgsearch-1.0.1.beta2/epgsearchcfg.c +--- epgsearch-1.0.1.beta2/epgsearchcfg.c~ 2012-06-11 19:43:52.000000000 +0300 ++++ epgsearch-1.0.1.beta2/epgsearchcfg.c 2012-06-12 22:20:39.169055465 +0300 +@@ -80,7 +80,7 @@ cEPGSearchConfig::cEPGSearchConfig(void) + strcpy(MailAuthUser, ""); + strcpy(MailAuthPass, ""); + strcpy(LastMailConflicts, ""); +- mailViaScript = 1; ++ mailViaScript = 0; + manualTimerCheckDefault = 0; + noAnnounceWhileReplay = 0; + TimerProgRepeat = 0; +diff -up epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ epgsearch-1.0.1.beta2/scripts/recordingdone.sh +--- epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ 2012-06-12 22:19:28.570878733 +0300 ++++ epgsearch-1.0.1.beta2/scripts/recordingdone.sh 2012-06-12 22:20:39.536029167 +0300 +@@ -60,10 +60,10 @@ CTIME_FROM_RECORDING=yes + SVDRPSEND=svdrpsend + + # Home of EPGsearch +-EPGSEARCH_HOME="/etc/vdr/plugins" ++EPGSEARCH_HOME="/var/lib/vdr/data/epgsearch" + + # Video root +-VIDEO_ROOT="/video" ++VIDEO_ROOT="/var/video" + + # do not edit below this line + #------------------------------------------------------------------------------ +diff -up epgsearch-1.0.1.beta2/scripts/recrep.sh~ epgsearch-1.0.1.beta2/scripts/recrep.sh +--- epgsearch-1.0.1.beta2/scripts/recrep.sh~ 2012-06-11 19:43:51.000000000 +0300 ++++ epgsearch-1.0.1.beta2/scripts/recrep.sh 2012-06-12 22:20:39.914002061 +0300 +@@ -15,7 +15,7 @@ + # adjust the following lines to your config + + # your plugins config dir +-PLUGINCONFDIR=/var/lib/vdr/plugins/epgsearch ++PLUGINCONFDIR=/etc/vdr/plugins/epgsearch + # path to svdrpsend + SVDRPSEND=svdrpsend + # the key used to call epgsearch +diff -up epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh +--- epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ 2012-06-11 19:43:51.000000000 +0300 ++++ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh 2012-06-12 22:20:40.723944345 +0300 +@@ -15,7 +15,7 @@ + #<Configuration> + + # Your timers.conf +-TIMERS="/video/timers.conf" ++TIMERS="/etc/vdr/timers.conf" + + #</Configuration> + diff --git a/src/patches/vdr-streamdev_recordings-64.patch b/src/patches/vdr-streamdev_recordings-64.patch new file mode 100644 index 0000000..2dc5250 --- /dev/null +++ b/src/patches/vdr-streamdev_recordings-64.patch @@ -0,0 +1,29 @@ +diff -Naur vdr-streamdev-10db11ac.org/server/connectionHTTP.c vdr-streamdev-10db11ac/server/connectionHTTP.c +--- vdr-streamdev-10db11ac.org/server/connectionHTTP.c 2013-02-18 12:43:02.000000000 +0100 ++++ vdr-streamdev-10db11ac/server/connectionHTTP.c 2013-04-29 15:16:40.049168127 +0200 +@@ -455,11 +455,11 @@ + return NULL; + + char *p = NULL; +- unsigned long l = strtoul(FileBase, &p, 0); ++ unsigned long long l = strtoull(FileBase, &p, 0); + if (p != FileBase && l > 0L) { + if (*p == ':') { + // get recording by dev:inode +- unsigned long inode = strtoul(p + 1, &p, 0); ++ unsigned long long inode = strtoull(p + 1, &p, 0); + if (*p == 0 && inode > 0) { + struct stat st; + cThreadLock RecordingsLock(&Recordings); +diff -Naur vdr-streamdev-10db11ac.org/server/menuHTTP.c vdr-streamdev-10db11ac/server/menuHTTP.c +--- vdr-streamdev-10db11ac.org/server/menuHTTP.c 2013-02-18 12:43:02.000000000 +0100 ++++ vdr-streamdev-10db11ac/server/menuHTTP.c 2013-04-29 15:15:30.352502787 +0200 +@@ -28,7 +28,7 @@ + { + struct stat st; + if (stat(current->FileName(), &st) == 0) +- return cString::sprintf("%lu:%lu.rec", st.st_dev, st.st_ino); ++ return cString::sprintf("%llu:%llu.rec", (unsigned long long) st.st_dev, (unsigned long long) st.st_ino); + return ""; + } + diff --git a/src/scripts/consort.sh b/src/scripts/consort.sh new file mode 100644 index 0000000..1682f7a --- /dev/null +++ b/src/scripts/consort.sh @@ -0,0 +1,158 @@ +#/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +# sort conntrack table entries based on ip addresses +# @parm sort field +do_ip_sort() { + sed \ + -r \ + 's/.*src=([0-9\.]+).*dst=([0-9\.]+).*src=.*/\'$1'#\0/' $FILE_NAME \ + | sort \ + -t. \ + -k 1,1n$SORT_ORDER -k 2,2n$SORT_ORDER -k 3,3n$SORT_ORDER -k 4,4n$SORT_ORDER \ + | sed \ + -r \ + 's/.*#(.*)/\1/' +} + +# sort conntrack table entries based on port addresses +# @parm sort field +do_port_sort() { + sed \ + -r \ + 's/.*sport=([0-9]+).*dport=([0-9]+).*src=.*/\'$1'#\0/' $FILE_NAME \ + | sort \ + -t# \ + -k 1,1n$SORT_ORDER \ + | sed \ + -r \ + 's/.*#(.*)/\1/' +} + +# sort conntrack table entries based on protocol +do_protocol_sort() { + sed \ + -r \ + 's/^[0-9a-zA-Z]+[ ]+[0-9]+[ ]+([a-zA-Z0-9]+)/\1#\0/' $FILE_NAME \ + | sort \ + -t# \ + -k 1,1$SORT_ORDER \ + | sed \ + -r \ + 's/.*#(.*)/\1/' +} + +# sort conntrack table entries based on connection status +do_status_sort() { + sed \ + -r \ + 's/^[0-9a-zA-Z]+[ ]+[0-9]+[ ]+[a-zA-Z0-9]+[ ]+[0-9]+[ ]+[0-9]+[ ]+([a-zA-Z_0-9]+)[ ]+|^[0-9a-zA-Z]+[ ]+[0-9]+[ ]+[a-zA-Z0-9]+[ ]+[0-9]+[ ]+[0-9]+([ ]+)/\1#\0/' $FILE_NAME \ + | sort \ + -t# \ + -k 1,1$SORT_ORDER \ + | sed \ + -r \ + 's/.*#(.*)/\1/' +} + +# sort conntrack table entries based on connection time to life +do_ttl_sort() { + sed \ + -r \ + 's/^[0-9a-zA-Z]+[ ]+[0-9]+[ ]+[a-zA-Z0-9]+[ ]+[0-9]+[ ]+([0-9]+)[ ]+/\1#\0/' $FILE_NAME \ + | sort \ + -t# \ + -k 1,1n$SORT_ORDER \ + | sed \ + -r \ + 's/.*#(.*)/\1/' +} + +# sort conntrack table entries based on downloaded bytes +do_downloaded_bytes_sort() { + sed \ + -r \ + 's/.*src=.*bytes=([0-9]+).*src=/\1#\0/' $FILE_NAME \ + | sort \ + -t# \ + -k 1,1n$SORT_ORDER \ + | sed \ + -r \ + 's/.*#(.*)/\1/' +} + +# sort conntrack table entries based on uploaded bytes +do_uploaded_bytes_sort() { + sed \ + -r \ + 's/.*src=.*bytes=([0-9]+).*/\1#\0/' $FILE_NAME \ + | sort \ + -t# \ + -k 1,1n$SORT_ORDER \ + | sed \ + -r \ + 's/.*#(.*)/\1/' +} + +SORT_ORDER= +FILE_NAME= + +if [ $# -lt 2 ]; then + echo "Usage: consort <sort criteria 1=srcIp,2=dstIp,3=srcPort,4=dstPort,5=protocol,6=connection status> <a=ascending,d=descending> [input file]" + echo " consort.sh 1 a a.txt" + echo " cat a.txt | consort 1 d" + exit; +fi + +if [[ 'a d A D' =~ $2 ]]; then + if [[ 'd D' =~ $2 ]]; then + SORT_ORDER=r + fi +else + echo "Unknown sort order \"$2\"" + exit; +fi + +if [ $# == 3 ]; then + if [ ! -f $3 ]; then + echo "File not found." + exit; + fi + FILE_NAME=$3 +fi + +if [[ '1 2' =~ $1 ]]; then + do_ip_sort $1 +elif [[ '3 4' =~ $1 ]]; then + do_port_sort $(($1-2)) +elif [[ '5' =~ $1 ]]; then + do_protocol_sort +elif [[ '6' =~ $1 ]]; then + do_status_sort +elif [[ '7' =~ $1 ]]; then + do_ttl_sort +elif [[ '8' =~ $1 ]]; then + do_downloaded_bytes_sort +elif [[ '9' =~ $1 ]]; then + do_uploaded_bytes_sort +else + echo "Unknown sort criteria \"$1\"" +fi hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page: