diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-08-02 14:27:03 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-08-02 14:27:03 -0400 |
| commit | e34fcd2bf42dbd72ab6ce2df80f2dcaa13416e74 (patch) | |
| tree | c9639b11acb0ff6c90d774574b0392d81320e84e | |
| parent | 32c0dcc8c0d1edba5d7e418fd2dc916847a4f069 (diff) | |
| parent | f3955c0a020b39021050cd33c20a17f14fc4b579 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/devices.c
dix/property.c
include/dix.h
755 files changed, 15820 insertions, 5805 deletions
diff --git a/.gitignore b/.gitignore index 62b5fd6b4..e4b3d3199 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ install-sh libtool ltmain.sh missing +ylwrap xorg-server.pc stamp-h? do-not-use-config.h @@ -1,12 +1,2713 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. -Please submit updated COPYING files to the Xorg bugzilla: +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- +NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the XFree86 Project shall not +be used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the XFree86 Project. + + +Copyright 1997-2003 by The XFree86 Project, Inc. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Orest Zborowski and David Wexelblat +not be used in advertising or publicity pertaining to distribution of +the software without specific, written prior permission. Orest Zborowski +and David Wexelblat make no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +THE XFREE86 PROJECT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 2005 Kean Johnston +Copyright 1999 by The XFree86 Project, Inc. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of The XFree86 Project, Inc +and Kean Johnston not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior permission. +The XFree86 Project, Inc and Kean Johnston make no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +THE XFREE86 PROJECT, INC AND KEAN JOHNSTON DISCLAIM ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL THOMAS ROELL, DAVID WEXELBLAT +OR KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR +PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS +ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. + + +Copyright 1985-1998, 2001 The Open Group +Copyright 2002 Red Hat Inc., Durham, North Carolina. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + + +Copyright (c) 1987, 1989-1990, 1992-1995 X Consortium + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the X Consortium shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the X Consortium. + + +Copyright © 1999-2000 SuSE, Inc. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of SuSE not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. SuSE makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. + +SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE +BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright © 2005 Novell, Inc. + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without +fee, provided that the above copyright notice appear in all copies +and that both that copyright notice and this permission notice +appear in supporting documentation, and that the name of +Novell, Inc. not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior permission. +Novell, Inc. makes no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN +NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. +All Rights Reserved + +Permission to use, copy, modify, and distribute this +software and its documentation for any purpose and without +fee is hereby granted, provided that the above copyright no- +tice appear in all copies and that both that copyright no- +tice and this permission notice appear in supporting docu- +mentation, and that the names of Sun or X Consortium +not be used in advertising or publicity pertaining to +distribution of the software without specific prior +written permission. Sun and X Consortium make no +representations about the suitability of this software for +any purpose. It is provided "as is" without any express or +implied warranty. + +SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT- +NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE LI- +ABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR +PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH +THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. +All Rights Reserved + +Permission to use, copy, modify, and distribute this +software and its documentation for any purpose and without +fee is hereby granted, provided that the above copyright no- +tice appear in all copies and that both that copyright no- +tice and this permission notice appear in supporting docu- +mentation, and that the names of Sun or The Open Group +not be used in advertising or publicity pertaining to +distribution of the software without specific prior +written permission. Sun and The Open Group make no +representations about the suitability of this software for +any purpose. It is provided "as is" without any express or +implied warranty. + +SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FIT- +NESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE LI- +ABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR +PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH +THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright © 2006 Sun Microsystems + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Sun Microsystems not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Sun Microsystems makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1987-1991, 1993 by Digital Equipment Corporation, Maynard, Massachusetts. +Copyright 1991 Massachusetts Institute of Technology, Cambridge, Massachusetts. +Copyright 1991, 1993 Olivetti Research Limited, Cambridge, England. + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Digital not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, +Copyright 1994 Quarterdeck Office Systems. + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the names of Digital and +Quarterdeck not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. + +DIGITAL AND QUARTERDECK DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT +OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE +OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1987-1992 by Digital Equipment Corp., Maynard, MA +X11R6 Changes Copyright (c) 1994 by Robert Chesler of Absol-Puter, Hudson, NH. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Digital not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +DIGITAL AND ABSOL-PUTER DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL DIGITAL OR ABSOL-PUTER BE LIABLE FOR ANY +SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER +RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1997 Digital Equipment Corporation. +All rights reserved. + +This software is furnished under license and may be used and copied only in +accordance with the following terms and conditions. Subject to these +conditions, you may download, copy, install, use, modify and distribute +this software in source and/or binary form. No title or ownership is +transferred hereby. + +1) Any source code used, modified or distributed must reproduce and retain + this copyright notice and list of conditions as they appear in the + source file. + +2) No right is granted to use any trade name, trademark, or logo of Digital + Equipment Corporation. Neither the "Digital Equipment Corporation" + name nor any trademark or logo of Digital Equipment Corporation may be + used to endorse or promote products derived from this software without + the prior written permission of Digital Equipment Corporation. + +3) This software is provided "AS-IS" and any express or implied warranties, + including but not limited to, any implied warranties of merchantability, + fitness for a particular purpose, or non-infringement are disclaimed. + In no event shall DIGITAL be liable for any damages whatsoever, and in + particular, DIGITAL shall not be liable for special, indirect, + consequential, or incidental damages or damages for lost profits, loss + of revenue or loss of use, whether such damages arise in contract, + negligence, tort, under statute, in equity, at law or otherwise, even + if advised of the possibility of such damage. + + +Copyright (c) 1991, 1996-1997 Digital Equipment Corporation, Maynard, Massachusetts. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, +BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Digital Equipment Corporation +shall not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from Digital +Equipment Corporation. + + +Copyright (c) 1993-1997 by Silicon Graphics Computer Systems, Inc. + +Permission to use, copy, modify, and distribute this +software and its documentation for any purpose and without +fee is hereby granted, provided that the above copyright +notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution +of the software without specific prior written permission. +Silicon Graphics makes no representation about the suitability +of this software for any purpose. It is provided "as is" +without any express or implied warranty. + +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH +THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +License Applicability. Except to the extent portions of this file are +made subject to an alternative license as permitted in the SGI Free +Software License B, Version 1.1 (the "License"), the contents of this +file are subject only to the provisions of the License. You may not use +this file except in compliance with the License. You may obtain a copy +of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 +Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: + +http://oss.sgi.com/projects/FreeB + +Note that, as provided in the License, the Software is distributed on an +"AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS +DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND +CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A +PARTICULAR PURPOSE, AND NON-INFRINGEMENT. + +Original Code. The Original Code is: OpenGL Sample Implementation, +Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, +Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. +Copyright in any portions created by third parties is as indicated +elsewhere herein. All Rights Reserved. + +Additional Notice Provisions: The application programming interfaces +established by SGI in conjunction with the Original Code are The +OpenGL(R) Graphics System: A Specification (Version 1.2.1), released +April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version +1.3), released November 4, 1998; and OpenGL(R) Graphics with the X +Window System(R) (Version 1.3), released October 19, 1998. This software +was created using the OpenGL(R) version 1.2.1 Sample Implementation +published by SGI, but has not been independently verified as being +compliant with the OpenGL(R) version 1.2.1 Specification. + + +The contents of this file are subject to the GLX Public License Version 1.0 +(the "License"). You may not use this file except in compliance with the +License. You may obtain a copy of the License at Silicon Graphics, Inc., +attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043 +or at http://www.sgi.com/software/opensource/glx/license.html. + +Software distributed under the License is distributed on an "AS IS" +basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY +IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR +PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific +language governing rights and limitations under the License. + +The Original Software is GLX version 1.2 source code, released February, +1999. The developer of the Original Software is Silicon Graphics, Inc. +Those portions of the Subject Software created by Silicon Graphics, Inc. +are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved. + + +Copyright (c) 1994, 1995 Hewlett-Packard Company + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL HEWLETT-PACKARD COMPANY BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR +THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the Hewlett-Packard +Company shall not be used in advertising or otherwise to promote the +sale, use or other dealings in this Software without prior written +authorization from the Hewlett-Packard Company. + + +Copyright 1989 by Hewlett-Packard Company, Palo Alto, California. +All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Hewlett-Packard not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. +Copyright (c) 2003 by the XFree86 Project, Inc. +Copyright 2004-2005 Red Hat Inc., Raleigh, North Carolina. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation on the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + + +Copyright 2005 Red Hat, Inc. + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without +fee, provided that the above copyright notice appear in all copies +and that both that copyright notice and this permission notice +appear in supporting documentation, and that the name of Red Hat +not be used in advertising or publicity pertaining to distribution +of the software without specific, written prior permission. Red +Hat makes no representations about the suitability of this software +for any purpose. It is provided "as is" without express or implied +warranty. + +RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN +NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright (c) 2006, Red Hat, Inc. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +RED HAT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Red Hat shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from Red Hat. + + +Copyright © 2006 Red Hat, Inc + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without +fee, provided that the above copyright notice appear in all copies +and that both that copyright notice and this permission notice +appear in supporting documentation, and that the name of Red Hat, +Inc not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. Red Hat, Inc makes no representations about the +suitability of this software for any purpose. It is provided "as +is" without express or implied warranty. + +RED HAT, INC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN +NO EVENT SHALL RED HAT, INC BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright © 2006 Red Hat, Inc. +(C) Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sub license, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +RED HAT, INC, OR PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT +OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR +THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Copyright (c) 1995 X Consortium +Copyright 2004 Red Hat Inc., Durham, North Carolina. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation on the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT, THE X CONSORTIUM, +AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the X Consortium +shall not be used in advertising or otherwise to promote the sale, +use or other dealings in this Software without prior written +authorization from the X Consortium. + + +Copyright 1998-2000 Precision Insight, Inc., Cedar Park, Texas. +Copyright 2000 VA Linux Systems, Inc. +Copyright (c) 2002 Apple Computer, Inc. +Copyright (c) 2003-2004 Torrey T. Lyons. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sub license, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. +IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Copyright IBM Corporation 1987,1988,1989 +All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of IBM not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +(C) Copyright IBM Corporation 2003 +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +on the rights to use, copy, modify, merge, publish, distribute, sub +license, and/or sell copies of the Software, and to permit persons to whom +the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +VA LINUX SYSTEM, IBM AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +USE OR OTHER DEALINGS IN THE SOFTWARE. + + +(C) Copyright IBM Corporation 2004-2005 +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sub license, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +IBM, +AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + + +Copyright (c) 1997 Metro Link Incorporated + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Except as contained in this notice, the name of the Metro Link shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from Metro Link. + + +Copyright 1995-1998 by Metro Link, Inc. +Copyright (c) 1997 Matthieu Herrb + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Metro Link, Inc. not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Metro Link, Inc. makes no +representations about the suitability of this software for any purpose. + It is provided "as is" without express or implied warranty. + +METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1998 by Metro Link Incorporated + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Metro Link +Incorporated not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. Metro Link Incorporated makes no representations +about the suitability of this software for any purpose. It is +provided "as is" without express or implied warranty. + +METRO LINK INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL METRO LINK INCORPORATED BE +LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY +DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Except as contained in this notice, the name of Conectiva Linux shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from +Conectiva Linux. + + +Copyright (c) 2001, Andy Ritger aritger@nvidia.com +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +o Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +o Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. +o Neither the name of NVIDIA nor the names of its contributors + may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT +NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + + +Copyright 1992 Vrije Universiteit, The Netherlands + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided +that the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of the Vrije Universiteit not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. The Vrije Universiteit makes no +representations about the suitability of this software for any purpose. +It is provided "as is" without express or implied warranty. + +The Vrije Universiteit DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL The Vrije Universiteit BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1998 by Concurrent Computer Corporation + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Concurrent Computer +Corporation not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior +permission. Concurrent Computer Corporation makes no representations +about the suitability of this software for any purpose. It is +provided "as is" without express or implied warranty. + +CONCURRENT COMPUTER CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL CONCURRENT COMPUTER CORPORATION BE +LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY +DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +Copyright 2000 Intel Corporation. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sub license, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. +IN NO EVENT SHALL INTEL, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR +THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Copyright © 2004 Nokia + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Nokia not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Nokia makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL NOKIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1998-2003 VIA Technologies, Inc. +Copyright 2001-2003 S3 Graphics, Inc. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sub license, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + + +(c)Copyright 1988,1991 Adobe Systems Incorporated. +All rights reserved. + +Permission to use, copy, modify, distribute, and sublicense this software and its +documentation for any purpose and without fee is hereby granted, provided that +the above copyright notices appear in all copies and that both those copyright +notices and this permission notice appear in supporting documentation and that +the name of Adobe Systems Incorporated not be used in advertising or publicity +pertaining to distribution of the software without specific, written prior +permission. No trademark license to use the Adobe trademarks is hereby +granted. If the Adobe trademark "Display PostScript"(tm) is used to describe +this software, its functionality or for any other purpose, such use shall be +limited to a statement that this software works in conjunction with the Display +PostScript system. Proper trademark attribution to reflect Adobe's ownership +of the trademark shall be given whenever any such reference to the Display +PostScript system is made. + +ADOBE MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE SOFTWARE FOR ANY +PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY. ADOBE +DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON- +INFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL ADOBE BE LIABLE TO YOU +OR ANY OTHER PARTY FOR ANY SPECIAL, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY +DAMAGES WHATSOEVER WHETHER IN AN ACTION OF CONTRACT,NEGLIGENCE, STRICT +LIABILITY OR ANY OTHER ACTION ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. ADOBE WILL NOT PROVIDE ANY TRAINING OR OTHER +SUPPORT FOR THE SOFTWARE. + +Adobe, PostScript, and Display PostScript are trademarks of Adobe Systems +Incorporated which may be registered in certain jurisdictions. + + +Copyright 1989 Network Computing Devices, Inc., Mountain View, California. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided +that the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of N.C.D. not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. N.C.D. makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. + + +Copyright (c) 1987 by the Regents of the University of California + +Permission to use, copy, modify, and distribute this +software and its documentation for any purpose and without +fee is hereby granted, provided that the above copyright +notice appear in all copies. The University of California +makes no representations about the suitability of this +software for any purpose. It is provided "as is" without +express or implied warranty. + + +Copyright 1992, 1993 Data General Corporation; +Copyright 1992, 1993 OMRON Corporation + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that the +above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and that +neither the name OMRON or DATA GENERAL be used in advertising or publicity +pertaining to distribution of the software without specific, written prior +permission of the party whose name is to be used. Neither OMRON or +DATA GENERAL make any representation about the suitability of this software +for any purpose. It is provided "as is" without express or implied warranty. + +OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, +IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT +OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +OF THIS SOFTWARE. + + +Copyright © 1998-2004, 2006 Keith Packard +Copyright © 2000-2002 Keith Packard, member of The XFree86 Project, Inc. +Copyright (c) 2002 Apple Computer, Inc. +Copyright (c) 2003 Torrey T. Lyons. +All Rights Reserved. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Keith Packard not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Keith Packard makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright © 2003-2005 Keith Packard, Daniel Stone + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Keith Packard and Daniel Stone not be +used in advertising or publicity pertaining to distribution of the software +without specific, written prior permission. Keith Packard and Daniel Stone +make no representations about the suitability of this software for any +purpose. It is provided "as is" without express or implied warranty. + +KEITH PACKARD AND DANIEL STONE DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, +IN NO EVENT SHALL KEITH PACKARD OR DANIEL STONE BE LIABLE FOR ANY SPECIAL, +INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright © 1999 Keith Packard +Copyright © 2000 Compaq Computer Corporation +Copyright © 2002 MontaVista Software Inc. +Copyright © 2005 OpenedHand Ltd. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Keith Packard or Compaq not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Keith Packard and Compaq makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +KEITH PACKARD AND COMPAQ DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, +IN NO EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Michael Taht or MontaVista not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Michael Taht and Montavista make no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +MICHAEL TAHT AND MONTAVISTA DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, +IN NO EVENT SHALL EITHER BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Matthew Allum or OpenedHand not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Matthew Allum and OpenedHand make no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +MATTHEW ALLUM AND OPENEDHAND DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, +IN NO EVENT SHALL EITHER BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1993 by Davor Matic + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation. Davor Matic makes no representations about +the suitability of this software for any purpose. It is provided "as +is" without express or implied warranty. + + +(c) Copyright 1996 by Sebastien Marineau <marineau@genie.uottawa.ca> + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +HOLGER VEIT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Except as contained in this notice, the name of Sebastien Marineau shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from Sebastien Marineau. + + +Copyright (C) 2001-2004 Harold L Hunt II +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL HAROLD L HUNT II BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Harold L Hunt II +shall not be used in advertising or otherwise to promote the sale, use +or other dealings in this Software without prior written authorization +from Harold L Hunt II. + + +Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Thomas Roell not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Thomas Roell makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THOMAS ROELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany +Copyright 1993 by David Wexelblat <dwex@goblin.org> + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Thomas Roell and David Wexelblat +not be used in advertising or publicity pertaining to distribution of +the software without specific, written prior permission. Thomas Roell and +David Wexelblat makes no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +THOMAS ROELL AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL THOMAS ROELL OR DAVID WEXELBLAT BE LIABLE FOR +ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER +RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany +Copyright 1993 by David Dawes <dawes@xfree86.org> + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Thomas Roell and David Dawes +not be used in advertising or publicity pertaining to distribution of +the software without specific, written prior permission. Thomas Roell and +David Dawes makes no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +THOMAS ROELL AND DAVID DAWES DISCLAIMS ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL THOMAS ROELL OR DAVID DAWES BE LIABLE FOR +ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER +RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1990,91,92,93 by Thomas Roell, Germany. +Copyright 1991,92,93 by SGCS (Snitily Graphics Consulting Services), USA. + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and +that both that copyright notice and this permission notice appear +in supporting documentation, and that the name of Thomas Roell nor +SGCS be used in advertising or publicity pertaining to distribution +of the software without specific, written prior permission. +Thomas Roell nor SGCS makes no representations about the suitability +of this software for any purpose. It is provided "as is" without +express or implied warranty. + +THOMAS ROELL AND SGCS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL THOMAS ROELL OR SGCS BE LIABLE FOR ANY +SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER +RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 2001-2005 by Kean Johnston <jkj@sco.com> +Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany +Copyright 1993 by David Wexelblat <dwex@goblin.org> + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Thomas Roell, David Wexelblat +and Kean Johnston not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior permission. +Thomas Roell, David Wexelblat and Kean Johnston make no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +THOMAS ROELL, DAVID WEXELBLAT AND KEAN JOHNSTON DISCLAIM ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL THOMAS ROELLm DAVID WEXELBLAT +OR KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR +PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS +ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. + + +Copyright 2001-2005 by Kean Johnston <jkj@sco.com> +Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany +Copyright 1993 by David Dawes <dawes@xfree86.org> +Copyright 1993 by David Wexelblat <dwex@goblin.org> + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Thomas Roell, David Dawes +and Kean Johnston not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior permission. +Thomas Roell, David Dawes and Kean Johnston make no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +THOMAS ROELL, DAVID DAWES AND KEAN JOHNSTON DISCLAIM ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL THOMAS ROELLm DAVID WEXELBLAT +OR KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR +PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS +ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF +THIS SOFTWARE. + + +Copyright (c) 2001-2003 Torrey T. Lyons. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +TORREY T. LYONS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Except as contained in this notice, the name(s) of the above copyright +holders shall not be used in advertising or otherwise to promote the sale, +use or other dealings in this Software without prior written authorization. + + +Copyright © 2004 David Reveman + +Permission to use, copy, modify, distribute, and sell this software +and its documentation for any purpose is hereby granted without +fee, provided that the above copyright notice appear in all copies +and that both that copyright notice and this permission notice +appear in supporting documentation, and that the name of +David Reveman not be used in advertising or publicity pertaining to +distribution of the software without specific, written prior permission. +David Reveman makes no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +DAVID REVEMAN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN +NO EVENT SHALL DAVID REVEMAN BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1993 Gerrit Jan Akkerman + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Gerrit Jan Akkerman not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +GERRIT JAN AKKERMAN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, +IN NO EVENT SHALL GERRIT JAN AKKERMAN BE LIABLE FOR ANY SPECIAL, INDIRECT +OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF +USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1998 by Alan Hourihane, Wigan, England. +Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Alan Hourihane not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Alan Hourihane makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1995 Kaleb S. KEITHLEY + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES +OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Kaleb S. KEITHLEY +shall not be used in advertising or otherwise to promote the sale, use +or other dealings in this Software without prior written authorization +from Kaleb S. KEITHLEY + + +Copyright (c) 1997 Matthieu Herrb + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Matthieu Herrb not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Matthieu Herrb makes no +representations about the suitability of this software for any purpose. + It is provided "as is" without express or implied warranty. + +MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL MATTHIEU HERRB BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1993 by Thomas Mueller + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Thomas Mueller not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Thomas Mueller makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +THOMAS MUELLER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THOMAS MUELLER BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 2004, Egbert Eich + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to +deal in the Software without restriction, including without limitation the +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +EGBERT EICH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- +NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of Egbert Eich shall not +be used in advertising or otherwise to promote the sale, use or other deal- +ings in this Software without prior written authorization from Egbert Eich. + + +Copyright 1993 by David Wexelblat <dwex@goblin.org> +Copyright 2005 by Kean Johnston <jkj@sco.com> +Copyright 1993 by David McCullough <davidm@stallion.oz.au> + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of David Wexelblat not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. David Wexelblat makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL DAVID WEXELBLAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1992 by Orest Zborowski <obz@Kodak.com> +Copyright 1993 by David Wexelblat <dwex@goblin.org> + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Orest Zborowski and David Wexelblat +not be used in advertising or publicity pertaining to distribution of +the software without specific, written prior permission. Orest Zborowski +and David Wexelblat make no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +OREST ZBOROWSKI AND DAVID WEXELBLAT DISCLAIMS ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID WEXELBLAT BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1992 by Orest Zborowski <obz@Kodak.com> +Copyright 1993 by David Dawes <dawes@xfree86.org> + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Orest Zborowski and David Dawes +not be used in advertising or publicity pertaining to distribution of +the software without specific, written prior permission. Orest Zborowski +and David Dawes make no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +OREST ZBOROWSKI AND DAVID DAWES DISCLAIMS ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID DAWES BE LIABLE +FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1995-1999 by Frederic Lepied, France. <fred@sugix.frmug.fr.net> + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Frederic Lepied not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Frederic Lepied makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +FREDERIC LEPIED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL FREDERIC LEPIED BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright (C) 1999 Jeff Hartmann +Copyright (C) 1999 Precision Insight, Inc. +Copyright (C) 1999 Xi Graphics, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +JEFF HARTMANN, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE +OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Copyright 2001,2005 by Kean Johnston <jkj@sco.com> + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name Kean Johnston not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Kean Johnston makes no +representations about the suitability of this software for any purpose. +It is provided "as is" without express or implied warranty. + +KEAN JOHNSTON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF +USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1992 by Rich Murphey <Rich@Rice.edu> +Copyright 1993 by David Wexelblat <dwex@goblin.org> + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Rich Murphey and David Wexelblat +not be used in advertising or publicity pertaining to distribution of +the software without specific, written prior permission. Rich Murphey and +David Wexelblat make no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR +ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER +RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1992 by Rich Murphey <Rich@Rice.edu> +Copyright 1993 by David Dawes <dawes@xfree86.org> + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of Rich Murphey and David Dawes +not be used in advertising or publicity pertaining to distribution of +the software without specific, written prior permission. Rich Murphey and +David Dawes make no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +RICH MURPHEY AND DAVID DAWES DISCLAIM ALL WARRANTIES WITH REGARD TO +THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID DAWES BE LIABLE FOR +ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER +RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF +CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright © 2004 Franco Catrin + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Franco Catrin not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Franco Catrin makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +FRANCO CATRIN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL FRANCO CATRIN BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright © 2004 Ralph Thomas + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Ralph Thomas not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Ralph Thomas makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +RALPH THOMAS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL RALPH THOMAS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright © 2004 Damien Ciabrini + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Anders Carlsson not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Anders Carlsson makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +DAMIEN CIABRINI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL ANDERS CARLSSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright © 2003-2004 Anders Carlsson + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Anders Carlsson not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Anders Carlsson makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +ANDERS CARLSSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL ANDERS CARLSSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright (C) 2003 Anders Carlsson +Copyright © 2003-2004 Eric Anholt +Copyright © 2004 Keith Packard + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Eric Anholt not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Eric Anholt makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +ERIC ANHOLT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL ERIC ANHOLT BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 2000 Silicon Integrated Systems Corp, Inc., HsinChu, Taiwan. +Copyright 2003 Eric Anholt +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sub license, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice (including the +next paragraph) shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +ERIC ANHOLT OR SILICON INTEGRATED SYSTEMS CORP BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Copyright © 2004 PillowElephantBadgerBankPond + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of PillowElephantBadgerBankPond not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. PillowElephantBadgerBankPond makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +PillowElephantBadgerBankPond DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL PillowElephantBadgerBankPond BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 2004 by Costas Stylianou <costas.stylianou@psion.com> +44(0)7850 394095 + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Costas Sylianou not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Costas Stylianou makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +COSTAS STYLIANOU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL COSTAS STYLIANOU BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL +WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE +FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION +OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright (C) 1995 Pascal Haible. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +PASCAL HAIBLE BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Except as contained in this notice, the name of Pascal Haible shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from +Pascal Haible. + + +Copyright © 2003-2004 Philip Blundell + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Philip Blundell not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Philip Blundell makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + + +Copyright (c) 1994-2003 by The XFree86 Project, Inc. +Copyright 1997 by Metro Link, Inc. +Copyright 2003 by David H. Dawes. +Copyright 2003 by X-Oz Technologies. +Copyright (c) 2004, X.Org Foundation + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the copyright holder(s) +and author(s) shall not be used in advertising or otherwise to promote +the sale, use or other dealings in this Software without prior written +authorization from the copyright holder(s) and author(s). + + +Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany +Copyright 1993 by David Wexelblat <dwex@goblin.org> +Copyright 1999 by David Holland <davidh@iquest.net> +Copyright © 2000 Compaq Computer Corporation +Copyright © 2002 Hewlett-Packard Company +Copyright © 2004, 2005 Red Hat, Inc. +Copyright © 2004 Nicholas Miell +Copyright © 2005 Trolltech AS +Copyright © 2006 Intel Corporation + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Red Hat not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. Red Hat makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. + +THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY +SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN +AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING +OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. + 2005 Lars Knoll & Zack Rusin, Trolltech + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Keith Packard not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Keith Packard makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY +SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN +AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING +OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +Copyright 1987, 1998 The Open Group +Copyright © 1998-1999, 2001 The XFree86 Project, Inc. +Copyright © 2000 VA Linux Systems, Inc. +Copyright (c) 2000, 2001 Nokia Home Communications +Copyright 2003-2006 Sun Microsystems, Inc. +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, and/or sell copies of the Software, and to permit persons +to whom the Software is furnished to do so, provided that the above +copyright notice(s) and this permission notice appear in all copies of +the Software and that both the above copyright notice(s) and this +permission notice appear in supporting documentation. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +Except as contained in this notice, the name of a copyright holder +shall not be used in advertising or otherwise to promote the sale, use +or other dealings in this Software without prior written authorization +of the copyright holder. + + +Copyright (c) 1998-1999 Shunsuke Akiyama <akiyama@jp.FreeBSD.org>. +Copyright (c) 1998-1999 X-TrueType Server Project +Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org> +All rights reserved + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + + +Copyright 1996 by Thomas E. Dickey <dickey@clark.net> + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of the above listed +copyright holder(s) not be used in advertising or publicity pertaining +to distribution of the software without specific, written prior +permission. + +THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE +LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +(c) Copyright 1996 Hewlett-Packard Company +(c) Copyright 1996 International Business Machines Corp. +(c) Copyright 1996, 2004 Sun Microsystems, Inc. +(c) Copyright 1996 Novell, Inc. +(c) Copyright 1996 Digital Equipment Corp. +(c) Copyright 1996 Fujitsu Limited +(c) Copyright 1996 Hitachi, Ltd. +Copyright (c) 2003-2005 Roland Mainz <roland.mainz@nrubsig.org> + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the names of the copyright holders shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from said +copyright holders. + + +Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. +Copyright (c) 2001 Andreas Monitzer. +Copyright (c) 2001-2004 Greg Parker. +Copyright (c) 2001-2004 Torrey T. Lyons +Copyright (c) 2002-2003 Apple Computer, Inc. +Copyright (c) 2004-2005 Alexander Gottwald +Copyright (c) 2002-2007 Apple Inc. +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name(s) of the above copyright +holders shall not be used in advertising or otherwise to promote the sale, +use or other dealings in this Software without prior written authorization. + + +Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com> +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN +NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the author shall not be used in +advertising or otherwise to promote the sale, use or other dealings in this +Software without prior written authorization from the author. + + +Copyright © 2002 David Dawes + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Except as contained in this notice, the name of the author(s) shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from +the author(s). + + +Copyright (C) 1996-1999 SciTech Software, Inc. +Copyright (C) David Mosberger-Tang +Copyright (C) 1999 Egbert Eich + +Permission to use, copy, modify, distribute, and sell this software and +its documentation for any purpose is hereby granted without fee, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of the authors not be used +in advertising or publicity pertaining to distribution of the software +without specific, written prior permission. The authors makes no +representations about the suitability of this software for any purpose. +It is provided "as is" without express or implied warranty. + +THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF +USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright 2005-2006 Luc Verhaegen. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + + +Copyright 1995 by Robin Cutshaw <robin@XFree86.Org> +Copyright 2000 by Egbert Eich +Copyright 2002 by David Dawes + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of the above listed copyright holder(s) +not be used in advertising or publicity pertaining to distribution of +the software without specific, written prior permission. The above listed +copyright holder(s) make(s) no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE +LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY +DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER +IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING +OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 1997-2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and +that the name of Marc Aurele La France not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. Marc Aurele La France makes no representations +about the suitability of this software for any purpose. It is provided +"as-is" without express or implied warranty. + +MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO +EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +OF THIS SOFTWARE. + + +Copyright 1994 by Glenn G. Lai +All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyr notice and this permission notice appear in +supporting documentation, and that the name of Glenn G. Lai not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +Glenn G. Lai DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +Copyright (c) 1999 by Keith Packard +Copyright © 2006 Intel Corporation +Copyright 2006 Luc Verhaegen. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + + +Copyright (c) 2000-2001 by Juliusz Chroboczek +Copyright (c) 1999 by Keith Packard + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + + +Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany +Copyright 1992 by David Dawes <dawes@XFree86.org> +Copyright 1992 by Jim Tsillas <jtsilla@damon.ccs.northeastern.edu> +Copyright 1992 by Rich Murphey <Rich@Rice.edu> +Copyright 1992 by Robert Baron <Robert.Baron@ernst.mach.cs.cmu.edu> +Copyright 1992 by Orest Zborowski <obz@eskimo.com> +Copyright 1993 by Vrije Universiteit, The Netherlands +Copyright 1993 by David Wexelblat <dwex@XFree86.org> +Copyright 1994, 1996 by Holger Veit <Holger.Veit@gmd.de> +Copyright 1997 by Takis Psarogiannakopoulos <takis@dpmms.cam.ac.uk> +Copyright 1994-2003 by The XFree86 Project, Inc + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the names of the above listed copyright holders +not be used in advertising or publicity pertaining to distribution of +the software without specific, written prior permission. The above listed +copyright holders make no representations about the suitability of this +software for any purpose. It is provided "as is" without express or +implied warranty. + +THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD +TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS BE +LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY +DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER +IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING +OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + +Copyright 2001-2005 by J. Kean Johnston <jkj@sco.com> + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name J. Kean Johnston not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. J. Kean Johnston makes no +representations about the suitability of this software for any purpose. +It is provided "as is" without express or implied warranty. + +J. KEAN JOHNSTON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL J. KEAN JOHNSTON BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF +USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR +OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright (C) 2000 Jakub Jelinek (jakub@redhat.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +JAKUB JELINEK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Copyright (C) 1996 David S. Miller (davem@redhat.com) +Copyright (C) 1999 Jakub Jelinek (jj@ultra.linux.cz) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +IN THE SOFTWARE. + + +Copyright 1997,1998 by UCHIYAMA Yasushi + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of UCHIYAMA Yasushi not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. UCHIYAMA Yasushi makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +UCHIYAMA YASUSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL UCHIYAMA YASUSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + +Copyright (C) 2000 Keith Packard + 2004 Eric Anholt + 2005 Zack Rusin + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of copyright holders not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Copyright holders make no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND +FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY +SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN +AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING +OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +(C) Copyright IBM Corporation 2002-2007 +All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +on the rights to use, copy, modify, merge, publish, distribute, sub +license, and/or sell copies of the Software, and to permit persons to whom +the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +THE COPYRIGHT HOLDERS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +this permission notice appear in supporting documentation. This permission +notice shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Copyright © 2006-2007 Keith Packard + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and +that the name of the copyright holders not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. The copyright holders make no representations +about the suitability of this software for any purpose. It is provided "as +is" without express or implied warranty. + +THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE +OF THIS SOFTWARE. + + +Copyright 2006 Adam Jackson. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +on the rights to use, copy, modify, merge, publish, distribute, sub +license, and/or sell copies of the Software, and to permit persons to whom +the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + +Copyright © 2006 Daniel Stone + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + + +Copyright © 2006-2007 Daniel Stone + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + + +Copyright © 2007 Daniel Stone + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + + +Copyright © 1999 Keith Packard +Copyright © 2006 Nokia Corporation + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of the authors not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. The authors make no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. -http://lists.freedesktop.org/mailman/listinfo/xorg diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am index c4141bceb..7c1730e39 100644 --- a/GL/glx/Makefile.am +++ b/GL/glx/Makefile.am @@ -40,6 +40,7 @@ libglxdri_la_SOURCES = \ libglx_la_SOURCES = \ g_disptab.h \ + glxbyteorder.h \ glxcmds.c \ glxcmdsswap.c \ glxcontext.h \ diff --git a/GL/glx/glxcmds.c b/GL/glx/glxcmds.c index ed5c138b4..900a34798 100644 --- a/GL/glx/glxcmds.c +++ b/GL/glx/glxcmds.c @@ -1260,13 +1260,15 @@ static int ValidateCreateDrawable(ClientPtr client, ** Create a GLX Pixmap from an X Pixmap. */ int DoCreateGLXPixmap(__GLXclientState *cl, XID fbconfigId, - GLuint screenNum, XID pixmapId, XID glxPixmapId) + GLuint screenNum, XID pixmapId, XID glxPixmapId, + CARD32 *attribs, CARD32 numAttribs) { ClientPtr client = cl->client; DrawablePtr pDraw; __GLXpixmap *pGlxPixmap; __GLcontextModes *modes; - int retval; + GLenum target = 0; + int retval, i; retval = ValidateCreateDrawable (client, screenNum, fbconfigId, pixmapId, glxPixmapId, @@ -1285,11 +1287,37 @@ int DoCreateGLXPixmap(__GLXclientState *cl, XID fbconfigId, pGlxPixmap->pGlxScreen = __glXgetActiveScreen(screenNum); pGlxPixmap->pScreen = pDraw->pScreen; pGlxPixmap->idExists = True; +#ifdef XF86DRI pGlxPixmap->pDamage = NULL; +#endif pGlxPixmap->refcnt = 0; pGlxPixmap->modes = modes; + for (i = 0; i < numAttribs; i++) { + if (attribs[2 * i] == GLX_TEXTURE_TARGET_EXT) { + switch (attribs[2 * i + 1]) { + case GLX_TEXTURE_2D_EXT: + target = GL_TEXTURE_2D; + break; + case GLX_TEXTURE_RECTANGLE_EXT: + target = GL_TEXTURE_RECTANGLE_ARB; + break; + } + } + } + + if (!target) { + int w = pDraw->width, h = pDraw->height; + + if (h & (h - 1) || w & (w - 1)) + target = GL_TEXTURE_RECTANGLE_ARB; + else + target = GL_TEXTURE_2D; + } + + pGlxPixmap->target = target; + /* ** Bump the ref count on the X pixmap so it won't disappear. */ @@ -1302,14 +1330,16 @@ int __glXDisp_CreateGLXPixmap(__GLXclientState *cl, GLbyte *pc) { xGLXCreateGLXPixmapReq *req = (xGLXCreateGLXPixmapReq *) pc; return DoCreateGLXPixmap( cl, req->visual, req->screen, - req->pixmap, req->glxpixmap ); + req->pixmap, req->glxpixmap, NULL, 0 ); } int __glXDisp_CreatePixmap(__GLXclientState *cl, GLbyte *pc) { xGLXCreatePixmapReq *req = (xGLXCreatePixmapReq *) pc; return DoCreateGLXPixmap( cl, req->fbconfig, req->screen, - req->pixmap, req->glxpixmap ); + req->pixmap, req->glxpixmap, + (CARD32*)(req + 1), + req->numAttribs ); } int __glXDisp_CreateGLXPixmapWithConfigSGIX(__GLXclientState *cl, GLbyte *pc) @@ -1317,7 +1347,7 @@ int __glXDisp_CreateGLXPixmapWithConfigSGIX(__GLXclientState *cl, GLbyte *pc) xGLXCreateGLXPixmapWithConfigSGIXReq *req = (xGLXCreateGLXPixmapWithConfigSGIXReq *) pc; return DoCreateGLXPixmap( cl, req->fbconfig, req->screen, - req->pixmap, req->glxpixmap ); + req->pixmap, req->glxpixmap, NULL, 0 ); } @@ -1679,7 +1709,6 @@ DoGetDrawableAttributes(__GLXclientState *cl, XID drawId) xGLXGetDrawableAttributesReply reply; CARD32 attributes[4]; int numAttribs; - PixmapPtr pixmap; glxPixmap = (__GLXpixmap *)LookupIDByType(drawId, __glXPixmapRes); if (!glxPixmap) { @@ -1694,19 +1723,11 @@ DoGetDrawableAttributes(__GLXclientState *cl, XID drawId) reply.numAttribs = numAttribs; attributes[0] = GLX_TEXTURE_TARGET_EXT; + attributes[1] = glxPixmap->target == GL_TEXTURE_2D ? GLX_TEXTURE_2D_EXT : + GLX_TEXTURE_RECTANGLE_EXT; attributes[2] = GLX_Y_INVERTED_EXT; attributes[3] = GL_FALSE; - /* XXX this is merely less wrong, see fdo bug #8991 */ - pixmap = (PixmapPtr) glxPixmap->pDraw; - if ((pixmap->drawable.width & (pixmap->drawable.width - 1)) || - (pixmap->drawable.height & (pixmap->drawable.height - 1)) - /* || strstr(CALL_GetString(GL_EXTENSIONS, - "GL_ARB_texture_non_power_of_two")) */) - attributes[1] = GLX_TEXTURE_RECTANGLE_EXT; - else - attributes[1] = GLX_TEXTURE_2D_EXT; - if (client->swapped) { __glXSwapGetDrawableAttributesReply(client, &reply, attributes); } else { diff --git a/GL/glx/glxcmdsswap.c b/GL/glx/glxcmdsswap.c index 1857bc1eb..12bc03037 100644 --- a/GL/glx/glxcmdsswap.c +++ b/GL/glx/glxcmdsswap.c @@ -266,7 +266,7 @@ int __glXDispSwap_CreateGLXPixmap(__GLXclientState *cl, GLbyte *pc) __GLX_SWAP_INT(&req->glxpixmap); return DoCreateGLXPixmap( cl, req->visual, req->screen, - req->pixmap, req->glxpixmap ); + req->pixmap, req->glxpixmap, NULL, 0 ); } int __glXDispSwap_CreatePixmap(__GLXclientState *cl, GLbyte *pc) @@ -279,9 +279,12 @@ int __glXDispSwap_CreatePixmap(__GLXclientState *cl, GLbyte *pc) __GLX_SWAP_INT(&req->fbconfig); __GLX_SWAP_INT(&req->pixmap); __GLX_SWAP_INT(&req->glxpixmap); + __GLX_SWAP_INT(&req->numAttribs); return DoCreateGLXPixmap( cl, req->fbconfig, req->screen, - req->pixmap, req->glxpixmap ); + req->pixmap, req->glxpixmap, + (CARD32*)(req + 1), + req->numAttribs ); } int __glXDispSwap_CreateGLXPixmapWithConfigSGIX(__GLXclientState *cl, GLbyte *pc) @@ -297,7 +300,7 @@ int __glXDispSwap_CreateGLXPixmapWithConfigSGIX(__GLXclientState *cl, GLbyte *pc __GLX_SWAP_INT(&req->glxpixmap); return DoCreateGLXPixmap( cl, req->fbconfig, req->screen, - req->pixmap, req->glxpixmap ); + req->pixmap, req->glxpixmap, NULL, 0 ); } int __glXDispSwap_DestroyGLXPixmap(__GLXclientState *cl, GLbyte *pc) diff --git a/GL/glx/glxdrawable.h b/GL/glx/glxdrawable.h index 6500cc770..b7ecad929 100644 --- a/GL/glx/glxdrawable.h +++ b/GL/glx/glxdrawable.h @@ -54,6 +54,7 @@ typedef struct { ScreenPtr pScreen; Bool idExists; int refcnt; + GLenum target; #ifdef XF86DRI DamagePtr pDamage; __DRIcontext *pDRICtx; diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c index efa02f842..685683dcc 100644 --- a/GL/glx/glxdri.c +++ b/GL/glx/glxdri.c @@ -374,20 +374,13 @@ __glXDRIbindTexImage(__GLXcontext *baseContext, { RegionPtr pRegion = NULL; PixmapPtr pixmap; - int w, h, bpp, override = 0; - GLenum target, format, type; + int bpp, override = 0; + GLenum format, type; ScreenPtr pScreen = glxPixmap->pScreen; __GLXDRIscreen * const screen = (__GLXDRIscreen *) __glXgetActiveScreen(pScreen->myNum); pixmap = (PixmapPtr) glxPixmap->pDraw; - w = pixmap->drawable.width; - h = pixmap->drawable.height; - - if (h & (h - 1) || w & (w - 1)) - target = GL_TEXTURE_RECTANGLE_ARB; - else - target = GL_TEXTURE_2D; if (screen->texOffsetStart && screen->driScreen.setTexOffset) { __GLXpixmap **texOffsetOverride = screen->texOffsetOverride; @@ -416,7 +409,7 @@ alreadyin: glxPixmap->pDRICtx = &((__GLXDRIcontext*)baseContext)->driContext; - CALL_GetIntegerv(GET_DISPATCH(), (target == GL_TEXTURE_2D ? + CALL_GetIntegerv(GET_DISPATCH(), (glxPixmap->target == GL_TEXTURE_2D ? GL_TEXTURE_BINDING_2D : GL_TEXTURE_BINDING_RECTANGLE_NV, &texname)); @@ -481,7 +474,7 @@ nooverride: pixmap->drawable.y) ); CALL_TexImage2D( GET_DISPATCH(), - (target, + (glxPixmap->target, 0, bpp == 4 ? 4 : 3, pixmap->drawable.width, @@ -511,7 +504,7 @@ nooverride: pixmap->drawable.y + p[i].y1) ); CALL_TexSubImage2D( GET_DISPATCH(), - (target, + (glxPixmap->target, 0, p[i].x1, p[i].y1, p[i].x2 - p[i].x1, p[i].y2 - p[i].y1, @@ -758,9 +751,16 @@ static __DRIscreen *findScreen(__DRInativeDisplay *dpy, int scrn) static GLboolean windowExists(__DRInativeDisplay *dpy, __DRIid draw) { - WindowPtr pWin = (WindowPtr) LookupIDByType(draw, RT_WINDOW); - - return pWin == NULL ? GL_FALSE : GL_TRUE; + DrawablePtr pDrawable = (DrawablePtr) LookupIDByType(draw, RT_WINDOW); + int unused; + drm_clip_rect_t *pRects; + + return pDrawable ? DRIGetDrawableInfo(pDrawable->pScreen, pDrawable, + (unsigned*)&unused, (unsigned*)&unused, + &unused, &unused, &unused, &unused, + &unused, &pRects, &unused, &unused, + &unused, &pRects) + : GL_FALSE; } static GLboolean createContext(__DRInativeDisplay *dpy, int screen, @@ -815,10 +815,8 @@ createDrawable(__DRInativeDisplay *dpy, int screen, return GL_FALSE; __glXDRIenterServer(GL_FALSE); - retval = DRICreateDrawable(screenInfo.screens[screen], - drawable, - pDrawable, - hHWDrawable); + retval = DRICreateDrawable(screenInfo.screens[screen], __pGlxClient, + pDrawable, hHWDrawable); __glXDRIleaveServer(GL_FALSE); return retval; } @@ -834,9 +832,8 @@ destroyDrawable(__DRInativeDisplay *dpy, int screen, __DRIid drawable) return GL_FALSE; __glXDRIenterServer(GL_FALSE); - retval = DRIDestroyDrawable(screenInfo.screens[screen], - drawable, - pDrawable); + retval = DRIDestroyDrawable(screenInfo.screens[screen], __pGlxClient, + pDrawable); __glXDRIleaveServer(GL_FALSE); return retval; } @@ -927,7 +924,7 @@ getDrawableInfo(__DRInativeDisplay *dpy, int screen, *ppBackClipRects = NULL; } - return GL_TRUE; + return retval; } static int @@ -973,7 +970,6 @@ static Bool glxDRIEnterVT (int index, int flags) { __GLXDRIscreen *screen = (__GLXDRIscreen *) __glXgetActiveScreen(index); - Bool ret; LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n"); diff --git a/GL/glx/glxext.c b/GL/glx/glxext.c index c09120c12..b35175ed2 100644 --- a/GL/glx/glxext.c +++ b/GL/glx/glxext.c @@ -62,6 +62,11 @@ xGLXSingleReply __glXReply; static __GLXclientState *__glXClients[MAXCLIENTS + 1]; /* +** Client that called into GLX dispatch. +*/ +ClientPtr __pGlxClient; + +/* ** Forward declarations. */ static int __glXDispatch(ClientPtr); @@ -167,10 +172,12 @@ static int PixmapGone(__GLXpixmap *pGlxPixmap, XID id) pGlxPixmap->idExists = False; if (!pGlxPixmap->refcnt) { +#ifdef XF86DRI if (pGlxPixmap->pDamage) { DamageUnregister (pGlxPixmap->pDraw, pGlxPixmap->pDamage); DamageDestroy(pGlxPixmap->pDamage); } +#endif /* ** The DestroyPixmap routine should decrement the refcount and free ** only if it's zero. @@ -549,6 +556,8 @@ static int __glXDispatch(ClientPtr client) GLboolean rendering = opcode <= X_GLXRenderLarge; __glXleaveServer(rendering); + __pGlxClient = client; + retval = (*proc)(cl, (GLbyte *) stuff); __glXenterServer(rendering); diff --git a/GL/glx/glxext.h b/GL/glx/glxext.h index dc4cd4afe..6774e4d4c 100644 --- a/GL/glx/glxext.h +++ b/GL/glx/glxext.h @@ -80,7 +80,8 @@ extern int DoGetFBConfigs(__GLXclientState *cl, unsigned screen, extern int DoCreateContext(__GLXclientState *cl, GLXContextID gcId, GLXContextID shareList, VisualID visual, GLuint screen, GLboolean isDirect); extern int DoCreateGLXPixmap(__GLXclientState *cl, XID fbconfigId, - GLuint screenNum, XID pixmapId, XID glxpixmapId); + GLuint screenNum, XID pixmapId, XID glxpixmapId, CARD32 *attribs, + CARD32 numAttribs); extern int DoDestroyPixmap(__GLXclientState *cl, XID glxpixmapId); extern int DoQueryContext(__GLXclientState *cl, GLXContextID gcId); diff --git a/GL/glx/glxserver.h b/GL/glx/glxserver.h index fa09c1546..b6b55927e 100644 --- a/GL/glx/glxserver.h +++ b/GL/glx/glxserver.h @@ -110,6 +110,8 @@ void __glXScreenInitVisuals(__GLXscreen *screen); extern __GLXcontext *__glXLastContext; extern __GLXcontext *__glXForceCurrent(__GLXclientState*, GLXContextTag, int*); +extern ClientPtr __pGlxClient; + int __glXError(int error); /* diff --git a/GL/glx/renderpix.c b/GL/glx/renderpix.c index cd2a78d4e..2fe630193 100644 --- a/GL/glx/renderpix.c +++ b/GL/glx/renderpix.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/renderpixswap.c b/GL/glx/renderpixswap.c index 0a9f60f6f..8455807e6 100644 --- a/GL/glx/renderpixswap.c +++ b/GL/glx/renderpixswap.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/singlepix.c b/GL/glx/singlepix.c index 98898aa3a..d6b96defc 100644 --- a/GL/glx/singlepix.c +++ b/GL/glx/singlepix.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/GL/glx/singlesize.h b/GL/glx/singlesize.h index 5d25b24ce..1cce1bcbc 100644 --- a/GL/glx/singlesize.h +++ b/GL/glx/singlesize.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif diff --git a/GL/glx/xfont.c b/GL/glx/xfont.c index b24c77d44..9629cf147 100644 --- a/GL/glx/xfont.c +++ b/GL/glx/xfont.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/Makefile.am b/Makefile.am index f35539e49..e382d58e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,7 +64,17 @@ aclocal_DATA = xorg-server.m4 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xorg-server.pc -EXTRA_DIST = xorg-server.pc.in xorg-server.m4 +EXTRA_DIST = xorg-server.pc.in xorg-server.m4 ChangeLog autogen.sh + +MAINTAINERCLEANFILES=ChangeLog + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || \ + (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog DIST_SUBDIRS = \ doc \ diff --git a/XTrap/xtrapdiswp.c b/XTrap/xtrapdiswp.c index dc2a3383a..86c240362 100644 --- a/XTrap/xtrapdiswp.c +++ b/XTrap/xtrapdiswp.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /**************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991, 1992 by diff --git a/XTrap/xtrapditbl.c b/XTrap/xtrapditbl.c index 27cfc362b..db78c26e2 100644 --- a/XTrap/xtrapditbl.c +++ b/XTrap/xtrapditbl.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /**************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA diff --git a/Xext/fontcache.c b/Xext/fontcache.c index db0348144..c54340b61 100644 --- a/Xext/fontcache.c +++ b/Xext/fontcache.c @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * Id: fontcache.c,v 1.12 1999/01/31 13:47:45 akiyama Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD */ diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h index 3ad90fa84..89c754732 100644 --- a/Xext/panoramiX.h +++ b/Xext/panoramiX.h @@ -1,4 +1,3 @@ -/* $TOG: panoramiX.h /main/4 1998/03/17 06:51:02 kaleb $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c index d9c569609..7508aa773 100644 --- a/Xext/sampleEVI.c +++ b/Xext/sampleEVI.c @@ -20,7 +20,6 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86$ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/Xext/security.c b/Xext/security.c index 0d46359ec..b6df61a61 100644 --- a/Xext/security.c +++ b/Xext/security.c @@ -1292,11 +1292,7 @@ SecurityFreePropertyAccessList(void) } } /* SecurityFreePropertyAccessList */ -#ifndef __UNIXOS2__ #define SecurityIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') ) -#else -#define SecurityIsWhitespace(c) ( (c == ' ') || (c == '\t') || (c == '\n') || (c == '\r') ) -#endif static char * SecuritySkipWhitespace( @@ -1574,11 +1570,7 @@ SecurityLoadPropertyAccessList(void) if (!SecurityPolicyFile) return; -#ifndef __UNIXOS2__ f = fopen(SecurityPolicyFile, "r"); -#else - f = fopen((char*)__XOS2RedirRoot(SecurityPolicyFile), "r"); -#endif if (!f) { ErrorF("error opening security policy file %s\n", diff --git a/Xext/shmint.h b/Xext/shmint.h index 5135d1729..fc056bc72 100644 --- a/Xext/shmint.h +++ b/Xext/shmint.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/Xext/xcalibrate.c b/Xext/xcalibrate.c index e273c5313..97ef3dc38 100644 --- a/Xext/xcalibrate.c +++ b/Xext/xcalibrate.c @@ -1,6 +1,4 @@ /* - * $Id: xcalibrate.c,v 3.1 2004/06/02 20:49:50 pb Exp $ - * * Copyright © 2003 Philip Blundell * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/Xext/xvdisp.h b/Xext/xvdisp.h index 00af9858b..75cacddcc 100644 --- a/Xext/xvdisp.h +++ b/Xext/xvdisp.h @@ -1,3 +1 @@ -/* $XFree86$ */ - extern void XineramifyXv(void); diff --git a/Xi/exevents.c b/Xi/exevents.c index 9e71a9e4e..fe297ab6a 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -248,7 +248,9 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr other, int count) SetMaskForEvent(Motion_Filter(b), DeviceMotionNotify); if (!grab) if (CheckDeviceGrabs(other, xE, 0, count)) - return; + /* if a passive grab was activated, the event has been sent + * already */ + return; } else if (xE->u.u.type == DeviceButtonRelease) { if (!b) @@ -258,7 +260,7 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr other, int count) *kptr &= ~bit; if (other->valuator) other->valuator->motionHintWindow = NullWindow; - if (!--b->buttonsDown) + if (b->buttonsDown >= 1 && !--b->buttonsDown) b->motionMask = 0; xE->u.u.detail = b->map[key]; if (xE->u.u.detail == 0) diff --git a/Xi/opendev.c b/Xi/opendev.c index 4b7b6a64f..0b0671d49 100644 --- a/Xi/opendev.c +++ b/Xi/opendev.c @@ -98,7 +98,6 @@ int ProcXOpenDevice(ClientPtr client) { xInputClassInfo evbase[numInputClasses]; - Bool enableit = FALSE; int j = 0; int status = Success; xOpenDeviceReply rep; @@ -121,7 +120,6 @@ ProcXOpenDevice(ClientPtr client) SendErrorToClient(client, IReqCode, X_OpenDevice, 0, BadDevice); return Success; } - enableit = TRUE; } OpenInputDevice(dev, client, &status); @@ -129,8 +127,6 @@ ProcXOpenDevice(ClientPtr client) SendErrorToClient(client, IReqCode, X_OpenDevice, 0, status); return Success; } - if (enableit && dev->inited && dev->startup) - (void)EnableDevice(dev); rep.repType = X_Reply; rep.RepType = X_OpenDevice; diff --git a/acinclude.m4 b/acinclude.m4 index 203143214..f3d8734f3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,3 +1,36 @@ +##### http://autoconf-archive.cryp.to/ac_define_dir.html +# +# SYNOPSIS +# +# AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION]) +# +# DESCRIPTION +# +# This macro sets VARNAME to the expansion of the DIR variable, +# taking care of fixing up ${prefix} and such. +# +# VARNAME is then offered as both an output variable and a C +# preprocessor symbol. +# +# Example: +# +# AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.]) +# +# LAST MODIFICATION +# +# 2006-10-13 +# +# COPYLEFT +# +# Copyright (c) 2006 Stepan Kasal <kasal@ucw.cz> +# Copyright (c) 2006 Andreas Schwab <schwab@suse.de> +# Copyright (c) 2006 Guido U. Draheim <guidod@gmx.de> +# Copyright (c) 2006 Alexandre Oliva +# +# Copying and distribution of this file, with or without +# modification, are permitted in any medium without royalty provided +# the copyright notice and this notice are preserved. + AC_DEFUN([AC_DEFINE_DIR], [ prefix_NONE= exec_prefix_NONE= diff --git a/afb/afbbres.c b/afb/afbbres.c index e8f1b3b85..dae4746a0 100644 --- a/afb/afbbres.c +++ b/afb/afbbres.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/afb/afbbresd.c b/afb/afbbresd.c index 4495c8cf8..4f07ede6c 100644 --- a/afb/afbbresd.c +++ b/afb/afbbresd.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbbstore.c b/afb/afbbstore.c index f7f1062e2..32d64ec47 100644 --- a/afb/afbbstore.c +++ b/afb/afbbstore.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /* diff --git a/afb/afbfont.c b/afb/afbfont.c index 940bdb09b..11a449423 100644 --- a/afb/afbfont.c +++ b/afb/afbfont.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Copyright (c) 1987 X Consortium diff --git a/afb/afbmisc.c b/afb/afbmisc.c index 023c43f34..8e9c9e8e9 100644 --- a/afb/afbmisc.c +++ b/afb/afbmisc.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/afb/afbpntwin.c b/afb/afbpntwin.c index 94c96e4cf..6082f7caa 100644 --- a/afb/afbpntwin.c +++ b/afb/afbpntwin.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/cfb/cfbcppl.c b/cfb/cfbcppl.c index 91b61a711..c13baf143 100644 --- a/cfb/cfbcppl.c +++ b/cfb/cfbcppl.c @@ -1,6 +1,4 @@ /* - * $TOG: cfb8cppl.c /main/16 1998/02/09 14:04:13 kaleb $ - * Copyright 1990, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its diff --git a/cfb/cfbtab.h b/cfb/cfbtab.h index d95efd66d..60d203f90 100644 --- a/cfb/cfbtab.h +++ b/cfb/cfbtab.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif diff --git a/composite/compalloc.c b/composite/compalloc.c index ce1ef7d80..f555411bf 100644 --- a/composite/compalloc.c +++ b/composite/compalloc.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2006 Sun Microsystems * * Permission to use, copy, modify, distribute, and sell this software and its @@ -206,7 +204,7 @@ compFreeClientWindow (WindowPtr pWin, XID id) EnableMapUnmapEvents (pWin); } - if (pWin->redirectDraw) + if (pWin->redirectDraw != RedirectDrawNone) compFreePixmap (pWin); if (cw->damage) @@ -218,10 +216,11 @@ compFreeClientWindow (WindowPtr pWin, XID id) xfree (cw); } else if (cw->update == CompositeRedirectAutomatic && - !cw->damageRegistered && pWin->redirectDraw) + !cw->damageRegistered && pWin->redirectDraw != RedirectDrawNone) { DamageRegister (&pWin->drawable, cw->damage); cw->damageRegistered = TRUE; + pWin->redirectDraw = RedirectDrawAutomatic; DamageDamageRegion (&pWin->drawable, &pWin->borderSize); } if (wasMapped && !pWin->mapped) @@ -508,7 +507,11 @@ compAllocPixmap (WindowPtr pWin) if (!pPixmap) return FALSE; - pWin->redirectDraw = TRUE; + if (cw->update == CompositeRedirectAutomatic) + pWin->redirectDraw = RedirectDrawAutomatic; + else + pWin->redirectDraw = RedirectDrawManual; + compSetPixmap (pWin, pPixmap); cw->oldx = COMP_ORIGIN_INVALID; cw->oldy = COMP_ORIGIN_INVALID; @@ -543,7 +546,7 @@ compFreePixmap (WindowPtr pWin) REGION_COPY (pScreen, &pWin->borderClip, &cw->borderClip); pRedirectPixmap = (*pScreen->GetWindowPixmap) (pWin); pParentPixmap = (*pScreen->GetWindowPixmap) (pWin->parent); - pWin->redirectDraw = FALSE; + pWin->redirectDraw = RedirectDrawNone; compSetPixmap (pWin, pParentPixmap); (*pScreen->DestroyPixmap) (pRedirectPixmap); } @@ -564,7 +567,7 @@ compReallocPixmap (WindowPtr pWin, int draw_x, int draw_y, int pix_x, pix_y; int pix_w, pix_h; - assert (cw && pWin->redirectDraw); + assert (cw && pWin->redirectDraw != RedirectDrawNone); cw->oldx = pOld->screen_x; cw->oldy = pOld->screen_y; pix_x = draw_x - bw; diff --git a/composite/compext.c b/composite/compext.c index bea8bcf23..944f8d844 100644 --- a/composite/compext.c +++ b/composite/compext.c @@ -1,7 +1,4 @@ /* - * $Id$ - * - * * Copyright © 2006 Sun Microsystems * * Permission to use, copy, modify, distribute, and sell this software and its @@ -49,6 +46,9 @@ #include "compint.h" +#define SERVER_COMPOSITE_MAJOR 0 +#define SERVER_COMPOSITE_MINOR 4 + static CARD8 CompositeReqCode; static int CompositeClientPrivateIndex; RESTYPE CompositeClientWindowType; @@ -133,16 +133,12 @@ ProcCompositeQueryVersion (ClientPtr client) rep.type = X_Reply; rep.length = 0; rep.sequenceNumber = client->sequence; - if (stuff->majorVersion < COMPOSITE_MAJOR) { + if (stuff->majorVersion < SERVER_COMPOSITE_MAJOR) { rep.majorVersion = stuff->majorVersion; rep.minorVersion = stuff->minorVersion; } else { - rep.majorVersion = COMPOSITE_MAJOR; - if (stuff->majorVersion == COMPOSITE_MAJOR && - stuff->minorVersion < COMPOSITE_MINOR) - rep.minorVersion = stuff->minorVersion; - else - rep.minorVersion = COMPOSITE_MINOR; + rep.majorVersion = SERVER_COMPOSITE_MAJOR; + rep.minorVersion = SERVER_COMPOSITE_MINOR; } pCompositeClient->major_version = rep.majorVersion; pCompositeClient->minor_version = rep.minorVersion; diff --git a/composite/compinit.c b/composite/compinit.c index 27261dcad..630f1042c 100644 --- a/composite/compinit.c +++ b/composite/compinit.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2006 Sun Microsystems * * Permission to use, copy, modify, distribute, and sell this software and its @@ -201,106 +199,84 @@ Bool CompositeRegisterAlternateVisuals (ScreenPtr pScreen, VisualID *vids, return compRegisterAlternateVisuals(cs, vids, nVisuals); } -#if COMP_INCLUDE_RGB24_VISUAL -#define NUM_COMP_ALTERNATE_VISUALS 2 -#else -#define NUM_COMP_ALTERNATE_VISUALS 1 -#endif - typedef struct _alternateVisual { int depth; CARD32 format; } CompAlternateVisual; -static CompAlternateVisual altVisuals[NUM_COMP_ALTERNATE_VISUALS] = { +static CompAlternateVisual altVisuals[] = { #if COMP_INCLUDE_RGB24_VISUAL { 24, PICT_r8g8b8 }, #endif { 32, PICT_a8r8g8b8 }, }; +static const int NUM_COMP_ALTERNATE_VISUALS = sizeof(altVisuals) / + sizeof(CompAlternateVisual); + static Bool -compAddAlternateVisuals (ScreenPtr pScreen, CompScreenPtr cs) +compAddAlternateVisual(ScreenPtr pScreen, CompScreenPtr cs, + CompAlternateVisual *alt) { - VisualPtr visuals; - DepthPtr depths[NUM_COMP_ALTERNATE_VISUALS]; - PictFormatPtr pPictFormats[NUM_COMP_ALTERNATE_VISUALS]; + VisualPtr visual, visuals; int i; int numVisuals; - VisualID *vids[NUM_COMP_ALTERNATE_VISUALS]; XID *installedCmaps; ColormapPtr installedCmap; int numInstalledCmaps; - int numAlternate = 0; - int alt; - - for (alt = 0; alt < NUM_COMP_ALTERNATE_VISUALS; alt++) - { - DepthPtr depth; - PictFormatPtr pPictFormat; - - depth = compFindVisuallessDepth (pScreen, altVisuals[alt].depth); - if (!depth) - continue; - /* - * Find the right picture format - */ - pPictFormat = PictureMatchFormat (pScreen, altVisuals[alt].depth, - altVisuals[alt].format); - if (!pPictFormat) - continue; - - /* - * Allocate vid list for this depth - */ - vids[numAlternate] = xalloc (sizeof (VisualID)); - if (!vids[numAlternate]) - continue; - depths[numAlternate] = depth; - pPictFormats[numAlternate] = pPictFormat; - numAlternate++; - } - - if (!numAlternate) - return TRUE; + DepthPtr depth; + PictFormatPtr pPictFormat; + VisualID *vid; + unsigned long alphaMask; /* - * Find the installed colormaps + * The ARGB32 visual is always available. Other alternate depth visuals + * are only provided if their depth is less than the root window depth. + * There's no deep reason for this. */ + if (alt->depth >= pScreen->rootDepth && alt->depth != 32) + return FALSE; + + depth = compFindVisuallessDepth (pScreen, alt->depth); + if (!depth) + /* alt->depth doesn't exist or already has alternate visuals. */ + return TRUE; + + pPictFormat = PictureMatchFormat (pScreen, alt->depth, alt->format); + if (!pPictFormat) + return FALSE; + + vid = xalloc(sizeof(VisualID)); + if (!vid) + return FALSE; + + /* Find the installed colormaps */ installedCmaps = xalloc (pScreen->maxInstalledCmaps * sizeof (XID)); - if (!installedCmaps) - { - for (alt = 0; alt < numAlternate; alt++) - xfree (vids[alt]); + if (!installedCmaps) { + xfree(vid); return FALSE; } - numInstalledCmaps = (*pScreen->ListInstalledColormaps) (pScreen, - installedCmaps); - - /* - * realloc the visual array to fit the new one in place - */ + numInstalledCmaps = pScreen->ListInstalledColormaps(pScreen, + installedCmaps); + + /* realloc the visual array to fit the new one in place */ numVisuals = pScreen->numVisuals; - visuals = xrealloc (pScreen->visuals, - (numVisuals + numAlternate) * sizeof (VisualRec)); - if (!visuals) - { - for (alt = 0; alt < numAlternate; alt++) - xfree (vids[alt]); - xfree (installedCmaps); + visuals = xrealloc(pScreen->visuals, (numVisuals + 1) * sizeof(VisualRec)); + if (!visuals) { + xfree(vid); + xfree(installedCmaps); return FALSE; } - + /* * Fix up any existing installed colormaps -- we'll assume that * the only ones created so far have been installed. If this * isn't true, we'll have to walk the resource database looking * for all colormaps. */ - for (i = 0; i < numInstalledCmaps; i++) - { + for (i = 0; i < numInstalledCmaps; i++) { int j; - + installedCmap = LookupIDByType (installedCmaps[i], RT_COLORMAP); if (!installedCmap) continue; @@ -308,66 +284,64 @@ compAddAlternateVisuals (ScreenPtr pScreen, CompScreenPtr cs) installedCmap->pVisual = &visuals[j]; } - xfree (installedCmaps); + xfree(installedCmaps); pScreen->visuals = visuals; - pScreen->numVisuals = numVisuals + numAlternate; - - for (alt = 0; alt < numAlternate; alt++) - { - DepthPtr depth = depths[alt]; - PictFormatPtr pPictFormat = pPictFormats[alt]; - VisualPtr visual = &visuals[numVisuals + alt]; - unsigned long alphaMask; - - /* - * Initialize the visual - */ + visual = visuals + pScreen->numVisuals; /* the new one */ + pScreen->numVisuals++; + + /* Initialize the visual */ + visual->vid = FakeClientID (0); + visual->bitsPerRGBValue = 8; + if (PICT_FORMAT_TYPE(alt->format) == PICT_TYPE_COLOR) { + visual->class = PseudoColor; + visual->nplanes = PICT_FORMAT_BPP(alt->format); + visual->ColormapEntries = 1 << visual->nplanes; + } else { + DirectFormatRec *direct = &pPictFormat->direct; visual->class = TrueColor; - visual->bitsPerRGBValue = 8; - - visual->vid = FakeClientID (0); - visual->redMask = (((unsigned long) pPictFormat->direct.redMask) << - pPictFormat->direct.red); - visual->greenMask = (((unsigned long) pPictFormat->direct.greenMask) << - pPictFormat->direct.green); - visual->blueMask = (((unsigned long) pPictFormat->direct.blueMask) << - pPictFormat->direct.blue); - alphaMask = (((unsigned long) pPictFormat->direct.alphaMask) << - pPictFormat->direct.alpha); - visual->offsetRed = pPictFormat->direct.red; - visual->offsetGreen = pPictFormat->direct.green; - visual->offsetBlue = pPictFormat->direct.blue; + visual->redMask = ((unsigned long)direct->redMask) << direct->red; + visual->greenMask = ((unsigned long)direct->greenMask) << direct->green; + visual->blueMask = ((unsigned long)direct->blueMask) << direct->blue; + alphaMask = ((unsigned long)direct->alphaMask) << direct->alpha; + visual->offsetRed = direct->red; + visual->offsetGreen = direct->green; + visual->offsetBlue = direct->blue; /* * Include A bits in this (unlike GLX which includes only RGB) * This lets DIX compute suitable masks for colormap allocations */ visual->nplanes = Ones (visual->redMask | - visual->greenMask | - visual->blueMask | - alphaMask); - /* - * find widest component - */ + visual->greenMask | + visual->blueMask | + alphaMask); + /* find widest component */ visual->ColormapEntries = (1 << max (Ones (visual->redMask), - max (Ones (visual->greenMask), - Ones (visual->blueMask)))); - - /* - * remember the visual ID to detect auto-update windows - */ - compRegisterAlternateVisuals(cs, &visual->vid, 1); - - /* - * Fix up the depth - */ - vids[alt][0] = visual->vid; - depth->numVids = 1; - depth->vids = vids[alt]; + max (Ones (visual->greenMask), + Ones (visual->blueMask)))); } + + /* remember the visual ID to detect auto-update windows */ + compRegisterAlternateVisuals(cs, &visual->vid, 1); + + /* Fix up the depth */ + *vid = visual->vid; + depth->numVids = 1; + depth->vids = vid; return TRUE; } +static Bool +compAddAlternateVisuals (ScreenPtr pScreen, CompScreenPtr cs) +{ + int alt, ret = 0; + + for (alt = 0; alt < NUM_COMP_ALTERNATE_VISUALS; alt++) + ret |= compAddAlternateVisual(pScreen, cs, altVisuals + alt); + + return !!ret; +} + Bool compScreenInit (ScreenPtr pScreen) { diff --git a/composite/compint.h b/composite/compint.h index 0bd55a9a6..2c4d5c002 100644 --- a/composite/compint.h +++ b/composite/compint.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2006 Sun Microsystems * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/composite/compwindow.c b/composite/compwindow.c index fed642ec6..a4c4e6f32 100644 --- a/composite/compwindow.c +++ b/composite/compwindow.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2006 Sun Microsystems * * Permission to use, copy, modify, distribute, and sell this software and its @@ -59,10 +57,10 @@ compCheckWindow (WindowPtr pWin, pointer data) if (!pWin->parent) { - assert (!pWin->redirectDraw); + assert (pWin->redirectDraw == RedirectDrawNone); assert (pWinPixmap == pScreenPixmap); } - else if (pWin->redirectDraw) + else if (pWin->redirectDraw != RedirectDrawNone) { assert (pWinPixmap != pParentPixmap); assert (pWinPixmap != pScreenPixmap); @@ -113,7 +111,7 @@ compSetPixmapVisitWindow (WindowPtr pWindow, pointer data) CompPixmapVisitPtr pVisit = (CompPixmapVisitPtr) data; ScreenPtr pScreen = pWindow->drawable.pScreen; - if (pWindow != pVisit->pWindow && pWindow->redirectDraw) + if (pWindow != pVisit->pWindow && pWindow->redirectDraw != RedirectDrawNone) return WT_DONTWALKCHILDREN; (*pScreen->SetWindowPixmap) (pWindow, pVisit->pPixmap); /* @@ -157,7 +155,7 @@ compCheckRedirect (WindowPtr pWin) } } - if (should != pWin->redirectDraw) + if (should != (pWin->redirectDraw != RedirectDrawNone)) { if (should) return compAllocPixmap (pWin); @@ -181,10 +179,11 @@ compPositionWindow (WindowPtr pWin, int x, int y) compCheckRedirect (pWin); */ #ifdef COMPOSITE_DEBUG - if (pWin->redirectDraw != (pWin->viewable && (GetCompWindow(pWin) != NULL))) + if ((pWin->redirectDraw != RedirectDrawNone) != + (pWin->viewable && (GetCompWindow(pWin) != NULL))) abort (); #endif - if (pWin->redirectDraw) + if (pWin->redirectDraw != RedirectDrawNone) { PixmapPtr pPixmap = (*pScreen->GetWindowPixmap) (pWin); int bw = wBorderWidth (pWin); @@ -331,7 +330,7 @@ compMoveWindow (WindowPtr pWin, int x, int y, WindowPtr pSib, VTKind kind) CompScreenPtr cs = GetCompScreen (pScreen); compCheckTree (pScreen); - if (pWin->redirectDraw) + if (pWin->redirectDraw != RedirectDrawNone) { WindowPtr pParent; int draw_x, draw_y; @@ -355,7 +354,7 @@ compMoveWindow (WindowPtr pWin, int x, int y, WindowPtr pSib, VTKind kind) cs->MoveWindow = pScreen->MoveWindow; pScreen->MoveWindow = compMoveWindow; - if (pWin->redirectDraw) + if (pWin->redirectDraw != RedirectDrawNone) { CompWindowPtr cw = GetCompWindow (pWin); if (cw->pOldPixmap) @@ -376,7 +375,7 @@ compResizeWindow (WindowPtr pWin, int x, int y, CompScreenPtr cs = GetCompScreen (pScreen); compCheckTree (pScreen); - if (pWin->redirectDraw) + if (pWin->redirectDraw != RedirectDrawNone) { WindowPtr pParent; int draw_x, draw_y; @@ -397,7 +396,7 @@ compResizeWindow (WindowPtr pWin, int x, int y, (*pScreen->ResizeWindow) (pWin, x, y, w, h, pSib); cs->ResizeWindow = pScreen->ResizeWindow; pScreen->ResizeWindow = compResizeWindow; - if (pWin->redirectDraw) + if (pWin->redirectDraw != RedirectDrawNone) { CompWindowPtr cw = GetCompWindow (pWin); if (cw->pOldPixmap) @@ -416,7 +415,7 @@ compChangeBorderWidth (WindowPtr pWin, unsigned int bw) CompScreenPtr cs = GetCompScreen (pScreen); compCheckTree (pScreen); - if (pWin->redirectDraw) + if (pWin->redirectDraw != RedirectDrawNone) { WindowPtr pParent; int draw_x, draw_y; @@ -438,7 +437,7 @@ compChangeBorderWidth (WindowPtr pWin, unsigned int bw) (*pScreen->ChangeBorderWidth) (pWin, bw); cs->ChangeBorderWidth = pScreen->ChangeBorderWidth; pScreen->ChangeBorderWidth = compChangeBorderWidth; - if (pWin->redirectDraw) + if (pWin->redirectDraw != RedirectDrawNone) { CompWindowPtr cw = GetCompWindow (pWin); if (cw->pOldPixmap) @@ -482,7 +481,7 @@ compReparentWindow (WindowPtr pWin, WindowPtr pPriorParent) /* * Reset pixmap pointers as appropriate */ - if (pWin->parent && !pWin->redirectDraw) + if (pWin->parent && pWin->redirectDraw == RedirectDrawNone) compSetPixmap (pWin, (*pScreen->GetWindowPixmap) (pWin->parent)); /* * Call down to next function @@ -501,7 +500,7 @@ compCopyWindow (WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) CompScreenPtr cs = GetCompScreen (pScreen); int dx = 0, dy = 0; - if (pWin->redirectDraw) + if (pWin->redirectDraw != RedirectDrawNone) { PixmapPtr pPixmap = (*pScreen->GetWindowPixmap) (pWin); CompWindowPtr cw = GetCompWindow (pWin); @@ -626,7 +625,7 @@ compDestroyWindow (WindowPtr pWin) while ((csw = GetCompSubwindows (pWin))) FreeResource (csw->clients->id, RT_NONE); - if (pWin->redirectDraw) + if (pWin->redirectDraw != RedirectDrawNone) compFreePixmap (pWin); ret = (*pScreen->DestroyWindow) (pWin); cs->DestroyWindow = pScreen->DestroyWindow; @@ -770,7 +769,7 @@ compWindowUpdate (WindowPtr pWin) for (pChild = pWin->lastChild; pChild; pChild = pChild->prevSib) compWindowUpdate (pChild); - if (pWin->redirectDraw) + if (pWin->redirectDraw != RedirectDrawNone) { CompWindowPtr cw = GetCompWindow(pWin); diff --git a/config/Makefile.am b/config/Makefile.am index 1cc9109db..056f30ed0 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -1,10 +1,22 @@ AM_CFLAGS = @DIX_CFLAGS@ +noinst_LIBRARIES = libconfig.a +libconfig_a_SOURCES = config.c config-backends.h + +if HAVE_DBUS +AM_CFLAGS += @DBUS_CFLAGS@ +libconfig_a_SOURCES += dbus-core.c +endif + +if CONFIG_DBUS_API dbusconfigdir = $(sysconfdir)/dbus-1/system.d dbusconfig_DATA = xorg-server.conf -lib_LIBRARIES = libconfig.a +libconfig_a_SOURCES += dbus.c +endif -libconfig_a_SOURCES = config.c +if CONFIG_HAL +libconfig_a_SOURCES += hal.c +endif -EXTRA_DIST = xorg-server.conf +EXTRA_DIST = xorg-server.conf x11-input.fdi diff --git a/config/config-backends.h b/config/config-backends.h new file mode 100644 index 000000000..ce0e5e436 --- /dev/null +++ b/config/config-backends.h @@ -0,0 +1,59 @@ +/* + * Copyright © 2006-2007 Daniel Stone + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Daniel Stone <daniel@fooishbar.org> + */ + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + +#ifdef HAVE_DBUS +#include <dbus/dbus.h> + +typedef void (*config_dbus_core_connect_hook)(DBusConnection *connection, + void *data); +typedef void (*config_dbus_core_disconnect_hook)(void *data); + +struct config_dbus_core_hook { + config_dbus_core_connect_hook connect; + config_dbus_core_disconnect_hook disconnect; + void *data; + + struct config_dbus_core_hook *next; +}; + +int config_dbus_core_init(void); +void config_dbus_core_fini(void); +int config_dbus_core_add_hook(struct config_dbus_core_hook *hook); +void config_dbus_core_remove_hook(struct config_dbus_core_hook *hook); +#endif + +#ifdef CONFIG_DBUS_API +int config_dbus_init(void); +void config_dbus_fini(void); +#endif + +#ifdef CONFIG_HAL +int config_hal_init(void); +void config_hal_fini(void); +#endif diff --git a/config/config.c b/config/config.c index 9b38faf49..882b699a0 100644 --- a/config/config.c +++ b/config/config.c @@ -1,514 +1,66 @@ /* - * Copyright © 2006 Daniel Stone + * Copyright © 2006-2007 Daniel Stone * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of the copyright holders and/or authors - * not be used in advertising or publicity pertaining to distribution of the - * software without specific, written prior permission. The copyright holders - * and/or authors make no representations about the suitability of this - * software for any purpose. It is provided "as is" without express or - * implied warranty. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * THE COPYRIGHT HOLDERS AND/OR AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD - * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS AND/OR AUTHORS BE LIABLE - * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Daniel Stone <daniel@fooishbar.org> */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif -#ifdef HAVE_DBUS -#define DBUS_API_SUBJECT_TO_CHANGE -#include <dbus/dbus.h> -#include <string.h> -#include <sys/select.h> - -#include <X11/X.h> - -#include "opaque.h" /* for 'display': there has to be a better way */ - /* the above comment lies. there is no better way. */ -#include "input.h" -#include "inputstr.h" -#include "hotplug.h" #include "os.h" - -#define CONFIG_MATCH_RULE "type='method_call',interface='org.x.config.input'" - -#define MALFORMED_MSG "[config] malformed message, dropping" -#define MALFORMED_MESSAGE() { DebugF(MALFORMED_MSG "\n"); \ - ret = BadValue; \ - goto unwind; } -#define MALFORMED_MESSAGE_ERROR() { DebugF(MALFORMED_MSG ": %s, %s", \ - error->name, error->message); \ - ret = BadValue; \ - goto unwind; } - -/* How often to attempt reconnecting when we get booted off the bus. */ -#define RECONNECT_DELAY 10000 /* in ms */ - -struct config_data { - int fd; - DBusConnection *connection; - char busobject[32]; - char busname[64]; -}; - -static struct config_data *configData; - -static CARD32 configReconnect(OsTimerPtr timer, CARD32 time, pointer arg); - -static void -configWakeupHandler(pointer blockData, int err, pointer pReadMask) -{ - struct config_data *data = blockData; - - if (data->connection && FD_ISSET(data->fd, (fd_set *) pReadMask)) - dbus_connection_read_write_dispatch(data->connection, 0); -} - -static void -configBlockHandler(pointer data, struct timeval **tv, pointer pReadMask) -{ -} - -static void -configTeardown(void) -{ - if (configData) { - RemoveGeneralSocket(configData->fd); - RemoveBlockAndWakeupHandlers(configBlockHandler, configWakeupHandler, - configData); - xfree(configData); - configData = NULL; - } -} - -static int -configAddDevice(DBusMessage *message, DBusMessageIter *iter, - DBusMessage *reply, DBusMessageIter *r_iter, - DBusError *error) -{ - DBusMessageIter subiter; - InputOption *tmpo = NULL, *options = NULL; - char *tmp = NULL; - int ret = BadMatch; - DeviceIntPtr dev = NULL; - - DebugF("[config] adding device\n"); - - /* signature should be [ss][ss]... */ - options = (InputOption *) xcalloc(sizeof(InputOption), 1); - if (!options) { - ErrorF("[config] couldn't allocate option\n"); - return BadAlloc; - } - - options->key = xstrdup("_source"); - options->value = xstrdup("client/dbus"); - if(!options->key || !options->value) { - ErrorF("[config] couldn't allocate first key/value pair\n"); - ret = BadAlloc; - goto unwind; - } - - while (dbus_message_iter_get_arg_type(iter) == DBUS_TYPE_ARRAY) { - tmpo = (InputOption *) xcalloc(sizeof(InputOption), 1); - if (!tmpo) { - ErrorF("[config] couldn't allocate option\n"); - ret = BadAlloc; - goto unwind; - } - tmpo->next = options; - options = tmpo; - - dbus_message_iter_recurse(iter, &subiter); - - if (dbus_message_iter_get_arg_type(&subiter) != DBUS_TYPE_STRING) - MALFORMED_MESSAGE(); - - dbus_message_iter_get_basic(&subiter, &tmp); - if (!tmp) - MALFORMED_MESSAGE(); - if (tmp[0] == '_') { - ErrorF("[config] attempted subterfuge: option name %s given\n", - tmp); - MALFORMED_MESSAGE(); - } - options->key = xstrdup(tmp); - if (!options->key) { - ErrorF("[config] couldn't duplicate key!\n"); - ret = BadAlloc; - goto unwind; - } - - if (!dbus_message_iter_has_next(&subiter)) - MALFORMED_MESSAGE(); - dbus_message_iter_next(&subiter); - if (dbus_message_iter_get_arg_type(&subiter) != DBUS_TYPE_STRING) - MALFORMED_MESSAGE(); - - dbus_message_iter_get_basic(&subiter, &tmp); - if (!tmp) - MALFORMED_MESSAGE(); - options->value = xstrdup(tmp); - if (!options->value) { - ErrorF("[config] couldn't duplicate option!\n"); - ret = BadAlloc; - goto unwind; - } - - dbus_message_iter_next(iter); - } - - ret = NewInputDeviceRequest(options, &dev); - if (ret != Success) { - DebugF("[config] NewInputDeviceRequest failed\n"); - goto unwind; - } - - if (!dev) { - DebugF("[config] NewInputDeviceRequest succeeded, without device\n"); - ret = BadMatch; - goto unwind; - } - - if (!dbus_message_iter_append_basic(r_iter, DBUS_TYPE_INT32, &(dev->id))) { - ErrorF("[config] couldn't append to iterator\n"); - ret = BadAlloc; - goto unwind; - } - -unwind: - if (dev && ret != Success) - RemoveDevice(dev); - - while (options) { - tmpo = options; - options = options->next; - if (tmpo->key) - xfree(tmpo->key); - if (tmpo->value) - xfree(tmpo->value); - xfree(tmpo); - } - - return ret; -} - -static int -configRemoveDevice(DBusMessage *message, DBusMessageIter *iter, - DBusError *error) -{ - int deviceid = -1; - int ret = BadMatch; - DeviceIntPtr pDev = NULL; - - if (!dbus_message_get_args(message, error, DBUS_TYPE_INT32, - &deviceid, DBUS_TYPE_INVALID)) { - MALFORMED_MESSAGE_ERROR(); - } - - if (deviceid < 0 || !(pDev = LookupDeviceIntRec(deviceid))) { - DebugF("[config] bogus device id %d given\n", deviceid); - ret = BadMatch; - goto unwind; - } - - DebugF("[config] removing device %s (id %d)\n", pDev->name, deviceid); - - /* Call PIE here so we don't try to dereference a device that's - * already been removed. */ - OsBlockSignals(); - ProcessInputEvents(); - DeleteInputDeviceRequest(pDev); - OsReleaseSignals(); - - return Success; - -unwind: - return ret; -} - -static int -configListDevices(DBusMessage *message, DBusMessageIter *iter, - DBusMessage *reply, DBusMessageIter *r_iter, - DBusError *error) -{ - DeviceIntPtr d; - int ret = BadMatch; - - for (d = inputInfo.devices; d; d = d->next) { - if (!dbus_message_iter_append_basic(r_iter, DBUS_TYPE_INT32, - &(d->id))) { - ErrorF("[config] couldn't append to iterator\n"); - ret = BadAlloc; - goto unwind; - } - if (!dbus_message_iter_append_basic(r_iter, DBUS_TYPE_STRING, - &(d->name))) { - ErrorF("[config] couldn't append to iterator\n"); - ret = BadAlloc; - goto unwind; - } - } - -unwind: - return ret; -} - -static DBusHandlerResult -configMessage(DBusConnection *connection, DBusMessage *message, void *closure) -{ - DBusMessageIter iter; - DBusError error; - DBusMessage *reply; - DBusMessageIter r_iter; - DBusConnection *bus = closure; - int ret = BadDrawable; /* nonsensical value */ - - dbus_error_init(&error); - - DebugF("[config] received a message\n"); - - if (strcmp(dbus_message_get_interface(message), - "org.x.config.input") == 0) { - - if (!(reply = dbus_message_new_method_return(message))) { - ErrorF("[config] failed to create the reply message\n"); - dbus_error_free(&error); - return DBUS_HANDLER_RESULT_NEED_MEMORY; - } - dbus_message_iter_init_append(reply, &r_iter); - - /* listDevices doesn't take any arguments */ - if (strcmp(dbus_message_get_member(message), "listDevices") == 0) - ret = configListDevices(message, NULL, reply, &r_iter, &error); - else - { - if (!dbus_message_iter_init(message, &iter)) { - ErrorF("[config] failed to init iterator\n"); - dbus_message_unref(reply); - dbus_error_free(&error); - return DBUS_HANDLER_RESULT_NEED_MEMORY; /* ?? */ - } - - if (strcmp(dbus_message_get_member(message), "add") == 0) - ret = configAddDevice(message, &iter, reply, &r_iter, &error); - else if (strcmp(dbus_message_get_member(message), "remove") == 0) - ret = configRemoveDevice(message, &iter, &error); - } - - if (ret != BadDrawable && ret != BadAlloc) { - if (!strlen(dbus_message_get_signature(reply))) - { - ret = -ret; /* return errors as negative numbers */ - if (!dbus_message_iter_append_basic(&r_iter, DBUS_TYPE_INT32, &ret)) { - ErrorF("[config] couldn't append to iterator\n"); - dbus_message_unref(reply); - dbus_error_free(&error); - return DBUS_HANDLER_RESULT_HANDLED; - } - } - - if (!dbus_connection_send(bus, reply, NULL)) - ErrorF("[config] failed to send reply\n"); - } - dbus_message_unref(reply); - dbus_connection_flush(bus); - } - - dbus_error_free(&error); - - if (ret == BadAlloc) - return DBUS_HANDLER_RESULT_NEED_MEMORY; - else if (ret == BadDrawable) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - else - return DBUS_HANDLER_RESULT_HANDLED; -} - -/** - * This is a filter, which only handles the disconnected signal, which - * doesn't go to the normal message handling function. This takes - * precedence over the message handling function, so have have to be - * careful to ignore anything we don't want to deal with here. - * - * Yes, this is brutally stupid. - */ -static DBusHandlerResult -configFilter(DBusConnection *connection, DBusMessage *message, void *closure) -{ - if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, - "Disconnected")) { - ErrorF("[dbus] disconnected from bus\n"); - TimerSet(NULL, 0, RECONNECT_DELAY, configReconnect, NULL); - configTeardown(); - return DBUS_HANDLER_RESULT_HANDLED; - } - - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -} - -static Bool -configSetup(void) -{ - DBusError error; - DBusObjectPathVTable vtable = { .message_function = configMessage }; - - if (!configData) - configData = (struct config_data *) xcalloc(sizeof(struct config_data), 1); - if (!configData) { - ErrorF("[dbus] failed to allocate data struct\n"); - return FALSE; - } - - dbus_error_init(&error); - configData->connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); - if (!configData->connection || dbus_error_is_set(&error)) { - DebugF("[dbus] some kind of error occurred while connecting: %s (%s)\n", - error.name, error.message); - dbus_error_free(&error); - xfree(configData); - configData = NULL; - return FALSE; - } - - dbus_connection_set_exit_on_disconnect(configData->connection, FALSE); - - if (!dbus_connection_get_unix_fd(configData->connection, &configData->fd)) { - dbus_connection_unref(configData->connection); - ErrorF("[dbus] couldn't get fd for bus\n"); - dbus_error_free(&error); - xfree(configData); - configData = NULL; - return FALSE; - } - - snprintf(configData->busname, sizeof(configData->busname), - "org.x.config.display%d", atoi(display)); - if (!dbus_bus_request_name(configData->connection, configData->busname, - 0, &error) || dbus_error_is_set(&error)) { - ErrorF("[dbus] couldn't take over org.x.config: %s (%s)\n", - error.name, error.message); - dbus_error_free(&error); - dbus_connection_unref(configData->connection); - xfree(configData); - configData = NULL; - return FALSE; - } - - /* blocks until we get a reply. */ - dbus_bus_add_match(configData->connection, CONFIG_MATCH_RULE, &error); - if (dbus_error_is_set(&error)) { - ErrorF("[dbus] couldn't match X.Org rule: %s (%s)\n", error.name, - error.message); - dbus_error_free(&error); - dbus_bus_release_name(configData->connection, configData->busname, - &error); - dbus_connection_unref(configData->connection); - xfree(configData); - configData = NULL; - return FALSE; - } - - if (!dbus_connection_add_filter(configData->connection, configFilter, - configData, NULL)) { - - ErrorF("[dbus] couldn't add signal filter: %s (%s)\n", error.name, - error.message); - dbus_error_free(&error); - dbus_bus_release_name(configData->connection, configData->busname, - &error); - dbus_bus_remove_match(configData->connection, CONFIG_MATCH_RULE, - &error); - dbus_connection_unref(configData->connection); - xfree(configData); - configData = NULL; - return FALSE; - } - - snprintf(configData->busobject, sizeof(configData->busobject), - "/org/x/config/%d", atoi(display)); - if (!dbus_connection_register_object_path(configData->connection, - configData->busobject, &vtable, - configData->connection)) { - ErrorF("[dbus] couldn't register object path\n"); - dbus_bus_release_name(configData->connection, configData->busname, - &error); - dbus_bus_remove_match(configData->connection, CONFIG_MATCH_RULE, - &error); - dbus_connection_unref(configData->connection); - dbus_error_free(&error); - xfree(configData); - configData = NULL; - return FALSE; - } - - DebugF("[dbus] registered object path %s\n", configData->busobject); - - dbus_error_free(&error); - AddGeneralSocket(configData->fd); - - RegisterBlockAndWakeupHandlers(configBlockHandler, configWakeupHandler, - configData); - - return TRUE; -} - -static CARD32 -configReconnect(OsTimerPtr timer, CARD32 time, pointer arg) -{ - if (configSetup()) - return 0; - else - return RECONNECT_DELAY; -} - -void -configInitialise(void) -{ - TimerSet(NULL, 0, 1, configReconnect, NULL); -} +#include "hotplug.h" +#include "config-backends.h" void -configFini(void) +config_init() { - DBusError error; - - if (configData) { - dbus_error_init(&error); - dbus_connection_unregister_object_path(configData->connection, - configData->busobject); - dbus_connection_remove_filter(configData->connection, configFilter, - configData); - dbus_bus_remove_match(configData->connection, CONFIG_MATCH_RULE, - &error); - dbus_bus_release_name(configData->connection, configData->busname, - &error); - dbus_connection_unref(configData->connection); - dbus_error_free(&error); - configTeardown(); +#if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL) + if (config_dbus_core_init()) { +# ifdef CONFIG_DBUS_API + if (!config_dbus_init()) + ErrorF("[config] failed to initialise D-Bus API\n"); +# endif +# ifdef CONFIG_HAL + if (!config_hal_init()) + ErrorF("[config] failed to initialise HAL\n"); +# endif + } + else { + ErrorF("[config] failed to initialise D-Bus core\n"); } -} - -#else /* !HAVE_DBUS */ - -void -configInitialise() -{ +#endif } void -configFini() +config_fini() { +#if defined(CONFIG_DBUS_API) || defined(CONFIG_HAL) +# ifdef CONFIG_HAL + config_hal_fini(); +# endif +# ifdef CONFIG_DBUS_API + config_dbus_fini(); +# endif + config_dbus_core_fini(); +#endif } - -#endif /* HAVE_DBUS */ diff --git a/config/dbus-api b/config/dbus-api index 654c22bec..018e98657 100644 --- a/config/dbus-api +++ b/config/dbus-api @@ -1,4 +1,4 @@ -D-BUS Configuration API v0.1 +D-BUS Configuration API v2 ---------------------------- The X server will register the bus name org.x.config.displayN, and the @@ -7,6 +7,9 @@ object /org/x/config/N, where N is the display number. Currently only hotplugging of input devices is supported. org.x.config.input: + org.x.config.input.version: + Returns one unsigned int32, which is the API version. + org.x.config.input.add: Takes an argument of key/value option pairs in arrays, e.g.: [ss][ss][ss][ss] @@ -15,18 +18,18 @@ org.x.config.input: Option names beginning with _ are not allowed; they are reserved for internal use. - Returns one signed int32, which is the device id of the new device. - If the return value is a negative number, it represents the X - Status, as defined in X.h. BadMatch will be returned if the options + Returns a number of signed int32s. Positive integers are the + device IDs of new devices; negative numbers are X error codes, + as defined in X.h. BadMatch will be returned if the options given do not match any device. BadValue is returned for a malformed - message. (Example: 8 is new device id 8. -8 is BadMatch.) + message. (Example: 8 is new device ID 8; -8 is BadMatch.) Notably, BadAlloc is never returned: the server internally signals to D-BUS that the attempt failed for lack of memory. org.x.config.input.remove: - Takes one int32 argument, which is the device ID to remove, i.e.: - i + Takes one uint32 argument, which is the device ID to remove, i.e.: + u is the signature. Returns one signed int32 which represents an X status as defined in @@ -34,4 +37,4 @@ org.x.config.input: org.x.config.input.listDevices: Lists the currently active devices. No argument. - Return value is sequence of <id> <name> <id> <name> ... + Return value is sequence of [<id> <name>] [<id> <name>] ..., i.e. [us]. diff --git a/config/dbus-core.c b/config/dbus-core.c new file mode 100644 index 000000000..28881596f --- /dev/null +++ b/config/dbus-core.c @@ -0,0 +1,243 @@ +/* + * Copyright © 2006-2007 Daniel Stone + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Daniel Stone <daniel@fooishbar.org> + */ + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + +#define DBUS_API_SUBJECT_TO_CHANGE +#include <dbus/dbus.h> +#include <sys/select.h> + +#include "config-backends.h" +#include "dix.h" +#include "os.h" + +/* How often to attempt reconnecting when we get booted off the bus. */ +#define RECONNECT_DELAY (10 * 1000) /* in ms */ + +struct dbus_core_info { + int fd; + DBusConnection *connection; + OsTimerPtr timer; + struct config_dbus_core_hook *hooks; +}; +static struct dbus_core_info bus_info; + +static CARD32 reconnect_timer(OsTimerPtr timer, CARD32 time, pointer arg); + +static void +wakeup_handler(pointer data, int err, pointer read_mask) +{ + struct dbus_core_info *info = data; + + if (info->connection && FD_ISSET(info->fd, (fd_set *) read_mask)) { + do { + dbus_connection_read_write_dispatch(info->connection, 0); + } while (dbus_connection_get_dispatch_status(info->connection) == + DBUS_DISPATCH_DATA_REMAINS); + } +} + +static void +block_handler(pointer data, struct timeval **tv, pointer read_mask) +{ +} + +/** + * Disconnect (if we haven't already been forcefully disconnected), clean up + * after ourselves, and call all registered disconnect hooks. + */ +static void +teardown(void) +{ + struct config_dbus_core_hook *hook; + + if (bus_info.timer) { + TimerCancel(bus_info.timer); + bus_info.timer = NULL; + } + + /* We should really have pre-disconnect hooks and run them here, for + * completeness. But then it gets awkward, given that you can't + * guarantee that they'll be called ... */ + if (bus_info.connection) + dbus_connection_unref(bus_info.connection); + + RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, &bus_info); + RemoveGeneralSocket(bus_info.fd); + bus_info.fd = -1; + bus_info.connection = NULL; + + for (hook = bus_info.hooks; hook; hook = hook->next) { + if (hook->disconnect) + hook->disconnect(hook->data); + } +} + +/** + * This is a filter, which only handles the disconnected signal, which + * doesn't go to the normal message handling function. This takes + * precedence over the message handling function, so have have to be + * careful to ignore anything we don't want to deal with here. + */ +static DBusHandlerResult +message_filter(DBusConnection *connection, DBusMessage *message, void *data) +{ + /* If we get disconnected, then take everything down, and attempt to + * reconnect immediately (assuming it's just a restart). The + * connection isn't valid at this point, so throw it out immediately. */ + if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, + "Disconnected")) { + DebugF("[config/dbus-core] disconnected from bus\n"); + bus_info.connection = NULL; + teardown(); + + bus_info.timer = TimerSet(NULL, 0, 1, reconnect_timer, NULL); + + return DBUS_HANDLER_RESULT_HANDLED; + } + + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +} + +/** + * Attempt to connect to the system bus, and set a filter to deal with + * disconnection (see message_filter above). + * + * @return 1 on success, 0 on failure. + */ +static int +connect_to_bus(void) +{ + DBusError error; + struct config_dbus_core_hook *hook; + + dbus_error_init(&error); + bus_info.connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); + if (!bus_info.connection || dbus_error_is_set(&error)) { + DebugF("[config/dbus-core] error connecting to system bus: %s (%s)\n", + error.name, error.message); + goto err_begin; + } + + /* Thankyou. Really, thankyou. */ + dbus_connection_set_exit_on_disconnect(bus_info.connection, FALSE); + + if (!dbus_connection_get_unix_fd(bus_info.connection, &bus_info.fd)) { + ErrorF("[config/dbus-core] couldn't get fd for system bus\n"); + goto err_unref; + } + + if (!dbus_connection_add_filter(bus_info.connection, message_filter, + &bus_info, NULL)) { + ErrorF("[config/dbus-core] couldn't add filter: %s (%s)\n", error.name, + error.message); + goto err_fd; + } + + dbus_error_free(&error); + AddGeneralSocket(bus_info.fd); + + RegisterBlockAndWakeupHandlers(block_handler, wakeup_handler, &bus_info); + + for (hook = bus_info.hooks; hook; hook = hook->next) { + if (hook->connect) + hook->connect(bus_info.connection, hook->data); + } + + return 1; + +err_fd: + bus_info.fd = -1; +err_unref: + dbus_connection_unref(bus_info.connection); + bus_info.connection = NULL; +err_begin: + dbus_error_free(&error); + + return 0; +} + +static CARD32 +reconnect_timer(OsTimerPtr timer, CARD32 time, pointer arg) +{ + if (connect_to_bus()) { + bus_info.timer = NULL; + return 0; + } + else { + return RECONNECT_DELAY; + } +} + +int +config_dbus_core_add_hook(struct config_dbus_core_hook *hook) +{ + struct config_dbus_core_hook **prev; + + for (prev = &bus_info.hooks; *prev; prev = &(*prev)->next) + ; + + hook->next = NULL; + *prev = hook; + + /* If we're already connected, call the connect hook. */ + if (bus_info.connection) + hook->connect(bus_info.connection, hook->data); + + return 1; +} + +void +config_dbus_core_remove_hook(struct config_dbus_core_hook *hook) +{ + struct config_dbus_core_hook **prev; + + for (prev = &bus_info.hooks; *prev; prev = &(*prev)->next) { + if (*prev == hook) { + *prev = hook->next; + break; + } + } +} + +int +config_dbus_core_init(void) +{ + memset(&bus_info, 0, sizeof(bus_info)); + bus_info.fd = -1; + bus_info.hooks = NULL; + bus_info.connection = NULL; + bus_info.timer = TimerSet(NULL, 0, 1, reconnect_timer, NULL); + + return 1; +} + +void +config_dbus_core_fini(void) +{ + teardown(); +} diff --git a/config/dbus.c b/config/dbus.c new file mode 100644 index 000000000..c6f4af0d5 --- /dev/null +++ b/config/dbus.c @@ -0,0 +1,441 @@ +/* + * Copyright © 2006-2007 Daniel Stone + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Daniel Stone <daniel@fooishbar.org> + */ + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + +#define DBUS_API_SUBJECT_TO_CHANGE +#include <dbus/dbus.h> +#include <string.h> + +#include <X11/X.h> + +#include "config-backends.h" +#include "opaque.h" /* for 'display': there should be a better way. */ +#include "input.h" +#include "inputstr.h" + +#define API_VERSION 2 + +#define MATCH_RULE "type='method_call',interface='org.x.config.input'" + +#define MALFORMED_MSG "[config/dbus] malformed message, dropping" +#define MALFORMED_MESSAGE() { DebugF(MALFORMED_MSG "\n"); \ + ret = BadValue; \ + goto unwind; } +#define MALFORMED_MESSAGE_ERROR() { DebugF(MALFORMED_MSG ": %s, %s", \ + error->name, error->message); \ + ret = BadValue; \ + goto unwind; } + +struct connection_info { + char busobject[32]; + char busname[64]; + DBusConnection *connection; +}; + +static void +reset_info(struct connection_info *info) +{ + info->connection = NULL; + info->busname[0] = '\0'; + info->busobject[0] = '\0'; +} + +static int +add_device(DBusMessage *message, DBusMessage *reply, DBusError *error) +{ + DBusMessageIter iter, reply_iter, subiter; + InputOption *tmpo = NULL, *options = NULL; + char *tmp = NULL; + int ret, err; + DeviceIntPtr dev = NULL; + + if (!dbus_message_iter_init(message, &iter)) { + ErrorF("[config/dbus] couldn't initialise iterator\n"); + return BadAlloc; + } + dbus_message_iter_init_append(reply, &reply_iter); + + options = xcalloc(sizeof(*options), 1); + if (!options) { + ErrorF("[config/dbus] couldn't allocate option\n"); + return BadAlloc; + } + + options->key = xstrdup("_source"); + options->value = xstrdup("client/dbus"); + if (!options->key || !options->value) { + ErrorF("[config/dbus] couldn't allocate first key/value pair\n"); + ret = BadAlloc; + goto unwind; + } + + /* signature should be [ss][ss]... */ + while (dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_ARRAY) { + tmpo = xcalloc(sizeof(*tmpo), 1); + if (!tmpo) { + ErrorF("[config/dbus] couldn't allocate option\n"); + ret = BadAlloc; + goto unwind; + } + tmpo->next = options; + options = tmpo; + + dbus_message_iter_recurse(&iter, &subiter); + + if (dbus_message_iter_get_arg_type(&subiter) != DBUS_TYPE_STRING) + MALFORMED_MESSAGE(); + + dbus_message_iter_get_basic(&subiter, &tmp); + if (!tmp) + MALFORMED_MESSAGE(); + /* The _ prefix refers to internal settings, and may not be given by + * the client. */ + if (tmp[0] == '_') { + ErrorF("[config/dbus] attempted subterfuge: option name %s given\n", + tmp); + MALFORMED_MESSAGE(); + } + options->key = xstrdup(tmp); + if (!options->key) { + ErrorF("[config/dbus] couldn't duplicate key!\n"); + ret = BadAlloc; + goto unwind; + } + + if (!dbus_message_iter_has_next(&subiter)) + MALFORMED_MESSAGE(); + dbus_message_iter_next(&subiter); + if (dbus_message_iter_get_arg_type(&subiter) != DBUS_TYPE_STRING) + MALFORMED_MESSAGE(); + + dbus_message_iter_get_basic(&subiter, &tmp); + if (!tmp) + MALFORMED_MESSAGE(); + options->value = xstrdup(tmp); + if (!options->value) { + ErrorF("[config] couldn't duplicate option!\n"); + ret = BadAlloc; + goto unwind; + } + + dbus_message_iter_next(&iter); + } + + ret = NewInputDeviceRequest(options, &dev); + if (ret != Success) { + DebugF("[config/dbus] NewInputDeviceRequest failed\n"); + goto unwind; + } + + if (!dev) { + DebugF("[config/dbus] NewInputDeviceRequest provided no device\n"); + ret = BadImplementation; + goto unwind; + } + + /* XXX: If we fail halfway through, we don't seem to have any way to + * empty the iterator, so you'll end up with some device IDs, + * plus an error. This seems to be a shortcoming in the D-Bus + * API. */ + for (; dev; dev = dev->next) { + if (!dbus_message_iter_append_basic(&reply_iter, DBUS_TYPE_INT32, + &dev->id)) { + ErrorF("[config/dbus] couldn't append to iterator\n"); + ret = BadAlloc; + goto unwind; + } + } + +unwind: + if (ret != Success) { + if (dev) + RemoveDevice(dev); + + err = -ret; + dbus_message_iter_append_basic(&reply_iter, DBUS_TYPE_INT32, &err); + } + + while (options) { + tmpo = options; + options = options->next; + if (tmpo->key) + xfree(tmpo->key); + if (tmpo->value) + xfree(tmpo->value); + xfree(tmpo); + } + + return ret; +} + +static int +remove_device(DBusMessage *message, DBusMessage *reply, DBusError *error) +{ + int deviceid, ret, err; + DeviceIntPtr dev; + DBusMessageIter iter, reply_iter; + + if (!dbus_message_iter_init(message, &iter)) { + ErrorF("[config] failed to init iterator\n"); + return BadAlloc; + } + dbus_message_iter_init_append(reply, &reply_iter); + + if (!dbus_message_get_args(message, error, DBUS_TYPE_UINT32, + &deviceid, DBUS_TYPE_INVALID)) { + MALFORMED_MESSAGE_ERROR(); + } + + dev = LookupDeviceIntRec(deviceid); + if (!dev) { + DebugF("[config] bogus device id %d given\n", deviceid); + ret = BadMatch; + goto unwind; + } + + DebugF("[config] removing device %s (id %d)\n", dev->name, deviceid); + + /* Call PIE here so we don't try to dereference a device that's + * already been removed. */ + OsBlockSignals(); + ProcessInputEvents(); + DeleteInputDeviceRequest(dev); + OsReleaseSignals(); + + ret = Success; + +unwind: + err = (ret == Success) ? ret : -ret; + dbus_message_iter_append_basic(&reply_iter, DBUS_TYPE_INT32, &err); + + return ret; +} + +static int +list_devices(DBusMessage *message, DBusMessage *reply, DBusError *error) +{ + DeviceIntPtr dev; + DBusMessageIter iter, subiter; + + dbus_message_iter_init_append(reply, &iter); + + for (dev = inputInfo.devices; dev; dev = dev->next) { + if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_STRUCT, NULL, + &subiter)) { + ErrorF("[config/dbus] couldn't init container\n"); + return BadAlloc; + } + if (!dbus_message_iter_append_basic(&subiter, DBUS_TYPE_UINT32, + &dev->id)) { + ErrorF("[config/dbus] couldn't append to iterator\n"); + return BadAlloc; + } + if (!dbus_message_iter_append_basic(&subiter, DBUS_TYPE_STRING, + &dev->name)) { + ErrorF("[config/dbus] couldn't append to iterator\n"); + return BadAlloc; + } + if (!dbus_message_iter_close_container(&iter, &subiter)) { + ErrorF("[config/dbus] couldn't close container\n"); + return BadAlloc; + } + } + + return Success; +} + +static int +get_version(DBusMessage *message, DBusMessage *reply, DBusError *error) +{ + DBusMessageIter iter; + unsigned int version = API_VERSION; + + dbus_message_iter_init_append(reply, &iter); + if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_UINT32, &version)) { + ErrorF("[config/dbus] couldn't append version\n"); + return BadAlloc; + } + + return Success; +} + +static DBusHandlerResult +message_handler(DBusConnection *connection, DBusMessage *message, void *data) +{ + DBusError error; + DBusMessage *reply; + struct connection_info *info = data; + + /* ret is the overall D-Bus handler result, whereas err is the internal + * X error from our individual functions. */ + int ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + int err; + + DebugF("[config/dbus] received a message for %s\n", + dbus_message_get_interface(message)); + + dbus_error_init(&error); + + reply = dbus_message_new_method_return(message); + if (!reply) { + ErrorF("[config/dbus] failed to create reply\n"); + ret = DBUS_HANDLER_RESULT_NEED_MEMORY; + goto err_start; + } + + if (strcmp(dbus_message_get_member(message), "add") == 0) + err = add_device(message, reply, &error); + else if (strcmp(dbus_message_get_member(message), "remove") == 0) + err = remove_device(message, reply, &error); + else if (strcmp(dbus_message_get_member(message), "listDevices") == 0) + err = list_devices(message, reply, &error); + else if (strcmp(dbus_message_get_member(message), "version") == 0) + err = get_version(message, reply, &error); + else + goto err_reply; + + /* Failure to allocate is a special case. */ + if (err == BadAlloc) { + ret = DBUS_HANDLER_RESULT_NEED_MEMORY; + goto err_reply; + } + + /* While failure here is always an OOM, we don't return that, + * since that would result in devices being double-added/removed. */ + if (dbus_connection_send(info->connection, reply, NULL)) + dbus_connection_flush(info->connection); + else + ErrorF("[config/dbus] failed to send reply\n"); + + ret = DBUS_HANDLER_RESULT_HANDLED; + +err_reply: + dbus_message_unref(reply); +err_start: + dbus_error_free(&error); + + return ret; +} + +static void +connect_hook(DBusConnection *connection, void *data) +{ + DBusError error; + DBusObjectPathVTable vtable = { .message_function = message_handler, }; + struct connection_info *info = data; + + info->connection = connection; + + dbus_error_init(&error); + + if (!dbus_bus_request_name(info->connection, info->busname, + 0, &error)) { + ErrorF("[config/dbus] couldn't take over org.x.config: %s (%s)\n", + error.name, error.message); + goto err_start; + } + + /* blocks until we get a reply. */ + dbus_bus_add_match(info->connection, MATCH_RULE, &error); + if (dbus_error_is_set(&error)) { + ErrorF("[config/dbus] couldn't add match: %s (%s)\n", error.name, + error.message); + goto err_name; + } + + if (!dbus_connection_register_object_path(info->connection, + info->busobject, &vtable, + info)) { + ErrorF("[config/dbus] couldn't register object path\n"); + goto err_match; + } + + DebugF("[dbus] registered %s, %s\n", info->busname, info->busobject); + + dbus_error_free(&error); + + return; + +err_match: + dbus_bus_remove_match(info->connection, MATCH_RULE, &error); +err_name: + dbus_bus_release_name(info->connection, info->busname, &error); +err_start: + dbus_error_free(&error); + + reset_info(info); +} + +static void +disconnect_hook(void *data) +{ + struct connection_info *info = data; + + reset_info(info); +} + +#if 0 +void +pre_disconnect_hook(void) +{ + DBusError error; + + dbus_error_init(&error); + dbus_connection_unregister_object_path(connection_data->connection, + connection_data->busobject); + dbus_bus_remove_match(connection_data->connection, MATCH_RULE, + &error); + dbus_bus_release_name(connection_data->connection, + connection_data->busname, &error); + dbus_error_free(&error); +} +#endif + +static struct connection_info connection_data; +static struct config_dbus_core_hook core_hook = { + .connect = connect_hook, + .disconnect = disconnect_hook, + .data = &connection_data, +}; + +int +config_dbus_init(void) +{ + snprintf(connection_data.busname, sizeof(connection_data.busname), + "org.x.config.display%d", atoi(display)); + snprintf(connection_data.busobject, sizeof(connection_data.busobject), + "/org/x/config/%d", atoi(display)); + + return config_dbus_core_add_hook(&core_hook); +} + +void +config_dbus_fini(void) +{ + config_dbus_core_remove_hook(&core_hook); +} diff --git a/config/hal.c b/config/hal.c new file mode 100644 index 000000000..f29ba9213 --- /dev/null +++ b/config/hal.c @@ -0,0 +1,371 @@ +/* + * Copyright © 2007 Daniel Stone + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Daniel Stone <daniel@fooishbar.org> + */ + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + +#include <dbus/dbus.h> +#include <hal/libhal.h> +#include <string.h> +#include <sys/select.h> + +#include "input.h" +#include "inputstr.h" +#include "hotplug.h" +#include "config-backends.h" +#include "os.h" + +#define TYPE_NONE 0 +#define TYPE_KEYS 1 +#define TYPE_POINTER 2 + +struct config_hal_info { + DBusConnection *system_bus; + LibHalContext *hal_ctx; +}; + +static void +remove_device(DeviceIntPtr dev) +{ + DebugF("[config/hal] removing device %s\n", dev->name); + + /* Call PIE here so we don't try to dereference a device that's + * already been removed. */ + OsBlockSignals(); + ProcessInputEvents(); + DeleteInputDeviceRequest(dev); + OsReleaseSignals(); +} + +static void +device_removed(LibHalContext *ctx, const char *udi) +{ + DeviceIntPtr dev; + char *value; + + value = xalloc(strlen(udi) + 5); /* "hal:" + NULL */ + if (!value) + return; + sprintf(value, "hal:%s", udi); + + for (dev = inputInfo.devices; dev; dev = dev->next) { + if (dev->config_info && strcmp(dev->config_info, value) == 0) + remove_device(dev); + } + for (dev = inputInfo.off_devices; dev; dev = dev->next) { + if (dev->config_info && strcmp(dev->config_info, value) == 0) + remove_device(dev); + } + + xfree(value); +} + +static void +add_option(InputOption **options, const char *key, const char *value) +{ + if (!value || *value == '\0') + return; + + for (; *options; options = &(*options)->next) + ; + *options = xcalloc(sizeof(**options), 1); + (*options)->key = xstrdup(key); + (*options)->value = xstrdup(value); + (*options)->next = NULL; +} + +static char * +get_prop_string(LibHalContext *hal_ctx, const char *udi, const char *name, + DBusError *error) +{ + char *prop, *ret; + + prop = libhal_device_get_property_string(hal_ctx, udi, name, error); + DebugF(" [config/hal] getting %s on %s returned %s\n", name, udi, prop); + if (prop) { + ret = xstrdup(prop); + libhal_free_string(prop); + } + else { + return NULL; + } + + return ret; +} + +static char * +get_prop_string_array(LibHalContext *hal_ctx, const char *udi, const char *prop, + DBusError *error) +{ + char **props, *ret, *str; + int i, len = 0; + + props = libhal_device_get_property_strlist(hal_ctx, udi, prop, error); + if (props) { + for (i = 0; props[i]; i++) + len += strlen(props[i]); + + ret = xcalloc(sizeof(char), len + i); /* i - 1 commas, 1 NULL */ + if (!ret) { + libhal_free_string_array(props); + return NULL; + } + + str = ret; + for (i = 0; props[i]; i++) { + str = strcpy(str, props[i]); + *str++ = ','; + } + *str = '\0'; + + libhal_free_string_array(props); + } + else { + return NULL; + } + + return ret; +} + +static void +device_added(LibHalContext *hal_ctx, const char *udi) +{ + char **props; + char *path = NULL, *driver = NULL, *name = NULL, *xkb_rules = NULL; + char *xkb_model = NULL, *xkb_layout = NULL, *xkb_variant = NULL; + char *xkb_options = NULL, *config_info = NULL; + InputOption *options = NULL; + DeviceIntPtr dev; + DBusError error; + int type = TYPE_NONE; + int i; + + dbus_error_init(&error); + + props = libhal_device_get_property_strlist(hal_ctx, udi, + "info.capabilities", &error); + if (!props) { + DebugF("[config/hal] couldn't get capabilities for %s: %s (%s)\n", + udi, error.name, error.message); + goto out_error; + } + for (i = 0; props[i]; i++) { + /* input.keys is the new, of which input.keyboard is a subset, but + * input.keyboard is the old 'we have keys', so we have to keep it + * around. */ + if (strcmp(props[i], "input.keys") == 0 || + strcmp(props[i], "input.keyboard") == 0) + type |= TYPE_KEYS; + if (strcmp(props[i], "input.mouse") == 0) + type |= TYPE_POINTER; + } + libhal_free_string_array(props); + + if (type == TYPE_NONE) + goto out_error; + + driver = get_prop_string(hal_ctx, udi, "input.x11_driver", &error); + path = get_prop_string(hal_ctx, udi, "input.device", &error); + if (!driver || !path) { + DebugF("[config/hal] no driver or path specified for %s\n", udi); + goto unwind; + } + name = get_prop_string(hal_ctx, udi, "info.product", &error); + if (!name) + name = xstrdup("(unnamed)"); + + if (type & TYPE_KEYS) { + xkb_rules = get_prop_string(hal_ctx, udi, "input.xkb_rules", &error); + xkb_model = get_prop_string(hal_ctx, udi, "input.xkb_model", &error); + xkb_layout = get_prop_string(hal_ctx, udi, "input.xkb_layout", &error); + xkb_variant = get_prop_string(hal_ctx, udi, "input.xkb_variant", + &error); + xkb_options = get_prop_string_array(hal_ctx, udi, "input.xkb_options", + &error); + } + + options = xcalloc(sizeof(*options), 1); + options->key = xstrdup("_source"); + options->value = xstrdup("server/hal"); + if (!options->key || !options->value) { + ErrorF("[config] couldn't allocate first key/value pair\n"); + goto unwind; + } + + add_option(&options, "path", path); + add_option(&options, "driver", driver); + add_option(&options, "name", name); + config_info = xalloc(strlen(udi) + 5); /* "hal:" and NULL */ + if (!config_info) + goto unwind; + sprintf(config_info, "hal:%s", udi); + + if (xkb_model) + add_option(&options, "xkb_model", xkb_model); + if (xkb_layout) + add_option(&options, "xkb_layout", xkb_layout); + if (xkb_variant) + add_option(&options, "xkb_variant", xkb_variant); + if (xkb_options) + add_option(&options, "xkb_options", xkb_options); + + if (NewInputDeviceRequest(options, &dev) != Success) { + DebugF("[config/hal] NewInputDeviceRequest failed\n"); + goto unwind; + } + + for (; dev; dev = dev->next) + dev->config_info = xstrdup(config_info); + +unwind: + if (path) + xfree(path); + if (driver) + xfree(driver); + if (name) + xfree(name); + if (xkb_rules) + xfree(xkb_rules); + if (xkb_model) + xfree(xkb_model); + if (xkb_layout) + xfree(xkb_layout); + if (xkb_options) + xfree(xkb_options); + if (config_info) + xfree(config_info); + +out_error: + dbus_error_free(&error); + + return; +} + +static void +disconnect_hook(void *data) +{ + DBusError error; + struct config_hal_info *info = data; + + if (info->hal_ctx) { + dbus_error_init(&error); + if (!libhal_ctx_shutdown(info->hal_ctx, &error)) + DebugF("[config/hal] couldn't shut down context?\n"); + libhal_ctx_free(info->hal_ctx); + dbus_error_free(&error); + } + + info->hal_ctx = NULL; + info->system_bus = NULL; +} + +static void +connect_hook(DBusConnection *connection, void *data) +{ + DBusError error; + struct config_hal_info *info = data; + char **devices; + int num_devices, i; + + info->system_bus = connection; + + dbus_error_init(&error); + + if (!info->hal_ctx) + info->hal_ctx = libhal_ctx_new(); + if (!info->hal_ctx) { + ErrorF("[config/hal] couldn't create HAL context\n"); + goto out_err; + } + + if (!libhal_ctx_set_dbus_connection(info->hal_ctx, info->system_bus)) { + ErrorF("[config/hal] couldn't associate HAL context with bus\n"); + goto out_ctx; + } + if (!libhal_ctx_init(info->hal_ctx, &error)) { + ErrorF("[config/hal] couldn't initialise context: %s (%s)\n", + error.name, error.message); + goto out_ctx; + } + if (!libhal_device_property_watch_all(info->hal_ctx, &error)) { + ErrorF("[config/hal] couldn't watch all properties: %s (%s)\n", + error.name, error.message); + goto out_ctx2; + } + libhal_ctx_set_device_added(info->hal_ctx, device_added); + libhal_ctx_set_device_removed(info->hal_ctx, device_removed); + + devices = libhal_find_device_by_capability(info->hal_ctx, "input", + &num_devices, &error); + for (i = 0; i < num_devices; i++) + device_added(info->hal_ctx, devices[i]); + libhal_free_string_array(devices); + + dbus_error_free(&error); + + return; + +out_ctx2: + if (!libhal_ctx_shutdown(info->hal_ctx, &error)) + DebugF("[config/hal] couldn't shut down context?\n"); +out_ctx: + libhal_ctx_free(info->hal_ctx); +out_err: + dbus_error_free(&error); + + info->hal_ctx = NULL; + info->system_bus = NULL; + + return; +} + +static struct config_hal_info hal_info; +static struct config_dbus_core_hook hook = { + .connect = connect_hook, + .disconnect = disconnect_hook, + .data = &hal_info, +}; + +int +config_hal_init(void) +{ + memset(&hal_info, 0, sizeof(hal_info)); + hal_info.system_bus = NULL; + hal_info.hal_ctx = NULL; + + if (!config_dbus_core_add_hook(&hook)) { + ErrorF("[config/hal] failed to add D-Bus hook\n"); + return 0; + } + + return 1; +} + +void +config_hal_fini(void) +{ + config_dbus_core_remove_hook(&hook); +} diff --git a/config/x11-input.fdi b/config/x11-input.fdi new file mode 100644 index 000000000..c0e636f93 --- /dev/null +++ b/config/x11-input.fdi @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<deviceinfo version="0.2"> + <device> + <!-- FIXME: Support tablets too. --> + <match key="info.capabilities" contains="input.mouse"> + <merge key="input.x11_driver" type="string">mouse</merge> + <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" + string="Linux"> + <merge key="input.x11_driver" type="string">evdev</merge> + </match> + </match> + + <match key="info.capabilities" contains="input.keys"> + <merge key="input.xkb_rules" type="string">base</merge> + + <!-- If we're using Linux, we use evdev by default (falling back to + keyboard otherwise). --> + <merge key="input.x11_driver" type="string">keyboard</merge> + <merge key="input.xkb_model" type="string">keyboard</merge> + <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" + string="Linux"> + <merge key="input.x11_driver" type="string">evdev</merge> + <merge key="input.xkb_model" type="string">evdev</merge> + </match> + + <merge key="input.xkb_layout" type="string">us</merge> + + <merge key="input.xkb_variant" type="string" /> + </match> + </device> +</deviceinfo> diff --git a/configure.ac b/configure.ac index a6637db89..2af3114b6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,31 +1,34 @@ -dnl $Id$ +dnl Copyright © 2003-2007 Keith Packard, Daniel Stone dnl -dnl Copyright © 2003-2005 Keith Packard, Daniel Stone +dnl Permission is hereby granted, free of charge, to any person obtaining a +dnl copy of this software and associated documentation files (the "Software"), +dnl to deal in the Software without restriction, including without limitation +dnl the rights to use, copy, modify, merge, publish, distribute, sublicense, +dnl and/or sell copies of the Software, and to permit persons to whom the +dnl Software is furnished to do so, subject to the following conditions: dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation, and that the names of Keith Packard and Daniel Stone not be -dnl used in advertising or publicity pertaining to distribution of the software -dnl without specific, written prior permission. Keith Packard and Daniel Stone -dnl make no representations about the suitability of this software for any -dnl purpose. It is provided "as is" without express or implied warranty. +dnl The above copyright notice and this permission notice (including the next +dnl paragraph) shall be included in all copies or substantial portions of the +dnl Software. dnl -dnl KEITH PACKARD AND DANIEL STONE DISCLAIM ALL WARRANTIES WITH REGARD TO THIS -dnl SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, -dnl IN NO EVENT SHALL KEITH PACKARD OR DANIEL STONE BE LIABLE FOR ANY SPECIAL, -dnl INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -dnl LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -dnl OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -dnl PERFORMANCE OF THIS SOFTWARE. +dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +dnl DEALINGS IN THE SOFTWARE. +dnl +dnl Authors: Keith Packard <keithp@keithp.com> +dnl Daniel Stone <daniel@fooishbar.org> +dnl an unwitting cast of miscellaneous others dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) dnl This is the not the Xorg version number, it's the server version number. dnl Yes, that's weird. -AC_INIT([xorg-server], 1.3.99.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +AC_INIT([xorg-server], 1.3.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE @@ -362,19 +365,6 @@ case $host_os in esac AM_CONDITIONAL(KDRIVE_HW, test "x$KDRIVE_HW" = xyes) -AC_MSG_CHECKING(for MMX capable platform) -if test "x$use_x86_asm" = xyes && test "x$GCC" = xyes ; then - AC_PREPROC_IFELSE([ -#if (!defined (__GNUC__) || __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)) - #error Not supported -#endif -], mmx_capable=yes, mmx_capable=no) -else - mmx_capable=no -fi -AC_MSG_RESULT([$mmx_capable]) -AM_CONDITIONAL(MMX_CAPABLE, [test "x$mmx_capable" = xyes]) - DEFAULT_VENDOR_NAME="The X.Org Foundation" DEFAULT_VENDOR_NAME_SHORT="X.Org" DEFAULT_VERSION_MAJOR=7 @@ -533,7 +523,8 @@ AC_ARG_ENABLE(fontcache, AS_HELP_STRING([--enable-fontcache], [Build FontCa AC_ARG_ENABLE(dbe, AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes]) AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: enabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=yes]) AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) -AC_ARG_ENABLE(dbus, AS_HELP_STRING([--disable-dbus], [Build D-BUS support (default: auto)]), [DBUS=$enableval], [DBUS=auto]) +AC_ARG_ENABLE(config-dbus, AS_HELP_STRING([--enable-config-dbus], [Build D-BUS API support (default: no)]), [CONFIG_DBUS_API=$enableval], [CONFIG_DBUS_API=no]) +AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto]) AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) dnl DDXes. @@ -627,23 +618,53 @@ XEXT_INC='-I$(top_srcdir)/Xext' XEXT_LIB='$(top_builddir)/Xext/libXext.la' XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' -PIXMAN="[pixman >= 0.9.1]" +PIXMAN="[pixman >= 0.9.2]" dnl Core modules for most extensions, et al. REQUIRED_MODULES="[randrproto >= 1.2] renderproto [fixesproto >= 4.0] [damageproto >= 1.1] xcmiscproto xextproto [xproto >= 7.0.9] xtrans [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto [inputproto >= 1.4.2] [kbproto >= 1.0.3]" REQUIRED_LIBS="xfont xau fontenc $PIXMAN" -if test "x$DBUS" = xauto; then - PKG_CHECK_MODULES(DBUS, dbus-1, [DBUS=yes], [DBUS=no]) +dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas +dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config +dnl API. +PKG_CHECK_MODULES(DBUS, dbus-1, [HAVE_DBUS=yes], [HAVE_DBUS=no]) +if test "x$HAVE_DBUS" = xyes; then + AC_DEFINE(HAVE_DBUS, 1, [Have D-Bus support]) +fi +AM_CONDITIONAL(HAVE_DBUS, [test "x$HAVE_DBUS" = xyes]) + +if test "x$CONFIG_DBUS_API" = xauto; then + CONFIG_DBUS_API="$HAVE_DBUS" +fi +if test "x$CONFIG_DBUS_API" = xyes; then + if ! test "x$HAVE_DBUS" = xyes; then + AC_MSG_ERROR([D-Bus configuration API requested, but D-Bus is not installed.]) + fi + + AC_DEFINE(CONFIG_DBUS_API, 1, [Use the D-Bus input configuration API]) + NEED_DBUS="yes" fi -if test "x$DBUS" = xyes; then - PKG_CHECK_MODULES(DBUS, dbus-1) - AC_DEFINE(HAVE_DBUS, 1, [Have D-BUS support]) - REQUIRED_MODULES="$REQUIRED_MODULES dbus-1" - REQUIRED_LIBS="$REQUIRED_LIBS dbus-1" +AM_CONDITIONAL(CONFIG_DBUS_API, [test "x$CONFIG_DBUS_API" = xyes]) + +PKG_CHECK_MODULES(HAL, hal, [HAVE_HAL=yes], [HAVE_HAL=no]) +if test "x$CONFIG_HAL" = xauto; then + CONFIG_HAL="$HAVE_HAL" +fi +if test "x$CONFIG_HAL" = xyes; then + if ! test "x$HAVE_HAL" = xyes; then + AC_MSG_ERROR([HAL hotplug API requested, but HAL is not installed.]) + fi + + AC_DEFINE(CONFIG_HAL, 1, [Use the HAL hotplug API]) + REQUIRED_LIBS="$REQUIRED_LIBS hal" + NEED_DBUS="yes" +fi +AM_CONDITIONAL(CONFIG_HAL, [test "x$CONFIG_HAL" = xyes]) + +if test "x$NEED_DBUS" = xyes; then + REQUIRED_LIBS="$REQUIRED_LIBS dbus-1" fi CONFIG_LIB='$(top_builddir)/config/libconfig.a' -AM_CONDITIONAL(DBUS, [test "x$DBUS" = xyes]) AM_CONDITIONAL(XV, [test "x$XV" = xyes]) if test "x$XV" = xyes; then @@ -663,7 +684,7 @@ fi AM_CONDITIONAL(COMPOSITE, [test "x$COMPOSITE" = xyes]) if test "x$COMPOSITE" = xyes; then AC_DEFINE(COMPOSITE, 1, [Support Composite Extension]) - REQUIRED_MODULES="$REQUIRED_MODULES [compositeproto >= 0.3]" + REQUIRED_MODULES="$REQUIRED_MODULES [compositeproto >= 0.4]" COMPOSITE_LIB='$(top_builddir)/composite/libcomposite.la' COMPOSITE_INC='-I$(top_srcdir)/composite' fi @@ -848,6 +869,7 @@ fi if test "x$BUILTIN_FONTS" = xyes; then AC_DEFINE(BUILTIN_FONTS, 1, [Use only built-in fonts]) AC_DEFINE(NOFONTSERVERACCESS, 1, [Avoid using a font server]) + FONTPATH="built-ins" fi if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then @@ -1062,11 +1084,14 @@ if ! test "x$have_clock_gettime" = xno; then CLOCK_LIBS="" fi + LIBS_SAVE="$LIBS" + LIBS="$CLOCK_LIBS" + AC_RUN_IFELSE([ #define _POSIX_C_SOURCE 199309L #include <time.h> -int main(int argc, char *argv[]) { +int main(int argc, char *argv[[]]) { struct timespec tp; if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) @@ -1076,6 +1101,8 @@ int main(int argc, char *argv[]) { } ], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no], [MONOTONIC_CLOCK="cross compiling"]) + + LIBS="$LIBS_SAVE" else MONOTONIC_CLOCK=no fi @@ -1191,7 +1218,7 @@ AC_MSG_RESULT([$XNEST]) AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes]) if test "x$XNEST" = xyes; then - XNEST_LIBS="$XSERVER_LIBS $FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB $LIBS" + XNEST_LIBS="$MI_LIB $CONFIG_LIB $XSERVER_LIBS $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB $LIBS" AC_SUBST([XNEST_LIBS]) fi @@ -1505,6 +1532,7 @@ return 0;} fi if test "x$DGA" = xyes; then XORG_MODULES="$XORG_MODULES xf86dgaproto" + PKG_CHECK_MODULES(DGA, xf86dgaproto) AC_DEFINE(DGA, 1, [Support DGA extension]) AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) fi @@ -1514,6 +1542,7 @@ return 0;} fi if test "x$XF86MISC" = xyes; then XORG_MODULES="$XORG_MODULES xf86miscproto" + PKG_CHECK_MODULES(XF86MISC, xf86miscproto) AC_DEFINE(XF86MISC, 1, [Support XFree86 miscellaneous extensions]) fi @@ -1522,6 +1551,7 @@ return 0;} fi if test "x$XF86VIDMODE" = xyes; then XORG_MODULES="$XORG_MODULES xf86vidmodeproto" + PKG_CHECK_MODULES(XF86VIDMODE, xf86vidmodeproto) AC_DEFINE(XF86VIDMODE, 1, [Support XFree86 Video Mode extension]) fi @@ -1748,7 +1778,7 @@ _AM_DEPENDENCIES([OBJC]) dnl kdrive DDX -XEYPHR_LIBS= +XEPHYR_LIBS= XEPHYR_INCS= XSDL_LIBS= XSDL_INCS= @@ -1813,7 +1843,7 @@ if test "$KDRIVE" = yes; then # Xephyr needs nanosleep() which is in librt on Solaris AC_CHECK_FUNC([nanosleep], [], AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt")) - XEPHYR_LIBS="$XEPHYR_LIBS $XSERVER_LIBS" + if test "x$TSLIB" = xyes; then PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"]) if test "x$HAVE_TSLIB" = xno; then @@ -1830,9 +1860,6 @@ if test "$KDRIVE" = yes; then KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS" - # dix os fb mi extension glx (NOTYET) damage shadow xpstubs - #KDRIVE_PURE_LIBS="$DIX_LIB $OS_LIB $FB_LIB $XEXT_LIB $MIEXT_DAMAGE_LIB \ - # $MIEXT_SHADOW_LIB $XPSTUBS_LIB" KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB" KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.a' case $host_os in @@ -1842,15 +1869,11 @@ if test "$KDRIVE" = yes; then ;; esac KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' - KDRIVE_LIBS="$XSERVERLIBS_LIBS $DIX_LIB $CONFIG_LIB $KDRIVE_LIB $TSLIB_LIBS $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB" + KDRIVE_LOCAL_LIBS="$DIX_LIB $CONFIG_LIB $KDRIVE_LIB $TSLIB_LIBS $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB" + KDRIVE_LIBS="$XSERVERLIBS_LIBS $KDRIVE_LOCAL_LIBS" # check if we can build Xephyr PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) - XEPHYR_LIBS="$XEPHYR_LIBS $XSERVER_LIBS" - - # Xephyr needs nanosleep() which is in librt on Solaris - AC_CHECK_FUNC([nanosleep], [], - AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt")) AC_SUBST([XEPHYR_LIBS]) AC_SUBST([XEPHYR_INCS]) @@ -1861,6 +1884,7 @@ AC_SUBST([KDRIVE_INCS]) AC_SUBST([KDRIVE_PURE_INCS]) AC_SUBST([KDRIVE_CFLAGS]) AC_SUBST([KDRIVE_PURE_LIBS]) +AC_SUBST([KDRIVE_LOCAL_LIBS]) AC_SUBST([KDRIVE_LIBS]) AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes]) AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes]) @@ -1871,8 +1895,6 @@ AM_CONDITIONAL(XSDLSERVER, [test x"$XSDL" = xyes]) AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes]) AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test "x$KDRIVEFBDEVLIB" = xyes]) AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes]) -AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes]) -AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes]) dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers) AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules]) diff --git a/damageext/damageext.c b/damageext/damageext.c index 57a7bce09..e1724ecc7 100755 --- a/damageext/damageext.c +++ b/damageext/damageext.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2002 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/damageext/damageext.h b/damageext/damageext.h index fb58483a0..642800bd2 100644 --- a/damageext/damageext.h +++ b/damageext/damageext.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2002 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/damageext/damageextint.h b/damageext/damageextint.h index 1ed07de83..dfafc9319 100644 --- a/damageext/damageextint.h +++ b/damageext/damageextint.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2002 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/dbe/dbestruct.h b/dbe/dbestruct.h index 835074c75..90f13428a 100644 --- a/dbe/dbestruct.h +++ b/dbe/dbestruct.h @@ -29,7 +29,6 @@ * Header file for DIX-related DBE * *****************************************************************************/ -/* $XFree86$ */ #ifndef DBE_STRUCT_H #define DBE_STRUCT_H diff --git a/dbe/midbe.h b/dbe/midbe.h index 1780c3fc3..007f2e37b 100644 --- a/dbe/midbe.h +++ b/dbe/midbe.h @@ -1,5 +1,4 @@ /****************************************************************************** - * * Copyright (c) 1994, 1995 Hewlett-Packard Company * * Permission is hereby granted, free of charge, to any person obtaining @@ -29,8 +28,6 @@ * Header file for users of machine-independent DBE code * *****************************************************************************/ -/* $XFree86$ */ - #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/dix/Makefile.am b/dix/Makefile.am index ff0d5d68c..1004255dd 100644 --- a/dix/Makefile.am +++ b/dix/Makefile.am @@ -58,3 +58,8 @@ noinst_PROGRAMS = dix.O dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS) ld -r -o $@ .libs/*.o endif + +dix.c: + touch $@ + +CLEANFILES = dix.c diff --git a/dix/cursor.c b/dix/cursor.c index 5ab562ead..d903124c4 100644 --- a/dix/cursor.c +++ b/dix/cursor.c @@ -430,25 +430,41 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar, *************************************************************/ CursorPtr -CreateRootCursor(char *pfilename, unsigned glyph) +CreateRootCursor(char *unused1, unsigned int unused2) { CursorPtr curs; +#ifdef NULL_ROOT_CURSOR + CursorMetricRec cm; +#else FontPtr cursorfont; int err; XID fontID; +#endif + +#ifdef NULL_ROOT_CURSOR + cm.width = 0; + cm.height = 0; + cm.xhot = 0; + cm.yhot = 0; + curs = AllocCursor(NULL, NULL, &cm, 0, 0, 0, 0, 0, 0); + + if (curs == NullCursor) + return NullCursor; +#else fontID = FakeClientID(0); err = OpenFont(serverClient, fontID, FontLoadAll | FontOpenSync, - (unsigned)strlen( pfilename), pfilename); + (unsigned)strlen(defaultCursorFont), defaultCursorFont); if (err != Success) return NullCursor; cursorfont = (FontPtr)LookupIDByType(fontID, RT_FONT); if (!cursorfont) return NullCursor; - if (AllocGlyphCursor(fontID, glyph, fontID, glyph + 1, + if (AllocGlyphCursor(fontID, 0, fontID, 1, 0, 0, 0, ~0, ~0, ~0, &curs, serverClient) != Success) return NullCursor; +#endif if (!AddResource(FakeClientID(0), RT_CURSOR, (pointer)curs)) return NullCursor; diff --git a/dix/devices.c b/dix/devices.c index 45833d037..4ddfa63da 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -81,9 +81,20 @@ SOFTWARE. #include "exglobals.h" #include "exevents.h" +/** @file + * This file handles input device-related stuff. + */ + int CoreDevicePrivatesIndex = 0; static int CoreDevicePrivatesGeneration = -1; +/** + * Create a new input device and init it to sane values. The device is added + * to the server's off_devices list. + * + * @param deviceProc Callback for device control function (switch dev on/off). + * @return The newly created device. + */ DeviceIntPtr AddInputDevice(DeviceProc deviceProc, Bool autoStart) { @@ -139,6 +150,7 @@ AddInputDevice(DeviceProc deviceProc, Bool autoStart) #ifdef XKB dev->xkb_interest = NULL; #endif + dev->config_info = NULL; /* must pre-allocate one private for the new devPrivates support */ dev->nPrivates = 1; dev->devPrivates = (DevUnion *)xcalloc(1, sizeof(DevUnion)); @@ -160,6 +172,15 @@ AddInputDevice(DeviceProc deviceProc, Bool autoStart) return dev; } +/** + * Switch device ON through the driver and push it onto the global device + * list. All clients are notified about the device being enabled. + * + * A device will send events once enabled. + * + * @param The device to be enabled. + * @return TRUE on success or FALSE otherwise. + */ Bool EnableDevice(DeviceIntPtr dev) { @@ -196,6 +217,13 @@ EnableDevice(DeviceIntPtr dev) return TRUE; } +/** + * Switch a device off through the driver and push it onto the off_devices + * list. A device will not send events while disabled. All clients are + * notified about the device being disabled. + * + * @return TRUE on success or FALSE otherwise. + */ Bool DisableDevice(DeviceIntPtr dev) { @@ -226,6 +254,14 @@ DisableDevice(DeviceIntPtr dev) return TRUE; } +/** + * Initialise a new device through the driver and tell all clients about the + * new device. + * + * The device will NOT send events until it is enabled! + * + * @return Success or an error code on failure. + */ int ActivateDevice(DeviceIntPtr dev) { @@ -250,6 +286,10 @@ ActivateDevice(DeviceIntPtr dev) return ret; } +/** + * Ring the bell. + * The actual task of ringing the bell is the job of the DDX. + */ static void CoreKeyboardBell(int volume, DeviceIntPtr pDev, pointer arg, int something) { @@ -264,6 +304,9 @@ CoreKeyboardCtl(DeviceIntPtr pDev, KeybdCtrl *ctrl) return; } +/** + * Device control function for the Virtual Core Keyboard. + */ static int CoreKeyboardProc(DeviceIntPtr pDev, int what) { @@ -324,6 +367,9 @@ CoreKeyboardProc(DeviceIntPtr pDev, int what) return Success; } +/** + * Device control function for the Virtual Core Pointer. + */ static int CorePointerProc(DeviceIntPtr pDev, int what) { @@ -354,6 +400,12 @@ CorePointerProc(DeviceIntPtr pDev, int what) return Success; } +/** + * Initialise the two core devices, VCP and VCK (see events.c). + * The devices are activated but not enabled. + * Note that the server MUST have two core devices at all times, even if there + * is no physical device connected. + */ void InitCoreDevices(void) { @@ -413,6 +465,14 @@ InitCoreDevices(void) } } +/** + * Activate all switched-off devices and then enable all those devices. + * + * Will return an error if no core keyboard or core pointer is present. + * In theory this should never happen if you call InitCoreDevices() first. + * + * @return Success or error code on failure. + */ int InitAndStartDevices(void) { @@ -448,6 +508,13 @@ InitAndStartDevices(void) return Success; } +/** + * Close down a device and free all resources. + * Once closed down, the driver will probably not expect you that you'll ever + * enable it again and free associated structs. If you want the device to just + * be disabled, DisableDevice(). + * Don't call this function directly, use RemoveDevice() instead. + */ static void CloseDevice(DeviceIntPtr dev) { @@ -550,6 +617,10 @@ CloseDevice(DeviceIntPtr dev) xfree(dev); } +/** + * Shut down all devices, free all resources, etc. + * Only useful if you're shutting down the server! + */ void CloseDownDevices(void) { @@ -571,6 +642,12 @@ CloseDownDevices(void) inputInfo.pointer = NULL; } +/** + * Remove a device from the device list, closes it and thus frees all + * resources. + * Removes both enabled and disabled devices and notifies all devices about + * the removal of the device. + */ int RemoveDevice(DeviceIntPtr dev) { diff --git a/dix/events.c b/dix/events.c index b97be4f01..3fbe9b829 100644 --- a/dix/events.c +++ b/dix/events.c @@ -160,7 +160,6 @@ extern Mask xevieFilters[128]; extern int xevieEventSent; extern int xevieKBEventSent; int xeviegrabState = 0; -static xEvent *xeviexE; #endif #include <X11/extensions/XIproto.h> @@ -2629,6 +2628,7 @@ BorderSizeNotEmpty(WindowPtr pWin) /** * "CheckPassiveGrabsOnWindow" checks to see if the event passed in causes a * passive grab set on the window to be activated. + * If a passive grab is activated, the event will be delivered to the client. * * @param pWin The window that may be subject to a passive grab. * @param device Device that caused the event. @@ -2728,16 +2728,26 @@ CheckPassiveGrabsOnWindow( } /** -"CheckDeviceGrabs" handles both keyboard and pointer events that may cause -a passive grab to be activated. If the event is a keyboard event, the -ancestors of the focus window are traced down and tried to see if they have -any passive grabs to be activated. If the focus window itself is reached and -it's descendants contain they pointer, the ancestors of the window that the -pointer is in are then traced down starting at the focus window, otherwise no -grabs are activated. If the event is a pointer event, the ancestors of the -window that the pointer is in are traced down starting at the root until -CheckPassiveGrabs causes a passive grab to activate or all the windows are -tried. PRH + * CheckDeviceGrabs handles both keyboard and pointer events that may cause + * a passive grab to be activated. + * + * If the event is a keyboard event, the ancestors of the focus window are + * traced down and tried to see if they have any passive grabs to be + * activated. If the focus window itself is reached and it's descendants + * contain the pointer, the ancestors of the window that the pointer is in + * are then traced down starting at the focus window, otherwise no grabs are + * activated. + * If the event is a pointer event, the ancestors of the window that the + * pointer is in are traced down starting at the root until CheckPassiveGrabs + * causes a passive grab to activate or all the windows are + * tried. PRH + * + * If a grab is activated, the event has been sent to the client already! + * + * @param device The device that caused the event. + * @param xE The event to handle (most likely {Device}ButtonPress). + * @param count Number of events in list. + * @return TRUE if a grab has been activated or false otherwise. */ Bool diff --git a/dix/getevents.c b/dix/getevents.c index 6969f782f..2a10038bc 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -1,23 +1,25 @@ /* * Copyright © 2006 Nokia Corporation - * Copyright © 2006 Daniel Stone + * Copyright © 2006-2007 Daniel Stone * - * Permission to use, copy, modify, distribute, and sell this software and - * its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and that - * both that this copyright notice and this permission notice appear in - * supporting electronic documentation. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * Author: Daniel Stone <daniel@fooishbar.org> */ @@ -443,9 +445,17 @@ GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type, ms = GetTimeInMillis(); + if (pDev->coreEvents) { + events->u.keyButtonPointer.time = ms; + events->u.u.type = type; + events->u.u.detail = key_code; + events++; + } + kbp = (deviceKeyButtonPointer *) events; kbp->time = ms; kbp->deviceid = pDev->id; + kbp->detail = key_code; if (type == KeyPress) kbp->type = DeviceKeyPress; else if (type == KeyRelease) @@ -459,12 +469,6 @@ GetKeyboardValuatorEvents(xEvent *events, DeviceIntPtr pDev, int type, num_valuators, valuators); } - if (pDev->coreEvents) { - events->u.keyButtonPointer.time = ms; - events->u.u.type = type; - events->u.u.detail = key_code; - } - return numEvents; } @@ -498,14 +502,18 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, if ((type == ButtonPress || type == ButtonRelease) && !pDev->button) return 0; + /* FIXME: I guess it should, in theory, be possible to post button events + * from devices without valuators. */ + if (!pDev->valuator) + return 0; + if (!coreOnly && pDev->coreEvents) num_events = 2; else num_events = 1; - if (type == MotionNotify && num_valuators <= 0) { + if (type == MotionNotify && num_valuators <= 0) return 0; - } /* Do we need to send a DeviceValuator event? */ if (!coreOnly && sendValuators) { @@ -599,8 +607,27 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, pDev->valuator->lastx = x; pDev->valuator->lasty = y; - if (!coreOnly) - { + /* for some reason inputInfo.pointer does not have coreEvents set */ + if (coreOnly || pDev->coreEvents) { + events->u.u.type = type; + events->u.keyButtonPointer.time = ms; + events->u.keyButtonPointer.rootX = x; + events->u.keyButtonPointer.rootY = y; + + if (type == ButtonPress || type == ButtonRelease) { + /* We hijack SetPointerMapping to work on all core-sending + * devices, so we use the device-specific map here instead of + * the core one. */ + events->u.u.detail = pDev->button->map[buttons]; + } + else { + events->u.u.detail = 0; + } + + events++; + } + + if (!coreOnly) { kbp = (deviceKeyButtonPointer *) events; kbp->time = ms; kbp->deviceid = pDev->id; @@ -628,24 +655,6 @@ GetPointerEvents(xEvent *events, DeviceIntPtr pDev, int type, int buttons, } } - /* for some reason inputInfo.pointer does not have coreEvents set */ - if (coreOnly || pDev->coreEvents) { - events->u.u.type = type; - events->u.keyButtonPointer.time = ms; - events->u.keyButtonPointer.rootX = x; - events->u.keyButtonPointer.rootY = y; - - if (type == ButtonPress || type == ButtonRelease) { - /* We hijack SetPointerMapping to work on all core-sending - * devices, so we use the device-specific map here instead of - * the core one. */ - events->u.u.detail = pDev->button->map[buttons]; - } - else { - events->u.u.detail = 0; - } - } - return num_events; } diff --git a/dix/grabs.c b/dix/grabs.c index 714fea3e5..2210cd05e 100644 --- a/dix/grabs.c +++ b/dix/grabs.c @@ -269,6 +269,42 @@ GrabMatchesSecond(GrabPtr pFirstGrab, GrabPtr pSecondGrab) return FALSE; } +static Bool +GrabsAreIdentical(GrabPtr pFirstGrab, GrabPtr pSecondGrab) +{ + if (pFirstGrab->device != pSecondGrab->device || + (pFirstGrab->modifierDevice != pSecondGrab->modifierDevice) || + (pFirstGrab->type != pSecondGrab->type)) + return FALSE; + + if (!(DetailSupersedesSecond(pFirstGrab->detail, + pSecondGrab->detail, + (unsigned short)AnyKey) && + DetailSupersedesSecond(pSecondGrab->detail, + pFirstGrab->detail, + (unsigned short)AnyKey))) + return FALSE; + + if (!(DetailSupersedesSecond(pFirstGrab->modifiersDetail, + pSecondGrab->modifiersDetail, + (unsigned short)AnyModifier) && + DetailSupersedesSecond(pSecondGrab->modifiersDetail, + pFirstGrab->modifiersDetail, + (unsigned short)AnyModifier))) + return FALSE; + + return TRUE; +} + + +/** + * Prepend the new grab to the list of passive grabs on the window. + * Any previously existing grab that matches the new grab will be removed. + * Adding a new grab that would override another client's grab will result in + * a BadAccess. + * + * @return Success or X error code on failure. + */ int AddPassiveGrabToList(GrabPtr pGrab) { @@ -286,11 +322,22 @@ AddPassiveGrabToList(GrabPtr pGrab) } } + /* Remove all grabs that match the new one exactly */ + for (grab = wPassiveGrabs(pGrab->window); grab; grab = grab->next) + { + if (GrabsAreIdentical(pGrab, grab)) + { + DeletePassiveGrabFromList(grab); + break; + } + } + if (!pGrab->window->optional && !MakeWindowOptional (pGrab->window)) { FreeGrab(pGrab); return BadAlloc; } + pGrab->next = pGrab->window->optional->passiveGrabs; pGrab->window->optional->passiveGrabs = pGrab; if (AddResource(pGrab->resource, RT_PASSIVEGRAB, (pointer)pGrab)) diff --git a/dix/main.c b/dix/main.c index 922a32499..4ae09dc4e 100644 --- a/dix/main.c +++ b/dix/main.c @@ -74,8 +74,6 @@ Equipment Corporation. ******************************************************************/ -/* $TOG: main.c /main/86 1998/02/09 14:20:03 kaleb $ */ - #define NEED_EVENTS #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> @@ -314,7 +312,7 @@ main(int argc, char *argv[], char *envp[]) InitBlockAndWakeupHandlers(); /* Perform any operating system dependent initializations you'd like */ OsInit(); - configInitialise(); + config_init(); if(serverGeneration == 1) { CreateWellKnownSockets(); @@ -397,14 +395,10 @@ main(int argc, char *argv[], char *envp[]) FatalError("failed to initialize core devices"); InitFonts(); -#ifdef BUILTIN_FONTS - defaultFontPath = "built-ins"; -#else if (loadableFonts) { SetFontPath(0, 0, (unsigned char *)defaultFontPath, &error); - } else -#endif - { + } + else { if (SetDefaultFontPath(defaultFontPath) != Success) ErrorF("failed to set default font path '%s'", defaultFontPath); @@ -412,22 +406,12 @@ main(int argc, char *argv[], char *envp[]) if (!SetDefaultFont(defaultTextFont)) { FatalError("could not open default font '%s'", defaultTextFont); } -#ifdef NULL_ROOT_CURSOR - cm.width = 0; - cm.height = 0; - cm.xhot = 0; - cm.yhot = 0; - - if (!(rootCursor = AllocCursor(NULL, NULL, &cm, 0, 0, 0, 0, 0, 0))) { - FatalError("could not create empty root cursor"); - } - AddResource(FakeClientID(0), RT_CURSOR, (pointer)rootCursor); -#else - if (!(rootCursor = CreateRootCursor(defaultCursorFont, 0))) { + + if (!(rootCursor = CreateRootCursor(NULL, 0))) { FatalError("could not open default cursor font '%s'", defaultCursorFont); } -#endif + #ifdef DPMSExtension /* check all screens, looking for DPMS Capabilities */ DPMSCapableFlag = DPMSSupported(); @@ -480,7 +464,7 @@ main(int argc, char *argv[], char *envp[]) FreeAllResources(); #endif - configFini(); + config_fini(); CloseDownDevices(); for (i = screenInfo.numScreens - 1; i >= 0; i--) { diff --git a/dix/property.c b/dix/property.c index 09f9e3152..c0de5b3f4 100644 --- a/dix/property.c +++ b/dix/property.c @@ -104,6 +104,19 @@ FindProperty(WindowPtr pWin, Atom propertyName) return pProp; } +static void +deliverPropertyNotifyEvent(WindowPtr pWin, int state, Atom atom) +{ + xEvent event; + + event.u.u.type = PropertyNotify; + event.u.property.window = pWin->drawable.id; + event.u.property.state = state; + event.u.property.atom = atom; + event.u.property.time = currentTime.milliseconds; + DeliverEvents(pWin, &event, 1, (WindowPtr)NULL); +} + int ProcRotateProperties(ClientPtr client) { @@ -113,7 +126,6 @@ ProcRotateProperties(ClientPtr client) Atom * atoms; PropertyPtr * props; /* array of pointer */ PropertyPtr pProp; - xEvent event; REQUEST_FIXED_SIZE(xRotatePropertiesReq, stuff->nAtoms << 2); UpdateCurrentTime(); @@ -164,16 +176,9 @@ ProcRotateProperties(ClientPtr client) delta += stuff->nAtoms; for (i = 0; i < stuff->nAtoms; i++) { - /* Generate a PropertyNotify event for each property whose value - is changed in the order in which they appear in the request. */ + deliverPropertyNotifyEvent(pWin, PropertyNewValue, + props[i]->propertyName); - event.u.u.type = PropertyNotify; - event.u.property.window = pWin->drawable.id; - event.u.property.state = PropertyNewValue; - event.u.property.atom = props[i]->propertyName; - event.u.property.time = currentTime.milliseconds; - DeliverEvents(pWin, &event, 1, (WindowPtr)NULL); - props[i]->propertyName = atoms[(i + delta) % stuff->nAtoms]; } } @@ -241,7 +246,6 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property, pointer value, Bool sendevent) { PropertyPtr pProp; - xEvent event; int sizeInBytes, totalSize, rc; pointer data; @@ -344,15 +348,10 @@ dixChangeWindowProperty(ClientPtr pClient, WindowPtr pWin, Atom property, pProp->size += len; } } + if (sendevent) - { - event.u.u.type = PropertyNotify; - event.u.property.window = pWin->drawable.id; - event.u.property.state = PropertyNewValue; - event.u.property.atom = pProp->propertyName; - event.u.property.time = currentTime.milliseconds; - DeliverEvents(pWin, &event, 1, (WindowPtr)NULL); - } + deliverPropertyNotifyEvent(pWin, PropertyNewValue, pProp->propertyName); + return(Success); } @@ -369,7 +368,6 @@ int DeleteProperty(WindowPtr pWin, Atom propName) { PropertyPtr pProp, prevProp; - xEvent event; if (!(pProp = wUserProps (pWin))) return(Success); @@ -392,12 +390,7 @@ DeleteProperty(WindowPtr pWin, Atom propName) { prevProp->next = pProp->next; } - event.u.u.type = PropertyNotify; - event.u.property.window = pWin->drawable.id; - event.u.property.state = PropertyDelete; - event.u.property.atom = pProp->propertyName; - event.u.property.time = currentTime.milliseconds; - DeliverEvents(pWin, &event, 1, (WindowPtr)NULL); + deliverPropertyNotifyEvent(pWin, PropertyDelete, pProp->propertyName); dixFreePrivates(pProp->devPrivates); xfree(pProp->data); xfree(pProp); @@ -409,17 +402,11 @@ void DeleteAllWindowProperties(WindowPtr pWin) { PropertyPtr pProp, pNextProp; - xEvent event; pProp = wUserProps (pWin); while (pProp) { - event.u.u.type = PropertyNotify; - event.u.property.window = pWin->drawable.id; - event.u.property.state = PropertyDelete; - event.u.property.atom = pProp->propertyName; - event.u.property.time = currentTime.milliseconds; - DeliverEvents(pWin, &event, 1, (WindowPtr)NULL); + deliverPropertyNotifyEvent(pWin, PropertyDelete, pProp->propertyName); pNextProp = pProp->next; dixFreePrivates(pProp->devPrivates); xfree(pProp->data); @@ -553,16 +540,7 @@ ProcGetProperty(ClientPtr client) reply.propertyType = pProp->type; if (stuff->delete && (reply.bytesAfter == 0)) - { /* send the event */ - xEvent event; - - event.u.u.type = PropertyNotify; - event.u.property.window = pWin->drawable.id; - event.u.property.state = PropertyDelete; - event.u.property.atom = pProp->propertyName; - event.u.property.time = currentTime.milliseconds; - DeliverEvents(pWin, &event, 1, (WindowPtr)NULL); - } + deliverPropertyNotifyEvent(pWin, PropertyDelete, pProp->propertyName); WriteReplyToClient(client, sizeof(xGenericReply), &reply); if (len) diff --git a/dix/resource.c b/dix/resource.c index e89ad1fdd..ea0a3105c 100644 --- a/dix/resource.c +++ b/dix/resource.c @@ -101,8 +101,6 @@ Equipment Corporation. * of the copyright holder. */ -/* $TOG: resource.c /main/41 1998/02/09 14:20:31 kaleb $ */ - /* Routines to manage various kinds of resources: * * CreateNewResourceType, CreateNewResourceClass, InitClientResources, diff --git a/dix/window.c b/dix/window.c index 95b7b168c..2f151b09c 100644 --- a/dix/window.c +++ b/dix/window.c @@ -299,7 +299,7 @@ SetWindowToDefaults(WindowPtr pWin) pWin->dontPropagate = 0; pWin->forcedBS = FALSE; #ifdef COMPOSITE - pWin->redirectDraw = 0; + pWin->redirectDraw = RedirectDrawNone; #endif } @@ -1693,10 +1693,14 @@ _X_EXPORT void SetWinSize (WindowPtr pWin) { #ifdef COMPOSITE - if (pWin->redirectDraw) + if (pWin->redirectDraw != RedirectDrawNone) { BoxRec box; + /* + * Redirected clients get clip list equal to their + * own geometry, not clipped to their parent + */ box.x1 = pWin->drawable.x; box.y1 = pWin->drawable.y; box.x2 = pWin->drawable.x + pWin->drawable.width; @@ -1736,10 +1740,14 @@ SetBorderSize (WindowPtr pWin) if (HasBorder (pWin)) { bw = wBorderWidth (pWin); #ifdef COMPOSITE - if (pWin->redirectDraw) + if (pWin->redirectDraw != RedirectDrawNone) { BoxRec box; + /* + * Redirected clients get clip list equal to their + * own geometry, not clipped to their parent + */ box.x1 = pWin->drawable.x - bw; box.y1 = pWin->drawable.y - bw; box.x2 = pWin->drawable.x + pWin->drawable.width + bw; diff --git a/dix/xpstubs.c b/dix/xpstubs.c index 3276d9dfe..59340ad21 100644 --- a/dix/xpstubs.c +++ b/dix/xpstubs.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Copyright 1996, 1998 The Open Group @@ -569,6 +569,45 @@ exaDriverInit (ScreenPtr pScreen, PictureScreenPtr ps; #endif + if (!pScreenInfo) + return FALSE; + + if (!pScreenInfo->memoryBase) { + LogMessage(X_ERROR, "EXA(%d): ExaDriverRec::memoryBase must be " + "non-zero\n", pScreen->myNum); + return FALSE; + } + + if (!pScreenInfo->memorySize) { + LogMessage(X_ERROR, "EXA(%d): ExaDriverRec::memorySize must be " + "non-zero\n", pScreen->myNum); + return FALSE; + } + + if (pScreenInfo->offScreenBase > pScreenInfo->memorySize) { + LogMessage(X_ERROR, "EXA(%d): ExaDriverRec::offScreenBase must be <= " + "ExaDriverRec::memorySize\n", pScreen->myNum); + return FALSE; + } + + if (!pScreenInfo->PrepareSolid) { + LogMessage(X_ERROR, "EXA(%d): ExaDriverRec::PrepareSolid must be " + "non-NULL\n", pScreen->myNum); + return FALSE; + } + + if (!pScreenInfo->PrepareCopy) { + LogMessage(X_ERROR, "EXA(%d): ExaDriverRec::PrepareCopy must be " + "non-NULL\n", pScreen->myNum); + return FALSE; + } + + if (!pScreenInfo->WaitMarker) { + LogMessage(X_ERROR, "EXA(%d): ExaDriverRec::WaitMarker must be " + "non-NULL\n", pScreen->myNum); + return FALSE; + } + if (pScreenInfo->exa_major != EXA_VERSION_MAJOR || pScreenInfo->exa_minor > EXA_VERSION_MINOR) { diff --git a/exa/exa_accel.c b/exa/exa_accel.c index bf63f2c4f..cc383cca4 100644 --- a/exa/exa_accel.c +++ b/exa/exa_accel.c @@ -643,15 +643,13 @@ exaPolyFillRect(DrawablePtr pDrawable, int n; ExaMigrationRec pixmaps[2]; RegionPtr pReg = RECTS_TO_REGION(pScreen, nrect, prect, CT_UNSORTED); - RegionPtr pDamageReg = DamageRegion(ExaGetPixmapPriv(pPixmap)->pDamage); /* Compute intersection of rects and clip region */ REGION_TRANSLATE(pScreen, pReg, pDrawable->x, pDrawable->y); REGION_INTERSECT(pScreen, pReg, pClip, pReg); if (!REGION_NUM_RECTS(pReg)) { - REGION_DESTROY(pScreen, pReg); - return; + goto out; } pixmaps[0].as_dst = TRUE; @@ -680,7 +678,7 @@ exaPolyFillRect(DrawablePtr pDrawable, (pGC->fillStyle == FillTiled && !pGC->tileIsPixel && exaFillRegionTiled(pDrawable, pReg, pGC->tile.pixmap, &pGC->patOrg, pGC->planemask, pGC->alu))) { - goto damage; + goto out; } } @@ -709,13 +707,7 @@ fallback: } ExaCheckPolyFillRect (pDrawable, pGC, nrect, prect); - -damage: - REGION_TRANSLATE(pScreen, pReg, xoff, yoff); - REGION_UNION(pScreen, pDamageReg, pReg, pDamageReg); - REGION_DESTROY(pScreen, pReg); - - return; + goto out; } xorg = pDrawable->x; @@ -754,8 +746,6 @@ damage: (*pExaScr->info->Solid) (pPixmap, fullX1 + xoff, fullY1 + yoff, fullX2 + xoff, fullY2 + yoff); - exaPixmapDirty (pPixmap, fullX1 + xoff, fullY1 + yoff, - fullX2 + xoff, fullY2 + yoff); } else { @@ -786,14 +776,15 @@ damage: (*pExaScr->info->Solid) (pPixmap, partX1 + xoff, partY1 + yoff, partX2 + xoff, partY2 + yoff); - exaPixmapDirty (pPixmap, partX1 + xoff, partY1 + yoff, - partX2 + xoff, partY2 + yoff); } } } } (*pExaScr->info->DoneSolid) (pPixmap); exaMarkSync(pDrawable->pScreen); + +out: + REGION_DESTROY(pScreen, pReg); } static void @@ -1329,6 +1320,9 @@ exaGetImage (DrawablePtr pDrawable, int x, int y, int w, int h, int xoff, yoff; Bool ok; + if (pExaScr->swappedOut || (w == 1 && h == 1)) + goto fallback; + if (pExaScr->info->DownloadFromScreen == NULL) goto migrate_and_fallback; @@ -1342,9 +1336,6 @@ exaGetImage (DrawablePtr pDrawable, int x, int y, int w, int h, if (pDrawable->bitsPerPixel < 8) goto migrate_and_fallback; - if (pExaScr->swappedOut) - goto fallback; - pPix = exaGetOffscreenPixmap (pDrawable, &xoff, &yoff); if (pPix == NULL) goto fallback; diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c index 6fe646a88..c666b001b 100644 --- a/exa/exa_offscreen.c +++ b/exa/exa_offscreen.c @@ -429,7 +429,7 @@ ExaOffscreenMarkUsed (PixmapPtr pPixmap) ExaScreenPriv (pPixmap->drawable.pScreen); static int iter = 0; - if (!pExaPixmap->area) + if (!pExaPixmap || !pExaPixmap->area) return; /* The numbers here are arbitrary. We may want to tune these. */ diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c index 708d1eac6..b67ea6389 100644 --- a/exa/exa_unaccel.c +++ b/exa/exa_unaccel.c @@ -369,31 +369,48 @@ ExaCheckComposite (CARD8 op, /** * Gets the 0,0 pixel of a pixmap. Used for doing solid fills of tiled pixmaps * that happen to be 1x1. Pixmap must be at least 8bpp. + * + * XXX This really belongs in fb, so it can be aware of tiling and etc. */ CARD32 exaGetPixmapFirstPixel (PixmapPtr pPixmap) { CARD32 pixel; + void *fb; + Bool need_finish = FALSE; + BoxRec box; ExaMigrationRec pixmaps[1]; + ExaPixmapPriv (pPixmap); + + /* Try to avoid framebuffer readbacks */ + if (exaPixmapIsOffscreen(pPixmap)) { + if (!miPointInRegion(DamageRegion(pExaPixmap->pDamage), 0, 0, &box)) { + fb = pExaPixmap->sys_ptr; + } else { + need_finish = TRUE; + fb = pPixmap->devPrivate.ptr; + pixmaps[0].as_dst = FALSE; + pixmaps[0].as_src = TRUE; + pixmaps[0].pPix = pPixmap; + exaDoMigration (pixmaps, 1, FALSE); + exaPrepareAccess(&pPixmap->drawable, EXA_PREPARE_SRC); + } + } - pixmaps[0].as_dst = FALSE; - pixmaps[0].as_src = TRUE; - pixmaps[0].pPix = pPixmap; - exaDoMigration (pixmaps, 1, FALSE); - - exaPrepareAccess(&pPixmap->drawable, EXA_PREPARE_SRC); switch (pPixmap->drawable.bitsPerPixel) { case 32: - pixel = *(CARD32 *)(pPixmap->devPrivate.ptr); + pixel = *(CARD32 *)fb; break; case 16: - pixel = *(CARD16 *)(pPixmap->devPrivate.ptr); + pixel = *(CARD16 *)fb; break; default: - pixel = *(CARD8 *)(pPixmap->devPrivate.ptr); + pixel = *(CARD8 *)fb; break; } - exaFinishAccess(&pPixmap->drawable, EXA_PREPARE_SRC); + + if (need_finish) + exaFinishAccess(&pPixmap->drawable, EXA_PREPARE_SRC); return pixel; } diff --git a/fb/Makefile.am b/fb/Makefile.am index 28c0cc703..75861a38d 100644 --- a/fb/Makefile.am +++ b/fb/Makefile.am @@ -1,4 +1,4 @@ -noinst_LTLIBRARIES = libfb.la libwfb.la libfbmmx.la +noinst_LTLIBRARIES = libfb.la libwfb.la INCLUDES = \ -I$(top_srcdir)/hw/xfree86/os-support \ @@ -12,25 +12,8 @@ endif libfb_la_CFLAGS = $(AM_CFLAGS) -if MMX_CAPABLE -libfb_la_CFLAGS += -DUSE_MMX - -libfbmmx_la_CFLAGS = \ - $(DIX_CFLAGS) \ - -DUSE_MMX \ - -mmmx \ - -msse \ - -Winline \ - --param inline-unit-growth=10000 \ - --param large-function-growth=10000 -endif - libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER -libfbmmx_la_SOURCES = \ - fbmmx.c \ - fbmmx.h - libfb_la_SOURCES = \ fb.h \ fb24_32.c \ @@ -73,6 +56,4 @@ libfb_la_SOURCES = \ libwfb_la_SOURCES = $(libfb_la_SOURCES) -libfb_la_LIBADD = libfbmmx.la - EXTRA_DIST = fbcmap.c fbcmap_mi.c @@ -610,16 +610,6 @@ extern int fbGetWinPrivateIndex(void); extern const GCOps fbGCOps; extern const GCFuncs fbGCFuncs; -#ifdef TEKX11 -#define FB_OLD_GC -#define FB_OLD_SCREEN -#endif - -#ifdef FB_OLD_SCREEN -# define FB_OLD_MISCREENINIT /* miScreenInit requires 14 args, not 13 */ -extern WindowPtr *WindowTable; -#endif - #ifdef FB_24_32BIT #define FB_SCREEN_PRIVATE #endif @@ -670,15 +660,6 @@ typedef struct { /* private field of GC */ typedef struct { -#ifdef FB_OLD_GC - unsigned char pad1; - unsigned char pad2; - unsigned char pad3; - unsigned fExpose:1; - unsigned freeCompClip:1; - PixmapPtr pRotatedPixmap; - RegionPtr pCompositeClip; -#endif FbBits and, xor; /* reduced rop values */ FbBits bgand, bgxor; /* for stipples */ FbBits fg, bg, pm; /* expanded and filled */ @@ -691,17 +672,10 @@ typedef struct { #define fbGetGCPrivate(pGC) ((FbGCPrivPtr)\ (pGC)->devPrivates[fbGetGCPrivateIndex()].ptr) -#ifdef FB_OLD_GC -#define fbGetCompositeClip(pGC) (fbGetGCPrivate(pGC)->pCompositeClip) -#define fbGetExpose(pGC) (fbGetGCPrivate(pGC)->fExpose) -#define fbGetFreeCompClip(pGC) (fbGetGCPrivate(pGC)->freeCompClip) -#define fbGetRotatedPixmap(pGC) (fbGetGCPrivate(pGC)->pRotatedPixmap) -#else #define fbGetCompositeClip(pGC) ((pGC)->pCompositeClip) #define fbGetExpose(pGC) ((pGC)->fExpose) #define fbGetFreeCompClip(pGC) ((pGC)->freeCompClip) #define fbGetRotatedPixmap(pGC) ((pGC)->pRotatedPixmap) -#endif #define fbGetScreenPixmap(s) ((PixmapPtr) (s)->devPrivate) #ifdef FB_NO_WINDOW_PIXMAPS @@ -776,12 +750,6 @@ typedef struct { ((pDrawable)->type == DRAWABLE_PIXMAP ? \ TRUE : fbWindowEnabled((WindowPtr) pDrawable)) -#ifdef FB_OLD_SCREEN -#define BitsPerPixel(d) (\ - ((1 << PixmapWidthPaddingInfo[d].padBytesLog2) * 8 / \ - (PixmapWidthPaddingInfo[d].padRoundUp+1))) -#endif - #define FbPowerOfTwo(w) (((w) & ((w) - 1)) == 0) /* * Accelerated tiles are power of 2 width <= FB_UNIT @@ -1791,13 +1759,11 @@ fbQueryBestSize (int class, unsigned short *width, unsigned short *height, ScreenPtr pScreen); -#ifndef FB_OLD_SCREEN PixmapPtr _fbGetWindowPixmap (WindowPtr pWindow); void _fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap); -#endif Bool fbSetupScreen(ScreenPtr pScreen, @@ -2033,6 +1999,7 @@ fbEvenTile (FbBits *dst, int height, FbBits *tile, + FbStride tileStride, int tileHeight, int alu, diff --git a/fb/fb24_32.h b/fb/fb24_32.h index 3c83f3423..7c9819eba 100644 --- a/fb/fb24_32.h +++ b/fb/fb24_32.h @@ -1,6 +1,4 @@ /* - * $XFree86$ - * * Copyright © 2000 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fballpriv.c b/fb/fballpriv.c index 4f807ed8d..8efb8fa99 100644 --- a/fb/fballpriv.c +++ b/fb/fballpriv.c @@ -1,6 +1,4 @@ /* - * Id: fballpriv.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -49,10 +47,6 @@ int fbGetWinPrivateIndex(void) #endif int fbGeneration; -#ifdef FB_OLD_SCREEN -#define miAllocateGCPrivateIndex() AllocateGCPrivateIndex() -#endif - Bool fbAllocatePrivates(ScreenPtr pScreen, int *pGCIndex) { diff --git a/fb/fbarc.c b/fb/fbarc.c index d2c1a76f1..3f46bd4b2 100644 --- a/fb/fbarc.c +++ b/fb/fbarc.c @@ -1,6 +1,4 @@ /* - * Id: fbarc.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbbits.c b/fb/fbbits.c index cefe943b6..808374309 100644 --- a/fb/fbbits.c +++ b/fb/fbbits.c @@ -1,6 +1,4 @@ /* - * Id: fbbits.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbbits.h b/fb/fbbits.h index 603c02929..44991f106 100644 --- a/fb/fbbits.h +++ b/fb/fbbits.h @@ -1,6 +1,4 @@ /* - * $XFree86$ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbblt.c b/fb/fbblt.c index e18981a83..837c3a239 100644 --- a/fb/fbblt.c +++ b/fb/fbblt.c @@ -1,6 +1,4 @@ /* - * Id: fbblt.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbbltone.c b/fb/fbbltone.c index d2c180fef..ffe69775a 100644 --- a/fb/fbbltone.c +++ b/fb/fbbltone.c @@ -1,6 +1,4 @@ /* - * Id: fbbltone.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbbstore.c b/fb/fbbstore.c index 78174b6fc..3ee5f5e35 100644 --- a/fb/fbbstore.c +++ b/fb/fbbstore.c @@ -1,6 +1,4 @@ /* - * Id: fbbstore.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbcopy.c b/fb/fbcopy.c index a4302037a..3ad01bfee 100644 --- a/fb/fbcopy.c +++ b/fb/fbcopy.c @@ -1,6 +1,4 @@ /* - * Id: fbcopy.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -29,7 +27,6 @@ #include <stdlib.h> #include "fb.h" -#include "fbmmx.h" void fbCopyNtoN (DrawablePtr pSrcDrawable, diff --git a/fb/fbfill.c b/fb/fbfill.c index 4f13a023a..831b1ce76 100644 --- a/fb/fbfill.c +++ b/fb/fbfill.c @@ -1,6 +1,4 @@ /* - * Id: fbfill.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -27,7 +25,6 @@ #endif #include "fb.h" -#include "fbmmx.h" void fbFill (DrawablePtr pDrawable, @@ -47,22 +44,18 @@ fbFill (DrawablePtr pDrawable, switch (pGC->fillStyle) { case FillSolid: -#ifdef USE_MMX - if (!pPriv->and && fbHaveMMX()) - { - if (fbFillmmx (dst, dstStride, dstBpp, x + dstXoff, y + dstYoff, width, height, pPriv->xor)) - { - fbFinishAccess (pDrawable); - return; - } - } +#ifndef FB_ACCESS_WRAPPER + if (pPriv->and || !pixman_fill ((uint32_t *)dst, dstStride, dstBpp, + x + dstXoff, y + dstYoff, + width, height, + pPriv->xor)) #endif - fbSolid (dst + (y + dstYoff) * dstStride, - dstStride, - (x + dstXoff) * dstBpp, - dstBpp, - width * dstBpp, height, - pPriv->and, pPriv->xor); + fbSolid (dst + (y + dstYoff) * dstStride, + dstStride, + (x + dstXoff) * dstBpp, + dstBpp, + width * dstBpp, height, + pPriv->and, pPriv->xor); break; case FillStippled: case FillOpaqueStippled: { @@ -218,26 +211,20 @@ fbSolidBoxClipped (DrawablePtr pDrawable, if (partY2 <= partY1) continue; -#ifdef USE_MMX - if (!and && fbHaveMMX()) - { - if (fbFillmmx (dst, dstStride, dstBpp, - partX1 + dstXoff, partX2 + dstYoff, (partX2 - partX1), (partY2 - partY1), - xor)) - { - fbFinishAccess (pDrawable); - return; - } - } +#ifndef FB_ACCESS_WRAPPER + if (and || !pixman_fill ((uint32_t *)dst, dstStride, dstBpp, + partX1 + dstXoff, partY1 + dstYoff, + (partX2 - partX1), (partY2 - partY1), + xor)) #endif - fbSolid (dst + (partY1 + dstYoff) * dstStride, - dstStride, - (partX1 + dstXoff) * dstBpp, - dstBpp, - - (partX2 - partX1) * dstBpp, - (partY2 - partY1), - and, xor); + fbSolid (dst + (partY1 + dstYoff) * dstStride, + dstStride, + (partX1 + dstXoff) * dstBpp, + dstBpp, + + (partX2 - partX1) * dstBpp, + (partY2 - partY1), + and, xor); } fbFinishAccess (pDrawable); } diff --git a/fb/fbfillrect.c b/fb/fbfillrect.c index f404044c5..4e4edb3fd 100644 --- a/fb/fbfillrect.c +++ b/fb/fbfillrect.c @@ -1,6 +1,4 @@ /* - * Id: fbfillrect.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbfillsp.c b/fb/fbfillsp.c index 77e4772a6..5d2147213 100644 --- a/fb/fbfillsp.c +++ b/fb/fbfillsp.c @@ -1,6 +1,4 @@ /* - * Id: fbfillsp.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -1,6 +1,4 @@ /* - * Id: fbgc.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbgetsp.c b/fb/fbgetsp.c index ffd8a1d7d..6402c6c38 100644 --- a/fb/fbgetsp.c +++ b/fb/fbgetsp.c @@ -1,6 +1,4 @@ /* - * Id: fbgetsp.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbimage.c b/fb/fbimage.c index 06a3c84fe..2b9ac27c0 100644 --- a/fb/fbimage.c +++ b/fb/fbimage.c @@ -1,6 +1,4 @@ /* - * Id: fbimage.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbline.c b/fb/fbline.c index 8e99dd99f..2cee123ae 100644 --- a/fb/fbline.c +++ b/fb/fbline.c @@ -1,6 +1,4 @@ /* - * $XFree86$ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbmmx.c b/fb/fbmmx.c deleted file mode 100644 index 3522a0075..000000000 --- a/fb/fbmmx.c +++ /dev/null @@ -1,341 +0,0 @@ -/* - * Copyright © 2004, 2005 Red Hat, Inc. - * Copyright © 2004 Nicholas Miell - * Copyright © 2005 Trolltech AS - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Red Hat not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. Red Hat makes no representations about the - * suitability of this software for any purpose. It is provided "as is" - * without express or implied warranty. - * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS - * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY - * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN - * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - * - * Author: Søren Sandmann (sandmann@redhat.com) - * Minor Improvements: Nicholas Miell (nmiell@gmail.com) - * MMX code paths for fbcompose.c by Lars Knoll (lars@trolltech.com) - * - * Based on work by Owen Taylor - */ - - -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#ifdef USE_MMX - -#if defined(__amd64__) || defined(__x86_64__) -#define USE_SSE -#endif - -#include <mmintrin.h> -#ifdef USE_SSE -#include <xmmintrin.h> /* for _mm_shuffle_pi16 and _MM_SHUFFLE */ -#endif - -#ifdef RENDER - -#include "fb.h" -#include "fbmmx.h" - -#include "picturestr.h" -#include "mipict.h" -#include "fbpict.h" - -#define noVERBOSE - -#ifdef VERBOSE -#define CHECKPOINT() ErrorF ("at %s %d\n", __FUNCTION__, __LINE__) -#else -#define CHECKPOINT() -#endif - - -typedef unsigned long long ullong; - -#ifdef __GNUC__ -typedef ullong mmxdatafield; -#endif -#ifdef _MSC_VER -typedef unsigned __int64 ullong; -typedef __m64 mmxdatafield; -#endif - -Bool -fbFillmmx (FbBits *bits, - FbStride stride, - int bpp, - int x, - int y, - int width, - int height, - FbBits xor) -{ - ullong fill; - __m64 vfill; - CARD32 byte_width; - CARD8 *byte_line; -#ifdef __GNUC__ - __m64 v1, v2, v3, v4, v5, v6, v7; -#endif - - if (bpp == 16 && (xor >> 16 != (xor & 0xffff))) - return FALSE; - - if (bpp != 16 && bpp != 32) - return FALSE; - - if (bpp == 16) - { - stride = stride * sizeof (FbBits) / 2; - byte_line = (CARD8 *)(((CARD16 *)bits) + stride * y + x); - byte_width = 2 * width; - stride *= 2; - } - else - { - stride = stride * sizeof (FbBits) / 4; - byte_line = (CARD8 *)(((CARD32 *)bits) + stride * y + x); - byte_width = 4 * width; - stride *= 4; - } - - fill = ((ullong)xor << 32) | xor; - vfill = (__m64)fill; - -#ifdef __GNUC__ - __asm__ ( - "movq %7, %0\n" - "movq %7, %1\n" - "movq %7, %2\n" - "movq %7, %3\n" - "movq %7, %4\n" - "movq %7, %5\n" - "movq %7, %6\n" - : "=y" (v1), "=y" (v2), "=y" (v3), - "=y" (v4), "=y" (v5), "=y" (v6), "=y" (v7) - : "y" (vfill)); -#endif - - while (height--) - { - int w; - CARD8 *d = byte_line; - byte_line += stride; - w = byte_width; - - while (w >= 2 && ((unsigned long)d & 3)) - { - *(CARD16 *)d = xor; - w -= 2; - d += 2; - } - - while (w >= 4 && ((unsigned long)d & 7)) - { - *(CARD32 *)d = xor; - - w -= 4; - d += 4; - } - - while (w >= 64) - { -#ifdef __GNUC__ - __asm__ ( - "movq %1, (%0)\n" - "movq %2, 8(%0)\n" - "movq %3, 16(%0)\n" - "movq %4, 24(%0)\n" - "movq %5, 32(%0)\n" - "movq %6, 40(%0)\n" - "movq %7, 48(%0)\n" - "movq %8, 56(%0)\n" - : - : "r" (d), - "y" (vfill), "y" (v1), "y" (v2), "y" (v3), - "y" (v4), "y" (v5), "y" (v6), "y" (v7) - : "memory"); -#else - *(__m64*) (d + 0) = vfill; - *(__m64*) (d + 8) = vfill; - *(__m64*) (d + 16) = vfill; - *(__m64*) (d + 24) = vfill; - *(__m64*) (d + 32) = vfill; - *(__m64*) (d + 40) = vfill; - *(__m64*) (d + 48) = vfill; - *(__m64*) (d + 56) = vfill; -#endif - w -= 64; - d += 64; - } - - while (w >= 4) - { - *(CARD32 *)d = xor; - - w -= 4; - d += 4; - } - if (w >= 2) - { - *(CARD16 *)d = xor; - w -= 2; - d += 2; - } - } - - _mm_empty(); - return TRUE; -} - -Bool -fbBltmmx (FbBits *src_bits, - FbBits *dst_bits, - FbStride src_stride, - FbStride dst_stride, - int src_bpp, - int dst_bpp, - int src_x, int src_y, - int dst_x, int dst_y, - int width, int height) -{ - CARD8 * src_bytes; - CARD8 * dst_bytes; - int byte_width; - - if (src_bpp != dst_bpp) - return FALSE; - - if (src_bpp == 16) - { - src_stride = src_stride * sizeof (FbBits) / 2; - dst_stride = dst_stride * sizeof (FbBits) / 2; - src_bytes = (CARD8 *)(((CARD16 *)src_bits) + src_stride * (src_y) + (src_x)); - dst_bytes = (CARD8 *)(((CARD16 *)dst_bits) + dst_stride * (dst_y) + (dst_x)); - byte_width = 2 * width; - src_stride *= 2; - dst_stride *= 2; - } else if (src_bpp == 32) { - src_stride = src_stride * sizeof (FbBits) / 4; - dst_stride = dst_stride * sizeof (FbBits) / 4; - src_bytes = (CARD8 *)(((CARD32 *)src_bits) + src_stride * (src_y) + (src_x)); - dst_bytes = (CARD8 *)(((CARD32 *)dst_bits) + dst_stride * (dst_y) + (dst_x)); - byte_width = 4 * width; - src_stride *= 4; - dst_stride *= 4; - } else { - return FALSE; - } - - while (height--) - { - int w; - CARD8 *s = src_bytes; - CARD8 *d = dst_bytes; - src_bytes += src_stride; - dst_bytes += dst_stride; - w = byte_width; - - while (w >= 2 && ((unsigned long)d & 3)) - { - *(CARD16 *)d = *(CARD16 *)s; - w -= 2; - s += 2; - d += 2; - } - - while (w >= 4 && ((unsigned long)d & 7)) - { - *(CARD32 *)d = *(CARD32 *)s; - - w -= 4; - s += 4; - d += 4; - } - - while (w >= 64) - { -#ifdef __GNUC__ - __asm__ ( - "movq (%1), %%mm0\n" - "movq 8(%1), %%mm1\n" - "movq 16(%1), %%mm2\n" - "movq 24(%1), %%mm3\n" - "movq 32(%1), %%mm4\n" - "movq 40(%1), %%mm5\n" - "movq 48(%1), %%mm6\n" - "movq 56(%1), %%mm7\n" - - "movq %%mm0, (%0)\n" - "movq %%mm1, 8(%0)\n" - "movq %%mm2, 16(%0)\n" - "movq %%mm3, 24(%0)\n" - "movq %%mm4, 32(%0)\n" - "movq %%mm5, 40(%0)\n" - "movq %%mm6, 48(%0)\n" - "movq %%mm7, 56(%0)\n" - : - : "r" (d), "r" (s) - : "memory", - "%mm0", "%mm1", "%mm2", "%mm3", - "%mm4", "%mm5", "%mm6", "%mm7"); -#else - __m64 v0 = *(__m64 *)(s + 0); - __m64 v1 = *(__m64 *)(s + 8); - __m64 v2 = *(__m64 *)(s + 16); - __m64 v3 = *(__m64 *)(s + 24); - __m64 v4 = *(__m64 *)(s + 32); - __m64 v5 = *(__m64 *)(s + 40); - __m64 v6 = *(__m64 *)(s + 48); - __m64 v7 = *(__m64 *)(s + 56); - *(__m64 *)(d + 0) = v0; - *(__m64 *)(d + 8) = v1; - *(__m64 *)(d + 16) = v2; - *(__m64 *)(d + 24) = v3; - *(__m64 *)(d + 32) = v4; - *(__m64 *)(d + 40) = v5; - *(__m64 *)(d + 48) = v6; - *(__m64 *)(d + 56) = v7; -#endif - - w -= 64; - s += 64; - d += 64; - } - while (w >= 4) - { - *(CARD32 *)d = *(CARD32 *)s; - - w -= 4; - s += 4; - d += 4; - } - if (w >= 2) - { - *(CARD16 *)d = *(CARD16 *)s; - w -= 2; - s += 2; - d += 2; - } - } - - _mm_empty(); - - return TRUE; -} - -#endif /* RENDER */ -#endif /* USE_MMX */ diff --git a/fb/fbmmx.h b/fb/fbmmx.h deleted file mode 100644 index 7d32a382b..000000000 --- a/fb/fbmmx.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright © 2004 Red Hat, Inc. - * Copyright © 2005 Trolltech AS - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Red Hat not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. Red Hat makes no representations about the - * suitability of this software for any purpose. It is provided "as is" - * without express or implied warranty. - * - * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS - * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY - * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN - * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - * - * Author: Søren Sandmann (sandmann@redhat.com) - * Lars Knoll (lars@trolltech.com) - * - * Based on work by Owen Taylor - */ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#ifdef USE_MMX - -#if !defined(__amd64__) && !defined(__x86_64__) -Bool fbHaveMMX(void); -#else -#define fbHaveMMX() TRUE -#endif - -#else -#define fbHaveMMX() FALSE -#endif - -#ifdef USE_MMX - -Bool fbBltmmx (FbBits *src_bits, - FbBits *dst_bits, - FbStride src_stride, - FbStride dst_stride, - int src_bpp, - int dst_bpp, - int src_x, int src_y, - int dst_x, int dst_y, - int width, int height); -Bool fbFillmmx (FbBits *bits, - FbStride stride, - int bpp, - int x, - int y, - int width, - int height, - FbBits xor); -#endif /* USE_MMX */ diff --git a/fb/fboverlay.c b/fb/fboverlay.c index 1e3d756ed..5d7481eed 100644 --- a/fb/fboverlay.c +++ b/fb/fboverlay.c @@ -413,11 +413,7 @@ fbOverlayFinishScreenInit(ScreenPtr pScreen, return FALSE; if (! miScreenInit(pScreen, 0, xsize, ysize, dpix, dpiy, 0, depth1, ndepths, depths, - defaultVisual, nvisuals, visuals -#ifdef FB_OLD_MISCREENINIT - , (miBSFuncPtr) 0 -#endif - )) + defaultVisual, nvisuals, visuals)) return FALSE; /* MI thinks there's no frame buffer */ #ifdef MITSHM diff --git a/fb/fbpict.c b/fb/fbpict.c index 0a42f12d9..9efa0e816 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -36,7 +36,6 @@ #include "picturestr.h" #include "mipict.h" #include "fbpict.h" -#include "fbmmx.h" #define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b)) @@ -211,7 +210,7 @@ fbCompositeGeneral (CARD8 op, CARD16 width, CARD16 height) { - return fbComposite (op, pSrc, pMask, pDst, + fbComposite (op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask, xDst, yDst, width, height); } @@ -468,203 +467,3 @@ fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) return TRUE; } - -#ifdef USE_MMX -/* The CPU detection code needs to be in a file not compiled with - * "-mmmx -msse", as gcc would generate CMOV instructions otherwise - * that would lead to SIGILL instructions on old CPUs that don't have - * it. - */ -#if !defined(__amd64__) && !defined(__x86_64__) - -#ifdef HAVE_GETISAX -#include <sys/auxv.h> -#endif - -enum CPUFeatures { - NoFeatures = 0, - MMX = 0x1, - MMX_Extensions = 0x2, - SSE = 0x6, - SSE2 = 0x8, - CMOV = 0x10 -}; - -static unsigned int detectCPUFeatures(void) { - unsigned int features = 0; - unsigned int result = 0; - -#ifdef HAVE_GETISAX - if (getisax(&result, 1)) { - if (result & AV_386_CMOV) - features |= CMOV; - if (result & AV_386_MMX) - features |= MMX; - if (result & AV_386_AMD_MMX) - features |= MMX_Extensions; - if (result & AV_386_SSE) - features |= SSE; - if (result & AV_386_SSE2) - features |= SSE2; - } -#else - char vendor[13]; -#ifdef _MSC_VER - int vendor0 = 0, vendor1, vendor2; -#endif - vendor[0] = 0; - vendor[12] = 0; - -#ifdef __GNUC__ - /* see p. 118 of amd64 instruction set manual Vol3 */ - /* We need to be careful about the handling of %ebx and - * %esp here. We can't declare either one as clobbered - * since they are special registers (%ebx is the "PIC - * register" holding an offset to global data, %esp the - * stack pointer), so we need to make sure they have their - * original values when we access the output operands. - */ - __asm__ ("pushf\n" - "pop %%eax\n" - "mov %%eax, %%ecx\n" - "xor $0x00200000, %%eax\n" - "push %%eax\n" - "popf\n" - "pushf\n" - "pop %%eax\n" - "mov $0x0, %%edx\n" - "xor %%ecx, %%eax\n" - "jz 1f\n" - - "mov $0x00000000, %%eax\n" - "push %%ebx\n" - "cpuid\n" - "mov %%ebx, %%eax\n" - "pop %%ebx\n" - "mov %%eax, %1\n" - "mov %%edx, %2\n" - "mov %%ecx, %3\n" - "mov $0x00000001, %%eax\n" - "push %%ebx\n" - "cpuid\n" - "pop %%ebx\n" - "1:\n" - "mov %%edx, %0\n" - : "=r" (result), - "=m" (vendor[0]), - "=m" (vendor[4]), - "=m" (vendor[8]) - : - : "%eax", "%ecx", "%edx" - ); - -#elif defined (_MSC_VER) - - _asm { - pushfd - pop eax - mov ecx, eax - xor eax, 00200000h - push eax - popfd - pushfd - pop eax - mov edx, 0 - xor eax, ecx - jz nocpuid - - mov eax, 0 - push ebx - cpuid - mov eax, ebx - pop ebx - mov vendor0, eax - mov vendor1, edx - mov vendor2, ecx - mov eax, 1 - push ebx - cpuid - pop ebx - nocpuid: - mov result, edx - } - memmove (vendor+0, &vendor0, 4); - memmove (vendor+4, &vendor1, 4); - memmove (vendor+8, &vendor2, 4); - -#else -# error unsupported compiler -#endif - - features = 0; - if (result) { - /* result now contains the standard feature bits */ - if (result & (1 << 15)) - features |= CMOV; - if (result & (1 << 23)) - features |= MMX; - if (result & (1 << 25)) - features |= SSE; - if (result & (1 << 26)) - features |= SSE2; - if ((features & MMX) && !(features & SSE) && - (strcmp(vendor, "AuthenticAMD") == 0 || - strcmp(vendor, "Geode by NSC") == 0)) { - /* check for AMD MMX extensions */ -#ifdef __GNUC__ - __asm__("push %%ebx\n" - "mov $0x80000000, %%eax\n" - "cpuid\n" - "xor %%edx, %%edx\n" - "cmp $0x1, %%eax\n" - "jge 2f\n" - "mov $0x80000001, %%eax\n" - "cpuid\n" - "2:\n" - "pop %%ebx\n" - "mov %%edx, %0\n" - : "=r" (result) - : - : "%eax", "%ecx", "%edx" - ); -#elif defined _MSC_VER - _asm { - push ebx - mov eax, 80000000h - cpuid - xor edx, edx - cmp eax, 1 - jge notamd - mov eax, 80000001h - cpuid - notamd: - pop ebx - mov result, edx - } -#endif - if (result & (1<<22)) - features |= MMX_Extensions; - } - } -#endif /* HAVE_GETISAX */ - - return features; -} - -Bool -fbHaveMMX (void) -{ - static Bool initialized = FALSE; - static Bool mmx_present; - - if (!initialized) - { - unsigned int features = detectCPUFeatures(); - mmx_present = (features & (MMX|MMX_Extensions)) == (MMX|MMX_Extensions); - initialized = TRUE; - } - - return mmx_present; -} -#endif /* __amd64__ */ -#endif diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c index 8c3216a6c..2b77c4f34 100644 --- a/fb/fbpixmap.c +++ b/fb/fbpixmap.c @@ -1,6 +1,4 @@ /* - * Id: fbpixmap.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbpoint.c b/fb/fbpoint.c index c03ea18cc..c0ea8ba5b 100644 --- a/fb/fbpoint.c +++ b/fb/fbpoint.c @@ -1,6 +1,4 @@ /* - * Id: fbpoint.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbpush.c b/fb/fbpush.c index bb7bcefef..891572f0d 100644 --- a/fb/fbpush.c +++ b/fb/fbpush.c @@ -1,6 +1,4 @@ /* - * Id: fbpush.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbrop.h b/fb/fbrop.h index f3768a265..1685ee836 100644 --- a/fb/fbrop.h +++ b/fb/fbrop.h @@ -1,6 +1,4 @@ /* - * Id: fbrop.h,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbscreen.c b/fb/fbscreen.c index 045ca8fd2..94033f1d1 100644 --- a/fb/fbscreen.c +++ b/fb/fbscreen.c @@ -81,7 +81,6 @@ fbQueryBestSize (int class, } } -#ifndef FB_OLD_SCREEN PixmapPtr _fbGetWindowPixmap (WindowPtr pWindow) { @@ -97,7 +96,6 @@ _fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap) pWindow->devPrivates[fbWinPrivateIndex].ptr = (pointer) pPixmap; #endif } -#endif Bool fbSetupScreen(ScreenPtr pScreen, @@ -141,7 +139,6 @@ fbSetupScreen(ScreenPtr pScreen, pScreen->ResolveColor = fbResolveColor; pScreen->BitmapToRegion = fbPixmapToRegion; -#ifndef FB_OLD_SCREEN pScreen->GetWindowPixmap = _fbGetWindowPixmap; pScreen->SetWindowPixmap = _fbSetWindowPixmap; @@ -150,7 +147,6 @@ fbSetupScreen(ScreenPtr pScreen, pScreen->BackingStoreFuncs.SetClipmaskRgn = 0; pScreen->BackingStoreFuncs.GetImagePixmap = 0; pScreen->BackingStoreFuncs.GetSpansPixmap = 0; -#endif return TRUE; } @@ -247,11 +243,7 @@ fbFinishScreenInit(ScreenPtr pScreen, return FALSE; if (! miScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width, rootdepth, ndepths, depths, - defaultVisual, nvisuals, visuals -#ifdef FB_OLD_MISCREENINIT - , (miBSFuncPtr) 0 -#endif - )) + defaultVisual, nvisuals, visuals)) return FALSE; /* overwrite miCloseScreen with our own */ pScreen->CloseScreen = fbCloseScreen; @@ -313,26 +305,3 @@ fbScreenInit(ScreenPtr pScreen, return TRUE; } #endif - - -#ifdef FB_OLD_SCREEN -const miBSFuncRec fbBSFuncRec = { - fbSaveAreas, - fbRestoreAreas, - (void (*)(GCPtr, RegionPtr)) 0, - (PixmapPtr (*)(void)) 0, - (PixmapPtr (*)(void)) 0, -}; -#endif - -#if 0 -void -fbInitializeBackingStore (ScreenPtr pScreen) -{ -#ifdef FB_OLD_SCREEN - miInitializeBackingStore (pScreen, (miBSFuncRec *) &fbBSFuncRec); -#else - miInitializeBackingStore (pScreen); -#endif -} -#endif diff --git a/fb/fbseg.c b/fb/fbseg.c index 31076379b..80ce7404e 100644 --- a/fb/fbseg.c +++ b/fb/fbseg.c @@ -1,6 +1,4 @@ /* - * Id: fbseg.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbsetsp.c b/fb/fbsetsp.c index 06332568b..227ba4c62 100644 --- a/fb/fbsetsp.c +++ b/fb/fbsetsp.c @@ -1,6 +1,4 @@ /* - * Id: fbsetsp.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbsolid.c b/fb/fbsolid.c index 6b5ed0fa1..53fcae071 100644 --- a/fb/fbsolid.c +++ b/fb/fbsolid.c @@ -1,6 +1,4 @@ /* - * $XFree86$ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbstipple.c b/fb/fbstipple.c index de8d1f814..7d1326367 100644 --- a/fb/fbstipple.c +++ b/fb/fbstipple.c @@ -1,6 +1,4 @@ /* - * Id: fbstipple.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbtile.c b/fb/fbtile.c index e7df1af5a..05a27a17b 100644 --- a/fb/fbtile.c +++ b/fb/fbtile.c @@ -1,6 +1,4 @@ /* - * Id: fbtile.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -42,6 +40,7 @@ fbEvenTile (FbBits *dst, int height, FbBits *tile, + FbStride tileStride, int tileHeight, int alu, @@ -68,9 +67,9 @@ fbEvenTile (FbBits *dst, /* * Compute tile start scanline and rotation parameters */ - tileEnd = tile + tileHeight; + tileEnd = tile + tileHeight * tileStride; modulus (- yRot, tileHeight, tileY); - t = tile + tileY; + t = tile + tileY * tileStride; modulus (- xRot, FB_UNIT, tileX); rot = tileX; @@ -80,8 +79,9 @@ fbEvenTile (FbBits *dst, /* * Pick up bits for this scanline */ - bits = READ(t++); - if (t == tileEnd) t = tile; + bits = READ(t); + t += tileStride; + if (t >= tileEnd) t = tile; bits = FbRotLeft(bits,rot); and = fbAnd(alu,bits,pm); xor = fbXor(alu,bits,pm); @@ -194,7 +194,7 @@ fbTile (FbBits *dst, { if (FbEvenTile (tileWidth)) fbEvenTile (dst, dstStride, dstX, width, height, - tile, tileHeight, + tile, tileStride, tileHeight, alu, pm, xRot, yRot); else fbOddTile (dst, dstStride, dstX, width, height, diff --git a/fb/fbtrap.c b/fb/fbtrap.c index 831306869..e70336cce 100644 --- a/fb/fbtrap.c +++ b/fb/fbtrap.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbutil.c b/fb/fbutil.c index 4be0f233c..5e232971e 100644 --- a/fb/fbutil.c +++ b/fb/fbutil.c @@ -1,6 +1,4 @@ /* - * Id: fbutil.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/fb/fbwindow.c b/fb/fbwindow.c index 5b3f446b1..144f08362 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -1,6 +1,4 @@ /* - * Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $ - * * Copyright © 1998 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -30,10 +28,6 @@ #include "fb.h" -#ifdef USE_MMX -#include "fbmmx.h" -#endif - Bool fbCreateWindow(WindowPtr pWin) { @@ -222,22 +216,22 @@ fbFillRegionSolid (DrawablePtr pDrawable, int n = REGION_NUM_RECTS(pRegion); BoxPtr pbox = REGION_RECTS(pRegion); -#ifdef USE_MMX - int has_mmx = 0; - if (!and && fbHaveMMX()) - has_mmx = 1; +#ifndef FB_ACCESS_WRAPPER + int try_mmx = 0; + if (!and) + try_mmx = 1; #endif fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff); while (n--) { -#ifdef USE_MMX - if (!has_mmx || !fbFillmmx (dst, dstStride, dstBpp, - pbox->x1 + dstXoff, pbox->y1 + dstYoff, - (pbox->x2 - pbox->x1), - (pbox->y2 - pbox->y1), - xor)) +#ifndef FB_ACCESS_WRAPPER + if (!try_mmx || !pixman_fill (dst, dstStride, dstBpp, + pbox->x1 + dstXoff, pbox->y1 + dstYoff, + (pbox->x2 - pbox->x1), + (pbox->y2 - pbox->y1), + xor)) { #endif fbSolid (dst + (pbox->y1 + dstYoff) * dstStride, @@ -247,7 +241,7 @@ fbFillRegionSolid (DrawablePtr pDrawable, (pbox->x2 - pbox->x1) * dstBpp, pbox->y2 - pbox->y1, and, xor); -#ifdef USE_MMX +#ifndef FB_ACCESS_WRAPPER } #endif fbValidateDrawable (pDrawable); diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am index b8641bbc8..b773910fc 100644 --- a/hw/darwin/Makefile.am +++ b/hw/darwin/Makefile.am @@ -36,7 +36,6 @@ Xquartz_SOURCES = \ $(top_srcdir)/Xi/stubs.c \ apple/X11Application.m \ apple/X11Controller.m \ - quartz/Xserver.m \ quartz/Preferences.m \ quartz/applewm.c \ quartz/keysym2ucs.c \ diff --git a/hw/darwin/apple/X11Application.h b/hw/darwin/apple/X11Application.h index b9d2af8bf..6b1d72643 100644 --- a/hw/darwin/apple/X11Application.h +++ b/hw/darwin/apple/X11Application.h @@ -1,5 +1,4 @@ /* X11Application.h -- subclass of NSApplication to multiplex events - $Id: X11Application.h,v 1.26 2003/08/08 19:16:13 jharper Exp $ Copyright (c) 2002-2007 Apple Inc. All rights reserved. diff --git a/hw/darwin/apple/X11Controller.h b/hw/darwin/apple/X11Controller.h index 954d0abb9..8d17fd9c3 100644 --- a/hw/darwin/apple/X11Controller.h +++ b/hw/darwin/apple/X11Controller.h @@ -1,5 +1,4 @@ /* X11Controller.h -- connect the IB ui - $Id: X11Controller.h,v 1.21 2003/07/24 17:52:29 jharper Exp $ Copyright (c) 2002 Apple Computer, Inc. All rights reserved. diff --git a/hw/darwin/apple/bundle-main.c b/hw/darwin/apple/bundle-main.c index a35e1e37f..ec7820dc6 100644 --- a/hw/darwin/apple/bundle-main.c +++ b/hw/darwin/apple/bundle-main.c @@ -1,5 +1,4 @@ /* bundle-main.c -- X server launcher - $Id: bundle-main.c,v 1.17 2003/09/11 00:17:10 jharper Exp $ Copyright (c) 2002-2007 Apple Inc. All rights reserved. diff --git a/hw/darwin/quartz/XApplication.h b/hw/darwin/quartz/XApplication.h index a2622e060..2f2b22389 100644 --- a/hw/darwin/quartz/XApplication.h +++ b/hw/darwin/quartz/XApplication.h @@ -30,7 +30,6 @@ * sale, use or other dealings in this Software without prior written * authorization. */ -/* $XFree86: $ */ #import <Cocoa/Cocoa.h> diff --git a/hw/darwin/quartz/cr/cr.h b/hw/darwin/quartz/cr/cr.h index 94133e4af..d6779ae7d 100644 --- a/hw/darwin/quartz/cr/cr.h +++ b/hw/darwin/quartz/cr/cr.h @@ -26,7 +26,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86$ */ #ifndef _CR_H #define _CR_H diff --git a/hw/darwin/quartz/keysym2ucs.c b/hw/darwin/quartz/keysym2ucs.c index 98b8b6fee..3be59df33 100644 --- a/hw/darwin/quartz/keysym2ucs.c +++ b/hw/darwin/quartz/keysym2ucs.c @@ -1,5 +1,4 @@ -/* $XFree86: $ - * +/* * This module converts keysym values into the corresponding ISO 10646 * (UCS, Unicode) values. * diff --git a/hw/darwin/quartz/keysym2ucs.h b/hw/darwin/quartz/keysym2ucs.h index c7ff6f3b3..f5b7a18f2 100644 --- a/hw/darwin/quartz/keysym2ucs.h +++ b/hw/darwin/quartz/keysym2ucs.h @@ -1,5 +1,4 @@ -/* $XFree86: $ - * +/* * This module converts keysym values into the corresponding ISO 10646 * (UCS, Unicode) values. * diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/darwin/quartz/quartzKeyboard.c index bd2cc25ea..bdd541663 100644 --- a/hw/darwin/quartz/quartzKeyboard.c +++ b/hw/darwin/quartz/quartzKeyboard.c @@ -1,6 +1,5 @@ /* quartzKeyboard.c - $Id$ Code to build a keymap using the Carbon Keyboard Layout API, which is supported on Mac OS X 10.2 and newer. diff --git a/hw/darwin/quartz/xpr/Xplugin.h b/hw/darwin/quartz/xpr/Xplugin.h index fb6842c87..a10b1b8e1 100644 --- a/hw/darwin/quartz/xpr/Xplugin.h +++ b/hw/darwin/quartz/xpr/Xplugin.h @@ -1,5 +1,4 @@ /* Xplugin.h -- windowing API for rootless X11 server - $Id$ Copyright (c) 2002 Apple Computer, Inc. All rights reserved. diff --git a/hw/darwin/quartz/xpr/appledri.h b/hw/darwin/quartz/xpr/appledri.h index 9c630373d..c4e43be12 100644 --- a/hw/darwin/quartz/xpr/appledri.h +++ b/hw/darwin/quartz/xpr/appledri.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/lib/GL/dri/xf86dri.h,v 1.7 2000/12/07 20:26:02 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/darwin/quartz/xpr/appledristr.h b/hw/darwin/quartz/xpr/appledristr.h index 36a2e891e..8649fd329 100644 --- a/hw/darwin/quartz/xpr/appledristr.h +++ b/hw/darwin/quartz/xpr/appledristr.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/lib/GL/dri/xf86dristr.h,v 1.9 2001/03/21 16:01:08 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/darwin/quartz/xpr/x-hash.c b/hw/darwin/quartz/xpr/x-hash.c index 40e530fe0..6bbeacfab 100644 --- a/hw/darwin/quartz/xpr/x-hash.c +++ b/hw/darwin/quartz/xpr/x-hash.c @@ -1,5 +1,4 @@ /* x-hash.c - basic hash tables - $Id$ Copyright (c) 2002 Apple Computer, Inc. All rights reserved. diff --git a/hw/darwin/quartz/xpr/x-hash.h b/hw/darwin/quartz/xpr/x-hash.h index 5d4f7f93a..3456dbedf 100644 --- a/hw/darwin/quartz/xpr/x-hash.h +++ b/hw/darwin/quartz/xpr/x-hash.h @@ -1,5 +1,4 @@ /* x-hash.h -- basic hash table class - $Id$ Copyright (c) 2002 Apple Computer, Inc. All rights reserved. diff --git a/hw/darwin/quartz/xpr/x-hook.c b/hw/darwin/quartz/xpr/x-hook.c index 7a0496763..42915db6f 100644 --- a/hw/darwin/quartz/xpr/x-hook.c +++ b/hw/darwin/quartz/xpr/x-hook.c @@ -1,5 +1,4 @@ /* x-hook.c - $Id$ Copyright (c) 2003 Apple Computer, Inc. All rights reserved. @@ -27,7 +26,6 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/darwin/quartz/xpr/x-hook.h b/hw/darwin/quartz/xpr/x-hook.h index 0b5e038fe..392352d50 100644 --- a/hw/darwin/quartz/xpr/x-hook.h +++ b/hw/darwin/quartz/xpr/x-hook.h @@ -1,5 +1,4 @@ /* x-hook.h -- lists of function,data pairs to call. - $Id$ Copyright (c) 2003 Apple Computer, Inc. All rights reserved. @@ -27,7 +26,6 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: $ */ #ifndef X_HOOK_H #define X_HOOK_H 1 diff --git a/hw/darwin/quartz/xpr/x-list.c b/hw/darwin/quartz/xpr/x-list.c index a973e03f3..a5f835d84 100644 --- a/hw/darwin/quartz/xpr/x-list.c +++ b/hw/darwin/quartz/xpr/x-list.c @@ -1,5 +1,4 @@ /* x-list.c - $Id$ Copyright (c) 2002 Apple Computer, Inc. All rights reserved. diff --git a/hw/darwin/quartz/xpr/x-list.h b/hw/darwin/quartz/xpr/x-list.h index bd55a53d0..04af024a2 100644 --- a/hw/darwin/quartz/xpr/x-list.h +++ b/hw/darwin/quartz/xpr/x-list.h @@ -1,5 +1,4 @@ /* x-list.h -- simple list type - $Id$ Copyright (c) 2002 Apple Computer, Inc. All rights reserved. diff --git a/hw/dmx/config/Canvas.c b/hw/dmx/config/Canvas.c index 4dccd7382..c2eba876a 100644 --- a/hw/dmx/config/Canvas.c +++ b/hw/dmx/config/Canvas.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 1987, 1998 The Open Group * diff --git a/hw/dmx/config/Canvas.h b/hw/dmx/config/Canvas.h index a36851a6d..fe9a57f21 100644 --- a/hw/dmx/config/Canvas.h +++ b/hw/dmx/config/Canvas.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Copyright 1987, 1998 The Open Group diff --git a/hw/dmx/config/CanvasP.h b/hw/dmx/config/CanvasP.h index 98f95b94e..cf43710f1 100644 --- a/hw/dmx/config/CanvasP.h +++ b/hw/dmx/config/CanvasP.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Copyright 1987, 1998 The Open Group diff --git a/hw/dmx/config/dmxcompat.c b/hw/dmx/config/dmxcompat.c index 3681e8aa2..b4190ffcc 100644 --- a/hw/dmx/config/dmxcompat.c +++ b/hw/dmx/config/dmxcompat.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/dmxcompat.h b/hw/dmx/config/dmxcompat.h index 416ec7873..718892040 100644 --- a/hw/dmx/config/dmxcompat.h +++ b/hw/dmx/config/dmxcompat.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/dmxconfig.c b/hw/dmx/config/dmxconfig.c index 353ce11db..225d89277 100644 --- a/hw/dmx/config/dmxconfig.c +++ b/hw/dmx/config/dmxconfig.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/dmxconfig.h b/hw/dmx/config/dmxconfig.h index b5c0c1f1c..7c9dbc799 100644 --- a/hw/dmx/config/dmxconfig.h +++ b/hw/dmx/config/dmxconfig.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/dmxparse.c b/hw/dmx/config/dmxparse.c index 1acb6d13e..0bf947051 100644 --- a/hw/dmx/config/dmxparse.c +++ b/hw/dmx/config/dmxparse.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/dmxparse.h b/hw/dmx/config/dmxparse.h index 8ea84f4e3..de81d23b7 100644 --- a/hw/dmx/config/dmxparse.h +++ b/hw/dmx/config/dmxparse.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/dmxprint.c b/hw/dmx/config/dmxprint.c index ed3fc213d..599ebf5df 100644 --- a/hw/dmx/config/dmxprint.c +++ b/hw/dmx/config/dmxprint.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/dmxprint.h b/hw/dmx/config/dmxprint.h index b68c29620..d162dea95 100644 --- a/hw/dmx/config/dmxprint.h +++ b/hw/dmx/config/dmxprint.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/dmxtodmx.c b/hw/dmx/config/dmxtodmx.c index 706c49908..0d4ee4c09 100644 --- a/hw/dmx/config/dmxtodmx.c +++ b/hw/dmx/config/dmxtodmx.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/vdltodmx.c b/hw/dmx/config/vdltodmx.c index 33cd8fe8a..69563f16c 100644 --- a/hw/dmx/config/vdltodmx.c +++ b/hw/dmx/config/vdltodmx.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/config/xdmxconfig.c b/hw/dmx/config/xdmxconfig.c index 9a350a826..033b52512 100644 --- a/hw/dmx/config/xdmxconfig.c +++ b/hw/dmx/config/xdmxconfig.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * @@ -60,7 +59,7 @@ extern int yyparse(void); extern FILE *yyin; -#define DMX_INFO "xdmxconfig v0.9\nCopyright 2002 Red Hat Inc.\n$Id$" +#define DMX_INFO "xdmxconfig v0.9\nCopyright 2002 Red Hat Inc.\n" #define DMX_MAIN_WIDTH 800 #define DMX_MAIN_HEIGHT 600 diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c index b7c81ee57..24d1620b8 100644 --- a/hw/dmx/dmx.c +++ b/hw/dmx/dmx.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmx.h b/hw/dmx/dmx.h index becb2da38..37f42a76f 100644 --- a/hw/dmx/dmx.h +++ b/hw/dmx/dmx.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxcb.c b/hw/dmx/dmxcb.c index b1f47bde4..2ecfe22a3 100644 --- a/hw/dmx/dmxcb.c +++ b/hw/dmx/dmxcb.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxcb.h b/hw/dmx/dmxcb.h index 38ffa5671..fa334dbe8 100644 --- a/hw/dmx/dmxcb.h +++ b/hw/dmx/dmxcb.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxclient.h b/hw/dmx/dmxclient.h index 657a1275f..8f018d153 100644 --- a/hw/dmx/dmxclient.h +++ b/hw/dmx/dmxclient.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright (c) 1995 X Consortium * Copyright 2004 Red Hat Inc., Durham, North Carolina. diff --git a/hw/dmx/dmxcmap.c b/hw/dmx/dmxcmap.c index 9a9781f53..949d7d689 100644 --- a/hw/dmx/dmxcmap.c +++ b/hw/dmx/dmxcmap.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxcmap.h b/hw/dmx/dmxcmap.h index 09039e72b..228f8662e 100644 --- a/hw/dmx/dmxcmap.h +++ b/hw/dmx/dmxcmap.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxcursor.c b/hw/dmx/dmxcursor.c index a7d9378b0..1ad199d58 100644 --- a/hw/dmx/dmxcursor.c +++ b/hw/dmx/dmxcursor.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxcursor.h b/hw/dmx/dmxcursor.h index af076bd1c..7b70c6250 100644 --- a/hw/dmx/dmxcursor.h +++ b/hw/dmx/dmxcursor.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxdpms.c b/hw/dmx/dmxdpms.c index 5bcce188d..5c176dfc3 100644 --- a/hw/dmx/dmxdpms.c +++ b/hw/dmx/dmxdpms.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxdpms.h b/hw/dmx/dmxdpms.h index d3fa57d4a..e3eee983a 100644 --- a/hw/dmx/dmxdpms.h +++ b/hw/dmx/dmxdpms.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c index c12973bd5..103364446 100644 --- a/hw/dmx/dmxextension.c +++ b/hw/dmx/dmxextension.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxextension.h b/hw/dmx/dmxextension.h index 3ea0b83ec..342d8c593 100644 --- a/hw/dmx/dmxextension.h +++ b/hw/dmx/dmxextension.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c index 3dba61de4..500b5682a 100644 --- a/hw/dmx/dmxfont.c +++ b/hw/dmx/dmxfont.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxfont.h b/hw/dmx/dmxfont.h index f69aac196..086e71b59 100644 --- a/hw/dmx/dmxfont.h +++ b/hw/dmx/dmxfont.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxgc.c b/hw/dmx/dmxgc.c index d17b05164..981f64d0a 100644 --- a/hw/dmx/dmxgc.c +++ b/hw/dmx/dmxgc.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxgc.h b/hw/dmx/dmxgc.h index 5f54d7dc9..3d49f6735 100644 --- a/hw/dmx/dmxgc.h +++ b/hw/dmx/dmxgc.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxgcops.c b/hw/dmx/dmxgcops.c index 75d9dfb73..eaabf16dd 100644 --- a/hw/dmx/dmxgcops.c +++ b/hw/dmx/dmxgcops.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxgcops.h b/hw/dmx/dmxgcops.h index 0754c44c1..da14d4d94 100644 --- a/hw/dmx/dmxgcops.h +++ b/hw/dmx/dmxgcops.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c index 1d3689c40..29dc00575 100644 --- a/hw/dmx/dmxinit.c +++ b/hw/dmx/dmxinit.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxinit.h b/hw/dmx/dmxinit.h index e5bdb9957..7d166fd85 100644 --- a/hw/dmx/dmxinit.h +++ b/hw/dmx/dmxinit.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2004 Red Hat Inc., Raleigh, North Carolina. * diff --git a/hw/dmx/dmxinput.c b/hw/dmx/dmxinput.c index f47899c2f..d644b5d0d 100644 --- a/hw/dmx/dmxinput.c +++ b/hw/dmx/dmxinput.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxinput.h b/hw/dmx/dmxinput.h index 3fb587086..8a3ccdcbd 100644 --- a/hw/dmx/dmxinput.h +++ b/hw/dmx/dmxinput.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxlog.c b/hw/dmx/dmxlog.c index 16d082daa..31a74cdf1 100644 --- a/hw/dmx/dmxlog.c +++ b/hw/dmx/dmxlog.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxlog.h b/hw/dmx/dmxlog.h index 6b9ec6005..8a5f725c8 100644 --- a/hw/dmx/dmxlog.h +++ b/hw/dmx/dmxlog.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxpict.c b/hw/dmx/dmxpict.c index 0f1782e51..478542a13 100644 --- a/hw/dmx/dmxpict.c +++ b/hw/dmx/dmxpict.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxpict.h b/hw/dmx/dmxpict.h index fe2a65959..c178ef39c 100644 --- a/hw/dmx/dmxpict.h +++ b/hw/dmx/dmxpict.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxpixmap.c b/hw/dmx/dmxpixmap.c index e617134f1..323ae606a 100644 --- a/hw/dmx/dmxpixmap.c +++ b/hw/dmx/dmxpixmap.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxpixmap.h b/hw/dmx/dmxpixmap.h index 908d2cb2c..4ecd10fd8 100644 --- a/hw/dmx/dmxpixmap.h +++ b/hw/dmx/dmxpixmap.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxprop.c b/hw/dmx/dmxprop.c index 8d9e22a27..376313d8d 100644 --- a/hw/dmx/dmxprop.c +++ b/hw/dmx/dmxprop.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxprop.h b/hw/dmx/dmxprop.h index f0c5afb95..50135cd64 100644 --- a/hw/dmx/dmxprop.h +++ b/hw/dmx/dmxprop.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002,2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c index 7c315d89f..8ae448a5e 100644 --- a/hw/dmx/dmxscrinit.c +++ b/hw/dmx/dmxscrinit.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxscrinit.h b/hw/dmx/dmxscrinit.h index 91be0948c..46a0a00a4 100644 --- a/hw/dmx/dmxscrinit.h +++ b/hw/dmx/dmxscrinit.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxshadow.c b/hw/dmx/dmxshadow.c index 8d1e147d1..461fd085b 100644 --- a/hw/dmx/dmxshadow.c +++ b/hw/dmx/dmxshadow.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxshadow.h b/hw/dmx/dmxshadow.h index 4ba084c99..cafe87900 100644 --- a/hw/dmx/dmxshadow.h +++ b/hw/dmx/dmxshadow.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxstat.c b/hw/dmx/dmxstat.c index 3b092b2a8..a89c69eae 100644 --- a/hw/dmx/dmxstat.c +++ b/hw/dmx/dmxstat.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002, 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxstat.h b/hw/dmx/dmxstat.h index 5411272ca..04c88d3c9 100644 --- a/hw/dmx/dmxstat.h +++ b/hw/dmx/dmxstat.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxsync.c b/hw/dmx/dmxsync.c index 02e244697..c1aa43107 100644 --- a/hw/dmx/dmxsync.c +++ b/hw/dmx/dmxsync.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxsync.h b/hw/dmx/dmxsync.h index 85fd36c07..b80f54af2 100644 --- a/hw/dmx/dmxsync.h +++ b/hw/dmx/dmxsync.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxvisual.c b/hw/dmx/dmxvisual.c index 23ff0acfa..7b8771f9e 100644 --- a/hw/dmx/dmxvisual.c +++ b/hw/dmx/dmxvisual.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxvisual.h b/hw/dmx/dmxvisual.h index 8701bf01f..bcb54cd0e 100644 --- a/hw/dmx/dmxvisual.h +++ b/hw/dmx/dmxvisual.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxwindow.c b/hw/dmx/dmxwindow.c index 25456e228..b66f2a3bb 100644 --- a/hw/dmx/dmxwindow.c +++ b/hw/dmx/dmxwindow.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/dmxwindow.h b/hw/dmx/dmxwindow.h index e6302fe3f..f976c7954 100644 --- a/hw/dmx/dmxwindow.h +++ b/hw/dmx/dmxwindow.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/dmxaddinput.c b/hw/dmx/examples/dmxaddinput.c index c391385e9..dcfd4f5cc 100644 --- a/hw/dmx/examples/dmxaddinput.c +++ b/hw/dmx/examples/dmxaddinput.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003,2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/dmxaddscreen.c b/hw/dmx/examples/dmxaddscreen.c index 5fa008c21..8e60872df 100644 --- a/hw/dmx/examples/dmxaddscreen.c +++ b/hw/dmx/examples/dmxaddscreen.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/dmxreconfig.c b/hw/dmx/examples/dmxreconfig.c index efcead86e..042f8a112 100644 --- a/hw/dmx/examples/dmxreconfig.c +++ b/hw/dmx/examples/dmxreconfig.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/dmxresize.c b/hw/dmx/examples/dmxresize.c index f6fadf70c..caed91d8d 100644 --- a/hw/dmx/examples/dmxresize.c +++ b/hw/dmx/examples/dmxresize.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/dmxrminput.c b/hw/dmx/examples/dmxrminput.c index 3860cc9c6..ef62cab8b 100644 --- a/hw/dmx/examples/dmxrminput.c +++ b/hw/dmx/examples/dmxrminput.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003,2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/dmxrmscreen.c b/hw/dmx/examples/dmxrmscreen.c index ab3653d24..fecf0f6c1 100644 --- a/hw/dmx/examples/dmxrmscreen.c +++ b/hw/dmx/examples/dmxrmscreen.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/dmxwininfo.c b/hw/dmx/examples/dmxwininfo.c index bbf7f7446..6cf1d411e 100644 --- a/hw/dmx/examples/dmxwininfo.c +++ b/hw/dmx/examples/dmxwininfo.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright (c) 2003 by the XFree86 Project, Inc. * diff --git a/hw/dmx/examples/ev.c b/hw/dmx/examples/ev.c index 04c47eb11..10912266d 100644 --- a/hw/dmx/examples/ev.c +++ b/hw/dmx/examples/ev.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/evi.c b/hw/dmx/examples/evi.c index 14af95d5a..644ea8f51 100644 --- a/hw/dmx/examples/evi.c +++ b/hw/dmx/examples/evi.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/res.c b/hw/dmx/examples/res.c index 3af5541fa..901a1958b 100644 --- a/hw/dmx/examples/res.c +++ b/hw/dmx/examples/res.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/xbell.c b/hw/dmx/examples/xbell.c index 4d55740a8..f3e3be1b8 100644 --- a/hw/dmx/examples/xbell.c +++ b/hw/dmx/examples/xbell.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/xdmx.c b/hw/dmx/examples/xdmx.c index 3fec7dd3d..dedce6e8d 100644 --- a/hw/dmx/examples/xdmx.c +++ b/hw/dmx/examples/xdmx.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/xinput.c b/hw/dmx/examples/xinput.c index c2b9bc0f4..74353a93b 100644 --- a/hw/dmx/examples/xinput.c +++ b/hw/dmx/examples/xinput.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001,2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/xled.c b/hw/dmx/examples/xled.c index cb4bcb1ac..270f80511 100644 --- a/hw/dmx/examples/xled.c +++ b/hw/dmx/examples/xled.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/examples/xtest.c b/hw/dmx/examples/xtest.c index b6f223d27..1e2d1cfff 100644 --- a/hw/dmx/examples/xtest.c +++ b/hw/dmx/examples/xtest.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/glxProxy/glxswap.c b/hw/dmx/glxProxy/glxswap.c index f7fcc37ac..8fa04f877 100644 --- a/hw/dmx/glxProxy/glxswap.c +++ b/hw/dmx/glxProxy/glxswap.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Raleigh, North Carolina. * diff --git a/hw/dmx/glxProxy/glxswap.h b/hw/dmx/glxProxy/glxswap.h index 95c433381..08e38df7b 100644 --- a/hw/dmx/glxProxy/glxswap.h +++ b/hw/dmx/glxProxy/glxswap.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Raleigh, North Carolina. * diff --git a/hw/dmx/input/ChkNotMaskEv.c b/hw/dmx/input/ChkNotMaskEv.c index 220e1de39..fdc67a889 100644 --- a/hw/dmx/input/ChkNotMaskEv.c +++ b/hw/dmx/input/ChkNotMaskEv.c @@ -1,4 +1,3 @@ -/* Derived from Xorg: ChkMaskEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp */ /* * Copyright 1985, 1987, 1998 The Open Group * diff --git a/hw/dmx/input/ChkNotMaskEv.h b/hw/dmx/input/ChkNotMaskEv.h index 777d3a28a..f79075e1d 100644 --- a/hw/dmx/input/ChkNotMaskEv.h +++ b/hw/dmx/input/ChkNotMaskEv.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxarg.c b/hw/dmx/input/dmxarg.c index 8708fa009..49a1da9af 100644 --- a/hw/dmx/input/dmxarg.c +++ b/hw/dmx/input/dmxarg.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxarg.h b/hw/dmx/input/dmxarg.h index b377aca70..ca76f9272 100644 --- a/hw/dmx/input/dmxarg.h +++ b/hw/dmx/input/dmxarg.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxbackend.c b/hw/dmx/input/dmxbackend.c index 7aa8510cb..b1791098a 100644 --- a/hw/dmx/input/dmxbackend.c +++ b/hw/dmx/input/dmxbackend.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxbackend.h b/hw/dmx/input/dmxbackend.h index 64a65f4a6..ee78f0014 100644 --- a/hw/dmx/input/dmxbackend.h +++ b/hw/dmx/input/dmxbackend.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxcommon.c b/hw/dmx/input/dmxcommon.c index 1dcc1e9e4..e77bb7918 100644 --- a/hw/dmx/input/dmxcommon.c +++ b/hw/dmx/input/dmxcommon.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxcommon.h b/hw/dmx/input/dmxcommon.h index 4b8b07d9f..1cc935d0b 100644 --- a/hw/dmx/input/dmxcommon.h +++ b/hw/dmx/input/dmxcommon.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002,2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxconsole.c b/hw/dmx/input/dmxconsole.c index aac5e08dc..cc820a204 100644 --- a/hw/dmx/input/dmxconsole.c +++ b/hw/dmx/input/dmxconsole.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxconsole.h b/hw/dmx/input/dmxconsole.h index 85516fb5b..cd545d39b 100644 --- a/hw/dmx/input/dmxconsole.h +++ b/hw/dmx/input/dmxconsole.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxdetach.c b/hw/dmx/input/dmxdetach.c index d2e6b652f..cc2250683 100644 --- a/hw/dmx/input/dmxdetach.c +++ b/hw/dmx/input/dmxdetach.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2004 Red Hat Inc., Raleigh, North Carolina. * diff --git a/hw/dmx/input/dmxdummy.c b/hw/dmx/input/dmxdummy.c index b9c72b015..2afe2580d 100644 --- a/hw/dmx/input/dmxdummy.c +++ b/hw/dmx/input/dmxdummy.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxdummy.h b/hw/dmx/input/dmxdummy.h index 1f20a38cb..e3a85be95 100644 --- a/hw/dmx/input/dmxdummy.h +++ b/hw/dmx/input/dmxdummy.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxeq.c b/hw/dmx/input/dmxeq.c index a2fb07f1e..3e98fb799 100644 --- a/hw/dmx/input/dmxeq.c +++ b/hw/dmx/input/dmxeq.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * * Copyright 1990, 1998 The Open Group diff --git a/hw/dmx/input/dmxeq.h b/hw/dmx/input/dmxeq.h index 64d15f7e8..b38c519df 100644 --- a/hw/dmx/input/dmxeq.h +++ b/hw/dmx/input/dmxeq.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c index 4810b17bb..26dc067dc 100644 --- a/hw/dmx/input/dmxevents.c +++ b/hw/dmx/input/dmxevents.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxevents.h b/hw/dmx/input/dmxevents.h index f8d29d440..fe8712ebe 100644 --- a/hw/dmx/input/dmxevents.h +++ b/hw/dmx/input/dmxevents.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index a9d902ec2..fd4eeaacb 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxinputinit.h b/hw/dmx/input/dmxinputinit.h index c593e267a..6f491edf9 100644 --- a/hw/dmx/input/dmxinputinit.h +++ b/hw/dmx/input/dmxinputinit.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxmap.c b/hw/dmx/input/dmxmap.c index cf1be5853..1eccd3d28 100644 --- a/hw/dmx/input/dmxmap.c +++ b/hw/dmx/input/dmxmap.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxmap.h b/hw/dmx/input/dmxmap.h index 662955636..aad30d1bd 100644 --- a/hw/dmx/input/dmxmap.h +++ b/hw/dmx/input/dmxmap.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxmotion.c b/hw/dmx/input/dmxmotion.c index 7b47c4562..cc55eedff 100644 --- a/hw/dmx/input/dmxmotion.c +++ b/hw/dmx/input/dmxmotion.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxmotion.h b/hw/dmx/input/dmxmotion.h index 2928f5f2a..88aeb3d09 100644 --- a/hw/dmx/input/dmxmotion.h +++ b/hw/dmx/input/dmxmotion.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxsigio.c b/hw/dmx/input/dmxsigio.c index 840b56641..03c3070d7 100644 --- a/hw/dmx/input/dmxsigio.c +++ b/hw/dmx/input/dmxsigio.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxsigio.h b/hw/dmx/input/dmxsigio.h index 869dd6bdf..83f8060ae 100644 --- a/hw/dmx/input/dmxsigio.h +++ b/hw/dmx/input/dmxsigio.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/dmxxinput.c b/hw/dmx/input/dmxxinput.c index ad2a77c9c..97bea7596 100644 --- a/hw/dmx/input/dmxxinput.c +++ b/hw/dmx/input/dmxxinput.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/lnx-keyboard.c b/hw/dmx/input/lnx-keyboard.c index b09492b89..42a807b11 100644 --- a/hw/dmx/input/lnx-keyboard.c +++ b/hw/dmx/input/lnx-keyboard.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Portions of this file were derived from the following files: * ********************************************************************** diff --git a/hw/dmx/input/lnx-keyboard.h b/hw/dmx/input/lnx-keyboard.h index 8f7129048..e36a50499 100644 --- a/hw/dmx/input/lnx-keyboard.h +++ b/hw/dmx/input/lnx-keyboard.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/lnx-ms.c b/hw/dmx/input/lnx-ms.c index 6df4e80d3..b3692a071 100644 --- a/hw/dmx/input/lnx-ms.c +++ b/hw/dmx/input/lnx-ms.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Portions of this file were derived from the following files: * ********************************************************************** diff --git a/hw/dmx/input/lnx-ms.h b/hw/dmx/input/lnx-ms.h index bc744431a..9042fc293 100644 --- a/hw/dmx/input/lnx-ms.h +++ b/hw/dmx/input/lnx-ms.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/lnx-ps2.c b/hw/dmx/input/lnx-ps2.c index 0c5b870aa..8b906df5f 100644 --- a/hw/dmx/input/lnx-ps2.c +++ b/hw/dmx/input/lnx-ps2.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Portions of this file were derived from the following files: * ********************************************************************** diff --git a/hw/dmx/input/lnx-ps2.h b/hw/dmx/input/lnx-ps2.h index e3d751e2f..5772e03d0 100644 --- a/hw/dmx/input/lnx-ps2.h +++ b/hw/dmx/input/lnx-ps2.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/usb-common.c b/hw/dmx/input/usb-common.c index a6fe7ad3b..70695d0f1 100644 --- a/hw/dmx/input/usb-common.c +++ b/hw/dmx/input/usb-common.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/usb-common.h b/hw/dmx/input/usb-common.h index 768312990..5ebfd1e78 100644 --- a/hw/dmx/input/usb-common.h +++ b/hw/dmx/input/usb-common.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/usb-keyboard.c b/hw/dmx/input/usb-keyboard.c index 4b9439603..efec2705b 100644 --- a/hw/dmx/input/usb-keyboard.c +++ b/hw/dmx/input/usb-keyboard.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* Portions of this file were derived from the following files: * ********************************************************************** diff --git a/hw/dmx/input/usb-keyboard.h b/hw/dmx/input/usb-keyboard.h index 5a4768a9d..1f9614eef 100644 --- a/hw/dmx/input/usb-keyboard.h +++ b/hw/dmx/input/usb-keyboard.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/usb-mouse.c b/hw/dmx/input/usb-mouse.c index eb1a3d123..efa9d00ec 100644 --- a/hw/dmx/input/usb-mouse.c +++ b/hw/dmx/input/usb-mouse.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/usb-mouse.h b/hw/dmx/input/usb-mouse.h index 2439013ee..918bf6481 100644 --- a/hw/dmx/input/usb-mouse.h +++ b/hw/dmx/input/usb-mouse.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/usb-other.c b/hw/dmx/input/usb-other.c index 9bb284281..d1074b8e1 100644 --- a/hw/dmx/input/usb-other.c +++ b/hw/dmx/input/usb-other.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/usb-other.h b/hw/dmx/input/usb-other.h index b2279fd8d..b69e65933 100644 --- a/hw/dmx/input/usb-other.h +++ b/hw/dmx/input/usb-other.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/dmx/input/usb-private.h b/hw/dmx/input/usb-private.h index eae9c8b7a..c70668ce5 100644 --- a/hw/dmx/input/usb-private.h +++ b/hw/dmx/input/usb-private.h @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2002 Red Hat Inc., Durham, North Carolina. * diff --git a/hw/kdrive/ati/Makefile.am b/hw/kdrive/ati/Makefile.am index 61c1c844b..9e1fc7f57 100644 --- a/hw/kdrive/ati/Makefile.am +++ b/hw/kdrive/ati/Makefile.am @@ -63,5 +63,9 @@ Xati_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xati_DEPENDENCIES = \ + libati.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/ati/ati.c b/hw/kdrive/ati/ati.c index 5b4e80ff2..c4f67e171 100644 --- a/hw/kdrive/ati/ati.c +++ b/hw/kdrive/ati/ati.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Eric Anholt * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/ati/ati.h b/hw/kdrive/ati/ati.h index 188d0b057..3ff3e3ff3 100644 --- a/hw/kdrive/ati/ati.h +++ b/hw/kdrive/ati/ati.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Eric Anholt * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifndef _ATI_H_ #define _ATI_H_ diff --git a/hw/kdrive/ati/ati_cursor.c b/hw/kdrive/ati/ati_cursor.c index e8c711707..d2ce686df 100644 --- a/hw/kdrive/ati/ati_cursor.c +++ b/hw/kdrive/ati/ati_cursor.c @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId$ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/ati/ati_dma.c b/hw/kdrive/ati/ati_dma.c index 70b86d36c..b97d79b25 100644 --- a/hw/kdrive/ati/ati_dma.c +++ b/hw/kdrive/ati/ati_dma.c @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #include <sys/time.h> @@ -43,6 +42,7 @@ extern CARD32 radeon_cp_microcode[][2]; extern CARD32 r200_cp_microcode[][2]; extern CARD32 r300_cp_microcode[][2]; +#if DEBUG_FIFO static void ATIDebugFifo(ATIScreenInfo *atis) { @@ -69,6 +69,7 @@ ATIDebugFifo(ATIScreenInfo *atis) MMIO_IN32(mmio, R128_REG_PC_NGUI_CTLSTAT)); } } +#endif static void ATIUploadMicrocode(ATIScreenInfo *atis) diff --git a/hw/kdrive/ati/ati_dma.h b/hw/kdrive/ati/ati_dma.h index ad2f3e12a..4c2092b2c 100644 --- a/hw/kdrive/ati/ati_dma.h +++ b/hw/kdrive/ati/ati_dma.h @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifndef _ATI_DMA_H_ #define _ATI_DMA_H_ diff --git a/hw/kdrive/ati/ati_draw.c b/hw/kdrive/ati/ati_draw.c index f71dac5f7..c10fea471 100644 --- a/hw/kdrive/ati/ati_draw.c +++ b/hw/kdrive/ati/ati_draw.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Eric Anholt * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/ati/ati_draw.h b/hw/kdrive/ati/ati_draw.h index addaa0ee0..98a130a7b 100644 --- a/hw/kdrive/ati/ati_draw.h +++ b/hw/kdrive/ati/ati_draw.h @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifndef _ATI_DRAW_H_ #define _ATI_DRAW_H_ diff --git a/hw/kdrive/ati/ati_drawtmp.h b/hw/kdrive/ati/ati_drawtmp.h index a0057222f..82c99ac4d 100644 --- a/hw/kdrive/ati/ati_drawtmp.h +++ b/hw/kdrive/ati/ati_drawtmp.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Eric Anholt * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef USE_DMA #define TAG(x) x##DMA diff --git a/hw/kdrive/ati/ati_dri.c b/hw/kdrive/ati/ati_dri.c index f2830e13a..edef72030 100644 --- a/hw/kdrive/ati/ati_dri.c +++ b/hw/kdrive/ati/ati_dri.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Eric Anholt * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #include <sys/time.h> diff --git a/hw/kdrive/ati/ati_dri.h b/hw/kdrive/ati/ati_dri.h index 2e2b9501b..985f7eb43 100644 --- a/hw/kdrive/ati/ati_dri.h +++ b/hw/kdrive/ati/ati_dri.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Eric Anholt * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifndef _ATI_DRI_H_ #define _ATI_DRI_H_ diff --git a/hw/kdrive/ati/ati_reg.h b/hw/kdrive/ati/ati_reg.h index 32291d8f4..3089cba04 100644 --- a/hw/kdrive/ati/ati_reg.h +++ b/hw/kdrive/ati/ati_reg.h @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ /* Many of the Radeon and Rage 128 registers are the same. * ATI_ should denote registers and values that are common for R128 and Radeon. diff --git a/hw/kdrive/ati/ati_sarea.h b/hw/kdrive/ati/ati_sarea.h index 67da24aca..2f04c7be0 100644 --- a/hw/kdrive/ati/ati_sarea.h +++ b/hw/kdrive/ati/ati_sarea.h @@ -1,7 +1,4 @@ - /* - * $Id$ - * * Copyright © 2003 Eric Anholt * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifndef _ATI_SAREA_H_ #define _ATI_SAREA_H_ diff --git a/hw/kdrive/ati/ati_stub.c b/hw/kdrive/ati/ati_stub.c index d0bc4ca6b..3669fd743 100644 --- a/hw/kdrive/ati/ati_stub.c +++ b/hw/kdrive/ati/ati_stub.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Eric Anholt * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/ati/ati_video.c b/hw/kdrive/ati/ati_video.c index 173fb644f..ca0ab464a 100644 --- a/hw/kdrive/ati/ati_video.c +++ b/hw/kdrive/ati/ati_video.c @@ -22,7 +22,6 @@ * * Based on mach64video.c by Keith Packard. */ -/* $RCSId$ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/ati/r128_blendtmp.h b/hw/kdrive/ati/r128_blendtmp.h index d31cdb3ad..b663eac95 100644 --- a/hw/kdrive/ati/r128_blendtmp.h +++ b/hw/kdrive/ati/r128_blendtmp.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Eric Anholt, Anders Carlsson * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef USE_DMA #define TAG(x) x##DMA diff --git a/hw/kdrive/ati/r128_composite.c b/hw/kdrive/ati/r128_composite.c index 46d4edb72..0d18ebff7 100644 --- a/hw/kdrive/ati/r128_composite.c +++ b/hw/kdrive/ati/r128_composite.c @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #include "ati.h" #include "ati_reg.h" diff --git a/hw/kdrive/ati/radeon_composite.c b/hw/kdrive/ati/radeon_composite.c index 18ada4f61..ddad343e3 100644 --- a/hw/kdrive/ati/radeon_composite.c +++ b/hw/kdrive/ati/radeon_composite.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Eric Anholt * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/chips/Makefile.am b/hw/kdrive/chips/Makefile.am index a0a10d715..8188a8e7e 100644 --- a/hw/kdrive/chips/Makefile.am +++ b/hw/kdrive/chips/Makefile.am @@ -25,5 +25,9 @@ Xchips_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xchips_DEPENDENCIES = \ + libchips.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/chips/chips.c b/hw/kdrive/chips/chips.c index 10bd24cf3..b419863eb 100644 --- a/hw/kdrive/chips/chips.c +++ b/hw/kdrive/chips/chips.c @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/trident.c,v 1.18 2001/06/04 09:45:42 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/chips/chips.h b/hw/kdrive/chips/chips.h index f7b9784c6..6ad17fe25 100644 --- a/hw/kdrive/chips/chips.h +++ b/hw/kdrive/chips/chips.h @@ -1,6 +1,4 @@ /* - * Id: chips.h,v 1.2 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/chips/chips.h,v 1.9 2000/11/29 08:42:25 keithp Exp $ */ #ifndef _CHIPS_H_ #define _CHIPS_H_ diff --git a/hw/kdrive/chips/chipsdraw.c b/hw/kdrive/chips/chipsdraw.c index 7b1b56053..b1c35f901 100644 --- a/hw/kdrive/chips/chipsdraw.c +++ b/hw/kdrive/chips/chipsdraw.c @@ -1,6 +1,4 @@ /* - * Id: tridentdraw.c,v 1.1 1999/11/02 03:54:47 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.10 2001/06/03 18:48:19 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/chips/chipsstub.c b/hw/kdrive/chips/chipsstub.c index 7fec1c77d..9024a7d44 100644 --- a/hw/kdrive/chips/chipsstub.c +++ b/hw/kdrive/chips/chipsstub.c @@ -1,6 +1,4 @@ /* - * Id: chipsstub.c,v 1.1 1999/11/02 08:19:15 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +20,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/chips/chipsstub.c,v 1.1 2001/09/05 07:12:42 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am index 1e820c097..cc3019fc7 100644 --- a/hw/kdrive/ephyr/Makefile.am +++ b/hw/kdrive/ephyr/Makefile.am @@ -30,5 +30,10 @@ Xephyr_LDADD = \ @KDRIVE_LIBS@ \ @XEPHYR_LIBS@ +Xephyr_DEPENDENCIES = \ + libxephyr.a \ + libxephyr-hostx.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/epson/Makefile.am b/hw/kdrive/epson/Makefile.am index d36230abe..cd2057132 100644 --- a/hw/kdrive/epson/Makefile.am +++ b/hw/kdrive/epson/Makefile.am @@ -25,5 +25,9 @@ Xepson_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xepson_DEPENDENCIES = \ + libepson.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/epson/epson13806.c b/hw/kdrive/epson/epson13806.c index 43a9b58da..cb00890a7 100644 --- a/hw/kdrive/epson/epson13806.c +++ b/hw/kdrive/epson/epson13806.c @@ -1,4 +1,3 @@ -/* $Header$ */ /* * Copyright 2004 by Costas Stylianou <costas.stylianou@psion.com> +44(0)7850 394095 * diff --git a/hw/kdrive/epson/epson13806.h b/hw/kdrive/epson/epson13806.h index b80fe19a4..b28d7c085 100644 --- a/hw/kdrive/epson/epson13806.h +++ b/hw/kdrive/epson/epson13806.h @@ -1,4 +1,3 @@ -/* $Header$ */ /* * Copyright 2004 by Costas Stylianou <costas.stylianou@psion.com> +44(0)7850 394095 * diff --git a/hw/kdrive/epson/epson13806draw.c b/hw/kdrive/epson/epson13806draw.c index e16e0d6a2..3222353a3 100644 --- a/hw/kdrive/epson/epson13806draw.c +++ b/hw/kdrive/epson/epson13806draw.c @@ -1,4 +1,3 @@ -/* $Header$ */ /* * Copyright 2004 by Costas Stylianou <costas.stylianou@psion.com> +44(0)7850 394095 * diff --git a/hw/kdrive/epson/epson13806draw.h b/hw/kdrive/epson/epson13806draw.h index ff1264d96..b5f1bf5c2 100644 --- a/hw/kdrive/epson/epson13806draw.h +++ b/hw/kdrive/epson/epson13806draw.h @@ -1,4 +1,3 @@ -/* $Header$ */ /* * Copyright 2004 by Costas Stylianou <costas.stylianou@psion.com> +44(0)7850 394095 * diff --git a/hw/kdrive/epson/epson13806reg.h b/hw/kdrive/epson/epson13806reg.h index 615638210..ee745a08f 100644 --- a/hw/kdrive/epson/epson13806reg.h +++ b/hw/kdrive/epson/epson13806reg.h @@ -1,4 +1,3 @@ -/* $Header$ */ /* * Copyright 2004 by Costas Stylianou <costas.stylianou@psion.com> +44(0)7850 394095 * diff --git a/hw/kdrive/epson/epson13806stub.c b/hw/kdrive/epson/epson13806stub.c index 7981782ed..087a30fc7 100644 --- a/hw/kdrive/epson/epson13806stub.c +++ b/hw/kdrive/epson/epson13806stub.c @@ -1,4 +1,3 @@ -/* $Header$ */ /* * Copyright 2004 by Costas Stylianou <costas.stylianou@psion.com> +44(0)7850 394095 * diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am index 69fdf59d5..09d179eb0 100644 --- a/hw/kdrive/fake/Makefile.am +++ b/hw/kdrive/fake/Makefile.am @@ -21,5 +21,9 @@ Xfake_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xfake_DEPENDENCIES = \ + libfake.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/fake/fake.c b/hw/kdrive/fake/fake.c index ca515f9b6..6211ab871 100644 --- a/hw/kdrive/fake/fake.c +++ b/hw/kdrive/fake/fake.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/fake/fake.h b/hw/kdrive/fake/fake.h index f7c8c3431..88d209674 100644 --- a/hw/kdrive/fake/fake.h +++ b/hw/kdrive/fake/fake.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/fake/fakeinit.c b/hw/kdrive/fake/fakeinit.c index dd88bc5a7..2cfcbedd5 100644 --- a/hw/kdrive/fake/fakeinit.c +++ b/hw/kdrive/fake/fakeinit.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/fake/kbd.c b/hw/kdrive/fake/kbd.c index db224c995..83c1b3b20 100644 --- a/hw/kdrive/fake/kbd.c +++ b/hw/kdrive/fake/kbd.c @@ -1,6 +1,4 @@ /* - * Id: kbd.c,v 1.1 1999/11/02 18:39:28 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/fake/kbd.c,v 1.1 1999/11/19 13:53:53 hohndel Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/fake/mouse.c b/hw/kdrive/fake/mouse.c index beb6ff524..4b8d2b06d 100644 --- a/hw/kdrive/fake/mouse.c +++ b/hw/kdrive/fake/mouse.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/fake/os.c b/hw/kdrive/fake/os.c index 32cb139c0..76cd9e728 100644 --- a/hw/kdrive/fake/os.c +++ b/hw/kdrive/fake/os.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am index b7a863bf6..ea2aff3b3 100644 --- a/hw/kdrive/fbdev/Makefile.am +++ b/hw/kdrive/fbdev/Makefile.am @@ -19,6 +19,10 @@ Xfbdev_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xfbdev_DEPENDENCIES = \ + libfbdev.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) endif diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c index 598d0ceaf..6e8b3ff5e 100644 --- a/hw/kdrive/fbdev/fbdev.c +++ b/hw/kdrive/fbdev/fbdev.c @@ -1,6 +1,4 @@ /* - * Id: fbdev.c,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.31 2002/10/14 18:01:40 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/fbdev/fbdev.h b/hw/kdrive/fbdev/fbdev.h index b7951db72..9e322dacb 100644 --- a/hw/kdrive/fbdev/fbdev.h +++ b/hw/kdrive/fbdev/fbdev.h @@ -1,6 +1,4 @@ /* - * Id: fbdev.h,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.h,v 1.11 2001/06/03 21:52:45 keithp Exp $ */ #ifndef _FBDEV_H_ #define _FBDEV_H_ diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c index 3b78c9735..5e1c88b2c 100644 --- a/hw/kdrive/fbdev/fbinit.c +++ b/hw/kdrive/fbdev/fbinit.c @@ -1,6 +1,4 @@ /* - * Id: fbinit.c,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/fbdev/fbinit.c,v 1.8 2001/05/29 17:47:55 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/i810/Makefile.am b/hw/kdrive/i810/Makefile.am index 79093da60..e3a702dde 100644 --- a/hw/kdrive/i810/Makefile.am +++ b/hw/kdrive/i810/Makefile.am @@ -28,5 +28,9 @@ Xi810_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xi810_DEPENDENCIES = \ + libi810.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/i810/i810.c b/hw/kdrive/i810/i810.c index d2318d786..49090f9eb 100644 --- a/hw/kdrive/i810/i810.c +++ b/hw/kdrive/i810/i810.c @@ -31,9 +31,6 @@ of the copyright holder. X Window System is a trademark of The Open Group */ - -/* $RCSId: xc/programs/Xserver/hw/kdrive/i810/i810.c,v 1.1 2001/03/30 02:18:41 keithp Exp $ */ - /* * i810.c - KDrive driver for the i810 chipset * diff --git a/hw/kdrive/i810/i810.h b/hw/kdrive/i810/i810.h index e0f6f8173..8fc2d56be 100644 --- a/hw/kdrive/i810/i810.h +++ b/hw/kdrive/i810/i810.h @@ -31,8 +31,6 @@ of the copyright holder. X Window System is a trademark of The Open Group */ -/* $RCSId: $ */ - /* * Author: * Pontus Lidman <pontus.lidman@nokia.com> diff --git a/hw/kdrive/i810/i810_cursor.c b/hw/kdrive/i810/i810_cursor.c index cf4f717f2..434fc4087 100644 --- a/hw/kdrive/i810/i810_cursor.c +++ b/hw/kdrive/i810/i810_cursor.c @@ -58,10 +58,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ - - -/* $RCSId: xc/programs/Xserver/hw/kdrive/i810/i810_cursor.c,v 1.2 2001/12/10 16:34:20 keithp Exp $ */ - /* i810_cursor.c: KDrive hardware cursor routines for the i810 chipset */ /* diff --git a/hw/kdrive/i810/i810_reg.h b/hw/kdrive/i810/i810_reg.h index e6648a1de..d9f4c8f48 100644 --- a/hw/kdrive/i810/i810_reg.h +++ b/hw/kdrive/i810/i810_reg.h @@ -57,7 +57,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $RCSId: xc/programs/Xserver/hw/kdrive/i810/i810_reg.h,v 1.1 2001/03/30 02:18:41 keithp Exp $ */ /* * Authors: diff --git a/hw/kdrive/i810/i810stub.c b/hw/kdrive/i810/i810stub.c index 364d16bfe..3109984e0 100644 --- a/hw/kdrive/i810/i810stub.c +++ b/hw/kdrive/i810/i810stub.c @@ -1,4 +1,3 @@ -/* $RCSId: $ */ /* COPYRIGHT AND PERMISSION NOTICE Copyright (c) 2000, 2001 Nokia Home Communications diff --git a/hw/kdrive/igs/igs.c b/hw/kdrive/igs/igs.c index a0b139a30..1c446f782 100644 --- a/hw/kdrive/igs/igs.c +++ b/hw/kdrive/igs/igs.c @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/igs/igs.c,v 1.2 2000/05/24 23:52:47 keithp Exp $ - * * Copyright © 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/igs/igs.h b/hw/kdrive/igs/igs.h index 264425022..9f0336b7d 100644 --- a/hw/kdrive/igs/igs.h +++ b/hw/kdrive/igs/igs.h @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/igs/igs.h,v 1.1 2000/05/06 22:17:43 keithp Exp $ - * * Copyright © 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/igs/igscmap.c b/hw/kdrive/igs/igscmap.c index 06ab7a490..dff028e7d 100644 --- a/hw/kdrive/igs/igscmap.c +++ b/hw/kdrive/igs/igscmap.c @@ -1,6 +1,4 @@ /* - * $RCSId: $ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/igs/igscurs.c b/hw/kdrive/igs/igscurs.c index 6d6267666..b8bd50956 100644 --- a/hw/kdrive/igs/igscurs.c +++ b/hw/kdrive/igs/igscurs.c @@ -1,6 +1,4 @@ /* - * $RCSId: $ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/igs/igsdraw.c b/hw/kdrive/igs/igsdraw.c index 1ae11a571..d2ae098a6 100644 --- a/hw/kdrive/igs/igsdraw.c +++ b/hw/kdrive/igs/igsdraw.c @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/igs/igsdraw.c,v 1.1 2000/05/06 22:17:43 keithp Exp $ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/igs/igsdraw.h b/hw/kdrive/igs/igsdraw.h index c969826b1..ab80f9acd 100644 --- a/hw/kdrive/igs/igsdraw.h +++ b/hw/kdrive/igs/igsdraw.h @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/igs/igsdraw.h,v 1.1 2000/05/06 22:17:43 keithp Exp $ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/igs/igsreg.c b/hw/kdrive/igs/igsreg.c index 831d985bd..6d6f28b73 100644 --- a/hw/kdrive/igs/igsreg.c +++ b/hw/kdrive/igs/igsreg.c @@ -1,6 +1,4 @@ /* - * $RCSId: $ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/igs/igsreg.h b/hw/kdrive/igs/igsreg.h index ddccd8907..2230ff01b 100644 --- a/hw/kdrive/igs/igsreg.h +++ b/hw/kdrive/igs/igsreg.h @@ -1,6 +1,4 @@ /* - * $RCSId: $ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/igs/igsstub.c b/hw/kdrive/igs/igsstub.c index 39c6fd4ed..1c588271c 100644 --- a/hw/kdrive/igs/igsstub.c +++ b/hw/kdrive/igs/igsstub.c @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/igs/igsstub.c,v 1.2 2000/05/24 23:52:48 keithp Exp $ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/ipaq/ipaq.c b/hw/kdrive/ipaq/ipaq.c index f1432a605..057b799f4 100644 --- a/hw/kdrive/ipaq/ipaq.c +++ b/hw/kdrive/ipaq/ipaq.c @@ -22,7 +22,6 @@ * Adapted from ts300.c by Alan Hourihane <alanh@fairlite.demon.co.uk> * For the Compaq IPAQ handheld, with the HP VGA Out Card (F1252A). */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/ipaq/ipaq.c,v 1.2 2001/05/29 17:47:55 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/itsy/itsy.c b/hw/kdrive/itsy/itsy.c index 0524b98d1..47cc05041 100644 --- a/hw/kdrive/itsy/itsy.c +++ b/hw/kdrive/itsy/itsy.c @@ -1,6 +1,4 @@ /* - * Id: itsy.c,v 1.1 1999/11/02 18:39:28 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/itsy.c,v 1.2 1999/12/30 03:03:09 robin Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/itsy/itsy.h b/hw/kdrive/itsy/itsy.h index 3c1fdd79e..fc8fb8f4f 100644 --- a/hw/kdrive/itsy/itsy.h +++ b/hw/kdrive/itsy/itsy.h @@ -1,6 +1,4 @@ /* - * Id: itsy.h,v 1.1 1999/11/02 18:39:28 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/itsy.h,v 1.1 1999/11/19 13:53:53 hohndel Exp $ */ #include "kdrive.h" #include <stdio.h> diff --git a/hw/kdrive/itsy/kbd.c b/hw/kdrive/itsy/kbd.c index beb4685d4..83ed49e72 100644 --- a/hw/kdrive/itsy/kbd.c +++ b/hw/kdrive/itsy/kbd.c @@ -1,6 +1,4 @@ /* - * Id: kbd.c,v 1.1 1999/11/02 18:39:28 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/kbd.c,v 1.1 1999/11/19 13:53:53 hohndel Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/itsy/ts.c b/hw/kdrive/itsy/ts.c index 180d1fd12..34ff6a880 100644 --- a/hw/kdrive/itsy/ts.c +++ b/hw/kdrive/itsy/ts.c @@ -1,6 +1,4 @@ /* - * Id: ts.c,v 1.1 1999/11/02 18:39:28 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/itsy/ts.c,v 1.1 1999/11/19 13:53:54 hohndel Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/linux/agp.c b/hw/kdrive/linux/agp.c index 4fb0cb3f9..80fb7259b 100644 --- a/hw/kdrive/linux/agp.c +++ b/hw/kdrive/linux/agp.c @@ -35,8 +35,6 @@ of the copyright holder. */ -/* $RCSId: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.4 2000/08/28 18:12:56 dawes Exp $ */ - /* * Author: Pontus Lidman <pontus.lidman@nokia.com> (adaption to KDrive) and others */ diff --git a/hw/kdrive/linux/bus.c b/hw/kdrive/linux/bus.c index 8cf5f901f..2d7a15751 100644 --- a/hw/kdrive/linux/bus.c +++ b/hw/kdrive/linux/bus.c @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/linux/bus.c,v 1.2 2001/06/29 14:00:41 keithp Exp $ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/linux/evdev.c b/hw/kdrive/linux/evdev.c index 6c08cfa62..79527c70d 100644 --- a/hw/kdrive/linux/evdev.c +++ b/hw/kdrive/linux/evdev.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -155,8 +153,6 @@ EvdevInit (KdPointerInfo *pi) { int i; int fd; - int n = 0; - char *prot; if (!pi->path) { for (i = 0; i < NUM_DEFAULT_EVDEV; i++) { @@ -277,6 +273,8 @@ EvdevDisable (KdPointerInfo *pi) { Kevdev *ke; + ke = pi->driverPrivate; + if (!pi || !pi->driverPrivate) return; diff --git a/hw/kdrive/linux/keyboard.c b/hw/kdrive/linux/keyboard.c index ad9907a59..3193ab761 100644 --- a/hw/kdrive/linux/keyboard.c +++ b/hw/kdrive/linux/keyboard.c @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/linux/keyboard.c,v 1.10 2001/11/08 10:26:24 keithp Exp $ - * * Copyright © 1999 Keith Packard * XKB integration © 2006 Nokia Corporation, author: Tomas Frydrych <tf@o-hand.com> * diff --git a/hw/kdrive/linux/klinux.h b/hw/kdrive/linux/klinux.h index 29ebe3aa9..349685241 100644 --- a/hw/kdrive/linux/klinux.h +++ b/hw/kdrive/linux/klinux.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c index c1fe185bd..0e4a77cdf 100644 --- a/hw/kdrive/linux/linux.c +++ b/hw/kdrive/linux/linux.c @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/linux/linux.c,v 1.6 2001/07/24 21:26:17 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/linux/mouse.c b/hw/kdrive/linux/mouse.c index 77ec3b37b..1965342b8 100644 --- a/hw/kdrive/linux/mouse.c +++ b/hw/kdrive/linux/mouse.c @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/linux/mouse.c,v 1.6 2002/08/02 16:11:35 keithp Exp $ - * * Copyright © 2001 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/linux/ms.c b/hw/kdrive/linux/ms.c index e62cebc39..d0b47a3ee 100644 --- a/hw/kdrive/linux/ms.c +++ b/hw/kdrive/linux/ms.c @@ -20,7 +20,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/linux/ms.c,v 1.1 2001/08/09 20:45:15 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/linux/ps2.c b/hw/kdrive/linux/ps2.c index 5d523a210..d361e82a1 100644 --- a/hw/kdrive/linux/ps2.c +++ b/hw/kdrive/linux/ps2.c @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/linux/ps2.c,v 1.6 2001/10/12 06:33:10 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/linux/ts.c b/hw/kdrive/linux/ts.c index 701fdc891..831953f02 100644 --- a/hw/kdrive/linux/ts.c +++ b/hw/kdrive/linux/ts.c @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/linux/ts.c,v 1.9 2002/08/15 18:07:48 keithp Exp $ - * * Derived from ps2.c by Jim Gettys * * Copyright © 1999 Keith Packard diff --git a/hw/kdrive/mach64/Makefile.am b/hw/kdrive/mach64/Makefile.am index b4d9a4eef..537939083 100644 --- a/hw/kdrive/mach64/Makefile.am +++ b/hw/kdrive/mach64/Makefile.am @@ -32,5 +32,9 @@ Xmach64_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xmach64_DEPENDENCIES = \ + libmach64.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/mach64/mach64.c b/hw/kdrive/mach64/mach64.c index 1d4186d34..3c513ba17 100644 --- a/hw/kdrive/mach64/mach64.c +++ b/hw/kdrive/mach64/mach64.c @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64.c,v 1.10 2002/10/14 18:01:41 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/mach64/mach64.h b/hw/kdrive/mach64/mach64.h index 5757cf72d..fbb10b2ba 100644 --- a/hw/kdrive/mach64/mach64.h +++ b/hw/kdrive/mach64/mach64.h @@ -1,6 +1,4 @@ /* - * Id: mach64.h,v 1.2 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 2001 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64.h,v 1.5 2001/06/23 03:41:24 keithp Exp $ */ #ifndef _MACH64_H_ #define _MACH64_H_ diff --git a/hw/kdrive/mach64/mach64curs.c b/hw/kdrive/mach64/mach64curs.c index 9ac1efd53..4a5938162 100644 --- a/hw/kdrive/mach64/mach64curs.c +++ b/hw/kdrive/mach64/mach64curs.c @@ -1,6 +1,4 @@ /* - * Id: tridentcurs.c,v 1.1 1999/11/02 03:54:47 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.6 2000/09/03 05:11:20 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/mach64/mach64draw.c b/hw/kdrive/mach64/mach64draw.c index f91798436..15d4d417a 100644 --- a/hw/kdrive/mach64/mach64draw.c +++ b/hw/kdrive/mach64/mach64draw.c @@ -1,6 +1,4 @@ /* - * Id: mach64draw.c,v 1.1 1999/11/02 03:54:47 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64draw.c,v 1.6 2001/07/23 03:44:17 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/mach64/mach64draw.h b/hw/kdrive/mach64/mach64draw.h index b7053ae49..bac11c2a6 100644 --- a/hw/kdrive/mach64/mach64draw.h +++ b/hw/kdrive/mach64/mach64draw.h @@ -1,6 +1,4 @@ /* - * Id: tridentdraw.h,v 1.1 1999/11/02 03:54:47 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.h,v 1.4 2000/10/11 06:04:40 keithp Exp $ */ #ifndef _TRIDENTDRAW_H_ #define _TRIDENTDRAW_H_ diff --git a/hw/kdrive/mach64/mach64stub.c b/hw/kdrive/mach64/mach64stub.c index f3fef3c12..5895a3cb7 100644 --- a/hw/kdrive/mach64/mach64stub.c +++ b/hw/kdrive/mach64/mach64stub.c @@ -1,6 +1,4 @@ /* - * Id: mach64stub.c,v 1.1 1999/11/02 08:19:15 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +20,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64stub.c,v 1.2 2001/10/12 06:33:10 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/mach64/mach64video.c b/hw/kdrive/mach64/mach64video.c index 7d42807da..38fcef7eb 100644 --- a/hw/kdrive/mach64/mach64video.c +++ b/hw/kdrive/mach64/mach64video.c @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/mach64/mach64video.c,v 1.9tsi Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> #endif diff --git a/hw/kdrive/mga/Makefile.am b/hw/kdrive/mga/Makefile.am index db1a9563d..0598651d6 100644 --- a/hw/kdrive/mga/Makefile.am +++ b/hw/kdrive/mga/Makefile.am @@ -27,5 +27,9 @@ Xmga_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xmga_DEPENDENCIES = \ + libmga.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/mga/g400_common.h b/hw/kdrive/mga/g400_common.h index c4093d908..9f16d2431 100644 --- a/hw/kdrive/mga/g400_common.h +++ b/hw/kdrive/mga/g400_common.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Damien Ciabrini * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifndef __G400_COMMON_H__ #define __G400_COMMON_H__ diff --git a/hw/kdrive/mga/g400_composite.c b/hw/kdrive/mga/g400_composite.c index da2e8b810..dda9d9347 100644 --- a/hw/kdrive/mga/g400_composite.c +++ b/hw/kdrive/mga/g400_composite.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Damien Ciabrini * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/mga/mga.c b/hw/kdrive/mga/mga.c index 990d646ac..2ae35d143 100644 --- a/hw/kdrive/mga/mga.c +++ b/hw/kdrive/mga/mga.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Anders Carlsson * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> #endif diff --git a/hw/kdrive/mga/mga.h b/hw/kdrive/mga/mga.h index 2c6b809c1..8fa956096 100644 --- a/hw/kdrive/mga/mga.h +++ b/hw/kdrive/mga/mga.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003-2004 Anders Carlsson * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifndef _MGA_H_ #define _MGA_H_ diff --git a/hw/kdrive/mga/mgadraw.c b/hw/kdrive/mga/mgadraw.c index 71d506ceb..d27e8c9cc 100644 --- a/hw/kdrive/mga/mgadraw.c +++ b/hw/kdrive/mga/mgadraw.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003-2004 Anders Carlsson * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> #endif diff --git a/hw/kdrive/mga/mgastub.c b/hw/kdrive/mga/mgastub.c index 5afbf7fcc..61e6963b8 100644 --- a/hw/kdrive/mga/mgastub.c +++ b/hw/kdrive/mga/mgastub.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Anders Carlsson * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> #endif diff --git a/hw/kdrive/neomagic/Makefile.am b/hw/kdrive/neomagic/Makefile.am index 33bc3a911..468654711 100644 --- a/hw/kdrive/neomagic/Makefile.am +++ b/hw/kdrive/neomagic/Makefile.am @@ -39,5 +39,9 @@ Xneomagic_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xneomagic_DEPENDENCIES = \ + libneomagic.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/nvidia/Makefile.am b/hw/kdrive/nvidia/Makefile.am index 79d2738a0..8ebfec9de 100644 --- a/hw/kdrive/nvidia/Makefile.am +++ b/hw/kdrive/nvidia/Makefile.am @@ -28,5 +28,9 @@ Xnvidia_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xnvidia_DEPENDENCIES = \ + libnvidia.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/nvidia/nvidia.c b/hw/kdrive/nvidia/nvidia.c index 1703a30c4..be42e561a 100644 --- a/hw/kdrive/nvidia/nvidia.c +++ b/hw/kdrive/nvidia/nvidia.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/nvidia/nvidia.h b/hw/kdrive/nvidia/nvidia.h index 3a36b43d7..026233cc1 100644 --- a/hw/kdrive/nvidia/nvidia.h +++ b/hw/kdrive/nvidia/nvidia.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/nvidia/nvidiacurs.c b/hw/kdrive/nvidia/nvidiacurs.c index 9ac1efd53..4a5938162 100644 --- a/hw/kdrive/nvidia/nvidiacurs.c +++ b/hw/kdrive/nvidia/nvidiacurs.c @@ -1,6 +1,4 @@ /* - * Id: tridentcurs.c,v 1.1 1999/11/02 03:54:47 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.6 2000/09/03 05:11:20 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/nvidia/nvidiadraw.c b/hw/kdrive/nvidia/nvidiadraw.c index dda3ea37a..a39f79888 100644 --- a/hw/kdrive/nvidia/nvidiadraw.c +++ b/hw/kdrive/nvidia/nvidiadraw.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/nvidia/nvidiadraw.h b/hw/kdrive/nvidia/nvidiadraw.h index b7053ae49..bac11c2a6 100644 --- a/hw/kdrive/nvidia/nvidiadraw.h +++ b/hw/kdrive/nvidia/nvidiadraw.h @@ -1,6 +1,4 @@ /* - * Id: tridentdraw.h,v 1.1 1999/11/02 03:54:47 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.h,v 1.4 2000/10/11 06:04:40 keithp Exp $ */ #ifndef _TRIDENTDRAW_H_ #define _TRIDENTDRAW_H_ diff --git a/hw/kdrive/nvidia/nvidiastub.c b/hw/kdrive/nvidia/nvidiastub.c index 230941958..0e8250e31 100644 --- a/hw/kdrive/nvidia/nvidiastub.c +++ b/hw/kdrive/nvidia/nvidiastub.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/nvidia/nvidiavideo.c b/hw/kdrive/nvidia/nvidiavideo.c index 1dd5a1c5d..ad7147dd1 100644 --- a/hw/kdrive/nvidia/nvidiavideo.c +++ b/hw/kdrive/nvidia/nvidiavideo.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/pcmcia/modes.h b/hw/kdrive/pcmcia/modes.h index 9087e9e74..0a078736f 100644 --- a/hw/kdrive/pcmcia/modes.h +++ b/hw/kdrive/pcmcia/modes.h @@ -21,7 +21,6 @@ * * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> */ -/* $RCSId: $ */ #define V_NHSYNC 0x01 #define V_NVSYNC 0x02 diff --git a/hw/kdrive/pcmcia/pcmcia.c b/hw/kdrive/pcmcia/pcmcia.c index dfdd2f6a9..a1728c783 100644 --- a/hw/kdrive/pcmcia/pcmcia.c +++ b/hw/kdrive/pcmcia/pcmcia.c @@ -27,7 +27,6 @@ * * Tested running under a Compaq IPAQ Pocket PC running Linux */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmcia.c,v 1.6 2002/10/14 18:01:41 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/pcmcia/pcmcia.h b/hw/kdrive/pcmcia/pcmcia.h index cb4d13a6c..245e51b77 100644 --- a/hw/kdrive/pcmcia/pcmcia.h +++ b/hw/kdrive/pcmcia/pcmcia.h @@ -21,7 +21,6 @@ * * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmcia.h,v 1.1 2001/05/23 08:56:09 alanh Exp $ */ #ifndef _PCMCIA_H_ #define _PCMCIA_H_ diff --git a/hw/kdrive/pcmcia/pcmciacurs.c b/hw/kdrive/pcmcia/pcmciacurs.c index 89770bc35..21d2d4adb 100644 --- a/hw/kdrive/pcmcia/pcmciacurs.c +++ b/hw/kdrive/pcmcia/pcmciacurs.c @@ -21,7 +21,6 @@ * * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> */ -/* $RCSId: $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/pcmcia/pcmciarotate.c b/hw/kdrive/pcmcia/pcmciarotate.c index ac3ec9dc2..e5dc1cb41 100644 --- a/hw/kdrive/pcmcia/pcmciarotate.c +++ b/hw/kdrive/pcmcia/pcmciarotate.c @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/miext/shadow/shrotate.c,v 1.3 2001/07/21 04:13:26 keithp Exp $ - * * Copyright © 2001 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/pcmcia/pcmciashadow.c b/hw/kdrive/pcmcia/pcmciashadow.c index c32333ff3..f578f1bff 100644 --- a/hw/kdrive/pcmcia/pcmciashadow.c +++ b/hw/kdrive/pcmcia/pcmciashadow.c @@ -21,7 +21,6 @@ * * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmciashadow.c,v 1.1 2001/05/23 08:56:09 alanh Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/pcmcia/pcmciastub.c b/hw/kdrive/pcmcia/pcmciastub.c index a56d2cbe2..779ad7f1b 100644 --- a/hw/kdrive/pcmcia/pcmciastub.c +++ b/hw/kdrive/pcmcia/pcmciastub.c @@ -21,7 +21,6 @@ * * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmciastub.c,v 1.1 2001/05/23 08:56:09 alanh Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/pm2/Makefile.am b/hw/kdrive/pm2/Makefile.am index ec70276c5..b2b48ba6a 100644 --- a/hw/kdrive/pm2/Makefile.am +++ b/hw/kdrive/pm2/Makefile.am @@ -26,5 +26,9 @@ Xpm2_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xpm2_DEPENDENCIES = \ + libpm2.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/r128/Makefile.am b/hw/kdrive/r128/Makefile.am index 1ca1a605b..609e0f5d2 100644 --- a/hw/kdrive/r128/Makefile.am +++ b/hw/kdrive/r128/Makefile.am @@ -25,5 +25,9 @@ Xr128_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xr128_DEPENDENCIES = \ + libr128.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/r128/r128.c b/hw/kdrive/r128/r128.c index 6758d64ab..9e7f312e0 100644 --- a/hw/kdrive/r128/r128.c +++ b/hw/kdrive/r128/r128.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Anders Carlsson * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> #endif diff --git a/hw/kdrive/r128/r128.h b/hw/kdrive/r128/r128.h index 02e3c10d5..ae9ae03aa 100644 --- a/hw/kdrive/r128/r128.h +++ b/hw/kdrive/r128/r128.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Anders Carlsson * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifndef _R128_H_ #define _R128_H_ diff --git a/hw/kdrive/r128/r128draw.c b/hw/kdrive/r128/r128draw.c index bdc55bba3..142cc8b3e 100644 --- a/hw/kdrive/r128/r128draw.c +++ b/hw/kdrive/r128/r128draw.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Anders Carlsson * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> #endif diff --git a/hw/kdrive/r128/r128stub.c b/hw/kdrive/r128/r128stub.c index dbf3c0e82..b5ffd9d77 100644 --- a/hw/kdrive/r128/r128stub.c +++ b/hw/kdrive/r128/r128stub.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Anders Carlsson * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> #endif diff --git a/hw/kdrive/savage/s3.c b/hw/kdrive/savage/s3.c index 95051f27b..c1b01e701 100644 --- a/hw/kdrive/savage/s3.c +++ b/hw/kdrive/savage/s3.c @@ -1,6 +1,4 @@ /* - * Id: s3.c,v 1.3 1999/11/02 08:17:24 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +20,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3.c,v 1.4 2000/05/06 22:17:44 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/savage/s3.h b/hw/kdrive/savage/s3.h index 86e1863b4..628abc806 100644 --- a/hw/kdrive/savage/s3.h +++ b/hw/kdrive/savage/s3.h @@ -1,6 +1,4 @@ /* - * Id: s3.h,v 1.2 1999/11/02 08:17:24 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +20,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3.h,v 1.4 2000/05/06 22:17:45 keithp Exp $ */ #ifndef _S3_H_ #define _S3_H_ diff --git a/hw/kdrive/savage/s3clock.c b/hw/kdrive/savage/s3clock.c index 40b6ed695..9e3f8b3e0 100644 --- a/hw/kdrive/savage/s3clock.c +++ b/hw/kdrive/savage/s3clock.c @@ -1,6 +1,4 @@ /* - * Id: s3clock.c,v 1.2 1999/11/02 06:16:29 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +20,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3clock.c,v 1.3 2000/02/23 20:30:02 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/savage/s3cmap.c b/hw/kdrive/savage/s3cmap.c index 57f19f4df..094a24755 100644 --- a/hw/kdrive/savage/s3cmap.c +++ b/hw/kdrive/savage/s3cmap.c @@ -1,6 +1,4 @@ /* - * Id: s3cmap.c,v 1.2 1999/11/02 06:16:29 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +20,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3cmap.c,v 1.4 2000/05/06 22:17:45 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/savage/s3curs.c b/hw/kdrive/savage/s3curs.c index 0440205eb..5928989a6 100644 --- a/hw/kdrive/savage/s3curs.c +++ b/hw/kdrive/savage/s3curs.c @@ -1,6 +1,4 @@ /* - * Id: s3curs.c,v 1.2 1999/11/02 06:16:29 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +20,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3curs.c,v 1.3 2000/02/23 20:30:03 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> @@ -292,11 +289,7 @@ s3RealizeCursor (ScreenPtr pScreen, CursorPtr pCursor) { if (pCursor) { -#ifdef FB_OLD_SCREEN - short x, y; -#else int x, y; -#endif miPointerPosition (&x, &y); s3LoadCursor (pScreen, x, y); @@ -393,11 +386,7 @@ s3CursorEnable (ScreenPtr pScreen) { if (pCurPriv->pCursor) { -#ifdef FB_OLD_SCREEN - short x, y; -#else int x, y; -#endif miPointerPosition (&x, &y); s3LoadCursor (pScreen, x, y); diff --git a/hw/kdrive/savage/s3draw.c b/hw/kdrive/savage/s3draw.c index cda9be7fd..258dbcf79 100644 --- a/hw/kdrive/savage/s3draw.c +++ b/hw/kdrive/savage/s3draw.c @@ -1,6 +1,4 @@ /* - * Id: s3draw.c,v 1.1 1999/11/02 03:54:47 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +20,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3draw.c,v 1.6 2001/05/29 04:54:11 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/savage/s3draw.h b/hw/kdrive/savage/s3draw.h index a95b53b12..068904370 100644 --- a/hw/kdrive/savage/s3draw.h +++ b/hw/kdrive/savage/s3draw.h @@ -1,6 +1,4 @@ /* - * Id: s3draw.h,v 1.2 1999/11/02 06:16:29 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +20,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3draw.h,v 1.4 2000/05/06 22:17:47 keithp Exp $ */ #ifndef _S3DRAW_H_ #define _S3DRAW_H_ diff --git a/hw/kdrive/savage/s3gc.c b/hw/kdrive/savage/s3gc.c index a87a2f579..ade14fa1f 100644 --- a/hw/kdrive/savage/s3gc.c +++ b/hw/kdrive/savage/s3gc.c @@ -1,6 +1,4 @@ /* - * Id: s3gc.c,v 1.2 1999/11/02 06:16:29 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +20,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3gc.c,v 1.3 2000/01/21 01:12:02 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/savage/s3reg.c b/hw/kdrive/savage/s3reg.c index df2534bda..673a2ac8f 100644 --- a/hw/kdrive/savage/s3reg.c +++ b/hw/kdrive/savage/s3reg.c @@ -1,6 +1,4 @@ /* - * Id: s3reg.c,v 1.1 1999/11/02 03:54:47 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +20,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3reg.c,v 1.3 2000/02/23 20:30:04 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/savage/s3reg.h b/hw/kdrive/savage/s3reg.h index 9b3c5447b..5c5b09f6d 100644 --- a/hw/kdrive/savage/s3reg.h +++ b/hw/kdrive/savage/s3reg.h @@ -1,6 +1,4 @@ /* - * Id: s3reg.h,v 1.1 1999/11/02 03:54:47 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +20,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3reg.h,v 1.3 2000/02/23 20:30:05 dawes Exp $ */ #ifndef _S3REG_H_ #define _S3REG_H_ diff --git a/hw/kdrive/savage/s3rtst.c b/hw/kdrive/savage/s3rtst.c index 6bcd2a4ce..c24b860ac 100644 --- a/hw/kdrive/savage/s3rtst.c +++ b/hw/kdrive/savage/s3rtst.c @@ -1,6 +1,4 @@ /* - * Id: s3rtst.c,v 1.1 1999/11/02 03:54:47 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +20,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3rtst.c,v 1.1 1999/11/19 13:53:57 hohndel Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/savage/s3stub.c b/hw/kdrive/savage/s3stub.c index 776f8dad2..145c5c1f6 100644 --- a/hw/kdrive/savage/s3stub.c +++ b/hw/kdrive/savage/s3stub.c @@ -1,6 +1,4 @@ /* - * Id: s3stub.c,v 1.1 1999/11/02 08:19:15 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +20,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/savage/s3stub.c,v 1.3 2000/02/23 20:30:05 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/sdl/Makefile.am b/hw/kdrive/sdl/Makefile.am index fa09640d2..e74249967 100644 --- a/hw/kdrive/sdl/Makefile.am +++ b/hw/kdrive/sdl/Makefile.am @@ -12,5 +12,7 @@ Xsdl_LDADD = @KDRIVE_PURE_LIBS@ \ @XSERVER_LIBS@ \ @XSDL_LIBS@ +Xsdl_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/sdl/sdl.c b/hw/kdrive/sdl/sdl.c index d7448ff7f..411b5d4e1 100644 --- a/hw/kdrive/sdl/sdl.c +++ b/hw/kdrive/sdl/sdl.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 PillowElephantBadgerBankPond * Permission to use, copy, modify, distribute, and sell this software and its @@ -25,7 +23,6 @@ * - jaymz * */ -/* $Header$ */ #ifdef HAVE_CONFIG_H #include "kdrive-config.h" #endif diff --git a/hw/kdrive/sis300/Makefile.am b/hw/kdrive/sis300/Makefile.am index 62f3266e1..3e8ce90b7 100644 --- a/hw/kdrive/sis300/Makefile.am +++ b/hw/kdrive/sis300/Makefile.am @@ -39,5 +39,9 @@ Xsis_LDADD = \ @KDRIVE_LIBS@ \ $(TSLIB_FLAG) +Xsis_DEPENDENCIES = \ + libsis.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/sis300/sis.c b/hw/kdrive/sis300/sis.c index 61fa997ee..30b7ac2c5 100644 --- a/hw/kdrive/sis300/sis.c +++ b/hw/kdrive/sis300/sis.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Eric Anholt * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/sis300/sis.h b/hw/kdrive/sis300/sis.h index 21cbdfc55..25d55be31 100644 --- a/hw/kdrive/sis300/sis.h +++ b/hw/kdrive/sis300/sis.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Eric Anholt * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifndef _SIS_H_ #define _SIS_H_ diff --git a/hw/kdrive/sis300/sis_draw.c b/hw/kdrive/sis300/sis_draw.c index 77e5829e4..bbc905e1d 100644 --- a/hw/kdrive/sis300/sis_draw.c +++ b/hw/kdrive/sis300/sis_draw.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Eric Anholt * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #include <sys/io.h> diff --git a/hw/kdrive/sis300/sis_stub.c b/hw/kdrive/sis300/sis_stub.c index 8a4c06c6c..bce7d02d2 100644 --- a/hw/kdrive/sis300/sis_stub.c +++ b/hw/kdrive/sis300/sis_stub.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Eric Anholt * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/sis530/sis.c b/hw/kdrive/sis530/sis.c index 023711af3..e1deb3b28 100644 --- a/hw/kdrive/sis530/sis.c +++ b/hw/kdrive/sis530/sis.c @@ -1,6 +1,4 @@ /* - * Id: sis.c,v 1.1 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sis.c,v 1.4 2000/05/06 22:17:49 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/sis530/sis.h b/hw/kdrive/sis530/sis.h index 2a39d0ba2..194c33c02 100644 --- a/hw/kdrive/sis530/sis.h +++ b/hw/kdrive/sis530/sis.h @@ -1,6 +1,4 @@ /* - * Id: sis.h,v 1.1 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sis.h,v 1.4 2000/05/06 22:17:49 keithp Exp $ */ #ifndef _SIS_H_ #define _SIS_H_ diff --git a/hw/kdrive/sis530/sisclock.c b/hw/kdrive/sis530/sisclock.c index 06379e55a..f73cdac9d 100644 --- a/hw/kdrive/sis530/sisclock.c +++ b/hw/kdrive/sis530/sisclock.c @@ -1,6 +1,4 @@ /* - * Id: sisclock.c,v 1.1 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisclock.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/sis530/siscmap.c b/hw/kdrive/sis530/siscmap.c index 42a008198..2a28420c8 100644 --- a/hw/kdrive/sis530/siscmap.c +++ b/hw/kdrive/sis530/siscmap.c @@ -1,6 +1,4 @@ /* - * Id: siscmap.c,v 1.1 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/siscmap.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/sis530/siscurs.c b/hw/kdrive/sis530/siscurs.c index 94dfffe7c..dad44471c 100644 --- a/hw/kdrive/sis530/siscurs.c +++ b/hw/kdrive/sis530/siscurs.c @@ -1,6 +1,4 @@ /* - * Id: siscurs.c,v 1.1 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/siscurs.c,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/sis530/sisdraw.c b/hw/kdrive/sis530/sisdraw.c index 20671c00a..fd80fa76a 100644 --- a/hw/kdrive/sis530/sisdraw.c +++ b/hw/kdrive/sis530/sisdraw.c @@ -1,6 +1,4 @@ /* - * Id: sisdraw.c,v 1.1 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisdraw.c,v 1.5 2000/08/09 17:52:44 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/sis530/sisdraw.h b/hw/kdrive/sis530/sisdraw.h index 4bf67b2ac..971ad64ac 100644 --- a/hw/kdrive/sis530/sisdraw.h +++ b/hw/kdrive/sis530/sisdraw.h @@ -1,6 +1,4 @@ /* - * Id: sisdraw.h,v 1.1 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisdraw.h,v 1.1 1999/11/19 13:53:59 hohndel Exp $ */ #ifndef _SISDRAW_H_ #define _SISDRAW_H_ diff --git a/hw/kdrive/sis530/sisio.c b/hw/kdrive/sis530/sisio.c index 7b4765f31..4741937a4 100644 --- a/hw/kdrive/sis530/sisio.c +++ b/hw/kdrive/sis530/sisio.c @@ -1,6 +1,4 @@ /* - * Id: sisio.c,v 1.1 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisio.c,v 1.1 1999/11/19 13:54:00 hohndel Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/sis530/sisstub.c b/hw/kdrive/sis530/sisstub.c index 2375f651b..960510bff 100644 --- a/hw/kdrive/sis530/sisstub.c +++ b/hw/kdrive/sis530/sisstub.c @@ -1,6 +1,4 @@ /* - * Id: sisstub.c,v 1.1 1999/11/02 08:20:07 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +20,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/sis530/sisstub.c,v 1.4 2000/08/09 17:52:44 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/smi/Makefile.am b/hw/kdrive/smi/Makefile.am index a6ac474b0..6cee31610 100644 --- a/hw/kdrive/smi/Makefile.am +++ b/hw/kdrive/smi/Makefile.am @@ -30,5 +30,9 @@ Xsmi_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xsmi_DEPENDENCIES = \ + libsmi.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/smi/smi.h b/hw/kdrive/smi/smi.h index 19fdcbad4..ef0fd110a 100644 --- a/hw/kdrive/smi/smi.h +++ b/hw/kdrive/smi/smi.h @@ -1,6 +1,4 @@ /* - * Id: smi.h,v 1.2 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 2001 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/smi/smidraw.c b/hw/kdrive/smi/smidraw.c index 06606ad1b..ba4e3904d 100644 --- a/hw/kdrive/smi/smidraw.c +++ b/hw/kdrive/smi/smidraw.c @@ -1,6 +1,4 @@ /* - * Id: smidraw.c,v 1.1 1999/11/02 03:54:47 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/smi/smidraw.h b/hw/kdrive/smi/smidraw.h index f91b68c56..4165c7406 100644 --- a/hw/kdrive/smi/smidraw.h +++ b/hw/kdrive/smi/smidraw.h @@ -1,6 +1,4 @@ /* - * Id: smidraw.h,v 1.1 1999/11/02 03:54:47 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/smi/smistub.c b/hw/kdrive/smi/smistub.c index 1db6708f2..59faf2839 100644 --- a/hw/kdrive/smi/smistub.c +++ b/hw/kdrive/smi/smistub.c @@ -1,6 +1,4 @@ /* - * Id: smistub.c,v 1.1 1999/11/02 08:19:15 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/src/kaa.c b/hw/kdrive/src/kaa.c index c29e9e9f0..c9805ddb6 100644 --- a/hw/kdrive/src/kaa.c +++ b/hw/kdrive/src/kaa.c @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/kaa.c,v 1.4 2001/06/04 09:45:41 keithp Exp $ - * * Copyright © 2001 Keith Packard * * Partly based on code that is Copyright © The XFree86 Project Inc. diff --git a/hw/kdrive/src/kaa.h b/hw/kdrive/src/kaa.h index 15f2faac2..db890a75b 100644 --- a/hw/kdrive/src/kaa.h +++ b/hw/kdrive/src/kaa.h @@ -1,6 +1,4 @@ /* - * $RCSId: $ - * * Copyright © 2001 Keith Packard * * Partly based on code that is Copyright © The XFree86 Project Inc. diff --git a/hw/kdrive/src/kaapict.c b/hw/kdrive/src/kaapict.c index 6d44b726a..501b6b9c4 100644 --- a/hw/kdrive/src/kaapict.c +++ b/hw/kdrive/src/kaapict.c @@ -1,6 +1,4 @@ /* - * $RCSId$ - * * Copyright © 2001 Keith Packard * * Partly based on code that is Copyright © The XFree86 Project Inc. diff --git a/hw/kdrive/src/kasync.c b/hw/kdrive/src/kasync.c index 00d756fc9..cc751112c 100644 --- a/hw/kdrive/src/kasync.c +++ b/hw/kdrive/src/kasync.c @@ -1,6 +1,4 @@ /* - * Id: kasync.c,v 1.3 1999/11/24 04:29:28 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/kasync.c,v 1.8 2001/03/30 02:15:19 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> @@ -296,13 +293,8 @@ KdScreenInitAsync (ScreenPtr pScreen) pScreen->PaintWindowBorder = KdCheckPaintWindow; pScreen->CopyWindow = KdCheckCopyWindow; -#ifndef FB_OLD_SCREEN pScreen->BackingStoreFuncs.SaveAreas = KdCheckSaveAreas; pScreen->BackingStoreFuncs.RestoreAreas = KdCheckRestoreAreas; -#else - pScreenPriv->BackingStoreFuncs.SaveAreas = KdCheckSaveAreas; - pScreenPriv->BackingStoreFuncs.RestoreAreas = KdCheckRestoreAreas; -#endif #ifdef RENDER KdPictureInitAsync (pScreen); #endif diff --git a/hw/kdrive/src/kcmap.c b/hw/kdrive/src/kcmap.c index 92ce5b920..4941ad17f 100644 --- a/hw/kdrive/src/kcmap.c +++ b/hw/kdrive/src/kcmap.c @@ -1,6 +1,4 @@ /* - * Id: kcmap.c,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/kcmap.c,v 1.4 2000/05/24 23:57:56 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/src/kcolor.c b/hw/kdrive/src/kcolor.c index c3669abdf..31af5c37e 100644 --- a/hw/kdrive/src/kcolor.c +++ b/hw/kdrive/src/kcolor.c @@ -1,6 +1,4 @@ /* - * Id: kcolor.c,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/kcolor.c,v 1.2 1999/12/30 03:03:05 robin Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/src/kcurscol.c b/hw/kdrive/src/kcurscol.c index 943417e0d..6a17df30f 100644 --- a/hw/kdrive/src/kcurscol.c +++ b/hw/kdrive/src/kcurscol.c @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/kcurscol.c,v 1.4 2000/05/11 18:14:13 tsi Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c index b6ac0b0cf..8653d72a2 100644 --- a/hw/kdrive/src/kdrive.c +++ b/hw/kdrive/src/kdrive.c @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/kdrive.c,v 1.29 2002/10/31 18:29:50 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -97,7 +95,6 @@ extern WindowPtr *WindowTable; void KdSetRootClip (ScreenPtr pScreen, BOOL enable) { -#ifndef FB_OLD_SCREEN WindowPtr pWin = WindowTable[pScreen->myNum]; WindowPtr pChild; Bool WasViewable; @@ -224,7 +221,6 @@ KdSetRootClip (ScreenPtr pScreen, BOOL enable) } if (pWin->realized) WindowsRestructured (); -#endif /* !FB_OLD_SCREEN */ } void @@ -1067,14 +1063,6 @@ KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) pScreen->SaveScreen = KdSaveScreen; pScreen->CreateWindow = KdCreateWindow; -#ifdef FB_OLD_SCREEN - pScreenPriv->BackingStoreFuncs.SaveAreas = fbSaveAreas; - pScreenPriv->BackingStoreFuncs.RestoreAreas = fbSaveAreas; - pScreenPriv->BackingStoreFuncs.SetClipmaskRgn = 0; - pScreenPriv->BackingStoreFuncs.GetImagePixmap = 0; - pScreenPriv->BackingStoreFuncs.GetSpansPixmap = 0; -#endif - #if KD_MAX_FB > 1 if (screen->fb[1].depth) { @@ -1156,12 +1144,8 @@ KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) #if 0 pScreen->backingStoreSupport = Always; -#ifdef FB_OLD_SCREEN - miInitializeBackingStore (pScreen, &pScreenPriv->BackingStoreFuncs); -#else miInitializeBackingStore (pScreen); #endif -#endif /* diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h index ced48d7a8..2ebde2203 100644 --- a/hw/kdrive/src/kdrive.h +++ b/hw/kdrive/src/kdrive.h @@ -1,6 +1,4 @@ /* - * Id: kdrive.h,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/kdrive.h,v 1.29 2002/11/13 16:37:39 keithp Exp $ */ #ifndef _KDRIVE_H_ #define _KDRIVE_H_ @@ -216,9 +213,6 @@ typedef struct { CreateScreenResourcesProcPtr CreateScreenResources; CloseScreenProcPtr CloseScreen; -#ifdef FB_OLD_SCREEN - miBSFuncRec BackingStoreFuncs; -#endif } KdPrivScreenRec, *KdPrivScreenPtr; typedef enum _kdPointerState { diff --git a/hw/kdrive/src/kinfo.c b/hw/kdrive/src/kinfo.c index 1e03ac8a2..2621f10dd 100644 --- a/hw/kdrive/src/kinfo.c +++ b/hw/kdrive/src/kinfo.c @@ -1,6 +1,4 @@ /* - * Id: kinfo.c,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/kinfo.c,v 1.2 2000/02/23 20:29:53 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 7edcc5106..cfd162f57 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -1,6 +1,4 @@ /* - * Id: kinput.c,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright © 1999 Keith Packard * Copyright © 2006 Nokia Corporation * @@ -22,7 +20,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.30 2002/11/13 16:37:39 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> @@ -740,6 +737,9 @@ KdKeyboardProc(DeviceIntPtr pDevice, int onoff) DevicePtr pDev = (DevicePtr)pDevice; KdKeyboardInfo *ki; Atom xiclass; +#ifdef XKB + XkbComponentNamesRec names; +#endif if (!pDev) return BadImplementation; @@ -788,11 +788,9 @@ KdKeyboardProc(DeviceIntPtr pDevice, int onoff) KdInitModMap(ki); KdInitAutoRepeats(ki); -#ifndef XKB +#ifdef XKB if (!noXkbExtension) { memset(&names, 0, sizeof(XkbComponentNamesRec)); - if (XkbInitialMap) - names.keymap = XkbInitialMap; XkbSetRulesDflts ("base", "pc105", "us", NULL, NULL); ret = XkbInitKeyboardDeviceStruct (pDevice, @@ -2296,6 +2294,7 @@ ChangeDeviceControl(register ClientPtr client, DeviceIntPtr pDev, return Success; case DEVICE_CORE: + case DEVICE_ENABLE: return Success; default: @@ -2319,13 +2318,11 @@ NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) pi = KdNewPointer(); if (!pi) return BadAlloc; - pi->options = options; } else if (strcmp(option->value, "keyboard") == 0) { ki = KdNewKeyboard(); if (!ki) return BadAlloc; - ki->options = options; } else { ErrorF("unrecognised device type!\n"); @@ -2334,8 +2331,19 @@ NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) } } + if (!ki && !pi) { + ErrorF("unrecognised device identifier!\n"); + return BadValue; + } + for (option = options; option; option = option->next) { - if (strcmp(option->key, "driver") == 0) { + if (strcmp(option->key, "device") == 0) { + if (pi && option->value) + pi->path = KdSaveString(option->value); + else if (ki && option->value) + ki->path = KdSaveString(option->value); + } + else if (strcmp(option->key, "driver") == 0) { if (pi) { pi->driver = KdFindPointerDriver(option->value); if (!pi->driver) { @@ -2343,6 +2351,7 @@ NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) KdFreePointer(pi); return BadValue; } + pi->options = options; } else if (ki) { ki->driver = KdFindKeyboardDriver(option->value); @@ -2351,6 +2360,7 @@ NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) KdFreeKeyboard(ki); return BadValue; } + ki->options = options; } } } @@ -2384,4 +2394,5 @@ NewInputDeviceRequest(InputOption *options, DeviceIntPtr *pdev) void DeleteInputDeviceRequest(DeviceIntPtr pDev) { + RemoveDevice(pDev); } diff --git a/hw/kdrive/src/kkeymap.c b/hw/kdrive/src/kkeymap.c index ce4596fc8..ae90a3499 100644 --- a/hw/kdrive/src/kkeymap.c +++ b/hw/kdrive/src/kkeymap.c @@ -1,6 +1,4 @@ /* - * Id: kkeymap.c,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/kkeymap.c,v 1.1 1999/11/19 13:53:49 hohndel Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/src/kkeymap.h b/hw/kdrive/src/kkeymap.h index ccc5e86f8..f66cfa49a 100644 --- a/hw/kdrive/src/kkeymap.h +++ b/hw/kdrive/src/kkeymap.h @@ -1,6 +1,4 @@ /* - * Id: kkeymap.h,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/kkeymap.h,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */ /* * All global variables and functions pertaining to keyboard key mapping * live in this header file. diff --git a/hw/kdrive/src/kloadmap.c b/hw/kdrive/src/kloadmap.c index b62b2deb2..21440a423 100644 --- a/hw/kdrive/src/kloadmap.c +++ b/hw/kdrive/src/kloadmap.c @@ -1,6 +1,4 @@ /* - * Id: kloadmap.c,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/kloadmap.c,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/src/kmap.c b/hw/kdrive/src/kmap.c index 73ff427c5..b92c1a84f 100644 --- a/hw/kdrive/src/kmap.c +++ b/hw/kdrive/src/kmap.c @@ -1,6 +1,4 @@ /* - * Id: kmap.c,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/kmap.c,v 1.10 2001/07/24 21:26:17 keithp Exp $ */ #include <kdrive-config.h> #include "kdrive.h" diff --git a/hw/kdrive/src/kmode.c b/hw/kdrive/src/kmode.c index 5a0c09095..d02cb55e1 100644 --- a/hw/kdrive/src/kmode.c +++ b/hw/kdrive/src/kmode.c @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/kmode.c,v 1.7 2002/10/14 18:01:40 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/src/knoop.c b/hw/kdrive/src/knoop.c index 416e23ef5..a3e9468ed 100644 --- a/hw/kdrive/src/knoop.c +++ b/hw/kdrive/src/knoop.c @@ -1,6 +1,4 @@ /* - * Id: knoop.c,v 1.2 1999/11/02 06:16:28 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/knoop.c,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */ /* * GC ops that don't do anything diff --git a/hw/kdrive/src/koffscreen.c b/hw/kdrive/src/koffscreen.c index eeb35fa56..efe03642f 100644 --- a/hw/kdrive/src/koffscreen.c +++ b/hw/kdrive/src/koffscreen.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Anders Carlsson * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/src/kshadow.c b/hw/kdrive/src/kshadow.c index 34e1d5de4..ea44812db 100644 --- a/hw/kdrive/src/kshadow.c +++ b/hw/kdrive/src/kshadow.c @@ -1,6 +1,4 @@ /* - * $RCSId: $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/src/ktest.c b/hw/kdrive/src/ktest.c index 935c00e62..150af5639 100644 --- a/hw/kdrive/src/ktest.c +++ b/hw/kdrive/src/ktest.c @@ -1,6 +1,4 @@ /* - * Id: ktest.c,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/ktest.c,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c index 4e672f16f..b8fbd731b 100644 --- a/hw/kdrive/src/kxv.c +++ b/hw/kdrive/src/kxv.c @@ -35,8 +35,6 @@ of the copyright holder. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/kxv.c,v 1.3 2001/08/09 09:08:54 keithp Exp $ */ - #ifdef HAVE_CONFIG_H #include <kdrive-config.h> #endif diff --git a/hw/kdrive/src/kxv.h b/hw/kdrive/src/kxv.h index b9eca8b8e..5d1441642 100644 --- a/hw/kdrive/src/kxv.h +++ b/hw/kdrive/src/kxv.h @@ -35,8 +35,6 @@ of the copyright holder. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/kxv.h,v 1.1 2001/03/30 02:18:41 keithp Exp $ */ - #ifndef _XVDIX_H_ #define _XVDIX_H_ diff --git a/hw/kdrive/src/vga.c b/hw/kdrive/src/vga.c index 9b8a7da39..862f074a2 100644 --- a/hw/kdrive/src/vga.c +++ b/hw/kdrive/src/vga.c @@ -1,6 +1,4 @@ /* - * Id: vga.c,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/vga.c,v 1.2 1999/12/30 03:03:07 robin Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/src/vga.h b/hw/kdrive/src/vga.h index 5d7e77307..0615d5256 100644 --- a/hw/kdrive/src/vga.h +++ b/hw/kdrive/src/vga.h @@ -1,6 +1,4 @@ /* - * Id: vga.h,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/vga.h,v 1.2 1999/12/30 03:03:07 robin Exp $ */ #ifndef _VGA_H_ #define _VGA_H_ diff --git a/hw/kdrive/trident/trident.c b/hw/kdrive/trident/trident.c index 59f044896..694a70810 100644 --- a/hw/kdrive/trident/trident.c +++ b/hw/kdrive/trident/trident.c @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/trident.c,v 1.17 2001/06/03 18:48:19 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/trident/trident.h b/hw/kdrive/trident/trident.h index 0b0d8cb48..feb939de3 100644 --- a/hw/kdrive/trident/trident.h +++ b/hw/kdrive/trident/trident.h @@ -1,6 +1,4 @@ /* - * Id: trident.h,v 1.2 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/trident.h,v 1.8 2000/10/20 00:19:51 keithp Exp $ */ #ifndef _TRIDENT_H_ #define _TRIDENT_H_ diff --git a/hw/kdrive/trident/tridentcurs.c b/hw/kdrive/trident/tridentcurs.c index 521cf98d2..4a5938162 100644 --- a/hw/kdrive/trident/tridentcurs.c +++ b/hw/kdrive/trident/tridentcurs.c @@ -1,6 +1,4 @@ /* - * Id: tridentcurs.c,v 1.1 1999/11/02 03:54:47 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentcurs.c,v 1.5 2000/08/29 17:20:15 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/trident/tridentdraw.c b/hw/kdrive/trident/tridentdraw.c index 3ebba88d8..c26d0be8b 100644 --- a/hw/kdrive/trident/tridentdraw.c +++ b/hw/kdrive/trident/tridentdraw.c @@ -1,6 +1,4 @@ /* - * Id: tridentdraw.c,v 1.1 1999/11/02 03:54:47 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.c,v 1.10 2001/06/03 18:48:19 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/trident/tridentdraw.h b/hw/kdrive/trident/tridentdraw.h index ec09167a8..bac11c2a6 100644 --- a/hw/kdrive/trident/tridentdraw.h +++ b/hw/kdrive/trident/tridentdraw.h @@ -1,6 +1,4 @@ /* - * Id: tridentdraw.h,v 1.1 1999/11/02 03:54:47 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentdraw.h,v 1.2 1999/12/30 03:03:18 robin Exp $ */ #ifndef _TRIDENTDRAW_H_ #define _TRIDENTDRAW_H_ diff --git a/hw/kdrive/trident/tridentstub.c b/hw/kdrive/trident/tridentstub.c index 650206aac..0792a50d4 100644 --- a/hw/kdrive/trident/tridentstub.c +++ b/hw/kdrive/trident/tridentstub.c @@ -1,6 +1,4 @@ /* - * Id: tridentstub.c,v 1.1 1999/11/02 08:19:15 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +20,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trident/tridentstub.c,v 1.5 2000/11/29 08:42:25 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/trio/s3.c b/hw/kdrive/trio/s3.c index 6fb8c967f..cb5104926 100644 --- a/hw/kdrive/trio/s3.c +++ b/hw/kdrive/trio/s3.c @@ -1,6 +1,4 @@ /* - * Id: s3.c,v 1.1 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3.c,v 1.4 2000/05/06 22:17:52 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/trio/s3.h b/hw/kdrive/trio/s3.h index 6f443ea97..b45a8ba80 100644 --- a/hw/kdrive/trio/s3.h +++ b/hw/kdrive/trio/s3.h @@ -1,6 +1,4 @@ /* - * Id: s3.h,v 1.1 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3.h,v 1.4 2000/05/06 22:17:53 keithp Exp $ */ #ifndef _S3_H_ #define _S3_H_ diff --git a/hw/kdrive/trio/s3clock.c b/hw/kdrive/trio/s3clock.c index 9fdd35e99..9f2d313ca 100644 --- a/hw/kdrive/trio/s3clock.c +++ b/hw/kdrive/trio/s3clock.c @@ -1,6 +1,4 @@ /* - * Id: s3clock.c,v 1.1 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3clock.c,v 1.2 1999/12/30 03:03:19 robin Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/trio/s3cmap.c b/hw/kdrive/trio/s3cmap.c index d59f29659..cc32da38c 100644 --- a/hw/kdrive/trio/s3cmap.c +++ b/hw/kdrive/trio/s3cmap.c @@ -1,6 +1,4 @@ /* - * Id: s3cmap.c,v 1.1 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3cmap.c,v 1.1 1999/11/19 13:54:05 hohndel Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/trio/s3curs.c b/hw/kdrive/trio/s3curs.c index 4d802c518..20afad756 100644 --- a/hw/kdrive/trio/s3curs.c +++ b/hw/kdrive/trio/s3curs.c @@ -1,6 +1,4 @@ /* - * Id: s3curs.c,v 1.1 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3curs.c,v 1.2 1999/12/30 03:03:19 robin Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> @@ -280,11 +277,7 @@ s3RealizeCursor (ScreenPtr pScreen, CursorPtr pCursor) { if (pCursor) { -#ifdef FB_OLD_SCREEN - short x, y; -#else int x, y; -#endif miPointerPosition (&x, &y); s3LoadCursor (pScreen, x, y); @@ -379,11 +372,7 @@ s3CursorEnable (ScreenPtr pScreen) { if (pCurPriv->pCursor) { -#ifdef FB_OLD_SCREEN - short x, y; -#else int x, y; -#endif miPointerPosition (&x, &y); s3LoadCursor (pScreen, x, y); diff --git a/hw/kdrive/trio/s3stub.c b/hw/kdrive/trio/s3stub.c index 7531858c5..f44ad84c6 100644 --- a/hw/kdrive/trio/s3stub.c +++ b/hw/kdrive/trio/s3stub.c @@ -1,6 +1,4 @@ /* - * Id: s3stub.c,v 1.1 1999/11/02 08:19:15 keithp Exp $ - * * Copyright 1999 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +20,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/trio/s3stub.c,v 1.3 2000/02/23 20:30:13 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/ts300/ts300.c b/hw/kdrive/ts300/ts300.c index 620ee7f40..e9ff3a3da 100644 --- a/hw/kdrive/ts300/ts300.c +++ b/hw/kdrive/ts300/ts300.c @@ -1,6 +1,4 @@ /* - * Id: ts300.c,v 1.1 1999/11/02 08:17:24 keithp Exp $ - * * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/ts300/ts300.c,v 1.3 2000/02/23 20:30:14 dawes Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am index e062fe777..d58f20f95 100644 --- a/hw/kdrive/vesa/Makefile.am +++ b/hw/kdrive/vesa/Makefile.am @@ -24,5 +24,9 @@ Xvesa_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xvesa_DEPENDENCIES = \ + libvesa.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/vesa/vbe.c b/hw/kdrive/vesa/vbe.c index 08f0b037c..cedefe9fc 100644 --- a/hw/kdrive/vesa/vbe.c +++ b/hw/kdrive/vesa/vbe.c @@ -19,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vbe.c,v 1.9 2001/05/29 04:54:12 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/vesa/vbe.h b/hw/kdrive/vesa/vbe.h index 5d0ff5142..f67fbbe42 100644 --- a/hw/kdrive/vesa/vbe.h +++ b/hw/kdrive/vesa/vbe.h @@ -19,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vbe.h,v 1.6 2001/05/29 04:54:12 keithp Exp $ */ #ifndef _VBE_H #define _VBE_H diff --git a/hw/kdrive/vesa/vesa.c b/hw/kdrive/vesa/vesa.c index 766cacdc8..d6fa5eb06 100644 --- a/hw/kdrive/vesa/vesa.c +++ b/hw/kdrive/vesa/vesa.c @@ -19,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id$ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/vesa/vesa.h b/hw/kdrive/vesa/vesa.h index 83be725eb..f6b21e9f5 100644 --- a/hw/kdrive/vesa/vesa.h +++ b/hw/kdrive/vesa/vesa.h @@ -19,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vesa.h,v 1.13 2002/09/29 23:39:47 keithp Exp $ */ #ifndef _VESA_H_ #define _VESA_H_ diff --git a/hw/kdrive/vesa/vesainit.c b/hw/kdrive/vesa/vesainit.c index 4f552d1a1..90b168108 100644 --- a/hw/kdrive/vesa/vesainit.c +++ b/hw/kdrive/vesa/vesainit.c @@ -19,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vesainit.c,v 1.7 2001/09/05 07:12:43 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/vesa/vga.c b/hw/kdrive/vesa/vga.c index 3050eacce..0367a5f06 100644 --- a/hw/kdrive/vesa/vga.c +++ b/hw/kdrive/vesa/vga.c @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vga.c,v 1.1 2000/10/20 00:19:51 keithp Exp $ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/vesa/vga.h b/hw/kdrive/vesa/vga.h index ca000904b..9a368cef7 100644 --- a/hw/kdrive/vesa/vga.h +++ b/hw/kdrive/vesa/vga.h @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vga.h,v 1.1 2000/10/20 00:19:51 keithp Exp $ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/vesa/vm86.c b/hw/kdrive/vesa/vm86.c index d09a36dee..78fc593a7 100644 --- a/hw/kdrive/vesa/vm86.c +++ b/hw/kdrive/vesa/vm86.c @@ -1,6 +1,4 @@ /* - * $RCSId: xc/programs/Xserver/hw/kdrive/vesa/vm86.c,v 1.2 2002/02/19 00:18:05 keithp Exp $ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/vesa/vm86.h b/hw/kdrive/vesa/vm86.h index bd1ad43c0..3b4881471 100644 --- a/hw/kdrive/vesa/vm86.h +++ b/hw/kdrive/vesa/vm86.h @@ -1,6 +1,4 @@ /* - * $RCSId: $ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/kdrive/via/Makefile.am b/hw/kdrive/via/Makefile.am index 1c5796963..8c8189d12 100644 --- a/hw/kdrive/via/Makefile.am +++ b/hw/kdrive/via/Makefile.am @@ -26,5 +26,9 @@ Xvia_LDADD = \ @KDRIVE_LIBS@ \ @XSERVER_LIBS@ +Xvia_DEPENDENCIES = \ + libvia.a \ + @KDRIVE_LOCAL_LIBS@ + relink: rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) diff --git a/hw/kdrive/vxworks/vxkbd.c b/hw/kdrive/vxworks/vxkbd.c index b421e923e..be528c78a 100644 --- a/hw/kdrive/vxworks/vxkbd.c +++ b/hw/kdrive/vxworks/vxkbd.c @@ -1,6 +1,4 @@ /* - * Id: vxkbd.c,v 1.1 1999/11/24 08:35:24 keithp Exp $ - * * Copyright © 1999 Network Computing Devices, Inc. All rights reserved. * * Author: Keith Packard diff --git a/hw/kdrive/vxworks/vxmouse.c b/hw/kdrive/vxworks/vxmouse.c index 97e24af4a..8192d7e5a 100644 --- a/hw/kdrive/vxworks/vxmouse.c +++ b/hw/kdrive/vxworks/vxmouse.c @@ -1,6 +1,4 @@ /* - * Id: vxmouse.c,v 1.1 1999/11/24 08:35:24 keithp Exp $ - * * Copyright © 1999 Network Computing Devices, Inc. All rights reserved. * * Author: Keith Packard diff --git a/hw/kdrive/vxworks/vxworks.c b/hw/kdrive/vxworks/vxworks.c index 688de620b..c9e2be7cc 100644 --- a/hw/kdrive/vxworks/vxworks.c +++ b/hw/kdrive/vxworks/vxworks.c @@ -1,6 +1,4 @@ /* - * Id: vxworks.c,v 1.1 1999/11/24 08:35:24 keithp Exp $ - * * Copyright © 1999 Network Computing Devices, Inc. All rights reserved. * * Author: Keith Packard diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 50aa67341..ca7dda109 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -71,17 +71,17 @@ Xorg_LDADD = $(XORG_LIBS) \ Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) BUILT_SOURCES = xorg.conf.example -CLEAN = xorg.conf.example xorg.conf.example.pre +DISTCLEANFILES += xorg.conf.example xorg.conf.example.pre EXTRA_DIST = xorgconf.cpp if SOLARIS_ASM_INLINE # Needs to be built before any files are compiled when using Sun compilers # so in*/out* inline definitions are properly processed. -BUILT_SOURCES += os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il +BUILT_SOURCES += os-support/solaris/solaris-@SOLARIS_INOUT_ARCH@.il -os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il: - cd os-support/solaris ; make solaris-$(SOLARIS_INOUT_ARCH).il +os-support/solaris/solaris-@SOLARIS_INOUT_ARCH@.il: + cd os-support/solaris ; make solaris-@SOLARIS_INOUT_ARCH@.il endif # do not use $(mkdir_p) if you want automake 1.7 to work diff --git a/hw/xfree86/common/atKeynames.h b/hw/xfree86/common/atKeynames.h index 1415fce20..f31f53377 100644 --- a/hw/xfree86/common/atKeynames.h +++ b/hw/xfree86/common/atKeynames.h @@ -47,8 +47,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* $XConsortium: atKeynames.h /main/11 1996/03/09 11:17:41 kaleb $ */ - #ifndef _ATKEYNAMES_H #define _ATKEYNAMES_H diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index becd3da25..73ca3d0ac 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -47,8 +47,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* $XConsortium: compiler.h /main/16 1996/10/25 15:38:34 kaleb $ */ - #ifndef _COMPILER_H # define _COMPILER_H diff --git a/hw/xfree86/common/modeline2c.pl b/hw/xfree86/common/modeline2c.pl index cc6c6925e..88e380de4 100644 --- a/hw/xfree86/common/modeline2c.pl +++ b/hw/xfree86/common/modeline2c.pl @@ -71,9 +71,6 @@ printf("/* \$$proj\$ */ #include <xorg-config.h> #endif -#ifdef __UNIXOS2__ -#define I_NEED_OS2_H -#endif #include \"xf86.h\" #include \"xf86Config.h\" #include \"xf86Priv.h\" diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index 169a957d2..f2cf78cf8 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -85,14 +85,6 @@ extern Bool xf86inSuspend; #define PIX24TOBPP(p) (((p) == Pix24Use24) ? 24 : \ (((p) == Pix24Use32) ? 32 : 0)) -/* variables for debugging */ -#ifdef BUILDDEBUG -extern char* xf86p8bit[]; -extern CARD32 xf86DummyVar1; -extern CARD32 xf86DummyVar2; -extern CARD32 xf86DummyVar3; -#endif - /* Function Prototypes */ #ifndef _NO_XF86_PROTOTYPES @@ -165,9 +157,6 @@ pciVideoPtr xf86FindPciDeviceVendor(CARD16 vendorID, CARD16 deviceID, char n, pciVideoPtr pvp_exclude); pciVideoPtr xf86FindPciClass(CARD8 intf, CARD8 subClass, CARD16 class, char n, pciVideoPtr pvp_exclude); -#ifdef INCLUDE_DEPRECATED -void xf86EnablePciBusMaster(pciVideoPtr pPci, Bool enable); -#endif void xf86RegisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func, pointer arg); Bool xf86DeregisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func); @@ -368,9 +357,6 @@ void xf86DeleteModuleInfo(int idx); /* xf86Debug.c */ #ifdef BUILDDEBUG - void xf86Break1(void); -void xf86Break2(void); -void xf86Break3(void); CARD8 xf86PeekFb8(CARD8 *p); CARD16 xf86PeekFb16(CARD16 *p); CARD32 xf86PeekFb32(CARD32 *p); @@ -383,8 +369,6 @@ CARD32 xf86PeekMmio32(pointer Base, unsigned long Offset); void xf86PokeMmio8(pointer Base, unsigned long Offset, CARD8 v); void xf86PokeMmio16(pointer Base, unsigned long Offset, CARD16 v); void xf86PokeMmio32(pointer Base, unsigned long Offset, CARD32 v); -extern void xf86SPTimestamp(xf86TsPtr* timestamp, char* string); -extern void xf86STimestamp(xf86TsPtr* timestamp); #endif /* xf86Init.c */ diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 9740b0732..cd309a5a9 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -3004,7 +3004,7 @@ xf86FindPrimaryDevice() } -#if !defined(__sparc) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) +#if !defined(__sparc) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__arm__) #include "vgaHW.h" #include "compiler.h" #endif diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 8e58befde..3c29497e3 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1,5 +1,3 @@ - - /* * Loosely based on code bearing the following copyright: * @@ -53,10 +51,6 @@ #include <grp.h> #endif -#ifdef __UNIXOS2__ -#define I_NEED_OS2_H -#endif - #include "xf86.h" #include "xf86Parser.h" #include "xf86tokens.h" @@ -181,15 +175,8 @@ xf86ValidateFontPath(char *path) while (next != NULL) { path_elem = xf86GetPathElem(&next); if (*path_elem == '/') { -#ifndef __UNIXOS2__ dir_elem = xnfcalloc(1, strlen(path_elem) + 1); if ((p1 = strchr(path_elem, ':')) != 0) -#else - /* OS/2 must prepend X11ROOT */ - path_elem = (char*)__XOS2RedirRoot(path_elem); - dir_elem = xnfcalloc(1, strlen(path_elem) + 1); - if (p1 = strchr(path_elem+2, ':')) -#endif dirlen = p1 - path_elem; else dirlen = strlen(path_elem); @@ -213,9 +200,7 @@ xf86ValidateFontPath(char *path) if (flag == 0) if (!S_ISREG(stat_buf.st_mode)) flag = -1; -#ifndef __UNIXOS2__ xfree(p1); -#endif if (flag != 0) { xf86Msg(X_WARNING, "`fonts.dir' not found (or not valid) in \"%s\".\n", @@ -442,7 +427,7 @@ xf86InputDriverlistFromConfig() { int count = 0; char **modulearray; - IDevPtr idp; + IDevPtr* idp; /* * make sure the config file has been parsed and that we have a @@ -460,7 +445,7 @@ xf86InputDriverlistFromConfig() */ if (xf86ConfigLayout.inputs) { idp = xf86ConfigLayout.inputs; - while (idp->identifier) { + while (*idp) { count++; idp++; } @@ -475,8 +460,8 @@ xf86InputDriverlistFromConfig() modulearray = xnfalloc((count + 1) * sizeof(char*)); count = 0; idp = xf86ConfigLayout.inputs; - while (idp->identifier) { - modulearray[count] = idp->driver; + while (idp && *idp) { + modulearray[count] = (*idp)->driver; count++; idp++; } @@ -752,7 +737,7 @@ configFiles(XF86ConfFilesPtr fileconf) } #endif - return TRUE; + return; } typedef enum { @@ -792,7 +777,9 @@ typedef enum { FLAG_AIGLX, FLAG_IGNORE_ABI, FLAG_ALLOW_EMPTY_INPUT, - FLAG_USE_DEFAULT_FONT_PATH + FLAG_USE_DEFAULT_FONT_PATH, + FLAG_AUTO_ADD_DEVICES, + FLAG_AUTO_ENABLE_DEVICES, } FlagValues; static OptionInfoRec FlagOptions[] = { @@ -870,6 +857,10 @@ static OptionInfoRec FlagOptions[] = { {0}, FALSE }, { FLAG_USE_DEFAULT_FONT_PATH, "UseDefaultFontPath", OPTV_BOOLEAN, {0}, FALSE }, + { FLAG_AUTO_ADD_DEVICES, "AutoAddDevices", OPTV_BOOLEAN, + {0}, TRUE }, + { FLAG_AUTO_ENABLE_DEVICES, "AutoEnableDevices", OPTV_BOOLEAN, + {0}, TRUE }, { -1, NULL, OPTV_NONE, {0}, FALSE }, }; @@ -933,6 +924,30 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) xf86Msg(X_CONFIG, "Ignoring ABI Version\n"); } + if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_ADD_DEVICES)) { + xf86GetOptValBool(FlagOptions, FLAG_AUTO_ADD_DEVICES, + &xf86Info.autoAddDevices); + from = X_CONFIG; + } + else { + xf86Info.autoAddDevices = TRUE; + from = X_DEFAULT; + } + xf86Msg(from, "%sutomatically adding devices\n", + xf86Info.autoAddDevices ? "A" : "Not a"); + + if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_ENABLE_DEVICES)) { + xf86GetOptValBool(FlagOptions, FLAG_AUTO_ENABLE_DEVICES, + &xf86Info.autoEnableDevices); + from = X_CONFIG; + } + else { + xf86Info.autoEnableDevices = TRUE; + from = X_DEFAULT; + } + xf86Msg(from, "%sutomatically enabling devices\n", + xf86Info.autoEnableDevices ? "A" : "Not a"); + /* * Set things up based on the config file information. Some of these * settings may be overridden later when the command line options are @@ -1003,6 +1018,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) } else if (!xf86NameCmp(s,"sync")) { xf86Msg(X_CONFIG, "Syncing logfile enabled\n"); xf86Info.log = LogSync; + LogSetParameter(XLOG_FLUSH, TRUE); LogSetParameter(XLOG_SYNC, TRUE); } else { xf86Msg(X_WARNING,"Unknown Log option\n"); @@ -1185,7 +1201,8 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) IDevPtr corePointer = NULL, coreKeyboard = NULL; Bool foundPointer = FALSE, foundKeyboard = FALSE; const char *pointerMsg = NULL, *keyboardMsg = NULL; - IDevPtr indp, i; + IDevPtr *devs, /* iterator */ + indp; IDevRec Pointer, Keyboard; XF86ConfInputPtr confInput; XF86ConfInputRec defPtr, defKbd; @@ -1198,7 +1215,8 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) * in the active ServerLayout. If more than one is specified for either, * remove the core attribute from the later ones. */ - for (indp = servlayoutp->inputs; indp->identifier; indp++) { + for (devs = servlayoutp->inputs; devs && *devs; devs++) { + indp = *devs; pointer opt1 = NULL, opt2 = NULL; if (indp->commonOptions && xf86CheckBoolOption(indp->commonOptions, "CorePointer", FALSE)) { @@ -1263,11 +1281,15 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) * removed. */ if (corePointer) { - for (indp = servlayoutp->inputs; indp->identifier; indp++) - if (indp == corePointer) + for (devs = servlayoutp->inputs; devs && *devs; devs++) + if (*devs == corePointer) + { + xfree(*devs); + *devs = (IDevPtr)0x1; /* ensure we dont skip next loop*/ break; - for (; indp->identifier; indp++) - indp[0] = indp[1]; + } + for (; devs && *devs; devs++) + devs[0] = devs[1]; count--; } corePointer = NULL; @@ -1327,13 +1349,14 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) foundPointer = configInput(&Pointer, confInput, from); if (foundPointer) { count++; - indp = xnfrealloc(servlayoutp->inputs, - (count + 1) * sizeof(IDevRec)); - indp[count - 1] = Pointer; - indp[count - 1].extraOptions = + devs = xnfrealloc(servlayoutp->inputs, + (count + 1) * sizeof(IDevPtr)); + devs[count - 1] = xnfalloc(sizeof(IDevRec)); + *devs[count - 1] = Pointer; + devs[count - 1]->extraOptions = xf86addNewOption(NULL, xnfstrdup("CorePointer"), NULL); - indp[count].identifier = NULL; - servlayoutp->inputs = indp; + devs[count] = NULL; + servlayoutp->inputs = devs; } } @@ -1351,9 +1374,9 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) * If you're using an evdev keyboard and expect a default mouse * section ... deal. */ - for (i = servlayoutp->inputs; i->identifier && i->driver; i++) { - if (!strcmp(i->driver, "void") || !strcmp(i->driver, "mouse") || - !strcmp(i->driver, "vmmouse") || !strcmp(i->driver, "evdev")) { + for (devs = servlayoutp->inputs; devs && *devs; devs++) { + if (!strcmp((*devs)->driver, "void") || !strcmp((*devs)->driver, "mouse") || + !strcmp((*devs)->driver, "vmmouse") || !strcmp((*devs)->driver, "evdev")) { found = 1; break; } } @@ -1366,13 +1389,14 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) foundPointer = configInput(&Pointer, confInput, from); if (foundPointer) { count++; - indp = xnfrealloc(servlayoutp->inputs, - (count + 1) * sizeof(IDevRec)); - indp[count - 1] = Pointer; - indp[count - 1].extraOptions = + devs = xnfrealloc(servlayoutp->inputs, + (count + 1) * sizeof(IDevPtr)); + devs[count - 1] = xnfalloc(sizeof(IDevRec)); + *devs[count - 1] = Pointer; + devs[count - 1]->extraOptions = xf86addNewOption(NULL, xnfstrdup("AlwaysCore"), NULL); - indp[count].identifier = NULL; - servlayoutp->inputs = indp; + devs[count] = NULL; + servlayoutp->inputs = devs; } } @@ -1393,11 +1417,15 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) * removed. */ if (coreKeyboard) { - for (indp = servlayoutp->inputs; indp->identifier; indp++) - if (indp == coreKeyboard) + for (devs = servlayoutp->inputs; devs && *devs; devs++) + if (*devs == coreKeyboard) + { + xfree(*devs); + *devs = (IDevPtr)0x1; /* ensure we dont skip next loop */ break; - for (; indp->identifier; indp++) - indp[0] = indp[1]; + } + for (; devs && *devs; devs++) + devs[0] = devs[1]; count--; } coreKeyboard = NULL; @@ -1457,13 +1485,14 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) foundKeyboard = configInput(&Keyboard, confInput, from); if (foundKeyboard) { count++; - indp = xnfrealloc(servlayoutp->inputs, - (count + 1) * sizeof(IDevRec)); - indp[count - 1] = Keyboard; - indp[count - 1].extraOptions = + devs = xnfrealloc(servlayoutp->inputs, + (count + 1) * sizeof(IDevPtr)); + devs[count - 1] = xnfalloc(sizeof(IDevRec)); + *devs[count - 1] = Keyboard; + devs[count - 1]->extraOptions = xf86addNewOption(NULL, xnfstrdup("CoreKeyboard"), NULL); - indp[count].identifier = NULL; - servlayoutp->inputs = indp; + devs[count] = NULL; + servlayoutp->inputs = devs; } } @@ -1519,7 +1548,7 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout, MessageType from; screenLayoutPtr slp; GDevPtr gdp; - IDevPtr indp; + IDevPtr* indp; int i = 0, j; if (!servlayoutp) @@ -1731,16 +1760,19 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout, ErrorF("Found %d input devices in the layout section %s", count, conf_layout->lay_identifier); #endif - indp = xnfalloc((count + 1) * sizeof(IDevRec)); - indp[count].identifier = NULL; + indp = xnfcalloc((count + 1), sizeof(IDevPtr)); + indp[count] = NULL; irp = conf_layout->lay_input_lst; count = 0; while (irp) { - if (!configInput(&indp[count], irp->iref_inputdev, X_CONFIG)) { - xfree(indp); - return FALSE; + indp[count] = xnfalloc(sizeof(IDevRec)); + if (!configInput(indp[count], irp->iref_inputdev, X_CONFIG)) { + while(count--) + xfree(indp[count]); + xfree(indp); + return FALSE; } - indp[count].extraOptions = irp->iref_option_lst; + indp[count]->extraOptions = irp->iref_option_lst; count++; irp = (XF86ConfInputrefPtr)irp->list.next; } @@ -1764,7 +1796,7 @@ configImpliedLayout(serverLayoutPtr servlayoutp, XF86ConfScreenPtr conf_screen) MessageType from; XF86ConfScreenPtr s; screenLayoutPtr slp; - IDevPtr indp; + IDevPtr *indp; if (!servlayoutp) return FALSE; @@ -1806,8 +1838,8 @@ configImpliedLayout(serverLayoutPtr servlayoutp, XF86ConfScreenPtr conf_screen) servlayoutp->inactives = xnfcalloc(1, sizeof(GDevRec)); servlayoutp->options = NULL; /* Set up an empty input device list, then look for some core devices. */ - indp = xnfalloc(sizeof(IDevRec)); - indp->identifier = NULL; + indp = xnfalloc(sizeof(IDevPtr)); + *indp = NULL; servlayoutp->inputs = indp; if (!xf86Info.allowEmptyInput && !checkCoreInputDevices(servlayoutp, TRUE)) return FALSE; @@ -1944,12 +1976,15 @@ configScreen(confScreenPtr screenp, XF86ConfScreenPtr conf_screen, int scrnum, } typedef enum { - MON_REDUCEDBLANKING + MON_REDUCEDBLANKING, + MON_MAX_PIX_CLOCK, } MonitorValues; static OptionInfoRec MonitorOptions[] = { { MON_REDUCEDBLANKING, "ReducedBlanking", OPTV_BOOLEAN, {0}, FALSE }, + { MON_MAX_PIX_CLOCK, "MaxPixClock", OPTV_FREQ, + {0}, FALSE }, { -1, NULL, OPTV_NONE, {0}, FALSE }, }; @@ -2096,11 +2131,11 @@ configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor) return FALSE; } - /* Check wether this Monitor accepts Reduced Blanking modelines */ xf86ProcessOptions(-1, monitorp->options, MonitorOptions); - xf86GetOptValBool(MonitorOptions, MON_REDUCEDBLANKING, &monitorp->reducedblanking); + xf86GetOptValFreq(MonitorOptions, MON_MAX_PIX_CLOCK, OPTUNITS_KHZ, + &monitorp->maxPixClock); return TRUE; } diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 7b04bd6bd..19f040b03 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -70,10 +70,7 @@ _X_EXPORT xf86MonPtr ConfiguredMonitor; Bool xf86DoConfigurePass1 = TRUE; static Bool foundMouse = FALSE; -#if defined(__UNIXOS2__) -#define DFLT_MOUSE_DEV "mouse$" -#define DFLT_MOUSE_PROTO "OS2Mouse" -#elif defined(__SCO__) +#if defined(__SCO__) static char *DFLT_MOUSE_PROTO = "OSMouse"; #elif defined(__UNIXWARE__) static char *DFLT_MOUSE_PROTO = "OSMouse"; @@ -271,17 +268,6 @@ configureInputSection (void) /* Crude mechanism to auto-detect mouse (os dependent) */ { int fd; -#if 0 && defined linux - /* Our autodetection code can do a better job */ - int len; - char path[32]; - - if ((len = readlink(DFLT_MOUSE_DEV, path, sizeof(path) - 1)) > 0) { - path[len] = '\0'; - if (strstr(path, "psaux") != NULL) - DFLT_MOUSE_PROTO = "PS/2"; - } -#endif #ifdef WSCONS_SUPPORT fd = open("/dev/wsmouse", 0); if (fd > 0) { @@ -323,29 +309,6 @@ configureInputSection (void) return ptr; } -static XF86ConfDRIPtr -configureDRISection (void) -{ -#ifdef NOTYET - parsePrologue (XF86ConfDRIPtr, XF86ConfDRIRec) - - return ptr; -#else - return NULL; -#endif -} - -static XF86ConfVendorPtr -configureVendorSection (void) -{ - parsePrologue (XF86ConfVendorPtr, XF86ConfVendorRec) - - return NULL; -#if 0 - return ptr; -#endif -} - static XF86ConfScreenPtr configureScreenSection (int screennum) { @@ -567,29 +530,6 @@ configureLayoutSection (void) return ptr; } -static XF86ConfModesPtr -configureModesSection (void) -{ -#ifdef NOTYET - parsePrologue (XF86ConfModesPtr, XF86ConfModesRec) - - return ptr; -#else - return NULL; -#endif -} - -static XF86ConfVideoAdaptorPtr -configureVideoAdaptorSection (void) -{ - parsePrologue (XF86ConfVideoAdaptorPtr, XF86ConfVideoAdaptorRec) - - return NULL; -#if 0 - return ptr; -#endif -} - static XF86ConfFlagsPtr configureFlagsSection (void) { @@ -862,19 +802,16 @@ DoConfigure() xf86config->conf_files = configureFilesSection(); xf86config->conf_modules = configureModuleSection(); xf86config->conf_flags = configureFlagsSection(); - xf86config->conf_videoadaptor_lst = configureVideoAdaptorSection(); - xf86config->conf_modes_lst = configureModesSection(); - xf86config->conf_vendor_lst = configureVendorSection(); - xf86config->conf_dri = configureDRISection(); + xf86config->conf_videoadaptor_lst = NULL; + xf86config->conf_modes_lst = NULL; + xf86config->conf_vendor_lst = NULL; + xf86config->conf_dri = NULL; xf86config->conf_input_lst = configureInputSection(); xf86config->conf_layout_lst = configureLayoutSection(); if (!(home = getenv("HOME"))) home = "/"; { -#ifdef __UNIXOS2__ -#define PATH_MAX 2048 -#endif #if !defined(PATH_MAX) #define PATH_MAX 1024 #endif @@ -1010,13 +947,11 @@ DoConfigure() ErrorF("\n"__XSERVERNAME__" is not able to detect your mouse.\n" "Edit the file and correct the Device.\n"); } else { -#ifndef __UNIXOS2__ /* OS/2 definitely has a mouse */ ErrorF("\n"__XSERVERNAME__" detected your mouse at device %s.\n" "Please check your config if the mouse is still not\n" "operational, as by default "__XSERVERNAME__ " tries to autodetect\n" "the protocol.\n",DFLT_MOUSE_DEV); -#endif } #endif /* !__SCO__ */ diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c index 46d812804..9e6e62216 100644 --- a/hw/xfree86/common/xf86Cursor.c +++ b/hw/xfree86/common/xf86Cursor.c @@ -25,8 +25,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* $XConsortium: xf86Cursor.c /main/10 1996/10/19 17:58:23 kaleb $ */ - #define NEED_EVENTS #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> @@ -408,18 +406,14 @@ xf86CursorOffScreen(ScreenPtr *pScreen, int *x, int *y) /* * xf86CrossScreen -- * Switch to another screen + * + * Currently nothing special happens, but mi assumes the CrossScreen + * method exists. */ -/* NEED TO CHECK THIS */ -/* ARGSUSED */ static void xf86CrossScreen (ScreenPtr pScreen, Bool entering) { -#if 0 - if (xf86Info.sharedMonitor) - (XF86SCRNINFO(pScreen)->EnterLeaveMonitor)(entering); - (XF86SCRNINFO(pScreen)->EnterLeaveCursor)(entering); -#endif } diff --git a/hw/xfree86/common/xf86Debug.c b/hw/xfree86/common/xf86Debug.c index cb579343a..5b609652b 100644 --- a/hw/xfree86/common/xf86Debug.c +++ b/hw/xfree86/common/xf86Debug.c @@ -30,10 +30,6 @@ #include <xorg-config.h> #endif -#ifdef __UNIXOS2__ -#define I_NEED_OS2_H -#endif - #include <sys/time.h> #include <unistd.h> #include <X11/X.h> @@ -43,88 +39,6 @@ #include "xf86_OSlib.h" #include "compiler.h" -_X_EXPORT void xf86Break1(void) -{ -} - -_X_EXPORT void xf86Break2(void) -{ -} - -_X_EXPORT void xf86Break3(void) -{ -} - -_X_EXPORT char *xf86p8bit[] = { "00000000", "00000001", "00000010", "00000011", - "00000100", "00000101", "00000110", "00000111", - "00001000", "00001001", "00001010", "00001011", - "00001100", "00001101", "00001110", "00001111", - "00010000", "00010001", "00010010", "00010011", - "00010100", "00010101", "00010110", "00010111", - "00011000", "00011001", "00011010", "00011011", - "00011100", "00011101", "00011110", "00011111", - "00100000", "00100001", "00100010", "00100011", - "00100100", "00100101", "00100110", "00100111", - "00101000", "00101001", "00101010", "00101011", - "00101100", "00101101", "00101110", "00101111", - "00110000", "00110001", "00110010", "00110011", - "00110100", "00110101", "00110110", "00110111", - "00111000", "00111001", "00111010", "00111011", - "00111100", "00111101", "00111110", "00111111", - "01000000", "01000001", "01000010", "01000011", - "01000100", "01000101", "01000110", "01000111", - "01001000", "01001001", "01001010", "01001011", - "01001100", "01001101", "01001110", "01001111", - "01010000", "01010001", "01010010", "01010011", - "01010100", "01010101", "01010110", "01010111", - "01011000", "01011001", "01011010", "01011011", - "01011100", "01011101", "01011110", "01011111", - "01100000", "01100001", "01100010", "01100011", - "01100100", "01100101", "01100110", "01100111", - "01101000", "01101001", "01101010", "01101011", - "01101100", "01101101", "01101110", "01101111", - "01110000", "01110001", "01110010", "01110011", - "01110100", "01110101", "01110110", "01110111", - "01111000", "01111001", "01111010", "01111011", - "01111100", "01111101", "01111110", "01111111", - "10000000", "10000001", "10000010", "10000011", - "10000100", "10000101", "10000110", "10000111", - "10001000", "10001001", "10001010", "10001011", - "10001100", "10001101", "10001110", "10001111", - "10010000", "10010001", "10010010", "10010011", - "10010100", "10010101", "10010110", "10010111", - "10011000", "10011001", "10011010", "10011011", - "10011100", "10011101", "10011110", "10011111", - "10100000", "10100001", "10100010", "10100011", - "10100100", "10100101", "10100110", "10100111", - "10101000", "10101001", "10101010", "10101011", - "10101100", "10101101", "10101110", "10101111", - "10110000", "10110001", "10110010", "10110011", - "10110100", "10110101", "10110110", "10110111", - "10111000", "10111001", "10111010", "10111011", - "10111100", "10111101", "10111110", "10111111", - "11000000", "11000001", "11000010", "11000011", - "11000100", "11000101", "11000110", "11000111", - "11001000", "11001001", "11001010", "11001011", - "11001100", "11001101", "11001110", "11001111", - "11010000", "11010001", "11010010", "11010011", - "11010100", "11010101", "11010110", "11010111", - "11011000", "11011001", "11011010", "11011011", - "11011100", "11011101", "11011110", "11011111", - "11100000", "11100001", "11100010", "11100011", - "11100100", "11100101", "11100110", "11100111", - "11101000", "11101001", "11101010", "11101011", - "11101100", "11101101", "11101110", "11101111", - "11110000", "11110001", "11110010", "11110011", - "11110100", "11110101", "11110110", "11110111", - "11111000", "11111001", "11111010", "11111011", - "11111100", "11111101", "11111110", "11111111" -}; - -_X_EXPORT CARD32 xf86DummyVar1; -_X_EXPORT CARD32 xf86DummyVar2; -_X_EXPORT CARD32 xf86DummyVar3; - CARD8 xf86PeekFb8(CARD8 *p) { return *p; } CARD16 xf86PeekFb16(CARD16 *p) { return *p; } CARD32 xf86PeekFb32(CARD32 *p) { return *p; } @@ -161,38 +75,3 @@ void xf86PokeMmio32(pointer Base, unsigned long Offset, CARD32 v) { MMIO_OUT32(Base,Offset,v); } - - -#if 0 -_X_EXPORT void -xf86STimestamp(xf86TsPtr* timestamp) -{ - if (*timestamp) { - gettimeofday((struct timeval*)*timestamp,NULL); - } else { - *timestamp = xnfalloc(sizeof(xf86TsRec)); - gettimeofday((struct timeval*)*timestamp,NULL); - } -} - -_X_EXPORT void -xf86SPTimestamp(xf86TsPtr* timestamp, char *str) -{ - if (*timestamp) { - long diff; - struct timeval ts; - ts = **(struct timeval**)timestamp; - gettimeofday((struct timeval*)*timestamp,NULL); - if (ts.tv_usec > (*timestamp)->usec) - diff = ((*timestamp)->sec - ts.tv_sec - 1) * 1000 - + (ts.tv_usec - (*timestamp)->usec) / 1000; - else - diff = ((*timestamp)->sec - ts.tv_sec) * 1000 - +(- ts.tv_usec + (*timestamp)->usec) / 1000; - ErrorF("%s Elapsed: %li\n",str,diff); - } else { - *timestamp = xnfalloc(sizeof(xf86TsRec)); - gettimeofday((struct timeval*)*timestamp,NULL); - } -} -#endif diff --git a/hw/xfree86/common/xf86DefModes.c b/hw/xfree86/common/xf86DefModes.c index a39d0a212..bdb64fe8e 100644 --- a/hw/xfree86/common/xf86DefModes.c +++ b/hw/xfree86/common/xf86DefModes.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ - /* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT -- LOOK at * modeline2c.pl */ @@ -13,9 +11,6 @@ #include <xorg-config.h> #endif -#ifdef __UNIXOS2__ -#define I_NEED_OS2_H -#endif #include "xf86.h" #include "xf86Config.h" #include "xf86Priv.h" diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index 4da74e556..dd9c34e5c 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -53,10 +53,6 @@ #include <xorg-config.h> #endif -#ifdef __UNIXOS2__ -#define I_NEED_OS2_H -#endif - #include <X11/X.h> #include <X11/Xpoll.h> #include <X11/Xproto.h> @@ -125,9 +121,6 @@ extern Bool noXkbExtension; * This has been generalised to work with Linux and *BSD+syscons (DHD) */ -#ifdef USE_VT_SYSREQ -static Bool VTSysreqToggle = FALSE; -#endif /* !USE_VT_SYSREQ */ _X_EXPORT Bool VTSwitchEnabled = TRUE; /* Allows run-time disabling for *BSD and for avoiding VT switches when using the DRI @@ -323,7 +316,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg) CloseDownClient(server); } break; -#if !defined(__SOL8__) && !defined(__UNIXOS2__) && !defined(sgi) && \ +#if !defined(__SOL8__) && !defined(sgi) && \ (!defined(sun) || defined(i386)) && defined(VT_ACTIVATE) case ACTION_SWITCHSCREEN: if (VTSwitchEnabled && !xf86Info.dontVTSwitch && arg) { @@ -443,7 +436,7 @@ xf86CommonSpecialKey(int key, Bool down, int modifiers) void xf86Wakeup(pointer blockData, int err, pointer pReadmask) { -#if !defined(__UNIXOS2__) && !defined(__QNX__) +#if !defined(__QNX__) fd_set* LastSelectMask = (fd_set*)pReadmask; fd_set devicesWithInput; InputInfoPtr pInfo; @@ -470,7 +463,7 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask) } } } -#else /* __UNIXOS2__ and __QNX__ */ +#else /* __QNX__ */ InputInfoPtr pInfo; @@ -490,7 +483,7 @@ xf86Wakeup(pointer blockData, int err, pointer pReadmask) pInfo = pInfo->next; } -#endif /* __UNIXOS2__ and __QNX__ */ +#endif /* __QNX__ */ if (err >= 0) { /* we don't want the handlers called if select() */ IHPtr ih; /* returned with an error condition, do we? */ @@ -771,16 +764,6 @@ xf86SigHandler(int signo) FatalError("Caught signal %d. Server aborting\n", signo); } -#ifdef MEMDEBUG -void -xf86SigMemDebug(int signo) -{ - CheckMemory(); - (void) signal(signo, xf86SigMemDebug); - return; -} -#endif - static void xf86ReleaseKeys(DeviceIntPtr pDev) { @@ -877,7 +860,6 @@ xf86VTSwitch() if (xf86Screens[i]->EnableDisableFBAccess) (*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE); } -#if !defined(__UNIXOS2__) /* * Keep the order: Disable Device > LeaveVT @@ -889,7 +871,6 @@ xf86VTSwitch() DisableDevice(pInfo->dev); pInfo = pInfo->next; } -#endif /* !__UNIXOS2__ */ xf86EnterServerState(SETUP); for (i = 0; i < xf86NumScreens; i++) xf86Screens[i]->LeaveVT(i, 0); @@ -923,7 +904,6 @@ xf86VTSwitch() } SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset); -#if !defined(__UNIXOS2__) pInfo = xf86InputDevs; while (pInfo) { if (pInfo->dev) { @@ -934,7 +914,6 @@ xf86VTSwitch() } /* XXX HACK */ xf86ReleaseKeys(inputInfo.keyboard); -#endif /* !__UNIXOS2__ */ for (ih = InputHandlers; ih; ih = ih->next) xf86EnableInputHandler(ih); @@ -989,7 +968,6 @@ xf86VTSwitch() /* Turn screen saver off when switching back */ SaveScreens(SCREEN_SAVER_FORCER,ScreenSaverReset); -#if !defined(__UNIXOS2__) pInfo = xf86InputDevs; while (pInfo) { if (pInfo->dev) { @@ -1000,7 +978,6 @@ xf86VTSwitch() } /* XXX HACK */ xf86ReleaseKeys(inputInfo.keyboard); -#endif /* !__UNIXOS2__ */ for (ih = InputHandlers; ih; ih = ih->next) xf86EnableInputHandler(ih); diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index e0b758ffd..4636af4e2 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -481,16 +481,6 @@ xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp, scrp->bitsPerPixelFrom = X_DEFAULT; scrp->depthFrom = X_DEFAULT; -#if BITMAP_SCANLINE_UNIT == 64 - /* - * For platforms with 64-bit scanlines, modify the driver's depth24flags - * to remove preferences for packed 24bpp modes, which are not currently - * supported on these platforms. - */ - depth24flags &= ~(SupportConvert32to24 | SupportConvert32to24 | - PreferConvert24to32 | PreferConvert32to24); -#endif - if (xf86FbBpp > 0) { scrp->bitsPerPixel = xf86FbBpp; scrp->bitsPerPixelFrom = X_CMDLINE; @@ -2439,12 +2429,8 @@ xf86LoadOneModule(char *name, pointer opt) if (!name) return NULL; -#ifndef NORMALISE_MODULE_NAME - Name = xstrdup(name); -#else /* Normalise the module name */ Name = xf86NormalizeName(name); -#endif /* Skip empty names */ if (Name == NULL) diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 16162b7bc..bf7dac6da 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -1,4 +1,3 @@ - /* * Loosely based on code bearing the following copyright: * @@ -39,15 +38,12 @@ #include <errno.h> #undef HAS_UTSNAME -#if !defined(WIN32) && !defined(__UNIXOS2__) +#if !defined(WIN32) #define HAS_UTSNAME 1 #include <sys/utsname.h> #endif #define NEED_EVENTS -#ifdef __UNIXOS2__ -#define I_NEED_OS2_H -#endif #include <X11/X.h> #include <X11/Xmd.h> #include <X11/Xproto.h> @@ -105,10 +101,6 @@ static void xf86PrintDefaultModulePath(void); static void xf86PrintDefaultLibraryPath(void); static void xf86RunVtInit(void); -#ifdef __UNIXOS2__ -extern void os2ServerVideoAccess(); -#endif - #ifdef XF86PM void (*xf86OSPMClose)(void) = NULL; #endif @@ -238,9 +230,6 @@ PostConfigInit(void) #ifdef SIGXFSZ signal(SIGXFSZ,xf86SigHandler); #endif -#ifdef MEMDEBUG - signal(SIGUSR2,xf86SigMemDebug); -#endif } #ifdef XF86PM @@ -267,10 +256,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) Bool pix24Fail = FALSE; Bool autoconfig = FALSE; -#ifdef __UNIXOS2__ - os2ServerVideoAccess(); /* See if we have access to the screen before doing anything */ -#endif - xf86Initialising = TRUE; /* Do this early? */ @@ -328,39 +313,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL); } -#ifdef TESTING - { - char **list, **l; - const char *subdirs[] = { - "drivers", - NULL - }; - const char *patlist[] = { - "(.*)_drv\\.so", - "(.*)_drv\\.o", - NULL - }; - ErrorF("Getting module listing...\n"); - list = LoaderListDirs(NULL, NULL); - if (list) - for (l = list; *l; l++) - ErrorF("module: %s\n", *l); - LoaderFreeDirList(list); - ErrorF("Getting video driver listing...\n"); - list = LoaderListDirs(subdirs, NULL); - if (list) - for (l = list; *l; l++) - ErrorF("video driver: %s\n", *l); - LoaderFreeDirList(list); - ErrorF("Getting driver listing...\n"); - list = LoaderListDirs(NULL, patlist); - if (list) - for (l = list; *l; l++) - ErrorF("video driver: %s\n", *l); - LoaderFreeDirList(list); - } -#endif - /* Force load mandatory base modules */ if (!xf86LoadModules(baseModules, NULL)) FatalError("Unable to load required base modules, Exiting...\n"); @@ -752,7 +704,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) } *VT = xf86Info.vtno; - VTAtom = MakeAtom(VT_ATOM_NAME, sizeof(VT_ATOM_NAME), TRUE); + VTAtom = MakeAtom(VT_ATOM_NAME, sizeof(VT_ATOM_NAME) - 1, TRUE); for (i = 0, ret = Success; i < xf86NumScreens && ret == Success; i++) { ret = xf86RegisterRootWindowProperty(xf86Screens[i]->scrnIndex, @@ -773,27 +725,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) } } -#if BITMAP_SCANLINE_UNIT == 64 - /* - * cfb24 doesn't currently work on architectures with a 64 bit - * BITMAP_SCANLINE_UNIT, so check for 24 bit pixel size for pixmaps - * or framebuffers. - */ - { - Bool usesCfb24 = FALSE; - - if (PIX24TOBPP(pix24) == 24) - usesCfb24 = TRUE; - for (i = 0; i < xf86NumScreens; i++) - if (xf86Screens[i]->bitsPerPixel == 24) - usesCfb24 = TRUE; - if (usesCfb24) { - FatalError("24-bit pixel size is not supported on systems with" - " 64-bit scanlines.\n"); - } - } -#endif - #ifdef XKB xf86InitXkb(); #endif @@ -950,14 +881,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) xf86Msg(xf86Info.randRFrom, "RandR %s\n", xf86Info.disableRandR ? "disabled" : "enabled"); #endif -#ifdef NOT_USED - /* - * Here we have to let the driver getting access of the VT. Note that - * this doesn't mean that the graphics board may access automatically - * the monitor. If the monitor is shared this is done in xf86CrossScreen! - */ - if (!xf86Info.sharedMonitor) (xf86Screens[i]->EnterLeaveMonitor)(ENTER); -#endif } xf86PostScreenInit(); @@ -981,7 +904,7 @@ InitInput(argc, argv) int argc; char **argv; { - IDevPtr pDev; + IDevPtr* pDev; InputDriverPtr pDrv; InputInfoPtr pInfo; @@ -990,9 +913,20 @@ InitInput(argc, argv) if (serverGeneration == 1) { /* Call the PreInit function for each input device instance. */ - for (pDev = xf86ConfigLayout.inputs; pDev && pDev->identifier; pDev++) { - if ((pDrv = xf86LookupInputDriver(pDev->driver)) == NULL) { - xf86Msg(X_ERROR, "No Input driver matching `%s'\n", pDev->driver); + for (pDev = xf86ConfigLayout.inputs; pDev && *pDev; pDev++) { + /* Replace obsolete keyboard driver with kbd */ + if (!xf86NameCmp((*pDev)->driver, "keyboard")) { + xf86MsgVerb(X_WARNING, 0, + "*** WARNING the legacy keyboard driver \"%s\" has been removed\n", + (*pDev)->driver); + xf86MsgVerb(X_WARNING, 0, + "*** Using the new \"kbd\" driver for \"%s\".\n", + (*pDev)->identifier); + strcpy((*pDev)->driver, "kbd"); + } + + if ((pDrv = xf86LookupInputDriver((*pDev)->driver)) == NULL) { + xf86Msg(X_ERROR, "No Input driver matching `%s'\n", (*pDev)->driver); /* XXX For now, just continue. */ continue; } @@ -1002,14 +936,14 @@ InitInput(argc, argv) pDrv->driverName); continue; } - pInfo = pDrv->PreInit(pDrv, pDev, 0); + pInfo = pDrv->PreInit(pDrv, *pDev, 0); if (!pInfo) { xf86Msg(X_ERROR, "PreInit returned NULL for \"%s\"\n", - pDev->identifier); + (*pDev)->identifier); continue; } else if (!(pInfo->flags & XI86_CONFIGURED)) { xf86Msg(X_ERROR, "PreInit failed for input device \"%s\"\n", - pDev->identifier); + (*pDev)->identifier); xf86DeleteInput(pInfo, 0); continue; } @@ -1048,7 +982,9 @@ OsVendorInit() signal(SIGCHLD, SIG_DFL); /* Need to wait for child processes */ #endif OsDelayInitColors = TRUE; +#ifndef BUILTIN_FONTS loadableFonts = TRUE; +#endif if (!beenHere) xf86LogInit(); @@ -1065,9 +1001,7 @@ OsVendorInit() #ifdef O_NONBLOCK if (!beenHere) { -#if !defined(__EMX__) if (geteuid() == 0 && getuid() != geteuid()) -#endif { int status; @@ -1734,7 +1668,7 @@ xf86PrintBanner() t.tm_sec = BUILD_TIME % 100; t.tm_min = (BUILD_TIME / 100) % 100; t.tm_hour = (BUILD_TIME / 10000) % 100; - if (strftime(buf, sizeof(buf), "%d %B %Y %I:%M:%s%p", &t)) + if (strftime(buf, sizeof(buf), "%d %B %Y %I:%M:%S%p", &t)) ErrorF("Build Date: %s\n", buf); #else if (strftime(buf, sizeof(buf), "%d %B %Y", &t)) @@ -1837,17 +1771,18 @@ xf86LoadModules(char **list, pointer *optlist) for (i = 0; list[i] != NULL; i++) { -#ifndef NORMALISE_MODULE_NAME - name = xstrdup(list[i]); -#else /* Normalise the module name */ name = xf86NormalizeName(list[i]); -#endif /* Skip empty names */ if (name == NULL || *name == '\0') continue; + /* Replace obsolete keyboard driver with kbd */ + if (!xf86NameCmp(name, "keyboard")) { + strcpy(name, "kbd"); + } + if (optlist) opt = optlist[i]; else diff --git a/hw/xfree86/common/xf86MiscExt.c b/hw/xfree86/common/xf86MiscExt.c index 652428489..655304e8b 100644 --- a/hw/xfree86/common/xf86MiscExt.c +++ b/hw/xfree86/common/xf86MiscExt.c @@ -34,10 +34,6 @@ #include <xorg-config.h> #endif -#ifdef __UNIXOS2__ -#define I_NEED_OS2_H -#endif - #include <X11/X.h> #include "os.h" #include "xf86.h" diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index b343788fc..7fcce10b1 100644 --- a/hw/xfree86/common/xf86Mode.c +++ b/hw/xfree86/common/xf86Mode.c @@ -458,7 +458,6 @@ xf86LookupMode(ScrnInfoPtr scrp, DisplayModePtr modep, int ModePrivFlags = 0; ModeStatus status = MODE_NOMODE; Bool allowDiv2 = (strategy & LOOKUP_CLKDIV2) != 0; - Bool haveBuiltin; int n; const int types[] = { M_T_BUILTIN | M_T_PREFERRED, @@ -1473,6 +1472,12 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, scrp->monitor->vrefresh[i].lo, scrp->monitor->vrefresh[i].hi); } + if (scrp->monitor->maxPixClock) { + xf86DrvMsg(scrp->scrnIndex, X_INFO, + "%s: Using maximum pixel clock of %.2f MHz\n", + scrp->monitor->id, + (float)scrp->monitor->maxPixClock / 1000.0); + } } /* @@ -2038,6 +2043,7 @@ xf86SetCrtcForModes(ScrnInfoPtr scrp, int adjustFlags) } +#if 0 static void add(char **p, char *new) { @@ -2046,7 +2052,6 @@ add(char **p, char *new) strcat(*p, new); } -#if 0 _X_EXPORT void xf86PrintModeline(int scrnIndex,DisplayModePtr mode) { diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index cdf3d1bea..20d8b4413 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -1,4 +1,3 @@ - /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. * @@ -85,7 +84,7 @@ typedef enum { */ #define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 3) #define ABI_VIDEODRV_VERSION SET_ABI_VERSION(2, 0) -#define ABI_XINPUT_VERSION SET_ABI_VERSION(1, 1) +#define ABI_XINPUT_VERSION SET_ABI_VERSION(2, 0) #define ABI_EXTENSION_VERSION SET_ABI_VERSION(0, 3) #define ABI_FONT_VERSION SET_ABI_VERSION(0, 5) @@ -93,11 +92,7 @@ typedef enum { #define MODINFOSTRING2 0x10dc023a #ifndef MODULEVENDORSTRING -#ifndef __OS2ELF__ #define MODULEVENDORSTRING "X.Org Foundation" -#else -#define MODULEVENDORSTRING "X.Org Foundation - OS2" -#endif #endif /* Error return codes for errmaj. New codes must only be added at the end. */ diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c index ac8896879..a6bcc3421 100644 --- a/hw/xfree86/common/xf86PM.c +++ b/hw/xfree86/common/xf86PM.c @@ -74,13 +74,11 @@ suspend (pmEvent event, Bool undo) if (xf86Screens[i]->EnableDisableFBAccess) (*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE); } -#if !defined(__EMX__) pInfo = xf86InputDevs; while (pInfo) { DisableDevice(pInfo->dev); pInfo = pInfo->next; } -#endif xf86EnterServerState(SETUP); for (i = 0; i < xf86NumScreens; i++) { xf86EnableAccess(xf86Screens[i]); @@ -119,13 +117,11 @@ resume(pmEvent event, Bool undo) (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE); } SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset); -#if !defined(__EMX__) pInfo = xf86InputDevs; while (pInfo) { EnableDevice(pInfo->dev); pInfo = pInfo->next; } -#endif xf86inSuspend = FALSE; } diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h index 59ce8da86..b6fbd3a41 100644 --- a/hw/xfree86/common/xf86Priv.h +++ b/hw/xfree86/common/xf86Priv.h @@ -174,9 +174,6 @@ void xf86PostKbdEvent(unsigned key); void xf86PostMseEvent(DeviceIntPtr device, int buttons, int dx, int dy); void xf86Wakeup(pointer blockData, int err, pointer pReadmask); void xf86SigHandler(int signo); -#ifdef MEMDEBUG -void xf86SigMemDebug(int signo); -#endif void xf86HandlePMEvents(int fd, pointer data); extern int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num); extern pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event); diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h index 7ca0669a5..09ebb0717 100644 --- a/hw/xfree86/common/xf86Privstr.h +++ b/hw/xfree86/common/xf86Privstr.h @@ -138,6 +138,9 @@ typedef struct { Bool allowEmptyInput; /* Allow the server to start with no input * devices. */ + Bool autoAddDevices; /* Whether to succeed NIDR, or ignore. */ + Bool autoEnableDevices; /* Whether to enable, or let the client + * control. */ } xf86InfoRec, *xf86InfoPtr; #ifdef DPMSExtension diff --git a/hw/xfree86/common/xf86Version.h b/hw/xfree86/common/xf86Version.h index f7ac89b1b..b93ac7d23 100644 --- a/hw/xfree86/common/xf86Version.h +++ b/hw/xfree86/common/xf86Version.h @@ -1,4 +1,3 @@ - /* * Copyright (c) 1994-2003 by The XFree86 Project, Inc. * @@ -55,5 +54,3 @@ 0) #endif - -/* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */ diff --git a/hw/xfree86/common/xf86XKB.c b/hw/xfree86/common/xf86XKB.c index b805885bd..11694544a 100644 --- a/hw/xfree86/common/xf86XKB.c +++ b/hw/xfree86/common/xf86XKB.c @@ -1,4 +1,3 @@ -/* $XConsortium: xf86XKB.c /main/4 1996/02/04 09:28:04 kaleb $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 543002000..e45d44c02 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -45,7 +45,6 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ -/* $XConsortium: xf86Xinput.c /main/14 1996/10/27 11:05:25 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> @@ -84,9 +83,7 @@ #include <stdarg.h> -#include "osdep.h" /* EnabledDevices */ #include <X11/Xpoll.h> -#include "xf86_OSproc.h" /* sigio stuff */ #include "mi.h" @@ -207,17 +204,6 @@ OpenInputDevice(DeviceIntPtr dev, if (!dev->inited) ActivateDevice(dev); - if (!dev->public.on) { - if (EnableDevice(dev)) { - dev->startup = FALSE; - } - else { - ErrorF("couldn't enable device %s\n", dev->name); - *status = BadDevice; - return; - } - } - *status = Success; } @@ -300,6 +286,7 @@ ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control) case DEVICE_RESOLUTION: case DEVICE_ABS_CALIB: case DEVICE_ABS_AREA: + case DEVICE_ENABLE: return Success; default: return BadMatch; @@ -325,6 +312,7 @@ NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev) InputOption *option = NULL; DeviceIntPtr dev = NULL; int rval = Success; + int is_auto = 0; idev = xcalloc(sizeof(*idev), 1); if (!idev) @@ -340,7 +328,7 @@ NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev) * test if the module is already loaded first */ drv = xf86LookupInputDriver(option->value); if (!drv) - if(xf86LoadOneModule(option->value, NULL)) + if (xf86LoadOneModule(option->value, NULL)) drv = xf86LookupInputDriver(option->value); if (!drv) { xf86Msg(X_ERROR, "No input driver matching `%s'\n", @@ -354,6 +342,7 @@ NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev) goto unwind; } } + if (strcasecmp(option->key, "name") == 0 || strcasecmp(option->key, "identifier") == 0) { if (idev->identifier) { @@ -366,8 +355,19 @@ NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev) goto unwind; } } + + /* Right now, the only automatic config we know of is HAL. */ + if (strcmp(option->key, "_source") == 0 && + strcmp(option->value, "server/hal") == 0) { + if (!xf86Info.autoAddDevices) { + rval = BadMatch; + goto unwind; + } + + is_auto = 1; + } } - if(!idev->driver || !idev->identifier) { + if (!idev->driver || !idev->identifier) { xf86Msg(X_ERROR, "No input driver/identifier specified (ignoring)\n"); rval = BadRequest; goto unwind; @@ -408,7 +408,10 @@ NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev) dev = pInfo->dev; ActivateDevice(dev); - if (dev->inited && dev->startup) + /* Enable it if it's properly initialised, we're currently in the VT, and + * either it's a manual request, or we're automatically enabling devices. */ + if (dev->inited && dev->startup && xf86Screens[0]->vtSema && + (!is_auto || xf86Info.autoEnableDevices)) EnableDevice(dev); *pdev = dev; diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h index f882b2608..d88bbbeee 100644 --- a/hw/xfree86/common/xf86Xinput.h +++ b/hw/xfree86/common/xf86Xinput.h @@ -1,4 +1,3 @@ -/* $XConsortium: xf86Xinput.h /main/11 1996/10/27 11:05:29 kaleb $ */ /* * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org> * diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index ae33568b8..096b78997 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -28,8 +28,6 @@ /* * This file contains the interfaces to the bus-specific code */ -#define INCLUDE_DEPRECATED 1 - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif @@ -3451,25 +3449,3 @@ pciConvertRange2Host(int entityIndex, resRange *pRange) tag = TAG(pvp); pciTagConvertRange2Host(tag, pRange); } - - -#ifdef INCLUDE_DEPRECATED -_X_EXPORT void -xf86EnablePciBusMaster(pciVideoPtr pPci, Bool enable) -{ - CARD32 temp; - PCITAG tag; - - if (!pPci) return; - - tag = pciTag(pPci->bus, pPci->device, pPci->func); - temp = pciReadLong(tag, PCI_CMD_STAT_REG); - if (enable) { - updateAccessInfoStatusControlInfo(tag, temp | PCI_CMD_MASTER_ENABLE); - pciWriteLong(tag, PCI_CMD_STAT_REG, temp | PCI_CMD_MASTER_ENABLE); - } else { - updateAccessInfoStatusControlInfo(tag, temp & ~PCI_CMD_MASTER_ENABLE); - pciWriteLong(tag, PCI_CMD_STAT_REG, temp & ~PCI_CMD_MASTER_ENABLE); - } -} -#endif /* INCLUDE_DEPRECATED */ diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h index 6e62e52ff..086d2bfc4 100644 --- a/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h @@ -526,7 +526,7 @@ typedef struct _serverlayoutrec { char * id; screenLayoutPtr screens; GDevPtr inactives; - IDevPtr inputs; + IDevPtr* inputs; /* NULL terminated */ pointer options; } serverLayoutRec, *serverLayoutPtr; diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c index 88506f659..d021ec15b 100644 --- a/hw/xfree86/common/xisb.c +++ b/hw/xfree86/common/xisb.c @@ -39,10 +39,6 @@ #include <xorg-config.h> #endif -#ifdef __UNIXOS2__ -#define I_NEED_OS2_H -#endif - #include <misc.h> #include <xf86.h> #include <xf86Version.h> diff --git a/hw/xfree86/common/xisb.h b/hw/xfree86/common/xisb.h index 01ae675c4..b7bdd5682 100644 --- a/hw/xfree86/common/xisb.h +++ b/hw/xfree86/common/xisb.h @@ -24,7 +24,6 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86$ */ #ifndef _xisb_H_ #define _xisb_H_ diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c index 6ff0726d9..67351d3dc 100644 --- a/hw/xfree86/ddc/ddcProperty.c +++ b/hw/xfree86/ddc/ddcProperty.c @@ -87,7 +87,7 @@ addRootWindowProperties(ScrnInfoPtr pScrn, xf86MonPtr DDC) if ((EDID1rawdata = xalloc(128*sizeof(CARD8)))==NULL) return; - EDID1Atom = MakeAtom(EDID1_ATOM_NAME, sizeof(EDID1_ATOM_NAME), TRUE); + EDID1Atom = MakeAtom(EDID1_ATOM_NAME, sizeof(EDID1_ATOM_NAME) - 1, TRUE); memcpy(EDID1rawdata, DDC->rawData, 128); xf86RegisterRootWindowProperty(scrnIndex, EDID1Atom, XA_INTEGER, 8, 128, (unsigned char *)EDID1rawdata); @@ -98,7 +98,7 @@ addRootWindowProperties(ScrnInfoPtr pScrn, xf86MonPtr DDC) return; memcpy(EDID2rawdata, DDC->rawData, 256); - EDID2Atom = MakeAtom(EDID2_ATOM_NAME, sizeof(EDID2_ATOM_NAME), TRUE); + EDID2Atom = MakeAtom(EDID2_ATOM_NAME, sizeof(EDID2_ATOM_NAME) - 1, TRUE); xf86RegisterRootWindowProperty(scrnIndex, EDID2Atom, XA_INTEGER, 8, 256, (unsigned char *)EDID2rawdata); } diff --git a/hw/xfree86/dixmods/extmod/xf86dgaext.h b/hw/xfree86/dixmods/extmod/xf86dgaext.h index 16fc4c8b2..2b1737305 100644 --- a/hw/xfree86/dixmods/extmod/xf86dgaext.h +++ b/hw/xfree86/dixmods/extmod/xf86dgaext.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre index 4103974c1..3ff5776f4 100644 --- a/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/hw/xfree86/doc/man/xorg.conf.man.pre @@ -1131,14 +1131,22 @@ monitor, monitor-specific .BR Options , and information about the video modes to use with the monitor. .PP -With RandR 1.2-enabled drivers, monitor sections are tied to specific outputs -of the video card. -Each output has a name, and the server will look for a Monitor named -.B \*qMonitor-outputname\*q -for configuration of that output (for example, -.B \*qMonitor-VGA\*q +With RandR 1.2-enabled drivers, monitor sections may be tied to specific +outputs of the video card. Using the name of the output defined by the video +driver plus the identifier of a monitor section, one associates a monitor +section with an output by adding an option to the Device section in the +following format: + +.B Option \*qMonitor-outputname\*q \*qmonitorsection\*q + +(for example, +.B Option \*qMonitor-VGA\*q \*qVGA monitor\*q for a VGA output) .PP +In the absence of specific association of monitor sections to outputs, if a +monitor section is present the server will associate it with an output to +preserve compatibility for previous single-head configurations. +.PP Specifying video modes is optional because the server will use the DDC or other information provided by the monitor to automatically configure the list of modes available. @@ -1593,13 +1601,6 @@ Note that disabling an operation will have no effect if the operation is not accelerated (whether due to lack of support in the hardware or in the driver). .TP 7 -.BI "Option \*qBiosLocation\*q \*q" address \*q -Set the location of the BIOS for the Int10 module. One may select a BIOS -of another card for posting or the legacy V_BIOS range located at 0xc0000 -or an alternative address (BUS_ISA). -This is only useful under very special circumstances and should be used with -extreme care. -.TP 7 .BI "Option \*qInitPrimary\*q \*q" boolean \*q Use the Int10 module to initialize the primary graphics card. Normally, only secondary cards are soft-booted using the Int10 module, as the diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index dbc1690f0..80e07c583 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -311,12 +311,8 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD) Bool xineramaInCore = FALSE; DRIEntPrivPtr pDRIEntPriv; ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - - if (DRIGeneration != serverGeneration) { - if ((DRIScreenPrivIndex = AllocateScreenPrivateIndex()) < 0) - return FALSE; - DRIGeneration = serverGeneration; - } + DRIContextFlags flags = 0; + DRIContextPrivPtr pDRIContextPriv; /* If the DRI extension is disabled, do not initialize the DRI */ if (noXFree86DRIExtension) { @@ -347,9 +343,16 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD) pDRIEntPriv = DRI_ENT_PRIV(pScrn); + if (DRIGeneration != serverGeneration) { + if ((DRIScreenPrivIndex = AllocateScreenPrivateIndex()) < 0) + return FALSE; + DRIGeneration = serverGeneration; + } + pDRIPriv = (DRIScreenPrivPtr) xcalloc(1, sizeof(DRIScreenPrivRec)); if (!pDRIPriv) { pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL; + DRIScreenPrivIndex = -1; return FALSE; } @@ -415,23 +418,29 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD) pDRIPriv->hLSAREA = pDRIEntPriv->hLSAREA; pDRIPriv->pLSAREA = pDRIEntPriv->pLSAREA; - if (drmAddMap( pDRIPriv->drmFD, - (drm_handle_t)pDRIPriv->pDriverInfo->frameBufferPhysicalAddress, - pDRIPriv->pDriverInfo->frameBufferSize, - DRM_FRAME_BUFFER, - 0, - &pDRIPriv->hFrameBuffer) < 0) + if (!pDRIPriv->pDriverInfo->dontMapFrameBuffer) { - pDRIPriv->directRenderingSupport = FALSE; - pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL; - drmUnmap(pDRIPriv->pSAREA, pDRIPriv->pDriverInfo->SAREASize); - drmClose(pDRIPriv->drmFD); - DRIDrvMsg(pScreen->myNum, X_INFO, - "[drm] drmAddMap failed\n"); - return FALSE; + if (drmAddMap( pDRIPriv->drmFD, + (drm_handle_t)pDRIPriv->pDriverInfo->frameBufferPhysicalAddress, + pDRIPriv->pDriverInfo->frameBufferSize, + DRM_FRAME_BUFFER, + 0, + &pDRIPriv->pDriverInfo->hFrameBuffer) < 0) + { + pDRIPriv->directRenderingSupport = FALSE; + pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL; + drmUnmap(pDRIPriv->pSAREA, pDRIPriv->pDriverInfo->SAREASize); + drmClose(pDRIPriv->drmFD); + DRIDrvMsg(pScreen->myNum, X_INFO, + "[drm] drmAddMap failed\n"); + return FALSE; + } + DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] framebuffer handle = %p\n", + pDRIPriv->pDriverInfo->hFrameBuffer); + } else { + DRIDrvMsg(pScreen->myNum, X_INFO, + "[drm] framebuffer mapped by ddx driver\n"); } - DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] framebuffer handle = %p\n", - pDRIPriv->hFrameBuffer); if (pDRIEntPriv->resOwner == NULL) { pDRIEntPriv->resOwner = pScreen; @@ -478,21 +487,14 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD) pDRIEntPriv->refCount++; - return TRUE; -} - -Bool -DRIFinishScreenInit(ScreenPtr pScreen) -{ - DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); - DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo; - DRIContextFlags flags = 0; - DRIContextPrivPtr pDRIContextPriv; - - /* Set up flags for DRICreateContextPriv */ + /* Set up flags for DRICreateContextPriv */ switch (pDRIInfo->driverSwapMethod) { - case DRI_KERNEL_SWAP: flags = DRI_CONTEXT_2DONLY; break; - case DRI_HIDE_X_CONTEXT: flags = DRI_CONTEXT_PRESERVED; break; + case DRI_KERNEL_SWAP: + flags = DRI_CONTEXT_2DONLY; + break; + case DRI_HIDE_X_CONTEXT: + flags = DRI_CONTEXT_PRESERVED; + break; } if (!(pDRIContextPriv = DRICreateContextPriv(pScreen, @@ -579,6 +581,15 @@ DRIFinishScreenInit(ScreenPtr pScreen) break; } + return TRUE; +} + +Bool +DRIFinishScreenInit(ScreenPtr pScreen) +{ + DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); + DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo; + /* Wrap DRI support */ if (pDRIInfo->wrap.ValidateTree) { pDRIPriv->wrap.ValidateTree = pScreen->ValidateTree; @@ -592,6 +603,10 @@ DRIFinishScreenInit(ScreenPtr pScreen) pDRIPriv->wrap.WindowExposures = pScreen->WindowExposures; pScreen->WindowExposures = pDRIInfo->wrap.WindowExposures; } + + pDRIPriv->DestroyWindow = pScreen->DestroyWindow; + pScreen->DestroyWindow = DRIDestroyWindow; + if (pDRIInfo->wrap.CopyWindow) { pDRIPriv->wrap.CopyWindow = pScreen->CopyWindow; pScreen->CopyWindow = pDRIInfo->wrap.CopyWindow; @@ -623,7 +638,7 @@ DRICloseScreen(ScreenPtr pScreen) DRIEntPrivPtr pDRIEntPriv = DRI_ENT_PRIV(pScrn); Bool closeMaster; - if (pDRIPriv && pDRIPriv->directRenderingSupport) { + if (pDRIPriv) { pDRIInfo = pDRIPriv->pDriverInfo; @@ -641,6 +656,10 @@ DRICloseScreen(ScreenPtr pScreen) pScreen->WindowExposures = pDRIPriv->wrap.WindowExposures; pDRIPriv->wrap.WindowExposures = NULL; } + if (pDRIPriv->DestroyWindow) { + pScreen->DestroyWindow = pDRIPriv->DestroyWindow; + pDRIPriv->DestroyWindow = NULL; + } if (pDRIInfo->wrap.CopyWindow) { pScreen->CopyWindow = pDRIPriv->wrap.CopyWindow; pDRIPriv->wrap.CopyWindow = NULL; @@ -726,6 +745,7 @@ DRICloseScreen(ScreenPtr pScreen) xfree(pDRIPriv); pScreen->devPrivates[DRIScreenPrivIndex].ptr = NULL; + DRIScreenPrivIndex = -1; } } @@ -1246,8 +1266,8 @@ DRIDecreaseNumberVisible(ScreenPtr pScreen) } Bool -DRICreateDrawable(ScreenPtr pScreen, Drawable id, - DrawablePtr pDrawable, drm_drawable_t * hHWDrawable) +DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable, + drm_drawable_t * hHWDrawable) { DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); DRIDrawablePrivPtr pDRIDrawablePriv; @@ -1289,11 +1309,12 @@ DRICreateDrawable(ScreenPtr pScreen, Drawable id, if (pDRIDrawablePriv->nrects) DRIIncreaseNumberVisible(pScreen); - - /* track this in case this window is destroyed */ - AddResource(id, DRIDrawablePrivResType, (pointer)pWin); } + /* track this in case the client dies */ + AddResource(FakeClientID(client->index), DRIDrawablePrivResType, + (pointer)pDrawable->id); + if (pDRIDrawablePriv->hwDrawable) { drmUpdateDrawableInfo(pDRIPriv->drmFD, pDRIDrawablePriv->hwDrawable, @@ -1311,21 +1332,59 @@ DRICreateDrawable(ScreenPtr pScreen, Drawable id, return TRUE; } -Bool -DRIDestroyDrawable(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable) +static void +DRIDrawablePrivDestroy(WindowPtr pWin) { - DRIDrawablePrivPtr pDRIDrawablePriv; - WindowPtr pWin; + DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin); + ScreenPtr pScreen; + DRIScreenPrivPtr pDRIPriv; + + if (!pDRIDrawablePriv) + return; + + pScreen = pWin->drawable.pScreen; + pDRIPriv = DRI_SCREEN_PRIV(pScreen); + + if (pDRIDrawablePriv->drawableIndex != -1) { + /* bump stamp to force outstanding 3D requests to resync */ + pDRIPriv->pSAREA->drawableTable[pDRIDrawablePriv->drawableIndex].stamp + = DRIDrawableValidationStamp++; + /* release drawable table entry */ + pDRIPriv->DRIDrawables[pDRIDrawablePriv->drawableIndex] = NULL; + } + + pDRIPriv->nrWindows--; + + if (pDRIDrawablePriv->nrects) + DRIDecreaseNumberVisible(pScreen); + + drmDestroyDrawable(pDRIPriv->drmFD, pDRIDrawablePriv->hwDrawable); + xfree(pDRIDrawablePriv); + pWin->devPrivates[DRIWindowPrivIndex].ptr = NULL; +} + +static Bool +DRIDestroyDrawableCB(pointer value, XID id, pointer data) +{ + if (value == data) { + /* This calls back DRIDrawablePrivDelete which frees private area */ + FreeResourceByType(id, DRIDrawablePrivResType, FALSE); + + return TRUE; + } + + return FALSE; +} + +Bool +DRIDestroyDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable) +{ if (pDrawable->type == DRAWABLE_WINDOW) { - pWin = (WindowPtr)pDrawable; - pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin); - pDRIDrawablePriv->refCount--; - if (pDRIDrawablePriv->refCount <= 0) { - /* This calls back DRIDrawablePrivDelete which frees private area */ - FreeResourceByType(id, DRIDrawablePrivResType, FALSE); - } + LookupClientResourceComplex(client, DRIDrawablePrivResType, + DRIDestroyDrawableCB, + (pointer)pDrawable->id); } else { /* pixmap (or for GLX 1.3, a PBuffer) */ /* NOT_DONE */ @@ -1338,43 +1397,26 @@ DRIDestroyDrawable(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable) Bool DRIDrawablePrivDelete(pointer pResource, XID id) { - DrawablePtr pDrawable = (DrawablePtr)pResource; - DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pDrawable->pScreen); - DRIDrawablePrivPtr pDRIDrawablePriv; - WindowPtr pWin; + WindowPtr pWin; - if (pDrawable->type == DRAWABLE_WINDOW) { - pWin = (WindowPtr)pDrawable; - pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin); + id = (XID)pResource; + pWin = LookupIDByType(id, RT_WINDOW); - if (pDRIDrawablePriv->drawableIndex != -1) { - /* bump stamp to force outstanding 3D requests to resync */ - pDRIPriv->pSAREA->drawableTable[pDRIDrawablePriv->drawableIndex].stamp - = DRIDrawableValidationStamp++; + if (pWin) { + DRIDrawablePrivPtr pDRIDrwPriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin); - /* release drawable table entry */ - pDRIPriv->DRIDrawables[pDRIDrawablePriv->drawableIndex] = NULL; - } - - if (drmDestroyDrawable(pDRIPriv->drmFD, - pDRIDrawablePriv->hwDrawable)) { + if (!pDRIDrwPriv) return FALSE; - } - - xfree(pDRIDrawablePriv); - pWin->devPrivates[DRIWindowPrivIndex].ptr = NULL; - pDRIPriv->nrWindows--; + if (--pDRIDrwPriv->refCount == 0) + DRIDrawablePrivDestroy(pWin); - if (REGION_NUM_RECTS(&pWin->clipList)) - DRIDecreaseNumberVisible(pDrawable->pScreen); + return TRUE; } else { /* pixmap (or for GLX 1.3, a PBuffer) */ /* NOT_DONE */ return FALSE; } - - return TRUE; } Bool @@ -1560,7 +1602,7 @@ DRIGetDeviceInfo(ScreenPtr pScreen, { DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); - *hFrameBuffer = pDRIPriv->hFrameBuffer; + *hFrameBuffer = pDRIPriv->pDriverInfo->hFrameBuffer; *fbOrigin = 0; *fbSize = pDRIPriv->pDriverInfo->frameBufferSize; *fbStride = pDRIPriv->pDriverInfo->frameBufferStride; @@ -1882,6 +1924,31 @@ DRITreeTraversal(WindowPtr pWin, pointer data) return WT_WALKCHILDREN; } +Bool +DRIDestroyWindow(WindowPtr pWin) +{ + ScreenPtr pScreen = pWin->drawable.pScreen; + DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); + Bool retval = TRUE; + + DRIDrawablePrivDestroy(pWin); + + /* call lower wrapped functions */ + if(pDRIPriv->DestroyWindow) { + /* unwrap */ + pScreen->DestroyWindow = pDRIPriv->DestroyWindow; + + /* call lower layers */ + retval = (*pScreen->DestroyWindow)(pWin); + + /* rewrap */ + pDRIPriv->DestroyWindow = pScreen->DestroyWindow; + pScreen->DestroyWindow = DRIDestroyWindow; + } + + return retval; +} + void DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) { diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h index e49bb6fa0..98e8b75be 100644 --- a/hw/xfree86/dri/dri.h +++ b/hw/xfree86/dri/dri.h @@ -107,7 +107,7 @@ typedef struct { */ #define DRIINFO_MAJOR_VERSION 5 -#define DRIINFO_MINOR_VERSION 3 +#define DRIINFO_MINOR_VERSION 4 #define DRIINFO_PATCH_VERSION 0 typedef unsigned long long (*DRITexOffsetStartProcPtr)(PixmapPtr pPix); @@ -187,6 +187,12 @@ typedef struct { /* New with DRI version 5.3.0 */ DRITexOffsetStartProcPtr texOffsetStart; DRITexOffsetFinishProcPtr texOffsetFinish; + + /* New with DRI version 5.4.0 */ + int dontMapFrameBuffer; + drm_handle_t hFrameBuffer; /* Handle to framebuffer, either + * mapped by DDX driver or DRI */ + } DRIInfoRec, *DRIInfoPtr; @@ -231,12 +237,12 @@ extern Bool DRIDestroyContext(ScreenPtr pScreen, XID context); extern Bool DRIContextPrivDelete(pointer pResource, XID id); extern Bool DRICreateDrawable(ScreenPtr pScreen, - Drawable id, + ClientPtr client, DrawablePtr pDrawable, drm_drawable_t * hHWDrawable); extern Bool DRIDestroyDrawable(ScreenPtr pScreen, - Drawable id, + ClientPtr client, DrawablePtr pDrawable); extern Bool DRIDrawablePrivDelete(pointer pResource, @@ -299,6 +305,8 @@ extern void DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg); +extern Bool DRIDestroyWindow(WindowPtr pWin); + extern void DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc); diff --git a/hw/xfree86/dri/dristruct.h b/hw/xfree86/dri/dristruct.h index a3bac8556..c3b0aeede 100644 --- a/hw/xfree86/dri/dristruct.h +++ b/hw/xfree86/dri/dristruct.h @@ -85,7 +85,6 @@ typedef struct _DRIScreenPrivRec int drmFD; /* File descriptor for /dev/video/? */ drm_handle_t hSAREA; /* Handle to SAREA, for mapping */ XF86DRISAREAPtr pSAREA; /* Mapped pointer to SAREA */ - drm_handle_t hFrameBuffer; /* Handle to framebuffer, for mapping */ drm_context_t myContext; /* DDX Driver's context */ DRIContextPrivPtr myContextPriv;/* Pointer to server's private area */ DRIContextPrivPtr lastPartial3DContext; /* last one partially saved */ @@ -99,6 +98,7 @@ typedef struct _DRIScreenPrivRec DrawablePtr fullscreen; /* pointer to fullscreen drawable */ drm_clip_rect_t fullscreen_rect; /* fake rect for fullscreen mode */ DRIWrappedFuncsRec wrap; + DestroyWindowProcPtr DestroyWindow; DrawablePtr DRIDrawables[SAREA_MAX_DRAWABLES]; DRIContextPrivPtr dummyCtxPriv; /* Pointer to dummy context */ Bool createDummyCtx; diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index 9690e8895..fdf0e9983 100644 --- a/hw/xfree86/dri/xf86dri.c +++ b/hw/xfree86/dri/xf86dri.c @@ -404,10 +404,8 @@ ProcXF86DRICreateDrawable( if (rc != Success) return rc; - if (!DRICreateDrawable( screenInfo.screens[stuff->screen], - (Drawable)stuff->drawable, - pDrawable, - (drm_drawable_t *)&rep.hHWDrawable)) { + if (!DRICreateDrawable(screenInfo.screens[stuff->screen], client, + pDrawable, (drm_drawable_t *)&rep.hHWDrawable)) { return BadValue; } @@ -435,9 +433,8 @@ ProcXF86DRIDestroyDrawable( if (rc != Success) return rc; - if (!DRIDestroyDrawable( screenInfo.screens[stuff->screen], - (Drawable)stuff->drawable, - pDrawable)) { + if (!DRIDestroyDrawable(screenInfo.screens[stuff->screen], client, + pDrawable)) { return BadValue; } diff --git a/hw/xfree86/dummylib/fatalerror.c b/hw/xfree86/dummylib/fatalerror.c index c66ee3329..e147c7303 100644 --- a/hw/xfree86/dummylib/fatalerror.c +++ b/hw/xfree86/dummylib/fatalerror.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/dummylib/pcitestmulti.c b/hw/xfree86/dummylib/pcitestmulti.c index 43e417560..65288d81b 100644 --- a/hw/xfree86/dummylib/pcitestmulti.c +++ b/hw/xfree86/dummylib/pcitestmulti.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/dummylib/verrorf.c b/hw/xfree86/dummylib/verrorf.c index ae692bdc6..c75d1bc6d 100644 --- a/hw/xfree86/dummylib/verrorf.c +++ b/hw/xfree86/dummylib/verrorf.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/dummylib/xf86allocscripi.c b/hw/xfree86/dummylib/xf86allocscripi.c index 8abad9fa5..926884884 100644 --- a/hw/xfree86/dummylib/xf86allocscripi.c +++ b/hw/xfree86/dummylib/xf86allocscripi.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/dummylib/xf86getpagesize.c b/hw/xfree86/dummylib/xf86getpagesize.c index ec13c9b41..8859c7673 100644 --- a/hw/xfree86/dummylib/xf86getpagesize.c +++ b/hw/xfree86/dummylib/xf86getpagesize.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/dummylib/xf86getverb.c b/hw/xfree86/dummylib/xf86getverb.c index dae6c68d7..a489e9ca3 100644 --- a/hw/xfree86/dummylib/xf86getverb.c +++ b/hw/xfree86/dummylib/xf86getverb.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/dummylib/xf86info.c b/hw/xfree86/dummylib/xf86info.c index bfbda9e18..221a9d2bb 100644 --- a/hw/xfree86/dummylib/xf86info.c +++ b/hw/xfree86/dummylib/xf86info.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/dummylib/xf86screens.c b/hw/xfree86/dummylib/xf86screens.c index 32a35ef91..6288c60dc 100644 --- a/hw/xfree86/dummylib/xf86screens.c +++ b/hw/xfree86/dummylib/xf86screens.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/dummylib/xf86servisinit.c b/hw/xfree86/dummylib/xf86servisinit.c index f65bf1e9c..c356a2b88 100644 --- a/hw/xfree86/dummylib/xf86servisinit.c +++ b/hw/xfree86/dummylib/xf86servisinit.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/dummylib/xf86verbose.c b/hw/xfree86/dummylib/xf86verbose.c index 0d31cb153..c4a45d68e 100644 --- a/hw/xfree86/dummylib/xf86verbose.c +++ b/hw/xfree86/dummylib/xf86verbose.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/i2c/uda1380.c b/hw/xfree86/i2c/uda1380.c index a30675083..defda3cdc 100644 --- a/hw/xfree86/i2c/uda1380.c +++ b/hw/xfree86/i2c/uda1380.c @@ -1,6 +1,4 @@ /************************************************************************************* - * $Id$ - * * Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net * * Permission is hereby granted, free of charge, to any person obtaining a copy of this diff --git a/hw/xfree86/i2c/uda1380.h b/hw/xfree86/i2c/uda1380.h index 95ad92b92..e671d66f8 100644 --- a/hw/xfree86/i2c/uda1380.h +++ b/hw/xfree86/i2c/uda1380.h @@ -1,6 +1,4 @@ /************************************************************************************* - * $Id$ - * * Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net * * Permission is hereby granted, free of charge, to any person obtaining a copy of this @@ -22,7 +20,6 @@ * otherwise to promote the sale, use or other dealings in this Software without prior written * authorization from the author. * - * $Log$ * Revision 1.3 2005/09/24 21:56:00 bogdand * Changed the license to a X/MIT one * diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c index d86372780..aa240ca97 100644 --- a/hw/xfree86/int10/generic.c +++ b/hw/xfree86/int10/generic.c @@ -71,8 +71,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) pciVideoPtr pvp; int screen; legacyVGARec vga; - xf86int10BiosLocation bios; - + #ifdef _PC int size; CARD32 cs; @@ -131,14 +130,9 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) #endif INTPriv(pInt)->highMemory = V_BIOS; - xf86int10ParseBiosLocation(options,&bios); - - if (xf86IsEntityPrimary(entityIndex) - && !(initPrimary(options))) { - if (! xf86int10GetBiosSegment(pInt, &bios, - (unsigned char *)sysMem - V_BIOS)) { + if (xf86IsEntityPrimary(entityIndex) && !(initPrimary(options))) { + if (!xf86int10GetBiosSegment(pInt, (unsigned char *)sysMem - V_BIOS)) goto error1; - } set_return_trap(pInt); @@ -148,8 +142,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) xf86Int10SaveRestoreBIOSVars(pInt, TRUE); } else { - const BusType location_type = xf86int10GetBiosLocationType(pInt, - &bios); + const BusType location_type = xf86int10GetBiosLocationType(pInt); int bios_location = V_BIOS; reset_int_vect(pInt); @@ -157,11 +150,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) switch (location_type) { case BUS_PCI: { - const int pci_entity = (bios.bus == BUS_PCI) - ? xf86GetPciEntity(bios.location.pci.bus, - bios.location.pci.dev, - bios.location.pci.func) - : pInt->entityIndex; + const int pci_entity = pInt->entityIndex; vbiosMem = (unsigned char *)base + bios_location; if (!(size = mapPciRom(pci_entity,(unsigned char *)(vbiosMem)))) { @@ -172,9 +161,6 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) break; } case BUS_ISA: - if (bios.bus == BUS_ISA) { - bios_location = bios.location.legacy; - } vbiosMem = (unsigned char *)sysMem + bios_location; #if 0 (void)memset(vbiosMem, 0, V_BIOS_SIZE); @@ -228,48 +214,24 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) * If this adapter is the primary, use its post-init BIOS (if we can find * it). */ - xf86int10ParseBiosLocation(options,&bios); - { int bios_location = V_BIOS; Bool done = FALSE; vbiosMem = (unsigned char *)base + bios_location; - if ((bios.bus == BUS_ISA) - || (bios.bus != BUS_PCI && xf86IsEntityPrimary(entityIndex))) { - if (bios.bus == BUS_ISA && bios.location.legacy) { - xf86DrvMsg(screen, X_CONFIG,"Looking for legacy V_BIOS " - "at 0x%x for %sprimary device\n", - bios.location.legacy, - xf86IsEntityPrimary(entityIndex) ? "" : "non-"); - bios_location = bios.location.legacy; - vbiosMem = (unsigned char *)base + bios_location; - } - if (int10_check_bios(screen, bios_location >> 4, vbiosMem)) - done = TRUE; - else - xf86DrvMsg(screen,X_INFO, - "No legacy BIOS found -- trying PCI\n"); + if (xf86IsEntityPrimary(entityIndex)) { + if (int10_check_bios(screen, bios_location >> 4, vbiosMem)) + done = TRUE; + else + xf86DrvMsg(screen,X_INFO, + "No legacy BIOS found -- trying PCI\n"); } if (!done) { - int pci_entity; - - if (bios.bus == BUS_PCI) { - xf86DrvMsg(screen,X_CONFIG,"Looking for BIOS at PCI:%i%i%i\n", - bios.location.pci.bus,bios.location.pci.dev, - bios.location.pci.func); - pci_entity = xf86GetPciEntity(bios.location.pci.bus, - bios.location.pci.dev, - bios.location.pci.func); - } else - pci_entity = pInt->entityIndex; - - if (!mapPciRom(pci_entity, vbiosMem)) { + if (!mapPciRom(pInt->entityIndex, vbiosMem)) { xf86DrvMsg(screen, X_ERROR, "Cannot read V_BIOS (5)\n"); goto error1; } } - } pInt->BIOSseg = V_BIOS >> 4; diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index d80de89cc..a41965db9 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -8,7 +8,7 @@ */ /* - * To debug port accesses define PRINT_PORT. + * To debug port accesses define PRINT_PORT to 1. * Note! You also have to comment out ioperm() * in xf86EnableIO(). Otherwise we won't trap * on PIO. @@ -18,6 +18,8 @@ #include <xorg-config.h> #endif +#define PRINT_PORT 0 + #include <unistd.h> #include <X11/Xos.h> @@ -27,6 +29,9 @@ #define _INT10_PRIVATE #include "int10Defines.h" #include "xf86int10.h" +#ifdef _X86EMU +#include "x86emu/x86emui.h" +#endif static int pciCfg1in(CARD16 addr, CARD32 *val); static int pciCfg1out(CARD16 addr, CARD32 val); @@ -40,6 +45,8 @@ static void SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set); #define REG pInt +static int pci_config_cycle = 0; + int setup_int(xf86Int10InfoPtr pInt) { @@ -209,10 +216,9 @@ port_rep_inb(xf86Int10InfoPtr pInt, { register int inc = d_f ? -1 : 1; CARD32 dst = base; -#ifdef PRINT_PORT - ErrorF(" rep_insb(%#x) %d bytes at %p %s\n", - port, count, base, d_f ? "up" : "down"); -#endif + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" rep_insb(%#x) %d bytes at %8.8x %s\n", + port, count, base, d_f ? "up" : "down"); while (count--) { MEM_WB(pInt, dst, x_inb(port)); dst += inc; @@ -226,10 +232,9 @@ port_rep_inw(xf86Int10InfoPtr pInt, { register int inc = d_f ? -2 : 2; CARD32 dst = base; -#ifdef PRINT_PORT - ErrorF(" rep_insw(%#x) %d bytes at %p %s\n", + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" rep_insw(%#x) %d bytes at %8.8x %s\n", port, count, base, d_f ? "up" : "down"); -#endif while (count--) { MEM_WW(pInt, dst, x_inw(port)); dst += inc; @@ -243,10 +248,9 @@ port_rep_inl(xf86Int10InfoPtr pInt, { register int inc = d_f ? -4 : 4; CARD32 dst = base; -#ifdef PRINT_PORT - ErrorF(" rep_insl(%#x) %d bytes at %p %s\n", + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" rep_insl(%#x) %d bytes at %8.8x %s\n", port, count, base, d_f ? "up" : "down"); -#endif while (count--) { MEM_WL(pInt, dst, x_inl(port)); dst += inc; @@ -260,10 +264,9 @@ port_rep_outb(xf86Int10InfoPtr pInt, { register int inc = d_f ? -1 : 1; CARD32 dst = base; -#ifdef PRINT_PORT - ErrorF(" rep_outb(%#x) %d bytes at %p %s\n", + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" rep_outb(%#x) %d bytes at %8.8x %s\n", port, count, base, d_f ? "up" : "down"); -#endif while (count--) { x_outb(port, MEM_RB(pInt, dst)); dst += inc; @@ -277,10 +280,9 @@ port_rep_outw(xf86Int10InfoPtr pInt, { register int inc = d_f ? -2 : 2; CARD32 dst = base; -#ifdef PRINT_PORT - ErrorF(" rep_outw(%#x) %d bytes at %p %s\n", + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" rep_outw(%#x) %d bytes at %8.8x %s\n", port, count, base, d_f ? "up" : "down"); -#endif while (count--) { x_outw(port, MEM_RW(pInt, dst)); dst += inc; @@ -294,10 +296,9 @@ port_rep_outl(xf86Int10InfoPtr pInt, { register int inc = d_f ? -4 : 4; CARD32 dst = base; -#ifdef PRINT_PORT - ErrorF(" rep_outl(%#x) %d bytes at %p %s\n", + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" rep_outl(%#x) %d bytes at %8.8x %s\n", port, count, base, d_f ? "up" : "down"); -#endif while (count--) { x_outl(port, MEM_RL(pInt, dst)); dst += inc; @@ -314,9 +315,8 @@ x_inb(CARD16 port) Int10Current->inb40time++; val = (CARD8)(Int10Current->inb40time >> ((Int10Current->inb40time & 1) << 3)); -#ifdef PRINT_PORT - ErrorF(" inb(%#x) = %2.2x\n", port, val); -#endif + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" inb(%#x) = %2.2x\n", port, val); #ifdef __NOT_YET__ } else if (port < 0x0100) { /* Don't interfere with mainboard */ val = 0; @@ -327,12 +327,10 @@ x_inb(CARD16 port) stack_trace(Int10Current); } #endif /* __NOT_YET__ */ - } else { - if (!pciCfg1inb(port, &val)) - val = inb(Int10Current->ioBase + port); -#ifdef PRINT_PORT - ErrorF(" inb(%#x) = %2.2x\n", port, val); -#endif + } else if (!pciCfg1inb(port, &val)) { + val = inb(Int10Current->ioBase + port); + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" inb(%#x) = %2.2x\n", port, val); } return val; } @@ -351,13 +349,11 @@ x_inw(CARD16 port) */ X_GETTIMEOFDAY(&tv); val = (CARD16)(tv.tv_usec / 3); - } else { - if (!pciCfg1inw(port, &val)) - val = inw(Int10Current->ioBase + port); + } else if (!pciCfg1inw(port, &val)) { + val = inw(Int10Current->ioBase + port); + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" inw(%#x) = %4.4x\n", port, val); } -#ifdef PRINT_PORT - ErrorF(" inw(%#x) = %4.4x\n", port, val); -#endif return val; } @@ -374,9 +370,8 @@ x_outb(CARD16 port, CARD8 val) */ X_GETTIMEOFDAY(&tv); Int10Current->inb40time = (CARD16)(tv.tv_usec | 1); -#ifdef PRINT_PORT - ErrorF(" outb(%#x, %2.2x)\n", port, val); -#endif + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" outb(%#x, %2.2x)\n", port, val); #ifdef __NOT_YET__ } else if (port < 0x0100) { /* Don't interfere with mainboard */ xf86DrvMsgVerb(Int10Current->scrnIndex, X_NOT_IMPLEMENTED, 2, @@ -386,24 +381,22 @@ x_outb(CARD16 port, CARD8 val) stack_trace(Int10Current); } #endif /* __NOT_YET__ */ - } else { -#ifdef PRINT_PORT - ErrorF(" outb(%#x, %2.2x)\n", port, val); -#endif - if (!pciCfg1outb(port, val)) - outb(Int10Current->ioBase + port, val); + } else if (!pciCfg1outb(port, val)) { + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" outb(%#x, %2.2x)\n", port, val); + outb(Int10Current->ioBase + port, val); } } void x_outw(CARD16 port, CARD16 val) { -#ifdef PRINT_PORT - ErrorF(" outw(%#x, %4.4x)\n", port, val); -#endif - if (!pciCfg1outw(port, val)) + if (!pciCfg1outw(port, val)) { + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" outw(%#x, %4.4x)\n", port, val); outw(Int10Current->ioBase + port, val); + } } CARD32 @@ -411,24 +404,22 @@ x_inl(CARD16 port) { CARD32 val; - if (!pciCfg1in(port, &val)) + if (!pciCfg1in(port, &val)) { val = inl(Int10Current->ioBase + port); - -#ifdef PRINT_PORT - ErrorF(" inl(%#x) = %8.8x\n", port, val); -#endif + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" inl(%#x) = %8.8x\n", port, val); + } return val; } void x_outl(CARD16 port, CARD32 val) { -#ifdef PRINT_PORT - ErrorF(" outl(%#x, %8.8x)\n", port, val); -#endif - - if (!pciCfg1out(port, val)) + if (!pciCfg1out(port, val)) { + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" outl(%#x, %8.8x)\n", port, val); outl(Int10Current->ioBase + port, val); + } } CARD8 @@ -480,6 +471,8 @@ pciCfg1in(CARD16 addr, CARD32 *val) } if (addr == 0xCFC) { *val = pciReadLong(Int10Current->Tag, OFFSET(PciCfg1Addr)); + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" cfg_inl(%#x) = %8.8x\n", PciCfg1Addr, *val); return 1; } return 0; @@ -493,6 +486,8 @@ pciCfg1out(CARD16 addr, CARD32 val) return 1; } if (addr == 0xCFC) { + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" cfg_outl(%#x, %8.8x)\n", PciCfg1Addr, val); pciWriteLong(Int10Current->Tag, OFFSET(PciCfg1Addr), val); return 1; } @@ -512,6 +507,8 @@ pciCfg1inw(CARD16 addr, CARD16 *val) if ((addr >= 0xCFC) && (addr <= 0xCFF)) { offset = addr - 0xCFC; *val = pciReadWord(Int10Current->Tag, OFFSET(PciCfg1Addr) + offset); + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" cfg_inw(%#x) = %4.4x\n", PciCfg1Addr + offset, *val); return 1; } return 0; @@ -530,6 +527,8 @@ pciCfg1outw(CARD16 addr, CARD16 val) } if ((addr >= 0xCFC) && (addr <= 0xCFF)) { offset = addr - 0xCFC; + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" cfg_outw(%#x, %4.4x)\n", PciCfg1Addr + offset, val); pciWriteWord(Int10Current->Tag, OFFSET(PciCfg1Addr) + offset, val); return 1; } @@ -549,6 +548,8 @@ pciCfg1inb(CARD16 addr, CARD8 *val) if ((addr >= 0xCFC) && (addr <= 0xCFF)) { offset = addr - 0xCFC; *val = pciReadByte(Int10Current->Tag, OFFSET(PciCfg1Addr) + offset); + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" cfg_inb(%#x) = %2.2x\n", PciCfg1Addr + offset, *val); return 1; } return 0; @@ -567,6 +568,8 @@ pciCfg1outb(CARD16 addr, CARD8 val) } if ((addr >= 0xCFC) && (addr <= 0xCFF)) { offset = addr - 0xCFC; + if (PRINT_PORT && DEBUG_IO_TRACE()) + ErrorF(" cfg_outb(%#x, %2.2x)\n", PciCfg1Addr + offset, val); pciWriteByte(Int10Current->Tag, OFFSET(PciCfg1Addr) + offset, val); return 1; } diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c index c62377ca8..b59f47358 100644 --- a/hw/xfree86/int10/helper_mem.c +++ b/hw/xfree86/int10/helper_mem.c @@ -25,13 +25,11 @@ typedef enum { OPT_NOINT10, OPT_INIT_PRIMARY, - OPT_BIOS_LOCATION } INT10Opts; static const OptionInfoRec INT10Options[] = { {OPT_NOINT10, "NoINT10", OPTV_BOOLEAN, {0}, FALSE }, {OPT_INIT_PRIMARY, "InitPrimary", OPTV_BOOLEAN, {0}, FALSE }, - {OPT_BIOS_LOCATION, "BiosLocation", OPTV_STRING, {0}, FALSE }, { -1, NULL, OPTV_NONE, {0}, FALSE }, }; @@ -271,92 +269,14 @@ initPrimary(const void* options) return initPrimary; } -/* - * xf86int10ParseBiosLocation(): allows to set the location of the - * BIOS. One may select a BIOS of another card for posting or the - * legacy V_BIOS range located at 0xc0000 or an alternative address - * (BUS_ISA). - * This is only useful under very special circumstances and should - * be used with extreme care. - */ -void -xf86int10ParseBiosLocation(const void* options, - xf86int10BiosLocationPtr bios) -{ - const char *p; - const char *str; - - bios->bus = BUS_NONE; - - if ((options == NULL) - || ((str = xf86GetOptValString(options, OPT_BIOS_LOCATION)) == NULL)) { - return; - } - - if (strncasecmp(str, "pci", 3) == 0) { - bios->bus = BUS_PCI; - } else if (strncasecmp(str, "primary", 7) == 0) { - bios->bus = BUS_ISA; - } - else { - return; - } - - p = strchr(str, ':'); - - switch (bios->bus) { - case BUS_ISA: - bios->location.legacy = (p != NULL) ? atoi(++p) : 0; - break; - case BUS_PCI: - if (p) { - bios->location.pci.bus = atoi(++p); - if ((p = strchr(p, ':'))) { - bios->location.pci.dev = atoi(++p); - if ((p = strchr(p, ':'))) { - bios->location.pci.func = atoi(++p); - break; - } - } - } - /* fall through */ - bios->bus = BUS_NONE; - break; - default: - break; - } -} - - BusType -xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt, - const xf86int10BiosLocationPtr bios) +xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt) { - BusType location_type = bios->bus; - - switch (location_type) { - case BUS_PCI: - xf86DrvMsg(pInt->scrnIndex,X_CONFIG,"Overriding bios location: " - "PCI:%i:%i%i\n",bios->location.pci.bus, - bios->location.pci.dev,bios->location.pci.func); - break; - case BUS_ISA: - if (bios->location.legacy) - xf86DrvMsg(pInt->scrnIndex,X_CONFIG,"Overriding bios location: " - "Legacy:0x%x\n",bios->location.legacy); - else - xf86DrvMsg(pInt->scrnIndex,X_CONFIG,"Overriding bios location: " - "Legacy\n"); - break; - case BUS_NONE: { - EntityInfoPtr pEnt = xf86GetEntityInfo(pInt->entityIndex); - location_type = pEnt->location.type; - xfree(pEnt); - break; - } - default: - break; - } + BusType location_type; + + EntityInfoPtr pEnt = xf86GetEntityInfo(pInt->entityIndex); + location_type = pEnt->location.type; + xfree(pEnt); return location_type; } @@ -371,40 +291,19 @@ xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt, } Bool -xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, - const xf86int10BiosLocationPtr bios, void * base) +xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, void *base) { unsigned i; int cs = ~0; int segments[4]; const char * format; + segments[0] = MEM_RW(pInt, (0x10 << 2) + 2); + segments[1] = MEM_RW(pInt, (0x42 << 2) + 2); + segments[2] = V_BIOS >> 4; + segments[3] = ~0; - if (bios->bus == BUS_ISA && bios->location.legacy) { - xf86DrvMsg(pInt->scrnIndex, X_CONFIG, - "Overriding BIOS location: 0x%x\n", - bios->location.legacy); - - segments[0] = bios->location.legacy >> 4; - segments[1] = ~0; - - format = "No V_BIOS at specified address 0x%lx\n"; - } else { - if (bios->bus == BUS_PCI) { - xf86DrvMsg(pInt->scrnIndex, X_WARNING, - "Option BiosLocation for primary device ignored: " - "It points to PCI.\n"); - xf86DrvMsg(pInt->scrnIndex, X_WARNING, - "You must set Option InitPrimary also\n"); - } - - segments[0] = MEM_RW(pInt, (0x10 << 2) + 2); - segments[1] = MEM_RW(pInt, (0x42 << 2) + 2); - segments[2] = V_BIOS >> 4; - segments[3] = ~0; - - format = "No V_BIOS found\n"; - } + format = "No V_BIOS found\n"; for (i = 0; segments[i] != ~0; i++) { unsigned char * vbiosMem; @@ -424,7 +323,7 @@ xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, } xf86DrvMsg(pInt->scrnIndex, X_INFO, "Primary V_BIOS segment is: 0x%lx\n", - (unsigned long)cs); + (unsigned long)cs); pInt->BIOSseg = cs; return TRUE; diff --git a/hw/xfree86/int10/xf86int10.h b/hw/xfree86/int10/xf86int10.h index ec4fbd67f..04838f1f6 100644 --- a/hw/xfree86/int10/xf86int10.h +++ b/hw/xfree86/int10/xf86int10.h @@ -59,18 +59,6 @@ typedef struct { CARD8 save_vse; CARD8 save_46e8; } legacyVGARec, *legacyVGAPtr; - -typedef struct { - BusType bus; - union { - struct { - int bus; - int dev; - int func; - } pci; - int legacy; - } location; -} xf86int10BiosLocation, *xf86int10BiosLocationPtr; /* OS dependent functions */ xf86Int10InfoPtr xf86InitInt10(int entityIndex); @@ -185,12 +173,8 @@ Bool int10skip(const void* options); Bool int10_check_bios(int scrnIndex, int codeSeg, const unsigned char* vbiosMem); Bool initPrimary(const void* options); -void xf86int10ParseBiosLocation(const void* options, - xf86int10BiosLocationPtr bios); -BusType xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt, - const xf86int10BiosLocationPtr bios); -Bool xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, - const xf86int10BiosLocationPtr bios, void * base); +BusType xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt); +Bool xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, void *base); #ifdef DEBUG void dprint(unsigned long start, unsigned long size); #endif diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index 6a1c65e4a..1b5c717fd 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -118,12 +118,7 @@ static char **defaultPathList = NULL; static Bool PathIsAbsolute(const char *path) { -#ifdef __UNIXOS2__ - return (*path == '/' || (strlen(path) > 2 && isalpha(elem[0]) && - elem[1] == ':' && elem[2] == '/')); -#else return (*path == '/'); -#endif } /* @@ -869,7 +864,7 @@ doLoadModule(const char *module, const char *path, const char **subdirlist, for (cim = compiled_in_modules; *cim; cim++) if (!strcmp (module, *cim)) { - xf86MsgVerb(X_INFO, 0, "Module already built-in\n"); + xf86MsgVerb(X_INFO, 0, "Module \"%s\" already built-in\n", module); return (ModuleDescPtr) 1; } diff --git a/hw/xfree86/loader/os.c b/hw/xfree86/loader/os.c index 83fd24787..fdddce898 100644 --- a/hw/xfree86/loader/os.c +++ b/hw/xfree86/loader/os.c @@ -62,8 +62,6 @@ #define OSNAME "svr5" #elif defined(SVR4) #define OSNAME "svr4" -#elif defined(__UNIXOS2__) -#define OSNAME "os2" #else #define OSNAME "unknown" #endif diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c index b4ae42f74..d925bedc0 100644 --- a/hw/xfree86/loader/xf86sym.c +++ b/hw/xfree86/loader/xf86sym.c @@ -46,8 +46,6 @@ * authorization from the copyright holder(s) and author(s). */ -#define INCLUDE_DEPRECATED 1 - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif @@ -150,9 +148,7 @@ extern void _Qp_uitoq(unsigned int *, unsigned int); #endif #if defined(__GNUC__) -#ifndef __UNIXOS2__ extern long __div64(long, long); -#endif extern long __divdf3(long, long); extern long __divdi3(long, long); extern long __divsf3(long, long); @@ -160,9 +156,7 @@ extern long __divsi3(long, long); extern long __moddi3(long, long); extern long __modsi3(long, long); -#ifndef __UNIXOS2__ extern long __mul64(long, long); -#endif extern long __muldf3(long, long); extern long __muldi3(long, long); extern long __mulsf3(long, long); @@ -172,18 +166,14 @@ extern long __udivsi3(long, long); extern long __umoddi3(long, long); extern long __umodsi3(long, long); -#ifndef __UNIXOS2__ #pragma weak __div64 -#endif #pragma weak __divdf3 #pragma weak __divdi3 #pragma weak __divsf3 #pragma weak __divsi3 #pragma weak __moddi3 #pragma weak __modsi3 -#ifndef __UNIXOS2__ #pragma weak __mul64 -#endif #pragma weak __muldf3 #pragma weak __muldi3 #pragma weak __mulsf3 @@ -358,9 +348,6 @@ _X_HIDDEN void *xfree86LookupTab[] = { SYMFUNC(xf86FindScreenForEntity) SYMFUNC(xf86FindPciDeviceVendor) SYMFUNC(xf86FindPciClass) -#ifdef INCLUDE_DEPRECATED - SYMFUNC(xf86EnablePciBusMaster) -#endif SYMFUNC(xf86RegisterStateChangeNotificationCallback) SYMFUNC(xf86DeregisterStateChangeNotificationCallback) SYMFUNC(xf86NoSharedResources) @@ -719,15 +706,6 @@ _X_HIDDEN void *xfree86LookupTab[] = { SYMFUNC(DPMSSet) SYMFUNC(DPMSSupported) #endif -/* xf86Debug.c */ -#ifdef BUILDDEBUG - SYMFUNC(xf86Break1) - SYMFUNC(xf86Break2) - SYMFUNC(xf86Break3) - SYMFUNC(xf86SPTimestamp) - SYMFUNC(xf86STimestamp) -#endif - SYMFUNC(pciFindFirst) SYMFUNC(pciFindNext) SYMFUNC(pciWriteByte) @@ -1066,7 +1044,7 @@ _X_HIDDEN void *xfree86LookupTab[] = { # endif #endif #if defined(__GNUC__) -#if !defined(__UNIXOS2__) && !defined(Lynx) +#if !defined(Lynx) SYMFUNC(__div64) #endif #if !defined(Lynx) /* FIXME: test on others than x86 and !3.1.0a/x86 */ @@ -1081,7 +1059,7 @@ _X_HIDDEN void *xfree86LookupTab[] = { #if !defined(Lynx) SYMFUNC(__modsi3) #endif -#if !defined(__UNIXOS2__) && !defined(Lynx) +#if !defined(Lynx) SYMFUNC(__mul64) #endif #if !defined(Lynx) @@ -1140,13 +1118,6 @@ _X_HIDDEN void *xfree86LookupTab[] = { SYMVAR(xf86Screens) SYMVAR(byte_reversed) SYMVAR(xf86inSuspend) - /* debugging variables */ -#ifdef BUILDDEBUG - SYMVAR(xf86p8bit) - SYMVAR(xf86DummyVar1) - SYMVAR(xf86DummyVar2) - SYMVAR(xf86DummyVar3) -#endif /* predefined resource lists from xf86Bus.h */ SYMVAR(resVgaExclusive) diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index d20a3a338..170c92176 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -676,7 +676,8 @@ xf86CrtcScreenInit (ScreenPtr screen) } if (c == config->num_crtc) xf86RandR12SetRotations (screen, RR_Rotate_0 | RR_Rotate_90 | - RR_Rotate_180 | RR_Rotate_270); + RR_Rotate_180 | RR_Rotate_270 | + RR_Reflect_X | RR_Reflect_Y); else xf86RandR12SetRotations (screen, RR_Rotate_0); @@ -1253,7 +1254,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) */ output->status = (*output->funcs->detect)(output); - if (!xf86OutputEnabled (output)) + if (output->status == XF86OutputStatusDisconnected) { xf86OutputSetEDID (output, NULL); continue; @@ -1413,8 +1414,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) output->probed_modes = mode; } mode->type |= M_T_PREFERRED; - break; } + else + mode->type &= ~M_T_PREFERRED; } } @@ -2030,7 +2032,7 @@ xf86DisableUnusedFunctions(ScrnInfoPtr pScrn) static void xf86OutputSetEDIDProperty (xf86OutputPtr output, void *data, int data_len) { - Atom edid_atom = MakeAtom(EDID_ATOM_NAME, sizeof(EDID_ATOM_NAME), TRUE); + Atom edid_atom = MakeAtom(EDID_ATOM_NAME, sizeof(EDID_ATOM_NAME) - 1, TRUE); /* This may get called before the RandR resources have been created */ if (output->randr_output == NULL) diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h index 2d6260030..a4e8ea388 100644 --- a/hw/xfree86/modes/xf86Crtc.h +++ b/hw/xfree86/modes/xf86Crtc.h @@ -30,6 +30,7 @@ #include "xf86Modes.h" #include "xf86Cursor.h" #include "damage.h" +#include "picturestr.h" /* Compat definitions for older X Servers. */ #ifndef M_T_PREFERRED @@ -279,6 +280,17 @@ struct _xf86Crtc { * Track state of cursor associated with this CRTC */ Bool cursor_shown; + + /** + * Current transformation matrix + */ + PictTransform crtc_to_framebuffer; + PictTransform framebuffer_to_crtc; + Bool transform_in_use; + /** + * Bounding box in screen space + */ + BoxRec bounds; }; typedef struct _xf86OutputFuncs { diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c index 009cccf89..396bf3091 100644 --- a/hw/xfree86/modes/xf86Cursors.c +++ b/hw/xfree86/modes/xf86Cursors.c @@ -58,29 +58,73 @@ xf86_crtc_rotate_coord (Rotation rotation, int *x_src, int *y_src) { + int t; + + switch (rotation & 0xf) { + case RR_Rotate_0: + break; + case RR_Rotate_90: + t = x_dst; + x_dst = height - y_dst - 1; + y_dst = t; + break; + case RR_Rotate_180: + x_dst = width - x_dst - 1; + y_dst = height - y_dst - 1; + break; + case RR_Rotate_270: + t = x_dst; + x_dst = y_dst; + y_dst = width - t - 1; + break; + } if (rotation & RR_Reflect_X) x_dst = width - x_dst - 1; if (rotation & RR_Reflect_Y) y_dst = height - y_dst - 1; + *x_src = x_dst; + *y_src = y_dst; +} + +/* + * Given a cursor source coordinate, rotate to a screen coordinate + */ +static void +xf86_crtc_rotate_coord_back (Rotation rotation, + int width, + int height, + int x_dst, + int y_dst, + int *x_src, + int *y_src) +{ + int t; + if (rotation & RR_Reflect_X) + x_dst = width - x_dst - 1; + if (rotation & RR_Reflect_Y) + y_dst = height - y_dst - 1; + switch (rotation & 0xf) { case RR_Rotate_0: - *x_src = x_dst; - *y_src = y_dst; break; case RR_Rotate_90: - *x_src = height - y_dst - 1; - *y_src = x_dst; + t = x_dst; + x_dst = y_dst; + y_dst = width - t - 1; break; case RR_Rotate_180: - *x_src = width - x_dst - 1; - *y_src = height - y_dst - 1; + x_dst = width - x_dst - 1; + y_dst = height - y_dst - 1; break; case RR_Rotate_270: - *x_src = y_dst; - *y_src = width - x_dst - 1; + t = x_dst; + x_dst = height - y_dst - 1; + y_dst = t; break; } + *x_src = x_dst; + *y_src = y_dst; } /* @@ -261,49 +305,33 @@ xf86_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y) xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CursorInfoPtr cursor_info = xf86_config->cursor_info; DisplayModePtr mode = &crtc->mode; - int x_temp; - int y_temp; Bool in_range; + int dx, dy; - /* - * Move to crtc coordinate space - */ - x -= crtc->x; - y -= crtc->y; - /* - * Rotate + * Transform position of cursor on screen */ - switch ((crtc->rotation) & 0xf) { - case RR_Rotate_0: - break; - case RR_Rotate_90: - x_temp = y; - y_temp = mode->VDisplay - cursor_info->MaxWidth - x; - x = x_temp; - y = y_temp; - break; - case RR_Rotate_180: - x_temp = mode->HDisplay - cursor_info->MaxWidth - x; - y_temp = mode->VDisplay - cursor_info->MaxHeight - y; - x = x_temp; - y = y_temp; - break; - case RR_Rotate_270: - x_temp = mode->HDisplay - cursor_info->MaxHeight - y; - y_temp = x; - x = x_temp; - y = y_temp; - break; + if (crtc->transform_in_use) + { + PictVector v; + v.vector[0] = IntToxFixed (x); v.vector[1] = IntToxFixed (y); v.vector[2] = IntToxFixed(1); + PictureTransformPoint (&crtc->framebuffer_to_crtc, &v); + x = xFixedToInt (v.vector[0]); y = xFixedToInt (v.vector[1]); + } + else + { + x -= crtc->x; + y -= crtc->y; } - /* - * Reflect + * Transform position of cursor upper left corner */ - if (crtc->rotation & RR_Reflect_X) - x = mode->HDisplay - cursor_info->MaxWidth - x; - if (crtc->rotation & RR_Reflect_Y) - y = mode->VDisplay - cursor_info->MaxHeight - y; + xf86_crtc_rotate_coord_back (crtc->rotation, + cursor_info->MaxWidth, + cursor_info->MaxHeight, + 0, 0, &dx, &dy); + x -= dx; + y -= dy; /* * Disable the cursor when it is outside the viewport diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c index a9f9ddc9c..3f67ef3d7 100644 --- a/hw/xfree86/modes/xf86EdidModes.c +++ b/hw/xfree86/modes/xf86EdidModes.c @@ -22,8 +22,9 @@ */ /** - * @file This is a copy of edid_modes.c from the X Server, for compatibility - * with old X Servers. + * @file This file covers code to convert a xf86MonPtr containing EDID-probed + * information into a list of modes, including applying monitor-specific + * quirks to fix broken EDID data. */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> @@ -91,11 +92,16 @@ static Bool quirk_prefer_large_60 (int scrnIndex, xf86MonPtr DDC) DDC->vendor.prod_id == 44358) return TRUE; - /* Samsung SyncMaster 226BW */ + /* Bug #10814: Samsung SyncMaster 225BW */ + if (memcmp (DDC->vendor.name, "SAM", 4) == 0 && + DDC->vendor.prod_id == 596) + return TRUE; + + /* Bug #10545: Samsung SyncMaster 226BW */ if (memcmp (DDC->vendor.name, "SAM", 4) == 0 && DDC->vendor.prod_id == 638) return TRUE; - + return FALSE; } @@ -421,7 +427,7 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC) { DisplayModePtr Modes = NULL, Mode; int i, clock; - Bool have_hsync = FALSE, have_vrefresh = FALSE; + Bool have_hsync = FALSE, have_vrefresh = FALSE, have_maxpixclock = FALSE; if (!Monitor || !DDC) return; @@ -441,6 +447,7 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC) /* Skip EDID ranges if they were specified in the config file */ have_hsync = (Monitor->nHsync != 0); have_vrefresh = (Monitor->nVrefresh != 0); + have_maxpixclock = (Monitor->maxPixClock != 0); /* Go through the detailed monitor sections */ for (i = 0; i < DET_TIMINGS; i++) { @@ -475,7 +482,7 @@ xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC) } clock = DDC->det_mon[i].section.ranges.max_clock * 1000; - if (clock > Monitor->maxPixClock) + if (!have_maxpixclock && clock > Monitor->maxPixClock) Monitor->maxPixClock = clock; break; diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c index 5b52bd76c..ea9f85baa 100644 --- a/hw/xfree86/modes/xf86Modes.c +++ b/hw/xfree86/modes/xf86Modes.c @@ -1,6 +1,3 @@ -/* -*- c-basic-offset: 4 -*- */ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Mode.c,v 1.10 2006/03/07 16:00:57 libv Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.69 2003/10/08 14:58:28 dawes Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c index db912745f..889be6f27 100644 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c @@ -1,7 +1,4 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.3 2004/07/30 21:53:09 eich Exp $ */ /* - * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.7tsi Exp $ - * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -96,9 +93,12 @@ xf86RandR12GetInfo (ScreenPtr pScreen, Rotation *rotations) } /* Re-probe the outputs for new monitors or modes */ - xf86ProbeOutputModes (scrp, 0, 0); - xf86SetScrnInfoModes (scrp); - xf86DiDGAReInit (pScreen); + if (scrp->vtSema) + { + xf86ProbeOutputModes (scrp, 0, 0); + xf86SetScrnInfoModes (scrp); + xf86DiDGAReInit (pScreen); + } for (mode = scrp->modes; ; mode = mode->next) { @@ -750,6 +750,10 @@ xf86RandR12CrtcSet (ScreenPtr pScreen, output->crtc = new_crtc; } } + for (ro = 0; ro < num_randr_outputs; ro++) + if (randr_outputs[ro]->pendingProperties) + changed = TRUE; + /* XXX need device-independent mode setting code through an API */ if (changed) { @@ -794,6 +798,9 @@ xf86RandR12CrtcSetGamma (ScreenPtr pScreen, if (crtc->funcs->gamma_set == NULL) return FALSE; + if (!crtc->scrn->vtSema) + return TRUE; + crtc->funcs->gamma_set(crtc, randr_crtc->gammaRed, randr_crtc->gammaGreen, randr_crtc->gammaBlue, randr_crtc->gammaSize); @@ -814,6 +821,11 @@ xf86RandR12OutputSetProperty (ScreenPtr pScreen, if (output->funcs->set_property == NULL) return TRUE; + /* + * This function gets called even when vtSema is FALSE, as + * drivers will need to remember the correct value to apply + * when the VT switch occurs + */ return output->funcs->set_property(output, property, value); } @@ -827,6 +839,11 @@ xf86RandR12OutputValidateMode (ScreenPtr pScreen, DisplayModeRec mode; xf86RandRModeConvert (pScrn, randr_mode, &mode); + /* + * This function may be called when vtSema is FALSE, so + * the underlying function must either avoid touching the hardware + * or return FALSE when vtSema is FALSE + */ if (output->funcs->mode_valid (output, &mode) != MODE_OK) return FALSE; return TRUE; @@ -934,7 +951,6 @@ xf86RandR12SetInfo12 (ScreenPtr pScreen) return FALSE; } - RROutputSetCrtc (output->randr_output, randr_crtc); RROutputSetPhysicalSize(output->randr_output, output->mm_width, output->mm_height); @@ -988,6 +1004,8 @@ xf86RandR12GetInfo12 (ScreenPtr pScreen, Rotation *rotations) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + if (!pScrn->vtSema) + return TRUE; xf86ProbeOutputModes (pScrn, 0, 0); xf86SetScrnInfoModes (pScrn); xf86DiDGAReInit (pScreen); diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c index 137993926..4016b9733 100644 --- a/hw/xfree86/modes/xf86Rotate.c +++ b/hw/xfree86/modes/xf86Rotate.c @@ -68,57 +68,204 @@ compWindowFormat (WindowPtr pWin) compGetWindowVisual (pWin)); } +#define F(x) IntToxFixed(x) + static void -xf86TranslateBox (BoxPtr b, int dx, int dy) +PictureTransformIdentity (PictTransformPtr matrix) +{ + int i; + memset (matrix, '\0', sizeof (PictTransform)); + for (i = 0; i < 3; i++) + matrix->matrix[i][i] = F(1); +} + +static Bool +PictureTransformMultiply (PictTransformPtr dst, PictTransformPtr l, PictTransformPtr r) { - b->x1 += dx; - b->y1 += dy; - b->x2 += dx; - b->y2 += dy; + PictTransform d; + int dx, dy; + int o; + + for (dy = 0; dy < 3; dy++) + for (dx = 0; dx < 3; dx++) + { + xFixed_48_16 v; + xFixed_32_32 partial; + v = 0; + for (o = 0; o < 3; o++) + { + partial = (xFixed_32_32) l->matrix[dy][o] * (xFixed_32_32) r->matrix[o][dx]; + v += partial >> 16; + } + if (v > MAX_FIXED_48_16 || v < MIN_FIXED_48_16) + return FALSE; + d.matrix[dy][dx] = (xFixed) v; + } + *dst = d; + return TRUE; } static void -xf86TransformBox (BoxPtr dst, BoxPtr src, Rotation rotation, - int xoff, int yoff, - int dest_width, int dest_height) +PictureTransformInitScale (PictTransformPtr t, xFixed sx, xFixed sy) +{ + memset (t, '\0', sizeof (PictTransform)); + t->matrix[0][0] = sx; + t->matrix[1][1] = sy; + t->matrix[2][2] = F (1); +} + +static xFixed +fixed_inverse (xFixed x) +{ + return (xFixed) ((((xFixed_48_16) F(1)) * F(1)) / x); +} + +static Bool +PictureTransformScale (PictTransformPtr forward, + PictTransformPtr reverse, + xFixed sx, xFixed sy) { - BoxRec stmp = *src; + PictTransform t; - xf86TranslateBox (&stmp, -xoff, -yoff); - switch (rotation & 0xf) { - default: - case RR_Rotate_0: - *dst = stmp; - break; - case RR_Rotate_90: - dst->x1 = stmp.y1; - dst->y1 = dest_height - stmp.x2; - dst->x2 = stmp.y2; - dst->y2 = dest_height - stmp.x1; - break; - case RR_Rotate_180: - dst->x1 = dest_width - stmp.x2; - dst->y1 = dest_height - stmp.y2; - dst->x2 = dest_width - stmp.x1; - dst->y2 = dest_height - stmp.y1; - break; - case RR_Rotate_270: - dst->x1 = dest_width - stmp.y2; - dst->y1 = stmp.x1; - dst->y2 = stmp.x2; - dst->x2 = dest_width - stmp.y1; - break; - } - if (rotation & RR_Reflect_X) { - int x1 = dst->x1; - dst->x1 = dest_width - dst->x2; - dst->x2 = dest_width - x1; + PictureTransformInitScale (&t, sx, sy); + if (!PictureTransformMultiply (forward, &t, forward)) + return FALSE; + PictureTransformInitScale (&t, fixed_inverse (sx), fixed_inverse (sy)); + if (!PictureTransformMultiply (reverse, reverse, &t)) + return FALSE; + return TRUE; +} + +static void +PictureTransformInitRotate (PictTransformPtr t, xFixed c, xFixed s) +{ + memset (t, '\0', sizeof (PictTransform)); + t->matrix[0][0] = c; + t->matrix[0][1] = -s; + t->matrix[1][0] = s; + t->matrix[1][1] = c; + t->matrix[2][2] = F (1); +} + +static Bool +PictureTransformRotate (PictTransformPtr forward, + PictTransformPtr reverse, + xFixed c, xFixed s) +{ + PictTransform t; + PictureTransformInitRotate (&t, c, s); + if (!PictureTransformMultiply (forward, &t, forward)) + return FALSE; + + PictureTransformInitRotate (&t, c, -s); + if (!PictureTransformMultiply (reverse, reverse, &t)) + return FALSE; + return TRUE; +} + +static void +PictureTransformInitTranslate (PictTransformPtr t, xFixed tx, xFixed ty) +{ + memset (t, '\0', sizeof (PictTransform)); + t->matrix[0][0] = F (1); + t->matrix[0][2] = tx; + t->matrix[1][1] = F (1); + t->matrix[1][2] = ty; + t->matrix[2][2] = F (1); +} + +static Bool +PictureTransformTranslate (PictTransformPtr forward, + PictTransformPtr reverse, + xFixed tx, xFixed ty) +{ + PictTransform t; + PictureTransformInitTranslate (&t, tx, ty); + if (!PictureTransformMultiply (forward, &t, forward)) + return FALSE; + + PictureTransformInitTranslate (&t, -tx, -ty); + if (!PictureTransformMultiply (reverse, reverse, &t)) + return FALSE; + return TRUE; +} + +static void +PictureTransformBounds (BoxPtr b, PictTransformPtr matrix) +{ + PictVector v[4]; + int i; + int x1, y1, x2, y2; + + v[0].vector[0] = F (b->x1); v[0].vector[1] = F (b->y1); v[0].vector[2] = F(1); + v[1].vector[0] = F (b->x2); v[1].vector[1] = F (b->y1); v[1].vector[2] = F(1); + v[2].vector[0] = F (b->x2); v[2].vector[1] = F (b->y2); v[2].vector[2] = F(1); + v[3].vector[0] = F (b->x1); v[3].vector[1] = F (b->y2); v[3].vector[2] = F(1); + for (i = 0; i < 4; i++) + { + PictureTransformPoint (matrix, &v[i]); + x1 = xFixedToInt (v[i].vector[0]); + y1 = xFixedToInt (v[i].vector[1]); + x2 = xFixedToInt (xFixedCeil (v[i].vector[0])); + y2 = xFixedToInt (xFixedCeil (v[i].vector[1])); + if (i == 0) + { + b->x1 = x1; b->y1 = y1; + b->x2 = x2; b->y2 = y2; + } + else + { + if (x1 < b->x1) b->x1 = x1; + if (y1 < b->y1) b->y1 = y1; + if (x2 > b->x2) b->x2 = x2; + if (y2 > b->y2) b->y2 = y2; + } } - if (rotation & RR_Reflect_Y) { - int y1 = dst->y1; - dst->y1 = dest_height - dst->y2; - dst->y2 = dest_height - y1; +} + +static Bool +PictureTransformIsIdentity(PictTransform *t) +{ + return ((t->matrix[0][0] == t->matrix[1][1]) && + (t->matrix[0][0] == t->matrix[2][2]) && + (t->matrix[0][0] != 0) && + (t->matrix[0][1] == 0) && + (t->matrix[0][2] == 0) && + (t->matrix[1][0] == 0) && + (t->matrix[1][2] == 0) && + (t->matrix[2][0] == 0) && + (t->matrix[2][1] == 0)); +} + +#define toF(x) ((float) (x) / 65536.0f) + +static void +PictureTransformErrorF (PictTransform *t) +{ + ErrorF ("{ { %f %f %f } { %f %f %f } { %f %f %f } }", + toF(t->matrix[0][0]), toF(t->matrix[0][1]), toF(t->matrix[0][2]), + toF(t->matrix[1][0]), toF(t->matrix[1][1]), toF(t->matrix[1][2]), + toF(t->matrix[2][0]), toF(t->matrix[2][1]), toF(t->matrix[2][2])); +} + +static Bool +PictureTransformIsInverse (char *where, PictTransform *a, PictTransform *b) +{ + PictTransform t; + + PictureTransformMultiply (&t, a, b); + if (!PictureTransformIsIdentity (&t)) + { + ErrorF ("%s: ", where); + PictureTransformErrorF (a); + ErrorF (" * "); + PictureTransformErrorF (b); + ErrorF (" = "); + PictureTransformErrorF (a); + ErrorF ("\n"); + return FALSE; } + return TRUE; } static void @@ -131,7 +278,6 @@ xf86RotateCrtcRedisplay (xf86CrtcPtr crtc, RegionPtr region) PictFormatPtr format = compWindowFormat (WindowTable[screen->myNum]); int error; PicturePtr src, dst; - PictTransform transform; int n = REGION_NUM_RECTS(region); BoxPtr b = REGION_RECTS(region); XID include_inferiors = IncludeInferiors; @@ -156,45 +302,7 @@ xf86RotateCrtcRedisplay (xf86CrtcPtr crtc, RegionPtr region) if (!dst) return; - memset (&transform, '\0', sizeof (transform)); - transform.matrix[2][2] = IntToxFixed(1); - transform.matrix[0][2] = IntToxFixed(crtc->x); - transform.matrix[1][2] = IntToxFixed(crtc->y); - switch (crtc->rotation & 0xf) { - default: - case RR_Rotate_0: - transform.matrix[0][0] = IntToxFixed(1); - transform.matrix[1][1] = IntToxFixed(1); - break; - case RR_Rotate_90: - transform.matrix[0][1] = IntToxFixed(-1); - transform.matrix[1][0] = IntToxFixed(1); - transform.matrix[0][2] += IntToxFixed(crtc->mode.VDisplay); - break; - case RR_Rotate_180: - transform.matrix[0][0] = IntToxFixed(-1); - transform.matrix[1][1] = IntToxFixed(-1); - transform.matrix[0][2] += IntToxFixed(crtc->mode.HDisplay); - transform.matrix[1][2] += IntToxFixed(crtc->mode.VDisplay); - break; - case RR_Rotate_270: - transform.matrix[0][1] = IntToxFixed(1); - transform.matrix[1][0] = IntToxFixed(-1); - transform.matrix[1][2] += IntToxFixed(crtc->mode.HDisplay); - break; - } - - /* handle reflection */ - if (crtc->rotation & RR_Reflect_X) - { - /* XXX figure this out */ - } - if (crtc->rotation & RR_Reflect_Y) - { - /* XXX figure this out too */ - } - - error = SetPictureTransform (src, &transform); + error = SetPictureTransform (src, &crtc->crtc_to_framebuffer); if (error) return; @@ -202,9 +310,8 @@ xf86RotateCrtcRedisplay (xf86CrtcPtr crtc, RegionPtr region) { BoxRec dst_box; - xf86TransformBox (&dst_box, b, crtc->rotation, - crtc->x, crtc->y, - crtc->mode.HDisplay, crtc->mode.VDisplay); + dst_box = *b; + PictureTransformBounds (&dst_box, &crtc->framebuffer_to_crtc); CompositePicture (PictOpSrc, src, NULL, dst, dst_box.x1, dst_box.y1, 0, 0, dst_box.x1, dst_box.y1, @@ -296,15 +403,10 @@ xf86RotateRedisplay(ScreenPtr pScreen) if (crtc->rotation != RR_Rotate_0 && crtc->enabled) { - BoxRec box; RegionRec crtc_damage; /* compute portion of damage that overlaps crtc */ - box.x1 = crtc->x; - box.x2 = crtc->x + xf86ModeWidth (&crtc->mode, crtc->rotation); - box.y1 = crtc->y; - box.y2 = crtc->y + xf86ModeHeight (&crtc->mode, crtc->rotation); - REGION_INIT(pScreen, &crtc_damage, &box, 1); + REGION_INIT(pScreen, &crtc_damage, &crtc->bounds, 1); REGION_INTERSECT (pScreen, &crtc_damage, &crtc_damage, region); /* update damaged region */ @@ -393,13 +495,93 @@ xf86CrtcRotate (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation) ScrnInfoPtr pScrn = crtc->scrn; xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); ScreenPtr pScreen = pScrn->pScreen; + PictTransform crtc_to_fb, fb_to_crtc; + + PictureTransformIdentity (&crtc_to_fb); + PictureTransformIdentity (&fb_to_crtc); + PictureTransformIsInverse ("identity", &crtc_to_fb, &fb_to_crtc); + if (rotation != RR_Rotate_0) + { + xFixed rot_cos, rot_sin, rot_dx, rot_dy; + xFixed scale_x, scale_y, scale_dx, scale_dy; + int mode_w = crtc->mode.HDisplay; + int mode_h = crtc->mode.VDisplay; + + /* rotation */ + switch (rotation & 0xf) { + default: + case RR_Rotate_0: + rot_cos = F ( 1); rot_sin = F ( 0); + rot_dx = F ( 0); rot_dy = F ( 0); + break; + case RR_Rotate_90: + rot_cos = F ( 0); rot_sin = F ( 1); + rot_dx = F ( mode_h); rot_dy = F (0); + break; + case RR_Rotate_180: + rot_cos = F (-1); rot_sin = F ( 0); + rot_dx = F (mode_w); rot_dy = F ( mode_h); + break; + case RR_Rotate_270: + rot_cos = F ( 0); rot_sin = F (-1); + rot_dx = F ( 0); rot_dy = F ( mode_w); + break; + } + + PictureTransformRotate (&crtc_to_fb, &fb_to_crtc, rot_cos, rot_sin); + PictureTransformIsInverse ("rotate", &crtc_to_fb, &fb_to_crtc); + + PictureTransformTranslate (&crtc_to_fb, &fb_to_crtc, rot_dx, rot_dy); + PictureTransformIsInverse ("rotate translate", &crtc_to_fb, &fb_to_crtc); + + /* reflection */ + scale_x = F (1); + scale_dx = 0; + scale_y = F (1); + scale_dy = 0; + if (rotation & RR_Reflect_X) + { + scale_x = F(-1); + if (rotation & (RR_Rotate_0|RR_Rotate_180)) + scale_dx = F(mode_w); + else + scale_dx = F(mode_h); + } + if (rotation & RR_Reflect_Y) + { + scale_y = F(-1); + if (rotation & (RR_Rotate_0|RR_Rotate_180)) + scale_dy = F(mode_h); + else + scale_dy = F(mode_w); + } + + PictureTransformScale (&crtc_to_fb, &fb_to_crtc, scale_x, scale_y); + PictureTransformIsInverse ("scale", &crtc_to_fb, &fb_to_crtc); + + PictureTransformTranslate (&crtc_to_fb, &fb_to_crtc, scale_dx, scale_dy); + PictureTransformIsInverse ("scale translate", &crtc_to_fb, &fb_to_crtc); + + } - if (rotation == RR_Rotate_0) + /* + * If the untranslated transformation is the identity, + * disable the shadow buffer + */ + if (PictureTransformIsIdentity (&crtc_to_fb)) { + crtc->transform_in_use = FALSE; + PictureTransformInitTranslate (&crtc->crtc_to_framebuffer, + F (-crtc->x), F (-crtc->y)); + PictureTransformInitTranslate (&crtc->framebuffer_to_crtc, + F ( crtc->x), F ( crtc->y)); xf86RotateDestroy (crtc); } else { + PictureTransformTranslate (&crtc_to_fb, &fb_to_crtc, crtc->x, crtc->y); + PictureTransformIsInverse ("offset", &crtc_to_fb, &fb_to_crtc); + /* * these are the size of the shadow pixmap, which * matches the mode, not the pre-rotated copy in the @@ -448,14 +630,14 @@ xf86CrtcRotate (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation) } if (0) { -bail2: + bail2: if (shadow || shadowData) { crtc->funcs->shadow_destroy (crtc, shadow, shadowData); crtc->rotatedPixmap = NULL; crtc->rotatedData = NULL; } -bail1: + bail1: if (old_width && old_height) crtc->rotatedPixmap = crtc->funcs->shadow_create (crtc, NULL, @@ -463,6 +645,14 @@ bail1: old_height); return FALSE; } + crtc->transform_in_use = TRUE; + crtc->crtc_to_framebuffer = crtc_to_fb; + crtc->framebuffer_to_crtc = fb_to_crtc; + crtc->bounds.x1 = 0; + crtc->bounds.x2 = crtc->mode.HDisplay; + crtc->bounds.y1 = 0; + crtc->bounds.y2 = crtc->mode.VDisplay; + PictureTransformBounds (&crtc->bounds, &crtc_to_fb); } /* All done */ diff --git a/hw/xfree86/os-support/README.OS-lib b/hw/xfree86/os-support/README.OS-lib index 27af6b3f2..e410906f9 100644 --- a/hw/xfree86/os-support/README.OS-lib +++ b/hw/xfree86/os-support/README.OS-lib @@ -38,7 +38,6 @@ have been made in implementation. systems. bsdi/ OS support for the BSD/386 operating system. linux/ OS support for the Linux operating system. - os2/ OS support for OS/2 2.11 and OS/2 Warp sco/ OS support for the SCO SVR3.x operating system. solx86/ OS support for the Solaris x86 operating system. sysv/ OS support for all SVR4.0 and SVR4.2, and for diff --git a/hw/xfree86/os-support/assyntax.h b/hw/xfree86/os-support/assyntax.h index b50313607..718312cf0 100644 --- a/hw/xfree86/os-support/assyntax.h +++ b/hw/xfree86/os-support/assyntax.h @@ -1,4 +1,3 @@ - #ifndef __ASSYNTAX_H__ #define __ASSYNTAX_H__ @@ -50,8 +49,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* $XConsortium: assyntax.h /main/5 1996/02/21 17:50:49 kaleb $ */ - /* * assyntax.h * diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c index 5052b7862..a1b19d0f6 100644 --- a/hw/xfree86/os-support/bsd/alpha_video.c +++ b/hw/xfree86/os-support/bsd/alpha_video.c @@ -23,8 +23,6 @@ * */ -/* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c index 4a3d5ca52..b556563d3 100644 --- a/hw/xfree86/os-support/bsd/arm_video.c +++ b/hw/xfree86/os-support/bsd/arm_video.c @@ -56,8 +56,6 @@ * */ -/* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/os-support/bsd/bsd_VTsw.c b/hw/xfree86/os-support/bsd/bsd_VTsw.c index 00591d135..476a0e957 100644 --- a/hw/xfree86/os-support/bsd/bsd_VTsw.c +++ b/hw/xfree86/os-support/bsd/bsd_VTsw.c @@ -22,7 +22,6 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium: bsd_VTsw.c /main/4 1996/02/21 17:50:57 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c index c8e204307..61779875c 100644 --- a/hw/xfree86/os-support/bsd/bsd_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_apm.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c index eb6d85053..07f031fa8 100644 --- a/hw/xfree86/os-support/bsd/bsd_init.c +++ b/hw/xfree86/os-support/bsd/bsd_init.c @@ -22,7 +22,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium: bsd_init.c /main/8 1996/10/23 13:13:05 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/bsd/bsd_kmod.c b/hw/xfree86/os-support/bsd/bsd_kmod.c index 08180106d..b6c755852 100644 --- a/hw/xfree86/os-support/bsd/bsd_kmod.c +++ b/hw/xfree86/os-support/bsd/bsd_kmod.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c index 0a0434f2a..b0171e2c3 100644 --- a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c @@ -25,7 +25,6 @@ * or other dealings in this Software without prior written authorization * from the XFree86 Project. */ -/* $OpenBSD: bsd_kqueue_apm.c,v 1.5 2002/07/30 23:07:42 matthieu Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c index ae16b78aa..e7db6c10e 100644 --- a/hw/xfree86/os-support/bsd/i386_video.c +++ b/hw/xfree86/os-support/bsd/i386_video.c @@ -23,8 +23,6 @@ * */ -/* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/os-support/bsd/libusb/data.c b/hw/xfree86/os-support/bsd/libusb/data.c index df5a9d2f6..292e5d885 100644 --- a/hw/xfree86/os-support/bsd/libusb/data.c +++ b/hw/xfree86/os-support/bsd/libusb/data.c @@ -1,5 +1,3 @@ -/* $NetBSD: data.c,v 1.6 1999/09/20 04:48:12 lukem Exp $ */ - /* * Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org> * All rights reserved. diff --git a/hw/xfree86/os-support/bsd/libusb/descr.c b/hw/xfree86/os-support/bsd/libusb/descr.c index bbcb55853..4dc3524d5 100644 --- a/hw/xfree86/os-support/bsd/libusb/descr.c +++ b/hw/xfree86/os-support/bsd/libusb/descr.c @@ -1,5 +1,3 @@ -/* $NetBSD: descr.c,v 1.7 1999/10/13 17:48:04 drochner Exp $ */ - /* * Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org> * All rights reserved. diff --git a/hw/xfree86/os-support/bsd/libusb/parse.c b/hw/xfree86/os-support/bsd/libusb/parse.c index c68ccb524..0a846e42b 100644 --- a/hw/xfree86/os-support/bsd/libusb/parse.c +++ b/hw/xfree86/os-support/bsd/libusb/parse.c @@ -1,5 +1,3 @@ -/* $NetBSD: parse.c,v 1.7 1999/10/13 17:48:04 drochner Exp $ */ - /* * Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org> * All rights reserved. diff --git a/hw/xfree86/os-support/bsd/libusb/usage.c b/hw/xfree86/os-support/bsd/libusb/usage.c index a8a5f650e..9b491c57a 100644 --- a/hw/xfree86/os-support/bsd/libusb/usage.c +++ b/hw/xfree86/os-support/bsd/libusb/usage.c @@ -1,5 +1,3 @@ -/* $NetBSD: usage.c,v 1.4 1999/07/02 15:46:53 simonb Exp $ */ - /* * Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org> * All rights reserved. diff --git a/hw/xfree86/os-support/bsd/libusb/usb.h b/hw/xfree86/os-support/bsd/libusb/usb.h index fedd3e545..c39dc063a 100644 --- a/hw/xfree86/os-support/bsd/libusb/usb.h +++ b/hw/xfree86/os-support/bsd/libusb/usb.h @@ -1,5 +1,3 @@ -/* $NetBSD: usb.h,v 1.5 1999/07/02 15:46:53 simonb Exp $ */ - /* * Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org> * All rights reserved. diff --git a/hw/xfree86/os-support/bsd/libusb/usbvar.h b/hw/xfree86/os-support/bsd/libusb/usbvar.h index db2cae171..ce38a0730 100644 --- a/hw/xfree86/os-support/bsd/libusb/usbvar.h +++ b/hw/xfree86/os-support/bsd/libusb/usbvar.h @@ -1,5 +1,3 @@ -/* $NetBSD: usbvar.h,v 1.2 1999/05/11 21:15:46 augustss Exp $ */ - /* * Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.org> * All rights reserved. diff --git a/hw/xfree86/os-support/bsd/memrange.h b/hw/xfree86/os-support/bsd/memrange.h index 0f4b270f4..03c479144 100644 --- a/hw/xfree86/os-support/bsd/memrange.h +++ b/hw/xfree86/os-support/bsd/memrange.h @@ -1,9 +1,6 @@ /* * Memory range attribute operations, peformed on /dev/mem - * - * $FreeBSD: src/sys/sys/memrange.h,v 1.4 1999/12/29 04:24:44 peter Exp $ */ -/* $XFree86$ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c index 6a23b4e5c..06be654e1 100644 --- a/hw/xfree86/os-support/bsd/ppc_video.c +++ b/hw/xfree86/os-support/bsd/ppc_video.c @@ -23,8 +23,6 @@ * */ -/* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c index 0cb9d4d56..fb5e8529b 100644 --- a/hw/xfree86/os-support/bsd/sparc64_video.c +++ b/hw/xfree86/os-support/bsd/sparc64_video.c @@ -23,9 +23,6 @@ * */ - -/* $XConsortium: bsd_video.c /main/10 1996/10/25 11:37:57 kaleb $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c index bc5e11fb8..30f7667fa 100644 --- a/hw/xfree86/os-support/bus/Pci.c +++ b/hw/xfree86/os-support/bus/Pci.c @@ -1093,7 +1093,7 @@ xf86GetPciConfigFromTag(PCITAG Tag) pciConfigPtr pDev; int i = 0; - for (i = 0 ; (pDev = pci_devp[i]) && i <= MAX_PCI_DEVICES; i++) { + for (i = 0 ; (pDev = pci_devp[i]) && i <= xf86MaxPciDevs; i++) { if (Tag == pDev->tag) return pDev; } diff --git a/hw/xfree86/os-support/bus/altixPCI.c b/hw/xfree86/os-support/bus/altixPCI.c index 7a72ec6e7..bab255e4d 100644 --- a/hw/xfree86/os-support/bus/altixPCI.c +++ b/hw/xfree86/os-support/bus/altixPCI.c @@ -11,75 +11,6 @@ #include "xf86.h" #include "Pci.h" -/* - * get_dev_on_bus - Return the first device we find on segnum, busnum - * - * Walk all the PCI devices and return the first one found on segnum, busnum. - * There may be a better way to do this in some xf86* function I don't know - * about. - */ -static pciDevice *get_dev_on_bus(unsigned int segnum, unsigned int busnum) -{ - pciDevice **pdev = xf86scanpci(0); - int i; - - for (i = 0; pdev[i] != NULL; i++) - if (PCI_DOM_FROM_TAG(pdev[i]->tag) == segnum && - pdev[i]->busnum == busnum) - return pdev[i]; - /* Should never get here... */ - ErrorF("No PCI device found on %04x:%02x??", segnum, busnum); - return NULL; -} - -/* - * get_bridge_info - fill in the bridge info for bus_info based on pdev - * - * Find the parent bus for pdev if it exists, otherwise assume pdev *is* - * the parent bus. We need this on Altix because our bridges are transparent. - */ -static void get_bridge_info(pciBusInfo_t *bus_info, pciDevice *pdev) -{ - unsigned int parent_segnum, segnum = PCI_DOM_FROM_TAG(pdev->tag); - unsigned int parent_busnum, parent_nodombus, busnum = pdev->busnum; - unsigned int nodombus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(pdev->tag)); - char bridge_path[] = "/sys/class/pci_bus/0000:00/bridge"; - char bridge_target[] = "../../../devices/pci0000:00"; - - /* Path to this device's bridge */ - sprintf(bridge_path, "/sys/class/pci_bus/%04x:%02x/bridge", segnum, - nodombus); - - if (readlink(bridge_path, bridge_target, strlen(bridge_target)) < 0) { - perror("failed to dereference bridge link"); - ErrorF("failed to dereference bridge link, aborting\n"); - exit(-1); - } - - sscanf(bridge_target, "../../../devices/pci%04x:%02x", &parent_segnum, - &parent_nodombus); - - parent_busnum = PCI_MAKE_BUS(parent_segnum, parent_nodombus); - - /* - * If there's no bridge or the bridge points to the device, use - * pdev as the bridge - */ - if (segnum == parent_segnum && busnum == parent_busnum) { - bus_info->bridge = pdev; - bus_info->secondary = FALSE; - bus_info->primary_bus = busnum; - } else { - bus_info->bridge = get_dev_on_bus(parent_segnum, - parent_busnum); - bus_info->secondary = TRUE; - bus_info->primary_bus = parent_busnum; - } - pdev->businfo = bus_info; - pdev->pci_base_class = PCI_CLASS_DISPLAY; - pdev->pci_sub_class = PCI_SUBCLASS_PREHISTORIC_VGA; -} - void xf86PreScanAltix(void) { /* Nothing to see here... */ @@ -88,36 +19,65 @@ void xf86PreScanAltix(void) void xf86PostScanAltix(void) { pciConfigPtr *pdev; - pciBusInfo_t *bus_info; - int prevBusNum, curBusNum, idx; + int idx, free_idx; /* - * Altix PCI bridges are invisible to userspace, so we make each device - * look like it's its own bridge unless it actually has a parent (as in - * the case of PCI to PCI bridges). + * Some altix pci chipsets do not expose themselves as host + * bridges. + * + * Walk the devices looking for buses for which there is not a + * corresponding pciDevice entry (ie. pciBusInfo[]->bridge is NULL). + * + * It is assumed that this indicates a root bridge for which we will + * construct a fake pci host bridge device. */ - bus_info = pciBusInfo[0]; + pdev = xf86scanpci(0); - prevBusNum = curBusNum = pdev[0]->busnum; - bus_info = pciBusInfo[curBusNum]; - bus_info->bridge = pdev[0]; - bus_info->secondary = FALSE; - bus_info->primary_bus = curBusNum; + for (idx = 0; pdev[idx] != NULL; idx++) + ; - /* Walk all the PCI devices, assigning their bridge info */ - for (idx = 0; pdev[idx] != NULL; idx++) { - if (pdev[idx]->busnum == prevBusNum) - continue; /* Already fixed up this bus */ + free_idx = idx; - curBusNum = pdev[idx]->busnum; - bus_info = pciBusInfo[curBusNum]; + for (idx = 0; idx < free_idx; idx++) { + pciConfigPtr dev, fakedev; + pciBusInfo_t *businfo; + + dev = pdev[idx]; + businfo = pciBusInfo[dev->busnum]; + + if (! businfo) { + /* device has no bus ... should this be an error? */ + continue; + } + + if (businfo->bridge) { + /* bus has a device ... no need for fixup */ + continue; + } + + if (free_idx >= MAX_PCI_DEVICES) + FatalError("SN: No room for fake root bridge device\n"); /* - * Fill in bus_info for pdev. The bridge field will either - * be pdev[idx] or a device on the parent bus. + * Construct a fake device and stick it at the end of the + * pdev array. Make it look like a host bridge. */ - get_bridge_info(bus_info, pdev[idx]); - prevBusNum = curBusNum; + fakedev = xnfcalloc(1, sizeof(pciDevice)); + fakedev->tag = PCI_MAKE_TAG(dev->busnum, 0, 0);; + fakedev->busnum = dev->busnum; + fakedev->devnum = 0; + fakedev->funcnum = 0; + fakedev->fakeDevice = 1; + /* should figure out a better DEVID */ + fakedev->pci_device_vendor = DEVID(VENDOR_GENERIC, CHIP_VGA); + fakedev->pci_base_class = PCI_CLASS_BRIDGE; + + businfo->secondary = 0; + businfo->primary_bus = dev->busnum; + businfo->bridge = fakedev; + + fakedev->businfo = businfo; + + pdev[free_idx++] = fakedev; } - return; } diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c index 3d8266e49..9a9a99d49 100644 --- a/hw/xfree86/os-support/bus/linuxPci.c +++ b/hw/xfree86/os-support/bus/linuxPci.c @@ -658,7 +658,7 @@ linuxOpenLegacy(PCITAG Tag, char *name) return fd; } - pBusInfo = pciBusInfo[bus]; + pBusInfo = pciBusInfo[PCI_BUS_FROM_TAG(Tag)]; if (!pBusInfo || (bridge == pBusInfo->bridge) || !(bridge = pBusInfo->bridge)) { xfree(path); @@ -1074,7 +1074,63 @@ ia64linuxPciFindNext(void) } if (sscanf(entry->d_name, "%02x . %01x", &dev, &func) == 2) { - pciDeviceTag = PCI_MAKE_TAG(PCI_MAKE_BUS(domain, bus), dev, func); + CARD32 tmp; + int sec_bus, pri_bus; + unsigned char base_class, sub_class; + + int pciBusNum = PCI_MAKE_BUS(domain, bus); + pciDeviceTag = PCI_MAKE_TAG(pciBusNum, dev, func); + + /* + * Before checking for a specific devid, look for enabled + * PCI to PCI bridge devices. If one is found, create and + * initialize a bus info record (if one does not already exist). + */ + tmp = pciReadLong(pciDeviceTag, PCI_CLASS_REG); + base_class = PCI_CLASS_EXTRACT(tmp); + sub_class = PCI_SUBCLASS_EXTRACT(tmp); + if ((base_class == PCI_CLASS_BRIDGE) && + ((sub_class == PCI_SUBCLASS_BRIDGE_PCI) || + (sub_class == PCI_SUBCLASS_BRIDGE_CARDBUS))) { + tmp = pciReadLong(pciDeviceTag, PCI_PCI_BRIDGE_BUS_REG); + sec_bus = PCI_SECONDARY_BUS_EXTRACT(tmp, pciDeviceTag); + pri_bus = PCI_PRIMARY_BUS_EXTRACT(tmp, pciDeviceTag); +#ifdef DEBUGPCI + ErrorF("ia64linuxPciFindNext: pri_bus %d sec_bus %d\n", + pri_bus, sec_bus); +#endif + if (pciBusNum != pri_bus) { + /* Some bridges do not implement the primary bus register */ + if ((PCI_BUS_NO_DOMAIN(pri_bus) != 0) || + (sub_class != PCI_SUBCLASS_BRIDGE_CARDBUS)) + xf86Msg(X_WARNING, + "ia64linuxPciFindNext: primary bus mismatch on PCI" + " bridge 0x%08lx (0x%02x, 0x%02x)\n", + pciDeviceTag, pciBusNum, pri_bus); + pri_bus = pciBusNum; + } + if ((pri_bus < sec_bus) && (sec_bus < pciMaxBusNum) && + pciBusInfo[pri_bus]) { + /* + * Found a secondary PCI bus + */ + if (!pciBusInfo[sec_bus]) { + pciBusInfo[sec_bus] = xnfalloc(sizeof(pciBusInfo_t)); + + /* Copy parents settings... */ + *pciBusInfo[sec_bus] = *pciBusInfo[pri_bus]; + } + + /* ...but not everything same as parent */ + pciBusInfo[sec_bus]->primary_bus = pri_bus; + pciBusInfo[sec_bus]->secondary = TRUE; + pciBusInfo[sec_bus]->numDevices = 32; + + if (pciNumBuses <= sec_bus) + pciNumBuses = sec_bus + 1; + } + } + devid = pciReadLong(pciDeviceTag, PCI_ID_REG); if ((devid & pciDevidMask) == pciDevid) /* Yes - Return it. Otherwise, next device */ diff --git a/hw/xfree86/os-support/hurd/hurd_bell.c b/hw/xfree86/os-support/hurd/hurd_bell.c index 2726611bb..732a1cadb 100644 --- a/hw/xfree86/os-support/hurd/hurd_bell.c +++ b/hw/xfree86/os-support/hurd/hurd_bell.c @@ -1,22 +1,24 @@ /* * Copyright © 2006 Daniel Stone * - * Permission to use, copy, modify, distribute, and sell this software and - * its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and that - * both that this copyright notice and this permission notice appear in - * supporting electronic documentation. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * Author: Daniel Stone <daniel@fooishbar.org> */ diff --git a/hw/xfree86/os-support/hurd/hurd_init.c b/hw/xfree86/os-support/hurd/hurd_init.c index aec5b3d46..8cd8f54d6 100644 --- a/hw/xfree86/os-support/hurd/hurd_init.c +++ b/hw/xfree86/os-support/hurd/hurd_init.c @@ -20,7 +20,6 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_init.c,v 1.1 1998/08/16 10:25:48 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/hurd/hurd_mmap.c b/hw/xfree86/os-support/hurd/hurd_mmap.c index 5e800d28b..ccef5f218 100644 --- a/hw/xfree86/os-support/hurd/hurd_mmap.c +++ b/hw/xfree86/os-support/hurd/hurd_mmap.c @@ -20,7 +20,6 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86$ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/os-support/hurd/hurd_mouse.c b/hw/xfree86/os-support/hurd/hurd_mouse.c index ccc08a248..5f6d9437f 100644 --- a/hw/xfree86/os-support/hurd/hurd_mouse.c +++ b/hw/xfree86/os-support/hurd/hurd_mouse.c @@ -20,7 +20,6 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_mouse.c,v 1.7 2000/02/10 22:33:44 dawes Exp $ */ #define NEED_EVENTS #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c index b8892831c..8e6ae8d36 100644 --- a/hw/xfree86/os-support/hurd/hurd_video.c +++ b/hw/xfree86/os-support/hurd/hurd_video.c @@ -20,7 +20,6 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/hurd/hurd_video.c,v 1.3 1999/04/29 12:24:52 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c index dd1637a23..d8f4633de 100644 --- a/hw/xfree86/os-support/linux/int10/linux.c +++ b/hw/xfree86/os-support/linux/int10/linux.c @@ -88,7 +88,6 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) int pagesize; memType cs; legacyVGARec vga; - xf86int10BiosLocation bios; Bool videoBiosMapped = FALSE; pciVideoPtr pvp; @@ -260,13 +259,9 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) #endif } - xf86int10ParseBiosLocation(options,&bios); - - if (xf86IsEntityPrimary(entityIndex) - && !(initPrimary(options))) { - if (! xf86int10GetBiosSegment(pInt, &bios, NULL)) { + if (xf86IsEntityPrimary(entityIndex) && !(initPrimary(options))) { + if (!xf86int10GetBiosSegment(pInt, NULL)) goto error3; - } set_return_trap(pInt); #ifdef _PC @@ -276,16 +271,11 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) xf86Int10SaveRestoreBIOSVars(pInt, TRUE); #endif } else { - const BusType location_type = xf86int10GetBiosLocationType(pInt, - &bios); + const BusType location_type = xf86int10GetBiosLocationType(pInt); switch (location_type) { case BUS_PCI: { - const int pci_entity = (bios.bus == BUS_PCI) - ? xf86GetPciEntity(bios.location.pci.bus, - bios.location.pci.dev, - bios.location.pci.func) - : pInt->entityIndex; + const int pci_entity = pInt->entityIndex; if (!mapPciRom(pci_entity, (unsigned char *)(V_BIOS))) { xf86DrvMsg(screen, X_ERROR, "Cannot read V_BIOS\n"); @@ -295,9 +285,8 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) break; } case BUS_ISA: - if (! xf86int10GetBiosSegment(pInt, &bios, NULL)) { + if (!xf86int10GetBiosSegment(pInt, NULL)) goto error3; - } break; default: goto error3; diff --git a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c index 48500dbbf..9412b07a4 100644 --- a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c +++ b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/os-support/linux/lnx.h b/hw/xfree86/os-support/linux/lnx.h index 5aca9e9b1..085c94265 100644 --- a/hw/xfree86/os-support/linux/lnx.h +++ b/hw/xfree86/os-support/linux/lnx.h @@ -11,7 +11,6 @@ extern int iopl __P ((int __level)); /* new pciconfig_iobase syscall added in 2.2.15 and 2.3.99 */ # include <linux/unistd.h> -# include <asm/pci.h> extern long (*_iobase)(unsigned, int, int, int); /* diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c index 0a7612965..e255118cc 100644 --- a/hw/xfree86/os-support/linux/lnx_axp.c +++ b/hw/xfree86/os-support/linux/lnx_axp.c @@ -112,8 +112,8 @@ lnxGetAXP(void) /* * pciconfig_iobase wrappers and dynamic i/o selection */ -#include <linux/unistd.h> -#include <asm/pci.h> +#include "lnx.h" +#include <unistd.h> #include <errno.h> /* glibc versions (single hose only) */ diff --git a/hw/xfree86/os-support/linux/lnx_bell.c b/hw/xfree86/os-support/linux/lnx_bell.c index 6ef881bf7..93ad680d7 100644 --- a/hw/xfree86/os-support/linux/lnx_bell.c +++ b/hw/xfree86/os-support/linux/lnx_bell.c @@ -1,22 +1,24 @@ /* * Copyright © 2006 Daniel Stone * - * Permission to use, copy, modify, distribute, and sell this software and - * its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and that - * both that this copyright notice and this permission notice appear in - * supporting electronic documentation. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR AUTHORS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * Author: Daniel Stone <daniel@fooishbar.org> */ diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c index 9775180a8..4c36b7cf4 100644 --- a/hw/xfree86/os-support/linux/lnx_init.c +++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -22,7 +22,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium: lnx_init.c /main/7 1996/10/23 18:46:30 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/linux/lnx_jstk.c b/hw/xfree86/os-support/linux/lnx_jstk.c index 6ed0e44c6..d77631ba4 100644 --- a/hw/xfree86/os-support/linux/lnx_jstk.c +++ b/hw/xfree86/os-support/linux/lnx_jstk.c @@ -1,5 +1,3 @@ -/* $XConsortium: lnx_jstk.c /main/7 1996/02/21 17:51:36 kaleb $ */ -/* Id: lnx_jstk.c,v 1.1 1995/12/20 14:06:09 lepied Exp */ /* * Copyright 1995 by Frederic Lepied, France. <fred@sugix.frmug.fr.net> * diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c index 02a13109f..b3494a78e 100644 --- a/hw/xfree86/os-support/linux/lnx_video.c +++ b/hw/xfree86/os-support/linux/lnx_video.c @@ -22,7 +22,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium: lnx_video.c /main/9 1996/10/19 18:06:34 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> @@ -62,7 +61,8 @@ static Bool ExtendedEnabled = FALSE; #elif !defined(__powerpc__) && \ !defined(__mc68000__) && \ !defined(__sparc__) && \ - !defined(__mips__) + !defined(__mips__) && \ + !defined(__arm__) /* * Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare @@ -567,7 +567,7 @@ xf86EnableIO(void) #endif } close(fd); -#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) +#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) if (ioperm(0, 1024, 1) || iopl(3)) { if (errno == ENODEV) ErrorF("xf86EnableIOPorts: no I/O ports found\n"); @@ -603,73 +603,21 @@ xf86DisableIO(void) return; } - -/***************************************************************************/ -/* Interrupt Handling section */ -/***************************************************************************/ - -/* XXX The #ifdefs should be made simpler. */ +/* + * Don't use these two functions. They can't possibly work. If you actually + * need interrupts off for something, you ought to be doing it in the kernel + * anyway. + */ _X_EXPORT Bool xf86DisableInterrupts() { -#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) - if (!ExtendedEnabled) - if (iopl(3) || ioperm(0, 1024, 1)) - return (FALSE); -#endif -#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) || defined(__s390__) -#else -# ifdef __GNUC__ -# if defined(__ia64__) -# if 0 - __asm__ __volatile__ (";; rsm psr.i;; srlz.d" ::: "memory"); -# endif -# else - __asm__ __volatile__("cli"); -# endif -# else - asm("cli"); -# endif -#endif -#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) - if (!ExtendedEnabled) { - iopl(0); - ioperm(0, 1024, 0); - } - -#endif return (TRUE); } _X_EXPORT void xf86EnableInterrupts() { -#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) - if (!ExtendedEnabled) - if (iopl(3) || ioperm(0, 1024, 1)) - return; -#endif -#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) || defined(__s390__) -#else -# ifdef __GNUC__ -# if defined(__ia64__) -# if 0 - __asm__ __volatile__ (";; ssm psr.i;; srlz.d" ::: "memory"); -# endif -# else - __asm__ __volatile__("sti"); -# endif -# else - asm("sti"); -# endif -#endif -#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) - if (!ExtendedEnabled) { - iopl(0); - ioperm(0, 1024, 0); - } -#endif return; } diff --git a/hw/xfree86/os-support/misc/Delay.c b/hw/xfree86/os-support/misc/Delay.c index b56595377..e3e93faa4 100644 --- a/hw/xfree86/os-support/misc/Delay.c +++ b/hw/xfree86/os-support/misc/Delay.c @@ -1,11 +1,7 @@ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif -#ifdef __UNIXOS2__ -#define I_NEED_OS2_H -#endif #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/misc/IODelay.c b/hw/xfree86/os-support/misc/IODelay.c index 54b7c1816..e4422f234 100644 --- a/hw/xfree86/os-support/misc/IODelay.c +++ b/hw/xfree86/os-support/misc/IODelay.c @@ -1,9 +1,6 @@ - -/* $XConsortium: IODelay.c /main/1 1996/05/07 17:13:43 kaleb $ */ /******************************************************************************* Stub for Alpha Linux *******************************************************************************/ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c index 1fda7fc10..7694eaa23 100644 --- a/hw/xfree86/os-support/misc/SlowBcopy.c +++ b/hw/xfree86/os-support/misc/SlowBcopy.c @@ -1,9 +1,6 @@ - -/* $XConsortium: SlowBcopy.c /main/1 1996/05/07 17:14:10 kaleb $ */ /******************************************************************************* for Alpha Linux *******************************************************************************/ - /* * Create a dependency that should be immune from the effect of register @@ -35,7 +32,8 @@ xf86SlowBcopy(unsigned char *src, unsigned char *dst, int len) #if !defined(__sparc__) && \ !defined(__powerpc__) && \ !defined(__mips__) && \ - !defined(__ia64__) + !defined(__ia64__) && \ + !defined(__arm__) outb(0x80, 0x00); #endif } diff --git a/hw/xfree86/os-support/misc/xf86_IlHack.c b/hw/xfree86/os-support/misc/xf86_IlHack.c index 1ec0f569d..6c9871d93 100644 --- a/hw/xfree86/os-support/misc/xf86_IlHack.c +++ b/hw/xfree86/os-support/misc/xf86_IlHack.c @@ -4,8 +4,6 @@ * * Note: this doesn't work when using a compiler other than GCC. */ -/* $XConsortium: xf86_IlHack.c /main/4 1996/02/21 17:52:26 kaleb $ */ - #define static /**/ #define __inline__ /**/ diff --git a/hw/xfree86/os-support/misc/xf86_Util.c b/hw/xfree86/os-support/misc/xf86_Util.c index 77df1e248..9e690591d 100644 --- a/hw/xfree86/os-support/misc/xf86_Util.c +++ b/hw/xfree86/os-support/misc/xf86_Util.c @@ -20,7 +20,6 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium: xf86_Util.c /main/5 1996/10/23 13:13:10 kaleb $ */ /* * This file is for utility functions that will be shared by other pieces diff --git a/hw/xfree86/os-support/sco/VTsw_sco.c b/hw/xfree86/os-support/sco/VTsw_sco.c index ba2f7adee..d126e7869 100644 --- a/hw/xfree86/os-support/sco/VTsw_sco.c +++ b/hw/xfree86/os-support/sco/VTsw_sco.c @@ -21,7 +21,6 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium: VTsw_sco.c /main/2 1995/11/13 06:08:36 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/sco/sco_init.c b/hw/xfree86/os-support/sco/sco_init.c index 07f30f019..5f7db3437 100644 --- a/hw/xfree86/os-support/sco/sco_init.c +++ b/hw/xfree86/os-support/sco/sco_init.c @@ -19,7 +19,6 @@ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XConsortium$ */ /* Re-written May 2001 to represent the current state of reality */ diff --git a/hw/xfree86/os-support/sco/sco_iop.c b/hw/xfree86/os-support/sco/sco_iop.c index 4870266d8..bb8d06d2e 100644 --- a/hw/xfree86/os-support/sco/sco_iop.c +++ b/hw/xfree86/os-support/sco/sco_iop.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /* * Copyright 2001 by J. Kean Johnston <jkj@caldera.com> * @@ -20,7 +19,6 @@ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XConsortium$ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/os-support/sco/sco_mouse.c b/hw/xfree86/os-support/sco/sco_mouse.c index 29e1f6f3c..af57cdedf 100644 --- a/hw/xfree86/os-support/sco/sco_mouse.c +++ b/hw/xfree86/os-support/sco/sco_mouse.c @@ -20,8 +20,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XConsortium$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/os-support/sco/sco_video.c b/hw/xfree86/os-support/sco/sco_video.c index 807028f6a..7edf71db3 100644 --- a/hw/xfree86/os-support/sco/sco_video.c +++ b/hw/xfree86/os-support/sco/sco_video.c @@ -19,7 +19,6 @@ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XConsortium$ */ /* Re-written May 2001 to represent the current state of reality */ diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c index fd05f399c..a3cfe40b9 100644 --- a/hw/xfree86/os-support/shared/VTsw_noop.c +++ b/hw/xfree86/os-support/shared/VTsw_noop.c @@ -20,7 +20,6 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium: VTsw_noop.c /main/3 1996/02/21 17:53:25 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c index 0100ae928..4d473147f 100644 --- a/hw/xfree86/os-support/shared/VTsw_usl.c +++ b/hw/xfree86/os-support/shared/VTsw_usl.c @@ -20,7 +20,6 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium: VTsw_usl.c /main/3 1996/02/21 17:53:28 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/shared/agp_noop.c b/hw/xfree86/os-support/shared/agp_noop.c index 0a7844894..5774bc231 100644 --- a/hw/xfree86/os-support/shared/agp_noop.c +++ b/hw/xfree86/os-support/shared/agp_noop.c @@ -34,9 +34,6 @@ #include <xorg-config.h> #endif -#ifdef __UNIXOS2__ -# define I_NEED_OS2_H -#endif #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/shared/bios_devmem.c b/hw/xfree86/os-support/shared/bios_devmem.c index 86d38292f..7288239be 100644 --- a/hw/xfree86/os-support/shared/bios_devmem.c +++ b/hw/xfree86/os-support/shared/bios_devmem.c @@ -20,7 +20,6 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium: bios_devmem.c /main/5 1996/10/19 18:07:41 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/shared/bios_mmap.c b/hw/xfree86/os-support/shared/bios_mmap.c index 40d37e0c3..cccf86a04 100644 --- a/hw/xfree86/os-support/shared/bios_mmap.c +++ b/hw/xfree86/os-support/shared/bios_mmap.c @@ -20,7 +20,6 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium: bios_V4mmap.c /main/4 1996/02/21 17:54:27 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/shared/ioperm_noop.c b/hw/xfree86/os-support/shared/ioperm_noop.c index 2427d1923..1d7851a5b 100644 --- a/hw/xfree86/os-support/shared/ioperm_noop.c +++ b/hw/xfree86/os-support/shared/ioperm_noop.c @@ -20,7 +20,6 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium: ioperm_noop.c /main/3 1996/02/21 17:53:39 kaleb $ */ /* * Some platforms don't bother with I/O permissions, diff --git a/hw/xfree86/os-support/shared/libc_wrapper.c b/hw/xfree86/os-support/shared/libc_wrapper.c index a459d5d70..959424110 100644 --- a/hw/xfree86/os-support/shared/libc_wrapper.c +++ b/hw/xfree86/os-support/shared/libc_wrapper.c @@ -30,9 +30,6 @@ #undef __STRICT_ANSI__ #endif #include <X11/X.h> -#ifdef __UNIXOS2__ -#define I_NEED_OS2_H -#endif #include <X11/Xmd.h> #include <X11/Xos.h> #include <sys/types.h> @@ -56,10 +53,6 @@ #include <errno.h> #include <stdio.h> #include <sys/ioctl.h> -#ifdef __UNIXOS2__ -#define NO_MMAP -#include <sys/param.h> -#endif #ifdef HAS_SVR3_MMAPDRV #define NO_MMAP #ifdef SELF_CONTAINED_WRAPPER @@ -123,9 +116,6 @@ void xf86WrapperInit(void); #endif typedef struct dirent DIRENTRY; -#ifdef __UNIXOS2__ -#define _POSIX_SOURCE -#endif #ifdef ISC202 #include <sys/types.h> #define WIFEXITED(a) ((a & 0x00ff) == 0) /* LSB will be 0 */ @@ -917,9 +907,7 @@ xf86strerror(int n) mapnum (ENOTDIR); mapnum (EPIPE); mapnum (EROFS); -#ifndef __UNIXOS2__ mapnum (ETXTBSY); /* not POSIX 1 */ -#endif mapnum (ENOTTY); #ifdef ENOSYS mapnum (ENOSYS); @@ -1243,7 +1231,6 @@ xf86bsearch(const void *key, const void *base, xf86size_t nmemb, _X_EXPORT int xf86execl(const char *pathname, const char *arg, ...) { -#ifndef __UNIXOS2__ int i; pid_t pid; int exit_status; @@ -1327,9 +1314,6 @@ xf86execl(const char *pathname, const char *arg, ...) pathname); return(1); } -#else - return(1); -#endif /* __UNIXOS2__ Disable this crazy business for now */ } _X_EXPORT void @@ -1435,9 +1419,7 @@ xfToOsChmodMode(xf86mode_t xfmode) if (xfmode & XF86_S_ISUID) mode |= S_ISUID; if (xfmode & XF86_S_ISGID) mode |= S_ISGID; -#ifndef __UNIXOS2__ if (xfmode & XF86_S_ISVTX) mode |= S_ISVTX; -#endif if (xfmode & XF86_S_IRUSR) mode |= S_IRUSR; if (xfmode & XF86_S_IWUSR) mode |= S_IWUSR; if (xfmode & XF86_S_IXUSR) mode |= S_IXUSR; @@ -1464,11 +1446,7 @@ xf86chmod(const char *path, xf86mode_t xfmode) _X_EXPORT int xf86chown(const char *path, xf86uid_t owner, xf86gid_t group) { -#ifndef __UNIXOS2__ int rc = chown(path, owner, group); -#else - int rc = 0; -#endif xf86errno = xf86GetErrno(); return rc; } @@ -1498,9 +1476,7 @@ xfToOsMknodMode(xf86mode_t xfmode) if (xfmode & XF86_S_IFREG) mode |= S_IFREG; if (xfmode & XF86_S_IFCHR) mode |= S_IFCHR; -#ifndef __UNIXOS2__ if (xfmode & XF86_S_IFBLK) mode |= S_IFBLK; -#endif if (xfmode & XF86_S_IFIFO) mode |= S_IFIFO; return mode; @@ -1509,11 +1485,7 @@ xfToOsMknodMode(xf86mode_t xfmode) _X_EXPORT int xf86mknod(const char *pathname, xf86mode_t xfmode, xf86dev_t dev) { mode_t mode = xfToOsMknodMode(xfmode); -#ifndef __UNIXOS2__ int rc = mknod(pathname, mode, dev); -#else - int rc = 0; -#endif xf86errno = xf86GetErrno(); return rc; } @@ -1611,12 +1583,8 @@ _X_EXPORT int xf86finite(double x) { #ifndef QNX4 -#ifndef __UNIXOS2__ return(finite(x)); #else - return(isfinite(x)); -#endif /* __UNIXOS2__ */ -#else /* XXX Replace this with something that really works. */ return 1; #endif @@ -1907,9 +1875,7 @@ xf86GetErrno () mapnum (ENOTDIR); mapnum (EPIPE); mapnum (EROFS); -#ifndef __UNIXOS2__ mapnum (ETXTBSY); /* not POSIX 1 */ -#endif mapnum (ENOTTY); #ifdef ENOSYS mapnum (ENOSYS); diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c index 6e1b54331..002e3a275 100644 --- a/hw/xfree86/os-support/shared/posix_tty.c +++ b/hw/xfree86/os-support/shared/posix_tty.c @@ -52,8 +52,6 @@ * */ -/* $XConsortium: posix_tty.c /main/7 1996/10/19 18:07:47 kaleb $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/os-support/shared/sigiostubs.c b/hw/xfree86/os-support/shared/sigiostubs.c index 1a196cb30..7113968c6 100644 --- a/hw/xfree86/os-support/shared/sigiostubs.c +++ b/hw/xfree86/os-support/shared/sigiostubs.c @@ -29,9 +29,6 @@ #include <xorg-config.h> #endif -#ifdef __UNIXOS2__ -# define I_NEED_OS2_H -#endif # include <X11/X.h> # include "xf86.h" # include "xf86Priv.h" diff --git a/hw/xfree86/os-support/shared/stdPci.c b/hw/xfree86/os-support/shared/stdPci.c index e55ac77be..6777c6a1f 100644 --- a/hw/xfree86/os-support/shared/stdPci.c +++ b/hw/xfree86/os-support/shared/stdPci.c @@ -29,9 +29,6 @@ #include <xorg-config.h> #endif -#ifdef __UNIXOS2__ -# define I_NEED_OS2_H -#endif #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" diff --git a/hw/xfree86/os-support/shared/stdResource.c b/hw/xfree86/os-support/shared/stdResource.c index ad4685605..555f80526 100644 --- a/hw/xfree86/os-support/shared/stdResource.c +++ b/hw/xfree86/os-support/shared/stdResource.c @@ -31,9 +31,6 @@ #include <xorg-config.h> #endif -#ifdef __UNIXOS2__ -# define I_NEED_OS2_H -#endif #include <X11/X.h> #include "xf86.h" #include "xf86Priv.h" @@ -43,9 +40,6 @@ #include "xf86_OSlib.h" #include "xf86Resources.h" -#ifdef __UNIXOS2__ -# undef ADDRESS -#endif /* Avoid Imakefile changes */ #include "bus/Pci.h" diff --git a/hw/xfree86/os-support/shared/vidmem.c b/hw/xfree86/os-support/shared/vidmem.c index 4d775eb52..0b4411604 100644 --- a/hw/xfree86/os-support/shared/vidmem.c +++ b/hw/xfree86/os-support/shared/vidmem.c @@ -30,9 +30,6 @@ #include <xorg-config.h> #endif -#ifdef __UNIXOS2__ -# define I_NEED_OS2_H -#endif #include <X11/X.h> #include "input.h" #include "scrnintstr.h" diff --git a/hw/xfree86/os-support/shared/xf86Axp.h b/hw/xfree86/os-support/shared/xf86Axp.h index 4b8b08370..5e9d6284c 100644 --- a/hw/xfree86/os-support/shared/xf86Axp.h +++ b/hw/xfree86/os-support/shared/xf86Axp.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am index d01e2e676..c027d9a3e 100644 --- a/hw/xfree86/os-support/solaris/Makefile.am +++ b/hw/xfree86/os-support/solaris/Makefile.am @@ -11,11 +11,11 @@ AGP_SRC = sun_agp.c #AGP_SRC = $(srcdir)/../shared/agp_noop.c #endif -SOLARIS_INOUT_SRC = solaris-$(SOLARIS_INOUT_ARCH).S -DISTCLEANFILES = solaris-$(SOLARIS_INOUT_ARCH).il +SOLARIS_INOUT_SRC = solaris-@SOLARIS_INOUT_ARCH@.S +DISTCLEANFILES = solaris-@SOLARIS_INOUT_ARCH@.il -solaris-$(SOLARIS_INOUT_ARCH).il: solaris-${SOLARIS_INOUT_ARCH}.S - $(CPP) -P -DINLINE_ASM solaris-${SOLARIS_INOUT_ARCH}.S > $@ +solaris-@SOLARIS_INOUT_ARCH@.il: solaris-@SOLARIS_INOUT_ARCH@.S + $(CPP) -P -DINLINE_ASM solaris-@SOLARIS_INOUT_ARCH@.S > $@ noinst_LTLIBRARIES = libsolaris.la libsolaris_la_SOURCES = sun_bios.c sun_init.c \ @@ -28,7 +28,7 @@ libsolaris_la_SOURCES = sun_bios.c sun_init.c \ nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC) sdk_HEADERS = agpgart.h -nodist_sdk_HEADERS = solaris-$(SOLARIS_INOUT_ARCH).il +nodist_sdk_HEADERS = solaris-@SOLARIS_INOUT_ARCH@.il AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS) diff --git a/hw/xfree86/os-support/sysv/sysv_init.c b/hw/xfree86/os-support/sysv/sysv_init.c index 6d0045f9b..170bb8914 100644 --- a/hw/xfree86/os-support/sysv/sysv_init.c +++ b/hw/xfree86/os-support/sysv/sysv_init.c @@ -22,7 +22,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium: sysv_init.c /main/4 1996/02/21 17:54:31 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/sysv/sysv_video.c b/hw/xfree86/os-support/sysv/sysv_video.c index fd6d61321..5811947bd 100644 --- a/hw/xfree86/os-support/sysv/sysv_video.c +++ b/hw/xfree86/os-support/sysv/sysv_video.c @@ -22,7 +22,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium: sysv_video.c /main/8 1996/10/25 11:38:09 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/usl/usl_init.c b/hw/xfree86/os-support/usl/usl_init.c index 120ce1bcc..d27b206c8 100644 --- a/hw/xfree86/os-support/usl/usl_init.c +++ b/hw/xfree86/os-support/usl/usl_init.c @@ -1,4 +1,3 @@ -/* $XdotOrg$ */ /* * Copyright 2001-2005 by Kean Johnston <jkj@sco.com> * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany @@ -25,7 +24,6 @@ * THIS SOFTWARE. * */ -/* $XConsortium$ */ #include "X.h" #include "Xmd.h" diff --git a/hw/xfree86/os-support/usl/usl_iop.c b/hw/xfree86/os-support/usl/usl_iop.c index 23c36fbf7..c6382fc7e 100644 --- a/hw/xfree86/os-support/usl/usl_iop.c +++ b/hw/xfree86/os-support/usl/usl_iop.c @@ -19,7 +19,6 @@ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XConsortium$ */ #include "X.h" diff --git a/hw/xfree86/os-support/usl/usl_video.c b/hw/xfree86/os-support/usl/usl_video.c index 160282aab..41abd2259 100644 --- a/hw/xfree86/os-support/usl/usl_video.c +++ b/hw/xfree86/os-support/usl/usl_video.c @@ -1,4 +1,3 @@ -/* $XdotOrg$ */ /* * Copyrught 2005 Kean Johnston <jkj@sco.com> * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany @@ -25,7 +24,6 @@ * THIS SOFTWARE. * */ -/* $XConsortium$ */ #include "X.h" diff --git a/hw/xfree86/os-support/usl/usl_vtsw.c b/hw/xfree86/os-support/usl/usl_vtsw.c index 5c6673f31..812e5bddb 100644 --- a/hw/xfree86/os-support/usl/usl_vtsw.c +++ b/hw/xfree86/os-support/usl/usl_vtsw.c @@ -1,4 +1,3 @@ -/* $XdotOrg$ */ /* * Copyright 2005 by Kean Johnston <jkj@sco.com> * Copyright 1993 by David Wexelblat <dwex@goblin.org> @@ -23,7 +22,6 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium$ */ #include "X.h" diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index 27f766d9c..fcc79be38 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -65,8 +65,6 @@ * */ -/* $XConsortium: xf86_OSlib.h /main/22 1996/10/27 11:06:31 kaleb $ */ - /* * This is private, and should not be included by any drivers. Drivers * may include xf86_OSproc.h to get prototypes for public interfaces. @@ -548,44 +546,6 @@ extern int errno; /* __FreeBSD_kernel__ || __NetBSD__ || __OpenBSD__ || __bsdi__ */ /**************************************************************************/ -/* OS/2 */ -/**************************************************************************/ -/* currently OS/2 with a modified EMX/GCC compiler only */ -#if defined(__UNIXOS2__) -# include <signal.h> -# include <errno.h> -# include <sys/stat.h> - -/* I would have liked to have this included here always, but - * it causes clashes for BYTE and BOOL with Xmd.h, which is too dangerous. - * So I'll include it in place where I know it does no harm. - */ -#if defined(I_NEED_OS2_H) -# undef BOOL -# undef BYTE -# include <os2.h> -#endif - - /* keyboard types */ -# define KB_84 1 -# define KB_101 2 -/* could detect more keyboards */ -# define KB_OTHER 3 - - /* LEDs */ -# define LED_CAP 0x40 -# define LED_NUM 0x20 -# define LED_SCR 0x10 - - /* mouse driver */ -# define OSMOUSE_ONLY -# define MOUSE_PROTOCOL_IN_KERNEL - -extern char* __XOS2RedirRoot(char*); - -#endif - -/**************************************************************************/ /* QNX4 */ /**************************************************************************/ /* This is the QNX code for Watcom 10.6 and QNX 4.x */ diff --git a/hw/xfree86/os-support/xf86_ansic.h b/hw/xfree86/os-support/xf86_ansic.h index c1d62ed9f..0afd96744 100644 --- a/hw/xfree86/os-support/xf86_ansic.h +++ b/hw/xfree86/os-support/xf86_ansic.h @@ -25,23 +25,7 @@ #ifndef _XF86_ANSIC_H #define _XF86_ANSIC_H -/* Handle <stdarg.h> */ - -#ifndef __OS2ELF__ -# include <stdarg.h> -#else /* __OS2ELF__ */ - /* EMX/gcc_elf under OS/2 does not have native header files */ -# if !defined (_VA_LIST) -# define _VA_LIST - typedef char *va_list; -# endif -# define _VA_ROUND(t) ((sizeof (t) + 3) & -4) -# if !defined (va_start) -# define va_start(ap,v) ap = (va_list)&v + ((sizeof (v) + 3) & -4) -# define va_end(ap) (ap = 0, (void)0) -# define va_arg(ap,t) (ap += _VA_ROUND (t), *(t *)(ap - _VA_ROUND (t))) -# endif -#endif /* __OS2ELF__ */ +#include <stdarg.h> /* * The first set of definitions are required both for modules and diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c index 2688bb100..8cec2a91a 100644 --- a/hw/xfree86/parser/Files.c +++ b/hw/xfree86/parser/Files.c @@ -1,5 +1,4 @@ /* - * * Copyright (c) 1997 Metro Link Incorporated * * Permission is hereby granted, free of charge, to any person obtaining a @@ -77,17 +76,6 @@ static xf86ConfigSymTabRec FilesTab[] = {-1, ""}, }; -static char * -prependRoot (char *pathname) -{ -#ifndef __EMX__ - return pathname; -#else - /* XXXX caveat: multiple path components in line */ - return (char *) __XOS2RedirRoot (pathname); -#endif -} - #define CLEANUP xf86freeFiles XF86ConfFilesPtr @@ -110,7 +98,7 @@ xf86parseFilesSection (void) if (xf86getSubToken (&(ptr->file_comment)) != STRING) Error (QUOTE_MSG, "FontPath"); j = FALSE; - str = prependRoot (val.str); + str = val.str; if (ptr->file_fontpath == NULL) { ptr->file_fontpath = xf86confmalloc (1); @@ -143,7 +131,7 @@ xf86parseFilesSection (void) if (xf86getSubToken (&(ptr->file_comment)) != STRING) Error (QUOTE_MSG, "ModulePath"); l = FALSE; - str = prependRoot (val.str); + str = val.str; if (ptr->file_modulepath == NULL) { ptr->file_modulepath = xf86confmalloc (1); @@ -170,7 +158,7 @@ xf86parseFilesSection (void) if (xf86getSubToken (&(ptr->file_comment)) != STRING) Error (QUOTE_MSG, "InputDevices"); l = FALSE; - str = prependRoot (val.str); + str = val.str; if (ptr->file_inputdevs == NULL) { ptr->file_inputdevs = xf86confmalloc (1); @@ -258,7 +246,7 @@ xf86printFileSection (FILE * cf, XF86ConfFilesPtr ptr) s++; p = index (s, ','); } - fprintf (cf, "\tInputdevs \"%s\"\n", s); + fprintf (cf, "\tInputDevices \"%s\"\n", s); } if (ptr->file_fontpath) { diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c index 68e7ec650..55c7eb55f 100644 --- a/hw/xfree86/parser/scan.c +++ b/hw/xfree86/parser/scan.c @@ -1,5 +1,4 @@ /* - * * Copyright (c) 1997 Metro Link Incorporated * * Permission is hereby granted, free of charge, to any person obtaining a @@ -106,10 +105,6 @@ static int pushToken = LOCK_TOKEN; static int eol_seen = 0; /* private state to handle comments */ LexRec val; -#ifdef __UNIXOS2__ -extern char *__XOS2RedirRoot(char *path); -#endif - /* * xf86strToUL -- * @@ -523,10 +518,6 @@ xf86pathIsAbsolute(const char *path) { if (path && path[0] == '/') return 1; -#ifdef __UNIXOS2__ - if (path && (path[0] == '\\' || (path[1] == ':'))) - return 1; -#endif return 0; } @@ -571,7 +562,6 @@ xf86pathIsSafe(const char *path) * %P projroot * %M major version number * %% % - * %& UNIXOS2 only: prepend X11ROOT env var */ #ifndef XCONFIGFILE @@ -625,9 +615,6 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot, static const char *env = NULL, *home = NULL; static char *hostname = NULL; static char majorvers[3] = ""; -#ifdef __UNIXOS2__ - static char *x11root = NULL; -#endif if (!template) return NULL; @@ -744,16 +731,6 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot, result[l++] = '%'; CHECK_LENGTH; break; -#ifdef __UNIXOS2__ - case '&': - if (!x11root) - x11root = getenv("X11ROOT"); - if (x11root) - APPEND_STR(x11root); - else - BAIL_OUT; - break; -#endif default: fprintf(stderr, "invalid escape %%%c found in path template\n", template[i]); diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c index 3924001f7..6589fdc72 100644 --- a/hw/xfree86/parser/write.c +++ b/hw/xfree86/parser/write.c @@ -1,5 +1,4 @@ /* - * * Copyright (c) 1997 Metro Link Incorporated * * Permission is hereby granted, free of charge, to any person obtaining a @@ -81,7 +80,7 @@ extern int sys_nerr; #if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED) #define HAS_SAVED_IDS_AND_SETEUID #endif -#if defined(__UNIXOS2__) || defined(WIN32) +#if defined(WIN32) #define HAS_NO_UIDS #endif diff --git a/hw/xfree86/scanpci/extrapci.ids b/hw/xfree86/scanpci/extrapci.ids index 08e7af992..e39843b70 100644 --- a/hw/xfree86/scanpci/extrapci.ids +++ b/hw/xfree86/scanpci/extrapci.ids @@ -37,7 +37,23 @@ # Some NVIDIA cards that are not in the master pci.ids file yet. 10de " - 0147 GeForce 6700 XL - 0160 GeForce 6500 - 0169 GeForce 6250 + 0095 GeForce 7800 SLI + 0194 GeForce 8800 Ultra + 0399 GeForce Go 7600 GT + 039a Quadro NVS 300M + 0400 GeForce 8600 GTS + 0402 GeForce 8600 GT + 0407 GeForce 8600M GT + 040b Quadro NVS 320M + 0421 GeForce 8500 GT + 0422 GeForce 8400 GS + 0423 GeForce 8300 GS + 0425 GeForce 8600M GS + 0426 GeForce 8400M GT + 0427 GeForce 8400M GS + 0428 GeForce 8400M G + 0429 Quadro NVS 140M + 042a Quadro NVS 130M + 042b Quadro NVS 135M + diff --git a/hw/xfree86/scanpci/pci.ids b/hw/xfree86/scanpci/pci.ids index 64713d034..2b9167353 100644 --- a/hw/xfree86/scanpci/pci.ids +++ b/hw/xfree86/scanpci/pci.ids @@ -11,7 +11,7 @@ # This file can be distributed under either the GNU General Public License # (version 2 or higher) or the 3-clause BSD License. # -# Daily snapshot on Thu 2007-01-18 02:05:01 +# Daily snapshot on Mon 2007-07-16 01:05:02 # # Vendors, devices and subsystems. Please keep sorted. @@ -65,6 +65,7 @@ # SpeedStream is Efficient Networks, Inc, a Siemens Company 02ac SpeedStream 1012 1012 PCMCIA 10/100 Ethernet Card [RTL81xx] +02e0 XFX Pine Group Inc 0315 SK-Electronics Co., Ltd. 0357 TTTech AG 000a TTP-Monitoring Card V2.0 @@ -82,6 +83,8 @@ 0109 F5U409-CU USB/Serial Portable Adapter 7050 F5D7050 802.11g Wireless USB Adapter 705c F5D7050 v4 +058f Alcor Micro Corporation + 9254 AU9254 (4-port USB hub) 05a9 OmniVision 8519 OV519 series 05e3 CyberDoor @@ -111,6 +114,7 @@ 010e Innovage Mini Digital Camera 010f SDC-300 Webcam 2468 CIF Single Chip + 2600 PAC7311 2603 Philips Webcam SPC500NC 2608 Maxell MaxCam RotaWeb 09c1 Arris @@ -141,6 +145,7 @@ 0001 PCI to EISA Bridge 0002 PCI to ISA Bridge 0046 Smart Array 64xx + 0e11 4091 Smart Array 6i 0e11 409a Smart Array 641 0e11 409b Smart Array 642 0e11 409c Smart Array 6400 @@ -326,9 +331,11 @@ 0041 53C1035ZC PCI-X Fusion-MPT Dual Ultra320 SCSI 0050 SAS1064 PCI-X Fusion-MPT SAS 0054 SAS1068 PCI-X Fusion-MPT SAS + 1028 1f09 PowerEdge 860 SAS 5i/R 0055 SAS1068 PCI-X Fusion-MPT SAS 1033 8336 SAS1068 - 0056 SAS1064E PCI-Express Fusion-MPT SAS + 0056 SAS1064ET PCI-Express Fusion-MPT SAS + 0057 M1064E MegaRAID SAS 0058 SAS1068E PCI-Express Fusion-MPT SAS 005a SAS1066E PCI-Express Fusion-MPT SAS 005c SAS1064A PCI-X Fusion-MPT SAS @@ -341,16 +348,21 @@ 1000 1010 MegaRAID SATA 350-8ELP 1000 1011 MegaRAID SATA 350-4ELP 1000 1012 MegaRAID SAS 8704ELP + 1000 1016 MegaRAID SAS 8880EM2 1014 0363 MegaRAID SAS PCI Express ROMB 1014 0364 SystemX MegaRAID SAS 8808E 1014 0365 SystemX MegaRAID SAS 8884E + 1014 0379 SystemX MegaRAID SAS 8880EM2 1028 1f0a PERC 6/E Adapter RAID Controller 1028 1f0b PERC 6/i Adapter RAID Controller 1028 1f0c PERC 6/i Integrated RAID Controller 1028 1f0d CERC 6/i Adapter RAID Controller - 1028 1f11 CERC 6/i Adapter RAID Controller + 1028 1f11 CERC 6/i Integrated RAID Controller 1043 824d MegaRAID SAS PCI Express ROMB 1170 002f MegaRAID SAS PCI Express ROMB + 8086 1006 RAID Controller SRCSAS28EP + 8086 100a RAID Controller SRCSAS28EV + 8086 1010 RAID Controller SRCSATA28E 8086 34cc Integrated RAID Controller SROMBSAS28E 8086 34cd Integrated RAID Controller SROMBSAS28E 0062 SAS1078 PCI-Express Fusion-MPT SAS @@ -453,10 +465,10 @@ 1002 ATI Technologies Inc 3150 M24 1P [Radeon Mobility X600] 3152 M22 [Radeon Mobility X300] - 3154 M24 1T [FireGL M24 GL] + 3154 M24GL [Mobility FireGL V3200] 3e50 RV380 0x3e50 [Radeon X600] 3e54 RV380 0x3e54 [FireGL V3200] - 3e70 RV380 [Radeon X600] Secondary + 3e70 RV380 [Radeon X600] (Secondary) 4136 Radeon IGP 320 M 4137 Radeon IGP330/340/350 4144 R300 AD [Radeon 9500 Pro] @@ -466,18 +478,18 @@ 4148 R350 AH [Radeon 9800] 4149 R350 AI [Radeon 9800] 414a R350 AJ [Radeon 9800] - 414b R350 AK [Fire GL X2] + 414b R350 AK [FireGL X2] 4150 RV350 AP [Radeon 9600] 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 - 1458 4024 Giga-Byte GV-R96128D Primary + 1458 4024 Giga-Byte GV-R96128D (Primary) 148c 2064 PowerColor R96A-C3N 148c 2066 PowerColor R96A-C3N 174b 7c19 Sapphire Atlantis Radeon 9600 Pro - 174b 7c29 GC-R9600PRO Primary [Sapphire] + 174b 7c29 GC-R9600PRO [Sapphire] (Primary) 17ee 2002 Radeon 9600 256Mb Primary - 18bc 0101 GC-R9600PRO Primary + 18bc 0101 GC-R9600PRO (Primary) 4151 RV350 AQ [Radeon 9600] 1043 c004 A9600SE 4152 RV350 AR [Radeon 9600] @@ -490,10 +502,10 @@ 4153 RV350 AS [Radeon 9550] 1043 010c A9550GE/TD 1462 932c 865PE Neo2-V (MS-6788) mainboard - 4154 RV350 AT [Fire GL T2] - 4155 RV350 AU [Fire GL T2] - 4156 RV350 AV [Fire GL T2] - 4157 RV350 AW [Fire GL T2] + 4154 RV350 AT [FireGL T2] + 4155 RV350 AU [FireGL T2] + 4156 RV350 AV [FireGL T2] + 4157 RV350 AW [FireGL T2] 4158 68800AX [Mach32] 4164 R300 AD [Radeon 9500 Pro] (Secondary) 4165 R300 AE [Radeon 9700 Pro] (Secondary) @@ -502,11 +514,11 @@ 4170 RV350 AP [Radeon 9600] (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 + 1458 4025 Giga-Byte GV-R96128D (Secondary) 148c 2067 PowerColor R96A-C3N (Secondary) - 174b 7c28 GC-R9600PRO Secondary [Sapphire] - 17ee 2003 Radeon 9600 256Mb Secondary - 18bc 0100 GC-R9600PRO Secondary + 174b 7c28 GC-R9600PRO [Sapphire] (Secondary) + 17ee 2003 Radeon 9600 256Mb (Secondary) + 18bc 0100 GC-R9600PRO (Secondary) 4171 RV350 AQ [Radeon 9600] (Secondary) 1043 c005 A9600SE (Secondary) 4172 RV350 AR [Radeon 9600] (Secondary) @@ -533,16 +545,18 @@ 4345 EHCI USB Controller 4347 OHCI USB Controller #1 4348 OHCI USB Controller #2 - 4349 ATI Dual Channel Bus Master PCI IDE Controller + 4349 Dual Channel Bus Master PCI IDE Controller 434d IXP AC'97 Modem - 4353 ATI SMBus + 4353 SMBus 4354 215CT [Mach64 CT] 4358 210888CX [Mach64 CX] - 4363 ATI SMBus - 436e ATI 436E Serial ATA Controller + 4363 SMBus + 436e 436E Serial ATA Controller 4370 IXP SB400 AC'97 Audio Controller 1025 0079 Aspire 5024WLMMi + 1025 0091 Aspire 5032WXMi 103c 308b MX6125 + 105b 0c81 Realtek ALC 653 107b 0300 MX6421 4371 IXP SB400 PCI-PCI Bridge 103c 308b MX6125 @@ -557,19 +571,19 @@ 4375 IXP SB400 USB Host Controller 1025 0080 Aspire 5024WLMMi 103c 308b MX6125 - 4376 Standard Dual Channel PCI IDE Controller ATI + 4376 Standard Dual Channel PCI IDE Controller 1025 0080 Aspire 5024WLMMi 103c 308b MX6125 4377 IXP SB400 PCI-ISA Bridge 1025 0080 Aspire 5024WLMi 103c 308b MX6125 - 4378 ATI SB400 - AC'97 Modem Controller + 4378 SB400 AC'97 Modem Controller 1025 0080 Aspire 5024WLMMi 103c 308b MX6125 - 4379 ATI 4379 Serial ATA Controller - 437a ATI 437A Serial ATA Controller - 1002 4379 ATI 4379 Serial ATA Controller - 1002 437a ATI 437A Serial ATA Controller + 4379 4379 Serial ATA Controller + 437a 437A Serial ATA Controller + 1002 4379 4379 Serial ATA Controller + 1002 437a 437A Serial ATA Controller 14f1 8800 Leadtek WinFast TV2000XP Expert 437b SB450 HDA Audio 1734 10b8 Realtek High Definition Audio @@ -741,6 +755,7 @@ 1014 0517 ThinkPad T30 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 Radeon Mobility M6 LY @@ -754,9 +769,10 @@ 4c64 Radeon R250 Ld [Radeon Mobility 9000 M9] 4c65 Radeon R250 Le [Radeon Mobility 9000 M9] 4c66 Radeon R250 [Mobility FireGL 9000] + 1014 054d Thinkpad T41 4c67 Radeon R250 Lg [Radeon Mobility 9000 M9] # Secondary chip to the Lf - 4c6e Radeon R250 Ln [Radeon Mobility 9000 M9] [Secondary] + 4c6e Radeon R250 Ln [Radeon Mobility 9000 M9] (Secondary) 4d46 Rage Mobility M4 AGP 4d4c Rage Mobility M4 AGP 4e44 Radeon R300 ND [Radeon 9700 Pro] @@ -770,7 +786,7 @@ 4e48 Radeon R350 [Radeon 9800 Pro] 4e49 Radeon R350 [Radeon 9800] 4e4a RV350 NJ [Radeon 9800 XT] - 4e4b R350 NK [Fire GL X2] + 4e4b R350 NK [FireGL X2] 4e50 RV350 [Mobility Radeon 9600 M10] 1025 005a TravelMate 290 103c 088c NC8000 laptop @@ -793,7 +809,7 @@ 4e68 Radeon R350 [Radeon 9800 Pro] (Secondary) 4e69 Radeon R350 [Radeon 9800] (Secondary) 4e6a RV350 NJ [Radeon 9800 XT] (Secondary) - 1002 4e71 ATI Technologies Inc M10 NQ [Radeon Mobility 9600] + 1002 4e71 M10 NQ [Radeon Mobility 9600] 4e71 M10 NQ [Radeon Mobility 9600] (Secondary) 4f72 RV250 [Radeon 9000 Series] 4f73 Radeon RV250 [Radeon 9000 Series] (Secondary) @@ -891,7 +907,7 @@ 1002 0908 XVR-100 (supplied by Sun) # The IBM card doubles as an ATI PCI video adapter 1014 029a Remote Supervisor Adapter II (RSA2) - 1014 02c8 IBM eServer xSeries server mainboard + 1014 02c8 eServer xSeries server mainboard 1028 019a PowerEdge SC1425 103c 1292 Radeon 7000 1458 4002 RV100 QY [RADEON 7000 PRO MAYA AV Series] @@ -956,7 +972,8 @@ 5453 Rage 128 Pro Ultra TS 5454 Rage 128 Pro Ultra TT 5455 Rage 128 Pro Ultra TU - 5460 M22 [Radeon Mobility M300] + 5460 M22 [Mobility Radeon X300] + 1775 1100 CR11/VR11 Single Board Computer 5462 M24 [Radeon Mobility X600] 5464 M22 [FireGL GL] 5548 R423 UH [Radeon X800 (PCIE)] @@ -965,18 +982,18 @@ 554b R423 UK [Radeon X800SE (PCIE)] 554d R430 [Radeon X800 XL] (PCIe) 554f R430 [Radeon X800 (PCIE)] - 5550 R423 [Fire GL V7100] + 5550 R423 [FireGL V7100] 5551 R423 [FireGL V5100 (PCIE)] 5552 R423 UR [FireGL V5100 (PCIE)] 5554 R423 UT [FireGL V7100 (PCIE)] - 5569 R423 UI [Radeon X800PRO (PCIE)] Secondary + 5569 R423 UI [Radeon X800PRO (PCIE)] (Secondary) 556b Radeon R423 UK (PCIE) [X800 SE] (Secondary) - 556d R430 [Radeon X800 XL] (PCIe) Secondary - 556f R430 [Radeon X800 (PCIE) Secondary] - 5571 R423GL-SE ATI FIREGL V5100 PCI-EX Secondary + 556d R430 [Radeon X800 XL] (PCIe) (Secondary) + 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) + 564f M26 [Radeon Mobility X700 XL (PCIE)] 5652 M26 [Radeon Mobility X700] 5653 Radeon Mobility X700 (PCIE) 1025 0080 Aspire 5024WLMi @@ -992,6 +1009,7 @@ 5835 RS300M AGP [Radeon Mobility 9100IGP] 5838 Radeon 9100 IGP AGP Bridge 5940 RV280 [Radeon 9200 PRO] (Secondary) + 17af 2021 Excalibur Radeon 9250 (Secondary) 5941 RV280 [Radeon 9200] (Secondary) 1458 4019 Gigabyte Radeon 9200 174b 7c12 Sapphire Radeon 9200 @@ -1001,14 +1019,15 @@ 5950 RS480 Host Bridge 1025 0080 Aspire 5024WLMMi 103c 308b MX6125 - 5951 ATI Radeon Xpress 200 (RS480/RS482/RX480/RX482) Chipset - Host bridge + 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] 1002 5954 RV370 [Radeon Xpress 200G Series] - 5955 ATI Radeon XPRESS 200M 5955 (PCIE) - 1002 5955 RS480 0x5955 [ATI Radeon XPRESS 200M 5955 (PCIE)] + 5955 Radeon XPRESS 200M 5955 (PCIE) + 1002 5955 RS480 0x5955 [Radeon XPRESS 200M 5955 (PCIE)] 103c 308b MX6125 5960 RV280 [Radeon 9200 PRO] + 17af 2020 Excalibur Radeon 9250 5961 RV280 [Radeon 9200] 1002 2f72 All-in-Wonder 9200 Series 1019 4c30 Radeon 9200 VIVO @@ -1021,7 +1040,7 @@ 18bc 0053 Radeon 9200 Game Buster VIVO 5962 RV280 [Radeon 9200] 5964 RV280 [Radeon 9200 SE] - 1002 5964 ATI Radeon 9200 SE, 64-bit 128MB DDR, 200/166MHz + 1002 5964 Radeon 9200 SE, 64-bit 128MB DDR, 200/166MHz 1043 c006 ASUS Radeon 9200 SE / TD / 128M 1458 4018 Radeon 9200 SE 1458 4032 Radeon 9200 SE 128MB @@ -1071,6 +1090,7 @@ 5d44 RV280 [Radeon 9200 SE] (Secondary) 1458 4019 Radeon 9200 SE (Secondary) 1458 4032 Radeon 9200 SE 128MB + 147b 6190 R9200SE-DT (Secondary) 174b 7c12 Sapphire Radeon 9200 SE (Secondary) 1787 5965 Excalibur 9200SE VIVO 128M (Secondary) 17af 2013 Radeon 9200 SE Excalibur (Secondary) @@ -1082,8 +1102,8 @@ 5d4d R480 [Radeon X850XT Platinum (PCIE)] 5d4f R480 [Radeon X800 GTO (PCIE)] 5d52 R480 [Radeon X850XT (PCIE)] (Primary) - 1002 0b12 PowerColor X850XT PCIe Primary - 1002 0b13 PowerColor X850XT PCIe Secondary + 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) @@ -1097,7 +1117,7 @@ 5e4d RV410 [Radeon X700 (PCIE)] 148c 2116 PowerColor Bravo X700 5e4f RV410 [Radeon X700] - 5e6b RV410 [Radeon X700 Pro (PCIE)] Secondary + 5e6b RV410 [Radeon X700 Pro (PCIE)] (Secondary) 5e6d RV410 [Radeon X700 (PCIE)] (Secondary) 148c 2117 PowerColor Bravo X700 5f57 R423 [Radeon X800XT (PCIE)] @@ -1106,7 +1126,7 @@ 7100 R520 [Radeon X1800] 7102 M58 [Radeon Mobility X1800] 7103 M58 [Mobility FireGL V7200] - 7104 R520 GL ATI FireGL V7200 Primary + 7104 R520GL [FireGL V7200] (Primary) 7105 R520 [FireGL] 7106 M58 [Mobility FireGL V7100] 7108 M58 [Radeon Mobility X1800] @@ -1117,66 +1137,69 @@ 710b R520 [Radeon X1800] 710c R520 [Radeon X1800] 7120 R520 [Radeon X1800] (Secondary) - 7124 R520 GL ATI FireGL V7200 Secondary + 7124 R520GL [FireGL V7200] (Secondary) 7129 R520 [Radeon X1800] (Secondary) 1002 0323 All-in-Wonder X1800XL (Secondary) 1002 0d03 Radeon X1800 CrossFire Edition (Secondary) 7140 RV515 [Radeon X1600] - 7142 RV515 PRO [ATI Radeon X1300/X1550 Series] + 7142 RV515 PRO [Radeon X1300/X1550 Series] 1002 0322 All-in-Wonder 2006 PCI-E Edition 7143 RV505 [Radeon X1550 Series] 7145 Radeon Mobility X1400 7146 RV515 [Radeon X1300] 1002 0322 All-in-Wonder 2006 PCI-E Edition 7147 RV505 [Radeon X1550 64-bit] - 7149 M52 [ATI Mobility Radeon X1300] - 714a M52 [ATI Mobility Radeon X1300] - 714b M52 [ATI Mobility Radeon X1300] - 714c M52 [ATI Mobility Radeon X1300] + 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 RV515 [Radeon X1300] - 7152 RV515 GL ATI FireGL V3300 Primary + 714e RV515LE [Radeon X1300] + 7152 RV515GL [FireGL V3300] (Primary) 7153 RV515GL [FireGL V3350] 715e RV515 [Radeon X1300] 715f RV505 CE [Radeon X1550 64-bit] - 7162 RV515 PRO [ATI Radeon X1300/X1550 Series Secondary] + 7162 RV515 PRO [Radeon X1300/X1550 Series] (Secondary) 1002 0323 All-in-Wonder 2006 PCI-E Edition (Secondary) 7166 RV515 [Radeon X1300] (Secondary) 1002 0323 All-in-Wonder 2006 PCI-E Edition (Secondary) - 7172 RV515 GL ATI FireGL V3300 Secondary - 7173 RV515GL [FireGL V3350 Secondary] - 7180 RV516 [ATI Radeon X1300/X1550 Series] - 7181 RV516 XT Radeon X1600 Series Primary - 7183 RV516 [ATI Radeon X1300/X1550 Series] - 7187 RV516 [ATI Radeon X1300/X1550 Series] - 7188 M64-S [ATI Mobility Radeon X2300] - 718a ATI Mobility Radeon X2300 - 718c M62CSP64 [ATI Mobility Radeon X1350] - 718d M64CSP128 [ATI Mobility Radeon X1450] + 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) + 7183 RV516 [Radeon X1300/X1550 Series] + 7187 RV516 [Radeon X1300/X1550 Series] + 7188 M64-S [Mobility Radeon X2300] + 718a Mobility Radeon X2300 + 718c M62CSP64 [Mobility Radeon X1350] + 718d M64CSP128 [Mobility Radeon X1450] 7193 RV516 [Radeon X1550 Series] 719b FireMV 2250 719f RV516LE [Radeon X1550 64-bit] - 71a0 RV516 [ATI Radeon X1300/X1550 Series Secondary] - 71a1 RV516 XT Radeon X1600 Series Secondary - 71a3 RV516 [ATI Radeon X1300 Pro Secondary] - 71a7 RV516 [ATI Radeon X1300/X1550 Series Secondary] - 71bb FireMV 2250 Secondary + 71a0 RV516 [Radeon X1300/X1550 Series] (Secondary) + 71a1 RV516 XT Radeon X1600 Series (Secondary) + 71a3 RV516 [Radeon X1300 Pro] (Secondary) + 71a7 RV516 [Radeon X1300/X1550 Series] (Secondary) + 71bb FireMV 2250 (Secondary) 71c0 RV530 [Radeon X1600] 71c2 RV530 [Radeon X1600] - 71c4 M56GL [ATI Mobility FireGL V5200] + 71c4 M56GL [Mobility FireGL V5200] 17aa 2007 ThinkPad T60p 71c5 M56P [Radeon Mobility X1600] - 71c6 RV530LE [Radeon X1600] + 71c6 RV530LE [Radeon X1600/X1650 PRO] 71c7 RV535 [Radeon X1650 Series] 71ce RV530LE [Radeon X1600] - 71d5 M66-P ATI Mobility Radeon X1700 - 71d6 M66-XT ATI Mobility Radeon X1700 + 71d4 M56GL [Mobility FireGL V5250] + 71d5 M66-P [Mobility Radeon X1700] + 71d6 M66-XT [Mobility Radeon X1700] 71de RV530LE [Radeon X1600] 71e0 RV530 [Radeon X1600] (Secondary) 71e2 RV530 [Radeon X1600] (Secondary) + 71e6 RV530LE [Radeon X1650 PRO] (Secondary) 71e7 RV535 [Radeon X1650 Series] - 7210 M71 [ATI Mobility Radeon X2100] - 7211 M71 [ATI Mobility Radeon X2100 Secondary] + 7210 M71 [Mobility Radeon X2100] + 7211 M71 [Mobility Radeon X2100] (Secondary) 7240 R580 [Radeon X1900] 7241 R580 [Radeon X1900] 7242 R580 [Radeon X1900] @@ -1186,32 +1209,33 @@ 7246 R580 [Radeon X1900] 7247 R580 [Radeon X1900] 7248 R580 [Radeon X1900] - 7249 R580 [Radeon X1900 XT] Primary + 7249 R580 [Radeon X1900 XT] (Primary) 724a R580 [Radeon X1900] 724b R580 [Radeon X1900] - 1002 0b12 Radeon X1900 Primary Display Device - 1002 0b13 Radeon X1900 Secondary Display Device + 1002 0b12 Radeon X1900 (Primary) + 1002 0b13 Radeon X1900 (Secondary) 724c R580 [Radeon X1900] 724d R580 [Radeon X1900] 724e R580 [AMD Stream Processor] - 7269 R580 [Radeon X1900 XT] Secondary + 7269 R580 [Radeon X1900 XT] (Secondary) 726b R580 [Radeon X1900] - 726e R580 [AMD Stream Processor Secondary] - 7280 ATI Radeon X1950 Pro Primary (PCIE) - 7288 ATI Radeon X1950 GT - 7291 ATI Radeon X1650 XT Primary (PCIE) + 726e R580 [AMD Stream Processor] (Secondary) + 7280 Radeon X1950 Pro (Primary) (PCIE) + 7288 Radeon X1950 GT + 7291 Radeon X1650 XT (Primary) (PCIE) 7293 Radeon X1650 Series - 72a0 ATI Radeon X1950 Pro Secondary (PCIE) - 72a8 ATI Radeon X1950 GT Secondary - 72b1 ATI Radeon X1650 XT Secondary (PCIE) - 72b3 ATI Radeon X1650 Series Secondary + 72a0 Radeon X1950 Pro (Secondary) (PCIE) + 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 - 791e ATI Radeon Xpress 1200 Series - 791f ATI Radeon Xpress 1200 Series - 793f ATI Radeon Xpress 1200 Series Secondary + 7919 Radeon X1200 Series Audio Controller + 791e Radeon X1200 Series + 791f Radeon X1200 Series + 793f Radeon X1200 Series (Secondary) 7c37 RV350 AQ [Radeon 9600 SE] cab0 AGP Bridge [IGP 320M] cab2 RS200/RS200M AGP Bridge [IGP 340M] @@ -1285,13 +1309,18 @@ 0035 DP83065 [Saturn] 10/100/1000 Ethernet Controller 0500 SCx200 Bridge 0501 SCx200 SMI - 0502 SCx200 IDE - 0503 SCx200 Audio + 0502 SCx200, SC1100 IDE controller + 100b 0502 IDE Controller + 0503 SCx200, SC1100 Audio Controller + 100b 0503 XpressAudio controller 0504 SCx200 Video 0505 SCx200 XBus 0510 SC1100 Bridge - 0511 SC1100 SMI + 100b 0500 GPIO and LPC support bridge + 0511 SC1100 SMI & ACPI + 100b 0501 SC1100 SMI & ACPI bridge 0515 SC1100 XBus + 100b 0505 SC1100 PCI to XBus bridge d001 87410 IDE 100c Tseng Labs Inc 3202 ET4000/W32p rev A @@ -1518,7 +1547,7 @@ 009f PCI 4758 Cryptographic Accelerator 00a5 ATM Controller (1410a500) 00a6 ATM 155MBPS MM Controller (1410a600) - 00b7 256-bit Graphics Rasterizer [Fire GL1] + 00b7 256-bit Graphics Rasterizer [FireGL1] 1092 00b8 FireGL1 AGP 32Mb 00b8 GXT2000P Graphics Adapter 00be ATM 622MBPS Controller (1410be00) @@ -1552,6 +1581,9 @@ 1014 0259 ServeRAID-5i 01c1 64bit/66MHz PCI ATM 155 UTP 01e6 Cryptographic Accelerator + 01ef PowerPC 440GP PCI Bridge + 1734 102b PCEAS PCI-X Dual Port ESCON Adapter + 1734 10f8 PCEAT PCI-Express Dual Port ESCON Adapter 01ff 10/100 Mbps Ethernet 0219 Multiport Serial Adapter 1014 021a Dual RVX @@ -1572,9 +1604,12 @@ 02bd Obsidian chipset SCSI controller 1014 02c1 PCI-X DDR 3Gb SAS Adapter (572A/572C) 1014 02c2 PCI-X DDR 3Gb SAS RAID Adapter (572B/571D) + 1014 0338 PCI-X266 Auxiliary Cache Adapter (575C) 0302 Winnipeg PCI-X Host Bridge 0308 CalIOC2 PCI-E Root Port 0314 ZISC 036 Neural accelerator card + 0339 Obsidian-E PCI-E SCSI controller + 1014 0360 PCI-E Auxiliary Cache Adapter (57B7) 3022 QLA3022 Network Adapter 4022 QLA3022 Network Adapter ffff MPIC-2 interrupt controller @@ -1586,6 +1621,10 @@ 1019 Elitegroup Computer Systems 101a AT&T GIS (NCR) 0005 100VG ethernet + 1dc1 Bynet + 101a 0019 BIC2M + 101a 001f BIC4M + 101a 0ece BYA4M 101b Vitesse Semiconductor 101c Western Digital 0193 33C193A @@ -1632,6 +1671,16 @@ 1101 K8 [Athlon64/Opteron] Address Map 1102 K8 [Athlon64/Opteron] DRAM Controller 1103 K8 [Athlon64/Opteron] Miscellaneous Control + 1200 Family 10h [Opteron, Athlon64, Sempron] HyperTransport Configuration + 1201 Family 10h [Opteron, Athlon64, Sempron] Address Map + 1202 Family 10h [Opteron, Athlon64, Sempron] DRAM Controller + 1203 Family 10h [Opteron, Athlon64, Sempron] Miscellaneous Control + 1204 Family 10h [Opteron, Athlon64, Sempron] Link Control + 1300 Family 11h HyperTransport Configuration + 1301 Family 11h Address Map + 1302 Family 11h DRAM Controller + 1303 Family 11h Miscellaneous Control + 1304 Family 11h Link Control 2000 79c970 [PCnet32 LANCE] 1014 2000 NetFinity 10/100 Fast Ethernet 1022 2000 PCnet - Fast 79C971 @@ -1661,8 +1710,7 @@ 2003 Am 1771 MBW [Alchemy] 2020 53c974 [PCscsi] 2040 79c974 -# CS5536 [Geode companion] Host Bridge - 2080 Conrad Kostecki + 2080 CS5536 [Geode companion] Host Bridge 2081 Geode LX Video 2082 Geode LX AES Security Block 208f CS5536 GeodeLink PCI South Bridge @@ -1881,7 +1929,7 @@ 0015 PowerEdge Expandable RAID controller 5i 1028 1f01 PERC 5/E Adapter RAID Controller 1028 1f02 PERC 5/i Adapter RAID Controller - 1f03 PERC 5/i + 1028 1f03 PERC 5/i Adapter RAID Controller 1029 Siemens Nixdorf IS 102a LSI Logic 0000 HYDRA @@ -2037,6 +2085,7 @@ 2538 Millenium P650 PCIe 102b 08c7 Millennium P650 PCIe 128MB 102b 0907 Millennium P650 PCIe 64MB + 102b 0947 Parhelia APVe 102b 1047 Millennium P650 LP PCIe 128MB 102b 1087 Millennium P650 LP PCIe 64MB 102b 2538 Parhelia APVe @@ -2179,6 +2228,7 @@ 0180 RAID bus controller 180 SATA/PATA [SiS] 0181 SATA 0182 182 SATA/RAID Controller + 1734 1095 D2030-A1 0186 AHCI Controller (0106) 0190 190 Gigabit Ethernet Adapter 0191 191 Gigabit Ethernet Adapter @@ -2222,6 +2272,7 @@ 0755 755 Host 0760 760/M760 Host 0761 761/M761 Host + 1734 1099 D2030-A1 Motherboard 0900 SiS900 PCI Fast Ethernet 1019 0a14 K7S5A motherboard 1039 0900 SiS900 10/100 Ethernet Adapter @@ -2250,6 +2301,7 @@ 1039 5513 SiS5513 EIDE Controller (A,B step) 1043 8035 CUSI-FX motherboard 1462 7010 MS-6701 motherboard + 1734 1095 D2030-A1 Motherboard 5517 5517 5571 5571 5581 5581 Pentium Chipset @@ -2276,6 +2328,9 @@ 1569 6326 SiS6326 GUI Accelerator 6330 661/741/760 PCI/AGP or 662/761Gx PCIE VGA Display Adapter 1039 6330 [M]661xX/[M]741[GX]/[M]760 PCI/AGP VGA Adapter + 1043 8113 SiS Real 256E (ASUS P5S800-VM motherboard) + 1458 d000 SiS661FX GUI 2D/3D Accelerator + 1734 1099 D2030-A1 6350 770/670 PCIE VGA Display Adapter 6351 771/671 PCIE VGA Display Adapter 7001 USB 1.0 Controller @@ -2283,14 +2338,17 @@ 1039 7000 Onboard USB Controller 1462 5470 K7SOM+ 5.2C Motherboard 1462 7010 MS-6701 motherboard + 1734 1095 D2030-A1 Motherboard 7002 USB 2.0 Controller 1462 7010 MS-6701 motherboard 1509 7002 Onboard USB Controller + 1734 1095 D2030-A1 7007 FireWire Controller 1462 701d MS-6701 7012 AC'97 Sound Controller 1462 7010 MS-6701 motherboard 15bd 1001 DFI 661FX motherboard + 1734 109f D2030-A1 Motherboard # There are may be different modem codecs here (Intel537 compatible and incompatible) 7013 AC'97 Modem Controller 7016 SiS7016 PCI Fast Ethernet Adapter @@ -2302,6 +2360,7 @@ 1025 000e SiS PCI Audio Accelerator 1025 0018 SiS PCI Audio Accelerator 1039 7018 SiS PCI Audio Accelerator + 1043 1453 SiS PCI Audio Accelerator 1043 800b SiS PCI Audio Accelerator 1054 7018 SiS PCI Audio Accelerator 107d 5330 SiS PCI Audio Accelerator @@ -2379,6 +2438,7 @@ 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 2910 E2910A PCIBus Exerciser 2925 E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer 3080 Pavilion ze2028ea @@ -2387,6 +2447,11 @@ 3220 Smart Array P600 103c 3225 3 Gb/s SAS RAID 3230 Smart Array Controller + 103c 3223 Smart Array P800 + 103c 3234 P400 SAS Controller + 103c 3235 P400i SAS Controller + 103c 3237 E500 SAS Controller + 3238 Smart Array E200i (SAS Controller) 4030 zx2 System Bus Adapter 4031 zx2 I/O Controller 4037 PCIe Local Bus Adapter @@ -2714,7 +2779,7 @@ ac56 PCI1510 PC card Cardbus Controller 1014 0512 Thinkpad R50e model 1634 1014 0528 ThinkPad R40e (2684-HVG) Cardbus Controller - 17aa 2012 Thinkpad R60e model 0657 + 17aa 2012 ThinkPad T60/R60 series ac60 PCI2040 PCI to DSP Bridge Controller 175c 5100 ASI51xx Audio Adapter 175c 6100 ASI61xx Audio Adapter @@ -2764,6 +2829,8 @@ 1052 ?Young Micro Systems 1053 Young Micro Systems 1054 Hitachi, Ltd + 3011 ColdFusion 3e Chipset Processor to I/O Controller + 3012 ColdFusion 3e Chipset Memory Controller Hub 1055 Efar Microsystems 9130 SLC90E66 [Victory66] IDE 9460 SLC90E66 [Victory66] ISA @@ -2782,6 +2849,8 @@ 0012 MPC8548 [PowerQUICC III] 0100 MC145575 [HFC-PCI] 0431 KTI829c 100VG + 1073 Nokia N770 + 1219 Nokia N800 1801 DSP56301 Digital Signal Processor 14fb 0101 Transas Radar Imitator Board [RIM] 14fb 0102 Transas Radar Imitator Board [RIM-2] @@ -2858,7 +2927,7 @@ 1059 Teknor Industrial Computers Inc 105a Promise Technology, Inc. 0d30 PDC20265 (FastTrak100 Lite/Ultra100) - 1043 8042 ASUS AV7266-E South Bridge Promise RAID + 1043 8042 AV7266-E South Bridge Promise RAID 105a 4d33 Ultra100 0d38 20263 105a 4d39 Fasttrak66 @@ -2916,13 +2985,15 @@ 7275 PDC20277 (SBFastTrak133 Lite) 8002 SATAII150 SX8 8350 80333 [SuperTrak EX8350/EX16350], 80331 [SuperTrak EX8300/EX16300] - 8650 IOP1348 [SuperTrak EX4650/EX8650/EX8654] + 8650 81348 [SuperTrak EX4650/EX8650/EX8654/EX4650EL] 105a 4600 SuperTrak EX4650 + 105a 4610 SuperTrak EX4650EL 105a 8601 SuperTrak EX8650 105a 8602 SuperTrak EX8654 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 @@ -3267,12 +3338,16 @@ 1648 [bge] Gigabit Ethernet 2bad GEM 5000 Simba Advanced PCI Bridge + 108e 5000 Netra AX1105-500 5043 SunPCI Co-processor + 676e SunPCiIII + 7063 SunPCiII / SunPCiIIpro 8000 Psycho PCI Bus Module 8001 Schizo PCI Bus Module 8002 Schizo+ PCI Bus Module a000 Ultra IIi a001 Ultra IIe + 108e a001 Netra AX1105-500 a801 Tomatillo PCI Bus Module abba Cassini 10/100/1000 108f Systemsoft @@ -3598,11 +3673,15 @@ 1147 VScom 020 2 port parallel adaptor 2540 IXXAT CAN-Interface PC-I 04/PCI 2724 Thales PCSM Security Card + 6520 PCI6520 PCI-X to PCI-X bridge 6540 PCI6540/6466 PCI-PCI bridge (transparent mode) + 1775 1100 CR11 Single Board Computer 4c53 10e0 PSL09 PrPMC 6541 PCI6540/6466 PCI-PCI bridge (non-transparent mode, primary side) + 1775 1100 CR11 Single Board Computer 4c53 10e0 PSL09 PrPMC 6542 PCI6540/6466 PCI-PCI bridge (non-transparent mode, secondary side) + 1775 1100 CR11 Single Board Computer 4c53 10e0 PSL09 PrPMC 8111 PEX 8111 PCI Express-to-PCI Bridge 8114 PEX 8114 PCI Express-to-PCI/PCI-X Bridge @@ -3672,14 +3751,16 @@ 12c7 4001 Intel Dialogic DM/V960-4T1 PCI 12d9 0002 PCI Prosody Card rev 1.5 14b4 d100 Dektec DTA-100 + 14b4 d114 Dektec DTA-120 16df 0011 PIKA PrimeNet MM PCI 16df 0012 PIKA PrimeNet MM cPCI 8 16df 0013 PIKA PrimeNet MM cPCI 8 (without CAS Signaling) 16df 0014 PIKA PrimeNet MM cPCI 4 16df 0015 PIKA Daytona MM 16df 0016 PIKA InLine MM - 9056 Francois + 9056 9056 PCI I/O Accelerator 10b5 2979 CellinkBlade 11 - CPCI board VoATM AAL1 + 14b4 d140 Dektec DTA-140 9060 9060 906d 9060SD 125c 0640 Aries 16000P @@ -3731,6 +3812,7 @@ 0910 3C910-A01 1006 MINI PCI type 3B Data Fax Modem 1007 Mini PCI 56k Winmodem + 10b7 615b Mini PCI 56K Modem 10b7 615c Mini PCI 56K Modem 1201 3c982-TXM 10/100baseTX Dual Port A [Hydra] 1202 3c982-TXM 10/100baseTX Dual Port B [Hydra] @@ -3819,9 +3901,10 @@ 9200 3c905C-TX/TX-M [Tornado] 1028 0095 3C920 Integrated Fast Ethernet Controller 1028 0097 3C920 Integrated Fast Ethernet Controller + 1028 00b4 OptiPlex GX110 1028 00fe Optiplex GX240 1028 012a 3C920 Integrated Fast Ethernet Controller [Latitude C640] - 10b7 1000 3C905C-TX Fast Etherlink for PC Management NIC + 10b7 1000 3C905CX-TX/TX-M Fast Etherlink for PC Management NIC 10b7 7000 10/100 Mini PCI Ethernet Adapter 10f1 2466 Tiger MPX S2466 (3C920 Integrated Fast Ethernet Controller) 9201 3C920B-EMB Integrated Fast Ethernet Controller [Tornado] @@ -4157,8 +4240,8 @@ 1102 1029 3D Blaster RIVA TNT2 Ultra 1102 102f 3D Blaster RIVA TNT2 Ultra 14af 5820 Maxi Gamer Xentor 32 - 002a NV5 [Riva TnT2] - 002b NV5 [Riva TnT2] + 002a NV5 [Riva TNT2] + 002b NV5 [Riva TNT2] 002c NV6 [Vanta/Vanta LT] 1043 0200 AGP-V3800 Combat SDRAM 1043 0201 AGP-V3800 Combat @@ -4196,7 +4279,7 @@ 0041 NV40 [GeForce 6800] 1043 817b V9999 Gamer Edition 0042 NV40.2 [GeForce 6800 LE] - 0043 NV40.3 + 0043 NV40.3 [GeForce 6800 XE] 0044 NV40 [GeForce 6800 XT] 0045 NV40 [GeForce 6800 GT] 0046 NV40 [GeForce 6800 GT] @@ -4207,52 +4290,54 @@ 004d NV40GL [Quadro FX 4000] 004e NV40GL [Quadro FX 4000] 0050 CK804 ISA Bridge - 1043 815a K8N4-E Mainboard + 1043 815a K8N4-E or A8N-E Mainboard 1458 0c11 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond 147b 1c1a KN8-Ultra Mainboard 0051 CK804 ISA Bridge 0052 CK804 SMBus - 1043 815a K8N4-E Mainboard + 1043 815a K8N4-E or A8N-E Mainboard 1458 0c11 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond 147b 1c1a KN8-Ultra Mainboard 0053 CK804 IDE - 1043 815a K8N4-E Mainboard + 1043 815a K8N4-E or A8N-E Mainboard 1458 5002 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond 147b 1c1a KN8-Ultra Mainboard 0054 CK804 Serial ATA Controller + 1043 815a A8N-E Mainboard 1458 b003 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond 147b 1c1a KN8-Ultra Mainboard 0055 CK804 Serial ATA Controller - 1043 815a K8N4-E Mainboard + 1043 815a K8N4-E or A8N-E Mainboard 1458 b003 GA-K8N Ultra-9 Mainboard 147b 1c1a KN8-Ultra Mainboard 0056 CK804 Ethernet Controller 0057 CK804 Ethernet Controller - 1043 8141 K8N4-E Mainboard + 1043 8141 K8N4-E or A8N-E Mainboard 1458 e000 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond 147b 1c1a KN8-Ultra Mainboard 0058 CK804 AC'97 Modem 0059 CK804 AC'97 Audio Controller - 1043 812a K8N4-E Mainboard + 1043 812a K8N4-E or A8N-E Mainboard 147b 1c1a KN8-Ultra Mainboard 005a CK804 USB Controller - 1043 815a K8N4-E Mainboard + 1043 815a K8N4-E or A8N-E Mainboard 1458 5004 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond 147b 1c1a KN8-Ultra Mainboard 005b CK804 USB Controller - 1043 815a K8N4-E Mainboard + 1043 815a K8N4-E or A8N-E Mainboard 1458 5004 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond 147b 1c1a KN8-Ultra Mainboard 005c CK804 PCI Bridge 005d CK804 PCIE Bridge 005e CK804 Memory Controller + 1043 815a A8N-E Mainboard 10f1 2891 Thunder K8SRE Mainboard 1458 5000 GA-K8N Ultra-9 Mainboard 1462 7100 MSI K8N Diamond @@ -4301,15 +4386,15 @@ 0091 G70 [GeForce 7800 GTX] 0092 G70 [GeForce 7800 GT] 0093 G70 [GeForce 7800 GS] - 0098 GeForce Go 7800 - 0099 GE Force Go 7800 GTX - 009d G70GL [Quadro FX4500] + 0098 G70 [GeForce Go 7800] + 0099 G70 [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] + 00c3 NV42 [GeForce 6800 XT] 00c8 NV41.8 [GeForce Go 6800] 00c9 NV41.9 [GeForce Go 6800 Ultra] 00cc NV41 [Quadro FX Go1400] @@ -4329,59 +4414,70 @@ 00da nForce3 Audio 00dd nForce3 PCI Bridge 00df CK8S Ethernet Controller + 1043 80a7 K8N-E 105b 0c43 Winfast NF3250K8AA 147b 1c0b NF8 Mainboard 00e0 nForce3 250Gb LPC Bridge + 1043 813f K8N-E 10de 0c11 Winfast NF3250K8AA 1462 7030 K8N Neo-FSR v2.0 147b 1c0b NF8 Mainboard 00e1 nForce3 250Gb Host Bridge + 1043 813f K8N-E 1462 7030 K8N Neo-FSR v2.0 147b 1c0b NF8 Mainboard 00e2 nForce3 250Gb AGP Host to PCI Bridge 00e3 CK8S Serial ATA Controller (v2.5) + 1043 813f K8N-E 105b 0c43 Winfast NF3250K8AA 147b 1c0b NF8 Mainboard 00e4 nForce 250Gb PCI System Management + 1043 813f K8N-E 105b 0c43 Winfast NF3250K8AA 1462 7030 K8N Neo-FSR v2.0 147b 1c0b NF8 Mainboard 00e5 CK8S Parallel ATA Controller (v2.5) + 1043 813f K8N-E 105b 0c43 Winfast NF3250K8AA 1462 7030 K8N Neo-FSR v2.0 147b 1c0b NF8 Mainboard 00e6 CK8S Ethernet Controller 00e7 CK8S USB Controller + 1043 813f K8N-E 105b 0c43 Winfast NF3250K8AA 1462 7030 K8N Neo-FSR v2.0 147b 1c0b NF8 Mainboard 00e8 nForce3 EHCI USB 2.0 Controller + 1043 813f K8N-E 105b 0c43 Winfast NF3250K8AA 1462 7030 K8N Neo-FSR v2.0 147b 1c0b NF8 Mainboard 00ea nForce3 250Gb AC'97 Audio Controller + 1043 819d K8N-E 105b 0c43 Winfast NF3250K8AA + 1462 b010 K8N Neo-FSR v2.0 147b 1c0b NF8 Mainboard 00ed nForce3 250Gb PCI-to-PCI Bridge 00ee CK8S Serial ATA Controller (v2.5) - 00f0 NV40 [GeForce 6800/GeForce 6800 Ultra] - 00f1 NV43 [GeForce 6600/GeForce 6600 GT] + 00f0 NV40 [GeForce 6800 Ultra] + 00f1 NV43 [GeForce 6600 GT] 1043 81a6 N6600GT TD 128M AGP + 1458 3150 GV-N66T128VP 1682 2119 GeForce 6600 GT AGP 128MB DDR3 DUAL DVI TV - 00f2 NV43 [GeForce 6600/GeForce 6600 GT] + 00f2 NV43 [GeForce 6600] 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 6600 GS] + 00f6 NV43 [GeForce 6800 GS] 1682 217e XFX GeForce 6800 XTreme 256MB DDR3 AGP 00f8 NV45GL [Quadro FX 3400/4400] - 00f9 NV40 [GeForce 6800 Ultra/GeForce 6800 GT] + 00f9 NV45 [GeForce 6800 GTO] 1682 2120 GEFORCE 6800 GT PCI-E 00fa NV36 [GeForce PCX 5750] 00fb NV35 [GeForce PCX 5900] 00fc NV37GL [Quadro FX 330/GeForce PCX 5300] - 00fd NV37GL [Quadro FX 330/Quadro NVS280] + 00fd NV37GL [Quadro PCI-E Series] 00fe NV38GL [Quadro FX 1300] 00ff NV18 [GeForce PCX 4300] 0100 NV10 [GeForce 256 SDR] @@ -4410,6 +4506,7 @@ 1048 0c4b GLoria II-64 Pro DVII 0110 NV11 [GeForce2 MX/MX 400] 1043 4015 AGP-V7100 Pro + 1043 4021 V7100 Deluxe Combo 1043 4031 V7100 Pro with TV output 1048 0c60 Gladiac MX 1048 0c61 Gladiac 511PCI @@ -4422,20 +4519,23 @@ 1462 8817 MSI GeForce2 MX400 Pro32S [MS-8817] 14af 7102 3D Prophet II MX 14af 7103 3D Prophet II MX Dual-Display - 0111 NV11DDR [GeForce2 MX 100 DDR/200 DDR] + 0111 NV11DDR [GeForce2 MX200] 0112 NV11 [GeForce2 Go] 0113 NV11GL [Quadro2 MXR/EX/Go] 0140 NV43 [GeForce 6600 GT] 0141 NV43 [GeForce 6600] + 1043 81b0 EN6600 Silencer 1458 3124 GV-NX66128DP Turbo Force Edition - 0142 NV43 [GeForce 6600 PCIe] + 0142 NV43 [GeForce 6600 LE] + 0143 NV43 [GeForce 6600 VE] 0144 NV43 [GeForce Go 6600] 0145 NV43 [GeForce 6610 XL] 0146 NV43 [Geforce Go 6600TE/6200TE] + 0147 GeForce 6700 XL 0148 NV43 [GeForce Go 6600] 0149 NV43 [GeForce Go 6600 GT] 014a Quadro NVS 440 - 014c Quadro FX 550 + 014c Quadro FX 540 MXM 014d NV18GL [Quadro FX 550] 014e NV43GL [Quadro FX 540] 014f NV43 [GeForce 6200] @@ -4453,14 +4553,17 @@ 0152 NV15BR [GeForce2 Ultra, Bladerunner] 1048 0c56 GLADIAC Ultra 0153 NV15GL [Quadro2 Pro] + 0160 GeForce 6500 0161 NV44 [GeForce 6200 TurboCache(TM)] - 0162 NV44 [GeForce 6200 SE TurboCache (TM)] + 0162 NV44 [GeForce 6200SE TurboCache (TM)] 0163 NV44 [GeForce 6200 LE] 0164 NV44 [GeForce Go 6200] 0165 NV44 [Quadro NVS 285] 0166 NV43 [GeForce Go 6400] - 0167 GeForce Go 6200 TurboCache - 0168 NV43 [GeForce Go 6200 TurboCache] + 0167 NV43 [GeForce Go 6200/6400] + 0168 NV43 [GeForce Go 6200/6400] + 0169 GeForce 6250 + 016a GeForce 7100 GS 0170 NV17 [GeForce4 MX 460] 0171 NV17 [GeForce4 MX 440] 10b0 0002 Gainward Pro/600 TV @@ -4478,9 +4581,9 @@ 4c53 1090 Cx9 / Vx9 mainboard 0177 NV17 [GeForce4 460 Go] 0178 NV17GL [Quadro4 550 XGL] - 0179 NV17 [GeForce4 420 Go 32M] + 0179 NV17 [GeForce4 440 Go 64M] 10de 0179 GeForce4 MX (Mac) - 017a NV17GL [Quadro4 200/400 NVS] + 017a NV17GL [Quadro NVS] 017b NV17GL [Quadro4 550 XGL] 017c NV17GL [Quadro4 500 GoGL] 017d NV17 [GeForce4 410 Go 16M] @@ -4493,14 +4596,19 @@ 147b 8f0d Siluro GF4 MX-8X 0182 NV18 [GeForce4 MX 440SE AGP 8x] 0183 NV18 [GeForce4 MX 420 AGP 8x] - 0185 NV18 [GeForce4 MX 4000 AGP 8x] + 0184 NV18 [GeForce4 MX] + 0185 NV18 [GeForce4 MX 4000] 0186 NV18M [GeForce4 448 Go] 0187 NV18M [GeForce4 488 Go] 0188 NV18GL [Quadro4 580 XGL] - 018a NV18GL [Quadro4 NVS AGP 8x] + 018a NV18GL [Quadro NVS with AGP8X] 018b NV18GL [Quadro4 380 XGL] - 018c Quadro NVS 50 PCI + 018c NV18GL [Quadro NVS 50 PCI] 018d NV18M [GeForce4 448 Go] + 0191 G80 [GeForce 8800 GTX] + 0193 G80 [GeForce 8800 GTS] + 019d G80 [Quadro FX 5600] + 019e G80 [Quadro FX 4600] 01a0 NVCrush11 [GeForce2 MX Integrated Graphics] 01a4 nForce CPU bridge 01ab nForce 420 Memory Controller (DDR) @@ -4516,15 +4624,18 @@ 01c1 nForce AC'97 Modem Controller 01c2 nForce USB Controller 01c3 nForce Ethernet Controller - 01d1 GeForce 7300 LE + 01d1 G72 [GeForce 7300 LE] 1462 0345 7300LE PCI Express Graphics Adapter + 01d3 G72 [GeForce 7300 SE] 01d6 GeForce Go 7200 - 01d7 Quadro NVS 110M / GeForce Go 7300 - 01d8 GeForce Go 7400 - 01da Quadro NVS 110M - 01de Quadro FX 350 + 01d7 G72M [Quadro NVS 110M/GeForce Go 7300] + 01d8 G72M [GeForce Go 7400] + 01da G72M [Quadro NVS 110M] + 01dc G72GL [Quadro FX 350M] + 01dd G72 [GeForce 7500 LE] + 01de G72GL [Quadro FX 350] 10de 01dc Quadro FX Go350M - 01df GeForce 7300 GS + 01df G71 [GeForce 7300 GS] 01e0 nForce2 AGP (different version?) 147b 1c09 NV7 Motherboard 01e8 nForce2 AGP @@ -4555,15 +4666,20 @@ 0215 NV40 [GeForce 6800 GT] 0218 NV40 [GeForce 6800 XT] 0221 NV44A [GeForce 6200] + 3842 a341 256A8N341DX + 0222 GeForce 6200 A-LE 0240 C51PV [GeForce 6150] + 1043 81cd A8N-VM CSM 1462 7207 K8NGM2 series - 0241 C51 PCI Express Bridge + 0241 C51 [GeForce 6150 LE] 0242 C51G [GeForce 6100] 0243 C51 PCI Express Bridge - 0244 C51 PCI Express Bridge - 0245 C51 PCI Express Bridge + 0244 C51 [Geforce 6150 Go] + 10de 0244 C51 [Geforce 6150 Go] + 0245 C51 [Quadro NVS 210S/GeForce 6150LE] 0246 C51 PCI Express Bridge - 0247 C51 PCI Express Bridge + 0247 MCP51 PCI-X GeForce Go 6100 + 1043 1382 MCP51 PCI-X GeForce Go 6100 0248 C51 PCI Express Bridge 0249 C51 PCI Express Bridge 024a C51 PCI Express Bridge @@ -4583,37 +4699,53 @@ 0259 NV25GL [Quadro4 750 XGL] 025b NV25GL [Quadro4 700 XGL] 0260 MCP51 LPC Bridge + 1043 81bc A8N-VM CSM Mainboard + 1458 5001 GA-M55plus-S3G 1462 7207 K8NGM2 series 0261 MCP51 LPC Bridge 0262 MCP51 LPC Bridge 0263 MCP51 LPC Bridge 0264 MCP51 SMBus + 1043 81bc A8N-VM CSM Mainboard 1462 7207 K8NGM2 series 0265 MCP51 IDE + 1043 81bc A8N-VM CSM Mainboard 1462 7207 K8NGM2 series 0266 MCP51 Serial ATA Controller + 1043 81bc A8N-VM CSM Mainboard 1462 7207 K8NGM2 series 0267 MCP51 Serial ATA Controller + 1043 81bc A8N-VM CSM Mainboard 1462 7207 K8NGM2 series 0268 MCP51 Ethernet Controller 0269 MCP51 Ethernet Controller + 1043 8141 A8N-VM CSM Mainboard 1462 7207 K8NGM2 series 026a MCP51 MCI 026b MCP51 AC97 Audio Controller 026c MCP51 High Definition Audio + 10de cb84 A8N-VM CSM Mainboard 1462 7207 K8NGM2 series 026d MCP51 USB Controller + 1043 81bc A8N-VM CSM Mainboard 1462 7207 K8NGM2 series 026e MCP51 USB Controller + 1043 81bc A8N-VM CSM Mainboard 1462 7207 K8NGM2 series 026f MCP51 PCI Bridge 0270 MCP51 Host Bridge + 1043 81bc A8N-VM CSM Mainboard + 1458 5001 GA-M55plus-S3G 1462 7207 K8NGM2 series 0271 MCP51 PMU 0272 MCP51 Memory Controller 0 027e C51 Memory Controller 2 + 1043 81cd A8N-VM CSM Mainboard + 1458 5000 GA-M55plus-S3G 1462 7207 K8NGM2 series 027f C51 Memory Controller 3 + 1043 81cd A8N-VM CSM Mainboard + 1458 5000 GA-M55plus-S3G 1462 7207 K8NGM2 series 0280 NV28 [GeForce4 Ti 4800] 0281 NV28 [GeForce4 Ti 4200 AGP 8x] @@ -4621,24 +4753,34 @@ 0286 NV28 [GeForce4 Ti 4200 Go AGP 8x] 0288 NV28GL [Quadro4 980 XGL] 0289 NV28GL [Quadro4 780 XGL] - 028c NV28GLM [Quadro4 700 GoGL] - 0290 GeForce 7900 GTX - 0291 GeForce 7900 GT - 0292 GeForce 7900 GS + 028c NV28GLM [Quadro4 Go700] + 0290 G71 [GeForce 7900 GTX] + 0291 G71 [GeForce 7900 GT/GTO] + 10de 042b NX7900GTO-T2D512E [7900 GTO] + 0292 G71 [GeForce 7900 GS] + 0293 G71 [GeForce 7900 GX2] + 0294 G71 [GeForce 7950 GX2] + 0295 G71 [GeForce 7950 GT] + 107d 2a68 WinFast PX7950GT TDH + 0297 GeForce Go 7950 GTX 0298 GeForce Go 7900 GS 0299 GeForce Go 7900 GTX 029a G71 [Quadro FX 2500M] 029b G71 [Quadro FX 1500M] - 029c Quadro FX 5500 - 029d Quadro FX 3500 - 029e Quadro FX 1500 - 029f Quadro FX 4500 X2 + 029c G71 [Quadro FX 5500] + 029d G71GL [Quadro FX 3500] + 029e G71 [Quadro FX 1500] + 029f G70 [Quadro FX 4500 X2] # Xbox Graphics Processing Unit (Integrated). GeForce3 derivative (NV20 < NV2A < NV25). 02a0 NV2A [XGPU] - 02e1 GeForce 7600 GS + 02e0 GeForce 7600 GT + 02e1 G73 [GeForce 7600 GS] + 02e2 GeForce 7300 GT 02f0 C51 Host Bridge + 1043 81cd A8N-VM CSM Mainboard 1462 7207 K8NGM2 series 02f1 C51 Host Bridge + 1458 5000 GA-M55plus-S3G 02f2 C51 Host Bridge 02f3 C51 Host Bridge 02f4 C51 Host Bridge @@ -4646,17 +4788,27 @@ 02f6 C51 Host Bridge 02f7 C51 Host Bridge 02f8 C51 Memory Controller 5 + 1043 81cd A8N-VM CSM Mainboard + 1458 5000 GA-M55plus-S3G 1462 7207 K8NGM2 series 02f9 C51 Memory Controller 4 + 1043 81cd A8N-VM CSM Mainboard + 1458 5000 GA-M55plus-S3G 1462 7207 K8NGM2 series 02fa C51 Memory Controller 0 + 1043 81cd A8N-VM CSM Mainboard + 1458 5000 GA-M55plus-S3G 1462 7207 K8NGM2 series 02fb C51 PCI Express Bridge 02fc C51 PCI Express Bridge 02fd C51 PCI Express Bridge 02fe C51 Memory Controller 1 + 1043 81cd A8N-VM CSM Mainboard + 1458 5000 GA-M55plus-S3G 1462 7207 K8NGM2 series 02ff C51 Host Bridge + 1043 81cd A8N-VM CSM Mainboard + 1458 5000 GA-M55plus-S3G 1462 7207 K8NGM2 series 0300 NV30 [GeForce FX] 0301 NV30 [GeForce FX 5800 Ultra] @@ -4672,17 +4824,18 @@ 0317 NV31M Pro 031a NV31M [GeForce FX Go5600] 031b NV31M [GeForce FX Go5650] - 031c NVIDIA Quadro FX Go700 + 031c Quadro FX Go700 031d NV31GLM 031e NV31GLM Pro 031f NV31GLM Pro 0320 NV34 [GeForce FX 5200] 0321 NV34 [GeForce FX 5200 Ultra] 0322 NV34 [GeForce FX 5200] + 1043 02fb V9250 Magic 1462 9171 MS-8917 (FX5200-T128) 1462 9360 MS-8936 (FX5200-T128) 0323 NV34 [GeForce FX 5200LE] - 0324 NV34M [GeForce FX Go5200] + 0324 NV34M [GeForce FX Go5200 64M] 1028 0196 Inspiron 5160 1071 8160 MIM2000 0325 NV34M [GeForce FX Go5250] @@ -4704,6 +4857,7 @@ 0338 NV35GL [Quadro FX 3000] 033f NV35GL [Quadro FX 700] 0341 NV36.1 [GeForce FX 5700 Ultra] + 1462 9380 MS-8938 (FX5700U-TD128) 0342 NV36.2 [GeForce FX 5700] 0343 NV36 [GeForce FX 5700LE] 0344 NV36.4 [GeForce FX 5700VE] @@ -4741,14 +4895,23 @@ 0377 MCP55 PCI Express bridge 0378 MCP55 PCI Express bridge 037a MCP55 Memory Controller + 037c G70 [GeForce 7800 GS] (rev a2) 037e MCP55 SATA Controller 037f MCP55 SATA Controller + 0390 GeForce 7650 GS 0391 G70 [GeForce 7600 GT] + 1458 3427 GV-NX76T128D-RH 0392 G70 [GeForce 7600 GS] 1462 0622 NX7600GS-T2D256EH 0393 G70 [GeForce 7300 GT] + 0394 G70 [GeForce 7600 LE] + 0395 G70 [GeForce 7300 GT] + 0397 GeForce Go 7700 0398 G70 [GeForce Go 7600] - 039e Quadro FX 560 + 1025 006c Acer 9814 WKMI + 039b GeForce Go 7900 SE + 039c Quadro FX 550M + 039e G73GL [Quadro FX 560] 03a0 C55 Host Bridge 03a1 C55 Host Bridge 03a2 C55 Host Bridge @@ -4835,8 +4998,13 @@ 045d MCP65 SATA Controller 045e MCP65 SATA Controller 045f MCP65 SATA Controller + 055c MCP67 High Definition Audio + 055d MCP67 High Definition Audio + c615 G70 [GeForce 7600 GT] 10df Emulex Corporation 1ae5 LP6000 Fibre Channel Host Adapter + f011 Saturn: LightPulse Fibre Channel Host Adapter + f015 Saturn: LightPulse Fibre Channel Host Adapter f085 LP850 Fibre Channel Host Adapter f095 LP952 Fibre Channel Host Adapter f098 LP982 Fibre Channel Host Adapter @@ -4848,6 +5016,7 @@ f0e1 Zephyr LightPulse Fibre Channel Host Adapter f0e5 Zephyr LightPulse Fibre Channel Host Adapter f0f5 Neptune LightPulse Fibre Channel Host Adapter + f100 Saturn-X: LightPulse Fibre Channel Host Adapter f700 LP7000 Fibre Channel Host Adapter f701 LP7000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2) f800 LP8000 Fibre Channel Host Adapter @@ -4862,6 +5031,7 @@ fc00 Thor-X LightPulse Fibre Channel Host Adapter fc10 Helios-X LightPulse Fibre Channel Host Adapter fc20 Zephyr-X LightPulse Fibre Channel Host Adapter + fc40 Saturn-X: LightPulse Fibre Channel Host Adapter fd00 Helios-X LightPulse Fibre Channel Host Adapter fe00 Zephyr-X LightPulse Fibre Channel Host Adapter ff00 Neptune LightPulse Fibre Channel Host Adapter @@ -4882,6 +5052,7 @@ 0000 CA91C042 [Universe] 0108 Tsi108 Host Bridge for Single PowerPC 0148 Tsi148 [Tempe] + 1775 1100 VR11 Single Board Computer 0860 CA91C860 [QSpan] 0862 CA91C862A [QSpan-II] 8260 CA91L8200B [Dual PCI PowerSpan II] @@ -4906,10 +5077,12 @@ 80d7 PCI-9112 80d9 PCI-9118 80da PCI-9812 + 80fc APCI1500 Signal processing controller (16 dig. inputs + 16 dig. outputs) 811a PCI-IEEE1355-DS-DE Interface 814c Fastcom ESCC-PCI (Commtech, Inc.) 8170 S5933 [Matchmaker] (Chipset Development Tool) 81e6 Multimedia video controller + 828d APCI3001 Signal processing controller (up to 16 analog inputs) 8291 Fastcom 232/8-PCI (Commtech, Inc.) 82c4 Fastcom 422/4-PCI (Commtech, Inc.) 82c5 Fastcom 422/2-PCI (Commtech, Inc.) @@ -4918,6 +5091,8 @@ 82ca Fastcom 232/4-PCI (Commtech, Inc.) 82db AJA HDNTV HD SDI Framestore 82e2 Fastcom DIO24H-PCI (Commtech, Inc.) + 8406 PCIcanx/PCIcan CAN interface [Kvaser AB] + 8407 PCIcan II CAN interface (A1021, PCB-07, PCB-08) [Kvaser AB] 8851 S5933 on Innes Corp FM Radio Capture card 10e9 Alps Electric Co., Ltd. 10ea Intergraphics Systems @@ -4936,8 +5111,15 @@ 8111 Twist3 Frame Grabber 10ec Realtek Semiconductor Co., Ltd. 0139 Zonet Zen3200 - 0883 High Definition Audio + 0260 Realtek 260 High Definition Audio + 0261 Realtek 261 High Definition Audio + 0280 Realtek 280 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 + 0888 Realtek 888 High Definition Audio 8029 RTL-8029(AS) 10b8 2011 EZ-Card (SMC1208) 10ec 8029 RTL-8029(AS) @@ -4955,10 +5137,12 @@ 1025 8920 ALN-325 1025 8921 ALN-325 103c 006a NX9500 + 1043 1045 L8400B or L3C/S notebook 1043 8109 P5P800-MX Mainboard 1071 8160 MIM2000 10bd 0320 EP-320X-R 10ec 8139 RT8139 + 10f7 8338 Panasonic CF-Y5 laptop 1113 ec01 FNC-0107TX 1186 1300 DFE-538TX 1186 1320 SN5200 @@ -4969,6 +5153,7 @@ 1429 d010 ND010 1432 9130 EN-9130TX 1436 8139 RT8139 + 144d c00c P30/P35 notebook 1458 e000 GA-7VM400M/7VT600 Motherboard 1462 788c 865PE Neo2-V Mainboard 146c 1439 FE-1439TX @@ -4977,6 +5162,7 @@ 149c 139a LFE-8139ATX 149c 8139 LFE-8139TX 14cb 0200 LNR-100 Family 10/100 Base-TX Ethernet + 1565 2300 P4TSV Onboard LAN (RTL8100B) 1695 9001 Onboard RTL8101L 10/100 MBit 1799 5000 F5D5000 PCI Card/Desktop Network PCI Card 1904 8139 RTL8139D Fast Ethernet Adapter @@ -4984,14 +5170,19 @@ 8e2e 7000 KF-230TX 8e2e 7100 KF-230TX/2 a0a0 0007 ALN-325C - 8167 RTL-8169SC Gigabit Ethernet + 8167 RTL-8110SC/8169SC Gigabit Ethernet + 1462 235c P965 Neo MS-7235 mainboard 8168 RTL8111/8168B PCI Express Gigabit Ethernet controller 8169 RTL-8169 Gigabit Ethernet 1025 0079 Aspire 5024WLMi 1259 c107 CG-LAPCIGT 1371 434e ProG-2000L 1458 e000 GA-8I915ME-G Mainboard + 1462 030c K8N Neo-FSR v2.0 mainboard 1462 702c K8T NEO 2 motherboard + 1462 7094 K8T Neo2-F V2.0 + 1734 1091 D2030-A1 + a0a0 0449 AK86-L motherboard 8180 RTL8180L 802.11b MAC 8185 RTL-8185 IEEE 802.11a/b/g Wireless LAN Controller 8197 SmartLAN56 56K Modem @@ -5010,6 +5201,7 @@ 3fc4 RME Digi9652 (Hammerfall) 3fc5 RME Hammerfall DSP 3fc6 RME Hammerfall DSP MADI + 8380 Ellips ProfiXpress Profibus Master 8381 Ellips Santos Frame Grabber d154 Copley Controls CAN card (PCI-CAN-02) 10ef Racore Computer Products, Inc. @@ -5071,8 +5263,10 @@ 1102 0051 SB0090 Audigy Player 1102 0053 SB0090 Audigy Player/OEM 1102 0058 SB0090 Audigy Player/OEM + 1102 1002 SB Audigy2 ZS 1102 1007 SB0240 Audigy 2 Platinum 6.1 1102 2002 SB Audigy 2 ZS (SB0350) + 1102 4001 E-MU 1010 0005 SB X-Fi 1102 0021 X-Fi Platinum 1102 1003 X-Fi XtremeMusic @@ -5116,13 +5310,16 @@ 0003 HPT343/345/346/363 0004 HPT366/368/370/370A/372/372N 1103 0001 HPT370A + 1103 0003 HPT343 / HPT345 / HPT363 UDMA33 1103 0004 HPT366 UDMA66 (r1) / HPT368 UDMA66 (r2) / HPT370 UDMA100 (r3) / HPT370 UDMA100 RAID (r4) 1103 0005 HPT370 UDMA100 + 1103 0006 HPT302/302N 0005 HPT372A/372N 0006 HPT302/302N 0007 HPT371/371N 0008 HPT374 0009 HPT372N + 2340 RocketRAID 2340 16 Port SATA-II Controller 1104 RasterOps Corp. 1105 Sigma Designs, Inc. 1105 REALmagic Xcard MPEG 1/2/3/4 DVD Decoder @@ -5140,7 +5337,7 @@ 1106 VIA Technologies, Inc. 0102 Embedded VIA Ethernet Controller 0130 VT6305 1394.A Controller -# Wrong ID found on Jetway K8M8MS + 0198 P4X600 Host Bridge 0204 K8M800 Host Bridge 0208 PT890 Host Bridge 0238 K8T890 Host Bridge @@ -5166,6 +5363,7 @@ 0340 PT900 Host Bridge 0351 VT3351 Host Bridge 0364 P4M900 Host Bridge + 1043 81ce P5VD2-VM mothervoard 0391 VT8371 [KX133] 0501 VT8501 [Apollo MVP4] 0505 VT82C505 @@ -5183,6 +5381,8 @@ 1297 f641 FX41 motherboard 1458 5002 GA-7VAX Mainboard 1462 7020 K8T NEO 2 motherboard + 1462 7094 K8T Neo2-F V2.0 + 1462 7181 K8MM3-V mainboard 147b 1407 KV8-MAX3 motherboard 1849 0571 K7VT2/K7VT6 motherboard 0576 VT82C576 3V [Apollo Master] @@ -5240,6 +5440,7 @@ 1364 P4M900 Host Bridge 1571 VT82C576M/VT82C586 1595 VT82C595/97 [Apollo VP2/97] + 2106 VIA Rhine Family Fast Ethernet Adapter (VT6105) 2204 K8M800 Host Bridge 2208 PT890 Host Bridge 2238 K8T890 Host Bridge @@ -5275,6 +5476,8 @@ 1179 0001 Magnia Z310 1458 5004 GA-7VAX Mainboard 1462 7020 K8T NEO 2 motherboard + 1462 7094 K8T Neo2-F V2.0 + 1462 7181 K8MM3-V mainboard 147b 1407 KV8-MAX3 motherboard 182d 201d CN-029 USB2.0 4 port PCI Card 1849 3038 K7VT6 @@ -5284,8 +5487,9 @@ 1106 0100 VT86C100A Fast Ethernet Adapter 1186 1400 DFE-530TX rev A 3044 IEEE 1394 Host Controller + 0010 0001 IEEE 1394 4port DCST 1394-3+1B 1025 005a TravelMate 290 - 1043 808a A8V Deluxe + 1043 808a A8V Deluxe or A8N-VM CSM Mainboard 1458 1000 GA-7VT600-1394 Motherboard 1462 207d K8NGM2 series motherboard 1462 702d K8T NEO 2 motherboard @@ -5318,24 +5522,30 @@ 1043 80a1 A7V8X-X Motherboard 1043 80b0 A7V600/K8V-X/K8V Deluxe motherboard (ADI AD1980 codec [SoundMAX]) 1043 812a A8V Deluxe motherboard (Realtek ALC850 codec) + 10ec 8168 High Definition Audio 1106 3059 L7VMM2 Motherboard 1106 4161 K7VT2 motherboard 1106 4170 PCPartner P4M800-8237R Motherboard 1106 4552 Soyo KT-600 Dragon Plus (Realtek ALC 650) 1297 c160 FX41 motherboard (Realtek ALC650 codec) + 1413 147b KV8 Pro motherboard onboard audio 1458 a002 GA-7VAX Onboard Audio (Realtek ALC650) 1462 0080 K8T NEO 2 motherboard 1462 3800 KT266 onboard audio + 1462 7181 K8MM3-V mainboard 147b 1407 KV8-MAX3 motherboard + 1849 0850 ASRock 775Dual-880 Pro onboard audio (Realtek ALC850) 1849 9761 K7VT6 motherboard 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 3065 VT6102 [Rhine-II] 1043 80a1 A7V8X-X Motherboard 1106 0102 VT6102 [Rhine II] Embeded Ethernet Controller on VT8235 1186 1400 DFE-530TX rev A 1186 1401 DFE-530TX rev B 13b9 1421 LD-10/100AL PCI Fast Ethernet Adapter (rev.B) + 1462 7181 K8MM3-V mainboard 147b 1c09 NV7 Motherboard 1695 3005 VT6103 1695 300c Realtek ALC655 sound chip @@ -5361,6 +5571,8 @@ 1297 f641 FX41 motherboard 1458 5004 GA-7VAX Mainboard 1462 7020 K8T NEO 2 motherboard + 1462 7094 K8T Neo2-F V2.0 + 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 @@ -5385,10 +5597,13 @@ 1043 80ed A7V600/K8V Deluxe/K8V-X/A8V Deluxe motherboard 1458 b003 GA-7VM400AM(F) Motherboard 1462 7020 K8T Neo 2 Motherboard + 1462 7094 K8T Neo2-F V2.0 147b 1407 KV8-MAX3 motherboard 147b 1408 KV7 1849 3149 K7VT6 motherboard + a0a0 04ad AK86-L motherboard 3156 P/KN266 Host Bridge + 3157 CX700M2 UniChrome PRO II Graphics 3164 VT6410 ATA133 RAID controller 1043 80f4 P4P800 Mainboard Deluxe ATX 1462 7028 915P/G Neo2 @@ -5416,10 +5631,11 @@ 3218 K8T800M Host Bridge 3227 VT8237 ISA bridge [KT600/K8T800/K8T890 South] 1043 80ed A7V600/K8V-X/A8V Deluxe motherboard - 1106 3227 DFI KT600-AL Motherboard + 1106 3227 DFI KT600-AL / Soltek SL-B9D-FGR Motherboard 1458 5001 GA-7VT600 Motherboard 147b 1407 KV8-MAX3 motherboard 1849 3227 K7VT4 motherboard + 3230 K8M890 [Chrome9] Integrated Video 3238 K8T890 Host Bridge 3249 VT6421 IDE RAID Controller 324a CX700 PCI to PCI Bridge @@ -5427,6 +5643,7 @@ 324e CX700 Internal Module Bus 3258 PT880 Host Bridge 3259 CN400/PM880 Host Bridge + 3260 VIA Chrome9 HC IGP 3269 KT880 Host Bridge 3282 K8T800Pro Host Bridge 3287 VT8251 PCI to ISA Bridge @@ -5438,10 +5655,13 @@ 3336 K8M890CE Host Bridge 3337 VT8237A PCI to ISA Bridge 3340 PT900 Host Bridge + 3343 UniChrome Pro IGP [VIA P4M890 Chipset] 3344 UniChrome Pro IGP 3349 VT8251 AHCI/SATA 4-Port Controller 3351 VT3351 Host Bridge 3364 P4M900 Host Bridge + 3371 Chrome9 HC IGP + 3372 VT8237S PCI to ISA Bridge 337a VT8237A PCI to PCI Bridge 337b VT8237A Host Bridge 4149 VIA VT6420 (ATA133) Controller @@ -5468,13 +5688,16 @@ 5238 K8T890 I/O APIC Interrupt Controller 5290 K8M890 I/O APIC Interrupt Controller 5308 PT894 I/O APIC Interrupt Controller + 5324 CX700M2 IDE 5327 P4M890 I/O APIC Interrupt Controller 5336 K8M890CE I/O APIC Interrupt Controller 5340 PT900 I/O APIC Interrupt Controller 5351 VT3351 I/O APIC Interrupt Controller 5364 P4M900 I/O APIC Interrupt Controller 6100 VT85C100A [Rhine II] + 6287 SATA RAID Controller 6327 P4M890 Security Device + 6364 P4M900 Security Device 7204 K8M800 Host Bridge 7205 VT8378 [S3 UniChrome] Integrated Video 1458 d000 Gigabyte GA-7VM400(A)M(F) Motherboard @@ -5634,11 +5857,7 @@ 000a GDT 6115/6515 000b GDT 6125/6525 000c GDT 6535 - 000d GDT 6555 - 0010 GDT 6115/6515 - 0011 GDT 6125/6525 - 0012 GDT 6535 - 0013 GDT 6555/6555-ECC + 000d GDT 6555/6555-ECC 0100 GDT 6117RP/6517RP 0101 GDT 6127RP/6527RP 0102 GDT 6537RP @@ -5695,6 +5914,7 @@ 0261 GDT 7529RN/7629RN 02ff GDT MAXRP 0300 GDT NEWRX + 0301 GDT NEWRX2 111a Efficient Networks, Inc 0000 155P-MF1 (FPGA) 0002 155P-MF1 (ASIC) @@ -5752,7 +5972,9 @@ 1130 Computervision 1131 Philips Semiconductors 1561 USB 1.1 Host Controller + 1775 c200 C2K onboard USB 1.1 host controller 1562 USB 2.0 Host Controller + 1775 c200 C2K onboard USB 2.0 host controller 3400 SmartPCI56(UCB1500) 56K Modem 5400 TriMedia TM1000/1100 5402 TriMedia TM-1300 @@ -5779,6 +6001,7 @@ 1043 4843 ASUS TV-FM 7133 1043 4845 TV-FM 7135 1043 4862 P7131 Dual + 1131 0000 KWorld V-Stream Studio TV Terminator 1131 2001 Proteus Pro [philips reference design] 1131 2018 Tiger reference design 1131 4ee9 MonsterTV Mobile @@ -5790,13 +6013,16 @@ 1435 7330 VFG7330 1435 7350 VFG7350 1461 1044 AVerTVHD MCE A180 + 1461 a14b AVerTV Studio 509 1461 f31f Avermedia AVerTV GO 007 FM 1462 6231 TV@Anywhere plus 1489 0214 LifeView FlyTV Platinum FM 14c0 1212 LifeView FlyTV Platinum Mini2 153b 1160 Cinergy 250 PCI TV 153b 1162 Terratec Cinergy 400 mobile + 17de 7350 ATSC 110 Digital / Analog HDTV Tuner 185b c100 VideoMate TV + 185b c900 VideoMate T750 5168 0306 LifeView FlyDVB-T DUO 5168 0319 LifeView FlyDVB Trio 5168 0502 LifeView FlyDVB-T Duo CardBus @@ -5857,10 +6083,14 @@ 13c2 100c Technotrend-Budget/Hauppauge WinTV-NOVA-CI DVB card 13c2 100f Technotrend-Budget/Hauppauge WinTV-NOVA-CI DVB card 13c2 1011 Technotrend-Budget/Hauppauge WinTV-NOVA-T DVB card + 13c2 1012 DVB T-1500 13c2 1013 SATELCO Multimedia DVB 13c2 1016 WinTV-NOVA-SE DVB card + 13c2 1018 DVB S-1401 + 13c2 1019 S2-3200 13c2 1102 Technotrend/Hauppauge DVB card rev2.1 153b 1156 Terratec Cynergy 1200C + 1894 0020 KNC One DVB-C V1.0 9730 SAA9730 Integrated Multimedia and Peripheral Controller 1131 0000 Integrated Multimedia and Peripheral Controller 1132 Mitel Corp. @@ -5935,6 +6165,7 @@ 1133 e028 Diva Server Analog-8P e02a Diva Server IPM-300 e02c Diva Server IPM-600 + e032 Diva BRI-2 PCIe r1 1134 Mercury Computer Systems 0001 Raceway Bridge 0002 Dual PCI to RapidIO Bridge @@ -6077,6 +6308,7 @@ 000d SyncPort 2-Port (x.25/FR) 0011 AccelePort 8r EIA-232 (IBM) 0012 AccelePort 8r EIA-422 + 0013 AccelePort Xr 0014 AccelePort 8r EIA-422 0015 AccelePort Xem 0016 AccelePort EPC/X @@ -6199,13 +6431,13 @@ 0015 CMIC-GC Host Bridge 0016 CMIC-GC Host Bridge 0017 GCNB-LE Host Bridge - 0036 HT1000 PCI/PCI-X bridge + 0036 BCM5785 [HT1000] PCI/PCI-X Bridge 0101 CIOB-X2 PCI-X I/O Bridge 0103 EPB PCI-Express to PCI-X Bridge - 0104 HT1000 PCI/PCI-X bridge + 0104 BCM5785 [HT1000] PCI/PCI-X Bridge 0110 CIOB-E I/O Bridge with Gigabit Ethernet - 0130 HT2000 PCI-X bridge - 0132 HT2000 PCI-Express bridge + 0130 BCM5780 [HT2000] PCI-X bridge + 0132 BCM5780 [HT2000] PCI-Express Bridge 1166 0132 HT2000 PCI-Express bridge 0140 HT2100 PCI-Express Bridge 0141 HT2100 PCI-Express Bridge @@ -6216,34 +6448,37 @@ 4c53 1080 CT8 mainboard 0203 CSB6 South Bridge 1734 1012 Primergy RX300 - 0205 HT1000 Legacy South Bridge + 0205 BCM5785 [HT1000] Legacy South Bridge 0211 OSB4 IDE Controller 0212 CSB5 IDE Controller + 1028 810b PowerEdge 2550 4c53 1080 CT8 mainboard 0213 CSB6 RAID/IDE Controller 1028 4134 PowerEdge 600SC 1028 c134 Poweredge SC600 1734 1012 Primergy RX300 - 0214 HT1000 Legacy IDE controller + 0214 BCM5785 [HT1000] IDE 0217 CSB6 IDE Controller 1028 4134 Poweredge SC600 0220 OSB4/CSB5 OHCI USB Controller 4c53 1080 CT8 mainboard 0221 CSB6 OHCI USB Controller 1734 1012 Primergy RX300 - 0223 HT1000 USB Controller + 0223 BCM5785 [HT1000] USB 0225 CSB5 LPC bridge 0227 GCLE-2 Host Bridge 1734 1012 Primergy RX300 0230 CSB5 LPC bridge 4c53 1080 CT8 mainboard - 0234 HT1000 LPC Bridge + 0234 BCM5785 [HT1000] LPC + 0235 BCM5785 [HT1000] XIOAPIC0-2 + 0238 BCM5785 [HT1000] WDTimer 0240 K2 SATA 0241 RAIDCore RC4000 0242 RAIDCore BC4000 - 024a BCM5785 (HT1000) SATA Native SATA Mode -# The device starts as 024a, and changes to 024b if set to PATA mode in BIOS - 024b BCM5785 (HT1000) PATA/IDE Mode + 024a BCM5785 [HT1000] SATA (Native SATA Mode) +# The device starts as 024A, and changes to 024B if set to PATA mode in BIOS + 024b BCM5785 [HT1000] SATA (PATA/IDE Mode) 1167 Mutoh Industries Inc 1168 Thine Electronics Inc 1169 Centre for Development of Advanced Computing @@ -6303,12 +6538,15 @@ 144d c006 vpr Matrix 170B4 CardBus bridge 0476 RL5c476 II 1014 0185 ThinkPad A/T/X Series + 1028 014f Latitude X300 laptop 1028 0188 Inspiron 6000 laptop 1043 1967 V6800V 1043 1987 Asus A4K and Z81K notebooks, possibly others ( mid-2005 machines ) 104d 80df Vaio PCG-FX403 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP - 144d c00c P35 notebook + 104d 814e VAIO GRZ390Z + 10f7 8338 Panasonic CF-Y5 laptop + 144d c00c P30/P35 notebook 14ef 0220 PCD-RP-220S 17aa 201c Thinkpad X60s 0477 RL5c477 @@ -6322,8 +6560,9 @@ 144d c006 vpr Matrix 170B4 0552 R5C552 IEEE 1394 Controller 1014 0511 ThinkPad A/T/X Series + 1028 014f Latitude X300 laptop 1028 0188 Inspiron 6000 laptop - 144d c00c P35 notebook + 144d c00c P30/P35 notebook 17aa 201e Thinkpad X60s 0554 R5C554 0575 R5C575 SD Bus Host Adapter @@ -6338,8 +6577,10 @@ 1028 0188 Inspiron 6000 laptop 1028 01a2 Inspiron 9200 1043 1967 ASUS V6800V + 10f7 8338 Panasonic CF-Y5 laptop 144d c018 X20 IV 17aa 201d Thinkpad X60s + 0832 R5C832 IEEE 1394 Controller 0841 R5C841 CardBus/SD/SDIO/MMC/MS/MSPro/xD/IEEE1394 0852 xD-Picture Card Controller 1043 1967 V6800V @@ -6350,7 +6591,7 @@ 1186 D-Link System Inc 0100 DC21041 1002 DL10050 Sundance Ethernet - 1186 1002 DFE-550TX + 1186 1002 DFE-550TX/FX 1186 1012 DFE-580TX 1025 AirPlus Xtreme G DWL-G650 Adapter 1026 AirXpert DWL-AG650 Wireless Cardbus Adapter @@ -6468,11 +6709,14 @@ # Nee Galileo Technology, Inc. 11ab Marvell Technology Group Ltd. 0146 GT-64010/64010A System Controller + 0f53 88E6318 Link Street network controller + 11ab MV88SE614x SATA II PCI-E controller 138f W8300 802.11 Adapter (rev 07) 1fa6 Marvell W8300 802.11 Adapter 1fa7 88W8310 and 88W8000G [Libertas] 802.11g client chipset 1faa 88w8335 [Libertas] 802.11b/g Wireless 1385 4e00 WG511 v2 54MBit/ Wireless PC-Card + 2a01 88W8335 [Libertas] 802.11b/g Wireless 4320 88E8001 Gigabit Ethernet Controller 1019 0f38 Marvell 88E8001 Gigabit Ethernet Controller (ECS) 1019 8001 Marvell 88E8001 Gigabit Ethernet Controller (ECS) @@ -6500,6 +6744,7 @@ 4345 88E8022 PCI-X IPMI Gigabit Ethernet Controller 4346 88E8061 PCI-E IPMI Gigabit Ethernet Controller 4347 88E8062 PCI-E IPMI Gigabit Ethernet Controller + 4c53 10d0 Telum ASLP10 PrAMC Gigabit Ethernet 4350 88E8035 PCI-E Fast Ethernet Controller 1179 0001 Marvell 88E8035 Fast Ethernet Controller (Toshiba) 11ab 3521 Marvell RDK-8035 @@ -6592,6 +6837,7 @@ 270f 2801 Marvell 88E8053 Gigabit Ethernet Controller (Chaintech) a0a0 0506 Marvell 88E8053 Gigabit Ethernet Controller (Aopen) 4363 88E8055 PCI-E Gigabit Ethernet Controller + 4364 88E8056 PCI-E Gigabit Ethernet Controller 4611 GT-64115 System Controller 4620 GT-64120/64120A/64121A System Controller 4801 GT-48001 @@ -6602,8 +6848,13 @@ 5081 MV88SX5081 8-port SATA I PCI-X Controller 6041 MV88SX6041 4-port SATA II PCI-X Controller 6081 MV88SX6081 8-port SATA II PCI-X Controller + 6101 88SE6101 single-port PATA133 interface + 6141 88SE614x SATA II PCI-E controller + 6145 88SE6145 SATA II PCI-E controller + 6450 64560 System Controller 6460 MV64360/64361/64362 System Controller 6480 MV64460/64461/64462 System Controller + 1775 c200 C2K CompactPCI single board computer 6485 MV64460/64461/64462 System Controller, Revision B f003 GT-64010 Primary Image Piranha Image Generator 11ac Canon Information Systems Research Aust. @@ -6642,6 +6893,12 @@ 0001 NP-PCI 11bd Pinnacle Systems Inc. 002e PCTV 40i + 0040 Royal TS Function 1 + 11bd 0044 PCTV 2000i Dual DVB-T Pro PCI Tuner 1 + 0041 RoyalTS Function 2 + 11bd 0044 PCTV 2000i Dual DVB-T Pro PCI Tuner 2 + 0042 Royal TS Function 3 + 11bd 0044 PCTV 2000i Dual DVB-T Pro PCI Common bede AV/DV Studio Capture Card 11be International Microcircuits Inc 11bf Astrodesign, Inc. @@ -6754,6 +7011,8 @@ 048c V.92 56K WinModem # InPorte Home Internal 56k Modem/fax/answering machine/SMS Features 048f V.92 56k WinModem + 1040 HDA softmodem + 2600 StarPro26XX family (SP2601, SP2603, SP2612) DSP 5801 USB 5802 USS-312 USB Controller 5803 USS-344S USB Controller @@ -6804,10 +7063,15 @@ 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 + 1981 AD1981HD sound chip + 1983 AD1983HD sound chip 1986 AD1986A sound chip + 11d4 1986 Lenovo N100 B9G + 198b AD1988B Sound Chip 5340 AD1881 sound chip 11d5 Ikon Corporation 0115 10115 @@ -6981,6 +7245,7 @@ 7223 OZ711M3/MC3 4-in-1 MemoryCardBus Controller 103c 088c NC8000 laptop 103c 0890 NC6000 laptop + 10cf 11c4 Lifebook P5020D Laptop 7233 OZ711MP3/MS3 4-in-1 MemoryCardBus Controller 1218 Hybricon Corp. 1219 First Virtual Corporation @@ -7205,6 +7470,7 @@ 125d 0428 ES56ST-PI Data Fax Modem 125d 0429 ES56SV-PI Data Fax Modem 147a c001 ES56-PI Data Fax Modem + 148d 1030 HCF WV-PI56 [ESS ES56-PI Data Fax Modem] 14fe 0428 ES56-PI Data Fax Modem 14fe 0429 ES56-PI Data Fax Modem 125e Specialvideo Engineering SRL @@ -7219,6 +7485,7 @@ 1668 0414 HWP01170-01 802.11b PCI Wireless Adapter 16a5 1601 AIR.mate PC-400 PCI Wireless LAN Adapter 1737 3874 WMP11 Wireless 802.11b PCI Adapter + 8086 2510 M3AWEB Wireless 802.11b MiniPCI Adapter 8086 2513 Wireless 802.11b MiniPCI Adapter 3886 ISL3886 [Prism Javelin/Prism Xbow] 17cf 0037 XG-901 and clones Wireless Adapter @@ -7227,6 +7494,7 @@ 10b8 2835 SMC2835W Wireless Cardbus Adapter 10b8 a835 SMC2835W V2 Wireless Cardbus Adapter 1113 4203 WN4201B + 1113 8201 T-Com T-Sinus 154pcicard Wireless PCI Adapter 1113 ee03 SMC2802W V2 Wireless PCI Adapter [ISL3886] 1113 ee08 SMC2835W V3 EU Wireless Cardbus Adapter 1186 3202 DWL-G650 A1 Wireless Adapter @@ -7489,9 +7757,11 @@ 9132 Ethernet 100/10 MBit 1283 Integrated Technology Express, Inc. 673a IT8330G - 8211 ITE 8211F Single Channel UDMA 133 (ASUS 8211 (ITE IT8212 ATA RAID Controller)) + 8152 IT8152F/G Advanced RISC-to-PCI Companion Chip + 8211 ITE 8211F Single Channel UDMA 133 1043 8138 P5GD1-VW Mainboard - 8212 IT/ITE8212 Dual channel ATA RAID controller (PCI version seems to be IT8212, embedded seems to be ITE8212) +# PCI version seems to be IT8212, embedded seems to be ITE8212 + 8212 IT/ITE8212 Dual channel ATA RAID controller 1283 0001 IT/ITE8212 Dual channel ATA RAID controller 8330 IT8330G 8872 IT8874F PCI Dual Serial Port Controller @@ -7522,6 +7792,7 @@ 1290 Sord Computer Corporation 1291 NCS Computer Italia 1292 Tritech Microelectronics Inc + fc02 Pyramid3D TR25202 1293 Media Reality Technology 1294 Rhetorex, Inc. 1295 Imagenation Corporation @@ -7549,8 +7820,12 @@ 12a9 Xiotech Corporation 12aa SDL Communications, Inc. 12ab Yuan Yuan Enterprise Co., Ltd. + 0000 MPG160/Kuroutoshikou ITVC15-STVLP 0002 AU8830 [Vortex2] Based Sound Card With A3D Support + 2300 Club-3D Zap TV2100 3000 MPG-200C PCI DVD Decoder Card + fff3 MPG600/Kuroutoshikou ITVC16-STVLP + ffff MPG600/Kuroutoshikou ITVC16-STVLP 12ac Measurex Corporation 12ad Multidata GmbH 12ae Alteon Networks Inc. @@ -7692,6 +7967,7 @@ 12d6 Analogic Corp 12d7 Biotronic SRL 12d8 Pericom Semiconductor + 01a7 PI7C21P100 PCI to PCI Bridge 8150 PCI to PCI Bridge 12d9 Aculab PLC 0002 PCI Prosody @@ -7930,7 +8206,7 @@ 132c Micrel Inc 132d Integrated Silicon Solution, Inc. 1330 MMC Networks -1331 Radisys Corp. +1331 RadiSys Corporation 0030 ENP-2611 8200 82600 Host Bridge 8201 82600 IDE @@ -8075,6 +8351,8 @@ 0038 Silicom Quad port Copper Ethernet PCI-E Intel based Bypass Server Adapter 0039 Silicom Dual port Fiber-SX Ethernet PCI-E Intel based Bypass Server Adapter 003a Silicom Dual port Fiber-LX Ethernet PCI-E Intel based Bypass Server Adapter + 003b Silicom Dual port Fiber Ethernet PMC Intel based Bypass Server Adapter (PMCX2BPFI) + 003c Silicom Dual port Copper Ethernet PCI-X BGE based Bypass Server Adapter (PXG2BPRB) 1375 Argosystems Inc 1376 LMC 1377 Electronic Equipment Production & Distribution GmbH @@ -8105,9 +8383,10 @@ 1384 Reality Simulation Systems Inc 1385 Netgear 0013 WG311T 108 Mbps Wireless PCI Adapter - 311a GA511 Gigabit Ethernet - 4100 802.11b Wireless Adapter (MA301) - 4105 MA311 802.11b wireless adapter + 006b WA301 802.11b Wireless PCI Adapter + 311a GA311 Gigabit Ethernet PCI Adapter + 4100 MA301 802.11b Wireless PCI Adapter + 4105 MA311 802.11b Wireless PCI Adapter 4251 WG111T 108 Mbps Wireless USB 2.0 Adapter 4400 WAG511 802.11a/b/g Dual Band Wireless PC Card 4600 WAG511 802.11a/b/g Dual Band Wireless PC Card @@ -8127,7 +8406,7 @@ 630a GA630 Gigabit Ethernet 6b00 WG311v3 54 Mbps Wireless PCI Adapter 6d00 WPNT511 RangeMax 240 Mbps Wireless PC Card - 7b00 WN511B RangeMax Next 280 Mbps Wireless PC Card + 7b00 WN511B RangeMax Next 270 Mbps Wireless PC Card 7c00 WN511T RangeMax Next 300 Mbps Wireless PC Card 7d00 WN311B RangeMax Next 270 Mbps Wireless PCI Adapter 7e00 WN311T RangeMax Next 300 Mbps Wireless PCI Adapter @@ -8150,6 +8429,7 @@ 1040 Smartio C104H/PCI 1141 Industrio CP-114 1680 Smartio C168H/PCI + 1681 CP-168U V2 Smart Serial Board (8-port RS-232) 2040 Intellio CP-204J 2180 Intellio C218 Turbo PCI 3200 Intellio C320 Turbo PCI @@ -8162,12 +8442,16 @@ 08b4 ISDN network Controller [HFC-4S] 1397 b520 HFC-4S [IOB4ST] 1397 b540 HFC-4S [Swyx 4xS0 SX2 QuadBri] + 1397 b556 HFC-4S [Junghanns DuoDBRI] 16b8 ISDN network Controller [HFC-8S] 2bd0 ISDN network controller [HFC-PCI] 0675 1704 ISDN Adapter (PCI Bus, D, C) 0675 1708 ISDN Adapter (PCI Bus, D, C, ACPI) 1397 2bd0 ISDN Board e4bf 1000 CI1-1-Harp + 30b1 ISDN network Controller [HFC-E1] + b700 ISDN network controller PrimuX S0 [HFC-PCI] + f001 GSM Network Controller [HFC-4GSM] 1398 Clarion co. Ltd 1399 Rios systems Co Ltd 139a Alacritech Inc @@ -8194,6 +8478,7 @@ 001d 7956 Security Processor 0020 7955 Security Processor 0026 8155 Security Processor + 002e 9630 Compression Processor 13a4 Rascom Inc 13a5 Audio Digital Imaging Inc 13a6 Videonics Inc @@ -8236,6 +8521,7 @@ 13c1 1001 7xxx/8xxx-series PATA/SATA-RAID 1002 9xxx-series SATA-RAID 1003 9550SX SATA-RAID + 1004 9650SE SATA-II RAID 13c2 Technotrend Systemtechnik GmbH 000e Technotrend/Hauppauge DVB card rev2.3 13c3 Janz Computer AG @@ -8264,6 +8550,7 @@ ab08 21x4x DEC-Tulip compatible 10/100 Ethernet 13d2 Shark Multimedia Inc 13d3 IMC Networks + 3219 DTV-DVB 7049A DVB-T USB Stick 13d4 Graphics Microsystems Inc 13d5 Media 100 Inc 13d6 K.I. Technology Co Ltd @@ -8298,7 +8585,7 @@ 13f0 Sundance Technology Inc / IC Plus Corp 0200 IC Plus IP100A Integrated 10/100 Ethernet MAC + PHY 0201 ST201 Sundance Ethernet - 1023 IC Plus IP1000 Family Gigabit Ethernet + 1023 IP1000 Family Gigabit Ethernet 13f1 Oce' - Technologies B.V. 13f2 Ford Microelectronics Inc 13f3 Mcdata Corporation @@ -8319,6 +8606,7 @@ 13f6 0111 CMI8738/C3DX PCI Audio Device 1681 a000 Gamesurround MUSE XL 0211 CM8738 + 9880 CM9880 13f7 Wildfire Communications 13f8 Ad Lib Multimedia Inc 13f9 NTT Advanced Technology Corp. @@ -8461,6 +8749,7 @@ 1424 Videoserver Connections 1425 Chelsio Communications Inc 000b T210 Protocol Engine + 000c T204 Protocol Engine 1426 Storage Technology Corp. 1427 Better On-Line Solutions 1428 Edec Co Ltd @@ -8534,6 +8823,7 @@ 1457 Nuera Communications Inc 1458 Giga-byte Technology 0c11 K8NS Pro Mainboard + 9001 GC-PTV-TAF Hybrid TV card e911 GN-WIAG02 1459 DOOIN Electronics 145a Escalate Networks Inc @@ -8545,6 +8835,9 @@ 0001 NextMove PCI 1460 DYNARC INC 1461 Avermedia Technologies Inc + a3ce M179 + a3cf M179 + a836 M115 DVB-T, PAL/SECAM/NTSC Tuner f436 AVerTV Hybrid+FM 1462 Micro-Star International Co., Ltd. 5501 nVidia NV15DDR [GeForce2 Ti] @@ -8552,6 +8845,8 @@ 6825 PCI Card wireless 11g [PC54G] 6834 RaLink RT2500 802.11g [PC54G2] 7125 K8N motherboard + 7235 P965 Neo MS-7235 mainboard + 7242 K9AGM RS485 Motherboard 8725 NVIDIA NV25 [GeForce4 Ti 4600] VGA Adapter 9000 NVIDIA NV28 [GeForce4 Ti 4800] VGA Adapter 9110 GeFORCE FX5200 @@ -8560,6 +8855,7 @@ 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. @@ -8764,8 +9060,11 @@ 0811 Sentry5 External Interface Core 0816 BCM3302 Sentry5 MIPS32 CPU 1600 NetXtreme BCM5752 Gigabit Ethernet PCI Express + 103c 3015 PCIe LAN on Motherboard 107b 5048 E4500 Onboard 1601 NetXtreme BCM5752M Gigabit Ethernet PCI Express + 1639 NetXtreme II BCM5709 Gigabit Ethernet + 163a NetXtreme II BCM5709S Gigabit Ethernet 1644 NetXtreme BCM5700 Gigabit Ethernet 1014 0277 Broadcom Vigil B5700 1000Base-T 1028 00d1 Broadcom BCM5700 @@ -8853,12 +9152,16 @@ 103c 7031 NC320T PCIe Gigabit Server Adapter 103c 7032 NC320i PCIe Gigabit Server Adapter 1734 1061 Primergy RX300 S2 + 165a NetXtreme BCM5722 Gigabit Ethernet PCI Express + 103c 7051 NC105i PCIe Gigabit Server Adapter + 103c 7052 NC105T PCIe Gigabit Server Adapter 165d NetXtreme BCM5705M Gigabit Ethernet 1028 865d Latitude D400 165e NetXtreme BCM5705M_2 Gigabit Ethernet 103c 088c NC8000 laptop 103c 0890 NC6000 laptop 103c 099c NX6110/NC6120 + 10cf 1279 LifeBook E8010D 1668 NetXtreme BCM5714 Gigabit Ethernet 103c 7039 NC324i PCIe Dual Port Gigabit Server Adapter 1669 NetXtreme 5714S Gigabit Ethernet @@ -8867,6 +9170,7 @@ 166e 570x 10/100 Integrated Controller 1672 NetXtreme BCM5754M Gigabit Ethernet PCI Express 1673 NetXtreme BCM5755M Gigabit Ethernet PCI Express + 1674 NetXtreme BCM5756ME Gigabit Ethernet PCI Express 1677 NetXtreme BCM5751 Gigabit Ethernet PCI Express 1028 0179 Optiplex GX280 1028 0182 Latitude D610 @@ -8884,6 +9188,7 @@ 167d NetXtreme BCM5751M Gigabit Ethernet PCI Express 17aa 2081 Thinkpad R60e model 0657 167e NetXtreme BCM5751F Fast Ethernet PCI Express + 167f NetLink BCM5787F Fast Ethernet PCI Express 1693 NetLink BCM5787M Gigabit Ethernet PCI Express 1696 NetXtreme BCM5782 Gigabit Ethernet 103c 12bc d530 CMT (DG746A) @@ -8892,6 +9197,7 @@ 169b NetLink BCM5787 Gigabit Ethernet PCI Express 169c NetXtreme BCM5788 Gigabit Ethernet 103c 308b MX6125 + 103c 30a1 NC2400 169d NetLink BCM5789 Gigabit Ethernet PCI Express 16a6 NetXtreme BCM5702X Gigabit Ethernet 0e11 00bb NC7760 Gigabit Server Adapter (PCI-X, 10/100/1000-T) @@ -8913,6 +9219,7 @@ 103c 3102 NC370F MultifuNCtion Gigabit Server Adapter 16ac NetXtreme II BCM5708S Gigabit Ethernet 103c 1706 NC373m Multifunction Gigabit Server Adapter + 103c 7038 NC373i PCI Express Multifunction Gigabit Server Adapter 103c 703b NC373i Integrated Multifunction Gigabit Server Adapter 103c 703d NC373F PCI Express Multifunction Gigabit Server Adapter 16c6 NetXtreme BCM5702A3 Gigabit Ethernet @@ -8933,15 +9240,19 @@ 170c BCM4401-B0 100Base-TX 1028 0188 Inspiron 6000 laptop 1028 0196 Inspiron 5160 + 1028 01af Inspiron 6400 103c 099c NX6110/NC6120 170d NetXtreme BCM5901 100Base-TX 1014 0545 ThinkPad R40e (2684-HVG) builtin ethernet controller 170e NetXtreme BCM5901 100Base-TX + 1712 NetLink BCM5906 Fast Ethernet PCI Express + 1713 NetLink BCM5906M Fast Ethernet PCI Express 3352 BCM3352 3360 BCM3360 4210 BCM4210 iLine10 HomePNA 2.0 4211 BCM4211 iLine10 HomePNA 2.0 + V.90 56k modem 4212 BCM4212 v.90 56k modem + 4220 802-11b/g Wireless PCI controller, packaged as a Linksys WPC54G ver 1.2 PCMCIA card 4301 BCM4303 802.11b Wireless LAN Controller 1028 0407 TrueMobile 1180 Onboard WLAN 1043 0120 WL-103b Wireless LAN PC Card @@ -8949,18 +9260,19 @@ 4306 BCM4307 Ethernet Controller 4307 BCM4307 802.11b Wireless LAN Controller 4310 BCM4310 Chipcommon I/OController - 4311 Dell Wireless 1390 WLAN Mini-PCI Card - 4312 BCM4310 UART + 4311 BCM94311MCG wlan mini-PCI + 4312 BCM4312 802.11a/b/g 4313 BCM4310 Ethernet Controller 4315 BCM4310 USB Controller 4318 BCM4318 [AirForce One 54g] 802.11g Wireless LAN Controller 103c 1356 MX6125 1043 120f A6U notebook embedded card - 1468 0311 Aspire 3022WLMi, 5024WLMi + 1468 0311 Aspire 3022WLMi, 5024WLMi, 5020 1468 0312 TravelMate 2410 14e4 0449 Gateway 7510GX 14e4 4318 WPC54G version 3 [Wireless-G Notebook Adapter] 802.11g Wireless Lan Controller 16ec 0119 U.S.Robotics Wireless MAXg PC Card + 1737 0042 WMP54GS version 1.1 [Wireless-G PCI Adapter] 802.11g w/SpeedBooster 1737 0048 WPC54G-EU version 3 [Wireless-G Notebook Adapter] 4319 BCM4311 [AirForce 54g] 802.11a/b/g PCI Express Transceiver 4320 BCM4306 802.11b/g Wireless LAN Controller @@ -8973,6 +9285,7 @@ 106b 004e AirPort Extreme 1154 0330 Buffalo WLI2-PCI-G54S High Speed Mode Wireless Desktop Adapter 144f 7050 eMachines M6805 802.11g Built-in Wireless + 144f 7051 Sonnet Aria Extreme PCI 14e4 4320 Linksys WMP54G PCI 1737 4320 WPC54G 1799 7001 Belkin F5D7001 High-Speed Mode Wireless G Network Card @@ -8989,6 +9302,7 @@ 1414 0004 Wireless PCI Adapter MN-730 4326 BCM4307 Chipcommon I/O Controller? 4329 BCM43XG + 4344 EDGE/GPRS data and 802.11b/g combo cardbus [GC89] 4401 BCM4401 100Base-T 103c 08b0 tc1100 tablet 1043 80a8 A7V8X motherboard @@ -9032,6 +9346,8 @@ 5690 BCM5690 12-port Multi-Layer Gigabit Ethernet Switch 5691 BCM5691 GE/10GE 8+2 Gigabit Ethernet Switch Controller 5692 BCM5692 12-port Multi-Layer Gigabit Ethernet Switch + 5695 BCM5695 12-port + HiGig Multi-Layer Gigabit Ethernet Switch + 5698 BCM5698 12-port Multi-Layer Gigabit Ethernet Switch 5820 BCM5820 Crypto Accelerator 5821 BCM5821 Crypto Accelerator 5822 BCM5822 Crypto Accelerator @@ -9109,6 +9425,7 @@ 1066 HCF 56k Data/Fax/Voice/Spkp Modem 122d 4033 Dell Athena - MDP3900V-U 1085 HCF V90 56k Data/Fax/Voice/Spkp PCI Modem + 10b6 CX06834-11 HCF V.92 56k Data/Fax/Voice/Spkp Modem 1433 HCF 56k Data/Fax Modem 1434 HCF 56k Data/Fax/Voice Modem 1435 HCF 56k Data/Fax/Voice/Spkp (w/Handset) Modem @@ -9190,6 +9507,7 @@ 2465 HSF 56k Data/Fax/Voice/Spkp (w/HS) Modem (Mob SmartDAA) 2466 HSF 56k Data/Fax/Voice/Spkp Modem (Mob SmartDAA) 2bfa 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 @@ -9197,6 +9515,9 @@ 2f02 HSF 56k HSFi Data/Fax 2f11 HSF 56k HSFi Modem 2f20 HSF 56k Data/Fax Modem + 2f30 HSF 56k Data/Fax Modem + 5045 HDAUDIO with SmartCP + 5047 High Definition Audio [Waikiki] 8234 RS8234 ATM SAR Controller [ServiceSAR Plus] 8800 CX23880/1/2/3 PCI Video and Audio Decoder 0070 2801 Hauppauge WinTV 28xxx (Roslyn) models @@ -9246,6 +9567,7 @@ 0070 9002 Nova-T DVB-T Model 909 1043 4823 ASUS PVR-416 107d 663c Leadtek PVR 2000 + 107d 665f WinFast DTV1000-T 14f1 0187 Conexant DVB-T reference design 17de 08a1 XPert DVB-T PCI BDA DVBT 23880 Transport Stream Capture 17de 08a6 KWorld/VStream XPert DVB-T @@ -9365,6 +9687,14 @@ 1522 2500 RockForceF4 4 Port V.34 Super-G3 Fax Modem 1522 2600 RockForceD8 8 Port V.90 Data Modem 1522 2700 RockForceF8 8 Port V.34 Super-G3 Fax Modem + 1522 3000 IQ Express D1 - 1 Port V.92 Data Modem + 1522 3100 IQ Express F1 - 1 Port V.34 Super-G3 Fax Modem + 1522 3200 IQ Express D2 - 2 Port V.92 Data Modem + 1522 3300 IQ Express F2 - 2 Port V.34 Super-G3 Fax Modem + 1522 3400 IQ Express D4 - 4 Port V.92 Data Modem + 1522 3500 IQ Express F4 - 4 Port V.34 Super-G3 Fax Modem + 1522 3c00 IQ Express D8 - 8 Port V.92 Data Modem + 1522 3d00 IQ Express F8 - 8 Port V.34 Super-G3 Fax Modem 1523 MUSIC Semiconductors 1524 ENE Technology Inc 0510 CB710 Memory Card Reader Controller @@ -9372,6 +9702,7 @@ 0520 FLASH memory: ENE Technology Inc: 0530 ENE PCI Memory Stick Card Reader Controller 0550 ENE PCI Secure Digital Card Reader Controller + 0551 SD/MMC Card Reader Controller 0610 PCI Smart Card Reader Controller 1211 CB1211 Cardbus Controller 1225 CB1225 Cardbus Controller @@ -9402,6 +9733,7 @@ 1533 BALTIMORE 1534 ROAD Corp 1535 EVERGREEN Technologies Inc +1536 ACTIS Computer 1537 DATALEX COMMUNCATIONS 1538 ARALION Inc 0303 ARS106S Ultra ATA 133/100/66 Host Controller @@ -9521,6 +9853,9 @@ 158e Lara Technology Inc 158f Ditect Coop 1590 3pardata Inc + 0001 Eagle Cluster Manager + 0002 Osprey Cluster Manager + a01d FC044X Fibre Channel HBA 1591 ARN 1592 Syba Tech Ltd 0781 Multi-IO Card @@ -9566,6 +9901,7 @@ 15b1 Source Technology Inc 15b2 Mosaid Technologies Inc 15b3 Mellanox Technologies + 0191 MT25408 [ConnectX IB SDR Flash Recovery] 5274 MT21108 InfiniBridge 5a44 MT23108 InfiniHost 5a45 MT23108 [Infinihost HCA Flash Recovery] @@ -9575,11 +9911,19 @@ 6278 MT25208 InfiniHost III Ex (Tavor compatibility mode) 6279 MT25208 [InfiniHost III Ex HCA Flash Recovery] 6282 MT25208 InfiniHost III Ex + 6340 MT25408 [ConnectX IB SDR] + 634a MT25418 [ConnectX IB DDR] + 6354 MT25428 [ConnectX IB QDR] + 6368 MT25448 [ConnectX EN 10GigE] 15b4 CCI/TRIAD 15b5 Cimetrics Inc 15b6 Texas Memory Systems Inc 15b7 Sandisk Corp 15b8 ADDI-DATA GmbH + 1003 APCI1032 SP controller (32 digi inputs w/ opto coupler) + 1005 APCI2200 SP controller (8/16 digi outputs (relay)) + 100a APCI1696 SP controller (96 TTL I/Os) + 3001 APCI3501 SP controller (analog output board) 15b9 Maestro Digital Communications 15ba Impacct Technology Corp 15bb Portwell Inc @@ -9628,6 +9972,7 @@ 15e0 Cacheflow Inc 15e1 Voice Technologies Group Inc 15e2 Quicknet Technologies Inc + 0500 PhoneJack-PCI 15e3 Networth Technologies Inc 15e4 VSN Systemen BV 15e5 Valley technologies Inc @@ -9685,6 +10030,8 @@ 8410 RTL81xx Fast Ethernet 1629 Kongsberg Spacetec AS 1003 Format synchronizer v3.0 + 1006 Format synchronizer, model 10500 + 1007 Format synchronizer, model 21000 2002 Fast Universal Data Output # This seems to occur on their 802.11b Wireless card WMP-11 1637 Linksys @@ -9753,35 +10100,54 @@ 168c 2042 Engenius 5354MP Plus ARIES2 a/b/g MiniPCI Adapter 168c 2051 TRENDnet TEW-443PI Wireless PCI Adapter 16ab 7302 Trust Speedshare Turbo Pro Wireless PCI Adapter + 17cf 0042 Z-COMAX Highpower XG-622H (400mw) 802.11b/g mini-PCI Adapter + 185f 1012 CM9 Wireless a/b/g MiniPCI Adapter 185f 2012 Wistron NeWeb WLAN a+b+g model CB9 001a AR5005G 802.11abg NIC + 1052 168c Sweex Wireless Lan PC Card 54Mbps 1113 ee20 SMC Wireless CardBus Adapter 802.11g (SMCWCB-G EU) 1113 ee24 SMC Wireless PCI Card WPCI-G 1186 3a15 D-Link AirPlus G DWL-G630 Wireless Cardbus Adapter(rev.D) 1186 3a16 D-Link AirPlus G DWL-G510 Wireless PCI Adapter(rev.B) 1186 3a23 D-Link AirPlus G DWL-G520+A Wireless PCI Adapter 1186 3a24 D-Link AirPlus G DWL-G650+A Wireless Cardbus Adapter + 1186 3b08 AirPlus G DWL-G630 168c 001a Belkin FD7000 168c 1052 TP-Link TL-WN510G Wireless CardBus Adapter + 168c 2052 Compex Wireless 802.11 b/g MiniPCI Adapter, Rev A1 [WLM54G] 001b AR5006X 802.11abg NIC 1186 3a19 D-Link AirPremier AG DWL-AG660 Wireless Cardbus Adapter 1186 3a22 D-Link AirPremier AG DWL-AG530 Wireless PCI Adapter + 1458 e901 GN-WI01HT Wireless a/b/g MiniPCI Adapter + 168c 001b Wireless LAN PCI LiteOn 168c 2062 EnGenius EMP-8602 (400mw) or Compex WLM54AG (SuperAG) 168c 2063 EnGenius EMP-8602 (400mw) or Compex WLM54AG + 185f 1600 DCMA-82 High Power WLAN 802.11a/b/g mini-PCI Module (Super A/G, eXtended Range, 400mW) + a727 6804 Wireless 11a/b/g PC Card with XJACK(r) Antenna + 001c AR5006EG 802.11 b/g Wireless PCI Express Adapter 0020 AR5005VL 802.11bg Wireless NIC + 0023 AR5416 802.11a/b/g/n Wireless PCI Adapter + 0024 AR5418 802.11a/b/g/n Wireless PCI Express Adapter 1014 AR5212 802.11abg NIC 1014 058a ThinkPad 11a/b/g Wireless LAN Mini Express Adapter (AR5BXB6) + 3b08 D-Link AirPlus G DWL-G630 1695 EPoX Computer Co., Ltd. 169c Netcell Corporation 0044 Revolution Storage Processing Card +# The right ID is 196d, but they got it nibble-swapped in 2202. +169d Club-3D VB (Wrong ID) + 3306 ZAP TV 2202 16a5 Tekram Technology Co.,Ltd. 16ab Global Sun Technology Inc 1100 GL24110P 1101 PLX9052 PCMCIA-to-PCI Wireless LAN 1102 PCMCIA-to-PCI Wireless Network Bridge 8501 WL-8305 Wireless LAN PCI Adapter -16ae Safenet Inc - 1141 SafeXcel-1141 +16ae SafeNet Inc + 0001 SafeXcel 1140 + 000a SafeXcel 1841 + 1141 SafeXcel 1141 + 1841 SafeXcel 1842 16af SparkLAN Communications, Inc. 16b4 Aspex Semiconductor Ltd 16b8 Sonnet Technologies, Inc. @@ -9795,12 +10161,47 @@ 16cd Densitron Technologies 16ce Roland Corp. 16d5 Acromag, Inc. + 0504 PMC-DX504 Reconfigurable FPGA with LVDS I/O + 0520 PMC520 Serial Communication, 232 Octal + 0521 PMC521 Serial Communication, 422/485 Octal + 1020 PMC-AX1020 Reconfigurable FPGA with A/D & D/A + 1065 PMC-AX1065 Reconfigurable FPGA with A/D & D/A + 2004 PMC-DX2004 Reconfigurable FPGA with LVDS I/O + 2020 PMC-AX2020 Reconfigurable FPGA with A/D & D/A + 2065 PMC-AX2065 Reconfigurable FPGA with A/D & D/A + 3020 PMC-AX3020 Reconfigurable FPGA with A/D & D/A + 3065 PMC-AX3065 Reconfigurable FPGA with A/D & D/A + 4243 PMC424, APC424, AcPC424 Digital I/O and Counter Timer Module + 4248 PMC464, APC464, AcPC464 Digital I/O and Counter Timer Module + 424b PMC-DX2002 Reconfigurable FPGA with Differential I/O + 4253 PMC-DX503 Reconfigurable FPGA with TTL and Differential I/O + 4312 PMC-CX1002 Reconfigurable Conduction-Cooled FPGA Virtex-II with Differential I/O + 4313 PMC-CX1003 Reconfigurable Conduction-Cooled FPGA Virtex-II with CMOS and Differential I/O + 4322 PMC-CX2002 Reconfigurable Conduction-Cooled FPGA Virtex-II with Differential I/O + 4323 PMC-CX2003 Reconfigurable Conduction-Cooled FPGA Virtex-II with CMOS and Differential I/O + 4350 PMC-DX501 Reconfigurable Digital I/O Module + 4353 PMC-DX2003 Reconfigurable FPGA with TTL and Differential I/O + 4357 PMC-DX502 Reconfigurable Differential I/O Module + 4457 PMC730, APC730, AcPC730 Multifunction Module + 464d PMC408 32-Channel Digital Input/Output Module + 4850 PMC220-16 12-Bit Analog Output Module + 4a42 PMC483, APC483, AcPC483 Counter Timer Module + 4a50 PMC484, APC484, AcPC484 Counter Timer Module + 4a56 PMC230 16-Bit Analog Output Module + 4b47 PMC330, APC330, AcPC330 Analog Input Module, 16-bit A/D + 4c40 PMC-LX40 Reconfigurable Virtex-4 FPGA with plug-in I/O + 4c60 PMC-LX60 Reconfigurable Virtex-4 FPGA with plug-in I/O + 4d4d PMC341, APC341, AcPC341 Analog Input Module, Simultaneous Sample & Hold 4d4e PMC482, APC482, AcPC482 Counter Timer Board + 524d PMC-DX2001 Reconfigurable FPGA with TTL I/O + 5335 PMC-SX35 Reconfigurable Virtex-4 FPGA with plug-in I/O + 5456 PMC470 48-Channel Digital Input/Output Module 16df PIKA Technologies Inc. 16e3 European Space Agency 1e0f LEON2FT Processor 16e5 Intellon Corp. 6000 INT6000 Ethernet-to-Powerline Bridge [HomePlug AV] + 6300 INT6300 Ethernet-to-Powerline Bridge [HomePlug AV] 16ec U.S. Robotics 00ff USR997900 10/100 Mbps PCI Network Card 0116 USR997902 10/100/1000 Mbps PCI Network Card @@ -9824,9 +10225,11 @@ 13c8 AEP SureWare Runner 1000V3 1734 Fujitsu Siemens Computer GmbH 1078 Amilo Pro v2010 + 1085 Celsius M450 1737 Linksys 0013 WMP54G Wireless Pci Card 0015 WMP54GS Wireless Pci Card + 0029 WPG54G ver. 4 PCI Card 1032 Gigabit Network Adapter 1737 0015 EG1032 v2 Instant Gigabit Network Adapter 1737 0024 EG1032 v3 Instant Gigabit Network Adapter @@ -9848,6 +10251,7 @@ 175c AudioScience Inc 175e Sanera Systems, Inc. 1775 SBS Technologies +177d Cavium Networks 1787 Hightech Information System Ltd. # also used by Struck Innovative Systeme for joint developments 1796 Research Centre Juelich @@ -9906,6 +10310,7 @@ 5832 Xframe II 10Gbps Ethernet 10a9 8021 Single Port 10 Gigabit Ethernet II (PCI-X, Fiber) 17db Cray Inc + 0101 XT Series [Seastar] 3D Toroidal Router 17de KWorld Computer Co. Ltd. 17e4 Sectra AB 0001 KK671 Cardbus encryption board @@ -9916,6 +10321,12 @@ 0021 EN2210 [c.Link] MoCA Network Controller (Coax) 17ee Connect Components Ltd 17f2 Albatron Corp. +17f3 RDC Semiconductor, Inc. + 6020 R6020 North Bridge + 6030 R6030 ISA Bridge + 6040 R6040 MAC Controller + 6060 R6060 USB 1.1 Controller + 6061 R6061 USB 2.0 Controller 17fe Linksys, A Division of Cisco Systems 2120 WMP11v4 802.11b PCI card 2220 [AirConn] INPROCOMM IPN 2220 Wireless LAN Adapter (rev 01) @@ -9939,6 +10350,7 @@ 1371 0020 CWP-854 Wireless-G PCI Adapter 1458 e381 GN-WMKG 802.11b/g Wireless CardBus Adapter 1458 e931 GN-WIKG 802.11b/g mini-PCI Adapter + 1462 6833 Unknown 802.11g mini-PCI Adapter 1462 6835 Wireless 11G CardBus CB54G2 1737 0032 WMP54G 2.0 PCI Adapter 1799 700a F5D7000 Wireless G Desktop Network Card @@ -9947,13 +10359,18 @@ 0301 RT2561/RT61 802.11g PCI 1186 3c08 DWL-G630 Rev E 1186 3c09 DWL-G510 Rev C + 13d1 abe3 miniPCI Pluscom 802.11 a/b/g + 1458 e934 GN-WP01GS 1737 0055 WMP54G ver 4.1 0302 RT2561/RT61 rev B 802.11g 1186 3c08 DWL-G630 Rev E 1186 3c09 DWL-G510 Rev C + 1462 b834 PC54G3 Wireless 11g PCI Card 0401 Ralink RT2600 802.11 MIMO + e932 RT2560F 802.11 b/g PCI 1820 InfiniCon Systems Inc. 1822 Twinhan Technology Co. Ltd + 0001 Twinhan VisionPlus DVB [card=113] 4e35 Mantis DTV PCI Bridge Controller [Ver 1.0] 182d SiteCom Europe BV # HFC-based ISDN card @@ -9983,6 +10400,12 @@ 5a46 MT23108 InfiniHost HCA bridge 6278 MT25208 InfiniHost III Ex (Tavor compatibility mode) 6282 MT25208 InfiniHost III Ex +186c Humusoft + 0614 MF614 multifunction I/O card +1876 L-3 Communications + a101 VigraWATCH PCI + a102 VigraWATCH PMC + a103 Vigra I/O 187e ZyXEL Communication Corporation 3403 ZyAir G-110 802.11g 340e M-302 802.11g XtremeMIMO @@ -10009,9 +10432,10 @@ # Nee Octigabay System 18c8 Cray Inc 18c9 ARVOO Engineering BV -18ca XGI - Xabre Graphics Inc +18ca XGI Technology Inc. (eXtreme Graphics Innovation) 0020 Volari Z7 0040 Volari V3XT/V5/V8 + 0047 Volari 8300 (chip: XP10, codename: XG47) 18d2 Sitecom # Sitecom HFC-S based ISDN controller card DC-105v2 3069 DC-105v2 ISDN controller @@ -10050,7 +10474,8 @@ 0100 A104d QUAD T1/E1 AFT card 0300 A101 single-port T1/E1 0400 A104u Quad T1/E1 AFT -1924 Level 5 Networks Inc. +# nee Level 5 Networks +1924 Solarflare Communications 192e TransDimension 1931 Option N.V. 000c Qualcomm MSM6275 UMTS chip @@ -10073,31 +10498,46 @@ 0086 MPC8343E 0087 MPC8343 1958 Faster Technology, LLC. +1959 PA Semi, Inc 1966 Orad Hi-Tec Systems 1975 DVG64 family 1969 Attansic Technology Corp. 1048 L1 Gigabit Ethernet Adapter + 2048 L2 100 Mbit Ethernet Adapter 196a Sensory Networks Inc. 0101 NodalCore C-1000 Content Classification Accelerator 0102 NodalCore C-2000 Content Classification Accelerator + 0105 NodalCore C-3000 Content Classification Accelerator 196d Club-3D BV +1971 AGEIA Technologies, Inc. + 1011 Physics Processing Unit [PhysX] + 1043 0001 PhysX P1 197b JMicron Technologies, Inc. 2360 JMicron 20360/20363 AHCI Controller 2361 JMB361 AHCI/IDE + 1462 7235 P965 Neo MS-7235 mainboard 2363 JMicron 20360/20363 AHCI Controller 2365 JMB365 AHCI/IDE 2366 JMB366 AHCI/IDE + 2368 JMB368 IDE controller +1982 Distant Early Warning Communications Inc + 1600 OX16C954 HOST-A + 16ff OX16C954 HOST-B 1989 Montilio Inc. 0001 RapidFile Bridge 8001 RapidFile 1993 Innominate Security Technologies AG 199a Pulse-LINK, Inc. +19a2 ServerEngines LLC + 0200 BladeEngine 10Gb PCI-E iSCSI adapter + 0201 BladeEngine 10Gb PCI-E Network Adpater 19a8 DAQDATA GmbH 19ac Kasten Chase Applied Research 0001 ACA2400 Crypto Accelerator 19ae Progeny Systems Corporation 0520 4135 HFT Interface Controller 19d4 Quixant Limited +19de Pico Computing 19e2 Vector Informatik GmbH 19e7 NET (Network Equipment Technologies) 1001 STIX DSP Card @@ -10107,11 +10547,25 @@ 1005 STIX - 4 Port FXS Card 1a03 ASPEED Technology, Inc. 2000 AST2000 +1a07 Kvaser AB + 0006 CAN interface PC104+ HS/HS + 0007 CAN interface PCIcanx II HS or HS/HS 1a08 Sierra semiconductor 0000 SC15064 1a1d GFaI e.V. + 1a17 Meta Networks MTP-1G IDPS NIC +1a22 Ambric Inc. 1a29 Fortinet, Inc. 1a51 Hectronic AB +1a5d Celoxica +1a71 XenSource, Inc. +1a73 Violin Memory, Inc + 0001 Mozart [Memory Appliance 1010] +1a77 Lightfleet Corporation +1a78 Virident Systems Inc. +1a8c Verigy Pte. Ltd. + 1100 E8001-66443 PCI Express CIC +1ab9 Espia Srl 1b13 Jaton Corp 1c1c Symphony 0001 82C101 @@ -10150,6 +10604,7 @@ 0014 HiNT HC4 PCI to ISDN bridge, Network controller 0020 HB6 Universal PCI-PCI bridge (transparent mode) 0021 HB6 Universal PCI-PCI bridge (non-transparent mode) + 1775 c200 C2K CompactPCI interface bridge 1775 ce90 CE9 4c53 1050 CT7 mainboard 4c53 1080 CT8 mainboard @@ -10235,6 +10690,11 @@ 4710 ALC200/200P 4033 Addtron Technology Co, Inc. 1360 RTL8139 Ethernet +4040 NetXen Incorporated + 0001 NXB-10GXSR 10 Gigabit Ethernet PCIe Adapter with SR-XFP optical interface + 0002 NXB-10GCX4 10 Gigabit Ethernet PCIe Adapter with CX4 copper interface + 0003 NXB-4GCU Quad Gigabit Ethernet PCIe Adapter with 1000-BASE-T interface + 0004 BladeCenter-H 10 Gigabit Ethernet High Speed Daughter Card 4143 Digital Equipment Corp 4144 Alpha Data 0044 ADM-XRCIIPro @@ -10242,6 +10702,7 @@ 0100 AladdinCARD 0200 CPC 4321 Tata Power Strategic Electronics Division +434e CAST Navigation LLC 4444 Internext Compression Inc 0016 iTVC16 (CX23416) MPEG-2 Encoder 0070 0003 WinTV PVR 250 @@ -10299,6 +10760,8 @@ 4d51 MediaQ Inc. 0200 MQ-200 4d54 Microtechnica Co Ltd +4d56 MATRIX VISION GmbH + 0000 Altera Cyclone II CameraLink Frame Grabber [mvHYPERION-CLe] 4ddc ILC Data Device Corp 0100 DD-42924I5-300 (ARINC 429 Data Bus) 0801 BU-65570I1 MIL-STD-1553 Test and Simulation @@ -10371,6 +10834,7 @@ 8903 Trio 3D business multimedia 8904 Trio 64 3D 1014 00db Integrated Trio3D + 4843 314a Terminator 128/3D GLH 5333 8904 86C365 Trio3D AGP 8905 Trio 64V+ family 8906 Trio 64V+ family @@ -10455,6 +10919,8 @@ 8d02 VT8636A [ProSavage KN133] AGP4X VGA Controller (TwisterK) 8d03 VT8751 [ProSavageDDR P4M266] 8d04 VT8375 [ProSavage8 KM266/KL266] + 8e48 Chrome S27 PCIE + 5333 0130 Chrome S27 256M DDR2 9102 86C410 Savage 2000 1092 5932 Viper II Z200 1092 5934 Viper II Z200 @@ -10469,6 +10935,7 @@ 0350 TL880-based HDTV/ATSC tuner 5455 Technische University Berlin 4458 S5933 +5456 GoTView 5519 Cnet Technologies, Inc. 5544 Dunord Technologies 0001 I-30xx Scanner Interface @@ -10478,6 +10945,8 @@ 3132 OpenSwitch12 5700 Netpower 5851 Exacq Technologies +5853 XenSource, Inc. + 0001 Xen Platform Device 6356 UltraStor 6374 c't Magazin fuer Computertechnik 6773 GPPCI @@ -10555,14 +11024,15 @@ # (bi-interleave 1) 0537 E8870SP Interleave registers 2 and 3 0600 RAID Controller + 8086 0136 SRCU31L 8086 01af SRCZCR 8086 01c1 ICP Vortex GDT8546RZ 8086 01f7 SCRU32 # uninitialized SRCU32 RAID Controller 061f 80303 I/O Processor - 0960 80960RP [i960 RP Microprocessor/Bridge] - 0962 80960RM [i960RM Bridge] - 0964 80960RP [i960 RP Microprocessor/Bridge] + 0960 80960RP (i960RP) Microprocessor/Bridge + 0962 80960RM (i960RM) Bridge + 0964 80960RP (i960RP) Microprocessor/Bridge 1000 82542 Gigabit Ethernet Controller 0e11 b0df NC6132 Gigabit Ethernet Adapter (1000-SX) 0e11 b0e0 NC6133 Gigabit Ethernet Adapter (1000-LX) @@ -10586,6 +11056,7 @@ 8086 2004 PRO/1000 T Server Adapter 1008 82544EI Gigabit Ethernet Controller (Copper) 1014 0269 iSeries 1000/100/10 Ethernet Adapter + 1028 011b PowerEdge 2550 1028 011c PRO/1000 XT Network Connection 8086 1107 PRO/1000 XT Server Adapter 8086 2107 PRO/1000 XT Server Adapter @@ -10712,7 +11183,8 @@ 103b 82801DB PRO/100 VM (LOM) Ethernet Controller 103c 82801DB PRO/100 VM (CNR) Ethernet Controller 103d 82801DB PRO/100 VE (MOB) Ethernet Controller - 1014 0522 Thinkpad R50e model 1634 + 1014 0522 Thinkpad R40 model 2681 + 8086 103d 82562EZ 10/100 Ethernet Controller 103e 82801DB PRO/100 VM (MOB) Ethernet Controller 1040 536EP Data Fax Modem 16be 1040 V.9X DSP Data Fax Modem @@ -10720,11 +11192,13 @@ 103c 08b0 tc1100 tablet 8086 2522 Samsung P30 integrated WLAN 8086 2527 MIM2000/Centrino + 8086 2561 Dell Latitude D800 8086 2581 Toshiba Satellite M10 1048 PRO/10GbE LR Server Adapter 8086 a01f PRO/10GbE LR Server Adapter 8086 a11f PRO/10GbE LR Server Adapter 1049 82566MM Gigabit Network Connection + 17aa 20b9 Lenovo Thinkpad T61 104a 82566DM Gigabit Network Connection 104b 82566DC Gigabit Network Connection 104c 82562V 10/100 Network Connection @@ -10746,6 +11220,7 @@ 105b 82546GB Gigabit Ethernet Controller (Copper) 105e 82571EB Gigabit Ethernet Controller 103c 7044 NC360T PCI Express Dual Port Gigabit Server Adapter + 1775 1100 CR11/VR11 Single Board Computer 1775 6003 Telum GE-QT 8086 005e PRO/1000 PT Dual Port Server Connection 8086 105e PRO/1000 PT Dual Port Network Connection @@ -10847,6 +11322,7 @@ 17aa 2001 ThinkPad T60 17aa 207e Thinkpad X60s 8086 109a PRO/1000 PL Network Connection + 8086 309c DeskTop Board D945GTP 109b 82546GB PRO/1000 GF Quad Port Server Adapter 109e 82597EX 10GbE Ethernet Controller 8086 a01f PRO/10GbE CX4 Server Adapter @@ -10856,6 +11332,7 @@ 10a4 82571EB Gigabit Ethernet Controller 8086 10a4 PRO/1000 PT Quad Port Server Adapter 8086 11a4 PRO/1000 PT Quad Port Server Adapter + 10a5 82571EB PRO/1000 PF Quad Port Server Adapter 10b0 82573L PRO/1000 PL Network Connection 10b2 82573V PRO/1000 PM Network Connection 10b3 82573E PRO/1000 PM Network Connection @@ -10864,6 +11341,7 @@ 103c 3109 NC340T PCI-X Quad-port Gigabit Server Adapter 8086 1099 PRO/1000 GT Quad Port Server Adapter 8086 1199 PRO/1000 GT Quad Port Server Adapter + 10b6 82598 10GbE PCI-Express Ethernet Controller 10b9 82572EI Gigabit Ethernet Controller (Copper) 8086 1083 PRO/1000 PT Desktop Adapter 8086 1093 PRO/1000 PT Desktop Adapter @@ -10872,8 +11350,16 @@ 10bc 82571EB Gigabit Ethernet Controller (Copper) 8086 10bc PRO/1000 PT Quad Port LP Server Adapter 8086 11bc PRO/1000 PT Quad Port LP Server Adapter + 10bd 82566DM-2 Gigabit Network Connection + 10c0 82562V-2 10/100 Network Connection + 10c2 82562G-2 10/100 Network Connection + 10c3 82562GT-2 10/100 Network Connection 10c4 82562GT 10/100 Network Connection 10c5 82562G 10/100 Network Connection + 10c6 82598AF DUAL PORT 10GbE PCI-Express Ethernet Controller + 10c7 82598AF SINGLE PORT 10GbE PCI-Express Ethernet Controller + 10d9 82571EB Dual Port Gigabit Mezzanine Adapter + 10da 82571EB Quad Port Gigabit Mezzanine Adapter 1107 PRO/1000 MF Server Adapter (LX) 1130 82815 815 Chipset Host Bridge and Memory Controller Hub 1025 1016 Travelmate 612 TX @@ -10882,7 +11368,7 @@ 8086 4532 D815EEA2 mainboard 8086 4557 D815EGEW Mainboard 1131 82815 815 Chipset AGP Bridge - 1132 82815 CGC [Chipset Graphics Controller] + 1132 82815 Chipset Graphics Controller (CGC) 1025 1016 Travelmate 612 TX 104d 80df Vaio PCG-FX403 8086 4532 D815EEA2 Mainboard @@ -10904,8 +11390,7 @@ 1226 82596 PRO/10 PCI 1227 82865 EtherExpress PRO/100A 1228 82556 EtherExpress PRO/100 Smart -# the revision field differentiates between them (1-3 is 82557, 4-5 is 82558, 6-8 is 82559, 9 is 82559ER) - 1229 82557/8/9 [Ethernet Pro 100] + 1229 82557/8/9 Ethernet Pro 100 0e11 3001 82559 Fast Ethernet LOM with Alert on LAN* 0e11 3002 82559 Fast Ethernet LOM with Alert on LAN* 0e11 3003 82559 Fast Ethernet LOM with Alert on LAN* @@ -10974,6 +11459,7 @@ 144d 2501 SEM-2000 MiniPCI LAN Adapter 144d 2502 SEM-2100IL MiniPCI LAN Adapter 1668 1100 EtherExpress PRO/100B (TX) (MiniPCI Ethernet+Modem) + 1775 1100 CR11/VR11 Single Board Computer 1775 ce90 CE9 4c53 1080 CT8 mainboard 4c53 10e0 PSL09 PrPMC @@ -10985,8 +11471,7 @@ 8086 0006 82557 10/100 with Wake on LAN 8086 0007 82558 10/100 Adapter 8086 0008 82558 10/100 with Wake on LAN -# 8086:0009 revision 5, 82558B based - 8086 0009 PRO/100+ PCI (TP) + 8086 0009 82558B PRO/100+ PCI (TP) 8086 000a EtherExpress PRO/100+ Management Adapter 8086 000b EtherExpress PRO/100+ 8086 000c EtherExpress PRO/100+ Management Adapter @@ -11089,7 +11574,7 @@ 15d9 3480 P4DP6 4c53 1090 Cx9/Vx9 mainboard 1462 82870P2 P64H2 Hot Plug Controller - 1960 80960RP [i960RP Microprocessor] + 1960 80960RP (i960RP) Microprocessor 101e 0431 MegaRAID 431 RAID Controller 101e 0438 MegaRAID 438 Ultra2 LVD RAID Controller 101e 0466 MegaRAID 466 Express Plus RAID Controller @@ -11114,44 +11599,45 @@ e4bf 1020 CU2-QUARTET e4bf 1040 CU1-CHORUS e4bf 3100 CX1-BAND - 1962 80960RM [i960RM Microprocessor] + 1962 80960RM (i960RM) Microprocessor 105a 0000 SuperTrak SX6000 I2O CPU - 1a21 82840 840 (Carmel) Chipset Host Bridge (Hub A) - 1a23 82840 840 (Carmel) Chipset AGP Bridge - 1a24 82840 840 (Carmel) Chipset PCI Bridge (Hub B) - 1a30 82845 845 (Brookdale) Chipset Host Bridge + 1a21 82840 840 [Carmel] Chipset Host Bridge (Hub A) + 1a23 82840 840 [Carmel] Chipset AGP Bridge + 1a24 82840 840 [Carmel] Chipset PCI Bridge (Hub B) + 1a30 82845 845 [Brookdale] Chipset Host Bridge 1028 010e Optiplex GX240 - 1a31 82845 845 (Brookdale) Chipset AGP Bridge + 1a31 82845 845 [Brookdale] Chipset AGP Bridge 1a38 5000 Series Chipset DMA Engine 1a48 PRO/10GbE SR Server Adapter 1b48 82597EX 10GbE Ethernet Controller 8086 a01f PRO/10GbE LR Server Adapter 8086 a11f PRO/10GbE LR Server Adapter 2410 82801AA ISA Bridge (LPC) - 2411 82801AA IDE - 2412 82801AA USB - 2413 82801AA SMBus - 2415 82801AA AC'97 Audio + 2411 82801AA IDE Controller + 2412 82801AA USB Controller + 2413 82801AA SMBus Controller + 2415 82801AA AC'97 Audio Controller 1028 0095 Precision Workstation 220 Integrated Digital Audio + 1028 00b4 OptiPlex GX110 110a 0051 Activy 2xx 11d4 0040 SoundMAX Integrated Digital Audio 11d4 0048 SoundMAX Integrated Digital Audio 11d4 5340 SoundMAX Integrated Digital Audio 1734 1025 Activy 3xx - 2416 82801AA AC'97 Modem + 2416 82801AA AC'97 Modem Controller 2418 82801AA PCI Bridge 2420 82801AB ISA Bridge (LPC) - 2421 82801AB IDE - 2422 82801AB USB - 2423 82801AB SMBus - 2425 82801AB AC'97 Audio + 2421 82801AB IDE Controller + 2422 82801AB USB Controller + 2423 82801AB SMBus Controller + 2425 82801AB AC'97 Audio Controller 11d4 0040 SoundMAX Integrated Digital Audio 11d4 0048 SoundMAX Integrated Digital Audio - 2426 82801AB AC'97 Modem + 2426 82801AB AC'97 Modem Controller 2428 82801AB PCI Bridge 2440 82801BA ISA Bridge (LPC) 8086 5744 S845WD1-E - 2442 82801BA/BAM USB (Hub #1) + 2442 82801BA/BAM USB Controller #1 1014 01c6 Netvista A40/A40p 1025 1016 Travelmate 612 TX 1028 00c7 Dimension 8100 @@ -11162,7 +11648,7 @@ 8086 4532 D815EEA2 mainboard 8086 4557 D815EGEW Mainboard 8086 5744 S845WD1-E mainboard - 2443 82801BA/BAM SMBus + 2443 82801BA/BAM SMBus Controller 1014 01c6 Netvista A40/A40p 1025 1016 Travelmate 612 TX 1028 00c7 Dimension 8100 @@ -11173,7 +11659,7 @@ 8086 4532 D815EEA2 mainboard 8086 4557 D815EGEW Mainboard 8086 5744 S845WD1-E mainboard - 2444 82801BA/BAM USB (Hub #2) + 2444 82801BA/BAM USB Controller #1 1025 1016 Travelmate 612 TX 1028 00c7 Dimension 8100 1028 010e Optiplex GX240 @@ -11182,7 +11668,7 @@ 147b 0507 TH7II-RAID 8086 4532 D815EEA2 mainboard 8086 5744 S845WD1-E mainboard - 2445 82801BA/BAM AC'97 Audio + 2445 82801BA/BAM AC'97 Audio Controller 0e11 000b Compaq Deskpro EN Audio 0e11 0088 Evo D500 1014 01c6 Netvista A40/A40p @@ -11191,10 +11677,12 @@ 1462 3370 STAC9721 AC 147b 0507 TH7II-RAID 8086 4557 D815EGEW Mainboard - 2446 82801BA/BAM AC'97 Modem + 2446 82801BA/BAM AC'97 Modem Controller 1025 1016 Travelmate 612 TX 104d 80df Vaio PCG-FX403 2448 82801 Mobile PCI Bridge +# (rev d3) (prog-if (rev d3) (prog-if 01 [Subtractive decode]) + 103c 0934 HP Compaq nw8240 Mobile Workstation 103c 099c NX6110/NC6120 144d c00c P30 notebook 1734 1055 Amilo M1420 @@ -11229,10 +11717,10 @@ 8086 3016 EtherExpress PRO/100 P Mobile Combo 8086 3017 EtherExpress PRO/100 P Mobile 8086 3018 EtherExpress PRO/100 - 244a 82801BAM IDE U100 + 244a 82801BAM IDE U100 Controller 1025 1016 Travelmate 612TX 104d 80df Vaio PCG-FX403 - 244b 82801BA IDE U100 + 244b 82801BA IDE U100 Controller 1014 01c6 Netvista A40/A40p 1028 00c7 Dimension 8100 1028 010e Optiplex GX240 @@ -11245,14 +11733,14 @@ 244e 82801 PCI Bridge 1014 0267 NetVista A30p 2450 82801E ISA Bridge (LPC) - 2452 82801E USB - 2453 82801E SMBus + 2452 82801E USB Controller + 2453 82801E SMBus Controller 2459 82801E Ethernet Controller 0 - 245b 82801E IDE U100 + 245b 82801E IDE U100 Controller 245d 82801E Ethernet Controller 1 245e 82801E PCI Bridge 2480 82801CA LPC Interface Controller - 2482 82801CA/CAM USB (Hub #1) + 2482 82801CA/CAM USB Controller #1 0e11 0030 Evo N600c 1014 0220 ThinkPad A/T/X Series 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP @@ -11265,7 +11753,7 @@ 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 15d9 3480 P4DP6 8086 1958 vpr Matrix 170B4 - 2484 82801CA/CAM USB (Hub #2) + 2484 82801CA/CAM USB Controller #2 0e11 0030 Evo N600c 1014 0220 ThinkPad A/T/X Series 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP @@ -11276,6 +11764,9 @@ 1014 0222 ThinkPad T23 (2647-4MG) or A30/A30p (2652/2653) 1014 0508 ThinkPad T30 1014 051c ThinkPad A/T/X Series + 1043 1583 L3C (SPDIF) + 1043 1623 L2B (no SPDIF) + 1043 1643 L3F 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 144d c006 vpr Matrix 170B4 2486 82801CA/CAM AC'97 Modem Controller @@ -11287,13 +11778,13 @@ 134d 4c21 Dell Inspiron 2100 internal modem 144d 2115 vpr Matrix 170B4 internal modem 14f1 5421 MD56ORD V.92 MDC Modem - 2487 82801CA/CAM USB (Hub #3) + 2487 82801CA/CAM USB Controller #3 0e11 0030 Evo N600c 1014 0220 ThinkPad A/T/X Series 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP 15d9 3480 P4DP6 8086 1958 vpr Matrix 170B4 - 248a 82801CAM IDE U100 + 248a 82801CAM IDE U100 Controller 0e11 0030 Evo N600c 1014 0220 ThinkPad A/T/X Series 104d 80e7 VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP @@ -11308,7 +11799,7 @@ 24c1 82801DBL (ICH4-L) IDE Controller 24c2 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #1 1014 0267 NetVista A30p - 1014 052d Thinkpad R50e model 1634 + 1014 052d ThinkPad 1025 005a TravelMate 290 1028 0126 Optiplex GX260 1028 0163 Latitude D505 @@ -11317,31 +11808,38 @@ 103c 0890 NC6000 laptop 103c 08b0 tc1100 tablet 1071 8160 MIM2000 - 144d c00c P30 notebook + 144d c00c P30/P35 notebook 1462 5800 845PE Max (MS-6580) 1509 2990 Averatec 5110H laptop 1734 1004 D1451 Mainboard (SCENIC N300, i845GV) 1734 1055 Amilo M1420 4c53 1090 Cx9 / Vx9 mainboard + 8086 24c2 Latitude X300 8086 4541 Latitude D400 + e4bf 0cc9 CC9-SAMBA + e4bf 0cd2 CD2-BEBOP 24c3 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) SMBus Controller 1014 0267 NetVista A30p - 1014 052d Thinkpad R50e model 1634 + 1014 052d ThinkPad 1025 005a TravelMate 290 1028 0126 Optiplex GX260 + 1028 014f Latitude X300 103c 088c NC8000 laptop 103c 0890 NC6000 laptop 103c 08b0 tc1100 tablet 1071 8160 MIM2000 + 144d c005 Samsung X10 Laptop 144d c00c P30/P35 notebook 1458 24c2 GA-8PE667 Ultra 1462 5800 845PE Max (MS-6580) 1734 1004 D1451 Mainboard (SCENIC N300, i845GV) 1734 1055 Amilo M1420 4c53 1090 Cx9 / Vx9 mainboard + e4bf 0cc9 CC9-SAMBA + e4bf 0cd2 CD2-BEBOP 24c4 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #2 1014 0267 NetVista A30p - 1014 052d Thinkpad R50e model 1634 + 1014 052d ThinkPad 1025 005a TravelMate 290 1028 0126 Optiplex GX260 1028 0163 Latitude D505 @@ -11350,30 +11848,40 @@ 103c 0890 NC6000 laptop 103c 08b0 tc1100 tablet 1071 8160 MIM2000 - 144d c00c P30 notebook + 144d c00c P30/P35 notebook 1462 5800 845PE Max (MS-6580) 1509 2990 Averatec 5110H 1734 1004 D1451 Mainboard (SCENIC N300, i845GV) 4c53 1090 Cx9 / Vx9 mainboard + 8086 24c2 Latitude X300 8086 4541 Latitude D400 + e4bf 0cc9 CC9-SAMBA + e4bf 0cd2 CD2-BEBOP 24c5 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Audio Controller 0e11 00b8 Analog Devices Inc. codec [SoundMAX] 1014 0267 NetVista A30p + 1014 0537 ThinkPad T41 1014 055f Thinkpad R50e model 1634 1025 005a TravelMate 290 1028 0139 Latitude D400 + 1028 014f Latitude X300 1028 0163 Latitude D505 1028 0196 Inspiron 5160 103c 088c NC8000 laptop 103c 0890 NC6000 laptop 103c 08b0 tc1100 tablet 1071 8160 MIM2000 - 144d c00c P30 notebook + 144d c005 Samsung X10 Laptop + 144d c00c P30/P35 notebook 1458 a002 GA-8PE667 Ultra 1462 5800 845PE Max (MS-6580) 1734 1005 D1451 (SCENIC N300, i845GV) Sigmatel STAC9750T 1734 1055 Amilo M1420 + 8086 24c5 Dell Dimension 2400 + a002 1458 Realtek AC'97 codec [ALC655] 24c6 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller + 1014 0524 Thinkpad T41 + 1014 0525 ThinkPad 1014 0559 Thinkpad R50e model 1634 1025 003c Aspire 2001WLCi (Compal CL50 motherboard) implementation 1025 005a TravelMate 290 @@ -11382,10 +11890,11 @@ 103c 0890 NC6000 laptop 103c 08b0 tc1100 tablet 1071 8160 MIM2000 - 144d c00c P30 notebook + 144d 2115 Samsung X10 Laptop + 144d c00c P30/P35 notebook 24c7 82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #3 1014 0267 NetVista A30p - 1014 052d Thinkpad R50e model 1634 + 1014 052d ThinkPad 1025 005a TravelMate 290 1028 0126 Optiplex GX260 1028 0163 Latitude D505 @@ -11394,22 +11903,26 @@ 103c 0890 NC6000 laptop 103c 08b0 tc1100 tablet 1071 8160 MIM2000 - 144d c00c P30 notebook + 144d c00c P30/P35 notebook 1462 5800 845PE Max (MS-6580) 1509 2990 Averatec 5110H 1734 1004 D1451 Mainboard (SCENIC N300, i845GV) 4c53 1090 Cx9 / Vx9 mainboard + 8086 24c2 Latitude X300 8086 4541 Latitude D400 + e4bf 0cc9 CC9-SAMBA + e4bf 0cd2 CD2-BEBOP 24ca 82801DBM (ICH4-M) IDE Controller - 1014 052d Thinkpad R50e model 1634 + 1014 052d ThinkPad 1025 005a TravelMate 290 + 1028 014f Latitude X300 1028 0163 Latitude D505 1028 0196 Inspiron 5160 103c 088c NC8000 laptop 103c 0890 NC6000 laptop 103c 08b0 tc1100 tablet 1071 8160 MIM2000 - 144d c00c P30 notebook + 144d c00c P30/P35 notebook 1734 1055 Amilo M1420 8086 4541 Latitude D400 24cb 82801DB (ICH4) IDE Controller @@ -11419,12 +11932,14 @@ 1462 5800 845PE Max (MS-6580) 1734 1004 D1451 Mainboard (SCENIC N300, i845GV) 4c53 1090 Cx9 / Vx9 mainboard + e4bf 0cc9 CC9-SAMBA + e4bf 0cd2 CD2-BEBOP 24cc 82801DBM (ICH4-M) LPC Interface Bridge 144d c00c P30 notebook 1734 1055 Amilo M1420 24cd 82801DB/DBM (ICH4/ICH4-M) USB2 EHCI Controller 1014 0267 NetVista A30p - 1014 052e Thinkpad R50e model 1634 + 1014 052e ThinkPad 1025 005a TravelMate 290 1028 011d Latitude D600 1028 0126 Optiplex GX260 @@ -11436,12 +11951,15 @@ 103c 08b0 tc1100 tablet 1071 8160 MIM2000 1179 ff00 Satellite 2430 - 144d c00c P30 notebook + 144d c00c P30/P35 notebook 1462 3981 845PE Max (MS-6580) 1509 1968 Averatec 5110H 1734 1004 D1451 Mainboard (SCENIC N300, i845GV) 1734 1055 Amilo M1420 4c53 1090 Cx9 / Vx9 mainboard + 8086 24c2 Latitude X300 + e4bf 0cc9 CC9-SAMBA + e4bf 0cd2 CD2-BEBOP 24d0 82801EB/ER (ICH5/ICH5R) LPC Interface Bridge 24d1 82801EB (ICH5) SATA Controller 1028 0169 Precision 470 @@ -11450,13 +11968,15 @@ 1043 80a6 P4P800 SE Mainboard 1458 24d1 GA-8IPE1000 Pro2 motherboard (865PE) 1462 7280 865PE Neo2 (MS-6728) + 1565 5200 P4TSV Motherboard (865G) 15d9 4580 P4SCE Mainboard 8086 3427 S875WP1-E mainboard 8086 4246 Desktop Board D865GBF 8086 4c43 Desktop Board D865GLC 8086 524c D865PERL mainboard 24d2 82801EB/ER (ICH5/ICH5R) USB UHCI Controller #1 - 1014 02ed xSeries server mainboard + 1014 02dd eServer xSeries server mainboard + 1014 02ed eServer xSeries server mainboard 1028 0169 Precision 470 1028 0183 PowerEdge 1800 1028 019a PowerEdge SC1425 @@ -11465,6 +11985,7 @@ 1043 80a6 P5P800-MX Mainboard 1458 24d2 GA-8IPE1000/8KNXP motherboard 1462 7280 865PE Neo2 (MS-6728) + 1565 3101 P4TSV Motherboard (865G) 15d9 4580 P4SCE Mainboard 1734 101c Primergy RX300 S2 8086 3427 S875WP1-E mainboard @@ -11472,13 +11993,15 @@ 8086 4c43 Desktop Board D865GLC 8086 524c D865PERL mainboard 24d3 82801EB/ER (ICH5/ICH5R) SMBus Controller - 1014 02ed xSeries server mainboard + 1014 02dd eServer xSeries server mainboard + 1014 02ed eServer xSeries server mainboard 1028 0156 Precision 360 1028 0169 Precision 470 103c 12bc d330 uT 1043 80a6 P4P800 Mainboard 1458 24d2 GA-8IPE1000 Pro2 motherboard (865PE) 1462 7280 865PE Neo2 (MS-6728) + 1565 3101 P4TSV Motherboard (865G) 15d9 4580 P4SCE Mainboard 1734 101c Primergy RX300 S2 8086 3427 S875WP1-E mainboard @@ -11486,7 +12009,8 @@ 8086 4c43 Desktop Board D865GLC 8086 524c D865PERL mainboard 24d4 82801EB/ER (ICH5/ICH5R) USB UHCI Controller #2 - 1014 02ed xSeries server mainboard + 1014 02dd eServer xSeries server mainboard + 1014 02ed eServer xSeries server mainboard 1028 0169 Precision 470 1028 0183 PowerEdge 1800 1028 019a PowerEdge SC1425 @@ -11495,6 +12019,7 @@ 1043 80a6 P5P800-MX Mainboard 1458 24d2 GA-8IPE1000 Pro2 motherboard (865PE) 1462 7280 865PE Neo2 (MS-6728) + 1565 3101 P4TSV Motherboard (865G) 15d9 4580 P4SCE Mainboard 1734 101c Primergy RX300 S2 8086 3427 S875WP1-E mainboard @@ -11526,6 +12051,7 @@ 1043 80a6 P5P800-MX Mainboard 1458 24d2 GA-8IPE1000 Pro2 motherboard (865PE) 1462 7280 865PE Neo2 (MS-6728) + 1565 3101 P4TSV Motherboard (865G) 15d9 4580 P4SCE Mainboard 1734 101c Primergy RX300 S2 8086 3427 S875WP1-E mainboard @@ -11533,7 +12059,8 @@ 8086 4c43 Desktop Board D865GLC 8086 524c D865PERL mainboard 24db 82801EB/ER (ICH5/ICH5R) IDE Controller - 1014 02ed xSeries server mainboard + 1014 02dd eServer xSeries server mainboard + 1014 02ed eServer xSeries server mainboard 1028 0169 Precision 470 1028 019a PowerEdge SC1425 103c 006a NX9500 @@ -11542,6 +12069,7 @@ 1458 24d2 GA-8IPE1000 Pro2 motherboard (865PE) 1462 7280 865PE Neo2 (MS-6728) 1462 7580 MSI 875P + 1565 3101 P4TSV Motherboard (865G) 15d9 4580 P4SCE Mainboard 1734 101c Primergy RX300 S2 8086 24db P4C800 Mainboard @@ -11551,7 +12079,8 @@ 8086 524c D865PERL mainboard 24dc 82801EB (ICH5) LPC Interface Bridge 24dd 82801EB/ER (ICH5/ICH5R) USB2 EHCI Controller - 1014 02ed xSeries server mainboard + 1014 02dd eServer xSeries server mainboard + 1014 02ed eServer xSeries server mainboard 1028 0169 Precision 470 1028 0183 PowerEdge 1800 1028 019a PowerEdge SC1425 @@ -11570,6 +12099,7 @@ 1043 80a6 P5P800-MX Mainboard 1458 24d2 GA-8IPE1000 Pro2 motherboard (865PE) 1462 7280 865PE Neo2 (MS-6728) + 1565 3101 P4TSV Motherboard (865G) 15d9 4580 P4SCE Mainboard 1734 101c Primergy RX300 S2 8086 3427 S875WP1-E mainboard @@ -11623,6 +12153,7 @@ 2562 82845G/GL[Brookdale-G]/GE Chipset Integrated Graphics Device 0e11 00b9 Evo D510 SFF 1014 0267 NetVista A30p + 1734 1003 D1521 Mainboard (Fujitsu-Siemens) 1734 1004 D1451 Mainboard (SCENIC N300, i845GV) 2570 82865G/PE/P DRAM Controller/Host-Hub Interface 103c 006a NX9500 @@ -11656,6 +12187,7 @@ 1043 2582 P5GD1-VW Mainboard 1458 2582 GA-8I915ME-G Mainboard 1734 105b Scenic W620 + 1849 2582 ASRock P4Dual-915GL 2584 82925X/XE Memory Controller Hub 2585 82925X/XE PCI Express Root Port 2588 E7220/E7221 Memory Controller Hub @@ -11663,64 +12195,85 @@ 258a E7221 Integrated Graphics Controller 2590 Mobile 915GM/PM/GMS/910GML Express Processor to DRAM Controller 1028 0182 Dell Latidude C610 +# (rev 03) + 103c 0934 HP Compaq nw8240 Mobile Workstation 103c 099c NX6110/NC6120 + 104d 81b7 Vaio VGN-S3XP a304 81b7 Vaio VGN-S3XP + e4bf 0ccd CCD-CALYPSO + e4bf 0cd3 CD3-JIVE + e4bf 58b1 XB1 2591 Mobile 915GM/PM Express PCI Express Root Port +# (rev 03) (prog-if 00 [Normal decode]) + 103c 0934 HP Compaq nw8240 Mobile Workstation 2592 Mobile 915GM/GMS/910GML Express Graphics Controller 103c 099c NX6110/NC6120 103c 308a NC6220 1043 1881 GMA 900 915GM Integrated Graphics + e4bf 0ccd CCD-CALYPSO + e4bf 0cd3 CD3-JIVE + e4bf 58b1 XB1 25a1 6300ESB LPC Interface Controller 25a2 6300ESB PATA Storage Controller 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 + 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 1775 10d0 V5D Single Board Computer + 1775 1100 CR11/VR11 Single Board Computer 1775 ce90 CE9 4c53 10b0 CL9 mainboard 4c53 10d0 Telum ASLP10 Processor AMC 4c53 10e0 PSL09 PrPMC 25a6 6300ESB AC'97 Audio Controller + 1775 1100 CR11/VR11 Single Board Computer 1775 ce90 CE9 4c53 10b0 CL9 mainboard 25a7 6300ESB AC'97 Modem Controller 25a9 6300ESB USB Universal Host Controller 1775 10d0 V5D Single Board Computer USB + 1775 1100 CR11/VR11 Single Board Computer 1775 ce90 CE9 4c53 10b0 CL9 mainboard 4c53 10d0 Telum ASLP10 Processor AMC 4c53 10e0 PSL09 PrPMC 25aa 6300ESB USB Universal Host Controller + 1775 1100 CR11/VR11 Single Board Computer 1775 ce90 CE9 4c53 10b0 CL9 mainboard 4c53 10e0 PSL09 PrPMC 25ab 6300ESB Watchdog Timer 1775 10d0 V5D Single Board Computer + 1775 1100 CR11/VR11 Single Board Computer 1775 ce90 CE9 4c53 10b0 CL9 mainboard 4c53 10d0 Telum ASLP10 Processor AMC 4c53 10e0 PSL09 PrPMC 25ac 6300ESB I/O Advanced Programmable Interrupt Controller 1775 10d0 V5D Single Board Computer + 1775 1100 CR11/VR11 Single Board Computer 1775 ce90 CE9 4c53 10b0 CL9 mainboard 4c53 10d0 Telum ASLP10 Processor AMC 4c53 10e0 PSL09 PrPMC 25ad 6300ESB USB2 Enhanced Host Controller 1775 10d0 V5D Single Board Computer USB 2.0 + 1775 1100 CR11/VR11 Single Board Computer 1775 ce90 CE9 4c53 10b0 CL9 mainboard 4c53 10d0 Telum ASLP10 Processor AMC 4c53 10e0 PSL09 PrPMC 25ae 6300ESB 64-bit PCI-X Bridge 25b0 6300ESB SATA RAID Controller + 1775 1100 CR11/VR11 Single Board Computer 4c53 10d0 Telum ASLP10 Processor AMC 4c53 10e0 PSL09 PrPMC 25c0 5000X Chipset Memory Controller Hub @@ -11779,7 +12332,12 @@ 2640 82801FB/FR (ICH6/ICH6R) LPC Interface Bridge 1462 7028 915P/G Neo2 1734 105c Scenic W620 + e4bf 0ccd CCD-CALYPSO + e4bf 0cd3 CD3-JIVE + e4bf 58b1 XB1 2641 82801FBM (ICH6M) LPC Interface Bridge +# (rev 03) + 103c 0934 HP Compaq nw8240 Mobile Workstation 103c 099c NX6110/NC6120 2642 82801FW/FRW (ICH6W/ICH6RW) LPC Interface Bridge 2651 82801FB/FW (ICH6/ICH6W) SATA Controller @@ -11787,30 +12345,48 @@ 1043 2601 P5GD1-VW Mainboard 1734 105c Scenic W620 8086 4147 D915GAG Motherboard + e4bf 0ccd CCD-CALYPSO + e4bf 0cd3 CD3-JIVE + e4bf 58b1 XB1 2652 82801FR/FRW (ICH6R/ICH6RW) SATA Controller 1462 7028 915P/G Neo2 2653 82801FBM (ICH6M) SATA Controller 2658 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #1 1028 0179 Optiplex GX280 +# (rev 03) (prog-if 00 [UHCI]) + 103c 0934 HP Compaq nw8240 Mobile Workstation 103c 099c NX6110/NC6120 1043 80a6 P5GD1-VW Mainboard 1458 2558 GA-8I915ME-G Mainboard 1462 7028 915P/G Neo2 1734 105c Scenic W620 + e4bf 0ccd CCD-CALYPSO + e4bf 0cd3 CD3-JIVE + e4bf 58b1 XB1 2659 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #2 1028 0179 Optiplex GX280 +# (prog-if 00 [UHCI]) + 103c 0934 HP Compaq nw8240 Mobile Workstation 103c 099c NX6110/NC6120 1043 80a6 P5GD1-VW Mainboard 1458 2659 GA-8I915ME-G Mainboard 1462 7028 915P/G Neo2 1734 105c Scenic W620 + e4bf 0ccd CCD-CALYPSO + e4bf 0cd3 CD3-JIVE + e4bf 58b1 XB1 265a 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #3 1028 0179 Optiplex GX280 +# (prog-if 00 [UHCI]) + 103c 0934 HP Compaq nw8240 Mobile Workstation 103c 099c NX6110/NC6120 1043 80a6 P5GD1-VW Mainboard 1458 265a GA-8I915ME-G Mainboard 1462 7028 915P/G Neo2 1734 105c Scenic W620 + e4bf 0ccd CCD-CALYPSO + e4bf 0cd3 CD3-JIVE + e4bf 58b1 XB1 265b 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #4 1028 0179 Optiplex GX280 103c 099c NX6110/NC6120 @@ -11818,19 +12394,43 @@ 1458 265a GA-8I915ME-G Mainboard 1462 7028 915P/G Neo2 1734 105c Scenic W620 + e4bf 0ccd CCD-CALYPSO + e4bf 0cd3 CD3-JIVE + e4bf 58b1 XB1 265c 82801FB/FBM/FR/FW/FRW (ICH6 Family) USB2 EHCI Controller 1028 0179 Optiplex GX280 +# (rev 03) (prog-if 20 [EHCI]) + 103c 0934 HP Compaq nw8240 Mobile Workstation 103c 099c NX6110/NC6120 1043 80a6 P5GD1-VW Mainboard 1458 5006 GA-8I915ME-G Mainboard 1462 7028 915P/G Neo2 1734 105c Scenic W620 8086 265c Dimension 3100 + e4bf 0ccd CCD-CALYPSO + e4bf 0cd3 CD3-JIVE + e4bf 58b1 XB1 2660 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 1 +# (rev 03) (prog-if 00 [Normal decode]) + 103c 0934 HP Compaq nw8240 Mobile Workstation 103c 099c NX6110/NC6120 + e4bf 0ccd CCD-CALYPSO + e4bf 0cd3 CD3-JIVE + e4bf 58b1 XB1 2662 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 2 +# (rev 03) (prog-if 00 [Normal decode]) + 103c 0934 HP Compaq nw8240 Mobile Workstation + e4bf 0ccd CCD-CALYPSO + e4bf 0cd3 CD3-JIVE + e4bf 58b1 XB1 2664 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 3 + e4bf 0ccd CCD-CALYPSO + e4bf 0cd3 CD3-JIVE + e4bf 58b1 XB1 2666 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 4 + e4bf 0ccd CCD-CALYPSO + e4bf 0cd3 CD3-JIVE + e4bf 58b1 XB1 2668 82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller # based on the PTGD1-LA motherboard 103c 2a09 PufferM-UL8E @@ -11841,15 +12441,22 @@ 1458 266a GA-8I915ME-G Mainboard 1462 7028 915P/G Neo2 1734 105c Scenic W620 + e4bf 0ccd CCD-CALYPSO + e4bf 0cd3 CD3-JIVE + e4bf 58b1 XB1 266c 82801FB/FBM/FR/FW/FRW (ICH6 Family) LAN Controller 266d 82801FB/FBM/FR/FW/FRW (ICH6 Family) AC'97 Modem Controller 1025 006a Conexant AC'97 CoDec (in Acer TravelMate 2410 serie laptop) +# (rev 03) (prog-if 00 [Generic]) + 103c 0934 HP Compaq nw8240 Mobile Workstation 103c 099c NX6110/NC6120 266e 82801FB/FBM/FR/FW/FRW (ICH6 Family) AC'97 Audio Controller 1025 006a Realtek ALC 655 codec (in Acer TravelMate 2410 serie laptop) 1028 0179 Optiplex GX280 1028 0182 Latitude D610 Laptop 1028 0188 Inspiron 6000 laptop +# (rev 03) + 103c 0934 HP Compaq nw8240 Mobile Workstation 103c 0944 Compaq NC6220 103c 099c NX6110/NC6120 103c 3006 DC7100 SFF(DX878AV) @@ -11857,16 +12464,21 @@ 152d 0745 Packard Bell A8550 Laptop 1734 105a Scenic W620 266f 82801FB/FBM/FR/FW/FRW (ICH6 Family) IDE Controller +# (rev 03) (prog-if 8a [Master SecP PriP]) + 103c 0934 HP Compaq nw8240 Mobile Workstation 103c 099c NX6110/NC6120 1043 80a6 P5GD1-VW Mainboard 1458 266f GA-8I915ME-G Mainboard 1462 7028 915P/G Neo2 1734 105c Scenic W620 + e4bf 0ccd CCD-CALYPSO + e4bf 0cd3 CD3-JIVE + e4bf 58b1 XB1 2670 631xESB/632xESB/3100 Chipset LPC Interface Controller - 2680 631xESB/632xESB/3100 Chipset SATA Storage Controller IDE - 2681 631xESB/632xESB SATA Storage Controller AHCI - 2682 631xESB/632xESB SATA Storage Controller RAID - 2683 631xESB/632xESB SATA Storage Controller RAID + 2680 631xESB/632xESB/3100 Chipset SATA IDE Controller + 2681 631xESB/632xESB SATA AHCI Controller + 2682 631xESB/632xESB SATA RAID Controller + 2683 631xESB/632xESB SATA RAID Controller 2688 631xESB/632xESB/3100 Chipset UHCI USB Controller #1 2689 631xESB/632xESB/3100 Chipset UHCI USB Controller #2 268a 631xESB/632xESB/3100 Chipset UHCI USB Controller #3 @@ -11894,6 +12506,7 @@ 2779 E7230/3000/3010 PCI Express Root Port 277a 82975X/3010 PCI Express Root Port 277c 82975X Memory Controller Hub + 1043 8178 P5WDG2 WS Professional motherboard 277d 82975X PCI Express Root Port 2782 82915G Integrated Graphics Controller 1043 2582 P5GD1-VW Mainboard @@ -11901,17 +12514,22 @@ 2792 Mobile 915GM/GMS/910GML Express Graphics Controller 103c 099c NX6110/NC6120 1043 1881 GMA 900 915GM Integrated Graphics - 27a0 Mobile 945GM/PM/GMS/940GML and 945GT Express Memory Controller Hub + e4bf 0ccd CCD-CALYPSO + e4bf 0cd3 CD3-JIVE + e4bf 58b1 XB1 + 27a0 Mobile 945GM/PM/GMS, 943/940GML and 945GT Express Memory Controller Hub + 1025 006c 9814 WKMI 103c 30a1 NC2400 17aa 2017 Thinkpad R60e model 0657 - 27a1 Mobile 945GM/PM/GMS/940GML and 945GT Express PCI Express Root Port - 27a2 Mobile 945GM/GMS/940GML Express Integrated Graphics Controller + 27a1 Mobile 945GM/PM/GMS, 943/940GML and 945GT Express PCI Express Root Port + 27a2 Mobile 945GM/GMS, 943/940GML Express Integrated Graphics Controller 103c 30a1 NC2400 17aa 201a Thinkpad R60e model 0657 - 27a6 Mobile 945GM/GMS/940GML Express Integrated Graphics Controller + 27a6 Mobile 945GM/GMS, 943/940GML Express Integrated Graphics Controller 103c 30a1 NC2400 17aa 201a Thinkpad R60e model 0657 27b0 82801GH (ICH7DH) LPC Interface Bridge + 8086 544e DeskTop Board D945GTP 27b8 82801GB/GR (ICH7 Family) LPC Interface Bridge 107b 5048 E4500 8086 544e DeskTop Board D945GTP @@ -11920,36 +12538,45 @@ 10f7 8338 Panasonic CF-Y5 laptop 17aa 2009 ThinkPad T60/R60 series 27bd 82801GHM (ICH7-M DH) LPC Interface Bridge - 27c0 82801GB/GR/GH (ICH7 Family) Serial ATA Storage Controller IDE + 1025 006c 9814 WKMI + 27c0 82801GB/GR/GH (ICH7 Family) SATA IDE Controller 107b 5048 E4500 + 1462 7236 945P Neo3-F Rev. 2.2 motherboard + 8086 544e DeskTop Board D945GTP + 27c1 82801GR/GH (ICH7 Family) SATA AHCI Controller + 27c3 82801GR/GH (ICH7 Family) SATA RAID Controller 8086 544e DeskTop Board D945GTP - 27c1 82801GR/GH (ICH7 Family) Serial ATA Storage Controller AHCI - 27c3 82801GR/GH (ICH7 Family) Serial ATA Storage Controller RAID - 27c4 82801GBM/GHM (ICH7 Family) Serial ATA Storage Controller IDE - 27c5 82801GBM/GHM (ICH7 Family) Serial ATA Storage Controller AHCI + 27c4 82801GBM/GHM (ICH7 Family) SATA IDE Controller + 1025 006c 9814 WKMI + 27c5 82801GBM/GHM (ICH7 Family) SATA AHCI Controller 17aa 200d Thinkpad R60e model 0657 - 27c6 82801GHM (ICH7-M DH) Serial ATA Storage Controller RAID - 27c8 82801G (ICH7 Family) USB UHCI #1 + 27c6 82801GHM (ICH7-M DH) SATA RAID Controller + 27c8 82801G (ICH7 Family) USB UHCI Controller #1 + 1025 006c 9814 WKMI 103c 30a1 NC2400 107b 5048 E4500 17aa 200a ThinkPad T60/R60 series 8086 544e DeskTop Board D945GTP - 27c9 82801G (ICH7 Family) USB UHCI #2 + 27c9 82801G (ICH7 Family) USB UHCI Controller #2 + 1025 006c 9814 WKMI 103c 30a1 NC2400 107b 5048 E4500 17aa 200a ThinkPad T60/R60 series 8086 544e DeskTop Board D945GTP - 27ca 82801G (ICH7 Family) USB UHCI #3 + 27ca 82801G (ICH7 Family) USB UHCI Controller #3 + 1025 006c 9814 WKMI 103c 30a1 NC2400 107b 5048 E4500 17aa 200a ThinkPad T60/R60 series 8086 544e DeskTop Board D945GTP - 27cb 82801G (ICH7 Family) USB UHCI #4 + 27cb 82801G (ICH7 Family) USB UHCI Controller #4 + 1025 006c 9814 WKMI 103c 30a1 NC2400 107b 5048 E4500 17aa 200a ThinkPad T60/R60 series 8086 544e DeskTop Board D945GTP 27cc 82801G (ICH7 Family) USB2 EHCI Controller + 1025 006c 9814 WKMI 103c 30a1 NC2400 17aa 200b ThinkPad T60/R60 series 8086 544e DeskTop Board D945GTP @@ -11958,14 +12585,19 @@ 27d4 82801G (ICH7 Family) PCI Express Port 3 27d6 82801G (ICH7 Family) PCI Express Port 4 27d8 82801G (ICH7 Family) High Definition Audio Controller + 1025 006c 9814 WKMI 103c 30a1 NC2400 + 1043 13c4 Asus G2P 107b 5048 E4500 10f7 8338 Panasonic CF-Y5 laptop - 1179 ff31 Toshiba America Information Systems:AC97 Data Fax SoftModem with SmartCP + 1179 ff31 AC97 Data Fax SoftModem with SmartCP 152d 0753 Softmodem 1734 10ad Conexant softmodem SmartCP 17aa 2010 ThinkPad T60/R60 series + 17aa 3802 Lenovo 3000 C200 audio [Realtek ALC861VD] + 8086 1112 DeskTop Board D945GTP 27da 82801G (ICH7 Family) SMBus Controller + 1025 006c 9814 WKMI 10f7 8338 Panasonic CF-Y5 laptop 17aa 200f ThinkPad T60/R60 series 8086 544e DeskTop Board D945GTP @@ -11973,6 +12605,7 @@ 8086 308d DeskTop Board D945GTP 27dd 82801G (ICH7 Family) AC'97 Modem Controller 27de 82801G (ICH7 Family) AC'97 Audio Controller + 1462 7267 Realtek ALC883 Audio Controller 27df 82801G (ICH7 Family) IDE Controller 103c 30a1 NC2400 107b 5048 E4500 @@ -11982,31 +12615,34 @@ 27e0 82801GR/GH/GHM (ICH7 Family) PCI Express Port 5 27e2 82801GR/GH/GHM (ICH7 Family) PCI Express Port 6 2810 82801HB/HR (ICH8/R) LPC Interface Controller - 2811 Mobile LPC Interface Controller + 2811 82801HBM (ICH8M-E) LPC Interface Controller 2812 82801HH (ICH8DH) LPC Interface Controller 2814 82801HO (ICH8DO) LPC Interface Controller - 2815 Mobile LPC Interface Controller + 2815 82801HEM (ICH8M) LPC Interface Controller 2820 82801H (ICH8 Family) 4 port SATA IDE Controller 1462 7235 P965 Neo MS-7235 mainboard 2821 82801HR/HO/HH (ICH8R/DO/DH) 6 port SATA AHCI Controller - 2822 82801HR/HO/HH (ICH8R/DO/DH) SATA RAID Controller + 2822 82801 SATA RAID Controller 2824 82801HB (ICH8) 4 port SATA AHCI Controller 2825 82801H (ICH8 Family) 2 port SATA IDE Controller 1462 7235 P965 Neo MS-7235 mainboard - 2828 Mobile SATA IDE Controller - 2829 Mobile SATA AHCI Controller - 282a Mobile SATA RAID Controller - 2830 82801H (ICH8 Family) USB UHCI #1 + 2828 82801HBM/HEM (ICH8M/ICH8M-E) SATA IDE Controller + 2829 82801HBM/HEM (ICH8M/ICH8M-E) SATA AHCI Controller + 282a Mobile 82801 SATA RAID Controller + 2830 82801H (ICH8 Family) USB UHCI Controller #1 1462 7235 P965 Neo MS-7235 mainboard - 2831 82801H (ICH8 Family) USB UHCI #2 + 2831 82801H (ICH8 Family) USB UHCI Controller #2 1462 7235 P965 Neo MS-7235 mainboard - 2832 82801H (ICH8 Family) USB UHCI #3 - 2834 82801H (ICH8 Family) USB UHCI #4 + 2832 82801H (ICH8 Family) USB UHCI Controller #3 + 2834 82801H (ICH8 Family) USB UHCI Contoller #4 1462 7235 P965 Neo MS-7235 mainboard - 2835 82801H (ICH8 Family) USB UHCI #5 - 2836 82801H (ICH8 Family) USB2 EHCI #1 + 17aa 20aa Lenovo Thinkpad T61 + 2835 82801H (ICH8 Family) USB UHCI Controller #5 + 17aa 20aa Lenovo Thinkpad T60 + 2836 82801H (ICH8 Family) USB2 EHCI Controller #1 1462 7235 P965 Neo MS-7235 mainboard - 283a 82801H (ICH8 Family) USB2 EHCI #2 + 283a 82801H (ICH8 Family) USB2 EHCI Controller #2 + 17aa 20ab Lenovo Thinkpad T61 283e 82801H (ICH8 Family) SMBus Controller 1462 7235 P965 Neo MS-7235 mainboard 283f 82801H (ICH8 Family) PCI Express Port 1 @@ -12016,36 +12652,45 @@ 2847 82801H (ICH8 Family) PCI Express Port 5 2849 82801H (ICH8 Family) PCI Express Port 6 284b 82801H (ICH8 Family) HD Audio Controller + 17aa 20ac Lenovo Thinkpad T61 284f 82801H (ICH8 Family) Thermal Reporting Device - 2850 Mobile IDE Controller - 2910 LPC Interface Controller - 2920 4 port SATA IDE Controller - 2921 2 port SATA IDE Controller - 2922 6 port SATA AHCI Controller - 2923 4 port SATA AHCI Controller - 2925 SATA RAID Controller - 2926 2 port SATA IDE Controller + 2850 82801HBM/HEM (ICH8M/ICH8M-E) IDE Controller + 2911 LPC Interface Controller + 2912 82801IH (ICH9DH) LPC Interface Controller + 2914 LPC Interface Controller + 2916 82801IR (ICH9R) LPC Interface Controller + 2917 Mobile LPC Controller + 2918 82801IB (ICH9) LPC Interface Controller + 2919 Mobile LPC Controller + 2920 82801IR/IO/IH (ICH9R/DO/DH) 4 port SATA IDE Controller + 2921 82801I (ICH9 Family) 2 port SATA IDE Controller + 2922 82801IR/IO/IH (ICH9R/DO/DH) 6 port SATA AHCI Controller + 2923 82801I (ICH9 Family) 4 port SATA AHCI Controller + 2925 82801IR/IO (ICH9R//DO) SATA RAID Controller + 2926 82801I (ICH9 Family) 2 port SATA IDE Controller 2928 Mobile 2 port SATA IDE Controller + 2929 Mobile SATA AHCI Controller + 292c Mobile SATA RAID Controller 292d Mobile 2 port SATA IDE Controller 292e Mobile 1 port SATA IDE Controller - 2930 SMBus Controller - 2932 Thermal Subsystem - 2934 USB UHCI Controller #1 - 2935 USB UHCI Controller #2 - 2936 USB UHCI Controller #3 - 2937 USB UHCI Controller #4 - 2938 USB UHCI Controller #5 - 2939 USB UHCI Controller #6 - 293a USB2 EHCI Controller #1 - 293c USB2 EHCI Controller #2 - 293e HD Audio Controller - 2940 PCI Express Port 1 - 2942 PCI Express Port 2 - 2944 PCI Express Port 3 - 2946 PCI Express Port 4 - 2948 PCI Express Port 5 - 294a PCI Express Port 6 - 294c Gigabit Ethernet Controller + 2930 82801I (ICH9 Family) SMBus Controller + 2932 82801I (ICH9 Family) Thermal Subsystem + 2934 82801I (ICH9 Family) USB UHCI Controller #1 + 2935 82801I (ICH9 Family) USB UHCI Controller #2 + 2936 82801I (ICH9 Family) USB UHCI Controller #3 + 2937 82801I (ICH9 Family) USB UHCI Controller #4 + 2938 82801I (ICH9 Family) USB UHCI Controller #5 + 2939 82801I (ICH9 Family) USB UHCI Controller #6 + 293a 82801I (ICH9 Family) USB2 EHCI Controller #1 + 293c 82801I (ICH9 Family) USB2 EHCI Controller #2 + 293e 82801I (ICH9 Family) HD Audio Controller + 2940 82801I (ICH9 Family) PCI Express Port 1 + 2942 82801I (ICH9 Family) PCI Express Port 2 + 2944 82801I (ICH9 Family) PCI Express Port 3 + 2946 82801I (ICH9 Family) PCI Express Port 4 + 2948 82801I (ICH9 Family) PCI Express Port 5 + 294a 82801I (ICH9 Family) PCI Express Port 6 + 294c 82801I (ICH9 Family) Gigabit Ethernet Controller 2970 82946GZ/PL/GL Memory Controller Hub 2971 82946GZ/PL/GL PCI Express Root Port 2972 82946GZ/GL Integrated Graphics Controller @@ -12066,8 +12711,10 @@ 2996 82Q963/Q965 PT IDER Controller 2997 82Q963/Q965 KT Controller 29a0 82P965/G965 Memory Controller Hub + 1462 7276 MS-7276 [G965MDH] 29a1 82P965/G965 PCI Express Root Port 29a2 82G965 Integrated Graphics Controller + 1462 7276 MS-7276 [G965MDH] 29a3 82G965 Integrated Graphics Controller 29a4 82P965/G965 HECI Controller 29a5 82P965/G965 HECI Controller @@ -12077,52 +12724,68 @@ 29b1 PCI Express Root Port 29b2 Integrated Graphics Controller 29b3 Integrated Graphics Controller - 29b4 HECI Controller - 29b5 HECI Controller + 29b4 MEI Controller + 29b5 MEI Controller 29b6 PT IDER Controller 29b7 Serial KT Controller - 29c0 DRAM Controller - 29c1 PCI Express Root Port - 29c2 Integrated Graphics Controller - 29c3 Integrated Graphics Controller - 29c4 HECI Controller - 29c5 HECI Controller - 29c6 PT IDER Controller - 29c7 Serial KT Controller + 29c0 82G33/G31/P35 Express DRAM Controller + 29c1 82G33/G31/P35 Express PCI Express Root Port + 29c2 82G33/G31 Express Integrated Graphics Controller + 29c3 82G33/G31 Express Integrated Graphics Controller + 29c4 82G33/G31/P35 Express MEI Controller + 29c5 82G33/G31/P35 Express MEI Controller + 29c6 82G33/G31/P35 Express PT IDER Controller + 29c7 82G33/G31/P35 Express Serial KT Controller 29cf Virtual HECI Controller + 29d0 DRAM Controller + 29d1 PCI Express Root Port + 29d2 Integrated Graphics Controller + 29d3 Integrated Graphics Controller + 29d4 MEI Controller + 29d5 MEI Controller + 29d6 PT IDER Controller + 29d7 Serial KT Controller 29e0 DRAM Controller 29e1 Host-Primary PCI Express Bridge - 29e4 HECI Controller - 29e5 HECI Controller + 29e4 MEI Controller + 29e5 MEI Controller 29e6 PT IDER Controller 29e7 Serial KT Controller 29e9 Host-Secondary PCI Express Bridge 29f0 Server DRAM Controller 29f1 Server Host-Primary PCI Express Bridge - 29f4 Server HECI Controller - 29f5 Server HECI Controller + 29f4 Server MEI Controller + 29f5 Server MEI Controller 29f6 Server PT IDER Controller 29f7 Server Serial KT Controller 29f9 Server Host-Secondary PCI Express Bridge - 2a00 Mobile Memory Controller Hub - 2a01 Mobile PCI Express Root Port - 2a02 Mobile Integrated Graphics Controller - 2a03 Mobile Integrated Graphics Controller - 2a04 Mobile HECI Controller - 2a05 Mobile HECI Controller - 2a06 Mobile PT IDER Controller - 2a07 Mobile KT Controller - 3092 Integrated RAID + 2a00 Mobile PM965/GM965/GL960 Memory Controller Hub + 17aa 20b1 Lenovo Thinkpad T61 + 2a01 Mobile PM965/GM965/GL960 PCI Express Root Port + 2a02 Mobile GM965/GL960 Integrated Graphics Controller + 2a03 Mobile GM965/GL960 Integrated Graphics Controller + 2a04 Mobile PM965/GM965 MEI Controller + 2a05 Mobile PM965/GM965 MEI Controller + 2a06 Mobile PM965/GM965 PT IDER Controller + 2a07 Mobile PM965/GM965 KT Controller 3200 GD31244 PCI-X SATA HBA 1775 c200 C2K onboard SATA host bus adapter + 3313 IOP348 I/O Processor (SL8e) in IOC Mode SAS/SATA + 331b IOP348 I/O Processor (SL8x) in IOC Mode SAS/SATA + 3331 IOC340 I/O Controller (VV8e) SAS/SATA + 3339 IOC340 I/O Controller (VV8x) SAS/SATA 3340 82855PM Processor to I/O Controller + 1014 0529 Thinkpad T41 1025 005a TravelMate 290 103c 088c NC8000 laptop 103c 0890 NC6000 laptop 103c 08b0 tc1100 tablet - 144d c00c P30 notebook + 144d c00c P30/P35 notebook 3341 82855PM Processor to AGP Controller 144d c00c P30 notebook + 3363 IOC340 I/O Controller in IOC Mode SAS/SATA + 33c3 IOP348 I/O Processor (SL8De) in IOC Mode SAS/SATA + 33cb IOP348 I/O Processor (SL8Dx) in IOC Mode SAS/SATA 3500 6311ESB/6321ESB PCI Express Upstream Port 3501 6310ESB PCI Express Upstream Port 3504 6311ESB/6321ESB I/OxAPIC Interrupt Controller @@ -12146,6 +12809,7 @@ 3580 82852/82855 GM/GME/PM/GMV Processor to I/O Controller 1014 055c Thinkpad R50e model 1634 1028 0139 Latitude D400 + 1028 014f Latitude X300 1028 0163 Latitude D505 1028 0196 Inspiron 5160 1734 1055 Amilo M1420 @@ -12153,19 +12817,25 @@ 1775 ce90 CE9 4c53 10b0 CL9 mainboard 4c53 10e0 PSL09 PrPMC + e4bf 0cc9 CC9-SAMBA + e4bf 0cd2 CD2-BEBOP 3581 82852/82855 GM/GME/PM/GMV Processor to AGP Controller 1734 1055 Amilo M1420 3582 82852/855GM Integrated Graphics Device 1014 0562 Thinkpad R50e model 1634 1028 0139 Latitude D400 + 1028 014f Latitude X300 1028 0163 Latitude D505 1775 10d0 V5D Single Board Computer VGA 1775 ce90 CE9 4c53 10b0 CL9 mainboard 4c53 10e0 PSL09 PrPMC + e4bf 0cc9 CC9-SAMBA + e4bf 0cd2 CD2-BEBOP 3584 82852/82855 GM/GME/PM/GMV Processor to I/O Controller 1014 055d Thinkpad R50e model 1634 1028 0139 Latitude D400 + 1028 014f Latitude X300 1028 0163 Latitude D505 1028 0196 Inspiron 5160 1734 1055 Amilo M1420 @@ -12176,6 +12846,7 @@ 3585 82852/82855 GM/GME/PM/GMV Processor to I/O Controller 1014 055e Thinkpad R50e model 1634 1028 0139 Latitude D400 + 1028 014f Latitude X300 1028 0163 Latitude D505 1028 0196 Inspiron 5160 1734 1055 Amilo M1420 @@ -12184,23 +12855,32 @@ 4c53 10b0 CL9 mainboard 4c53 10e0 PSL09 PrPMC 3590 E7520 Memory Controller Hub + 1014 02dd eServer xSeries server mainboard 1028 019a PowerEdge SC1425 1734 103e Primergy RX300 S2 + 1775 1100 CR11/VR11 Single Board Computer 4c53 10d0 Telum ASLP10 Processor AMC 3591 E7525/E7520 Error Reporting Registers + 1014 02dd eServer xSeries server mainboard 1028 0169 Precision 470 4c53 10d0 Telum ASLP10 Processor AMC 3592 E7320 Memory Controller Hub 3593 E7320 Error Reporting Registers 3594 E7520 DMA Controller + 1775 1100 CR11/VR11 Single Board Computer 4c53 10d0 Telum ASLP10 Processor AMC 3595 E7525/E7520/E7320 PCI Express Port A + 1775 1100 CR11/VR11 Single Board Computer 3596 E7525/E7520/E7320 PCI Express Port A1 3597 E7525/E7520 PCI Express Port B + 1775 1100 CR11/VR11 Single Board Computer 3598 E7520 PCI Express Port B1 + 1775 1100 CR11/VR11 Single Board Computer 3599 E7520 PCI Express Port C + 1775 1100 CR11/VR11 Single Board Computer 359a E7520 PCI Express Port C1 359b E7525/E7520/E7320 Extended Configuration Registers + 1014 02dd eServer xSeries server mainboard 359e E7525 Memory Controller Hub 1028 0169 Precision 470 35b0 3100 Chipset Memory I/O Controller Hub @@ -12224,6 +12904,8 @@ 360f Server FBD Branch 0 Registers 3610 Server FBD Branch 1 Registers 4000 Memory Controller Hub + 4001 Memory Controller Hub + 4003 Memory Controller Hub 4008 Memory Controller Hub 4010 Memory Controller Hub 4021 PCI Express Port 1 @@ -12243,7 +12925,8 @@ 4035 FBD Registers 4036 FBD Registers 4220 PRO/Wireless 2200BG Network Connection - 2731 8086 WLAN-Adapter +# (rev 05) + 103c 12f6 HP Compaq nw8240 Mobile Workstation 8086 2731 Samsung P35 integrated WLAN 4222 PRO/Wireless 3945ABG Network Connection 8086 1005 PRO/Wireless 3945BG Network Connection @@ -12255,11 +12938,47 @@ 4227 PRO/Wireless 3945ABG Network Connection 8086 1011 Thinkpad X60s, R60e model 0657 8086 1014 PRO/Wireless 3945BG Network Connection + 4229 PRO/Wireless 4965 AG or AGN Network Connection + 4230 PRO/Wireless 4965 AG or AGN Network Connection + 8086 1110 Lenovo Thinkpad T61 + 444e Turbo Memory Controller 5001 Pro/DSL 2100 Modem + 5020 Memory Controller Hub + 5021 DRAM Error Reporting Registers + 5023 EDMA Controller + 5024 PCI Express Port PEA0 + 5025 PCI Express Port PEA1 + 5028 S-ATA IDE + 5029 S-ATA AHCI + 502a S-ATA RAID0/1 + 502b S-ATA Reserved + 5031 LPC Bus + 5032 SMBus Controller + 5033 USB 1.1 Controller + 5035 USB 2.0 Controller + 5037 PCI-PCI Bridge (transparent mode) + 5039 Controller Area Network (CAN) interface #1 + 503a Controller Area Network (CAN) interface #2 + 503b Synchronous Serial Port (SPP) + 503c IEEE 1588 Hardware Assist + 503d Local Expansion Bus + 503e Global Control Unit (GCU) + 5040 Gigabit Ethernet MAC + 5041 Gigabit Ethernet MAC + 5042 Gigabit Ethernet MAC + 5043 Gigabit Ethernet MAC + 5044 Gigabit Ethernet MAC + 5045 Gigabit Ethernet MAC + 5046 Gigabit Ethernet MAC + 5047 Gigabit Ethernet MAC + 5048 Gigabit Ethernet MAC + 5049 Gigabit Ethernet MAC + 504a Gigabit Ethernet MAC + 504b Gigabit Ethernet MAC 5200 EtherExpress PRO/100 Intelligent Server 5201 EtherExpress PRO/100 Intelligent Server 8086 0001 EtherExpress PRO/100 Server Ethernet Adapter - 530d 80310 IOP [IO Processor] + 530d 80310 (IOP) IO Processor 65c0 Memory Controller Hub 65e2 PCI Express x4 Port 2 65e3 PCI Express x4 Port 3 @@ -12292,17 +13011,19 @@ 15ad 1976 virtualHW v3 7113 82371AB/EB/MB PIIX4 ACPI 15ad 1976 virtualHW v3 - 7120 82810 GMCH [Graphics Memory Controller Hub] + 7120 82810 GMCH (Graphics Memory Controller Hub) 4c53 1040 CL7 mainboard 4c53 1060 PC7 mainboard - 7121 82810 CGC [Chipset Graphics Controller] + 7121 82810 (CGC) Chipset Graphics Controller 4c53 1040 CL7 mainboard 4c53 1060 PC7 mainboard 8086 4341 Cayman (CA810) Mainboard - 7122 82810 DC-100 GMCH [Graphics Memory Controller Hub] - 7123 82810 DC-100 CGC [Chipset Graphics Controller] - 7124 82810E DC-133 GMCH [Graphics Memory Controller Hub] - 7125 82810E DC-133 CGC [Chipset Graphics Controller] + 7122 82810 DC-100 (GMCH) Graphics Memory Controller Hub + 7123 82810 DC-100 (CGC) Chipset Graphics Controller + 7124 82810E DC-133 (GMCH) Graphics Memory Controller Hub + 1028 00b4 OptiPlex GX110 + 7125 82810E DC-133 (CGC) Chipset Graphics Controller + 1028 00b4 OptiPlex GX110 7126 82810 DC-133 System and Graphics Controller 7128 82810-M DC-100 System and Graphics Controller 712a 82810-M DC-133 System and Graphics Controller @@ -12352,6 +13073,7 @@ 10b4 202f Lightspeed 740 8086 0000 Terminator 2x/i 8086 0100 Intel740 Graphics Accelerator + 8002 Trusted Execution Technology Registers 84c4 450KX/GX [Orion] - 82454KX/GX PCI bridge 84c5 450KX/GX [Orion] - 82453KX/GX Memory controller 84ca 450NX - 82451NX Memory & I/O Controller @@ -12386,6 +13108,13 @@ 4c53 1050 CT7 mainboard 4c53 1051 CE7 mainboard e4bf 1000 CC8-1-BLUES +80ee InnoTek Systemberatung GmbH + beef VirtualBox Graphics Adapter + cafe VirtualBox Guest Service +8384 Sigmatel + 7618 High Definition Audio Codec + 7670 9770 High Definition Audio + 7672 9772 High Definition Audio 8401 TRENDware International Inc. 8686 ScaleMP 1010 vSMPowered system controller [vSMP CTL] @@ -12548,6 +13277,8 @@ 008f AIC-7892P U160/m 1179 0001 Magnia Z310 15d9 9005 Onboard SCSI Host Adapter + 0092 AVC-2010 [VideoH!] + 0093 AVC-2410 [VideoH!] 00c0 AHA-3960D / AIC-7899A U160/m 0e11 f620 Compaq 64-Bit/66MHz Dual Channel Wide Ultra3 SCSI Adapter 9005 f620 AHA-3960D U160/m @@ -12577,6 +13308,13 @@ 1028 0287 PowerEdge Expandable RAID Controller 320/DC 1028 0291 CERC SATA RAID 2 PCI SATA 6ch (DellCorsair) 103c 3227 AAR-2610SA + 108e 0286 STK RAID INT + 108e 0287 STK RAID EXT + 108e 7aac STK RAID REM + 15d9 02b5 AOC-USAS-S4i + 15d9 02b6 AOC-USAS-S8i + 15d9 02c9 AOC-USAS-S4iR + 15d9 02ca AOC-USAS-S8iR 17aa 0286 Legend S220 (Legend Crusader) 17aa 0287 Legend S230 (Legend Vulcan) 9005 0285 2200S (Vulcan) @@ -12596,12 +13334,31 @@ 9005 0294 ESD SO-DIMM PCI-X SATA ZCR (Prowler) 9005 0296 ASR-2240S 9005 0297 ASR-4005SAS - 9005 0298 ASR-4000SAS + 9005 0298 ASR-4000 9005 0299 ASR-4800SAS 9005 029a 4805SAS + 9005 02a4 ICP ICP9085LI + 9005 02a5 ICP ICP5085BR 9005 02b5 ASR5800 9005 02b6 ASR5805 9005 02b7 ASR5808 + 9005 02b8 ICP5445SL + 9005 02b9 ICP5085SL + 9005 02ba ICP5805SL + 9005 02bb 3405 + 9005 02bc 3805 + 9005 02bd 31205 + 9005 02be 31605 + 9005 02bf ICP ICP5045BL + 9005 02c0 ICP ICP5085BL + 9005 02c1 ICP ICP5125BR + 9005 02c2 ICP ICP5165BR + 9005 02c3 51205 + 9005 02c4 51605 + 9005 02c5 ICP ICP5125SL + 9005 02c6 ICP ICP5165SL + 9005 02c7 3085 + 9005 02c8 ICP5805BL 0286 AAC-RAID (Rocket) 1014 034d 8s 1014 9540 ServeRAID 8k/8k-l4 @@ -12615,17 +13372,17 @@ 9005 029f ICP ICP9014R0 9005 02a0 ICP ICP9047MA 9005 02a1 ICP ICP9087MA - 9005 02a2 3800SAS + 9005 02a2 3800 9005 02a3 ICP ICP5445AU 9005 02a4 ICP ICP9085LI 9005 02a5 ICP ICP5085BR 9005 02a6 ICP9067MA - 9005 02a7 3805SAS - 9005 02a8 3400SAS + 9005 02a7 3805 + 9005 02a8 3400 9005 02a9 ICP ICP5085AU 9005 02aa ICP ICP5045AU - 9005 02ac 1800SAS - 9005 02b3 ASR-2400SAS + 9005 02ac 1800 + 9005 02b3 2400 9005 02b4 ICP ICP5045AL 9005 0800 Callisto 0410 AIC-9410W SAS (Razor HBA RAID) @@ -12648,6 +13405,7 @@ 1014 02c2 PCI-X DDR 3Gb SAS RAID Adapter (572B/572D) 0503 Scamp chipset SCSI controller 1014 02bf Quad Channel PCI-X DDR U320 SCSI RAID Adapter (571E) + 1014 02c3 PCI-X DDR 3Gb SAS RAID Adapter (572F) 1014 02d5 Quad Channel PCI-X DDR U320 SCSI RAID Adapter (571F) 0910 AUA-3100B 091e AUA-3100B @@ -12663,8 +13421,11 @@ 8015 ASC-39320B U320 8016 ASC-39320A U320 8017 ASC-29320ALP U320 + 9005 0044 ASC-29320ALP PCIx U320 + 9005 0045 ASC-29320LPE PCIe U320 801c ASC-39320D U320 801d AIC-7902B U320 + 1014 02cc ServeRAID 7e 801e AIC-7901A U320 801f AIC-7902 U320 1734 1011 Primergy RX300 @@ -12680,6 +13441,7 @@ 8097 ASC-29320ALP U320 w/HostRAID 809c ASC-39320D(B) U320 w/HostRAID 809d AIC-7902(B) U320 w/HostRAID + 1014 02cc ServeRAID 7e 809e AIC-7901A U320 w/HostRAID 809f AIC-7902 U320 w/HostRAID 907f Atronics @@ -12740,13 +13502,15 @@ cddd Tyzx, Inc. 0101 DeepSea 1 High Speed Stereo Vision Frame Grabber 0200 DeepSea 2 High Speed Stereo Vision Frame Grabber d161 Digium, Inc. - 0205 Wildcard TE205P - 0210 Wildcard TE210P - 0405 Wildcard TE405P Quad-Span togglable E1/T1/J1 card 5.0v - 0406 Wildcard TE406P Quad-Span togglable E1/T1/J1 echo cancellation card 5.0v - 0410 Wildcard TE410P Quad-Span togglable E1/T1/J1 card 3.3v - 0411 Wildcard TE411P Quad-Span togglable E1/T1/J1 echo cancellation card 3.3v - 2400 Wildcard TDM2400P + 0120 Wildcard TE120P single-span T1/E1/J1 card + 0205 Wildcard TE205P dual-span T1/E1/J1 card 5.0V + 0210 Wildcard TE210P dual-span T1/E1/J1 card 3.3V + 0405 Wildcard TE405P quad-span T1/E1/J1 card 5.0V + 0410 Wildcard TE410P quad-span T1/E1/J1 card 3.3V + 0800 Wildcard TDM800P 8-port analog card + 2400 Wildcard TDM2400P 24-port analog card + 3400 Wildcard TC400P transcoder base card + b410 Wildcard B410 quad-BRI card d4d4 Dy4 Systems Inc 0601 PCI Mezzanine Card d531 I+ME ACTIA GmbH diff --git a/hw/xfree86/scanpci/xf86PciStdIds.h b/hw/xfree86/scanpci/xf86PciStdIds.h index d2784f5d9..f73aa8591 100644 --- a/hw/xfree86/scanpci/xf86PciStdIds.h +++ b/hw/xfree86/scanpci/xf86PciStdIds.h @@ -97,6 +97,9 @@ static const char pci_vendor_02ac[] = "SpeedStream"; static const char pci_device_02ac_1012[] = "1012 PCMCIA 10/100 Ethernet Card [RTL81xx]"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_02e0[] = "XFX Pine Group Inc"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_0315[] = "SK-Electronics Co., Ltd."; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -130,6 +133,10 @@ static const char pci_device_050d_7050[] = "F5D7050 802.11g Wireless USB Adapter static const char pci_device_050d_705c[] = "F5D7050 v4"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_058f[] = "Alcor Micro Corporation"; +static const char pci_device_058f_9254[] = "AU9254 (4-port USB hub)"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_05a9[] = "OmniVision"; static const char pci_device_05a9_8519[] = "OV519 series"; #endif @@ -182,6 +189,7 @@ static const char pci_vendor_093a[] = "PixArt Imaging Inc."; static const char pci_device_093a_010e[] = "Innovage Mini Digital Camera"; static const char pci_device_093a_010f[] = "SDC-300 Webcam"; static const char pci_device_093a_2468[] = "CIF Single Chip"; +static const char pci_device_093a_2600[] = "PAC7311"; static const char pci_device_093a_2603[] = "Philips Webcam SPC500NC"; static const char pci_device_093a_2608[] = "Maxell MaxCam RotaWeb"; #endif @@ -226,6 +234,9 @@ static const char pci_device_0e11_0001[] = "PCI to EISA Bridge"; static const char pci_device_0e11_0002[] = "PCI to ISA Bridge"; static const char pci_device_0e11_0046[] = "Smart Array 64xx"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_0e11_0046_0e11_4091[] = "Smart Array 6i"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_0e11_0046_0e11_409a[] = "Smart Array 641"; #endif #ifdef INIT_SUBSYS_INFO @@ -576,13 +587,19 @@ static const char pci_subsys_1000_0040_1000_0066[] = "MegaRAID SCSI 320-2XRWS"; static const char pci_device_1000_0041[] = "53C1035ZC PCI-X Fusion-MPT Dual Ultra320 SCSI"; static const char pci_device_1000_0050[] = "SAS1064 PCI-X Fusion-MPT SAS"; static const char pci_device_1000_0054[] = "SAS1068 PCI-X Fusion-MPT SAS"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1000_0054_1028_1f09[] = "PowerEdge 860 SAS 5i/R"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_device_1000_0055[] = "SAS1068 PCI-X Fusion-MPT SAS"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1000_0055_1033_8336[] = "SAS1068"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO -static const char pci_device_1000_0056[] = "SAS1064E PCI-Express Fusion-MPT SAS"; +static const char pci_device_1000_0056[] = "SAS1064ET PCI-Express Fusion-MPT SAS"; +static const char pci_device_1000_0057[] = "M1064E MegaRAID SAS"; static const char pci_device_1000_0058[] = "SAS1068E PCI-Express Fusion-MPT SAS"; static const char pci_device_1000_005a[] = "SAS1066E PCI-Express Fusion-MPT SAS"; static const char pci_device_1000_005c[] = "SAS1064A PCI-X Fusion-MPT SAS"; @@ -610,6 +627,9 @@ static const char pci_subsys_1000_0060_1000_1011[] = "MegaRAID SATA 350-4ELP"; static const char pci_subsys_1000_0060_1000_1012[] = "MegaRAID SAS 8704ELP"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1000_0060_1000_1016[] = "MegaRAID SAS 8880EM2"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1000_0060_1014_0363[] = "MegaRAID SAS PCI Express ROMB"; #endif #ifdef INIT_SUBSYS_INFO @@ -618,6 +638,9 @@ static const char pci_subsys_1000_0060_1014_0364[] = "SystemX MegaRAID SAS 8808E #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1000_0060_1014_0365[] = "SystemX MegaRAID SAS 8884E"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1000_0060_1014_0379[] = "SystemX MegaRAID SAS 8880EM2"; +#endif #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1000_0060_1028_1f0a[] = "PERC 6/E Adapter RAID Controller"; @@ -640,7 +663,7 @@ static const char pci_subsys_1000_0060_1028_1f0d[] = "CERC 6/i Adapter RAID Cont #ifdef VENDOR_INCLUDE_NONVIDEO #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1000_0060_1028_1f11[] = "CERC 6/i Adapter RAID Controller"; +static const char pci_subsys_1000_0060_1028_1f11[] = "CERC 6/i Integrated RAID Controller"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO #ifdef INIT_SUBSYS_INFO @@ -651,6 +674,21 @@ static const char pci_subsys_1000_0060_1170_002f[] = "MegaRAID SAS PCI Express R #endif #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1000_0060_8086_1006[] = "RAID Controller SRCSAS28EP"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1000_0060_8086_100a[] = "RAID Controller SRCSAS28EV"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1000_0060_8086_1010[] = "RAID Controller SRCSATA28E"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1000_0060_8086_34cc[] = "Integrated RAID Controller SROMBSAS28E"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -936,10 +974,10 @@ static const char pci_device_1001_9100[] = "INI-9100/9100W SCSI Host"; static const char pci_vendor_1002[] = "ATI Technologies Inc"; static const char pci_device_1002_3150[] = "M24 1P [Radeon Mobility X600]"; static const char pci_device_1002_3152[] = "M22 [Radeon Mobility X300]"; -static const char pci_device_1002_3154[] = "M24 1T [FireGL M24 GL]"; +static const char pci_device_1002_3154[] = "M24GL [Mobility FireGL V3200]"; static const char pci_device_1002_3e50[] = "RV380 0x3e50 [Radeon X600]"; static const char pci_device_1002_3e54[] = "RV380 0x3e54 [FireGL V3200]"; -static const char pci_device_1002_3e70[] = "RV380 [Radeon X600] Secondary"; +static const char pci_device_1002_3e70[] = "RV380 [Radeon X600] (Secondary)"; static const char pci_device_1002_4136[] = "Radeon IGP 320 M"; static const char pci_device_1002_4137[] = "Radeon IGP330/340/350"; static const char pci_device_1002_4144[] = "R300 AD [Radeon 9500 Pro]"; @@ -949,7 +987,7 @@ static const char pci_device_1002_4147[] = "R300 AG [FireGL Z1/X1]"; static const char pci_device_1002_4148[] = "R350 AH [Radeon 9800]"; static const char pci_device_1002_4149[] = "R350 AI [Radeon 9800]"; static const char pci_device_1002_414a[] = "R350 AJ [Radeon 9800]"; -static const char pci_device_1002_414b[] = "R350 AK [Fire GL X2]"; +static const char pci_device_1002_414b[] = "R350 AK [FireGL X2]"; static const char pci_device_1002_4150[] = "RV350 AP [Radeon 9600]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4150_1002_0002[] = "R9600 Pro primary (Asus OEM for HP)"; @@ -961,7 +999,7 @@ static const char pci_subsys_1002_4150_1002_0003[] = "R9600 Pro secondary (Asus static const char pci_subsys_1002_4150_1002_4722[] = "All-in-Wonder 2006 AGP Edition"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1002_4150_1458_4024[] = "Giga-Byte GV-R96128D Primary"; +static const char pci_subsys_1002_4150_1458_4024[] = "Giga-Byte GV-R96128D (Primary)"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4150_148c_2064[] = "PowerColor R96A-C3N"; @@ -973,13 +1011,13 @@ static const char pci_subsys_1002_4150_148c_2066[] = "PowerColor R96A-C3N"; static const char pci_subsys_1002_4150_174b_7c19[] = "Sapphire Atlantis Radeon 9600 Pro"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1002_4150_174b_7c29[] = "GC-R9600PRO Primary [Sapphire]"; +static const char pci_subsys_1002_4150_174b_7c29[] = "GC-R9600PRO [Sapphire] (Primary)"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4150_17ee_2002[] = "Radeon 9600 256Mb Primary"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1002_4150_18bc_0101[] = "GC-R9600PRO Primary"; +static const char pci_subsys_1002_4150_18bc_0101[] = "GC-R9600PRO (Primary)"; #endif static const char pci_device_1002_4151[] = "RV350 AQ [Radeon 9600]"; #ifdef INIT_SUBSYS_INFO @@ -1011,10 +1049,10 @@ static const char pci_subsys_1002_4153_1043_010c[] = "A9550GE/TD"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4153_1462_932c[] = "865PE Neo2-V (MS-6788) mainboard"; #endif -static const char pci_device_1002_4154[] = "RV350 AT [Fire GL T2]"; -static const char pci_device_1002_4155[] = "RV350 AU [Fire GL T2]"; -static const char pci_device_1002_4156[] = "RV350 AV [Fire GL T2]"; -static const char pci_device_1002_4157[] = "RV350 AW [Fire GL T2]"; +static const char pci_device_1002_4154[] = "RV350 AT [FireGL T2]"; +static const char pci_device_1002_4155[] = "RV350 AU [FireGL T2]"; +static const char pci_device_1002_4156[] = "RV350 AV [FireGL T2]"; +static const char pci_device_1002_4157[] = "RV350 AW [FireGL T2]"; static const char pci_device_1002_4158[] = "68800AX [Mach32]"; static const char pci_device_1002_4164[] = "R300 AD [Radeon 9500 Pro] (Secondary)"; static const char pci_device_1002_4165[] = "R300 AE [Radeon 9700 Pro] (Secondary)"; @@ -1028,19 +1066,19 @@ static const char pci_subsys_1002_4170_1002_0003[] = "R9600 Pro secondary (Asus static const char pci_subsys_1002_4170_1002_4723[] = "All-in-Wonder 2006 AGP Edition (Secondary)"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1002_4170_1458_4025[] = "Giga-Byte GV-R96128D Secondary"; +static const char pci_subsys_1002_4170_1458_4025[] = "Giga-Byte GV-R96128D (Secondary)"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4170_148c_2067[] = "PowerColor R96A-C3N (Secondary)"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1002_4170_174b_7c28[] = "GC-R9600PRO Secondary [Sapphire]"; +static const char pci_subsys_1002_4170_174b_7c28[] = "GC-R9600PRO [Sapphire] (Secondary)"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1002_4170_17ee_2003[] = "Radeon 9600 256Mb Secondary"; +static const char pci_subsys_1002_4170_17ee_2003[] = "Radeon 9600 256Mb (Secondary)"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1002_4170_18bc_0100[] = "GC-R9600PRO Secondary"; +static const char pci_subsys_1002_4170_18bc_0100[] = "GC-R9600PRO (Secondary)"; #endif static const char pci_device_1002_4171[] = "RV350 AQ [Radeon 9600] (Secondary)"; #ifdef INIT_SUBSYS_INFO @@ -1096,21 +1134,27 @@ static const char pci_device_1002_4341[] = "IXP150 AC'97 Audio Controller"; static const char pci_device_1002_4345[] = "EHCI USB Controller"; static const char pci_device_1002_4347[] = "OHCI USB Controller #1"; static const char pci_device_1002_4348[] = "OHCI USB Controller #2"; -static const char pci_device_1002_4349[] = "ATI Dual Channel Bus Master PCI IDE Controller"; +static const char pci_device_1002_4349[] = "Dual Channel Bus Master PCI IDE Controller"; static const char pci_device_1002_434d[] = "IXP AC'97 Modem"; -static const char pci_device_1002_4353[] = "ATI SMBus"; +static const char pci_device_1002_4353[] = "SMBus"; static const char pci_device_1002_4354[] = "215CT [Mach64 CT]"; static const char pci_device_1002_4358[] = "210888CX [Mach64 CX]"; -static const char pci_device_1002_4363[] = "ATI SMBus"; -static const char pci_device_1002_436e[] = "ATI 436E Serial ATA Controller"; +static const char pci_device_1002_4363[] = "SMBus"; +static const char pci_device_1002_436e[] = "436E Serial ATA Controller"; static const char pci_device_1002_4370[] = "IXP SB400 AC'97 Audio Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4370_1025_0079[] = "Aspire 5024WLMMi"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1002_4370_1025_0091[] = "Aspire 5032WXMi"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4370_103c_308b[] = "MX6125"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1002_4370_105b_0c81[] = "Realtek ALC 653"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4370_107b_0300[] = "MX6421"; #endif static const char pci_device_1002_4371[] = "IXP SB400 PCI-PCI Bridge"; @@ -1142,7 +1186,7 @@ static const char pci_subsys_1002_4375_1025_0080[] = "Aspire 5024WLMMi"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4375_103c_308b[] = "MX6125"; #endif -static const char pci_device_1002_4376[] = "Standard Dual Channel PCI IDE Controller ATI"; +static const char pci_device_1002_4376[] = "Standard Dual Channel PCI IDE Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4376_1025_0080[] = "Aspire 5024WLMMi"; #endif @@ -1156,20 +1200,20 @@ static const char pci_subsys_1002_4377_1025_0080[] = "Aspire 5024WLMi"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4377_103c_308b[] = "MX6125"; #endif -static const char pci_device_1002_4378[] = "ATI SB400 - AC'97 Modem Controller"; +static const char pci_device_1002_4378[] = "SB400 AC'97 Modem Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4378_1025_0080[] = "Aspire 5024WLMMi"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4378_103c_308b[] = "MX6125"; #endif -static const char pci_device_1002_4379[] = "ATI 4379 Serial ATA Controller"; -static const char pci_device_1002_437a[] = "ATI 437A Serial ATA Controller"; +static const char pci_device_1002_4379[] = "4379 Serial ATA Controller"; +static const char pci_device_1002_437a[] = "437A Serial ATA Controller"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1002_437a_1002_4379[] = "ATI 4379 Serial ATA Controller"; +static const char pci_subsys_1002_437a_1002_4379[] = "4379 Serial ATA Controller"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1002_437a_1002_437a[] = "ATI 437A Serial ATA Controller"; +static const char pci_subsys_1002_437a_1002_437a[] = "437A Serial ATA Controller"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_437a_14f1_8800[] = "Leadtek WinFast TV2000XP Expert"; @@ -1531,6 +1575,9 @@ static const char pci_subsys_1002_4c57_1028_00e6[] = "Radeon Mobility M7 LW (Del static const char pci_subsys_1002_4c57_1028_012a[] = "Latitude C640"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1002_4c57_1043_1622[] = "Mobility Radeon M7 (L3C/S)"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4c57_144d_c006[] = "Radeon Mobility M7 LW in vpr Matrix 170B4"; #endif static const char pci_device_1002_4c58[] = "Radeon RV200 LX [Mobility FireGL 7800 M7]"; @@ -1557,8 +1604,11 @@ static const char pci_device_1002_4c5a[] = "Radeon Mobility M6 LZ"; static const char pci_device_1002_4c64[] = "Radeon R250 Ld [Radeon Mobility 9000 M9]"; static const char pci_device_1002_4c65[] = "Radeon R250 Le [Radeon Mobility 9000 M9]"; static const char pci_device_1002_4c66[] = "Radeon R250 [Mobility FireGL 9000]"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1002_4c66_1014_054d[] = "Thinkpad T41"; +#endif static const char pci_device_1002_4c67[] = "Radeon R250 Lg [Radeon Mobility 9000 M9]"; -static const char pci_device_1002_4c6e[] = "Radeon R250 Ln [Radeon Mobility 9000 M9] [Secondary]"; +static const char pci_device_1002_4c6e[] = "Radeon R250 Ln [Radeon Mobility 9000 M9] (Secondary)"; static const char pci_device_1002_4d46[] = "Rage Mobility M4 AGP"; static const char pci_device_1002_4d4c[] = "Rage Mobility M4 AGP"; static const char pci_device_1002_4e44[] = "Radeon R300 ND [Radeon 9700 Pro]"; @@ -1580,7 +1630,7 @@ static const char pci_device_1002_4e47[] = "Radeon R300 NG [FireGL X1]"; static const char pci_device_1002_4e48[] = "Radeon R350 [Radeon 9800 Pro]"; static const char pci_device_1002_4e49[] = "Radeon R350 [Radeon 9800]"; static const char pci_device_1002_4e4a[] = "RV350 NJ [Radeon 9800 XT]"; -static const char pci_device_1002_4e4b[] = "R350 NK [Fire GL X2]"; +static const char pci_device_1002_4e4b[] = "R350 NK [FireGL X2]"; static const char pci_device_1002_4e50[] = "RV350 [Mobility Radeon 9600 M10]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_4e50_1025_005a[] = "TravelMate 290"; @@ -1622,7 +1672,7 @@ static const char pci_device_1002_4e68[] = "Radeon R350 [Radeon 9800 Pro] (Secon static const char pci_device_1002_4e69[] = "Radeon R350 [Radeon 9800] (Secondary)"; static const char pci_device_1002_4e6a[] = "RV350 NJ [Radeon 9800 XT] (Secondary)"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1002_4e6a_1002_4e71[] = "ATI Technologies Inc M10 NQ [Radeon Mobility 9600]"; +static const char pci_subsys_1002_4e6a_1002_4e71[] = "M10 NQ [Radeon Mobility 9600]"; #endif static const char pci_device_1002_4e71[] = "M10 NQ [Radeon Mobility 9600] (Secondary)"; static const char pci_device_1002_4f72[] = "RV250 [Radeon 9000 Series]"; @@ -1825,7 +1875,7 @@ static const char pci_subsys_1002_5159_1002_0908[] = "XVR-100 (supplied by Sun)" static const char pci_subsys_1002_5159_1014_029a[] = "Remote Supervisor Adapter II (RSA2)"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1002_5159_1014_02c8[] = "IBM eServer xSeries server mainboard"; +static const char pci_subsys_1002_5159_1014_02c8[] = "eServer xSeries server mainboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_5159_1028_019a[] = "PowerEdge SC1425"; @@ -1960,7 +2010,10 @@ static const char pci_subsys_1002_5452_103c_1279[] = "Rage 128 Pro 4XL"; static const char pci_device_1002_5453[] = "Rage 128 Pro Ultra TS"; static const char pci_device_1002_5454[] = "Rage 128 Pro Ultra TT"; static const char pci_device_1002_5455[] = "Rage 128 Pro Ultra TU"; -static const char pci_device_1002_5460[] = "M22 [Radeon Mobility M300]"; +static const char pci_device_1002_5460[] = "M22 [Mobility Radeon X300]"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1002_5460_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif static const char pci_device_1002_5462[] = "M24 [Radeon Mobility X600]"; static const char pci_device_1002_5464[] = "M22 [FireGL GL]"; static const char pci_device_1002_5548[] = "R423 UH [Radeon X800 (PCIE)]"; @@ -1969,18 +2022,18 @@ static const char pci_device_1002_554a[] = "R423 UJ [Radeon X800LE (PCIE)]"; static const char pci_device_1002_554b[] = "R423 UK [Radeon X800SE (PCIE)]"; static const char pci_device_1002_554d[] = "R430 [Radeon X800 XL] (PCIe)"; static const char pci_device_1002_554f[] = "R430 [Radeon X800 (PCIE)]"; -static const char pci_device_1002_5550[] = "R423 [Fire GL V7100]"; +static const char pci_device_1002_5550[] = "R423 [FireGL V7100]"; static const char pci_device_1002_5551[] = "R423 [FireGL V5100 (PCIE)]"; static const char pci_device_1002_5552[] = "R423 UR [FireGL V5100 (PCIE)]"; static const char pci_device_1002_5554[] = "R423 UT [FireGL V7100 (PCIE)]"; -static const char pci_device_1002_5569[] = "R423 UI [Radeon X800PRO (PCIE)] Secondary"; +static const char pci_device_1002_5569[] = "R423 UI [Radeon X800PRO (PCIE)] (Secondary)"; static const char pci_device_1002_556b[] = "Radeon R423 UK (PCIE) [X800 SE] (Secondary)"; -static const char pci_device_1002_556d[] = "R430 [Radeon X800 XL] (PCIe) Secondary"; -static const char pci_device_1002_556f[] = "R430 [Radeon X800 (PCIE) Secondary]"; -static const char pci_device_1002_5571[] = "R423GL-SE ATI FIREGL V5100 PCI-EX Secondary"; +static const char pci_device_1002_556d[] = "R430 [Radeon X800 XL] (PCIe) (Secondary)"; +static const char pci_device_1002_556f[] = "R430 [Radeon X800] (PCIE) (Secondary)"; +static const char pci_device_1002_5571[] = "R423GL-SE [FireGL V5100 (PCIE)] (Secondary)"; static const char pci_device_1002_564a[] = "M26 [Mobility FireGL V5000]"; static const char pci_device_1002_564b[] = "M26 [Mobility FireGL V5000]"; -static const char pci_device_1002_564f[] = "M26 [Radeon Mobility X700 XL] (PCIE)"; +static const char pci_device_1002_564f[] = "M26 [Radeon Mobility X700 XL (PCIE)]"; static const char pci_device_1002_5652[] = "M26 [Radeon Mobility X700]"; static const char pci_device_1002_5653[] = "Radeon Mobility X700 (PCIE)"; #ifdef INIT_SUBSYS_INFO @@ -2000,6 +2053,9 @@ static const char pci_device_1002_5834[] = "Radeon 9100 IGP"; static const char pci_device_1002_5835[] = "RS300M AGP [Radeon Mobility 9100IGP]"; static const char pci_device_1002_5838[] = "Radeon 9100 IGP AGP Bridge"; static const char pci_device_1002_5940[] = "RV280 [Radeon 9200 PRO] (Secondary)"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1002_5940_17af_2021[] = "Excalibur Radeon 9250 (Secondary)"; +#endif static const char pci_device_1002_5941[] = "RV280 [Radeon 9200] (Secondary)"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_5941_1458_4019[] = "Gigabyte Radeon 9200"; @@ -2021,20 +2077,23 @@ static const char pci_subsys_1002_5950_1025_0080[] = "Aspire 5024WLMMi"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_5950_103c_308b[] = "MX6125"; #endif -static const char pci_device_1002_5951[] = "ATI Radeon Xpress 200 (RS480/RS482/RX480/RX482) Chipset - Host bridge"; +static const char pci_device_1002_5951[] = "Radeon Xpress 200 (RS480/RS482/RX480/RX482) Chipset - Host bridge"; static const char pci_device_1002_5952[] = "RD580 [CrossFire Xpress 3200] Chipset Host Bridge"; static const char pci_device_1002_5954[] = "RS480 [Radeon Xpress 200G Series]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_5954_1002_5954[] = "RV370 [Radeon Xpress 200G Series]"; #endif -static const char pci_device_1002_5955[] = "ATI Radeon XPRESS 200M 5955 (PCIE)"; +static const char pci_device_1002_5955[] = "Radeon XPRESS 200M 5955 (PCIE)"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1002_5955_1002_5955[] = "RS480 0x5955 [ATI Radeon XPRESS 200M 5955 (PCIE)]"; +static const char pci_subsys_1002_5955_1002_5955[] = "RS480 0x5955 [Radeon XPRESS 200M 5955 (PCIE)]"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_5955_103c_308b[] = "MX6125"; #endif static const char pci_device_1002_5960[] = "RV280 [Radeon 9200 PRO]"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1002_5960_17af_2020[] = "Excalibur Radeon 9250"; +#endif static const char pci_device_1002_5961[] = "RV280 [Radeon 9200]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_5961_1002_2f72[] = "All-in-Wonder 9200 Series"; @@ -2066,7 +2125,7 @@ static const char pci_subsys_1002_5961_18bc_0053[] = "Radeon 9200 Game Buster VI static const char pci_device_1002_5962[] = "RV280 [Radeon 9200]"; static const char pci_device_1002_5964[] = "RV280 [Radeon 9200 SE]"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1002_5964_1002_5964[] = "ATI Radeon 9200 SE, 64-bit 128MB DDR, 200/166MHz"; +static const char pci_subsys_1002_5964_1002_5964[] = "Radeon 9200 SE, 64-bit 128MB DDR, 200/166MHz"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_5964_1043_c006[] = "ASUS Radeon 9200 SE / TD / 128M"; @@ -2158,6 +2217,9 @@ static const char pci_subsys_1002_5d44_1458_4019[] = "Radeon 9200 SE (Secondary) static const char pci_subsys_1002_5d44_1458_4032[] = "Radeon 9200 SE 128MB"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1002_5d44_147b_6190[] = "R9200SE-DT (Secondary)"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_5d44_174b_7c12[] = "Sapphire Radeon 9200 SE (Secondary)"; #endif #ifdef INIT_SUBSYS_INFO @@ -2179,10 +2241,10 @@ static const char pci_device_1002_5d4d[] = "R480 [Radeon X850XT Platinum (PCIE)] static const char pci_device_1002_5d4f[] = "R480 [Radeon X800 GTO (PCIE)]"; static const char pci_device_1002_5d52[] = "R480 [Radeon X850XT (PCIE)] (Primary)"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1002_5d52_1002_0b12[] = "PowerColor X850XT PCIe Primary"; +static const char pci_subsys_1002_5d52_1002_0b12[] = "PowerColor X850XT PCIe (Primary)"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1002_5d52_1002_0b13[] = "PowerColor X850XT PCIe Secondary"; +static const char pci_subsys_1002_5d52_1002_0b13[] = "PowerColor X850XT PCIe (Secondary)"; #endif static const char pci_device_1002_5d57[] = "R423 5F57 [Radeon X800XT (PCIE)]"; static const char pci_device_1002_5d6d[] = "R480 [Radeon X850XT Platinum (PCIE)] (Secondary)"; @@ -2199,7 +2261,7 @@ static const char pci_device_1002_5e4d[] = "RV410 [Radeon X700 (PCIE)]"; static const char pci_subsys_1002_5e4d_148c_2116[] = "PowerColor Bravo X700"; #endif static const char pci_device_1002_5e4f[] = "RV410 [Radeon X700]"; -static const char pci_device_1002_5e6b[] = "RV410 [Radeon X700 Pro (PCIE)] Secondary"; +static const char pci_device_1002_5e6b[] = "RV410 [Radeon X700 Pro (PCIE)] (Secondary)"; static const char pci_device_1002_5e6d[] = "RV410 [Radeon X700 (PCIE)] (Secondary)"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_5e6d_148c_2117[] = "PowerColor Bravo X700"; @@ -2210,7 +2272,7 @@ static const char pci_device_1002_7010[] = "PCI Bridge [IGP 340M]"; static const char pci_device_1002_7100[] = "R520 [Radeon X1800]"; static const char pci_device_1002_7102[] = "M58 [Radeon Mobility X1800]"; static const char pci_device_1002_7103[] = "M58 [Mobility FireGL V7200]"; -static const char pci_device_1002_7104[] = "R520 GL ATI FireGL V7200 Primary"; +static const char pci_device_1002_7104[] = "R520GL [FireGL V7200] (Primary)"; static const char pci_device_1002_7105[] = "R520 [FireGL]"; static const char pci_device_1002_7106[] = "M58 [Mobility FireGL V7100]"; static const char pci_device_1002_7108[] = "M58 [Radeon Mobility X1800]"; @@ -2225,7 +2287,7 @@ static const char pci_device_1002_710a[] = "R520 [Radeon X1800]"; static const char pci_device_1002_710b[] = "R520 [Radeon X1800]"; static const char pci_device_1002_710c[] = "R520 [Radeon X1800]"; static const char pci_device_1002_7120[] = "R520 [Radeon X1800] (Secondary)"; -static const char pci_device_1002_7124[] = "R520 GL ATI FireGL V7200 Secondary"; +static const char pci_device_1002_7124[] = "R520GL [FireGL V7200] (Secondary)"; static const char pci_device_1002_7129[] = "R520 [Radeon X1800] (Secondary)"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_7129_1002_0323[] = "All-in-Wonder X1800XL (Secondary)"; @@ -2234,7 +2296,7 @@ static const char pci_subsys_1002_7129_1002_0323[] = "All-in-Wonder X1800XL (Sec static const char pci_subsys_1002_7129_1002_0d03[] = "Radeon X1800 CrossFire Edition (Secondary)"; #endif static const char pci_device_1002_7140[] = "RV515 [Radeon X1600]"; -static const char pci_device_1002_7142[] = "RV515 PRO [ATI Radeon X1300/X1550 Series]"; +static const char pci_device_1002_7142[] = "RV515 PRO [Radeon X1300/X1550 Series]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_7142_1002_0322[] = "All-in-Wonder 2006 PCI-E Edition"; #endif @@ -2245,17 +2307,17 @@ static const char pci_device_1002_7146[] = "RV515 [Radeon X1300]"; static const char pci_subsys_1002_7146_1002_0322[] = "All-in-Wonder 2006 PCI-E Edition"; #endif static const char pci_device_1002_7147[] = "RV505 [Radeon X1550 64-bit]"; -static const char pci_device_1002_7149[] = "M52 [ATI Mobility Radeon X1300]"; -static const char pci_device_1002_714a[] = "M52 [ATI Mobility Radeon X1300]"; -static const char pci_device_1002_714b[] = "M52 [ATI Mobility Radeon X1300]"; -static const char pci_device_1002_714c[] = "M52 [ATI Mobility Radeon X1300]"; +static const char pci_device_1002_7149[] = "M52 [Mobility Radeon X1300]"; +static const char pci_device_1002_714a[] = "M52 [Mobility Radeon X1300]"; +static const char pci_device_1002_714b[] = "M52 [Mobility Radeon X1300]"; +static const char pci_device_1002_714c[] = "M52 [Mobility Radeon X1300]"; static const char pci_device_1002_714d[] = "RV515 [Radeon X1300]"; -static const char pci_device_1002_714e[] = "RV515 [Radeon X1300]"; -static const char pci_device_1002_7152[] = "RV515 GL ATI FireGL V3300 Primary"; +static const char pci_device_1002_714e[] = "RV515LE [Radeon X1300]"; +static const char pci_device_1002_7152[] = "RV515GL [FireGL V3300] (Primary)"; static const char pci_device_1002_7153[] = "RV515GL [FireGL V3350]"; static const char pci_device_1002_715e[] = "RV515 [Radeon X1300]"; static const char pci_device_1002_715f[] = "RV505 CE [Radeon X1550 64-bit]"; -static const char pci_device_1002_7162[] = "RV515 PRO [ATI Radeon X1300/X1550 Series Secondary]"; +static const char pci_device_1002_7162[] = "RV515 PRO [Radeon X1300/X1550 Series] (Secondary)"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_7162_1002_0323[] = "All-in-Wonder 2006 PCI-E Edition (Secondary)"; #endif @@ -2263,42 +2325,45 @@ static const char pci_device_1002_7166[] = "RV515 [Radeon X1300] (Secondary)"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_7166_1002_0323[] = "All-in-Wonder 2006 PCI-E Edition (Secondary)"; #endif -static const char pci_device_1002_7172[] = "RV515 GL ATI FireGL V3300 Secondary"; -static const char pci_device_1002_7173[] = "RV515GL [FireGL V3350 Secondary]"; -static const char pci_device_1002_7180[] = "RV516 [ATI Radeon X1300/X1550 Series]"; -static const char pci_device_1002_7181[] = "RV516 XT Radeon X1600 Series Primary"; -static const char pci_device_1002_7183[] = "RV516 [ATI Radeon X1300/X1550 Series]"; -static const char pci_device_1002_7187[] = "RV516 [ATI Radeon X1300/X1550 Series]"; -static const char pci_device_1002_7188[] = "M64-S [ATI Mobility Radeon X2300]"; -static const char pci_device_1002_718a[] = "ATI Mobility Radeon X2300"; -static const char pci_device_1002_718c[] = "M62CSP64 [ATI Mobility Radeon X1350]"; -static const char pci_device_1002_718d[] = "M64CSP128 [ATI Mobility Radeon X1450]"; +static const char pci_device_1002_716e[] = "RV515LE [Radeon X1300] Secondary"; +static const char pci_device_1002_7172[] = "RV515GL [FireGL V3300] (Secondary)"; +static const char pci_device_1002_7173[] = "RV515GL [FireGL V3350] (Secondary)"; +static const char pci_device_1002_7180[] = "RV516 [Radeon X1300/X1550 Series]"; +static const char pci_device_1002_7181[] = "RV516 XT Radeon X1600 Series (Primary)"; +static const char pci_device_1002_7183[] = "RV516 [Radeon X1300/X1550 Series]"; +static const char pci_device_1002_7187[] = "RV516 [Radeon X1300/X1550 Series]"; +static const char pci_device_1002_7188[] = "M64-S [Mobility Radeon X2300]"; +static const char pci_device_1002_718a[] = "Mobility Radeon X2300"; +static const char pci_device_1002_718c[] = "M62CSP64 [Mobility Radeon X1350]"; +static const char pci_device_1002_718d[] = "M64CSP128 [Mobility Radeon X1450]"; static const char pci_device_1002_7193[] = "RV516 [Radeon X1550 Series]"; static const char pci_device_1002_719b[] = "FireMV 2250"; static const char pci_device_1002_719f[] = "RV516LE [Radeon X1550 64-bit]"; -static const char pci_device_1002_71a0[] = "RV516 [ATI Radeon X1300/X1550 Series Secondary]"; -static const char pci_device_1002_71a1[] = "RV516 XT Radeon X1600 Series Secondary"; -static const char pci_device_1002_71a3[] = "RV516 [ATI Radeon X1300 Pro Secondary]"; -static const char pci_device_1002_71a7[] = "RV516 [ATI Radeon X1300/X1550 Series Secondary]"; -static const char pci_device_1002_71bb[] = "FireMV 2250 Secondary"; +static const char pci_device_1002_71a0[] = "RV516 [Radeon X1300/X1550 Series] (Secondary)"; +static const char pci_device_1002_71a1[] = "RV516 XT Radeon X1600 Series (Secondary)"; +static const char pci_device_1002_71a3[] = "RV516 [Radeon X1300 Pro] (Secondary)"; +static const char pci_device_1002_71a7[] = "RV516 [Radeon X1300/X1550 Series] (Secondary)"; +static const char pci_device_1002_71bb[] = "FireMV 2250 (Secondary)"; static const char pci_device_1002_71c0[] = "RV530 [Radeon X1600]"; static const char pci_device_1002_71c2[] = "RV530 [Radeon X1600]"; -static const char pci_device_1002_71c4[] = "M56GL [ATI Mobility FireGL V5200]"; +static const char pci_device_1002_71c4[] = "M56GL [Mobility FireGL V5200]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1002_71c4_17aa_2007[] = "ThinkPad T60p"; #endif static const char pci_device_1002_71c5[] = "M56P [Radeon Mobility X1600]"; -static const char pci_device_1002_71c6[] = "RV530LE [Radeon X1600]"; +static const char pci_device_1002_71c6[] = "RV530LE [Radeon X1600/X1650 PRO]"; static const char pci_device_1002_71c7[] = "RV535 [Radeon X1650 Series]"; static const char pci_device_1002_71ce[] = "RV530LE [Radeon X1600]"; -static const char pci_device_1002_71d5[] = "M66-P ATI Mobility Radeon X1700"; -static const char pci_device_1002_71d6[] = "M66-XT ATI Mobility Radeon X1700"; +static const char pci_device_1002_71d4[] = "M56GL [Mobility FireGL V5250]"; +static const char pci_device_1002_71d5[] = "M66-P [Mobility Radeon X1700]"; +static const char pci_device_1002_71d6[] = "M66-XT [Mobility Radeon X1700]"; static const char pci_device_1002_71de[] = "RV530LE [Radeon X1600]"; static const char pci_device_1002_71e0[] = "RV530 [Radeon X1600] (Secondary)"; static const char pci_device_1002_71e2[] = "RV530 [Radeon X1600] (Secondary)"; +static const char pci_device_1002_71e6[] = "RV530LE [Radeon X1650 PRO] (Secondary)"; static const char pci_device_1002_71e7[] = "RV535 [Radeon X1650 Series]"; -static const char pci_device_1002_7210[] = "M71 [ATI Mobility Radeon X2100]"; -static const char pci_device_1002_7211[] = "M71 [ATI Mobility Radeon X2100 Secondary]"; +static const char pci_device_1002_7210[] = "M71 [Mobility Radeon X2100]"; +static const char pci_device_1002_7211[] = "M71 [Mobility Radeon X2100] (Secondary)"; static const char pci_device_1002_7240[] = "R580 [Radeon X1900]"; static const char pci_device_1002_7241[] = "R580 [Radeon X1900]"; static const char pci_device_1002_7242[] = "R580 [Radeon X1900]"; @@ -2308,36 +2373,37 @@ static const char pci_device_1002_7245[] = "R580 [Radeon X1900]"; static const char pci_device_1002_7246[] = "R580 [Radeon X1900]"; static const char pci_device_1002_7247[] = "R580 [Radeon X1900]"; static const char pci_device_1002_7248[] = "R580 [Radeon X1900]"; -static const char pci_device_1002_7249[] = "R580 [Radeon X1900 XT] Primary"; +static const char pci_device_1002_7249[] = "R580 [Radeon X1900 XT] (Primary)"; static const char pci_device_1002_724a[] = "R580 [Radeon X1900]"; static const char pci_device_1002_724b[] = "R580 [Radeon X1900]"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1002_724b_1002_0b12[] = "Radeon X1900 Primary Display Device"; +static const char pci_subsys_1002_724b_1002_0b12[] = "Radeon X1900 (Primary)"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1002_724b_1002_0b13[] = "Radeon X1900 Secondary Display Device"; +static const char pci_subsys_1002_724b_1002_0b13[] = "Radeon X1900 (Secondary)"; #endif static const char pci_device_1002_724c[] = "R580 [Radeon X1900]"; static const char pci_device_1002_724d[] = "R580 [Radeon X1900]"; static const char pci_device_1002_724e[] = "R580 [AMD Stream Processor]"; -static const char pci_device_1002_7269[] = "R580 [Radeon X1900 XT] Secondary"; +static const char pci_device_1002_7269[] = "R580 [Radeon X1900 XT] (Secondary)"; static const char pci_device_1002_726b[] = "R580 [Radeon X1900]"; -static const char pci_device_1002_726e[] = "R580 [AMD Stream Processor Secondary]"; -static const char pci_device_1002_7280[] = "ATI Radeon X1950 Pro Primary (PCIE)"; -static const char pci_device_1002_7288[] = "ATI Radeon X1950 GT"; -static const char pci_device_1002_7291[] = "ATI Radeon X1650 XT Primary (PCIE)"; +static const char pci_device_1002_726e[] = "R580 [AMD Stream Processor] (Secondary)"; +static const char pci_device_1002_7280[] = "Radeon X1950 Pro (Primary) (PCIE)"; +static const char pci_device_1002_7288[] = "Radeon X1950 GT"; +static const char pci_device_1002_7291[] = "Radeon X1650 XT (Primary) (PCIE)"; static const char pci_device_1002_7293[] = "Radeon X1650 Series"; -static const char pci_device_1002_72a0[] = "ATI Radeon X1950 Pro Secondary (PCIE)"; -static const char pci_device_1002_72a8[] = "ATI Radeon X1950 GT Secondary"; -static const char pci_device_1002_72b1[] = "ATI Radeon X1650 XT Secondary (PCIE)"; -static const char pci_device_1002_72b3[] = "ATI Radeon X1650 Series Secondary"; +static const char pci_device_1002_72a0[] = "Radeon X1950 Pro (Secondary) (PCIE)"; +static const char pci_device_1002_72a8[] = "Radeon X1950 GT (Secondary)"; +static const char pci_device_1002_72b1[] = "Radeon X1650 XT (Secondary) (PCIE)"; +static const char pci_device_1002_72b3[] = "Radeon X1650 Series (Secondary)"; static const char pci_device_1002_7833[] = "Radeon 9100 IGP Host Bridge"; static const char pci_device_1002_7834[] = "Radeon 9100 PRO IGP"; static const char pci_device_1002_7835[] = "Radeon Mobility 9200 IGP"; static const char pci_device_1002_7838[] = "Radeon 9100 IGP PCI/AGP Bridge"; -static const char pci_device_1002_791e[] = "ATI Radeon Xpress 1200 Series"; -static const char pci_device_1002_791f[] = "ATI Radeon Xpress 1200 Series"; -static const char pci_device_1002_793f[] = "ATI Radeon Xpress 1200 Series Secondary"; +static const char pci_device_1002_7919[] = "Radeon X1200 Series Audio Controller"; +static const char pci_device_1002_791e[] = "Radeon X1200 Series"; +static const char pci_device_1002_791f[] = "Radeon X1200 Series"; +static const char pci_device_1002_793f[] = "Radeon X1200 Series (Secondary)"; static const char pci_device_1002_7c37[] = "RV350 AQ [Radeon 9600 SE]"; static const char pci_device_1002_cab0[] = "AGP Bridge [IGP 320M]"; static const char pci_device_1002_cab2[] = "RS200/RS200M AGP Bridge [IGP 340M]"; @@ -2447,13 +2513,28 @@ static const char pci_device_100b_0030[] = "Geode GX2 Graphics Processor"; static const char pci_device_100b_0035[] = "DP83065 [Saturn] 10/100/1000 Ethernet Controller"; static const char pci_device_100b_0500[] = "SCx200 Bridge"; static const char pci_device_100b_0501[] = "SCx200 SMI"; -static const char pci_device_100b_0502[] = "SCx200 IDE"; -static const char pci_device_100b_0503[] = "SCx200 Audio"; +static const char pci_device_100b_0502[] = "SCx200, SC1100 IDE controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_100b_0502_100b_0502[] = "IDE Controller"; +#endif +static const char pci_device_100b_0503[] = "SCx200, SC1100 Audio Controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_100b_0503_100b_0503[] = "XpressAudio controller"; +#endif static const char pci_device_100b_0504[] = "SCx200 Video"; static const char pci_device_100b_0505[] = "SCx200 XBus"; static const char pci_device_100b_0510[] = "SC1100 Bridge"; -static const char pci_device_100b_0511[] = "SC1100 SMI"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_100b_0510_100b_0500[] = "GPIO and LPC support bridge"; +#endif +static const char pci_device_100b_0511[] = "SC1100 SMI & ACPI"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_100b_0511_100b_0501[] = "SC1100 SMI & ACPI bridge"; +#endif static const char pci_device_100b_0515[] = "SC1100 XBus"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_100b_0515_100b_0505[] = "SC1100 PCI to XBus bridge"; +#endif static const char pci_device_100b_d001[] = "87410 IDE"; static const char pci_vendor_100c[] = "Tseng Labs Inc"; static const char pci_device_100c_3202[] = "ET4000/W32p rev A"; @@ -2900,7 +2981,7 @@ static const char pci_subsys_1014_0096_1014_0099[] = "iSeries 2748 DASD IOA"; static const char pci_device_1014_009f[] = "PCI 4758 Cryptographic Accelerator"; static const char pci_device_1014_00a5[] = "ATM Controller (1410a500)"; static const char pci_device_1014_00a6[] = "ATM 155MBPS MM Controller (1410a600)"; -static const char pci_device_1014_00b7[] = "256-bit Graphics Rasterizer [Fire GL1]"; +static const char pci_device_1014_00b7[] = "256-bit Graphics Rasterizer [FireGL1]"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1014_00b7_1092_00b8[] = "FireGL1 AGP 32Mb"; @@ -2960,6 +3041,13 @@ static const char pci_subsys_1014_01bd_1014_0259[] = "ServeRAID-5i"; #endif static const char pci_device_1014_01c1[] = "64bit/66MHz PCI ATM 155 UTP"; static const char pci_device_1014_01e6[] = "Cryptographic Accelerator"; +static const char pci_device_1014_01ef[] = "PowerPC 440GP PCI Bridge"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1014_01ef_1734_102b[] = "PCEAS PCI-X Dual Port ESCON Adapter"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1014_01ef_1734_10f8[] = "PCEAT PCI-Express Dual Port ESCON Adapter"; +#endif static const char pci_device_1014_01ff[] = "10/100 Mbps Ethernet"; static const char pci_device_1014_0219[] = "Multiport Serial Adapter"; #ifdef INIT_SUBSYS_INFO @@ -2998,9 +3086,16 @@ static const char pci_subsys_1014_02bd_1014_02c1[] = "PCI-X DDR 3Gb SAS Adapter #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1014_02bd_1014_02c2[] = "PCI-X DDR 3Gb SAS RAID Adapter (572B/571D)"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1014_02bd_1014_0338[] = "PCI-X266 Auxiliary Cache Adapter (575C)"; +#endif static const char pci_device_1014_0302[] = "Winnipeg PCI-X Host Bridge"; static const char pci_device_1014_0308[] = "CalIOC2 PCI-E Root Port"; static const char pci_device_1014_0314[] = "ZISC 036 Neural accelerator card"; +static const char pci_device_1014_0339[] = "Obsidian-E PCI-E SCSI controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1014_0339_1014_0360[] = "PCI-E Auxiliary Cache Adapter (57B7)"; +#endif static const char pci_device_1014_3022[] = "QLA3022 Network Adapter"; static const char pci_device_1014_4022[] = "QLA3022 Network Adapter"; static const char pci_device_1014_ffff[] = "MPIC-2 interrupt controller"; @@ -3024,6 +3119,16 @@ static const char pci_vendor_1019[] = "Elitegroup Computer Systems"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_101a[] = "AT&T GIS (NCR)"; static const char pci_device_101a_0005[] = "100VG ethernet"; +static const char pci_device_101a_1dc1[] = "Bynet"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_101a_1dc1_101a_0019[] = "BIC2M"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_101a_1dc1_101a_001f[] = "BIC4M"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_101a_1dc1_101a_0ece[] = "BYA4M"; +#endif #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_101b[] = "Vitesse Semiconductor"; @@ -3121,6 +3226,16 @@ static const char pci_device_1022_1100[] = "K8 [Athlon64/Opteron] HyperTransport static const char pci_device_1022_1101[] = "K8 [Athlon64/Opteron] Address Map"; static const char pci_device_1022_1102[] = "K8 [Athlon64/Opteron] DRAM Controller"; static const char pci_device_1022_1103[] = "K8 [Athlon64/Opteron] Miscellaneous Control"; +static const char pci_device_1022_1200[] = "Family 10h [Opteron, Athlon64, Sempron] HyperTransport Configuration"; +static const char pci_device_1022_1201[] = "Family 10h [Opteron, Athlon64, Sempron] Address Map"; +static const char pci_device_1022_1202[] = "Family 10h [Opteron, Athlon64, Sempron] DRAM Controller"; +static const char pci_device_1022_1203[] = "Family 10h [Opteron, Athlon64, Sempron] Miscellaneous Control"; +static const char pci_device_1022_1204[] = "Family 10h [Opteron, Athlon64, Sempron] Link Control"; +static const char pci_device_1022_1300[] = "Family 11h HyperTransport Configuration"; +static const char pci_device_1022_1301[] = "Family 11h Address Map"; +static const char pci_device_1022_1302[] = "Family 11h DRAM Controller"; +static const char pci_device_1022_1303[] = "Family 11h Miscellaneous Control"; +static const char pci_device_1022_1304[] = "Family 11h Link Control"; static const char pci_device_1022_2000[] = "79c970 [PCnet32 LANCE]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1022_2000_1014_2000[] = "NetFinity 10/100 Fast Ethernet"; @@ -3198,7 +3313,7 @@ static const char pci_subsys_1022_2001_1668_0299[] = "ActionLink Home Network Ad static const char pci_device_1022_2003[] = "Am 1771 MBW [Alchemy]"; static const char pci_device_1022_2020[] = "53c974 [PCscsi]"; static const char pci_device_1022_2040[] = "79c974"; -static const char pci_device_1022_2080[] = "Conrad Kostecki"; +static const char pci_device_1022_2080[] = "CS5536 [Geode companion] Host Bridge"; static const char pci_device_1022_2081[] = "Geode LX Video"; static const char pci_device_1022_2082[] = "Geode LX AES Security Block"; static const char pci_device_1022_208f[] = "CS5536 GeodeLink PCI South Bridge"; @@ -3500,7 +3615,9 @@ static const char pci_subsys_1028_0015_1028_1f01[] = "PERC 5/E Adapter RAID Cont #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1028_0015_1028_1f02[] = "PERC 5/i Adapter RAID Controller"; #endif -static const char pci_device_1028_1f03[] = "PERC 5/i"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1028_0015_1028_1f03[] = "PERC 5/i Adapter RAID Controller"; +#endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1029[] = "Siemens Nixdorf IS"; #endif @@ -3916,6 +4033,9 @@ static const char pci_subsys_102b_2538_102b_08c7[] = "Millennium P650 PCIe 128MB static const char pci_subsys_102b_2538_102b_0907[] = "Millennium P650 PCIe 64MB"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_102b_2538_102b_0947[] = "Parhelia APVe"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_102b_2538_102b_1047[] = "Millennium P650 LP PCIe 128MB"; #endif #ifdef INIT_SUBSYS_INFO @@ -4157,6 +4277,9 @@ static const char pci_device_1039_0018[] = "SiS85C503/5513 (LPC Bridge)"; static const char pci_device_1039_0180[] = "RAID bus controller 180 SATA/PATA [SiS]"; static const char pci_device_1039_0181[] = "SATA"; static const char pci_device_1039_0182[] = "182 SATA/RAID Controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1039_0182_1734_1095[] = "D2030-A1"; +#endif static const char pci_device_1039_0186[] = "AHCI Controller (0106)"; static const char pci_device_1039_0190[] = "190 Gigabit Ethernet Adapter"; static const char pci_device_1039_0191[] = "191 Gigabit Ethernet Adapter"; @@ -4204,6 +4327,9 @@ static const char pci_device_1039_0746[] = "746 Host"; static const char pci_device_1039_0755[] = "755 Host"; static const char pci_device_1039_0760[] = "760/M760 Host"; static const char pci_device_1039_0761[] = "761/M761 Host"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1039_0761_1734_1099[] = "D2030-A1 Motherboard"; +#endif static const char pci_device_1039_0900[] = "SiS900 PCI Fast Ethernet"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1039_0900_1019_0a14[] = "K7S5A motherboard"; @@ -4248,6 +4374,9 @@ static const char pci_subsys_1039_5513_1043_8035[] = "CUSI-FX motherboard"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1039_5513_1462_7010[] = "MS-6701 motherboard"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1039_5513_1734_1095[] = "D2030-A1 Motherboard"; +#endif static const char pci_device_1039_5517[] = "5517"; static const char pci_device_1039_5571[] = "5571"; static const char pci_device_1039_5581[] = "5581 Pentium Chipset"; @@ -4294,6 +4423,15 @@ static const char pci_device_1039_6330[] = "661/741/760 PCI/AGP or 662/761Gx PCI #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1039_6330_1039_6330[] = "[M]661xX/[M]741[GX]/[M]760 PCI/AGP VGA Adapter"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1039_6330_1043_8113[] = "SiS Real 256E (ASUS P5S800-VM motherboard)"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1039_6330_1458_d000[] = "SiS661FX GUI 2D/3D Accelerator"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1039_6330_1734_1099[] = "D2030-A1"; +#endif static const char pci_device_1039_6350[] = "770/670 PCIE VGA Display Adapter"; static const char pci_device_1039_6351[] = "771/671 PCIE VGA Display Adapter"; static const char pci_device_1039_7001[] = "USB 1.0 Controller"; @@ -4309,6 +4447,9 @@ static const char pci_subsys_1039_7001_1462_5470[] = "K7SOM+ 5.2C Motherboard"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1039_7001_1462_7010[] = "MS-6701 motherboard"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1039_7001_1734_1095[] = "D2030-A1 Motherboard"; +#endif static const char pci_device_1039_7002[] = "USB 2.0 Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1039_7002_1462_7010[] = "MS-6701 motherboard"; @@ -4316,6 +4457,9 @@ static const char pci_subsys_1039_7002_1462_7010[] = "MS-6701 motherboard"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1039_7002_1509_7002[] = "Onboard USB Controller"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1039_7002_1734_1095[] = "D2030-A1"; +#endif static const char pci_device_1039_7007[] = "FireWire Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1039_7007_1462_701d[] = "MS-6701"; @@ -4327,6 +4471,9 @@ static const char pci_subsys_1039_7012_1462_7010[] = "MS-6701 motherboard"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1039_7012_15bd_1001[] = "DFI 661FX motherboard"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1039_7012_1734_109f[] = "D2030-A1 Motherboard"; +#endif static const char pci_device_1039_7013[] = "AC'97 Modem Controller"; static const char pci_device_1039_7016[] = "SiS7016 PCI Fast Ethernet Adapter"; #ifdef INIT_SUBSYS_INFO @@ -4352,6 +4499,9 @@ static const char pci_subsys_1039_7018_1025_0018[] = "SiS PCI Audio Accelerator" static const char pci_subsys_1039_7018_1039_7018[] = "SiS PCI Audio Accelerator"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1039_7018_1043_1453[] = "SiS PCI Audio Accelerator"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1039_7018_1043_800b[] = "SiS PCI Audio Accelerator"; #endif #ifdef INIT_SUBSYS_INFO @@ -4498,6 +4648,7 @@ static const char pci_device_103c_12f8[] = "Broadcom BCM4306 802.11b/g Wireless static const char pci_device_103c_12fa[] = "BCM4306 802.11b/g Wireless LAN Controller"; static const char pci_device_103c_1302[] = "RMP-3 Shared Memory Driver"; static const char pci_device_103c_1303[] = "RMP-3 (Remote Management Processor)"; +static const char pci_device_103c_1361[] = "BCM4312 802.11a/b/g WLAN Controller"; static const char pci_device_103c_2910[] = "E2910A PCIBus Exerciser"; static const char pci_device_103c_2925[] = "E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer"; static const char pci_device_103c_3080[] = "Pavilion ze2028ea"; @@ -4508,6 +4659,19 @@ static const char pci_device_103c_3220[] = "Smart Array P600"; static const char pci_subsys_103c_3220_103c_3225[] = "3 Gb/s SAS RAID"; #endif static const char pci_device_103c_3230[] = "Smart Array Controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_103c_3230_103c_3223[] = "Smart Array P800"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_103c_3230_103c_3234[] = "P400 SAS Controller"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_103c_3230_103c_3235[] = "P400i SAS Controller"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_103c_3230_103c_3237[] = "E500 SAS Controller"; +#endif +static const char pci_device_103c_3238[] = "Smart Array E200i (SAS Controller)"; static const char pci_device_103c_4030[] = "zx2 System Bus Adapter"; static const char pci_device_103c_4031[] = "zx2 I/O Controller"; static const char pci_device_103c_4037[] = "PCIe Local Bus Adapter"; @@ -5165,7 +5329,7 @@ static const char pci_subsys_104c_ac56_1014_0512[] = "Thinkpad R50e model 1634"; static const char pci_subsys_104c_ac56_1014_0528[] = "ThinkPad R40e (2684-HVG) Cardbus Controller"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_104c_ac56_17aa_2012[] = "Thinkpad R60e model 0657"; +static const char pci_subsys_104c_ac56_17aa_2012[] = "ThinkPad T60/R60 series"; #endif static const char pci_device_104c_ac60[] = "PCI2040 PCI to DSP Bridge Controller"; #ifdef INIT_SUBSYS_INFO @@ -5253,6 +5417,8 @@ static const char pci_vendor_1053[] = "Young Micro Systems"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1054[] = "Hitachi, Ltd"; +static const char pci_device_1054_3011[] = "ColdFusion 3e Chipset Processor to I/O Controller"; +static const char pci_device_1054_3012[] = "ColdFusion 3e Chipset Memory Controller Hub"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1055[] = "Efar Microsystems"; @@ -5275,6 +5441,8 @@ static const char pci_device_1057_0009[] = "MPC8560"; static const char pci_device_1057_0012[] = "MPC8548 [PowerQUICC III]"; static const char pci_device_1057_0100[] = "MC145575 [HFC-PCI]"; static const char pci_device_1057_0431[] = "KTI829c 100VG"; +static const char pci_device_1057_1073[] = "Nokia N770"; +static const char pci_device_1057_1219[] = "Nokia N800"; static const char pci_device_1057_1801[] = "DSP56301 Digital Signal Processor"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1057_1801_14fb_0101[] = "Transas Radar Imitator Board [RIM]"; @@ -5463,7 +5631,7 @@ static const char pci_vendor_1059[] = "Teknor Industrial Computers Inc"; static const char pci_vendor_105a[] = "Promise Technology, Inc."; static const char pci_device_105a_0d30[] = "PDC20265 (FastTrak100 Lite/Ultra100)"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_105a_0d30_1043_8042[] = "ASUS AV7266-E South Bridge Promise RAID"; +static const char pci_subsys_105a_0d30_1043_8042[] = "AV7266-E South Bridge Promise RAID"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_105a_0d30_105a_4d33[] = "Ultra100"; @@ -5568,11 +5736,14 @@ static const char pci_device_105a_6629[] = "PDC20619 (FastTrak TX4000)"; static const char pci_device_105a_7275[] = "PDC20277 (SBFastTrak133 Lite)"; static const char pci_device_105a_8002[] = "SATAII150 SX8"; static const char pci_device_105a_8350[] = "80333 [SuperTrak EX8350/EX16350], 80331 [SuperTrak EX8300/EX16300]"; -static const char pci_device_105a_8650[] = "IOP1348 [SuperTrak EX4650/EX8650/EX8654]"; +static const char pci_device_105a_8650[] = "81348 [SuperTrak EX4650/EX8650/EX8654/EX4650EL]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_105a_8650_105a_4600[] = "SuperTrak EX4650"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_105a_8650_105a_4610[] = "SuperTrak EX4650EL"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_105a_8650_105a_8601[] = "SuperTrak EX8650"; #endif #ifdef INIT_SUBSYS_INFO @@ -5583,6 +5754,7 @@ static const char pci_device_105a_e350[] = "80333 [SuperTrak EX24350]"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_105b[] = "Foxconn International, Inc."; +static const char pci_device_105b_0c4d[] = "SiS AC'97 Sound Controller"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_105c[] = "Wipro Infotech Limited"; @@ -6173,12 +6345,20 @@ static const char pci_device_108e_1103[] = "RIO USB"; static const char pci_device_108e_1648[] = "[bge] Gigabit Ethernet"; static const char pci_device_108e_2bad[] = "GEM"; static const char pci_device_108e_5000[] = "Simba Advanced PCI Bridge"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_108e_5000_108e_5000[] = "Netra AX1105-500"; +#endif static const char pci_device_108e_5043[] = "SunPCI Co-processor"; +static const char pci_device_108e_676e[] = "SunPCiIII"; +static const char pci_device_108e_7063[] = "SunPCiII / SunPCiIIpro"; static const char pci_device_108e_8000[] = "Psycho PCI Bus Module"; static const char pci_device_108e_8001[] = "Schizo PCI Bus Module"; static const char pci_device_108e_8002[] = "Schizo+ PCI Bus Module"; static const char pci_device_108e_a000[] = "Ultra IIi"; static const char pci_device_108e_a001[] = "Ultra IIe"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_108e_a001_108e_a001[] = "Netra AX1105-500"; +#endif static const char pci_device_108e_a801[] = "Tomatillo PCI Bus Module"; static const char pci_device_108e_abba[] = "Cassini 10/100/1000"; #ifdef VENDOR_INCLUDE_NONVIDEO @@ -6840,16 +7020,26 @@ static const char pci_device_10b5_1146[] = "VScom 010 1 port parallel adaptor"; static const char pci_device_10b5_1147[] = "VScom 020 2 port parallel adaptor"; static const char pci_device_10b5_2540[] = "IXXAT CAN-Interface PC-I 04/PCI"; static const char pci_device_10b5_2724[] = "Thales PCSM Security Card"; +static const char pci_device_10b5_6520[] = "PCI6520 PCI-X to PCI-X bridge"; static const char pci_device_10b5_6540[] = "PCI6540/6466 PCI-PCI bridge (transparent mode)"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10b5_6540_1775_1100[] = "CR11 Single Board Computer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10b5_6540_4c53_10e0[] = "PSL09 PrPMC"; #endif static const char pci_device_10b5_6541[] = "PCI6540/6466 PCI-PCI bridge (non-transparent mode, primary side)"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10b5_6541_1775_1100[] = "CR11 Single Board Computer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10b5_6541_4c53_10e0[] = "PSL09 PrPMC"; #endif static const char pci_device_10b5_6542[] = "PCI6540/6466 PCI-PCI bridge (non-transparent mode, secondary side)"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10b5_6542_1775_1100[] = "CR11 Single Board Computer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10b5_6542_4c53_10e0[] = "PSL09 PrPMC"; #endif static const char pci_device_10b5_8111[] = "PEX 8111 PCI Express-to-PCI Bridge"; @@ -7041,6 +7231,9 @@ static const char pci_subsys_10b5_9054_12d9_0002[] = "PCI Prosody Card rev 1.5"; static const char pci_subsys_10b5_9054_14b4_d100[] = "Dektec DTA-100"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10b5_9054_14b4_d114[] = "Dektec DTA-120"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10b5_9054_16df_0011[] = "PIKA PrimeNet MM PCI"; #endif #ifdef INIT_SUBSYS_INFO @@ -7058,10 +7251,13 @@ static const char pci_subsys_10b5_9054_16df_0015[] = "PIKA Daytona MM"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10b5_9054_16df_0016[] = "PIKA InLine MM"; #endif -static const char pci_device_10b5_9056[] = "Francois"; +static const char pci_device_10b5_9056[] = "9056 PCI I/O Accelerator"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10b5_9056_10b5_2979[] = "CellinkBlade 11 - CPCI board VoATM AAL1"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10b5_9056_14b4_d140[] = "Dektec DTA-140"; +#endif static const char pci_device_10b5_9060[] = "9060"; static const char pci_device_10b5_906d[] = "9060SD"; #ifdef INIT_SUBSYS_INFO @@ -7174,6 +7370,9 @@ static const char pci_device_10b7_0910[] = "3C910-A01"; static const char pci_device_10b7_1006[] = "MINI PCI type 3B Data Fax Modem"; static const char pci_device_10b7_1007[] = "Mini PCI 56k Winmodem"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10b7_1007_10b7_615b[] = "Mini PCI 56K Modem"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10b7_1007_10b7_615c[] = "Mini PCI 56K Modem"; #endif static const char pci_device_10b7_1201[] = "3c982-TXM 10/100baseTX Dual Port A [Hydra]"; @@ -7389,6 +7588,11 @@ static const char pci_subsys_10b7_9200_1028_0097[] = "3C920 Integrated Fast Ethe #ifdef VENDOR_INCLUDE_NONVIDEO #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10b7_9200_1028_00b4[] = "OptiPlex GX110"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10b7_9200_1028_00fe[] = "Optiplex GX240"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -7398,7 +7602,7 @@ static const char pci_subsys_10b7_9200_1028_012a[] = "3C920 Integrated Fast Ethe #endif #ifdef VENDOR_INCLUDE_NONVIDEO #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_10b7_9200_10b7_1000[] = "3C905C-TX Fast Etherlink for PC Management NIC"; +static const char pci_subsys_10b7_9200_10b7_1000[] = "3C905CX-TX/TX-M Fast Etherlink for PC Management NIC"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10b7_9200_10b7_7000[] = "10/100 Mini PCI Ethernet Adapter"; @@ -8108,8 +8312,8 @@ static const char pci_subsys_10de_0029_1102_102f[] = "3D Blaster RIVA TNT2 Ultra #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0029_14af_5820[] = "Maxi Gamer Xentor 32"; #endif -static const char pci_device_10de_002a[] = "NV5 [Riva TnT2]"; -static const char pci_device_10de_002b[] = "NV5 [Riva TnT2]"; +static const char pci_device_10de_002a[] = "NV5 [Riva TNT2]"; +static const char pci_device_10de_002b[] = "NV5 [Riva TNT2]"; static const char pci_device_10de_002c[] = "NV6 [Vanta/Vanta LT]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_002c_1043_0200[] = "AGP-V3800 Combat SDRAM"; @@ -8187,7 +8391,7 @@ static const char pci_device_10de_0041[] = "NV40 [GeForce 6800]"; static const char pci_subsys_10de_0041_1043_817b[] = "V9999 Gamer Edition"; #endif static const char pci_device_10de_0042[] = "NV40.2 [GeForce 6800 LE]"; -static const char pci_device_10de_0043[] = "NV40.3"; +static const char pci_device_10de_0043[] = "NV40.3 [GeForce 6800 XE]"; static const char pci_device_10de_0044[] = "NV40 [GeForce 6800 XT]"; static const char pci_device_10de_0045[] = "NV40 [GeForce 6800 GT]"; static const char pci_device_10de_0046[] = "NV40 [GeForce 6800 GT]"; @@ -8201,7 +8405,7 @@ static const char pci_device_10de_004d[] = "NV40GL [Quadro FX 4000]"; static const char pci_device_10de_004e[] = "NV40GL [Quadro FX 4000]"; static const char pci_device_10de_0050[] = "CK804 ISA Bridge"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_10de_0050_1043_815a[] = "K8N4-E Mainboard"; +static const char pci_subsys_10de_0050_1043_815a[] = "K8N4-E or A8N-E Mainboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0050_1458_0c11[] = "GA-K8N Ultra-9 Mainboard"; @@ -8215,7 +8419,7 @@ static const char pci_subsys_10de_0050_147b_1c1a[] = "KN8-Ultra Mainboard"; static const char pci_device_10de_0051[] = "CK804 ISA Bridge"; static const char pci_device_10de_0052[] = "CK804 SMBus"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_10de_0052_1043_815a[] = "K8N4-E Mainboard"; +static const char pci_subsys_10de_0052_1043_815a[] = "K8N4-E or A8N-E Mainboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0052_1458_0c11[] = "GA-K8N Ultra-9 Mainboard"; @@ -8228,7 +8432,7 @@ static const char pci_subsys_10de_0052_147b_1c1a[] = "KN8-Ultra Mainboard"; #endif static const char pci_device_10de_0053[] = "CK804 IDE"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_10de_0053_1043_815a[] = "K8N4-E Mainboard"; +static const char pci_subsys_10de_0053_1043_815a[] = "K8N4-E or A8N-E Mainboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0053_1458_5002[] = "GA-K8N Ultra-9 Mainboard"; @@ -8241,6 +8445,9 @@ static const char pci_subsys_10de_0053_147b_1c1a[] = "KN8-Ultra Mainboard"; #endif static const char pci_device_10de_0054[] = "CK804 Serial ATA Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0054_1043_815a[] = "A8N-E Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0054_1458_b003[] = "GA-K8N Ultra-9 Mainboard"; #endif #ifdef INIT_SUBSYS_INFO @@ -8251,7 +8458,7 @@ static const char pci_subsys_10de_0054_147b_1c1a[] = "KN8-Ultra Mainboard"; #endif static const char pci_device_10de_0055[] = "CK804 Serial ATA Controller"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_10de_0055_1043_815a[] = "K8N4-E Mainboard"; +static const char pci_subsys_10de_0055_1043_815a[] = "K8N4-E or A8N-E Mainboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0055_1458_b003[] = "GA-K8N Ultra-9 Mainboard"; @@ -8262,7 +8469,7 @@ static const char pci_subsys_10de_0055_147b_1c1a[] = "KN8-Ultra Mainboard"; static const char pci_device_10de_0056[] = "CK804 Ethernet Controller"; static const char pci_device_10de_0057[] = "CK804 Ethernet Controller"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_10de_0057_1043_8141[] = "K8N4-E Mainboard"; +static const char pci_subsys_10de_0057_1043_8141[] = "K8N4-E or A8N-E Mainboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0057_1458_e000[] = "GA-K8N Ultra-9 Mainboard"; @@ -8276,14 +8483,14 @@ static const char pci_subsys_10de_0057_147b_1c1a[] = "KN8-Ultra Mainboard"; static const char pci_device_10de_0058[] = "CK804 AC'97 Modem"; static const char pci_device_10de_0059[] = "CK804 AC'97 Audio Controller"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_10de_0059_1043_812a[] = "K8N4-E Mainboard"; +static const char pci_subsys_10de_0059_1043_812a[] = "K8N4-E or A8N-E Mainboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0059_147b_1c1a[] = "KN8-Ultra Mainboard"; #endif static const char pci_device_10de_005a[] = "CK804 USB Controller"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_10de_005a_1043_815a[] = "K8N4-E Mainboard"; +static const char pci_subsys_10de_005a_1043_815a[] = "K8N4-E or A8N-E Mainboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_005a_1458_5004[] = "GA-K8N Ultra-9 Mainboard"; @@ -8296,7 +8503,7 @@ static const char pci_subsys_10de_005a_147b_1c1a[] = "KN8-Ultra Mainboard"; #endif static const char pci_device_10de_005b[] = "CK804 USB Controller"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_10de_005b_1043_815a[] = "K8N4-E Mainboard"; +static const char pci_subsys_10de_005b_1043_815a[] = "K8N4-E or A8N-E Mainboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_005b_1458_5004[] = "GA-K8N Ultra-9 Mainboard"; @@ -8311,6 +8518,9 @@ static const char pci_device_10de_005c[] = "CK804 PCI Bridge"; static const char pci_device_10de_005d[] = "CK804 PCIE Bridge"; static const char pci_device_10de_005e[] = "CK804 Memory Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_005e_1043_815a[] = "A8N-E Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_005e_10f1_2891[] = "Thunder K8SRE Mainboard"; #endif #ifdef INIT_SUBSYS_INFO @@ -8402,9 +8612,10 @@ static const char pci_device_10de_0090[] = "G70 [GeForce 7800 GTX]"; static const char pci_device_10de_0091[] = "G70 [GeForce 7800 GTX]"; static const char pci_device_10de_0092[] = "G70 [GeForce 7800 GT]"; static const char pci_device_10de_0093[] = "G70 [GeForce 7800 GS]"; -static const char pci_device_10de_0098[] = "GeForce Go 7800"; -static const char pci_device_10de_0099[] = "GE Force Go 7800 GTX"; -static const char pci_device_10de_009d[] = "G70GL [Quadro FX4500]"; +static const char pci_device_10de_0095[] = "GeForce 7800 SLI"; +static const char pci_device_10de_0098[] = "G70 [GeForce Go 7800]"; +static const char pci_device_10de_0099[] = "G70 [GeForce Go 7800 GTX]"; +static const char pci_device_10de_009d[] = "G70GL [Quadro FX 4500]"; static const char pci_device_10de_00a0[] = "NV5 [Aladdin TNT2]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_00a0_14af_5810[] = "Maxi Gamer Xentor"; @@ -8412,7 +8623,7 @@ static const char pci_subsys_10de_00a0_14af_5810[] = "Maxi Gamer Xentor"; static const char pci_device_10de_00c0[] = "NV41 [GeForce 6800 GS]"; static const char pci_device_10de_00c1[] = "NV41.1 [GeForce 6800]"; static const char pci_device_10de_00c2[] = "NV41.2 [GeForce 6800 LE]"; -static const char pci_device_10de_00c3[] = "NV42 [Geforce 6800 XT]"; +static const char pci_device_10de_00c3[] = "NV42 [GeForce 6800 XT]"; static const char pci_device_10de_00c8[] = "NV41.8 [GeForce Go 6800]"; static const char pci_device_10de_00c9[] = "NV41.9 [GeForce Go 6800 Ultra]"; static const char pci_device_10de_00cc[] = "NV41 [Quadro FX Go1400]"; @@ -8435,6 +8646,9 @@ static const char pci_device_10de_00da[] = "nForce3 Audio"; static const char pci_device_10de_00dd[] = "nForce3 PCI Bridge"; static const char pci_device_10de_00df[] = "CK8S Ethernet Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_00df_1043_80a7[] = "K8N-E"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_00df_105b_0c43[] = "Winfast NF3250K8AA"; #endif #ifdef INIT_SUBSYS_INFO @@ -8442,6 +8656,9 @@ static const char pci_subsys_10de_00df_147b_1c0b[] = "NF8 Mainboard"; #endif static const char pci_device_10de_00e0[] = "nForce3 250Gb LPC Bridge"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_00e0_1043_813f[] = "K8N-E"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_00e0_10de_0c11[] = "Winfast NF3250K8AA"; #endif #ifdef INIT_SUBSYS_INFO @@ -8452,6 +8669,9 @@ static const char pci_subsys_10de_00e0_147b_1c0b[] = "NF8 Mainboard"; #endif static const char pci_device_10de_00e1[] = "nForce3 250Gb Host Bridge"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_00e1_1043_813f[] = "K8N-E"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_00e1_1462_7030[] = "K8N Neo-FSR v2.0"; #endif #ifdef INIT_SUBSYS_INFO @@ -8460,6 +8680,9 @@ static const char pci_subsys_10de_00e1_147b_1c0b[] = "NF8 Mainboard"; static const char pci_device_10de_00e2[] = "nForce3 250Gb AGP Host to PCI Bridge"; static const char pci_device_10de_00e3[] = "CK8S Serial ATA Controller (v2.5)"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_00e3_1043_813f[] = "K8N-E"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_00e3_105b_0c43[] = "Winfast NF3250K8AA"; #endif #ifdef INIT_SUBSYS_INFO @@ -8467,6 +8690,9 @@ static const char pci_subsys_10de_00e3_147b_1c0b[] = "NF8 Mainboard"; #endif static const char pci_device_10de_00e4[] = "nForce 250Gb PCI System Management"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_00e4_1043_813f[] = "K8N-E"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_00e4_105b_0c43[] = "Winfast NF3250K8AA"; #endif #ifdef INIT_SUBSYS_INFO @@ -8477,6 +8703,9 @@ static const char pci_subsys_10de_00e4_147b_1c0b[] = "NF8 Mainboard"; #endif static const char pci_device_10de_00e5[] = "CK8S Parallel ATA Controller (v2.5)"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_00e5_1043_813f[] = "K8N-E"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_00e5_105b_0c43[] = "Winfast NF3250K8AA"; #endif #ifdef INIT_SUBSYS_INFO @@ -8488,6 +8717,9 @@ static const char pci_subsys_10de_00e5_147b_1c0b[] = "NF8 Mainboard"; static const char pci_device_10de_00e6[] = "CK8S Ethernet Controller"; static const char pci_device_10de_00e7[] = "CK8S USB Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_00e7_1043_813f[] = "K8N-E"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_00e7_105b_0c43[] = "Winfast NF3250K8AA"; #endif #ifdef INIT_SUBSYS_INFO @@ -8498,6 +8730,9 @@ static const char pci_subsys_10de_00e7_147b_1c0b[] = "NF8 Mainboard"; #endif static const char pci_device_10de_00e8[] = "nForce3 EHCI USB 2.0 Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_00e8_1043_813f[] = "K8N-E"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_00e8_105b_0c43[] = "Winfast NF3250K8AA"; #endif #ifdef INIT_SUBSYS_INFO @@ -8508,41 +8743,50 @@ static const char pci_subsys_10de_00e8_147b_1c0b[] = "NF8 Mainboard"; #endif static const char pci_device_10de_00ea[] = "nForce3 250Gb AC'97 Audio Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_00ea_1043_819d[] = "K8N-E"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_00ea_105b_0c43[] = "Winfast NF3250K8AA"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_00ea_1462_b010[] = "K8N Neo-FSR v2.0"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_00ea_147b_1c0b[] = "NF8 Mainboard"; #endif static const char pci_device_10de_00ed[] = "nForce3 250Gb PCI-to-PCI Bridge"; static const char pci_device_10de_00ee[] = "CK8S Serial ATA Controller (v2.5)"; -static const char pci_device_10de_00f0[] = "NV40 [GeForce 6800/GeForce 6800 Ultra]"; -static const char pci_device_10de_00f1[] = "NV43 [GeForce 6600/GeForce 6600 GT]"; +static const char pci_device_10de_00f0[] = "NV40 [GeForce 6800 Ultra]"; +static const char pci_device_10de_00f1[] = "NV43 [GeForce 6600 GT]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_00f1_1043_81a6[] = "N6600GT TD 128M AGP"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_00f1_1458_3150[] = "GV-N66T128VP"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_00f1_1682_2119[] = "GeForce 6600 GT AGP 128MB DDR3 DUAL DVI TV"; #endif -static const char pci_device_10de_00f2[] = "NV43 [GeForce 6600/GeForce 6600 GT]"; +static const char pci_device_10de_00f2[] = "NV43 [GeForce 6600]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_00f2_1682_211c[] = "GeForce 6600 256MB DDR DUAL DVI TV"; #endif static const char pci_device_10de_00f3[] = "NV43 [GeForce 6200]"; static const char pci_device_10de_00f4[] = "NV43 [GeForce 6600 LE]"; static const char pci_device_10de_00f5[] = "G70 [GeForce 7800 GS]"; -static const char pci_device_10de_00f6[] = "NV43 [GeForce 6600 GS]"; +static const char pci_device_10de_00f6[] = "NV43 [GeForce 6800 GS]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_00f6_1682_217e[] = "XFX GeForce 6800 XTreme 256MB DDR3 AGP"; #endif static const char pci_device_10de_00f8[] = "NV45GL [Quadro FX 3400/4400]"; -static const char pci_device_10de_00f9[] = "NV40 [GeForce 6800 Ultra/GeForce 6800 GT]"; +static const char pci_device_10de_00f9[] = "NV45 [GeForce 6800 GTO]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_00f9_1682_2120[] = "GEFORCE 6800 GT PCI-E"; #endif static const char pci_device_10de_00fa[] = "NV36 [GeForce PCX 5750]"; static const char pci_device_10de_00fb[] = "NV35 [GeForce PCX 5900]"; static const char pci_device_10de_00fc[] = "NV37GL [Quadro FX 330/GeForce PCX 5300]"; -static const char pci_device_10de_00fd[] = "NV37GL [Quadro FX 330/Quadro NVS280]"; +static const char pci_device_10de_00fd[] = "NV37GL [Quadro PCI-E Series]"; static const char pci_device_10de_00fe[] = "NV38GL [Quadro FX 1300]"; static const char pci_device_10de_00ff[] = "NV18 [GeForce PCX 4300]"; static const char pci_device_10de_0100[] = "NV10 [GeForce 256 SDR]"; @@ -8616,6 +8860,9 @@ static const char pci_device_10de_0110[] = "NV11 [GeForce2 MX/MX 400]"; static const char pci_subsys_10de_0110_1043_4015[] = "AGP-V7100 Pro"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0110_1043_4021[] = "V7100 Deluxe Combo"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0110_1043_4031[] = "V7100 Pro with TV output"; #endif #ifdef INIT_SUBSYS_INFO @@ -8651,15 +8898,19 @@ static const char pci_subsys_10de_0110_14af_7102[] = "3D Prophet II MX"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0110_14af_7103[] = "3D Prophet II MX Dual-Display"; #endif -static const char pci_device_10de_0111[] = "NV11DDR [GeForce2 MX 100 DDR/200 DDR]"; +static const char pci_device_10de_0111[] = "NV11DDR [GeForce2 MX200]"; static const char pci_device_10de_0112[] = "NV11 [GeForce2 Go]"; static const char pci_device_10de_0113[] = "NV11GL [Quadro2 MXR/EX/Go]"; static const char pci_device_10de_0140[] = "NV43 [GeForce 6600 GT]"; static const char pci_device_10de_0141[] = "NV43 [GeForce 6600]"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0141_1043_81b0[] = "EN6600 Silencer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0141_1458_3124[] = "GV-NX66128DP Turbo Force Edition"; #endif -static const char pci_device_10de_0142[] = "NV43 [GeForce 6600 PCIe]"; +static const char pci_device_10de_0142[] = "NV43 [GeForce 6600 LE]"; +static const char pci_device_10de_0143[] = "NV43 [GeForce 6600 VE]"; static const char pci_device_10de_0144[] = "NV43 [GeForce Go 6600]"; static const char pci_device_10de_0145[] = "NV43 [GeForce 6610 XL]"; static const char pci_device_10de_0146[] = "NV43 [Geforce Go 6600TE/6200TE]"; @@ -8667,7 +8918,7 @@ static const char pci_device_10de_0147[] = "GeForce 6700 XL"; static const char pci_device_10de_0148[] = "NV43 [GeForce Go 6600]"; static const char pci_device_10de_0149[] = "NV43 [GeForce Go 6600 GT]"; static const char pci_device_10de_014a[] = "Quadro NVS 440"; -static const char pci_device_10de_014c[] = "Quadro FX 550"; +static const char pci_device_10de_014c[] = "Quadro FX 540 MXM"; static const char pci_device_10de_014d[] = "NV18GL [Quadro FX 550]"; static const char pci_device_10de_014e[] = "NV43GL [Quadro FX 540]"; static const char pci_device_10de_014f[] = "NV43 [GeForce 6200]"; @@ -8707,14 +8958,15 @@ static const char pci_subsys_10de_0152_1048_0c56[] = "GLADIAC Ultra"; static const char pci_device_10de_0153[] = "NV15GL [Quadro2 Pro]"; static const char pci_device_10de_0160[] = "GeForce 6500"; static const char pci_device_10de_0161[] = "NV44 [GeForce 6200 TurboCache(TM)]"; -static const char pci_device_10de_0162[] = "NV44 [GeForce 6200 SE TurboCache (TM)]"; +static const char pci_device_10de_0162[] = "NV44 [GeForce 6200SE TurboCache (TM)]"; static const char pci_device_10de_0163[] = "NV44 [GeForce 6200 LE]"; static const char pci_device_10de_0164[] = "NV44 [GeForce Go 6200]"; static const char pci_device_10de_0165[] = "NV44 [Quadro NVS 285]"; static const char pci_device_10de_0166[] = "NV43 [GeForce Go 6400]"; -static const char pci_device_10de_0167[] = "GeForce Go 6200 TurboCache"; -static const char pci_device_10de_0168[] = "NV43 [GeForce Go 6200 TurboCache]"; +static const char pci_device_10de_0167[] = "NV43 [GeForce Go 6200/6400]"; +static const char pci_device_10de_0168[] = "NV43 [GeForce Go 6200/6400]"; static const char pci_device_10de_0169[] = "GeForce 6250"; +static const char pci_device_10de_016a[] = "GeForce 7100 GS"; static const char pci_device_10de_0170[] = "NV17 [GeForce4 MX 460]"; static const char pci_device_10de_0171[] = "NV17 [GeForce4 MX 440]"; #ifdef INIT_SUBSYS_INFO @@ -8748,11 +9000,11 @@ static const char pci_subsys_10de_0176_4c53_1090[] = "Cx9 / Vx9 mainboard"; #endif static const char pci_device_10de_0177[] = "NV17 [GeForce4 460 Go]"; static const char pci_device_10de_0178[] = "NV17GL [Quadro4 550 XGL]"; -static const char pci_device_10de_0179[] = "NV17 [GeForce4 420 Go 32M]"; +static const char pci_device_10de_0179[] = "NV17 [GeForce4 440 Go 64M]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0179_10de_0179[] = "GeForce4 MX (Mac)"; #endif -static const char pci_device_10de_017a[] = "NV17GL [Quadro4 200/400 NVS]"; +static const char pci_device_10de_017a[] = "NV17GL [Quadro NVS]"; static const char pci_device_10de_017b[] = "NV17GL [Quadro4 550 XGL]"; static const char pci_device_10de_017c[] = "NV17GL [Quadro4 500 GoGL]"; static const char pci_device_10de_017d[] = "NV17 [GeForce4 410 Go 16M]"; @@ -8777,14 +9029,20 @@ static const char pci_subsys_10de_0181_147b_8f0d[] = "Siluro GF4 MX-8X"; #endif static const char pci_device_10de_0182[] = "NV18 [GeForce4 MX 440SE AGP 8x]"; static const char pci_device_10de_0183[] = "NV18 [GeForce4 MX 420 AGP 8x]"; -static const char pci_device_10de_0185[] = "NV18 [GeForce4 MX 4000 AGP 8x]"; +static const char pci_device_10de_0184[] = "NV18 [GeForce4 MX]"; +static const char pci_device_10de_0185[] = "NV18 [GeForce4 MX 4000]"; static const char pci_device_10de_0186[] = "NV18M [GeForce4 448 Go]"; static const char pci_device_10de_0187[] = "NV18M [GeForce4 488 Go]"; static const char pci_device_10de_0188[] = "NV18GL [Quadro4 580 XGL]"; -static const char pci_device_10de_018a[] = "NV18GL [Quadro4 NVS AGP 8x]"; +static const char pci_device_10de_018a[] = "NV18GL [Quadro NVS with AGP8X]"; static const char pci_device_10de_018b[] = "NV18GL [Quadro4 380 XGL]"; -static const char pci_device_10de_018c[] = "Quadro NVS 50 PCI"; +static const char pci_device_10de_018c[] = "NV18GL [Quadro NVS 50 PCI]"; static const char pci_device_10de_018d[] = "NV18M [GeForce4 448 Go]"; +static const char pci_device_10de_0191[] = "G80 [GeForce 8800 GTX]"; +static const char pci_device_10de_0193[] = "G80 [GeForce 8800 GTS]"; +static const char pci_device_10de_0194[] = "GeForce 8800 Ultra"; +static const char pci_device_10de_019d[] = "G80 [Quadro FX 5600]"; +static const char pci_device_10de_019e[] = "G80 [Quadro FX 4600]"; static const char pci_device_10de_01a0[] = "NVCrush11 [GeForce2 MX Integrated Graphics]"; static const char pci_device_10de_01a4[] = "nForce CPU bridge"; static const char pci_device_10de_01ab[] = "nForce 420 Memory Controller (DDR)"; @@ -8800,19 +9058,22 @@ static const char pci_device_10de_01bc[] = "nForce IDE"; static const char pci_device_10de_01c1[] = "nForce AC'97 Modem Controller"; static const char pci_device_10de_01c2[] = "nForce USB Controller"; static const char pci_device_10de_01c3[] = "nForce Ethernet Controller"; -static const char pci_device_10de_01d1[] = "GeForce 7300 LE"; +static const char pci_device_10de_01d1[] = "G72 [GeForce 7300 LE]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_01d1_1462_0345[] = "7300LE PCI Express Graphics Adapter"; #endif +static const char pci_device_10de_01d3[] = "G72 [GeForce 7300 SE]"; static const char pci_device_10de_01d6[] = "GeForce Go 7200"; -static const char pci_device_10de_01d7[] = "Quadro NVS 110M / GeForce Go 7300"; -static const char pci_device_10de_01d8[] = "GeForce Go 7400"; -static const char pci_device_10de_01da[] = "Quadro NVS 110M"; -static const char pci_device_10de_01de[] = "Quadro FX 350"; +static const char pci_device_10de_01d7[] = "G72M [Quadro NVS 110M/GeForce Go 7300]"; +static const char pci_device_10de_01d8[] = "G72M [GeForce Go 7400]"; +static const char pci_device_10de_01da[] = "G72M [Quadro NVS 110M]"; +static const char pci_device_10de_01dc[] = "G72GL [Quadro FX 350M]"; +static const char pci_device_10de_01dd[] = "G72 [GeForce 7500 LE]"; +static const char pci_device_10de_01de[] = "G72GL [Quadro FX 350]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_01de_10de_01dc[] = "Quadro FX Go350M"; #endif -static const char pci_device_10de_01df[] = "GeForce 7300 GS"; +static const char pci_device_10de_01df[] = "G71 [GeForce 7300 GS]"; static const char pci_device_10de_01e0[] = "nForce2 AGP (different version?)"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_01e0_147b_1c09[] = "NV7 Motherboard"; @@ -8867,17 +9128,30 @@ static const char pci_device_10de_0212[] = "NV40 [GeForce 6800 LE]"; static const char pci_device_10de_0215[] = "NV40 [GeForce 6800 GT]"; static const char pci_device_10de_0218[] = "NV40 [GeForce 6800 XT]"; static const char pci_device_10de_0221[] = "NV44A [GeForce 6200]"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0221_3842_a341[] = "256A8N341DX"; +#endif +static const char pci_device_10de_0222[] = "GeForce 6200 A-LE"; static const char pci_device_10de_0240[] = "C51PV [GeForce 6150]"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0240_1043_81cd[] = "A8N-VM CSM"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0240_1462_7207[] = "K8NGM2 series"; #endif -static const char pci_device_10de_0241[] = "C51 PCI Express Bridge"; +static const char pci_device_10de_0241[] = "C51 [GeForce 6150 LE]"; static const char pci_device_10de_0242[] = "C51G [GeForce 6100]"; static const char pci_device_10de_0243[] = "C51 PCI Express Bridge"; -static const char pci_device_10de_0244[] = "C51 PCI Express Bridge"; -static const char pci_device_10de_0245[] = "C51 PCI Express Bridge"; +static const char pci_device_10de_0244[] = "C51 [Geforce 6150 Go]"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0244_10de_0244[] = "C51 [Geforce 6150 Go]"; +#endif +static const char pci_device_10de_0245[] = "C51 [Quadro NVS 210S/GeForce 6150LE]"; static const char pci_device_10de_0246[] = "C51 PCI Express Bridge"; -static const char pci_device_10de_0247[] = "C51 PCI Express Bridge"; +static const char pci_device_10de_0247[] = "MCP51 PCI-X GeForce Go 6100"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0247_1043_1382[] = "MCP51 PCI-X GeForce Go 6100"; +#endif static const char pci_device_10de_0248[] = "C51 PCI Express Bridge"; static const char pci_device_10de_0249[] = "C51 PCI Express Bridge"; static const char pci_device_10de_024a[] = "C51 PCI Express Bridge"; @@ -8904,6 +9178,12 @@ static const char pci_device_10de_0259[] = "NV25GL [Quadro4 750 XGL]"; static const char pci_device_10de_025b[] = "NV25GL [Quadro4 700 XGL]"; static const char pci_device_10de_0260[] = "MCP51 LPC Bridge"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0260_1043_81bc[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0260_1458_5001[] = "GA-M55plus-S3G"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0260_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_0261[] = "MCP51 LPC Bridge"; @@ -8911,52 +9191,94 @@ static const char pci_device_10de_0262[] = "MCP51 LPC Bridge"; static const char pci_device_10de_0263[] = "MCP51 LPC Bridge"; static const char pci_device_10de_0264[] = "MCP51 SMBus"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0264_1043_81bc[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0264_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_0265[] = "MCP51 IDE"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0265_1043_81bc[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0265_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_0266[] = "MCP51 Serial ATA Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0266_1043_81bc[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0266_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_0267[] = "MCP51 Serial ATA Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0267_1043_81bc[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0267_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_0268[] = "MCP51 Ethernet Controller"; static const char pci_device_10de_0269[] = "MCP51 Ethernet Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0269_1043_8141[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0269_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_026a[] = "MCP51 MCI"; static const char pci_device_10de_026b[] = "MCP51 AC97 Audio Controller"; static const char pci_device_10de_026c[] = "MCP51 High Definition Audio"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_026c_10de_cb84[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_026c_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_026d[] = "MCP51 USB Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_026d_1043_81bc[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_026d_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_026e[] = "MCP51 USB Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_026e_1043_81bc[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_026e_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_026f[] = "MCP51 PCI Bridge"; static const char pci_device_10de_0270[] = "MCP51 Host Bridge"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0270_1043_81bc[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0270_1458_5001[] = "GA-M55plus-S3G"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0270_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_0271[] = "MCP51 PMU"; static const char pci_device_10de_0272[] = "MCP51 Memory Controller 0"; static const char pci_device_10de_027e[] = "C51 Memory Controller 2"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_027e_1043_81cd[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_027e_1458_5000[] = "GA-M55plus-S3G"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_027e_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_027f[] = "C51 Memory Controller 3"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_027f_1043_81cd[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_027f_1458_5000[] = "GA-M55plus-S3G"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_027f_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_0280[] = "NV28 [GeForce4 Ti 4800]"; @@ -8965,25 +9287,43 @@ static const char pci_device_10de_0282[] = "NV28 [GeForce4 Ti 4800 SE]"; static const char pci_device_10de_0286[] = "NV28 [GeForce4 Ti 4200 Go AGP 8x]"; static const char pci_device_10de_0288[] = "NV28GL [Quadro4 980 XGL]"; static const char pci_device_10de_0289[] = "NV28GL [Quadro4 780 XGL]"; -static const char pci_device_10de_028c[] = "NV28GLM [Quadro4 700 GoGL]"; -static const char pci_device_10de_0290[] = "GeForce 7900 GTX"; -static const char pci_device_10de_0291[] = "GeForce 7900 GT"; -static const char pci_device_10de_0292[] = "GeForce 7900 GS"; +static const char pci_device_10de_028c[] = "NV28GLM [Quadro4 Go700]"; +static const char pci_device_10de_0290[] = "G71 [GeForce 7900 GTX]"; +static const char pci_device_10de_0291[] = "G71 [GeForce 7900 GT/GTO]"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0291_10de_042b[] = "NX7900GTO-T2D512E [7900 GTO]"; +#endif +static const char pci_device_10de_0292[] = "G71 [GeForce 7900 GS]"; +static const char pci_device_10de_0293[] = "G71 [GeForce 7900 GX2]"; +static const char pci_device_10de_0294[] = "G71 [GeForce 7950 GX2]"; +static const char pci_device_10de_0295[] = "G71 [GeForce 7950 GT]"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0295_107d_2a68[] = "WinFast PX7950GT TDH"; +#endif +static const char pci_device_10de_0297[] = "GeForce Go 7950 GTX"; static const char pci_device_10de_0298[] = "GeForce Go 7900 GS"; static const char pci_device_10de_0299[] = "GeForce Go 7900 GTX"; static const char pci_device_10de_029a[] = "G71 [Quadro FX 2500M]"; static const char pci_device_10de_029b[] = "G71 [Quadro FX 1500M]"; -static const char pci_device_10de_029c[] = "Quadro FX 5500"; -static const char pci_device_10de_029d[] = "Quadro FX 3500"; -static const char pci_device_10de_029e[] = "Quadro FX 1500"; -static const char pci_device_10de_029f[] = "Quadro FX 4500 X2"; +static const char pci_device_10de_029c[] = "G71 [Quadro FX 5500]"; +static const char pci_device_10de_029d[] = "G71GL [Quadro FX 3500]"; +static const char pci_device_10de_029e[] = "G71 [Quadro FX 1500]"; +static const char pci_device_10de_029f[] = "G70 [Quadro FX 4500 X2]"; static const char pci_device_10de_02a0[] = "NV2A [XGPU]"; -static const char pci_device_10de_02e1[] = "GeForce 7600 GS"; +static const char pci_device_10de_02e0[] = "GeForce 7600 GT"; +static const char pci_device_10de_02e1[] = "G73 [GeForce 7600 GS]"; +static const char pci_device_10de_02e2[] = "GeForce 7300 GT"; static const char pci_device_10de_02f0[] = "C51 Host Bridge"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_02f0_1043_81cd[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_02f0_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_02f1[] = "C51 Host Bridge"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_02f1_1458_5000[] = "GA-M55plus-S3G"; +#endif static const char pci_device_10de_02f2[] = "C51 Host Bridge"; static const char pci_device_10de_02f3[] = "C51 Host Bridge"; static const char pci_device_10de_02f4[] = "C51 Host Bridge"; @@ -8992,14 +9332,32 @@ static const char pci_device_10de_02f6[] = "C51 Host Bridge"; static const char pci_device_10de_02f7[] = "C51 Host Bridge"; static const char pci_device_10de_02f8[] = "C51 Memory Controller 5"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_02f8_1043_81cd[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_02f8_1458_5000[] = "GA-M55plus-S3G"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_02f8_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_02f9[] = "C51 Memory Controller 4"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_02f9_1043_81cd[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_02f9_1458_5000[] = "GA-M55plus-S3G"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_02f9_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_02fa[] = "C51 Memory Controller 0"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_02fa_1043_81cd[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_02fa_1458_5000[] = "GA-M55plus-S3G"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_02fa_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_02fb[] = "C51 PCI Express Bridge"; @@ -9007,10 +9365,22 @@ static const char pci_device_10de_02fc[] = "C51 PCI Express Bridge"; static const char pci_device_10de_02fd[] = "C51 PCI Express Bridge"; static const char pci_device_10de_02fe[] = "C51 Memory Controller 1"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_02fe_1043_81cd[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_02fe_1458_5000[] = "GA-M55plus-S3G"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_02fe_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_02ff[] = "C51 Host Bridge"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_02ff_1043_81cd[] = "A8N-VM CSM Mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_02ff_1458_5000[] = "GA-M55plus-S3G"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_02ff_1462_7207[] = "K8NGM2 series"; #endif static const char pci_device_10de_0300[] = "NV30 [GeForce FX]"; @@ -9029,7 +9399,7 @@ static const char pci_device_10de_0316[] = "NV31M"; static const char pci_device_10de_0317[] = "NV31M Pro"; static const char pci_device_10de_031a[] = "NV31M [GeForce FX Go5600]"; static const char pci_device_10de_031b[] = "NV31M [GeForce FX Go5650]"; -static const char pci_device_10de_031c[] = "NVIDIA Quadro FX Go700"; +static const char pci_device_10de_031c[] = "Quadro FX Go700"; static const char pci_device_10de_031d[] = "NV31GLM"; static const char pci_device_10de_031e[] = "NV31GLM Pro"; static const char pci_device_10de_031f[] = "NV31GLM Pro"; @@ -9037,13 +9407,16 @@ static const char pci_device_10de_0320[] = "NV34 [GeForce FX 5200]"; static const char pci_device_10de_0321[] = "NV34 [GeForce FX 5200 Ultra]"; static const char pci_device_10de_0322[] = "NV34 [GeForce FX 5200]"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0322_1043_02fb[] = "V9250 Magic"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0322_1462_9171[] = "MS-8917 (FX5200-T128)"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0322_1462_9360[] = "MS-8936 (FX5200-T128)"; #endif static const char pci_device_10de_0323[] = "NV34 [GeForce FX 5200LE]"; -static const char pci_device_10de_0324[] = "NV34M [GeForce FX Go5200]"; +static const char pci_device_10de_0324[] = "NV34M [GeForce FX Go5200 64M]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0324_1028_0196[] = "Inspiron 5160"; #endif @@ -9071,6 +9444,9 @@ static const char pci_device_10de_0334[] = "NV35 [GeForce FX 5900ZT]"; static const char pci_device_10de_0338[] = "NV35GL [Quadro FX 3000]"; static const char pci_device_10de_033f[] = "NV35GL [Quadro FX 700]"; static const char pci_device_10de_0341[] = "NV36.1 [GeForce FX 5700 Ultra]"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0341_1462_9380[] = "MS-8938 (FX5700U-TD128)"; +#endif static const char pci_device_10de_0342[] = "NV36.2 [GeForce FX 5700]"; static const char pci_device_10de_0343[] = "NV36 [GeForce FX 5700LE]"; static const char pci_device_10de_0344[] = "NV36.4 [GeForce FX 5700VE]"; @@ -9110,16 +9486,31 @@ static const char pci_device_10de_0376[] = "MCP55 PCI Express bridge"; static const char pci_device_10de_0377[] = "MCP55 PCI Express bridge"; static const char pci_device_10de_0378[] = "MCP55 PCI Express bridge"; static const char pci_device_10de_037a[] = "MCP55 Memory Controller"; +static const char pci_device_10de_037c[] = "G70 [GeForce 7800 GS] (rev a2)"; static const char pci_device_10de_037e[] = "MCP55 SATA Controller"; static const char pci_device_10de_037f[] = "MCP55 SATA Controller"; +static const char pci_device_10de_0390[] = "GeForce 7650 GS"; static const char pci_device_10de_0391[] = "G70 [GeForce 7600 GT]"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0391_1458_3427[] = "GV-NX76T128D-RH"; +#endif static const char pci_device_10de_0392[] = "G70 [GeForce 7600 GS]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10de_0392_1462_0622[] = "NX7600GS-T2D256EH"; #endif static const char pci_device_10de_0393[] = "G70 [GeForce 7300 GT]"; +static const char pci_device_10de_0394[] = "G70 [GeForce 7600 LE]"; +static const char pci_device_10de_0395[] = "G70 [GeForce 7300 GT]"; +static const char pci_device_10de_0397[] = "GeForce Go 7700"; static const char pci_device_10de_0398[] = "G70 [GeForce Go 7600]"; -static const char pci_device_10de_039e[] = "Quadro FX 560"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10de_0398_1025_006c[] = "Acer 9814 WKMI"; +#endif +static const char pci_device_10de_0399[] = "GeForce Go 7600 GT"; +static const char pci_device_10de_039a[] = "Quadro NVS 300M"; +static const char pci_device_10de_039b[] = "GeForce Go 7900 SE"; +static const char pci_device_10de_039c[] = "Quadro FX 550M"; +static const char pci_device_10de_039e[] = "G73GL [Quadro FX 560]"; static const char pci_device_10de_03a0[] = "C55 Host Bridge"; static const char pci_device_10de_03a1[] = "C55 Host Bridge"; static const char pci_device_10de_03a2[] = "C55 Host Bridge"; @@ -9175,6 +9566,20 @@ static const char pci_device_10de_03f4[] = "MCP61 SMU"; static const char pci_device_10de_03f5[] = "MCP61 Memory Controller"; static const char pci_device_10de_03f6[] = "MCP61 SATA Controller"; static const char pci_device_10de_03f7[] = "MCP61 SATA Controller"; +static const char pci_device_10de_0400[] = "GeForce 8600 GTS"; +static const char pci_device_10de_0402[] = "GeForce 8600 GT"; +static const char pci_device_10de_0407[] = "GeForce 8600M GT"; +static const char pci_device_10de_040b[] = "Quadro NVS 320M"; +static const char pci_device_10de_0421[] = "GeForce 8500 GT"; +static const char pci_device_10de_0422[] = "GeForce 8400 GS"; +static const char pci_device_10de_0423[] = "GeForce 8300 GS"; +static const char pci_device_10de_0425[] = "GeForce 8600M GS"; +static const char pci_device_10de_0426[] = "GeForce 8400M GT"; +static const char pci_device_10de_0427[] = "GeForce 8400M GS"; +static const char pci_device_10de_0428[] = "GeForce 8400M G"; +static const char pci_device_10de_0429[] = "Quadro NVS 140M"; +static const char pci_device_10de_042a[] = "Quadro NVS 130M"; +static const char pci_device_10de_042b[] = "Quadro NVS 135M"; static const char pci_device_10de_0440[] = "MCP65 LPC Bridge"; static const char pci_device_10de_0441[] = "MCP65 LPC Bridge"; static const char pci_device_10de_0442[] = "MCP65 LPC Bridge"; @@ -9206,9 +9611,14 @@ static const char pci_device_10de_045c[] = "MCP65 SATA Controller"; static const char pci_device_10de_045d[] = "MCP65 SATA Controller"; static const char pci_device_10de_045e[] = "MCP65 SATA Controller"; static const char pci_device_10de_045f[] = "MCP65 SATA Controller"; +static const char pci_device_10de_055c[] = "MCP67 High Definition Audio"; +static const char pci_device_10de_055d[] = "MCP67 High Definition Audio"; +static const char pci_device_10de_c615[] = "G70 [GeForce 7600 GT]"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_10df[] = "Emulex Corporation"; static const char pci_device_10df_1ae5[] = "LP6000 Fibre Channel Host Adapter"; +static const char pci_device_10df_f011[] = "Saturn: LightPulse Fibre Channel Host Adapter"; +static const char pci_device_10df_f015[] = "Saturn: LightPulse Fibre Channel Host Adapter"; static const char pci_device_10df_f085[] = "LP850 Fibre Channel Host Adapter"; static const char pci_device_10df_f095[] = "LP952 Fibre Channel Host Adapter"; static const char pci_device_10df_f098[] = "LP982 Fibre Channel Host Adapter"; @@ -9220,6 +9630,7 @@ static const char pci_device_10df_f0d5[] = "Helios LightPulse Fibre Channel Host static const char pci_device_10df_f0e1[] = "Zephyr LightPulse Fibre Channel Host Adapter"; static const char pci_device_10df_f0e5[] = "Zephyr LightPulse Fibre Channel Host Adapter"; static const char pci_device_10df_f0f5[] = "Neptune LightPulse Fibre Channel Host Adapter"; +static const char pci_device_10df_f100[] = "Saturn-X: LightPulse Fibre Channel Host Adapter"; static const char pci_device_10df_f700[] = "LP7000 Fibre Channel Host Adapter"; static const char pci_device_10df_f701[] = "LP7000 Fibre Channel Host Adapter Alternate ID (JX1:2-3, JX2:1-2)"; static const char pci_device_10df_f800[] = "LP8000 Fibre Channel Host Adapter"; @@ -9234,6 +9645,7 @@ static const char pci_device_10df_fb00[] = "Viper LightPulse Fibre Channel Host static const char pci_device_10df_fc00[] = "Thor-X LightPulse Fibre Channel Host Adapter"; static const char pci_device_10df_fc10[] = "Helios-X LightPulse Fibre Channel Host Adapter"; static const char pci_device_10df_fc20[] = "Zephyr-X LightPulse Fibre Channel Host Adapter"; +static const char pci_device_10df_fc40[] = "Saturn-X: LightPulse Fibre Channel Host Adapter"; static const char pci_device_10df_fd00[] = "Helios-X LightPulse Fibre Channel Host Adapter"; static const char pci_device_10df_fe00[] = "Zephyr-X LightPulse Fibre Channel Host Adapter"; static const char pci_device_10df_ff00[] = "Neptune LightPulse Fibre Channel Host Adapter"; @@ -9262,6 +9674,9 @@ static const char pci_vendor_10e3[] = "Tundra Semiconductor Corp."; static const char pci_device_10e3_0000[] = "CA91C042 [Universe]"; static const char pci_device_10e3_0108[] = "Tsi108 Host Bridge for Single PowerPC"; static const char pci_device_10e3_0148[] = "Tsi148 [Tempe]"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10e3_0148_1775_1100[] = "VR11 Single Board Computer"; +#endif static const char pci_device_10e3_0860[] = "CA91C860 [QSpan]"; static const char pci_device_10e3_0862[] = "CA91C862A [QSpan-II]"; static const char pci_device_10e3_8260[] = "CA91L8200B [Dual PCI PowerSpan II]"; @@ -9296,10 +9711,12 @@ static const char pci_device_10e8_809c[] = "S5933_HEPC3"; static const char pci_device_10e8_80d7[] = "PCI-9112"; static const char pci_device_10e8_80d9[] = "PCI-9118"; static const char pci_device_10e8_80da[] = "PCI-9812"; +static const char pci_device_10e8_80fc[] = "APCI1500 Signal processing controller (16 dig. inputs + 16 dig. outputs)"; static const char pci_device_10e8_811a[] = "PCI-IEEE1355-DS-DE Interface"; static const char pci_device_10e8_814c[] = "Fastcom ESCC-PCI (Commtech, Inc.)"; static const char pci_device_10e8_8170[] = "S5933 [Matchmaker] (Chipset Development Tool)"; static const char pci_device_10e8_81e6[] = "Multimedia video controller"; +static const char pci_device_10e8_828d[] = "APCI3001 Signal processing controller (up to 16 analog inputs)"; static const char pci_device_10e8_8291[] = "Fastcom 232/8-PCI (Commtech, Inc.)"; static const char pci_device_10e8_82c4[] = "Fastcom 422/4-PCI (Commtech, Inc.)"; static const char pci_device_10e8_82c5[] = "Fastcom 422/2-PCI (Commtech, Inc.)"; @@ -9308,6 +9725,8 @@ static const char pci_device_10e8_82c7[] = "Fastcom IG232/2-PCI (Commtech, Inc.) static const char pci_device_10e8_82ca[] = "Fastcom 232/4-PCI (Commtech, Inc.)"; static const char pci_device_10e8_82db[] = "AJA HDNTV HD SDI Framestore"; static const char pci_device_10e8_82e2[] = "Fastcom DIO24H-PCI (Commtech, Inc.)"; +static const char pci_device_10e8_8406[] = "PCIcanx/PCIcan CAN interface [Kvaser AB]"; +static const char pci_device_10e8_8407[] = "PCIcan II CAN interface (A1021, PCB-07, PCB-08) [Kvaser AB]"; static const char pci_device_10e8_8851[] = "S5933 on Innes Corp FM Radio Capture card"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -9331,12 +9750,19 @@ static const char pci_device_10eb_8111[] = "Twist3 Frame Grabber"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_10ec[] = "Realtek Semiconductor Co., Ltd."; static const char pci_device_10ec_0139[] = "Zonet Zen3200"; -static const char pci_device_10ec_0883[] = "High Definition Audio"; +static const char pci_device_10ec_0260[] = "Realtek 260 High Definition Audio"; +static const char pci_device_10ec_0261[] = "Realtek 261 High Definition Audio"; +static const char pci_device_10ec_0280[] = "Realtek 280 High Definition Audio"; +static const char pci_device_10ec_0861[] = "Realtek 861 High Definition Audio"; +static const char pci_device_10ec_0862[] = "Realtek 862 High Definition Audio"; +static const char pci_device_10ec_0880[] = "Realtek 880 High Definition Audio"; +static const char pci_device_10ec_0883[] = "Realtek 883 High Definition Audio"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10ec_0883_1025_1605[] = "TravelMate 5600 series"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_device_10ec_0888[] = "Realtek 888 High Definition Audio"; static const char pci_device_10ec_8029[] = "RTL-8029(AS)"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10ec_8029_10b8_2011[] = "EZ-Card (SMC1208)"; @@ -9387,6 +9813,9 @@ static const char pci_subsys_10ec_8139_103c_006a[] = "NX9500"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10ec_8139_1043_1045[] = "L8400B or L3C/S notebook"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10ec_8139_1043_8109[] = "P5P800-MX Mainboard"; #endif #ifdef INIT_SUBSYS_INFO @@ -9399,6 +9828,9 @@ static const char pci_subsys_10ec_8139_10bd_0320[] = "EP-320X-R"; static const char pci_subsys_10ec_8139_10ec_8139[] = "RT8139"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10ec_8139_10f7_8338[] = "Panasonic CF-Y5 laptop"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10ec_8139_1113_ec01[] = "FNC-0107TX"; #endif #ifdef INIT_SUBSYS_INFO @@ -9429,6 +9861,9 @@ static const char pci_subsys_10ec_8139_1432_9130[] = "EN-9130TX"; static const char pci_subsys_10ec_8139_1436_8139[] = "RT8139"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10ec_8139_144d_c00c[] = "P30/P35 notebook"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10ec_8139_1458_e000[] = "GA-7VM400M/7VT600 Motherboard"; #endif #ifdef INIT_SUBSYS_INFO @@ -9453,6 +9888,9 @@ static const char pci_subsys_10ec_8139_149c_8139[] = "LFE-8139TX"; static const char pci_subsys_10ec_8139_14cb_0200[] = "LNR-100 Family 10/100 Base-TX Ethernet"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10ec_8139_1565_2300[] = "P4TSV Onboard LAN (RTL8100B)"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10ec_8139_1695_9001[] = "Onboard RTL8101L 10/100 MBit"; #endif #ifdef INIT_SUBSYS_INFO @@ -9473,7 +9911,10 @@ static const char pci_subsys_10ec_8139_8e2e_7100[] = "KF-230TX/2"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_10ec_8139_a0a0_0007[] = "ALN-325C"; #endif -static const char pci_device_10ec_8167[] = "RTL-8169SC Gigabit Ethernet"; +static const char pci_device_10ec_8167[] = "RTL-8110SC/8169SC Gigabit Ethernet"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10ec_8167_1462_235c[] = "P965 Neo MS-7235 mainboard"; +#endif static const char pci_device_10ec_8168[] = "RTL8111/8168B PCI Express Gigabit Ethernet controller"; static const char pci_device_10ec_8169[] = "RTL-8169 Gigabit Ethernet"; #endif @@ -9491,8 +9932,20 @@ static const char pci_subsys_10ec_8169_1371_434e[] = "ProG-2000L"; static const char pci_subsys_10ec_8169_1458_e000[] = "GA-8I915ME-G Mainboard"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10ec_8169_1462_030c[] = "K8N Neo-FSR v2.0 mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_10ec_8169_1462_702c[] = "K8T NEO 2 motherboard"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10ec_8169_1462_7094[] = "K8T Neo2-F V2.0"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10ec_8169_1734_1091[] = "D2030-A1"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_10ec_8169_a0a0_0449[] = "AK86-L motherboard"; +#endif static const char pci_device_10ec_8180[] = "RTL8180L 802.11b MAC"; static const char pci_device_10ec_8185[] = "RTL-8185 IEEE 802.11a/b/g Wireless LAN Controller"; static const char pci_device_10ec_8197[] = "SmartLAN56 56K Modem"; @@ -9515,6 +9968,7 @@ static const char pci_device_10ee_3fc3[] = "RME Digi96/8 Pad"; static const char pci_device_10ee_3fc4[] = "RME Digi9652 (Hammerfall)"; static const char pci_device_10ee_3fc5[] = "RME Hammerfall DSP"; static const char pci_device_10ee_3fc6[] = "RME Hammerfall DSP MADI"; +static const char pci_device_10ee_8380[] = "Ellips ProfiXpress Profibus Master"; static const char pci_device_10ee_8381[] = "Ellips Santos Frame Grabber"; static const char pci_device_10ee_d154[] = "Copley Controls CAN card (PCI-CAN-02)"; #endif @@ -9660,11 +10114,17 @@ static const char pci_subsys_1102_0004_1102_0053[] = "SB0090 Audigy Player/OEM"; static const char pci_subsys_1102_0004_1102_0058[] = "SB0090 Audigy Player/OEM"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1102_0004_1102_1002[] = "SB Audigy2 ZS"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1102_0004_1102_1007[] = "SB0240 Audigy 2 Platinum 6.1"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1102_0004_1102_2002[] = "SB Audigy 2 ZS (SB0350)"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1102_0004_1102_4001[] = "E-MU 1010"; +#endif static const char pci_device_1102_0005[] = "SB X-Fi"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1102_0005_1102_0021[] = "X-Fi Platinum"; @@ -9771,16 +10231,23 @@ static const char pci_device_1103_0004[] = "HPT366/368/370/370A/372/372N"; static const char pci_subsys_1103_0004_1103_0001[] = "HPT370A"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1103_0004_1103_0003[] = "HPT343 / HPT345 / HPT363 UDMA33"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1103_0004_1103_0004[] = "HPT366 UDMA66 (r1) / HPT368 UDMA66 (r2) / HPT370 UDMA100 (r3) / HPT370 UDMA100 RAID (r4)"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1103_0004_1103_0005[] = "HPT370 UDMA100"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1103_0004_1103_0006[] = "HPT302/302N"; +#endif static const char pci_device_1103_0005[] = "HPT372A/372N"; static const char pci_device_1103_0006[] = "HPT302/302N"; static const char pci_device_1103_0007[] = "HPT371/371N"; static const char pci_device_1103_0008[] = "HPT374"; static const char pci_device_1103_0009[] = "HPT372N"; +static const char pci_device_1103_2340[] = "RocketRAID 2340 16 Port SATA-II Controller"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1104[] = "RasterOps Corp."; @@ -9808,6 +10275,7 @@ static const char pci_device_1105_8486[] = "EM8486 REALmagic DVD/MPEG-4 A/V Deco static const char pci_vendor_1106[] = "VIA Technologies, Inc."; static const char pci_device_1106_0102[] = "Embedded VIA Ethernet Controller"; static const char pci_device_1106_0130[] = "VT6305 1394.A Controller"; +static const char pci_device_1106_0198[] = "P4X600 Host Bridge"; static const char pci_device_1106_0204[] = "K8M800 Host Bridge"; static const char pci_device_1106_0208[] = "PT890 Host Bridge"; static const char pci_device_1106_0238[] = "K8T890 Host Bridge"; @@ -9845,6 +10313,9 @@ static const char pci_device_1106_0336[] = "K8M890CE Host Bridge"; static const char pci_device_1106_0340[] = "PT900 Host Bridge"; static const char pci_device_1106_0351[] = "VT3351 Host Bridge"; static const char pci_device_1106_0364[] = "P4M900 Host Bridge"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_0364_1043_81ce[] = "P5VD2-VM mothervoard"; +#endif static const char pci_device_1106_0391[] = "VT8371 [KX133]"; static const char pci_device_1106_0501[] = "VT8501 [Apollo MVP4]"; static const char pci_device_1106_0505[] = "VT82C505"; @@ -9884,6 +10355,12 @@ static const char pci_subsys_1106_0571_1458_5002[] = "GA-7VAX Mainboard"; static const char pci_subsys_1106_0571_1462_7020[] = "K8T NEO 2 motherboard"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_0571_1462_7094[] = "K8T Neo2-F V2.0"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_0571_1462_7181[] = "K8MM3-V mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_0571_147b_1407[] = "KV8-MAX3 motherboard"; #endif #ifdef INIT_SUBSYS_INFO @@ -9978,6 +10455,7 @@ static const char pci_device_1106_1351[] = "VT3351 Host Bridge"; static const char pci_device_1106_1364[] = "P4M900 Host Bridge"; static const char pci_device_1106_1571[] = "VT82C576M/VT82C586"; static const char pci_device_1106_1595[] = "VT82C595/97 [Apollo VP2/97]"; +static const char pci_device_1106_2106[] = "VIA Rhine Family Fast Ethernet Adapter (VT6105)"; static const char pci_device_1106_2204[] = "K8M800 Host Bridge"; static const char pci_device_1106_2208[] = "PT890 Host Bridge"; static const char pci_device_1106_2238[] = "K8T890 Host Bridge"; @@ -10034,6 +10512,12 @@ static const char pci_subsys_1106_3038_1458_5004[] = "GA-7VAX Mainboard"; static const char pci_subsys_1106_3038_1462_7020[] = "K8T NEO 2 motherboard"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3038_1462_7094[] = "K8T Neo2-F V2.0"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3038_1462_7181[] = "K8MM3-V mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3038_147b_1407[] = "KV8-MAX3 motherboard"; #endif #ifdef INIT_SUBSYS_INFO @@ -10054,13 +10538,16 @@ static const char pci_subsys_1106_3043_1106_0100[] = "VT86C100A Fast Ethernet Ad static const char pci_subsys_1106_3043_1186_1400[] = "DFE-530TX rev A"; #endif static const char pci_device_1106_3044[] = "IEEE 1394 Host Controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3044_0010_0001[] = "IEEE 1394 4port DCST 1394-3+1B"; +#endif #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3044_1025_005a[] = "TravelMate 290"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1106_3044_1043_808a[] = "A8V Deluxe"; +static const char pci_subsys_1106_3044_1043_808a[] = "A8V Deluxe or A8N-VM CSM Mainboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3044_1458_1000[] = "GA-7VT600-1394 Motherboard"; @@ -10151,6 +10638,9 @@ static const char pci_subsys_1106_3059_1043_80b0[] = "A7V600/K8V-X/K8V Deluxe mo static const char pci_subsys_1106_3059_1043_812a[] = "A8V Deluxe motherboard (Realtek ALC850 codec)"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3059_10ec_8168[] = "High Definition Audio"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3059_1106_3059[] = "L7VMM2 Motherboard"; #endif #ifdef INIT_SUBSYS_INFO @@ -10166,6 +10656,9 @@ static const char pci_subsys_1106_3059_1106_4552[] = "Soyo KT-600 Dragon Plus (R static const char pci_subsys_1106_3059_1297_c160[] = "FX41 motherboard (Realtek ALC650 codec)"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3059_1413_147b[] = "KV8 Pro motherboard onboard audio"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3059_1458_a002[] = "GA-7VAX Onboard Audio (Realtek ALC650)"; #endif #ifdef INIT_SUBSYS_INFO @@ -10175,9 +10668,15 @@ static const char pci_subsys_1106_3059_1462_0080[] = "K8T NEO 2 motherboard"; static const char pci_subsys_1106_3059_1462_3800[] = "KT266 onboard audio"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3059_1462_7181[] = "K8MM3-V mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3059_147b_1407[] = "KV8-MAX3 motherboard"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3059_1849_0850[] = "ASRock 775Dual-880 Pro onboard audio (Realtek ALC850)"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3059_1849_9761[] = "K7VT6 motherboard"; #endif #endif @@ -10188,6 +10687,9 @@ static const char pci_subsys_1106_3059_4005_4710[] = "MSI K7T266 Pro2-RU (MSI-63 #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3059_a0a0_01b6[] = "AK77-8XN onboard audio"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3059_a0a0_0342[] = "AK86-L motherboard"; +#endif static const char pci_device_1106_3065[] = "VT6102 [Rhine-II]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3065_1043_80a1[] = "A7V8X-X Motherboard"; @@ -10205,6 +10707,9 @@ static const char pci_subsys_1106_3065_1186_1401[] = "DFE-530TX rev B"; static const char pci_subsys_1106_3065_13b9_1421[] = "LD-10/100AL PCI Fast Ethernet Adapter (rev.B)"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3065_1462_7181[] = "K8MM3-V mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3065_147b_1c09[] = "NV7 Motherboard"; #endif #ifdef INIT_SUBSYS_INFO @@ -10261,6 +10766,12 @@ static const char pci_subsys_1106_3104_1458_5004[] = "GA-7VAX Mainboard"; static const char pci_subsys_1106_3104_1462_7020[] = "K8T NEO 2 motherboard"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3104_1462_7094[] = "K8T Neo2-F V2.0"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3104_1462_7181[] = "K8MM3-V mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3104_147b_1407[] = "KV8-MAX3 motherboard"; #endif #ifdef INIT_SUBSYS_INFO @@ -10303,6 +10814,9 @@ static const char pci_subsys_1106_3149_1458_b003[] = "GA-7VM400AM(F) Motherboard static const char pci_subsys_1106_3149_1462_7020[] = "K8T Neo 2 Motherboard"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3149_1462_7094[] = "K8T Neo2-F V2.0"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3149_147b_1407[] = "KV8-MAX3 motherboard"; #endif #ifdef INIT_SUBSYS_INFO @@ -10311,7 +10825,11 @@ static const char pci_subsys_1106_3149_147b_1408[] = "KV7"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3149_1849_3149[] = "K7VT6 motherboard"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1106_3149_a0a0_04ad[] = "AK86-L motherboard"; +#endif static const char pci_device_1106_3156[] = "P/KN266 Host Bridge"; +static const char pci_device_1106_3157[] = "CX700M2 UniChrome PRO II Graphics"; static const char pci_device_1106_3164[] = "VT6410 ATA133 RAID controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3164_1043_80f4[] = "P4P800 Mainboard Deluxe ATX"; @@ -10370,7 +10888,7 @@ static const char pci_device_1106_3227[] = "VT8237 ISA bridge [KT600/K8T800/K8T8 static const char pci_subsys_1106_3227_1043_80ed[] = "A7V600/K8V-X/A8V Deluxe motherboard"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1106_3227_1106_3227[] = "DFI KT600-AL Motherboard"; +static const char pci_subsys_1106_3227_1106_3227[] = "DFI KT600-AL / Soltek SL-B9D-FGR Motherboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3227_1458_5001[] = "GA-7VT600 Motherboard"; @@ -10381,6 +10899,7 @@ static const char pci_subsys_1106_3227_147b_1407[] = "KV8-MAX3 motherboard"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1106_3227_1849_3227[] = "K7VT4 motherboard"; #endif +static const char pci_device_1106_3230[] = "K8M890 [Chrome9] Integrated Video"; static const char pci_device_1106_3238[] = "K8T890 Host Bridge"; static const char pci_device_1106_3249[] = "VT6421 IDE RAID Controller"; static const char pci_device_1106_324a[] = "CX700 PCI to PCI Bridge"; @@ -10388,6 +10907,7 @@ static const char pci_device_1106_324b[] = "CX700 Host Bridge"; static const char pci_device_1106_324e[] = "CX700 Internal Module Bus"; static const char pci_device_1106_3258[] = "PT880 Host Bridge"; static const char pci_device_1106_3259[] = "CN400/PM880 Host Bridge"; +static const char pci_device_1106_3260[] = "VIA Chrome9 HC IGP"; static const char pci_device_1106_3269[] = "KT880 Host Bridge"; static const char pci_device_1106_3282[] = "K8T800Pro Host Bridge"; static const char pci_device_1106_3287[] = "VT8251 PCI to ISA Bridge"; @@ -10399,10 +10919,13 @@ static const char pci_device_1106_3327[] = "P4M890 Host Bridge"; static const char pci_device_1106_3336[] = "K8M890CE Host Bridge"; static const char pci_device_1106_3337[] = "VT8237A PCI to ISA Bridge"; static const char pci_device_1106_3340[] = "PT900 Host Bridge"; +static const char pci_device_1106_3343[] = "UniChrome Pro IGP [VIA P4M890 Chipset]"; static const char pci_device_1106_3344[] = "UniChrome Pro IGP"; static const char pci_device_1106_3349[] = "VT8251 AHCI/SATA 4-Port Controller"; static const char pci_device_1106_3351[] = "VT3351 Host Bridge"; static const char pci_device_1106_3364[] = "P4M900 Host Bridge"; +static const char pci_device_1106_3371[] = "Chrome9 HC IGP"; +static const char pci_device_1106_3372[] = "VT8237S PCI to ISA Bridge"; static const char pci_device_1106_337a[] = "VT8237A PCI to PCI Bridge"; static const char pci_device_1106_337b[] = "VT8237A Host Bridge"; static const char pci_device_1106_4149[] = "VIA VT6420 (ATA133) Controller"; @@ -10429,13 +10952,16 @@ static const char pci_device_1106_5208[] = "PT890 I/O APIC Interrupt Controller" static const char pci_device_1106_5238[] = "K8T890 I/O APIC Interrupt Controller"; static const char pci_device_1106_5290[] = "K8M890 I/O APIC Interrupt Controller"; static const char pci_device_1106_5308[] = "PT894 I/O APIC Interrupt Controller"; +static const char pci_device_1106_5324[] = "CX700M2 IDE"; static const char pci_device_1106_5327[] = "P4M890 I/O APIC Interrupt Controller"; static const char pci_device_1106_5336[] = "K8M890CE I/O APIC Interrupt Controller"; static const char pci_device_1106_5340[] = "PT900 I/O APIC Interrupt Controller"; static const char pci_device_1106_5351[] = "VT3351 I/O APIC Interrupt Controller"; static const char pci_device_1106_5364[] = "P4M900 I/O APIC Interrupt Controller"; static const char pci_device_1106_6100[] = "VT85C100A [Rhine II]"; +static const char pci_device_1106_6287[] = "SATA RAID Controller"; static const char pci_device_1106_6327[] = "P4M890 Security Device"; +static const char pci_device_1106_6364[] = "P4M900 Security Device"; static const char pci_device_1106_7204[] = "K8M800 Host Bridge"; static const char pci_device_1106_7205[] = "VT8378 [S3 UniChrome] Integrated Video"; #ifdef INIT_SUBSYS_INFO @@ -10649,11 +11175,7 @@ static const char pci_device_1119_0009[] = "GDT 6557/6557-ECC"; static const char pci_device_1119_000a[] = "GDT 6115/6515"; static const char pci_device_1119_000b[] = "GDT 6125/6525"; static const char pci_device_1119_000c[] = "GDT 6535"; -static const char pci_device_1119_000d[] = "GDT 6555"; -static const char pci_device_1119_0010[] = "GDT 6115/6515"; -static const char pci_device_1119_0011[] = "GDT 6125/6525"; -static const char pci_device_1119_0012[] = "GDT 6535"; -static const char pci_device_1119_0013[] = "GDT 6555/6555-ECC"; +static const char pci_device_1119_000d[] = "GDT 6555/6555-ECC"; static const char pci_device_1119_0100[] = "GDT 6117RP/6517RP"; static const char pci_device_1119_0101[] = "GDT 6127RP/6527RP"; static const char pci_device_1119_0102[] = "GDT 6537RP"; @@ -10710,6 +11232,7 @@ static const char pci_device_1119_0260[] = "GDT 7519RN/7619RN"; static const char pci_device_1119_0261[] = "GDT 7529RN/7629RN"; static const char pci_device_1119_02ff[] = "GDT MAXRP"; static const char pci_device_1119_0300[] = "GDT NEWRX"; +static const char pci_device_1119_0301[] = "GDT NEWRX2"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_111a[] = "Efficient Networks, Inc"; @@ -10833,7 +11356,13 @@ static const char pci_vendor_1130[] = "Computervision"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1131[] = "Philips Semiconductors"; static const char pci_device_1131_1561[] = "USB 1.1 Host Controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1131_1561_1775_c200[] = "C2K onboard USB 1.1 host controller"; +#endif static const char pci_device_1131_1562[] = "USB 2.0 Host Controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1131_1562_1775_c200[] = "C2K onboard USB 2.0 host controller"; +#endif static const char pci_device_1131_3400[] = "SmartPCI56(UCB1500) 56K Modem"; static const char pci_device_1131_5400[] = "TriMedia TM1000/1100"; static const char pci_device_1131_5402[] = "TriMedia TM-1300"; @@ -10901,6 +11430,9 @@ static const char pci_subsys_1131_7133_1043_4845[] = "TV-FM 7135"; static const char pci_subsys_1131_7133_1043_4862[] = "P7131 Dual"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1131_7133_1131_0000[] = "KWorld V-Stream Studio TV Terminator"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1131_7133_1131_2001[] = "Proteus Pro [philips reference design]"; #endif #ifdef INIT_SUBSYS_INFO @@ -10934,6 +11466,9 @@ static const char pci_subsys_1131_7133_1435_7350[] = "VFG7350"; static const char pci_subsys_1131_7133_1461_1044[] = "AVerTVHD MCE A180"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1131_7133_1461_a14b[] = "AVerTV Studio 509"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1131_7133_1461_f31f[] = "Avermedia AVerTV GO 007 FM"; #endif #ifdef INIT_SUBSYS_INFO @@ -10952,9 +11487,15 @@ static const char pci_subsys_1131_7133_153b_1160[] = "Cinergy 250 PCI TV"; static const char pci_subsys_1131_7133_153b_1162[] = "Terratec Cinergy 400 mobile"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1131_7133_17de_7350[] = "ATSC 110 Digital / Analog HDTV Tuner"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1131_7133_185b_c100[] = "VideoMate TV"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1131_7133_185b_c900[] = "VideoMate T750"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1131_7133_5168_0306[] = "LifeView FlyDVB-T DUO"; #endif #ifdef INIT_SUBSYS_INFO @@ -11129,17 +11670,29 @@ static const char pci_subsys_1131_7146_13c2_100f[] = "Technotrend-Budget/Hauppau static const char pci_subsys_1131_7146_13c2_1011[] = "Technotrend-Budget/Hauppauge WinTV-NOVA-T DVB card"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1131_7146_13c2_1012[] = "DVB T-1500"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1131_7146_13c2_1013[] = "SATELCO Multimedia DVB"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1131_7146_13c2_1016[] = "WinTV-NOVA-SE DVB card"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1131_7146_13c2_1018[] = "DVB S-1401"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1131_7146_13c2_1019[] = "S2-3200"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1131_7146_13c2_1102[] = "Technotrend/Hauppauge DVB card rev2.1"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1131_7146_153b_1156[] = "Terratec Cynergy 1200C"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1131_7146_1894_0020[] = "KNC One DVB-C V1.0"; +#endif static const char pci_device_1131_9730[] = "SAA9730 Integrated Multimedia and Peripheral Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1131_9730_1131_0000[] = "Integrated Multimedia and Peripheral Controller"; @@ -11270,6 +11823,7 @@ static const char pci_subsys_1133_e028_1133_e028[] = "Diva Server Analog-8P"; #endif static const char pci_device_1133_e02a[] = "Diva Server IPM-300"; static const char pci_device_1133_e02c[] = "Diva Server IPM-600"; +static const char pci_device_1133_e032[] = "Diva BRI-2 PCIe r1"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1134[] = "Mercury Computer Systems"; @@ -11591,6 +12145,7 @@ static const char pci_device_114f_000c[] = "DataFirePRIme T1 (1-port)"; static const char pci_device_114f_000d[] = "SyncPort 2-Port (x.25/FR)"; static const char pci_device_114f_0011[] = "AccelePort 8r EIA-232 (IBM)"; static const char pci_device_114f_0012[] = "AccelePort 8r EIA-422"; +static const char pci_device_114f_0013[] = "AccelePort Xr"; static const char pci_device_114f_0014[] = "AccelePort 8r EIA-422"; static const char pci_device_114f_0015[] = "AccelePort Xem"; static const char pci_device_114f_0016[] = "AccelePort EPC/X"; @@ -11830,13 +12385,13 @@ static const char pci_device_1166_0014[] = "CMIC-LE Host Bridge (GC-LE chipset)" static const char pci_device_1166_0015[] = "CMIC-GC Host Bridge"; static const char pci_device_1166_0016[] = "CMIC-GC Host Bridge"; static const char pci_device_1166_0017[] = "GCNB-LE Host Bridge"; -static const char pci_device_1166_0036[] = "HT1000 PCI/PCI-X bridge"; +static const char pci_device_1166_0036[] = "BCM5785 [HT1000] PCI/PCI-X Bridge"; static const char pci_device_1166_0101[] = "CIOB-X2 PCI-X I/O Bridge"; static const char pci_device_1166_0103[] = "EPB PCI-Express to PCI-X Bridge"; -static const char pci_device_1166_0104[] = "HT1000 PCI/PCI-X bridge"; +static const char pci_device_1166_0104[] = "BCM5785 [HT1000] PCI/PCI-X Bridge"; static const char pci_device_1166_0110[] = "CIOB-E I/O Bridge with Gigabit Ethernet"; -static const char pci_device_1166_0130[] = "HT2000 PCI-X bridge"; -static const char pci_device_1166_0132[] = "HT2000 PCI-Express bridge"; +static const char pci_device_1166_0130[] = "BCM5780 [HT2000] PCI-X bridge"; +static const char pci_device_1166_0132[] = "BCM5780 [HT2000] PCI-Express Bridge"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1166_0132_1166_0132[] = "HT2000 PCI-Express bridge"; #endif @@ -11853,9 +12408,14 @@ static const char pci_device_1166_0203[] = "CSB6 South Bridge"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1166_0203_1734_1012[] = "Primergy RX300"; #endif -static const char pci_device_1166_0205[] = "HT1000 Legacy South Bridge"; +static const char pci_device_1166_0205[] = "BCM5785 [HT1000] Legacy South Bridge"; static const char pci_device_1166_0211[] = "OSB4 IDE Controller"; static const char pci_device_1166_0212[] = "CSB5 IDE Controller"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1166_0212_1028_810b[] = "PowerEdge 2550"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1166_0212_4c53_1080[] = "CT8 mainboard"; #endif @@ -11873,7 +12433,7 @@ static const char pci_subsys_1166_0213_1028_c134[] = "Poweredge SC600"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1166_0213_1734_1012[] = "Primergy RX300"; #endif -static const char pci_device_1166_0214[] = "HT1000 Legacy IDE controller"; +static const char pci_device_1166_0214[] = "BCM5785 [HT1000] IDE"; static const char pci_device_1166_0217[] = "CSB6 IDE Controller"; #endif #ifdef INIT_SUBSYS_INFO @@ -11888,7 +12448,7 @@ static const char pci_device_1166_0221[] = "CSB6 OHCI USB Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1166_0221_1734_1012[] = "Primergy RX300"; #endif -static const char pci_device_1166_0223[] = "HT1000 USB Controller"; +static const char pci_device_1166_0223[] = "BCM5785 [HT1000] USB"; static const char pci_device_1166_0225[] = "CSB5 LPC bridge"; static const char pci_device_1166_0227[] = "GCLE-2 Host Bridge"; #ifdef INIT_SUBSYS_INFO @@ -11898,12 +12458,14 @@ static const char pci_device_1166_0230[] = "CSB5 LPC bridge"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1166_0230_4c53_1080[] = "CT8 mainboard"; #endif -static const char pci_device_1166_0234[] = "HT1000 LPC Bridge"; +static const char pci_device_1166_0234[] = "BCM5785 [HT1000] LPC"; +static const char pci_device_1166_0235[] = "BCM5785 [HT1000] XIOAPIC0-2"; +static const char pci_device_1166_0238[] = "BCM5785 [HT1000] WDTimer"; static const char pci_device_1166_0240[] = "K2 SATA"; static const char pci_device_1166_0241[] = "RAIDCore RC4000"; static const char pci_device_1166_0242[] = "RAIDCore BC4000"; -static const char pci_device_1166_024a[] = "BCM5785 (HT1000) SATA Native SATA Mode"; -static const char pci_device_1166_024b[] = "BCM5785 (HT1000) PATA/IDE Mode"; +static const char pci_device_1166_024a[] = "BCM5785 [HT1000] SATA (Native SATA Mode)"; +static const char pci_device_1166_024b[] = "BCM5785 [HT1000] SATA (PATA/IDE Mode)"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1167[] = "Mutoh Industries Inc"; @@ -12030,6 +12592,11 @@ static const char pci_subsys_1180_0476_1014_0185[] = "ThinkPad A/T/X Series"; #endif #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1180_0476_1028_014f[] = "Latitude X300 laptop"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1180_0476_1028_0188[] = "Inspiron 6000 laptop"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -12049,8 +12616,16 @@ static const char pci_subsys_1180_0476_104d_80df[] = "Vaio PCG-FX403"; static const char pci_subsys_1180_0476_104d_80e7[] = "VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1180_0476_104d_814e[] = "VAIO GRZ390Z"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1180_0476_144d_c00c[] = "P35 notebook"; +static const char pci_subsys_1180_0476_10f7_8338[] = "Panasonic CF-Y5 laptop"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1180_0476_144d_c00c[] = "P30/P35 notebook"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1180_0476_14ef_0220[] = "PCD-RP-220S"; @@ -12081,11 +12656,16 @@ static const char pci_subsys_1180_0552_1014_0511[] = "ThinkPad A/T/X Series"; #endif #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1180_0552_1028_014f[] = "Latitude X300 laptop"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1180_0552_1028_0188[] = "Inspiron 6000 laptop"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1180_0552_144d_c00c[] = "P35 notebook"; +static const char pci_subsys_1180_0552_144d_c00c[] = "P30/P35 notebook"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1180_0552_17aa_201e[] = "Thinkpad X60s"; @@ -12122,11 +12702,15 @@ static const char pci_subsys_1180_0822_1028_01a2[] = "Inspiron 9200"; static const char pci_subsys_1180_0822_1043_1967[] = "ASUS V6800V"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1180_0822_10f7_8338[] = "Panasonic CF-Y5 laptop"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1180_0822_144d_c018[] = "X20 IV"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1180_0822_17aa_201d[] = "Thinkpad X60s"; #endif +static const char pci_device_1180_0832[] = "R5C832 IEEE 1394 Controller"; static const char pci_device_1180_0841[] = "R5C841 CardBus/SD/SDIO/MMC/MS/MSPro/xD/IEEE1394"; static const char pci_device_1180_0852[] = "xD-Picture Card Controller"; #ifdef INIT_SUBSYS_INFO @@ -12150,7 +12734,7 @@ static const char pci_vendor_1186[] = "D-Link System Inc"; static const char pci_device_1186_0100[] = "DC21041"; static const char pci_device_1186_1002[] = "DL10050 Sundance Ethernet"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_1186_1002_1186_1002[] = "DFE-550TX"; +static const char pci_subsys_1186_1002_1186_1002[] = "DFE-550TX/FX"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1186_1002_1186_1012[] = "DFE-580TX"; @@ -12351,6 +12935,8 @@ static const char pci_vendor_11aa[] = "Actel"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_11ab[] = "Marvell Technology Group Ltd."; static const char pci_device_11ab_0146[] = "GT-64010/64010A System Controller"; +static const char pci_device_11ab_0f53[] = "88E6318 Link Street network controller"; +static const char pci_device_11ab_11ab[] = "MV88SE614x SATA II PCI-E controller"; static const char pci_device_11ab_138f[] = "W8300 802.11 Adapter (rev 07)"; static const char pci_device_11ab_1fa6[] = "Marvell W8300 802.11 Adapter"; static const char pci_device_11ab_1fa7[] = "88W8310 and 88W8000G [Libertas] 802.11g client chipset"; @@ -12358,6 +12944,7 @@ static const char pci_device_11ab_1faa[] = "88w8335 [Libertas] 802.11b/g Wireles #ifdef INIT_SUBSYS_INFO static const char pci_subsys_11ab_1faa_1385_4e00[] = "WG511 v2 54MBit/ Wireless PC-Card"; #endif +static const char pci_device_11ab_2a01[] = "88W8335 [Libertas] 802.11b/g Wireless"; static const char pci_device_11ab_4320[] = "88E8001 Gigabit Ethernet Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_11ab_4320_1019_0f38[] = "Marvell 88E8001 Gigabit Ethernet Controller (ECS)"; @@ -12421,6 +13008,9 @@ static const char pci_device_11ab_4344[] = "88E8021 PCI-X IPMI Gigabit Ethernet static const char pci_device_11ab_4345[] = "88E8022 PCI-X IPMI Gigabit Ethernet Controller"; static const char pci_device_11ab_4346[] = "88E8061 PCI-E IPMI Gigabit Ethernet Controller"; static const char pci_device_11ab_4347[] = "88E8062 PCI-E IPMI Gigabit Ethernet Controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_11ab_4347_4c53_10d0[] = "Telum ASLP10 PrAMC Gigabit Ethernet"; +#endif static const char pci_device_11ab_4350[] = "88E8035 PCI-E Fast Ethernet Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_11ab_4350_1179_0001[] = "Marvell 88E8035 Fast Ethernet Controller (Toshiba)"; @@ -12689,6 +13279,7 @@ static const char pci_subsys_11ab_4362_270f_2801[] = "Marvell 88E8053 Gigabit Et static const char pci_subsys_11ab_4362_a0a0_0506[] = "Marvell 88E8053 Gigabit Ethernet Controller (Aopen)"; #endif static const char pci_device_11ab_4363[] = "88E8055 PCI-E Gigabit Ethernet Controller"; +static const char pci_device_11ab_4364[] = "88E8056 PCI-E Gigabit Ethernet Controller"; static const char pci_device_11ab_4611[] = "GT-64115 System Controller"; static const char pci_device_11ab_4620[] = "GT-64120/64120A/64121A System Controller"; static const char pci_device_11ab_4801[] = "GT-48001"; @@ -12699,8 +13290,15 @@ static const char pci_device_11ab_5080[] = "MV88SX5080 8-port SATA I PCI-X Contr static const char pci_device_11ab_5081[] = "MV88SX5081 8-port SATA I PCI-X Controller"; static const char pci_device_11ab_6041[] = "MV88SX6041 4-port SATA II PCI-X Controller"; static const char pci_device_11ab_6081[] = "MV88SX6081 8-port SATA II PCI-X Controller"; +static const char pci_device_11ab_6101[] = "88SE6101 single-port PATA133 interface"; +static const char pci_device_11ab_6141[] = "88SE614x SATA II PCI-E controller"; +static const char pci_device_11ab_6145[] = "88SE6145 SATA II PCI-E controller"; +static const char pci_device_11ab_6450[] = "64560 System Controller"; static const char pci_device_11ab_6460[] = "MV64360/64361/64362 System Controller"; static const char pci_device_11ab_6480[] = "MV64460/64461/64462 System Controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_11ab_6480_1775_c200[] = "C2K CompactPCI single board computer"; +#endif static const char pci_device_11ab_6485[] = "MV64460/64461/64462 System Controller, Revision B"; static const char pci_device_11ab_f003[] = "GT-64010 Primary Image Piranha Image Generator"; #endif @@ -12787,6 +13385,18 @@ static const char pci_device_11bc_0001[] = "NP-PCI"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_11bd[] = "Pinnacle Systems Inc."; static const char pci_device_11bd_002e[] = "PCTV 40i"; +static const char pci_device_11bd_0040[] = "Royal TS Function 1"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_11bd_0040_11bd_0044[] = "PCTV 2000i Dual DVB-T Pro PCI Tuner 1"; +#endif +static const char pci_device_11bd_0041[] = "RoyalTS Function 2"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_11bd_0041_11bd_0044[] = "PCTV 2000i Dual DVB-T Pro PCI Tuner 2"; +#endif +static const char pci_device_11bd_0042[] = "Royal TS Function 3"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_11bd_0042_11bd_0044[] = "PCTV 2000i Dual DVB-T Pro PCI Common"; +#endif static const char pci_device_11bd_bede[] = "AV/DV Studio Capture Card"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -13070,6 +13680,8 @@ static const char pci_device_11c1_0462[] = "V90 WildWire Modem"; static const char pci_device_11c1_0480[] = "Venus Modem (V90, 56KFlex)"; static const char pci_device_11c1_048c[] = "V.92 56K WinModem"; static const char pci_device_11c1_048f[] = "V.92 56k WinModem"; +static const char pci_device_11c1_1040[] = "HDA softmodem"; +static const char pci_device_11c1_2600[] = "StarPro26XX family (SP2601, SP2603, SP2612) DSP"; static const char pci_device_11c1_5801[] = "USB"; static const char pci_device_11c1_5802[] = "USS-312 USB Controller"; static const char pci_device_11c1_5803[] = "USS-344S USB Controller"; @@ -13180,10 +13792,17 @@ static const char pci_vendor_11d3[] = "Trancell Systems Inc"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_11d4[] = "Analog Devices"; +static const char pci_device_11d4_0078[] = "AD1986HD sound chip"; static const char pci_device_11d4_1535[] = "Blackfin BF535 processor"; static const char pci_device_11d4_1805[] = "SM56 PCI modem"; static const char pci_device_11d4_1889[] = "AD1889 sound chip"; +static const char pci_device_11d4_1981[] = "AD1981HD sound chip"; +static const char pci_device_11d4_1983[] = "AD1983HD sound chip"; static const char pci_device_11d4_1986[] = "AD1986A sound chip"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_11d4_1986_11d4_1986[] = "Lenovo N100 B9G"; +#endif +static const char pci_device_11d4_198b[] = "AD1988B Sound Chip"; static const char pci_device_11d4_5340[] = "AD1881 sound chip"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -13545,6 +14164,9 @@ static const char pci_subsys_1217_7223_103c_088c[] = "NC8000 laptop"; static const char pci_subsys_1217_7223_103c_0890[] = "NC6000 laptop"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1217_7223_10cf_11c4[] = "Lifebook P5020D Laptop"; +#endif static const char pci_device_1217_7233[] = "OZ711MP3/MS3 4-in-1 MemoryCardBus Controller"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -14072,6 +14694,9 @@ static const char pci_subsys_125d_2898_125d_0429[] = "ES56SV-PI Data Fax Modem"; static const char pci_subsys_125d_2898_147a_c001[] = "ES56-PI Data Fax Modem"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_125d_2898_148d_1030[] = "HCF WV-PI56 [ESS ES56-PI Data Fax Modem]"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_125d_2898_14fe_0428[] = "ES56-PI Data Fax Modem"; #endif #ifdef INIT_SUBSYS_INFO @@ -14111,6 +14736,11 @@ static const char pci_subsys_1260_3873_1737_3874[] = "WMP11 Wireless 802.11b PCI #endif #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1260_3873_8086_2510[] = "M3AWEB Wireless 802.11b MiniPCI Adapter"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1260_3873_8086_2513[] = "Wireless 802.11b MiniPCI Adapter"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -14132,6 +14762,9 @@ static const char pci_subsys_1260_3890_10b8_a835[] = "SMC2835W V2 Wireless Cardb static const char pci_subsys_1260_3890_1113_4203[] = "WN4201B"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1260_3890_1113_8201[] = "T-Com T-Sinus 154pcicard Wireless PCI Adapter"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1260_3890_1113_ee03[] = "SMC2802W V2 Wireless PCI Adapter [ISL3886]"; #endif #ifdef INIT_SUBSYS_INFO @@ -14850,11 +15483,12 @@ static const char pci_device_1282_9132[] = "Ethernet 100/10 MBit"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1283[] = "Integrated Technology Express, Inc."; static const char pci_device_1283_673a[] = "IT8330G"; -static const char pci_device_1283_8211[] = "ITE 8211F Single Channel UDMA 133 (ASUS 8211 (ITE IT8212 ATA RAID Controller))"; +static const char pci_device_1283_8152[] = "IT8152F/G Advanced RISC-to-PCI Companion Chip"; +static const char pci_device_1283_8211[] = "ITE 8211F Single Channel UDMA 133"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1283_8211_1043_8138[] = "P5GD1-VW Mainboard"; #endif -static const char pci_device_1283_8212[] = "IT/ITE8212 Dual channel ATA RAID controller (PCI version seems to be IT8212, embedded seems to be ITE8212)"; +static const char pci_device_1283_8212[] = "IT/ITE8212 Dual channel ATA RAID controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1283_8212_1283_0001[] = "IT/ITE8212 Dual channel ATA RAID controller"; #endif @@ -14916,6 +15550,7 @@ static const char pci_vendor_1290[] = "Sord Computer Corporation"; static const char pci_vendor_1291[] = "NCS Computer Italia"; #endif static const char pci_vendor_1292[] = "Tritech Microelectronics Inc"; +static const char pci_device_1292_fc02[] = "Pyramid3D TR25202"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1293[] = "Media Reality Technology"; #endif @@ -14992,8 +15627,12 @@ static const char pci_vendor_12aa[] = "SDL Communications, Inc."; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_12ab[] = "Yuan Yuan Enterprise Co., Ltd."; +static const char pci_device_12ab_0000[] = "MPG160/Kuroutoshikou ITVC15-STVLP"; static const char pci_device_12ab_0002[] = "AU8830 [Vortex2] Based Sound Card With A3D Support"; +static const char pci_device_12ab_2300[] = "Club-3D Zap TV2100"; static const char pci_device_12ab_3000[] = "MPG-200C PCI DVD Decoder Card"; +static const char pci_device_12ab_fff3[] = "MPG600/Kuroutoshikou ITVC16-STVLP"; +static const char pci_device_12ab_ffff[] = "MPG600/Kuroutoshikou ITVC16-STVLP"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_12ac[] = "Measurex Corporation"; @@ -15302,6 +15941,7 @@ static const char pci_vendor_12d7[] = "Biotronic SRL"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_12d8[] = "Pericom Semiconductor"; +static const char pci_device_12d8_01a7[] = "PI7C21P100 PCI to PCI Bridge"; static const char pci_device_12d8_8150[] = "PCI to PCI Bridge"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -15805,7 +16445,7 @@ static const char pci_vendor_132d[] = "Integrated Silicon Solution, Inc."; static const char pci_vendor_1330[] = "MMC Networks"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO -static const char pci_vendor_1331[] = "Radisys Corp."; +static const char pci_vendor_1331[] = "RadiSys Corporation"; static const char pci_device_1331_0030[] = "ENP-2611"; static const char pci_device_1331_8200[] = "82600 Host Bridge"; static const char pci_device_1331_8201[] = "82600 IDE"; @@ -16070,6 +16710,8 @@ static const char pci_device_1374_0037[] = "Silicom Quad port Copper Ethernet PC static const char pci_device_1374_0038[] = "Silicom Quad port Copper Ethernet PCI-E Intel based Bypass Server Adapter"; static const char pci_device_1374_0039[] = "Silicom Dual port Fiber-SX Ethernet PCI-E Intel based Bypass Server Adapter"; static const char pci_device_1374_003a[] = "Silicom Dual port Fiber-LX Ethernet PCI-E Intel based Bypass Server Adapter"; +static const char pci_device_1374_003b[] = "Silicom Dual port Fiber Ethernet PMC Intel based Bypass Server Adapter (PMCX2BPFI)"; +static const char pci_device_1374_003c[] = "Silicom Dual port Copper Ethernet PCI-X BGE based Bypass Server Adapter (PXG2BPRB)"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1375[] = "Argosystems Inc"; @@ -16134,9 +16776,10 @@ static const char pci_vendor_1384[] = "Reality Simulation Systems Inc"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1385[] = "Netgear"; static const char pci_device_1385_0013[] = "WG311T 108 Mbps Wireless PCI Adapter"; -static const char pci_device_1385_311a[] = "GA511 Gigabit Ethernet"; -static const char pci_device_1385_4100[] = "802.11b Wireless Adapter (MA301)"; -static const char pci_device_1385_4105[] = "MA311 802.11b wireless adapter"; +static const char pci_device_1385_006b[] = "WA301 802.11b Wireless PCI Adapter"; +static const char pci_device_1385_311a[] = "GA311 Gigabit Ethernet PCI Adapter"; +static const char pci_device_1385_4100[] = "MA301 802.11b Wireless PCI Adapter"; +static const char pci_device_1385_4105[] = "MA311 802.11b Wireless PCI Adapter"; static const char pci_device_1385_4251[] = "WG111T 108 Mbps Wireless USB 2.0 Adapter"; static const char pci_device_1385_4400[] = "WAG511 802.11a/b/g Dual Band Wireless PC Card"; static const char pci_device_1385_4600[] = "WAG511 802.11a/b/g Dual Band Wireless PC Card"; @@ -16156,7 +16799,7 @@ static const char pci_device_1385_622a[] = "GA622"; static const char pci_device_1385_630a[] = "GA630 Gigabit Ethernet"; static const char pci_device_1385_6b00[] = "WG311v3 54 Mbps Wireless PCI Adapter"; static const char pci_device_1385_6d00[] = "WPNT511 RangeMax 240 Mbps Wireless PC Card"; -static const char pci_device_1385_7b00[] = "WN511B RangeMax Next 280 Mbps Wireless PC Card"; +static const char pci_device_1385_7b00[] = "WN511B RangeMax Next 270 Mbps Wireless PC Card"; static const char pci_device_1385_7c00[] = "WN511T RangeMax Next 300 Mbps Wireless PC Card"; static const char pci_device_1385_7d00[] = "WN311B RangeMax Next 270 Mbps Wireless PCI Adapter"; static const char pci_device_1385_7e00[] = "WN311T RangeMax Next 300 Mbps Wireless PCI Adapter"; @@ -16207,6 +16850,7 @@ static const char pci_vendor_1393[] = "Moxa Technologies Co Ltd"; static const char pci_device_1393_1040[] = "Smartio C104H/PCI"; static const char pci_device_1393_1141[] = "Industrio CP-114"; static const char pci_device_1393_1680[] = "Smartio C168H/PCI"; +static const char pci_device_1393_1681[] = "CP-168U V2 Smart Serial Board (8-port RS-232)"; static const char pci_device_1393_2040[] = "Intellio CP-204J"; static const char pci_device_1393_2180[] = "Intellio C218 Turbo PCI"; static const char pci_device_1393_3200[] = "Intellio C320 Turbo PCI"; @@ -16233,6 +16877,9 @@ static const char pci_subsys_1397_08b4_1397_b520[] = "HFC-4S [IOB4ST]"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1397_08b4_1397_b540[] = "HFC-4S [Swyx 4xS0 SX2 QuadBri]"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1397_08b4_1397_b556[] = "HFC-4S [Junghanns DuoDBRI]"; +#endif static const char pci_device_1397_16b8[] = "ISDN network Controller [HFC-8S]"; static const char pci_device_1397_2bd0[] = "ISDN network controller [HFC-PCI]"; #ifdef INIT_SUBSYS_INFO @@ -16247,6 +16894,9 @@ static const char pci_subsys_1397_2bd0_1397_2bd0[] = "ISDN Board"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1397_2bd0_e4bf_1000[] = "CI1-1-Harp"; #endif +static const char pci_device_1397_30b1[] = "ISDN network Controller [HFC-E1]"; +static const char pci_device_1397_b700[] = "ISDN network controller PrimuX S0 [HFC-PCI]"; +static const char pci_device_1397_f001[] = "GSM Network Controller [HFC-4GSM]"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1398[] = "Clarion co. Ltd"; @@ -16297,6 +16947,7 @@ static const char pci_device_13a3_0018[] = "8154 Security Processor"; static const char pci_device_13a3_001d[] = "7956 Security Processor"; static const char pci_device_13a3_0020[] = "7955 Security Processor"; static const char pci_device_13a3_0026[] = "8155 Security Processor"; +static const char pci_device_13a3_002e[] = "9630 Compression Processor"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_13a4[] = "Rascom Inc"; @@ -16401,6 +17052,7 @@ static const char pci_subsys_13c1_1001_13c1_1001[] = "7xxx/8xxx-series PATA/SATA #endif static const char pci_device_13c1_1002[] = "9xxx-series SATA-RAID"; static const char pci_device_13c1_1003[] = "9550SX SATA-RAID"; +static const char pci_device_13c1_1004[] = "9650SE SATA-II RAID"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_13c2[] = "Technotrend Systemtechnik GmbH"; @@ -16465,6 +17117,7 @@ static const char pci_vendor_13d2[] = "Shark Multimedia Inc"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_13d3[] = "IMC Networks"; +static const char pci_device_13d3_3219[] = "DTV-DVB 7049A DVB-T USB Stick"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_13d4[] = "Graphics Microsystems Inc"; @@ -16559,7 +17212,7 @@ static const char pci_vendor_13ef[] = "Coppercom Inc"; static const char pci_vendor_13f0[] = "Sundance Technology Inc / IC Plus Corp"; static const char pci_device_13f0_0200[] = "IC Plus IP100A Integrated 10/100 Ethernet MAC + PHY"; static const char pci_device_13f0_0201[] = "ST201 Sundance Ethernet"; -static const char pci_device_13f0_1023[] = "IC Plus IP1000 Family Gigabit Ethernet"; +static const char pci_device_13f0_1023[] = "IP1000 Family Gigabit Ethernet"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_13f1[] = "Oce' - Technologies B.V."; @@ -16608,6 +17261,7 @@ static const char pci_subsys_13f6_0111_13f6_0111[] = "CMI8738/C3DX PCI Audio Dev static const char pci_subsys_13f6_0111_1681_a000[] = "Gamesurround MUSE XL"; #endif static const char pci_device_13f6_0211[] = "CM8738"; +static const char pci_device_13f6_9880[] = "CM9880"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_13f7[] = "Wildfire Communications"; @@ -16930,6 +17584,7 @@ static const char pci_vendor_1424[] = "Videoserver Connections"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1425[] = "Chelsio Communications Inc"; static const char pci_device_1425_000b[] = "T210 Protocol Engine"; +static const char pci_device_1425_000c[] = "T204 Protocol Engine"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1426[] = "Storage Technology Corp."; @@ -17100,6 +17755,7 @@ static const char pci_vendor_1457[] = "Nuera Communications Inc"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1458[] = "Giga-byte Technology"; static const char pci_device_1458_0c11[] = "K8NS Pro Mainboard"; +static const char pci_device_1458_9001[] = "GC-PTV-TAF Hybrid TV card"; static const char pci_device_1458_e911[] = "GN-WIAG02"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -17129,6 +17785,9 @@ static const char pci_vendor_1460[] = "DYNARC INC"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1461[] = "Avermedia Technologies Inc"; +static const char pci_device_1461_a3ce[] = "M179"; +static const char pci_device_1461_a3cf[] = "M179"; +static const char pci_device_1461_a836[] = "M115 DVB-T, PAL/SECAM/NTSC Tuner"; static const char pci_device_1461_f436[] = "AVerTV Hybrid+FM"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -17138,6 +17797,8 @@ static const char pci_device_1462_6819[] = "Broadcom Corporation BCM4306 802.11b static const char pci_device_1462_6825[] = "PCI Card wireless 11g [PC54G]"; static const char pci_device_1462_6834[] = "RaLink RT2500 802.11g [PC54G2]"; static const char pci_device_1462_7125[] = "K8N motherboard"; +static const char pci_device_1462_7235[] = "P965 Neo MS-7235 mainboard"; +static const char pci_device_1462_7242[] = "K9AGM RS485 Motherboard"; static const char pci_device_1462_8725[] = "NVIDIA NV25 [GeForce4 Ti 4600] VGA Adapter"; static const char pci_device_1462_9000[] = "NVIDIA NV28 [GeForce4 Ti 4800] VGA Adapter"; static const char pci_device_1462_9110[] = "GeFORCE FX5200"; @@ -17146,6 +17807,7 @@ static const char pci_device_1462_9123[] = "NVIDIA NV31 [GeForce FX 5600] FX5600 static const char pci_device_1462_9510[] = "Radeon 9600XT"; static const char pci_device_1462_9511[] = "Radeon 9600XT"; static const char pci_device_1462_9591[] = "nVidia Corporation NV36 [GeForce FX 5700LE]"; +static const char pci_device_1462_b834[] = "Wireless 11g Turbo G PCI card [MSI PC60G]"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1463[] = "Fast Corporation"; @@ -17611,10 +18273,17 @@ static const char pci_device_14e4_080f[] = "Sentry5 DDR/SDR RAM Controller"; static const char pci_device_14e4_0811[] = "Sentry5 External Interface Core"; static const char pci_device_14e4_0816[] = "BCM3302 Sentry5 MIPS32 CPU"; static const char pci_device_14e4_1600[] = "NetXtreme BCM5752 Gigabit Ethernet PCI Express"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_14e4_1600_103c_3015[] = "PCIe LAN on Motherboard"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO #ifdef INIT_SUBSYS_INFO static const char pci_subsys_14e4_1600_107b_5048[] = "E4500 Onboard"; #endif static const char pci_device_14e4_1601[] = "NetXtreme BCM5752M Gigabit Ethernet PCI Express"; +static const char pci_device_14e4_1639[] = "NetXtreme II BCM5709 Gigabit Ethernet"; +static const char pci_device_14e4_163a[] = "NetXtreme II BCM5709S Gigabit Ethernet"; static const char pci_device_14e4_1644[] = "NetXtreme BCM5700 Gigabit Ethernet"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_14e4_1644_1014_0277[] = "Broadcom Vigil B5700 1000Base-T"; @@ -17920,6 +18589,17 @@ static const char pci_subsys_14e4_1659_103c_7032[] = "NC320i PCIe Gigabit Server #ifdef INIT_SUBSYS_INFO static const char pci_subsys_14e4_1659_1734_1061[] = "Primergy RX300 S2"; #endif +static const char pci_device_14e4_165a[] = "NetXtreme BCM5722 Gigabit Ethernet PCI Express"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_14e4_165a_103c_7051[] = "NC105i PCIe Gigabit Server Adapter"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_14e4_165a_103c_7052[] = "NC105T PCIe Gigabit Server Adapter"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_device_14e4_165d[] = "NetXtreme BCM5705M Gigabit Ethernet"; #endif #ifdef INIT_SUBSYS_INFO @@ -17942,6 +18622,9 @@ static const char pci_subsys_14e4_165e_103c_0890[] = "NC6000 laptop"; static const char pci_subsys_14e4_165e_103c_099c[] = "NX6110/NC6120"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_14e4_165e_10cf_1279[] = "LifeBook E8010D"; +#endif static const char pci_device_14e4_1668[] = "NetXtreme BCM5714 Gigabit Ethernet"; #endif #ifdef INIT_SUBSYS_INFO @@ -17954,6 +18637,7 @@ static const char pci_device_14e4_166b[] = "NetXtreme BCM5780S Gigabit Ethernet" static const char pci_device_14e4_166e[] = "570x 10/100 Integrated Controller"; static const char pci_device_14e4_1672[] = "NetXtreme BCM5754M Gigabit Ethernet PCI Express"; static const char pci_device_14e4_1673[] = "NetXtreme BCM5755M Gigabit Ethernet PCI Express"; +static const char pci_device_14e4_1674[] = "NetXtreme BCM5756ME Gigabit Ethernet PCI Express"; static const char pci_device_14e4_1677[] = "NetXtreme BCM5751 Gigabit Ethernet PCI Express"; #endif #ifdef INIT_SUBSYS_INFO @@ -18007,6 +18691,7 @@ static const char pci_device_14e4_167d[] = "NetXtreme BCM5751M Gigabit Ethernet static const char pci_subsys_14e4_167d_17aa_2081[] = "Thinkpad R60e model 0657"; #endif static const char pci_device_14e4_167e[] = "NetXtreme BCM5751F Fast Ethernet PCI Express"; +static const char pci_device_14e4_167f[] = "NetLink BCM5787F Fast Ethernet PCI Express"; static const char pci_device_14e4_1693[] = "NetLink BCM5787M Gigabit Ethernet PCI Express"; static const char pci_device_14e4_1696[] = "NetXtreme BCM5782 Gigabit Ethernet"; #endif @@ -18025,6 +18710,11 @@ static const char pci_device_14e4_169c[] = "NetXtreme BCM5788 Gigabit Ethernet"; static const char pci_subsys_14e4_169c_103c_308b[] = "MX6125"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_14e4_169c_103c_30a1[] = "NC2400"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_device_14e4_169d[] = "NetLink BCM5789 Gigabit Ethernet PCI Express"; static const char pci_device_14e4_16a6[] = "NetXtreme BCM5702X Gigabit Ethernet"; #endif @@ -18090,6 +18780,11 @@ static const char pci_subsys_14e4_16ac_103c_1706[] = "NC373m Multifunction Gigab #ifdef VENDOR_INCLUDE_NONVIDEO #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_14e4_16ac_103c_7038[] = "NC373i PCI Express Multifunction Gigabit Server Adapter"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_14e4_16ac_103c_703b[] = "NC373i Integrated Multifunction Gigabit Server Adapter"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -18152,6 +18847,11 @@ static const char pci_subsys_14e4_170c_1028_0196[] = "Inspiron 5160"; #ifdef VENDOR_INCLUDE_NONVIDEO #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_14e4_170c_1028_01af[] = "Inspiron 6400"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_14e4_170c_103c_099c[] = "NX6110/NC6120"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -18160,11 +18860,14 @@ static const char pci_device_14e4_170d[] = "NetXtreme BCM5901 100Base-TX"; static const char pci_subsys_14e4_170d_1014_0545[] = "ThinkPad R40e (2684-HVG) builtin ethernet controller"; #endif static const char pci_device_14e4_170e[] = "NetXtreme BCM5901 100Base-TX"; +static const char pci_device_14e4_1712[] = "NetLink BCM5906 Fast Ethernet PCI Express"; +static const char pci_device_14e4_1713[] = "NetLink BCM5906M Fast Ethernet PCI Express"; static const char pci_device_14e4_3352[] = "BCM3352"; static const char pci_device_14e4_3360[] = "BCM3360"; static const char pci_device_14e4_4210[] = "BCM4210 iLine10 HomePNA 2.0"; static const char pci_device_14e4_4211[] = "BCM4211 iLine10 HomePNA 2.0 + V.90 56k modem"; static const char pci_device_14e4_4212[] = "BCM4212 v.90 56k modem"; +static const char pci_device_14e4_4220[] = "802-11b/g Wireless PCI controller, packaged as a Linksys WPC54G ver 1.2 PCMCIA card"; static const char pci_device_14e4_4301[] = "BCM4303 802.11b Wireless LAN Controller"; #endif #ifdef INIT_SUBSYS_INFO @@ -18178,8 +18881,8 @@ static const char pci_device_14e4_4305[] = "BCM4307 V.90 56k Modem"; static const char pci_device_14e4_4306[] = "BCM4307 Ethernet Controller"; static const char pci_device_14e4_4307[] = "BCM4307 802.11b Wireless LAN Controller"; static const char pci_device_14e4_4310[] = "BCM4310 Chipcommon I/OController"; -static const char pci_device_14e4_4311[] = "Dell Wireless 1390 WLAN Mini-PCI Card"; -static const char pci_device_14e4_4312[] = "BCM4310 UART"; +static const char pci_device_14e4_4311[] = "BCM94311MCG wlan mini-PCI"; +static const char pci_device_14e4_4312[] = "BCM4312 802.11a/b/g"; static const char pci_device_14e4_4313[] = "BCM4310 Ethernet Controller"; static const char pci_device_14e4_4315[] = "BCM4310 USB Controller"; static const char pci_device_14e4_4318[] = "BCM4318 [AirForce One 54g] 802.11g Wireless LAN Controller"; @@ -18192,7 +18895,7 @@ static const char pci_subsys_14e4_4318_103c_1356[] = "MX6125"; static const char pci_subsys_14e4_4318_1043_120f[] = "A6U notebook embedded card"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_14e4_4318_1468_0311[] = "Aspire 3022WLMi, 5024WLMi"; +static const char pci_subsys_14e4_4318_1468_0311[] = "Aspire 3022WLMi, 5024WLMi, 5020"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_14e4_4318_1468_0312[] = "TravelMate 2410"; @@ -18207,6 +18910,9 @@ static const char pci_subsys_14e4_4318_14e4_4318[] = "WPC54G version 3 [Wireless static const char pci_subsys_14e4_4318_16ec_0119[] = "U.S.Robotics Wireless MAXg PC Card"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_14e4_4318_1737_0042[] = "WMP54GS version 1.1 [Wireless-G PCI Adapter] 802.11g w/SpeedBooster"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_14e4_4318_1737_0048[] = "WPC54G-EU version 3 [Wireless-G Notebook Adapter]"; #endif static const char pci_device_14e4_4319[] = "BCM4311 [AirForce 54g] 802.11a/b/g PCI Express Transceiver"; @@ -18249,6 +18955,9 @@ static const char pci_subsys_14e4_4320_1154_0330[] = "Buffalo WLI2-PCI-G54S High static const char pci_subsys_14e4_4320_144f_7050[] = "eMachines M6805 802.11g Built-in Wireless"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_14e4_4320_144f_7051[] = "Sonnet Aria Extreme PCI"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_14e4_4320_14e4_4320[] = "Linksys WMP54G PCI"; #endif #ifdef INIT_SUBSYS_INFO @@ -18288,6 +18997,7 @@ static const char pci_subsys_14e4_4325_1414_0004[] = "Wireless PCI Adapter MN-73 #endif static const char pci_device_14e4_4326[] = "BCM4307 Chipcommon I/O Controller?"; static const char pci_device_14e4_4329[] = "BCM43XG"; +static const char pci_device_14e4_4344[] = "EDGE/GPRS data and 802.11b/g combo cardbus [GC89]"; static const char pci_device_14e4_4401[] = "BCM4401 100Base-T"; #endif #ifdef INIT_SUBSYS_INFO @@ -18337,6 +19047,8 @@ static const char pci_device_14e4_5680[] = "BCM5680 G-Switch 8 Port Gigabit Ethe static const char pci_device_14e4_5690[] = "BCM5690 12-port Multi-Layer Gigabit Ethernet Switch"; static const char pci_device_14e4_5691[] = "BCM5691 GE/10GE 8+2 Gigabit Ethernet Switch Controller"; static const char pci_device_14e4_5692[] = "BCM5692 12-port Multi-Layer Gigabit Ethernet Switch"; +static const char pci_device_14e4_5695[] = "BCM5695 12-port + HiGig Multi-Layer Gigabit Ethernet Switch"; +static const char pci_device_14e4_5698[] = "BCM5698 12-port Multi-Layer Gigabit Ethernet Switch"; static const char pci_device_14e4_5820[] = "BCM5820 Crypto Accelerator"; static const char pci_device_14e4_5821[] = "BCM5821 Crypto Accelerator"; static const char pci_device_14e4_5822[] = "BCM5822 Crypto Accelerator"; @@ -18496,6 +19208,7 @@ static const char pci_device_14f1_1066[] = "HCF 56k Data/Fax/Voice/Spkp Modem"; static const char pci_subsys_14f1_1066_122d_4033[] = "Dell Athena - MDP3900V-U"; #endif static const char pci_device_14f1_1085[] = "HCF V90 56k Data/Fax/Voice/Spkp PCI Modem"; +static const char pci_device_14f1_10b6[] = "CX06834-11 HCF V.92 56k Data/Fax/Voice/Spkp Modem"; static const char pci_device_14f1_1433[] = "HCF 56k Data/Fax Modem"; static const char pci_device_14f1_1434[] = "HCF 56k Data/Fax/Voice Modem"; static const char pci_device_14f1_1435[] = "HCF 56k Data/Fax/Voice/Spkp (w/Handset) Modem"; @@ -18649,6 +19362,11 @@ static const char pci_device_14f1_2464[] = "HSF 56k Data/Fax/Voice Modem (Mob Sm static const char pci_device_14f1_2465[] = "HSF 56k Data/Fax/Voice/Spkp (w/HS) Modem (Mob SmartDAA)"; static const char pci_device_14f1_2466[] = "HSF 56k Data/Fax/Voice/Spkp Modem (Mob SmartDAA)"; static const char pci_device_14f1_2bfa[] = "HDAudio Soft Data Fax Modem with SmartCP"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_14f1_2bfa_1025_0009[] = "Aspire 5622WLMi"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_device_14f1_2f00[] = "HSF 56k HSFi Modem"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_14f1_2f00_13e0_8d84[] = "IBM HSFi V.90"; @@ -18662,6 +19380,9 @@ static const char pci_subsys_14f1_2f00_14f1_2004[] = "Dynalink 56PMi"; static const char pci_device_14f1_2f02[] = "HSF 56k HSFi Data/Fax"; static const char pci_device_14f1_2f11[] = "HSF 56k HSFi Modem"; static const char pci_device_14f1_2f20[] = "HSF 56k Data/Fax Modem"; +static const char pci_device_14f1_2f30[] = "HSF 56k Data/Fax Modem"; +static const char pci_device_14f1_5045[] = "HDAUDIO with SmartCP"; +static const char pci_device_14f1_5047[] = "High Definition Audio [Waikiki]"; static const char pci_device_14f1_8234[] = "RS8234 ATM SAR Controller [ServiceSAR Plus]"; static const char pci_device_14f1_8800[] = "CX23880/1/2/3 PCI Video and Audio Decoder"; #ifdef INIT_SUBSYS_INFO @@ -18806,6 +19527,9 @@ static const char pci_subsys_14f1_8802_1043_4823[] = "ASUS PVR-416"; static const char pci_subsys_14f1_8802_107d_663c[] = "Leadtek PVR 2000"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_14f1_8802_107d_665f[] = "WinFast DTV1000-T"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_14f1_8802_14f1_0187[] = "Conexant DVB-T reference design"; #endif #ifdef INIT_SUBSYS_INFO @@ -19091,6 +19815,30 @@ static const char pci_subsys_1522_0100_1522_2600[] = "RockForceD8 8 Port V.90 Da #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1522_0100_1522_2700[] = "RockForceF8 8 Port V.34 Super-G3 Fax Modem"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1522_0100_1522_3000[] = "IQ Express D1 - 1 Port V.92 Data Modem"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1522_0100_1522_3100[] = "IQ Express F1 - 1 Port V.34 Super-G3 Fax Modem"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1522_0100_1522_3200[] = "IQ Express D2 - 2 Port V.92 Data Modem"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1522_0100_1522_3300[] = "IQ Express F2 - 2 Port V.34 Super-G3 Fax Modem"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1522_0100_1522_3400[] = "IQ Express D4 - 4 Port V.92 Data Modem"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1522_0100_1522_3500[] = "IQ Express F4 - 4 Port V.34 Super-G3 Fax Modem"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1522_0100_1522_3c00[] = "IQ Express D8 - 8 Port V.92 Data Modem"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1522_0100_1522_3d00[] = "IQ Express F8 - 8 Port V.34 Super-G3 Fax Modem"; +#endif #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1523[] = "MUSIC Semiconductors"; @@ -19106,6 +19854,7 @@ static const char pci_subsys_1524_0510_103c_006a[] = "NX9500"; static const char pci_device_1524_0520[] = "FLASH memory: ENE Technology Inc:"; static const char pci_device_1524_0530[] = "ENE PCI Memory Stick Card Reader Controller"; static const char pci_device_1524_0550[] = "ENE PCI Secure Digital Card Reader Controller"; +static const char pci_device_1524_0551[] = "SD/MMC Card Reader Controller"; static const char pci_device_1524_0610[] = "PCI Smart Card Reader Controller"; static const char pci_device_1524_1211[] = "CB1211 Cardbus Controller"; static const char pci_device_1524_1225[] = "CB1225 Cardbus Controller"; @@ -19184,6 +19933,9 @@ static const char pci_vendor_1534[] = "ROAD Corp"; static const char pci_vendor_1535[] = "EVERGREEN Technologies Inc"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_1536[] = "ACTIS Computer"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1537[] = "DATALEX COMMUNCATIONS"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -19478,6 +20230,9 @@ static const char pci_vendor_158f[] = "Ditect Coop"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1590[] = "3pardata Inc"; +static const char pci_device_1590_0001[] = "Eagle Cluster Manager"; +static const char pci_device_1590_0002[] = "Osprey Cluster Manager"; +static const char pci_device_1590_a01d[] = "FC044X Fibre Channel HBA"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1591[] = "ARN"; @@ -19587,6 +20342,7 @@ static const char pci_vendor_15b2[] = "Mosaid Technologies Inc"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_15b3[] = "Mellanox Technologies"; +static const char pci_device_15b3_0191[] = "MT25408 [ConnectX IB SDR Flash Recovery]"; static const char pci_device_15b3_5274[] = "MT21108 InfiniBridge"; static const char pci_device_15b3_5a44[] = "MT23108 InfiniHost"; static const char pci_device_15b3_5a45[] = "MT23108 [Infinihost HCA Flash Recovery]"; @@ -19596,6 +20352,10 @@ static const char pci_device_15b3_6274[] = "MT25204 [InfiniHost III Lx HCA]"; static const char pci_device_15b3_6278[] = "MT25208 InfiniHost III Ex (Tavor compatibility mode)"; static const char pci_device_15b3_6279[] = "MT25208 [InfiniHost III Ex HCA Flash Recovery]"; static const char pci_device_15b3_6282[] = "MT25208 InfiniHost III Ex"; +static const char pci_device_15b3_6340[] = "MT25408 [ConnectX IB SDR]"; +static const char pci_device_15b3_634a[] = "MT25418 [ConnectX IB DDR]"; +static const char pci_device_15b3_6354[] = "MT25428 [ConnectX IB QDR]"; +static const char pci_device_15b3_6368[] = "MT25448 [ConnectX EN 10GigE]"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_15b4[] = "CCI/TRIAD"; @@ -19611,6 +20371,10 @@ static const char pci_vendor_15b7[] = "Sandisk Corp"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_15b8[] = "ADDI-DATA GmbH"; +static const char pci_device_15b8_1003[] = "APCI1032 SP controller (32 digi inputs w/ opto coupler)"; +static const char pci_device_15b8_1005[] = "APCI2200 SP controller (8/16 digi outputs (relay))"; +static const char pci_device_15b8_100a[] = "APCI1696 SP controller (96 TTL I/Os)"; +static const char pci_device_15b8_3001[] = "APCI3501 SP controller (analog output board)"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_15b9[] = "Maestro Digital Communications"; @@ -19741,6 +20505,7 @@ static const char pci_vendor_15e1[] = "Voice Technologies Group Inc"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_15e2[] = "Quicknet Technologies Inc"; +static const char pci_device_15e2_0500[] = "PhoneJack-PCI"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_15e3[] = "Networth Technologies Inc"; @@ -19886,6 +20651,8 @@ static const char pci_device_1626_8410[] = "RTL81xx Fast Ethernet"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1629[] = "Kongsberg Spacetec AS"; static const char pci_device_1629_1003[] = "Format synchronizer v3.0"; +static const char pci_device_1629_1006[] = "Format synchronizer, model 10500"; +static const char pci_device_1629_1007[] = "Format synchronizer, model 21000"; static const char pci_device_1629_2002[] = "Fast Universal Data Output"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -20039,10 +20806,19 @@ static const char pci_subsys_168c_0013_168c_2051[] = "TRENDnet TEW-443PI Wireles static const char pci_subsys_168c_0013_16ab_7302[] = "Trust Speedshare Turbo Pro Wireless PCI Adapter"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_168c_0013_17cf_0042[] = "Z-COMAX Highpower XG-622H (400mw) 802.11b/g mini-PCI Adapter"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_168c_0013_185f_1012[] = "CM9 Wireless a/b/g MiniPCI Adapter"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_168c_0013_185f_2012[] = "Wistron NeWeb WLAN a+b+g model CB9"; #endif static const char pci_device_168c_001a[] = "AR5005G 802.11abg NIC"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_168c_001a_1052_168c[] = "Sweex Wireless Lan PC Card 54Mbps"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_168c_001a_1113_ee20[] = "SMC Wireless CardBus Adapter 802.11g (SMCWCB-G EU)"; #endif #ifdef INIT_SUBSYS_INFO @@ -20061,11 +20837,17 @@ static const char pci_subsys_168c_001a_1186_3a23[] = "D-Link AirPlus G DWL-G520+ static const char pci_subsys_168c_001a_1186_3a24[] = "D-Link AirPlus G DWL-G650+A Wireless Cardbus Adapter"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_168c_001a_1186_3b08[] = "AirPlus G DWL-G630"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_168c_001a_168c_001a[] = "Belkin FD7000"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_168c_001a_168c_1052[] = "TP-Link TL-WN510G Wireless CardBus Adapter"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_168c_001a_168c_2052[] = "Compex Wireless 802.11 b/g MiniPCI Adapter, Rev A1 [WLM54G]"; +#endif static const char pci_device_168c_001b[] = "AR5006X 802.11abg NIC"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_168c_001b_1186_3a19[] = "D-Link AirPremier AG DWL-AG660 Wireless Cardbus Adapter"; @@ -20074,16 +20856,32 @@ static const char pci_subsys_168c_001b_1186_3a19[] = "D-Link AirPremier AG DWL-A static const char pci_subsys_168c_001b_1186_3a22[] = "D-Link AirPremier AG DWL-AG530 Wireless PCI Adapter"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_168c_001b_1458_e901[] = "GN-WI01HT Wireless a/b/g MiniPCI Adapter"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_168c_001b_168c_001b[] = "Wireless LAN PCI LiteOn"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_168c_001b_168c_2062[] = "EnGenius EMP-8602 (400mw) or Compex WLM54AG (SuperAG)"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_168c_001b_168c_2063[] = "EnGenius EMP-8602 (400mw) or Compex WLM54AG"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_168c_001b_185f_1600[] = "DCMA-82 High Power WLAN 802.11a/b/g mini-PCI Module (Super A/G, eXtended Range, 400mW)"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_168c_001b_a727_6804[] = "Wireless 11a/b/g PC Card with XJACK(r) Antenna"; +#endif +static const char pci_device_168c_001c[] = "AR5006EG 802.11 b/g Wireless PCI Express Adapter"; static const char pci_device_168c_0020[] = "AR5005VL 802.11bg Wireless NIC"; +static const char pci_device_168c_0023[] = "AR5416 802.11a/b/g/n Wireless PCI Adapter"; +static const char pci_device_168c_0024[] = "AR5418 802.11a/b/g/n Wireless PCI Express Adapter"; static const char pci_device_168c_1014[] = "AR5212 802.11abg NIC"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_168c_1014_1014_058a[] = "ThinkPad 11a/b/g Wireless LAN Mini Express Adapter (AR5BXB6)"; #endif +static const char pci_device_168c_3b08[] = "D-Link AirPlus G DWL-G630"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1695[] = "EPoX Computer Co., Ltd."; @@ -20093,6 +20891,10 @@ static const char pci_vendor_169c[] = "Netcell Corporation"; static const char pci_device_169c_0044[] = "Revolution Storage Processing Card"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_169d[] = "Club-3D VB (Wrong ID)"; +static const char pci_device_169d_3306[] = "ZAP TV 2202"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_16a5[] = "Tekram Technology Co.,Ltd."; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -20103,8 +20905,11 @@ static const char pci_device_16ab_1102[] = "PCMCIA-to-PCI Wireless Network Bridg static const char pci_device_16ab_8501[] = "WL-8305 Wireless LAN PCI Adapter"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO -static const char pci_vendor_16ae[] = "Safenet Inc"; -static const char pci_device_16ae_1141[] = "SafeXcel-1141"; +static const char pci_vendor_16ae[] = "SafeNet Inc"; +static const char pci_device_16ae_0001[] = "SafeXcel 1140"; +static const char pci_device_16ae_000a[] = "SafeXcel 1841"; +static const char pci_device_16ae_1141[] = "SafeXcel 1141"; +static const char pci_device_16ae_1841[] = "SafeXcel 1842"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_16af[] = "SparkLAN Communications, Inc."; @@ -20140,7 +20945,41 @@ static const char pci_vendor_16ce[] = "Roland Corp."; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_16d5[] = "Acromag, Inc."; +static const char pci_device_16d5_0504[] = "PMC-DX504 Reconfigurable FPGA with LVDS I/O"; +static const char pci_device_16d5_0520[] = "PMC520 Serial Communication, 232 Octal"; +static const char pci_device_16d5_0521[] = "PMC521 Serial Communication, 422/485 Octal"; +static const char pci_device_16d5_1020[] = "PMC-AX1020 Reconfigurable FPGA with A/D & D/A"; +static const char pci_device_16d5_1065[] = "PMC-AX1065 Reconfigurable FPGA with A/D & D/A"; +static const char pci_device_16d5_2004[] = "PMC-DX2004 Reconfigurable FPGA with LVDS I/O"; +static const char pci_device_16d5_2020[] = "PMC-AX2020 Reconfigurable FPGA with A/D & D/A"; +static const char pci_device_16d5_2065[] = "PMC-AX2065 Reconfigurable FPGA with A/D & D/A"; +static const char pci_device_16d5_3020[] = "PMC-AX3020 Reconfigurable FPGA with A/D & D/A"; +static const char pci_device_16d5_3065[] = "PMC-AX3065 Reconfigurable FPGA with A/D & D/A"; +static const char pci_device_16d5_4243[] = "PMC424, APC424, AcPC424 Digital I/O and Counter Timer Module"; +static const char pci_device_16d5_4248[] = "PMC464, APC464, AcPC464 Digital I/O and Counter Timer Module"; +static const char pci_device_16d5_424b[] = "PMC-DX2002 Reconfigurable FPGA with Differential I/O"; +static const char pci_device_16d5_4253[] = "PMC-DX503 Reconfigurable FPGA with TTL and Differential I/O"; +static const char pci_device_16d5_4312[] = "PMC-CX1002 Reconfigurable Conduction-Cooled FPGA Virtex-II with Differential I/O"; +static const char pci_device_16d5_4313[] = "PMC-CX1003 Reconfigurable Conduction-Cooled FPGA Virtex-II with CMOS and Differential I/O"; +static const char pci_device_16d5_4322[] = "PMC-CX2002 Reconfigurable Conduction-Cooled FPGA Virtex-II with Differential I/O"; +static const char pci_device_16d5_4323[] = "PMC-CX2003 Reconfigurable Conduction-Cooled FPGA Virtex-II with CMOS and Differential I/O"; +static const char pci_device_16d5_4350[] = "PMC-DX501 Reconfigurable Digital I/O Module"; +static const char pci_device_16d5_4353[] = "PMC-DX2003 Reconfigurable FPGA with TTL and Differential I/O"; +static const char pci_device_16d5_4357[] = "PMC-DX502 Reconfigurable Differential I/O Module"; +static const char pci_device_16d5_4457[] = "PMC730, APC730, AcPC730 Multifunction Module"; +static const char pci_device_16d5_464d[] = "PMC408 32-Channel Digital Input/Output Module"; +static const char pci_device_16d5_4850[] = "PMC220-16 12-Bit Analog Output Module"; +static const char pci_device_16d5_4a42[] = "PMC483, APC483, AcPC483 Counter Timer Module"; +static const char pci_device_16d5_4a50[] = "PMC484, APC484, AcPC484 Counter Timer Module"; +static const char pci_device_16d5_4a56[] = "PMC230 16-Bit Analog Output Module"; +static const char pci_device_16d5_4b47[] = "PMC330, APC330, AcPC330 Analog Input Module, 16-bit A/D"; +static const char pci_device_16d5_4c40[] = "PMC-LX40 Reconfigurable Virtex-4 FPGA with plug-in I/O"; +static const char pci_device_16d5_4c60[] = "PMC-LX60 Reconfigurable Virtex-4 FPGA with plug-in I/O"; +static const char pci_device_16d5_4d4d[] = "PMC341, APC341, AcPC341 Analog Input Module, Simultaneous Sample & Hold"; static const char pci_device_16d5_4d4e[] = "PMC482, APC482, AcPC482 Counter Timer Board"; +static const char pci_device_16d5_524d[] = "PMC-DX2001 Reconfigurable FPGA with TTL I/O"; +static const char pci_device_16d5_5335[] = "PMC-SX35 Reconfigurable Virtex-4 FPGA with plug-in I/O"; +static const char pci_device_16d5_5456[] = "PMC470 48-Channel Digital Input/Output Module"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_16df[] = "PIKA Technologies Inc."; @@ -20152,6 +20991,7 @@ static const char pci_device_16e3_1e0f[] = "LEON2FT Processor"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_16e5[] = "Intellon Corp."; static const char pci_device_16e5_6000[] = "INT6000 Ethernet-to-Powerline Bridge [HomePlug AV]"; +static const char pci_device_16e5_6300[] = "INT6300 Ethernet-to-Powerline Bridge [HomePlug AV]"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_16ec[] = "U.S. Robotics"; @@ -20198,11 +21038,13 @@ static const char pci_device_172a_13c8[] = "AEP SureWare Runner 1000V3"; #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1734[] = "Fujitsu Siemens Computer GmbH"; static const char pci_device_1734_1078[] = "Amilo Pro v2010"; +static const char pci_device_1734_1085[] = "Celsius M450"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1737[] = "Linksys"; static const char pci_device_1737_0013[] = "WMP54G Wireless Pci Card"; static const char pci_device_1737_0015[] = "WMP54GS Wireless Pci Card"; +static const char pci_device_1737_0029[] = "WPG54G ver. 4 PCI Card"; static const char pci_device_1737_1032[] = "Gigabit Network Adapter"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1737_1032_1737_0015[] = "EG1032 v2 Instant Gigabit Network Adapter"; @@ -20250,6 +21092,9 @@ static const char pci_vendor_175e[] = "Sanera Systems, Inc."; static const char pci_vendor_1775[] = "SBS Technologies"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_177d[] = "Cavium Networks"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1787[] = "Hightech Information System Ltd."; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -20351,6 +21196,7 @@ static const char pci_subsys_17d5_5832_10a9_8021[] = "Single Port 10 Gigabit Eth #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_17db[] = "Cray Inc"; +static const char pci_device_17db_0101[] = "XT Series [Seastar] 3D Toroidal Router"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_17de[] = "KWorld Computer Co. Ltd."; @@ -20373,6 +21219,14 @@ static const char pci_vendor_17ee[] = "Connect Components Ltd"; static const char pci_vendor_17f2[] = "Albatron Corp."; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_17f3[] = "RDC Semiconductor, Inc."; +static const char pci_device_17f3_6020[] = "R6020 North Bridge"; +static const char pci_device_17f3_6030[] = "R6030 ISA Bridge"; +static const char pci_device_17f3_6040[] = "R6040 MAC Controller"; +static const char pci_device_17f3_6060[] = "R6060 USB 1.1 Controller"; +static const char pci_device_17f3_6061[] = "R6061 USB 2.0 Controller"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_17fe[] = "Linksys, A Division of Cisco Systems"; static const char pci_device_17fe_2120[] = "WMP11v4 802.11b PCI card"; static const char pci_device_17fe_2220[] = "[AirConn] INPROCOMM IPN 2220 Wireless LAN Adapter (rev 01)"; @@ -20427,6 +21281,9 @@ static const char pci_subsys_1814_0201_1458_e381[] = "GN-WMKG 802.11b/g Wireless static const char pci_subsys_1814_0201_1458_e931[] = "GN-WIKG 802.11b/g mini-PCI Adapter"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1814_0201_1462_6833[] = "Unknown 802.11g mini-PCI Adapter"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1814_0201_1462_6835[] = "Wireless 11G CardBus CB54G2"; #endif #ifdef INIT_SUBSYS_INFO @@ -20449,6 +21306,12 @@ static const char pci_subsys_1814_0301_1186_3c08[] = "DWL-G630 Rev E"; static const char pci_subsys_1814_0301_1186_3c09[] = "DWL-G510 Rev C"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1814_0301_13d1_abe3[] = "miniPCI Pluscom 802.11 a/b/g"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1814_0301_1458_e934[] = "GN-WP01GS"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_1814_0301_1737_0055[] = "WMP54G ver 4.1"; #endif static const char pci_device_1814_0302[] = "RT2561/RT61 rev B 802.11g"; @@ -20458,13 +21321,18 @@ static const char pci_subsys_1814_0302_1186_3c08[] = "DWL-G630 Rev E"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_1814_0302_1186_3c09[] = "DWL-G510 Rev C"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1814_0302_1462_b834[] = "PC54G3 Wireless 11g PCI Card"; +#endif static const char pci_device_1814_0401[] = "Ralink RT2600 802.11 MIMO"; +static const char pci_device_1814_e932[] = "RT2560F 802.11 b/g PCI"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1820[] = "InfiniCon Systems Inc."; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1822[] = "Twinhan Technology Co. Ltd"; +static const char pci_device_1822_0001[] = "Twinhan VisionPlus DVB [card=113]"; static const char pci_device_1822_4e35[] = "Mantis DTV PCI Bridge Controller [Ver 1.0]"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -20523,6 +21391,16 @@ static const char pci_device_1867_6278[] = "MT25208 InfiniHost III Ex (Tavor com static const char pci_device_1867_6282[] = "MT25208 InfiniHost III Ex"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_186c[] = "Humusoft"; +static const char pci_device_186c_0614[] = "MF614 multifunction I/O card"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_1876[] = "L-3 Communications"; +static const char pci_device_1876_a101[] = "VigraWATCH PCI"; +static const char pci_device_1876_a102[] = "VigraWATCH PMC"; +static const char pci_device_1876_a103[] = "Vigra I/O"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_187e[] = "ZyXEL Communication Corporation"; static const char pci_device_187e_3403[] = "ZyAir G-110 802.11g"; static const char pci_device_187e_340e[] = "M-302 802.11g XtremeMIMO"; @@ -20576,9 +21454,10 @@ static const char pci_vendor_18c8[] = "Cray Inc"; static const char pci_vendor_18c9[] = "ARVOO Engineering BV"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO -static const char pci_vendor_18ca[] = "XGI - Xabre Graphics Inc"; +static const char pci_vendor_18ca[] = "XGI Technology Inc. (eXtreme Graphics Innovation)"; static const char pci_device_18ca_0020[] = "Volari Z7"; static const char pci_device_18ca_0040[] = "Volari V3XT/V5/V8"; +static const char pci_device_18ca_0047[] = "Volari 8300 (chip: XP10, codename: XG47)"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_18d2[] = "Sitecom"; @@ -20652,7 +21531,7 @@ static const char pci_device_1923_0300[] = "A101 single-port T1/E1"; static const char pci_device_1923_0400[] = "A104u Quad T1/E1 AFT"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO -static const char pci_vendor_1924[] = "Level 5 Networks Inc."; +static const char pci_vendor_1924[] = "Solarflare Communications"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_192e[] = "TransDimension"; @@ -20689,28 +21568,49 @@ static const char pci_device_1957_0087[] = "MPC8343"; static const char pci_vendor_1958[] = "Faster Technology, LLC."; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_1959[] = "PA Semi, Inc"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1966[] = "Orad Hi-Tec Systems"; static const char pci_device_1966_1975[] = "DVG64 family"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1969[] = "Attansic Technology Corp."; static const char pci_device_1969_1048[] = "L1 Gigabit Ethernet Adapter"; +static const char pci_device_1969_2048[] = "L2 100 Mbit Ethernet Adapter"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_196a[] = "Sensory Networks Inc."; static const char pci_device_196a_0101[] = "NodalCore C-1000 Content Classification Accelerator"; static const char pci_device_196a_0102[] = "NodalCore C-2000 Content Classification Accelerator"; +static const char pci_device_196a_0105[] = "NodalCore C-3000 Content Classification Accelerator"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_196d[] = "Club-3D BV"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_1971[] = "AGEIA Technologies, Inc."; +static const char pci_device_1971_1011[] = "Physics Processing Unit [PhysX]"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_1971_1011_1043_0001[] = "PhysX P1"; +#endif +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_197b[] = "JMicron Technologies, Inc."; static const char pci_device_197b_2360[] = "JMicron 20360/20363 AHCI Controller"; static const char pci_device_197b_2361[] = "JMB361 AHCI/IDE"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_197b_2361_1462_7235[] = "P965 Neo MS-7235 mainboard"; +#endif static const char pci_device_197b_2363[] = "JMicron 20360/20363 AHCI Controller"; static const char pci_device_197b_2365[] = "JMB365 AHCI/IDE"; static const char pci_device_197b_2366[] = "JMB366 AHCI/IDE"; +static const char pci_device_197b_2368[] = "JMB368 IDE controller"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_1982[] = "Distant Early Warning Communications Inc"; +static const char pci_device_1982_1600[] = "OX16C954 HOST-A"; +static const char pci_device_1982_16ff[] = "OX16C954 HOST-B"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1989[] = "Montilio Inc."; @@ -20724,6 +21624,11 @@ static const char pci_vendor_1993[] = "Innominate Security Technologies AG"; static const char pci_vendor_199a[] = "Pulse-LINK, Inc."; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_19a2[] = "ServerEngines LLC"; +static const char pci_device_19a2_0200[] = "BladeEngine 10Gb PCI-E iSCSI adapter"; +static const char pci_device_19a2_0201[] = "BladeEngine 10Gb PCI-E Network Adpater"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_19a8[] = "DAQDATA GmbH"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -20738,6 +21643,9 @@ static const char pci_device_19ae_0520[] = "4135 HFT Interface Controller"; static const char pci_vendor_19d4[] = "Quixant Limited"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_19de[] = "Pico Computing"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_19e2[] = "Vector Informatik GmbH"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -20751,11 +21659,20 @@ static const char pci_device_19e7_1005[] = "STIX - 4 Port FXS Card"; static const char pci_vendor_1a03[] = "ASPEED Technology, Inc."; static const char pci_device_1a03_2000[] = "AST2000"; #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_1a07[] = "Kvaser AB"; +static const char pci_device_1a07_0006[] = "CAN interface PC104+ HS/HS"; +static const char pci_device_1a07_0007[] = "CAN interface PCIcanx II HS or HS/HS"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1a08[] = "Sierra semiconductor"; static const char pci_device_1a08_0000[] = "SC15064"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1a1d[] = "GFaI e.V."; +static const char pci_device_1a1d_1a17[] = "Meta Networks MTP-1G IDPS NIC"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_1a22[] = "Ambric Inc."; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1a29[] = "Fortinet, Inc."; @@ -20764,6 +21681,29 @@ static const char pci_vendor_1a29[] = "Fortinet, Inc."; static const char pci_vendor_1a51[] = "Hectronic AB"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_1a5d[] = "Celoxica"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_1a71[] = "XenSource, Inc."; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_1a73[] = "Violin Memory, Inc"; +static const char pci_device_1a73_0001[] = "Mozart [Memory Appliance 1010]"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_1a77[] = "Lightfleet Corporation"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_1a78[] = "Virident Systems Inc."; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_1a8c[] = "Verigy Pte. Ltd."; +static const char pci_device_1a8c_1100[] = "E8001-66443 PCI Express CIC"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_1ab9[] = "Espia Srl"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_1b13[] = "Jaton Corp"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -20844,6 +21784,9 @@ static const char pci_device_3388_0014[] = "HiNT HC4 PCI to ISDN bridge, Network static const char pci_device_3388_0020[] = "HB6 Universal PCI-PCI bridge (transparent mode)"; static const char pci_device_3388_0021[] = "HB6 Universal PCI-PCI bridge (non-transparent mode)"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_3388_0021_1775_c200[] = "C2K CompactPCI interface bridge"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_3388_0021_1775_ce90[] = "CE9"; #endif #ifdef INIT_SUBSYS_INFO @@ -21000,6 +21943,13 @@ static const char pci_vendor_4033[] = "Addtron Technology Co, Inc."; static const char pci_device_4033_1360[] = "RTL8139 Ethernet"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_4040[] = "NetXen Incorporated"; +static const char pci_device_4040_0001[] = "NXB-10GXSR 10 Gigabit Ethernet PCIe Adapter with SR-XFP optical interface"; +static const char pci_device_4040_0002[] = "NXB-10GCX4 10 Gigabit Ethernet PCIe Adapter with CX4 copper interface"; +static const char pci_device_4040_0003[] = "NXB-4GCU Quad Gigabit Ethernet PCIe Adapter with 1000-BASE-T interface"; +static const char pci_device_4040_0004[] = "BladeCenter-H 10 Gigabit Ethernet High Speed Daughter Card"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_4143[] = "Digital Equipment Corp"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -21015,6 +21965,9 @@ static const char pci_device_416c_0200[] = "CPC"; static const char pci_vendor_4321[] = "Tata Power Strategic Electronics Division"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_434e[] = "CAST Navigation LLC"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_4444[] = "Internext Compression Inc"; static const char pci_device_4444_0016[] = "iTVC16 (CX23416) MPEG-2 Encoder"; #ifdef INIT_SUBSYS_INFO @@ -21168,6 +22121,10 @@ static const char pci_device_4d51_0200[] = "MQ-200"; static const char pci_vendor_4d54[] = "Microtechnica Co Ltd"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_4d56[] = "MATRIX VISION GmbH"; +static const char pci_device_4d56_0000[] = "Altera Cyclone II CameraLink Frame Grabber [mvHYPERION-CLe]"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_4ddc[] = "ILC Data Device Corp"; static const char pci_device_4ddc_0100[] = "DD-42924I5-300 (ARINC 429 Data Bus)"; static const char pci_device_4ddc_0801[] = "BU-65570I1 MIL-STD-1553 Test and Simulation"; @@ -21262,6 +22219,9 @@ static const char pci_device_5333_8904[] = "Trio 64 3D"; static const char pci_subsys_5333_8904_1014_00db[] = "Integrated Trio3D"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_5333_8904_4843_314a[] = "Terminator 128/3D GLH"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_5333_8904_5333_8904[] = "86C365 Trio3D AGP"; #endif static const char pci_device_5333_8905[] = "Trio 64V+ family"; @@ -21431,6 +22391,10 @@ static const char pci_device_5333_8d01[] = "86C380 [ProSavageDDR K4M266]"; static const char pci_device_5333_8d02[] = "VT8636A [ProSavage KN133] AGP4X VGA Controller (TwisterK)"; static const char pci_device_5333_8d03[] = "VT8751 [ProSavageDDR P4M266]"; static const char pci_device_5333_8d04[] = "VT8375 [ProSavage8 KM266/KL266]"; +static const char pci_device_5333_8e48[] = "Chrome S27 PCIE"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_5333_8e48_5333_0130[] = "Chrome S27 256M DDR2"; +#endif static const char pci_device_5333_9102[] = "86C410 Savage 2000"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_5333_9102_1092_5932[] = "Viper II Z200"; @@ -21466,6 +22430,9 @@ static const char pci_vendor_5455[] = "Technische University Berlin"; static const char pci_device_5455_4458[] = "S5933"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_5456[] = "GoTView"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_5519[] = "Cnet Technologies, Inc."; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -21487,6 +22454,10 @@ static const char pci_vendor_5700[] = "Netpower"; static const char pci_vendor_5851[] = "Exacq Technologies"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_5853[] = "XenSource, Inc."; +static const char pci_device_5853_0001[] = "Xen Platform Device"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_6356[] = "UltraStor"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -21579,6 +22550,9 @@ static const char pci_device_8086_0536[] = "E8870SP Interleave registers 0 and 1 static const char pci_device_8086_0537[] = "E8870SP Interleave registers 2 and 3"; static const char pci_device_8086_0600[] = "RAID Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_0600_8086_0136[] = "SRCU31L"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_0600_8086_01af[] = "SRCZCR"; #endif #ifdef INIT_SUBSYS_INFO @@ -21588,9 +22562,9 @@ static const char pci_subsys_8086_0600_8086_01c1[] = "ICP Vortex GDT8546RZ"; static const char pci_subsys_8086_0600_8086_01f7[] = "SCRU32"; #endif static const char pci_device_8086_061f[] = "80303 I/O Processor"; -static const char pci_device_8086_0960[] = "80960RP [i960 RP Microprocessor/Bridge]"; -static const char pci_device_8086_0962[] = "80960RM [i960RM Bridge]"; -static const char pci_device_8086_0964[] = "80960RP [i960 RP Microprocessor/Bridge]"; +static const char pci_device_8086_0960[] = "80960RP (i960RP) Microprocessor/Bridge"; +static const char pci_device_8086_0962[] = "80960RM (i960RM) Bridge"; +static const char pci_device_8086_0964[] = "80960RP (i960RP) Microprocessor/Bridge"; static const char pci_device_8086_1000[] = "82542 Gigabit Ethernet Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_1000_0e11_b0df[] = "NC6132 Gigabit Ethernet Adapter (1000-SX)"; @@ -21651,6 +22625,9 @@ static const char pci_device_8086_1008[] = "82544EI Gigabit Ethernet Controller static const char pci_subsys_8086_1008_1014_0269[] = "iSeries 1000/100/10 Ethernet Adapter"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_1008_1028_011b[] = "PowerEdge 2550"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_1008_1028_011c[] = "PRO/1000 XT Network Connection"; #endif #ifdef INIT_SUBSYS_INFO @@ -21955,7 +22932,10 @@ static const char pci_device_8086_103b[] = "82801DB PRO/100 VM (LOM) Ethernet Co static const char pci_device_8086_103c[] = "82801DB PRO/100 VM (CNR) Ethernet Controller"; static const char pci_device_8086_103d[] = "82801DB PRO/100 VE (MOB) Ethernet Controller"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_103d_1014_0522[] = "Thinkpad R50e model 1634"; +static const char pci_subsys_8086_103d_1014_0522[] = "Thinkpad R40 model 2681"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_103d_8086_103d[] = "82562EZ 10/100 Ethernet Controller"; #endif static const char pci_device_8086_103e[] = "82801DB PRO/100 VM (MOB) Ethernet Controller"; static const char pci_device_8086_1040[] = "536EP Data Fax Modem"; @@ -21973,6 +22953,9 @@ static const char pci_subsys_8086_1043_8086_2522[] = "Samsung P30 integrated WLA static const char pci_subsys_8086_1043_8086_2527[] = "MIM2000/Centrino"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_1043_8086_2561[] = "Dell Latitude D800"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_1043_8086_2581[] = "Toshiba Satellite M10"; #endif static const char pci_device_8086_1048[] = "PRO/10GbE LR Server Adapter"; @@ -21983,6 +22966,9 @@ static const char pci_subsys_8086_1048_8086_a01f[] = "PRO/10GbE LR Server Adapte static const char pci_subsys_8086_1048_8086_a11f[] = "PRO/10GbE LR Server Adapter"; #endif static const char pci_device_8086_1049[] = "82566MM Gigabit Network Connection"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_1049_17aa_20b9[] = "Lenovo Thinkpad T61"; +#endif static const char pci_device_8086_104a[] = "82566DM Gigabit Network Connection"; static const char pci_device_8086_104b[] = "82566DC Gigabit Network Connection"; static const char pci_device_8086_104c[] = "82562V 10/100 Network Connection"; @@ -22017,6 +23003,9 @@ static const char pci_device_8086_105e[] = "82571EB Gigabit Ethernet Controller" static const char pci_subsys_8086_105e_103c_7044[] = "NC360T PCI Express Dual Port Gigabit Server Adapter"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_105e_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_105e_1775_6003[] = "Telum GE-QT"; #endif #ifdef INIT_SUBSYS_INFO @@ -22229,6 +23218,9 @@ static const char pci_subsys_8086_109a_17aa_207e[] = "Thinkpad X60s"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_109a_8086_109a[] = "PRO/1000 PL Network Connection"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_109a_8086_309c[] = "DeskTop Board D945GTP"; +#endif static const char pci_device_8086_109b[] = "82546GB PRO/1000 GF Quad Port Server Adapter"; static const char pci_device_8086_109e[] = "82597EX 10GbE Ethernet Controller"; #ifdef INIT_SUBSYS_INFO @@ -22246,6 +23238,7 @@ static const char pci_subsys_8086_10a4_8086_10a4[] = "PRO/1000 PT Quad Port Serv #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_10a4_8086_11a4[] = "PRO/1000 PT Quad Port Server Adapter"; #endif +static const char pci_device_8086_10a5[] = "82571EB PRO/1000 PF Quad Port Server Adapter"; static const char pci_device_8086_10b0[] = "82573L PRO/1000 PL Network Connection"; static const char pci_device_8086_10b2[] = "82573V PRO/1000 PM Network Connection"; static const char pci_device_8086_10b3[] = "82573E PRO/1000 PM Network Connection"; @@ -22260,6 +23253,7 @@ static const char pci_subsys_8086_10b5_8086_1099[] = "PRO/1000 GT Quad Port Serv #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_10b5_8086_1199[] = "PRO/1000 GT Quad Port Server Adapter"; #endif +static const char pci_device_8086_10b6[] = "82598 10GbE PCI-Express Ethernet Controller"; static const char pci_device_8086_10b9[] = "82572EI Gigabit Ethernet Controller (Copper)"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_10b9_8086_1083[] = "PRO/1000 PT Desktop Adapter"; @@ -22276,8 +23270,16 @@ static const char pci_subsys_8086_10bc_8086_10bc[] = "PRO/1000 PT Quad Port LP S #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_10bc_8086_11bc[] = "PRO/1000 PT Quad Port LP Server Adapter"; #endif +static const char pci_device_8086_10bd[] = "82566DM-2 Gigabit Network Connection"; +static const char pci_device_8086_10c0[] = "82562V-2 10/100 Network Connection"; +static const char pci_device_8086_10c2[] = "82562G-2 10/100 Network Connection"; +static const char pci_device_8086_10c3[] = "82562GT-2 10/100 Network Connection"; static const char pci_device_8086_10c4[] = "82562GT 10/100 Network Connection"; static const char pci_device_8086_10c5[] = "82562G 10/100 Network Connection"; +static const char pci_device_8086_10c6[] = "82598AF DUAL PORT 10GbE PCI-Express Ethernet Controller"; +static const char pci_device_8086_10c7[] = "82598AF SINGLE PORT 10GbE PCI-Express Ethernet Controller"; +static const char pci_device_8086_10d9[] = "82571EB Dual Port Gigabit Mezzanine Adapter"; +static const char pci_device_8086_10da[] = "82571EB Quad Port Gigabit Mezzanine Adapter"; static const char pci_device_8086_1107[] = "PRO/1000 MF Server Adapter (LX)"; static const char pci_device_8086_1130[] = "82815 815 Chipset Host Bridge and Memory Controller Hub"; #ifdef INIT_SUBSYS_INFO @@ -22296,7 +23298,7 @@ static const char pci_subsys_8086_1130_8086_4532[] = "D815EEA2 mainboard"; static const char pci_subsys_8086_1130_8086_4557[] = "D815EGEW Mainboard"; #endif static const char pci_device_8086_1131[] = "82815 815 Chipset AGP Bridge"; -static const char pci_device_8086_1132[] = "82815 CGC [Chipset Graphics Controller]"; +static const char pci_device_8086_1132[] = "82815 Chipset Graphics Controller (CGC)"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_1132_1025_1016[] = "Travelmate 612 TX"; #endif @@ -22338,7 +23340,7 @@ static const char pci_device_8086_1225[] = "82452KX/GX [Orion]"; static const char pci_device_8086_1226[] = "82596 PRO/10 PCI"; static const char pci_device_8086_1227[] = "82865 EtherExpress PRO/100A"; static const char pci_device_8086_1228[] = "82556 EtherExpress PRO/100 Smart"; -static const char pci_device_8086_1229[] = "82557/8/9 [Ethernet Pro 100]"; +static const char pci_device_8086_1229[] = "82557/8/9 Ethernet Pro 100"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_1229_0e11_3001[] = "82559 Fast Ethernet LOM with Alert on LAN*"; #endif @@ -22544,6 +23546,9 @@ static const char pci_subsys_8086_1229_144d_2502[] = "SEM-2100IL MiniPCI LAN Ada static const char pci_subsys_8086_1229_1668_1100[] = "EtherExpress PRO/100B (TX) (MiniPCI Ethernet+Modem)"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_1229_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_1229_1775_ce90[] = "CE9"; #endif #ifdef INIT_SUBSYS_INFO @@ -22577,7 +23582,7 @@ static const char pci_subsys_8086_1229_8086_0007[] = "82558 10/100 Adapter"; static const char pci_subsys_8086_1229_8086_0008[] = "82558 10/100 with Wake on LAN"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_1229_8086_0009[] = "PRO/100+ PCI (TP)"; +static const char pci_subsys_8086_1229_8086_0009[] = "82558B PRO/100+ PCI (TP)"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_1229_8086_000a[] = "EtherExpress PRO/100+ Management Adapter"; @@ -22843,7 +23848,7 @@ static const char pci_subsys_8086_1461_15d9_3480[] = "P4DP6"; static const char pci_subsys_8086_1461_4c53_1090[] = "Cx9/Vx9 mainboard"; #endif static const char pci_device_8086_1462[] = "82870P2 P64H2 Hot Plug Controller"; -static const char pci_device_8086_1960[] = "80960RP [i960RP Microprocessor]"; +static const char pci_device_8086_1960[] = "80960RP (i960RP) Microprocessor"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_1960_101e_0431[] = "MegaRAID 431 RAID Controller"; #endif @@ -22916,18 +23921,18 @@ static const char pci_subsys_8086_1960_e4bf_1040[] = "CU1-CHORUS"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_1960_e4bf_3100[] = "CX1-BAND"; #endif -static const char pci_device_8086_1962[] = "80960RM [i960RM Microprocessor]"; +static const char pci_device_8086_1962[] = "80960RM (i960RM) Microprocessor"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_1962_105a_0000[] = "SuperTrak SX6000 I2O CPU"; #endif -static const char pci_device_8086_1a21[] = "82840 840 (Carmel) Chipset Host Bridge (Hub A)"; -static const char pci_device_8086_1a23[] = "82840 840 (Carmel) Chipset AGP Bridge"; -static const char pci_device_8086_1a24[] = "82840 840 (Carmel) Chipset PCI Bridge (Hub B)"; -static const char pci_device_8086_1a30[] = "82845 845 (Brookdale) Chipset Host Bridge"; +static const char pci_device_8086_1a21[] = "82840 840 [Carmel] Chipset Host Bridge (Hub A)"; +static const char pci_device_8086_1a23[] = "82840 840 [Carmel] Chipset AGP Bridge"; +static const char pci_device_8086_1a24[] = "82840 840 [Carmel] Chipset PCI Bridge (Hub B)"; +static const char pci_device_8086_1a30[] = "82845 845 [Brookdale] Chipset Host Bridge"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_1a30_1028_010e[] = "Optiplex GX240"; #endif -static const char pci_device_8086_1a31[] = "82845 845 (Brookdale) Chipset AGP Bridge"; +static const char pci_device_8086_1a31[] = "82845 845 [Brookdale] Chipset AGP Bridge"; static const char pci_device_8086_1a38[] = "5000 Series Chipset DMA Engine"; static const char pci_device_8086_1a48[] = "PRO/10GbE SR Server Adapter"; static const char pci_device_8086_1b48[] = "82597EX 10GbE Ethernet Controller"; @@ -22938,14 +23943,17 @@ static const char pci_subsys_8086_1b48_8086_a01f[] = "PRO/10GbE LR Server Adapte static const char pci_subsys_8086_1b48_8086_a11f[] = "PRO/10GbE LR Server Adapter"; #endif static const char pci_device_8086_2410[] = "82801AA ISA Bridge (LPC)"; -static const char pci_device_8086_2411[] = "82801AA IDE"; -static const char pci_device_8086_2412[] = "82801AA USB"; -static const char pci_device_8086_2413[] = "82801AA SMBus"; -static const char pci_device_8086_2415[] = "82801AA AC'97 Audio"; +static const char pci_device_8086_2411[] = "82801AA IDE Controller"; +static const char pci_device_8086_2412[] = "82801AA USB Controller"; +static const char pci_device_8086_2413[] = "82801AA SMBus Controller"; +static const char pci_device_8086_2415[] = "82801AA AC'97 Audio Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2415_1028_0095[] = "Precision Workstation 220 Integrated Digital Audio"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2415_1028_00b4[] = "OptiPlex GX110"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2415_110a_0051[] = "Activy 2xx"; #endif #ifdef INIT_SUBSYS_INFO @@ -22960,26 +23968,26 @@ static const char pci_subsys_8086_2415_11d4_5340[] = "SoundMAX Integrated Digita #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2415_1734_1025[] = "Activy 3xx"; #endif -static const char pci_device_8086_2416[] = "82801AA AC'97 Modem"; +static const char pci_device_8086_2416[] = "82801AA AC'97 Modem Controller"; static const char pci_device_8086_2418[] = "82801AA PCI Bridge"; static const char pci_device_8086_2420[] = "82801AB ISA Bridge (LPC)"; -static const char pci_device_8086_2421[] = "82801AB IDE"; -static const char pci_device_8086_2422[] = "82801AB USB"; -static const char pci_device_8086_2423[] = "82801AB SMBus"; -static const char pci_device_8086_2425[] = "82801AB AC'97 Audio"; +static const char pci_device_8086_2421[] = "82801AB IDE Controller"; +static const char pci_device_8086_2422[] = "82801AB USB Controller"; +static const char pci_device_8086_2423[] = "82801AB SMBus Controller"; +static const char pci_device_8086_2425[] = "82801AB AC'97 Audio Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2425_11d4_0040[] = "SoundMAX Integrated Digital Audio"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2425_11d4_0048[] = "SoundMAX Integrated Digital Audio"; #endif -static const char pci_device_8086_2426[] = "82801AB AC'97 Modem"; +static const char pci_device_8086_2426[] = "82801AB AC'97 Modem Controller"; static const char pci_device_8086_2428[] = "82801AB PCI Bridge"; static const char pci_device_8086_2440[] = "82801BA ISA Bridge (LPC)"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2440_8086_5744[] = "S845WD1-E"; #endif -static const char pci_device_8086_2442[] = "82801BA/BAM USB (Hub #1)"; +static const char pci_device_8086_2442[] = "82801BA/BAM USB Controller #1"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2442_1014_01c6[] = "Netvista A40/A40p"; #endif @@ -23010,7 +24018,7 @@ static const char pci_subsys_8086_2442_8086_4557[] = "D815EGEW Mainboard"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2442_8086_5744[] = "S845WD1-E mainboard"; #endif -static const char pci_device_8086_2443[] = "82801BA/BAM SMBus"; +static const char pci_device_8086_2443[] = "82801BA/BAM SMBus Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2443_1014_01c6[] = "Netvista A40/A40p"; #endif @@ -23041,7 +24049,7 @@ static const char pci_subsys_8086_2443_8086_4557[] = "D815EGEW Mainboard"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2443_8086_5744[] = "S845WD1-E mainboard"; #endif -static const char pci_device_8086_2444[] = "82801BA/BAM USB (Hub #2)"; +static const char pci_device_8086_2444[] = "82801BA/BAM USB Controller #1"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2444_1025_1016[] = "Travelmate 612 TX"; #endif @@ -23066,7 +24074,7 @@ static const char pci_subsys_8086_2444_8086_4532[] = "D815EEA2 mainboard"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2444_8086_5744[] = "S845WD1-E mainboard"; #endif -static const char pci_device_8086_2445[] = "82801BA/BAM AC'97 Audio"; +static const char pci_device_8086_2445[] = "82801BA/BAM AC'97 Audio Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2445_0e11_000b[] = "Compaq Deskpro EN Audio"; #endif @@ -23091,7 +24099,7 @@ static const char pci_subsys_8086_2445_147b_0507[] = "TH7II-RAID"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2445_8086_4557[] = "D815EGEW Mainboard"; #endif -static const char pci_device_8086_2446[] = "82801BA/BAM AC'97 Modem"; +static const char pci_device_8086_2446[] = "82801BA/BAM AC'97 Modem Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2446_1025_1016[] = "Travelmate 612 TX"; #endif @@ -23100,6 +24108,9 @@ static const char pci_subsys_8086_2446_104d_80df[] = "Vaio PCG-FX403"; #endif static const char pci_device_8086_2448[] = "82801 Mobile PCI Bridge"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2448_103c_0934[] = "HP Compaq nw8240 Mobile Workstation"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2448_103c_099c[] = "NX6110/NC6120"; #endif #ifdef INIT_SUBSYS_INFO @@ -23199,14 +24210,14 @@ static const char pci_subsys_8086_2449_8086_3017[] = "EtherExpress PRO/100 P Mob #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2449_8086_3018[] = "EtherExpress PRO/100"; #endif -static const char pci_device_8086_244a[] = "82801BAM IDE U100"; +static const char pci_device_8086_244a[] = "82801BAM IDE U100 Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_244a_1025_1016[] = "Travelmate 612TX"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_244a_104d_80df[] = "Vaio PCG-FX403"; #endif -static const char pci_device_8086_244b[] = "82801BA IDE U100"; +static const char pci_device_8086_244b[] = "82801BA IDE U100 Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_244b_1014_01c6[] = "Netvista A40/A40p"; #endif @@ -23237,14 +24248,14 @@ static const char pci_device_8086_244e[] = "82801 PCI Bridge"; static const char pci_subsys_8086_244e_1014_0267[] = "NetVista A30p"; #endif static const char pci_device_8086_2450[] = "82801E ISA Bridge (LPC)"; -static const char pci_device_8086_2452[] = "82801E USB"; -static const char pci_device_8086_2453[] = "82801E SMBus"; +static const char pci_device_8086_2452[] = "82801E USB Controller"; +static const char pci_device_8086_2453[] = "82801E SMBus Controller"; static const char pci_device_8086_2459[] = "82801E Ethernet Controller 0"; -static const char pci_device_8086_245b[] = "82801E IDE U100"; +static const char pci_device_8086_245b[] = "82801E IDE U100 Controller"; static const char pci_device_8086_245d[] = "82801E Ethernet Controller 1"; static const char pci_device_8086_245e[] = "82801E PCI Bridge"; static const char pci_device_8086_2480[] = "82801CA LPC Interface Controller"; -static const char pci_device_8086_2482[] = "82801CA/CAM USB (Hub #1)"; +static const char pci_device_8086_2482[] = "82801CA/CAM USB Controller #1"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2482_0e11_0030[] = "Evo N600c"; #endif @@ -23279,7 +24290,7 @@ static const char pci_subsys_8086_2483_15d9_3480[] = "P4DP6"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2483_8086_1958[] = "vpr Matrix 170B4"; #endif -static const char pci_device_8086_2484[] = "82801CA/CAM USB (Hub #2)"; +static const char pci_device_8086_2484[] = "82801CA/CAM USB Controller #2"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2484_0e11_0030[] = "Evo N600c"; #endif @@ -23309,6 +24320,15 @@ static const char pci_subsys_8086_2485_1014_0508[] = "ThinkPad T30"; static const char pci_subsys_8086_2485_1014_051c[] = "ThinkPad A/T/X Series"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2485_1043_1583[] = "L3C (SPDIF)"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2485_1043_1623[] = "L2B (no SPDIF)"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2485_1043_1643[] = "L3F"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2485_104d_80e7[] = "VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP"; #endif #ifdef INIT_SUBSYS_INFO @@ -23339,7 +24359,7 @@ static const char pci_subsys_8086_2486_144d_2115[] = "vpr Matrix 170B4 internal #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2486_14f1_5421[] = "MD56ORD V.92 MDC Modem"; #endif -static const char pci_device_8086_2487[] = "82801CA/CAM USB (Hub #3)"; +static const char pci_device_8086_2487[] = "82801CA/CAM USB Controller #3"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2487_0e11_0030[] = "Evo N600c"; #endif @@ -23355,7 +24375,7 @@ static const char pci_subsys_8086_2487_15d9_3480[] = "P4DP6"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2487_8086_1958[] = "vpr Matrix 170B4"; #endif -static const char pci_device_8086_248a[] = "82801CAM IDE U100"; +static const char pci_device_8086_248a[] = "82801CAM IDE U100 Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_248a_0e11_0030[] = "Evo N600c"; #endif @@ -23389,7 +24409,7 @@ static const char pci_device_8086_24c2[] = "82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) static const char pci_subsys_8086_24c2_1014_0267[] = "NetVista A30p"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24c2_1014_052d[] = "Thinkpad R50e model 1634"; +static const char pci_subsys_8086_24c2_1014_052d[] = "ThinkPad"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c2_1025_005a[] = "TravelMate 290"; @@ -23416,7 +24436,7 @@ static const char pci_subsys_8086_24c2_103c_08b0[] = "tc1100 tablet"; static const char pci_subsys_8086_24c2_1071_8160[] = "MIM2000"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24c2_144d_c00c[] = "P30 notebook"; +static const char pci_subsys_8086_24c2_144d_c00c[] = "P30/P35 notebook"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c2_1462_5800[] = "845PE Max (MS-6580)"; @@ -23434,14 +24454,23 @@ static const char pci_subsys_8086_24c2_1734_1055[] = "Amilo M1420"; static const char pci_subsys_8086_24c2_4c53_1090[] = "Cx9 / Vx9 mainboard"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c2_8086_24c2[] = "Latitude X300"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c2_8086_4541[] = "Latitude D400"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c2_e4bf_0cc9[] = "CC9-SAMBA"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c2_e4bf_0cd2[] = "CD2-BEBOP"; +#endif static const char pci_device_8086_24c3[] = "82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) SMBus Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c3_1014_0267[] = "NetVista A30p"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24c3_1014_052d[] = "Thinkpad R50e model 1634"; +static const char pci_subsys_8086_24c3_1014_052d[] = "ThinkPad"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c3_1025_005a[] = "TravelMate 290"; @@ -23450,6 +24479,9 @@ static const char pci_subsys_8086_24c3_1025_005a[] = "TravelMate 290"; static const char pci_subsys_8086_24c3_1028_0126[] = "Optiplex GX260"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c3_1028_014f[] = "Latitude X300"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c3_103c_088c[] = "NC8000 laptop"; #endif #ifdef INIT_SUBSYS_INFO @@ -23462,6 +24494,9 @@ static const char pci_subsys_8086_24c3_103c_08b0[] = "tc1100 tablet"; static const char pci_subsys_8086_24c3_1071_8160[] = "MIM2000"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c3_144d_c005[] = "Samsung X10 Laptop"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c3_144d_c00c[] = "P30/P35 notebook"; #endif #ifdef INIT_SUBSYS_INFO @@ -23479,12 +24514,18 @@ static const char pci_subsys_8086_24c3_1734_1055[] = "Amilo M1420"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c3_4c53_1090[] = "Cx9 / Vx9 mainboard"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c3_e4bf_0cc9[] = "CC9-SAMBA"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c3_e4bf_0cd2[] = "CD2-BEBOP"; +#endif static const char pci_device_8086_24c4[] = "82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #2"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c4_1014_0267[] = "NetVista A30p"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24c4_1014_052d[] = "Thinkpad R50e model 1634"; +static const char pci_subsys_8086_24c4_1014_052d[] = "ThinkPad"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c4_1025_005a[] = "TravelMate 290"; @@ -23511,7 +24552,7 @@ static const char pci_subsys_8086_24c4_103c_08b0[] = "tc1100 tablet"; static const char pci_subsys_8086_24c4_1071_8160[] = "MIM2000"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24c4_144d_c00c[] = "P30 notebook"; +static const char pci_subsys_8086_24c4_144d_c00c[] = "P30/P35 notebook"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c4_1462_5800[] = "845PE Max (MS-6580)"; @@ -23526,8 +24567,17 @@ static const char pci_subsys_8086_24c4_1734_1004[] = "D1451 Mainboard (SCENIC N3 static const char pci_subsys_8086_24c4_4c53_1090[] = "Cx9 / Vx9 mainboard"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c4_8086_24c2[] = "Latitude X300"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c4_8086_4541[] = "Latitude D400"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c4_e4bf_0cc9[] = "CC9-SAMBA"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c4_e4bf_0cd2[] = "CD2-BEBOP"; +#endif static const char pci_device_8086_24c5[] = "82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Audio Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c5_0e11_00b8[] = "Analog Devices Inc. codec [SoundMAX]"; @@ -23536,6 +24586,9 @@ static const char pci_subsys_8086_24c5_0e11_00b8[] = "Analog Devices Inc. codec static const char pci_subsys_8086_24c5_1014_0267[] = "NetVista A30p"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c5_1014_0537[] = "ThinkPad T41"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c5_1014_055f[] = "Thinkpad R50e model 1634"; #endif #ifdef INIT_SUBSYS_INFO @@ -23545,6 +24598,9 @@ static const char pci_subsys_8086_24c5_1025_005a[] = "TravelMate 290"; static const char pci_subsys_8086_24c5_1028_0139[] = "Latitude D400"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c5_1028_014f[] = "Latitude X300"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c5_1028_0163[] = "Latitude D505"; #endif #ifdef INIT_SUBSYS_INFO @@ -23563,7 +24619,10 @@ static const char pci_subsys_8086_24c5_103c_08b0[] = "tc1100 tablet"; static const char pci_subsys_8086_24c5_1071_8160[] = "MIM2000"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24c5_144d_c00c[] = "P30 notebook"; +static const char pci_subsys_8086_24c5_144d_c005[] = "Samsung X10 Laptop"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c5_144d_c00c[] = "P30/P35 notebook"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c5_1458_a002[] = "GA-8PE667 Ultra"; @@ -23577,8 +24636,20 @@ static const char pci_subsys_8086_24c5_1734_1005[] = "D1451 (SCENIC N300, i845GV #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c5_1734_1055[] = "Amilo M1420"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c5_8086_24c5[] = "Dell Dimension 2400"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c5_a002_1458[] = "Realtek AC'97 codec [ALC655]"; +#endif static const char pci_device_8086_24c6[] = "82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) AC'97 Modem Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c6_1014_0524[] = "Thinkpad T41"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c6_1014_0525[] = "ThinkPad"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c6_1014_0559[] = "Thinkpad R50e model 1634"; #endif #ifdef INIT_SUBSYS_INFO @@ -23603,14 +24674,17 @@ static const char pci_subsys_8086_24c6_103c_08b0[] = "tc1100 tablet"; static const char pci_subsys_8086_24c6_1071_8160[] = "MIM2000"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24c6_144d_c00c[] = "P30 notebook"; +static const char pci_subsys_8086_24c6_144d_2115[] = "Samsung X10 Laptop"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c6_144d_c00c[] = "P30/P35 notebook"; #endif static const char pci_device_8086_24c7[] = "82801DB/DBL/DBM (ICH4/ICH4-L/ICH4-M) USB UHCI Controller #3"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c7_1014_0267[] = "NetVista A30p"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24c7_1014_052d[] = "Thinkpad R50e model 1634"; +static const char pci_subsys_8086_24c7_1014_052d[] = "ThinkPad"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c7_1025_005a[] = "TravelMate 290"; @@ -23637,7 +24711,7 @@ static const char pci_subsys_8086_24c7_103c_08b0[] = "tc1100 tablet"; static const char pci_subsys_8086_24c7_1071_8160[] = "MIM2000"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24c7_144d_c00c[] = "P30 notebook"; +static const char pci_subsys_8086_24c7_144d_c00c[] = "P30/P35 notebook"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c7_1462_5800[] = "845PE Max (MS-6580)"; @@ -23652,16 +24726,28 @@ static const char pci_subsys_8086_24c7_1734_1004[] = "D1451 Mainboard (SCENIC N3 static const char pci_subsys_8086_24c7_4c53_1090[] = "Cx9 / Vx9 mainboard"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c7_8086_24c2[] = "Latitude X300"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24c7_8086_4541[] = "Latitude D400"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c7_e4bf_0cc9[] = "CC9-SAMBA"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24c7_e4bf_0cd2[] = "CD2-BEBOP"; +#endif static const char pci_device_8086_24ca[] = "82801DBM (ICH4-M) IDE Controller"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24ca_1014_052d[] = "Thinkpad R50e model 1634"; +static const char pci_subsys_8086_24ca_1014_052d[] = "ThinkPad"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24ca_1025_005a[] = "TravelMate 290"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24ca_1028_014f[] = "Latitude X300"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24ca_1028_0163[] = "Latitude D505"; #endif #ifdef INIT_SUBSYS_INFO @@ -23680,7 +24766,7 @@ static const char pci_subsys_8086_24ca_103c_08b0[] = "tc1100 tablet"; static const char pci_subsys_8086_24ca_1071_8160[] = "MIM2000"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24ca_144d_c00c[] = "P30 notebook"; +static const char pci_subsys_8086_24ca_144d_c00c[] = "P30/P35 notebook"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24ca_1734_1055[] = "Amilo M1420"; @@ -23707,6 +24793,12 @@ static const char pci_subsys_8086_24cb_1734_1004[] = "D1451 Mainboard (SCENIC N3 #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24cb_4c53_1090[] = "Cx9 / Vx9 mainboard"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24cb_e4bf_0cc9[] = "CC9-SAMBA"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24cb_e4bf_0cd2[] = "CD2-BEBOP"; +#endif static const char pci_device_8086_24cc[] = "82801DBM (ICH4-M) LPC Interface Bridge"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24cc_144d_c00c[] = "P30 notebook"; @@ -23719,7 +24811,7 @@ static const char pci_device_8086_24cd[] = "82801DB/DBM (ICH4/ICH4-M) USB2 EHCI static const char pci_subsys_8086_24cd_1014_0267[] = "NetVista A30p"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24cd_1014_052e[] = "Thinkpad R50e model 1634"; +static const char pci_subsys_8086_24cd_1014_052e[] = "ThinkPad"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24cd_1025_005a[] = "TravelMate 290"; @@ -23755,7 +24847,7 @@ static const char pci_subsys_8086_24cd_1071_8160[] = "MIM2000"; static const char pci_subsys_8086_24cd_1179_ff00[] = "Satellite 2430"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24cd_144d_c00c[] = "P30 notebook"; +static const char pci_subsys_8086_24cd_144d_c00c[] = "P30/P35 notebook"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24cd_1462_3981[] = "845PE Max (MS-6580)"; @@ -23772,6 +24864,15 @@ static const char pci_subsys_8086_24cd_1734_1055[] = "Amilo M1420"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24cd_4c53_1090[] = "Cx9 / Vx9 mainboard"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24cd_8086_24c2[] = "Latitude X300"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24cd_e4bf_0cc9[] = "CC9-SAMBA"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24cd_e4bf_0cd2[] = "CD2-BEBOP"; +#endif static const char pci_device_8086_24d0[] = "82801EB/ER (ICH5/ICH5R) LPC Interface Bridge"; static const char pci_device_8086_24d1[] = "82801EB (ICH5) SATA Controller"; #ifdef INIT_SUBSYS_INFO @@ -23793,6 +24894,9 @@ static const char pci_subsys_8086_24d1_1458_24d1[] = "GA-8IPE1000 Pro2 motherboa static const char pci_subsys_8086_24d1_1462_7280[] = "865PE Neo2 (MS-6728)"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24d1_1565_5200[] = "P4TSV Motherboard (865G)"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24d1_15d9_4580[] = "P4SCE Mainboard"; #endif #ifdef INIT_SUBSYS_INFO @@ -23809,7 +24913,10 @@ static const char pci_subsys_8086_24d1_8086_524c[] = "D865PERL mainboard"; #endif static const char pci_device_8086_24d2[] = "82801EB/ER (ICH5/ICH5R) USB UHCI Controller #1"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24d2_1014_02ed[] = "xSeries server mainboard"; +static const char pci_subsys_8086_24d2_1014_02dd[] = "eServer xSeries server mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24d2_1014_02ed[] = "eServer xSeries server mainboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24d2_1028_0169[] = "Precision 470"; @@ -23836,6 +24943,9 @@ static const char pci_subsys_8086_24d2_1458_24d2[] = "GA-8IPE1000/8KNXP motherbo static const char pci_subsys_8086_24d2_1462_7280[] = "865PE Neo2 (MS-6728)"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24d2_1565_3101[] = "P4TSV Motherboard (865G)"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24d2_15d9_4580[] = "P4SCE Mainboard"; #endif #ifdef INIT_SUBSYS_INFO @@ -23855,7 +24965,10 @@ static const char pci_subsys_8086_24d2_8086_524c[] = "D865PERL mainboard"; #endif static const char pci_device_8086_24d3[] = "82801EB/ER (ICH5/ICH5R) SMBus Controller"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24d3_1014_02ed[] = "xSeries server mainboard"; +static const char pci_subsys_8086_24d3_1014_02dd[] = "eServer xSeries server mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24d3_1014_02ed[] = "eServer xSeries server mainboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24d3_1028_0156[] = "Precision 360"; @@ -23876,6 +24989,9 @@ static const char pci_subsys_8086_24d3_1458_24d2[] = "GA-8IPE1000 Pro2 motherboa static const char pci_subsys_8086_24d3_1462_7280[] = "865PE Neo2 (MS-6728)"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24d3_1565_3101[] = "P4TSV Motherboard (865G)"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24d3_15d9_4580[] = "P4SCE Mainboard"; #endif #ifdef INIT_SUBSYS_INFO @@ -23895,7 +25011,10 @@ static const char pci_subsys_8086_24d3_8086_524c[] = "D865PERL mainboard"; #endif static const char pci_device_8086_24d4[] = "82801EB/ER (ICH5/ICH5R) USB UHCI Controller #2"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24d4_1014_02ed[] = "xSeries server mainboard"; +static const char pci_subsys_8086_24d4_1014_02dd[] = "eServer xSeries server mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24d4_1014_02ed[] = "eServer xSeries server mainboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24d4_1028_0169[] = "Precision 470"; @@ -23922,6 +25041,9 @@ static const char pci_subsys_8086_24d4_1458_24d2[] = "GA-8IPE1000 Pro2 motherboa static const char pci_subsys_8086_24d4_1462_7280[] = "865PE Neo2 (MS-6728)"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24d4_1565_3101[] = "P4TSV Motherboard (865G)"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24d4_15d9_4580[] = "P4SCE Mainboard"; #endif #ifdef INIT_SUBSYS_INFO @@ -24009,6 +25131,9 @@ static const char pci_subsys_8086_24d7_1458_24d2[] = "GA-8IPE1000 Pro2 motherboa static const char pci_subsys_8086_24d7_1462_7280[] = "865PE Neo2 (MS-6728)"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24d7_1565_3101[] = "P4TSV Motherboard (865G)"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24d7_15d9_4580[] = "P4SCE Mainboard"; #endif #ifdef INIT_SUBSYS_INFO @@ -24028,7 +25153,10 @@ static const char pci_subsys_8086_24d7_8086_524c[] = "D865PERL mainboard"; #endif static const char pci_device_8086_24db[] = "82801EB/ER (ICH5/ICH5R) IDE Controller"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24db_1014_02ed[] = "xSeries server mainboard"; +static const char pci_subsys_8086_24db_1014_02dd[] = "eServer xSeries server mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24db_1014_02ed[] = "eServer xSeries server mainboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24db_1028_0169[] = "Precision 470"; @@ -24055,6 +25183,9 @@ static const char pci_subsys_8086_24db_1462_7280[] = "865PE Neo2 (MS-6728)"; static const char pci_subsys_8086_24db_1462_7580[] = "MSI 875P"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24db_1565_3101[] = "P4TSV Motherboard (865G)"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24db_15d9_4580[] = "P4SCE Mainboard"; #endif #ifdef INIT_SUBSYS_INFO @@ -24078,7 +25209,10 @@ static const char pci_subsys_8086_24db_8086_524c[] = "D865PERL mainboard"; static const char pci_device_8086_24dc[] = "82801EB (ICH5) LPC Interface Bridge"; static const char pci_device_8086_24dd[] = "82801EB/ER (ICH5/ICH5R) USB2 EHCI Controller"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_24dd_1014_02ed[] = "xSeries server mainboard"; +static const char pci_subsys_8086_24dd_1014_02dd[] = "eServer xSeries server mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24dd_1014_02ed[] = "eServer xSeries server mainboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24dd_1028_0169[] = "Precision 470"; @@ -24133,6 +25267,9 @@ static const char pci_subsys_8086_24de_1458_24d2[] = "GA-8IPE1000 Pro2 motherboa static const char pci_subsys_8086_24de_1462_7280[] = "865PE Neo2 (MS-6728)"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_24de_1565_3101[] = "P4TSV Motherboard (865G)"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_24de_15d9_4580[] = "P4SCE Mainboard"; #endif #ifdef INIT_SUBSYS_INFO @@ -24232,6 +25369,9 @@ static const char pci_subsys_8086_2562_0e11_00b9[] = "Evo D510 SFF"; static const char pci_subsys_8086_2562_1014_0267[] = "NetVista A30p"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2562_1734_1003[] = "D1521 Mainboard (Fujitsu-Siemens)"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2562_1734_1004[] = "D1451 Mainboard (SCENIC N300, i845GV)"; #endif static const char pci_device_8086_2570[] = "82865G/PE/P DRAM Controller/Host-Hub Interface"; @@ -24306,6 +25446,9 @@ static const char pci_subsys_8086_2582_1458_2582[] = "GA-8I915ME-G Mainboard"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2582_1734_105b[] = "Scenic W620"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2582_1849_2582[] = "ASRock P4Dual-915GL"; +#endif static const char pci_device_8086_2584[] = "82925X/XE Memory Controller Hub"; static const char pci_device_8086_2585[] = "82925X/XE PCI Express Root Port"; static const char pci_device_8086_2588[] = "E7220/E7221 Memory Controller Hub"; @@ -24316,12 +25459,30 @@ static const char pci_device_8086_2590[] = "Mobile 915GM/PM/GMS/910GML Express P static const char pci_subsys_8086_2590_1028_0182[] = "Dell Latidude C610"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2590_103c_0934[] = "HP Compaq nw8240 Mobile Workstation"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2590_103c_099c[] = "NX6110/NC6120"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2590_104d_81b7[] = "Vaio VGN-S3XP"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2590_a304_81b7[] = "Vaio VGN-S3XP"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2590_e4bf_0ccd[] = "CCD-CALYPSO"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2590_e4bf_0cd3[] = "CD3-JIVE"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2590_e4bf_58b1[] = "XB1"; +#endif static const char pci_device_8086_2591[] = "Mobile 915GM/PM Express PCI Express Root Port"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2591_103c_0934[] = "HP Compaq nw8240 Mobile Workstation"; +#endif static const char pci_device_8086_2592[] = "Mobile 915GM/GMS/910GML Express Graphics Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2592_103c_099c[] = "NX6110/NC6120"; @@ -24332,12 +25493,24 @@ static const char pci_subsys_8086_2592_103c_308a[] = "NC6220"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2592_1043_1881[] = "GMA 900 915GM Integrated Graphics"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2592_e4bf_0ccd[] = "CCD-CALYPSO"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2592_e4bf_0cd3[] = "CD3-JIVE"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2592_e4bf_58b1[] = "XB1"; +#endif static const char pci_device_8086_25a1[] = "6300ESB LPC Interface Controller"; static const char pci_device_8086_25a2[] = "6300ESB PATA Storage Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_25a2_1775_10d0[] = "V5D Single Board Computer IDE"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_25a2_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_25a2_1775_ce90[] = "CE9"; #endif #ifdef INIT_SUBSYS_INFO @@ -24348,6 +25521,9 @@ static const char pci_subsys_8086_25a2_4c53_10e0[] = "PSL09 PrPMC"; #endif static const char pci_device_8086_25a3[] = "6300ESB SATA Storage Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_25a3_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_25a3_1775_ce90[] = "CE9"; #endif #ifdef INIT_SUBSYS_INFO @@ -24364,6 +25540,9 @@ static const char pci_device_8086_25a4[] = "6300ESB SMBus Controller"; static const char pci_subsys_8086_25a4_1775_10d0[] = "V5D Single Board Computer"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_25a4_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_25a4_1775_ce90[] = "CE9"; #endif #ifdef INIT_SUBSYS_INFO @@ -24377,6 +25556,9 @@ static const char pci_subsys_8086_25a4_4c53_10e0[] = "PSL09 PrPMC"; #endif static const char pci_device_8086_25a6[] = "6300ESB AC'97 Audio Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_25a6_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_25a6_1775_ce90[] = "CE9"; #endif #ifdef INIT_SUBSYS_INFO @@ -24388,6 +25570,9 @@ static const char pci_device_8086_25a9[] = "6300ESB USB Universal Host Controlle static const char pci_subsys_8086_25a9_1775_10d0[] = "V5D Single Board Computer USB"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_25a9_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_25a9_1775_ce90[] = "CE9"; #endif #ifdef INIT_SUBSYS_INFO @@ -24401,6 +25586,9 @@ static const char pci_subsys_8086_25a9_4c53_10e0[] = "PSL09 PrPMC"; #endif static const char pci_device_8086_25aa[] = "6300ESB USB Universal Host Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_25aa_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_25aa_1775_ce90[] = "CE9"; #endif #ifdef INIT_SUBSYS_INFO @@ -24414,6 +25602,9 @@ static const char pci_device_8086_25ab[] = "6300ESB Watchdog Timer"; static const char pci_subsys_8086_25ab_1775_10d0[] = "V5D Single Board Computer"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_25ab_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_25ab_1775_ce90[] = "CE9"; #endif #ifdef INIT_SUBSYS_INFO @@ -24430,6 +25621,9 @@ static const char pci_device_8086_25ac[] = "6300ESB I/O Advanced Programmable In static const char pci_subsys_8086_25ac_1775_10d0[] = "V5D Single Board Computer"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_25ac_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_25ac_1775_ce90[] = "CE9"; #endif #ifdef INIT_SUBSYS_INFO @@ -24446,6 +25640,9 @@ static const char pci_device_8086_25ad[] = "6300ESB USB2 Enhanced Host Controlle static const char pci_subsys_8086_25ad_1775_10d0[] = "V5D Single Board Computer USB 2.0"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_25ad_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_25ad_1775_ce90[] = "CE9"; #endif #ifdef INIT_SUBSYS_INFO @@ -24460,6 +25657,9 @@ static const char pci_subsys_8086_25ad_4c53_10e0[] = "PSL09 PrPMC"; static const char pci_device_8086_25ae[] = "6300ESB 64-bit PCI-X Bridge"; static const char pci_device_8086_25b0[] = "6300ESB SATA RAID Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_25b0_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_25b0_4c53_10d0[] = "Telum ASLP10 Processor AMC"; #endif #ifdef INIT_SUBSYS_INFO @@ -24525,8 +25725,20 @@ static const char pci_subsys_8086_2640_1462_7028[] = "915P/G Neo2"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2640_1734_105c[] = "Scenic W620"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2640_e4bf_0ccd[] = "CCD-CALYPSO"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2640_e4bf_0cd3[] = "CD3-JIVE"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2640_e4bf_58b1[] = "XB1"; +#endif static const char pci_device_8086_2641[] = "82801FBM (ICH6M) LPC Interface Bridge"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2641_103c_0934[] = "HP Compaq nw8240 Mobile Workstation"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2641_103c_099c[] = "NX6110/NC6120"; #endif static const char pci_device_8086_2642[] = "82801FW/FRW (ICH6W/ICH6RW) LPC Interface Bridge"; @@ -24543,6 +25755,15 @@ static const char pci_subsys_8086_2651_1734_105c[] = "Scenic W620"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2651_8086_4147[] = "D915GAG Motherboard"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2651_e4bf_0ccd[] = "CCD-CALYPSO"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2651_e4bf_0cd3[] = "CD3-JIVE"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2651_e4bf_58b1[] = "XB1"; +#endif static const char pci_device_8086_2652[] = "82801FR/FRW (ICH6R/ICH6RW) SATA Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2652_1462_7028[] = "915P/G Neo2"; @@ -24553,6 +25774,9 @@ static const char pci_device_8086_2658[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) static const char pci_subsys_8086_2658_1028_0179[] = "Optiplex GX280"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2658_103c_0934[] = "HP Compaq nw8240 Mobile Workstation"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2658_103c_099c[] = "NX6110/NC6120"; #endif #ifdef INIT_SUBSYS_INFO @@ -24567,11 +25791,23 @@ static const char pci_subsys_8086_2658_1462_7028[] = "915P/G Neo2"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2658_1734_105c[] = "Scenic W620"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2658_e4bf_0ccd[] = "CCD-CALYPSO"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2658_e4bf_0cd3[] = "CD3-JIVE"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2658_e4bf_58b1[] = "XB1"; +#endif static const char pci_device_8086_2659[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #2"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2659_1028_0179[] = "Optiplex GX280"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2659_103c_0934[] = "HP Compaq nw8240 Mobile Workstation"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2659_103c_099c[] = "NX6110/NC6120"; #endif #ifdef INIT_SUBSYS_INFO @@ -24586,11 +25822,23 @@ static const char pci_subsys_8086_2659_1462_7028[] = "915P/G Neo2"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2659_1734_105c[] = "Scenic W620"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2659_e4bf_0ccd[] = "CCD-CALYPSO"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2659_e4bf_0cd3[] = "CD3-JIVE"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2659_e4bf_58b1[] = "XB1"; +#endif static const char pci_device_8086_265a[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #3"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_265a_1028_0179[] = "Optiplex GX280"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_265a_103c_0934[] = "HP Compaq nw8240 Mobile Workstation"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_265a_103c_099c[] = "NX6110/NC6120"; #endif #ifdef INIT_SUBSYS_INFO @@ -24605,6 +25853,15 @@ static const char pci_subsys_8086_265a_1462_7028[] = "915P/G Neo2"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_265a_1734_105c[] = "Scenic W620"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_265a_e4bf_0ccd[] = "CCD-CALYPSO"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_265a_e4bf_0cd3[] = "CD3-JIVE"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_265a_e4bf_58b1[] = "XB1"; +#endif static const char pci_device_8086_265b[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) USB UHCI #4"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_265b_1028_0179[] = "Optiplex GX280"; @@ -24624,11 +25881,23 @@ static const char pci_subsys_8086_265b_1462_7028[] = "915P/G Neo2"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_265b_1734_105c[] = "Scenic W620"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_265b_e4bf_0ccd[] = "CCD-CALYPSO"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_265b_e4bf_0cd3[] = "CD3-JIVE"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_265b_e4bf_58b1[] = "XB1"; +#endif static const char pci_device_8086_265c[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) USB2 EHCI Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_265c_1028_0179[] = "Optiplex GX280"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_265c_103c_0934[] = "HP Compaq nw8240 Mobile Workstation"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_265c_103c_099c[] = "NX6110/NC6120"; #endif #ifdef INIT_SUBSYS_INFO @@ -24646,13 +25915,64 @@ static const char pci_subsys_8086_265c_1734_105c[] = "Scenic W620"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_265c_8086_265c[] = "Dimension 3100"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_265c_e4bf_0ccd[] = "CCD-CALYPSO"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_265c_e4bf_0cd3[] = "CD3-JIVE"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_265c_e4bf_58b1[] = "XB1"; +#endif static const char pci_device_8086_2660[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 1"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2660_103c_0934[] = "HP Compaq nw8240 Mobile Workstation"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2660_103c_099c[] = "NX6110/NC6120"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2660_e4bf_0ccd[] = "CCD-CALYPSO"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2660_e4bf_0cd3[] = "CD3-JIVE"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2660_e4bf_58b1[] = "XB1"; +#endif static const char pci_device_8086_2662[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 2"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2662_103c_0934[] = "HP Compaq nw8240 Mobile Workstation"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2662_e4bf_0ccd[] = "CCD-CALYPSO"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2662_e4bf_0cd3[] = "CD3-JIVE"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2662_e4bf_58b1[] = "XB1"; +#endif static const char pci_device_8086_2664[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 3"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2664_e4bf_0ccd[] = "CCD-CALYPSO"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2664_e4bf_0cd3[] = "CD3-JIVE"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2664_e4bf_58b1[] = "XB1"; +#endif static const char pci_device_8086_2666[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 4"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2666_e4bf_0ccd[] = "CCD-CALYPSO"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2666_e4bf_0cd3[] = "CD3-JIVE"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2666_e4bf_58b1[] = "XB1"; +#endif static const char pci_device_8086_2668[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) High Definition Audio Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2668_103c_2a09[] = "PufferM-UL8E"; @@ -24676,12 +25996,24 @@ static const char pci_subsys_8086_266a_1462_7028[] = "915P/G Neo2"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_266a_1734_105c[] = "Scenic W620"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_266a_e4bf_0ccd[] = "CCD-CALYPSO"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_266a_e4bf_0cd3[] = "CD3-JIVE"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_266a_e4bf_58b1[] = "XB1"; +#endif static const char pci_device_8086_266c[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) LAN Controller"; static const char pci_device_8086_266d[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) AC'97 Modem Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_266d_1025_006a[] = "Conexant AC'97 CoDec (in Acer TravelMate 2410 serie laptop)"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_266d_103c_0934[] = "HP Compaq nw8240 Mobile Workstation"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_266d_103c_099c[] = "NX6110/NC6120"; #endif static const char pci_device_8086_266e[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) AC'97 Audio Controller"; @@ -24698,6 +26030,9 @@ static const char pci_subsys_8086_266e_1028_0182[] = "Latitude D610 Laptop"; static const char pci_subsys_8086_266e_1028_0188[] = "Inspiron 6000 laptop"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_266e_103c_0934[] = "HP Compaq nw8240 Mobile Workstation"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_266e_103c_0944[] = "Compaq NC6220"; #endif #ifdef INIT_SUBSYS_INFO @@ -24717,6 +26052,9 @@ static const char pci_subsys_8086_266e_1734_105a[] = "Scenic W620"; #endif static const char pci_device_8086_266f[] = "82801FB/FBM/FR/FW/FRW (ICH6 Family) IDE Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_266f_103c_0934[] = "HP Compaq nw8240 Mobile Workstation"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_266f_103c_099c[] = "NX6110/NC6120"; #endif #ifdef INIT_SUBSYS_INFO @@ -24731,11 +26069,20 @@ static const char pci_subsys_8086_266f_1462_7028[] = "915P/G Neo2"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_266f_1734_105c[] = "Scenic W620"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_266f_e4bf_0ccd[] = "CCD-CALYPSO"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_266f_e4bf_0cd3[] = "CD3-JIVE"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_266f_e4bf_58b1[] = "XB1"; +#endif static const char pci_device_8086_2670[] = "631xESB/632xESB/3100 Chipset LPC Interface Controller"; -static const char pci_device_8086_2680[] = "631xESB/632xESB/3100 Chipset SATA Storage Controller IDE"; -static const char pci_device_8086_2681[] = "631xESB/632xESB SATA Storage Controller AHCI"; -static const char pci_device_8086_2682[] = "631xESB/632xESB SATA Storage Controller RAID"; -static const char pci_device_8086_2683[] = "631xESB/632xESB SATA Storage Controller RAID"; +static const char pci_device_8086_2680[] = "631xESB/632xESB/3100 Chipset SATA IDE Controller"; +static const char pci_device_8086_2681[] = "631xESB/632xESB SATA AHCI Controller"; +static const char pci_device_8086_2682[] = "631xESB/632xESB SATA RAID Controller"; +static const char pci_device_8086_2683[] = "631xESB/632xESB SATA RAID Controller"; static const char pci_device_8086_2688[] = "631xESB/632xESB/3100 Chipset UHCI USB Controller #1"; static const char pci_device_8086_2689[] = "631xESB/632xESB/3100 Chipset UHCI USB Controller #2"; static const char pci_device_8086_268a[] = "631xESB/632xESB/3100 Chipset UHCI USB Controller #3"; @@ -24769,6 +26116,9 @@ static const char pci_device_8086_2778[] = "E7230/3000/3010 Memory Controller Hu static const char pci_device_8086_2779[] = "E7230/3000/3010 PCI Express Root Port"; static const char pci_device_8086_277a[] = "82975X/3010 PCI Express Root Port"; static const char pci_device_8086_277c[] = "82975X Memory Controller Hub"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_277c_1043_8178[] = "P5WDG2 WS Professional motherboard"; +#endif static const char pci_device_8086_277d[] = "82975X PCI Express Root Port"; static const char pci_device_8086_2782[] = "82915G Integrated Graphics Controller"; #ifdef INIT_SUBSYS_INFO @@ -24784,22 +26134,34 @@ static const char pci_subsys_8086_2792_103c_099c[] = "NX6110/NC6120"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2792_1043_1881[] = "GMA 900 915GM Integrated Graphics"; #endif -static const char pci_device_8086_27a0[] = "Mobile 945GM/PM/GMS/940GML and 945GT Express Memory Controller Hub"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2792_e4bf_0ccd[] = "CCD-CALYPSO"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2792_e4bf_0cd3[] = "CD3-JIVE"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2792_e4bf_58b1[] = "XB1"; +#endif +static const char pci_device_8086_27a0[] = "Mobile 945GM/PM/GMS, 943/940GML and 945GT Express Memory Controller Hub"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_27a0_1025_006c[] = "9814 WKMI"; +#endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27a0_103c_30a1[] = "NC2400"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27a0_17aa_2017[] = "Thinkpad R60e model 0657"; #endif -static const char pci_device_8086_27a1[] = "Mobile 945GM/PM/GMS/940GML and 945GT Express PCI Express Root Port"; -static const char pci_device_8086_27a2[] = "Mobile 945GM/GMS/940GML Express Integrated Graphics Controller"; +static const char pci_device_8086_27a1[] = "Mobile 945GM/PM/GMS, 943/940GML and 945GT Express PCI Express Root Port"; +static const char pci_device_8086_27a2[] = "Mobile 945GM/GMS, 943/940GML Express Integrated Graphics Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27a2_103c_30a1[] = "NC2400"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27a2_17aa_201a[] = "Thinkpad R60e model 0657"; #endif -static const char pci_device_8086_27a6[] = "Mobile 945GM/GMS/940GML Express Integrated Graphics Controller"; +static const char pci_device_8086_27a6[] = "Mobile 945GM/GMS, 943/940GML Express Integrated Graphics Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27a6_103c_30a1[] = "NC2400"; #endif @@ -24807,6 +26169,9 @@ static const char pci_subsys_8086_27a6_103c_30a1[] = "NC2400"; static const char pci_subsys_8086_27a6_17aa_201a[] = "Thinkpad R60e model 0657"; #endif static const char pci_device_8086_27b0[] = "82801GH (ICH7DH) LPC Interface Bridge"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_27b0_8086_544e[] = "DeskTop Board D945GTP"; +#endif static const char pci_device_8086_27b8[] = "82801GB/GR (ICH7 Family) LPC Interface Bridge"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27b8_107b_5048[] = "E4500"; @@ -24825,22 +26190,37 @@ static const char pci_subsys_8086_27b9_10f7_8338[] = "Panasonic CF-Y5 laptop"; static const char pci_subsys_8086_27b9_17aa_2009[] = "ThinkPad T60/R60 series"; #endif static const char pci_device_8086_27bd[] = "82801GHM (ICH7-M DH) LPC Interface Bridge"; -static const char pci_device_8086_27c0[] = "82801GB/GR/GH (ICH7 Family) Serial ATA Storage Controller IDE"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_27bd_1025_006c[] = "9814 WKMI"; +#endif +static const char pci_device_8086_27c0[] = "82801GB/GR/GH (ICH7 Family) SATA IDE Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27c0_107b_5048[] = "E4500"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_27c0_1462_7236[] = "945P Neo3-F Rev. 2.2 motherboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27c0_8086_544e[] = "DeskTop Board D945GTP"; #endif -static const char pci_device_8086_27c1[] = "82801GR/GH (ICH7 Family) Serial ATA Storage Controller AHCI"; -static const char pci_device_8086_27c3[] = "82801GR/GH (ICH7 Family) Serial ATA Storage Controller RAID"; -static const char pci_device_8086_27c4[] = "82801GBM/GHM (ICH7 Family) Serial ATA Storage Controller IDE"; -static const char pci_device_8086_27c5[] = "82801GBM/GHM (ICH7 Family) Serial ATA Storage Controller AHCI"; +static const char pci_device_8086_27c1[] = "82801GR/GH (ICH7 Family) SATA AHCI Controller"; +static const char pci_device_8086_27c3[] = "82801GR/GH (ICH7 Family) SATA RAID Controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_27c3_8086_544e[] = "DeskTop Board D945GTP"; +#endif +static const char pci_device_8086_27c4[] = "82801GBM/GHM (ICH7 Family) SATA IDE Controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_27c4_1025_006c[] = "9814 WKMI"; +#endif +static const char pci_device_8086_27c5[] = "82801GBM/GHM (ICH7 Family) SATA AHCI Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27c5_17aa_200d[] = "Thinkpad R60e model 0657"; #endif -static const char pci_device_8086_27c6[] = "82801GHM (ICH7-M DH) Serial ATA Storage Controller RAID"; -static const char pci_device_8086_27c8[] = "82801G (ICH7 Family) USB UHCI #1"; +static const char pci_device_8086_27c6[] = "82801GHM (ICH7-M DH) SATA RAID Controller"; +static const char pci_device_8086_27c8[] = "82801G (ICH7 Family) USB UHCI Controller #1"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_27c8_1025_006c[] = "9814 WKMI"; +#endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27c8_103c_30a1[] = "NC2400"; #endif @@ -24853,7 +26233,10 @@ static const char pci_subsys_8086_27c8_17aa_200a[] = "ThinkPad T60/R60 series"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27c8_8086_544e[] = "DeskTop Board D945GTP"; #endif -static const char pci_device_8086_27c9[] = "82801G (ICH7 Family) USB UHCI #2"; +static const char pci_device_8086_27c9[] = "82801G (ICH7 Family) USB UHCI Controller #2"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_27c9_1025_006c[] = "9814 WKMI"; +#endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27c9_103c_30a1[] = "NC2400"; #endif @@ -24866,7 +26249,10 @@ static const char pci_subsys_8086_27c9_17aa_200a[] = "ThinkPad T60/R60 series"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27c9_8086_544e[] = "DeskTop Board D945GTP"; #endif -static const char pci_device_8086_27ca[] = "82801G (ICH7 Family) USB UHCI #3"; +static const char pci_device_8086_27ca[] = "82801G (ICH7 Family) USB UHCI Controller #3"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_27ca_1025_006c[] = "9814 WKMI"; +#endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27ca_103c_30a1[] = "NC2400"; #endif @@ -24879,7 +26265,10 @@ static const char pci_subsys_8086_27ca_17aa_200a[] = "ThinkPad T60/R60 series"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27ca_8086_544e[] = "DeskTop Board D945GTP"; #endif -static const char pci_device_8086_27cb[] = "82801G (ICH7 Family) USB UHCI #4"; +static const char pci_device_8086_27cb[] = "82801G (ICH7 Family) USB UHCI Controller #4"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_27cb_1025_006c[] = "9814 WKMI"; +#endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27cb_103c_30a1[] = "NC2400"; #endif @@ -24894,6 +26283,9 @@ static const char pci_subsys_8086_27cb_8086_544e[] = "DeskTop Board D945GTP"; #endif static const char pci_device_8086_27cc[] = "82801G (ICH7 Family) USB2 EHCI Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_27cc_1025_006c[] = "9814 WKMI"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27cc_103c_30a1[] = "NC2400"; #endif #ifdef INIT_SUBSYS_INFO @@ -24908,16 +26300,22 @@ static const char pci_device_8086_27d4[] = "82801G (ICH7 Family) PCI Express Por static const char pci_device_8086_27d6[] = "82801G (ICH7 Family) PCI Express Port 4"; static const char pci_device_8086_27d8[] = "82801G (ICH7 Family) High Definition Audio Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_27d8_1025_006c[] = "9814 WKMI"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27d8_103c_30a1[] = "NC2400"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_27d8_1043_13c4[] = "Asus G2P"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27d8_107b_5048[] = "E4500"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27d8_10f7_8338[] = "Panasonic CF-Y5 laptop"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_27d8_1179_ff31[] = "Toshiba America Information Systems:AC97 Data Fax SoftModem with SmartCP"; +static const char pci_subsys_8086_27d8_1179_ff31[] = "AC97 Data Fax SoftModem with SmartCP"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27d8_152d_0753[] = "Softmodem"; @@ -24928,8 +26326,17 @@ static const char pci_subsys_8086_27d8_1734_10ad[] = "Conexant softmodem SmartCP #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27d8_17aa_2010[] = "ThinkPad T60/R60 series"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_27d8_17aa_3802[] = "Lenovo 3000 C200 audio [Realtek ALC861VD]"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_27d8_8086_1112[] = "DeskTop Board D945GTP"; +#endif static const char pci_device_8086_27da[] = "82801G (ICH7 Family) SMBus Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_27da_1025_006c[] = "9814 WKMI"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27da_10f7_8338[] = "Panasonic CF-Y5 laptop"; #endif #ifdef INIT_SUBSYS_INFO @@ -24944,6 +26351,9 @@ static const char pci_subsys_8086_27dc_8086_308d[] = "DeskTop Board D945GTP"; #endif static const char pci_device_8086_27dd[] = "82801G (ICH7 Family) AC'97 Modem Controller"; static const char pci_device_8086_27de[] = "82801G (ICH7 Family) AC'97 Audio Controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_27de_1462_7267[] = "Realtek ALC883 Audio Controller"; +#endif static const char pci_device_8086_27df[] = "82801G (ICH7 Family) IDE Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_27df_103c_30a1[] = "NC2400"; @@ -24963,43 +26373,52 @@ static const char pci_subsys_8086_27df_8086_544e[] = "DeskTop Board D945GTP"; static const char pci_device_8086_27e0[] = "82801GR/GH/GHM (ICH7 Family) PCI Express Port 5"; static const char pci_device_8086_27e2[] = "82801GR/GH/GHM (ICH7 Family) PCI Express Port 6"; static const char pci_device_8086_2810[] = "82801HB/HR (ICH8/R) LPC Interface Controller"; -static const char pci_device_8086_2811[] = "Mobile LPC Interface Controller"; +static const char pci_device_8086_2811[] = "82801HBM (ICH8M-E) LPC Interface Controller"; static const char pci_device_8086_2812[] = "82801HH (ICH8DH) LPC Interface Controller"; static const char pci_device_8086_2814[] = "82801HO (ICH8DO) LPC Interface Controller"; -static const char pci_device_8086_2815[] = "Mobile LPC Interface Controller"; +static const char pci_device_8086_2815[] = "82801HEM (ICH8M) LPC Interface Controller"; static const char pci_device_8086_2820[] = "82801H (ICH8 Family) 4 port SATA IDE Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2820_1462_7235[] = "P965 Neo MS-7235 mainboard"; #endif static const char pci_device_8086_2821[] = "82801HR/HO/HH (ICH8R/DO/DH) 6 port SATA AHCI Controller"; -static const char pci_device_8086_2822[] = "82801HR/HO/HH (ICH8R/DO/DH) SATA RAID Controller"; +static const char pci_device_8086_2822[] = "82801 SATA RAID Controller"; static const char pci_device_8086_2824[] = "82801HB (ICH8) 4 port SATA AHCI Controller"; static const char pci_device_8086_2825[] = "82801H (ICH8 Family) 2 port SATA IDE Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2825_1462_7235[] = "P965 Neo MS-7235 mainboard"; #endif -static const char pci_device_8086_2828[] = "Mobile SATA IDE Controller"; -static const char pci_device_8086_2829[] = "Mobile SATA AHCI Controller"; -static const char pci_device_8086_282a[] = "Mobile SATA RAID Controller"; -static const char pci_device_8086_2830[] = "82801H (ICH8 Family) USB UHCI #1"; +static const char pci_device_8086_2828[] = "82801HBM/HEM (ICH8M/ICH8M-E) SATA IDE Controller"; +static const char pci_device_8086_2829[] = "82801HBM/HEM (ICH8M/ICH8M-E) SATA AHCI Controller"; +static const char pci_device_8086_282a[] = "Mobile 82801 SATA RAID Controller"; +static const char pci_device_8086_2830[] = "82801H (ICH8 Family) USB UHCI Controller #1"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2830_1462_7235[] = "P965 Neo MS-7235 mainboard"; #endif -static const char pci_device_8086_2831[] = "82801H (ICH8 Family) USB UHCI #2"; +static const char pci_device_8086_2831[] = "82801H (ICH8 Family) USB UHCI Controller #2"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2831_1462_7235[] = "P965 Neo MS-7235 mainboard"; #endif -static const char pci_device_8086_2832[] = "82801H (ICH8 Family) USB UHCI #3"; -static const char pci_device_8086_2834[] = "82801H (ICH8 Family) USB UHCI #4"; +static const char pci_device_8086_2832[] = "82801H (ICH8 Family) USB UHCI Controller #3"; +static const char pci_device_8086_2834[] = "82801H (ICH8 Family) USB UHCI Contoller #4"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2834_1462_7235[] = "P965 Neo MS-7235 mainboard"; #endif -static const char pci_device_8086_2835[] = "82801H (ICH8 Family) USB UHCI #5"; -static const char pci_device_8086_2836[] = "82801H (ICH8 Family) USB2 EHCI #1"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2834_17aa_20aa[] = "Lenovo Thinkpad T61"; +#endif +static const char pci_device_8086_2835[] = "82801H (ICH8 Family) USB UHCI Controller #5"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2835_17aa_20aa[] = "Lenovo Thinkpad T60"; +#endif +static const char pci_device_8086_2836[] = "82801H (ICH8 Family) USB2 EHCI Controller #1"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_2836_1462_7235[] = "P965 Neo MS-7235 mainboard"; #endif -static const char pci_device_8086_283a[] = "82801H (ICH8 Family) USB2 EHCI #2"; +static const char pci_device_8086_283a[] = "82801H (ICH8 Family) USB2 EHCI Controller #2"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_283a_17aa_20ab[] = "Lenovo Thinkpad T61"; +#endif static const char pci_device_8086_283e[] = "82801H (ICH8 Family) SMBus Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_283e_1462_7235[] = "P965 Neo MS-7235 mainboard"; @@ -25011,36 +26430,47 @@ static const char pci_device_8086_2845[] = "82801H (ICH8 Family) PCI Express Por static const char pci_device_8086_2847[] = "82801H (ICH8 Family) PCI Express Port 5"; static const char pci_device_8086_2849[] = "82801H (ICH8 Family) PCI Express Port 6"; static const char pci_device_8086_284b[] = "82801H (ICH8 Family) HD Audio Controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_284b_17aa_20ac[] = "Lenovo Thinkpad T61"; +#endif static const char pci_device_8086_284f[] = "82801H (ICH8 Family) Thermal Reporting Device"; -static const char pci_device_8086_2850[] = "Mobile IDE Controller"; -static const char pci_device_8086_2910[] = "LPC Interface Controller"; -static const char pci_device_8086_2920[] = "4 port SATA IDE Controller"; -static const char pci_device_8086_2921[] = "2 port SATA IDE Controller"; -static const char pci_device_8086_2922[] = "6 port SATA AHCI Controller"; -static const char pci_device_8086_2923[] = "4 port SATA AHCI Controller"; -static const char pci_device_8086_2925[] = "SATA RAID Controller"; -static const char pci_device_8086_2926[] = "2 port SATA IDE Controller"; +static const char pci_device_8086_2850[] = "82801HBM/HEM (ICH8M/ICH8M-E) IDE Controller"; +static const char pci_device_8086_2911[] = "LPC Interface Controller"; +static const char pci_device_8086_2912[] = "82801IH (ICH9DH) LPC Interface Controller"; +static const char pci_device_8086_2914[] = "LPC Interface Controller"; +static const char pci_device_8086_2916[] = "82801IR (ICH9R) LPC Interface Controller"; +static const char pci_device_8086_2917[] = "Mobile LPC Controller"; +static const char pci_device_8086_2918[] = "82801IB (ICH9) LPC Interface Controller"; +static const char pci_device_8086_2919[] = "Mobile LPC Controller"; +static const char pci_device_8086_2920[] = "82801IR/IO/IH (ICH9R/DO/DH) 4 port SATA IDE Controller"; +static const char pci_device_8086_2921[] = "82801I (ICH9 Family) 2 port SATA IDE Controller"; +static const char pci_device_8086_2922[] = "82801IR/IO/IH (ICH9R/DO/DH) 6 port SATA AHCI Controller"; +static const char pci_device_8086_2923[] = "82801I (ICH9 Family) 4 port SATA AHCI Controller"; +static const char pci_device_8086_2925[] = "82801IR/IO (ICH9R//DO) SATA RAID Controller"; +static const char pci_device_8086_2926[] = "82801I (ICH9 Family) 2 port SATA IDE Controller"; static const char pci_device_8086_2928[] = "Mobile 2 port SATA IDE Controller"; +static const char pci_device_8086_2929[] = "Mobile SATA AHCI Controller"; +static const char pci_device_8086_292c[] = "Mobile SATA RAID Controller"; static const char pci_device_8086_292d[] = "Mobile 2 port SATA IDE Controller"; static const char pci_device_8086_292e[] = "Mobile 1 port SATA IDE Controller"; -static const char pci_device_8086_2930[] = "SMBus Controller"; -static const char pci_device_8086_2932[] = "Thermal Subsystem"; -static const char pci_device_8086_2934[] = "USB UHCI Controller #1"; -static const char pci_device_8086_2935[] = "USB UHCI Controller #2"; -static const char pci_device_8086_2936[] = "USB UHCI Controller #3"; -static const char pci_device_8086_2937[] = "USB UHCI Controller #4"; -static const char pci_device_8086_2938[] = "USB UHCI Controller #5"; -static const char pci_device_8086_2939[] = "USB UHCI Controller #6"; -static const char pci_device_8086_293a[] = "USB2 EHCI Controller #1"; -static const char pci_device_8086_293c[] = "USB2 EHCI Controller #2"; -static const char pci_device_8086_293e[] = "HD Audio Controller"; -static const char pci_device_8086_2940[] = "PCI Express Port 1"; -static const char pci_device_8086_2942[] = "PCI Express Port 2"; -static const char pci_device_8086_2944[] = "PCI Express Port 3"; -static const char pci_device_8086_2946[] = "PCI Express Port 4"; -static const char pci_device_8086_2948[] = "PCI Express Port 5"; -static const char pci_device_8086_294a[] = "PCI Express Port 6"; -static const char pci_device_8086_294c[] = "Gigabit Ethernet Controller"; +static const char pci_device_8086_2930[] = "82801I (ICH9 Family) SMBus Controller"; +static const char pci_device_8086_2932[] = "82801I (ICH9 Family) Thermal Subsystem"; +static const char pci_device_8086_2934[] = "82801I (ICH9 Family) USB UHCI Controller #1"; +static const char pci_device_8086_2935[] = "82801I (ICH9 Family) USB UHCI Controller #2"; +static const char pci_device_8086_2936[] = "82801I (ICH9 Family) USB UHCI Controller #3"; +static const char pci_device_8086_2937[] = "82801I (ICH9 Family) USB UHCI Controller #4"; +static const char pci_device_8086_2938[] = "82801I (ICH9 Family) USB UHCI Controller #5"; +static const char pci_device_8086_2939[] = "82801I (ICH9 Family) USB UHCI Controller #6"; +static const char pci_device_8086_293a[] = "82801I (ICH9 Family) USB2 EHCI Controller #1"; +static const char pci_device_8086_293c[] = "82801I (ICH9 Family) USB2 EHCI Controller #2"; +static const char pci_device_8086_293e[] = "82801I (ICH9 Family) HD Audio Controller"; +static const char pci_device_8086_2940[] = "82801I (ICH9 Family) PCI Express Port 1"; +static const char pci_device_8086_2942[] = "82801I (ICH9 Family) PCI Express Port 2"; +static const char pci_device_8086_2944[] = "82801I (ICH9 Family) PCI Express Port 3"; +static const char pci_device_8086_2946[] = "82801I (ICH9 Family) PCI Express Port 4"; +static const char pci_device_8086_2948[] = "82801I (ICH9 Family) PCI Express Port 5"; +static const char pci_device_8086_294a[] = "82801I (ICH9 Family) PCI Express Port 6"; +static const char pci_device_8086_294c[] = "82801I (ICH9 Family) Gigabit Ethernet Controller"; static const char pci_device_8086_2970[] = "82946GZ/PL/GL Memory Controller Hub"; static const char pci_device_8086_2971[] = "82946GZ/PL/GL PCI Express Root Port"; static const char pci_device_8086_2972[] = "82946GZ/GL Integrated Graphics Controller"; @@ -25061,8 +26491,14 @@ static const char pci_device_8086_2995[] = "82Q963/Q965 HECI Controller"; static const char pci_device_8086_2996[] = "82Q963/Q965 PT IDER Controller"; static const char pci_device_8086_2997[] = "82Q963/Q965 KT Controller"; static const char pci_device_8086_29a0[] = "82P965/G965 Memory Controller Hub"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_29a0_1462_7276[] = "MS-7276 [G965MDH]"; +#endif static const char pci_device_8086_29a1[] = "82P965/G965 PCI Express Root Port"; static const char pci_device_8086_29a2[] = "82G965 Integrated Graphics Controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_29a2_1462_7276[] = "MS-7276 [G965MDH]"; +#endif static const char pci_device_8086_29a3[] = "82G965 Integrated Graphics Controller"; static const char pci_device_8086_29a4[] = "82P965/G965 HECI Controller"; static const char pci_device_8086_29a5[] = "82P965/G965 HECI Controller"; @@ -25072,48 +26508,65 @@ static const char pci_device_8086_29b0[] = "DRAM Controller"; static const char pci_device_8086_29b1[] = "PCI Express Root Port"; static const char pci_device_8086_29b2[] = "Integrated Graphics Controller"; static const char pci_device_8086_29b3[] = "Integrated Graphics Controller"; -static const char pci_device_8086_29b4[] = "HECI Controller"; -static const char pci_device_8086_29b5[] = "HECI Controller"; +static const char pci_device_8086_29b4[] = "MEI Controller"; +static const char pci_device_8086_29b5[] = "MEI Controller"; static const char pci_device_8086_29b6[] = "PT IDER Controller"; static const char pci_device_8086_29b7[] = "Serial KT Controller"; -static const char pci_device_8086_29c0[] = "DRAM Controller"; -static const char pci_device_8086_29c1[] = "PCI Express Root Port"; -static const char pci_device_8086_29c2[] = "Integrated Graphics Controller"; -static const char pci_device_8086_29c3[] = "Integrated Graphics Controller"; -static const char pci_device_8086_29c4[] = "HECI Controller"; -static const char pci_device_8086_29c5[] = "HECI Controller"; -static const char pci_device_8086_29c6[] = "PT IDER Controller"; -static const char pci_device_8086_29c7[] = "Serial KT Controller"; +static const char pci_device_8086_29c0[] = "82G33/G31/P35 Express DRAM Controller"; +static const char pci_device_8086_29c1[] = "82G33/G31/P35 Express PCI Express Root Port"; +static const char pci_device_8086_29c2[] = "82G33/G31 Express Integrated Graphics Controller"; +static const char pci_device_8086_29c3[] = "82G33/G31 Express Integrated Graphics Controller"; +static const char pci_device_8086_29c4[] = "82G33/G31/P35 Express MEI Controller"; +static const char pci_device_8086_29c5[] = "82G33/G31/P35 Express MEI Controller"; +static const char pci_device_8086_29c6[] = "82G33/G31/P35 Express PT IDER Controller"; +static const char pci_device_8086_29c7[] = "82G33/G31/P35 Express Serial KT Controller"; static const char pci_device_8086_29cf[] = "Virtual HECI Controller"; +static const char pci_device_8086_29d0[] = "DRAM Controller"; +static const char pci_device_8086_29d1[] = "PCI Express Root Port"; +static const char pci_device_8086_29d2[] = "Integrated Graphics Controller"; +static const char pci_device_8086_29d3[] = "Integrated Graphics Controller"; +static const char pci_device_8086_29d4[] = "MEI Controller"; +static const char pci_device_8086_29d5[] = "MEI Controller"; +static const char pci_device_8086_29d6[] = "PT IDER Controller"; +static const char pci_device_8086_29d7[] = "Serial KT Controller"; static const char pci_device_8086_29e0[] = "DRAM Controller"; static const char pci_device_8086_29e1[] = "Host-Primary PCI Express Bridge"; -static const char pci_device_8086_29e4[] = "HECI Controller"; -static const char pci_device_8086_29e5[] = "HECI Controller"; +static const char pci_device_8086_29e4[] = "MEI Controller"; +static const char pci_device_8086_29e5[] = "MEI Controller"; static const char pci_device_8086_29e6[] = "PT IDER Controller"; static const char pci_device_8086_29e7[] = "Serial KT Controller"; static const char pci_device_8086_29e9[] = "Host-Secondary PCI Express Bridge"; static const char pci_device_8086_29f0[] = "Server DRAM Controller"; static const char pci_device_8086_29f1[] = "Server Host-Primary PCI Express Bridge"; -static const char pci_device_8086_29f4[] = "Server HECI Controller"; -static const char pci_device_8086_29f5[] = "Server HECI Controller"; +static const char pci_device_8086_29f4[] = "Server MEI Controller"; +static const char pci_device_8086_29f5[] = "Server MEI Controller"; static const char pci_device_8086_29f6[] = "Server PT IDER Controller"; static const char pci_device_8086_29f7[] = "Server Serial KT Controller"; static const char pci_device_8086_29f9[] = "Server Host-Secondary PCI Express Bridge"; -static const char pci_device_8086_2a00[] = "Mobile Memory Controller Hub"; -static const char pci_device_8086_2a01[] = "Mobile PCI Express Root Port"; -static const char pci_device_8086_2a02[] = "Mobile Integrated Graphics Controller"; -static const char pci_device_8086_2a03[] = "Mobile Integrated Graphics Controller"; -static const char pci_device_8086_2a04[] = "Mobile HECI Controller"; -static const char pci_device_8086_2a05[] = "Mobile HECI Controller"; -static const char pci_device_8086_2a06[] = "Mobile PT IDER Controller"; -static const char pci_device_8086_2a07[] = "Mobile KT Controller"; -static const char pci_device_8086_3092[] = "Integrated RAID"; +static const char pci_device_8086_2a00[] = "Mobile PM965/GM965/GL960 Memory Controller Hub"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_2a00_17aa_20b1[] = "Lenovo Thinkpad T61"; +#endif +static const char pci_device_8086_2a01[] = "Mobile PM965/GM965/GL960 PCI Express Root Port"; +static const char pci_device_8086_2a02[] = "Mobile GM965/GL960 Integrated Graphics Controller"; +static const char pci_device_8086_2a03[] = "Mobile GM965/GL960 Integrated Graphics Controller"; +static const char pci_device_8086_2a04[] = "Mobile PM965/GM965 MEI Controller"; +static const char pci_device_8086_2a05[] = "Mobile PM965/GM965 MEI Controller"; +static const char pci_device_8086_2a06[] = "Mobile PM965/GM965 PT IDER Controller"; +static const char pci_device_8086_2a07[] = "Mobile PM965/GM965 KT Controller"; static const char pci_device_8086_3200[] = "GD31244 PCI-X SATA HBA"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_3200_1775_c200[] = "C2K onboard SATA host bus adapter"; #endif +static const char pci_device_8086_3313[] = "IOP348 I/O Processor (SL8e) in IOC Mode SAS/SATA"; +static const char pci_device_8086_331b[] = "IOP348 I/O Processor (SL8x) in IOC Mode SAS/SATA"; +static const char pci_device_8086_3331[] = "IOC340 I/O Controller (VV8e) SAS/SATA"; +static const char pci_device_8086_3339[] = "IOC340 I/O Controller (VV8x) SAS/SATA"; static const char pci_device_8086_3340[] = "82855PM Processor to I/O Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_3340_1014_0529[] = "Thinkpad T41"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_3340_1025_005a[] = "TravelMate 290"; #endif #ifdef INIT_SUBSYS_INFO @@ -25126,12 +26579,15 @@ static const char pci_subsys_8086_3340_103c_0890[] = "NC6000 laptop"; static const char pci_subsys_8086_3340_103c_08b0[] = "tc1100 tablet"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_3340_144d_c00c[] = "P30 notebook"; +static const char pci_subsys_8086_3340_144d_c00c[] = "P30/P35 notebook"; #endif static const char pci_device_8086_3341[] = "82855PM Processor to AGP Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_3341_144d_c00c[] = "P30 notebook"; #endif +static const char pci_device_8086_3363[] = "IOC340 I/O Controller in IOC Mode SAS/SATA"; +static const char pci_device_8086_33c3[] = "IOP348 I/O Processor (SL8De) in IOC Mode SAS/SATA"; +static const char pci_device_8086_33cb[] = "IOP348 I/O Processor (SL8Dx) in IOC Mode SAS/SATA"; static const char pci_device_8086_3500[] = "6311ESB/6321ESB PCI Express Upstream Port"; static const char pci_device_8086_3501[] = "6310ESB PCI Express Upstream Port"; static const char pci_device_8086_3504[] = "6311ESB/6321ESB I/OxAPIC Interrupt Controller"; @@ -25168,6 +26624,9 @@ static const char pci_subsys_8086_3580_1014_055c[] = "Thinkpad R50e model 1634"; static const char pci_subsys_8086_3580_1028_0139[] = "Latitude D400"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_3580_1028_014f[] = "Latitude X300"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_3580_1028_0163[] = "Latitude D505"; #endif #ifdef INIT_SUBSYS_INFO @@ -25188,6 +26647,12 @@ static const char pci_subsys_8086_3580_4c53_10b0[] = "CL9 mainboard"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_3580_4c53_10e0[] = "PSL09 PrPMC"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_3580_e4bf_0cc9[] = "CC9-SAMBA"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_3580_e4bf_0cd2[] = "CD2-BEBOP"; +#endif static const char pci_device_8086_3581[] = "82852/82855 GM/GME/PM/GMV Processor to AGP Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_3581_1734_1055[] = "Amilo M1420"; @@ -25200,6 +26665,9 @@ static const char pci_subsys_8086_3582_1014_0562[] = "Thinkpad R50e model 1634"; static const char pci_subsys_8086_3582_1028_0139[] = "Latitude D400"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_3582_1028_014f[] = "Latitude X300"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_3582_1028_0163[] = "Latitude D505"; #endif #ifdef INIT_SUBSYS_INFO @@ -25214,6 +26682,12 @@ static const char pci_subsys_8086_3582_4c53_10b0[] = "CL9 mainboard"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_3582_4c53_10e0[] = "PSL09 PrPMC"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_3582_e4bf_0cc9[] = "CC9-SAMBA"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_3582_e4bf_0cd2[] = "CD2-BEBOP"; +#endif static const char pci_device_8086_3584[] = "82852/82855 GM/GME/PM/GMV Processor to I/O Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_3584_1014_055d[] = "Thinkpad R50e model 1634"; @@ -25222,6 +26696,9 @@ static const char pci_subsys_8086_3584_1014_055d[] = "Thinkpad R50e model 1634"; static const char pci_subsys_8086_3584_1028_0139[] = "Latitude D400"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_3584_1028_014f[] = "Latitude X300"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_3584_1028_0163[] = "Latitude D505"; #endif #ifdef INIT_SUBSYS_INFO @@ -25250,6 +26727,9 @@ static const char pci_subsys_8086_3585_1014_055e[] = "Thinkpad R50e model 1634"; static const char pci_subsys_8086_3585_1028_0139[] = "Latitude D400"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_3585_1028_014f[] = "Latitude X300"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_3585_1028_0163[] = "Latitude D505"; #endif #ifdef INIT_SUBSYS_INFO @@ -25272,16 +26752,25 @@ static const char pci_subsys_8086_3585_4c53_10e0[] = "PSL09 PrPMC"; #endif static const char pci_device_8086_3590[] = "E7520 Memory Controller Hub"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_3590_1014_02dd[] = "eServer xSeries server mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_3590_1028_019a[] = "PowerEdge SC1425"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_3590_1734_103e[] = "Primergy RX300 S2"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_3590_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_3590_4c53_10d0[] = "Telum ASLP10 Processor AMC"; #endif static const char pci_device_8086_3591[] = "E7525/E7520 Error Reporting Registers"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_3591_1014_02dd[] = "eServer xSeries server mainboard"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_3591_1028_0169[] = "Precision 470"; #endif #ifdef INIT_SUBSYS_INFO @@ -25291,15 +26780,33 @@ static const char pci_device_8086_3592[] = "E7320 Memory Controller Hub"; static const char pci_device_8086_3593[] = "E7320 Error Reporting Registers"; static const char pci_device_8086_3594[] = "E7520 DMA Controller"; #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_3594_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_3594_4c53_10d0[] = "Telum ASLP10 Processor AMC"; #endif static const char pci_device_8086_3595[] = "E7525/E7520/E7320 PCI Express Port A"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_3595_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif static const char pci_device_8086_3596[] = "E7525/E7520/E7320 PCI Express Port A1"; static const char pci_device_8086_3597[] = "E7525/E7520 PCI Express Port B"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_3597_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif static const char pci_device_8086_3598[] = "E7520 PCI Express Port B1"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_3598_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif static const char pci_device_8086_3599[] = "E7520 PCI Express Port C"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_3599_1775_1100[] = "CR11/VR11 Single Board Computer"; +#endif static const char pci_device_8086_359a[] = "E7520 PCI Express Port C1"; static const char pci_device_8086_359b[] = "E7525/E7520/E7320 Extended Configuration Registers"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_359b_1014_02dd[] = "eServer xSeries server mainboard"; +#endif static const char pci_device_8086_359e[] = "E7525 Memory Controller Hub"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_359e_1028_0169[] = "Precision 470"; @@ -25325,6 +26832,8 @@ static const char pci_device_8086_360e[] = "Server Reserved Registers"; static const char pci_device_8086_360f[] = "Server FBD Branch 0 Registers"; static const char pci_device_8086_3610[] = "Server FBD Branch 1 Registers"; static const char pci_device_8086_4000[] = "Memory Controller Hub"; +static const char pci_device_8086_4001[] = "Memory Controller Hub"; +static const char pci_device_8086_4003[] = "Memory Controller Hub"; static const char pci_device_8086_4008[] = "Memory Controller Hub"; static const char pci_device_8086_4010[] = "Memory Controller Hub"; static const char pci_device_8086_4021[] = "PCI Express Port 1"; @@ -25345,7 +26854,7 @@ static const char pci_device_8086_4035[] = "FBD Registers"; static const char pci_device_8086_4036[] = "FBD Registers"; static const char pci_device_8086_4220[] = "PRO/Wireless 2200BG Network Connection"; #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_8086_4220_2731_8086[] = "WLAN-Adapter"; +static const char pci_subsys_8086_4220_103c_12f6[] = "HP Compaq nw8240 Mobile Workstation"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_4220_8086_2731[] = "Samsung P35 integrated WLAN"; @@ -25372,13 +26881,51 @@ static const char pci_subsys_8086_4227_8086_1011[] = "Thinkpad X60s, R60e model #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_4227_8086_1014[] = "PRO/Wireless 3945BG Network Connection"; #endif +static const char pci_device_8086_4229[] = "PRO/Wireless 4965 AG or AGN Network Connection"; +static const char pci_device_8086_4230[] = "PRO/Wireless 4965 AG or AGN Network Connection"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_4230_8086_1110[] = "Lenovo Thinkpad T61"; +#endif +static const char pci_device_8086_444e[] = "Turbo Memory Controller"; static const char pci_device_8086_5001[] = "Pro/DSL 2100 Modem"; +static const char pci_device_8086_5020[] = "Memory Controller Hub"; +static const char pci_device_8086_5021[] = "DRAM Error Reporting Registers"; +static const char pci_device_8086_5023[] = "EDMA Controller"; +static const char pci_device_8086_5024[] = "PCI Express Port PEA0"; +static const char pci_device_8086_5025[] = "PCI Express Port PEA1"; +static const char pci_device_8086_5028[] = "S-ATA IDE"; +static const char pci_device_8086_5029[] = "S-ATA AHCI"; +static const char pci_device_8086_502a[] = "S-ATA RAID0/1"; +static const char pci_device_8086_502b[] = "S-ATA Reserved"; +static const char pci_device_8086_5031[] = "LPC Bus"; +static const char pci_device_8086_5032[] = "SMBus Controller"; +static const char pci_device_8086_5033[] = "USB 1.1 Controller"; +static const char pci_device_8086_5035[] = "USB 2.0 Controller"; +static const char pci_device_8086_5037[] = "PCI-PCI Bridge (transparent mode)"; +static const char pci_device_8086_5039[] = "Controller Area Network (CAN) interface #1"; +static const char pci_device_8086_503a[] = "Controller Area Network (CAN) interface #2"; +static const char pci_device_8086_503b[] = "Synchronous Serial Port (SPP)"; +static const char pci_device_8086_503c[] = "IEEE 1588 Hardware Assist"; +static const char pci_device_8086_503d[] = "Local Expansion Bus"; +static const char pci_device_8086_503e[] = "Global Control Unit (GCU)"; +static const char pci_device_8086_5040[] = "Gigabit Ethernet MAC"; +static const char pci_device_8086_5041[] = "Gigabit Ethernet MAC"; +static const char pci_device_8086_5042[] = "Gigabit Ethernet MAC"; +static const char pci_device_8086_5043[] = "Gigabit Ethernet MAC"; +static const char pci_device_8086_5044[] = "Gigabit Ethernet MAC"; +static const char pci_device_8086_5045[] = "Gigabit Ethernet MAC"; +static const char pci_device_8086_5046[] = "Gigabit Ethernet MAC"; +static const char pci_device_8086_5047[] = "Gigabit Ethernet MAC"; +static const char pci_device_8086_5048[] = "Gigabit Ethernet MAC"; +static const char pci_device_8086_5049[] = "Gigabit Ethernet MAC"; +static const char pci_device_8086_504a[] = "Gigabit Ethernet MAC"; +static const char pci_device_8086_504b[] = "Gigabit Ethernet MAC"; static const char pci_device_8086_5200[] = "EtherExpress PRO/100 Intelligent Server"; static const char pci_device_8086_5201[] = "EtherExpress PRO/100 Intelligent Server"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_5201_8086_0001[] = "EtherExpress PRO/100 Server Ethernet Adapter"; #endif -static const char pci_device_8086_530d[] = "80310 IOP [IO Processor]"; +static const char pci_device_8086_530d[] = "80310 (IOP) IO Processor"; static const char pci_device_8086_65c0[] = "Memory Controller Hub"; static const char pci_device_8086_65e2[] = "PCI Express x4 Port 2"; static const char pci_device_8086_65e3[] = "PCI Express x4 Port 3"; @@ -25419,14 +26966,14 @@ static const char pci_device_8086_7113[] = "82371AB/EB/MB PIIX4 ACPI"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_7113_15ad_1976[] = "virtualHW v3"; #endif -static const char pci_device_8086_7120[] = "82810 GMCH [Graphics Memory Controller Hub]"; +static const char pci_device_8086_7120[] = "82810 GMCH (Graphics Memory Controller Hub)"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_7120_4c53_1040[] = "CL7 mainboard"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_7120_4c53_1060[] = "PC7 mainboard"; #endif -static const char pci_device_8086_7121[] = "82810 CGC [Chipset Graphics Controller]"; +static const char pci_device_8086_7121[] = "82810 (CGC) Chipset Graphics Controller"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_7121_4c53_1040[] = "CL7 mainboard"; #endif @@ -25436,10 +26983,16 @@ static const char pci_subsys_8086_7121_4c53_1060[] = "PC7 mainboard"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_7121_8086_4341[] = "Cayman (CA810) Mainboard"; #endif -static const char pci_device_8086_7122[] = "82810 DC-100 GMCH [Graphics Memory Controller Hub]"; -static const char pci_device_8086_7123[] = "82810 DC-100 CGC [Chipset Graphics Controller]"; -static const char pci_device_8086_7124[] = "82810E DC-133 GMCH [Graphics Memory Controller Hub]"; -static const char pci_device_8086_7125[] = "82810E DC-133 CGC [Chipset Graphics Controller]"; +static const char pci_device_8086_7122[] = "82810 DC-100 (GMCH) Graphics Memory Controller Hub"; +static const char pci_device_8086_7123[] = "82810 DC-100 (CGC) Chipset Graphics Controller"; +static const char pci_device_8086_7124[] = "82810E DC-133 (GMCH) Graphics Memory Controller Hub"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_7124_1028_00b4[] = "OptiPlex GX110"; +#endif +static const char pci_device_8086_7125[] = "82810E DC-133 (CGC) Chipset Graphics Controller"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_8086_7125_1028_00b4[] = "OptiPlex GX110"; +#endif static const char pci_device_8086_7126[] = "82810 DC-133 System and Graphics Controller"; static const char pci_device_8086_7128[] = "82810-M DC-100 System and Graphics Controller"; static const char pci_device_8086_712a[] = "82810-M DC-133 System and Graphics Controller"; @@ -25541,6 +27094,7 @@ static const char pci_subsys_8086_7800_8086_0000[] = "Terminator 2x/i"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_8086_7800_8086_0100[] = "Intel740 Graphics Accelerator"; #endif +static const char pci_device_8086_8002[] = "Trusted Execution Technology Registers"; static const char pci_device_8086_84c4[] = "450KX/GX [Orion] - 82454KX/GX PCI bridge"; static const char pci_device_8086_84c5[] = "450KX/GX [Orion] - 82453KX/GX Memory controller"; static const char pci_device_8086_84ca[] = "450NX - 82451NX Memory & I/O Controller"; @@ -25593,6 +27147,17 @@ static const char pci_subsys_8086_b555_4c53_1051[] = "CE7 mainboard"; static const char pci_subsys_8086_b555_e4bf_1000[] = "CC8-1-BLUES"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_80ee[] = "InnoTek Systemberatung GmbH"; +static const char pci_device_80ee_beef[] = "VirtualBox Graphics Adapter"; +static const char pci_device_80ee_cafe[] = "VirtualBox Guest Service"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const char pci_vendor_8384[] = "Sigmatel"; +static const char pci_device_8384_7618[] = "High Definition Audio Codec"; +static const char pci_device_8384_7670[] = "9770 High Definition Audio"; +static const char pci_device_8384_7672[] = "9772 High Definition Audio"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_8401[] = "TRENDware International Inc."; #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -25882,6 +27447,8 @@ static const char pci_subsys_9005_008f_1179_0001[] = "Magnia Z310"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_9005_008f_15d9_9005[] = "Onboard SCSI Host Adapter"; #endif +static const char pci_device_9005_0092[] = "AVC-2010 [VideoH!]"; +static const char pci_device_9005_0093[] = "AVC-2410 [VideoH!]"; static const char pci_device_9005_00c0[] = "AHA-3960D / AIC-7899A U160/m"; #endif #ifdef INIT_SUBSYS_INFO @@ -25967,6 +27534,33 @@ static const char pci_subsys_9005_0285_1028_0291[] = "CERC SATA RAID 2 PCI SATA static const char pci_subsys_9005_0285_103c_3227[] = "AAR-2610SA"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_108e_0286[] = "STK RAID INT"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_108e_0287[] = "STK RAID EXT"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_108e_7aac[] = "STK RAID REM"; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_15d9_02b5[] = "AOC-USAS-S4i"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_15d9_02b6[] = "AOC-USAS-S8i"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_15d9_02c9[] = "AOC-USAS-S4iR"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_15d9_02ca[] = "AOC-USAS-S8iR"; +#endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_9005_0285_17aa_0286[] = "Legend S220 (Legend Crusader)"; #endif @@ -26019,7 +27613,7 @@ static const char pci_subsys_9005_0285_9005_0296[] = "ASR-2240S"; static const char pci_subsys_9005_0285_9005_0297[] = "ASR-4005SAS"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_9005_0285_9005_0298[] = "ASR-4000SAS"; +static const char pci_subsys_9005_0285_9005_0298[] = "ASR-4000"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_9005_0285_9005_0299[] = "ASR-4800SAS"; @@ -26028,6 +27622,12 @@ static const char pci_subsys_9005_0285_9005_0299[] = "ASR-4800SAS"; static const char pci_subsys_9005_0285_9005_029a[] = "4805SAS"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02a4[] = "ICP ICP9085LI"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02a5[] = "ICP ICP5085BR"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_9005_0285_9005_02b5[] = "ASR5800"; #endif #ifdef INIT_SUBSYS_INFO @@ -26036,6 +27636,57 @@ static const char pci_subsys_9005_0285_9005_02b6[] = "ASR5805"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_9005_0285_9005_02b7[] = "ASR5808"; #endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02b8[] = "ICP5445SL"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02b9[] = "ICP5085SL"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02ba[] = "ICP5805SL"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02bb[] = "3405"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02bc[] = "3805"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02bd[] = "31205"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02be[] = "31605"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02bf[] = "ICP ICP5045BL"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02c0[] = "ICP ICP5085BL"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02c1[] = "ICP ICP5125BR"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02c2[] = "ICP ICP5165BR"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02c3[] = "51205"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02c4[] = "51605"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02c5[] = "ICP ICP5125SL"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02c6[] = "ICP ICP5165SL"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02c7[] = "3085"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0285_9005_02c8[] = "ICP5805BL"; +#endif static const char pci_device_9005_0286[] = "AAC-RAID (Rocket)"; #ifdef INIT_SUBSYS_INFO static const char pci_subsys_9005_0286_1014_034d[] = "8s"; @@ -26074,7 +27725,7 @@ static const char pci_subsys_9005_0286_9005_02a0[] = "ICP ICP9047MA"; static const char pci_subsys_9005_0286_9005_02a1[] = "ICP ICP9087MA"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_9005_0286_9005_02a2[] = "3800SAS"; +static const char pci_subsys_9005_0286_9005_02a2[] = "3800"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_9005_0286_9005_02a3[] = "ICP ICP5445AU"; @@ -26089,10 +27740,10 @@ static const char pci_subsys_9005_0286_9005_02a5[] = "ICP ICP5085BR"; static const char pci_subsys_9005_0286_9005_02a6[] = "ICP9067MA"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_9005_0286_9005_02a7[] = "3805SAS"; +static const char pci_subsys_9005_0286_9005_02a7[] = "3805"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_9005_0286_9005_02a8[] = "3400SAS"; +static const char pci_subsys_9005_0286_9005_02a8[] = "3400"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_9005_0286_9005_02a9[] = "ICP ICP5085AU"; @@ -26101,10 +27752,10 @@ static const char pci_subsys_9005_0286_9005_02a9[] = "ICP ICP5085AU"; static const char pci_subsys_9005_0286_9005_02aa[] = "ICP ICP5045AU"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_9005_0286_9005_02ac[] = "1800SAS"; +static const char pci_subsys_9005_0286_9005_02ac[] = "1800"; #endif #ifdef INIT_SUBSYS_INFO -static const char pci_subsys_9005_0286_9005_02b3[] = "ASR-2400SAS"; +static const char pci_subsys_9005_0286_9005_02b3[] = "2400"; #endif #ifdef INIT_SUBSYS_INFO static const char pci_subsys_9005_0286_9005_02b4[] = "ICP ICP5045AL"; @@ -26153,6 +27804,9 @@ static const char pci_device_9005_0503[] = "Scamp chipset SCSI controller"; static const char pci_subsys_9005_0503_1014_02bf[] = "Quad Channel PCI-X DDR U320 SCSI RAID Adapter (571E)"; #endif #ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_0503_1014_02c3[] = "PCI-X DDR 3Gb SAS RAID Adapter (572F)"; +#endif +#ifdef INIT_SUBSYS_INFO static const char pci_subsys_9005_0503_1014_02d5[] = "Quad Channel PCI-X DDR U320 SCSI RAID Adapter (571F)"; #endif static const char pci_device_9005_0910[] = "AUA-3100B"; @@ -26175,8 +27829,17 @@ static const char pci_device_9005_8014[] = "ASC-29320LP U320"; static const char pci_device_9005_8015[] = "ASC-39320B U320"; static const char pci_device_9005_8016[] = "ASC-39320A U320"; static const char pci_device_9005_8017[] = "ASC-29320ALP U320"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_8017_9005_0044[] = "ASC-29320ALP PCIx U320"; +#endif +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_8017_9005_0045[] = "ASC-29320LPE PCIe U320"; +#endif static const char pci_device_9005_801c[] = "ASC-39320D U320"; static const char pci_device_9005_801d[] = "AIC-7902B U320"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_801d_1014_02cc[] = "ServeRAID 7e"; +#endif static const char pci_device_9005_801e[] = "AIC-7901A U320"; static const char pci_device_9005_801f[] = "AIC-7902 U320"; #ifdef INIT_SUBSYS_INFO @@ -26194,6 +27857,9 @@ static const char pci_device_9005_8096[] = "ASC-39320A U320 w/HostRAID"; static const char pci_device_9005_8097[] = "ASC-29320ALP U320 w/HostRAID"; static const char pci_device_9005_809c[] = "ASC-39320D(B) U320 w/HostRAID"; static const char pci_device_9005_809d[] = "AIC-7902(B) U320 w/HostRAID"; +#ifdef INIT_SUBSYS_INFO +static const char pci_subsys_9005_809d_1014_02cc[] = "ServeRAID 7e"; +#endif static const char pci_device_9005_809e[] = "AIC-7901A U320 w/HostRAID"; static const char pci_device_9005_809f[] = "AIC-7902 U320 w/HostRAID"; #endif @@ -26326,13 +27992,15 @@ static const char pci_device_cddd_0200[] = "DeepSea 2 High Speed Stereo Vision F #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_d161[] = "Digium, Inc."; -static const char pci_device_d161_0205[] = "Wildcard TE205P"; -static const char pci_device_d161_0210[] = "Wildcard TE210P"; -static const char pci_device_d161_0405[] = "Wildcard TE405P Quad-Span togglable E1/T1/J1 card 5.0v"; -static const char pci_device_d161_0406[] = "Wildcard TE406P Quad-Span togglable E1/T1/J1 echo cancellation card 5.0v"; -static const char pci_device_d161_0410[] = "Wildcard TE410P Quad-Span togglable E1/T1/J1 card 3.3v"; -static const char pci_device_d161_0411[] = "Wildcard TE411P Quad-Span togglable E1/T1/J1 echo cancellation card 3.3v"; -static const char pci_device_d161_2400[] = "Wildcard TDM2400P"; +static const char pci_device_d161_0120[] = "Wildcard TE120P single-span T1/E1/J1 card"; +static const char pci_device_d161_0205[] = "Wildcard TE205P dual-span T1/E1/J1 card 5.0V"; +static const char pci_device_d161_0210[] = "Wildcard TE210P dual-span T1/E1/J1 card 3.3V"; +static const char pci_device_d161_0405[] = "Wildcard TE405P quad-span T1/E1/J1 card 5.0V"; +static const char pci_device_d161_0410[] = "Wildcard TE410P quad-span T1/E1/J1 card 3.3V"; +static const char pci_device_d161_0800[] = "Wildcard TDM800P 8-port analog card"; +static const char pci_device_d161_2400[] = "Wildcard TDM2400P 24-port analog card"; +static const char pci_device_d161_3400[] = "Wildcard TC400P transcoder base card"; +static const char pci_device_d161_b410[] = "Wildcard B410 quad-BRI card"; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const char pci_vendor_d4d4[] = "Dy4 Systems Inc"; @@ -26471,6 +28139,10 @@ static const char pci_device_fffe_0710[] = "Virtual SVGA"; static const char pci_vendor_ffff[] = "Illegal Vendor ID"; #endif #ifdef INIT_SUBSYS_INFO +static const pciSubsystemInfo pci_ss_info_0e11_0046_0e11_4091 = + {0x0e11, 0x4091, pci_subsys_0e11_0046_0e11_4091, 0}; +#undef pci_ss_info_0e11_4091 +#define pci_ss_info_0e11_4091 pci_ss_info_0e11_0046_0e11_4091 static const pciSubsystemInfo pci_ss_info_0e11_0046_0e11_409a = {0x0e11, 0x409a, pci_subsys_0e11_0046_0e11_409a, 0}; #undef pci_ss_info_0e11_409a @@ -26763,6 +28435,12 @@ static const pciSubsystemInfo pci_ss_info_1000_0040_1000_0066 = #undef pci_ss_info_1000_0066 #define pci_ss_info_1000_0066 pci_ss_info_1000_0040_1000_0066 #endif +static const pciSubsystemInfo pci_ss_info_1000_0054_1028_1f09 = + {0x1028, 0x1f09, pci_subsys_1000_0054_1028_1f09, 0}; +#undef pci_ss_info_1028_1f09 +#define pci_ss_info_1028_1f09 pci_ss_info_1000_0054_1028_1f09 +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif static const pciSubsystemInfo pci_ss_info_1000_0055_1033_8336 = {0x1033, 0x8336, pci_subsys_1000_0055_1033_8336, 0}; #undef pci_ss_info_1033_8336 @@ -26796,6 +28474,10 @@ static const pciSubsystemInfo pci_ss_info_1000_0060_1000_1012 = {0x1000, 0x1012, pci_subsys_1000_0060_1000_1012, 0}; #undef pci_ss_info_1000_1012 #define pci_ss_info_1000_1012 pci_ss_info_1000_0060_1000_1012 +static const pciSubsystemInfo pci_ss_info_1000_0060_1000_1016 = + {0x1000, 0x1016, pci_subsys_1000_0060_1000_1016, 0}; +#undef pci_ss_info_1000_1016 +#define pci_ss_info_1000_1016 pci_ss_info_1000_0060_1000_1016 static const pciSubsystemInfo pci_ss_info_1000_0060_1014_0363 = {0x1014, 0x0363, pci_subsys_1000_0060_1014_0363, 0}; #undef pci_ss_info_1014_0363 @@ -26808,6 +28490,10 @@ static const pciSubsystemInfo pci_ss_info_1000_0060_1014_0365 = {0x1014, 0x0365, pci_subsys_1000_0060_1014_0365, 0}; #undef pci_ss_info_1014_0365 #define pci_ss_info_1014_0365 pci_ss_info_1000_0060_1014_0365 +static const pciSubsystemInfo pci_ss_info_1000_0060_1014_0379 = + {0x1014, 0x0379, pci_subsys_1000_0060_1014_0379, 0}; +#undef pci_ss_info_1014_0379 +#define pci_ss_info_1014_0379 pci_ss_info_1000_0060_1014_0379 #endif static const pciSubsystemInfo pci_ss_info_1000_0060_1028_1f0a = {0x1028, 0x1f0a, pci_subsys_1000_0060_1028_1f0a, 0}; @@ -26847,6 +28533,24 @@ static const pciSubsystemInfo pci_ss_info_1000_0060_1170_002f = #undef pci_ss_info_1170_002f #define pci_ss_info_1170_002f pci_ss_info_1000_0060_1170_002f #endif +static const pciSubsystemInfo pci_ss_info_1000_0060_8086_1006 = + {0x8086, 0x1006, pci_subsys_1000_0060_8086_1006, 0}; +#undef pci_ss_info_8086_1006 +#define pci_ss_info_8086_1006 pci_ss_info_1000_0060_8086_1006 +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +static const pciSubsystemInfo pci_ss_info_1000_0060_8086_100a = + {0x8086, 0x100a, pci_subsys_1000_0060_8086_100a, 0}; +#undef pci_ss_info_8086_100a +#define pci_ss_info_8086_100a pci_ss_info_1000_0060_8086_100a +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +static const pciSubsystemInfo pci_ss_info_1000_0060_8086_1010 = + {0x8086, 0x1010, pci_subsys_1000_0060_8086_1010, 0}; +#undef pci_ss_info_8086_1010 +#define pci_ss_info_8086_1010 pci_ss_info_1000_0060_8086_1010 +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif static const pciSubsystemInfo pci_ss_info_1000_0060_8086_34cc = {0x8086, 0x34cc, pci_subsys_1000_0060_8086_34cc, 0}; #undef pci_ss_info_8086_34cc @@ -27315,10 +29019,18 @@ static const pciSubsystemInfo pci_ss_info_1002_4370_1025_0079 = {0x1025, 0x0079, pci_subsys_1002_4370_1025_0079, 0}; #undef pci_ss_info_1025_0079 #define pci_ss_info_1025_0079 pci_ss_info_1002_4370_1025_0079 +static const pciSubsystemInfo pci_ss_info_1002_4370_1025_0091 = + {0x1025, 0x0091, pci_subsys_1002_4370_1025_0091, 0}; +#undef pci_ss_info_1025_0091 +#define pci_ss_info_1025_0091 pci_ss_info_1002_4370_1025_0091 static const pciSubsystemInfo pci_ss_info_1002_4370_103c_308b = {0x103c, 0x308b, pci_subsys_1002_4370_103c_308b, 0}; #undef pci_ss_info_103c_308b #define pci_ss_info_103c_308b pci_ss_info_1002_4370_103c_308b +static const pciSubsystemInfo pci_ss_info_1002_4370_105b_0c81 = + {0x105b, 0x0c81, pci_subsys_1002_4370_105b_0c81, 0}; +#undef pci_ss_info_105b_0c81 +#define pci_ss_info_105b_0c81 pci_ss_info_1002_4370_105b_0c81 static const pciSubsystemInfo pci_ss_info_1002_4370_107b_0300 = {0x107b, 0x0300, pci_subsys_1002_4370_107b_0300, 0}; #undef pci_ss_info_107b_0300 @@ -27763,6 +29475,10 @@ static const pciSubsystemInfo pci_ss_info_1002_4c57_1028_012a = {0x1028, 0x012a, pci_subsys_1002_4c57_1028_012a, 0}; #undef pci_ss_info_1028_012a #define pci_ss_info_1028_012a pci_ss_info_1002_4c57_1028_012a +static const pciSubsystemInfo pci_ss_info_1002_4c57_1043_1622 = + {0x1043, 0x1622, pci_subsys_1002_4c57_1043_1622, 0}; +#undef pci_ss_info_1043_1622 +#define pci_ss_info_1043_1622 pci_ss_info_1002_4c57_1043_1622 static const pciSubsystemInfo pci_ss_info_1002_4c57_144d_c006 = {0x144d, 0xc006, pci_subsys_1002_4c57_144d_c006, 0}; #undef pci_ss_info_144d_c006 @@ -27791,6 +29507,10 @@ static const pciSubsystemInfo pci_ss_info_1002_4c59_1509_1930 = {0x1509, 0x1930, pci_subsys_1002_4c59_1509_1930, 0}; #undef pci_ss_info_1509_1930 #define pci_ss_info_1509_1930 pci_ss_info_1002_4c59_1509_1930 +static const pciSubsystemInfo pci_ss_info_1002_4c66_1014_054d = + {0x1014, 0x054d, pci_subsys_1002_4c66_1014_054d, 0}; +#undef pci_ss_info_1014_054d +#define pci_ss_info_1014_054d pci_ss_info_1002_4c66_1014_054d static const pciSubsystemInfo pci_ss_info_1002_4e44_1002_515e = {0x1002, 0x515e, pci_subsys_1002_4e44_1002_515e, 0}; #undef pci_ss_info_1002_515e @@ -28199,6 +29919,10 @@ static const pciSubsystemInfo pci_ss_info_1002_5452_103c_1279 = {0x103c, 0x1279, pci_subsys_1002_5452_103c_1279, 0}; #undef pci_ss_info_103c_1279 #define pci_ss_info_103c_1279 pci_ss_info_1002_5452_103c_1279 +static const pciSubsystemInfo pci_ss_info_1002_5460_1775_1100 = + {0x1775, 0x1100, pci_subsys_1002_5460_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_1002_5460_1775_1100 static const pciSubsystemInfo pci_ss_info_1002_5653_1025_0080 = {0x1025, 0x0080, pci_subsys_1002_5653_1025_0080, 0}; #undef pci_ss_info_1025_0080 @@ -28207,6 +29931,10 @@ static const pciSubsystemInfo pci_ss_info_1002_5654_1002_5654 = {0x1002, 0x5654, pci_subsys_1002_5654_1002_5654, 0}; #undef pci_ss_info_1002_5654 #define pci_ss_info_1002_5654 pci_ss_info_1002_5654_1002_5654 +static const pciSubsystemInfo pci_ss_info_1002_5940_17af_2021 = + {0x17af, 0x2021, pci_subsys_1002_5940_17af_2021, 0}; +#undef pci_ss_info_17af_2021 +#define pci_ss_info_17af_2021 pci_ss_info_1002_5940_17af_2021 static const pciSubsystemInfo pci_ss_info_1002_5941_1458_4019 = {0x1458, 0x4019, pci_subsys_1002_5941_1458_4019, 0}; #undef pci_ss_info_1458_4019 @@ -28243,6 +29971,10 @@ static const pciSubsystemInfo pci_ss_info_1002_5955_103c_308b = {0x103c, 0x308b, pci_subsys_1002_5955_103c_308b, 0}; #undef pci_ss_info_103c_308b #define pci_ss_info_103c_308b pci_ss_info_1002_5955_103c_308b +static const pciSubsystemInfo pci_ss_info_1002_5960_17af_2020 = + {0x17af, 0x2020, pci_subsys_1002_5960_17af_2020, 0}; +#undef pci_ss_info_17af_2020 +#define pci_ss_info_17af_2020 pci_ss_info_1002_5960_17af_2020 static const pciSubsystemInfo pci_ss_info_1002_5961_1002_2f72 = {0x1002, 0x2f72, pci_subsys_1002_5961_1002_2f72, 0}; #undef pci_ss_info_1002_2f72 @@ -28367,6 +30099,10 @@ static const pciSubsystemInfo pci_ss_info_1002_5d44_1458_4032 = {0x1458, 0x4032, pci_subsys_1002_5d44_1458_4032, 0}; #undef pci_ss_info_1458_4032 #define pci_ss_info_1458_4032 pci_ss_info_1002_5d44_1458_4032 +static const pciSubsystemInfo pci_ss_info_1002_5d44_147b_6190 = + {0x147b, 0x6190, pci_subsys_1002_5d44_147b_6190, 0}; +#undef pci_ss_info_147b_6190 +#define pci_ss_info_147b_6190 pci_ss_info_1002_5d44_147b_6190 static const pciSubsystemInfo pci_ss_info_1002_5d44_174b_7c12 = {0x174b, 0x7c12, pci_subsys_1002_5d44_174b_7c12, 0}; #undef pci_ss_info_174b_7c12 @@ -28497,6 +30233,26 @@ static const pciSubsystemInfo pci_ss_info_100b_0020_1385_f311 = {0x1385, 0xf311, pci_subsys_100b_0020_1385_f311, 0}; #undef pci_ss_info_1385_f311 #define pci_ss_info_1385_f311 pci_ss_info_100b_0020_1385_f311 +static const pciSubsystemInfo pci_ss_info_100b_0502_100b_0502 = + {0x100b, 0x0502, pci_subsys_100b_0502_100b_0502, 0}; +#undef pci_ss_info_100b_0502 +#define pci_ss_info_100b_0502 pci_ss_info_100b_0502_100b_0502 +static const pciSubsystemInfo pci_ss_info_100b_0503_100b_0503 = + {0x100b, 0x0503, pci_subsys_100b_0503_100b_0503, 0}; +#undef pci_ss_info_100b_0503 +#define pci_ss_info_100b_0503 pci_ss_info_100b_0503_100b_0503 +static const pciSubsystemInfo pci_ss_info_100b_0510_100b_0500 = + {0x100b, 0x0500, pci_subsys_100b_0510_100b_0500, 0}; +#undef pci_ss_info_100b_0500 +#define pci_ss_info_100b_0500 pci_ss_info_100b_0510_100b_0500 +static const pciSubsystemInfo pci_ss_info_100b_0511_100b_0501 = + {0x100b, 0x0501, pci_subsys_100b_0511_100b_0501, 0}; +#undef pci_ss_info_100b_0501 +#define pci_ss_info_100b_0501 pci_ss_info_100b_0511_100b_0501 +static const pciSubsystemInfo pci_ss_info_100b_0515_100b_0505 = + {0x100b, 0x0505, pci_subsys_100b_0515_100b_0505, 0}; +#undef pci_ss_info_100b_0505 +#define pci_ss_info_100b_0505 pci_ss_info_100b_0515_100b_0505 static const pciSubsystemInfo pci_ss_info_1011_0009_1025_0310 = {0x1025, 0x0310, pci_subsys_1011_0009_1025_0310, 0}; #undef pci_ss_info_1025_0310 @@ -28980,6 +30736,14 @@ static const pciSubsystemInfo pci_ss_info_1014_01bd_1014_0259 = {0x1014, 0x0259, pci_subsys_1014_01bd_1014_0259, 0}; #undef pci_ss_info_1014_0259 #define pci_ss_info_1014_0259 pci_ss_info_1014_01bd_1014_0259 +static const pciSubsystemInfo pci_ss_info_1014_01ef_1734_102b = + {0x1734, 0x102b, pci_subsys_1014_01ef_1734_102b, 0}; +#undef pci_ss_info_1734_102b +#define pci_ss_info_1734_102b pci_ss_info_1014_01ef_1734_102b +static const pciSubsystemInfo pci_ss_info_1014_01ef_1734_10f8 = + {0x1734, 0x10f8, pci_subsys_1014_01ef_1734_10f8, 0}; +#undef pci_ss_info_1734_10f8 +#define pci_ss_info_1734_10f8 pci_ss_info_1014_01ef_1734_10f8 static const pciSubsystemInfo pci_ss_info_1014_0219_1014_021a = {0x1014, 0x021a, pci_subsys_1014_0219_1014_021a, 0}; #undef pci_ss_info_1014_021a @@ -29016,6 +30780,28 @@ static const pciSubsystemInfo pci_ss_info_1014_02bd_1014_02c2 = {0x1014, 0x02c2, pci_subsys_1014_02bd_1014_02c2, 0}; #undef pci_ss_info_1014_02c2 #define pci_ss_info_1014_02c2 pci_ss_info_1014_02bd_1014_02c2 +static const pciSubsystemInfo pci_ss_info_1014_02bd_1014_0338 = + {0x1014, 0x0338, pci_subsys_1014_02bd_1014_0338, 0}; +#undef pci_ss_info_1014_0338 +#define pci_ss_info_1014_0338 pci_ss_info_1014_02bd_1014_0338 +static const pciSubsystemInfo pci_ss_info_1014_0339_1014_0360 = + {0x1014, 0x0360, pci_subsys_1014_0339_1014_0360, 0}; +#undef pci_ss_info_1014_0360 +#define pci_ss_info_1014_0360 pci_ss_info_1014_0339_1014_0360 +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_101a_1dc1_101a_0019 = + {0x101a, 0x0019, pci_subsys_101a_1dc1_101a_0019, 0}; +#undef pci_ss_info_101a_0019 +#define pci_ss_info_101a_0019 pci_ss_info_101a_1dc1_101a_0019 +static const pciSubsystemInfo pci_ss_info_101a_1dc1_101a_001f = + {0x101a, 0x001f, pci_subsys_101a_1dc1_101a_001f, 0}; +#undef pci_ss_info_101a_001f +#define pci_ss_info_101a_001f pci_ss_info_101a_1dc1_101a_001f +static const pciSubsystemInfo pci_ss_info_101a_1dc1_101a_0ece = + {0x101a, 0x0ece, pci_subsys_101a_1dc1_101a_0ece, 0}; +#undef pci_ss_info_101a_0ece +#define pci_ss_info_101a_0ece pci_ss_info_101a_1dc1_101a_0ece #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_101e_1960_101e_0471 = @@ -29345,6 +31131,10 @@ static const pciSubsystemInfo pci_ss_info_1028_0015_1028_1f02 = {0x1028, 0x1f02, pci_subsys_1028_0015_1028_1f02, 0}; #undef pci_ss_info_1028_1f02 #define pci_ss_info_1028_1f02 pci_ss_info_1028_0015_1028_1f02 +static const pciSubsystemInfo pci_ss_info_1028_0015_1028_1f03 = + {0x1028, 0x1f03, pci_subsys_1028_0015_1028_1f03, 0}; +#undef pci_ss_info_1028_1f03 +#define pci_ss_info_1028_1f03 pci_ss_info_1028_0015_1028_1f03 #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_102a_001f_9005_000f = {0x9005, 0x000f, pci_subsys_102a_001f_9005_000f, 0}; @@ -29853,6 +31643,10 @@ static const pciSubsystemInfo pci_ss_info_102b_2538_102b_0907 = {0x102b, 0x0907, pci_subsys_102b_2538_102b_0907, 0}; #undef pci_ss_info_102b_0907 #define pci_ss_info_102b_0907 pci_ss_info_102b_2538_102b_0907 +static const pciSubsystemInfo pci_ss_info_102b_2538_102b_0947 = + {0x102b, 0x0947, pci_subsys_102b_2538_102b_0947, 0}; +#undef pci_ss_info_102b_0947 +#define pci_ss_info_102b_0947 pci_ss_info_102b_2538_102b_0947 static const pciSubsystemInfo pci_ss_info_102b_2538_102b_1047 = {0x102b, 0x1047, pci_subsys_102b_2538_102b_1047, 0}; #undef pci_ss_info_102b_1047 @@ -30015,6 +31809,10 @@ static const pciSubsystemInfo pci_ss_info_1033_00e0_807d_1043 = {0x807d, 0x1043, pci_subsys_1033_00e0_807d_1043, 0}; #undef pci_ss_info_807d_1043 #define pci_ss_info_807d_1043 pci_ss_info_1033_00e0_807d_1043 +static const pciSubsystemInfo pci_ss_info_1039_0182_1734_1095 = + {0x1734, 0x1095, pci_subsys_1039_0182_1734_1095, 0}; +#undef pci_ss_info_1734_1095 +#define pci_ss_info_1734_1095 pci_ss_info_1039_0182_1734_1095 static const pciSubsystemInfo pci_ss_info_1039_0200_1039_0000 = {0x1039, 0x0000, pci_subsys_1039_0200_1039_0000, 0}; #undef pci_ss_info_1039_0000 @@ -30023,6 +31821,10 @@ static const pciSubsystemInfo pci_ss_info_1039_0300_107d_2720 = {0x107d, 0x2720, pci_subsys_1039_0300_107d_2720, 0}; #undef pci_ss_info_107d_2720 #define pci_ss_info_107d_2720 pci_ss_info_1039_0300_107d_2720 +static const pciSubsystemInfo pci_ss_info_1039_0761_1734_1099 = + {0x1734, 0x1099, pci_subsys_1039_0761_1734_1099, 0}; +#undef pci_ss_info_1734_1099 +#define pci_ss_info_1734_1099 pci_ss_info_1039_0761_1734_1099 static const pciSubsystemInfo pci_ss_info_1039_0900_1019_0a14 = {0x1019, 0x0a14, pci_subsys_1039_0900_1019_0a14, 0}; #undef pci_ss_info_1019_0a14 @@ -30055,6 +31857,10 @@ static const pciSubsystemInfo pci_ss_info_1039_5513_1462_7010 = {0x1462, 0x7010, pci_subsys_1039_5513_1462_7010, 0}; #undef pci_ss_info_1462_7010 #define pci_ss_info_1462_7010 pci_ss_info_1039_5513_1462_7010 +static const pciSubsystemInfo pci_ss_info_1039_5513_1734_1095 = + {0x1734, 0x1095, pci_subsys_1039_5513_1734_1095, 0}; +#undef pci_ss_info_1734_1095 +#define pci_ss_info_1734_1095 pci_ss_info_1039_5513_1734_1095 static const pciSubsystemInfo pci_ss_info_1039_6300_1019_0970 = {0x1019, 0x0970, pci_subsys_1039_6300_1019_0970, 0}; #undef pci_ss_info_1019_0970 @@ -30095,6 +31901,18 @@ static const pciSubsystemInfo pci_ss_info_1039_6330_1039_6330 = {0x1039, 0x6330, pci_subsys_1039_6330_1039_6330, 0}; #undef pci_ss_info_1039_6330 #define pci_ss_info_1039_6330 pci_ss_info_1039_6330_1039_6330 +static const pciSubsystemInfo pci_ss_info_1039_6330_1043_8113 = + {0x1043, 0x8113, pci_subsys_1039_6330_1043_8113, 0}; +#undef pci_ss_info_1043_8113 +#define pci_ss_info_1043_8113 pci_ss_info_1039_6330_1043_8113 +static const pciSubsystemInfo pci_ss_info_1039_6330_1458_d000 = + {0x1458, 0xd000, pci_subsys_1039_6330_1458_d000, 0}; +#undef pci_ss_info_1458_d000 +#define pci_ss_info_1458_d000 pci_ss_info_1039_6330_1458_d000 +static const pciSubsystemInfo pci_ss_info_1039_6330_1734_1099 = + {0x1734, 0x1099, pci_subsys_1039_6330_1734_1099, 0}; +#undef pci_ss_info_1734_1099 +#define pci_ss_info_1734_1099 pci_ss_info_1039_6330_1734_1099 static const pciSubsystemInfo pci_ss_info_1039_7001_1019_0a14 = {0x1019, 0x0a14, pci_subsys_1039_7001_1019_0a14, 0}; #undef pci_ss_info_1019_0a14 @@ -30111,6 +31929,10 @@ static const pciSubsystemInfo pci_ss_info_1039_7001_1462_7010 = {0x1462, 0x7010, pci_subsys_1039_7001_1462_7010, 0}; #undef pci_ss_info_1462_7010 #define pci_ss_info_1462_7010 pci_ss_info_1039_7001_1462_7010 +static const pciSubsystemInfo pci_ss_info_1039_7001_1734_1095 = + {0x1734, 0x1095, pci_subsys_1039_7001_1734_1095, 0}; +#undef pci_ss_info_1734_1095 +#define pci_ss_info_1734_1095 pci_ss_info_1039_7001_1734_1095 static const pciSubsystemInfo pci_ss_info_1039_7002_1462_7010 = {0x1462, 0x7010, pci_subsys_1039_7002_1462_7010, 0}; #undef pci_ss_info_1462_7010 @@ -30119,6 +31941,10 @@ static const pciSubsystemInfo pci_ss_info_1039_7002_1509_7002 = {0x1509, 0x7002, pci_subsys_1039_7002_1509_7002, 0}; #undef pci_ss_info_1509_7002 #define pci_ss_info_1509_7002 pci_ss_info_1039_7002_1509_7002 +static const pciSubsystemInfo pci_ss_info_1039_7002_1734_1095 = + {0x1734, 0x1095, pci_subsys_1039_7002_1734_1095, 0}; +#undef pci_ss_info_1734_1095 +#define pci_ss_info_1734_1095 pci_ss_info_1039_7002_1734_1095 static const pciSubsystemInfo pci_ss_info_1039_7007_1462_701d = {0x1462, 0x701d, pci_subsys_1039_7007_1462_701d, 0}; #undef pci_ss_info_1462_701d @@ -30131,6 +31957,10 @@ static const pciSubsystemInfo pci_ss_info_1039_7012_15bd_1001 = {0x15bd, 0x1001, pci_subsys_1039_7012_15bd_1001, 0}; #undef pci_ss_info_15bd_1001 #define pci_ss_info_15bd_1001 pci_ss_info_1039_7012_15bd_1001 +static const pciSubsystemInfo pci_ss_info_1039_7012_1734_109f = + {0x1734, 0x109f, pci_subsys_1039_7012_1734_109f, 0}; +#undef pci_ss_info_1734_109f +#define pci_ss_info_1734_109f pci_ss_info_1039_7012_1734_109f static const pciSubsystemInfo pci_ss_info_1039_7016_1039_7016 = {0x1039, 0x7016, pci_subsys_1039_7016_1039_7016, 0}; #undef pci_ss_info_1039_7016 @@ -30159,6 +31989,10 @@ static const pciSubsystemInfo pci_ss_info_1039_7018_1039_7018 = {0x1039, 0x7018, pci_subsys_1039_7018_1039_7018, 0}; #undef pci_ss_info_1039_7018 #define pci_ss_info_1039_7018 pci_ss_info_1039_7018_1039_7018 +static const pciSubsystemInfo pci_ss_info_1039_7018_1043_1453 = + {0x1043, 0x1453, pci_subsys_1039_7018_1043_1453, 0}; +#undef pci_ss_info_1043_1453 +#define pci_ss_info_1043_1453 pci_ss_info_1039_7018_1043_1453 static const pciSubsystemInfo pci_ss_info_1039_7018_1043_800b = {0x1043, 0x800b, pci_subsys_1039_7018_1043_800b, 0}; #undef pci_ss_info_1043_800b @@ -30295,6 +32129,22 @@ static const pciSubsystemInfo pci_ss_info_103c_3220_103c_3225 = {0x103c, 0x3225, pci_subsys_103c_3220_103c_3225, 0}; #undef pci_ss_info_103c_3225 #define pci_ss_info_103c_3225 pci_ss_info_103c_3220_103c_3225 +static const pciSubsystemInfo pci_ss_info_103c_3230_103c_3223 = + {0x103c, 0x3223, pci_subsys_103c_3230_103c_3223, 0}; +#undef pci_ss_info_103c_3223 +#define pci_ss_info_103c_3223 pci_ss_info_103c_3230_103c_3223 +static const pciSubsystemInfo pci_ss_info_103c_3230_103c_3234 = + {0x103c, 0x3234, pci_subsys_103c_3230_103c_3234, 0}; +#undef pci_ss_info_103c_3234 +#define pci_ss_info_103c_3234 pci_ss_info_103c_3230_103c_3234 +static const pciSubsystemInfo pci_ss_info_103c_3230_103c_3235 = + {0x103c, 0x3235, pci_subsys_103c_3230_103c_3235, 0}; +#undef pci_ss_info_103c_3235 +#define pci_ss_info_103c_3235 pci_ss_info_103c_3230_103c_3235 +static const pciSubsystemInfo pci_ss_info_103c_3230_103c_3237 = + {0x103c, 0x3237, pci_subsys_103c_3230_103c_3237, 0}; +#undef pci_ss_info_103c_3237 +#define pci_ss_info_103c_3237 pci_ss_info_103c_3230_103c_3237 #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_1043_0675_0675_1704 = {0x0675, 0x1704, pci_subsys_1043_0675_0675_1704, 0}; @@ -31276,6 +33126,10 @@ static const pciSubsystemInfo pci_ss_info_105a_8650_105a_4600 = {0x105a, 0x4600, pci_subsys_105a_8650_105a_4600, 0}; #undef pci_ss_info_105a_4600 #define pci_ss_info_105a_4600 pci_ss_info_105a_8650_105a_4600 +static const pciSubsystemInfo pci_ss_info_105a_8650_105a_4610 = + {0x105a, 0x4610, pci_subsys_105a_8650_105a_4610, 0}; +#undef pci_ss_info_105a_4610 +#define pci_ss_info_105a_4610 pci_ss_info_105a_8650_105a_4610 static const pciSubsystemInfo pci_ss_info_105a_8650_105a_8601 = {0x105a, 0x8601, pci_subsys_105a_8650_105a_8601, 0}; #undef pci_ss_info_105a_8601 @@ -31591,6 +33445,14 @@ static const pciSubsystemInfo pci_ss_info_108d_0019_108d_0017 = #undef pci_ss_info_108d_0017 #define pci_ss_info_108d_0017 pci_ss_info_108d_0019_108d_0017 #endif +static const pciSubsystemInfo pci_ss_info_108e_5000_108e_5000 = + {0x108e, 0x5000, pci_subsys_108e_5000_108e_5000, 0}; +#undef pci_ss_info_108e_5000 +#define pci_ss_info_108e_5000 pci_ss_info_108e_5000_108e_5000 +static const pciSubsystemInfo pci_ss_info_108e_a001_108e_a001 = + {0x108e, 0xa001, pci_subsys_108e_a001_108e_a001, 0}; +#undef pci_ss_info_108e_a001 +#define pci_ss_info_108e_a001 pci_ss_info_108e_a001_108e_a001 #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_1095_0648_1043_8025 = {0x1043, 0x8025, pci_subsys_1095_0648_1043_8025, 0}; @@ -32122,14 +33984,26 @@ static const pciSubsystemInfo pci_ss_info_10b4_1b1d_10b4_237e = #define pci_ss_info_10b4_237e pci_ss_info_10b4_1b1d_10b4_237e #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_10b5_6540_1775_1100 = + {0x1775, 0x1100, pci_subsys_10b5_6540_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_10b5_6540_1775_1100 static const pciSubsystemInfo pci_ss_info_10b5_6540_4c53_10e0 = {0x4c53, 0x10e0, pci_subsys_10b5_6540_4c53_10e0, 0}; #undef pci_ss_info_4c53_10e0 #define pci_ss_info_4c53_10e0 pci_ss_info_10b5_6540_4c53_10e0 +static const pciSubsystemInfo pci_ss_info_10b5_6541_1775_1100 = + {0x1775, 0x1100, pci_subsys_10b5_6541_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_10b5_6541_1775_1100 static const pciSubsystemInfo pci_ss_info_10b5_6541_4c53_10e0 = {0x4c53, 0x10e0, pci_subsys_10b5_6541_4c53_10e0, 0}; #undef pci_ss_info_4c53_10e0 #define pci_ss_info_4c53_10e0 pci_ss_info_10b5_6541_4c53_10e0 +static const pciSubsystemInfo pci_ss_info_10b5_6542_1775_1100 = + {0x1775, 0x1100, pci_subsys_10b5_6542_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_10b5_6542_1775_1100 static const pciSubsystemInfo pci_ss_info_10b5_6542_4c53_10e0 = {0x4c53, 0x10e0, pci_subsys_10b5_6542_4c53_10e0, 0}; #undef pci_ss_info_4c53_10e0 @@ -32374,6 +34248,10 @@ static const pciSubsystemInfo pci_ss_info_10b5_9054_14b4_d100 = {0x14b4, 0xd100, pci_subsys_10b5_9054_14b4_d100, 0}; #undef pci_ss_info_14b4_d100 #define pci_ss_info_14b4_d100 pci_ss_info_10b5_9054_14b4_d100 +static const pciSubsystemInfo pci_ss_info_10b5_9054_14b4_d114 = + {0x14b4, 0xd114, pci_subsys_10b5_9054_14b4_d114, 0}; +#undef pci_ss_info_14b4_d114 +#define pci_ss_info_14b4_d114 pci_ss_info_10b5_9054_14b4_d114 static const pciSubsystemInfo pci_ss_info_10b5_9054_16df_0011 = {0x16df, 0x0011, pci_subsys_10b5_9054_16df_0011, 0}; #undef pci_ss_info_16df_0011 @@ -32402,6 +34280,10 @@ static const pciSubsystemInfo pci_ss_info_10b5_9056_10b5_2979 = {0x10b5, 0x2979, pci_subsys_10b5_9056_10b5_2979, 0}; #undef pci_ss_info_10b5_2979 #define pci_ss_info_10b5_2979 pci_ss_info_10b5_9056_10b5_2979 +static const pciSubsystemInfo pci_ss_info_10b5_9056_14b4_d140 = + {0x14b4, 0xd140, pci_subsys_10b5_9056_14b4_d140, 0}; +#undef pci_ss_info_14b4_d140 +#define pci_ss_info_14b4_d140 pci_ss_info_10b5_9056_14b4_d140 static const pciSubsystemInfo pci_ss_info_10b5_906d_125c_0640 = {0x125c, 0x0640, pci_subsys_10b5_906d_125c_0640, 0}; #undef pci_ss_info_125c_0640 @@ -32512,6 +34394,10 @@ static const pciSubsystemInfo pci_ss_info_10b7_0013_10b7_2031 = {0x10b7, 0x2031, pci_subsys_10b7_0013_10b7_2031, 0}; #undef pci_ss_info_10b7_2031 #define pci_ss_info_10b7_2031 pci_ss_info_10b7_0013_10b7_2031 +static const pciSubsystemInfo pci_ss_info_10b7_1007_10b7_615b = + {0x10b7, 0x615b, pci_subsys_10b7_1007_10b7_615b, 0}; +#undef pci_ss_info_10b7_615b +#define pci_ss_info_10b7_615b pci_ss_info_10b7_1007_10b7_615b static const pciSubsystemInfo pci_ss_info_10b7_1007_10b7_615c = {0x10b7, 0x615c, pci_subsys_10b7_1007_10b7_615c, 0}; #undef pci_ss_info_10b7_615c @@ -32721,6 +34607,12 @@ static const pciSubsystemInfo pci_ss_info_10b7_9200_1028_0097 = #define pci_ss_info_1028_0097 pci_ss_info_10b7_9200_1028_0097 #ifdef VENDOR_INCLUDE_NONVIDEO #endif +static const pciSubsystemInfo pci_ss_info_10b7_9200_1028_00b4 = + {0x1028, 0x00b4, pci_subsys_10b7_9200_1028_00b4, 0}; +#undef pci_ss_info_1028_00b4 +#define pci_ss_info_1028_00b4 pci_ss_info_10b7_9200_1028_00b4 +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif static const pciSubsystemInfo pci_ss_info_10b7_9200_1028_00fe = {0x1028, 0x00fe, pci_subsys_10b7_9200_1028_00fe, 0}; #undef pci_ss_info_1028_00fe @@ -33469,6 +35361,10 @@ static const pciSubsystemInfo pci_ss_info_10de_0053_147b_1c1a = {0x147b, 0x1c1a, pci_subsys_10de_0053_147b_1c1a, 0}; #undef pci_ss_info_147b_1c1a #define pci_ss_info_147b_1c1a pci_ss_info_10de_0053_147b_1c1a +static const pciSubsystemInfo pci_ss_info_10de_0054_1043_815a = + {0x1043, 0x815a, pci_subsys_10de_0054_1043_815a, 0}; +#undef pci_ss_info_1043_815a +#define pci_ss_info_1043_815a pci_ss_info_10de_0054_1043_815a static const pciSubsystemInfo pci_ss_info_10de_0054_1458_b003 = {0x1458, 0xb003, pci_subsys_10de_0054_1458_b003, 0}; #undef pci_ss_info_1458_b003 @@ -33549,6 +35445,10 @@ static const pciSubsystemInfo pci_ss_info_10de_005b_147b_1c1a = {0x147b, 0x1c1a, pci_subsys_10de_005b_147b_1c1a, 0}; #undef pci_ss_info_147b_1c1a #define pci_ss_info_147b_1c1a pci_ss_info_10de_005b_147b_1c1a +static const pciSubsystemInfo pci_ss_info_10de_005e_1043_815a = + {0x1043, 0x815a, pci_subsys_10de_005e_1043_815a, 0}; +#undef pci_ss_info_1043_815a +#define pci_ss_info_1043_815a pci_ss_info_10de_005e_1043_815a static const pciSubsystemInfo pci_ss_info_10de_005e_10f1_2891 = {0x10f1, 0x2891, pci_subsys_10de_005e_10f1_2891, 0}; #undef pci_ss_info_10f1_2891 @@ -33645,6 +35545,10 @@ static const pciSubsystemInfo pci_ss_info_10de_00cd_10de_029b = {0x10de, 0x029b, pci_subsys_10de_00cd_10de_029b, 0}; #undef pci_ss_info_10de_029b #define pci_ss_info_10de_029b pci_ss_info_10de_00cd_10de_029b +static const pciSubsystemInfo pci_ss_info_10de_00df_1043_80a7 = + {0x1043, 0x80a7, pci_subsys_10de_00df_1043_80a7, 0}; +#undef pci_ss_info_1043_80a7 +#define pci_ss_info_1043_80a7 pci_ss_info_10de_00df_1043_80a7 static const pciSubsystemInfo pci_ss_info_10de_00df_105b_0c43 = {0x105b, 0x0c43, pci_subsys_10de_00df_105b_0c43, 0}; #undef pci_ss_info_105b_0c43 @@ -33653,6 +35557,10 @@ static const pciSubsystemInfo pci_ss_info_10de_00df_147b_1c0b = {0x147b, 0x1c0b, pci_subsys_10de_00df_147b_1c0b, 0}; #undef pci_ss_info_147b_1c0b #define pci_ss_info_147b_1c0b pci_ss_info_10de_00df_147b_1c0b +static const pciSubsystemInfo pci_ss_info_10de_00e0_1043_813f = + {0x1043, 0x813f, pci_subsys_10de_00e0_1043_813f, 0}; +#undef pci_ss_info_1043_813f +#define pci_ss_info_1043_813f pci_ss_info_10de_00e0_1043_813f static const pciSubsystemInfo pci_ss_info_10de_00e0_10de_0c11 = {0x10de, 0x0c11, pci_subsys_10de_00e0_10de_0c11, 0}; #undef pci_ss_info_10de_0c11 @@ -33665,6 +35573,10 @@ static const pciSubsystemInfo pci_ss_info_10de_00e0_147b_1c0b = {0x147b, 0x1c0b, pci_subsys_10de_00e0_147b_1c0b, 0}; #undef pci_ss_info_147b_1c0b #define pci_ss_info_147b_1c0b pci_ss_info_10de_00e0_147b_1c0b +static const pciSubsystemInfo pci_ss_info_10de_00e1_1043_813f = + {0x1043, 0x813f, pci_subsys_10de_00e1_1043_813f, 0}; +#undef pci_ss_info_1043_813f +#define pci_ss_info_1043_813f pci_ss_info_10de_00e1_1043_813f static const pciSubsystemInfo pci_ss_info_10de_00e1_1462_7030 = {0x1462, 0x7030, pci_subsys_10de_00e1_1462_7030, 0}; #undef pci_ss_info_1462_7030 @@ -33673,6 +35585,10 @@ static const pciSubsystemInfo pci_ss_info_10de_00e1_147b_1c0b = {0x147b, 0x1c0b, pci_subsys_10de_00e1_147b_1c0b, 0}; #undef pci_ss_info_147b_1c0b #define pci_ss_info_147b_1c0b pci_ss_info_10de_00e1_147b_1c0b +static const pciSubsystemInfo pci_ss_info_10de_00e3_1043_813f = + {0x1043, 0x813f, pci_subsys_10de_00e3_1043_813f, 0}; +#undef pci_ss_info_1043_813f +#define pci_ss_info_1043_813f pci_ss_info_10de_00e3_1043_813f static const pciSubsystemInfo pci_ss_info_10de_00e3_105b_0c43 = {0x105b, 0x0c43, pci_subsys_10de_00e3_105b_0c43, 0}; #undef pci_ss_info_105b_0c43 @@ -33681,6 +35597,10 @@ static const pciSubsystemInfo pci_ss_info_10de_00e3_147b_1c0b = {0x147b, 0x1c0b, pci_subsys_10de_00e3_147b_1c0b, 0}; #undef pci_ss_info_147b_1c0b #define pci_ss_info_147b_1c0b pci_ss_info_10de_00e3_147b_1c0b +static const pciSubsystemInfo pci_ss_info_10de_00e4_1043_813f = + {0x1043, 0x813f, pci_subsys_10de_00e4_1043_813f, 0}; +#undef pci_ss_info_1043_813f +#define pci_ss_info_1043_813f pci_ss_info_10de_00e4_1043_813f static const pciSubsystemInfo pci_ss_info_10de_00e4_105b_0c43 = {0x105b, 0x0c43, pci_subsys_10de_00e4_105b_0c43, 0}; #undef pci_ss_info_105b_0c43 @@ -33693,6 +35613,10 @@ static const pciSubsystemInfo pci_ss_info_10de_00e4_147b_1c0b = {0x147b, 0x1c0b, pci_subsys_10de_00e4_147b_1c0b, 0}; #undef pci_ss_info_147b_1c0b #define pci_ss_info_147b_1c0b pci_ss_info_10de_00e4_147b_1c0b +static const pciSubsystemInfo pci_ss_info_10de_00e5_1043_813f = + {0x1043, 0x813f, pci_subsys_10de_00e5_1043_813f, 0}; +#undef pci_ss_info_1043_813f +#define pci_ss_info_1043_813f pci_ss_info_10de_00e5_1043_813f static const pciSubsystemInfo pci_ss_info_10de_00e5_105b_0c43 = {0x105b, 0x0c43, pci_subsys_10de_00e5_105b_0c43, 0}; #undef pci_ss_info_105b_0c43 @@ -33705,6 +35629,10 @@ static const pciSubsystemInfo pci_ss_info_10de_00e5_147b_1c0b = {0x147b, 0x1c0b, pci_subsys_10de_00e5_147b_1c0b, 0}; #undef pci_ss_info_147b_1c0b #define pci_ss_info_147b_1c0b pci_ss_info_10de_00e5_147b_1c0b +static const pciSubsystemInfo pci_ss_info_10de_00e7_1043_813f = + {0x1043, 0x813f, pci_subsys_10de_00e7_1043_813f, 0}; +#undef pci_ss_info_1043_813f +#define pci_ss_info_1043_813f pci_ss_info_10de_00e7_1043_813f static const pciSubsystemInfo pci_ss_info_10de_00e7_105b_0c43 = {0x105b, 0x0c43, pci_subsys_10de_00e7_105b_0c43, 0}; #undef pci_ss_info_105b_0c43 @@ -33717,6 +35645,10 @@ static const pciSubsystemInfo pci_ss_info_10de_00e7_147b_1c0b = {0x147b, 0x1c0b, pci_subsys_10de_00e7_147b_1c0b, 0}; #undef pci_ss_info_147b_1c0b #define pci_ss_info_147b_1c0b pci_ss_info_10de_00e7_147b_1c0b +static const pciSubsystemInfo pci_ss_info_10de_00e8_1043_813f = + {0x1043, 0x813f, pci_subsys_10de_00e8_1043_813f, 0}; +#undef pci_ss_info_1043_813f +#define pci_ss_info_1043_813f pci_ss_info_10de_00e8_1043_813f static const pciSubsystemInfo pci_ss_info_10de_00e8_105b_0c43 = {0x105b, 0x0c43, pci_subsys_10de_00e8_105b_0c43, 0}; #undef pci_ss_info_105b_0c43 @@ -33729,10 +35661,18 @@ static const pciSubsystemInfo pci_ss_info_10de_00e8_147b_1c0b = {0x147b, 0x1c0b, pci_subsys_10de_00e8_147b_1c0b, 0}; #undef pci_ss_info_147b_1c0b #define pci_ss_info_147b_1c0b pci_ss_info_10de_00e8_147b_1c0b +static const pciSubsystemInfo pci_ss_info_10de_00ea_1043_819d = + {0x1043, 0x819d, pci_subsys_10de_00ea_1043_819d, 0}; +#undef pci_ss_info_1043_819d +#define pci_ss_info_1043_819d pci_ss_info_10de_00ea_1043_819d static const pciSubsystemInfo pci_ss_info_10de_00ea_105b_0c43 = {0x105b, 0x0c43, pci_subsys_10de_00ea_105b_0c43, 0}; #undef pci_ss_info_105b_0c43 #define pci_ss_info_105b_0c43 pci_ss_info_10de_00ea_105b_0c43 +static const pciSubsystemInfo pci_ss_info_10de_00ea_1462_b010 = + {0x1462, 0xb010, pci_subsys_10de_00ea_1462_b010, 0}; +#undef pci_ss_info_1462_b010 +#define pci_ss_info_1462_b010 pci_ss_info_10de_00ea_1462_b010 static const pciSubsystemInfo pci_ss_info_10de_00ea_147b_1c0b = {0x147b, 0x1c0b, pci_subsys_10de_00ea_147b_1c0b, 0}; #undef pci_ss_info_147b_1c0b @@ -33741,6 +35681,10 @@ static const pciSubsystemInfo pci_ss_info_10de_00f1_1043_81a6 = {0x1043, 0x81a6, pci_subsys_10de_00f1_1043_81a6, 0}; #undef pci_ss_info_1043_81a6 #define pci_ss_info_1043_81a6 pci_ss_info_10de_00f1_1043_81a6 +static const pciSubsystemInfo pci_ss_info_10de_00f1_1458_3150 = + {0x1458, 0x3150, pci_subsys_10de_00f1_1458_3150, 0}; +#undef pci_ss_info_1458_3150 +#define pci_ss_info_1458_3150 pci_ss_info_10de_00f1_1458_3150 static const pciSubsystemInfo pci_ss_info_10de_00f1_1682_2119 = {0x1682, 0x2119, pci_subsys_10de_00f1_1682_2119, 0}; #undef pci_ss_info_1682_2119 @@ -33845,6 +35789,10 @@ static const pciSubsystemInfo pci_ss_info_10de_0110_1043_4015 = {0x1043, 0x4015, pci_subsys_10de_0110_1043_4015, 0}; #undef pci_ss_info_1043_4015 #define pci_ss_info_1043_4015 pci_ss_info_10de_0110_1043_4015 +static const pciSubsystemInfo pci_ss_info_10de_0110_1043_4021 = + {0x1043, 0x4021, pci_subsys_10de_0110_1043_4021, 0}; +#undef pci_ss_info_1043_4021 +#define pci_ss_info_1043_4021 pci_ss_info_10de_0110_1043_4021 static const pciSubsystemInfo pci_ss_info_10de_0110_1043_4031 = {0x1043, 0x4031, pci_subsys_10de_0110_1043_4031, 0}; #undef pci_ss_info_1043_4031 @@ -33893,6 +35841,10 @@ static const pciSubsystemInfo pci_ss_info_10de_0110_14af_7103 = {0x14af, 0x7103, pci_subsys_10de_0110_14af_7103, 0}; #undef pci_ss_info_14af_7103 #define pci_ss_info_14af_7103 pci_ss_info_10de_0110_14af_7103 +static const pciSubsystemInfo pci_ss_info_10de_0141_1043_81b0 = + {0x1043, 0x81b0, pci_subsys_10de_0141_1043_81b0, 0}; +#undef pci_ss_info_1043_81b0 +#define pci_ss_info_1043_81b0 pci_ss_info_10de_0141_1043_81b0 static const pciSubsystemInfo pci_ss_info_10de_0141_1458_3124 = {0x1458, 0x3124, pci_subsys_10de_0141_1458_3124, 0}; #undef pci_ss_info_1458_3124 @@ -34053,10 +36005,26 @@ static const pciSubsystemInfo pci_ss_info_10de_0202_1545_002f = {0x1545, 0x002f, pci_subsys_10de_0202_1545_002f, 0}; #undef pci_ss_info_1545_002f #define pci_ss_info_1545_002f pci_ss_info_10de_0202_1545_002f +static const pciSubsystemInfo pci_ss_info_10de_0221_3842_a341 = + {0x3842, 0xa341, pci_subsys_10de_0221_3842_a341, 0}; +#undef pci_ss_info_3842_a341 +#define pci_ss_info_3842_a341 pci_ss_info_10de_0221_3842_a341 +static const pciSubsystemInfo pci_ss_info_10de_0240_1043_81cd = + {0x1043, 0x81cd, pci_subsys_10de_0240_1043_81cd, 0}; +#undef pci_ss_info_1043_81cd +#define pci_ss_info_1043_81cd pci_ss_info_10de_0240_1043_81cd static const pciSubsystemInfo pci_ss_info_10de_0240_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_0240_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_0240_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_0244_10de_0244 = + {0x10de, 0x0244, pci_subsys_10de_0244_10de_0244, 0}; +#undef pci_ss_info_10de_0244 +#define pci_ss_info_10de_0244 pci_ss_info_10de_0244_10de_0244 +static const pciSubsystemInfo pci_ss_info_10de_0247_1043_1382 = + {0x1043, 0x1382, pci_subsys_10de_0247_1043_1382, 0}; +#undef pci_ss_info_1043_1382 +#define pci_ss_info_1043_1382 pci_ss_info_10de_0247_1043_1382 static const pciSubsystemInfo pci_ss_info_10de_0251_1043_8023 = {0x1043, 0x8023, pci_subsys_10de_0251_1043_8023, 0}; #undef pci_ss_info_1043_8023 @@ -34069,74 +36037,194 @@ static const pciSubsystemInfo pci_ss_info_10de_0253_147b_8f09 = {0x147b, 0x8f09, pci_subsys_10de_0253_147b_8f09, 0}; #undef pci_ss_info_147b_8f09 #define pci_ss_info_147b_8f09 pci_ss_info_10de_0253_147b_8f09 +static const pciSubsystemInfo pci_ss_info_10de_0260_1043_81bc = + {0x1043, 0x81bc, pci_subsys_10de_0260_1043_81bc, 0}; +#undef pci_ss_info_1043_81bc +#define pci_ss_info_1043_81bc pci_ss_info_10de_0260_1043_81bc +static const pciSubsystemInfo pci_ss_info_10de_0260_1458_5001 = + {0x1458, 0x5001, pci_subsys_10de_0260_1458_5001, 0}; +#undef pci_ss_info_1458_5001 +#define pci_ss_info_1458_5001 pci_ss_info_10de_0260_1458_5001 static const pciSubsystemInfo pci_ss_info_10de_0260_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_0260_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_0260_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_0264_1043_81bc = + {0x1043, 0x81bc, pci_subsys_10de_0264_1043_81bc, 0}; +#undef pci_ss_info_1043_81bc +#define pci_ss_info_1043_81bc pci_ss_info_10de_0264_1043_81bc static const pciSubsystemInfo pci_ss_info_10de_0264_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_0264_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_0264_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_0265_1043_81bc = + {0x1043, 0x81bc, pci_subsys_10de_0265_1043_81bc, 0}; +#undef pci_ss_info_1043_81bc +#define pci_ss_info_1043_81bc pci_ss_info_10de_0265_1043_81bc static const pciSubsystemInfo pci_ss_info_10de_0265_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_0265_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_0265_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_0266_1043_81bc = + {0x1043, 0x81bc, pci_subsys_10de_0266_1043_81bc, 0}; +#undef pci_ss_info_1043_81bc +#define pci_ss_info_1043_81bc pci_ss_info_10de_0266_1043_81bc static const pciSubsystemInfo pci_ss_info_10de_0266_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_0266_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_0266_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_0267_1043_81bc = + {0x1043, 0x81bc, pci_subsys_10de_0267_1043_81bc, 0}; +#undef pci_ss_info_1043_81bc +#define pci_ss_info_1043_81bc pci_ss_info_10de_0267_1043_81bc static const pciSubsystemInfo pci_ss_info_10de_0267_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_0267_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_0267_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_0269_1043_8141 = + {0x1043, 0x8141, pci_subsys_10de_0269_1043_8141, 0}; +#undef pci_ss_info_1043_8141 +#define pci_ss_info_1043_8141 pci_ss_info_10de_0269_1043_8141 static const pciSubsystemInfo pci_ss_info_10de_0269_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_0269_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_0269_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_026c_10de_cb84 = + {0x10de, 0xcb84, pci_subsys_10de_026c_10de_cb84, 0}; +#undef pci_ss_info_10de_cb84 +#define pci_ss_info_10de_cb84 pci_ss_info_10de_026c_10de_cb84 static const pciSubsystemInfo pci_ss_info_10de_026c_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_026c_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_026c_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_026d_1043_81bc = + {0x1043, 0x81bc, pci_subsys_10de_026d_1043_81bc, 0}; +#undef pci_ss_info_1043_81bc +#define pci_ss_info_1043_81bc pci_ss_info_10de_026d_1043_81bc static const pciSubsystemInfo pci_ss_info_10de_026d_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_026d_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_026d_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_026e_1043_81bc = + {0x1043, 0x81bc, pci_subsys_10de_026e_1043_81bc, 0}; +#undef pci_ss_info_1043_81bc +#define pci_ss_info_1043_81bc pci_ss_info_10de_026e_1043_81bc static const pciSubsystemInfo pci_ss_info_10de_026e_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_026e_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_026e_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_0270_1043_81bc = + {0x1043, 0x81bc, pci_subsys_10de_0270_1043_81bc, 0}; +#undef pci_ss_info_1043_81bc +#define pci_ss_info_1043_81bc pci_ss_info_10de_0270_1043_81bc +static const pciSubsystemInfo pci_ss_info_10de_0270_1458_5001 = + {0x1458, 0x5001, pci_subsys_10de_0270_1458_5001, 0}; +#undef pci_ss_info_1458_5001 +#define pci_ss_info_1458_5001 pci_ss_info_10de_0270_1458_5001 static const pciSubsystemInfo pci_ss_info_10de_0270_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_0270_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_0270_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_027e_1043_81cd = + {0x1043, 0x81cd, pci_subsys_10de_027e_1043_81cd, 0}; +#undef pci_ss_info_1043_81cd +#define pci_ss_info_1043_81cd pci_ss_info_10de_027e_1043_81cd +static const pciSubsystemInfo pci_ss_info_10de_027e_1458_5000 = + {0x1458, 0x5000, pci_subsys_10de_027e_1458_5000, 0}; +#undef pci_ss_info_1458_5000 +#define pci_ss_info_1458_5000 pci_ss_info_10de_027e_1458_5000 static const pciSubsystemInfo pci_ss_info_10de_027e_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_027e_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_027e_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_027f_1043_81cd = + {0x1043, 0x81cd, pci_subsys_10de_027f_1043_81cd, 0}; +#undef pci_ss_info_1043_81cd +#define pci_ss_info_1043_81cd pci_ss_info_10de_027f_1043_81cd +static const pciSubsystemInfo pci_ss_info_10de_027f_1458_5000 = + {0x1458, 0x5000, pci_subsys_10de_027f_1458_5000, 0}; +#undef pci_ss_info_1458_5000 +#define pci_ss_info_1458_5000 pci_ss_info_10de_027f_1458_5000 static const pciSubsystemInfo pci_ss_info_10de_027f_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_027f_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_027f_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_0291_10de_042b = + {0x10de, 0x042b, pci_subsys_10de_0291_10de_042b, 0}; +#undef pci_ss_info_10de_042b +#define pci_ss_info_10de_042b pci_ss_info_10de_0291_10de_042b +static const pciSubsystemInfo pci_ss_info_10de_0295_107d_2a68 = + {0x107d, 0x2a68, pci_subsys_10de_0295_107d_2a68, 0}; +#undef pci_ss_info_107d_2a68 +#define pci_ss_info_107d_2a68 pci_ss_info_10de_0295_107d_2a68 +static const pciSubsystemInfo pci_ss_info_10de_02f0_1043_81cd = + {0x1043, 0x81cd, pci_subsys_10de_02f0_1043_81cd, 0}; +#undef pci_ss_info_1043_81cd +#define pci_ss_info_1043_81cd pci_ss_info_10de_02f0_1043_81cd static const pciSubsystemInfo pci_ss_info_10de_02f0_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_02f0_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_02f0_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_02f1_1458_5000 = + {0x1458, 0x5000, pci_subsys_10de_02f1_1458_5000, 0}; +#undef pci_ss_info_1458_5000 +#define pci_ss_info_1458_5000 pci_ss_info_10de_02f1_1458_5000 +static const pciSubsystemInfo pci_ss_info_10de_02f8_1043_81cd = + {0x1043, 0x81cd, pci_subsys_10de_02f8_1043_81cd, 0}; +#undef pci_ss_info_1043_81cd +#define pci_ss_info_1043_81cd pci_ss_info_10de_02f8_1043_81cd +static const pciSubsystemInfo pci_ss_info_10de_02f8_1458_5000 = + {0x1458, 0x5000, pci_subsys_10de_02f8_1458_5000, 0}; +#undef pci_ss_info_1458_5000 +#define pci_ss_info_1458_5000 pci_ss_info_10de_02f8_1458_5000 static const pciSubsystemInfo pci_ss_info_10de_02f8_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_02f8_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_02f8_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_02f9_1043_81cd = + {0x1043, 0x81cd, pci_subsys_10de_02f9_1043_81cd, 0}; +#undef pci_ss_info_1043_81cd +#define pci_ss_info_1043_81cd pci_ss_info_10de_02f9_1043_81cd +static const pciSubsystemInfo pci_ss_info_10de_02f9_1458_5000 = + {0x1458, 0x5000, pci_subsys_10de_02f9_1458_5000, 0}; +#undef pci_ss_info_1458_5000 +#define pci_ss_info_1458_5000 pci_ss_info_10de_02f9_1458_5000 static const pciSubsystemInfo pci_ss_info_10de_02f9_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_02f9_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_02f9_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_02fa_1043_81cd = + {0x1043, 0x81cd, pci_subsys_10de_02fa_1043_81cd, 0}; +#undef pci_ss_info_1043_81cd +#define pci_ss_info_1043_81cd pci_ss_info_10de_02fa_1043_81cd +static const pciSubsystemInfo pci_ss_info_10de_02fa_1458_5000 = + {0x1458, 0x5000, pci_subsys_10de_02fa_1458_5000, 0}; +#undef pci_ss_info_1458_5000 +#define pci_ss_info_1458_5000 pci_ss_info_10de_02fa_1458_5000 static const pciSubsystemInfo pci_ss_info_10de_02fa_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_02fa_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_02fa_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_02fe_1043_81cd = + {0x1043, 0x81cd, pci_subsys_10de_02fe_1043_81cd, 0}; +#undef pci_ss_info_1043_81cd +#define pci_ss_info_1043_81cd pci_ss_info_10de_02fe_1043_81cd +static const pciSubsystemInfo pci_ss_info_10de_02fe_1458_5000 = + {0x1458, 0x5000, pci_subsys_10de_02fe_1458_5000, 0}; +#undef pci_ss_info_1458_5000 +#define pci_ss_info_1458_5000 pci_ss_info_10de_02fe_1458_5000 static const pciSubsystemInfo pci_ss_info_10de_02fe_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_02fe_1462_7207, 0}; #undef pci_ss_info_1462_7207 #define pci_ss_info_1462_7207 pci_ss_info_10de_02fe_1462_7207 +static const pciSubsystemInfo pci_ss_info_10de_02ff_1043_81cd = + {0x1043, 0x81cd, pci_subsys_10de_02ff_1043_81cd, 0}; +#undef pci_ss_info_1043_81cd +#define pci_ss_info_1043_81cd pci_ss_info_10de_02ff_1043_81cd +static const pciSubsystemInfo pci_ss_info_10de_02ff_1458_5000 = + {0x1458, 0x5000, pci_subsys_10de_02ff_1458_5000, 0}; +#undef pci_ss_info_1458_5000 +#define pci_ss_info_1458_5000 pci_ss_info_10de_02ff_1458_5000 static const pciSubsystemInfo pci_ss_info_10de_02ff_1462_7207 = {0x1462, 0x7207, pci_subsys_10de_02ff_1462_7207, 0}; #undef pci_ss_info_1462_7207 @@ -34145,6 +36233,10 @@ static const pciSubsystemInfo pci_ss_info_10de_0314_1043_814a = {0x1043, 0x814a, pci_subsys_10de_0314_1043_814a, 0}; #undef pci_ss_info_1043_814a #define pci_ss_info_1043_814a pci_ss_info_10de_0314_1043_814a +static const pciSubsystemInfo pci_ss_info_10de_0322_1043_02fb = + {0x1043, 0x02fb, pci_subsys_10de_0322_1043_02fb, 0}; +#undef pci_ss_info_1043_02fb +#define pci_ss_info_1043_02fb pci_ss_info_10de_0322_1043_02fb static const pciSubsystemInfo pci_ss_info_10de_0322_1462_9171 = {0x1462, 0x9171, pci_subsys_10de_0322_1462_9171, 0}; #undef pci_ss_info_1462_9171 @@ -34165,14 +36257,26 @@ static const pciSubsystemInfo pci_ss_info_10de_0331_1043_8145 = {0x1043, 0x8145, pci_subsys_10de_0331_1043_8145, 0}; #undef pci_ss_info_1043_8145 #define pci_ss_info_1043_8145 pci_ss_info_10de_0331_1043_8145 +static const pciSubsystemInfo pci_ss_info_10de_0341_1462_9380 = + {0x1462, 0x9380, pci_subsys_10de_0341_1462_9380, 0}; +#undef pci_ss_info_1462_9380 +#define pci_ss_info_1462_9380 pci_ss_info_10de_0341_1462_9380 static const pciSubsystemInfo pci_ss_info_10de_0347_103c_006a = {0x103c, 0x006a, pci_subsys_10de_0347_103c_006a, 0}; #undef pci_ss_info_103c_006a #define pci_ss_info_103c_006a pci_ss_info_10de_0347_103c_006a +static const pciSubsystemInfo pci_ss_info_10de_0391_1458_3427 = + {0x1458, 0x3427, pci_subsys_10de_0391_1458_3427, 0}; +#undef pci_ss_info_1458_3427 +#define pci_ss_info_1458_3427 pci_ss_info_10de_0391_1458_3427 static const pciSubsystemInfo pci_ss_info_10de_0392_1462_0622 = {0x1462, 0x0622, pci_subsys_10de_0392_1462_0622, 0}; #undef pci_ss_info_1462_0622 #define pci_ss_info_1462_0622 pci_ss_info_10de_0392_1462_0622 +static const pciSubsystemInfo pci_ss_info_10de_0398_1025_006c = + {0x1025, 0x006c, pci_subsys_10de_0398_1025_006c, 0}; +#undef pci_ss_info_1025_006c +#define pci_ss_info_1025_006c pci_ss_info_10de_0398_1025_006c #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_10e1_0391_10e1_0391 = {0x10e1, 0x0391, pci_subsys_10e1_0391_10e1_0391, 0}; @@ -34180,6 +36284,12 @@ static const pciSubsystemInfo pci_ss_info_10e1_0391_10e1_0391 = #define pci_ss_info_10e1_0391 pci_ss_info_10e1_0391_10e1_0391 #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_10e3_0148_1775_1100 = + {0x1775, 0x1100, pci_subsys_10e3_0148_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_10e3_0148_1775_1100 +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO #endif static const pciSubsystemInfo pci_ss_info_10ec_0883_1025_1605 = {0x1025, 0x1605, pci_subsys_10ec_0883_1025_1605, 0}; @@ -34242,6 +36352,10 @@ static const pciSubsystemInfo pci_ss_info_10ec_8139_103c_006a = #undef pci_ss_info_103c_006a #define pci_ss_info_103c_006a pci_ss_info_10ec_8139_103c_006a #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_10ec_8139_1043_1045 = + {0x1043, 0x1045, pci_subsys_10ec_8139_1043_1045, 0}; +#undef pci_ss_info_1043_1045 +#define pci_ss_info_1043_1045 pci_ss_info_10ec_8139_1043_1045 static const pciSubsystemInfo pci_ss_info_10ec_8139_1043_8109 = {0x1043, 0x8109, pci_subsys_10ec_8139_1043_8109, 0}; #undef pci_ss_info_1043_8109 @@ -34258,6 +36372,10 @@ static const pciSubsystemInfo pci_ss_info_10ec_8139_10ec_8139 = {0x10ec, 0x8139, pci_subsys_10ec_8139_10ec_8139, 0}; #undef pci_ss_info_10ec_8139 #define pci_ss_info_10ec_8139 pci_ss_info_10ec_8139_10ec_8139 +static const pciSubsystemInfo pci_ss_info_10ec_8139_10f7_8338 = + {0x10f7, 0x8338, pci_subsys_10ec_8139_10f7_8338, 0}; +#undef pci_ss_info_10f7_8338 +#define pci_ss_info_10f7_8338 pci_ss_info_10ec_8139_10f7_8338 static const pciSubsystemInfo pci_ss_info_10ec_8139_1113_ec01 = {0x1113, 0xec01, pci_subsys_10ec_8139_1113_ec01, 0}; #undef pci_ss_info_1113_ec01 @@ -34298,6 +36416,10 @@ static const pciSubsystemInfo pci_ss_info_10ec_8139_1436_8139 = {0x1436, 0x8139, pci_subsys_10ec_8139_1436_8139, 0}; #undef pci_ss_info_1436_8139 #define pci_ss_info_1436_8139 pci_ss_info_10ec_8139_1436_8139 +static const pciSubsystemInfo pci_ss_info_10ec_8139_144d_c00c = + {0x144d, 0xc00c, pci_subsys_10ec_8139_144d_c00c, 0}; +#undef pci_ss_info_144d_c00c +#define pci_ss_info_144d_c00c pci_ss_info_10ec_8139_144d_c00c static const pciSubsystemInfo pci_ss_info_10ec_8139_1458_e000 = {0x1458, 0xe000, pci_subsys_10ec_8139_1458_e000, 0}; #undef pci_ss_info_1458_e000 @@ -34330,6 +36452,10 @@ static const pciSubsystemInfo pci_ss_info_10ec_8139_14cb_0200 = {0x14cb, 0x0200, pci_subsys_10ec_8139_14cb_0200, 0}; #undef pci_ss_info_14cb_0200 #define pci_ss_info_14cb_0200 pci_ss_info_10ec_8139_14cb_0200 +static const pciSubsystemInfo pci_ss_info_10ec_8139_1565_2300 = + {0x1565, 0x2300, pci_subsys_10ec_8139_1565_2300, 0}; +#undef pci_ss_info_1565_2300 +#define pci_ss_info_1565_2300 pci_ss_info_10ec_8139_1565_2300 static const pciSubsystemInfo pci_ss_info_10ec_8139_1695_9001 = {0x1695, 0x9001, pci_subsys_10ec_8139_1695_9001, 0}; #undef pci_ss_info_1695_9001 @@ -34358,6 +36484,10 @@ static const pciSubsystemInfo pci_ss_info_10ec_8139_a0a0_0007 = {0xa0a0, 0x0007, pci_subsys_10ec_8139_a0a0_0007, 0}; #undef pci_ss_info_a0a0_0007 #define pci_ss_info_a0a0_0007 pci_ss_info_10ec_8139_a0a0_0007 +static const pciSubsystemInfo pci_ss_info_10ec_8167_1462_235c = + {0x1462, 0x235c, pci_subsys_10ec_8167_1462_235c, 0}; +#undef pci_ss_info_1462_235c +#define pci_ss_info_1462_235c pci_ss_info_10ec_8167_1462_235c #endif static const pciSubsystemInfo pci_ss_info_10ec_8169_1025_0079 = {0x1025, 0x0079, pci_subsys_10ec_8169_1025_0079, 0}; @@ -34376,10 +36506,26 @@ static const pciSubsystemInfo pci_ss_info_10ec_8169_1458_e000 = {0x1458, 0xe000, pci_subsys_10ec_8169_1458_e000, 0}; #undef pci_ss_info_1458_e000 #define pci_ss_info_1458_e000 pci_ss_info_10ec_8169_1458_e000 +static const pciSubsystemInfo pci_ss_info_10ec_8169_1462_030c = + {0x1462, 0x030c, pci_subsys_10ec_8169_1462_030c, 0}; +#undef pci_ss_info_1462_030c +#define pci_ss_info_1462_030c pci_ss_info_10ec_8169_1462_030c static const pciSubsystemInfo pci_ss_info_10ec_8169_1462_702c = {0x1462, 0x702c, pci_subsys_10ec_8169_1462_702c, 0}; #undef pci_ss_info_1462_702c #define pci_ss_info_1462_702c pci_ss_info_10ec_8169_1462_702c +static const pciSubsystemInfo pci_ss_info_10ec_8169_1462_7094 = + {0x1462, 0x7094, pci_subsys_10ec_8169_1462_7094, 0}; +#undef pci_ss_info_1462_7094 +#define pci_ss_info_1462_7094 pci_ss_info_10ec_8169_1462_7094 +static const pciSubsystemInfo pci_ss_info_10ec_8169_1734_1091 = + {0x1734, 0x1091, pci_subsys_10ec_8169_1734_1091, 0}; +#undef pci_ss_info_1734_1091 +#define pci_ss_info_1734_1091 pci_ss_info_10ec_8169_1734_1091 +static const pciSubsystemInfo pci_ss_info_10ec_8169_a0a0_0449 = + {0xa0a0, 0x0449, pci_subsys_10ec_8169_a0a0_0449, 0}; +#undef pci_ss_info_a0a0_0449 +#define pci_ss_info_a0a0_0449 pci_ss_info_10ec_8169_a0a0_0449 #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_1102_0002_1102_0020 = @@ -34470,6 +36616,10 @@ static const pciSubsystemInfo pci_ss_info_1102_0004_1102_0058 = {0x1102, 0x0058, pci_subsys_1102_0004_1102_0058, 0}; #undef pci_ss_info_1102_0058 #define pci_ss_info_1102_0058 pci_ss_info_1102_0004_1102_0058 +static const pciSubsystemInfo pci_ss_info_1102_0004_1102_1002 = + {0x1102, 0x1002, pci_subsys_1102_0004_1102_1002, 0}; +#undef pci_ss_info_1102_1002 +#define pci_ss_info_1102_1002 pci_ss_info_1102_0004_1102_1002 static const pciSubsystemInfo pci_ss_info_1102_0004_1102_1007 = {0x1102, 0x1007, pci_subsys_1102_0004_1102_1007, 0}; #undef pci_ss_info_1102_1007 @@ -34478,6 +36628,10 @@ static const pciSubsystemInfo pci_ss_info_1102_0004_1102_2002 = {0x1102, 0x2002, pci_subsys_1102_0004_1102_2002, 0}; #undef pci_ss_info_1102_2002 #define pci_ss_info_1102_2002 pci_ss_info_1102_0004_1102_2002 +static const pciSubsystemInfo pci_ss_info_1102_0004_1102_4001 = + {0x1102, 0x4001, pci_subsys_1102_0004_1102_4001, 0}; +#undef pci_ss_info_1102_4001 +#define pci_ss_info_1102_4001 pci_ss_info_1102_0004_1102_4001 static const pciSubsystemInfo pci_ss_info_1102_0005_1102_0021 = {0x1102, 0x0021, pci_subsys_1102_0005_1102_0021, 0}; #undef pci_ss_info_1102_0021 @@ -34598,6 +36752,10 @@ static const pciSubsystemInfo pci_ss_info_1103_0004_1103_0001 = {0x1103, 0x0001, pci_subsys_1103_0004_1103_0001, 0}; #undef pci_ss_info_1103_0001 #define pci_ss_info_1103_0001 pci_ss_info_1103_0004_1103_0001 +static const pciSubsystemInfo pci_ss_info_1103_0004_1103_0003 = + {0x1103, 0x0003, pci_subsys_1103_0004_1103_0003, 0}; +#undef pci_ss_info_1103_0003 +#define pci_ss_info_1103_0003 pci_ss_info_1103_0004_1103_0003 static const pciSubsystemInfo pci_ss_info_1103_0004_1103_0004 = {0x1103, 0x0004, pci_subsys_1103_0004_1103_0004, 0}; #undef pci_ss_info_1103_0004 @@ -34606,6 +36764,10 @@ static const pciSubsystemInfo pci_ss_info_1103_0004_1103_0005 = {0x1103, 0x0005, pci_subsys_1103_0004_1103_0005, 0}; #undef pci_ss_info_1103_0005 #define pci_ss_info_1103_0005 pci_ss_info_1103_0004_1103_0005 +static const pciSubsystemInfo pci_ss_info_1103_0004_1103_0006 = + {0x1103, 0x0006, pci_subsys_1103_0004_1103_0006, 0}; +#undef pci_ss_info_1103_0006 +#define pci_ss_info_1103_0006 pci_ss_info_1103_0004_1103_0006 #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_1105_8475_1105_0001 = @@ -34642,6 +36804,10 @@ static const pciSubsystemInfo pci_ss_info_1106_0305_147b_a401 = {0x147b, 0xa401, pci_subsys_1106_0305_147b_a401, 0}; #undef pci_ss_info_147b_a401 #define pci_ss_info_147b_a401 pci_ss_info_1106_0305_147b_a401 +static const pciSubsystemInfo pci_ss_info_1106_0364_1043_81ce = + {0x1043, 0x81ce, pci_subsys_1106_0364_1043_81ce, 0}; +#undef pci_ss_info_1043_81ce +#define pci_ss_info_1043_81ce pci_ss_info_1106_0364_1043_81ce static const pciSubsystemInfo pci_ss_info_1106_0571_1019_0985 = {0x1019, 0x0985, pci_subsys_1106_0571_1019_0985, 0}; #undef pci_ss_info_1019_0985 @@ -34686,6 +36852,14 @@ static const pciSubsystemInfo pci_ss_info_1106_0571_1462_7020 = {0x1462, 0x7020, pci_subsys_1106_0571_1462_7020, 0}; #undef pci_ss_info_1462_7020 #define pci_ss_info_1462_7020 pci_ss_info_1106_0571_1462_7020 +static const pciSubsystemInfo pci_ss_info_1106_0571_1462_7094 = + {0x1462, 0x7094, pci_subsys_1106_0571_1462_7094, 0}; +#undef pci_ss_info_1462_7094 +#define pci_ss_info_1462_7094 pci_ss_info_1106_0571_1462_7094 +static const pciSubsystemInfo pci_ss_info_1106_0571_1462_7181 = + {0x1462, 0x7181, pci_subsys_1106_0571_1462_7181, 0}; +#undef pci_ss_info_1462_7181 +#define pci_ss_info_1462_7181 pci_ss_info_1106_0571_1462_7181 static const pciSubsystemInfo pci_ss_info_1106_0571_147b_1407 = {0x147b, 0x1407, pci_subsys_1106_0571_147b_1407, 0}; #undef pci_ss_info_147b_1407 @@ -34802,6 +36976,14 @@ static const pciSubsystemInfo pci_ss_info_1106_3038_1462_7020 = {0x1462, 0x7020, pci_subsys_1106_3038_1462_7020, 0}; #undef pci_ss_info_1462_7020 #define pci_ss_info_1462_7020 pci_ss_info_1106_3038_1462_7020 +static const pciSubsystemInfo pci_ss_info_1106_3038_1462_7094 = + {0x1462, 0x7094, pci_subsys_1106_3038_1462_7094, 0}; +#undef pci_ss_info_1462_7094 +#define pci_ss_info_1462_7094 pci_ss_info_1106_3038_1462_7094 +static const pciSubsystemInfo pci_ss_info_1106_3038_1462_7181 = + {0x1462, 0x7181, pci_subsys_1106_3038_1462_7181, 0}; +#undef pci_ss_info_1462_7181 +#define pci_ss_info_1462_7181 pci_ss_info_1106_3038_1462_7181 static const pciSubsystemInfo pci_ss_info_1106_3038_147b_1407 = {0x147b, 0x1407, pci_subsys_1106_3038_147b_1407, 0}; #undef pci_ss_info_147b_1407 @@ -34826,6 +37008,10 @@ static const pciSubsystemInfo pci_ss_info_1106_3043_1186_1400 = {0x1186, 0x1400, pci_subsys_1106_3043_1186_1400, 0}; #undef pci_ss_info_1186_1400 #define pci_ss_info_1186_1400 pci_ss_info_1106_3043_1186_1400 +static const pciSubsystemInfo pci_ss_info_1106_3044_0010_0001 = + {0x0010, 0x0001, pci_subsys_1106_3044_0010_0001, 0}; +#undef pci_ss_info_0010_0001 +#define pci_ss_info_0010_0001 pci_ss_info_1106_3044_0010_0001 #endif static const pciSubsystemInfo pci_ss_info_1106_3044_1025_005a = {0x1025, 0x005a, pci_subsys_1106_3044_1025_005a, 0}; @@ -34944,6 +37130,10 @@ static const pciSubsystemInfo pci_ss_info_1106_3059_1043_812a = {0x1043, 0x812a, pci_subsys_1106_3059_1043_812a, 0}; #undef pci_ss_info_1043_812a #define pci_ss_info_1043_812a pci_ss_info_1106_3059_1043_812a +static const pciSubsystemInfo pci_ss_info_1106_3059_10ec_8168 = + {0x10ec, 0x8168, pci_subsys_1106_3059_10ec_8168, 0}; +#undef pci_ss_info_10ec_8168 +#define pci_ss_info_10ec_8168 pci_ss_info_1106_3059_10ec_8168 static const pciSubsystemInfo pci_ss_info_1106_3059_1106_3059 = {0x1106, 0x3059, pci_subsys_1106_3059_1106_3059, 0}; #undef pci_ss_info_1106_3059 @@ -34964,6 +37154,10 @@ static const pciSubsystemInfo pci_ss_info_1106_3059_1297_c160 = {0x1297, 0xc160, pci_subsys_1106_3059_1297_c160, 0}; #undef pci_ss_info_1297_c160 #define pci_ss_info_1297_c160 pci_ss_info_1106_3059_1297_c160 +static const pciSubsystemInfo pci_ss_info_1106_3059_1413_147b = + {0x1413, 0x147b, pci_subsys_1106_3059_1413_147b, 0}; +#undef pci_ss_info_1413_147b +#define pci_ss_info_1413_147b pci_ss_info_1106_3059_1413_147b static const pciSubsystemInfo pci_ss_info_1106_3059_1458_a002 = {0x1458, 0xa002, pci_subsys_1106_3059_1458_a002, 0}; #undef pci_ss_info_1458_a002 @@ -34976,10 +37170,18 @@ static const pciSubsystemInfo pci_ss_info_1106_3059_1462_3800 = {0x1462, 0x3800, pci_subsys_1106_3059_1462_3800, 0}; #undef pci_ss_info_1462_3800 #define pci_ss_info_1462_3800 pci_ss_info_1106_3059_1462_3800 +static const pciSubsystemInfo pci_ss_info_1106_3059_1462_7181 = + {0x1462, 0x7181, pci_subsys_1106_3059_1462_7181, 0}; +#undef pci_ss_info_1462_7181 +#define pci_ss_info_1462_7181 pci_ss_info_1106_3059_1462_7181 static const pciSubsystemInfo pci_ss_info_1106_3059_147b_1407 = {0x147b, 0x1407, pci_subsys_1106_3059_147b_1407, 0}; #undef pci_ss_info_147b_1407 #define pci_ss_info_147b_1407 pci_ss_info_1106_3059_147b_1407 +static const pciSubsystemInfo pci_ss_info_1106_3059_1849_0850 = + {0x1849, 0x0850, pci_subsys_1106_3059_1849_0850, 0}; +#undef pci_ss_info_1849_0850 +#define pci_ss_info_1849_0850 pci_ss_info_1106_3059_1849_0850 static const pciSubsystemInfo pci_ss_info_1106_3059_1849_9761 = {0x1849, 0x9761, pci_subsys_1106_3059_1849_9761, 0}; #undef pci_ss_info_1849_9761 @@ -34994,6 +37196,10 @@ static const pciSubsystemInfo pci_ss_info_1106_3059_a0a0_01b6 = {0xa0a0, 0x01b6, pci_subsys_1106_3059_a0a0_01b6, 0}; #undef pci_ss_info_a0a0_01b6 #define pci_ss_info_a0a0_01b6 pci_ss_info_1106_3059_a0a0_01b6 +static const pciSubsystemInfo pci_ss_info_1106_3059_a0a0_0342 = + {0xa0a0, 0x0342, pci_subsys_1106_3059_a0a0_0342, 0}; +#undef pci_ss_info_a0a0_0342 +#define pci_ss_info_a0a0_0342 pci_ss_info_1106_3059_a0a0_0342 static const pciSubsystemInfo pci_ss_info_1106_3065_1043_80a1 = {0x1043, 0x80a1, pci_subsys_1106_3065_1043_80a1, 0}; #undef pci_ss_info_1043_80a1 @@ -35014,6 +37220,10 @@ static const pciSubsystemInfo pci_ss_info_1106_3065_13b9_1421 = {0x13b9, 0x1421, pci_subsys_1106_3065_13b9_1421, 0}; #undef pci_ss_info_13b9_1421 #define pci_ss_info_13b9_1421 pci_ss_info_1106_3065_13b9_1421 +static const pciSubsystemInfo pci_ss_info_1106_3065_1462_7181 = + {0x1462, 0x7181, pci_subsys_1106_3065_1462_7181, 0}; +#undef pci_ss_info_1462_7181 +#define pci_ss_info_1462_7181 pci_ss_info_1106_3065_1462_7181 static const pciSubsystemInfo pci_ss_info_1106_3065_147b_1c09 = {0x147b, 0x1c09, pci_subsys_1106_3065_147b_1c09, 0}; #undef pci_ss_info_147b_1c09 @@ -35078,6 +37288,14 @@ static const pciSubsystemInfo pci_ss_info_1106_3104_1462_7020 = {0x1462, 0x7020, pci_subsys_1106_3104_1462_7020, 0}; #undef pci_ss_info_1462_7020 #define pci_ss_info_1462_7020 pci_ss_info_1106_3104_1462_7020 +static const pciSubsystemInfo pci_ss_info_1106_3104_1462_7094 = + {0x1462, 0x7094, pci_subsys_1106_3104_1462_7094, 0}; +#undef pci_ss_info_1462_7094 +#define pci_ss_info_1462_7094 pci_ss_info_1106_3104_1462_7094 +static const pciSubsystemInfo pci_ss_info_1106_3104_1462_7181 = + {0x1462, 0x7181, pci_subsys_1106_3104_1462_7181, 0}; +#undef pci_ss_info_1462_7181 +#define pci_ss_info_1462_7181 pci_ss_info_1106_3104_1462_7181 static const pciSubsystemInfo pci_ss_info_1106_3104_147b_1407 = {0x147b, 0x1407, pci_subsys_1106_3104_147b_1407, 0}; #undef pci_ss_info_147b_1407 @@ -35114,6 +37332,10 @@ static const pciSubsystemInfo pci_ss_info_1106_3149_1462_7020 = {0x1462, 0x7020, pci_subsys_1106_3149_1462_7020, 0}; #undef pci_ss_info_1462_7020 #define pci_ss_info_1462_7020 pci_ss_info_1106_3149_1462_7020 +static const pciSubsystemInfo pci_ss_info_1106_3149_1462_7094 = + {0x1462, 0x7094, pci_subsys_1106_3149_1462_7094, 0}; +#undef pci_ss_info_1462_7094 +#define pci_ss_info_1462_7094 pci_ss_info_1106_3149_1462_7094 static const pciSubsystemInfo pci_ss_info_1106_3149_147b_1407 = {0x147b, 0x1407, pci_subsys_1106_3149_147b_1407, 0}; #undef pci_ss_info_147b_1407 @@ -35126,6 +37348,10 @@ static const pciSubsystemInfo pci_ss_info_1106_3149_1849_3149 = {0x1849, 0x3149, pci_subsys_1106_3149_1849_3149, 0}; #undef pci_ss_info_1849_3149 #define pci_ss_info_1849_3149 pci_ss_info_1106_3149_1849_3149 +static const pciSubsystemInfo pci_ss_info_1106_3149_a0a0_04ad = + {0xa0a0, 0x04ad, pci_subsys_1106_3149_a0a0_04ad, 0}; +#undef pci_ss_info_a0a0_04ad +#define pci_ss_info_a0a0_04ad pci_ss_info_1106_3149_a0a0_04ad static const pciSubsystemInfo pci_ss_info_1106_3164_1043_80f4 = {0x1043, 0x80f4, pci_subsys_1106_3164_1043_80f4, 0}; #undef pci_ss_info_1043_80f4 @@ -35284,6 +37510,14 @@ static const pciSubsystemInfo pci_ss_info_1127_0400_1127_0400 = #define pci_ss_info_1127_0400 pci_ss_info_1127_0400_1127_0400 #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_1131_1561_1775_c200 = + {0x1775, 0xc200, pci_subsys_1131_1561_1775_c200, 0}; +#undef pci_ss_info_1775_c200 +#define pci_ss_info_1775_c200 pci_ss_info_1131_1561_1775_c200 +static const pciSubsystemInfo pci_ss_info_1131_1562_1775_c200 = + {0x1775, 0xc200, pci_subsys_1131_1562_1775_c200, 0}; +#undef pci_ss_info_1775_c200 +#define pci_ss_info_1775_c200 pci_ss_info_1131_1562_1775_c200 static const pciSubsystemInfo pci_ss_info_1131_5402_1244_0f00 = {0x1244, 0x0f00, pci_subsys_1131_5402_1244_0f00, 0}; #undef pci_ss_info_1244_0f00 @@ -35362,6 +37596,10 @@ static const pciSubsystemInfo pci_ss_info_1131_7133_1043_4862 = {0x1043, 0x4862, pci_subsys_1131_7133_1043_4862, 0}; #undef pci_ss_info_1043_4862 #define pci_ss_info_1043_4862 pci_ss_info_1131_7133_1043_4862 +static const pciSubsystemInfo pci_ss_info_1131_7133_1131_0000 = + {0x1131, 0x0000, pci_subsys_1131_7133_1131_0000, 0}; +#undef pci_ss_info_1131_0000 +#define pci_ss_info_1131_0000 pci_ss_info_1131_7133_1131_0000 static const pciSubsystemInfo pci_ss_info_1131_7133_1131_2001 = {0x1131, 0x2001, pci_subsys_1131_7133_1131_2001, 0}; #undef pci_ss_info_1131_2001 @@ -35406,6 +37644,10 @@ static const pciSubsystemInfo pci_ss_info_1131_7133_1461_1044 = {0x1461, 0x1044, pci_subsys_1131_7133_1461_1044, 0}; #undef pci_ss_info_1461_1044 #define pci_ss_info_1461_1044 pci_ss_info_1131_7133_1461_1044 +static const pciSubsystemInfo pci_ss_info_1131_7133_1461_a14b = + {0x1461, 0xa14b, pci_subsys_1131_7133_1461_a14b, 0}; +#undef pci_ss_info_1461_a14b +#define pci_ss_info_1461_a14b pci_ss_info_1131_7133_1461_a14b static const pciSubsystemInfo pci_ss_info_1131_7133_1461_f31f = {0x1461, 0xf31f, pci_subsys_1131_7133_1461_f31f, 0}; #undef pci_ss_info_1461_f31f @@ -35430,10 +37672,18 @@ static const pciSubsystemInfo pci_ss_info_1131_7133_153b_1162 = {0x153b, 0x1162, pci_subsys_1131_7133_153b_1162, 0}; #undef pci_ss_info_153b_1162 #define pci_ss_info_153b_1162 pci_ss_info_1131_7133_153b_1162 +static const pciSubsystemInfo pci_ss_info_1131_7133_17de_7350 = + {0x17de, 0x7350, pci_subsys_1131_7133_17de_7350, 0}; +#undef pci_ss_info_17de_7350 +#define pci_ss_info_17de_7350 pci_ss_info_1131_7133_17de_7350 static const pciSubsystemInfo pci_ss_info_1131_7133_185b_c100 = {0x185b, 0xc100, pci_subsys_1131_7133_185b_c100, 0}; #undef pci_ss_info_185b_c100 #define pci_ss_info_185b_c100 pci_ss_info_1131_7133_185b_c100 +static const pciSubsystemInfo pci_ss_info_1131_7133_185b_c900 = + {0x185b, 0xc900, pci_subsys_1131_7133_185b_c900, 0}; +#undef pci_ss_info_185b_c900 +#define pci_ss_info_185b_c900 pci_ss_info_1131_7133_185b_c900 static const pciSubsystemInfo pci_ss_info_1131_7133_5168_0306 = {0x5168, 0x0306, pci_subsys_1131_7133_5168_0306, 0}; #undef pci_ss_info_5168_0306 @@ -35662,6 +37912,10 @@ static const pciSubsystemInfo pci_ss_info_1131_7146_13c2_1011 = {0x13c2, 0x1011, pci_subsys_1131_7146_13c2_1011, 0}; #undef pci_ss_info_13c2_1011 #define pci_ss_info_13c2_1011 pci_ss_info_1131_7146_13c2_1011 +static const pciSubsystemInfo pci_ss_info_1131_7146_13c2_1012 = + {0x13c2, 0x1012, pci_subsys_1131_7146_13c2_1012, 0}; +#undef pci_ss_info_13c2_1012 +#define pci_ss_info_13c2_1012 pci_ss_info_1131_7146_13c2_1012 static const pciSubsystemInfo pci_ss_info_1131_7146_13c2_1013 = {0x13c2, 0x1013, pci_subsys_1131_7146_13c2_1013, 0}; #undef pci_ss_info_13c2_1013 @@ -35670,6 +37924,14 @@ static const pciSubsystemInfo pci_ss_info_1131_7146_13c2_1016 = {0x13c2, 0x1016, pci_subsys_1131_7146_13c2_1016, 0}; #undef pci_ss_info_13c2_1016 #define pci_ss_info_13c2_1016 pci_ss_info_1131_7146_13c2_1016 +static const pciSubsystemInfo pci_ss_info_1131_7146_13c2_1018 = + {0x13c2, 0x1018, pci_subsys_1131_7146_13c2_1018, 0}; +#undef pci_ss_info_13c2_1018 +#define pci_ss_info_13c2_1018 pci_ss_info_1131_7146_13c2_1018 +static const pciSubsystemInfo pci_ss_info_1131_7146_13c2_1019 = + {0x13c2, 0x1019, pci_subsys_1131_7146_13c2_1019, 0}; +#undef pci_ss_info_13c2_1019 +#define pci_ss_info_13c2_1019 pci_ss_info_1131_7146_13c2_1019 static const pciSubsystemInfo pci_ss_info_1131_7146_13c2_1102 = {0x13c2, 0x1102, pci_subsys_1131_7146_13c2_1102, 0}; #undef pci_ss_info_13c2_1102 @@ -35678,6 +37940,10 @@ static const pciSubsystemInfo pci_ss_info_1131_7146_153b_1156 = {0x153b, 0x1156, pci_subsys_1131_7146_153b_1156, 0}; #undef pci_ss_info_153b_1156 #define pci_ss_info_153b_1156 pci_ss_info_1131_7146_153b_1156 +static const pciSubsystemInfo pci_ss_info_1131_7146_1894_0020 = + {0x1894, 0x0020, pci_subsys_1131_7146_1894_0020, 0}; +#undef pci_ss_info_1894_0020 +#define pci_ss_info_1894_0020 pci_ss_info_1131_7146_1894_0020 static const pciSubsystemInfo pci_ss_info_1131_9730_1131_0000 = {0x1131, 0x0000, pci_subsys_1131_9730_1131_0000, 0}; #undef pci_ss_info_1131_0000 @@ -36188,6 +38454,12 @@ static const pciSubsystemInfo pci_ss_info_1166_0203_1734_1012 = {0x1734, 0x1012, pci_subsys_1166_0203_1734_1012, 0}; #undef pci_ss_info_1734_1012 #define pci_ss_info_1734_1012 pci_ss_info_1166_0203_1734_1012 +#endif +static const pciSubsystemInfo pci_ss_info_1166_0212_1028_810b = + {0x1028, 0x810b, pci_subsys_1166_0212_1028_810b, 0}; +#undef pci_ss_info_1028_810b +#define pci_ss_info_1028_810b pci_ss_info_1166_0212_1028_810b +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_1166_0212_4c53_1080 = {0x4c53, 0x1080, pci_subsys_1166_0212_4c53_1080, 0}; #undef pci_ss_info_4c53_1080 @@ -36265,6 +38537,12 @@ static const pciSubsystemInfo pci_ss_info_1180_0476_1014_0185 = #undef pci_ss_info_1014_0185 #define pci_ss_info_1014_0185 pci_ss_info_1180_0476_1014_0185 #endif +static const pciSubsystemInfo pci_ss_info_1180_0476_1028_014f = + {0x1028, 0x014f, pci_subsys_1180_0476_1028_014f, 0}; +#undef pci_ss_info_1028_014f +#define pci_ss_info_1028_014f pci_ss_info_1180_0476_1028_014f +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif static const pciSubsystemInfo pci_ss_info_1180_0476_1028_0188 = {0x1028, 0x0188, pci_subsys_1180_0476_1028_0188, 0}; #undef pci_ss_info_1028_0188 @@ -36290,6 +38568,16 @@ static const pciSubsystemInfo pci_ss_info_1180_0476_104d_80e7 = #undef pci_ss_info_104d_80e7 #define pci_ss_info_104d_80e7 pci_ss_info_1180_0476_104d_80e7 #ifdef VENDOR_INCLUDE_NONVIDEO +#endif +static const pciSubsystemInfo pci_ss_info_1180_0476_104d_814e = + {0x104d, 0x814e, pci_subsys_1180_0476_104d_814e, 0}; +#undef pci_ss_info_104d_814e +#define pci_ss_info_104d_814e pci_ss_info_1180_0476_104d_814e +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_1180_0476_10f7_8338 = + {0x10f7, 0x8338, pci_subsys_1180_0476_10f7_8338, 0}; +#undef pci_ss_info_10f7_8338 +#define pci_ss_info_10f7_8338 pci_ss_info_1180_0476_10f7_8338 static const pciSubsystemInfo pci_ss_info_1180_0476_144d_c00c = {0x144d, 0xc00c, pci_subsys_1180_0476_144d_c00c, 0}; #undef pci_ss_info_144d_c00c @@ -36323,6 +38611,12 @@ static const pciSubsystemInfo pci_ss_info_1180_0552_1014_0511 = #undef pci_ss_info_1014_0511 #define pci_ss_info_1014_0511 pci_ss_info_1180_0552_1014_0511 #endif +static const pciSubsystemInfo pci_ss_info_1180_0552_1028_014f = + {0x1028, 0x014f, pci_subsys_1180_0552_1028_014f, 0}; +#undef pci_ss_info_1028_014f +#define pci_ss_info_1028_014f pci_ss_info_1180_0552_1028_014f +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif static const pciSubsystemInfo pci_ss_info_1180_0552_1028_0188 = {0x1028, 0x0188, pci_subsys_1180_0552_1028_0188, 0}; #undef pci_ss_info_1028_0188 @@ -36368,6 +38662,10 @@ static const pciSubsystemInfo pci_ss_info_1180_0822_1043_1967 = {0x1043, 0x1967, pci_subsys_1180_0822_1043_1967, 0}; #undef pci_ss_info_1043_1967 #define pci_ss_info_1043_1967 pci_ss_info_1180_0822_1043_1967 +static const pciSubsystemInfo pci_ss_info_1180_0822_10f7_8338 = + {0x10f7, 0x8338, pci_subsys_1180_0822_10f7_8338, 0}; +#undef pci_ss_info_10f7_8338 +#define pci_ss_info_10f7_8338 pci_ss_info_1180_0822_10f7_8338 static const pciSubsystemInfo pci_ss_info_1180_0822_144d_c018 = {0x144d, 0xc018, pci_subsys_1180_0822_144d_c018, 0}; #undef pci_ss_info_144d_c018 @@ -36484,6 +38782,10 @@ static const pciSubsystemInfo pci_ss_info_11ab_4320_270f_2803 = {0x270f, 0x2803, pci_subsys_11ab_4320_270f_2803, 0}; #undef pci_ss_info_270f_2803 #define pci_ss_info_270f_2803 pci_ss_info_11ab_4320_270f_2803 +static const pciSubsystemInfo pci_ss_info_11ab_4347_4c53_10d0 = + {0x4c53, 0x10d0, pci_subsys_11ab_4347_4c53_10d0, 0}; +#undef pci_ss_info_4c53_10d0 +#define pci_ss_info_4c53_10d0 pci_ss_info_11ab_4347_4c53_10d0 static const pciSubsystemInfo pci_ss_info_11ab_4350_1179_0001 = {0x1179, 0x0001, pci_subsys_11ab_4350_1179_0001, 0}; #undef pci_ss_info_1179_0001 @@ -36830,6 +39132,10 @@ static const pciSubsystemInfo pci_ss_info_11ab_4362_a0a0_0506 = {0xa0a0, 0x0506, pci_subsys_11ab_4362_a0a0_0506, 0}; #undef pci_ss_info_a0a0_0506 #define pci_ss_info_a0a0_0506 pci_ss_info_11ab_4362_a0a0_0506 +static const pciSubsystemInfo pci_ss_info_11ab_6480_1775_c200 = + {0x1775, 0xc200, pci_subsys_11ab_6480_1775_c200, 0}; +#undef pci_ss_info_1775_c200 +#define pci_ss_info_1775_c200 pci_ss_info_11ab_6480_1775_c200 #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_11ad_0002_11ad_0002 = @@ -36858,6 +39164,20 @@ static const pciSubsystemInfo pci_ss_info_11ad_c115_11ad_c001 = #define pci_ss_info_11ad_c001 pci_ss_info_11ad_c115_11ad_c001 #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_11bd_0040_11bd_0044 = + {0x11bd, 0x0044, pci_subsys_11bd_0040_11bd_0044, 0}; +#undef pci_ss_info_11bd_0044 +#define pci_ss_info_11bd_0044 pci_ss_info_11bd_0040_11bd_0044 +static const pciSubsystemInfo pci_ss_info_11bd_0041_11bd_0044 = + {0x11bd, 0x0044, pci_subsys_11bd_0041_11bd_0044, 0}; +#undef pci_ss_info_11bd_0044 +#define pci_ss_info_11bd_0044 pci_ss_info_11bd_0041_11bd_0044 +static const pciSubsystemInfo pci_ss_info_11bd_0042_11bd_0044 = + {0x11bd, 0x0044, pci_subsys_11bd_0042_11bd_0044, 0}; +#undef pci_ss_info_11bd_0044 +#define pci_ss_info_11bd_0044 pci_ss_info_11bd_0042_11bd_0044 +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO #endif static const pciSubsystemInfo pci_ss_info_11c1_0440_1033_8015 = {0x1033, 0x8015, pci_subsys_11c1_0440_1033_8015, 0}; @@ -37212,6 +39532,12 @@ static const pciSubsystemInfo pci_ss_info_11cb_2000_11cb_b008 = #define pci_ss_info_11cb_b008 pci_ss_info_11cb_2000_11cb_b008 #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_11d4_1986_11d4_1986 = + {0x11d4, 0x1986, pci_subsys_11d4_1986_11d4_1986, 0}; +#undef pci_ss_info_11d4_1986 +#define pci_ss_info_11d4_1986 pci_ss_info_11d4_1986_11d4_1986 +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO #endif static const pciSubsystemInfo pci_ss_info_11de_6057_1031_7efe = {0x1031, 0x7efe, pci_subsys_11de_6057_1031_7efe, 0}; @@ -37316,6 +39642,10 @@ static const pciSubsystemInfo pci_ss_info_1217_7223_103c_0890 = #undef pci_ss_info_103c_0890 #define pci_ss_info_103c_0890 pci_ss_info_1217_7223_103c_0890 #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_1217_7223_10cf_11c4 = + {0x10cf, 0x11c4, pci_subsys_1217_7223_10cf_11c4, 0}; +#undef pci_ss_info_10cf_11c4 +#define pci_ss_info_10cf_11c4 pci_ss_info_1217_7223_10cf_11c4 #endif static const pciSubsystemInfo pci_ss_info_121a_0003_1092_0003 = {0x1092, 0x0003, pci_subsys_121a_0003_1092_0003, 0}; @@ -37646,6 +39976,10 @@ static const pciSubsystemInfo pci_ss_info_125d_2898_147a_c001 = {0x147a, 0xc001, pci_subsys_125d_2898_147a_c001, 0}; #undef pci_ss_info_147a_c001 #define pci_ss_info_147a_c001 pci_ss_info_125d_2898_147a_c001 +static const pciSubsystemInfo pci_ss_info_125d_2898_148d_1030 = + {0x148d, 0x1030, pci_subsys_125d_2898_148d_1030, 0}; +#undef pci_ss_info_148d_1030 +#define pci_ss_info_148d_1030 pci_ss_info_125d_2898_148d_1030 static const pciSubsystemInfo pci_ss_info_125d_2898_14fe_0428 = {0x14fe, 0x0428, pci_subsys_125d_2898_14fe_0428, 0}; #undef pci_ss_info_14fe_0428 @@ -37685,6 +40019,12 @@ static const pciSubsystemInfo pci_ss_info_1260_3873_1737_3874 = #undef pci_ss_info_1737_3874 #define pci_ss_info_1737_3874 pci_ss_info_1260_3873_1737_3874 #endif +static const pciSubsystemInfo pci_ss_info_1260_3873_8086_2510 = + {0x8086, 0x2510, pci_subsys_1260_3873_8086_2510, 0}; +#undef pci_ss_info_8086_2510 +#define pci_ss_info_8086_2510 pci_ss_info_1260_3873_8086_2510 +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif static const pciSubsystemInfo pci_ss_info_1260_3873_8086_2513 = {0x8086, 0x2513, pci_subsys_1260_3873_8086_2513, 0}; #undef pci_ss_info_8086_2513 @@ -37710,6 +40050,10 @@ static const pciSubsystemInfo pci_ss_info_1260_3890_1113_4203 = {0x1113, 0x4203, pci_subsys_1260_3890_1113_4203, 0}; #undef pci_ss_info_1113_4203 #define pci_ss_info_1113_4203 pci_ss_info_1260_3890_1113_4203 +static const pciSubsystemInfo pci_ss_info_1260_3890_1113_8201 = + {0x1113, 0x8201, pci_subsys_1260_3890_1113_8201, 0}; +#undef pci_ss_info_1113_8201 +#define pci_ss_info_1113_8201 pci_ss_info_1260_3890_1113_8201 static const pciSubsystemInfo pci_ss_info_1260_3890_1113_ee03 = {0x1113, 0xee03, pci_subsys_1260_3890_1113_ee03, 0}; #undef pci_ss_info_1113_ee03 @@ -38830,6 +41174,10 @@ static const pciSubsystemInfo pci_ss_info_1397_08b4_1397_b540 = {0x1397, 0xb540, pci_subsys_1397_08b4_1397_b540, 0}; #undef pci_ss_info_1397_b540 #define pci_ss_info_1397_b540 pci_ss_info_1397_08b4_1397_b540 +static const pciSubsystemInfo pci_ss_info_1397_08b4_1397_b556 = + {0x1397, 0xb556, pci_subsys_1397_08b4_1397_b556, 0}; +#undef pci_ss_info_1397_b556 +#define pci_ss_info_1397_b556 pci_ss_info_1397_08b4_1397_b556 static const pciSubsystemInfo pci_ss_info_1397_2bd0_0675_1704 = {0x0675, 0x1704, pci_subsys_1397_2bd0_0675_1704, 0}; #undef pci_ss_info_0675_1704 @@ -39092,6 +41440,12 @@ static const pciSubsystemInfo pci_ss_info_14c1_8043_103c_1240 = #ifdef VENDOR_INCLUDE_NONVIDEO #endif #ifdef VENDOR_INCLUDE_NONVIDEO +#endif +static const pciSubsystemInfo pci_ss_info_14e4_1600_103c_3015 = + {0x103c, 0x3015, pci_subsys_14e4_1600_103c_3015, 0}; +#undef pci_ss_info_103c_3015 +#define pci_ss_info_103c_3015 pci_ss_info_14e4_1600_103c_3015 +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_14e4_1600_107b_5048 = {0x107b, 0x5048, pci_subsys_14e4_1600_107b_5048, 0}; #undef pci_ss_info_107b_5048 @@ -39467,6 +41821,18 @@ static const pciSubsystemInfo pci_ss_info_14e4_1659_1734_1061 = #undef pci_ss_info_1734_1061 #define pci_ss_info_1734_1061 pci_ss_info_14e4_1659_1734_1061 #endif +static const pciSubsystemInfo pci_ss_info_14e4_165a_103c_7051 = + {0x103c, 0x7051, pci_subsys_14e4_165a_103c_7051, 0}; +#undef pci_ss_info_103c_7051 +#define pci_ss_info_103c_7051 pci_ss_info_14e4_165a_103c_7051 +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +static const pciSubsystemInfo pci_ss_info_14e4_165a_103c_7052 = + {0x103c, 0x7052, pci_subsys_14e4_165a_103c_7052, 0}; +#undef pci_ss_info_103c_7052 +#define pci_ss_info_103c_7052 pci_ss_info_14e4_165a_103c_7052 +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif static const pciSubsystemInfo pci_ss_info_14e4_165d_1028_865d = {0x1028, 0x865d, pci_subsys_14e4_165d_1028_865d, 0}; #undef pci_ss_info_1028_865d @@ -39490,6 +41856,10 @@ static const pciSubsystemInfo pci_ss_info_14e4_165e_103c_099c = #undef pci_ss_info_103c_099c #define pci_ss_info_103c_099c pci_ss_info_14e4_165e_103c_099c #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_14e4_165e_10cf_1279 = + {0x10cf, 0x1279, pci_subsys_14e4_165e_10cf_1279, 0}; +#undef pci_ss_info_10cf_1279 +#define pci_ss_info_10cf_1279 pci_ss_info_14e4_165e_10cf_1279 #endif static const pciSubsystemInfo pci_ss_info_14e4_1668_103c_7039 = {0x103c, 0x7039, pci_subsys_14e4_1668_103c_7039, 0}; @@ -39569,6 +41939,12 @@ static const pciSubsystemInfo pci_ss_info_14e4_169c_103c_308b = #define pci_ss_info_103c_308b pci_ss_info_14e4_169c_103c_308b #ifdef VENDOR_INCLUDE_NONVIDEO #endif +static const pciSubsystemInfo pci_ss_info_14e4_169c_103c_30a1 = + {0x103c, 0x30a1, pci_subsys_14e4_169c_103c_30a1, 0}; +#undef pci_ss_info_103c_30a1 +#define pci_ss_info_103c_30a1 pci_ss_info_14e4_169c_103c_30a1 +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif static const pciSubsystemInfo pci_ss_info_14e4_16a6_0e11_00bb = {0x0e11, 0x00bb, pci_subsys_14e4_16a6_0e11_00bb, 0}; #undef pci_ss_info_0e11_00bb @@ -39641,6 +42017,12 @@ static const pciSubsystemInfo pci_ss_info_14e4_16ac_103c_1706 = #define pci_ss_info_103c_1706 pci_ss_info_14e4_16ac_103c_1706 #ifdef VENDOR_INCLUDE_NONVIDEO #endif +static const pciSubsystemInfo pci_ss_info_14e4_16ac_103c_7038 = + {0x103c, 0x7038, pci_subsys_14e4_16ac_103c_7038, 0}; +#undef pci_ss_info_103c_7038 +#define pci_ss_info_103c_7038 pci_ss_info_14e4_16ac_103c_7038 +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif static const pciSubsystemInfo pci_ss_info_14e4_16ac_103c_703b = {0x103c, 0x703b, pci_subsys_14e4_16ac_103c_703b, 0}; #undef pci_ss_info_103c_703b @@ -39709,6 +42091,12 @@ static const pciSubsystemInfo pci_ss_info_14e4_170c_1028_0196 = #define pci_ss_info_1028_0196 pci_ss_info_14e4_170c_1028_0196 #ifdef VENDOR_INCLUDE_NONVIDEO #endif +static const pciSubsystemInfo pci_ss_info_14e4_170c_1028_01af = + {0x1028, 0x01af, pci_subsys_14e4_170c_1028_01af, 0}; +#undef pci_ss_info_1028_01af +#define pci_ss_info_1028_01af pci_ss_info_14e4_170c_1028_01af +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif static const pciSubsystemInfo pci_ss_info_14e4_170c_103c_099c = {0x103c, 0x099c, pci_subsys_14e4_170c_103c_099c, 0}; #undef pci_ss_info_103c_099c @@ -39758,6 +42146,10 @@ static const pciSubsystemInfo pci_ss_info_14e4_4318_16ec_0119 = {0x16ec, 0x0119, pci_subsys_14e4_4318_16ec_0119, 0}; #undef pci_ss_info_16ec_0119 #define pci_ss_info_16ec_0119 pci_ss_info_14e4_4318_16ec_0119 +static const pciSubsystemInfo pci_ss_info_14e4_4318_1737_0042 = + {0x1737, 0x0042, pci_subsys_14e4_4318_1737_0042, 0}; +#undef pci_ss_info_1737_0042 +#define pci_ss_info_1737_0042 pci_ss_info_14e4_4318_1737_0042 static const pciSubsystemInfo pci_ss_info_14e4_4318_1737_0048 = {0x1737, 0x0048, pci_subsys_14e4_4318_1737_0048, 0}; #undef pci_ss_info_1737_0048 @@ -39808,6 +42200,10 @@ static const pciSubsystemInfo pci_ss_info_14e4_4320_144f_7050 = {0x144f, 0x7050, pci_subsys_14e4_4320_144f_7050, 0}; #undef pci_ss_info_144f_7050 #define pci_ss_info_144f_7050 pci_ss_info_14e4_4320_144f_7050 +static const pciSubsystemInfo pci_ss_info_14e4_4320_144f_7051 = + {0x144f, 0x7051, pci_subsys_14e4_4320_144f_7051, 0}; +#undef pci_ss_info_144f_7051 +#define pci_ss_info_144f_7051 pci_ss_info_14e4_4320_144f_7051 static const pciSubsystemInfo pci_ss_info_14e4_4320_14e4_4320 = {0x14e4, 0x4320, pci_subsys_14e4_4320_14e4_4320, 0}; #undef pci_ss_info_14e4_4320 @@ -40090,6 +42486,12 @@ static const pciSubsystemInfo pci_ss_info_14f1_2443_104d_8097 = #undef pci_ss_info_104d_8097 #define pci_ss_info_104d_8097 pci_ss_info_14f1_2443_104d_8097 #ifdef VENDOR_INCLUDE_NONVIDEO +#endif +static const pciSubsystemInfo pci_ss_info_14f1_2bfa_1025_0009 = + {0x1025, 0x0009, pci_subsys_14f1_2bfa_1025_0009, 0}; +#undef pci_ss_info_1025_0009 +#define pci_ss_info_1025_0009 pci_ss_info_14f1_2bfa_1025_0009 +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_14f1_2f00_13e0_8d84 = {0x13e0, 0x8d84, pci_subsys_14f1_2f00_13e0_8d84, 0}; #undef pci_ss_info_13e0_8d84 @@ -40286,6 +42688,10 @@ static const pciSubsystemInfo pci_ss_info_14f1_8802_107d_663c = {0x107d, 0x663c, pci_subsys_14f1_8802_107d_663c, 0}; #undef pci_ss_info_107d_663c #define pci_ss_info_107d_663c pci_ss_info_14f1_8802_107d_663c +static const pciSubsystemInfo pci_ss_info_14f1_8802_107d_665f = + {0x107d, 0x665f, pci_subsys_14f1_8802_107d_665f, 0}; +#undef pci_ss_info_107d_665f +#define pci_ss_info_107d_665f pci_ss_info_14f1_8802_107d_665f static const pciSubsystemInfo pci_ss_info_14f1_8802_14f1_0187 = {0x14f1, 0x0187, pci_subsys_14f1_8802_14f1_0187, 0}; #undef pci_ss_info_14f1_0187 @@ -40430,6 +42836,38 @@ static const pciSubsystemInfo pci_ss_info_1522_0100_1522_2700 = {0x1522, 0x2700, pci_subsys_1522_0100_1522_2700, 0}; #undef pci_ss_info_1522_2700 #define pci_ss_info_1522_2700 pci_ss_info_1522_0100_1522_2700 +static const pciSubsystemInfo pci_ss_info_1522_0100_1522_3000 = + {0x1522, 0x3000, pci_subsys_1522_0100_1522_3000, 0}; +#undef pci_ss_info_1522_3000 +#define pci_ss_info_1522_3000 pci_ss_info_1522_0100_1522_3000 +static const pciSubsystemInfo pci_ss_info_1522_0100_1522_3100 = + {0x1522, 0x3100, pci_subsys_1522_0100_1522_3100, 0}; +#undef pci_ss_info_1522_3100 +#define pci_ss_info_1522_3100 pci_ss_info_1522_0100_1522_3100 +static const pciSubsystemInfo pci_ss_info_1522_0100_1522_3200 = + {0x1522, 0x3200, pci_subsys_1522_0100_1522_3200, 0}; +#undef pci_ss_info_1522_3200 +#define pci_ss_info_1522_3200 pci_ss_info_1522_0100_1522_3200 +static const pciSubsystemInfo pci_ss_info_1522_0100_1522_3300 = + {0x1522, 0x3300, pci_subsys_1522_0100_1522_3300, 0}; +#undef pci_ss_info_1522_3300 +#define pci_ss_info_1522_3300 pci_ss_info_1522_0100_1522_3300 +static const pciSubsystemInfo pci_ss_info_1522_0100_1522_3400 = + {0x1522, 0x3400, pci_subsys_1522_0100_1522_3400, 0}; +#undef pci_ss_info_1522_3400 +#define pci_ss_info_1522_3400 pci_ss_info_1522_0100_1522_3400 +static const pciSubsystemInfo pci_ss_info_1522_0100_1522_3500 = + {0x1522, 0x3500, pci_subsys_1522_0100_1522_3500, 0}; +#undef pci_ss_info_1522_3500 +#define pci_ss_info_1522_3500 pci_ss_info_1522_0100_1522_3500 +static const pciSubsystemInfo pci_ss_info_1522_0100_1522_3c00 = + {0x1522, 0x3c00, pci_subsys_1522_0100_1522_3c00, 0}; +#undef pci_ss_info_1522_3c00 +#define pci_ss_info_1522_3c00 pci_ss_info_1522_0100_1522_3c00 +static const pciSubsystemInfo pci_ss_info_1522_0100_1522_3d00 = + {0x1522, 0x3d00, pci_subsys_1522_0100_1522_3d00, 0}; +#undef pci_ss_info_1522_3d00 +#define pci_ss_info_1522_3d00 pci_ss_info_1522_0100_1522_3d00 #endif #ifdef VENDOR_INCLUDE_NONVIDEO #endif @@ -40564,10 +43002,22 @@ static const pciSubsystemInfo pci_ss_info_168c_0013_16ab_7302 = {0x16ab, 0x7302, pci_subsys_168c_0013_16ab_7302, 0}; #undef pci_ss_info_16ab_7302 #define pci_ss_info_16ab_7302 pci_ss_info_168c_0013_16ab_7302 +static const pciSubsystemInfo pci_ss_info_168c_0013_17cf_0042 = + {0x17cf, 0x0042, pci_subsys_168c_0013_17cf_0042, 0}; +#undef pci_ss_info_17cf_0042 +#define pci_ss_info_17cf_0042 pci_ss_info_168c_0013_17cf_0042 +static const pciSubsystemInfo pci_ss_info_168c_0013_185f_1012 = + {0x185f, 0x1012, pci_subsys_168c_0013_185f_1012, 0}; +#undef pci_ss_info_185f_1012 +#define pci_ss_info_185f_1012 pci_ss_info_168c_0013_185f_1012 static const pciSubsystemInfo pci_ss_info_168c_0013_185f_2012 = {0x185f, 0x2012, pci_subsys_168c_0013_185f_2012, 0}; #undef pci_ss_info_185f_2012 #define pci_ss_info_185f_2012 pci_ss_info_168c_0013_185f_2012 +static const pciSubsystemInfo pci_ss_info_168c_001a_1052_168c = + {0x1052, 0x168c, pci_subsys_168c_001a_1052_168c, 0}; +#undef pci_ss_info_1052_168c +#define pci_ss_info_1052_168c pci_ss_info_168c_001a_1052_168c static const pciSubsystemInfo pci_ss_info_168c_001a_1113_ee20 = {0x1113, 0xee20, pci_subsys_168c_001a_1113_ee20, 0}; #undef pci_ss_info_1113_ee20 @@ -40592,6 +43042,10 @@ static const pciSubsystemInfo pci_ss_info_168c_001a_1186_3a24 = {0x1186, 0x3a24, pci_subsys_168c_001a_1186_3a24, 0}; #undef pci_ss_info_1186_3a24 #define pci_ss_info_1186_3a24 pci_ss_info_168c_001a_1186_3a24 +static const pciSubsystemInfo pci_ss_info_168c_001a_1186_3b08 = + {0x1186, 0x3b08, pci_subsys_168c_001a_1186_3b08, 0}; +#undef pci_ss_info_1186_3b08 +#define pci_ss_info_1186_3b08 pci_ss_info_168c_001a_1186_3b08 static const pciSubsystemInfo pci_ss_info_168c_001a_168c_001a = {0x168c, 0x001a, pci_subsys_168c_001a_168c_001a, 0}; #undef pci_ss_info_168c_001a @@ -40600,6 +43054,10 @@ static const pciSubsystemInfo pci_ss_info_168c_001a_168c_1052 = {0x168c, 0x1052, pci_subsys_168c_001a_168c_1052, 0}; #undef pci_ss_info_168c_1052 #define pci_ss_info_168c_1052 pci_ss_info_168c_001a_168c_1052 +static const pciSubsystemInfo pci_ss_info_168c_001a_168c_2052 = + {0x168c, 0x2052, pci_subsys_168c_001a_168c_2052, 0}; +#undef pci_ss_info_168c_2052 +#define pci_ss_info_168c_2052 pci_ss_info_168c_001a_168c_2052 static const pciSubsystemInfo pci_ss_info_168c_001b_1186_3a19 = {0x1186, 0x3a19, pci_subsys_168c_001b_1186_3a19, 0}; #undef pci_ss_info_1186_3a19 @@ -40608,6 +43066,14 @@ static const pciSubsystemInfo pci_ss_info_168c_001b_1186_3a22 = {0x1186, 0x3a22, pci_subsys_168c_001b_1186_3a22, 0}; #undef pci_ss_info_1186_3a22 #define pci_ss_info_1186_3a22 pci_ss_info_168c_001b_1186_3a22 +static const pciSubsystemInfo pci_ss_info_168c_001b_1458_e901 = + {0x1458, 0xe901, pci_subsys_168c_001b_1458_e901, 0}; +#undef pci_ss_info_1458_e901 +#define pci_ss_info_1458_e901 pci_ss_info_168c_001b_1458_e901 +static const pciSubsystemInfo pci_ss_info_168c_001b_168c_001b = + {0x168c, 0x001b, pci_subsys_168c_001b_168c_001b, 0}; +#undef pci_ss_info_168c_001b +#define pci_ss_info_168c_001b pci_ss_info_168c_001b_168c_001b static const pciSubsystemInfo pci_ss_info_168c_001b_168c_2062 = {0x168c, 0x2062, pci_subsys_168c_001b_168c_2062, 0}; #undef pci_ss_info_168c_2062 @@ -40616,6 +43082,14 @@ static const pciSubsystemInfo pci_ss_info_168c_001b_168c_2063 = {0x168c, 0x2063, pci_subsys_168c_001b_168c_2063, 0}; #undef pci_ss_info_168c_2063 #define pci_ss_info_168c_2063 pci_ss_info_168c_001b_168c_2063 +static const pciSubsystemInfo pci_ss_info_168c_001b_185f_1600 = + {0x185f, 0x1600, pci_subsys_168c_001b_185f_1600, 0}; +#undef pci_ss_info_185f_1600 +#define pci_ss_info_185f_1600 pci_ss_info_168c_001b_185f_1600 +static const pciSubsystemInfo pci_ss_info_168c_001b_a727_6804 = + {0xa727, 0x6804, pci_subsys_168c_001b_a727_6804, 0}; +#undef pci_ss_info_a727_6804 +#define pci_ss_info_a727_6804 pci_ss_info_168c_001b_a727_6804 static const pciSubsystemInfo pci_ss_info_168c_1014_1014_058a = {0x1014, 0x058a, pci_subsys_168c_1014_1014_058a, 0}; #undef pci_ss_info_1014_058a @@ -40710,6 +43184,10 @@ static const pciSubsystemInfo pci_ss_info_1814_0201_1458_e931 = {0x1458, 0xe931, pci_subsys_1814_0201_1458_e931, 0}; #undef pci_ss_info_1458_e931 #define pci_ss_info_1458_e931 pci_ss_info_1814_0201_1458_e931 +static const pciSubsystemInfo pci_ss_info_1814_0201_1462_6833 = + {0x1462, 0x6833, pci_subsys_1814_0201_1462_6833, 0}; +#undef pci_ss_info_1462_6833 +#define pci_ss_info_1462_6833 pci_ss_info_1814_0201_1462_6833 static const pciSubsystemInfo pci_ss_info_1814_0201_1462_6835 = {0x1462, 0x6835, pci_subsys_1814_0201_1462_6835, 0}; #undef pci_ss_info_1462_6835 @@ -40738,6 +43216,14 @@ static const pciSubsystemInfo pci_ss_info_1814_0301_1186_3c09 = {0x1186, 0x3c09, pci_subsys_1814_0301_1186_3c09, 0}; #undef pci_ss_info_1186_3c09 #define pci_ss_info_1186_3c09 pci_ss_info_1814_0301_1186_3c09 +static const pciSubsystemInfo pci_ss_info_1814_0301_13d1_abe3 = + {0x13d1, 0xabe3, pci_subsys_1814_0301_13d1_abe3, 0}; +#undef pci_ss_info_13d1_abe3 +#define pci_ss_info_13d1_abe3 pci_ss_info_1814_0301_13d1_abe3 +static const pciSubsystemInfo pci_ss_info_1814_0301_1458_e934 = + {0x1458, 0xe934, pci_subsys_1814_0301_1458_e934, 0}; +#undef pci_ss_info_1458_e934 +#define pci_ss_info_1458_e934 pci_ss_info_1814_0301_1458_e934 static const pciSubsystemInfo pci_ss_info_1814_0301_1737_0055 = {0x1737, 0x0055, pci_subsys_1814_0301_1737_0055, 0}; #undef pci_ss_info_1737_0055 @@ -40750,6 +43236,10 @@ static const pciSubsystemInfo pci_ss_info_1814_0302_1186_3c09 = {0x1186, 0x3c09, pci_subsys_1814_0302_1186_3c09, 0}; #undef pci_ss_info_1186_3c09 #define pci_ss_info_1186_3c09 pci_ss_info_1814_0302_1186_3c09 +static const pciSubsystemInfo pci_ss_info_1814_0302_1462_b834 = + {0x1462, 0xb834, pci_subsys_1814_0302_1462_b834, 0}; +#undef pci_ss_info_1462_b834 +#define pci_ss_info_1462_b834 pci_ss_info_1814_0302_1462_b834 #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_18ec_c006_18ec_d001 = @@ -40786,6 +43276,22 @@ static const pciSubsystemInfo pci_ss_info_18ec_c058_18ec_d004 = #define pci_ss_info_18ec_d004 pci_ss_info_18ec_c058_18ec_d004 #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_1971_1011_1043_0001 = + {0x1043, 0x0001, pci_subsys_1971_1011_1043_0001, 0}; +#undef pci_ss_info_1043_0001 +#define pci_ss_info_1043_0001 pci_ss_info_1971_1011_1043_0001 +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_197b_2361_1462_7235 = + {0x1462, 0x7235, pci_subsys_197b_2361_1462_7235, 0}; +#undef pci_ss_info_1462_7235 +#define pci_ss_info_1462_7235 pci_ss_info_197b_2361_1462_7235 +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_3388_0021_1775_c200 = + {0x1775, 0xc200, pci_subsys_3388_0021_1775_c200, 0}; +#undef pci_ss_info_1775_c200 +#define pci_ss_info_1775_c200 pci_ss_info_3388_0021_1775_c200 static const pciSubsystemInfo pci_ss_info_3388_0021_1775_ce90 = {0x1775, 0xce90, pci_subsys_3388_0021_1775_ce90, 0}; #undef pci_ss_info_1775_ce90 @@ -41053,6 +43559,10 @@ static const pciSubsystemInfo pci_ss_info_5333_8904_1014_00db = {0x1014, 0x00db, pci_subsys_5333_8904_1014_00db, 0}; #undef pci_ss_info_1014_00db #define pci_ss_info_1014_00db pci_ss_info_5333_8904_1014_00db +static const pciSubsystemInfo pci_ss_info_5333_8904_4843_314a = + {0x4843, 0x314a, pci_subsys_5333_8904_4843_314a, 0}; +#undef pci_ss_info_4843_314a +#define pci_ss_info_4843_314a pci_ss_info_5333_8904_4843_314a static const pciSubsystemInfo pci_ss_info_5333_8904_5333_8904 = {0x5333, 0x8904, pci_subsys_5333_8904_5333_8904, 0}; #undef pci_ss_info_5333_8904 @@ -41225,6 +43735,10 @@ static const pciSubsystemInfo pci_ss_info_5333_8c2e_1014_01fc = {0x1014, 0x01fc, pci_subsys_5333_8c2e_1014_01fc, 0}; #undef pci_ss_info_1014_01fc #define pci_ss_info_1014_01fc pci_ss_info_5333_8c2e_1014_01fc +static const pciSubsystemInfo pci_ss_info_5333_8e48_5333_0130 = + {0x5333, 0x0130, pci_subsys_5333_8e48_5333_0130, 0}; +#undef pci_ss_info_5333_0130 +#define pci_ss_info_5333_0130 pci_ss_info_5333_8e48_5333_0130 static const pciSubsystemInfo pci_ss_info_5333_9102_1092_5932 = {0x1092, 0x5932, pci_subsys_5333_9102_1092_5932, 0}; #undef pci_ss_info_1092_5932 @@ -41257,6 +43771,10 @@ static const pciSubsystemInfo pci_ss_info_5333_9102_1092_5a57 = {0x1092, 0x5a57, pci_subsys_5333_9102_1092_5a57, 0}; #undef pci_ss_info_1092_5a57 #define pci_ss_info_1092_5a57 pci_ss_info_5333_9102_1092_5a57 +static const pciSubsystemInfo pci_ss_info_8086_0600_8086_0136 = + {0x8086, 0x0136, pci_subsys_8086_0600_8086_0136, 0}; +#undef pci_ss_info_8086_0136 +#define pci_ss_info_8086_0136 pci_ss_info_8086_0600_8086_0136 static const pciSubsystemInfo pci_ss_info_8086_0600_8086_01af = {0x8086, 0x01af, pci_subsys_8086_0600_8086_01af, 0}; #undef pci_ss_info_8086_01af @@ -41341,6 +43859,10 @@ static const pciSubsystemInfo pci_ss_info_8086_1008_1014_0269 = {0x1014, 0x0269, pci_subsys_8086_1008_1014_0269, 0}; #undef pci_ss_info_1014_0269 #define pci_ss_info_1014_0269 pci_ss_info_8086_1008_1014_0269 +static const pciSubsystemInfo pci_ss_info_8086_1008_1028_011b = + {0x1028, 0x011b, pci_subsys_8086_1008_1028_011b, 0}; +#undef pci_ss_info_1028_011b +#define pci_ss_info_1028_011b pci_ss_info_8086_1008_1028_011b static const pciSubsystemInfo pci_ss_info_8086_1008_1028_011c = {0x1028, 0x011c, pci_subsys_8086_1008_1028_011c, 0}; #undef pci_ss_info_1028_011c @@ -41701,6 +44223,10 @@ static const pciSubsystemInfo pci_ss_info_8086_103d_1014_0522 = {0x1014, 0x0522, pci_subsys_8086_103d_1014_0522, 0}; #undef pci_ss_info_1014_0522 #define pci_ss_info_1014_0522 pci_ss_info_8086_103d_1014_0522 +static const pciSubsystemInfo pci_ss_info_8086_103d_8086_103d = + {0x8086, 0x103d, pci_subsys_8086_103d_8086_103d, 0}; +#undef pci_ss_info_8086_103d +#define pci_ss_info_8086_103d pci_ss_info_8086_103d_8086_103d static const pciSubsystemInfo pci_ss_info_8086_1040_16be_1040 = {0x16be, 0x1040, pci_subsys_8086_1040_16be_1040, 0}; #undef pci_ss_info_16be_1040 @@ -41717,6 +44243,10 @@ static const pciSubsystemInfo pci_ss_info_8086_1043_8086_2527 = {0x8086, 0x2527, pci_subsys_8086_1043_8086_2527, 0}; #undef pci_ss_info_8086_2527 #define pci_ss_info_8086_2527 pci_ss_info_8086_1043_8086_2527 +static const pciSubsystemInfo pci_ss_info_8086_1043_8086_2561 = + {0x8086, 0x2561, pci_subsys_8086_1043_8086_2561, 0}; +#undef pci_ss_info_8086_2561 +#define pci_ss_info_8086_2561 pci_ss_info_8086_1043_8086_2561 static const pciSubsystemInfo pci_ss_info_8086_1043_8086_2581 = {0x8086, 0x2581, pci_subsys_8086_1043_8086_2581, 0}; #undef pci_ss_info_8086_2581 @@ -41729,6 +44259,10 @@ static const pciSubsystemInfo pci_ss_info_8086_1048_8086_a11f = {0x8086, 0xa11f, pci_subsys_8086_1048_8086_a11f, 0}; #undef pci_ss_info_8086_a11f #define pci_ss_info_8086_a11f pci_ss_info_8086_1048_8086_a11f +static const pciSubsystemInfo pci_ss_info_8086_1049_17aa_20b9 = + {0x17aa, 0x20b9, pci_subsys_8086_1049_17aa_20b9, 0}; +#undef pci_ss_info_17aa_20b9 +#define pci_ss_info_17aa_20b9 pci_ss_info_8086_1049_17aa_20b9 static const pciSubsystemInfo pci_ss_info_8086_1050_1462_728c = {0x1462, 0x728c, pci_subsys_8086_1050_1462_728c, 0}; #undef pci_ss_info_1462_728c @@ -41753,6 +44287,10 @@ static const pciSubsystemInfo pci_ss_info_8086_105e_103c_7044 = {0x103c, 0x7044, pci_subsys_8086_105e_103c_7044, 0}; #undef pci_ss_info_103c_7044 #define pci_ss_info_103c_7044 pci_ss_info_8086_105e_103c_7044 +static const pciSubsystemInfo pci_ss_info_8086_105e_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_105e_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_105e_1775_1100 static const pciSubsystemInfo pci_ss_info_8086_105e_1775_6003 = {0x1775, 0x6003, pci_subsys_8086_105e_1775_6003, 0}; #undef pci_ss_info_1775_6003 @@ -41977,6 +44515,10 @@ static const pciSubsystemInfo pci_ss_info_8086_109a_8086_109a = {0x8086, 0x109a, pci_subsys_8086_109a_8086_109a, 0}; #undef pci_ss_info_8086_109a #define pci_ss_info_8086_109a pci_ss_info_8086_109a_8086_109a +static const pciSubsystemInfo pci_ss_info_8086_109a_8086_309c = + {0x8086, 0x309c, pci_subsys_8086_109a_8086_309c, 0}; +#undef pci_ss_info_8086_309c +#define pci_ss_info_8086_309c pci_ss_info_8086_109a_8086_309c static const pciSubsystemInfo pci_ss_info_8086_109e_8086_a01f = {0x8086, 0xa01f, pci_subsys_8086_109e_8086_a01f, 0}; #undef pci_ss_info_8086_a01f @@ -42353,6 +44895,10 @@ static const pciSubsystemInfo pci_ss_info_8086_1229_1668_1100 = {0x1668, 0x1100, pci_subsys_8086_1229_1668_1100, 0}; #undef pci_ss_info_1668_1100 #define pci_ss_info_1668_1100 pci_ss_info_8086_1229_1668_1100 +static const pciSubsystemInfo pci_ss_info_8086_1229_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_1229_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_1229_1775_1100 static const pciSubsystemInfo pci_ss_info_8086_1229_1775_ce90 = {0x1775, 0xce90, pci_subsys_8086_1229_1775_ce90, 0}; #undef pci_ss_info_1775_ce90 @@ -42841,6 +45387,10 @@ static const pciSubsystemInfo pci_ss_info_8086_2415_1028_0095 = {0x1028, 0x0095, pci_subsys_8086_2415_1028_0095, 0}; #undef pci_ss_info_1028_0095 #define pci_ss_info_1028_0095 pci_ss_info_8086_2415_1028_0095 +static const pciSubsystemInfo pci_ss_info_8086_2415_1028_00b4 = + {0x1028, 0x00b4, pci_subsys_8086_2415_1028_00b4, 0}; +#undef pci_ss_info_1028_00b4 +#define pci_ss_info_1028_00b4 pci_ss_info_8086_2415_1028_00b4 static const pciSubsystemInfo pci_ss_info_8086_2415_110a_0051 = {0x110a, 0x0051, pci_subsys_8086_2415_110a_0051, 0}; #undef pci_ss_info_110a_0051 @@ -43025,6 +45575,10 @@ static const pciSubsystemInfo pci_ss_info_8086_2446_104d_80df = {0x104d, 0x80df, pci_subsys_8086_2446_104d_80df, 0}; #undef pci_ss_info_104d_80df #define pci_ss_info_104d_80df pci_ss_info_8086_2446_104d_80df +static const pciSubsystemInfo pci_ss_info_8086_2448_103c_0934 = + {0x103c, 0x0934, pci_subsys_8086_2448_103c_0934, 0}; +#undef pci_ss_info_103c_0934 +#define pci_ss_info_103c_0934 pci_ss_info_8086_2448_103c_0934 static const pciSubsystemInfo pci_ss_info_8086_2448_103c_099c = {0x103c, 0x099c, pci_subsys_8086_2448_103c_099c, 0}; #undef pci_ss_info_103c_099c @@ -43281,6 +45835,18 @@ static const pciSubsystemInfo pci_ss_info_8086_2485_1014_051c = {0x1014, 0x051c, pci_subsys_8086_2485_1014_051c, 0}; #undef pci_ss_info_1014_051c #define pci_ss_info_1014_051c pci_ss_info_8086_2485_1014_051c +static const pciSubsystemInfo pci_ss_info_8086_2485_1043_1583 = + {0x1043, 0x1583, pci_subsys_8086_2485_1043_1583, 0}; +#undef pci_ss_info_1043_1583 +#define pci_ss_info_1043_1583 pci_ss_info_8086_2485_1043_1583 +static const pciSubsystemInfo pci_ss_info_8086_2485_1043_1623 = + {0x1043, 0x1623, pci_subsys_8086_2485_1043_1623, 0}; +#undef pci_ss_info_1043_1623 +#define pci_ss_info_1043_1623 pci_ss_info_8086_2485_1043_1623 +static const pciSubsystemInfo pci_ss_info_8086_2485_1043_1643 = + {0x1043, 0x1643, pci_subsys_8086_2485_1043_1643, 0}; +#undef pci_ss_info_1043_1643 +#define pci_ss_info_1043_1643 pci_ss_info_8086_2485_1043_1643 static const pciSubsystemInfo pci_ss_info_8086_2485_104d_80e7 = {0x104d, 0x80e7, pci_subsys_8086_2485_104d_80e7, 0}; #undef pci_ss_info_104d_80e7 @@ -43437,10 +46003,22 @@ static const pciSubsystemInfo pci_ss_info_8086_24c2_4c53_1090 = {0x4c53, 0x1090, pci_subsys_8086_24c2_4c53_1090, 0}; #undef pci_ss_info_4c53_1090 #define pci_ss_info_4c53_1090 pci_ss_info_8086_24c2_4c53_1090 +static const pciSubsystemInfo pci_ss_info_8086_24c2_8086_24c2 = + {0x8086, 0x24c2, pci_subsys_8086_24c2_8086_24c2, 0}; +#undef pci_ss_info_8086_24c2 +#define pci_ss_info_8086_24c2 pci_ss_info_8086_24c2_8086_24c2 static const pciSubsystemInfo pci_ss_info_8086_24c2_8086_4541 = {0x8086, 0x4541, pci_subsys_8086_24c2_8086_4541, 0}; #undef pci_ss_info_8086_4541 #define pci_ss_info_8086_4541 pci_ss_info_8086_24c2_8086_4541 +static const pciSubsystemInfo pci_ss_info_8086_24c2_e4bf_0cc9 = + {0xe4bf, 0x0cc9, pci_subsys_8086_24c2_e4bf_0cc9, 0}; +#undef pci_ss_info_e4bf_0cc9 +#define pci_ss_info_e4bf_0cc9 pci_ss_info_8086_24c2_e4bf_0cc9 +static const pciSubsystemInfo pci_ss_info_8086_24c2_e4bf_0cd2 = + {0xe4bf, 0x0cd2, pci_subsys_8086_24c2_e4bf_0cd2, 0}; +#undef pci_ss_info_e4bf_0cd2 +#define pci_ss_info_e4bf_0cd2 pci_ss_info_8086_24c2_e4bf_0cd2 static const pciSubsystemInfo pci_ss_info_8086_24c3_1014_0267 = {0x1014, 0x0267, pci_subsys_8086_24c3_1014_0267, 0}; #undef pci_ss_info_1014_0267 @@ -43457,6 +46035,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24c3_1028_0126 = {0x1028, 0x0126, pci_subsys_8086_24c3_1028_0126, 0}; #undef pci_ss_info_1028_0126 #define pci_ss_info_1028_0126 pci_ss_info_8086_24c3_1028_0126 +static const pciSubsystemInfo pci_ss_info_8086_24c3_1028_014f = + {0x1028, 0x014f, pci_subsys_8086_24c3_1028_014f, 0}; +#undef pci_ss_info_1028_014f +#define pci_ss_info_1028_014f pci_ss_info_8086_24c3_1028_014f static const pciSubsystemInfo pci_ss_info_8086_24c3_103c_088c = {0x103c, 0x088c, pci_subsys_8086_24c3_103c_088c, 0}; #undef pci_ss_info_103c_088c @@ -43473,6 +46055,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24c3_1071_8160 = {0x1071, 0x8160, pci_subsys_8086_24c3_1071_8160, 0}; #undef pci_ss_info_1071_8160 #define pci_ss_info_1071_8160 pci_ss_info_8086_24c3_1071_8160 +static const pciSubsystemInfo pci_ss_info_8086_24c3_144d_c005 = + {0x144d, 0xc005, pci_subsys_8086_24c3_144d_c005, 0}; +#undef pci_ss_info_144d_c005 +#define pci_ss_info_144d_c005 pci_ss_info_8086_24c3_144d_c005 static const pciSubsystemInfo pci_ss_info_8086_24c3_144d_c00c = {0x144d, 0xc00c, pci_subsys_8086_24c3_144d_c00c, 0}; #undef pci_ss_info_144d_c00c @@ -43497,6 +46083,14 @@ static const pciSubsystemInfo pci_ss_info_8086_24c3_4c53_1090 = {0x4c53, 0x1090, pci_subsys_8086_24c3_4c53_1090, 0}; #undef pci_ss_info_4c53_1090 #define pci_ss_info_4c53_1090 pci_ss_info_8086_24c3_4c53_1090 +static const pciSubsystemInfo pci_ss_info_8086_24c3_e4bf_0cc9 = + {0xe4bf, 0x0cc9, pci_subsys_8086_24c3_e4bf_0cc9, 0}; +#undef pci_ss_info_e4bf_0cc9 +#define pci_ss_info_e4bf_0cc9 pci_ss_info_8086_24c3_e4bf_0cc9 +static const pciSubsystemInfo pci_ss_info_8086_24c3_e4bf_0cd2 = + {0xe4bf, 0x0cd2, pci_subsys_8086_24c3_e4bf_0cd2, 0}; +#undef pci_ss_info_e4bf_0cd2 +#define pci_ss_info_e4bf_0cd2 pci_ss_info_8086_24c3_e4bf_0cd2 static const pciSubsystemInfo pci_ss_info_8086_24c4_1014_0267 = {0x1014, 0x0267, pci_subsys_8086_24c4_1014_0267, 0}; #undef pci_ss_info_1014_0267 @@ -43557,10 +46151,22 @@ static const pciSubsystemInfo pci_ss_info_8086_24c4_4c53_1090 = {0x4c53, 0x1090, pci_subsys_8086_24c4_4c53_1090, 0}; #undef pci_ss_info_4c53_1090 #define pci_ss_info_4c53_1090 pci_ss_info_8086_24c4_4c53_1090 +static const pciSubsystemInfo pci_ss_info_8086_24c4_8086_24c2 = + {0x8086, 0x24c2, pci_subsys_8086_24c4_8086_24c2, 0}; +#undef pci_ss_info_8086_24c2 +#define pci_ss_info_8086_24c2 pci_ss_info_8086_24c4_8086_24c2 static const pciSubsystemInfo pci_ss_info_8086_24c4_8086_4541 = {0x8086, 0x4541, pci_subsys_8086_24c4_8086_4541, 0}; #undef pci_ss_info_8086_4541 #define pci_ss_info_8086_4541 pci_ss_info_8086_24c4_8086_4541 +static const pciSubsystemInfo pci_ss_info_8086_24c4_e4bf_0cc9 = + {0xe4bf, 0x0cc9, pci_subsys_8086_24c4_e4bf_0cc9, 0}; +#undef pci_ss_info_e4bf_0cc9 +#define pci_ss_info_e4bf_0cc9 pci_ss_info_8086_24c4_e4bf_0cc9 +static const pciSubsystemInfo pci_ss_info_8086_24c4_e4bf_0cd2 = + {0xe4bf, 0x0cd2, pci_subsys_8086_24c4_e4bf_0cd2, 0}; +#undef pci_ss_info_e4bf_0cd2 +#define pci_ss_info_e4bf_0cd2 pci_ss_info_8086_24c4_e4bf_0cd2 static const pciSubsystemInfo pci_ss_info_8086_24c5_0e11_00b8 = {0x0e11, 0x00b8, pci_subsys_8086_24c5_0e11_00b8, 0}; #undef pci_ss_info_0e11_00b8 @@ -43569,6 +46175,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24c5_1014_0267 = {0x1014, 0x0267, pci_subsys_8086_24c5_1014_0267, 0}; #undef pci_ss_info_1014_0267 #define pci_ss_info_1014_0267 pci_ss_info_8086_24c5_1014_0267 +static const pciSubsystemInfo pci_ss_info_8086_24c5_1014_0537 = + {0x1014, 0x0537, pci_subsys_8086_24c5_1014_0537, 0}; +#undef pci_ss_info_1014_0537 +#define pci_ss_info_1014_0537 pci_ss_info_8086_24c5_1014_0537 static const pciSubsystemInfo pci_ss_info_8086_24c5_1014_055f = {0x1014, 0x055f, pci_subsys_8086_24c5_1014_055f, 0}; #undef pci_ss_info_1014_055f @@ -43581,6 +46191,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24c5_1028_0139 = {0x1028, 0x0139, pci_subsys_8086_24c5_1028_0139, 0}; #undef pci_ss_info_1028_0139 #define pci_ss_info_1028_0139 pci_ss_info_8086_24c5_1028_0139 +static const pciSubsystemInfo pci_ss_info_8086_24c5_1028_014f = + {0x1028, 0x014f, pci_subsys_8086_24c5_1028_014f, 0}; +#undef pci_ss_info_1028_014f +#define pci_ss_info_1028_014f pci_ss_info_8086_24c5_1028_014f static const pciSubsystemInfo pci_ss_info_8086_24c5_1028_0163 = {0x1028, 0x0163, pci_subsys_8086_24c5_1028_0163, 0}; #undef pci_ss_info_1028_0163 @@ -43605,6 +46219,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24c5_1071_8160 = {0x1071, 0x8160, pci_subsys_8086_24c5_1071_8160, 0}; #undef pci_ss_info_1071_8160 #define pci_ss_info_1071_8160 pci_ss_info_8086_24c5_1071_8160 +static const pciSubsystemInfo pci_ss_info_8086_24c5_144d_c005 = + {0x144d, 0xc005, pci_subsys_8086_24c5_144d_c005, 0}; +#undef pci_ss_info_144d_c005 +#define pci_ss_info_144d_c005 pci_ss_info_8086_24c5_144d_c005 static const pciSubsystemInfo pci_ss_info_8086_24c5_144d_c00c = {0x144d, 0xc00c, pci_subsys_8086_24c5_144d_c00c, 0}; #undef pci_ss_info_144d_c00c @@ -43625,6 +46243,22 @@ static const pciSubsystemInfo pci_ss_info_8086_24c5_1734_1055 = {0x1734, 0x1055, pci_subsys_8086_24c5_1734_1055, 0}; #undef pci_ss_info_1734_1055 #define pci_ss_info_1734_1055 pci_ss_info_8086_24c5_1734_1055 +static const pciSubsystemInfo pci_ss_info_8086_24c5_8086_24c5 = + {0x8086, 0x24c5, pci_subsys_8086_24c5_8086_24c5, 0}; +#undef pci_ss_info_8086_24c5 +#define pci_ss_info_8086_24c5 pci_ss_info_8086_24c5_8086_24c5 +static const pciSubsystemInfo pci_ss_info_8086_24c5_a002_1458 = + {0xa002, 0x1458, pci_subsys_8086_24c5_a002_1458, 0}; +#undef pci_ss_info_a002_1458 +#define pci_ss_info_a002_1458 pci_ss_info_8086_24c5_a002_1458 +static const pciSubsystemInfo pci_ss_info_8086_24c6_1014_0524 = + {0x1014, 0x0524, pci_subsys_8086_24c6_1014_0524, 0}; +#undef pci_ss_info_1014_0524 +#define pci_ss_info_1014_0524 pci_ss_info_8086_24c6_1014_0524 +static const pciSubsystemInfo pci_ss_info_8086_24c6_1014_0525 = + {0x1014, 0x0525, pci_subsys_8086_24c6_1014_0525, 0}; +#undef pci_ss_info_1014_0525 +#define pci_ss_info_1014_0525 pci_ss_info_8086_24c6_1014_0525 static const pciSubsystemInfo pci_ss_info_8086_24c6_1014_0559 = {0x1014, 0x0559, pci_subsys_8086_24c6_1014_0559, 0}; #undef pci_ss_info_1014_0559 @@ -43657,6 +46291,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24c6_1071_8160 = {0x1071, 0x8160, pci_subsys_8086_24c6_1071_8160, 0}; #undef pci_ss_info_1071_8160 #define pci_ss_info_1071_8160 pci_ss_info_8086_24c6_1071_8160 +static const pciSubsystemInfo pci_ss_info_8086_24c6_144d_2115 = + {0x144d, 0x2115, pci_subsys_8086_24c6_144d_2115, 0}; +#undef pci_ss_info_144d_2115 +#define pci_ss_info_144d_2115 pci_ss_info_8086_24c6_144d_2115 static const pciSubsystemInfo pci_ss_info_8086_24c6_144d_c00c = {0x144d, 0xc00c, pci_subsys_8086_24c6_144d_c00c, 0}; #undef pci_ss_info_144d_c00c @@ -43721,10 +46359,22 @@ static const pciSubsystemInfo pci_ss_info_8086_24c7_4c53_1090 = {0x4c53, 0x1090, pci_subsys_8086_24c7_4c53_1090, 0}; #undef pci_ss_info_4c53_1090 #define pci_ss_info_4c53_1090 pci_ss_info_8086_24c7_4c53_1090 +static const pciSubsystemInfo pci_ss_info_8086_24c7_8086_24c2 = + {0x8086, 0x24c2, pci_subsys_8086_24c7_8086_24c2, 0}; +#undef pci_ss_info_8086_24c2 +#define pci_ss_info_8086_24c2 pci_ss_info_8086_24c7_8086_24c2 static const pciSubsystemInfo pci_ss_info_8086_24c7_8086_4541 = {0x8086, 0x4541, pci_subsys_8086_24c7_8086_4541, 0}; #undef pci_ss_info_8086_4541 #define pci_ss_info_8086_4541 pci_ss_info_8086_24c7_8086_4541 +static const pciSubsystemInfo pci_ss_info_8086_24c7_e4bf_0cc9 = + {0xe4bf, 0x0cc9, pci_subsys_8086_24c7_e4bf_0cc9, 0}; +#undef pci_ss_info_e4bf_0cc9 +#define pci_ss_info_e4bf_0cc9 pci_ss_info_8086_24c7_e4bf_0cc9 +static const pciSubsystemInfo pci_ss_info_8086_24c7_e4bf_0cd2 = + {0xe4bf, 0x0cd2, pci_subsys_8086_24c7_e4bf_0cd2, 0}; +#undef pci_ss_info_e4bf_0cd2 +#define pci_ss_info_e4bf_0cd2 pci_ss_info_8086_24c7_e4bf_0cd2 static const pciSubsystemInfo pci_ss_info_8086_24ca_1014_052d = {0x1014, 0x052d, pci_subsys_8086_24ca_1014_052d, 0}; #undef pci_ss_info_1014_052d @@ -43733,6 +46383,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24ca_1025_005a = {0x1025, 0x005a, pci_subsys_8086_24ca_1025_005a, 0}; #undef pci_ss_info_1025_005a #define pci_ss_info_1025_005a pci_ss_info_8086_24ca_1025_005a +static const pciSubsystemInfo pci_ss_info_8086_24ca_1028_014f = + {0x1028, 0x014f, pci_subsys_8086_24ca_1028_014f, 0}; +#undef pci_ss_info_1028_014f +#define pci_ss_info_1028_014f pci_ss_info_8086_24ca_1028_014f static const pciSubsystemInfo pci_ss_info_8086_24ca_1028_0163 = {0x1028, 0x0163, pci_subsys_8086_24ca_1028_0163, 0}; #undef pci_ss_info_1028_0163 @@ -43793,6 +46447,14 @@ static const pciSubsystemInfo pci_ss_info_8086_24cb_4c53_1090 = {0x4c53, 0x1090, pci_subsys_8086_24cb_4c53_1090, 0}; #undef pci_ss_info_4c53_1090 #define pci_ss_info_4c53_1090 pci_ss_info_8086_24cb_4c53_1090 +static const pciSubsystemInfo pci_ss_info_8086_24cb_e4bf_0cc9 = + {0xe4bf, 0x0cc9, pci_subsys_8086_24cb_e4bf_0cc9, 0}; +#undef pci_ss_info_e4bf_0cc9 +#define pci_ss_info_e4bf_0cc9 pci_ss_info_8086_24cb_e4bf_0cc9 +static const pciSubsystemInfo pci_ss_info_8086_24cb_e4bf_0cd2 = + {0xe4bf, 0x0cd2, pci_subsys_8086_24cb_e4bf_0cd2, 0}; +#undef pci_ss_info_e4bf_0cd2 +#define pci_ss_info_e4bf_0cd2 pci_ss_info_8086_24cb_e4bf_0cd2 static const pciSubsystemInfo pci_ss_info_8086_24cc_144d_c00c = {0x144d, 0xc00c, pci_subsys_8086_24cc_144d_c00c, 0}; #undef pci_ss_info_144d_c00c @@ -43877,6 +46539,18 @@ static const pciSubsystemInfo pci_ss_info_8086_24cd_4c53_1090 = {0x4c53, 0x1090, pci_subsys_8086_24cd_4c53_1090, 0}; #undef pci_ss_info_4c53_1090 #define pci_ss_info_4c53_1090 pci_ss_info_8086_24cd_4c53_1090 +static const pciSubsystemInfo pci_ss_info_8086_24cd_8086_24c2 = + {0x8086, 0x24c2, pci_subsys_8086_24cd_8086_24c2, 0}; +#undef pci_ss_info_8086_24c2 +#define pci_ss_info_8086_24c2 pci_ss_info_8086_24cd_8086_24c2 +static const pciSubsystemInfo pci_ss_info_8086_24cd_e4bf_0cc9 = + {0xe4bf, 0x0cc9, pci_subsys_8086_24cd_e4bf_0cc9, 0}; +#undef pci_ss_info_e4bf_0cc9 +#define pci_ss_info_e4bf_0cc9 pci_ss_info_8086_24cd_e4bf_0cc9 +static const pciSubsystemInfo pci_ss_info_8086_24cd_e4bf_0cd2 = + {0xe4bf, 0x0cd2, pci_subsys_8086_24cd_e4bf_0cd2, 0}; +#undef pci_ss_info_e4bf_0cd2 +#define pci_ss_info_e4bf_0cd2 pci_ss_info_8086_24cd_e4bf_0cd2 static const pciSubsystemInfo pci_ss_info_8086_24d1_1028_0169 = {0x1028, 0x0169, pci_subsys_8086_24d1_1028_0169, 0}; #undef pci_ss_info_1028_0169 @@ -43901,6 +46575,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24d1_1462_7280 = {0x1462, 0x7280, pci_subsys_8086_24d1_1462_7280, 0}; #undef pci_ss_info_1462_7280 #define pci_ss_info_1462_7280 pci_ss_info_8086_24d1_1462_7280 +static const pciSubsystemInfo pci_ss_info_8086_24d1_1565_5200 = + {0x1565, 0x5200, pci_subsys_8086_24d1_1565_5200, 0}; +#undef pci_ss_info_1565_5200 +#define pci_ss_info_1565_5200 pci_ss_info_8086_24d1_1565_5200 static const pciSubsystemInfo pci_ss_info_8086_24d1_15d9_4580 = {0x15d9, 0x4580, pci_subsys_8086_24d1_15d9_4580, 0}; #undef pci_ss_info_15d9_4580 @@ -43921,6 +46599,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24d1_8086_524c = {0x8086, 0x524c, pci_subsys_8086_24d1_8086_524c, 0}; #undef pci_ss_info_8086_524c #define pci_ss_info_8086_524c pci_ss_info_8086_24d1_8086_524c +static const pciSubsystemInfo pci_ss_info_8086_24d2_1014_02dd = + {0x1014, 0x02dd, pci_subsys_8086_24d2_1014_02dd, 0}; +#undef pci_ss_info_1014_02dd +#define pci_ss_info_1014_02dd pci_ss_info_8086_24d2_1014_02dd static const pciSubsystemInfo pci_ss_info_8086_24d2_1014_02ed = {0x1014, 0x02ed, pci_subsys_8086_24d2_1014_02ed, 0}; #undef pci_ss_info_1014_02ed @@ -43957,6 +46639,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24d2_1462_7280 = {0x1462, 0x7280, pci_subsys_8086_24d2_1462_7280, 0}; #undef pci_ss_info_1462_7280 #define pci_ss_info_1462_7280 pci_ss_info_8086_24d2_1462_7280 +static const pciSubsystemInfo pci_ss_info_8086_24d2_1565_3101 = + {0x1565, 0x3101, pci_subsys_8086_24d2_1565_3101, 0}; +#undef pci_ss_info_1565_3101 +#define pci_ss_info_1565_3101 pci_ss_info_8086_24d2_1565_3101 static const pciSubsystemInfo pci_ss_info_8086_24d2_15d9_4580 = {0x15d9, 0x4580, pci_subsys_8086_24d2_15d9_4580, 0}; #undef pci_ss_info_15d9_4580 @@ -43981,6 +46667,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24d2_8086_524c = {0x8086, 0x524c, pci_subsys_8086_24d2_8086_524c, 0}; #undef pci_ss_info_8086_524c #define pci_ss_info_8086_524c pci_ss_info_8086_24d2_8086_524c +static const pciSubsystemInfo pci_ss_info_8086_24d3_1014_02dd = + {0x1014, 0x02dd, pci_subsys_8086_24d3_1014_02dd, 0}; +#undef pci_ss_info_1014_02dd +#define pci_ss_info_1014_02dd pci_ss_info_8086_24d3_1014_02dd static const pciSubsystemInfo pci_ss_info_8086_24d3_1014_02ed = {0x1014, 0x02ed, pci_subsys_8086_24d3_1014_02ed, 0}; #undef pci_ss_info_1014_02ed @@ -44009,6 +46699,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24d3_1462_7280 = {0x1462, 0x7280, pci_subsys_8086_24d3_1462_7280, 0}; #undef pci_ss_info_1462_7280 #define pci_ss_info_1462_7280 pci_ss_info_8086_24d3_1462_7280 +static const pciSubsystemInfo pci_ss_info_8086_24d3_1565_3101 = + {0x1565, 0x3101, pci_subsys_8086_24d3_1565_3101, 0}; +#undef pci_ss_info_1565_3101 +#define pci_ss_info_1565_3101 pci_ss_info_8086_24d3_1565_3101 static const pciSubsystemInfo pci_ss_info_8086_24d3_15d9_4580 = {0x15d9, 0x4580, pci_subsys_8086_24d3_15d9_4580, 0}; #undef pci_ss_info_15d9_4580 @@ -44033,6 +46727,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24d3_8086_524c = {0x8086, 0x524c, pci_subsys_8086_24d3_8086_524c, 0}; #undef pci_ss_info_8086_524c #define pci_ss_info_8086_524c pci_ss_info_8086_24d3_8086_524c +static const pciSubsystemInfo pci_ss_info_8086_24d4_1014_02dd = + {0x1014, 0x02dd, pci_subsys_8086_24d4_1014_02dd, 0}; +#undef pci_ss_info_1014_02dd +#define pci_ss_info_1014_02dd pci_ss_info_8086_24d4_1014_02dd static const pciSubsystemInfo pci_ss_info_8086_24d4_1014_02ed = {0x1014, 0x02ed, pci_subsys_8086_24d4_1014_02ed, 0}; #undef pci_ss_info_1014_02ed @@ -44069,6 +46767,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24d4_1462_7280 = {0x1462, 0x7280, pci_subsys_8086_24d4_1462_7280, 0}; #undef pci_ss_info_1462_7280 #define pci_ss_info_1462_7280 pci_ss_info_8086_24d4_1462_7280 +static const pciSubsystemInfo pci_ss_info_8086_24d4_1565_3101 = + {0x1565, 0x3101, pci_subsys_8086_24d4_1565_3101, 0}; +#undef pci_ss_info_1565_3101 +#define pci_ss_info_1565_3101 pci_ss_info_8086_24d4_1565_3101 static const pciSubsystemInfo pci_ss_info_8086_24d4_15d9_4580 = {0x15d9, 0x4580, pci_subsys_8086_24d4_15d9_4580, 0}; #undef pci_ss_info_15d9_4580 @@ -44181,6 +46883,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24d7_1462_7280 = {0x1462, 0x7280, pci_subsys_8086_24d7_1462_7280, 0}; #undef pci_ss_info_1462_7280 #define pci_ss_info_1462_7280 pci_ss_info_8086_24d7_1462_7280 +static const pciSubsystemInfo pci_ss_info_8086_24d7_1565_3101 = + {0x1565, 0x3101, pci_subsys_8086_24d7_1565_3101, 0}; +#undef pci_ss_info_1565_3101 +#define pci_ss_info_1565_3101 pci_ss_info_8086_24d7_1565_3101 static const pciSubsystemInfo pci_ss_info_8086_24d7_15d9_4580 = {0x15d9, 0x4580, pci_subsys_8086_24d7_15d9_4580, 0}; #undef pci_ss_info_15d9_4580 @@ -44205,6 +46911,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24d7_8086_524c = {0x8086, 0x524c, pci_subsys_8086_24d7_8086_524c, 0}; #undef pci_ss_info_8086_524c #define pci_ss_info_8086_524c pci_ss_info_8086_24d7_8086_524c +static const pciSubsystemInfo pci_ss_info_8086_24db_1014_02dd = + {0x1014, 0x02dd, pci_subsys_8086_24db_1014_02dd, 0}; +#undef pci_ss_info_1014_02dd +#define pci_ss_info_1014_02dd pci_ss_info_8086_24db_1014_02dd static const pciSubsystemInfo pci_ss_info_8086_24db_1014_02ed = {0x1014, 0x02ed, pci_subsys_8086_24db_1014_02ed, 0}; #undef pci_ss_info_1014_02ed @@ -44241,6 +46951,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24db_1462_7580 = {0x1462, 0x7580, pci_subsys_8086_24db_1462_7580, 0}; #undef pci_ss_info_1462_7580 #define pci_ss_info_1462_7580 pci_ss_info_8086_24db_1462_7580 +static const pciSubsystemInfo pci_ss_info_8086_24db_1565_3101 = + {0x1565, 0x3101, pci_subsys_8086_24db_1565_3101, 0}; +#undef pci_ss_info_1565_3101 +#define pci_ss_info_1565_3101 pci_ss_info_8086_24db_1565_3101 static const pciSubsystemInfo pci_ss_info_8086_24db_15d9_4580 = {0x15d9, 0x4580, pci_subsys_8086_24db_15d9_4580, 0}; #undef pci_ss_info_15d9_4580 @@ -44269,6 +46983,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24db_8086_524c = {0x8086, 0x524c, pci_subsys_8086_24db_8086_524c, 0}; #undef pci_ss_info_8086_524c #define pci_ss_info_8086_524c pci_ss_info_8086_24db_8086_524c +static const pciSubsystemInfo pci_ss_info_8086_24dd_1014_02dd = + {0x1014, 0x02dd, pci_subsys_8086_24dd_1014_02dd, 0}; +#undef pci_ss_info_1014_02dd +#define pci_ss_info_1014_02dd pci_ss_info_8086_24dd_1014_02dd static const pciSubsystemInfo pci_ss_info_8086_24dd_1014_02ed = {0x1014, 0x02ed, pci_subsys_8086_24dd_1014_02ed, 0}; #undef pci_ss_info_1014_02ed @@ -44341,6 +47059,10 @@ static const pciSubsystemInfo pci_ss_info_8086_24de_1462_7280 = {0x1462, 0x7280, pci_subsys_8086_24de_1462_7280, 0}; #undef pci_ss_info_1462_7280 #define pci_ss_info_1462_7280 pci_ss_info_8086_24de_1462_7280 +static const pciSubsystemInfo pci_ss_info_8086_24de_1565_3101 = + {0x1565, 0x3101, pci_subsys_8086_24de_1565_3101, 0}; +#undef pci_ss_info_1565_3101 +#define pci_ss_info_1565_3101 pci_ss_info_8086_24de_1565_3101 static const pciSubsystemInfo pci_ss_info_8086_24de_15d9_4580 = {0x15d9, 0x4580, pci_subsys_8086_24de_15d9_4580, 0}; #undef pci_ss_info_15d9_4580 @@ -44433,6 +47155,10 @@ static const pciSubsystemInfo pci_ss_info_8086_2562_1014_0267 = {0x1014, 0x0267, pci_subsys_8086_2562_1014_0267, 0}; #undef pci_ss_info_1014_0267 #define pci_ss_info_1014_0267 pci_ss_info_8086_2562_1014_0267 +static const pciSubsystemInfo pci_ss_info_8086_2562_1734_1003 = + {0x1734, 0x1003, pci_subsys_8086_2562_1734_1003, 0}; +#undef pci_ss_info_1734_1003 +#define pci_ss_info_1734_1003 pci_ss_info_8086_2562_1734_1003 static const pciSubsystemInfo pci_ss_info_8086_2562_1734_1004 = {0x1734, 0x1004, pci_subsys_8086_2562_1734_1004, 0}; #undef pci_ss_info_1734_1004 @@ -44517,18 +47243,46 @@ static const pciSubsystemInfo pci_ss_info_8086_2582_1734_105b = {0x1734, 0x105b, pci_subsys_8086_2582_1734_105b, 0}; #undef pci_ss_info_1734_105b #define pci_ss_info_1734_105b pci_ss_info_8086_2582_1734_105b +static const pciSubsystemInfo pci_ss_info_8086_2582_1849_2582 = + {0x1849, 0x2582, pci_subsys_8086_2582_1849_2582, 0}; +#undef pci_ss_info_1849_2582 +#define pci_ss_info_1849_2582 pci_ss_info_8086_2582_1849_2582 static const pciSubsystemInfo pci_ss_info_8086_2590_1028_0182 = {0x1028, 0x0182, pci_subsys_8086_2590_1028_0182, 0}; #undef pci_ss_info_1028_0182 #define pci_ss_info_1028_0182 pci_ss_info_8086_2590_1028_0182 +static const pciSubsystemInfo pci_ss_info_8086_2590_103c_0934 = + {0x103c, 0x0934, pci_subsys_8086_2590_103c_0934, 0}; +#undef pci_ss_info_103c_0934 +#define pci_ss_info_103c_0934 pci_ss_info_8086_2590_103c_0934 static const pciSubsystemInfo pci_ss_info_8086_2590_103c_099c = {0x103c, 0x099c, pci_subsys_8086_2590_103c_099c, 0}; #undef pci_ss_info_103c_099c #define pci_ss_info_103c_099c pci_ss_info_8086_2590_103c_099c +static const pciSubsystemInfo pci_ss_info_8086_2590_104d_81b7 = + {0x104d, 0x81b7, pci_subsys_8086_2590_104d_81b7, 0}; +#undef pci_ss_info_104d_81b7 +#define pci_ss_info_104d_81b7 pci_ss_info_8086_2590_104d_81b7 static const pciSubsystemInfo pci_ss_info_8086_2590_a304_81b7 = {0xa304, 0x81b7, pci_subsys_8086_2590_a304_81b7, 0}; #undef pci_ss_info_a304_81b7 #define pci_ss_info_a304_81b7 pci_ss_info_8086_2590_a304_81b7 +static const pciSubsystemInfo pci_ss_info_8086_2590_e4bf_0ccd = + {0xe4bf, 0x0ccd, pci_subsys_8086_2590_e4bf_0ccd, 0}; +#undef pci_ss_info_e4bf_0ccd +#define pci_ss_info_e4bf_0ccd pci_ss_info_8086_2590_e4bf_0ccd +static const pciSubsystemInfo pci_ss_info_8086_2590_e4bf_0cd3 = + {0xe4bf, 0x0cd3, pci_subsys_8086_2590_e4bf_0cd3, 0}; +#undef pci_ss_info_e4bf_0cd3 +#define pci_ss_info_e4bf_0cd3 pci_ss_info_8086_2590_e4bf_0cd3 +static const pciSubsystemInfo pci_ss_info_8086_2590_e4bf_58b1 = + {0xe4bf, 0x58b1, pci_subsys_8086_2590_e4bf_58b1, 0}; +#undef pci_ss_info_e4bf_58b1 +#define pci_ss_info_e4bf_58b1 pci_ss_info_8086_2590_e4bf_58b1 +static const pciSubsystemInfo pci_ss_info_8086_2591_103c_0934 = + {0x103c, 0x0934, pci_subsys_8086_2591_103c_0934, 0}; +#undef pci_ss_info_103c_0934 +#define pci_ss_info_103c_0934 pci_ss_info_8086_2591_103c_0934 static const pciSubsystemInfo pci_ss_info_8086_2592_103c_099c = {0x103c, 0x099c, pci_subsys_8086_2592_103c_099c, 0}; #undef pci_ss_info_103c_099c @@ -44541,10 +47295,26 @@ static const pciSubsystemInfo pci_ss_info_8086_2592_1043_1881 = {0x1043, 0x1881, pci_subsys_8086_2592_1043_1881, 0}; #undef pci_ss_info_1043_1881 #define pci_ss_info_1043_1881 pci_ss_info_8086_2592_1043_1881 +static const pciSubsystemInfo pci_ss_info_8086_2592_e4bf_0ccd = + {0xe4bf, 0x0ccd, pci_subsys_8086_2592_e4bf_0ccd, 0}; +#undef pci_ss_info_e4bf_0ccd +#define pci_ss_info_e4bf_0ccd pci_ss_info_8086_2592_e4bf_0ccd +static const pciSubsystemInfo pci_ss_info_8086_2592_e4bf_0cd3 = + {0xe4bf, 0x0cd3, pci_subsys_8086_2592_e4bf_0cd3, 0}; +#undef pci_ss_info_e4bf_0cd3 +#define pci_ss_info_e4bf_0cd3 pci_ss_info_8086_2592_e4bf_0cd3 +static const pciSubsystemInfo pci_ss_info_8086_2592_e4bf_58b1 = + {0xe4bf, 0x58b1, pci_subsys_8086_2592_e4bf_58b1, 0}; +#undef pci_ss_info_e4bf_58b1 +#define pci_ss_info_e4bf_58b1 pci_ss_info_8086_2592_e4bf_58b1 static const pciSubsystemInfo pci_ss_info_8086_25a2_1775_10d0 = {0x1775, 0x10d0, pci_subsys_8086_25a2_1775_10d0, 0}; #undef pci_ss_info_1775_10d0 #define pci_ss_info_1775_10d0 pci_ss_info_8086_25a2_1775_10d0 +static const pciSubsystemInfo pci_ss_info_8086_25a2_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_25a2_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_25a2_1775_1100 static const pciSubsystemInfo pci_ss_info_8086_25a2_1775_ce90 = {0x1775, 0xce90, pci_subsys_8086_25a2_1775_ce90, 0}; #undef pci_ss_info_1775_ce90 @@ -44557,6 +47327,10 @@ static const pciSubsystemInfo pci_ss_info_8086_25a2_4c53_10e0 = {0x4c53, 0x10e0, pci_subsys_8086_25a2_4c53_10e0, 0}; #undef pci_ss_info_4c53_10e0 #define pci_ss_info_4c53_10e0 pci_ss_info_8086_25a2_4c53_10e0 +static const pciSubsystemInfo pci_ss_info_8086_25a3_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_25a3_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_25a3_1775_1100 static const pciSubsystemInfo pci_ss_info_8086_25a3_1775_ce90 = {0x1775, 0xce90, pci_subsys_8086_25a3_1775_ce90, 0}; #undef pci_ss_info_1775_ce90 @@ -44577,6 +47351,10 @@ static const pciSubsystemInfo pci_ss_info_8086_25a4_1775_10d0 = {0x1775, 0x10d0, pci_subsys_8086_25a4_1775_10d0, 0}; #undef pci_ss_info_1775_10d0 #define pci_ss_info_1775_10d0 pci_ss_info_8086_25a4_1775_10d0 +static const pciSubsystemInfo pci_ss_info_8086_25a4_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_25a4_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_25a4_1775_1100 static const pciSubsystemInfo pci_ss_info_8086_25a4_1775_ce90 = {0x1775, 0xce90, pci_subsys_8086_25a4_1775_ce90, 0}; #undef pci_ss_info_1775_ce90 @@ -44593,6 +47371,10 @@ static const pciSubsystemInfo pci_ss_info_8086_25a4_4c53_10e0 = {0x4c53, 0x10e0, pci_subsys_8086_25a4_4c53_10e0, 0}; #undef pci_ss_info_4c53_10e0 #define pci_ss_info_4c53_10e0 pci_ss_info_8086_25a4_4c53_10e0 +static const pciSubsystemInfo pci_ss_info_8086_25a6_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_25a6_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_25a6_1775_1100 static const pciSubsystemInfo pci_ss_info_8086_25a6_1775_ce90 = {0x1775, 0xce90, pci_subsys_8086_25a6_1775_ce90, 0}; #undef pci_ss_info_1775_ce90 @@ -44605,6 +47387,10 @@ static const pciSubsystemInfo pci_ss_info_8086_25a9_1775_10d0 = {0x1775, 0x10d0, pci_subsys_8086_25a9_1775_10d0, 0}; #undef pci_ss_info_1775_10d0 #define pci_ss_info_1775_10d0 pci_ss_info_8086_25a9_1775_10d0 +static const pciSubsystemInfo pci_ss_info_8086_25a9_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_25a9_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_25a9_1775_1100 static const pciSubsystemInfo pci_ss_info_8086_25a9_1775_ce90 = {0x1775, 0xce90, pci_subsys_8086_25a9_1775_ce90, 0}; #undef pci_ss_info_1775_ce90 @@ -44621,6 +47407,10 @@ static const pciSubsystemInfo pci_ss_info_8086_25a9_4c53_10e0 = {0x4c53, 0x10e0, pci_subsys_8086_25a9_4c53_10e0, 0}; #undef pci_ss_info_4c53_10e0 #define pci_ss_info_4c53_10e0 pci_ss_info_8086_25a9_4c53_10e0 +static const pciSubsystemInfo pci_ss_info_8086_25aa_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_25aa_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_25aa_1775_1100 static const pciSubsystemInfo pci_ss_info_8086_25aa_1775_ce90 = {0x1775, 0xce90, pci_subsys_8086_25aa_1775_ce90, 0}; #undef pci_ss_info_1775_ce90 @@ -44637,6 +47427,10 @@ static const pciSubsystemInfo pci_ss_info_8086_25ab_1775_10d0 = {0x1775, 0x10d0, pci_subsys_8086_25ab_1775_10d0, 0}; #undef pci_ss_info_1775_10d0 #define pci_ss_info_1775_10d0 pci_ss_info_8086_25ab_1775_10d0 +static const pciSubsystemInfo pci_ss_info_8086_25ab_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_25ab_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_25ab_1775_1100 static const pciSubsystemInfo pci_ss_info_8086_25ab_1775_ce90 = {0x1775, 0xce90, pci_subsys_8086_25ab_1775_ce90, 0}; #undef pci_ss_info_1775_ce90 @@ -44657,6 +47451,10 @@ static const pciSubsystemInfo pci_ss_info_8086_25ac_1775_10d0 = {0x1775, 0x10d0, pci_subsys_8086_25ac_1775_10d0, 0}; #undef pci_ss_info_1775_10d0 #define pci_ss_info_1775_10d0 pci_ss_info_8086_25ac_1775_10d0 +static const pciSubsystemInfo pci_ss_info_8086_25ac_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_25ac_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_25ac_1775_1100 static const pciSubsystemInfo pci_ss_info_8086_25ac_1775_ce90 = {0x1775, 0xce90, pci_subsys_8086_25ac_1775_ce90, 0}; #undef pci_ss_info_1775_ce90 @@ -44677,6 +47475,10 @@ static const pciSubsystemInfo pci_ss_info_8086_25ad_1775_10d0 = {0x1775, 0x10d0, pci_subsys_8086_25ad_1775_10d0, 0}; #undef pci_ss_info_1775_10d0 #define pci_ss_info_1775_10d0 pci_ss_info_8086_25ad_1775_10d0 +static const pciSubsystemInfo pci_ss_info_8086_25ad_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_25ad_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_25ad_1775_1100 static const pciSubsystemInfo pci_ss_info_8086_25ad_1775_ce90 = {0x1775, 0xce90, pci_subsys_8086_25ad_1775_ce90, 0}; #undef pci_ss_info_1775_ce90 @@ -44693,6 +47495,10 @@ static const pciSubsystemInfo pci_ss_info_8086_25ad_4c53_10e0 = {0x4c53, 0x10e0, pci_subsys_8086_25ad_4c53_10e0, 0}; #undef pci_ss_info_4c53_10e0 #define pci_ss_info_4c53_10e0 pci_ss_info_8086_25ad_4c53_10e0 +static const pciSubsystemInfo pci_ss_info_8086_25b0_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_25b0_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_25b0_1775_1100 static const pciSubsystemInfo pci_ss_info_8086_25b0_4c53_10d0 = {0x4c53, 0x10d0, pci_subsys_8086_25b0_4c53_10d0, 0}; #undef pci_ss_info_4c53_10d0 @@ -44709,6 +47515,22 @@ static const pciSubsystemInfo pci_ss_info_8086_2640_1734_105c = {0x1734, 0x105c, pci_subsys_8086_2640_1734_105c, 0}; #undef pci_ss_info_1734_105c #define pci_ss_info_1734_105c pci_ss_info_8086_2640_1734_105c +static const pciSubsystemInfo pci_ss_info_8086_2640_e4bf_0ccd = + {0xe4bf, 0x0ccd, pci_subsys_8086_2640_e4bf_0ccd, 0}; +#undef pci_ss_info_e4bf_0ccd +#define pci_ss_info_e4bf_0ccd pci_ss_info_8086_2640_e4bf_0ccd +static const pciSubsystemInfo pci_ss_info_8086_2640_e4bf_0cd3 = + {0xe4bf, 0x0cd3, pci_subsys_8086_2640_e4bf_0cd3, 0}; +#undef pci_ss_info_e4bf_0cd3 +#define pci_ss_info_e4bf_0cd3 pci_ss_info_8086_2640_e4bf_0cd3 +static const pciSubsystemInfo pci_ss_info_8086_2640_e4bf_58b1 = + {0xe4bf, 0x58b1, pci_subsys_8086_2640_e4bf_58b1, 0}; +#undef pci_ss_info_e4bf_58b1 +#define pci_ss_info_e4bf_58b1 pci_ss_info_8086_2640_e4bf_58b1 +static const pciSubsystemInfo pci_ss_info_8086_2641_103c_0934 = + {0x103c, 0x0934, pci_subsys_8086_2641_103c_0934, 0}; +#undef pci_ss_info_103c_0934 +#define pci_ss_info_103c_0934 pci_ss_info_8086_2641_103c_0934 static const pciSubsystemInfo pci_ss_info_8086_2641_103c_099c = {0x103c, 0x099c, pci_subsys_8086_2641_103c_099c, 0}; #undef pci_ss_info_103c_099c @@ -44729,6 +47551,18 @@ static const pciSubsystemInfo pci_ss_info_8086_2651_8086_4147 = {0x8086, 0x4147, pci_subsys_8086_2651_8086_4147, 0}; #undef pci_ss_info_8086_4147 #define pci_ss_info_8086_4147 pci_ss_info_8086_2651_8086_4147 +static const pciSubsystemInfo pci_ss_info_8086_2651_e4bf_0ccd = + {0xe4bf, 0x0ccd, pci_subsys_8086_2651_e4bf_0ccd, 0}; +#undef pci_ss_info_e4bf_0ccd +#define pci_ss_info_e4bf_0ccd pci_ss_info_8086_2651_e4bf_0ccd +static const pciSubsystemInfo pci_ss_info_8086_2651_e4bf_0cd3 = + {0xe4bf, 0x0cd3, pci_subsys_8086_2651_e4bf_0cd3, 0}; +#undef pci_ss_info_e4bf_0cd3 +#define pci_ss_info_e4bf_0cd3 pci_ss_info_8086_2651_e4bf_0cd3 +static const pciSubsystemInfo pci_ss_info_8086_2651_e4bf_58b1 = + {0xe4bf, 0x58b1, pci_subsys_8086_2651_e4bf_58b1, 0}; +#undef pci_ss_info_e4bf_58b1 +#define pci_ss_info_e4bf_58b1 pci_ss_info_8086_2651_e4bf_58b1 static const pciSubsystemInfo pci_ss_info_8086_2652_1462_7028 = {0x1462, 0x7028, pci_subsys_8086_2652_1462_7028, 0}; #undef pci_ss_info_1462_7028 @@ -44737,6 +47571,10 @@ static const pciSubsystemInfo pci_ss_info_8086_2658_1028_0179 = {0x1028, 0x0179, pci_subsys_8086_2658_1028_0179, 0}; #undef pci_ss_info_1028_0179 #define pci_ss_info_1028_0179 pci_ss_info_8086_2658_1028_0179 +static const pciSubsystemInfo pci_ss_info_8086_2658_103c_0934 = + {0x103c, 0x0934, pci_subsys_8086_2658_103c_0934, 0}; +#undef pci_ss_info_103c_0934 +#define pci_ss_info_103c_0934 pci_ss_info_8086_2658_103c_0934 static const pciSubsystemInfo pci_ss_info_8086_2658_103c_099c = {0x103c, 0x099c, pci_subsys_8086_2658_103c_099c, 0}; #undef pci_ss_info_103c_099c @@ -44757,10 +47595,26 @@ static const pciSubsystemInfo pci_ss_info_8086_2658_1734_105c = {0x1734, 0x105c, pci_subsys_8086_2658_1734_105c, 0}; #undef pci_ss_info_1734_105c #define pci_ss_info_1734_105c pci_ss_info_8086_2658_1734_105c +static const pciSubsystemInfo pci_ss_info_8086_2658_e4bf_0ccd = + {0xe4bf, 0x0ccd, pci_subsys_8086_2658_e4bf_0ccd, 0}; +#undef pci_ss_info_e4bf_0ccd +#define pci_ss_info_e4bf_0ccd pci_ss_info_8086_2658_e4bf_0ccd +static const pciSubsystemInfo pci_ss_info_8086_2658_e4bf_0cd3 = + {0xe4bf, 0x0cd3, pci_subsys_8086_2658_e4bf_0cd3, 0}; +#undef pci_ss_info_e4bf_0cd3 +#define pci_ss_info_e4bf_0cd3 pci_ss_info_8086_2658_e4bf_0cd3 +static const pciSubsystemInfo pci_ss_info_8086_2658_e4bf_58b1 = + {0xe4bf, 0x58b1, pci_subsys_8086_2658_e4bf_58b1, 0}; +#undef pci_ss_info_e4bf_58b1 +#define pci_ss_info_e4bf_58b1 pci_ss_info_8086_2658_e4bf_58b1 static const pciSubsystemInfo pci_ss_info_8086_2659_1028_0179 = {0x1028, 0x0179, pci_subsys_8086_2659_1028_0179, 0}; #undef pci_ss_info_1028_0179 #define pci_ss_info_1028_0179 pci_ss_info_8086_2659_1028_0179 +static const pciSubsystemInfo pci_ss_info_8086_2659_103c_0934 = + {0x103c, 0x0934, pci_subsys_8086_2659_103c_0934, 0}; +#undef pci_ss_info_103c_0934 +#define pci_ss_info_103c_0934 pci_ss_info_8086_2659_103c_0934 static const pciSubsystemInfo pci_ss_info_8086_2659_103c_099c = {0x103c, 0x099c, pci_subsys_8086_2659_103c_099c, 0}; #undef pci_ss_info_103c_099c @@ -44781,10 +47635,26 @@ static const pciSubsystemInfo pci_ss_info_8086_2659_1734_105c = {0x1734, 0x105c, pci_subsys_8086_2659_1734_105c, 0}; #undef pci_ss_info_1734_105c #define pci_ss_info_1734_105c pci_ss_info_8086_2659_1734_105c +static const pciSubsystemInfo pci_ss_info_8086_2659_e4bf_0ccd = + {0xe4bf, 0x0ccd, pci_subsys_8086_2659_e4bf_0ccd, 0}; +#undef pci_ss_info_e4bf_0ccd +#define pci_ss_info_e4bf_0ccd pci_ss_info_8086_2659_e4bf_0ccd +static const pciSubsystemInfo pci_ss_info_8086_2659_e4bf_0cd3 = + {0xe4bf, 0x0cd3, pci_subsys_8086_2659_e4bf_0cd3, 0}; +#undef pci_ss_info_e4bf_0cd3 +#define pci_ss_info_e4bf_0cd3 pci_ss_info_8086_2659_e4bf_0cd3 +static const pciSubsystemInfo pci_ss_info_8086_2659_e4bf_58b1 = + {0xe4bf, 0x58b1, pci_subsys_8086_2659_e4bf_58b1, 0}; +#undef pci_ss_info_e4bf_58b1 +#define pci_ss_info_e4bf_58b1 pci_ss_info_8086_2659_e4bf_58b1 static const pciSubsystemInfo pci_ss_info_8086_265a_1028_0179 = {0x1028, 0x0179, pci_subsys_8086_265a_1028_0179, 0}; #undef pci_ss_info_1028_0179 #define pci_ss_info_1028_0179 pci_ss_info_8086_265a_1028_0179 +static const pciSubsystemInfo pci_ss_info_8086_265a_103c_0934 = + {0x103c, 0x0934, pci_subsys_8086_265a_103c_0934, 0}; +#undef pci_ss_info_103c_0934 +#define pci_ss_info_103c_0934 pci_ss_info_8086_265a_103c_0934 static const pciSubsystemInfo pci_ss_info_8086_265a_103c_099c = {0x103c, 0x099c, pci_subsys_8086_265a_103c_099c, 0}; #undef pci_ss_info_103c_099c @@ -44805,6 +47675,18 @@ static const pciSubsystemInfo pci_ss_info_8086_265a_1734_105c = {0x1734, 0x105c, pci_subsys_8086_265a_1734_105c, 0}; #undef pci_ss_info_1734_105c #define pci_ss_info_1734_105c pci_ss_info_8086_265a_1734_105c +static const pciSubsystemInfo pci_ss_info_8086_265a_e4bf_0ccd = + {0xe4bf, 0x0ccd, pci_subsys_8086_265a_e4bf_0ccd, 0}; +#undef pci_ss_info_e4bf_0ccd +#define pci_ss_info_e4bf_0ccd pci_ss_info_8086_265a_e4bf_0ccd +static const pciSubsystemInfo pci_ss_info_8086_265a_e4bf_0cd3 = + {0xe4bf, 0x0cd3, pci_subsys_8086_265a_e4bf_0cd3, 0}; +#undef pci_ss_info_e4bf_0cd3 +#define pci_ss_info_e4bf_0cd3 pci_ss_info_8086_265a_e4bf_0cd3 +static const pciSubsystemInfo pci_ss_info_8086_265a_e4bf_58b1 = + {0xe4bf, 0x58b1, pci_subsys_8086_265a_e4bf_58b1, 0}; +#undef pci_ss_info_e4bf_58b1 +#define pci_ss_info_e4bf_58b1 pci_ss_info_8086_265a_e4bf_58b1 static const pciSubsystemInfo pci_ss_info_8086_265b_1028_0179 = {0x1028, 0x0179, pci_subsys_8086_265b_1028_0179, 0}; #undef pci_ss_info_1028_0179 @@ -44829,10 +47711,26 @@ static const pciSubsystemInfo pci_ss_info_8086_265b_1734_105c = {0x1734, 0x105c, pci_subsys_8086_265b_1734_105c, 0}; #undef pci_ss_info_1734_105c #define pci_ss_info_1734_105c pci_ss_info_8086_265b_1734_105c +static const pciSubsystemInfo pci_ss_info_8086_265b_e4bf_0ccd = + {0xe4bf, 0x0ccd, pci_subsys_8086_265b_e4bf_0ccd, 0}; +#undef pci_ss_info_e4bf_0ccd +#define pci_ss_info_e4bf_0ccd pci_ss_info_8086_265b_e4bf_0ccd +static const pciSubsystemInfo pci_ss_info_8086_265b_e4bf_0cd3 = + {0xe4bf, 0x0cd3, pci_subsys_8086_265b_e4bf_0cd3, 0}; +#undef pci_ss_info_e4bf_0cd3 +#define pci_ss_info_e4bf_0cd3 pci_ss_info_8086_265b_e4bf_0cd3 +static const pciSubsystemInfo pci_ss_info_8086_265b_e4bf_58b1 = + {0xe4bf, 0x58b1, pci_subsys_8086_265b_e4bf_58b1, 0}; +#undef pci_ss_info_e4bf_58b1 +#define pci_ss_info_e4bf_58b1 pci_ss_info_8086_265b_e4bf_58b1 static const pciSubsystemInfo pci_ss_info_8086_265c_1028_0179 = {0x1028, 0x0179, pci_subsys_8086_265c_1028_0179, 0}; #undef pci_ss_info_1028_0179 #define pci_ss_info_1028_0179 pci_ss_info_8086_265c_1028_0179 +static const pciSubsystemInfo pci_ss_info_8086_265c_103c_0934 = + {0x103c, 0x0934, pci_subsys_8086_265c_103c_0934, 0}; +#undef pci_ss_info_103c_0934 +#define pci_ss_info_103c_0934 pci_ss_info_8086_265c_103c_0934 static const pciSubsystemInfo pci_ss_info_8086_265c_103c_099c = {0x103c, 0x099c, pci_subsys_8086_265c_103c_099c, 0}; #undef pci_ss_info_103c_099c @@ -44857,10 +47755,78 @@ static const pciSubsystemInfo pci_ss_info_8086_265c_8086_265c = {0x8086, 0x265c, pci_subsys_8086_265c_8086_265c, 0}; #undef pci_ss_info_8086_265c #define pci_ss_info_8086_265c pci_ss_info_8086_265c_8086_265c +static const pciSubsystemInfo pci_ss_info_8086_265c_e4bf_0ccd = + {0xe4bf, 0x0ccd, pci_subsys_8086_265c_e4bf_0ccd, 0}; +#undef pci_ss_info_e4bf_0ccd +#define pci_ss_info_e4bf_0ccd pci_ss_info_8086_265c_e4bf_0ccd +static const pciSubsystemInfo pci_ss_info_8086_265c_e4bf_0cd3 = + {0xe4bf, 0x0cd3, pci_subsys_8086_265c_e4bf_0cd3, 0}; +#undef pci_ss_info_e4bf_0cd3 +#define pci_ss_info_e4bf_0cd3 pci_ss_info_8086_265c_e4bf_0cd3 +static const pciSubsystemInfo pci_ss_info_8086_265c_e4bf_58b1 = + {0xe4bf, 0x58b1, pci_subsys_8086_265c_e4bf_58b1, 0}; +#undef pci_ss_info_e4bf_58b1 +#define pci_ss_info_e4bf_58b1 pci_ss_info_8086_265c_e4bf_58b1 +static const pciSubsystemInfo pci_ss_info_8086_2660_103c_0934 = + {0x103c, 0x0934, pci_subsys_8086_2660_103c_0934, 0}; +#undef pci_ss_info_103c_0934 +#define pci_ss_info_103c_0934 pci_ss_info_8086_2660_103c_0934 static const pciSubsystemInfo pci_ss_info_8086_2660_103c_099c = {0x103c, 0x099c, pci_subsys_8086_2660_103c_099c, 0}; #undef pci_ss_info_103c_099c #define pci_ss_info_103c_099c pci_ss_info_8086_2660_103c_099c +static const pciSubsystemInfo pci_ss_info_8086_2660_e4bf_0ccd = + {0xe4bf, 0x0ccd, pci_subsys_8086_2660_e4bf_0ccd, 0}; +#undef pci_ss_info_e4bf_0ccd +#define pci_ss_info_e4bf_0ccd pci_ss_info_8086_2660_e4bf_0ccd +static const pciSubsystemInfo pci_ss_info_8086_2660_e4bf_0cd3 = + {0xe4bf, 0x0cd3, pci_subsys_8086_2660_e4bf_0cd3, 0}; +#undef pci_ss_info_e4bf_0cd3 +#define pci_ss_info_e4bf_0cd3 pci_ss_info_8086_2660_e4bf_0cd3 +static const pciSubsystemInfo pci_ss_info_8086_2660_e4bf_58b1 = + {0xe4bf, 0x58b1, pci_subsys_8086_2660_e4bf_58b1, 0}; +#undef pci_ss_info_e4bf_58b1 +#define pci_ss_info_e4bf_58b1 pci_ss_info_8086_2660_e4bf_58b1 +static const pciSubsystemInfo pci_ss_info_8086_2662_103c_0934 = + {0x103c, 0x0934, pci_subsys_8086_2662_103c_0934, 0}; +#undef pci_ss_info_103c_0934 +#define pci_ss_info_103c_0934 pci_ss_info_8086_2662_103c_0934 +static const pciSubsystemInfo pci_ss_info_8086_2662_e4bf_0ccd = + {0xe4bf, 0x0ccd, pci_subsys_8086_2662_e4bf_0ccd, 0}; +#undef pci_ss_info_e4bf_0ccd +#define pci_ss_info_e4bf_0ccd pci_ss_info_8086_2662_e4bf_0ccd +static const pciSubsystemInfo pci_ss_info_8086_2662_e4bf_0cd3 = + {0xe4bf, 0x0cd3, pci_subsys_8086_2662_e4bf_0cd3, 0}; +#undef pci_ss_info_e4bf_0cd3 +#define pci_ss_info_e4bf_0cd3 pci_ss_info_8086_2662_e4bf_0cd3 +static const pciSubsystemInfo pci_ss_info_8086_2662_e4bf_58b1 = + {0xe4bf, 0x58b1, pci_subsys_8086_2662_e4bf_58b1, 0}; +#undef pci_ss_info_e4bf_58b1 +#define pci_ss_info_e4bf_58b1 pci_ss_info_8086_2662_e4bf_58b1 +static const pciSubsystemInfo pci_ss_info_8086_2664_e4bf_0ccd = + {0xe4bf, 0x0ccd, pci_subsys_8086_2664_e4bf_0ccd, 0}; +#undef pci_ss_info_e4bf_0ccd +#define pci_ss_info_e4bf_0ccd pci_ss_info_8086_2664_e4bf_0ccd +static const pciSubsystemInfo pci_ss_info_8086_2664_e4bf_0cd3 = + {0xe4bf, 0x0cd3, pci_subsys_8086_2664_e4bf_0cd3, 0}; +#undef pci_ss_info_e4bf_0cd3 +#define pci_ss_info_e4bf_0cd3 pci_ss_info_8086_2664_e4bf_0cd3 +static const pciSubsystemInfo pci_ss_info_8086_2664_e4bf_58b1 = + {0xe4bf, 0x58b1, pci_subsys_8086_2664_e4bf_58b1, 0}; +#undef pci_ss_info_e4bf_58b1 +#define pci_ss_info_e4bf_58b1 pci_ss_info_8086_2664_e4bf_58b1 +static const pciSubsystemInfo pci_ss_info_8086_2666_e4bf_0ccd = + {0xe4bf, 0x0ccd, pci_subsys_8086_2666_e4bf_0ccd, 0}; +#undef pci_ss_info_e4bf_0ccd +#define pci_ss_info_e4bf_0ccd pci_ss_info_8086_2666_e4bf_0ccd +static const pciSubsystemInfo pci_ss_info_8086_2666_e4bf_0cd3 = + {0xe4bf, 0x0cd3, pci_subsys_8086_2666_e4bf_0cd3, 0}; +#undef pci_ss_info_e4bf_0cd3 +#define pci_ss_info_e4bf_0cd3 pci_ss_info_8086_2666_e4bf_0cd3 +static const pciSubsystemInfo pci_ss_info_8086_2666_e4bf_58b1 = + {0xe4bf, 0x58b1, pci_subsys_8086_2666_e4bf_58b1, 0}; +#undef pci_ss_info_e4bf_58b1 +#define pci_ss_info_e4bf_58b1 pci_ss_info_8086_2666_e4bf_58b1 static const pciSubsystemInfo pci_ss_info_8086_2668_103c_2a09 = {0x103c, 0x2a09, pci_subsys_8086_2668_103c_2a09, 0}; #undef pci_ss_info_103c_2a09 @@ -44889,10 +47855,26 @@ static const pciSubsystemInfo pci_ss_info_8086_266a_1734_105c = {0x1734, 0x105c, pci_subsys_8086_266a_1734_105c, 0}; #undef pci_ss_info_1734_105c #define pci_ss_info_1734_105c pci_ss_info_8086_266a_1734_105c +static const pciSubsystemInfo pci_ss_info_8086_266a_e4bf_0ccd = + {0xe4bf, 0x0ccd, pci_subsys_8086_266a_e4bf_0ccd, 0}; +#undef pci_ss_info_e4bf_0ccd +#define pci_ss_info_e4bf_0ccd pci_ss_info_8086_266a_e4bf_0ccd +static const pciSubsystemInfo pci_ss_info_8086_266a_e4bf_0cd3 = + {0xe4bf, 0x0cd3, pci_subsys_8086_266a_e4bf_0cd3, 0}; +#undef pci_ss_info_e4bf_0cd3 +#define pci_ss_info_e4bf_0cd3 pci_ss_info_8086_266a_e4bf_0cd3 +static const pciSubsystemInfo pci_ss_info_8086_266a_e4bf_58b1 = + {0xe4bf, 0x58b1, pci_subsys_8086_266a_e4bf_58b1, 0}; +#undef pci_ss_info_e4bf_58b1 +#define pci_ss_info_e4bf_58b1 pci_ss_info_8086_266a_e4bf_58b1 static const pciSubsystemInfo pci_ss_info_8086_266d_1025_006a = {0x1025, 0x006a, pci_subsys_8086_266d_1025_006a, 0}; #undef pci_ss_info_1025_006a #define pci_ss_info_1025_006a pci_ss_info_8086_266d_1025_006a +static const pciSubsystemInfo pci_ss_info_8086_266d_103c_0934 = + {0x103c, 0x0934, pci_subsys_8086_266d_103c_0934, 0}; +#undef pci_ss_info_103c_0934 +#define pci_ss_info_103c_0934 pci_ss_info_8086_266d_103c_0934 static const pciSubsystemInfo pci_ss_info_8086_266d_103c_099c = {0x103c, 0x099c, pci_subsys_8086_266d_103c_099c, 0}; #undef pci_ss_info_103c_099c @@ -44913,6 +47895,10 @@ static const pciSubsystemInfo pci_ss_info_8086_266e_1028_0188 = {0x1028, 0x0188, pci_subsys_8086_266e_1028_0188, 0}; #undef pci_ss_info_1028_0188 #define pci_ss_info_1028_0188 pci_ss_info_8086_266e_1028_0188 +static const pciSubsystemInfo pci_ss_info_8086_266e_103c_0934 = + {0x103c, 0x0934, pci_subsys_8086_266e_103c_0934, 0}; +#undef pci_ss_info_103c_0934 +#define pci_ss_info_103c_0934 pci_ss_info_8086_266e_103c_0934 static const pciSubsystemInfo pci_ss_info_8086_266e_103c_0944 = {0x103c, 0x0944, pci_subsys_8086_266e_103c_0944, 0}; #undef pci_ss_info_103c_0944 @@ -44937,6 +47923,10 @@ static const pciSubsystemInfo pci_ss_info_8086_266e_1734_105a = {0x1734, 0x105a, pci_subsys_8086_266e_1734_105a, 0}; #undef pci_ss_info_1734_105a #define pci_ss_info_1734_105a pci_ss_info_8086_266e_1734_105a +static const pciSubsystemInfo pci_ss_info_8086_266f_103c_0934 = + {0x103c, 0x0934, pci_subsys_8086_266f_103c_0934, 0}; +#undef pci_ss_info_103c_0934 +#define pci_ss_info_103c_0934 pci_ss_info_8086_266f_103c_0934 static const pciSubsystemInfo pci_ss_info_8086_266f_103c_099c = {0x103c, 0x099c, pci_subsys_8086_266f_103c_099c, 0}; #undef pci_ss_info_103c_099c @@ -44957,6 +47947,18 @@ static const pciSubsystemInfo pci_ss_info_8086_266f_1734_105c = {0x1734, 0x105c, pci_subsys_8086_266f_1734_105c, 0}; #undef pci_ss_info_1734_105c #define pci_ss_info_1734_105c pci_ss_info_8086_266f_1734_105c +static const pciSubsystemInfo pci_ss_info_8086_266f_e4bf_0ccd = + {0xe4bf, 0x0ccd, pci_subsys_8086_266f_e4bf_0ccd, 0}; +#undef pci_ss_info_e4bf_0ccd +#define pci_ss_info_e4bf_0ccd pci_ss_info_8086_266f_e4bf_0ccd +static const pciSubsystemInfo pci_ss_info_8086_266f_e4bf_0cd3 = + {0xe4bf, 0x0cd3, pci_subsys_8086_266f_e4bf_0cd3, 0}; +#undef pci_ss_info_e4bf_0cd3 +#define pci_ss_info_e4bf_0cd3 pci_ss_info_8086_266f_e4bf_0cd3 +static const pciSubsystemInfo pci_ss_info_8086_266f_e4bf_58b1 = + {0xe4bf, 0x58b1, pci_subsys_8086_266f_e4bf_58b1, 0}; +#undef pci_ss_info_e4bf_58b1 +#define pci_ss_info_e4bf_58b1 pci_ss_info_8086_266f_e4bf_58b1 static const pciSubsystemInfo pci_ss_info_8086_2770_107b_5048 = {0x107b, 0x5048, pci_subsys_8086_2770_107b_5048, 0}; #undef pci_ss_info_107b_5048 @@ -44969,6 +47971,10 @@ static const pciSubsystemInfo pci_ss_info_8086_2772_8086_544e = {0x8086, 0x544e, pci_subsys_8086_2772_8086_544e, 0}; #undef pci_ss_info_8086_544e #define pci_ss_info_8086_544e pci_ss_info_8086_2772_8086_544e +static const pciSubsystemInfo pci_ss_info_8086_277c_1043_8178 = + {0x1043, 0x8178, pci_subsys_8086_277c_1043_8178, 0}; +#undef pci_ss_info_1043_8178 +#define pci_ss_info_1043_8178 pci_ss_info_8086_277c_1043_8178 static const pciSubsystemInfo pci_ss_info_8086_2782_1043_2582 = {0x1043, 0x2582, pci_subsys_8086_2782_1043_2582, 0}; #undef pci_ss_info_1043_2582 @@ -44985,6 +47991,22 @@ static const pciSubsystemInfo pci_ss_info_8086_2792_1043_1881 = {0x1043, 0x1881, pci_subsys_8086_2792_1043_1881, 0}; #undef pci_ss_info_1043_1881 #define pci_ss_info_1043_1881 pci_ss_info_8086_2792_1043_1881 +static const pciSubsystemInfo pci_ss_info_8086_2792_e4bf_0ccd = + {0xe4bf, 0x0ccd, pci_subsys_8086_2792_e4bf_0ccd, 0}; +#undef pci_ss_info_e4bf_0ccd +#define pci_ss_info_e4bf_0ccd pci_ss_info_8086_2792_e4bf_0ccd +static const pciSubsystemInfo pci_ss_info_8086_2792_e4bf_0cd3 = + {0xe4bf, 0x0cd3, pci_subsys_8086_2792_e4bf_0cd3, 0}; +#undef pci_ss_info_e4bf_0cd3 +#define pci_ss_info_e4bf_0cd3 pci_ss_info_8086_2792_e4bf_0cd3 +static const pciSubsystemInfo pci_ss_info_8086_2792_e4bf_58b1 = + {0xe4bf, 0x58b1, pci_subsys_8086_2792_e4bf_58b1, 0}; +#undef pci_ss_info_e4bf_58b1 +#define pci_ss_info_e4bf_58b1 pci_ss_info_8086_2792_e4bf_58b1 +static const pciSubsystemInfo pci_ss_info_8086_27a0_1025_006c = + {0x1025, 0x006c, pci_subsys_8086_27a0_1025_006c, 0}; +#undef pci_ss_info_1025_006c +#define pci_ss_info_1025_006c pci_ss_info_8086_27a0_1025_006c static const pciSubsystemInfo pci_ss_info_8086_27a0_103c_30a1 = {0x103c, 0x30a1, pci_subsys_8086_27a0_103c_30a1, 0}; #undef pci_ss_info_103c_30a1 @@ -45009,6 +48031,10 @@ static const pciSubsystemInfo pci_ss_info_8086_27a6_17aa_201a = {0x17aa, 0x201a, pci_subsys_8086_27a6_17aa_201a, 0}; #undef pci_ss_info_17aa_201a #define pci_ss_info_17aa_201a pci_ss_info_8086_27a6_17aa_201a +static const pciSubsystemInfo pci_ss_info_8086_27b0_8086_544e = + {0x8086, 0x544e, pci_subsys_8086_27b0_8086_544e, 0}; +#undef pci_ss_info_8086_544e +#define pci_ss_info_8086_544e pci_ss_info_8086_27b0_8086_544e static const pciSubsystemInfo pci_ss_info_8086_27b8_107b_5048 = {0x107b, 0x5048, pci_subsys_8086_27b8_107b_5048, 0}; #undef pci_ss_info_107b_5048 @@ -45029,18 +48055,38 @@ static const pciSubsystemInfo pci_ss_info_8086_27b9_17aa_2009 = {0x17aa, 0x2009, pci_subsys_8086_27b9_17aa_2009, 0}; #undef pci_ss_info_17aa_2009 #define pci_ss_info_17aa_2009 pci_ss_info_8086_27b9_17aa_2009 +static const pciSubsystemInfo pci_ss_info_8086_27bd_1025_006c = + {0x1025, 0x006c, pci_subsys_8086_27bd_1025_006c, 0}; +#undef pci_ss_info_1025_006c +#define pci_ss_info_1025_006c pci_ss_info_8086_27bd_1025_006c static const pciSubsystemInfo pci_ss_info_8086_27c0_107b_5048 = {0x107b, 0x5048, pci_subsys_8086_27c0_107b_5048, 0}; #undef pci_ss_info_107b_5048 #define pci_ss_info_107b_5048 pci_ss_info_8086_27c0_107b_5048 +static const pciSubsystemInfo pci_ss_info_8086_27c0_1462_7236 = + {0x1462, 0x7236, pci_subsys_8086_27c0_1462_7236, 0}; +#undef pci_ss_info_1462_7236 +#define pci_ss_info_1462_7236 pci_ss_info_8086_27c0_1462_7236 static const pciSubsystemInfo pci_ss_info_8086_27c0_8086_544e = {0x8086, 0x544e, pci_subsys_8086_27c0_8086_544e, 0}; #undef pci_ss_info_8086_544e #define pci_ss_info_8086_544e pci_ss_info_8086_27c0_8086_544e +static const pciSubsystemInfo pci_ss_info_8086_27c3_8086_544e = + {0x8086, 0x544e, pci_subsys_8086_27c3_8086_544e, 0}; +#undef pci_ss_info_8086_544e +#define pci_ss_info_8086_544e pci_ss_info_8086_27c3_8086_544e +static const pciSubsystemInfo pci_ss_info_8086_27c4_1025_006c = + {0x1025, 0x006c, pci_subsys_8086_27c4_1025_006c, 0}; +#undef pci_ss_info_1025_006c +#define pci_ss_info_1025_006c pci_ss_info_8086_27c4_1025_006c static const pciSubsystemInfo pci_ss_info_8086_27c5_17aa_200d = {0x17aa, 0x200d, pci_subsys_8086_27c5_17aa_200d, 0}; #undef pci_ss_info_17aa_200d #define pci_ss_info_17aa_200d pci_ss_info_8086_27c5_17aa_200d +static const pciSubsystemInfo pci_ss_info_8086_27c8_1025_006c = + {0x1025, 0x006c, pci_subsys_8086_27c8_1025_006c, 0}; +#undef pci_ss_info_1025_006c +#define pci_ss_info_1025_006c pci_ss_info_8086_27c8_1025_006c static const pciSubsystemInfo pci_ss_info_8086_27c8_103c_30a1 = {0x103c, 0x30a1, pci_subsys_8086_27c8_103c_30a1, 0}; #undef pci_ss_info_103c_30a1 @@ -45057,6 +48103,10 @@ static const pciSubsystemInfo pci_ss_info_8086_27c8_8086_544e = {0x8086, 0x544e, pci_subsys_8086_27c8_8086_544e, 0}; #undef pci_ss_info_8086_544e #define pci_ss_info_8086_544e pci_ss_info_8086_27c8_8086_544e +static const pciSubsystemInfo pci_ss_info_8086_27c9_1025_006c = + {0x1025, 0x006c, pci_subsys_8086_27c9_1025_006c, 0}; +#undef pci_ss_info_1025_006c +#define pci_ss_info_1025_006c pci_ss_info_8086_27c9_1025_006c static const pciSubsystemInfo pci_ss_info_8086_27c9_103c_30a1 = {0x103c, 0x30a1, pci_subsys_8086_27c9_103c_30a1, 0}; #undef pci_ss_info_103c_30a1 @@ -45073,6 +48123,10 @@ static const pciSubsystemInfo pci_ss_info_8086_27c9_8086_544e = {0x8086, 0x544e, pci_subsys_8086_27c9_8086_544e, 0}; #undef pci_ss_info_8086_544e #define pci_ss_info_8086_544e pci_ss_info_8086_27c9_8086_544e +static const pciSubsystemInfo pci_ss_info_8086_27ca_1025_006c = + {0x1025, 0x006c, pci_subsys_8086_27ca_1025_006c, 0}; +#undef pci_ss_info_1025_006c +#define pci_ss_info_1025_006c pci_ss_info_8086_27ca_1025_006c static const pciSubsystemInfo pci_ss_info_8086_27ca_103c_30a1 = {0x103c, 0x30a1, pci_subsys_8086_27ca_103c_30a1, 0}; #undef pci_ss_info_103c_30a1 @@ -45089,6 +48143,10 @@ static const pciSubsystemInfo pci_ss_info_8086_27ca_8086_544e = {0x8086, 0x544e, pci_subsys_8086_27ca_8086_544e, 0}; #undef pci_ss_info_8086_544e #define pci_ss_info_8086_544e pci_ss_info_8086_27ca_8086_544e +static const pciSubsystemInfo pci_ss_info_8086_27cb_1025_006c = + {0x1025, 0x006c, pci_subsys_8086_27cb_1025_006c, 0}; +#undef pci_ss_info_1025_006c +#define pci_ss_info_1025_006c pci_ss_info_8086_27cb_1025_006c static const pciSubsystemInfo pci_ss_info_8086_27cb_103c_30a1 = {0x103c, 0x30a1, pci_subsys_8086_27cb_103c_30a1, 0}; #undef pci_ss_info_103c_30a1 @@ -45105,6 +48163,10 @@ static const pciSubsystemInfo pci_ss_info_8086_27cb_8086_544e = {0x8086, 0x544e, pci_subsys_8086_27cb_8086_544e, 0}; #undef pci_ss_info_8086_544e #define pci_ss_info_8086_544e pci_ss_info_8086_27cb_8086_544e +static const pciSubsystemInfo pci_ss_info_8086_27cc_1025_006c = + {0x1025, 0x006c, pci_subsys_8086_27cc_1025_006c, 0}; +#undef pci_ss_info_1025_006c +#define pci_ss_info_1025_006c pci_ss_info_8086_27cc_1025_006c static const pciSubsystemInfo pci_ss_info_8086_27cc_103c_30a1 = {0x103c, 0x30a1, pci_subsys_8086_27cc_103c_30a1, 0}; #undef pci_ss_info_103c_30a1 @@ -45117,10 +48179,18 @@ static const pciSubsystemInfo pci_ss_info_8086_27cc_8086_544e = {0x8086, 0x544e, pci_subsys_8086_27cc_8086_544e, 0}; #undef pci_ss_info_8086_544e #define pci_ss_info_8086_544e pci_ss_info_8086_27cc_8086_544e +static const pciSubsystemInfo pci_ss_info_8086_27d8_1025_006c = + {0x1025, 0x006c, pci_subsys_8086_27d8_1025_006c, 0}; +#undef pci_ss_info_1025_006c +#define pci_ss_info_1025_006c pci_ss_info_8086_27d8_1025_006c static const pciSubsystemInfo pci_ss_info_8086_27d8_103c_30a1 = {0x103c, 0x30a1, pci_subsys_8086_27d8_103c_30a1, 0}; #undef pci_ss_info_103c_30a1 #define pci_ss_info_103c_30a1 pci_ss_info_8086_27d8_103c_30a1 +static const pciSubsystemInfo pci_ss_info_8086_27d8_1043_13c4 = + {0x1043, 0x13c4, pci_subsys_8086_27d8_1043_13c4, 0}; +#undef pci_ss_info_1043_13c4 +#define pci_ss_info_1043_13c4 pci_ss_info_8086_27d8_1043_13c4 static const pciSubsystemInfo pci_ss_info_8086_27d8_107b_5048 = {0x107b, 0x5048, pci_subsys_8086_27d8_107b_5048, 0}; #undef pci_ss_info_107b_5048 @@ -45145,6 +48215,18 @@ static const pciSubsystemInfo pci_ss_info_8086_27d8_17aa_2010 = {0x17aa, 0x2010, pci_subsys_8086_27d8_17aa_2010, 0}; #undef pci_ss_info_17aa_2010 #define pci_ss_info_17aa_2010 pci_ss_info_8086_27d8_17aa_2010 +static const pciSubsystemInfo pci_ss_info_8086_27d8_17aa_3802 = + {0x17aa, 0x3802, pci_subsys_8086_27d8_17aa_3802, 0}; +#undef pci_ss_info_17aa_3802 +#define pci_ss_info_17aa_3802 pci_ss_info_8086_27d8_17aa_3802 +static const pciSubsystemInfo pci_ss_info_8086_27d8_8086_1112 = + {0x8086, 0x1112, pci_subsys_8086_27d8_8086_1112, 0}; +#undef pci_ss_info_8086_1112 +#define pci_ss_info_8086_1112 pci_ss_info_8086_27d8_8086_1112 +static const pciSubsystemInfo pci_ss_info_8086_27da_1025_006c = + {0x1025, 0x006c, pci_subsys_8086_27da_1025_006c, 0}; +#undef pci_ss_info_1025_006c +#define pci_ss_info_1025_006c pci_ss_info_8086_27da_1025_006c static const pciSubsystemInfo pci_ss_info_8086_27da_10f7_8338 = {0x10f7, 0x8338, pci_subsys_8086_27da_10f7_8338, 0}; #undef pci_ss_info_10f7_8338 @@ -45161,6 +48243,10 @@ static const pciSubsystemInfo pci_ss_info_8086_27dc_8086_308d = {0x8086, 0x308d, pci_subsys_8086_27dc_8086_308d, 0}; #undef pci_ss_info_8086_308d #define pci_ss_info_8086_308d pci_ss_info_8086_27dc_8086_308d +static const pciSubsystemInfo pci_ss_info_8086_27de_1462_7267 = + {0x1462, 0x7267, pci_subsys_8086_27de_1462_7267, 0}; +#undef pci_ss_info_1462_7267 +#define pci_ss_info_1462_7267 pci_ss_info_8086_27de_1462_7267 static const pciSubsystemInfo pci_ss_info_8086_27df_103c_30a1 = {0x103c, 0x30a1, pci_subsys_8086_27df_103c_30a1, 0}; #undef pci_ss_info_103c_30a1 @@ -45201,18 +48287,50 @@ static const pciSubsystemInfo pci_ss_info_8086_2834_1462_7235 = {0x1462, 0x7235, pci_subsys_8086_2834_1462_7235, 0}; #undef pci_ss_info_1462_7235 #define pci_ss_info_1462_7235 pci_ss_info_8086_2834_1462_7235 +static const pciSubsystemInfo pci_ss_info_8086_2834_17aa_20aa = + {0x17aa, 0x20aa, pci_subsys_8086_2834_17aa_20aa, 0}; +#undef pci_ss_info_17aa_20aa +#define pci_ss_info_17aa_20aa pci_ss_info_8086_2834_17aa_20aa +static const pciSubsystemInfo pci_ss_info_8086_2835_17aa_20aa = + {0x17aa, 0x20aa, pci_subsys_8086_2835_17aa_20aa, 0}; +#undef pci_ss_info_17aa_20aa +#define pci_ss_info_17aa_20aa pci_ss_info_8086_2835_17aa_20aa static const pciSubsystemInfo pci_ss_info_8086_2836_1462_7235 = {0x1462, 0x7235, pci_subsys_8086_2836_1462_7235, 0}; #undef pci_ss_info_1462_7235 #define pci_ss_info_1462_7235 pci_ss_info_8086_2836_1462_7235 +static const pciSubsystemInfo pci_ss_info_8086_283a_17aa_20ab = + {0x17aa, 0x20ab, pci_subsys_8086_283a_17aa_20ab, 0}; +#undef pci_ss_info_17aa_20ab +#define pci_ss_info_17aa_20ab pci_ss_info_8086_283a_17aa_20ab static const pciSubsystemInfo pci_ss_info_8086_283e_1462_7235 = {0x1462, 0x7235, pci_subsys_8086_283e_1462_7235, 0}; #undef pci_ss_info_1462_7235 #define pci_ss_info_1462_7235 pci_ss_info_8086_283e_1462_7235 +static const pciSubsystemInfo pci_ss_info_8086_284b_17aa_20ac = + {0x17aa, 0x20ac, pci_subsys_8086_284b_17aa_20ac, 0}; +#undef pci_ss_info_17aa_20ac +#define pci_ss_info_17aa_20ac pci_ss_info_8086_284b_17aa_20ac +static const pciSubsystemInfo pci_ss_info_8086_29a0_1462_7276 = + {0x1462, 0x7276, pci_subsys_8086_29a0_1462_7276, 0}; +#undef pci_ss_info_1462_7276 +#define pci_ss_info_1462_7276 pci_ss_info_8086_29a0_1462_7276 +static const pciSubsystemInfo pci_ss_info_8086_29a2_1462_7276 = + {0x1462, 0x7276, pci_subsys_8086_29a2_1462_7276, 0}; +#undef pci_ss_info_1462_7276 +#define pci_ss_info_1462_7276 pci_ss_info_8086_29a2_1462_7276 +static const pciSubsystemInfo pci_ss_info_8086_2a00_17aa_20b1 = + {0x17aa, 0x20b1, pci_subsys_8086_2a00_17aa_20b1, 0}; +#undef pci_ss_info_17aa_20b1 +#define pci_ss_info_17aa_20b1 pci_ss_info_8086_2a00_17aa_20b1 static const pciSubsystemInfo pci_ss_info_8086_3200_1775_c200 = {0x1775, 0xc200, pci_subsys_8086_3200_1775_c200, 0}; #undef pci_ss_info_1775_c200 #define pci_ss_info_1775_c200 pci_ss_info_8086_3200_1775_c200 +static const pciSubsystemInfo pci_ss_info_8086_3340_1014_0529 = + {0x1014, 0x0529, pci_subsys_8086_3340_1014_0529, 0}; +#undef pci_ss_info_1014_0529 +#define pci_ss_info_1014_0529 pci_ss_info_8086_3340_1014_0529 static const pciSubsystemInfo pci_ss_info_8086_3340_1025_005a = {0x1025, 0x005a, pci_subsys_8086_3340_1025_005a, 0}; #undef pci_ss_info_1025_005a @@ -45261,6 +48379,10 @@ static const pciSubsystemInfo pci_ss_info_8086_3580_1028_0139 = {0x1028, 0x0139, pci_subsys_8086_3580_1028_0139, 0}; #undef pci_ss_info_1028_0139 #define pci_ss_info_1028_0139 pci_ss_info_8086_3580_1028_0139 +static const pciSubsystemInfo pci_ss_info_8086_3580_1028_014f = + {0x1028, 0x014f, pci_subsys_8086_3580_1028_014f, 0}; +#undef pci_ss_info_1028_014f +#define pci_ss_info_1028_014f pci_ss_info_8086_3580_1028_014f static const pciSubsystemInfo pci_ss_info_8086_3580_1028_0163 = {0x1028, 0x0163, pci_subsys_8086_3580_1028_0163, 0}; #undef pci_ss_info_1028_0163 @@ -45289,6 +48411,14 @@ static const pciSubsystemInfo pci_ss_info_8086_3580_4c53_10e0 = {0x4c53, 0x10e0, pci_subsys_8086_3580_4c53_10e0, 0}; #undef pci_ss_info_4c53_10e0 #define pci_ss_info_4c53_10e0 pci_ss_info_8086_3580_4c53_10e0 +static const pciSubsystemInfo pci_ss_info_8086_3580_e4bf_0cc9 = + {0xe4bf, 0x0cc9, pci_subsys_8086_3580_e4bf_0cc9, 0}; +#undef pci_ss_info_e4bf_0cc9 +#define pci_ss_info_e4bf_0cc9 pci_ss_info_8086_3580_e4bf_0cc9 +static const pciSubsystemInfo pci_ss_info_8086_3580_e4bf_0cd2 = + {0xe4bf, 0x0cd2, pci_subsys_8086_3580_e4bf_0cd2, 0}; +#undef pci_ss_info_e4bf_0cd2 +#define pci_ss_info_e4bf_0cd2 pci_ss_info_8086_3580_e4bf_0cd2 static const pciSubsystemInfo pci_ss_info_8086_3581_1734_1055 = {0x1734, 0x1055, pci_subsys_8086_3581_1734_1055, 0}; #undef pci_ss_info_1734_1055 @@ -45301,6 +48431,10 @@ static const pciSubsystemInfo pci_ss_info_8086_3582_1028_0139 = {0x1028, 0x0139, pci_subsys_8086_3582_1028_0139, 0}; #undef pci_ss_info_1028_0139 #define pci_ss_info_1028_0139 pci_ss_info_8086_3582_1028_0139 +static const pciSubsystemInfo pci_ss_info_8086_3582_1028_014f = + {0x1028, 0x014f, pci_subsys_8086_3582_1028_014f, 0}; +#undef pci_ss_info_1028_014f +#define pci_ss_info_1028_014f pci_ss_info_8086_3582_1028_014f static const pciSubsystemInfo pci_ss_info_8086_3582_1028_0163 = {0x1028, 0x0163, pci_subsys_8086_3582_1028_0163, 0}; #undef pci_ss_info_1028_0163 @@ -45321,6 +48455,14 @@ static const pciSubsystemInfo pci_ss_info_8086_3582_4c53_10e0 = {0x4c53, 0x10e0, pci_subsys_8086_3582_4c53_10e0, 0}; #undef pci_ss_info_4c53_10e0 #define pci_ss_info_4c53_10e0 pci_ss_info_8086_3582_4c53_10e0 +static const pciSubsystemInfo pci_ss_info_8086_3582_e4bf_0cc9 = + {0xe4bf, 0x0cc9, pci_subsys_8086_3582_e4bf_0cc9, 0}; +#undef pci_ss_info_e4bf_0cc9 +#define pci_ss_info_e4bf_0cc9 pci_ss_info_8086_3582_e4bf_0cc9 +static const pciSubsystemInfo pci_ss_info_8086_3582_e4bf_0cd2 = + {0xe4bf, 0x0cd2, pci_subsys_8086_3582_e4bf_0cd2, 0}; +#undef pci_ss_info_e4bf_0cd2 +#define pci_ss_info_e4bf_0cd2 pci_ss_info_8086_3582_e4bf_0cd2 static const pciSubsystemInfo pci_ss_info_8086_3584_1014_055d = {0x1014, 0x055d, pci_subsys_8086_3584_1014_055d, 0}; #undef pci_ss_info_1014_055d @@ -45329,6 +48471,10 @@ static const pciSubsystemInfo pci_ss_info_8086_3584_1028_0139 = {0x1028, 0x0139, pci_subsys_8086_3584_1028_0139, 0}; #undef pci_ss_info_1028_0139 #define pci_ss_info_1028_0139 pci_ss_info_8086_3584_1028_0139 +static const pciSubsystemInfo pci_ss_info_8086_3584_1028_014f = + {0x1028, 0x014f, pci_subsys_8086_3584_1028_014f, 0}; +#undef pci_ss_info_1028_014f +#define pci_ss_info_1028_014f pci_ss_info_8086_3584_1028_014f static const pciSubsystemInfo pci_ss_info_8086_3584_1028_0163 = {0x1028, 0x0163, pci_subsys_8086_3584_1028_0163, 0}; #undef pci_ss_info_1028_0163 @@ -45365,6 +48511,10 @@ static const pciSubsystemInfo pci_ss_info_8086_3585_1028_0139 = {0x1028, 0x0139, pci_subsys_8086_3585_1028_0139, 0}; #undef pci_ss_info_1028_0139 #define pci_ss_info_1028_0139 pci_ss_info_8086_3585_1028_0139 +static const pciSubsystemInfo pci_ss_info_8086_3585_1028_014f = + {0x1028, 0x014f, pci_subsys_8086_3585_1028_014f, 0}; +#undef pci_ss_info_1028_014f +#define pci_ss_info_1028_014f pci_ss_info_8086_3585_1028_014f static const pciSubsystemInfo pci_ss_info_8086_3585_1028_0163 = {0x1028, 0x0163, pci_subsys_8086_3585_1028_0163, 0}; #undef pci_ss_info_1028_0163 @@ -45393,6 +48543,10 @@ static const pciSubsystemInfo pci_ss_info_8086_3585_4c53_10e0 = {0x4c53, 0x10e0, pci_subsys_8086_3585_4c53_10e0, 0}; #undef pci_ss_info_4c53_10e0 #define pci_ss_info_4c53_10e0 pci_ss_info_8086_3585_4c53_10e0 +static const pciSubsystemInfo pci_ss_info_8086_3590_1014_02dd = + {0x1014, 0x02dd, pci_subsys_8086_3590_1014_02dd, 0}; +#undef pci_ss_info_1014_02dd +#define pci_ss_info_1014_02dd pci_ss_info_8086_3590_1014_02dd static const pciSubsystemInfo pci_ss_info_8086_3590_1028_019a = {0x1028, 0x019a, pci_subsys_8086_3590_1028_019a, 0}; #undef pci_ss_info_1028_019a @@ -45401,10 +48555,18 @@ static const pciSubsystemInfo pci_ss_info_8086_3590_1734_103e = {0x1734, 0x103e, pci_subsys_8086_3590_1734_103e, 0}; #undef pci_ss_info_1734_103e #define pci_ss_info_1734_103e pci_ss_info_8086_3590_1734_103e +static const pciSubsystemInfo pci_ss_info_8086_3590_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_3590_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_3590_1775_1100 static const pciSubsystemInfo pci_ss_info_8086_3590_4c53_10d0 = {0x4c53, 0x10d0, pci_subsys_8086_3590_4c53_10d0, 0}; #undef pci_ss_info_4c53_10d0 #define pci_ss_info_4c53_10d0 pci_ss_info_8086_3590_4c53_10d0 +static const pciSubsystemInfo pci_ss_info_8086_3591_1014_02dd = + {0x1014, 0x02dd, pci_subsys_8086_3591_1014_02dd, 0}; +#undef pci_ss_info_1014_02dd +#define pci_ss_info_1014_02dd pci_ss_info_8086_3591_1014_02dd static const pciSubsystemInfo pci_ss_info_8086_3591_1028_0169 = {0x1028, 0x0169, pci_subsys_8086_3591_1028_0169, 0}; #undef pci_ss_info_1028_0169 @@ -45413,18 +48575,42 @@ static const pciSubsystemInfo pci_ss_info_8086_3591_4c53_10d0 = {0x4c53, 0x10d0, pci_subsys_8086_3591_4c53_10d0, 0}; #undef pci_ss_info_4c53_10d0 #define pci_ss_info_4c53_10d0 pci_ss_info_8086_3591_4c53_10d0 +static const pciSubsystemInfo pci_ss_info_8086_3594_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_3594_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_3594_1775_1100 static const pciSubsystemInfo pci_ss_info_8086_3594_4c53_10d0 = {0x4c53, 0x10d0, pci_subsys_8086_3594_4c53_10d0, 0}; #undef pci_ss_info_4c53_10d0 #define pci_ss_info_4c53_10d0 pci_ss_info_8086_3594_4c53_10d0 +static const pciSubsystemInfo pci_ss_info_8086_3595_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_3595_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_3595_1775_1100 +static const pciSubsystemInfo pci_ss_info_8086_3597_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_3597_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_3597_1775_1100 +static const pciSubsystemInfo pci_ss_info_8086_3598_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_3598_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_3598_1775_1100 +static const pciSubsystemInfo pci_ss_info_8086_3599_1775_1100 = + {0x1775, 0x1100, pci_subsys_8086_3599_1775_1100, 0}; +#undef pci_ss_info_1775_1100 +#define pci_ss_info_1775_1100 pci_ss_info_8086_3599_1775_1100 +static const pciSubsystemInfo pci_ss_info_8086_359b_1014_02dd = + {0x1014, 0x02dd, pci_subsys_8086_359b_1014_02dd, 0}; +#undef pci_ss_info_1014_02dd +#define pci_ss_info_1014_02dd pci_ss_info_8086_359b_1014_02dd static const pciSubsystemInfo pci_ss_info_8086_359e_1028_0169 = {0x1028, 0x0169, pci_subsys_8086_359e_1028_0169, 0}; #undef pci_ss_info_1028_0169 #define pci_ss_info_1028_0169 pci_ss_info_8086_359e_1028_0169 -static const pciSubsystemInfo pci_ss_info_8086_4220_2731_8086 = - {0x2731, 0x8086, pci_subsys_8086_4220_2731_8086, 0}; -#undef pci_ss_info_2731_8086 -#define pci_ss_info_2731_8086 pci_ss_info_8086_4220_2731_8086 +static const pciSubsystemInfo pci_ss_info_8086_4220_103c_12f6 = + {0x103c, 0x12f6, pci_subsys_8086_4220_103c_12f6, 0}; +#undef pci_ss_info_103c_12f6 +#define pci_ss_info_103c_12f6 pci_ss_info_8086_4220_103c_12f6 static const pciSubsystemInfo pci_ss_info_8086_4220_8086_2731 = {0x8086, 0x2731, pci_subsys_8086_4220_8086_2731, 0}; #undef pci_ss_info_8086_2731 @@ -45453,6 +48639,10 @@ static const pciSubsystemInfo pci_ss_info_8086_4227_8086_1014 = {0x8086, 0x1014, pci_subsys_8086_4227_8086_1014, 0}; #undef pci_ss_info_8086_1014 #define pci_ss_info_8086_1014 pci_ss_info_8086_4227_8086_1014 +static const pciSubsystemInfo pci_ss_info_8086_4230_8086_1110 = + {0x8086, 0x1110, pci_subsys_8086_4230_8086_1110, 0}; +#undef pci_ss_info_8086_1110 +#define pci_ss_info_8086_1110 pci_ss_info_8086_4230_8086_1110 static const pciSubsystemInfo pci_ss_info_8086_5201_8086_0001 = {0x8086, 0x0001, pci_subsys_8086_5201_8086_0001, 0}; #undef pci_ss_info_8086_0001 @@ -45493,6 +48683,14 @@ static const pciSubsystemInfo pci_ss_info_8086_7121_8086_4341 = {0x8086, 0x4341, pci_subsys_8086_7121_8086_4341, 0}; #undef pci_ss_info_8086_4341 #define pci_ss_info_8086_4341 pci_ss_info_8086_7121_8086_4341 +static const pciSubsystemInfo pci_ss_info_8086_7124_1028_00b4 = + {0x1028, 0x00b4, pci_subsys_8086_7124_1028_00b4, 0}; +#undef pci_ss_info_1028_00b4 +#define pci_ss_info_1028_00b4 pci_ss_info_8086_7124_1028_00b4 +static const pciSubsystemInfo pci_ss_info_8086_7125_1028_00b4 = + {0x1028, 0x00b4, pci_subsys_8086_7125_1028_00b4, 0}; +#undef pci_ss_info_1028_00b4 +#define pci_ss_info_1028_00b4 pci_ss_info_8086_7125_1028_00b4 static const pciSubsystemInfo pci_ss_info_8086_7190_0e11_0500 = {0x0e11, 0x0500, pci_subsys_8086_7190_0e11_0500, 0}; #undef pci_ss_info_0e11_0500 @@ -45942,6 +49140,40 @@ static const pciSubsystemInfo pci_ss_info_9005_0285_103c_3227 = #undef pci_ss_info_103c_3227 #define pci_ss_info_103c_3227 pci_ss_info_9005_0285_103c_3227 #ifdef VENDOR_INCLUDE_NONVIDEO +#endif +static const pciSubsystemInfo pci_ss_info_9005_0285_108e_0286 = + {0x108e, 0x0286, pci_subsys_9005_0285_108e_0286, 0}; +#undef pci_ss_info_108e_0286 +#define pci_ss_info_108e_0286 pci_ss_info_9005_0285_108e_0286 +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +static const pciSubsystemInfo pci_ss_info_9005_0285_108e_0287 = + {0x108e, 0x0287, pci_subsys_9005_0285_108e_0287, 0}; +#undef pci_ss_info_108e_0287 +#define pci_ss_info_108e_0287 pci_ss_info_9005_0285_108e_0287 +#ifdef VENDOR_INCLUDE_NONVIDEO +#endif +static const pciSubsystemInfo pci_ss_info_9005_0285_108e_7aac = + {0x108e, 0x7aac, pci_subsys_9005_0285_108e_7aac, 0}; +#undef pci_ss_info_108e_7aac +#define pci_ss_info_108e_7aac pci_ss_info_9005_0285_108e_7aac +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo pci_ss_info_9005_0285_15d9_02b5 = + {0x15d9, 0x02b5, pci_subsys_9005_0285_15d9_02b5, 0}; +#undef pci_ss_info_15d9_02b5 +#define pci_ss_info_15d9_02b5 pci_ss_info_9005_0285_15d9_02b5 +static const pciSubsystemInfo pci_ss_info_9005_0285_15d9_02b6 = + {0x15d9, 0x02b6, pci_subsys_9005_0285_15d9_02b6, 0}; +#undef pci_ss_info_15d9_02b6 +#define pci_ss_info_15d9_02b6 pci_ss_info_9005_0285_15d9_02b6 +static const pciSubsystemInfo pci_ss_info_9005_0285_15d9_02c9 = + {0x15d9, 0x02c9, pci_subsys_9005_0285_15d9_02c9, 0}; +#undef pci_ss_info_15d9_02c9 +#define pci_ss_info_15d9_02c9 pci_ss_info_9005_0285_15d9_02c9 +static const pciSubsystemInfo pci_ss_info_9005_0285_15d9_02ca = + {0x15d9, 0x02ca, pci_subsys_9005_0285_15d9_02ca, 0}; +#undef pci_ss_info_15d9_02ca +#define pci_ss_info_15d9_02ca pci_ss_info_9005_0285_15d9_02ca static const pciSubsystemInfo pci_ss_info_9005_0285_17aa_0286 = {0x17aa, 0x0286, pci_subsys_9005_0285_17aa_0286, 0}; #undef pci_ss_info_17aa_0286 @@ -46022,6 +49254,14 @@ static const pciSubsystemInfo pci_ss_info_9005_0285_9005_029a = {0x9005, 0x029a, pci_subsys_9005_0285_9005_029a, 0}; #undef pci_ss_info_9005_029a #define pci_ss_info_9005_029a pci_ss_info_9005_0285_9005_029a +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02a4 = + {0x9005, 0x02a4, pci_subsys_9005_0285_9005_02a4, 0}; +#undef pci_ss_info_9005_02a4 +#define pci_ss_info_9005_02a4 pci_ss_info_9005_0285_9005_02a4 +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02a5 = + {0x9005, 0x02a5, pci_subsys_9005_0285_9005_02a5, 0}; +#undef pci_ss_info_9005_02a5 +#define pci_ss_info_9005_02a5 pci_ss_info_9005_0285_9005_02a5 static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02b5 = {0x9005, 0x02b5, pci_subsys_9005_0285_9005_02b5, 0}; #undef pci_ss_info_9005_02b5 @@ -46034,6 +49274,74 @@ static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02b7 = {0x9005, 0x02b7, pci_subsys_9005_0285_9005_02b7, 0}; #undef pci_ss_info_9005_02b7 #define pci_ss_info_9005_02b7 pci_ss_info_9005_0285_9005_02b7 +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02b8 = + {0x9005, 0x02b8, pci_subsys_9005_0285_9005_02b8, 0}; +#undef pci_ss_info_9005_02b8 +#define pci_ss_info_9005_02b8 pci_ss_info_9005_0285_9005_02b8 +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02b9 = + {0x9005, 0x02b9, pci_subsys_9005_0285_9005_02b9, 0}; +#undef pci_ss_info_9005_02b9 +#define pci_ss_info_9005_02b9 pci_ss_info_9005_0285_9005_02b9 +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02ba = + {0x9005, 0x02ba, pci_subsys_9005_0285_9005_02ba, 0}; +#undef pci_ss_info_9005_02ba +#define pci_ss_info_9005_02ba pci_ss_info_9005_0285_9005_02ba +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02bb = + {0x9005, 0x02bb, pci_subsys_9005_0285_9005_02bb, 0}; +#undef pci_ss_info_9005_02bb +#define pci_ss_info_9005_02bb pci_ss_info_9005_0285_9005_02bb +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02bc = + {0x9005, 0x02bc, pci_subsys_9005_0285_9005_02bc, 0}; +#undef pci_ss_info_9005_02bc +#define pci_ss_info_9005_02bc pci_ss_info_9005_0285_9005_02bc +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02bd = + {0x9005, 0x02bd, pci_subsys_9005_0285_9005_02bd, 0}; +#undef pci_ss_info_9005_02bd +#define pci_ss_info_9005_02bd pci_ss_info_9005_0285_9005_02bd +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02be = + {0x9005, 0x02be, pci_subsys_9005_0285_9005_02be, 0}; +#undef pci_ss_info_9005_02be +#define pci_ss_info_9005_02be pci_ss_info_9005_0285_9005_02be +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02bf = + {0x9005, 0x02bf, pci_subsys_9005_0285_9005_02bf, 0}; +#undef pci_ss_info_9005_02bf +#define pci_ss_info_9005_02bf pci_ss_info_9005_0285_9005_02bf +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02c0 = + {0x9005, 0x02c0, pci_subsys_9005_0285_9005_02c0, 0}; +#undef pci_ss_info_9005_02c0 +#define pci_ss_info_9005_02c0 pci_ss_info_9005_0285_9005_02c0 +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02c1 = + {0x9005, 0x02c1, pci_subsys_9005_0285_9005_02c1, 0}; +#undef pci_ss_info_9005_02c1 +#define pci_ss_info_9005_02c1 pci_ss_info_9005_0285_9005_02c1 +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02c2 = + {0x9005, 0x02c2, pci_subsys_9005_0285_9005_02c2, 0}; +#undef pci_ss_info_9005_02c2 +#define pci_ss_info_9005_02c2 pci_ss_info_9005_0285_9005_02c2 +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02c3 = + {0x9005, 0x02c3, pci_subsys_9005_0285_9005_02c3, 0}; +#undef pci_ss_info_9005_02c3 +#define pci_ss_info_9005_02c3 pci_ss_info_9005_0285_9005_02c3 +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02c4 = + {0x9005, 0x02c4, pci_subsys_9005_0285_9005_02c4, 0}; +#undef pci_ss_info_9005_02c4 +#define pci_ss_info_9005_02c4 pci_ss_info_9005_0285_9005_02c4 +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02c5 = + {0x9005, 0x02c5, pci_subsys_9005_0285_9005_02c5, 0}; +#undef pci_ss_info_9005_02c5 +#define pci_ss_info_9005_02c5 pci_ss_info_9005_0285_9005_02c5 +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02c6 = + {0x9005, 0x02c6, pci_subsys_9005_0285_9005_02c6, 0}; +#undef pci_ss_info_9005_02c6 +#define pci_ss_info_9005_02c6 pci_ss_info_9005_0285_9005_02c6 +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02c7 = + {0x9005, 0x02c7, pci_subsys_9005_0285_9005_02c7, 0}; +#undef pci_ss_info_9005_02c7 +#define pci_ss_info_9005_02c7 pci_ss_info_9005_0285_9005_02c7 +static const pciSubsystemInfo pci_ss_info_9005_0285_9005_02c8 = + {0x9005, 0x02c8, pci_subsys_9005_0285_9005_02c8, 0}; +#undef pci_ss_info_9005_02c8 +#define pci_ss_info_9005_02c8 pci_ss_info_9005_0285_9005_02c8 static const pciSubsystemInfo pci_ss_info_9005_0286_1014_034d = {0x1014, 0x034d, pci_subsys_9005_0286_1014_034d, 0}; #undef pci_ss_info_1014_034d @@ -46174,6 +49482,10 @@ static const pciSubsystemInfo pci_ss_info_9005_0503_1014_02bf = {0x1014, 0x02bf, pci_subsys_9005_0503_1014_02bf, 0}; #undef pci_ss_info_1014_02bf #define pci_ss_info_1014_02bf pci_ss_info_9005_0503_1014_02bf +static const pciSubsystemInfo pci_ss_info_9005_0503_1014_02c3 = + {0x1014, 0x02c3, pci_subsys_9005_0503_1014_02c3, 0}; +#undef pci_ss_info_1014_02c3 +#define pci_ss_info_1014_02c3 pci_ss_info_9005_0503_1014_02c3 static const pciSubsystemInfo pci_ss_info_9005_0503_1014_02d5 = {0x1014, 0x02d5, pci_subsys_9005_0503_1014_02d5, 0}; #undef pci_ss_info_1014_02d5 @@ -46188,10 +49500,26 @@ static const pciSubsystemInfo pci_ss_info_9005_8011_9005_0041 = {0x9005, 0x0041, pci_subsys_9005_8011_9005_0041, 0}; #undef pci_ss_info_9005_0041 #define pci_ss_info_9005_0041 pci_ss_info_9005_8011_9005_0041 +static const pciSubsystemInfo pci_ss_info_9005_8017_9005_0044 = + {0x9005, 0x0044, pci_subsys_9005_8017_9005_0044, 0}; +#undef pci_ss_info_9005_0044 +#define pci_ss_info_9005_0044 pci_ss_info_9005_8017_9005_0044 +static const pciSubsystemInfo pci_ss_info_9005_8017_9005_0045 = + {0x9005, 0x0045, pci_subsys_9005_8017_9005_0045, 0}; +#undef pci_ss_info_9005_0045 +#define pci_ss_info_9005_0045 pci_ss_info_9005_8017_9005_0045 +static const pciSubsystemInfo pci_ss_info_9005_801d_1014_02cc = + {0x1014, 0x02cc, pci_subsys_9005_801d_1014_02cc, 0}; +#undef pci_ss_info_1014_02cc +#define pci_ss_info_1014_02cc pci_ss_info_9005_801d_1014_02cc static const pciSubsystemInfo pci_ss_info_9005_801f_1734_1011 = {0x1734, 0x1011, pci_subsys_9005_801f_1734_1011, 0}; #undef pci_ss_info_1734_1011 #define pci_ss_info_1734_1011 pci_ss_info_9005_801f_1734_1011 +static const pciSubsystemInfo pci_ss_info_9005_809d_1014_02cc = + {0x1014, 0x02cc, pci_subsys_9005_809d_1014_02cc, 0}; +#undef pci_ss_info_1014_02cc +#define pci_ss_info_1014_02cc pci_ss_info_9005_809d_1014_02cc #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo pci_ss_info_9710_9815_1000_0020 = @@ -46269,6 +49597,7 @@ static const pciSubsystemInfo pci_ss_info_e159_0001_8086_0003 = #define pci_ss_list_050d_0109 NULL #define pci_ss_list_050d_7050 NULL #define pci_ss_list_050d_705c NULL +#define pci_ss_list_058f_9254 NULL #define pci_ss_list_05a9_8519 NULL #define pci_ss_list_05e3_0701 NULL #define pci_ss_list_066f_3410 NULL @@ -46284,6 +49613,7 @@ static const pciSubsystemInfo pci_ss_info_e159_0001_8086_0003 = #define pci_ss_list_093a_010e NULL #define pci_ss_list_093a_010f NULL #define pci_ss_list_093a_2468 NULL +#define pci_ss_list_093a_2600 NULL #define pci_ss_list_093a_2603 NULL #define pci_ss_list_093a_2608 NULL #define pci_ss_list_09c1_0704 NULL @@ -46307,6 +49637,7 @@ static const pciSubsystemInfo pci_ss_info_e159_0001_8086_0003 = #define pci_ss_list_0e11_0001 NULL #define pci_ss_list_0e11_0002 NULL static const pciSubsystemInfo *pci_ss_list_0e11_0046[] = { + &pci_ss_info_0e11_0046_0e11_4091, &pci_ss_info_0e11_0046_0e11_409a, &pci_ss_info_0e11_0046_0e11_409b, &pci_ss_info_0e11_0046_0e11_409c, @@ -46525,12 +49856,16 @@ static const pciSubsystemInfo *pci_ss_list_1000_0040[] = { }; #define pci_ss_list_1000_0041 NULL #define pci_ss_list_1000_0050 NULL -#define pci_ss_list_1000_0054 NULL +static const pciSubsystemInfo *pci_ss_list_1000_0054[] = { + &pci_ss_info_1000_0054_1028_1f09, + NULL +}; static const pciSubsystemInfo *pci_ss_list_1000_0055[] = { &pci_ss_info_1000_0055_1033_8336, NULL }; #define pci_ss_list_1000_0056 NULL +#define pci_ss_list_1000_0057 NULL #define pci_ss_list_1000_0058 NULL #define pci_ss_list_1000_005a NULL #define pci_ss_list_1000_005c NULL @@ -46543,9 +49878,11 @@ static const pciSubsystemInfo *pci_ss_list_1000_0060[] = { &pci_ss_info_1000_0060_1000_1010, &pci_ss_info_1000_0060_1000_1011, &pci_ss_info_1000_0060_1000_1012, + &pci_ss_info_1000_0060_1000_1016, &pci_ss_info_1000_0060_1014_0363, &pci_ss_info_1000_0060_1014_0364, &pci_ss_info_1000_0060_1014_0365, + &pci_ss_info_1000_0060_1014_0379, &pci_ss_info_1000_0060_1028_1f0a, &pci_ss_info_1000_0060_1028_1f0b, &pci_ss_info_1000_0060_1028_1f0c, @@ -46553,6 +49890,9 @@ static const pciSubsystemInfo *pci_ss_list_1000_0060[] = { &pci_ss_info_1000_0060_1028_1f11, &pci_ss_info_1000_0060_1043_824d, &pci_ss_info_1000_0060_1170_002f, + &pci_ss_info_1000_0060_8086_1006, + &pci_ss_info_1000_0060_8086_100a, + &pci_ss_info_1000_0060_8086_1010, &pci_ss_info_1000_0060_8086_34cc, &pci_ss_info_1000_0060_8086_34cd, NULL @@ -46789,7 +50129,9 @@ static const pciSubsystemInfo *pci_ss_list_1002_4337[] = { #define pci_ss_list_1002_436e NULL static const pciSubsystemInfo *pci_ss_list_1002_4370[] = { &pci_ss_info_1002_4370_1025_0079, + &pci_ss_info_1002_4370_1025_0091, &pci_ss_info_1002_4370_103c_308b, + &pci_ss_info_1002_4370_105b_0c81, &pci_ss_info_1002_4370_107b_0300, NULL }; @@ -47048,6 +50390,7 @@ static const pciSubsystemInfo *pci_ss_list_1002_4c57[] = { &pci_ss_info_1002_4c57_1014_0517, &pci_ss_info_1002_4c57_1028_00e6, &pci_ss_info_1002_4c57_1028_012a, + &pci_ss_info_1002_4c57_1043_1622, &pci_ss_info_1002_4c57_144d_c006, NULL }; @@ -47064,7 +50407,10 @@ static const pciSubsystemInfo *pci_ss_list_1002_4c59[] = { #define pci_ss_list_1002_4c5a NULL #define pci_ss_list_1002_4c64 NULL #define pci_ss_list_1002_4c65 NULL -#define pci_ss_list_1002_4c66 NULL +static const pciSubsystemInfo *pci_ss_list_1002_4c66[] = { + &pci_ss_info_1002_4c66_1014_054d, + NULL +}; #define pci_ss_list_1002_4c67 NULL #define pci_ss_list_1002_4c6e NULL #define pci_ss_list_1002_4d46 NULL @@ -47308,7 +50654,10 @@ static const pciSubsystemInfo *pci_ss_list_1002_5452[] = { #define pci_ss_list_1002_5453 NULL #define pci_ss_list_1002_5454 NULL #define pci_ss_list_1002_5455 NULL -#define pci_ss_list_1002_5460 NULL +static const pciSubsystemInfo *pci_ss_list_1002_5460[] = { + &pci_ss_info_1002_5460_1775_1100, + NULL +}; #define pci_ss_list_1002_5462 NULL #define pci_ss_list_1002_5464 NULL #define pci_ss_list_1002_5548 NULL @@ -47347,7 +50696,10 @@ static const pciSubsystemInfo *pci_ss_list_1002_5654[] = { #define pci_ss_list_1002_5834 NULL #define pci_ss_list_1002_5835 NULL #define pci_ss_list_1002_5838 NULL -#define pci_ss_list_1002_5940 NULL +static const pciSubsystemInfo *pci_ss_list_1002_5940[] = { + &pci_ss_info_1002_5940_17af_2021, + NULL +}; static const pciSubsystemInfo *pci_ss_list_1002_5941[] = { &pci_ss_info_1002_5941_1458_4019, &pci_ss_info_1002_5941_174b_7c12, @@ -47372,7 +50724,10 @@ static const pciSubsystemInfo *pci_ss_list_1002_5955[] = { &pci_ss_info_1002_5955_103c_308b, NULL }; -#define pci_ss_list_1002_5960 NULL +static const pciSubsystemInfo *pci_ss_list_1002_5960[] = { + &pci_ss_info_1002_5960_17af_2020, + NULL +}; static const pciSubsystemInfo *pci_ss_list_1002_5961[] = { &pci_ss_info_1002_5961_1002_2f72, &pci_ss_info_1002_5961_1019_4c30, @@ -47443,6 +50798,7 @@ static const pciSubsystemInfo *pci_ss_list_1002_5c63[] = { static const pciSubsystemInfo *pci_ss_list_1002_5d44[] = { &pci_ss_info_1002_5d44_1458_4019, &pci_ss_info_1002_5d44_1458_4032, + &pci_ss_info_1002_5d44_147b_6190, &pci_ss_info_1002_5d44_174b_7c12, &pci_ss_info_1002_5d44_1787_5965, &pci_ss_info_1002_5d44_17af_2013, @@ -47535,6 +50891,7 @@ static const pciSubsystemInfo *pci_ss_list_1002_7166[] = { &pci_ss_info_1002_7166_1002_0323, NULL }; +#define pci_ss_list_1002_716e NULL #define pci_ss_list_1002_7172 NULL #define pci_ss_list_1002_7173 NULL #define pci_ss_list_1002_7180 NULL @@ -47563,11 +50920,13 @@ static const pciSubsystemInfo *pci_ss_list_1002_71c4[] = { #define pci_ss_list_1002_71c6 NULL #define pci_ss_list_1002_71c7 NULL #define pci_ss_list_1002_71ce NULL +#define pci_ss_list_1002_71d4 NULL #define pci_ss_list_1002_71d5 NULL #define pci_ss_list_1002_71d6 NULL #define pci_ss_list_1002_71de NULL #define pci_ss_list_1002_71e0 NULL #define pci_ss_list_1002_71e2 NULL +#define pci_ss_list_1002_71e6 NULL #define pci_ss_list_1002_71e7 NULL #define pci_ss_list_1002_7210 NULL #define pci_ss_list_1002_7211 NULL @@ -47605,6 +50964,7 @@ static const pciSubsystemInfo *pci_ss_list_1002_724b[] = { #define pci_ss_list_1002_7834 NULL #define pci_ss_list_1002_7835 NULL #define pci_ss_list_1002_7838 NULL +#define pci_ss_list_1002_7919 NULL #define pci_ss_list_1002_791e NULL #define pci_ss_list_1002_791f NULL #define pci_ss_list_1002_793f NULL @@ -47683,13 +51043,28 @@ static const pciSubsystemInfo *pci_ss_list_100b_0020[] = { #define pci_ss_list_100b_0035 NULL #define pci_ss_list_100b_0500 NULL #define pci_ss_list_100b_0501 NULL -#define pci_ss_list_100b_0502 NULL -#define pci_ss_list_100b_0503 NULL +static const pciSubsystemInfo *pci_ss_list_100b_0502[] = { + &pci_ss_info_100b_0502_100b_0502, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_100b_0503[] = { + &pci_ss_info_100b_0503_100b_0503, + NULL +}; #define pci_ss_list_100b_0504 NULL #define pci_ss_list_100b_0505 NULL -#define pci_ss_list_100b_0510 NULL -#define pci_ss_list_100b_0511 NULL -#define pci_ss_list_100b_0515 NULL +static const pciSubsystemInfo *pci_ss_list_100b_0510[] = { + &pci_ss_info_100b_0510_100b_0500, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_100b_0511[] = { + &pci_ss_info_100b_0511_100b_0501, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_100b_0515[] = { + &pci_ss_info_100b_0515_100b_0505, + NULL +}; #define pci_ss_list_100b_d001 NULL #define pci_ss_list_100c_3202 NULL #define pci_ss_list_100c_3205 NULL @@ -47986,6 +51361,11 @@ static const pciSubsystemInfo *pci_ss_list_1014_01bd[] = { }; #define pci_ss_list_1014_01c1 NULL #define pci_ss_list_1014_01e6 NULL +static const pciSubsystemInfo *pci_ss_list_1014_01ef[] = { + &pci_ss_info_1014_01ef_1734_102b, + &pci_ss_info_1014_01ef_1734_10f8, + NULL +}; #define pci_ss_list_1014_01ff NULL static const pciSubsystemInfo *pci_ss_list_1014_0219[] = { &pci_ss_info_1014_0219_1014_021a, @@ -48010,17 +51390,30 @@ static const pciSubsystemInfo *pci_ss_list_1014_028c[] = { static const pciSubsystemInfo *pci_ss_list_1014_02bd[] = { &pci_ss_info_1014_02bd_1014_02c1, &pci_ss_info_1014_02bd_1014_02c2, + &pci_ss_info_1014_02bd_1014_0338, NULL }; #define pci_ss_list_1014_0302 NULL #define pci_ss_list_1014_0308 NULL #define pci_ss_list_1014_0314 NULL +static const pciSubsystemInfo *pci_ss_list_1014_0339[] = { + &pci_ss_info_1014_0339_1014_0360, + NULL +}; #define pci_ss_list_1014_3022 NULL #define pci_ss_list_1014_4022 NULL #define pci_ss_list_1014_ffff NULL #endif #define pci_ss_list_1017_5343 NULL #define pci_ss_list_101a_0005 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_101a_1dc1[] = { + &pci_ss_info_101a_1dc1_101a_0019, + &pci_ss_info_101a_1dc1_101a_001f, + &pci_ss_info_101a_1dc1_101a_0ece, + NULL +}; +#endif #define pci_ss_list_101c_0193 NULL #define pci_ss_list_101c_0196 NULL #define pci_ss_list_101c_0197 NULL @@ -48066,6 +51459,16 @@ static const pciSubsystemInfo *pci_ss_list_101e_9063[] = { #define pci_ss_list_1022_1101 NULL #define pci_ss_list_1022_1102 NULL #define pci_ss_list_1022_1103 NULL +#define pci_ss_list_1022_1200 NULL +#define pci_ss_list_1022_1201 NULL +#define pci_ss_list_1022_1202 NULL +#define pci_ss_list_1022_1203 NULL +#define pci_ss_list_1022_1204 NULL +#define pci_ss_list_1022_1300 NULL +#define pci_ss_list_1022_1301 NULL +#define pci_ss_list_1022_1302 NULL +#define pci_ss_list_1022_1303 NULL +#define pci_ss_list_1022_1304 NULL static const pciSubsystemInfo *pci_ss_list_1022_2000[] = { &pci_ss_info_1022_2000_1014_2000, &pci_ss_info_1022_2000_1022_2000, @@ -48367,9 +51770,9 @@ static const pciSubsystemInfo *pci_ss_list_1028_0013[] = { static const pciSubsystemInfo *pci_ss_list_1028_0015[] = { &pci_ss_info_1028_0015_1028_1f01, &pci_ss_info_1028_0015_1028_1f02, + &pci_ss_info_1028_0015_1028_1f03, NULL }; -#define pci_ss_list_1028_1f03 NULL #define pci_ss_list_102a_0000 NULL #define pci_ss_list_102a_0010 NULL #ifdef VENDOR_INCLUDE_NONVIDEO @@ -48551,6 +51954,7 @@ static const pciSubsystemInfo *pci_ss_list_102b_2537[] = { static const pciSubsystemInfo *pci_ss_list_102b_2538[] = { &pci_ss_info_102b_2538_102b_08c7, &pci_ss_info_102b_2538_102b_0907, + &pci_ss_info_102b_2538_102b_0947, &pci_ss_info_102b_2538_102b_1047, &pci_ss_info_102b_2538_102b_1087, &pci_ss_info_102b_2538_102b_2538, @@ -48700,7 +52104,10 @@ static const pciSubsystemInfo *pci_ss_list_1033_00e0[] = { #define pci_ss_list_1039_0018 NULL #define pci_ss_list_1039_0180 NULL #define pci_ss_list_1039_0181 NULL -#define pci_ss_list_1039_0182 NULL +static const pciSubsystemInfo *pci_ss_list_1039_0182[] = { + &pci_ss_info_1039_0182_1734_1095, + NULL +}; #define pci_ss_list_1039_0186 NULL #define pci_ss_list_1039_0190 NULL #define pci_ss_list_1039_0191 NULL @@ -48747,7 +52154,10 @@ static const pciSubsystemInfo *pci_ss_list_1039_0300[] = { #define pci_ss_list_1039_0746 NULL #define pci_ss_list_1039_0755 NULL #define pci_ss_list_1039_0760 NULL -#define pci_ss_list_1039_0761 NULL +static const pciSubsystemInfo *pci_ss_list_1039_0761[] = { + &pci_ss_info_1039_0761_1734_1099, + NULL +}; static const pciSubsystemInfo *pci_ss_list_1039_0900[] = { &pci_ss_info_1039_0900_1019_0a14, &pci_ss_info_1039_0900_1039_0900, @@ -48778,6 +52188,7 @@ static const pciSubsystemInfo *pci_ss_list_1039_5513[] = { &pci_ss_info_1039_5513_1039_5513, &pci_ss_info_1039_5513_1043_8035, &pci_ss_info_1039_5513_1462_7010, + &pci_ss_info_1039_5513_1734_1095, NULL }; #define pci_ss_list_1039_5517 NULL @@ -48812,6 +52223,9 @@ static const pciSubsystemInfo *pci_ss_list_1039_6326[] = { }; static const pciSubsystemInfo *pci_ss_list_1039_6330[] = { &pci_ss_info_1039_6330_1039_6330, + &pci_ss_info_1039_6330_1043_8113, + &pci_ss_info_1039_6330_1458_d000, + &pci_ss_info_1039_6330_1734_1099, NULL }; #define pci_ss_list_1039_6350 NULL @@ -48821,11 +52235,13 @@ static const pciSubsystemInfo *pci_ss_list_1039_7001[] = { &pci_ss_info_1039_7001_1039_7000, &pci_ss_info_1039_7001_1462_5470, &pci_ss_info_1039_7001_1462_7010, + &pci_ss_info_1039_7001_1734_1095, NULL }; static const pciSubsystemInfo *pci_ss_list_1039_7002[] = { &pci_ss_info_1039_7002_1462_7010, &pci_ss_info_1039_7002_1509_7002, + &pci_ss_info_1039_7002_1734_1095, NULL }; static const pciSubsystemInfo *pci_ss_list_1039_7007[] = { @@ -48835,6 +52251,7 @@ static const pciSubsystemInfo *pci_ss_list_1039_7007[] = { static const pciSubsystemInfo *pci_ss_list_1039_7012[] = { &pci_ss_info_1039_7012_1462_7010, &pci_ss_info_1039_7012_15bd_1001, + &pci_ss_info_1039_7012_1734_109f, NULL }; #define pci_ss_list_1039_7013 NULL @@ -48849,6 +52266,7 @@ static const pciSubsystemInfo *pci_ss_list_1039_7018[] = { &pci_ss_info_1039_7018_1025_000e, &pci_ss_info_1039_7018_1025_0018, &pci_ss_info_1039_7018_1039_7018, + &pci_ss_info_1039_7018_1043_1453, &pci_ss_info_1039_7018_1043_800b, &pci_ss_info_1039_7018_1054_7018, &pci_ss_info_1039_7018_107d_5330, @@ -48933,6 +52351,7 @@ static const pciSubsystemInfo *pci_ss_list_103c_1048[] = { #define pci_ss_list_103c_12fa NULL #define pci_ss_list_103c_1302 NULL #define pci_ss_list_103c_1303 NULL +#define pci_ss_list_103c_1361 NULL #define pci_ss_list_103c_2910 NULL #define pci_ss_list_103c_2925 NULL #define pci_ss_list_103c_3080 NULL @@ -48942,7 +52361,14 @@ static const pciSubsystemInfo *pci_ss_list_103c_3220[] = { &pci_ss_info_103c_3220_103c_3225, NULL }; -#define pci_ss_list_103c_3230 NULL +static const pciSubsystemInfo *pci_ss_list_103c_3230[] = { + &pci_ss_info_103c_3230_103c_3223, + &pci_ss_info_103c_3230_103c_3234, + &pci_ss_info_103c_3230_103c_3235, + &pci_ss_info_103c_3230_103c_3237, + NULL +}; +#define pci_ss_list_103c_3238 NULL #define pci_ss_list_103c_4030 NULL #define pci_ss_list_103c_4031 NULL #define pci_ss_list_103c_4037 NULL @@ -49396,6 +52822,8 @@ static const pciSubsystemInfo *pci_ss_list_1050_6692[] = { #define pci_ss_list_1050_9922 NULL #define pci_ss_list_1050_9970 NULL #endif +#define pci_ss_list_1054_3011 NULL +#define pci_ss_list_1054_3012 NULL #define pci_ss_list_1055_9130 NULL #define pci_ss_list_1055_9460 NULL #define pci_ss_list_1055_9462 NULL @@ -49410,6 +52838,8 @@ static const pciSubsystemInfo *pci_ss_list_1050_6692[] = { #define pci_ss_list_1057_0012 NULL #define pci_ss_list_1057_0100 NULL #define pci_ss_list_1057_0431 NULL +#define pci_ss_list_1057_1073 NULL +#define pci_ss_list_1057_1219 NULL static const pciSubsystemInfo *pci_ss_list_1057_1801[] = { &pci_ss_info_1057_1801_14fb_0101, &pci_ss_info_1057_1801_14fb_0102, @@ -49576,6 +53006,7 @@ static const pciSubsystemInfo *pci_ss_list_105a_6269[] = { #define pci_ss_list_105a_8350 NULL static const pciSubsystemInfo *pci_ss_list_105a_8650[] = { &pci_ss_info_105a_8650_105a_4600, + &pci_ss_info_105a_8650_105a_4610, &pci_ss_info_105a_8650_105a_8601, &pci_ss_info_105a_8650_105a_8602, NULL @@ -49583,6 +53014,7 @@ static const pciSubsystemInfo *pci_ss_list_105a_8650[] = { #define pci_ss_list_105a_c350 NULL #define pci_ss_list_105a_e350 NULL #endif +#define pci_ss_list_105b_0c4d NULL #define pci_ss_list_105d_2309 NULL static const pciSubsystemInfo *pci_ss_list_105d_2339[] = { &pci_ss_info_105d_2339_105d_0000, @@ -49937,13 +53369,21 @@ static const pciSubsystemInfo *pci_ss_list_108d_0019[] = { #define pci_ss_list_108e_1103 NULL #define pci_ss_list_108e_1648 NULL #define pci_ss_list_108e_2bad NULL -#define pci_ss_list_108e_5000 NULL +static const pciSubsystemInfo *pci_ss_list_108e_5000[] = { + &pci_ss_info_108e_5000_108e_5000, + NULL +}; #define pci_ss_list_108e_5043 NULL +#define pci_ss_list_108e_676e NULL +#define pci_ss_list_108e_7063 NULL #define pci_ss_list_108e_8000 NULL #define pci_ss_list_108e_8001 NULL #define pci_ss_list_108e_8002 NULL #define pci_ss_list_108e_a000 NULL -#define pci_ss_list_108e_a001 NULL +static const pciSubsystemInfo *pci_ss_list_108e_a001[] = { + &pci_ss_info_108e_a001_108e_a001, + NULL +}; #define pci_ss_list_108e_a801 NULL #define pci_ss_list_108e_abba NULL #define pci_ss_list_1091_0020 NULL @@ -50269,16 +53709,20 @@ static const pciSubsystemInfo *pci_ss_list_10b4_1b1d[] = { #define pci_ss_list_10b5_1147 NULL #define pci_ss_list_10b5_2540 NULL #define pci_ss_list_10b5_2724 NULL +#define pci_ss_list_10b5_6520 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_10b5_6540[] = { + &pci_ss_info_10b5_6540_1775_1100, &pci_ss_info_10b5_6540_4c53_10e0, NULL }; static const pciSubsystemInfo *pci_ss_list_10b5_6541[] = { + &pci_ss_info_10b5_6541_1775_1100, &pci_ss_info_10b5_6541_4c53_10e0, NULL }; static const pciSubsystemInfo *pci_ss_list_10b5_6542[] = { + &pci_ss_info_10b5_6542_1775_1100, &pci_ss_info_10b5_6542_4c53_10e0, NULL }; @@ -50354,6 +53798,7 @@ static const pciSubsystemInfo *pci_ss_list_10b5_9054[] = { &pci_ss_info_10b5_9054_12c7_4001, &pci_ss_info_10b5_9054_12d9_0002, &pci_ss_info_10b5_9054_14b4_d100, + &pci_ss_info_10b5_9054_14b4_d114, &pci_ss_info_10b5_9054_16df_0011, &pci_ss_info_10b5_9054_16df_0012, &pci_ss_info_10b5_9054_16df_0013, @@ -50364,6 +53809,7 @@ static const pciSubsystemInfo *pci_ss_list_10b5_9054[] = { }; static const pciSubsystemInfo *pci_ss_list_10b5_9056[] = { &pci_ss_info_10b5_9056_10b5_2979, + &pci_ss_info_10b5_9056_14b4_d140, NULL }; #define pci_ss_list_10b5_9060 NULL @@ -50443,6 +53889,7 @@ static const pciSubsystemInfo *pci_ss_list_10b7_0013[] = { #define pci_ss_list_10b7_0910 NULL #define pci_ss_list_10b7_1006 NULL static const pciSubsystemInfo *pci_ss_list_10b7_1007[] = { + &pci_ss_info_10b7_1007_10b7_615b, &pci_ss_info_10b7_1007_10b7_615c, NULL }; @@ -50563,6 +54010,7 @@ static const pciSubsystemInfo *pci_ss_list_10b7_9055[] = { static const pciSubsystemInfo *pci_ss_list_10b7_9200[] = { &pci_ss_info_10b7_9200_1028_0095, &pci_ss_info_10b7_9200_1028_0097, + &pci_ss_info_10b7_9200_1028_00b4, &pci_ss_info_10b7_9200_1028_00fe, &pci_ss_info_10b7_9200_1028_012a, &pci_ss_info_10b7_9200_10b7_1000, @@ -51004,6 +54452,7 @@ static const pciSubsystemInfo *pci_ss_list_10de_0053[] = { NULL }; static const pciSubsystemInfo *pci_ss_list_10de_0054[] = { + &pci_ss_info_10de_0054_1043_815a, &pci_ss_info_10de_0054_1458_b003, &pci_ss_info_10de_0054_1462_7100, &pci_ss_info_10de_0054_147b_1c1a, @@ -51046,6 +54495,7 @@ static const pciSubsystemInfo *pci_ss_list_10de_005b[] = { #define pci_ss_list_10de_005c NULL #define pci_ss_list_10de_005d NULL static const pciSubsystemInfo *pci_ss_list_10de_005e[] = { + &pci_ss_info_10de_005e_1043_815a, &pci_ss_info_10de_005e_10f1_2891, &pci_ss_info_10de_005e_1458_5000, &pci_ss_info_10de_005e_1462_7100, @@ -51126,6 +54576,7 @@ static const pciSubsystemInfo *pci_ss_list_10de_008a[] = { #define pci_ss_list_10de_0091 NULL #define pci_ss_list_10de_0092 NULL #define pci_ss_list_10de_0093 NULL +#define pci_ss_list_10de_0095 NULL #define pci_ss_list_10de_0098 NULL #define pci_ss_list_10de_0099 NULL #define pci_ss_list_10de_009d NULL @@ -51158,34 +54609,40 @@ static const pciSubsystemInfo *pci_ss_list_10de_00cd[] = { #define pci_ss_list_10de_00da NULL #define pci_ss_list_10de_00dd NULL static const pciSubsystemInfo *pci_ss_list_10de_00df[] = { + &pci_ss_info_10de_00df_1043_80a7, &pci_ss_info_10de_00df_105b_0c43, &pci_ss_info_10de_00df_147b_1c0b, NULL }; static const pciSubsystemInfo *pci_ss_list_10de_00e0[] = { + &pci_ss_info_10de_00e0_1043_813f, &pci_ss_info_10de_00e0_10de_0c11, &pci_ss_info_10de_00e0_1462_7030, &pci_ss_info_10de_00e0_147b_1c0b, NULL }; static const pciSubsystemInfo *pci_ss_list_10de_00e1[] = { + &pci_ss_info_10de_00e1_1043_813f, &pci_ss_info_10de_00e1_1462_7030, &pci_ss_info_10de_00e1_147b_1c0b, NULL }; #define pci_ss_list_10de_00e2 NULL static const pciSubsystemInfo *pci_ss_list_10de_00e3[] = { + &pci_ss_info_10de_00e3_1043_813f, &pci_ss_info_10de_00e3_105b_0c43, &pci_ss_info_10de_00e3_147b_1c0b, NULL }; static const pciSubsystemInfo *pci_ss_list_10de_00e4[] = { + &pci_ss_info_10de_00e4_1043_813f, &pci_ss_info_10de_00e4_105b_0c43, &pci_ss_info_10de_00e4_1462_7030, &pci_ss_info_10de_00e4_147b_1c0b, NULL }; static const pciSubsystemInfo *pci_ss_list_10de_00e5[] = { + &pci_ss_info_10de_00e5_1043_813f, &pci_ss_info_10de_00e5_105b_0c43, &pci_ss_info_10de_00e5_1462_7030, &pci_ss_info_10de_00e5_147b_1c0b, @@ -51193,19 +54650,23 @@ static const pciSubsystemInfo *pci_ss_list_10de_00e5[] = { }; #define pci_ss_list_10de_00e6 NULL static const pciSubsystemInfo *pci_ss_list_10de_00e7[] = { + &pci_ss_info_10de_00e7_1043_813f, &pci_ss_info_10de_00e7_105b_0c43, &pci_ss_info_10de_00e7_1462_7030, &pci_ss_info_10de_00e7_147b_1c0b, NULL }; static const pciSubsystemInfo *pci_ss_list_10de_00e8[] = { + &pci_ss_info_10de_00e8_1043_813f, &pci_ss_info_10de_00e8_105b_0c43, &pci_ss_info_10de_00e8_1462_7030, &pci_ss_info_10de_00e8_147b_1c0b, NULL }; static const pciSubsystemInfo *pci_ss_list_10de_00ea[] = { + &pci_ss_info_10de_00ea_1043_819d, &pci_ss_info_10de_00ea_105b_0c43, + &pci_ss_info_10de_00ea_1462_b010, &pci_ss_info_10de_00ea_147b_1c0b, NULL }; @@ -51214,6 +54675,7 @@ static const pciSubsystemInfo *pci_ss_list_10de_00ea[] = { #define pci_ss_list_10de_00f0 NULL static const pciSubsystemInfo *pci_ss_list_10de_00f1[] = { &pci_ss_info_10de_00f1_1043_81a6, + &pci_ss_info_10de_00f1_1458_3150, &pci_ss_info_10de_00f1_1682_2119, NULL }; @@ -51271,6 +54733,7 @@ static const pciSubsystemInfo *pci_ss_list_10de_0103[] = { }; static const pciSubsystemInfo *pci_ss_list_10de_0110[] = { &pci_ss_info_10de_0110_1043_4015, + &pci_ss_info_10de_0110_1043_4021, &pci_ss_info_10de_0110_1043_4031, &pci_ss_info_10de_0110_1048_0c60, &pci_ss_info_10de_0110_1048_0c61, @@ -51290,10 +54753,12 @@ static const pciSubsystemInfo *pci_ss_list_10de_0110[] = { #define pci_ss_list_10de_0113 NULL #define pci_ss_list_10de_0140 NULL static const pciSubsystemInfo *pci_ss_list_10de_0141[] = { + &pci_ss_info_10de_0141_1043_81b0, &pci_ss_info_10de_0141_1458_3124, NULL }; #define pci_ss_list_10de_0142 NULL +#define pci_ss_list_10de_0143 NULL #define pci_ss_list_10de_0144 NULL #define pci_ss_list_10de_0145 NULL #define pci_ss_list_10de_0146 NULL @@ -51335,6 +54800,7 @@ static const pciSubsystemInfo *pci_ss_list_10de_0152[] = { #define pci_ss_list_10de_0167 NULL #define pci_ss_list_10de_0168 NULL #define pci_ss_list_10de_0169 NULL +#define pci_ss_list_10de_016a NULL #define pci_ss_list_10de_0170 NULL static const pciSubsystemInfo *pci_ss_list_10de_0171[] = { &pci_ss_info_10de_0171_10b0_0002, @@ -51375,6 +54841,7 @@ static const pciSubsystemInfo *pci_ss_list_10de_0181[] = { }; #define pci_ss_list_10de_0182 NULL #define pci_ss_list_10de_0183 NULL +#define pci_ss_list_10de_0184 NULL #define pci_ss_list_10de_0185 NULL #define pci_ss_list_10de_0186 NULL #define pci_ss_list_10de_0187 NULL @@ -51383,6 +54850,11 @@ static const pciSubsystemInfo *pci_ss_list_10de_0181[] = { #define pci_ss_list_10de_018b NULL #define pci_ss_list_10de_018c NULL #define pci_ss_list_10de_018d NULL +#define pci_ss_list_10de_0191 NULL +#define pci_ss_list_10de_0193 NULL +#define pci_ss_list_10de_0194 NULL +#define pci_ss_list_10de_019d NULL +#define pci_ss_list_10de_019e NULL #define pci_ss_list_10de_01a0 NULL #define pci_ss_list_10de_01a4 NULL #define pci_ss_list_10de_01ab NULL @@ -51402,10 +54874,13 @@ static const pciSubsystemInfo *pci_ss_list_10de_01d1[] = { &pci_ss_info_10de_01d1_1462_0345, NULL }; +#define pci_ss_list_10de_01d3 NULL #define pci_ss_list_10de_01d6 NULL #define pci_ss_list_10de_01d7 NULL #define pci_ss_list_10de_01d8 NULL #define pci_ss_list_10de_01da NULL +#define pci_ss_list_10de_01dc NULL +#define pci_ss_list_10de_01dd NULL static const pciSubsystemInfo *pci_ss_list_10de_01de[] = { &pci_ss_info_10de_01de_10de_01dc, NULL @@ -51460,18 +54935,29 @@ static const pciSubsystemInfo *pci_ss_list_10de_0202[] = { #define pci_ss_list_10de_0212 NULL #define pci_ss_list_10de_0215 NULL #define pci_ss_list_10de_0218 NULL -#define pci_ss_list_10de_0221 NULL +static const pciSubsystemInfo *pci_ss_list_10de_0221[] = { + &pci_ss_info_10de_0221_3842_a341, + NULL +}; +#define pci_ss_list_10de_0222 NULL static const pciSubsystemInfo *pci_ss_list_10de_0240[] = { + &pci_ss_info_10de_0240_1043_81cd, &pci_ss_info_10de_0240_1462_7207, NULL }; #define pci_ss_list_10de_0241 NULL #define pci_ss_list_10de_0242 NULL #define pci_ss_list_10de_0243 NULL -#define pci_ss_list_10de_0244 NULL +static const pciSubsystemInfo *pci_ss_list_10de_0244[] = { + &pci_ss_info_10de_0244_10de_0244, + NULL +}; #define pci_ss_list_10de_0245 NULL #define pci_ss_list_10de_0246 NULL -#define pci_ss_list_10de_0247 NULL +static const pciSubsystemInfo *pci_ss_list_10de_0247[] = { + &pci_ss_info_10de_0247_1043_1382, + NULL +}; #define pci_ss_list_10de_0248 NULL #define pci_ss_list_10de_0249 NULL #define pci_ss_list_10de_024a NULL @@ -51495,6 +54981,8 @@ static const pciSubsystemInfo *pci_ss_list_10de_0253[] = { #define pci_ss_list_10de_0259 NULL #define pci_ss_list_10de_025b NULL static const pciSubsystemInfo *pci_ss_list_10de_0260[] = { + &pci_ss_info_10de_0260_1043_81bc, + &pci_ss_info_10de_0260_1458_5001, &pci_ss_info_10de_0260_1462_7207, NULL }; @@ -51502,52 +54990,66 @@ static const pciSubsystemInfo *pci_ss_list_10de_0260[] = { #define pci_ss_list_10de_0262 NULL #define pci_ss_list_10de_0263 NULL static const pciSubsystemInfo *pci_ss_list_10de_0264[] = { + &pci_ss_info_10de_0264_1043_81bc, &pci_ss_info_10de_0264_1462_7207, NULL }; static const pciSubsystemInfo *pci_ss_list_10de_0265[] = { + &pci_ss_info_10de_0265_1043_81bc, &pci_ss_info_10de_0265_1462_7207, NULL }; static const pciSubsystemInfo *pci_ss_list_10de_0266[] = { + &pci_ss_info_10de_0266_1043_81bc, &pci_ss_info_10de_0266_1462_7207, NULL }; static const pciSubsystemInfo *pci_ss_list_10de_0267[] = { + &pci_ss_info_10de_0267_1043_81bc, &pci_ss_info_10de_0267_1462_7207, NULL }; #define pci_ss_list_10de_0268 NULL static const pciSubsystemInfo *pci_ss_list_10de_0269[] = { + &pci_ss_info_10de_0269_1043_8141, &pci_ss_info_10de_0269_1462_7207, NULL }; #define pci_ss_list_10de_026a NULL #define pci_ss_list_10de_026b NULL static const pciSubsystemInfo *pci_ss_list_10de_026c[] = { + &pci_ss_info_10de_026c_10de_cb84, &pci_ss_info_10de_026c_1462_7207, NULL }; static const pciSubsystemInfo *pci_ss_list_10de_026d[] = { + &pci_ss_info_10de_026d_1043_81bc, &pci_ss_info_10de_026d_1462_7207, NULL }; static const pciSubsystemInfo *pci_ss_list_10de_026e[] = { + &pci_ss_info_10de_026e_1043_81bc, &pci_ss_info_10de_026e_1462_7207, NULL }; #define pci_ss_list_10de_026f NULL static const pciSubsystemInfo *pci_ss_list_10de_0270[] = { + &pci_ss_info_10de_0270_1043_81bc, + &pci_ss_info_10de_0270_1458_5001, &pci_ss_info_10de_0270_1462_7207, NULL }; #define pci_ss_list_10de_0271 NULL #define pci_ss_list_10de_0272 NULL static const pciSubsystemInfo *pci_ss_list_10de_027e[] = { + &pci_ss_info_10de_027e_1043_81cd, + &pci_ss_info_10de_027e_1458_5000, &pci_ss_info_10de_027e_1462_7207, NULL }; static const pciSubsystemInfo *pci_ss_list_10de_027f[] = { + &pci_ss_info_10de_027f_1043_81cd, + &pci_ss_info_10de_027f_1458_5000, &pci_ss_info_10de_027f_1462_7207, NULL }; @@ -51559,8 +55061,18 @@ static const pciSubsystemInfo *pci_ss_list_10de_027f[] = { #define pci_ss_list_10de_0289 NULL #define pci_ss_list_10de_028c NULL #define pci_ss_list_10de_0290 NULL -#define pci_ss_list_10de_0291 NULL +static const pciSubsystemInfo *pci_ss_list_10de_0291[] = { + &pci_ss_info_10de_0291_10de_042b, + NULL +}; #define pci_ss_list_10de_0292 NULL +#define pci_ss_list_10de_0293 NULL +#define pci_ss_list_10de_0294 NULL +static const pciSubsystemInfo *pci_ss_list_10de_0295[] = { + &pci_ss_info_10de_0295_107d_2a68, + NULL +}; +#define pci_ss_list_10de_0297 NULL #define pci_ss_list_10de_0298 NULL #define pci_ss_list_10de_0299 NULL #define pci_ss_list_10de_029a NULL @@ -51570,12 +55082,18 @@ static const pciSubsystemInfo *pci_ss_list_10de_027f[] = { #define pci_ss_list_10de_029e NULL #define pci_ss_list_10de_029f NULL #define pci_ss_list_10de_02a0 NULL +#define pci_ss_list_10de_02e0 NULL #define pci_ss_list_10de_02e1 NULL +#define pci_ss_list_10de_02e2 NULL static const pciSubsystemInfo *pci_ss_list_10de_02f0[] = { + &pci_ss_info_10de_02f0_1043_81cd, &pci_ss_info_10de_02f0_1462_7207, NULL }; -#define pci_ss_list_10de_02f1 NULL +static const pciSubsystemInfo *pci_ss_list_10de_02f1[] = { + &pci_ss_info_10de_02f1_1458_5000, + NULL +}; #define pci_ss_list_10de_02f2 NULL #define pci_ss_list_10de_02f3 NULL #define pci_ss_list_10de_02f4 NULL @@ -51583,14 +55101,20 @@ static const pciSubsystemInfo *pci_ss_list_10de_02f0[] = { #define pci_ss_list_10de_02f6 NULL #define pci_ss_list_10de_02f7 NULL static const pciSubsystemInfo *pci_ss_list_10de_02f8[] = { + &pci_ss_info_10de_02f8_1043_81cd, + &pci_ss_info_10de_02f8_1458_5000, &pci_ss_info_10de_02f8_1462_7207, NULL }; static const pciSubsystemInfo *pci_ss_list_10de_02f9[] = { + &pci_ss_info_10de_02f9_1043_81cd, + &pci_ss_info_10de_02f9_1458_5000, &pci_ss_info_10de_02f9_1462_7207, NULL }; static const pciSubsystemInfo *pci_ss_list_10de_02fa[] = { + &pci_ss_info_10de_02fa_1043_81cd, + &pci_ss_info_10de_02fa_1458_5000, &pci_ss_info_10de_02fa_1462_7207, NULL }; @@ -51598,10 +55122,14 @@ static const pciSubsystemInfo *pci_ss_list_10de_02fa[] = { #define pci_ss_list_10de_02fc NULL #define pci_ss_list_10de_02fd NULL static const pciSubsystemInfo *pci_ss_list_10de_02fe[] = { + &pci_ss_info_10de_02fe_1043_81cd, + &pci_ss_info_10de_02fe_1458_5000, &pci_ss_info_10de_02fe_1462_7207, NULL }; static const pciSubsystemInfo *pci_ss_list_10de_02ff[] = { + &pci_ss_info_10de_02ff_1043_81cd, + &pci_ss_info_10de_02ff_1458_5000, &pci_ss_info_10de_02ff_1462_7207, NULL }; @@ -51628,6 +55156,7 @@ static const pciSubsystemInfo *pci_ss_list_10de_0314[] = { #define pci_ss_list_10de_0320 NULL #define pci_ss_list_10de_0321 NULL static const pciSubsystemInfo *pci_ss_list_10de_0322[] = { + &pci_ss_info_10de_0322_1043_02fb, &pci_ss_info_10de_0322_1462_9171, &pci_ss_info_10de_0322_1462_9360, NULL @@ -51658,7 +55187,10 @@ static const pciSubsystemInfo *pci_ss_list_10de_0331[] = { #define pci_ss_list_10de_0334 NULL #define pci_ss_list_10de_0338 NULL #define pci_ss_list_10de_033f NULL -#define pci_ss_list_10de_0341 NULL +static const pciSubsystemInfo *pci_ss_list_10de_0341[] = { + &pci_ss_info_10de_0341_1462_9380, + NULL +}; #define pci_ss_list_10de_0342 NULL #define pci_ss_list_10de_0343 NULL #define pci_ss_list_10de_0344 NULL @@ -51698,15 +55230,30 @@ static const pciSubsystemInfo *pci_ss_list_10de_0347[] = { #define pci_ss_list_10de_0377 NULL #define pci_ss_list_10de_0378 NULL #define pci_ss_list_10de_037a NULL +#define pci_ss_list_10de_037c NULL #define pci_ss_list_10de_037e NULL #define pci_ss_list_10de_037f NULL -#define pci_ss_list_10de_0391 NULL +#define pci_ss_list_10de_0390 NULL +static const pciSubsystemInfo *pci_ss_list_10de_0391[] = { + &pci_ss_info_10de_0391_1458_3427, + NULL +}; static const pciSubsystemInfo *pci_ss_list_10de_0392[] = { &pci_ss_info_10de_0392_1462_0622, NULL }; #define pci_ss_list_10de_0393 NULL -#define pci_ss_list_10de_0398 NULL +#define pci_ss_list_10de_0394 NULL +#define pci_ss_list_10de_0395 NULL +#define pci_ss_list_10de_0397 NULL +static const pciSubsystemInfo *pci_ss_list_10de_0398[] = { + &pci_ss_info_10de_0398_1025_006c, + NULL +}; +#define pci_ss_list_10de_0399 NULL +#define pci_ss_list_10de_039a NULL +#define pci_ss_list_10de_039b NULL +#define pci_ss_list_10de_039c NULL #define pci_ss_list_10de_039e NULL #define pci_ss_list_10de_03a0 NULL #define pci_ss_list_10de_03a1 NULL @@ -51763,6 +55310,20 @@ static const pciSubsystemInfo *pci_ss_list_10de_0392[] = { #define pci_ss_list_10de_03f5 NULL #define pci_ss_list_10de_03f6 NULL #define pci_ss_list_10de_03f7 NULL +#define pci_ss_list_10de_0400 NULL +#define pci_ss_list_10de_0402 NULL +#define pci_ss_list_10de_0407 NULL +#define pci_ss_list_10de_040b NULL +#define pci_ss_list_10de_0421 NULL +#define pci_ss_list_10de_0422 NULL +#define pci_ss_list_10de_0423 NULL +#define pci_ss_list_10de_0425 NULL +#define pci_ss_list_10de_0426 NULL +#define pci_ss_list_10de_0427 NULL +#define pci_ss_list_10de_0428 NULL +#define pci_ss_list_10de_0429 NULL +#define pci_ss_list_10de_042a NULL +#define pci_ss_list_10de_042b NULL #define pci_ss_list_10de_0440 NULL #define pci_ss_list_10de_0441 NULL #define pci_ss_list_10de_0442 NULL @@ -51794,7 +55355,12 @@ static const pciSubsystemInfo *pci_ss_list_10de_0392[] = { #define pci_ss_list_10de_045d NULL #define pci_ss_list_10de_045e NULL #define pci_ss_list_10de_045f NULL +#define pci_ss_list_10de_055c NULL +#define pci_ss_list_10de_055d NULL +#define pci_ss_list_10de_c615 NULL #define pci_ss_list_10df_1ae5 NULL +#define pci_ss_list_10df_f011 NULL +#define pci_ss_list_10df_f015 NULL #define pci_ss_list_10df_f085 NULL #define pci_ss_list_10df_f095 NULL #define pci_ss_list_10df_f098 NULL @@ -51806,6 +55372,7 @@ static const pciSubsystemInfo *pci_ss_list_10de_0392[] = { #define pci_ss_list_10df_f0e1 NULL #define pci_ss_list_10df_f0e5 NULL #define pci_ss_list_10df_f0f5 NULL +#define pci_ss_list_10df_f100 NULL #define pci_ss_list_10df_f700 NULL #define pci_ss_list_10df_f701 NULL #define pci_ss_list_10df_f800 NULL @@ -51820,6 +55387,7 @@ static const pciSubsystemInfo *pci_ss_list_10de_0392[] = { #define pci_ss_list_10df_fc00 NULL #define pci_ss_list_10df_fc10 NULL #define pci_ss_list_10df_fc20 NULL +#define pci_ss_list_10df_fc40 NULL #define pci_ss_list_10df_fd00 NULL #define pci_ss_list_10df_fe00 NULL #define pci_ss_list_10df_ff00 NULL @@ -51839,12 +55407,17 @@ static const pciSubsystemInfo *pci_ss_list_10e1_0391[] = { #endif #define pci_ss_list_10e3_0000 NULL #define pci_ss_list_10e3_0108 NULL -#define pci_ss_list_10e3_0148 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_10e3_0148[] = { + &pci_ss_info_10e3_0148_1775_1100, + NULL +}; #define pci_ss_list_10e3_0860 NULL #define pci_ss_list_10e3_0862 NULL #define pci_ss_list_10e3_8260 NULL #define pci_ss_list_10e3_8261 NULL #define pci_ss_list_10e3_a108 NULL +#endif #define pci_ss_list_10e4_8029 NULL #define pci_ss_list_10e8_1072 NULL #define pci_ss_list_10e8_2011 NULL @@ -51859,10 +55432,12 @@ static const pciSubsystemInfo *pci_ss_list_10e1_0391[] = { #define pci_ss_list_10e8_80d7 NULL #define pci_ss_list_10e8_80d9 NULL #define pci_ss_list_10e8_80da NULL +#define pci_ss_list_10e8_80fc NULL #define pci_ss_list_10e8_811a NULL #define pci_ss_list_10e8_814c NULL #define pci_ss_list_10e8_8170 NULL #define pci_ss_list_10e8_81e6 NULL +#define pci_ss_list_10e8_828d NULL #define pci_ss_list_10e8_8291 NULL #define pci_ss_list_10e8_82c4 NULL #define pci_ss_list_10e8_82c5 NULL @@ -51871,6 +55446,8 @@ static const pciSubsystemInfo *pci_ss_list_10e1_0391[] = { #define pci_ss_list_10e8_82ca NULL #define pci_ss_list_10e8_82db NULL #define pci_ss_list_10e8_82e2 NULL +#define pci_ss_list_10e8_8406 NULL +#define pci_ss_list_10e8_8407 NULL #define pci_ss_list_10e8_8851 NULL #define pci_ss_list_10ea_1680 NULL #define pci_ss_list_10ea_1682 NULL @@ -51884,11 +55461,18 @@ static const pciSubsystemInfo *pci_ss_list_10e1_0391[] = { #define pci_ss_list_10eb_0101 NULL #define pci_ss_list_10eb_8111 NULL #define pci_ss_list_10ec_0139 NULL +#define pci_ss_list_10ec_0260 NULL +#define pci_ss_list_10ec_0261 NULL +#define pci_ss_list_10ec_0280 NULL +#define pci_ss_list_10ec_0861 NULL +#define pci_ss_list_10ec_0862 NULL +#define pci_ss_list_10ec_0880 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_10ec_0883[] = { &pci_ss_info_10ec_0883_1025_1605, NULL }; +#define pci_ss_list_10ec_0888 NULL static const pciSubsystemInfo *pci_ss_list_10ec_8029[] = { &pci_ss_info_10ec_8029_10b8_2011, &pci_ss_info_10ec_8029_10ec_8029, @@ -51912,10 +55496,12 @@ static const pciSubsystemInfo *pci_ss_list_10ec_8139[] = { &pci_ss_info_10ec_8139_1025_8920, &pci_ss_info_10ec_8139_1025_8921, &pci_ss_info_10ec_8139_103c_006a, + &pci_ss_info_10ec_8139_1043_1045, &pci_ss_info_10ec_8139_1043_8109, &pci_ss_info_10ec_8139_1071_8160, &pci_ss_info_10ec_8139_10bd_0320, &pci_ss_info_10ec_8139_10ec_8139, + &pci_ss_info_10ec_8139_10f7_8338, &pci_ss_info_10ec_8139_1113_ec01, &pci_ss_info_10ec_8139_1186_1300, &pci_ss_info_10ec_8139_1186_1320, @@ -51926,6 +55512,7 @@ static const pciSubsystemInfo *pci_ss_list_10ec_8139[] = { &pci_ss_info_10ec_8139_1429_d010, &pci_ss_info_10ec_8139_1432_9130, &pci_ss_info_10ec_8139_1436_8139, + &pci_ss_info_10ec_8139_144d_c00c, &pci_ss_info_10ec_8139_1458_e000, &pci_ss_info_10ec_8139_1462_788c, &pci_ss_info_10ec_8139_146c_1439, @@ -51934,6 +55521,7 @@ static const pciSubsystemInfo *pci_ss_list_10ec_8139[] = { &pci_ss_info_10ec_8139_149c_139a, &pci_ss_info_10ec_8139_149c_8139, &pci_ss_info_10ec_8139_14cb_0200, + &pci_ss_info_10ec_8139_1565_2300, &pci_ss_info_10ec_8139_1695_9001, &pci_ss_info_10ec_8139_1799_5000, &pci_ss_info_10ec_8139_1904_8139, @@ -51943,14 +55531,21 @@ static const pciSubsystemInfo *pci_ss_list_10ec_8139[] = { &pci_ss_info_10ec_8139_a0a0_0007, NULL }; -#define pci_ss_list_10ec_8167 NULL +static const pciSubsystemInfo *pci_ss_list_10ec_8167[] = { + &pci_ss_info_10ec_8167_1462_235c, + NULL +}; #define pci_ss_list_10ec_8168 NULL static const pciSubsystemInfo *pci_ss_list_10ec_8169[] = { &pci_ss_info_10ec_8169_1025_0079, &pci_ss_info_10ec_8169_1259_c107, &pci_ss_info_10ec_8169_1371_434e, &pci_ss_info_10ec_8169_1458_e000, + &pci_ss_info_10ec_8169_1462_030c, &pci_ss_info_10ec_8169_1462_702c, + &pci_ss_info_10ec_8169_1462_7094, + &pci_ss_info_10ec_8169_1734_1091, + &pci_ss_info_10ec_8169_a0a0_0449, NULL }; #define pci_ss_list_10ec_8180 NULL @@ -51970,6 +55565,7 @@ static const pciSubsystemInfo *pci_ss_list_10ec_8169[] = { #define pci_ss_list_10ee_3fc4 NULL #define pci_ss_list_10ee_3fc5 NULL #define pci_ss_list_10ee_3fc6 NULL +#define pci_ss_list_10ee_8380 NULL #define pci_ss_list_10ee_8381 NULL #define pci_ss_list_10ee_d154 NULL #define pci_ss_list_10ef_8154 NULL @@ -52013,8 +55609,10 @@ static const pciSubsystemInfo *pci_ss_list_1102_0004[] = { &pci_ss_info_1102_0004_1102_0051, &pci_ss_info_1102_0004_1102_0053, &pci_ss_info_1102_0004_1102_0058, + &pci_ss_info_1102_0004_1102_1002, &pci_ss_info_1102_0004_1102_1007, &pci_ss_info_1102_0004_1102_2002, + &pci_ss_info_1102_0004_1102_4001, NULL }; static const pciSubsystemInfo *pci_ss_list_1102_0005[] = { @@ -52077,8 +55675,10 @@ static const pciSubsystemInfo *pci_ss_list_1102_8938[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1103_0004[] = { &pci_ss_info_1103_0004_1103_0001, + &pci_ss_info_1103_0004_1103_0003, &pci_ss_info_1103_0004_1103_0004, &pci_ss_info_1103_0004_1103_0005, + &pci_ss_info_1103_0004_1103_0006, NULL }; #define pci_ss_list_1103_0005 NULL @@ -52086,6 +55686,7 @@ static const pciSubsystemInfo *pci_ss_list_1103_0004[] = { #define pci_ss_list_1103_0007 NULL #define pci_ss_list_1103_0008 NULL #define pci_ss_list_1103_0009 NULL +#define pci_ss_list_1103_2340 NULL #endif #define pci_ss_list_1105_1105 NULL #define pci_ss_list_1105_8300 NULL @@ -52107,6 +55708,7 @@ static const pciSubsystemInfo *pci_ss_list_1105_8476[] = { #endif #define pci_ss_list_1106_0102 NULL #define pci_ss_list_1106_0130 NULL +#define pci_ss_list_1106_0198 NULL #define pci_ss_list_1106_0204 NULL #define pci_ss_list_1106_0208 NULL #define pci_ss_list_1106_0238 NULL @@ -52136,7 +55738,10 @@ static const pciSubsystemInfo *pci_ss_list_1106_0305[] = { #define pci_ss_list_1106_0336 NULL #define pci_ss_list_1106_0340 NULL #define pci_ss_list_1106_0351 NULL -#define pci_ss_list_1106_0364 NULL +static const pciSubsystemInfo *pci_ss_list_1106_0364[] = { + &pci_ss_info_1106_0364_1043_81ce, + NULL +}; #define pci_ss_list_1106_0391 NULL #define pci_ss_list_1106_0501 NULL #define pci_ss_list_1106_0505 NULL @@ -52153,6 +55758,8 @@ static const pciSubsystemInfo *pci_ss_list_1106_0571[] = { &pci_ss_info_1106_0571_1297_f641, &pci_ss_info_1106_0571_1458_5002, &pci_ss_info_1106_0571_1462_7020, + &pci_ss_info_1106_0571_1462_7094, + &pci_ss_info_1106_0571_1462_7181, &pci_ss_info_1106_0571_147b_1407, &pci_ss_info_1106_0571_1849_0571, NULL @@ -52222,6 +55829,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_0691[] = { #define pci_ss_list_1106_1364 NULL #define pci_ss_list_1106_1571 NULL #define pci_ss_list_1106_1595 NULL +#define pci_ss_list_1106_2106 NULL #define pci_ss_list_1106_2204 NULL #define pci_ss_list_1106_2208 NULL #define pci_ss_list_1106_2238 NULL @@ -52257,6 +55865,8 @@ static const pciSubsystemInfo *pci_ss_list_1106_3038[] = { &pci_ss_info_1106_3038_1179_0001, &pci_ss_info_1106_3038_1458_5004, &pci_ss_info_1106_3038_1462_7020, + &pci_ss_info_1106_3038_1462_7094, + &pci_ss_info_1106_3038_1462_7181, &pci_ss_info_1106_3038_147b_1407, &pci_ss_info_1106_3038_182d_201d, &pci_ss_info_1106_3038_1849_3038, @@ -52270,6 +55880,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_3043[] = { NULL }; static const pciSubsystemInfo *pci_ss_list_1106_3044[] = { + &pci_ss_info_1106_3044_0010_0001, &pci_ss_info_1106_3044_1025_005a, &pci_ss_info_1106_3044_1043_808a, &pci_ss_info_1106_3044_1458_1000, @@ -52310,18 +55921,23 @@ static const pciSubsystemInfo *pci_ss_list_1106_3059[] = { &pci_ss_info_1106_3059_1043_80a1, &pci_ss_info_1106_3059_1043_80b0, &pci_ss_info_1106_3059_1043_812a, + &pci_ss_info_1106_3059_10ec_8168, &pci_ss_info_1106_3059_1106_3059, &pci_ss_info_1106_3059_1106_4161, &pci_ss_info_1106_3059_1106_4170, &pci_ss_info_1106_3059_1106_4552, &pci_ss_info_1106_3059_1297_c160, + &pci_ss_info_1106_3059_1413_147b, &pci_ss_info_1106_3059_1458_a002, &pci_ss_info_1106_3059_1462_0080, &pci_ss_info_1106_3059_1462_3800, + &pci_ss_info_1106_3059_1462_7181, &pci_ss_info_1106_3059_147b_1407, + &pci_ss_info_1106_3059_1849_0850, &pci_ss_info_1106_3059_1849_9761, &pci_ss_info_1106_3059_4005_4710, &pci_ss_info_1106_3059_a0a0_01b6, + &pci_ss_info_1106_3059_a0a0_0342, NULL }; static const pciSubsystemInfo *pci_ss_list_1106_3065[] = { @@ -52330,6 +55946,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_3065[] = { &pci_ss_info_1106_3065_1186_1400, &pci_ss_info_1106_3065_1186_1401, &pci_ss_info_1106_3065_13b9_1421, + &pci_ss_info_1106_3065_1462_7181, &pci_ss_info_1106_3065_147b_1c09, &pci_ss_info_1106_3065_1695_3005, &pci_ss_info_1106_3065_1695_300c, @@ -52362,6 +55979,8 @@ static const pciSubsystemInfo *pci_ss_list_1106_3104[] = { &pci_ss_info_1106_3104_1297_f641, &pci_ss_info_1106_3104_1458_5004, &pci_ss_info_1106_3104_1462_7020, + &pci_ss_info_1106_3104_1462_7094, + &pci_ss_info_1106_3104_1462_7181, &pci_ss_info_1106_3104_147b_1407, &pci_ss_info_1106_3104_182d_201d, &pci_ss_info_1106_3104_1849_3104, @@ -52394,12 +56013,15 @@ static const pciSubsystemInfo *pci_ss_list_1106_3149[] = { &pci_ss_info_1106_3149_1043_80ed, &pci_ss_info_1106_3149_1458_b003, &pci_ss_info_1106_3149_1462_7020, + &pci_ss_info_1106_3149_1462_7094, &pci_ss_info_1106_3149_147b_1407, &pci_ss_info_1106_3149_147b_1408, &pci_ss_info_1106_3149_1849_3149, + &pci_ss_info_1106_3149_a0a0_04ad, NULL }; #define pci_ss_list_1106_3156 NULL +#define pci_ss_list_1106_3157 NULL static const pciSubsystemInfo *pci_ss_list_1106_3164[] = { &pci_ss_info_1106_3164_1043_80f4, &pci_ss_info_1106_3164_1462_7028, @@ -52443,6 +56065,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_3227[] = { &pci_ss_info_1106_3227_1849_3227, NULL }; +#define pci_ss_list_1106_3230 NULL #define pci_ss_list_1106_3238 NULL #define pci_ss_list_1106_3249 NULL #define pci_ss_list_1106_324a NULL @@ -52450,6 +56073,7 @@ static const pciSubsystemInfo *pci_ss_list_1106_3227[] = { #define pci_ss_list_1106_324e NULL #define pci_ss_list_1106_3258 NULL #define pci_ss_list_1106_3259 NULL +#define pci_ss_list_1106_3260 NULL #define pci_ss_list_1106_3269 NULL #define pci_ss_list_1106_3282 NULL #define pci_ss_list_1106_3287 NULL @@ -52461,10 +56085,13 @@ static const pciSubsystemInfo *pci_ss_list_1106_3227[] = { #define pci_ss_list_1106_3336 NULL #define pci_ss_list_1106_3337 NULL #define pci_ss_list_1106_3340 NULL +#define pci_ss_list_1106_3343 NULL #define pci_ss_list_1106_3344 NULL #define pci_ss_list_1106_3349 NULL #define pci_ss_list_1106_3351 NULL #define pci_ss_list_1106_3364 NULL +#define pci_ss_list_1106_3371 NULL +#define pci_ss_list_1106_3372 NULL #define pci_ss_list_1106_337a NULL #define pci_ss_list_1106_337b NULL #define pci_ss_list_1106_4149 NULL @@ -52491,13 +56118,16 @@ static const pciSubsystemInfo *pci_ss_list_1106_3227[] = { #define pci_ss_list_1106_5238 NULL #define pci_ss_list_1106_5290 NULL #define pci_ss_list_1106_5308 NULL +#define pci_ss_list_1106_5324 NULL #define pci_ss_list_1106_5327 NULL #define pci_ss_list_1106_5336 NULL #define pci_ss_list_1106_5340 NULL #define pci_ss_list_1106_5351 NULL #define pci_ss_list_1106_5364 NULL #define pci_ss_list_1106_6100 NULL +#define pci_ss_list_1106_6287 NULL #define pci_ss_list_1106_6327 NULL +#define pci_ss_list_1106_6364 NULL #define pci_ss_list_1106_7204 NULL static const pciSubsystemInfo *pci_ss_list_1106_7205[] = { &pci_ss_info_1106_7205_1458_d000, @@ -52652,10 +56282,6 @@ static const pciSubsystemInfo *pci_ss_list_1113_9211[] = { #define pci_ss_list_1119_000b NULL #define pci_ss_list_1119_000c NULL #define pci_ss_list_1119_000d NULL -#define pci_ss_list_1119_0010 NULL -#define pci_ss_list_1119_0011 NULL -#define pci_ss_list_1119_0012 NULL -#define pci_ss_list_1119_0013 NULL #define pci_ss_list_1119_0100 NULL #define pci_ss_list_1119_0101 NULL #define pci_ss_list_1119_0102 NULL @@ -52712,6 +56338,7 @@ static const pciSubsystemInfo *pci_ss_list_1113_9211[] = { #define pci_ss_list_1119_0261 NULL #define pci_ss_list_1119_02ff NULL #define pci_ss_list_1119_0300 NULL +#define pci_ss_list_1119_0301 NULL #define pci_ss_list_111a_0000 NULL #define pci_ss_list_111a_0002 NULL #ifdef VENDOR_INCLUDE_NONVIDEO @@ -52757,11 +56384,17 @@ static const pciSubsystemInfo *pci_ss_list_1127_0400[] = { #define pci_ss_list_112f_0000 NULL #define pci_ss_list_112f_0001 NULL #define pci_ss_list_112f_0008 NULL -#define pci_ss_list_1131_1561 NULL -#define pci_ss_list_1131_1562 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_1131_1561[] = { + &pci_ss_info_1131_1561_1775_c200, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_1131_1562[] = { + &pci_ss_info_1131_1562_1775_c200, + NULL +}; #define pci_ss_list_1131_3400 NULL #define pci_ss_list_1131_5400 NULL -#ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1131_5402[] = { &pci_ss_info_1131_5402_1244_0f00, NULL @@ -52790,6 +56423,7 @@ static const pciSubsystemInfo *pci_ss_list_1131_7133[] = { &pci_ss_info_1131_7133_1043_4843, &pci_ss_info_1131_7133_1043_4845, &pci_ss_info_1131_7133_1043_4862, + &pci_ss_info_1131_7133_1131_0000, &pci_ss_info_1131_7133_1131_2001, &pci_ss_info_1131_7133_1131_2018, &pci_ss_info_1131_7133_1131_4ee9, @@ -52801,13 +56435,16 @@ static const pciSubsystemInfo *pci_ss_list_1131_7133[] = { &pci_ss_info_1131_7133_1435_7330, &pci_ss_info_1131_7133_1435_7350, &pci_ss_info_1131_7133_1461_1044, + &pci_ss_info_1131_7133_1461_a14b, &pci_ss_info_1131_7133_1461_f31f, &pci_ss_info_1131_7133_1462_6231, &pci_ss_info_1131_7133_1489_0214, &pci_ss_info_1131_7133_14c0_1212, &pci_ss_info_1131_7133_153b_1160, &pci_ss_info_1131_7133_153b_1162, + &pci_ss_info_1131_7133_17de_7350, &pci_ss_info_1131_7133_185b_c100, + &pci_ss_info_1131_7133_185b_c900, &pci_ss_info_1131_7133_5168_0306, &pci_ss_info_1131_7133_5168_0319, &pci_ss_info_1131_7133_5168_0502, @@ -52872,10 +56509,14 @@ static const pciSubsystemInfo *pci_ss_list_1131_7146[] = { &pci_ss_info_1131_7146_13c2_100c, &pci_ss_info_1131_7146_13c2_100f, &pci_ss_info_1131_7146_13c2_1011, + &pci_ss_info_1131_7146_13c2_1012, &pci_ss_info_1131_7146_13c2_1013, &pci_ss_info_1131_7146_13c2_1016, + &pci_ss_info_1131_7146_13c2_1018, + &pci_ss_info_1131_7146_13c2_1019, &pci_ss_info_1131_7146_13c2_1102, &pci_ss_info_1131_7146_153b_1156, + &pci_ss_info_1131_7146_1894_0020, NULL }; static const pciSubsystemInfo *pci_ss_list_1131_9730[] = { @@ -52974,6 +56615,7 @@ static const pciSubsystemInfo *pci_ss_list_1133_e028[] = { }; #define pci_ss_list_1133_e02a NULL #define pci_ss_list_1133_e02c NULL +#define pci_ss_list_1133_e032 NULL #endif #define pci_ss_list_1134_0001 NULL #define pci_ss_list_1134_0002 NULL @@ -53098,6 +56740,7 @@ static const pciSubsystemInfo *pci_ss_list_1148_9e00[] = { #define pci_ss_list_114f_000d NULL #define pci_ss_list_114f_0011 NULL #define pci_ss_list_114f_0012 NULL +#define pci_ss_list_114f_0013 NULL #define pci_ss_list_114f_0014 NULL #define pci_ss_list_114f_0015 NULL #define pci_ss_list_114f_0016 NULL @@ -53247,6 +56890,7 @@ static const pciSubsystemInfo *pci_ss_list_1166_0203[] = { #define pci_ss_list_1166_0205 NULL #define pci_ss_list_1166_0211 NULL static const pciSubsystemInfo *pci_ss_list_1166_0212[] = { + &pci_ss_info_1166_0212_1028_810b, &pci_ss_info_1166_0212_4c53_1080, NULL }; @@ -53280,6 +56924,8 @@ static const pciSubsystemInfo *pci_ss_list_1166_0230[] = { NULL }; #define pci_ss_list_1166_0234 NULL +#define pci_ss_list_1166_0235 NULL +#define pci_ss_list_1166_0238 NULL #define pci_ss_list_1166_0240 NULL #define pci_ss_list_1166_0241 NULL #define pci_ss_list_1166_0242 NULL @@ -53333,11 +56979,14 @@ static const pciSubsystemInfo *pci_ss_list_1180_0475[] = { }; static const pciSubsystemInfo *pci_ss_list_1180_0476[] = { &pci_ss_info_1180_0476_1014_0185, + &pci_ss_info_1180_0476_1028_014f, &pci_ss_info_1180_0476_1028_0188, &pci_ss_info_1180_0476_1043_1967, &pci_ss_info_1180_0476_1043_1987, &pci_ss_info_1180_0476_104d_80df, &pci_ss_info_1180_0476_104d_80e7, + &pci_ss_info_1180_0476_104d_814e, + &pci_ss_info_1180_0476_10f7_8338, &pci_ss_info_1180_0476_144d_c00c, &pci_ss_info_1180_0476_14ef_0220, &pci_ss_info_1180_0476_17aa_201c, @@ -53360,6 +57009,7 @@ static const pciSubsystemInfo *pci_ss_list_1180_0551[] = { }; static const pciSubsystemInfo *pci_ss_list_1180_0552[] = { &pci_ss_info_1180_0552_1014_0511, + &pci_ss_info_1180_0552_1028_014f, &pci_ss_info_1180_0552_1028_0188, &pci_ss_info_1180_0552_144d_c00c, &pci_ss_info_1180_0552_17aa_201e, @@ -53380,10 +57030,12 @@ static const pciSubsystemInfo *pci_ss_list_1180_0822[] = { &pci_ss_info_1180_0822_1028_0188, &pci_ss_info_1180_0822_1028_01a2, &pci_ss_info_1180_0822_1043_1967, + &pci_ss_info_1180_0822_10f7_8338, &pci_ss_info_1180_0822_144d_c018, &pci_ss_info_1180_0822_17aa_201d, NULL }; +#define pci_ss_list_1180_0832 NULL #define pci_ss_list_1180_0841 NULL static const pciSubsystemInfo *pci_ss_list_1180_0852[] = { &pci_ss_info_1180_0852_1043_1967, @@ -53479,6 +57131,8 @@ static const pciSubsystemInfo *pci_ss_list_1186_4c00[] = { #define pci_ss_list_119e_0003 NULL #define pci_ss_list_11a9_4240 NULL #define pci_ss_list_11ab_0146 NULL +#define pci_ss_list_11ab_0f53 NULL +#define pci_ss_list_11ab_11ab NULL #define pci_ss_list_11ab_138f NULL #define pci_ss_list_11ab_1fa6 NULL #define pci_ss_list_11ab_1fa7 NULL @@ -53487,6 +57141,7 @@ static const pciSubsystemInfo *pci_ss_list_11ab_1faa[] = { &pci_ss_info_11ab_1faa_1385_4e00, NULL }; +#define pci_ss_list_11ab_2a01 NULL static const pciSubsystemInfo *pci_ss_list_11ab_4320[] = { &pci_ss_info_11ab_4320_1019_0f38, &pci_ss_info_11ab_4320_1019_8001, @@ -53515,7 +57170,10 @@ static const pciSubsystemInfo *pci_ss_list_11ab_4320[] = { #define pci_ss_list_11ab_4344 NULL #define pci_ss_list_11ab_4345 NULL #define pci_ss_list_11ab_4346 NULL -#define pci_ss_list_11ab_4347 NULL +static const pciSubsystemInfo *pci_ss_list_11ab_4347[] = { + &pci_ss_info_11ab_4347_4c53_10d0, + NULL +}; static const pciSubsystemInfo *pci_ss_list_11ab_4350[] = { &pci_ss_info_11ab_4350_1179_0001, &pci_ss_info_11ab_4350_11ab_3521, @@ -53618,6 +57276,7 @@ static const pciSubsystemInfo *pci_ss_list_11ab_4362[] = { NULL }; #define pci_ss_list_11ab_4363 NULL +#define pci_ss_list_11ab_4364 NULL #define pci_ss_list_11ab_4611 NULL #define pci_ss_list_11ab_4620 NULL #define pci_ss_list_11ab_4801 NULL @@ -53628,8 +57287,15 @@ static const pciSubsystemInfo *pci_ss_list_11ab_4362[] = { #define pci_ss_list_11ab_5081 NULL #define pci_ss_list_11ab_6041 NULL #define pci_ss_list_11ab_6081 NULL +#define pci_ss_list_11ab_6101 NULL +#define pci_ss_list_11ab_6141 NULL +#define pci_ss_list_11ab_6145 NULL +#define pci_ss_list_11ab_6450 NULL #define pci_ss_list_11ab_6460 NULL -#define pci_ss_list_11ab_6480 NULL +static const pciSubsystemInfo *pci_ss_list_11ab_6480[] = { + &pci_ss_info_11ab_6480_1775_c200, + NULL +}; #define pci_ss_list_11ab_6485 NULL #define pci_ss_list_11ab_f003 NULL #endif @@ -53657,7 +57323,21 @@ static const pciSubsystemInfo *pci_ss_list_11ad_c115[] = { #define pci_ss_list_11b9_c0ed NULL #define pci_ss_list_11bc_0001 NULL #define pci_ss_list_11bd_002e NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_11bd_0040[] = { + &pci_ss_info_11bd_0040_11bd_0044, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_11bd_0041[] = { + &pci_ss_info_11bd_0041_11bd_0044, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_11bd_0042[] = { + &pci_ss_info_11bd_0042_11bd_0044, + NULL +}; #define pci_ss_list_11bd_bede NULL +#endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_11c1_0440[] = { &pci_ss_info_11c1_0440_1033_8015, @@ -53779,6 +57459,8 @@ static const pciSubsystemInfo *pci_ss_list_11c1_0450[] = { #define pci_ss_list_11c1_0480 NULL #define pci_ss_list_11c1_048c NULL #define pci_ss_list_11c1_048f NULL +#define pci_ss_list_11c1_1040 NULL +#define pci_ss_list_11c1_2600 NULL #define pci_ss_list_11c1_5801 NULL #define pci_ss_list_11c1_5802 NULL #define pci_ss_list_11c1_5803 NULL @@ -53823,11 +57505,20 @@ static const pciSubsystemInfo *pci_ss_list_11cb_2000[] = { #define pci_ss_list_11cb_8000 NULL #endif #define pci_ss_list_11d1_01f7 NULL +#define pci_ss_list_11d4_0078 NULL #define pci_ss_list_11d4_1535 NULL #define pci_ss_list_11d4_1805 NULL #define pci_ss_list_11d4_1889 NULL -#define pci_ss_list_11d4_1986 NULL +#define pci_ss_list_11d4_1981 NULL +#define pci_ss_list_11d4_1983 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_11d4_1986[] = { + &pci_ss_info_11d4_1986_11d4_1986, + NULL +}; +#define pci_ss_list_11d4_198b NULL #define pci_ss_list_11d4_5340 NULL +#endif #define pci_ss_list_11d5_0115 NULL #define pci_ss_list_11d5_0117 NULL #ifdef VENDOR_INCLUDE_NONVIDEO @@ -53957,6 +57648,7 @@ static const pciSubsystemInfo *pci_ss_list_1217_7110[] = { static const pciSubsystemInfo *pci_ss_list_1217_7223[] = { &pci_ss_info_1217_7223_103c_088c, &pci_ss_info_1217_7223_103c_0890, + &pci_ss_info_1217_7223_10cf_11c4, NULL }; #define pci_ss_list_1217_7233 NULL @@ -54161,6 +57853,7 @@ static const pciSubsystemInfo *pci_ss_list_125d_2898[] = { &pci_ss_info_125d_2898_125d_0428, &pci_ss_info_125d_2898_125d_0429, &pci_ss_info_125d_2898_147a_c001, + &pci_ss_info_125d_2898_148d_1030, &pci_ss_info_125d_2898_14fe_0428, &pci_ss_info_125d_2898_14fe_0429, NULL @@ -54178,6 +57871,7 @@ static const pciSubsystemInfo *pci_ss_list_1260_3873[] = { &pci_ss_info_1260_3873_1668_0414, &pci_ss_info_1260_3873_16a5_1601, &pci_ss_info_1260_3873_1737_3874, + &pci_ss_info_1260_3873_8086_2510, &pci_ss_info_1260_3873_8086_2513, NULL }; @@ -54190,6 +57884,7 @@ static const pciSubsystemInfo *pci_ss_list_1260_3890[] = { &pci_ss_info_1260_3890_10b8_2835, &pci_ss_info_1260_3890_10b8_a835, &pci_ss_info_1260_3890_1113_4203, + &pci_ss_info_1260_3890_1113_8201, &pci_ss_info_1260_3890_1113_ee03, &pci_ss_info_1260_3890_1113_ee08, &pci_ss_info_1260_3890_1186_3202, @@ -54467,6 +58162,7 @@ static const pciSubsystemInfo *pci_ss_list_127a_8234[] = { #define pci_ss_list_1282_9102 NULL #define pci_ss_list_1282_9132 NULL #define pci_ss_list_1283_673a NULL +#define pci_ss_list_1283_8152 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1283_8211[] = { &pci_ss_info_1283_8211_1043_8138, @@ -54491,10 +58187,15 @@ static const pciSubsystemInfo *pci_ss_list_1283_8212[] = { #define pci_ss_list_128e_000a NULL #define pci_ss_list_128e_000b NULL #define pci_ss_list_128e_000c NULL +#define pci_ss_list_1292_fc02 NULL #define pci_ss_list_129a_0615 NULL #define pci_ss_list_12a3_8105 NULL +#define pci_ss_list_12ab_0000 NULL #define pci_ss_list_12ab_0002 NULL +#define pci_ss_list_12ab_2300 NULL #define pci_ss_list_12ab_3000 NULL +#define pci_ss_list_12ab_fff3 NULL +#define pci_ss_list_12ab_ffff NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_12ae_0001[] = { &pci_ss_info_12ae_0001_1014_0104, @@ -54610,6 +58311,7 @@ static const pciSubsystemInfo *pci_ss_list_12d2_0018[] = { #define pci_ss_list_12d4_0200 NULL #define pci_ss_list_12d5_0003 NULL #define pci_ss_list_12d5_1000 NULL +#define pci_ss_list_12d8_01a7 NULL #define pci_ss_list_12d8_8150 NULL #define pci_ss_list_12d9_0002 NULL #define pci_ss_list_12d9_0004 NULL @@ -54897,6 +58599,8 @@ static const pciSubsystemInfo *pci_ss_list_1371_434e[] = { #define pci_ss_list_1374_0038 NULL #define pci_ss_list_1374_0039 NULL #define pci_ss_list_1374_003a NULL +#define pci_ss_list_1374_003b NULL +#define pci_ss_list_1374_003c NULL #define pci_ss_list_137a_0001 NULL #define pci_ss_list_1382_0001 NULL #define pci_ss_list_1382_2008 NULL @@ -54910,6 +58614,7 @@ static const pciSubsystemInfo *pci_ss_list_1371_434e[] = { #define pci_ss_list_1382_4248 NULL #define pci_ss_list_1382_4424 NULL #define pci_ss_list_1385_0013 NULL +#define pci_ss_list_1385_006b NULL #define pci_ss_list_1385_311a NULL #define pci_ss_list_1385_4100 NULL #define pci_ss_list_1385_4105 NULL @@ -54941,6 +58646,7 @@ static const pciSubsystemInfo *pci_ss_list_1371_434e[] = { #define pci_ss_list_1393_1040 NULL #define pci_ss_list_1393_1141 NULL #define pci_ss_list_1393_1680 NULL +#define pci_ss_list_1393_1681 NULL #define pci_ss_list_1393_2040 NULL #define pci_ss_list_1393_2180 NULL #define pci_ss_list_1393_3200 NULL @@ -54954,6 +58660,7 @@ static const pciSubsystemInfo *pci_ss_list_1394_0001[] = { static const pciSubsystemInfo *pci_ss_list_1397_08b4[] = { &pci_ss_info_1397_08b4_1397_b520, &pci_ss_info_1397_08b4_1397_b540, + &pci_ss_info_1397_08b4_1397_b556, NULL }; #define pci_ss_list_1397_16b8 NULL @@ -54964,6 +58671,9 @@ static const pciSubsystemInfo *pci_ss_list_1397_2bd0[] = { &pci_ss_info_1397_2bd0_e4bf_1000, NULL }; +#define pci_ss_list_1397_30b1 NULL +#define pci_ss_list_1397_b700 NULL +#define pci_ss_list_1397_f001 NULL #endif #define pci_ss_list_139a_0001 NULL #define pci_ss_list_139a_0003 NULL @@ -54979,6 +58689,7 @@ static const pciSubsystemInfo *pci_ss_list_1397_2bd0[] = { #define pci_ss_list_13a3_001d NULL #define pci_ss_list_13a3_0020 NULL #define pci_ss_list_13a3_0026 NULL +#define pci_ss_list_13a3_002e NULL #define pci_ss_list_13a8_0152 NULL #define pci_ss_list_13a8_0154 NULL #define pci_ss_list_13a8_0158 NULL @@ -54994,6 +58705,7 @@ static const pciSubsystemInfo *pci_ss_list_13c1_1001[] = { }; #define pci_ss_list_13c1_1002 NULL #define pci_ss_list_13c1_1003 NULL +#define pci_ss_list_13c1_1004 NULL #endif #define pci_ss_list_13c2_000e NULL #define pci_ss_list_13c6_0520 NULL @@ -55005,6 +58717,7 @@ static const pciSubsystemInfo *pci_ss_list_13c1_1001[] = { #define pci_ss_list_13d1_ab03 NULL #define pci_ss_list_13d1_ab06 NULL #define pci_ss_list_13d1_ab08 NULL +#define pci_ss_list_13d3_3219 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_13df_0001[] = { &pci_ss_info_13df_0001_13df_0001, @@ -55036,6 +58749,7 @@ static const pciSubsystemInfo *pci_ss_list_13f6_0111[] = { NULL }; #define pci_ss_list_13f6_0211 NULL +#define pci_ss_list_13f6_9880 NULL #endif #define pci_ss_list_13fe_1240 NULL #ifdef VENDOR_INCLUDE_NONVIDEO @@ -55149,6 +58863,7 @@ static const pciSubsystemInfo *pci_ss_list_1415_9511[] = { #define pci_ss_list_1420_8002 NULL #define pci_ss_list_1420_8003 NULL #define pci_ss_list_1425_000b NULL +#define pci_ss_list_1425_000c NULL #define pci_ss_list_142e_4020 NULL #define pci_ss_list_142e_4337 NULL #define pci_ss_list_1432_9130 NULL @@ -55172,14 +58887,20 @@ static const pciSubsystemInfo *pci_ss_list_1415_9511[] = { #define pci_ss_list_144a_9114 NULL #define pci_ss_list_144d_c00c NULL #define pci_ss_list_1458_0c11 NULL +#define pci_ss_list_1458_9001 NULL #define pci_ss_list_1458_e911 NULL #define pci_ss_list_145f_0001 NULL +#define pci_ss_list_1461_a3ce NULL +#define pci_ss_list_1461_a3cf NULL +#define pci_ss_list_1461_a836 NULL #define pci_ss_list_1461_f436 NULL #define pci_ss_list_1462_5501 NULL #define pci_ss_list_1462_6819 NULL #define pci_ss_list_1462_6825 NULL #define pci_ss_list_1462_6834 NULL #define pci_ss_list_1462_7125 NULL +#define pci_ss_list_1462_7235 NULL +#define pci_ss_list_1462_7242 NULL #define pci_ss_list_1462_8725 NULL #define pci_ss_list_1462_9000 NULL #define pci_ss_list_1462_9110 NULL @@ -55188,6 +58909,7 @@ static const pciSubsystemInfo *pci_ss_list_1415_9511[] = { #define pci_ss_list_1462_9510 NULL #define pci_ss_list_1462_9511 NULL #define pci_ss_list_1462_9591 NULL +#define pci_ss_list_1462_b834 NULL #define pci_ss_list_146c_1430 NULL #define pci_ss_list_148d_1003 NULL #define pci_ss_list_1497_1497 NULL @@ -55267,10 +58989,13 @@ static const pciSubsystemInfo *pci_ss_list_14c1_8043[] = { #define pci_ss_list_14e4_0816 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_14e4_1600[] = { + &pci_ss_info_14e4_1600_103c_3015, &pci_ss_info_14e4_1600_107b_5048, NULL }; #define pci_ss_list_14e4_1601 NULL +#define pci_ss_list_14e4_1639 NULL +#define pci_ss_list_14e4_163a NULL static const pciSubsystemInfo *pci_ss_list_14e4_1644[] = { &pci_ss_info_14e4_1644_1014_0277, &pci_ss_info_14e4_1644_1028_00d1, @@ -55378,6 +59103,11 @@ static const pciSubsystemInfo *pci_ss_list_14e4_1659[] = { &pci_ss_info_14e4_1659_1734_1061, NULL }; +static const pciSubsystemInfo *pci_ss_list_14e4_165a[] = { + &pci_ss_info_14e4_165a_103c_7051, + &pci_ss_info_14e4_165a_103c_7052, + NULL +}; static const pciSubsystemInfo *pci_ss_list_14e4_165d[] = { &pci_ss_info_14e4_165d_1028_865d, NULL @@ -55386,6 +59116,7 @@ static const pciSubsystemInfo *pci_ss_list_14e4_165e[] = { &pci_ss_info_14e4_165e_103c_088c, &pci_ss_info_14e4_165e_103c_0890, &pci_ss_info_14e4_165e_103c_099c, + &pci_ss_info_14e4_165e_10cf_1279, NULL }; static const pciSubsystemInfo *pci_ss_list_14e4_1668[] = { @@ -55398,6 +59129,7 @@ static const pciSubsystemInfo *pci_ss_list_14e4_1668[] = { #define pci_ss_list_14e4_166e NULL #define pci_ss_list_14e4_1672 NULL #define pci_ss_list_14e4_1673 NULL +#define pci_ss_list_14e4_1674 NULL static const pciSubsystemInfo *pci_ss_list_14e4_1677[] = { &pci_ss_info_14e4_1677_1028_0179, &pci_ss_info_14e4_1677_1028_0182, @@ -55421,6 +59153,7 @@ static const pciSubsystemInfo *pci_ss_list_14e4_167d[] = { NULL }; #define pci_ss_list_14e4_167e NULL +#define pci_ss_list_14e4_167f NULL #define pci_ss_list_14e4_1693 NULL static const pciSubsystemInfo *pci_ss_list_14e4_1696[] = { &pci_ss_info_14e4_1696_103c_12bc, @@ -55431,6 +59164,7 @@ static const pciSubsystemInfo *pci_ss_list_14e4_1696[] = { #define pci_ss_list_14e4_169b NULL static const pciSubsystemInfo *pci_ss_list_14e4_169c[] = { &pci_ss_info_14e4_169c_103c_308b, + &pci_ss_info_14e4_169c_103c_30a1, NULL }; #define pci_ss_list_14e4_169d NULL @@ -55462,6 +59196,7 @@ static const pciSubsystemInfo *pci_ss_list_14e4_16aa[] = { }; static const pciSubsystemInfo *pci_ss_list_14e4_16ac[] = { &pci_ss_info_14e4_16ac_103c_1706, + &pci_ss_info_14e4_16ac_103c_7038, &pci_ss_info_14e4_16ac_103c_703b, &pci_ss_info_14e4_16ac_103c_703d, NULL @@ -55488,6 +59223,7 @@ static const pciSubsystemInfo *pci_ss_list_14e4_16c7[] = { static const pciSubsystemInfo *pci_ss_list_14e4_170c[] = { &pci_ss_info_14e4_170c_1028_0188, &pci_ss_info_14e4_170c_1028_0196, + &pci_ss_info_14e4_170c_1028_01af, &pci_ss_info_14e4_170c_103c_099c, NULL }; @@ -55496,11 +59232,14 @@ static const pciSubsystemInfo *pci_ss_list_14e4_170d[] = { NULL }; #define pci_ss_list_14e4_170e NULL +#define pci_ss_list_14e4_1712 NULL +#define pci_ss_list_14e4_1713 NULL #define pci_ss_list_14e4_3352 NULL #define pci_ss_list_14e4_3360 NULL #define pci_ss_list_14e4_4210 NULL #define pci_ss_list_14e4_4211 NULL #define pci_ss_list_14e4_4212 NULL +#define pci_ss_list_14e4_4220 NULL static const pciSubsystemInfo *pci_ss_list_14e4_4301[] = { &pci_ss_info_14e4_4301_1028_0407, &pci_ss_info_14e4_4301_1043_0120, @@ -55522,6 +59261,7 @@ static const pciSubsystemInfo *pci_ss_list_14e4_4318[] = { &pci_ss_info_14e4_4318_14e4_0449, &pci_ss_info_14e4_4318_14e4_4318, &pci_ss_info_14e4_4318_16ec_0119, + &pci_ss_info_14e4_4318_1737_0042, &pci_ss_info_14e4_4318_1737_0048, NULL }; @@ -55536,6 +59276,7 @@ static const pciSubsystemInfo *pci_ss_list_14e4_4320[] = { &pci_ss_info_14e4_4320_106b_004e, &pci_ss_info_14e4_4320_1154_0330, &pci_ss_info_14e4_4320_144f_7050, + &pci_ss_info_14e4_4320_144f_7051, &pci_ss_info_14e4_4320_14e4_4320, &pci_ss_info_14e4_4320_1737_4320, &pci_ss_info_14e4_4320_1799_7001, @@ -55558,6 +59299,7 @@ static const pciSubsystemInfo *pci_ss_list_14e4_4325[] = { }; #define pci_ss_list_14e4_4326 NULL #define pci_ss_list_14e4_4329 NULL +#define pci_ss_list_14e4_4344 NULL static const pciSubsystemInfo *pci_ss_list_14e4_4401[] = { &pci_ss_info_14e4_4401_103c_08b0, &pci_ss_info_14e4_4401_1043_80a8, @@ -55603,6 +59345,8 @@ static const pciSubsystemInfo *pci_ss_list_14e4_4401[] = { #define pci_ss_list_14e4_5690 NULL #define pci_ss_list_14e4_5691 NULL #define pci_ss_list_14e4_5692 NULL +#define pci_ss_list_14e4_5695 NULL +#define pci_ss_list_14e4_5698 NULL #define pci_ss_list_14e4_5820 NULL #define pci_ss_list_14e4_5821 NULL #define pci_ss_list_14e4_5822 NULL @@ -55677,6 +59421,7 @@ static const pciSubsystemInfo *pci_ss_list_14f1_1066[] = { NULL }; #define pci_ss_list_14f1_1085 NULL +#define pci_ss_list_14f1_10b6 NULL #define pci_ss_list_14f1_1433 NULL #define pci_ss_list_14f1_1434 NULL #define pci_ss_list_14f1_1435 NULL @@ -55773,7 +59518,10 @@ static const pciSubsystemInfo *pci_ss_list_14f1_2443[] = { #define pci_ss_list_14f1_2464 NULL #define pci_ss_list_14f1_2465 NULL #define pci_ss_list_14f1_2466 NULL -#define pci_ss_list_14f1_2bfa NULL +static const pciSubsystemInfo *pci_ss_list_14f1_2bfa[] = { + &pci_ss_info_14f1_2bfa_1025_0009, + NULL +}; static const pciSubsystemInfo *pci_ss_list_14f1_2f00[] = { &pci_ss_info_14f1_2f00_13e0_8d84, &pci_ss_info_14f1_2f00_13e0_8d85, @@ -55783,6 +59531,9 @@ static const pciSubsystemInfo *pci_ss_list_14f1_2f00[] = { #define pci_ss_list_14f1_2f02 NULL #define pci_ss_list_14f1_2f11 NULL #define pci_ss_list_14f1_2f20 NULL +#define pci_ss_list_14f1_2f30 NULL +#define pci_ss_list_14f1_5045 NULL +#define pci_ss_list_14f1_5047 NULL #define pci_ss_list_14f1_8234 NULL static const pciSubsystemInfo *pci_ss_list_14f1_8800[] = { &pci_ss_info_14f1_8800_0070_2801, @@ -55836,6 +59587,7 @@ static const pciSubsystemInfo *pci_ss_list_14f1_8802[] = { &pci_ss_info_14f1_8802_0070_9002, &pci_ss_info_14f1_8802_1043_4823, &pci_ss_info_14f1_8802_107d_663c, + &pci_ss_info_14f1_8802_107d_665f, &pci_ss_info_14f1_8802_14f1_0187, &pci_ss_info_14f1_8802_17de_08a1, &pci_ss_info_14f1_8802_17de_08a6, @@ -55917,6 +59669,14 @@ static const pciSubsystemInfo *pci_ss_list_1522_0100[] = { &pci_ss_info_1522_0100_1522_2500, &pci_ss_info_1522_0100_1522_2600, &pci_ss_info_1522_0100_1522_2700, + &pci_ss_info_1522_0100_1522_3000, + &pci_ss_info_1522_0100_1522_3100, + &pci_ss_info_1522_0100_1522_3200, + &pci_ss_info_1522_0100_1522_3300, + &pci_ss_info_1522_0100_1522_3400, + &pci_ss_info_1522_0100_1522_3500, + &pci_ss_info_1522_0100_1522_3c00, + &pci_ss_info_1522_0100_1522_3d00, NULL }; #endif @@ -55928,6 +59688,7 @@ static const pciSubsystemInfo *pci_ss_list_1524_0510[] = { #define pci_ss_list_1524_0520 NULL #define pci_ss_list_1524_0530 NULL #define pci_ss_list_1524_0550 NULL +#define pci_ss_list_1524_0551 NULL #define pci_ss_list_1524_0610 NULL #define pci_ss_list_1524_1211 NULL #define pci_ss_list_1524_1225 NULL @@ -55975,6 +59736,9 @@ static const pciSubsystemInfo *pci_ss_list_1524_1411[] = { #define pci_ss_list_1571_a206 NULL #define pci_ss_list_1578_5615 NULL #define pci_ss_list_157c_8001 NULL +#define pci_ss_list_1590_0001 NULL +#define pci_ss_list_1590_0002 NULL +#define pci_ss_list_1590_a01d NULL #define pci_ss_list_1592_0781 NULL #define pci_ss_list_1592_0782 NULL #define pci_ss_list_1592_0783 NULL @@ -55987,6 +59751,7 @@ static const pciSubsystemInfo *pci_ss_list_1524_1411[] = { #define pci_ss_list_15ad_0405 NULL #define pci_ss_list_15ad_0710 NULL #define pci_ss_list_15ad_0720 NULL +#define pci_ss_list_15b3_0191 NULL #define pci_ss_list_15b3_5274 NULL #define pci_ss_list_15b3_5a44 NULL #define pci_ss_list_15b3_5a45 NULL @@ -55996,6 +59761,14 @@ static const pciSubsystemInfo *pci_ss_list_1524_1411[] = { #define pci_ss_list_15b3_6278 NULL #define pci_ss_list_15b3_6279 NULL #define pci_ss_list_15b3_6282 NULL +#define pci_ss_list_15b3_6340 NULL +#define pci_ss_list_15b3_634a NULL +#define pci_ss_list_15b3_6354 NULL +#define pci_ss_list_15b3_6368 NULL +#define pci_ss_list_15b8_1003 NULL +#define pci_ss_list_15b8_1005 NULL +#define pci_ss_list_15b8_100a NULL +#define pci_ss_list_15b8_3001 NULL #define pci_ss_list_15bc_1100 NULL #define pci_ss_list_15bc_2922 NULL #define pci_ss_list_15bc_2928 NULL @@ -56003,6 +59776,7 @@ static const pciSubsystemInfo *pci_ss_list_1524_1411[] = { #define pci_ss_list_15c5_8010 NULL #define pci_ss_list_15c7_0349 NULL #define pci_ss_list_15dc_0001 NULL +#define pci_ss_list_15e2_0500 NULL #define pci_ss_list_15e8_0130 NULL #define pci_ss_list_15e9_1841 NULL #define pci_ss_list_15ec_3101 NULL @@ -56016,6 +59790,8 @@ static const pciSubsystemInfo *pci_ss_list_1524_1411[] = { #define pci_ss_list_1619_2610 NULL #define pci_ss_list_1626_8410 NULL #define pci_ss_list_1629_1003 NULL +#define pci_ss_list_1629_1006 NULL +#define pci_ss_list_1629_1007 NULL #define pci_ss_list_1629_2002 NULL #define pci_ss_list_1637_3874 NULL #define pci_ss_list_1638_1100 NULL @@ -56070,44 +59846,96 @@ static const pciSubsystemInfo *pci_ss_list_168c_0013[] = { &pci_ss_info_168c_0013_168c_2042, &pci_ss_info_168c_0013_168c_2051, &pci_ss_info_168c_0013_16ab_7302, + &pci_ss_info_168c_0013_17cf_0042, + &pci_ss_info_168c_0013_185f_1012, &pci_ss_info_168c_0013_185f_2012, NULL }; static const pciSubsystemInfo *pci_ss_list_168c_001a[] = { + &pci_ss_info_168c_001a_1052_168c, &pci_ss_info_168c_001a_1113_ee20, &pci_ss_info_168c_001a_1113_ee24, &pci_ss_info_168c_001a_1186_3a15, &pci_ss_info_168c_001a_1186_3a16, &pci_ss_info_168c_001a_1186_3a23, &pci_ss_info_168c_001a_1186_3a24, + &pci_ss_info_168c_001a_1186_3b08, &pci_ss_info_168c_001a_168c_001a, &pci_ss_info_168c_001a_168c_1052, + &pci_ss_info_168c_001a_168c_2052, NULL }; static const pciSubsystemInfo *pci_ss_list_168c_001b[] = { &pci_ss_info_168c_001b_1186_3a19, &pci_ss_info_168c_001b_1186_3a22, + &pci_ss_info_168c_001b_1458_e901, + &pci_ss_info_168c_001b_168c_001b, &pci_ss_info_168c_001b_168c_2062, &pci_ss_info_168c_001b_168c_2063, + &pci_ss_info_168c_001b_185f_1600, + &pci_ss_info_168c_001b_a727_6804, NULL }; +#define pci_ss_list_168c_001c NULL #define pci_ss_list_168c_0020 NULL +#define pci_ss_list_168c_0023 NULL +#define pci_ss_list_168c_0024 NULL static const pciSubsystemInfo *pci_ss_list_168c_1014[] = { &pci_ss_info_168c_1014_1014_058a, NULL }; +#define pci_ss_list_168c_3b08 NULL #endif #define pci_ss_list_169c_0044 NULL +#define pci_ss_list_169d_3306 NULL #define pci_ss_list_16ab_1100 NULL #define pci_ss_list_16ab_1101 NULL #define pci_ss_list_16ab_1102 NULL #define pci_ss_list_16ab_8501 NULL +#define pci_ss_list_16ae_0001 NULL +#define pci_ss_list_16ae_000a NULL #define pci_ss_list_16ae_1141 NULL +#define pci_ss_list_16ae_1841 NULL #define pci_ss_list_16c6_8695 NULL #define pci_ss_list_16ca_0001 NULL +#define pci_ss_list_16d5_0504 NULL +#define pci_ss_list_16d5_0520 NULL +#define pci_ss_list_16d5_0521 NULL +#define pci_ss_list_16d5_1020 NULL +#define pci_ss_list_16d5_1065 NULL +#define pci_ss_list_16d5_2004 NULL +#define pci_ss_list_16d5_2020 NULL +#define pci_ss_list_16d5_2065 NULL +#define pci_ss_list_16d5_3020 NULL +#define pci_ss_list_16d5_3065 NULL +#define pci_ss_list_16d5_4243 NULL +#define pci_ss_list_16d5_4248 NULL +#define pci_ss_list_16d5_424b NULL +#define pci_ss_list_16d5_4253 NULL +#define pci_ss_list_16d5_4312 NULL +#define pci_ss_list_16d5_4313 NULL +#define pci_ss_list_16d5_4322 NULL +#define pci_ss_list_16d5_4323 NULL +#define pci_ss_list_16d5_4350 NULL +#define pci_ss_list_16d5_4353 NULL +#define pci_ss_list_16d5_4357 NULL +#define pci_ss_list_16d5_4457 NULL +#define pci_ss_list_16d5_464d NULL +#define pci_ss_list_16d5_4850 NULL +#define pci_ss_list_16d5_4a42 NULL +#define pci_ss_list_16d5_4a50 NULL +#define pci_ss_list_16d5_4a56 NULL +#define pci_ss_list_16d5_4b47 NULL +#define pci_ss_list_16d5_4c40 NULL +#define pci_ss_list_16d5_4c60 NULL +#define pci_ss_list_16d5_4d4d NULL #define pci_ss_list_16d5_4d4e NULL +#define pci_ss_list_16d5_524d NULL +#define pci_ss_list_16d5_5335 NULL +#define pci_ss_list_16d5_5456 NULL #define pci_ss_list_16e3_1e0f NULL #define pci_ss_list_16e5_6000 NULL +#define pci_ss_list_16e5_6300 NULL #define pci_ss_list_16ec_00ff NULL #define pci_ss_list_16ec_0116 NULL #define pci_ss_list_16ec_2f00 NULL @@ -56118,8 +59946,10 @@ static const pciSubsystemInfo *pci_ss_list_168c_1014[] = { #define pci_ss_list_1725_7174 NULL #define pci_ss_list_172a_13c8 NULL #define pci_ss_list_1734_1078 NULL +#define pci_ss_list_1734_1085 NULL #define pci_ss_list_1737_0013 NULL #define pci_ss_list_1737_0015 NULL +#define pci_ss_list_1737_0029 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1737_1032[] = { &pci_ss_info_1737_1032_1737_0015, @@ -56188,11 +60018,17 @@ static const pciSubsystemInfo *pci_ss_list_17d5_5832[] = { NULL }; #endif +#define pci_ss_list_17db_0101 NULL #define pci_ss_list_17e4_0001 NULL #define pci_ss_list_17e4_0002 NULL #define pci_ss_list_17e6_0010 NULL #define pci_ss_list_17e6_0011 NULL #define pci_ss_list_17e6_0021 NULL +#define pci_ss_list_17f3_6020 NULL +#define pci_ss_list_17f3_6030 NULL +#define pci_ss_list_17f3_6040 NULL +#define pci_ss_list_17f3_6060 NULL +#define pci_ss_list_17f3_6061 NULL #define pci_ss_list_17fe_2120 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_17fe_2220[] = { @@ -56224,6 +60060,7 @@ static const pciSubsystemInfo *pci_ss_list_1814_0201[] = { &pci_ss_info_1814_0201_1371_0020, &pci_ss_info_1814_0201_1458_e381, &pci_ss_info_1814_0201_1458_e931, + &pci_ss_info_1814_0201_1462_6833, &pci_ss_info_1814_0201_1462_6835, &pci_ss_info_1814_0201_1737_0032, &pci_ss_info_1814_0201_1799_700a, @@ -56234,16 +60071,21 @@ static const pciSubsystemInfo *pci_ss_list_1814_0201[] = { static const pciSubsystemInfo *pci_ss_list_1814_0301[] = { &pci_ss_info_1814_0301_1186_3c08, &pci_ss_info_1814_0301_1186_3c09, + &pci_ss_info_1814_0301_13d1_abe3, + &pci_ss_info_1814_0301_1458_e934, &pci_ss_info_1814_0301_1737_0055, NULL }; static const pciSubsystemInfo *pci_ss_list_1814_0302[] = { &pci_ss_info_1814_0302_1186_3c08, &pci_ss_info_1814_0302_1186_3c09, + &pci_ss_info_1814_0302_1462_b834, NULL }; #define pci_ss_list_1814_0401 NULL +#define pci_ss_list_1814_e932 NULL #endif +#define pci_ss_list_1822_0001 NULL #define pci_ss_list_1822_4e35 NULL #define pci_ss_list_182d_3069 NULL #define pci_ss_list_182d_9790 NULL @@ -56258,6 +60100,10 @@ static const pciSubsystemInfo *pci_ss_list_1814_0302[] = { #define pci_ss_list_1867_5a46 NULL #define pci_ss_list_1867_6278 NULL #define pci_ss_list_1867_6282 NULL +#define pci_ss_list_186c_0614 NULL +#define pci_ss_list_1876_a101 NULL +#define pci_ss_list_1876_a102 NULL +#define pci_ss_list_1876_a103 NULL #define pci_ss_list_187e_3403 NULL #define pci_ss_list_187e_340e NULL #define pci_ss_list_1888_0301 NULL @@ -56271,6 +60117,7 @@ static const pciSubsystemInfo *pci_ss_list_1814_0302[] = { #define pci_ss_list_18b8_b001 NULL #define pci_ss_list_18ca_0020 NULL #define pci_ss_list_18ca_0040 NULL +#define pci_ss_list_18ca_0047 NULL #define pci_ss_list_18d2_3069 NULL #define pci_ss_list_18dd_4c6f NULL #define pci_ss_list_18e6_0001 NULL @@ -56323,15 +60170,33 @@ static const pciSubsystemInfo *pci_ss_list_18ec_c058[] = { #define pci_ss_list_1957_0087 NULL #define pci_ss_list_1966_1975 NULL #define pci_ss_list_1969_1048 NULL +#define pci_ss_list_1969_2048 NULL #define pci_ss_list_196a_0101 NULL #define pci_ss_list_196a_0102 NULL +#define pci_ss_list_196a_0105 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_1971_1011[] = { + &pci_ss_info_1971_1011_1043_0001, + NULL +}; +#endif #define pci_ss_list_197b_2360 NULL -#define pci_ss_list_197b_2361 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_197b_2361[] = { + &pci_ss_info_197b_2361_1462_7235, + NULL +}; #define pci_ss_list_197b_2363 NULL #define pci_ss_list_197b_2365 NULL #define pci_ss_list_197b_2366 NULL +#define pci_ss_list_197b_2368 NULL +#endif +#define pci_ss_list_1982_1600 NULL +#define pci_ss_list_1982_16ff NULL #define pci_ss_list_1989_0001 NULL #define pci_ss_list_1989_8001 NULL +#define pci_ss_list_19a2_0200 NULL +#define pci_ss_list_19a2_0201 NULL #define pci_ss_list_19ac_0001 NULL #define pci_ss_list_19ae_0520 NULL #define pci_ss_list_19e7_1001 NULL @@ -56340,7 +60205,12 @@ static const pciSubsystemInfo *pci_ss_list_18ec_c058[] = { #define pci_ss_list_19e7_1004 NULL #define pci_ss_list_19e7_1005 NULL #define pci_ss_list_1a03_2000 NULL +#define pci_ss_list_1a07_0006 NULL +#define pci_ss_list_1a07_0007 NULL #define pci_ss_list_1a08_0000 NULL +#define pci_ss_list_1a1d_1a17 NULL +#define pci_ss_list_1a73_0001 NULL +#define pci_ss_list_1a8c_1100 NULL #define pci_ss_list_1c1c_0001 NULL #define pci_ss_list_1d44_a400 NULL #define pci_ss_list_1de1_0391 NULL @@ -56357,6 +60227,7 @@ static const pciSubsystemInfo *pci_ss_list_18ec_c058[] = { #define pci_ss_list_3388_0020 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_3388_0021[] = { + &pci_ss_info_3388_0021_1775_c200, &pci_ss_info_3388_0021_1775_ce90, &pci_ss_info_3388_0021_4c53_1050, &pci_ss_info_3388_0021_4c53_1080, @@ -56460,6 +60331,10 @@ static const pciSubsystemInfo *pci_ss_list_4005_4000[] = { }; #define pci_ss_list_4005_4710 NULL #define pci_ss_list_4033_1360 NULL +#define pci_ss_list_4040_0001 NULL +#define pci_ss_list_4040_0002 NULL +#define pci_ss_list_4040_0003 NULL +#define pci_ss_list_4040_0004 NULL #define pci_ss_list_4144_0044 NULL #define pci_ss_list_416c_0100 NULL #define pci_ss_list_416c_0200 NULL @@ -56519,6 +60394,7 @@ static const pciSubsystemInfo *pci_ss_list_4c53_0001[] = { }; #endif #define pci_ss_list_4d51_0200 NULL +#define pci_ss_list_4d56_0000 NULL #define pci_ss_list_4ddc_0100 NULL #define pci_ss_list_4ddc_0801 NULL #define pci_ss_list_4ddc_0802 NULL @@ -56586,6 +60462,7 @@ static const pciSubsystemInfo *pci_ss_list_5333_8901[] = { #define pci_ss_list_5333_8903 NULL static const pciSubsystemInfo *pci_ss_list_5333_8904[] = { &pci_ss_info_5333_8904_1014_00db, + &pci_ss_info_5333_8904_4843_314a, &pci_ss_info_5333_8904_5333_8904, NULL }; @@ -56692,6 +60569,10 @@ static const pciSubsystemInfo *pci_ss_list_5333_8c2e[] = { #define pci_ss_list_5333_8d02 NULL #define pci_ss_list_5333_8d03 NULL #define pci_ss_list_5333_8d04 NULL +static const pciSubsystemInfo *pci_ss_list_5333_8e48[] = { + &pci_ss_info_5333_8e48_5333_0130, + NULL +}; static const pciSubsystemInfo *pci_ss_list_5333_9102[] = { &pci_ss_info_5333_9102_1092_5932, &pci_ss_info_5333_9102_1092_5934, @@ -56709,6 +60590,7 @@ static const pciSubsystemInfo *pci_ss_list_5333_9102[] = { #define pci_ss_list_5544_0001 NULL #define pci_ss_list_5555_0003 NULL #define pci_ss_list_5654_3132 NULL +#define pci_ss_list_5853_0001 NULL #define pci_ss_list_6374_6773 NULL #define pci_ss_list_6666_0001 NULL #define pci_ss_list_6666_0002 NULL @@ -56770,6 +60652,7 @@ static const pciSubsystemInfo *pci_ss_list_5333_9102[] = { #define pci_ss_list_8086_0536 NULL #define pci_ss_list_8086_0537 NULL static const pciSubsystemInfo *pci_ss_list_8086_0600[] = { + &pci_ss_info_8086_0600_8086_0136, &pci_ss_info_8086_0600_8086_01af, &pci_ss_info_8086_0600_8086_01c1, &pci_ss_info_8086_0600_8086_01f7, @@ -56810,6 +60693,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_1004[] = { }; static const pciSubsystemInfo *pci_ss_list_8086_1008[] = { &pci_ss_info_8086_1008_1014_0269, + &pci_ss_info_8086_1008_1028_011b, &pci_ss_info_8086_1008_1028_011c, &pci_ss_info_8086_1008_8086_1107, &pci_ss_info_8086_1008_8086_2107, @@ -56987,6 +60871,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_1039[] = { #define pci_ss_list_8086_103c NULL static const pciSubsystemInfo *pci_ss_list_8086_103d[] = { &pci_ss_info_8086_103d_1014_0522, + &pci_ss_info_8086_103d_8086_103d, NULL }; #define pci_ss_list_8086_103e NULL @@ -56998,6 +60883,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_1043[] = { &pci_ss_info_8086_1043_103c_08b0, &pci_ss_info_8086_1043_8086_2522, &pci_ss_info_8086_1043_8086_2527, + &pci_ss_info_8086_1043_8086_2561, &pci_ss_info_8086_1043_8086_2581, NULL }; @@ -57006,7 +60892,10 @@ static const pciSubsystemInfo *pci_ss_list_8086_1048[] = { &pci_ss_info_8086_1048_8086_a11f, NULL }; -#define pci_ss_list_8086_1049 NULL +static const pciSubsystemInfo *pci_ss_list_8086_1049[] = { + &pci_ss_info_8086_1049_17aa_20b9, + NULL +}; #define pci_ss_list_8086_104a NULL #define pci_ss_list_8086_104b NULL #define pci_ss_list_8086_104c NULL @@ -57030,6 +60919,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_1050[] = { #define pci_ss_list_8086_105b NULL static const pciSubsystemInfo *pci_ss_list_8086_105e[] = { &pci_ss_info_8086_105e_103c_7044, + &pci_ss_info_8086_105e_1775_1100, &pci_ss_info_8086_105e_1775_6003, &pci_ss_info_8086_105e_8086_005e, &pci_ss_info_8086_105e_8086_105e, @@ -57163,6 +61053,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_109a[] = { &pci_ss_info_8086_109a_17aa_2001, &pci_ss_info_8086_109a_17aa_207e, &pci_ss_info_8086_109a_8086_109a, + &pci_ss_info_8086_109a_8086_309c, NULL }; #define pci_ss_list_8086_109b NULL @@ -57178,6 +61069,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_10a4[] = { &pci_ss_info_8086_10a4_8086_11a4, NULL }; +#define pci_ss_list_8086_10a5 NULL #define pci_ss_list_8086_10b0 NULL #define pci_ss_list_8086_10b2 NULL #define pci_ss_list_8086_10b3 NULL @@ -57188,6 +61080,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_10b5[] = { &pci_ss_info_8086_10b5_8086_1199, NULL }; +#define pci_ss_list_8086_10b6 NULL static const pciSubsystemInfo *pci_ss_list_8086_10b9[] = { &pci_ss_info_8086_10b9_8086_1083, &pci_ss_info_8086_10b9_8086_1093, @@ -57200,8 +61093,16 @@ static const pciSubsystemInfo *pci_ss_list_8086_10bc[] = { &pci_ss_info_8086_10bc_8086_11bc, NULL }; +#define pci_ss_list_8086_10bd NULL +#define pci_ss_list_8086_10c0 NULL +#define pci_ss_list_8086_10c2 NULL +#define pci_ss_list_8086_10c3 NULL #define pci_ss_list_8086_10c4 NULL #define pci_ss_list_8086_10c5 NULL +#define pci_ss_list_8086_10c6 NULL +#define pci_ss_list_8086_10c7 NULL +#define pci_ss_list_8086_10d9 NULL +#define pci_ss_list_8086_10da NULL #define pci_ss_list_8086_1107 NULL static const pciSubsystemInfo *pci_ss_list_8086_1130[] = { &pci_ss_info_8086_1130_1025_1016, @@ -57311,6 +61212,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_1229[] = { &pci_ss_info_8086_1229_144d_2501, &pci_ss_info_8086_1229_144d_2502, &pci_ss_info_8086_1229_1668_1100, + &pci_ss_info_8086_1229_1775_1100, &pci_ss_info_8086_1229_1775_ce90, &pci_ss_info_8086_1229_4c53_1080, &pci_ss_info_8086_1229_4c53_10e0, @@ -57483,6 +61385,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_1b48[] = { #define pci_ss_list_8086_2413 NULL static const pciSubsystemInfo *pci_ss_list_8086_2415[] = { &pci_ss_info_8086_2415_1028_0095, + &pci_ss_info_8086_2415_1028_00b4, &pci_ss_info_8086_2415_110a_0051, &pci_ss_info_8086_2415_11d4_0040, &pci_ss_info_8086_2415_11d4_0048, @@ -57561,6 +61464,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_2446[] = { NULL }; static const pciSubsystemInfo *pci_ss_list_8086_2448[] = { + &pci_ss_info_8086_2448_103c_0934, &pci_ss_info_8086_2448_103c_099c, &pci_ss_info_8086_2448_144d_c00c, &pci_ss_info_8086_2448_1734_1055, @@ -57658,6 +61562,9 @@ static const pciSubsystemInfo *pci_ss_list_8086_2485[] = { &pci_ss_info_8086_2485_1014_0222, &pci_ss_info_8086_2485_1014_0508, &pci_ss_info_8086_2485_1014_051c, + &pci_ss_info_8086_2485_1043_1583, + &pci_ss_info_8086_2485_1043_1623, + &pci_ss_info_8086_2485_1043_1643, &pci_ss_info_8086_2485_104d_80e7, &pci_ss_info_8086_2485_144d_c006, NULL @@ -57717,7 +61624,10 @@ static const pciSubsystemInfo *pci_ss_list_8086_24c2[] = { &pci_ss_info_8086_24c2_1734_1004, &pci_ss_info_8086_24c2_1734_1055, &pci_ss_info_8086_24c2_4c53_1090, + &pci_ss_info_8086_24c2_8086_24c2, &pci_ss_info_8086_24c2_8086_4541, + &pci_ss_info_8086_24c2_e4bf_0cc9, + &pci_ss_info_8086_24c2_e4bf_0cd2, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_24c3[] = { @@ -57725,16 +61635,20 @@ static const pciSubsystemInfo *pci_ss_list_8086_24c3[] = { &pci_ss_info_8086_24c3_1014_052d, &pci_ss_info_8086_24c3_1025_005a, &pci_ss_info_8086_24c3_1028_0126, + &pci_ss_info_8086_24c3_1028_014f, &pci_ss_info_8086_24c3_103c_088c, &pci_ss_info_8086_24c3_103c_0890, &pci_ss_info_8086_24c3_103c_08b0, &pci_ss_info_8086_24c3_1071_8160, + &pci_ss_info_8086_24c3_144d_c005, &pci_ss_info_8086_24c3_144d_c00c, &pci_ss_info_8086_24c3_1458_24c2, &pci_ss_info_8086_24c3_1462_5800, &pci_ss_info_8086_24c3_1734_1004, &pci_ss_info_8086_24c3_1734_1055, &pci_ss_info_8086_24c3_4c53_1090, + &pci_ss_info_8086_24c3_e4bf_0cc9, + &pci_ss_info_8086_24c3_e4bf_0cd2, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_24c4[] = { @@ -57753,29 +61667,39 @@ static const pciSubsystemInfo *pci_ss_list_8086_24c4[] = { &pci_ss_info_8086_24c4_1509_2990, &pci_ss_info_8086_24c4_1734_1004, &pci_ss_info_8086_24c4_4c53_1090, + &pci_ss_info_8086_24c4_8086_24c2, &pci_ss_info_8086_24c4_8086_4541, + &pci_ss_info_8086_24c4_e4bf_0cc9, + &pci_ss_info_8086_24c4_e4bf_0cd2, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_24c5[] = { &pci_ss_info_8086_24c5_0e11_00b8, &pci_ss_info_8086_24c5_1014_0267, + &pci_ss_info_8086_24c5_1014_0537, &pci_ss_info_8086_24c5_1014_055f, &pci_ss_info_8086_24c5_1025_005a, &pci_ss_info_8086_24c5_1028_0139, + &pci_ss_info_8086_24c5_1028_014f, &pci_ss_info_8086_24c5_1028_0163, &pci_ss_info_8086_24c5_1028_0196, &pci_ss_info_8086_24c5_103c_088c, &pci_ss_info_8086_24c5_103c_0890, &pci_ss_info_8086_24c5_103c_08b0, &pci_ss_info_8086_24c5_1071_8160, + &pci_ss_info_8086_24c5_144d_c005, &pci_ss_info_8086_24c5_144d_c00c, &pci_ss_info_8086_24c5_1458_a002, &pci_ss_info_8086_24c5_1462_5800, &pci_ss_info_8086_24c5_1734_1005, &pci_ss_info_8086_24c5_1734_1055, + &pci_ss_info_8086_24c5_8086_24c5, + &pci_ss_info_8086_24c5_a002_1458, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_24c6[] = { + &pci_ss_info_8086_24c6_1014_0524, + &pci_ss_info_8086_24c6_1014_0525, &pci_ss_info_8086_24c6_1014_0559, &pci_ss_info_8086_24c6_1025_003c, &pci_ss_info_8086_24c6_1025_005a, @@ -57784,6 +61708,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_24c6[] = { &pci_ss_info_8086_24c6_103c_0890, &pci_ss_info_8086_24c6_103c_08b0, &pci_ss_info_8086_24c6_1071_8160, + &pci_ss_info_8086_24c6_144d_2115, &pci_ss_info_8086_24c6_144d_c00c, NULL }; @@ -57803,12 +61728,16 @@ static const pciSubsystemInfo *pci_ss_list_8086_24c7[] = { &pci_ss_info_8086_24c7_1509_2990, &pci_ss_info_8086_24c7_1734_1004, &pci_ss_info_8086_24c7_4c53_1090, + &pci_ss_info_8086_24c7_8086_24c2, &pci_ss_info_8086_24c7_8086_4541, + &pci_ss_info_8086_24c7_e4bf_0cc9, + &pci_ss_info_8086_24c7_e4bf_0cd2, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_24ca[] = { &pci_ss_info_8086_24ca_1014_052d, &pci_ss_info_8086_24ca_1025_005a, + &pci_ss_info_8086_24ca_1028_014f, &pci_ss_info_8086_24ca_1028_0163, &pci_ss_info_8086_24ca_1028_0196, &pci_ss_info_8086_24ca_103c_088c, @@ -57827,6 +61756,8 @@ static const pciSubsystemInfo *pci_ss_list_8086_24cb[] = { &pci_ss_info_8086_24cb_1462_5800, &pci_ss_info_8086_24cb_1734_1004, &pci_ss_info_8086_24cb_4c53_1090, + &pci_ss_info_8086_24cb_e4bf_0cc9, + &pci_ss_info_8086_24cb_e4bf_0cd2, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_24cc[] = { @@ -57854,6 +61785,9 @@ static const pciSubsystemInfo *pci_ss_list_8086_24cd[] = { &pci_ss_info_8086_24cd_1734_1004, &pci_ss_info_8086_24cd_1734_1055, &pci_ss_info_8086_24cd_4c53_1090, + &pci_ss_info_8086_24cd_8086_24c2, + &pci_ss_info_8086_24cd_e4bf_0cc9, + &pci_ss_info_8086_24cd_e4bf_0cd2, NULL }; #define pci_ss_list_8086_24d0 NULL @@ -57864,6 +61798,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_24d1[] = { &pci_ss_info_8086_24d1_1043_80a6, &pci_ss_info_8086_24d1_1458_24d1, &pci_ss_info_8086_24d1_1462_7280, + &pci_ss_info_8086_24d1_1565_5200, &pci_ss_info_8086_24d1_15d9_4580, &pci_ss_info_8086_24d1_8086_3427, &pci_ss_info_8086_24d1_8086_4246, @@ -57872,6 +61807,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_24d1[] = { NULL }; static const pciSubsystemInfo *pci_ss_list_8086_24d2[] = { + &pci_ss_info_8086_24d2_1014_02dd, &pci_ss_info_8086_24d2_1014_02ed, &pci_ss_info_8086_24d2_1028_0169, &pci_ss_info_8086_24d2_1028_0183, @@ -57881,6 +61817,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_24d2[] = { &pci_ss_info_8086_24d2_1043_80a6, &pci_ss_info_8086_24d2_1458_24d2, &pci_ss_info_8086_24d2_1462_7280, + &pci_ss_info_8086_24d2_1565_3101, &pci_ss_info_8086_24d2_15d9_4580, &pci_ss_info_8086_24d2_1734_101c, &pci_ss_info_8086_24d2_8086_3427, @@ -57890,6 +61827,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_24d2[] = { NULL }; static const pciSubsystemInfo *pci_ss_list_8086_24d3[] = { + &pci_ss_info_8086_24d3_1014_02dd, &pci_ss_info_8086_24d3_1014_02ed, &pci_ss_info_8086_24d3_1028_0156, &pci_ss_info_8086_24d3_1028_0169, @@ -57897,6 +61835,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_24d3[] = { &pci_ss_info_8086_24d3_1043_80a6, &pci_ss_info_8086_24d3_1458_24d2, &pci_ss_info_8086_24d3_1462_7280, + &pci_ss_info_8086_24d3_1565_3101, &pci_ss_info_8086_24d3_15d9_4580, &pci_ss_info_8086_24d3_1734_101c, &pci_ss_info_8086_24d3_8086_3427, @@ -57906,6 +61845,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_24d3[] = { NULL }; static const pciSubsystemInfo *pci_ss_list_8086_24d4[] = { + &pci_ss_info_8086_24d4_1014_02dd, &pci_ss_info_8086_24d4_1014_02ed, &pci_ss_info_8086_24d4_1028_0169, &pci_ss_info_8086_24d4_1028_0183, @@ -57915,6 +61855,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_24d4[] = { &pci_ss_info_8086_24d4_1043_80a6, &pci_ss_info_8086_24d4_1458_24d2, &pci_ss_info_8086_24d4_1462_7280, + &pci_ss_info_8086_24d4_1565_3101, &pci_ss_info_8086_24d4_15d9_4580, &pci_ss_info_8086_24d4_1734_101c, &pci_ss_info_8086_24d4_8086_3427, @@ -57952,6 +61893,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_24d7[] = { &pci_ss_info_8086_24d7_1043_80a6, &pci_ss_info_8086_24d7_1458_24d2, &pci_ss_info_8086_24d7_1462_7280, + &pci_ss_info_8086_24d7_1565_3101, &pci_ss_info_8086_24d7_15d9_4580, &pci_ss_info_8086_24d7_1734_101c, &pci_ss_info_8086_24d7_8086_3427, @@ -57961,6 +61903,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_24d7[] = { NULL }; static const pciSubsystemInfo *pci_ss_list_8086_24db[] = { + &pci_ss_info_8086_24db_1014_02dd, &pci_ss_info_8086_24db_1014_02ed, &pci_ss_info_8086_24db_1028_0169, &pci_ss_info_8086_24db_1028_019a, @@ -57970,6 +61913,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_24db[] = { &pci_ss_info_8086_24db_1458_24d2, &pci_ss_info_8086_24db_1462_7280, &pci_ss_info_8086_24db_1462_7580, + &pci_ss_info_8086_24db_1565_3101, &pci_ss_info_8086_24db_15d9_4580, &pci_ss_info_8086_24db_1734_101c, &pci_ss_info_8086_24db_8086_24db, @@ -57981,6 +61925,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_24db[] = { }; #define pci_ss_list_8086_24dc NULL static const pciSubsystemInfo *pci_ss_list_8086_24dd[] = { + &pci_ss_info_8086_24dd_1014_02dd, &pci_ss_info_8086_24dd_1014_02ed, &pci_ss_info_8086_24dd_1028_0169, &pci_ss_info_8086_24dd_1028_0183, @@ -58002,6 +61947,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_24de[] = { &pci_ss_info_8086_24de_1043_80a6, &pci_ss_info_8086_24de_1458_24d2, &pci_ss_info_8086_24de_1462_7280, + &pci_ss_info_8086_24de_1565_3101, &pci_ss_info_8086_24de_15d9_4580, &pci_ss_info_8086_24de_1734_101c, &pci_ss_info_8086_24de_8086_3427, @@ -58073,6 +62019,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_2560[] = { static const pciSubsystemInfo *pci_ss_list_8086_2562[] = { &pci_ss_info_8086_2562_0e11_00b9, &pci_ss_info_8086_2562_1014_0267, + &pci_ss_info_8086_2562_1734_1003, &pci_ss_info_8086_2562_1734_1004, NULL }; @@ -58116,6 +62063,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_2582[] = { &pci_ss_info_8086_2582_1043_2582, &pci_ss_info_8086_2582_1458_2582, &pci_ss_info_8086_2582_1734_105b, + &pci_ss_info_8086_2582_1849_2582, NULL }; #define pci_ss_list_8086_2584 NULL @@ -58125,26 +62073,39 @@ static const pciSubsystemInfo *pci_ss_list_8086_2582[] = { #define pci_ss_list_8086_258a NULL static const pciSubsystemInfo *pci_ss_list_8086_2590[] = { &pci_ss_info_8086_2590_1028_0182, + &pci_ss_info_8086_2590_103c_0934, &pci_ss_info_8086_2590_103c_099c, + &pci_ss_info_8086_2590_104d_81b7, &pci_ss_info_8086_2590_a304_81b7, + &pci_ss_info_8086_2590_e4bf_0ccd, + &pci_ss_info_8086_2590_e4bf_0cd3, + &pci_ss_info_8086_2590_e4bf_58b1, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_8086_2591[] = { + &pci_ss_info_8086_2591_103c_0934, NULL }; -#define pci_ss_list_8086_2591 NULL static const pciSubsystemInfo *pci_ss_list_8086_2592[] = { &pci_ss_info_8086_2592_103c_099c, &pci_ss_info_8086_2592_103c_308a, &pci_ss_info_8086_2592_1043_1881, + &pci_ss_info_8086_2592_e4bf_0ccd, + &pci_ss_info_8086_2592_e4bf_0cd3, + &pci_ss_info_8086_2592_e4bf_58b1, NULL }; #define pci_ss_list_8086_25a1 NULL static const pciSubsystemInfo *pci_ss_list_8086_25a2[] = { &pci_ss_info_8086_25a2_1775_10d0, + &pci_ss_info_8086_25a2_1775_1100, &pci_ss_info_8086_25a2_1775_ce90, &pci_ss_info_8086_25a2_4c53_10b0, &pci_ss_info_8086_25a2_4c53_10e0, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_25a3[] = { + &pci_ss_info_8086_25a3_1775_1100, &pci_ss_info_8086_25a3_1775_ce90, &pci_ss_info_8086_25a3_4c53_10b0, &pci_ss_info_8086_25a3_4c53_10d0, @@ -58153,6 +62114,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_25a3[] = { }; static const pciSubsystemInfo *pci_ss_list_8086_25a4[] = { &pci_ss_info_8086_25a4_1775_10d0, + &pci_ss_info_8086_25a4_1775_1100, &pci_ss_info_8086_25a4_1775_ce90, &pci_ss_info_8086_25a4_4c53_10b0, &pci_ss_info_8086_25a4_4c53_10d0, @@ -58160,6 +62122,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_25a4[] = { NULL }; static const pciSubsystemInfo *pci_ss_list_8086_25a6[] = { + &pci_ss_info_8086_25a6_1775_1100, &pci_ss_info_8086_25a6_1775_ce90, &pci_ss_info_8086_25a6_4c53_10b0, NULL @@ -58167,6 +62130,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_25a6[] = { #define pci_ss_list_8086_25a7 NULL static const pciSubsystemInfo *pci_ss_list_8086_25a9[] = { &pci_ss_info_8086_25a9_1775_10d0, + &pci_ss_info_8086_25a9_1775_1100, &pci_ss_info_8086_25a9_1775_ce90, &pci_ss_info_8086_25a9_4c53_10b0, &pci_ss_info_8086_25a9_4c53_10d0, @@ -58174,6 +62138,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_25a9[] = { NULL }; static const pciSubsystemInfo *pci_ss_list_8086_25aa[] = { + &pci_ss_info_8086_25aa_1775_1100, &pci_ss_info_8086_25aa_1775_ce90, &pci_ss_info_8086_25aa_4c53_10b0, &pci_ss_info_8086_25aa_4c53_10e0, @@ -58181,6 +62146,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_25aa[] = { }; static const pciSubsystemInfo *pci_ss_list_8086_25ab[] = { &pci_ss_info_8086_25ab_1775_10d0, + &pci_ss_info_8086_25ab_1775_1100, &pci_ss_info_8086_25ab_1775_ce90, &pci_ss_info_8086_25ab_4c53_10b0, &pci_ss_info_8086_25ab_4c53_10d0, @@ -58189,6 +62155,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_25ab[] = { }; static const pciSubsystemInfo *pci_ss_list_8086_25ac[] = { &pci_ss_info_8086_25ac_1775_10d0, + &pci_ss_info_8086_25ac_1775_1100, &pci_ss_info_8086_25ac_1775_ce90, &pci_ss_info_8086_25ac_4c53_10b0, &pci_ss_info_8086_25ac_4c53_10d0, @@ -58197,6 +62164,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_25ac[] = { }; static const pciSubsystemInfo *pci_ss_list_8086_25ad[] = { &pci_ss_info_8086_25ad_1775_10d0, + &pci_ss_info_8086_25ad_1775_1100, &pci_ss_info_8086_25ad_1775_ce90, &pci_ss_info_8086_25ad_4c53_10b0, &pci_ss_info_8086_25ad_4c53_10d0, @@ -58205,6 +62173,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_25ad[] = { }; #define pci_ss_list_8086_25ae NULL static const pciSubsystemInfo *pci_ss_list_8086_25b0[] = { + &pci_ss_info_8086_25b0_1775_1100, &pci_ss_info_8086_25b0_4c53_10d0, &pci_ss_info_8086_25b0_4c53_10e0, NULL @@ -58265,9 +62234,13 @@ static const pciSubsystemInfo *pci_ss_list_8086_25b0[] = { static const pciSubsystemInfo *pci_ss_list_8086_2640[] = { &pci_ss_info_8086_2640_1462_7028, &pci_ss_info_8086_2640_1734_105c, + &pci_ss_info_8086_2640_e4bf_0ccd, + &pci_ss_info_8086_2640_e4bf_0cd3, + &pci_ss_info_8086_2640_e4bf_58b1, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_2641[] = { + &pci_ss_info_8086_2641_103c_0934, &pci_ss_info_8086_2641_103c_099c, NULL }; @@ -58277,6 +62250,9 @@ static const pciSubsystemInfo *pci_ss_list_8086_2651[] = { &pci_ss_info_8086_2651_1043_2601, &pci_ss_info_8086_2651_1734_105c, &pci_ss_info_8086_2651_8086_4147, + &pci_ss_info_8086_2651_e4bf_0ccd, + &pci_ss_info_8086_2651_e4bf_0cd3, + &pci_ss_info_8086_2651_e4bf_58b1, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_2652[] = { @@ -58286,29 +62262,41 @@ static const pciSubsystemInfo *pci_ss_list_8086_2652[] = { #define pci_ss_list_8086_2653 NULL static const pciSubsystemInfo *pci_ss_list_8086_2658[] = { &pci_ss_info_8086_2658_1028_0179, + &pci_ss_info_8086_2658_103c_0934, &pci_ss_info_8086_2658_103c_099c, &pci_ss_info_8086_2658_1043_80a6, &pci_ss_info_8086_2658_1458_2558, &pci_ss_info_8086_2658_1462_7028, &pci_ss_info_8086_2658_1734_105c, + &pci_ss_info_8086_2658_e4bf_0ccd, + &pci_ss_info_8086_2658_e4bf_0cd3, + &pci_ss_info_8086_2658_e4bf_58b1, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_2659[] = { &pci_ss_info_8086_2659_1028_0179, + &pci_ss_info_8086_2659_103c_0934, &pci_ss_info_8086_2659_103c_099c, &pci_ss_info_8086_2659_1043_80a6, &pci_ss_info_8086_2659_1458_2659, &pci_ss_info_8086_2659_1462_7028, &pci_ss_info_8086_2659_1734_105c, + &pci_ss_info_8086_2659_e4bf_0ccd, + &pci_ss_info_8086_2659_e4bf_0cd3, + &pci_ss_info_8086_2659_e4bf_58b1, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_265a[] = { &pci_ss_info_8086_265a_1028_0179, + &pci_ss_info_8086_265a_103c_0934, &pci_ss_info_8086_265a_103c_099c, &pci_ss_info_8086_265a_1043_80a6, &pci_ss_info_8086_265a_1458_265a, &pci_ss_info_8086_265a_1462_7028, &pci_ss_info_8086_265a_1734_105c, + &pci_ss_info_8086_265a_e4bf_0ccd, + &pci_ss_info_8086_265a_e4bf_0cd3, + &pci_ss_info_8086_265a_e4bf_58b1, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_265b[] = { @@ -58318,25 +62306,52 @@ static const pciSubsystemInfo *pci_ss_list_8086_265b[] = { &pci_ss_info_8086_265b_1458_265a, &pci_ss_info_8086_265b_1462_7028, &pci_ss_info_8086_265b_1734_105c, + &pci_ss_info_8086_265b_e4bf_0ccd, + &pci_ss_info_8086_265b_e4bf_0cd3, + &pci_ss_info_8086_265b_e4bf_58b1, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_265c[] = { &pci_ss_info_8086_265c_1028_0179, + &pci_ss_info_8086_265c_103c_0934, &pci_ss_info_8086_265c_103c_099c, &pci_ss_info_8086_265c_1043_80a6, &pci_ss_info_8086_265c_1458_5006, &pci_ss_info_8086_265c_1462_7028, &pci_ss_info_8086_265c_1734_105c, &pci_ss_info_8086_265c_8086_265c, + &pci_ss_info_8086_265c_e4bf_0ccd, + &pci_ss_info_8086_265c_e4bf_0cd3, + &pci_ss_info_8086_265c_e4bf_58b1, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_2660[] = { + &pci_ss_info_8086_2660_103c_0934, &pci_ss_info_8086_2660_103c_099c, + &pci_ss_info_8086_2660_e4bf_0ccd, + &pci_ss_info_8086_2660_e4bf_0cd3, + &pci_ss_info_8086_2660_e4bf_58b1, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_8086_2662[] = { + &pci_ss_info_8086_2662_103c_0934, + &pci_ss_info_8086_2662_e4bf_0ccd, + &pci_ss_info_8086_2662_e4bf_0cd3, + &pci_ss_info_8086_2662_e4bf_58b1, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_8086_2664[] = { + &pci_ss_info_8086_2664_e4bf_0ccd, + &pci_ss_info_8086_2664_e4bf_0cd3, + &pci_ss_info_8086_2664_e4bf_58b1, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_8086_2666[] = { + &pci_ss_info_8086_2666_e4bf_0ccd, + &pci_ss_info_8086_2666_e4bf_0cd3, + &pci_ss_info_8086_2666_e4bf_58b1, NULL }; -#define pci_ss_list_8086_2662 NULL -#define pci_ss_list_8086_2664 NULL -#define pci_ss_list_8086_2666 NULL static const pciSubsystemInfo *pci_ss_list_8086_2668[] = { &pci_ss_info_8086_2668_103c_2a09, &pci_ss_info_8086_2668_1043_814e, @@ -58348,11 +62363,15 @@ static const pciSubsystemInfo *pci_ss_list_8086_266a[] = { &pci_ss_info_8086_266a_1458_266a, &pci_ss_info_8086_266a_1462_7028, &pci_ss_info_8086_266a_1734_105c, + &pci_ss_info_8086_266a_e4bf_0ccd, + &pci_ss_info_8086_266a_e4bf_0cd3, + &pci_ss_info_8086_266a_e4bf_58b1, NULL }; #define pci_ss_list_8086_266c NULL static const pciSubsystemInfo *pci_ss_list_8086_266d[] = { &pci_ss_info_8086_266d_1025_006a, + &pci_ss_info_8086_266d_103c_0934, &pci_ss_info_8086_266d_103c_099c, NULL }; @@ -58361,6 +62380,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_266e[] = { &pci_ss_info_8086_266e_1028_0179, &pci_ss_info_8086_266e_1028_0182, &pci_ss_info_8086_266e_1028_0188, + &pci_ss_info_8086_266e_103c_0934, &pci_ss_info_8086_266e_103c_0944, &pci_ss_info_8086_266e_103c_099c, &pci_ss_info_8086_266e_103c_3006, @@ -58370,11 +62390,15 @@ static const pciSubsystemInfo *pci_ss_list_8086_266e[] = { NULL }; static const pciSubsystemInfo *pci_ss_list_8086_266f[] = { + &pci_ss_info_8086_266f_103c_0934, &pci_ss_info_8086_266f_103c_099c, &pci_ss_info_8086_266f_1043_80a6, &pci_ss_info_8086_266f_1458_266f, &pci_ss_info_8086_266f_1462_7028, &pci_ss_info_8086_266f_1734_105c, + &pci_ss_info_8086_266f_e4bf_0ccd, + &pci_ss_info_8086_266f_e4bf_0cd3, + &pci_ss_info_8086_266f_e4bf_58b1, NULL }; #define pci_ss_list_8086_2670 NULL @@ -58412,7 +62436,10 @@ static const pciSubsystemInfo *pci_ss_list_8086_2772[] = { #define pci_ss_list_8086_2778 NULL #define pci_ss_list_8086_2779 NULL #define pci_ss_list_8086_277a NULL -#define pci_ss_list_8086_277c NULL +static const pciSubsystemInfo *pci_ss_list_8086_277c[] = { + &pci_ss_info_8086_277c_1043_8178, + NULL +}; #define pci_ss_list_8086_277d NULL static const pciSubsystemInfo *pci_ss_list_8086_2782[] = { &pci_ss_info_8086_2782_1043_2582, @@ -58422,9 +62449,13 @@ static const pciSubsystemInfo *pci_ss_list_8086_2782[] = { static const pciSubsystemInfo *pci_ss_list_8086_2792[] = { &pci_ss_info_8086_2792_103c_099c, &pci_ss_info_8086_2792_1043_1881, + &pci_ss_info_8086_2792_e4bf_0ccd, + &pci_ss_info_8086_2792_e4bf_0cd3, + &pci_ss_info_8086_2792_e4bf_58b1, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_27a0[] = { + &pci_ss_info_8086_27a0_1025_006c, &pci_ss_info_8086_27a0_103c_30a1, &pci_ss_info_8086_27a0_17aa_2017, NULL @@ -58440,7 +62471,10 @@ static const pciSubsystemInfo *pci_ss_list_8086_27a6[] = { &pci_ss_info_8086_27a6_17aa_201a, NULL }; -#define pci_ss_list_8086_27b0 NULL +static const pciSubsystemInfo *pci_ss_list_8086_27b0[] = { + &pci_ss_info_8086_27b0_8086_544e, + NULL +}; static const pciSubsystemInfo *pci_ss_list_8086_27b8[] = { &pci_ss_info_8086_27b8_107b_5048, &pci_ss_info_8086_27b8_8086_544e, @@ -58452,21 +62486,32 @@ static const pciSubsystemInfo *pci_ss_list_8086_27b9[] = { &pci_ss_info_8086_27b9_17aa_2009, NULL }; -#define pci_ss_list_8086_27bd NULL +static const pciSubsystemInfo *pci_ss_list_8086_27bd[] = { + &pci_ss_info_8086_27bd_1025_006c, + NULL +}; static const pciSubsystemInfo *pci_ss_list_8086_27c0[] = { &pci_ss_info_8086_27c0_107b_5048, + &pci_ss_info_8086_27c0_1462_7236, &pci_ss_info_8086_27c0_8086_544e, NULL }; #define pci_ss_list_8086_27c1 NULL -#define pci_ss_list_8086_27c3 NULL -#define pci_ss_list_8086_27c4 NULL +static const pciSubsystemInfo *pci_ss_list_8086_27c3[] = { + &pci_ss_info_8086_27c3_8086_544e, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_8086_27c4[] = { + &pci_ss_info_8086_27c4_1025_006c, + NULL +}; static const pciSubsystemInfo *pci_ss_list_8086_27c5[] = { &pci_ss_info_8086_27c5_17aa_200d, NULL }; #define pci_ss_list_8086_27c6 NULL static const pciSubsystemInfo *pci_ss_list_8086_27c8[] = { + &pci_ss_info_8086_27c8_1025_006c, &pci_ss_info_8086_27c8_103c_30a1, &pci_ss_info_8086_27c8_107b_5048, &pci_ss_info_8086_27c8_17aa_200a, @@ -58474,6 +62519,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_27c8[] = { NULL }; static const pciSubsystemInfo *pci_ss_list_8086_27c9[] = { + &pci_ss_info_8086_27c9_1025_006c, &pci_ss_info_8086_27c9_103c_30a1, &pci_ss_info_8086_27c9_107b_5048, &pci_ss_info_8086_27c9_17aa_200a, @@ -58481,6 +62527,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_27c9[] = { NULL }; static const pciSubsystemInfo *pci_ss_list_8086_27ca[] = { + &pci_ss_info_8086_27ca_1025_006c, &pci_ss_info_8086_27ca_103c_30a1, &pci_ss_info_8086_27ca_107b_5048, &pci_ss_info_8086_27ca_17aa_200a, @@ -58488,6 +62535,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_27ca[] = { NULL }; static const pciSubsystemInfo *pci_ss_list_8086_27cb[] = { + &pci_ss_info_8086_27cb_1025_006c, &pci_ss_info_8086_27cb_103c_30a1, &pci_ss_info_8086_27cb_107b_5048, &pci_ss_info_8086_27cb_17aa_200a, @@ -58495,6 +62543,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_27cb[] = { NULL }; static const pciSubsystemInfo *pci_ss_list_8086_27cc[] = { + &pci_ss_info_8086_27cc_1025_006c, &pci_ss_info_8086_27cc_103c_30a1, &pci_ss_info_8086_27cc_17aa_200b, &pci_ss_info_8086_27cc_8086_544e, @@ -58505,16 +62554,21 @@ static const pciSubsystemInfo *pci_ss_list_8086_27cc[] = { #define pci_ss_list_8086_27d4 NULL #define pci_ss_list_8086_27d6 NULL static const pciSubsystemInfo *pci_ss_list_8086_27d8[] = { + &pci_ss_info_8086_27d8_1025_006c, &pci_ss_info_8086_27d8_103c_30a1, + &pci_ss_info_8086_27d8_1043_13c4, &pci_ss_info_8086_27d8_107b_5048, &pci_ss_info_8086_27d8_10f7_8338, &pci_ss_info_8086_27d8_1179_ff31, &pci_ss_info_8086_27d8_152d_0753, &pci_ss_info_8086_27d8_1734_10ad, &pci_ss_info_8086_27d8_17aa_2010, + &pci_ss_info_8086_27d8_17aa_3802, + &pci_ss_info_8086_27d8_8086_1112, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_27da[] = { + &pci_ss_info_8086_27da_1025_006c, &pci_ss_info_8086_27da_10f7_8338, &pci_ss_info_8086_27da_17aa_200f, &pci_ss_info_8086_27da_8086_544e, @@ -58525,7 +62579,10 @@ static const pciSubsystemInfo *pci_ss_list_8086_27dc[] = { NULL }; #define pci_ss_list_8086_27dd NULL -#define pci_ss_list_8086_27de NULL +static const pciSubsystemInfo *pci_ss_list_8086_27de[] = { + &pci_ss_info_8086_27de_1462_7267, + NULL +}; static const pciSubsystemInfo *pci_ss_list_8086_27df[] = { &pci_ss_info_8086_27df_103c_30a1, &pci_ss_info_8086_27df_107b_5048, @@ -58566,14 +62623,21 @@ static const pciSubsystemInfo *pci_ss_list_8086_2831[] = { #define pci_ss_list_8086_2832 NULL static const pciSubsystemInfo *pci_ss_list_8086_2834[] = { &pci_ss_info_8086_2834_1462_7235, + &pci_ss_info_8086_2834_17aa_20aa, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_8086_2835[] = { + &pci_ss_info_8086_2835_17aa_20aa, NULL }; -#define pci_ss_list_8086_2835 NULL static const pciSubsystemInfo *pci_ss_list_8086_2836[] = { &pci_ss_info_8086_2836_1462_7235, NULL }; -#define pci_ss_list_8086_283a NULL +static const pciSubsystemInfo *pci_ss_list_8086_283a[] = { + &pci_ss_info_8086_283a_17aa_20ab, + NULL +}; static const pciSubsystemInfo *pci_ss_list_8086_283e[] = { &pci_ss_info_8086_283e_1462_7235, NULL @@ -58584,10 +62648,19 @@ static const pciSubsystemInfo *pci_ss_list_8086_283e[] = { #define pci_ss_list_8086_2845 NULL #define pci_ss_list_8086_2847 NULL #define pci_ss_list_8086_2849 NULL -#define pci_ss_list_8086_284b NULL +static const pciSubsystemInfo *pci_ss_list_8086_284b[] = { + &pci_ss_info_8086_284b_17aa_20ac, + NULL +}; #define pci_ss_list_8086_284f NULL #define pci_ss_list_8086_2850 NULL -#define pci_ss_list_8086_2910 NULL +#define pci_ss_list_8086_2911 NULL +#define pci_ss_list_8086_2912 NULL +#define pci_ss_list_8086_2914 NULL +#define pci_ss_list_8086_2916 NULL +#define pci_ss_list_8086_2917 NULL +#define pci_ss_list_8086_2918 NULL +#define pci_ss_list_8086_2919 NULL #define pci_ss_list_8086_2920 NULL #define pci_ss_list_8086_2921 NULL #define pci_ss_list_8086_2922 NULL @@ -58595,6 +62668,8 @@ static const pciSubsystemInfo *pci_ss_list_8086_283e[] = { #define pci_ss_list_8086_2925 NULL #define pci_ss_list_8086_2926 NULL #define pci_ss_list_8086_2928 NULL +#define pci_ss_list_8086_2929 NULL +#define pci_ss_list_8086_292c NULL #define pci_ss_list_8086_292d NULL #define pci_ss_list_8086_292e NULL #define pci_ss_list_8086_2930 NULL @@ -58634,9 +62709,15 @@ static const pciSubsystemInfo *pci_ss_list_8086_283e[] = { #define pci_ss_list_8086_2995 NULL #define pci_ss_list_8086_2996 NULL #define pci_ss_list_8086_2997 NULL -#define pci_ss_list_8086_29a0 NULL +static const pciSubsystemInfo *pci_ss_list_8086_29a0[] = { + &pci_ss_info_8086_29a0_1462_7276, + NULL +}; #define pci_ss_list_8086_29a1 NULL -#define pci_ss_list_8086_29a2 NULL +static const pciSubsystemInfo *pci_ss_list_8086_29a2[] = { + &pci_ss_info_8086_29a2_1462_7276, + NULL +}; #define pci_ss_list_8086_29a3 NULL #define pci_ss_list_8086_29a4 NULL #define pci_ss_list_8086_29a5 NULL @@ -58659,6 +62740,14 @@ static const pciSubsystemInfo *pci_ss_list_8086_283e[] = { #define pci_ss_list_8086_29c6 NULL #define pci_ss_list_8086_29c7 NULL #define pci_ss_list_8086_29cf NULL +#define pci_ss_list_8086_29d0 NULL +#define pci_ss_list_8086_29d1 NULL +#define pci_ss_list_8086_29d2 NULL +#define pci_ss_list_8086_29d3 NULL +#define pci_ss_list_8086_29d4 NULL +#define pci_ss_list_8086_29d5 NULL +#define pci_ss_list_8086_29d6 NULL +#define pci_ss_list_8086_29d7 NULL #define pci_ss_list_8086_29e0 NULL #define pci_ss_list_8086_29e1 NULL #define pci_ss_list_8086_29e4 NULL @@ -58673,7 +62762,10 @@ static const pciSubsystemInfo *pci_ss_list_8086_283e[] = { #define pci_ss_list_8086_29f6 NULL #define pci_ss_list_8086_29f7 NULL #define pci_ss_list_8086_29f9 NULL -#define pci_ss_list_8086_2a00 NULL +static const pciSubsystemInfo *pci_ss_list_8086_2a00[] = { + &pci_ss_info_8086_2a00_17aa_20b1, + NULL +}; #define pci_ss_list_8086_2a01 NULL #define pci_ss_list_8086_2a02 NULL #define pci_ss_list_8086_2a03 NULL @@ -58681,12 +62773,16 @@ static const pciSubsystemInfo *pci_ss_list_8086_283e[] = { #define pci_ss_list_8086_2a05 NULL #define pci_ss_list_8086_2a06 NULL #define pci_ss_list_8086_2a07 NULL -#define pci_ss_list_8086_3092 NULL static const pciSubsystemInfo *pci_ss_list_8086_3200[] = { &pci_ss_info_8086_3200_1775_c200, NULL }; +#define pci_ss_list_8086_3313 NULL +#define pci_ss_list_8086_331b NULL +#define pci_ss_list_8086_3331 NULL +#define pci_ss_list_8086_3339 NULL static const pciSubsystemInfo *pci_ss_list_8086_3340[] = { + &pci_ss_info_8086_3340_1014_0529, &pci_ss_info_8086_3340_1025_005a, &pci_ss_info_8086_3340_103c_088c, &pci_ss_info_8086_3340_103c_0890, @@ -58698,6 +62794,9 @@ static const pciSubsystemInfo *pci_ss_list_8086_3341[] = { &pci_ss_info_8086_3341_144d_c00c, NULL }; +#define pci_ss_list_8086_3363 NULL +#define pci_ss_list_8086_33c3 NULL +#define pci_ss_list_8086_33cb NULL #define pci_ss_list_8086_3500 NULL #define pci_ss_list_8086_3501 NULL #define pci_ss_list_8086_3504 NULL @@ -58725,6 +62824,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_3577[] = { static const pciSubsystemInfo *pci_ss_list_8086_3580[] = { &pci_ss_info_8086_3580_1014_055c, &pci_ss_info_8086_3580_1028_0139, + &pci_ss_info_8086_3580_1028_014f, &pci_ss_info_8086_3580_1028_0163, &pci_ss_info_8086_3580_1028_0196, &pci_ss_info_8086_3580_1734_1055, @@ -58732,6 +62832,8 @@ static const pciSubsystemInfo *pci_ss_list_8086_3580[] = { &pci_ss_info_8086_3580_1775_ce90, &pci_ss_info_8086_3580_4c53_10b0, &pci_ss_info_8086_3580_4c53_10e0, + &pci_ss_info_8086_3580_e4bf_0cc9, + &pci_ss_info_8086_3580_e4bf_0cd2, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_3581[] = { @@ -58741,16 +62843,20 @@ static const pciSubsystemInfo *pci_ss_list_8086_3581[] = { static const pciSubsystemInfo *pci_ss_list_8086_3582[] = { &pci_ss_info_8086_3582_1014_0562, &pci_ss_info_8086_3582_1028_0139, + &pci_ss_info_8086_3582_1028_014f, &pci_ss_info_8086_3582_1028_0163, &pci_ss_info_8086_3582_1775_10d0, &pci_ss_info_8086_3582_1775_ce90, &pci_ss_info_8086_3582_4c53_10b0, &pci_ss_info_8086_3582_4c53_10e0, + &pci_ss_info_8086_3582_e4bf_0cc9, + &pci_ss_info_8086_3582_e4bf_0cd2, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_3584[] = { &pci_ss_info_8086_3584_1014_055d, &pci_ss_info_8086_3584_1028_0139, + &pci_ss_info_8086_3584_1028_014f, &pci_ss_info_8086_3584_1028_0163, &pci_ss_info_8086_3584_1028_0196, &pci_ss_info_8086_3584_1734_1055, @@ -58763,6 +62869,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_3584[] = { static const pciSubsystemInfo *pci_ss_list_8086_3585[] = { &pci_ss_info_8086_3585_1014_055e, &pci_ss_info_8086_3585_1028_0139, + &pci_ss_info_8086_3585_1028_014f, &pci_ss_info_8086_3585_1028_0163, &pci_ss_info_8086_3585_1028_0196, &pci_ss_info_8086_3585_1734_1055, @@ -58773,12 +62880,15 @@ static const pciSubsystemInfo *pci_ss_list_8086_3585[] = { NULL }; static const pciSubsystemInfo *pci_ss_list_8086_3590[] = { + &pci_ss_info_8086_3590_1014_02dd, &pci_ss_info_8086_3590_1028_019a, &pci_ss_info_8086_3590_1734_103e, + &pci_ss_info_8086_3590_1775_1100, &pci_ss_info_8086_3590_4c53_10d0, NULL }; static const pciSubsystemInfo *pci_ss_list_8086_3591[] = { + &pci_ss_info_8086_3591_1014_02dd, &pci_ss_info_8086_3591_1028_0169, &pci_ss_info_8086_3591_4c53_10d0, NULL @@ -58786,16 +62896,32 @@ static const pciSubsystemInfo *pci_ss_list_8086_3591[] = { #define pci_ss_list_8086_3592 NULL #define pci_ss_list_8086_3593 NULL static const pciSubsystemInfo *pci_ss_list_8086_3594[] = { + &pci_ss_info_8086_3594_1775_1100, &pci_ss_info_8086_3594_4c53_10d0, NULL }; -#define pci_ss_list_8086_3595 NULL +static const pciSubsystemInfo *pci_ss_list_8086_3595[] = { + &pci_ss_info_8086_3595_1775_1100, + NULL +}; #define pci_ss_list_8086_3596 NULL -#define pci_ss_list_8086_3597 NULL -#define pci_ss_list_8086_3598 NULL -#define pci_ss_list_8086_3599 NULL +static const pciSubsystemInfo *pci_ss_list_8086_3597[] = { + &pci_ss_info_8086_3597_1775_1100, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_8086_3598[] = { + &pci_ss_info_8086_3598_1775_1100, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_8086_3599[] = { + &pci_ss_info_8086_3599_1775_1100, + NULL +}; #define pci_ss_list_8086_359a NULL -#define pci_ss_list_8086_359b NULL +static const pciSubsystemInfo *pci_ss_list_8086_359b[] = { + &pci_ss_info_8086_359b_1014_02dd, + NULL +}; static const pciSubsystemInfo *pci_ss_list_8086_359e[] = { &pci_ss_info_8086_359e_1028_0169, NULL @@ -58821,6 +62947,8 @@ static const pciSubsystemInfo *pci_ss_list_8086_359e[] = { #define pci_ss_list_8086_360f NULL #define pci_ss_list_8086_3610 NULL #define pci_ss_list_8086_4000 NULL +#define pci_ss_list_8086_4001 NULL +#define pci_ss_list_8086_4003 NULL #define pci_ss_list_8086_4008 NULL #define pci_ss_list_8086_4010 NULL #define pci_ss_list_8086_4021 NULL @@ -58840,7 +62968,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_359e[] = { #define pci_ss_list_8086_4035 NULL #define pci_ss_list_8086_4036 NULL static const pciSubsystemInfo *pci_ss_list_8086_4220[] = { - &pci_ss_info_8086_4220_2731_8086, + &pci_ss_info_8086_4220_103c_12f6, &pci_ss_info_8086_4220_8086_2731, NULL }; @@ -58860,7 +62988,45 @@ static const pciSubsystemInfo *pci_ss_list_8086_4227[] = { &pci_ss_info_8086_4227_8086_1014, NULL }; +#define pci_ss_list_8086_4229 NULL +static const pciSubsystemInfo *pci_ss_list_8086_4230[] = { + &pci_ss_info_8086_4230_8086_1110, + NULL +}; +#define pci_ss_list_8086_444e NULL #define pci_ss_list_8086_5001 NULL +#define pci_ss_list_8086_5020 NULL +#define pci_ss_list_8086_5021 NULL +#define pci_ss_list_8086_5023 NULL +#define pci_ss_list_8086_5024 NULL +#define pci_ss_list_8086_5025 NULL +#define pci_ss_list_8086_5028 NULL +#define pci_ss_list_8086_5029 NULL +#define pci_ss_list_8086_502a NULL +#define pci_ss_list_8086_502b NULL +#define pci_ss_list_8086_5031 NULL +#define pci_ss_list_8086_5032 NULL +#define pci_ss_list_8086_5033 NULL +#define pci_ss_list_8086_5035 NULL +#define pci_ss_list_8086_5037 NULL +#define pci_ss_list_8086_5039 NULL +#define pci_ss_list_8086_503a NULL +#define pci_ss_list_8086_503b NULL +#define pci_ss_list_8086_503c NULL +#define pci_ss_list_8086_503d NULL +#define pci_ss_list_8086_503e NULL +#define pci_ss_list_8086_5040 NULL +#define pci_ss_list_8086_5041 NULL +#define pci_ss_list_8086_5042 NULL +#define pci_ss_list_8086_5043 NULL +#define pci_ss_list_8086_5044 NULL +#define pci_ss_list_8086_5045 NULL +#define pci_ss_list_8086_5046 NULL +#define pci_ss_list_8086_5047 NULL +#define pci_ss_list_8086_5048 NULL +#define pci_ss_list_8086_5049 NULL +#define pci_ss_list_8086_504a NULL +#define pci_ss_list_8086_504b NULL #define pci_ss_list_8086_5200 NULL static const pciSubsystemInfo *pci_ss_list_8086_5201[] = { &pci_ss_info_8086_5201_8086_0001, @@ -58920,8 +63086,14 @@ static const pciSubsystemInfo *pci_ss_list_8086_7121[] = { }; #define pci_ss_list_8086_7122 NULL #define pci_ss_list_8086_7123 NULL -#define pci_ss_list_8086_7124 NULL -#define pci_ss_list_8086_7125 NULL +static const pciSubsystemInfo *pci_ss_list_8086_7124[] = { + &pci_ss_info_8086_7124_1028_00b4, + NULL +}; +static const pciSubsystemInfo *pci_ss_list_8086_7125[] = { + &pci_ss_info_8086_7125_1028_00b4, + NULL +}; #define pci_ss_list_8086_7126 NULL #define pci_ss_list_8086_7128 NULL #define pci_ss_list_8086_712a NULL @@ -58987,6 +63159,7 @@ static const pciSubsystemInfo *pci_ss_list_8086_7800[] = { &pci_ss_info_8086_7800_8086_0100, NULL }; +#define pci_ss_list_8086_8002 NULL #define pci_ss_list_8086_84c4 NULL #define pci_ss_list_8086_84c5 NULL #define pci_ss_list_8086_84ca NULL @@ -59024,6 +63197,11 @@ static const pciSubsystemInfo *pci_ss_list_8086_b555[] = { &pci_ss_info_8086_b555_e4bf_1000, NULL }; +#define pci_ss_list_80ee_beef NULL +#define pci_ss_list_80ee_cafe NULL +#define pci_ss_list_8384_7618 NULL +#define pci_ss_list_8384_7670 NULL +#define pci_ss_list_8384_7672 NULL #define pci_ss_list_8686_1010 NULL #define pci_ss_list_8800_2008 NULL #define pci_ss_list_8c4a_1980 NULL @@ -59217,6 +63395,8 @@ static const pciSubsystemInfo *pci_ss_list_9005_008f[] = { &pci_ss_info_9005_008f_15d9_9005, NULL }; +#define pci_ss_list_9005_0092 NULL +#define pci_ss_list_9005_0093 NULL static const pciSubsystemInfo *pci_ss_list_9005_00c0[] = { &pci_ss_info_9005_00c0_0e11_f620, &pci_ss_info_9005_00c0_9005_f620, @@ -59258,6 +63438,13 @@ static const pciSubsystemInfo *pci_ss_list_9005_0285[] = { &pci_ss_info_9005_0285_1028_0287, &pci_ss_info_9005_0285_1028_0291, &pci_ss_info_9005_0285_103c_3227, + &pci_ss_info_9005_0285_108e_0286, + &pci_ss_info_9005_0285_108e_0287, + &pci_ss_info_9005_0285_108e_7aac, + &pci_ss_info_9005_0285_15d9_02b5, + &pci_ss_info_9005_0285_15d9_02b6, + &pci_ss_info_9005_0285_15d9_02c9, + &pci_ss_info_9005_0285_15d9_02ca, &pci_ss_info_9005_0285_17aa_0286, &pci_ss_info_9005_0285_17aa_0287, &pci_ss_info_9005_0285_9005_0285, @@ -59278,9 +63465,28 @@ static const pciSubsystemInfo *pci_ss_list_9005_0285[] = { &pci_ss_info_9005_0285_9005_0298, &pci_ss_info_9005_0285_9005_0299, &pci_ss_info_9005_0285_9005_029a, + &pci_ss_info_9005_0285_9005_02a4, + &pci_ss_info_9005_0285_9005_02a5, &pci_ss_info_9005_0285_9005_02b5, &pci_ss_info_9005_0285_9005_02b6, &pci_ss_info_9005_0285_9005_02b7, + &pci_ss_info_9005_0285_9005_02b8, + &pci_ss_info_9005_0285_9005_02b9, + &pci_ss_info_9005_0285_9005_02ba, + &pci_ss_info_9005_0285_9005_02bb, + &pci_ss_info_9005_0285_9005_02bc, + &pci_ss_info_9005_0285_9005_02bd, + &pci_ss_info_9005_0285_9005_02be, + &pci_ss_info_9005_0285_9005_02bf, + &pci_ss_info_9005_0285_9005_02c0, + &pci_ss_info_9005_0285_9005_02c1, + &pci_ss_info_9005_0285_9005_02c2, + &pci_ss_info_9005_0285_9005_02c3, + &pci_ss_info_9005_0285_9005_02c4, + &pci_ss_info_9005_0285_9005_02c5, + &pci_ss_info_9005_0285_9005_02c6, + &pci_ss_info_9005_0285_9005_02c7, + &pci_ss_info_9005_0285_9005_02c8, NULL }; static const pciSubsystemInfo *pci_ss_list_9005_0286[] = { @@ -59343,6 +63549,7 @@ static const pciSubsystemInfo *pci_ss_list_9005_0500[] = { }; static const pciSubsystemInfo *pci_ss_list_9005_0503[] = { &pci_ss_info_9005_0503_1014_02bf, + &pci_ss_info_9005_0503_1014_02c3, &pci_ss_info_9005_0503_1014_02d5, NULL }; @@ -59361,9 +63568,16 @@ static const pciSubsystemInfo *pci_ss_list_9005_8011[] = { #define pci_ss_list_9005_8014 NULL #define pci_ss_list_9005_8015 NULL #define pci_ss_list_9005_8016 NULL -#define pci_ss_list_9005_8017 NULL +static const pciSubsystemInfo *pci_ss_list_9005_8017[] = { + &pci_ss_info_9005_8017_9005_0044, + &pci_ss_info_9005_8017_9005_0045, + NULL +}; #define pci_ss_list_9005_801c NULL -#define pci_ss_list_9005_801d NULL +static const pciSubsystemInfo *pci_ss_list_9005_801d[] = { + &pci_ss_info_9005_801d_1014_02cc, + NULL +}; #define pci_ss_list_9005_801e NULL static const pciSubsystemInfo *pci_ss_list_9005_801f[] = { &pci_ss_info_9005_801f_1734_1011, @@ -59380,7 +63594,10 @@ static const pciSubsystemInfo *pci_ss_list_9005_801f[] = { #define pci_ss_list_9005_8096 NULL #define pci_ss_list_9005_8097 NULL #define pci_ss_list_9005_809c NULL -#define pci_ss_list_9005_809d NULL +static const pciSubsystemInfo *pci_ss_list_9005_809d[] = { + &pci_ss_info_9005_809d_1014_02cc, + NULL +}; #define pci_ss_list_9005_809e NULL #define pci_ss_list_9005_809f NULL #endif @@ -59419,13 +63636,15 @@ static const pciSubsystemInfo *pci_ss_list_9710_9855[] = { #define pci_ss_list_cafe_0003 NULL #define pci_ss_list_cddd_0101 NULL #define pci_ss_list_cddd_0200 NULL +#define pci_ss_list_d161_0120 NULL #define pci_ss_list_d161_0205 NULL #define pci_ss_list_d161_0210 NULL #define pci_ss_list_d161_0405 NULL -#define pci_ss_list_d161_0406 NULL #define pci_ss_list_d161_0410 NULL -#define pci_ss_list_d161_0411 NULL +#define pci_ss_list_d161_0800 NULL #define pci_ss_list_d161_2400 NULL +#define pci_ss_list_d161_3400 NULL +#define pci_ss_list_d161_b410 NULL #define pci_ss_list_d4d4_0601 NULL #define pci_ss_list_deaf_9050 NULL #define pci_ss_list_deaf_9051 NULL @@ -59563,6 +63782,7 @@ static const pciSubsystemInfo *pci_ss_list_0270[] = { #endif #define pci_ss_list_0291 NULL #define pci_ss_list_02ac NULL +#define pci_ss_list_02e0 NULL #define pci_ss_list_0315 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_0357[] = { @@ -59576,6 +63796,7 @@ static const pciSubsystemInfo *pci_ss_list_0357[] = { #define pci_ss_list_0482 NULL #define pci_ss_list_04cf NULL #define pci_ss_list_050d NULL +#define pci_ss_list_058f NULL #define pci_ss_list_05a9 NULL #define pci_ss_list_05e3 NULL #define pci_ss_list_066f NULL @@ -59667,6 +63888,7 @@ static const pciSubsystemInfo *pci_ss_list_0e11[] = { &pci_ss_info_0e11_4080, &pci_ss_info_0e11_4082, &pci_ss_info_0e11_4083, + &pci_ss_info_0e11_4091, &pci_ss_info_0e11_409a, &pci_ss_info_0e11_409b, &pci_ss_info_0e11_409c, @@ -59765,6 +63987,7 @@ static const pciSubsystemInfo *pci_ss_list_1000[] = { &pci_ss_info_1000_1010, &pci_ss_info_1000_1011, &pci_ss_info_1000_1012, + &pci_ss_info_1000_1016, &pci_ss_info_1000_1020, &pci_ss_info_1000_2004, &pci_ss_info_1000_2005, @@ -59887,7 +64110,14 @@ static const pciSubsystemInfo *pci_ss_list_100a[] = { NULL }; #endif -#define pci_ss_list_100b NULL +static const pciSubsystemInfo *pci_ss_list_100b[] = { + &pci_ss_info_100b_0500, + &pci_ss_info_100b_0501, + &pci_ss_info_100b_0502, + &pci_ss_info_100b_0503, + &pci_ss_info_100b_0505, + NULL +}; #define pci_ss_list_100c NULL #define pci_ss_list_100d NULL #define pci_ss_list_100e NULL @@ -60018,18 +64248,24 @@ static const pciSubsystemInfo *pci_ss_list_1014[] = { &pci_ss_info_1014_02c0, &pci_ss_info_1014_02c1, &pci_ss_info_1014_02c2, + &pci_ss_info_1014_02c3, &pci_ss_info_1014_02c6, &pci_ss_info_1014_02c8, + &pci_ss_info_1014_02cc, &pci_ss_info_1014_02d3, &pci_ss_info_1014_02d4, &pci_ss_info_1014_02d5, + &pci_ss_info_1014_02dd, &pci_ss_info_1014_02ed, &pci_ss_info_1014_02f2, &pci_ss_info_1014_030d, + &pci_ss_info_1014_0338, &pci_ss_info_1014_034d, + &pci_ss_info_1014_0360, &pci_ss_info_1014_0363, &pci_ss_info_1014_0364, &pci_ss_info_1014_0365, + &pci_ss_info_1014_0379, &pci_ss_info_1014_0502, &pci_ss_info_1014_0503, &pci_ss_info_1014_0506, @@ -60043,11 +64279,15 @@ static const pciSubsystemInfo *pci_ss_list_1014[] = { &pci_ss_info_1014_051a, &pci_ss_info_1014_051c, &pci_ss_info_1014_0522, + &pci_ss_info_1014_0524, + &pci_ss_info_1014_0525, &pci_ss_info_1014_0528, + &pci_ss_info_1014_0529, &pci_ss_info_1014_052c, &pci_ss_info_1014_052d, &pci_ss_info_1014_052e, &pci_ss_info_1014_0535, + &pci_ss_info_1014_0537, &pci_ss_info_1014_053a, &pci_ss_info_1014_053b, &pci_ss_info_1014_053c, @@ -60056,6 +64296,7 @@ static const pciSubsystemInfo *pci_ss_list_1014[] = { &pci_ss_info_1014_0540, &pci_ss_info_1014_0545, &pci_ss_info_1014_0549, + &pci_ss_info_1014_054d, &pci_ss_info_1014_0556, &pci_ss_info_1014_0559, &pci_ss_info_1014_055c, @@ -60108,7 +64349,14 @@ static const pciSubsystemInfo *pci_ss_list_1019[] = { NULL }; #endif -#define pci_ss_list_101a NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_101a[] = { + &pci_ss_info_101a_0019, + &pci_ss_info_101a_001f, + &pci_ss_info_101a_0ece, + NULL +}; +#endif #define pci_ss_list_101b NULL #define pci_ss_list_101c NULL #ifdef VENDOR_INCLUDE_NONVIDEO @@ -60157,14 +64405,17 @@ static const pciSubsystemInfo *pci_ss_list_1023[] = { }; #define pci_ss_list_1024 NULL static const pciSubsystemInfo *pci_ss_list_1025[] = { + &pci_ss_info_1025_0009, &pci_ss_info_1025_000e, &pci_ss_info_1025_0018, &pci_ss_info_1025_003c, &pci_ss_info_1025_004d, &pci_ss_info_1025_005a, &pci_ss_info_1025_006a, + &pci_ss_info_1025_006c, &pci_ss_info_1025_0079, &pci_ss_info_1025_0080, + &pci_ss_info_1025_0091, &pci_ss_info_1025_0310, &pci_ss_info_1025_0315, &pci_ss_info_1025_1003, @@ -60213,6 +64464,7 @@ static const pciSubsystemInfo *pci_ss_list_1028[] = { &pci_ss_info_1028_009b, &pci_ss_info_1028_00aa, &pci_ss_info_1028_00b1, + &pci_ss_info_1028_00b4, &pci_ss_info_1028_00bb, &pci_ss_info_1028_00c5, &pci_ss_info_1028_00c7, @@ -60238,6 +64490,7 @@ static const pciSubsystemInfo *pci_ss_list_1028[] = { &pci_ss_info_1028_0149, &pci_ss_info_1028_014a, &pci_ss_info_1028_014e, + &pci_ss_info_1028_014f, &pci_ss_info_1028_0151, &pci_ss_info_1028_0156, &pci_ss_info_1028_0163, @@ -60259,6 +64512,7 @@ static const pciSubsystemInfo *pci_ss_list_1028[] = { &pci_ss_info_1028_019d, &pci_ss_info_1028_01a2, &pci_ss_info_1028_01ad, + &pci_ss_info_1028_01af, &pci_ss_info_1028_0287, &pci_ss_info_1028_0291, &pci_ss_info_1028_0407, @@ -60277,6 +64531,7 @@ static const pciSubsystemInfo *pci_ss_list_1028[] = { &pci_ss_info_1028_1f01, &pci_ss_info_1028_1f02, &pci_ss_info_1028_1f03, + &pci_ss_info_1028_1f09, &pci_ss_info_1028_1f0a, &pci_ss_info_1028_1f0b, &pci_ss_info_1028_1f0c, @@ -60285,6 +64540,7 @@ static const pciSubsystemInfo *pci_ss_list_1028[] = { &pci_ss_info_1028_4082, &pci_ss_info_1028_4134, &pci_ss_info_1028_8082, + &pci_ss_info_1028_810b, &pci_ss_info_1028_865d, &pci_ss_info_1028_c082, &pci_ss_info_1028_c134, @@ -60310,6 +64566,7 @@ static const pciSubsystemInfo *pci_ss_list_102b[] = { &pci_ss_info_102b_0850, &pci_ss_info_102b_08c7, &pci_ss_info_102b_0907, + &pci_ss_info_102b_0947, &pci_ss_info_102b_0d41, &pci_ss_info_102b_0d42, &pci_ss_info_102b_0d43, @@ -60486,6 +64743,7 @@ static const pciSubsystemInfo *pci_ss_list_103c[] = { &pci_ss_info_103c_088c, &pci_ss_info_103c_0890, &pci_ss_info_103c_08b0, + &pci_ss_info_103c_0934, &pci_ss_info_103c_0944, &pci_ss_info_103c_099c, &pci_ss_info_103c_1040, @@ -60540,6 +64798,7 @@ static const pciSubsystemInfo *pci_ss_list_103c[] = { &pci_ss_info_103c_12d7, &pci_ss_info_103c_12dd, &pci_ss_info_103c_12f4, + &pci_ss_info_103c_12f6, &pci_ss_info_103c_12fa, &pci_ss_info_103c_1300, &pci_ss_info_103c_1301, @@ -60552,6 +64811,7 @@ static const pciSubsystemInfo *pci_ss_list_103c[] = { &pci_ss_info_103c_2a09, &pci_ss_info_103c_2a0d, &pci_ss_info_103c_3006, + &pci_ss_info_103c_3015, &pci_ss_info_103c_3070, &pci_ss_info_103c_308a, &pci_ss_info_103c_308b, @@ -60562,9 +64822,13 @@ static const pciSubsystemInfo *pci_ss_list_103c[] = { &pci_ss_info_103c_3102, &pci_ss_info_103c_3103, &pci_ss_info_103c_3109, + &pci_ss_info_103c_3223, &pci_ss_info_103c_3225, &pci_ss_info_103c_3226, &pci_ss_info_103c_3227, + &pci_ss_info_103c_3234, + &pci_ss_info_103c_3235, + &pci_ss_info_103c_3237, &pci_ss_info_103c_60e7, &pci_ss_info_103c_7031, &pci_ss_info_103c_7032, @@ -60575,6 +64839,8 @@ static const pciSubsystemInfo *pci_ss_list_103c[] = { &pci_ss_info_103c_703c, &pci_ss_info_103c_703d, &pci_ss_info_103c_7044, + &pci_ss_info_103c_7051, + &pci_ss_info_103c_7052, &pci_ss_info_103c_def1, NULL }; @@ -60596,6 +64862,7 @@ static const pciSubsystemInfo *pci_ss_list_1042[] = { #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1043[] = { + &pci_ss_info_1043_0001, &pci_ss_info_1043_002a, &pci_ss_info_1043_010c, &pci_ss_info_1043_010d, @@ -60606,12 +64873,21 @@ static const pciSubsystemInfo *pci_ss_list_1043[] = { &pci_ss_info_1043_0202, &pci_ss_info_1043_0205, &pci_ss_info_1043_0210, + &pci_ss_info_1043_02fb, &pci_ss_info_1043_032e, &pci_ss_info_1043_0c11, &pci_ss_info_1043_100f, + &pci_ss_info_1043_1045, &pci_ss_info_1043_1106, &pci_ss_info_1043_120f, &pci_ss_info_1043_130f, + &pci_ss_info_1043_1382, + &pci_ss_info_1043_13c4, + &pci_ss_info_1043_1453, + &pci_ss_info_1043_1583, + &pci_ss_info_1043_1622, + &pci_ss_info_1043_1623, + &pci_ss_info_1043_1643, &pci_ss_info_1043_1702, &pci_ss_info_1043_1703, &pci_ss_info_1043_1707, @@ -60628,6 +64904,7 @@ static const pciSubsystemInfo *pci_ss_list_1043[] = { &pci_ss_info_1043_400b, &pci_ss_info_1043_4015, &pci_ss_info_1043_4016, + &pci_ss_info_1043_4021, &pci_ss_info_1043_402f, &pci_ss_info_1043_4031, &pci_ss_info_1043_405b, @@ -60684,10 +64961,12 @@ static const pciSubsystemInfo *pci_ss_list_1043[] = { &pci_ss_info_1043_80f8, &pci_ss_info_1043_8109, &pci_ss_info_1043_810f, + &pci_ss_info_1043_8113, &pci_ss_info_1043_811a, &pci_ss_info_1043_812a, &pci_ss_info_1043_8134, &pci_ss_info_1043_8138, + &pci_ss_info_1043_813f, &pci_ss_info_1043_8141, &pci_ss_info_1043_8142, &pci_ss_info_1043_8145, @@ -60695,8 +64974,14 @@ static const pciSubsystemInfo *pci_ss_list_1043[] = { &pci_ss_info_1043_814e, &pci_ss_info_1043_815a, &pci_ss_info_1043_815b, + &pci_ss_info_1043_8178, &pci_ss_info_1043_817b, + &pci_ss_info_1043_819d, &pci_ss_info_1043_81a6, + &pci_ss_info_1043_81b0, + &pci_ss_info_1043_81bc, + &pci_ss_info_1043_81cd, + &pci_ss_info_1043_81ce, &pci_ss_info_1043_824d, &pci_ss_info_1043_c002, &pci_ss_info_1043_c003, @@ -60842,6 +65127,8 @@ static const pciSubsystemInfo *pci_ss_list_104d[] = { &pci_ss_info_104d_810f, &pci_ss_info_104d_813c, &pci_ss_info_104d_8140, + &pci_ss_info_104d_814e, + &pci_ss_info_104d_81b7, &pci_ss_info_104d_830b, NULL }; @@ -60855,7 +65142,12 @@ static const pciSubsystemInfo *pci_ss_list_1050[] = { }; #endif #define pci_ss_list_1051 NULL -#define pci_ss_list_1052 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_1052[] = { + &pci_ss_info_1052_168c, + NULL +}; +#endif #define pci_ss_list_1053 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1054[] = { @@ -60893,6 +65185,7 @@ static const pciSubsystemInfo *pci_ss_list_105a[] = { &pci_ss_info_105a_1275, &pci_ss_info_105a_2168, &pci_ss_info_105a_4600, + &pci_ss_info_105a_4610, &pci_ss_info_105a_4d30, &pci_ss_info_105a_4d33, &pci_ss_info_105a_4d39, @@ -60908,6 +65201,7 @@ static const pciSubsystemInfo *pci_ss_list_105a[] = { static const pciSubsystemInfo *pci_ss_list_105b[] = { &pci_ss_info_105b_0c19, &pci_ss_info_105b_0c43, + &pci_ss_info_105b_0c81, NULL }; #endif @@ -61042,6 +65336,7 @@ static const pciSubsystemInfo *pci_ss_list_107d[] = { &pci_ss_info_107d_2840, &pci_ss_info_107d_2842, &pci_ss_info_107d_2896, + &pci_ss_info_107d_2a68, &pci_ss_info_107d_5330, &pci_ss_info_107d_5350, &pci_ss_info_107d_6606, @@ -61085,7 +65380,12 @@ static const pciSubsystemInfo *pci_ss_list_108d[] = { }; #endif static const pciSubsystemInfo *pci_ss_list_108e[] = { + &pci_ss_info_108e_0286, + &pci_ss_info_108e_0287, &pci_ss_info_108e_10cf, + &pci_ss_info_108e_5000, + &pci_ss_info_108e_7aac, + &pci_ss_info_108e_a001, NULL }; #define pci_ss_list_108f NULL @@ -61350,6 +65650,7 @@ static const pciSubsystemInfo *pci_ss_list_10b7[] = { &pci_ss_info_10b7_5a57, &pci_ss_info_10b7_5b57, &pci_ss_info_10b7_5c57, + &pci_ss_info_10b7_615b, &pci_ss_info_10b7_615c, &pci_ss_info_10b7_6556, &pci_ss_info_10b7_656a, @@ -61474,6 +65775,8 @@ static const pciSubsystemInfo *pci_ss_list_10cf[] = { &pci_ss_info_10cf_10b4, &pci_ss_info_10cf_1115, &pci_ss_info_10cf_1143, + &pci_ss_info_10cf_11c4, + &pci_ss_info_10cf_1279, NULL }; #endif @@ -61502,8 +65805,11 @@ static const pciSubsystemInfo *pci_ss_list_10de[] = { &pci_ss_info_10de_00a1, &pci_ss_info_10de_0179, &pci_ss_info_10de_01dc, + &pci_ss_info_10de_0244, &pci_ss_info_10de_029b, + &pci_ss_info_10de_042b, &pci_ss_info_10de_0c11, + &pci_ss_info_10de_cb84, NULL }; #define pci_ss_list_10df NULL @@ -61531,6 +65837,7 @@ static const pciSubsystemInfo *pci_ss_list_10ec[] = { &pci_ss_info_10ec_8129, &pci_ss_info_10ec_8138, &pci_ss_info_10ec_8139, + &pci_ss_info_10ec_8168, NULL }; #endif @@ -61654,8 +65961,10 @@ static const pciSubsystemInfo *pci_ss_list_1102[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1103[] = { &pci_ss_info_1103_0001, + &pci_ss_info_1103_0003, &pci_ss_info_1103_0004, &pci_ss_info_1103_0005, + &pci_ss_info_1103_0006, NULL }; #endif @@ -61738,6 +66047,7 @@ static const pciSubsystemInfo *pci_ss_list_1113[] = { &pci_ss_info_1113_2220, &pci_ss_info_1113_2242, &pci_ss_info_1113_4203, + &pci_ss_info_1113_8201, &pci_ss_info_1113_9211, &pci_ss_info_1113_d301, &pci_ss_info_1113_ec01, @@ -62088,6 +66398,7 @@ static const pciSubsystemInfo *pci_ss_list_1186[] = { &pci_ss_info_1186_3b01, &pci_ss_info_1186_3b04, &pci_ss_info_1186_3b05, + &pci_ss_info_1186_3b08, &pci_ss_info_1186_3c08, &pci_ss_info_1186_3c09, &pci_ss_info_1186_4c00, @@ -62197,6 +66508,7 @@ static const pciSubsystemInfo *pci_ss_list_11bd[] = { &pci_ss_info_11bd_002b, &pci_ss_info_11bd_002d, &pci_ss_info_11bd_002e, + &pci_ss_info_11bd_0044, NULL }; #endif @@ -62243,6 +66555,7 @@ static const pciSubsystemInfo *pci_ss_list_11cb[] = { static const pciSubsystemInfo *pci_ss_list_11d4[] = { &pci_ss_info_11d4_0040, &pci_ss_info_11d4_0048, + &pci_ss_info_11d4_1986, &pci_ss_info_11d4_5340, NULL }; @@ -63109,6 +67422,7 @@ static const pciSubsystemInfo *pci_ss_list_1397[] = { &pci_ss_info_1397_3137, &pci_ss_info_1397_b520, &pci_ss_info_1397_b540, + &pci_ss_info_1397_b556, NULL }; #endif @@ -63201,8 +67515,11 @@ static const pciSubsystemInfo *pci_ss_list_13c2[] = { &pci_ss_info_13c2_100c, &pci_ss_info_13c2_100f, &pci_ss_info_13c2_1011, + &pci_ss_info_13c2_1012, &pci_ss_info_13c2_1013, &pci_ss_info_13c2_1016, + &pci_ss_info_13c2_1018, + &pci_ss_info_13c2_1019, &pci_ss_info_13c2_1102, NULL }; @@ -63255,6 +67572,7 @@ static const pciSubsystemInfo *pci_ss_list_13cf[] = { static const pciSubsystemInfo *pci_ss_list_13d1[] = { &pci_ss_info_13d1_ab01, &pci_ss_info_13d1_aba0, + &pci_ss_info_13d1_abe3, &pci_ss_info_13d1_ac11, &pci_ss_info_13d1_ac12, NULL @@ -63431,7 +67749,12 @@ static const pciSubsystemInfo *pci_ss_list_1412[] = { NULL }; #endif -#define pci_ss_list_1413 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_1413[] = { + &pci_ss_info_1413_147b, + NULL +}; +#endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1414[] = { &pci_ss_info_1414_0003, @@ -63561,6 +67884,7 @@ static const pciSubsystemInfo *pci_ss_list_144d[] = { &pci_ss_info_144d_c000, &pci_ss_info_144d_c001, &pci_ss_info_144d_c003, + &pci_ss_info_144d_c005, &pci_ss_info_144d_c006, &pci_ss_info_144d_c00c, &pci_ss_info_144d_c018, @@ -63589,6 +67913,7 @@ static const pciSubsystemInfo *pci_ss_list_144f[] = { &pci_ss_info_144f_3000, &pci_ss_info_144f_4005, &pci_ss_info_144f_7050, + &pci_ss_info_144f_7051, NULL }; #endif @@ -63621,6 +67946,8 @@ static const pciSubsystemInfo *pci_ss_list_1458[] = { &pci_ss_info_1458_266a, &pci_ss_info_1458_266f, &pci_ss_info_1458_3124, + &pci_ss_info_1458_3150, + &pci_ss_info_1458_3427, &pci_ss_info_1458_4000, &pci_ss_info_1458_4002, &pci_ss_info_1458_4018, @@ -63641,8 +67968,10 @@ static const pciSubsystemInfo *pci_ss_list_1458[] = { &pci_ss_info_1458_d000, &pci_ss_info_1458_e000, &pci_ss_info_1458_e381, + &pci_ss_info_1458_e901, &pci_ss_info_1458_e911, &pci_ss_info_1458_e931, + &pci_ss_info_1458_e934, NULL }; #endif @@ -63671,6 +68000,7 @@ static const pciSubsystemInfo *pci_ss_list_1461[] = { &pci_ss_info_1461_2c00, &pci_ss_info_1461_8011, &pci_ss_info_1461_9715, + &pci_ss_info_1461_a14b, &pci_ss_info_1461_a3ce, &pci_ss_info_1461_a3cf, &pci_ss_info_1461_a70a, @@ -63684,6 +68014,7 @@ static const pciSubsystemInfo *pci_ss_list_1461[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1462[] = { &pci_ss_info_1462_0080, + &pci_ss_info_1462_030c, &pci_ss_info_1462_0311, &pci_ss_info_1462_0345, &pci_ss_info_1462_0400, @@ -63695,6 +68026,7 @@ static const pciSubsystemInfo *pci_ss_list_1462[] = { &pci_ss_info_1462_0900, &pci_ss_info_1462_1009, &pci_ss_info_1462_207d, + &pci_ss_info_1462_235c, &pci_ss_info_1462_3091, &pci_ss_info_1462_309e, &pci_ss_info_1462_3300, @@ -63717,6 +68049,7 @@ static const pciSubsystemInfo *pci_ss_list_1462[] = { &pci_ss_info_1462_6822, &pci_ss_info_1462_6828, &pci_ss_info_1462_6830, + &pci_ss_info_1462_6833, &pci_ss_info_1462_6835, &pci_ss_info_1462_6880, &pci_ss_info_1462_6900, @@ -63732,9 +68065,14 @@ static const pciSubsystemInfo *pci_ss_list_1462[] = { &pci_ss_info_1462_702d, &pci_ss_info_1462_702e, &pci_ss_info_1462_7030, + &pci_ss_info_1462_7094, &pci_ss_info_1462_7100, + &pci_ss_info_1462_7181, &pci_ss_info_1462_7207, &pci_ss_info_1462_7235, + &pci_ss_info_1462_7236, + &pci_ss_info_1462_7267, + &pci_ss_info_1462_7276, &pci_ss_info_1462_7280, &pci_ss_info_1462_728c, &pci_ss_info_1462_7580, @@ -63753,7 +68091,10 @@ static const pciSubsystemInfo *pci_ss_list_1462[] = { &pci_ss_info_1462_932c, &pci_ss_info_1462_9350, &pci_ss_info_1462_9360, + &pci_ss_info_1462_9380, &pci_ss_info_1462_971d, + &pci_ss_info_1462_b010, + &pci_ss_info_1462_b834, NULL }; #endif @@ -63818,6 +68159,7 @@ static const pciSubsystemInfo *pci_ss_list_147b[] = { &pci_ss_info_147b_1c09, &pci_ss_info_147b_1c0b, &pci_ss_info_147b_1c1a, + &pci_ss_info_147b_6190, &pci_ss_info_147b_6191, &pci_ss_info_147b_8f00, &pci_ss_info_147b_8f09, @@ -63875,7 +68217,12 @@ static const pciSubsystemInfo *pci_ss_list_148c[] = { NULL }; #endif -#define pci_ss_list_148d NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_148d[] = { + &pci_ss_info_148d_1030, + NULL +}; +#endif #define pci_ss_list_148e NULL #define pci_ss_list_148f NULL #define pci_ss_list_1490 NULL @@ -63967,6 +68314,8 @@ static const pciSubsystemInfo *pci_ss_list_14af[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_14b4[] = { &pci_ss_info_14b4_d100, + &pci_ss_info_14b4_d114, + &pci_ss_info_14b4_d140, NULL }; #endif @@ -64254,6 +68603,14 @@ static const pciSubsystemInfo *pci_ss_list_1522[] = { &pci_ss_info_1522_2500, &pci_ss_info_1522_2600, &pci_ss_info_1522_2700, + &pci_ss_info_1522_3000, + &pci_ss_info_1522_3100, + &pci_ss_info_1522_3200, + &pci_ss_info_1522_3300, + &pci_ss_info_1522_3400, + &pci_ss_info_1522_3500, + &pci_ss_info_1522_3c00, + &pci_ss_info_1522_3d00, NULL }; #endif @@ -64288,6 +68645,7 @@ static const pciSubsystemInfo *pci_ss_list_152d[] = { #define pci_ss_list_1533 NULL #define pci_ss_list_1534 NULL #define pci_ss_list_1535 NULL +#define pci_ss_list_1536 NULL #define pci_ss_list_1537 NULL #define pci_ss_list_1538 NULL #define pci_ss_list_1539 NULL @@ -64396,7 +68754,14 @@ static const pciSubsystemInfo *pci_ss_list_1563[] = { }; #endif #define pci_ss_list_1564 NULL -#define pci_ss_list_1565 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_1565[] = { + &pci_ss_info_1565_2300, + &pci_ss_info_1565_3101, + &pci_ss_info_1565_5200, + NULL +}; +#endif #define pci_ss_list_1566 NULL #define pci_ss_list_1567 NULL #define pci_ss_list_1568 NULL @@ -64545,6 +68910,10 @@ static const pciSubsystemInfo *pci_ss_list_15d4[] = { #define pci_ss_list_15d8 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_15d9[] = { + &pci_ss_info_15d9_02b5, + &pci_ss_info_15d9_02b6, + &pci_ss_info_15d9_02c9, + &pci_ss_info_15d9_02ca, &pci_ss_info_15d9_3480, &pci_ss_info_15d9_4580, &pci_ss_info_15d9_9005, @@ -64697,6 +69066,7 @@ static const pciSubsystemInfo *pci_ss_list_1682[] = { static const pciSubsystemInfo *pci_ss_list_168c[] = { &pci_ss_info_168c_0013, &pci_ss_info_168c_001a, + &pci_ss_info_168c_001b, &pci_ss_info_168c_1025, &pci_ss_info_168c_1027, &pci_ss_info_168c_1042, @@ -64705,6 +69075,7 @@ static const pciSubsystemInfo *pci_ss_list_168c[] = { &pci_ss_info_168c_2041, &pci_ss_info_168c_2042, &pci_ss_info_168c_2051, + &pci_ss_info_168c_2052, &pci_ss_info_168c_2062, &pci_ss_info_168c_2063, NULL @@ -64721,6 +69092,7 @@ static const pciSubsystemInfo *pci_ss_list_1695[] = { }; #endif #define pci_ss_list_169c NULL +#define pci_ss_list_169d NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_16a5[] = { &pci_ss_info_16a5_1601, @@ -64805,6 +69177,7 @@ static const pciSubsystemInfo *pci_ss_list_172a[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1734[] = { &pci_ss_info_1734_007a, + &pci_ss_info_1734_1003, &pci_ss_info_1734_1004, &pci_ss_info_1734_1005, &pci_ss_info_1734_100b, @@ -64813,6 +69186,7 @@ static const pciSubsystemInfo *pci_ss_list_1734[] = { &pci_ss_info_1734_1012, &pci_ss_info_1734_101c, &pci_ss_info_1734_1025, + &pci_ss_info_1734_102b, &pci_ss_info_1734_103e, &pci_ss_info_1734_1052, &pci_ss_info_1734_1055, @@ -64824,9 +69198,14 @@ static const pciSubsystemInfo *pci_ss_list_1734[] = { &pci_ss_info_1734_1065, &pci_ss_info_1734_106c, &pci_ss_info_1734_1081, + &pci_ss_info_1734_1091, + &pci_ss_info_1734_1095, + &pci_ss_info_1734_1099, + &pci_ss_info_1734_109f, &pci_ss_info_1734_10a3, &pci_ss_info_1734_10ad, &pci_ss_info_1734_10b8, + &pci_ss_info_1734_10f8, NULL }; #endif @@ -64837,6 +69216,7 @@ static const pciSubsystemInfo *pci_ss_list_1737[] = { &pci_ss_info_1737_0024, &pci_ss_info_1737_0032, &pci_ss_info_1737_0033, + &pci_ss_info_1737_0042, &pci_ss_info_1737_0048, &pci_ss_info_1737_0055, &pci_ss_info_1737_3874, @@ -64890,12 +69270,14 @@ static const pciSubsystemInfo *pci_ss_list_175c[] = { static const pciSubsystemInfo *pci_ss_list_1775[] = { &pci_ss_info_1775_10d0, &pci_ss_info_1775_10d1, + &pci_ss_info_1775_1100, &pci_ss_info_1775_6003, &pci_ss_info_1775_c200, &pci_ss_info_1775_ce90, NULL }; #endif +#define pci_ss_list_177d NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1787[] = { &pci_ss_info_1787_0202, @@ -64944,6 +69326,12 @@ static const pciSubsystemInfo *pci_ss_list_17aa[] = { &pci_ss_info_17aa_201e, &pci_ss_info_17aa_207e, &pci_ss_info_17aa_2081, + &pci_ss_info_17aa_20aa, + &pci_ss_info_17aa_20ab, + &pci_ss_info_17aa_20ac, + &pci_ss_info_17aa_20b1, + &pci_ss_info_17aa_20b9, + &pci_ss_info_17aa_3802, NULL }; #endif @@ -64956,6 +69344,8 @@ static const pciSubsystemInfo *pci_ss_list_17af[] = { &pci_ss_info_17af_200d, &pci_ss_info_17af_2012, &pci_ss_info_17af_2013, + &pci_ss_info_17af_2020, + &pci_ss_info_17af_2021, NULL }; #endif @@ -64970,6 +69360,7 @@ static const pciSubsystemInfo *pci_ss_list_17cf[] = { &pci_ss_info_17cf_0014, &pci_ss_info_17cf_0020, &pci_ss_info_17cf_0037, + &pci_ss_info_17cf_0042, NULL }; #endif @@ -64981,6 +69372,7 @@ static const pciSubsystemInfo *pci_ss_list_17de[] = { &pci_ss_info_17de_08a1, &pci_ss_info_17de_08a6, &pci_ss_info_17de_08b2, + &pci_ss_info_17de_7350, &pci_ss_info_17de_a8a6, NULL }; @@ -65002,6 +69394,7 @@ static const pciSubsystemInfo *pci_ss_list_17f2[] = { NULL }; #endif +#define pci_ss_list_17f3 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_17fe[] = { &pci_ss_info_17fe_2220, @@ -65042,6 +69435,8 @@ static const pciSubsystemInfo *pci_ss_list_182d[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1849[] = { &pci_ss_info_1849_0571, + &pci_ss_info_1849_0850, + &pci_ss_info_1849_2582, &pci_ss_info_1849_3038, &pci_ss_info_1849_3065, &pci_ss_info_1849_3099, @@ -65112,7 +69507,9 @@ static const pciSubsystemInfo *pci_ss_list_185b[] = { #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_185f[] = { + &pci_ss_info_185f_1012, &pci_ss_info_185f_1220, + &pci_ss_info_185f_1600, &pci_ss_info_185f_2012, &pci_ss_info_185f_22a0, NULL @@ -65120,6 +69517,8 @@ static const pciSubsystemInfo *pci_ss_list_185f[] = { #endif #define pci_ss_list_1864 NULL #define pci_ss_list_1867 NULL +#define pci_ss_list_186c NULL +#define pci_ss_list_1876 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_187e[] = { &pci_ss_info_187e_3406, @@ -65138,6 +69537,7 @@ static const pciSubsystemInfo *pci_ss_list_1885[] = { #define pci_ss_list_1890 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1894[] = { + &pci_ss_info_1894_0020, &pci_ss_info_1894_a006, &pci_ss_info_1894_fe01, NULL @@ -65216,6 +69616,7 @@ static const pciSubsystemInfo *pci_ss_list_1931[] = { #define pci_ss_list_194a NULL #define pci_ss_list_1957 NULL #define pci_ss_list_1958 NULL +#define pci_ss_list_1959 NULL #define pci_ss_list_1966 NULL #define pci_ss_list_1969 NULL #define pci_ss_list_196a NULL @@ -65226,7 +69627,9 @@ static const pciSubsystemInfo *pci_ss_list_196d[] = { NULL }; #endif +#define pci_ss_list_1971 NULL #define pci_ss_list_197b NULL +#define pci_ss_list_1982 NULL #define pci_ss_list_1989 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_1993[] = { @@ -65237,17 +69640,28 @@ static const pciSubsystemInfo *pci_ss_list_1993[] = { }; #endif #define pci_ss_list_199a NULL +#define pci_ss_list_19a2 NULL #define pci_ss_list_19a8 NULL #define pci_ss_list_19ac NULL #define pci_ss_list_19ae NULL #define pci_ss_list_19d4 NULL +#define pci_ss_list_19de NULL #define pci_ss_list_19e2 NULL #define pci_ss_list_19e7 NULL #define pci_ss_list_1a03 NULL +#define pci_ss_list_1a07 NULL #define pci_ss_list_1a08 NULL #define pci_ss_list_1a1d NULL +#define pci_ss_list_1a22 NULL #define pci_ss_list_1a29 NULL #define pci_ss_list_1a51 NULL +#define pci_ss_list_1a5d NULL +#define pci_ss_list_1a71 NULL +#define pci_ss_list_1a73 NULL +#define pci_ss_list_1a77 NULL +#define pci_ss_list_1a78 NULL +#define pci_ss_list_1a8c NULL +#define pci_ss_list_1ab9 NULL #define pci_ss_list_1b13 NULL #define pci_ss_list_1c1c NULL #define pci_ss_list_1d44 NULL @@ -65321,7 +69735,12 @@ static const pciSubsystemInfo *pci_ss_list_3388[] = { #endif #define pci_ss_list_3411 NULL #define pci_ss_list_3513 NULL -#define pci_ss_list_3842 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_3842[] = { + &pci_ss_info_3842_a341, + NULL +}; +#endif #define pci_ss_list_38ef NULL static const pciSubsystemInfo *pci_ss_list_3d3d[] = { &pci_ss_info_3d3d_0100, @@ -65343,16 +69762,21 @@ static const pciSubsystemInfo *pci_ss_list_4005[] = { NULL }; #define pci_ss_list_4033 NULL +#define pci_ss_list_4040 NULL #define pci_ss_list_4143 NULL #define pci_ss_list_4144 NULL #define pci_ss_list_416c NULL #define pci_ss_list_4321 NULL +#define pci_ss_list_434e NULL #define pci_ss_list_4444 NULL #define pci_ss_list_4468 NULL #define pci_ss_list_4594 NULL #define pci_ss_list_45fb NULL #define pci_ss_list_4680 NULL -#define pci_ss_list_4843 NULL +static const pciSubsystemInfo *pci_ss_list_4843[] = { + &pci_ss_info_4843_314a, + NULL +}; #define pci_ss_list_4916 NULL #define pci_ss_list_4943 NULL #define pci_ss_list_494f NULL @@ -65396,6 +69820,7 @@ static const pciSubsystemInfo *pci_ss_list_4c53[] = { #define pci_ss_list_4ca1 NULL #define pci_ss_list_4d51 NULL #define pci_ss_list_4d54 NULL +#define pci_ss_list_4d56 NULL #define pci_ss_list_4ddc NULL #define pci_ss_list_5046 NULL #ifdef VENDOR_INCLUDE_NONVIDEO @@ -65426,6 +69851,7 @@ static const pciSubsystemInfo *pci_ss_list_5168[] = { #endif #define pci_ss_list_5301 NULL static const pciSubsystemInfo *pci_ss_list_5333[] = { + &pci_ss_info_5333_0130, &pci_ss_info_5333_8100, &pci_ss_info_5333_8110, &pci_ss_info_5333_8125, @@ -65445,6 +69871,7 @@ static const pciSubsystemInfo *pci_ss_list_5333[] = { }; #define pci_ss_list_544c NULL #define pci_ss_list_5455 NULL +#define pci_ss_list_5456 NULL #define pci_ss_list_5519 NULL #define pci_ss_list_5544 NULL #define pci_ss_list_5555 NULL @@ -65458,6 +69885,7 @@ static const pciSubsystemInfo *pci_ss_list_5654[] = { #endif #define pci_ss_list_5700 NULL #define pci_ss_list_5851 NULL +#define pci_ss_list_5853 NULL #define pci_ss_list_6356 NULL #define pci_ss_list_6374 NULL #define pci_ss_list_6409 NULL @@ -65519,6 +69947,7 @@ static const pciSubsystemInfo *pci_ss_list_8086[] = { &pci_ss_info_8086_0079, &pci_ss_info_8086_007b, &pci_ss_info_8086_0100, + &pci_ss_info_8086_0136, &pci_ss_info_8086_01af, &pci_ss_info_8086_01c1, &pci_ss_info_8086_01f7, @@ -65532,8 +69961,11 @@ static const pciSubsystemInfo *pci_ss_list_8086[] = { &pci_ss_info_8086_1003, &pci_ss_info_8086_1004, &pci_ss_info_8086_1005, + &pci_ss_info_8086_1006, &pci_ss_info_8086_1009, + &pci_ss_info_8086_100a, &pci_ss_info_8086_100c, + &pci_ss_info_8086_1010, &pci_ss_info_8086_1011, &pci_ss_info_8086_1012, &pci_ss_info_8086_1013, @@ -65550,6 +69982,7 @@ static const pciSubsystemInfo *pci_ss_list_8086[] = { &pci_ss_info_8086_1028, &pci_ss_info_8086_1030, &pci_ss_info_8086_1034, + &pci_ss_info_8086_103d, &pci_ss_info_8086_1040, &pci_ss_info_8086_1041, &pci_ss_info_8086_1042, @@ -65581,6 +70014,7 @@ static const pciSubsystemInfo *pci_ss_list_8086[] = { &pci_ss_info_8086_1107, &pci_ss_info_8086_1109, &pci_ss_info_8086_110d, + &pci_ss_info_8086_1110, &pci_ss_info_8086_1112, &pci_ss_info_8086_1113, &pci_ss_info_8086_115e, @@ -65645,10 +70079,14 @@ static const pciSubsystemInfo *pci_ss_list_8086[] = { &pci_ss_info_8086_2411, &pci_ss_info_8086_2412, &pci_ss_info_8086_2413, + &pci_ss_info_8086_24c2, + &pci_ss_info_8086_24c5, &pci_ss_info_8086_24db, + &pci_ss_info_8086_2510, &pci_ss_info_8086_2513, &pci_ss_info_8086_2522, &pci_ss_info_8086_2527, + &pci_ss_info_8086_2561, &pci_ss_info_8086_2581, &pci_ss_info_8086_265c, &pci_ss_info_8086_2731, @@ -65674,6 +70112,7 @@ static const pciSubsystemInfo *pci_ss_list_8086[] = { &pci_ss_info_8086_302f, &pci_ss_info_8086_3063, &pci_ss_info_8086_308d, + &pci_ss_info_8086_309c, &pci_ss_info_8086_3108, &pci_ss_info_8086_3411, &pci_ss_info_8086_3424, @@ -65720,6 +70159,8 @@ static const pciSubsystemInfo *pci_ss_list_8086[] = { &pci_ss_info_8086_e002, NULL }; +#define pci_ss_list_80ee NULL +#define pci_ss_list_8384 NULL #define pci_ss_list_8401 NULL #define pci_ss_list_8686 NULL #define pci_ss_list_8800 NULL @@ -65781,6 +70222,8 @@ static const pciSubsystemInfo *pci_ss_list_9005[] = { &pci_ss_info_9005_0003, &pci_ss_info_9005_000f, &pci_ss_info_9005_0041, + &pci_ss_info_9005_0044, + &pci_ss_info_9005_0045, &pci_ss_info_9005_0092, &pci_ss_info_9005_0093, &pci_ss_info_9005_0106, @@ -65829,6 +70272,23 @@ static const pciSubsystemInfo *pci_ss_list_9005[] = { &pci_ss_info_9005_02b5, &pci_ss_info_9005_02b6, &pci_ss_info_9005_02b7, + &pci_ss_info_9005_02b8, + &pci_ss_info_9005_02b9, + &pci_ss_info_9005_02ba, + &pci_ss_info_9005_02bb, + &pci_ss_info_9005_02bc, + &pci_ss_info_9005_02bd, + &pci_ss_info_9005_02be, + &pci_ss_info_9005_02bf, + &pci_ss_info_9005_02c0, + &pci_ss_info_9005_02c1, + &pci_ss_info_9005_02c2, + &pci_ss_info_9005_02c3, + &pci_ss_info_9005_02c4, + &pci_ss_info_9005_02c5, + &pci_ss_info_9005_02c6, + &pci_ss_info_9005_02c7, + &pci_ss_info_9005_02c8, &pci_ss_info_9005_0364, &pci_ss_info_9005_0365, &pci_ss_info_9005_0410, @@ -65871,12 +70331,15 @@ static const pciSubsystemInfo *pci_ss_list_a0a0[] = { &pci_ss_info_a0a0_01b6, &pci_ss_info_a0a0_0304, &pci_ss_info_a0a0_0306, + &pci_ss_info_a0a0_0342, &pci_ss_info_a0a0_03b2, &pci_ss_info_a0a0_03b4, &pci_ss_info_a0a0_03b5, &pci_ss_info_a0a0_03b9, &pci_ss_info_a0a0_03ba, &pci_ss_info_a0a0_03bb, + &pci_ss_info_a0a0_0449, + &pci_ss_info_a0a0_04ad, &pci_ss_info_a0a0_0506, &pci_ss_info_a0a0_0509, NULL @@ -65892,7 +70355,12 @@ static const pciSubsystemInfo *pci_ss_list_a304[] = { NULL }; #endif -#define pci_ss_list_a727 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciSubsystemInfo *pci_ss_list_a727[] = { + &pci_ss_info_a727_6804, + NULL +}; +#endif #define pci_ss_list_aa42 NULL #define pci_ss_list_ac1e NULL #define pci_ss_list_ac3d NULL @@ -65956,11 +70424,16 @@ static const pciSubsystemInfo *pci_ss_list_dead[] = { #define pci_ss_list_e159 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciSubsystemInfo *pci_ss_list_e4bf[] = { + &pci_ss_info_e4bf_0cc9, + &pci_ss_info_e4bf_0ccd, + &pci_ss_info_e4bf_0cd2, + &pci_ss_info_e4bf_0cd3, &pci_ss_info_e4bf_1000, &pci_ss_info_e4bf_1010, &pci_ss_info_e4bf_1020, &pci_ss_info_e4bf_1040, &pci_ss_info_e4bf_3100, + &pci_ss_info_e4bf_58b1, NULL }; #endif @@ -66300,6 +70773,17 @@ static const pciDeviceInfo pci_dev_info_050d_705c = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_058f_9254 = { + 0x9254, pci_device_058f_9254, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_058f_9254, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_05a9_8519 = { 0x8519, pci_device_05a9_8519, #ifdef INIT_SUBSYS_INFO @@ -66449,6 +70933,15 @@ static const pciDeviceInfo pci_dev_info_093a_2468 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_093a_2600 = { + 0x2600, pci_device_093a_2600, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_093a_2600, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_093a_2603 = { 0x2603, pci_device_093a_2603, #ifdef INIT_SUBSYS_INFO @@ -67721,6 +72214,15 @@ static const pciDeviceInfo pci_dev_info_1000_0056 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1000_0057 = { + 0x0057, pci_device_1000_0057, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1000_0057, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1000_0058 = { 0x0058, pci_device_1000_0058, #ifdef INIT_SUBSYS_INFO @@ -71396,6 +75898,15 @@ static const pciDeviceInfo pci_dev_info_1002_7166 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1002_716e = { + 0x716e, pci_device_1002_716e, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1002_716e, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1002_7172 = { 0x7172, pci_device_1002_7172, #ifdef INIT_SUBSYS_INFO @@ -71621,6 +76132,15 @@ static const pciDeviceInfo pci_dev_info_1002_71ce = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1002_71d4 = { + 0x71d4, pci_device_1002_71d4, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1002_71d4, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1002_71d5 = { 0x71d5, pci_device_1002_71d5, #ifdef INIT_SUBSYS_INFO @@ -71666,6 +76186,15 @@ static const pciDeviceInfo pci_dev_info_1002_71e2 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1002_71e6 = { + 0x71e6, pci_device_1002_71e6, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1002_71e6, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1002_71e7 = { 0x71e7, pci_device_1002_71e7, #ifdef INIT_SUBSYS_INFO @@ -71963,6 +76492,15 @@ static const pciDeviceInfo pci_dev_info_1002_7838 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1002_7919 = { + 0x7919, pci_device_1002_7919, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1002_7919, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1002_791e = { 0x791e, pci_device_1002_791e, #ifdef INIT_SUBSYS_INFO @@ -73714,6 +78252,15 @@ static const pciDeviceInfo pci_dev_info_1014_01e6 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1014_01ef = { + 0x01ef, pci_device_1014_01ef, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_01ef, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1014_01ff = { 0x01ff, pci_device_1014_01ff, #ifdef INIT_SUBSYS_INFO @@ -73840,6 +78387,15 @@ static const pciDeviceInfo pci_dev_info_1014_0314 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1014_0339 = { + 0x0339, pci_device_1014_0339, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1014_0339, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1014_3022 = { 0x3022, pci_device_1014_3022, #ifdef INIT_SUBSYS_INFO @@ -73889,6 +78445,15 @@ static const pciDeviceInfo pci_dev_info_101a_0005 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_101a_1dc1 = { + 0x1dc1, pci_device_101a_1dc1, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_101a_1dc1, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_101c_0193 = { @@ -74119,6 +78684,96 @@ static const pciDeviceInfo pci_dev_info_1022_1103 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1022_1200 = { + 0x1200, pci_device_1022_1200, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1022_1200, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1022_1201 = { + 0x1201, pci_device_1022_1201, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1022_1201, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1022_1202 = { + 0x1202, pci_device_1022_1202, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1022_1202, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1022_1203 = { + 0x1203, pci_device_1022_1203, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1022_1203, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1022_1204 = { + 0x1204, pci_device_1022_1204, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1022_1204, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1022_1300 = { + 0x1300, pci_device_1022_1300, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1022_1300, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1022_1301 = { + 0x1301, pci_device_1022_1301, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1022_1301, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1022_1302 = { + 0x1302, pci_device_1022_1302, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1022_1302, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1022_1303 = { + 0x1303, pci_device_1022_1303, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1022_1303, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1022_1304 = { + 0x1304, pci_device_1022_1304, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1022_1304, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1022_2000 = { 0x2000, pci_device_1022_2000, #ifdef INIT_SUBSYS_INFO @@ -75721,15 +80376,6 @@ static const pciDeviceInfo pci_dev_info_1028_0015 = { #endif 0 }; -static const pciDeviceInfo pci_dev_info_1028_1f03 = { - 0x1f03, pci_device_1028_1f03, -#ifdef INIT_SUBSYS_INFO - pci_ss_list_1028_1f03, -#else - NULL, -#endif - 0 -}; #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_102a_0000 = { 0x0000, pci_device_102a_0000, @@ -77907,6 +82553,15 @@ static const pciDeviceInfo pci_dev_info_103c_1303 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_103c_1361 = { + 0x1361, pci_device_103c_1361, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_103c_1361, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_103c_2910 = { 0x2910, pci_device_103c_2910, #ifdef INIT_SUBSYS_INFO @@ -77970,6 +82625,15 @@ static const pciDeviceInfo pci_dev_info_103c_3230 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_103c_3238 = { + 0x3238, pci_device_103c_3238, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_103c_3238, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_103c_4030 = { 0x4030, pci_device_103c_4030, #ifdef INIT_SUBSYS_INFO @@ -79668,6 +84332,26 @@ static const pciDeviceInfo pci_dev_info_1050_9970 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_1054_3011 = { + 0x3011, pci_device_1054_3011, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1054_3011, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1054_3012 = { + 0x3012, pci_device_1054_3012, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1054_3012, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_1055_9130 = { 0x9130, pci_device_1055_9130, #ifdef INIT_SUBSYS_INFO @@ -79795,6 +84479,24 @@ static const pciDeviceInfo pci_dev_info_1057_0431 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1057_1073 = { + 0x1073, pci_device_1057_1073, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1057_1073, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1057_1219 = { + 0x1219, pci_device_1057_1219, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1057_1219, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1057_1801 = { 0x1801, pci_device_1057_1801, #ifdef INIT_SUBSYS_INFO @@ -80328,6 +85030,17 @@ static const pciDeviceInfo pci_dev_info_105a_e350 = { 0 }; #endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_105b_0c4d = { + 0x0c4d, pci_device_105b_0c4d, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_105b_0c4d, +#else + NULL, +#endif + 0 +}; +#endif static const pciDeviceInfo pci_dev_info_105d_2309 = { 0x2309, pci_device_105d_2309, #ifdef INIT_SUBSYS_INFO @@ -82364,6 +87077,24 @@ static const pciDeviceInfo pci_dev_info_108e_5043 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_108e_676e = { + 0x676e, pci_device_108e_676e, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_108e_676e, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_108e_7063 = { + 0x7063, pci_device_108e_7063, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_108e_7063, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_108e_8000 = { 0x8000, pci_device_108e_8000, #ifdef INIT_SUBSYS_INFO @@ -83827,6 +88558,15 @@ static const pciDeviceInfo pci_dev_info_10b5_2724 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10b5_6520 = { + 0x6520, pci_device_10b5_6520, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10b5_6520, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10b5_6540 = { 0x6540, pci_device_10b5_6540, #ifdef INIT_SUBSYS_INFO @@ -86574,6 +91314,15 @@ static const pciDeviceInfo pci_dev_info_10de_0093 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_0095 = { + 0x0095, pci_device_10de_0095, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0095, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_0098 = { 0x0098, pci_device_10de_0098, #ifdef INIT_SUBSYS_INFO @@ -87141,6 +91890,15 @@ static const pciDeviceInfo pci_dev_info_10de_0142 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_0143 = { + 0x0143, pci_device_10de_0143, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0143, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_0144 = { 0x0144, pci_device_10de_0144, #ifdef INIT_SUBSYS_INFO @@ -87366,6 +92124,15 @@ static const pciDeviceInfo pci_dev_info_10de_0169 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_016a = { + 0x016a, pci_device_10de_016a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_016a, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_0170 = { 0x0170, pci_device_10de_0170, #ifdef INIT_SUBSYS_INFO @@ -87519,6 +92286,15 @@ static const pciDeviceInfo pci_dev_info_10de_0183 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_0184 = { + 0x0184, pci_device_10de_0184, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0184, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_0185 = { 0x0185, pci_device_10de_0185, #ifdef INIT_SUBSYS_INFO @@ -87591,6 +92367,51 @@ static const pciDeviceInfo pci_dev_info_10de_018d = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_0191 = { + 0x0191, pci_device_10de_0191, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0191, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0193 = { + 0x0193, pci_device_10de_0193, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0193, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0194 = { + 0x0194, pci_device_10de_0194, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0194, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_019d = { + 0x019d, pci_device_10de_019d, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_019d, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_019e = { + 0x019e, pci_device_10de_019e, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_019e, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_01a0 = { 0x01a0, pci_device_10de_01a0, #ifdef INIT_SUBSYS_INFO @@ -87735,6 +92556,15 @@ static const pciDeviceInfo pci_dev_info_10de_01d1 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_01d3 = { + 0x01d3, pci_device_10de_01d3, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_01d3, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_01d6 = { 0x01d6, pci_device_10de_01d6, #ifdef INIT_SUBSYS_INFO @@ -87771,6 +92601,24 @@ static const pciDeviceInfo pci_dev_info_10de_01da = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_01dc = { + 0x01dc, pci_device_10de_01dc, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_01dc, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_01dd = { + 0x01dd, pci_device_10de_01dd, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_01dd, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_01de = { 0x01de, pci_device_10de_01de, #ifdef INIT_SUBSYS_INFO @@ -87951,6 +92799,15 @@ static const pciDeviceInfo pci_dev_info_10de_0221 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_0222 = { + 0x0222, pci_device_10de_0222, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0222, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_0240 = { 0x0240, pci_device_10de_0240, #ifdef INIT_SUBSYS_INFO @@ -88437,6 +93294,42 @@ static const pciDeviceInfo pci_dev_info_10de_0292 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_0293 = { + 0x0293, pci_device_10de_0293, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0293, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0294 = { + 0x0294, pci_device_10de_0294, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0294, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0295 = { + 0x0295, pci_device_10de_0295, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0295, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0297 = { + 0x0297, pci_device_10de_0297, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0297, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_0298 = { 0x0298, pci_device_10de_0298, #ifdef INIT_SUBSYS_INFO @@ -88518,6 +93411,15 @@ static const pciDeviceInfo pci_dev_info_10de_02a0 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_02e0 = { + 0x02e0, pci_device_10de_02e0, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_02e0, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_02e1 = { 0x02e1, pci_device_10de_02e1, #ifdef INIT_SUBSYS_INFO @@ -88527,6 +93429,15 @@ static const pciDeviceInfo pci_dev_info_10de_02e1 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_02e2 = { + 0x02e2, pci_device_10de_02e2, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_02e2, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_02f0 = { 0x02f0, pci_device_10de_02f0, #ifdef INIT_SUBSYS_INFO @@ -89355,6 +94266,15 @@ static const pciDeviceInfo pci_dev_info_10de_037a = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_037c = { + 0x037c, pci_device_10de_037c, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_037c, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_037e = { 0x037e, pci_device_10de_037e, #ifdef INIT_SUBSYS_INFO @@ -89373,6 +94293,15 @@ static const pciDeviceInfo pci_dev_info_10de_037f = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_0390 = { + 0x0390, pci_device_10de_0390, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0390, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_0391 = { 0x0391, pci_device_10de_0391, #ifdef INIT_SUBSYS_INFO @@ -89400,6 +94329,33 @@ static const pciDeviceInfo pci_dev_info_10de_0393 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_0394 = { + 0x0394, pci_device_10de_0394, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0394, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0395 = { + 0x0395, pci_device_10de_0395, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0395, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0397 = { + 0x0397, pci_device_10de_0397, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0397, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_0398 = { 0x0398, pci_device_10de_0398, #ifdef INIT_SUBSYS_INFO @@ -89409,6 +94365,42 @@ static const pciDeviceInfo pci_dev_info_10de_0398 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_0399 = { + 0x0399, pci_device_10de_0399, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0399, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_039a = { + 0x039a, pci_device_10de_039a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_039a, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_039b = { + 0x039b, pci_device_10de_039b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_039b, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_039c = { + 0x039c, pci_device_10de_039c, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_039c, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_039e = { 0x039e, pci_device_10de_039e, #ifdef INIT_SUBSYS_INFO @@ -89913,6 +94905,132 @@ static const pciDeviceInfo pci_dev_info_10de_03f7 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_0400 = { + 0x0400, pci_device_10de_0400, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0400, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0402 = { + 0x0402, pci_device_10de_0402, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0402, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0407 = { + 0x0407, pci_device_10de_0407, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0407, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_040b = { + 0x040b, pci_device_10de_040b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_040b, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0421 = { + 0x0421, pci_device_10de_0421, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0421, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0422 = { + 0x0422, pci_device_10de_0422, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0422, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0423 = { + 0x0423, pci_device_10de_0423, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0423, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0425 = { + 0x0425, pci_device_10de_0425, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0425, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0426 = { + 0x0426, pci_device_10de_0426, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0426, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0427 = { + 0x0427, pci_device_10de_0427, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0427, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0428 = { + 0x0428, pci_device_10de_0428, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0428, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_0429 = { + 0x0429, pci_device_10de_0429, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_0429, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_042a = { + 0x042a, pci_device_10de_042a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_042a, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_042b = { + 0x042b, pci_device_10de_042b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_042b, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10de_0440 = { 0x0440, pci_device_10de_0440, #ifdef INIT_SUBSYS_INFO @@ -90192,6 +95310,33 @@ static const pciDeviceInfo pci_dev_info_10de_045f = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10de_055c = { + 0x055c, pci_device_10de_055c, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_055c, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_055d = { + 0x055d, pci_device_10de_055d, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_055d, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10de_c615 = { + 0xc615, pci_device_10de_c615, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10de_c615, +#else + NULL, +#endif + 0 +}; #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_10df_1ae5 = { 0x1ae5, pci_device_10df_1ae5, @@ -90202,6 +95347,24 @@ static const pciDeviceInfo pci_dev_info_10df_1ae5 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10df_f011 = { + 0xf011, pci_device_10df_f011, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10df_f011, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10df_f015 = { + 0xf015, pci_device_10df_f015, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10df_f015, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10df_f085 = { 0xf085, pci_device_10df_f085, #ifdef INIT_SUBSYS_INFO @@ -90301,6 +95464,15 @@ static const pciDeviceInfo pci_dev_info_10df_f0f5 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10df_f100 = { + 0xf100, pci_device_10df_f100, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10df_f100, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10df_f700 = { 0xf700, pci_device_10df_f700, #ifdef INIT_SUBSYS_INFO @@ -90427,6 +95599,15 @@ static const pciDeviceInfo pci_dev_info_10df_fc20 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10df_fc40 = { + 0xfc40, pci_device_10df_fc40, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10df_fc40, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10df_fd00 = { 0xfd00, pci_device_10df_fd00, #ifdef INIT_SUBSYS_INFO @@ -90741,6 +95922,15 @@ static const pciDeviceInfo pci_dev_info_10e8_80da = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10e8_80fc = { + 0x80fc, pci_device_10e8_80fc, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10e8_80fc, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10e8_811a = { 0x811a, pci_device_10e8_811a, #ifdef INIT_SUBSYS_INFO @@ -90777,6 +95967,15 @@ static const pciDeviceInfo pci_dev_info_10e8_81e6 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10e8_828d = { + 0x828d, pci_device_10e8_828d, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10e8_828d, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10e8_8291 = { 0x8291, pci_device_10e8_8291, #ifdef INIT_SUBSYS_INFO @@ -90849,6 +96048,24 @@ static const pciDeviceInfo pci_dev_info_10e8_82e2 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10e8_8406 = { + 0x8406, pci_device_10e8_8406, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10e8_8406, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10e8_8407 = { + 0x8407, pci_device_10e8_8407, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10e8_8407, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10e8_8851 = { 0x8851, pci_device_10e8_8851, #ifdef INIT_SUBSYS_INFO @@ -90970,6 +96187,60 @@ static const pciDeviceInfo pci_dev_info_10ec_0139 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10ec_0260 = { + 0x0260, pci_device_10ec_0260, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10ec_0260, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10ec_0261 = { + 0x0261, pci_device_10ec_0261, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10ec_0261, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10ec_0280 = { + 0x0280, pci_device_10ec_0280, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10ec_0280, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10ec_0861 = { + 0x0861, pci_device_10ec_0861, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10ec_0861, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10ec_0862 = { + 0x0862, pci_device_10ec_0862, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10ec_0862, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_10ec_0880 = { + 0x0880, pci_device_10ec_0880, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10ec_0880, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10ec_0883 = { 0x0883, pci_device_10ec_0883, #ifdef INIT_SUBSYS_INFO @@ -90979,6 +96250,15 @@ static const pciDeviceInfo pci_dev_info_10ec_0883 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10ec_0888 = { + 0x0888, pci_device_10ec_0888, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10ec_0888, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10ec_8029 = { 0x8029, pci_device_10ec_8029, #ifdef INIT_SUBSYS_INFO @@ -91199,6 +96479,15 @@ static const pciDeviceInfo pci_dev_info_10ee_3fc6 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_10ee_8380 = { + 0x8380, pci_device_10ee_8380, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_10ee_8380, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_10ee_8381 = { 0x8381, pci_device_10ee_8381, #ifdef INIT_SUBSYS_INFO @@ -91541,6 +96830,15 @@ static const pciDeviceInfo pci_dev_info_1103_0009 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1103_2340 = { + 0x2340, pci_device_1103_2340, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1103_2340, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_1105_1105 = { @@ -91653,6 +96951,15 @@ static const pciDeviceInfo pci_dev_info_1106_0130 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1106_0198 = { + 0x0198, pci_device_1106_0198, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1106_0198, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1106_0204 = { 0x0204, pci_device_1106_0204, #ifdef INIT_SUBSYS_INFO @@ -92211,6 +97518,15 @@ static const pciDeviceInfo pci_dev_info_1106_1595 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1106_2106 = { + 0x2106, pci_device_1106_2106, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1106_2106, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1106_2204 = { 0x2204, pci_device_1106_2204, #ifdef INIT_SUBSYS_INFO @@ -92742,6 +98058,15 @@ static const pciDeviceInfo pci_dev_info_1106_3156 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1106_3157 = { + 0x3157, pci_device_1106_3157, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1106_3157, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1106_3164 = { 0x3164, pci_device_1106_3164, #ifdef INIT_SUBSYS_INFO @@ -92850,6 +98175,15 @@ static const pciDeviceInfo pci_dev_info_1106_3227 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1106_3230 = { + 0x3230, pci_device_1106_3230, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1106_3230, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1106_3238 = { 0x3238, pci_device_1106_3238, #ifdef INIT_SUBSYS_INFO @@ -92913,6 +98247,15 @@ static const pciDeviceInfo pci_dev_info_1106_3259 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1106_3260 = { + 0x3260, pci_device_1106_3260, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1106_3260, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1106_3269 = { 0x3269, pci_device_1106_3269, #ifdef INIT_SUBSYS_INFO @@ -93012,6 +98355,15 @@ static const pciDeviceInfo pci_dev_info_1106_3340 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1106_3343 = { + 0x3343, pci_device_1106_3343, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1106_3343, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1106_3344 = { 0x3344, pci_device_1106_3344, #ifdef INIT_SUBSYS_INFO @@ -93048,6 +98400,24 @@ static const pciDeviceInfo pci_dev_info_1106_3364 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1106_3371 = { + 0x3371, pci_device_1106_3371, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1106_3371, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1106_3372 = { + 0x3372, pci_device_1106_3372, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1106_3372, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1106_337a = { 0x337a, pci_device_1106_337a, #ifdef INIT_SUBSYS_INFO @@ -93282,6 +98652,15 @@ static const pciDeviceInfo pci_dev_info_1106_5308 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1106_5324 = { + 0x5324, pci_device_1106_5324, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1106_5324, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1106_5327 = { 0x5327, pci_device_1106_5327, #ifdef INIT_SUBSYS_INFO @@ -93336,6 +98715,15 @@ static const pciDeviceInfo pci_dev_info_1106_6100 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1106_6287 = { + 0x6287, pci_device_1106_6287, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1106_6287, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1106_6327 = { 0x6327, pci_device_1106_6327, #ifdef INIT_SUBSYS_INFO @@ -93345,6 +98733,15 @@ static const pciDeviceInfo pci_dev_info_1106_6327 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1106_6364 = { + 0x6364, pci_device_1106_6364, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1106_6364, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1106_7204 = { 0x7204, pci_device_1106_7204, #ifdef INIT_SUBSYS_INFO @@ -94548,42 +99945,6 @@ static const pciDeviceInfo pci_dev_info_1119_000d = { #endif 0 }; -static const pciDeviceInfo pci_dev_info_1119_0010 = { - 0x0010, pci_device_1119_0010, -#ifdef INIT_SUBSYS_INFO - pci_ss_list_1119_0010, -#else - NULL, -#endif - 0 -}; -static const pciDeviceInfo pci_dev_info_1119_0011 = { - 0x0011, pci_device_1119_0011, -#ifdef INIT_SUBSYS_INFO - pci_ss_list_1119_0011, -#else - NULL, -#endif - 0 -}; -static const pciDeviceInfo pci_dev_info_1119_0012 = { - 0x0012, pci_device_1119_0012, -#ifdef INIT_SUBSYS_INFO - pci_ss_list_1119_0012, -#else - NULL, -#endif - 0 -}; -static const pciDeviceInfo pci_dev_info_1119_0013 = { - 0x0013, pci_device_1119_0013, -#ifdef INIT_SUBSYS_INFO - pci_ss_list_1119_0013, -#else - NULL, -#endif - 0 -}; static const pciDeviceInfo pci_dev_info_1119_0100 = { 0x0100, pci_device_1119_0100, #ifdef INIT_SUBSYS_INFO @@ -95088,6 +100449,15 @@ static const pciDeviceInfo pci_dev_info_1119_0300 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1119_0301 = { + 0x0301, pci_device_1119_0301, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1119_0301, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_111a_0000 = { @@ -95835,6 +101205,15 @@ static const pciDeviceInfo pci_dev_info_1133_e02c = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1133_e032 = { + 0xe032, pci_device_1133_e032, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1133_e032, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_1134_0001 = { @@ -96352,6 +101731,15 @@ static const pciDeviceInfo pci_dev_info_114f_0012 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_114f_0013 = { + 0x0013, pci_device_114f_0013, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_114f_0013, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_114f_0014 = { 0x0014, pci_device_114f_0014, #ifdef INIT_SUBSYS_INFO @@ -97181,6 +102569,24 @@ static const pciDeviceInfo pci_dev_info_1166_0234 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1166_0235 = { + 0x0235, pci_device_1166_0235, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1166_0235, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1166_0238 = { + 0x0238, pci_device_1166_0238, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1166_0238, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1166_0240 = { 0x0240, pci_device_1166_0240, #ifdef INIT_SUBSYS_INFO @@ -97569,6 +102975,15 @@ static const pciDeviceInfo pci_dev_info_1180_0822 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1180_0832 = { + 0x0832, pci_device_1180_0832, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1180_0832, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1180_0841 = { 0x0841, pci_device_1180_0841, #ifdef INIT_SUBSYS_INFO @@ -98284,6 +103699,24 @@ static const pciDeviceInfo pci_dev_info_11ab_0146 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_11ab_0f53 = { + 0x0f53, pci_device_11ab_0f53, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_11ab_0f53, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_11ab_11ab = { + 0x11ab, pci_device_11ab_11ab, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_11ab_11ab, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_11ab_138f = { 0x138f, pci_device_11ab_138f, #ifdef INIT_SUBSYS_INFO @@ -98320,6 +103753,15 @@ static const pciDeviceInfo pci_dev_info_11ab_1faa = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_11ab_2a01 = { + 0x2a01, pci_device_11ab_2a01, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_11ab_2a01, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_11ab_4320 = { 0x4320, pci_device_11ab_4320, #ifdef INIT_SUBSYS_INFO @@ -98464,6 +103906,15 @@ static const pciDeviceInfo pci_dev_info_11ab_4363 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_11ab_4364 = { + 0x4364, pci_device_11ab_4364, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_11ab_4364, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_11ab_4611 = { 0x4611, pci_device_11ab_4611, #ifdef INIT_SUBSYS_INFO @@ -98554,6 +104005,42 @@ static const pciDeviceInfo pci_dev_info_11ab_6081 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_11ab_6101 = { + 0x6101, pci_device_11ab_6101, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_11ab_6101, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_11ab_6141 = { + 0x6141, pci_device_11ab_6141, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_11ab_6141, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_11ab_6145 = { + 0x6145, pci_device_11ab_6145, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_11ab_6145, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_11ab_6450 = { + 0x6450, pci_device_11ab_6450, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_11ab_6450, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_11ab_6460 = { 0x6460, pci_device_11ab_6460, #ifdef INIT_SUBSYS_INFO @@ -98712,6 +104199,33 @@ static const pciDeviceInfo pci_dev_info_11bd_002e = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_11bd_0040 = { + 0x0040, pci_device_11bd_0040, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_11bd_0040, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_11bd_0041 = { + 0x0041, pci_device_11bd_0041, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_11bd_0041, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_11bd_0042 = { + 0x0042, pci_device_11bd_0042, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_11bd_0042, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_11bd_bede = { 0xbede, pci_device_11bd_bede, #ifdef INIT_SUBSYS_INFO @@ -99020,6 +104534,24 @@ static const pciDeviceInfo pci_dev_info_11c1_048f = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_11c1_1040 = { + 0x1040, pci_device_11c1_1040, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_11c1_1040, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_11c1_2600 = { + 0x2600, pci_device_11c1_2600, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_11c1_2600, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_11c1_5801 = { 0x5801, pci_device_11c1_5801, #ifdef INIT_SUBSYS_INFO @@ -99219,6 +104751,15 @@ static const pciDeviceInfo pci_dev_info_11d1_01f7 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_11d4_0078 = { + 0x0078, pci_device_11d4_0078, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_11d4_0078, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_11d4_1535 = { 0x1535, pci_device_11d4_1535, #ifdef INIT_SUBSYS_INFO @@ -99246,6 +104787,24 @@ static const pciDeviceInfo pci_dev_info_11d4_1889 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_11d4_1981 = { + 0x1981, pci_device_11d4_1981, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_11d4_1981, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_11d4_1983 = { + 0x1983, pci_device_11d4_1983, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_11d4_1983, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_11d4_1986 = { 0x1986, pci_device_11d4_1986, #ifdef INIT_SUBSYS_INFO @@ -99255,6 +104814,15 @@ static const pciDeviceInfo pci_dev_info_11d4_1986 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_11d4_198b = { + 0x198b, pci_device_11d4_198b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_11d4_198b, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_11d4_5340 = { 0x5340, pci_device_11d4_5340, #ifdef INIT_SUBSYS_INFO @@ -101440,6 +107008,15 @@ static const pciDeviceInfo pci_dev_info_1283_673a = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1283_8152 = { + 0x8152, pci_device_1283_8152, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1283_8152, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1283_8211 = { 0x8211, pci_device_1283_8211, #ifdef INIT_SUBSYS_INFO @@ -101593,6 +107170,15 @@ static const pciDeviceInfo pci_dev_info_128e_000c = { 0 }; #endif +static const pciDeviceInfo pci_dev_info_1292_fc02 = { + 0xfc02, pci_device_1292_fc02, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1292_fc02, +#else + NULL, +#endif + 0 +}; #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_129a_0615 = { 0x0615, pci_device_129a_0615, @@ -101616,6 +107202,15 @@ static const pciDeviceInfo pci_dev_info_12a3_8105 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_12ab_0000 = { + 0x0000, pci_device_12ab_0000, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_12ab_0000, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_12ab_0002 = { 0x0002, pci_device_12ab_0002, #ifdef INIT_SUBSYS_INFO @@ -101625,6 +107220,15 @@ static const pciDeviceInfo pci_dev_info_12ab_0002 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_12ab_2300 = { + 0x2300, pci_device_12ab_2300, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_12ab_2300, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_12ab_3000 = { 0x3000, pci_device_12ab_3000, #ifdef INIT_SUBSYS_INFO @@ -101634,6 +107238,24 @@ static const pciDeviceInfo pci_dev_info_12ab_3000 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_12ab_fff3 = { + 0xfff3, pci_device_12ab_fff3, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_12ab_fff3, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_12ab_ffff = { + 0xffff, pci_device_12ab_ffff, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_12ab_ffff, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_12ae_0001 = { @@ -102147,6 +107769,15 @@ static const pciDeviceInfo pci_dev_info_12d5_1000 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_12d8_01a7 = { + 0x01a7, pci_device_12d8_01a7, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_12d8_01a7, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_12d8_8150 = { 0x8150, pci_device_12d8_8150, #ifdef INIT_SUBSYS_INFO @@ -104022,6 +109653,24 @@ static const pciDeviceInfo pci_dev_info_1374_003a = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1374_003b = { + 0x003b, pci_device_1374_003b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1374_003b, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1374_003c = { + 0x003c, pci_device_1374_003c, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1374_003c, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_137a_0001 = { @@ -104145,6 +109794,15 @@ static const pciDeviceInfo pci_dev_info_1385_0013 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1385_006b = { + 0x006b, pci_device_1385_006b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1385_006b, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1385_311a = { 0x311a, pci_device_1385_311a, #ifdef INIT_SUBSYS_INFO @@ -104428,6 +110086,15 @@ static const pciDeviceInfo pci_dev_info_1393_1680 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1393_1681 = { + 0x1681, pci_device_1393_1681, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1393_1681, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1393_2040 = { 0x2040, pci_device_1393_2040, #ifdef INIT_SUBSYS_INFO @@ -104495,6 +110162,33 @@ static const pciDeviceInfo pci_dev_info_1397_2bd0 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1397_30b1 = { + 0x30b1, pci_device_1397_30b1, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1397_30b1, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1397_b700 = { + 0xb700, pci_device_1397_b700, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1397_b700, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1397_f001 = { + 0xf001, pci_device_1397_f001, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1397_f001, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_139a_0001 = { @@ -104625,6 +110319,15 @@ static const pciDeviceInfo pci_dev_info_13a3_0026 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_13a3_002e = { + 0x002e, pci_device_13a3_002e, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_13a3_002e, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_13a8_0152 = { @@ -104730,6 +110433,15 @@ static const pciDeviceInfo pci_dev_info_13c1_1003 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_13c1_1004 = { + 0x1004, pci_device_13c1_1004, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_13c1_1004, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_13c2_000e = { @@ -104830,6 +110542,17 @@ static const pciDeviceInfo pci_dev_info_13d1_ab08 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_13d3_3219 = { + 0x3219, pci_device_13d3_3219, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_13d3_3219, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_13df_0001 = { 0x0001, pci_device_13df_0001, #ifdef INIT_SUBSYS_INFO @@ -104937,6 +110660,15 @@ static const pciDeviceInfo pci_dev_info_13f6_0211 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_13f6_9880 = { + 0x9880, pci_device_13f6_9880, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_13f6_9880, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_13fe_1240 = { @@ -105367,6 +111099,15 @@ static const pciDeviceInfo pci_dev_info_1425_000b = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1425_000c = { + 0x000c, pci_device_1425_000c, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1425_000c, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_142e_4020 = { @@ -105586,6 +111327,15 @@ static const pciDeviceInfo pci_dev_info_1458_0c11 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1458_9001 = { + 0x9001, pci_device_1458_9001, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1458_9001, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1458_e911 = { 0xe911, pci_device_1458_e911, #ifdef INIT_SUBSYS_INFO @@ -105608,6 +111358,33 @@ static const pciDeviceInfo pci_dev_info_145f_0001 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_1461_a3ce = { + 0xa3ce, pci_device_1461_a3ce, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1461_a3ce, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1461_a3cf = { + 0xa3cf, pci_device_1461_a3cf, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1461_a3cf, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1461_a836 = { + 0xa836, pci_device_1461_a836, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1461_a836, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1461_f436 = { 0xf436, pci_device_1461_f436, #ifdef INIT_SUBSYS_INFO @@ -105664,6 +111441,24 @@ static const pciDeviceInfo pci_dev_info_1462_7125 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1462_7235 = { + 0x7235, pci_device_1462_7235, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1462_7235, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1462_7242 = { + 0x7242, pci_device_1462_7242, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1462_7242, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1462_8725 = { 0x8725, pci_device_1462_8725, #ifdef INIT_SUBSYS_INFO @@ -105736,6 +111531,15 @@ static const pciDeviceInfo pci_dev_info_1462_9591 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1462_b834 = { + 0xb834, pci_device_1462_b834, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1462_b834, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_146c_1430 = { @@ -106436,6 +112240,24 @@ static const pciDeviceInfo pci_dev_info_14e4_1601 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_14e4_1639 = { + 0x1639, pci_device_14e4_1639, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_14e4_1639, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_14e4_163a = { + 0x163a, pci_device_14e4_163a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_14e4_163a, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_14e4_1644 = { 0x1644, pci_device_14e4_1644, #ifdef INIT_SUBSYS_INFO @@ -106535,6 +112357,15 @@ static const pciDeviceInfo pci_dev_info_14e4_1659 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_14e4_165a = { + 0x165a, pci_device_14e4_165a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_14e4_165a, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_14e4_165d = { 0x165d, pci_device_14e4_165d, #ifdef INIT_SUBSYS_INFO @@ -106616,6 +112447,15 @@ static const pciDeviceInfo pci_dev_info_14e4_1673 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_14e4_1674 = { + 0x1674, pci_device_14e4_1674, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_14e4_1674, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_14e4_1677 = { 0x1677, pci_device_14e4_1677, #ifdef INIT_SUBSYS_INFO @@ -106679,6 +112519,15 @@ static const pciDeviceInfo pci_dev_info_14e4_167e = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_14e4_167f = { + 0x167f, pci_device_14e4_167f, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_14e4_167f, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_14e4_1693 = { 0x1693, pci_device_14e4_1693, #ifdef INIT_SUBSYS_INFO @@ -106859,6 +112708,24 @@ static const pciDeviceInfo pci_dev_info_14e4_170e = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_14e4_1712 = { + 0x1712, pci_device_14e4_1712, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_14e4_1712, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_14e4_1713 = { + 0x1713, pci_device_14e4_1713, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_14e4_1713, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_14e4_3352 = { 0x3352, pci_device_14e4_3352, #ifdef INIT_SUBSYS_INFO @@ -106904,6 +112771,15 @@ static const pciDeviceInfo pci_dev_info_14e4_4212 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_14e4_4220 = { + 0x4220, pci_device_14e4_4220, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_14e4_4220, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_14e4_4301 = { 0x4301, pci_device_14e4_4301, #ifdef INIT_SUBSYS_INFO @@ -107066,6 +112942,15 @@ static const pciDeviceInfo pci_dev_info_14e4_4329 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_14e4_4344 = { + 0x4344, pci_device_14e4_4344, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_14e4_4344, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_14e4_4401 = { 0x4401, pci_device_14e4_4401, #ifdef INIT_SUBSYS_INFO @@ -107435,6 +113320,24 @@ static const pciDeviceInfo pci_dev_info_14e4_5692 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_14e4_5695 = { + 0x5695, pci_device_14e4_5695, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_14e4_5695, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_14e4_5698 = { + 0x5698, pci_device_14e4_5698, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_14e4_5698, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_14e4_5820 = { 0x5820, pci_device_14e4_5820, #ifdef INIT_SUBSYS_INFO @@ -107781,6 +113684,15 @@ static const pciDeviceInfo pci_dev_info_14f1_1085 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_14f1_10b6 = { + 0x10b6, pci_device_14f1_10b6, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_14f1_10b6, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_14f1_1433 = { 0x1433, pci_device_14f1_1433, #ifdef INIT_SUBSYS_INFO @@ -108339,6 +114251,33 @@ static const pciDeviceInfo pci_dev_info_14f1_2f20 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_14f1_2f30 = { + 0x2f30, pci_device_14f1_2f30, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_14f1_2f30, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_14f1_5045 = { + 0x5045, pci_device_14f1_5045, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_14f1_5045, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_14f1_5047 = { + 0x5047, pci_device_14f1_5047, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_14f1_5047, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_14f1_8234 = { 0x8234, pci_device_14f1_8234, #ifdef INIT_SUBSYS_INFO @@ -108741,6 +114680,15 @@ static const pciDeviceInfo pci_dev_info_1524_0550 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1524_0551 = { + 0x0551, pci_device_1524_0551, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1524_0551, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1524_0610 = { 0x0610, pci_device_1524_0610, #ifdef INIT_SUBSYS_INFO @@ -109112,6 +115060,35 @@ static const pciDeviceInfo pci_dev_info_157c_8001 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_1590_0001 = { + 0x0001, pci_device_1590_0001, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1590_0001, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1590_0002 = { + 0x0002, pci_device_1590_0002, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1590_0002, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1590_a01d = { + 0xa01d, pci_device_1590_a01d, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1590_a01d, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_1592_0781 = { 0x0781, pci_device_1592_0781, #ifdef INIT_SUBSYS_INFO @@ -109224,6 +115201,15 @@ static const pciDeviceInfo pci_dev_info_15ad_0720 = { 0 }; #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_15b3_0191 = { + 0x0191, pci_device_15b3_0191, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_15b3_0191, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_15b3_5274 = { 0x5274, pci_device_15b3_5274, #ifdef INIT_SUBSYS_INFO @@ -109305,6 +115291,80 @@ static const pciDeviceInfo pci_dev_info_15b3_6282 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_15b3_6340 = { + 0x6340, pci_device_15b3_6340, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_15b3_6340, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_15b3_634a = { + 0x634a, pci_device_15b3_634a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_15b3_634a, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_15b3_6354 = { + 0x6354, pci_device_15b3_6354, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_15b3_6354, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_15b3_6368 = { + 0x6368, pci_device_15b3_6368, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_15b3_6368, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_15b8_1003 = { + 0x1003, pci_device_15b8_1003, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_15b8_1003, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_15b8_1005 = { + 0x1005, pci_device_15b8_1005, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_15b8_1005, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_15b8_100a = { + 0x100a, pci_device_15b8_100a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_15b8_100a, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_15b8_3001 = { + 0x3001, pci_device_15b8_3001, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_15b8_3001, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_15bc_1100 = { @@ -109378,6 +115438,17 @@ static const pciDeviceInfo pci_dev_info_15dc_0001 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_15e2_0500 = { + 0x0500, pci_device_15e2_0500, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_15e2_0500, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_15e8_0130 = { 0x0130, pci_device_15e8_0130, #ifdef INIT_SUBSYS_INFO @@ -109505,6 +115576,24 @@ static const pciDeviceInfo pci_dev_info_1629_1003 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1629_1006 = { + 0x1006, pci_device_1629_1006, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1629_1006, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1629_1007 = { + 0x1007, pci_device_1629_1007, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1629_1007, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1629_2002 = { 0x2002, pci_device_1629_2002, #ifdef INIT_SUBSYS_INFO @@ -109756,6 +115845,15 @@ static const pciDeviceInfo pci_dev_info_168c_001b = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_168c_001c = { + 0x001c, pci_device_168c_001c, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_168c_001c, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_168c_0020 = { 0x0020, pci_device_168c_0020, #ifdef INIT_SUBSYS_INFO @@ -109765,6 +115863,24 @@ static const pciDeviceInfo pci_dev_info_168c_0020 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_168c_0023 = { + 0x0023, pci_device_168c_0023, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_168c_0023, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_168c_0024 = { + 0x0024, pci_device_168c_0024, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_168c_0024, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_168c_1014 = { 0x1014, pci_device_168c_1014, #ifdef INIT_SUBSYS_INFO @@ -109774,6 +115890,15 @@ static const pciDeviceInfo pci_dev_info_168c_1014 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_168c_3b08 = { + 0x3b08, pci_device_168c_3b08, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_168c_3b08, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_169c_0044 = { @@ -109787,6 +115912,17 @@ static const pciDeviceInfo pci_dev_info_169c_0044 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_169d_3306 = { + 0x3306, pci_device_169d_3306, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_169d_3306, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_16ab_1100 = { 0x1100, pci_device_16ab_1100, #ifdef INIT_SUBSYS_INFO @@ -109825,6 +115961,24 @@ static const pciDeviceInfo pci_dev_info_16ab_8501 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_16ae_0001 = { + 0x0001, pci_device_16ae_0001, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16ae_0001, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16ae_000a = { + 0x000a, pci_device_16ae_000a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16ae_000a, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_16ae_1141 = { 0x1141, pci_device_16ae_1141, #ifdef INIT_SUBSYS_INFO @@ -109834,6 +115988,15 @@ static const pciDeviceInfo pci_dev_info_16ae_1141 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_16ae_1841 = { + 0x1841, pci_device_16ae_1841, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16ae_1841, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_16c6_8695 = { @@ -109858,6 +116021,285 @@ static const pciDeviceInfo pci_dev_info_16ca_0001 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_16d5_0504 = { + 0x0504, pci_device_16d5_0504, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_0504, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_0520 = { + 0x0520, pci_device_16d5_0520, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_0520, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_0521 = { + 0x0521, pci_device_16d5_0521, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_0521, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_1020 = { + 0x1020, pci_device_16d5_1020, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_1020, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_1065 = { + 0x1065, pci_device_16d5_1065, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_1065, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_2004 = { + 0x2004, pci_device_16d5_2004, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_2004, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_2020 = { + 0x2020, pci_device_16d5_2020, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_2020, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_2065 = { + 0x2065, pci_device_16d5_2065, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_2065, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_3020 = { + 0x3020, pci_device_16d5_3020, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_3020, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_3065 = { + 0x3065, pci_device_16d5_3065, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_3065, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4243 = { + 0x4243, pci_device_16d5_4243, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4243, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4248 = { + 0x4248, pci_device_16d5_4248, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4248, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_424b = { + 0x424b, pci_device_16d5_424b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_424b, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4253 = { + 0x4253, pci_device_16d5_4253, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4253, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4312 = { + 0x4312, pci_device_16d5_4312, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4312, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4313 = { + 0x4313, pci_device_16d5_4313, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4313, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4322 = { + 0x4322, pci_device_16d5_4322, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4322, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4323 = { + 0x4323, pci_device_16d5_4323, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4323, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4350 = { + 0x4350, pci_device_16d5_4350, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4350, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4353 = { + 0x4353, pci_device_16d5_4353, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4353, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4357 = { + 0x4357, pci_device_16d5_4357, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4357, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4457 = { + 0x4457, pci_device_16d5_4457, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4457, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_464d = { + 0x464d, pci_device_16d5_464d, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_464d, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4850 = { + 0x4850, pci_device_16d5_4850, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4850, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4a42 = { + 0x4a42, pci_device_16d5_4a42, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4a42, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4a50 = { + 0x4a50, pci_device_16d5_4a50, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4a50, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4a56 = { + 0x4a56, pci_device_16d5_4a56, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4a56, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4b47 = { + 0x4b47, pci_device_16d5_4b47, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4b47, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4c40 = { + 0x4c40, pci_device_16d5_4c40, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4c40, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4c60 = { + 0x4c60, pci_device_16d5_4c60, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4c60, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_4d4d = { + 0x4d4d, pci_device_16d5_4d4d, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_4d4d, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_16d5_4d4e = { 0x4d4e, pci_device_16d5_4d4e, #ifdef INIT_SUBSYS_INFO @@ -109867,6 +116309,33 @@ static const pciDeviceInfo pci_dev_info_16d5_4d4e = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_16d5_524d = { + 0x524d, pci_device_16d5_524d, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_524d, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_5335 = { + 0x5335, pci_device_16d5_5335, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_5335, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_16d5_5456 = { + 0x5456, pci_device_16d5_5456, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16d5_5456, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_16e3_1e0f = { @@ -109889,6 +116358,15 @@ static const pciDeviceInfo pci_dev_info_16e5_6000 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_16e5_6300 = { + 0x6300, pci_device_16e5_6300, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_16e5_6300, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_16ec_00ff = { @@ -109993,6 +116471,15 @@ static const pciDeviceInfo pci_dev_info_1734_1078 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1734_1085 = { + 0x1085, pci_device_1734_1085, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1734_1085, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_1737_0013 = { @@ -110013,6 +116500,15 @@ static const pciDeviceInfo pci_dev_info_1737_0015 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1737_0029 = { + 0x0029, pci_device_1737_0029, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1737_0029, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1737_1032 = { 0x1032, pci_device_1737_1032, #ifdef INIT_SUBSYS_INFO @@ -110435,6 +116931,17 @@ static const pciDeviceInfo pci_dev_info_17d5_5832 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_17db_0101 = { + 0x0101, pci_device_17db_0101, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_17db_0101, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_17e4_0001 = { 0x0001, pci_device_17e4_0001, #ifdef INIT_SUBSYS_INFO @@ -110484,6 +116991,53 @@ static const pciDeviceInfo pci_dev_info_17e6_0021 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_17f3_6020 = { + 0x6020, pci_device_17f3_6020, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_17f3_6020, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_17f3_6030 = { + 0x6030, pci_device_17f3_6030, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_17f3_6030, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_17f3_6040 = { + 0x6040, pci_device_17f3_6040, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_17f3_6040, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_17f3_6060 = { + 0x6060, pci_device_17f3_6060, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_17f3_6060, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_17f3_6061 = { + 0x6061, pci_device_17f3_6061, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_17f3_6061, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_17fe_2120 = { 0x2120, pci_device_17fe_2120, #ifdef INIT_SUBSYS_INFO @@ -110578,8 +117132,26 @@ static const pciDeviceInfo pci_dev_info_1814_0401 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1814_e932 = { + 0xe932, pci_device_1814_e932, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1814_e932, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_1822_0001 = { + 0x0001, pci_device_1822_0001, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1822_0001, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_1822_4e35 = { 0x4e35, pci_device_1822_4e35, #ifdef INIT_SUBSYS_INFO @@ -110718,6 +117290,46 @@ static const pciDeviceInfo pci_dev_info_1867_6282 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_186c_0614 = { + 0x0614, pci_device_186c_0614, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_186c_0614, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_1876_a101 = { + 0xa101, pci_device_1876_a101, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1876_a101, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1876_a102 = { + 0xa102, pci_device_1876_a102, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1876_a102, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1876_a103 = { + 0xa103, pci_device_1876_a103, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1876_a103, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_187e_3403 = { 0x3403, pci_device_187e_3403, #ifdef INIT_SUBSYS_INFO @@ -110843,6 +117455,15 @@ static const pciDeviceInfo pci_dev_info_18ca_0040 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_18ca_0047 = { + 0x0047, pci_device_18ca_0047, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_18ca_0047, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_18d2_3069 = { @@ -111213,6 +117834,15 @@ static const pciDeviceInfo pci_dev_info_1969_1048 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_1969_2048 = { + 0x2048, pci_device_1969_2048, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1969_2048, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_196a_0101 = { @@ -111233,6 +117863,26 @@ static const pciDeviceInfo pci_dev_info_196a_0102 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_196a_0105 = { + 0x0105, pci_device_196a_0105, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_196a_0105, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_1971_1011 = { + 0x1011, pci_device_1971_1011, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1971_1011, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_197b_2360 = { @@ -111280,6 +117930,35 @@ static const pciDeviceInfo pci_dev_info_197b_2366 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_197b_2368 = { + 0x2368, pci_device_197b_2368, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_197b_2368, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_1982_1600 = { + 0x1600, pci_device_1982_1600, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1982_1600, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1982_16ff = { + 0x16ff, pci_device_1982_16ff, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1982_16ff, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_1989_0001 = { @@ -111302,6 +117981,26 @@ static const pciDeviceInfo pci_dev_info_1989_8001 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_19a2_0200 = { + 0x0200, pci_device_19a2_0200, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_19a2_0200, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_19a2_0201 = { + 0x0201, pci_device_19a2_0201, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_19a2_0201, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_19ac_0001 = { 0x0001, pci_device_19ac_0001, #ifdef INIT_SUBSYS_INFO @@ -111380,6 +118079,26 @@ static const pciDeviceInfo pci_dev_info_1a03_2000 = { 0 }; #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_1a07_0006 = { + 0x0006, pci_device_1a07_0006, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1a07_0006, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_1a07_0007 = { + 0x0007, pci_device_1a07_0007, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1a07_0007, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_1a08_0000 = { 0x0000, pci_device_1a08_0000, #ifdef INIT_SUBSYS_INFO @@ -111391,6 +118110,39 @@ static const pciDeviceInfo pci_dev_info_1a08_0000 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_1a1d_1a17 = { + 0x1a17, pci_device_1a1d_1a17, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1a1d_1a17, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_1a73_0001 = { + 0x0001, pci_device_1a73_0001, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1a73_0001, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_1a8c_1100 = { + 0x1100, pci_device_1a8c_1100, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_1a8c_1100, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_1c1c_0001 = { 0x0001, pci_device_1c1c_0001, #ifdef INIT_SUBSYS_INFO @@ -111978,6 +118730,44 @@ static const pciDeviceInfo pci_dev_info_4033_1360 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_4040_0001 = { + 0x0001, pci_device_4040_0001, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_4040_0001, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_4040_0002 = { + 0x0002, pci_device_4040_0002, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_4040_0002, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_4040_0003 = { + 0x0003, pci_device_4040_0003, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_4040_0003, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_4040_0004 = { + 0x0004, pci_device_4040_0004, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_4040_0004, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_4144_0044 = { 0x0044, pci_device_4144_0044, #ifdef INIT_SUBSYS_INFO @@ -112093,6 +118883,17 @@ static const pciDeviceInfo pci_dev_info_4d51_0200 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_4d56_0000 = { + 0x0000, pci_device_4d56_0000, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_4d56_0000, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_4ddc_0100 = { 0x0100, pci_device_4ddc_0100, #ifdef INIT_SUBSYS_INFO @@ -113013,6 +119814,15 @@ static const pciDeviceInfo pci_dev_info_5333_8d04 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_5333_8e48 = { + 0x8e48, pci_device_5333_8e48, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_5333_8e48, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_5333_9102 = { 0x9102, pci_device_5333_9102, #ifdef INIT_SUBSYS_INFO @@ -113087,6 +119897,17 @@ static const pciDeviceInfo pci_dev_info_5654_3132 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_5853_0001 = { + 0x0001, pci_device_5853_0001, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_5853_0001, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_6374_6773 = { 0x6773, pci_device_6374_6773, #ifdef INIT_SUBSYS_INFO @@ -114687,6 +121508,15 @@ static const pciDeviceInfo pci_dev_info_8086_10a4 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_8086_10a5 = { + 0x10a5, pci_device_8086_10a5, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_10a5, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_8086_10b0 = { 0x10b0, pci_device_8086_10b0, #ifdef INIT_SUBSYS_INFO @@ -114732,6 +121562,15 @@ static const pciDeviceInfo pci_dev_info_8086_10b5 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_8086_10b6 = { + 0x10b6, pci_device_8086_10b6, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_10b6, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_8086_10b9 = { 0x10b9, pci_device_8086_10b9, #ifdef INIT_SUBSYS_INFO @@ -114768,6 +121607,42 @@ static const pciDeviceInfo pci_dev_info_8086_10bc = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_8086_10bd = { + 0x10bd, pci_device_8086_10bd, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_10bd, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_10c0 = { + 0x10c0, pci_device_8086_10c0, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_10c0, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_10c2 = { + 0x10c2, pci_device_8086_10c2, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_10c2, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_10c3 = { + 0x10c3, pci_device_8086_10c3, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_10c3, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_8086_10c4 = { 0x10c4, pci_device_8086_10c4, #ifdef INIT_SUBSYS_INFO @@ -114786,6 +121661,42 @@ static const pciDeviceInfo pci_dev_info_8086_10c5 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_8086_10c6 = { + 0x10c6, pci_device_8086_10c6, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_10c6, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_10c7 = { + 0x10c7, pci_device_8086_10c7, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_10c7, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_10d9 = { + 0x10d9, pci_device_8086_10d9, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_10d9, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_10da = { + 0x10da, pci_device_8086_10da, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_10da, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_8086_1107 = { 0x1107, pci_device_8086_1107, #ifdef INIT_SUBSYS_INFO @@ -117882,10 +124793,64 @@ static const pciDeviceInfo pci_dev_info_8086_2850 = { #endif 0 }; -static const pciDeviceInfo pci_dev_info_8086_2910 = { - 0x2910, pci_device_8086_2910, +static const pciDeviceInfo pci_dev_info_8086_2911 = { + 0x2911, pci_device_8086_2911, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_2911, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_2912 = { + 0x2912, pci_device_8086_2912, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_2912, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_2914 = { + 0x2914, pci_device_8086_2914, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_2914, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_2916 = { + 0x2916, pci_device_8086_2916, #ifdef INIT_SUBSYS_INFO - pci_ss_list_8086_2910, + pci_ss_list_8086_2916, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_2917 = { + 0x2917, pci_device_8086_2917, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_2917, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_2918 = { + 0x2918, pci_device_8086_2918, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_2918, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_2919 = { + 0x2919, pci_device_8086_2919, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_2919, #else NULL, #endif @@ -117954,6 +124919,24 @@ static const pciDeviceInfo pci_dev_info_8086_2928 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_8086_2929 = { + 0x2929, pci_device_8086_2929, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_2929, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_292c = { + 0x292c, pci_device_8086_292c, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_292c, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_8086_292d = { 0x292d, pci_device_8086_292d, #ifdef INIT_SUBSYS_INFO @@ -118530,6 +125513,78 @@ static const pciDeviceInfo pci_dev_info_8086_29cf = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_8086_29d0 = { + 0x29d0, pci_device_8086_29d0, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_29d0, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_29d1 = { + 0x29d1, pci_device_8086_29d1, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_29d1, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_29d2 = { + 0x29d2, pci_device_8086_29d2, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_29d2, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_29d3 = { + 0x29d3, pci_device_8086_29d3, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_29d3, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_29d4 = { + 0x29d4, pci_device_8086_29d4, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_29d4, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_29d5 = { + 0x29d5, pci_device_8086_29d5, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_29d5, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_29d6 = { + 0x29d6, pci_device_8086_29d6, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_29d6, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_29d7 = { + 0x29d7, pci_device_8086_29d7, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_29d7, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_8086_29e0 = { 0x29e0, pci_device_8086_29e0, #ifdef INIT_SUBSYS_INFO @@ -118728,19 +125783,46 @@ static const pciDeviceInfo pci_dev_info_8086_2a07 = { #endif 0 }; -static const pciDeviceInfo pci_dev_info_8086_3092 = { - 0x3092, pci_device_8086_3092, +static const pciDeviceInfo pci_dev_info_8086_3200 = { + 0x3200, pci_device_8086_3200, #ifdef INIT_SUBSYS_INFO - pci_ss_list_8086_3092, + pci_ss_list_8086_3200, #else NULL, #endif 0 }; -static const pciDeviceInfo pci_dev_info_8086_3200 = { - 0x3200, pci_device_8086_3200, +static const pciDeviceInfo pci_dev_info_8086_3313 = { + 0x3313, pci_device_8086_3313, #ifdef INIT_SUBSYS_INFO - pci_ss_list_8086_3200, + pci_ss_list_8086_3313, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_331b = { + 0x331b, pci_device_8086_331b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_331b, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_3331 = { + 0x3331, pci_device_8086_3331, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_3331, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_3339 = { + 0x3339, pci_device_8086_3339, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_3339, #else NULL, #endif @@ -118764,6 +125846,33 @@ static const pciDeviceInfo pci_dev_info_8086_3341 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_8086_3363 = { + 0x3363, pci_device_8086_3363, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_3363, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_33c3 = { + 0x33c3, pci_device_8086_33c3, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_33c3, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_33cb = { + 0x33cb, pci_device_8086_33cb, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_33cb, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_8086_3500 = { 0x3500, pci_device_8086_3500, #ifdef INIT_SUBSYS_INFO @@ -119259,6 +126368,24 @@ static const pciDeviceInfo pci_dev_info_8086_4000 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_8086_4001 = { + 0x4001, pci_device_8086_4001, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_4001, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_4003 = { + 0x4003, pci_device_8086_4003, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_4003, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_8086_4008 = { 0x4008, pci_device_8086_4008, #ifdef INIT_SUBSYS_INFO @@ -119466,6 +126593,33 @@ static const pciDeviceInfo pci_dev_info_8086_4227 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_8086_4229 = { + 0x4229, pci_device_8086_4229, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_4229, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_4230 = { + 0x4230, pci_device_8086_4230, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_4230, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_444e = { + 0x444e, pci_device_8086_444e, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_444e, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_8086_5001 = { 0x5001, pci_device_8086_5001, #ifdef INIT_SUBSYS_INFO @@ -119475,6 +126629,294 @@ static const pciDeviceInfo pci_dev_info_8086_5001 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_8086_5020 = { + 0x5020, pci_device_8086_5020, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5020, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5021 = { + 0x5021, pci_device_8086_5021, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5021, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5023 = { + 0x5023, pci_device_8086_5023, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5023, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5024 = { + 0x5024, pci_device_8086_5024, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5024, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5025 = { + 0x5025, pci_device_8086_5025, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5025, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5028 = { + 0x5028, pci_device_8086_5028, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5028, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5029 = { + 0x5029, pci_device_8086_5029, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5029, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_502a = { + 0x502a, pci_device_8086_502a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_502a, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_502b = { + 0x502b, pci_device_8086_502b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_502b, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5031 = { + 0x5031, pci_device_8086_5031, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5031, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5032 = { + 0x5032, pci_device_8086_5032, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5032, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5033 = { + 0x5033, pci_device_8086_5033, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5033, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5035 = { + 0x5035, pci_device_8086_5035, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5035, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5037 = { + 0x5037, pci_device_8086_5037, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5037, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5039 = { + 0x5039, pci_device_8086_5039, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5039, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_503a = { + 0x503a, pci_device_8086_503a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_503a, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_503b = { + 0x503b, pci_device_8086_503b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_503b, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_503c = { + 0x503c, pci_device_8086_503c, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_503c, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_503d = { + 0x503d, pci_device_8086_503d, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_503d, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_503e = { + 0x503e, pci_device_8086_503e, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_503e, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5040 = { + 0x5040, pci_device_8086_5040, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5040, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5041 = { + 0x5041, pci_device_8086_5041, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5041, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5042 = { + 0x5042, pci_device_8086_5042, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5042, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5043 = { + 0x5043, pci_device_8086_5043, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5043, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5044 = { + 0x5044, pci_device_8086_5044, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5044, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5045 = { + 0x5045, pci_device_8086_5045, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5045, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5046 = { + 0x5046, pci_device_8086_5046, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5046, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5047 = { + 0x5047, pci_device_8086_5047, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5047, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5048 = { + 0x5048, pci_device_8086_5048, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5048, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_5049 = { + 0x5049, pci_device_8086_5049, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_5049, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_504a = { + 0x504a, pci_device_8086_504a, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_504a, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8086_504b = { + 0x504b, pci_device_8086_504b, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_504b, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_8086_5200 = { 0x5200, pci_device_8086_5200, #ifdef INIT_SUBSYS_INFO @@ -120015,6 +127457,15 @@ static const pciDeviceInfo pci_dev_info_8086_7800 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_8086_8002 = { + 0x8002, pci_device_8086_8002, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8086_8002, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_8086_84c4 = { 0x84c4, pci_device_8086_84c4, #ifdef INIT_SUBSYS_INFO @@ -120232,6 +127683,55 @@ static const pciDeviceInfo pci_dev_info_8086_b555 = { 0 }; #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_80ee_beef = { + 0xbeef, pci_device_80ee_beef, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_80ee_beef, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_80ee_cafe = { + 0xcafe, pci_device_80ee_cafe, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_80ee_cafe, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_8384_7618 = { + 0x7618, pci_device_8384_7618, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8384_7618, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8384_7670 = { + 0x7670, pci_device_8384_7670, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8384_7670, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_8384_7672 = { + 0x7672, pci_device_8384_7672, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_8384_7672, +#else + NULL, +#endif + 0 +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_8686_1010 = { 0x1010, pci_device_8686_1010, #ifdef INIT_SUBSYS_INFO @@ -121115,6 +128615,24 @@ static const pciDeviceInfo pci_dev_info_9005_008f = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_9005_0092 = { + 0x0092, pci_device_9005_0092, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_9005_0092, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_9005_0093 = { + 0x0093, pci_device_9005_0093, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_9005_0093, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_9005_00c0 = { 0x00c0, pci_device_9005_00c0, #ifdef INIT_SUBSYS_INFO @@ -121776,6 +129294,15 @@ static const pciDeviceInfo pci_dev_info_cddd_0200 = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo pci_dev_info_d161_0120 = { + 0x0120, pci_device_d161_0120, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_d161_0120, +#else + NULL, +#endif + 0 +}; static const pciDeviceInfo pci_dev_info_d161_0205 = { 0x0205, pci_device_d161_0205, #ifdef INIT_SUBSYS_INFO @@ -121803,15 +129330,6 @@ static const pciDeviceInfo pci_dev_info_d161_0405 = { #endif 0 }; -static const pciDeviceInfo pci_dev_info_d161_0406 = { - 0x0406, pci_device_d161_0406, -#ifdef INIT_SUBSYS_INFO - pci_ss_list_d161_0406, -#else - NULL, -#endif - 0 -}; static const pciDeviceInfo pci_dev_info_d161_0410 = { 0x0410, pci_device_d161_0410, #ifdef INIT_SUBSYS_INFO @@ -121821,10 +129339,10 @@ static const pciDeviceInfo pci_dev_info_d161_0410 = { #endif 0 }; -static const pciDeviceInfo pci_dev_info_d161_0411 = { - 0x0411, pci_device_d161_0411, +static const pciDeviceInfo pci_dev_info_d161_0800 = { + 0x0800, pci_device_d161_0800, #ifdef INIT_SUBSYS_INFO - pci_ss_list_d161_0411, + pci_ss_list_d161_0800, #else NULL, #endif @@ -121839,6 +129357,24 @@ static const pciDeviceInfo pci_dev_info_d161_2400 = { #endif 0 }; +static const pciDeviceInfo pci_dev_info_d161_3400 = { + 0x3400, pci_device_d161_3400, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_d161_3400, +#else + NULL, +#endif + 0 +}; +static const pciDeviceInfo pci_dev_info_d161_b410 = { + 0xb410, pci_device_d161_b410, +#ifdef INIT_SUBSYS_INFO + pci_ss_list_d161_b410, +#else + NULL, +#endif + 0 +}; #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo pci_dev_info_d4d4_0601 = { @@ -122376,6 +129912,7 @@ static const pciDeviceInfo *pci_dev_list_02ac[] = { NULL }; #endif +#define pci_dev_list_02e0 NULL #define pci_dev_list_0315 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_0357[] = { @@ -122414,6 +129951,12 @@ static const pciDeviceInfo *pci_dev_list_050d[] = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_058f[] = { + &pci_dev_info_058f_9254, + NULL +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_05a9[] = { &pci_dev_info_05a9_8519, NULL @@ -122470,6 +130013,7 @@ static const pciDeviceInfo *pci_dev_list_093a[] = { &pci_dev_info_093a_010e, &pci_dev_info_093a_010f, &pci_dev_info_093a_2468, + &pci_dev_info_093a_2600, &pci_dev_info_093a_2603, &pci_dev_info_093a_2608, NULL @@ -122647,6 +130191,7 @@ static const pciDeviceInfo *pci_dev_list_1000[] = { &pci_dev_info_1000_0054, &pci_dev_info_1000_0055, &pci_dev_info_1000_0056, + &pci_dev_info_1000_0057, &pci_dev_info_1000_0058, &pci_dev_info_1000_005a, &pci_dev_info_1000_005c, @@ -123064,6 +130609,7 @@ static const pciDeviceInfo *pci_dev_list_1002[] = { &pci_dev_info_1002_715f, &pci_dev_info_1002_7162, &pci_dev_info_1002_7166, + &pci_dev_info_1002_716e, &pci_dev_info_1002_7172, &pci_dev_info_1002_7173, &pci_dev_info_1002_7180, @@ -123089,11 +130635,13 @@ static const pciDeviceInfo *pci_dev_list_1002[] = { &pci_dev_info_1002_71c6, &pci_dev_info_1002_71c7, &pci_dev_info_1002_71ce, + &pci_dev_info_1002_71d4, &pci_dev_info_1002_71d5, &pci_dev_info_1002_71d6, &pci_dev_info_1002_71de, &pci_dev_info_1002_71e0, &pci_dev_info_1002_71e2, + &pci_dev_info_1002_71e6, &pci_dev_info_1002_71e7, &pci_dev_info_1002_7210, &pci_dev_info_1002_7211, @@ -123127,6 +130675,7 @@ static const pciDeviceInfo *pci_dev_list_1002[] = { &pci_dev_info_1002_7834, &pci_dev_info_1002_7835, &pci_dev_info_1002_7838, + &pci_dev_info_1002_7919, &pci_dev_info_1002_791e, &pci_dev_info_1002_791f, &pci_dev_info_1002_793f, @@ -123360,6 +130909,7 @@ static const pciDeviceInfo *pci_dev_list_1014[] = { &pci_dev_info_1014_01bd, &pci_dev_info_1014_01c1, &pci_dev_info_1014_01e6, + &pci_dev_info_1014_01ef, &pci_dev_info_1014_01ff, &pci_dev_info_1014_0219, &pci_dev_info_1014_021b, @@ -123374,6 +130924,7 @@ static const pciDeviceInfo *pci_dev_list_1014[] = { &pci_dev_info_1014_0302, &pci_dev_info_1014_0308, &pci_dev_info_1014_0314, + &pci_dev_info_1014_0339, &pci_dev_info_1014_3022, &pci_dev_info_1014_4022, &pci_dev_info_1014_ffff, @@ -123393,6 +130944,7 @@ static const pciDeviceInfo *pci_dev_list_1017[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_101a[] = { &pci_dev_info_101a_0005, + &pci_dev_info_101a_1dc1, NULL }; #endif @@ -123436,6 +130988,16 @@ static const pciDeviceInfo *pci_dev_list_1022[] = { &pci_dev_info_1022_1101, &pci_dev_info_1022_1102, &pci_dev_info_1022_1103, + &pci_dev_info_1022_1200, + &pci_dev_info_1022_1201, + &pci_dev_info_1022_1202, + &pci_dev_info_1022_1203, + &pci_dev_info_1022_1204, + &pci_dev_info_1022_1300, + &pci_dev_info_1022_1301, + &pci_dev_info_1022_1302, + &pci_dev_info_1022_1303, + &pci_dev_info_1022_1304, &pci_dev_info_1022_2000, &pci_dev_info_1022_2001, &pci_dev_info_1022_2003, @@ -123624,7 +131186,6 @@ static const pciDeviceInfo *pci_dev_list_1028[] = { &pci_dev_info_1028_0013, &pci_dev_info_1028_0014, &pci_dev_info_1028_0015, - &pci_dev_info_1028_1f03, NULL }; #define pci_dev_list_1029 NULL @@ -123914,6 +131475,7 @@ static const pciDeviceInfo *pci_dev_list_103c[] = { &pci_dev_info_103c_12fa, &pci_dev_info_103c_1302, &pci_dev_info_103c_1303, + &pci_dev_info_103c_1361, &pci_dev_info_103c_2910, &pci_dev_info_103c_2925, &pci_dev_info_103c_3080, @@ -123921,6 +131483,7 @@ static const pciDeviceInfo *pci_dev_list_103c[] = { &pci_dev_info_103c_30b5, &pci_dev_info_103c_3220, &pci_dev_info_103c_3230, + &pci_dev_info_103c_3238, &pci_dev_info_103c_4030, &pci_dev_info_103c_4031, &pci_dev_info_103c_4037, @@ -124168,7 +131731,13 @@ static const pciDeviceInfo *pci_dev_list_1050[] = { #define pci_dev_list_1051 NULL #define pci_dev_list_1052 NULL #define pci_dev_list_1053 NULL -#define pci_dev_list_1054 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_1054[] = { + &pci_dev_info_1054_3011, + &pci_dev_info_1054_3012, + NULL +}; +#endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_1055[] = { &pci_dev_info_1055_9130, @@ -124190,6 +131759,8 @@ static const pciDeviceInfo *pci_dev_list_1057[] = { &pci_dev_info_1057_0012, &pci_dev_info_1057_0100, &pci_dev_info_1057_0431, + &pci_dev_info_1057_1073, + &pci_dev_info_1057_1219, &pci_dev_info_1057_1801, &pci_dev_info_1057_18c0, &pci_dev_info_1057_18c1, @@ -124258,7 +131829,12 @@ static const pciDeviceInfo *pci_dev_list_105a[] = { NULL }; #endif -#define pci_dev_list_105b NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_105b[] = { + &pci_dev_info_105b_0c4d, + NULL +}; +#endif #define pci_dev_list_105c NULL static const pciDeviceInfo *pci_dev_list_105d[] = { &pci_dev_info_105d_2309, @@ -124611,6 +132187,8 @@ static const pciDeviceInfo *pci_dev_list_108e[] = { &pci_dev_info_108e_2bad, &pci_dev_info_108e_5000, &pci_dev_info_108e_5043, + &pci_dev_info_108e_676e, + &pci_dev_info_108e_7063, &pci_dev_info_108e_8000, &pci_dev_info_108e_8001, &pci_dev_info_108e_8002, @@ -124861,6 +132439,7 @@ static const pciDeviceInfo *pci_dev_list_10b5[] = { &pci_dev_info_10b5_1147, &pci_dev_info_10b5_2540, &pci_dev_info_10b5_2724, + &pci_dev_info_10b5_6520, &pci_dev_info_10b5_6540, &pci_dev_info_10b5_6541, &pci_dev_info_10b5_6542, @@ -125264,6 +132843,7 @@ static const pciDeviceInfo *pci_dev_list_10de[] = { &pci_dev_info_10de_0091, &pci_dev_info_10de_0092, &pci_dev_info_10de_0093, + &pci_dev_info_10de_0095, &pci_dev_info_10de_0098, &pci_dev_info_10de_0099, &pci_dev_info_10de_009d, @@ -125327,6 +132907,7 @@ static const pciDeviceInfo *pci_dev_list_10de[] = { &pci_dev_info_10de_0140, &pci_dev_info_10de_0141, &pci_dev_info_10de_0142, + &pci_dev_info_10de_0143, &pci_dev_info_10de_0144, &pci_dev_info_10de_0145, &pci_dev_info_10de_0146, @@ -125352,6 +132933,7 @@ static const pciDeviceInfo *pci_dev_list_10de[] = { &pci_dev_info_10de_0167, &pci_dev_info_10de_0168, &pci_dev_info_10de_0169, + &pci_dev_info_10de_016a, &pci_dev_info_10de_0170, &pci_dev_info_10de_0171, &pci_dev_info_10de_0172, @@ -125369,6 +132951,7 @@ static const pciDeviceInfo *pci_dev_list_10de[] = { &pci_dev_info_10de_0181, &pci_dev_info_10de_0182, &pci_dev_info_10de_0183, + &pci_dev_info_10de_0184, &pci_dev_info_10de_0185, &pci_dev_info_10de_0186, &pci_dev_info_10de_0187, @@ -125377,6 +132960,11 @@ static const pciDeviceInfo *pci_dev_list_10de[] = { &pci_dev_info_10de_018b, &pci_dev_info_10de_018c, &pci_dev_info_10de_018d, + &pci_dev_info_10de_0191, + &pci_dev_info_10de_0193, + &pci_dev_info_10de_0194, + &pci_dev_info_10de_019d, + &pci_dev_info_10de_019e, &pci_dev_info_10de_01a0, &pci_dev_info_10de_01a4, &pci_dev_info_10de_01ab, @@ -125393,10 +132981,13 @@ static const pciDeviceInfo *pci_dev_list_10de[] = { &pci_dev_info_10de_01c2, &pci_dev_info_10de_01c3, &pci_dev_info_10de_01d1, + &pci_dev_info_10de_01d3, &pci_dev_info_10de_01d6, &pci_dev_info_10de_01d7, &pci_dev_info_10de_01d8, &pci_dev_info_10de_01da, + &pci_dev_info_10de_01dc, + &pci_dev_info_10de_01dd, &pci_dev_info_10de_01de, &pci_dev_info_10de_01df, &pci_dev_info_10de_01e0, @@ -125417,6 +133008,7 @@ static const pciDeviceInfo *pci_dev_list_10de[] = { &pci_dev_info_10de_0215, &pci_dev_info_10de_0218, &pci_dev_info_10de_0221, + &pci_dev_info_10de_0222, &pci_dev_info_10de_0240, &pci_dev_info_10de_0241, &pci_dev_info_10de_0242, @@ -125471,6 +133063,10 @@ static const pciDeviceInfo *pci_dev_list_10de[] = { &pci_dev_info_10de_0290, &pci_dev_info_10de_0291, &pci_dev_info_10de_0292, + &pci_dev_info_10de_0293, + &pci_dev_info_10de_0294, + &pci_dev_info_10de_0295, + &pci_dev_info_10de_0297, &pci_dev_info_10de_0298, &pci_dev_info_10de_0299, &pci_dev_info_10de_029a, @@ -125480,7 +133076,9 @@ static const pciDeviceInfo *pci_dev_list_10de[] = { &pci_dev_info_10de_029e, &pci_dev_info_10de_029f, &pci_dev_info_10de_02a0, + &pci_dev_info_10de_02e0, &pci_dev_info_10de_02e1, + &pci_dev_info_10de_02e2, &pci_dev_info_10de_02f0, &pci_dev_info_10de_02f1, &pci_dev_info_10de_02f2, @@ -125573,12 +133171,21 @@ static const pciDeviceInfo *pci_dev_list_10de[] = { &pci_dev_info_10de_0377, &pci_dev_info_10de_0378, &pci_dev_info_10de_037a, + &pci_dev_info_10de_037c, &pci_dev_info_10de_037e, &pci_dev_info_10de_037f, + &pci_dev_info_10de_0390, &pci_dev_info_10de_0391, &pci_dev_info_10de_0392, &pci_dev_info_10de_0393, + &pci_dev_info_10de_0394, + &pci_dev_info_10de_0395, + &pci_dev_info_10de_0397, &pci_dev_info_10de_0398, + &pci_dev_info_10de_0399, + &pci_dev_info_10de_039a, + &pci_dev_info_10de_039b, + &pci_dev_info_10de_039c, &pci_dev_info_10de_039e, &pci_dev_info_10de_03a0, &pci_dev_info_10de_03a1, @@ -125635,6 +133242,20 @@ static const pciDeviceInfo *pci_dev_list_10de[] = { &pci_dev_info_10de_03f5, &pci_dev_info_10de_03f6, &pci_dev_info_10de_03f7, + &pci_dev_info_10de_0400, + &pci_dev_info_10de_0402, + &pci_dev_info_10de_0407, + &pci_dev_info_10de_040b, + &pci_dev_info_10de_0421, + &pci_dev_info_10de_0422, + &pci_dev_info_10de_0423, + &pci_dev_info_10de_0425, + &pci_dev_info_10de_0426, + &pci_dev_info_10de_0427, + &pci_dev_info_10de_0428, + &pci_dev_info_10de_0429, + &pci_dev_info_10de_042a, + &pci_dev_info_10de_042b, &pci_dev_info_10de_0440, &pci_dev_info_10de_0441, &pci_dev_info_10de_0442, @@ -125666,11 +133287,16 @@ static const pciDeviceInfo *pci_dev_list_10de[] = { &pci_dev_info_10de_045d, &pci_dev_info_10de_045e, &pci_dev_info_10de_045f, + &pci_dev_info_10de_055c, + &pci_dev_info_10de_055d, + &pci_dev_info_10de_c615, NULL }; #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_10df[] = { &pci_dev_info_10df_1ae5, + &pci_dev_info_10df_f011, + &pci_dev_info_10df_f015, &pci_dev_info_10df_f085, &pci_dev_info_10df_f095, &pci_dev_info_10df_f098, @@ -125682,6 +133308,7 @@ static const pciDeviceInfo *pci_dev_list_10df[] = { &pci_dev_info_10df_f0e1, &pci_dev_info_10df_f0e5, &pci_dev_info_10df_f0f5, + &pci_dev_info_10df_f100, &pci_dev_info_10df_f700, &pci_dev_info_10df_f701, &pci_dev_info_10df_f800, @@ -125696,6 +133323,7 @@ static const pciDeviceInfo *pci_dev_list_10df[] = { &pci_dev_info_10df_fc00, &pci_dev_info_10df_fc10, &pci_dev_info_10df_fc20, + &pci_dev_info_10df_fc40, &pci_dev_info_10df_fd00, &pci_dev_info_10df_fe00, &pci_dev_info_10df_ff00, @@ -125757,10 +133385,12 @@ static const pciDeviceInfo *pci_dev_list_10e8[] = { &pci_dev_info_10e8_80d7, &pci_dev_info_10e8_80d9, &pci_dev_info_10e8_80da, + &pci_dev_info_10e8_80fc, &pci_dev_info_10e8_811a, &pci_dev_info_10e8_814c, &pci_dev_info_10e8_8170, &pci_dev_info_10e8_81e6, + &pci_dev_info_10e8_828d, &pci_dev_info_10e8_8291, &pci_dev_info_10e8_82c4, &pci_dev_info_10e8_82c5, @@ -125769,6 +133399,8 @@ static const pciDeviceInfo *pci_dev_list_10e8[] = { &pci_dev_info_10e8_82ca, &pci_dev_info_10e8_82db, &pci_dev_info_10e8_82e2, + &pci_dev_info_10e8_8406, + &pci_dev_info_10e8_8407, &pci_dev_info_10e8_8851, NULL }; @@ -125796,7 +133428,14 @@ static const pciDeviceInfo *pci_dev_list_10eb[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_10ec[] = { &pci_dev_info_10ec_0139, + &pci_dev_info_10ec_0260, + &pci_dev_info_10ec_0261, + &pci_dev_info_10ec_0280, + &pci_dev_info_10ec_0861, + &pci_dev_info_10ec_0862, + &pci_dev_info_10ec_0880, &pci_dev_info_10ec_0883, + &pci_dev_info_10ec_0888, &pci_dev_info_10ec_8029, &pci_dev_info_10ec_8129, &pci_dev_info_10ec_8136, @@ -125831,6 +133470,7 @@ static const pciDeviceInfo *pci_dev_list_10ee[] = { &pci_dev_info_10ee_3fc4, &pci_dev_info_10ee_3fc5, &pci_dev_info_10ee_3fc6, + &pci_dev_info_10ee_8380, &pci_dev_info_10ee_8381, &pci_dev_info_10ee_d154, NULL @@ -125924,6 +133564,7 @@ static const pciDeviceInfo *pci_dev_list_1103[] = { &pci_dev_info_1103_0007, &pci_dev_info_1103_0008, &pci_dev_info_1103_0009, + &pci_dev_info_1103_2340, NULL }; #endif @@ -125947,6 +133588,7 @@ static const pciDeviceInfo *pci_dev_list_1105[] = { static const pciDeviceInfo *pci_dev_list_1106[] = { &pci_dev_info_1106_0102, &pci_dev_info_1106_0130, + &pci_dev_info_1106_0198, &pci_dev_info_1106_0204, &pci_dev_info_1106_0208, &pci_dev_info_1106_0238, @@ -126009,6 +133651,7 @@ static const pciDeviceInfo *pci_dev_list_1106[] = { &pci_dev_info_1106_1364, &pci_dev_info_1106_1571, &pci_dev_info_1106_1595, + &pci_dev_info_1106_2106, &pci_dev_info_1106_2204, &pci_dev_info_1106_2208, &pci_dev_info_1106_2238, @@ -126068,6 +133711,7 @@ static const pciDeviceInfo *pci_dev_list_1106[] = { &pci_dev_info_1106_3148, &pci_dev_info_1106_3149, &pci_dev_info_1106_3156, + &pci_dev_info_1106_3157, &pci_dev_info_1106_3164, &pci_dev_info_1106_3168, &pci_dev_info_1106_3177, @@ -126080,6 +133724,7 @@ static const pciDeviceInfo *pci_dev_list_1106[] = { &pci_dev_info_1106_3213, &pci_dev_info_1106_3218, &pci_dev_info_1106_3227, + &pci_dev_info_1106_3230, &pci_dev_info_1106_3238, &pci_dev_info_1106_3249, &pci_dev_info_1106_324a, @@ -126087,6 +133732,7 @@ static const pciDeviceInfo *pci_dev_list_1106[] = { &pci_dev_info_1106_324e, &pci_dev_info_1106_3258, &pci_dev_info_1106_3259, + &pci_dev_info_1106_3260, &pci_dev_info_1106_3269, &pci_dev_info_1106_3282, &pci_dev_info_1106_3287, @@ -126098,10 +133744,13 @@ static const pciDeviceInfo *pci_dev_list_1106[] = { &pci_dev_info_1106_3336, &pci_dev_info_1106_3337, &pci_dev_info_1106_3340, + &pci_dev_info_1106_3343, &pci_dev_info_1106_3344, &pci_dev_info_1106_3349, &pci_dev_info_1106_3351, &pci_dev_info_1106_3364, + &pci_dev_info_1106_3371, + &pci_dev_info_1106_3372, &pci_dev_info_1106_337a, &pci_dev_info_1106_337b, &pci_dev_info_1106_4149, @@ -126128,13 +133777,16 @@ static const pciDeviceInfo *pci_dev_list_1106[] = { &pci_dev_info_1106_5238, &pci_dev_info_1106_5290, &pci_dev_info_1106_5308, + &pci_dev_info_1106_5324, &pci_dev_info_1106_5327, &pci_dev_info_1106_5336, &pci_dev_info_1106_5340, &pci_dev_info_1106_5351, &pci_dev_info_1106_5364, &pci_dev_info_1106_6100, + &pci_dev_info_1106_6287, &pci_dev_info_1106_6327, + &pci_dev_info_1106_6364, &pci_dev_info_1106_7204, &pci_dev_info_1106_7205, &pci_dev_info_1106_7208, @@ -126333,10 +133985,6 @@ static const pciDeviceInfo *pci_dev_list_1119[] = { &pci_dev_info_1119_000b, &pci_dev_info_1119_000c, &pci_dev_info_1119_000d, - &pci_dev_info_1119_0010, - &pci_dev_info_1119_0011, - &pci_dev_info_1119_0012, - &pci_dev_info_1119_0013, &pci_dev_info_1119_0100, &pci_dev_info_1119_0101, &pci_dev_info_1119_0102, @@ -126393,6 +134041,7 @@ static const pciDeviceInfo *pci_dev_list_1119[] = { &pci_dev_info_1119_0261, &pci_dev_info_1119_02ff, &pci_dev_info_1119_0300, + &pci_dev_info_1119_0301, NULL }; #endif @@ -126535,6 +134184,7 @@ static const pciDeviceInfo *pci_dev_list_1133[] = { &pci_dev_info_1133_e028, &pci_dev_info_1133_e02a, &pci_dev_info_1133_e02c, + &pci_dev_info_1133_e032, NULL }; #endif @@ -126664,6 +134314,7 @@ static const pciDeviceInfo *pci_dev_list_114f[] = { &pci_dev_info_114f_000d, &pci_dev_info_114f_0011, &pci_dev_info_114f_0012, + &pci_dev_info_114f_0013, &pci_dev_info_114f_0014, &pci_dev_info_114f_0015, &pci_dev_info_114f_0016, @@ -126800,6 +134451,8 @@ static const pciDeviceInfo *pci_dev_list_1166[] = { &pci_dev_info_1166_0227, &pci_dev_info_1166_0230, &pci_dev_info_1166_0234, + &pci_dev_info_1166_0235, + &pci_dev_info_1166_0238, &pci_dev_info_1166_0240, &pci_dev_info_1166_0241, &pci_dev_info_1166_0242, @@ -126888,6 +134541,7 @@ static const pciDeviceInfo *pci_dev_list_1180[] = { &pci_dev_info_1180_0592, &pci_dev_info_1180_0811, &pci_dev_info_1180_0822, + &pci_dev_info_1180_0832, &pci_dev_info_1180_0841, &pci_dev_info_1180_0852, NULL @@ -127051,10 +134705,13 @@ static const pciDeviceInfo *pci_dev_list_11a9[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_11ab[] = { &pci_dev_info_11ab_0146, + &pci_dev_info_11ab_0f53, + &pci_dev_info_11ab_11ab, &pci_dev_info_11ab_138f, &pci_dev_info_11ab_1fa6, &pci_dev_info_11ab_1fa7, &pci_dev_info_11ab_1faa, + &pci_dev_info_11ab_2a01, &pci_dev_info_11ab_4320, &pci_dev_info_11ab_4340, &pci_dev_info_11ab_4341, @@ -127071,6 +134728,7 @@ static const pciDeviceInfo *pci_dev_list_11ab[] = { &pci_dev_info_11ab_4361, &pci_dev_info_11ab_4362, &pci_dev_info_11ab_4363, + &pci_dev_info_11ab_4364, &pci_dev_info_11ab_4611, &pci_dev_info_11ab_4620, &pci_dev_info_11ab_4801, @@ -127081,6 +134739,10 @@ static const pciDeviceInfo *pci_dev_list_11ab[] = { &pci_dev_info_11ab_5081, &pci_dev_info_11ab_6041, &pci_dev_info_11ab_6081, + &pci_dev_info_11ab_6101, + &pci_dev_info_11ab_6141, + &pci_dev_info_11ab_6145, + &pci_dev_info_11ab_6450, &pci_dev_info_11ab_6460, &pci_dev_info_11ab_6480, &pci_dev_info_11ab_6485, @@ -127143,6 +134805,9 @@ static const pciDeviceInfo *pci_dev_list_11bc[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_11bd[] = { &pci_dev_info_11bd_002e, + &pci_dev_info_11bd_0040, + &pci_dev_info_11bd_0041, + &pci_dev_info_11bd_0042, &pci_dev_info_11bd_bede, NULL }; @@ -127185,6 +134850,8 @@ static const pciDeviceInfo *pci_dev_list_11c1[] = { &pci_dev_info_11c1_0480, &pci_dev_info_11c1_048c, &pci_dev_info_11c1_048f, + &pci_dev_info_11c1_1040, + &pci_dev_info_11c1_2600, &pci_dev_info_11c1_5801, &pci_dev_info_11c1_5802, &pci_dev_info_11c1_5803, @@ -127245,10 +134912,14 @@ static const pciDeviceInfo *pci_dev_list_11d1[] = { #define pci_dev_list_11d3 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_11d4[] = { + &pci_dev_info_11d4_0078, &pci_dev_info_11d4_1535, &pci_dev_info_11d4_1805, &pci_dev_info_11d4_1889, + &pci_dev_info_11d4_1981, + &pci_dev_info_11d4_1983, &pci_dev_info_11d4_1986, + &pci_dev_info_11d4_198b, &pci_dev_info_11d4_5340, NULL }; @@ -127834,6 +135505,7 @@ static const pciDeviceInfo *pci_dev_list_1282[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_1283[] = { &pci_dev_info_1283_673a, + &pci_dev_info_1283_8152, &pci_dev_info_1283_8211, &pci_dev_info_1283_8212, &pci_dev_info_1283_8330, @@ -127883,7 +135555,10 @@ static const pciDeviceInfo *pci_dev_list_128e[] = { #define pci_dev_list_128f NULL #define pci_dev_list_1290 NULL #define pci_dev_list_1291 NULL -#define pci_dev_list_1292 NULL +static const pciDeviceInfo *pci_dev_list_1292[] = { + &pci_dev_info_1292_fc02, + NULL +}; #define pci_dev_list_1293 NULL #define pci_dev_list_1294 NULL #define pci_dev_list_1295 NULL @@ -127920,8 +135595,12 @@ static const pciDeviceInfo *pci_dev_list_12a3[] = { #define pci_dev_list_12aa NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_12ab[] = { + &pci_dev_info_12ab_0000, &pci_dev_info_12ab_0002, + &pci_dev_info_12ab_2300, &pci_dev_info_12ab_3000, + &pci_dev_info_12ab_fff3, + &pci_dev_info_12ab_ffff, NULL }; #endif @@ -128060,6 +135739,7 @@ static const pciDeviceInfo *pci_dev_list_12d5[] = { #define pci_dev_list_12d7 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_12d8[] = { + &pci_dev_info_12d8_01a7, &pci_dev_info_12d8_8150, NULL }; @@ -128498,6 +136178,8 @@ static const pciDeviceInfo *pci_dev_list_1374[] = { &pci_dev_info_1374_0038, &pci_dev_info_1374_0039, &pci_dev_info_1374_003a, + &pci_dev_info_1374_003b, + &pci_dev_info_1374_003c, NULL }; #endif @@ -128540,6 +136222,7 @@ static const pciDeviceInfo *pci_dev_list_1382[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_1385[] = { &pci_dev_info_1385_0013, + &pci_dev_info_1385_006b, &pci_dev_info_1385_311a, &pci_dev_info_1385_4100, &pci_dev_info_1385_4105, @@ -128593,6 +136276,7 @@ static const pciDeviceInfo *pci_dev_list_1393[] = { &pci_dev_info_1393_1040, &pci_dev_info_1393_1141, &pci_dev_info_1393_1680, + &pci_dev_info_1393_1681, &pci_dev_info_1393_2040, &pci_dev_info_1393_2180, &pci_dev_info_1393_3200, @@ -128612,6 +136296,9 @@ static const pciDeviceInfo *pci_dev_list_1397[] = { &pci_dev_info_1397_08b4, &pci_dev_info_1397_16b8, &pci_dev_info_1397_2bd0, + &pci_dev_info_1397_30b1, + &pci_dev_info_1397_b700, + &pci_dev_info_1397_f001, NULL }; #endif @@ -128646,6 +136333,7 @@ static const pciDeviceInfo *pci_dev_list_13a3[] = { &pci_dev_info_13a3_001d, &pci_dev_info_13a3_0020, &pci_dev_info_13a3_0026, + &pci_dev_info_13a3_002e, NULL }; #endif @@ -128699,6 +136387,7 @@ static const pciDeviceInfo *pci_dev_list_13c1[] = { &pci_dev_info_13c1_1001, &pci_dev_info_13c1_1002, &pci_dev_info_13c1_1003, + &pci_dev_info_13c1_1004, NULL }; #endif @@ -128745,7 +136434,12 @@ static const pciDeviceInfo *pci_dev_list_13d1[] = { }; #endif #define pci_dev_list_13d2 NULL -#define pci_dev_list_13d3 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_13d3[] = { + &pci_dev_info_13d3_3219, + NULL +}; +#endif #define pci_dev_list_13d4 NULL #define pci_dev_list_13d5 NULL #define pci_dev_list_13d6 NULL @@ -128809,6 +136503,7 @@ static const pciDeviceInfo *pci_dev_list_13f6[] = { &pci_dev_info_13f6_0101, &pci_dev_info_13f6_0111, &pci_dev_info_13f6_0211, + &pci_dev_info_13f6_9880, NULL }; #endif @@ -128933,6 +136628,7 @@ static const pciDeviceInfo *pci_dev_list_1420[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_1425[] = { &pci_dev_info_1425_000b, + &pci_dev_info_1425_000c, NULL }; #endif @@ -129029,6 +136725,7 @@ static const pciDeviceInfo *pci_dev_list_144d[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_1458[] = { &pci_dev_info_1458_0c11, + &pci_dev_info_1458_9001, &pci_dev_info_1458_e911, NULL }; @@ -129048,6 +136745,9 @@ static const pciDeviceInfo *pci_dev_list_145f[] = { #define pci_dev_list_1460 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_1461[] = { + &pci_dev_info_1461_a3ce, + &pci_dev_info_1461_a3cf, + &pci_dev_info_1461_a836, &pci_dev_info_1461_f436, NULL }; @@ -129059,6 +136759,8 @@ static const pciDeviceInfo *pci_dev_list_1462[] = { &pci_dev_info_1462_6825, &pci_dev_info_1462_6834, &pci_dev_info_1462_7125, + &pci_dev_info_1462_7235, + &pci_dev_info_1462_7242, &pci_dev_info_1462_8725, &pci_dev_info_1462_9000, &pci_dev_info_1462_9110, @@ -129067,6 +136769,7 @@ static const pciDeviceInfo *pci_dev_list_1462[] = { &pci_dev_info_1462_9510, &pci_dev_info_1462_9511, &pci_dev_info_1462_9591, + &pci_dev_info_1462_b834, NULL }; #endif @@ -129338,6 +137041,8 @@ static const pciDeviceInfo *pci_dev_list_14e4[] = { &pci_dev_info_14e4_0816, &pci_dev_info_14e4_1600, &pci_dev_info_14e4_1601, + &pci_dev_info_14e4_1639, + &pci_dev_info_14e4_163a, &pci_dev_info_14e4_1644, &pci_dev_info_14e4_1645, &pci_dev_info_14e4_1646, @@ -129349,6 +137054,7 @@ static const pciDeviceInfo *pci_dev_list_14e4[] = { &pci_dev_info_14e4_1653, &pci_dev_info_14e4_1654, &pci_dev_info_14e4_1659, + &pci_dev_info_14e4_165a, &pci_dev_info_14e4_165d, &pci_dev_info_14e4_165e, &pci_dev_info_14e4_1668, @@ -129358,6 +137064,7 @@ static const pciDeviceInfo *pci_dev_list_14e4[] = { &pci_dev_info_14e4_166e, &pci_dev_info_14e4_1672, &pci_dev_info_14e4_1673, + &pci_dev_info_14e4_1674, &pci_dev_info_14e4_1677, &pci_dev_info_14e4_1678, &pci_dev_info_14e4_1679, @@ -129365,6 +137072,7 @@ static const pciDeviceInfo *pci_dev_list_14e4[] = { &pci_dev_info_14e4_167b, &pci_dev_info_14e4_167d, &pci_dev_info_14e4_167e, + &pci_dev_info_14e4_167f, &pci_dev_info_14e4_1693, &pci_dev_info_14e4_1696, &pci_dev_info_14e4_169a, @@ -129385,11 +137093,14 @@ static const pciDeviceInfo *pci_dev_list_14e4[] = { &pci_dev_info_14e4_170c, &pci_dev_info_14e4_170d, &pci_dev_info_14e4_170e, + &pci_dev_info_14e4_1712, + &pci_dev_info_14e4_1713, &pci_dev_info_14e4_3352, &pci_dev_info_14e4_3360, &pci_dev_info_14e4_4210, &pci_dev_info_14e4_4211, &pci_dev_info_14e4_4212, + &pci_dev_info_14e4_4220, &pci_dev_info_14e4_4301, &pci_dev_info_14e4_4305, &pci_dev_info_14e4_4306, @@ -129408,6 +137119,7 @@ static const pciDeviceInfo *pci_dev_list_14e4[] = { &pci_dev_info_14e4_4325, &pci_dev_info_14e4_4326, &pci_dev_info_14e4_4329, + &pci_dev_info_14e4_4344, &pci_dev_info_14e4_4401, &pci_dev_info_14e4_4402, &pci_dev_info_14e4_4403, @@ -129449,6 +137161,8 @@ static const pciDeviceInfo *pci_dev_list_14e4[] = { &pci_dev_info_14e4_5690, &pci_dev_info_14e4_5691, &pci_dev_info_14e4_5692, + &pci_dev_info_14e4_5695, + &pci_dev_info_14e4_5698, &pci_dev_info_14e4_5820, &pci_dev_info_14e4_5821, &pci_dev_info_14e4_5822, @@ -129508,6 +137222,7 @@ static const pciDeviceInfo *pci_dev_list_14f1[] = { &pci_dev_info_14f1_1065, &pci_dev_info_14f1_1066, &pci_dev_info_14f1_1085, + &pci_dev_info_14f1_10b6, &pci_dev_info_14f1_1433, &pci_dev_info_14f1_1434, &pci_dev_info_14f1_1435, @@ -129570,6 +137285,9 @@ static const pciDeviceInfo *pci_dev_list_14f1[] = { &pci_dev_info_14f1_2f02, &pci_dev_info_14f1_2f11, &pci_dev_info_14f1_2f20, + &pci_dev_info_14f1_2f30, + &pci_dev_info_14f1_5045, + &pci_dev_info_14f1_5047, &pci_dev_info_14f1_8234, &pci_dev_info_14f1_8800, &pci_dev_info_14f1_8801, @@ -129711,6 +137429,7 @@ static const pciDeviceInfo *pci_dev_list_1524[] = { &pci_dev_info_1524_0520, &pci_dev_info_1524_0530, &pci_dev_info_1524_0550, + &pci_dev_info_1524_0551, &pci_dev_info_1524_0610, &pci_dev_info_1524_1211, &pci_dev_info_1524_1225, @@ -129745,6 +137464,7 @@ static const pciDeviceInfo *pci_dev_list_1532[] = { #define pci_dev_list_1533 NULL #define pci_dev_list_1534 NULL #define pci_dev_list_1535 NULL +#define pci_dev_list_1536 NULL #define pci_dev_list_1537 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_1538[] = { @@ -129894,7 +137614,14 @@ static const pciDeviceInfo *pci_dev_list_157c[] = { #define pci_dev_list_158d NULL #define pci_dev_list_158e NULL #define pci_dev_list_158f NULL -#define pci_dev_list_1590 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_1590[] = { + &pci_dev_info_1590_0001, + &pci_dev_info_1590_0002, + &pci_dev_info_1590_a01d, + NULL +}; +#endif #define pci_dev_list_1591 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_1592[] = { @@ -129951,6 +137678,7 @@ static const pciDeviceInfo *pci_dev_list_15ad[] = { #define pci_dev_list_15b2 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_15b3[] = { + &pci_dev_info_15b3_0191, &pci_dev_info_15b3_5274, &pci_dev_info_15b3_5a44, &pci_dev_info_15b3_5a45, @@ -129960,6 +137688,10 @@ static const pciDeviceInfo *pci_dev_list_15b3[] = { &pci_dev_info_15b3_6278, &pci_dev_info_15b3_6279, &pci_dev_info_15b3_6282, + &pci_dev_info_15b3_6340, + &pci_dev_info_15b3_634a, + &pci_dev_info_15b3_6354, + &pci_dev_info_15b3_6368, NULL }; #endif @@ -129967,7 +137699,15 @@ static const pciDeviceInfo *pci_dev_list_15b3[] = { #define pci_dev_list_15b5 NULL #define pci_dev_list_15b6 NULL #define pci_dev_list_15b7 NULL -#define pci_dev_list_15b8 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_15b8[] = { + &pci_dev_info_15b8_1003, + &pci_dev_info_15b8_1005, + &pci_dev_info_15b8_100a, + &pci_dev_info_15b8_3001, + NULL +}; +#endif #define pci_dev_list_15b9 NULL #define pci_dev_list_15ba NULL #define pci_dev_list_15bb NULL @@ -130031,7 +137771,12 @@ static const pciDeviceInfo *pci_dev_list_15dc[] = { #define pci_dev_list_15df NULL #define pci_dev_list_15e0 NULL #define pci_dev_list_15e1 NULL -#define pci_dev_list_15e2 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_15e2[] = { + &pci_dev_info_15e2_0500, + NULL +}; +#endif #define pci_dev_list_15e3 NULL #define pci_dev_list_15e4 NULL #define pci_dev_list_15e5 NULL @@ -130110,6 +137855,8 @@ static const pciDeviceInfo *pci_dev_list_1626[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_1629[] = { &pci_dev_info_1629_1003, + &pci_dev_info_1629_1006, + &pci_dev_info_1629_1007, &pci_dev_info_1629_2002, NULL }; @@ -130204,8 +137951,12 @@ static const pciDeviceInfo *pci_dev_list_168c[] = { &pci_dev_info_168c_0013, &pci_dev_info_168c_001a, &pci_dev_info_168c_001b, + &pci_dev_info_168c_001c, &pci_dev_info_168c_0020, + &pci_dev_info_168c_0023, + &pci_dev_info_168c_0024, &pci_dev_info_168c_1014, + &pci_dev_info_168c_3b08, NULL }; #endif @@ -130216,6 +137967,12 @@ static const pciDeviceInfo *pci_dev_list_169c[] = { NULL }; #endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_169d[] = { + &pci_dev_info_169d_3306, + NULL +}; +#endif #define pci_dev_list_16a5 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_16ab[] = { @@ -130228,7 +137985,10 @@ static const pciDeviceInfo *pci_dev_list_16ab[] = { #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_16ae[] = { + &pci_dev_info_16ae_0001, + &pci_dev_info_16ae_000a, &pci_dev_info_16ae_1141, + &pci_dev_info_16ae_1841, NULL }; #endif @@ -130254,7 +138014,41 @@ static const pciDeviceInfo *pci_dev_list_16ca[] = { #define pci_dev_list_16ce NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_16d5[] = { + &pci_dev_info_16d5_0504, + &pci_dev_info_16d5_0520, + &pci_dev_info_16d5_0521, + &pci_dev_info_16d5_1020, + &pci_dev_info_16d5_1065, + &pci_dev_info_16d5_2004, + &pci_dev_info_16d5_2020, + &pci_dev_info_16d5_2065, + &pci_dev_info_16d5_3020, + &pci_dev_info_16d5_3065, + &pci_dev_info_16d5_4243, + &pci_dev_info_16d5_4248, + &pci_dev_info_16d5_424b, + &pci_dev_info_16d5_4253, + &pci_dev_info_16d5_4312, + &pci_dev_info_16d5_4313, + &pci_dev_info_16d5_4322, + &pci_dev_info_16d5_4323, + &pci_dev_info_16d5_4350, + &pci_dev_info_16d5_4353, + &pci_dev_info_16d5_4357, + &pci_dev_info_16d5_4457, + &pci_dev_info_16d5_464d, + &pci_dev_info_16d5_4850, + &pci_dev_info_16d5_4a42, + &pci_dev_info_16d5_4a50, + &pci_dev_info_16d5_4a56, + &pci_dev_info_16d5_4b47, + &pci_dev_info_16d5_4c40, + &pci_dev_info_16d5_4c60, + &pci_dev_info_16d5_4d4d, &pci_dev_info_16d5_4d4e, + &pci_dev_info_16d5_524d, + &pci_dev_info_16d5_5335, + &pci_dev_info_16d5_5456, NULL }; #endif @@ -130268,6 +138062,7 @@ static const pciDeviceInfo *pci_dev_list_16e3[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_16e5[] = { &pci_dev_info_16e5_6000, + &pci_dev_info_16e5_6300, NULL }; #endif @@ -130318,6 +138113,7 @@ static const pciDeviceInfo *pci_dev_list_172a[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_1734[] = { &pci_dev_info_1734_1078, + &pci_dev_info_1734_1085, NULL }; #endif @@ -130325,6 +138121,7 @@ static const pciDeviceInfo *pci_dev_list_1734[] = { static const pciDeviceInfo *pci_dev_list_1737[] = { &pci_dev_info_1737_0013, &pci_dev_info_1737_0015, + &pci_dev_info_1737_0029, &pci_dev_info_1737_1032, &pci_dev_info_1737_1064, &pci_dev_info_1737_ab08, @@ -130353,6 +138150,7 @@ static const pciDeviceInfo *pci_dev_list_1743[] = { #define pci_dev_list_175c NULL #define pci_dev_list_175e NULL #define pci_dev_list_1775 NULL +#define pci_dev_list_177d NULL #define pci_dev_list_1787 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_1796[] = { @@ -130445,7 +138243,12 @@ static const pciDeviceInfo *pci_dev_list_17d5[] = { NULL }; #endif -#define pci_dev_list_17db NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_17db[] = { + &pci_dev_info_17db_0101, + NULL +}; +#endif #define pci_dev_list_17de NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_17e4[] = { @@ -130465,6 +138268,16 @@ static const pciDeviceInfo *pci_dev_list_17e6[] = { #define pci_dev_list_17ee NULL #define pci_dev_list_17f2 NULL #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_17f3[] = { + &pci_dev_info_17f3_6020, + &pci_dev_info_17f3_6030, + &pci_dev_info_17f3_6040, + &pci_dev_info_17f3_6060, + &pci_dev_info_17f3_6061, + NULL +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_17fe[] = { &pci_dev_info_17fe_2120, &pci_dev_info_17fe_2220, @@ -130488,12 +138301,14 @@ static const pciDeviceInfo *pci_dev_list_1814[] = { &pci_dev_info_1814_0301, &pci_dev_info_1814_0302, &pci_dev_info_1814_0401, + &pci_dev_info_1814_e932, NULL }; #endif #define pci_dev_list_1820 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_1822[] = { + &pci_dev_info_1822_0001, &pci_dev_info_1822_4e35, NULL }; @@ -130546,6 +138361,20 @@ static const pciDeviceInfo *pci_dev_list_1867[] = { }; #endif #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_186c[] = { + &pci_dev_info_186c_0614, + NULL +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_1876[] = { + &pci_dev_info_1876_a101, + &pci_dev_info_1876_a102, + &pci_dev_info_1876_a103, + NULL +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_187e[] = { &pci_dev_info_187e_3403, &pci_dev_info_187e_340e, @@ -130590,6 +138419,7 @@ static const pciDeviceInfo *pci_dev_list_18b8[] = { static const pciDeviceInfo *pci_dev_list_18ca[] = { &pci_dev_info_18ca_0020, &pci_dev_info_18ca_0040, + &pci_dev_info_18ca_0047, NULL }; #endif @@ -130693,6 +138523,7 @@ static const pciDeviceInfo *pci_dev_list_1957[] = { }; #endif #define pci_dev_list_1958 NULL +#define pci_dev_list_1959 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_1966[] = { &pci_dev_info_1966_1975, @@ -130702,6 +138533,7 @@ static const pciDeviceInfo *pci_dev_list_1966[] = { #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_1969[] = { &pci_dev_info_1969_1048, + &pci_dev_info_1969_2048, NULL }; #endif @@ -130709,17 +138541,32 @@ static const pciDeviceInfo *pci_dev_list_1969[] = { static const pciDeviceInfo *pci_dev_list_196a[] = { &pci_dev_info_196a_0101, &pci_dev_info_196a_0102, + &pci_dev_info_196a_0105, NULL }; #endif #define pci_dev_list_196d NULL #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_1971[] = { + &pci_dev_info_1971_1011, + NULL +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_197b[] = { &pci_dev_info_197b_2360, &pci_dev_info_197b_2361, &pci_dev_info_197b_2363, &pci_dev_info_197b_2365, &pci_dev_info_197b_2366, + &pci_dev_info_197b_2368, + NULL +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_1982[] = { + &pci_dev_info_1982_1600, + &pci_dev_info_1982_16ff, NULL }; #endif @@ -130732,6 +138579,13 @@ static const pciDeviceInfo *pci_dev_list_1989[] = { #endif #define pci_dev_list_1993 NULL #define pci_dev_list_199a NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_19a2[] = { + &pci_dev_info_19a2_0200, + &pci_dev_info_19a2_0201, + NULL +}; +#endif #define pci_dev_list_19a8 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_19ac[] = { @@ -130746,6 +138600,7 @@ static const pciDeviceInfo *pci_dev_list_19ae[] = { }; #endif #define pci_dev_list_19d4 NULL +#define pci_dev_list_19de NULL #define pci_dev_list_19e2 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_19e7[] = { @@ -130762,14 +138617,44 @@ static const pciDeviceInfo *pci_dev_list_1a03[] = { NULL }; #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_1a07[] = { + &pci_dev_info_1a07_0006, + &pci_dev_info_1a07_0007, + NULL +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_1a08[] = { &pci_dev_info_1a08_0000, NULL }; #endif -#define pci_dev_list_1a1d NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_1a1d[] = { + &pci_dev_info_1a1d_1a17, + NULL +}; +#endif +#define pci_dev_list_1a22 NULL #define pci_dev_list_1a29 NULL #define pci_dev_list_1a51 NULL +#define pci_dev_list_1a5d NULL +#define pci_dev_list_1a71 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_1a73[] = { + &pci_dev_info_1a73_0001, + NULL +}; +#endif +#define pci_dev_list_1a77 NULL +#define pci_dev_list_1a78 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_1a8c[] = { + &pci_dev_info_1a8c_1100, + NULL +}; +#endif +#define pci_dev_list_1ab9 NULL #define pci_dev_list_1b13 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_1c1c[] = { @@ -130906,6 +138791,15 @@ static const pciDeviceInfo *pci_dev_list_4033[] = { NULL }; #endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_4040[] = { + &pci_dev_info_4040_0001, + &pci_dev_info_4040_0002, + &pci_dev_info_4040_0003, + &pci_dev_info_4040_0004, + NULL +}; +#endif #define pci_dev_list_4143 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_4144[] = { @@ -130921,6 +138815,7 @@ static const pciDeviceInfo *pci_dev_list_416c[] = { }; #endif #define pci_dev_list_4321 NULL +#define pci_dev_list_434e NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_4444[] = { &pci_dev_info_4444_0016, @@ -130971,6 +138866,12 @@ static const pciDeviceInfo *pci_dev_list_4d51[] = { #endif #define pci_dev_list_4d54 NULL #ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_4d56[] = { + &pci_dev_info_4d56_0000, + NULL +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_4ddc[] = { &pci_dev_info_4ddc_0100, &pci_dev_info_4ddc_0801, @@ -131104,6 +139005,7 @@ static const pciDeviceInfo *pci_dev_list_5333[] = { &pci_dev_info_5333_8d02, &pci_dev_info_5333_8d03, &pci_dev_info_5333_8d04, + &pci_dev_info_5333_8e48, &pci_dev_info_5333_9102, &pci_dev_info_5333_ca00, NULL @@ -131120,6 +139022,7 @@ static const pciDeviceInfo *pci_dev_list_5455[] = { NULL }; #endif +#define pci_dev_list_5456 NULL #define pci_dev_list_5519 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_5544[] = { @@ -131141,6 +139044,12 @@ static const pciDeviceInfo *pci_dev_list_5654[] = { #endif #define pci_dev_list_5700 NULL #define pci_dev_list_5851 NULL +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_5853[] = { + &pci_dev_info_5853_0001, + NULL +}; +#endif #define pci_dev_list_6356 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_6374[] = { @@ -131345,17 +139254,27 @@ static const pciDeviceInfo *pci_dev_list_8086[] = { &pci_dev_info_8086_10a0, &pci_dev_info_8086_10a1, &pci_dev_info_8086_10a4, + &pci_dev_info_8086_10a5, &pci_dev_info_8086_10b0, &pci_dev_info_8086_10b2, &pci_dev_info_8086_10b3, &pci_dev_info_8086_10b4, &pci_dev_info_8086_10b5, + &pci_dev_info_8086_10b6, &pci_dev_info_8086_10b9, &pci_dev_info_8086_10ba, &pci_dev_info_8086_10bb, &pci_dev_info_8086_10bc, + &pci_dev_info_8086_10bd, + &pci_dev_info_8086_10c0, + &pci_dev_info_8086_10c2, + &pci_dev_info_8086_10c3, &pci_dev_info_8086_10c4, &pci_dev_info_8086_10c5, + &pci_dev_info_8086_10c6, + &pci_dev_info_8086_10c7, + &pci_dev_info_8086_10d9, + &pci_dev_info_8086_10da, &pci_dev_info_8086_1107, &pci_dev_info_8086_1130, &pci_dev_info_8086_1131, @@ -131700,7 +139619,13 @@ static const pciDeviceInfo *pci_dev_list_8086[] = { &pci_dev_info_8086_284b, &pci_dev_info_8086_284f, &pci_dev_info_8086_2850, - &pci_dev_info_8086_2910, + &pci_dev_info_8086_2911, + &pci_dev_info_8086_2912, + &pci_dev_info_8086_2914, + &pci_dev_info_8086_2916, + &pci_dev_info_8086_2917, + &pci_dev_info_8086_2918, + &pci_dev_info_8086_2919, &pci_dev_info_8086_2920, &pci_dev_info_8086_2921, &pci_dev_info_8086_2922, @@ -131708,6 +139633,8 @@ static const pciDeviceInfo *pci_dev_list_8086[] = { &pci_dev_info_8086_2925, &pci_dev_info_8086_2926, &pci_dev_info_8086_2928, + &pci_dev_info_8086_2929, + &pci_dev_info_8086_292c, &pci_dev_info_8086_292d, &pci_dev_info_8086_292e, &pci_dev_info_8086_2930, @@ -131772,6 +139699,14 @@ static const pciDeviceInfo *pci_dev_list_8086[] = { &pci_dev_info_8086_29c6, &pci_dev_info_8086_29c7, &pci_dev_info_8086_29cf, + &pci_dev_info_8086_29d0, + &pci_dev_info_8086_29d1, + &pci_dev_info_8086_29d2, + &pci_dev_info_8086_29d3, + &pci_dev_info_8086_29d4, + &pci_dev_info_8086_29d5, + &pci_dev_info_8086_29d6, + &pci_dev_info_8086_29d7, &pci_dev_info_8086_29e0, &pci_dev_info_8086_29e1, &pci_dev_info_8086_29e4, @@ -131794,10 +139729,16 @@ static const pciDeviceInfo *pci_dev_list_8086[] = { &pci_dev_info_8086_2a05, &pci_dev_info_8086_2a06, &pci_dev_info_8086_2a07, - &pci_dev_info_8086_3092, &pci_dev_info_8086_3200, + &pci_dev_info_8086_3313, + &pci_dev_info_8086_331b, + &pci_dev_info_8086_3331, + &pci_dev_info_8086_3339, &pci_dev_info_8086_3340, &pci_dev_info_8086_3341, + &pci_dev_info_8086_3363, + &pci_dev_info_8086_33c3, + &pci_dev_info_8086_33cb, &pci_dev_info_8086_3500, &pci_dev_info_8086_3501, &pci_dev_info_8086_3504, @@ -131853,6 +139794,8 @@ static const pciDeviceInfo *pci_dev_list_8086[] = { &pci_dev_info_8086_360f, &pci_dev_info_8086_3610, &pci_dev_info_8086_4000, + &pci_dev_info_8086_4001, + &pci_dev_info_8086_4003, &pci_dev_info_8086_4008, &pci_dev_info_8086_4010, &pci_dev_info_8086_4021, @@ -131876,7 +139819,42 @@ static const pciDeviceInfo *pci_dev_list_8086[] = { &pci_dev_info_8086_4223, &pci_dev_info_8086_4224, &pci_dev_info_8086_4227, + &pci_dev_info_8086_4229, + &pci_dev_info_8086_4230, + &pci_dev_info_8086_444e, &pci_dev_info_8086_5001, + &pci_dev_info_8086_5020, + &pci_dev_info_8086_5021, + &pci_dev_info_8086_5023, + &pci_dev_info_8086_5024, + &pci_dev_info_8086_5025, + &pci_dev_info_8086_5028, + &pci_dev_info_8086_5029, + &pci_dev_info_8086_502a, + &pci_dev_info_8086_502b, + &pci_dev_info_8086_5031, + &pci_dev_info_8086_5032, + &pci_dev_info_8086_5033, + &pci_dev_info_8086_5035, + &pci_dev_info_8086_5037, + &pci_dev_info_8086_5039, + &pci_dev_info_8086_503a, + &pci_dev_info_8086_503b, + &pci_dev_info_8086_503c, + &pci_dev_info_8086_503d, + &pci_dev_info_8086_503e, + &pci_dev_info_8086_5040, + &pci_dev_info_8086_5041, + &pci_dev_info_8086_5042, + &pci_dev_info_8086_5043, + &pci_dev_info_8086_5044, + &pci_dev_info_8086_5045, + &pci_dev_info_8086_5046, + &pci_dev_info_8086_5047, + &pci_dev_info_8086_5048, + &pci_dev_info_8086_5049, + &pci_dev_info_8086_504a, + &pci_dev_info_8086_504b, &pci_dev_info_8086_5200, &pci_dev_info_8086_5201, &pci_dev_info_8086_530d, @@ -131937,6 +139915,7 @@ static const pciDeviceInfo *pci_dev_list_8086[] = { &pci_dev_info_8086_7602, &pci_dev_info_8086_7603, &pci_dev_info_8086_7800, + &pci_dev_info_8086_8002, &pci_dev_info_8086_84c4, &pci_dev_info_8086_84c5, &pci_dev_info_8086_84ca, @@ -131963,6 +139942,21 @@ static const pciDeviceInfo *pci_dev_list_8086[] = { &pci_dev_info_8086_b555, NULL }; +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_80ee[] = { + &pci_dev_info_80ee_beef, + &pci_dev_info_80ee_cafe, + NULL +}; +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO +static const pciDeviceInfo *pci_dev_list_8384[] = { + &pci_dev_info_8384_7618, + &pci_dev_info_8384_7670, + &pci_dev_info_8384_7672, + NULL +}; +#endif #define pci_dev_list_8401 NULL #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_8686[] = { @@ -132092,6 +140086,8 @@ static const pciDeviceInfo *pci_dev_list_9005[] = { &pci_dev_info_9005_0081, &pci_dev_info_9005_0083, &pci_dev_info_9005_008f, + &pci_dev_info_9005_0092, + &pci_dev_info_9005_0093, &pci_dev_info_9005_00c0, &pci_dev_info_9005_00c1, &pci_dev_info_9005_00c3, @@ -132238,13 +140234,15 @@ static const pciDeviceInfo *pci_dev_list_cddd[] = { #endif #ifdef VENDOR_INCLUDE_NONVIDEO static const pciDeviceInfo *pci_dev_list_d161[] = { + &pci_dev_info_d161_0120, &pci_dev_info_d161_0205, &pci_dev_info_d161_0210, &pci_dev_info_d161_0405, - &pci_dev_info_d161_0406, &pci_dev_info_d161_0410, - &pci_dev_info_d161_0411, + &pci_dev_info_d161_0800, &pci_dev_info_d161_2400, + &pci_dev_info_d161_3400, + &pci_dev_info_d161_b410, NULL }; #endif @@ -132435,6 +140433,9 @@ static const pciVendorInfo pciVendorInfoList[] = { {0x02ac, pci_vendor_02ac, pci_dev_list_02ac}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x02e0, pci_vendor_02e0, pci_dev_list_02e0}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x0315, pci_vendor_0315, pci_dev_list_0315}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -132459,6 +140460,9 @@ static const pciVendorInfo pciVendorInfoList[] = { {0x050d, pci_vendor_050d, pci_dev_list_050d}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x058f, pci_vendor_058f, pci_dev_list_058f}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x05a9, pci_vendor_05a9, pci_dev_list_05a9}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -136350,6 +144354,9 @@ static const pciVendorInfo pciVendorInfoList[] = { {0x1535, pci_vendor_1535, pci_dev_list_1535}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x1536, pci_vendor_1536, pci_dev_list_1536}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x1537, pci_vendor_1537, pci_dev_list_1537}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -137041,6 +145048,9 @@ static const pciVendorInfo pciVendorInfoList[] = { {0x169c, pci_vendor_169c, pci_dev_list_169c}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x169d, pci_vendor_169d, pci_dev_list_169d}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x16a5, pci_vendor_16a5, pci_dev_list_16a5}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -137155,6 +145165,9 @@ static const pciVendorInfo pciVendorInfoList[] = { {0x1775, pci_vendor_1775, pci_dev_list_1775}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x177d, pci_vendor_177d, pci_dev_list_177d}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x1787, pci_vendor_1787, pci_dev_list_1787}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -137224,6 +145237,9 @@ static const pciVendorInfo pciVendorInfoList[] = { {0x17f2, pci_vendor_17f2, pci_dev_list_17f2}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x17f3, pci_vendor_17f3, pci_dev_list_17f3}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x17fe, pci_vendor_17fe, pci_dev_list_17fe}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -137287,6 +145303,12 @@ static const pciVendorInfo pciVendorInfoList[] = { {0x1867, pci_vendor_1867, pci_dev_list_1867}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x186c, pci_vendor_186c, pci_dev_list_186c}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO + {0x1876, pci_vendor_1876, pci_dev_list_1876}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x187e, pci_vendor_187e, pci_dev_list_187e}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -137380,6 +145402,9 @@ static const pciVendorInfo pciVendorInfoList[] = { {0x1958, pci_vendor_1958, pci_dev_list_1958}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x1959, pci_vendor_1959, pci_dev_list_1959}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x1966, pci_vendor_1966, pci_dev_list_1966}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -137392,9 +145417,15 @@ static const pciVendorInfo pciVendorInfoList[] = { {0x196d, pci_vendor_196d, pci_dev_list_196d}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x1971, pci_vendor_1971, pci_dev_list_1971}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x197b, pci_vendor_197b, pci_dev_list_197b}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x1982, pci_vendor_1982, pci_dev_list_1982}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x1989, pci_vendor_1989, pci_dev_list_1989}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -137404,6 +145435,9 @@ static const pciVendorInfo pciVendorInfoList[] = { {0x199a, pci_vendor_199a, pci_dev_list_199a}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x19a2, pci_vendor_19a2, pci_dev_list_19a2}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x19a8, pci_vendor_19a8, pci_dev_list_19a8}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -137416,6 +145450,9 @@ static const pciVendorInfo pciVendorInfoList[] = { {0x19d4, pci_vendor_19d4, pci_dev_list_19d4}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x19de, pci_vendor_19de, pci_dev_list_19de}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x19e2, pci_vendor_19e2, pci_dev_list_19e2}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -137423,18 +145460,45 @@ static const pciVendorInfo pciVendorInfoList[] = { #endif {0x1a03, pci_vendor_1a03, pci_dev_list_1a03}, #ifdef VENDOR_INCLUDE_NONVIDEO + {0x1a07, pci_vendor_1a07, pci_dev_list_1a07}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x1a08, pci_vendor_1a08, pci_dev_list_1a08}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO {0x1a1d, pci_vendor_1a1d, pci_dev_list_1a1d}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x1a22, pci_vendor_1a22, pci_dev_list_1a22}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x1a29, pci_vendor_1a29, pci_dev_list_1a29}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO {0x1a51, pci_vendor_1a51, pci_dev_list_1a51}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x1a5d, pci_vendor_1a5d, pci_dev_list_1a5d}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO + {0x1a71, pci_vendor_1a71, pci_dev_list_1a71}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO + {0x1a73, pci_vendor_1a73, pci_dev_list_1a73}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO + {0x1a77, pci_vendor_1a77, pci_dev_list_1a77}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO + {0x1a78, pci_vendor_1a78, pci_dev_list_1a78}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO + {0x1a8c, pci_vendor_1a8c, pci_dev_list_1a8c}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO + {0x1ab9, pci_vendor_1ab9, pci_dev_list_1ab9}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x1b13, pci_vendor_1b13, pci_dev_list_1b13}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -137518,6 +145582,9 @@ static const pciVendorInfo pciVendorInfoList[] = { {0x4033, pci_vendor_4033, pci_dev_list_4033}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x4040, pci_vendor_4040, pci_dev_list_4040}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x4143, pci_vendor_4143, pci_dev_list_4143}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -137530,6 +145597,9 @@ static const pciVendorInfo pciVendorInfoList[] = { {0x4321, pci_vendor_4321, pci_dev_list_4321}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x434e, pci_vendor_434e, pci_dev_list_434e}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x4444, pci_vendor_4444, pci_dev_list_4444}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -137579,6 +145649,9 @@ static const pciVendorInfo pciVendorInfoList[] = { {0x4d54, pci_vendor_4d54, pci_dev_list_4d54}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x4d56, pci_vendor_4d56, pci_dev_list_4d56}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x4ddc, pci_vendor_4ddc, pci_dev_list_4ddc}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -137610,6 +145683,9 @@ static const pciVendorInfo pciVendorInfoList[] = { {0x5455, pci_vendor_5455, pci_dev_list_5455}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x5456, pci_vendor_5456, pci_dev_list_5456}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x5519, pci_vendor_5519, pci_dev_list_5519}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -137628,6 +145704,9 @@ static const pciVendorInfo pciVendorInfoList[] = { {0x5851, pci_vendor_5851, pci_dev_list_5851}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x5853, pci_vendor_5853, pci_dev_list_5853}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x6356, pci_vendor_6356, pci_dev_list_6356}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -137659,6 +145738,12 @@ static const pciVendorInfo pciVendorInfoList[] = { #endif {0x8086, pci_vendor_8086, pci_dev_list_8086}, #ifdef VENDOR_INCLUDE_NONVIDEO + {0x80ee, pci_vendor_80ee, pci_dev_list_80ee}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO + {0x8384, pci_vendor_8384, pci_dev_list_8384}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x8401, pci_vendor_8401, pci_dev_list_8401}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -137915,6 +146000,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { {0x02ac, pci_vendor_02ac, pci_ss_list_02ac}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x02e0, pci_vendor_02e0, pci_ss_list_02e0}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x0315, pci_vendor_0315, pci_ss_list_0315}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -137939,6 +146027,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { {0x050d, pci_vendor_050d, pci_ss_list_050d}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x058f, pci_vendor_058f, pci_ss_list_058f}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x05a9, pci_vendor_05a9, pci_ss_list_05a9}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -141830,6 +149921,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { {0x1535, pci_vendor_1535, pci_ss_list_1535}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x1536, pci_vendor_1536, pci_ss_list_1536}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x1537, pci_vendor_1537, pci_ss_list_1537}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -142521,6 +150615,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { {0x169c, pci_vendor_169c, pci_ss_list_169c}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x169d, pci_vendor_169d, pci_ss_list_169d}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x16a5, pci_vendor_16a5, pci_ss_list_16a5}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -142635,6 +150732,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { {0x1775, pci_vendor_1775, pci_ss_list_1775}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x177d, pci_vendor_177d, pci_ss_list_177d}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x1787, pci_vendor_1787, pci_ss_list_1787}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -142704,6 +150804,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { {0x17f2, pci_vendor_17f2, pci_ss_list_17f2}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x17f3, pci_vendor_17f3, pci_ss_list_17f3}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x17fe, pci_vendor_17fe, pci_ss_list_17fe}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -142767,6 +150870,12 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { {0x1867, pci_vendor_1867, pci_ss_list_1867}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x186c, pci_vendor_186c, pci_ss_list_186c}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO + {0x1876, pci_vendor_1876, pci_ss_list_1876}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x187e, pci_vendor_187e, pci_ss_list_187e}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -142860,6 +150969,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { {0x1958, pci_vendor_1958, pci_ss_list_1958}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x1959, pci_vendor_1959, pci_ss_list_1959}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x1966, pci_vendor_1966, pci_ss_list_1966}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -142872,9 +150984,15 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { {0x196d, pci_vendor_196d, pci_ss_list_196d}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x1971, pci_vendor_1971, pci_ss_list_1971}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x197b, pci_vendor_197b, pci_ss_list_197b}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x1982, pci_vendor_1982, pci_ss_list_1982}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x1989, pci_vendor_1989, pci_ss_list_1989}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -142884,6 +151002,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { {0x199a, pci_vendor_199a, pci_ss_list_199a}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x19a2, pci_vendor_19a2, pci_ss_list_19a2}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x19a8, pci_vendor_19a8, pci_ss_list_19a8}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -142896,6 +151017,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { {0x19d4, pci_vendor_19d4, pci_ss_list_19d4}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x19de, pci_vendor_19de, pci_ss_list_19de}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x19e2, pci_vendor_19e2, pci_ss_list_19e2}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -142903,18 +151027,45 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { #endif {0x1a03, pci_vendor_1a03, pci_ss_list_1a03}, #ifdef VENDOR_INCLUDE_NONVIDEO + {0x1a07, pci_vendor_1a07, pci_ss_list_1a07}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x1a08, pci_vendor_1a08, pci_ss_list_1a08}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO {0x1a1d, pci_vendor_1a1d, pci_ss_list_1a1d}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x1a22, pci_vendor_1a22, pci_ss_list_1a22}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x1a29, pci_vendor_1a29, pci_ss_list_1a29}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO {0x1a51, pci_vendor_1a51, pci_ss_list_1a51}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x1a5d, pci_vendor_1a5d, pci_ss_list_1a5d}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO + {0x1a71, pci_vendor_1a71, pci_ss_list_1a71}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO + {0x1a73, pci_vendor_1a73, pci_ss_list_1a73}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO + {0x1a77, pci_vendor_1a77, pci_ss_list_1a77}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO + {0x1a78, pci_vendor_1a78, pci_ss_list_1a78}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO + {0x1a8c, pci_vendor_1a8c, pci_ss_list_1a8c}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO + {0x1ab9, pci_vendor_1ab9, pci_ss_list_1ab9}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x1b13, pci_vendor_1b13, pci_ss_list_1b13}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -142998,6 +151149,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { {0x4033, pci_vendor_4033, pci_ss_list_4033}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x4040, pci_vendor_4040, pci_ss_list_4040}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x4143, pci_vendor_4143, pci_ss_list_4143}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -143010,6 +151164,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { {0x4321, pci_vendor_4321, pci_ss_list_4321}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x434e, pci_vendor_434e, pci_ss_list_434e}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x4444, pci_vendor_4444, pci_ss_list_4444}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -143059,6 +151216,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { {0x4d54, pci_vendor_4d54, pci_ss_list_4d54}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x4d56, pci_vendor_4d56, pci_ss_list_4d56}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x4ddc, pci_vendor_4ddc, pci_ss_list_4ddc}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -143090,6 +151250,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { {0x5455, pci_vendor_5455, pci_ss_list_5455}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x5456, pci_vendor_5456, pci_ss_list_5456}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x5519, pci_vendor_5519, pci_ss_list_5519}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -143108,6 +151271,9 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { {0x5851, pci_vendor_5851, pci_ss_list_5851}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO + {0x5853, pci_vendor_5853, pci_ss_list_5853}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x6356, pci_vendor_6356, pci_ss_list_6356}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO @@ -143139,6 +151305,12 @@ static const pciVendorSubsysInfo pciVendorSubsysInfoList[] = { #endif {0x8086, pci_vendor_8086, pci_ss_list_8086}, #ifdef VENDOR_INCLUDE_NONVIDEO + {0x80ee, pci_vendor_80ee, pci_ss_list_80ee}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO + {0x8384, pci_vendor_8384, pci_ss_list_8384}, +#endif +#ifdef VENDOR_INCLUDE_NONVIDEO {0x8401, pci_vendor_8401, pci_ss_list_8401}, #endif #ifdef VENDOR_INCLUDE_NONVIDEO diff --git a/hw/xfree86/utils/cvt/cvt.man.pre b/hw/xfree86/utils/cvt/cvt.man.pre index 109072442..8a292eed8 100644 --- a/hw/xfree86/utils/cvt/cvt.man.pre +++ b/hw/xfree86/utils/cvt/cvt.man.pre @@ -37,6 +37,6 @@ __xconfigfile__(__filemansuffix__) Luc Verhaegen. .PP This program is based on the Coordinated Video Timing sample -implementation written by Graham Loveridge. This file is publically +implementation written by Graham Loveridge. This file is publicly available at <http://www.vesa.org/Public/CVT/CVTd6r1.xls>. CVT is a VESA trademark. diff --git a/hw/xfree86/utils/gtf/gtf.man.pre b/hw/xfree86/utils/gtf/gtf.man.pre index fd0c406d3..74ade74cb 100644 --- a/hw/xfree86/utils/gtf/gtf.man.pre +++ b/hw/xfree86/utils/gtf/gtf.man.pre @@ -40,6 +40,6 @@ __xconfigfile__(__filemansuffix__) Andy Ritger. .PP This program is based on the Generalized Timing Formula (GTF(TM)) Standard -Version: 1.0, Revsion: 1.0. The GTF Excel(TM) spreadsheet, a sample +Version: 1.0, Revision: 1.0. The GTF Excel(TM) spreadsheet, a sample (and the definitive) implementation of the GTF Timing Standard is available at <ftp://ftp.vesa.org/pub/GTF/VTF_V1R1.xls>. diff --git a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c index afa8510b0..5f8bdbd7f 100644 --- a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c +++ b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c @@ -1,10 +1,5 @@ - - /* Keyboard mode control program for 386BSD */ - -/* $XConsortium: kbd_mode.c /main/7 1996/03/11 10:46:12 kaleb $ */ - #include <sys/types.h> #include <fcntl.h> #include <errno.h> diff --git a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c index 96a4644a0..f2802a6b8 100644 --- a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c +++ b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c @@ -1,4 +1,3 @@ -/* $XdotOrg: $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/hw/xfree86/utils/xorgcfg/card-cfg.h b/hw/xfree86/utils/xorgcfg/card-cfg.h index 2c7121871..fbb02a7ab 100644 --- a/hw/xfree86/utils/xorgcfg/card-cfg.h +++ b/hw/xfree86/utils/xorgcfg/card-cfg.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86$ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/config.h b/hw/xfree86/utils/xorgcfg/config.h index 62187b0d4..b5baba465 100644 --- a/hw/xfree86/utils/xorgcfg/config.h +++ b/hw/xfree86/utils/xorgcfg/config.h @@ -49,12 +49,6 @@ #include <stdarg.h> -#ifdef __UNIXOS2__ -#define strcasecmp stricmp -#define setenv putenv -#define PATH_MAX 260 -#endif - /* Get PATH_MAX */ #ifndef PATH_MAX # if defined(_POSIX_SOURCE) @@ -103,7 +97,6 @@ #define CONFIG_ACCESSX 3 extern int config_mode; -#ifndef __UNIXOS2__ #define CONFPATH "%A," "%R," \ "/etc/X11/%R," "%P/etc/X11/%R," \ "%E," "%F," \ @@ -120,26 +113,6 @@ extern int config_mode; "%P/etc/X11/%X," \ "%P/lib/X11/%X.%H," "%P/lib/X11/%X-%M," \ "%P/lib/X11/%X" -#else -#define CONFPATH "%&"XF86CONFIGDIR"/%R," "%&"XF86CONFIGDIR"/%X," \ - "%A," "%R," \ - "/etc/X11/%R," "%P/etc/X11/%R," \ - "%E," "%F," \ - "/etc/X11/%F," "%P/etc/X11/%F," \ - "%D/%X," \ - "/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \ - "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \ - "%P/etc/X11/%X," \ - "%P/lib/X11/%X.%H," "%P/lib/X11/%X-%M," \ - "%P/lib/X11/%X" -#define USER_CONFPATH "%&"XF86CONFIGDIR"/%X," "%&"XF86CONFIGDIR"/%X," \ - "/etc/X11/%S," "%P/etc/X11/%S," \ - "/etc/X11/%G," "%P/etc/X11/%G," \ - "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \ - "%P/etc/X11/%X," \ - "%P/lib/X11/%X.%H," "%P/lib/X11/%X-%M," \ - "%P/lib/X11/%X" -#endif /* * Types diff --git a/hw/xfree86/utils/xorgcfg/help.h b/hw/xfree86/utils/xorgcfg/help.h index d582a8172..141f50402 100644 --- a/hw/xfree86/utils/xorgcfg/help.h +++ b/hw/xfree86/utils/xorgcfg/help.h @@ -25,8 +25,6 @@ * Conectiva Linux. * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> - * - * $XFree86$ */ /* help string definitions */ diff --git a/hw/xfree86/utils/xorgcfg/mouse-cfg.c b/hw/xfree86/utils/xorgcfg/mouse-cfg.c index 5bae6d326..24aec6ae4 100644 --- a/hw/xfree86/utils/xorgcfg/mouse-cfg.c +++ b/hw/xfree86/utils/xorgcfg/mouse-cfg.c @@ -54,9 +54,6 @@ static struct MouseProtocol { char *name; int type; } protocols[] = { -#ifdef __UNIXOS2__ - {"OS2Mouse", MTYPE_AUTOMOUSE}, -#endif #ifdef __SCO__ {"OsMouse", MTYPE_AUTOMOUSE}, #endif diff --git a/hw/xfree86/utils/xorgcfg/mouse-cfg.h b/hw/xfree86/utils/xorgcfg/mouse-cfg.h index ebd7ee662..90e5980e6 100644 --- a/hw/xfree86/utils/xorgcfg/mouse-cfg.h +++ b/hw/xfree86/utils/xorgcfg/mouse-cfg.h @@ -25,8 +25,6 @@ * Conectiva Linux. * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> - * - * $XFree86$ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/stubs.c b/hw/xfree86/utils/xorgcfg/stubs.c index 47b2c2d5a..fdc840a7e 100644 --- a/hw/xfree86/utils/xorgcfg/stubs.c +++ b/hw/xfree86/utils/xorgcfg/stubs.c @@ -36,10 +36,6 @@ * Implementation */ -#ifdef __UNIXOS2__ -static char dummy; -#endif - #if !defined(USE_MODULES) /* these are defined in libdummy.a */ int diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c index 8800c29d7..0b6e65482 100644 --- a/hw/xfree86/utils/xorgcfg/text-mode.c +++ b/hw/xfree86/utils/xorgcfg/text-mode.c @@ -53,11 +53,7 @@ #endif #ifndef XKB_RULES_DIR -#ifndef __UNIXOS2__ #define XKB_RULES_DIR PROJECT_ROOT "/share/X11/xkb/rules" -#else -#define XKB_RULES_DIR XF86CONFIGDIR "/xkb/rules" -#endif #endif #define CONTROL_A 1 @@ -212,11 +208,7 @@ TextMode(void) "The "__XCONFIGFILE__" file usually resides in /etc. A " "sample "__XCONFIGFILE__" file is supplied with " #else -#ifndef __UNIXOS2__ "The "__XCONFIGFILE__" file usually resides in " PROJECT_ROOT "/etc/X11 " -#else - "The "__XCONFIGFILE__" file usually resides in "XF86CONFIGDIR" " -#endif "or /etc/X11. A sample "__XCONFIGFILE__" file is supplied with " #endif __XSERVERNAME__"; it is configured for a standard VGA card and " @@ -306,11 +298,7 @@ WriteXF86Config(void) refresh(); xf86config = DialogInput("Write "__XCONFIGFILE__, "Write configuration to file:", 10, 60, XF86Config_path ? XF86Config_path : -#ifndef __UNIXOS2__ "/etc/X11/"__XCONFIGFILE__, " Ok ", " Cancel ", 0); -#else - XF86CONFIGDIR"/"__XCONFIGFILE__, " Ok ", " Cancel ", 0); -#endif if (xf86config == NULL) return (-1); @@ -355,9 +343,6 @@ WriteXF86Config(void) } static char *protocols[] = { -#ifdef __UNIXOS2__ - "OS2Mouse", -#endif #ifdef __SCO__ "OsMouse", #endif @@ -549,8 +534,6 @@ MouseConfig(void) str = "/dev/wsmouse"; #elif defined(__FreeBSD__) || defined(__DragonFly__) str = "/dev/sysmouse"; -#elif defined(__UNIXOS2__) - str = "mouse$"; #elif defined(__linux__) str = "/dev/input/mice"; #else diff --git a/hw/xfree86/utils/xorgconfig/cards.c b/hw/xfree86/utils/xorgconfig/cards.c index f903d7f9c..8116f0a03 100644 --- a/hw/xfree86/utils/xorgconfig/cards.c +++ b/hw/xfree86/utils/xorgconfig/cards.c @@ -1,10 +1,3 @@ -/* $XConsortium: cards.c /main/9 1996/10/19 18:15:32 kaleb $ */ - - - - - - /* * Functions to manipulate card database. */ @@ -66,15 +59,6 @@ getnextline(FILE *f, char *l) { if (fgets(l, 128, f) == NULL) return -1; -#ifdef __UNIXOS2__ - { - char *p = strchr(l,'\r'); - if (p) { - *p = '\n'; - *(p+1) = '\0'; - } - } -#endif return 0; } @@ -119,11 +103,7 @@ int parse_database() { int i, lineno; char filename[128]; -#ifndef __UNIXOS2__ strcpy(filename, CARD_DATABASE_FILE); -#else - strcpy(filename, (char*)__XOS2RedirRoot(CARD_DATABASE_FILE)); -#endif f = fopen(filename, "r"); if (f == NULL) return -1; diff --git a/hw/xfree86/utils/xorgconfig/cards.h b/hw/xfree86/utils/xorgconfig/cards.h index b667ec685..7e1438db8 100644 --- a/hw/xfree86/utils/xorgconfig/cards.h +++ b/hw/xfree86/utils/xorgconfig/cards.h @@ -1,10 +1,3 @@ - - - - - -/* $XConsortium: cards.h /main/3 1996/02/21 18:12:53 kaleb $ */ - #ifndef CARD_DATABASE_FILE #define CARD_DATABASE_FILE "Cards" #endif diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c index 3e60fdabb..736b01183 100644 --- a/hw/xfree86/utils/xorgconfig/xorgconfig.c +++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c @@ -1,4 +1,3 @@ - /* * This is a configuration program that will create a base XF86Config * file based on menu choices. Its main feature is that clueless users @@ -91,7 +90,6 @@ * - Add font path "/TrueType/" and "/freefont/". * Chisato Yamauchi(cyamauch@phyas.aichi-edu.ac.jp) */ -/* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */ #ifdef HAVE_CONFIG_H # include "xorg-server.h" @@ -107,13 +105,6 @@ #include <sys/types.h> #include <sys/stat.h> -/* hv: fix a few EMX problems, will disappear with real UnixOS/2 */ -#ifdef __UNIXOS2__ -#define sync() /*nothing*/ -static int getuid() { return 0; } -#endif - - #include <X11/Xlib.h> #include <X11/extensions/XKBstr.h> #include <X11/extensions/XKBrules.h> @@ -172,11 +163,7 @@ static int getuid() { return 0; } #endif #define MODULEPATH TREEROOT "/lib/modules" -#ifndef __UNIXOS2__ #define XSERVERNAME_FOR_PROBE "X" -#else -#define XSERVERNAME_FOR_PROBE PROJECTROOT"/bin/"__XSERVERNAME__ -#endif #ifndef XCONFIGFILE #define XCONFIGFILE "xorg.conf" @@ -378,10 +365,6 @@ getstring(char *s) /* * Mouse configuration. - * - * (hv) OS/2 (__UNIXOS2__) only has an OS supported mouse, so user has no options - * the server will enable a third button automatically if there is one - * We also do the same for QNX4, since we use the OS mouse drivers. */ int M_OSMOUSE, M_WSMOUSE, M_AUTO, @@ -398,7 +381,7 @@ struct { int *ident; char *desc; } mouse_info[] = { -#if defined(__UNIXOS2__) || defined(QNX4) +#if defined(QNX4) #define DEF_PROTO_STRING "OSMOUSE" {"OSMOUSE", &M_OSMOUSE, "OSMOUSE" @@ -498,7 +481,6 @@ struct { # define DEF_MOUSEDEV "/dev/mouse"; #endif -#ifndef __UNIXOS2__ static char *mouseintro_text = "First specify a mouse protocol type. Choose one from the following list:\n" "\n"; @@ -549,12 +531,10 @@ static char *mousemancomment_text = "You have selected a Logitech MouseMan type mouse. You might want to enable\n" "ChordMiddle which could cause the third button to work.\n"; -#endif /* !__UNIXOS2__ */ - static void mouse_configuration(void) { -#if !defined(__UNIXOS2__) && !defined(QNX4) +#if !defined(QNX4) int i, j; char s[80]; char *def_mousedev = DEF_MOUSEDEV; @@ -670,18 +650,14 @@ mouse_configuration(void) { } printf("\n"); -#else /* __UNIXOS2__ */ +#else /* set some reasonable defaults for OS/2 */ config_mousetype = M_OSMOUSE; config_chordmiddle = 0; config_cleardtrrts = 0; config_emulate3buttons = 0; -#if !defined(QNX4) - config_pointerdevice = "OS2MOUSE"; -#else config_pointerdevice = "QNXMOUSE"; #endif -#endif /* __UNIXOS2__ */ } @@ -1351,36 +1327,9 @@ static char *modestring[NU_MODESTRINGS] = { #endif }; -#ifdef __EMX__ -/* yet another instance of this code, sigh! */ -char * -__XOS2RedirRoot(char *path, char sep) -{ - static char pn[300]; - char *root; - int i,l; - if ((isalpha(path[0]) && path[1]==':') || path[0] != '/') - return path; - - root = getenv("X11ROOT"); - if (!root) root = ""; - sprintf(pn,"%s%s",root,path); - if (sep=='\\') { - l = strlen(pn); - for (i=0; i<l; i++) - if (pn[i]=='/') pn[i]='\\'; - } - return pn; -} -#endif - -/* (hv) to avoid the UNIXISM to try to open a dir to check for existance */ static int exists_dir(char *name) { struct stat sbuf; -#ifdef __EMX__ - name = __XOS2RedirRoot(name,'/'); -#endif /* is it there ? */ if (stat(name,&sbuf) == -1) return 0; @@ -1691,22 +1640,10 @@ skipramdacselection: sprintf(d3name, "%s%s", temp_dir, DUMBCONFIG3); printf("Running X -probeonly -pn -xf86config %s.\n", fname); write_XF86Config(fname); -#ifndef __EMX__ sync(); -#endif /* compose a line with the real path */ -#ifndef __EMX__ sprintf(syscmdline, "X -probeonly -pn -xf86config %s 2> %s", fname, d2name); -#else - /* OS/2 does not have symlinks, so "X" does not exist, - * call the real X server - */ - sprintf(syscmdline,"%s/"__XSERVERNAME__" -probeonly -pn -xf86config " - TEMPORARY_XF86CONFIG_FILENAME " 2>" DUMBCONFIG2, - __XOS2RedirRoot("/"__XSERVERNAME__"/bin",'\\'), - card[card_selected].server); -#endif if (system(syscmdline)) { printf("X -probeonly call failed.\n"); @@ -2548,10 +2485,8 @@ write_XF86Config(char *filename) f = fopen(filename, "w"); if (f == NULL) { printf("Failed to open filename for writing.\n"); -#ifndef __EMX__ if (getuid() != 0) printf("Maybe you need to be root to write to the specified directory?\n"); -#endif return(1); } @@ -2606,7 +2541,7 @@ write_XF86Config(char *filename) fprintf(f, " Option \"Protocol\" \"%s\"\t# %s\n", mouse_info[config_mousetype].name, mouse_info[config_mousetype].desc); -#if !defined(__UNIXOS2__) && !defined(QNX4) +#if !defined(QNX4) fprintf(f, " Option \"Device\" \"%s\"\n", config_pointerdevice); #endif fprintf(f, "%s", pointersection_text2); @@ -2780,7 +2715,6 @@ ask_XF86Config_location(void) { "I am going to write the " CONFIGNAME " file now. Make sure you don't accidently\n" "overwrite a previously configured one.\n\n"); -#ifndef __EMX__ if (getuid() == 0) { #ifdef PREFER_XF86CONFIG_IN_ETC filename = Strdup("/etc/X11/" XCONFIGFILE); @@ -2814,16 +2748,6 @@ ask_XF86Config_location(void) { if (answerisyes(s)) return filename; #endif -#else /* __EMX__ */ - { - printf("Please answer the following question with either 'y' or 'n'.\n"); - printf("Shall I write it to the default location, drive:/"__XSERVERNAME__"/lib/X11/XConfig? "); - getstring(s); - printf("\n"); - if (answerisyes(s)) { - return __XOS2RedirRoot("/"__XSERVERNAME__"/lib/X11/XConfig",'/'); - } -#endif /* __EMX__ */ } if (filename) @@ -2862,7 +2786,6 @@ __XSERVERNAME__" distribution for your OS.\n" "libraries, configuration files and a server that you want to use.\n" "\n"; -#ifndef __UNIXOS2__ static char *oldxfree86_text = "The directory '/usr/X386/bin' exists. You probably have a very old version of\n" "XFree86 installed, but this program was built to configure "__XSERVERNAME__" "XVERSIONSTRING"\n" @@ -2882,7 +2805,6 @@ static char *pathnote_text = "link is '/usr/bin/X11'.\n" "\n" "Make sure the path is OK before continuing.\n"; -#endif static void path_check(void) { @@ -2899,7 +2821,6 @@ path_check(void) { printf("\n"); } -#ifndef __UNIXOS2__ ok = exists_dir("/usr/X386/bin"); if (!ok) return; @@ -2909,7 +2830,6 @@ path_check(void) { getenv("PATH")); printf("%s", pathnote_text); keypress(); -#endif } diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c index 3ca985167..06559bbd5 100644 --- a/hw/xfree86/vbe/vbe.c +++ b/hw/xfree86/vbe/vbe.c @@ -1074,3 +1074,73 @@ VBEDPMSSet(vbeInfoPtr pVbe, int mode) return (R16(pVbe->pInt10->ax) == 0x4f); } +void +VBEInterpretPanelID(int scrnIndex, struct vbePanelID *data) +{ + ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + DisplayModePtr mode; + const float PANEL_HZ = 60.0; + + if (!data) + return; + + xf86DrvMsg(scrnIndex, X_INFO, "PanelID returned panel resolution %dx%d\n", + data->hsize, data->vsize); + + if (pScrn->monitor->nHsync || pScrn->monitor->nVrefresh) + return; + + mode = xf86CVTMode(data->hsize, data->vsize, PANEL_HZ, 1, 0); + + pScrn->monitor->nHsync = 1; + pScrn->monitor->hsync[0].lo = 31.5; + pScrn->monitor->hsync[0].hi = (float)mode->Clock / (float)mode->HTotal; + pScrn->monitor->nVrefresh = 1; + pScrn->monitor->vrefresh[0].lo = 56.0; + pScrn->monitor->vrefresh[0].hi = + (float)mode->Clock*1000.0 / (float)mode->HTotal / (float)mode->VTotal; + + xfree(mode); +} + +struct vbePanelID * +VBEReadPanelID(vbeInfoPtr pVbe) +{ + int RealOff = pVbe->real_mode_base; + pointer page = pVbe->memory; + unsigned char *tmp = NULL; + int screen = pVbe->pInt10->scrnIndex; + + pVbe->pInt10->ax = 0x4F11; + pVbe->pInt10->bx = 0x01; + pVbe->pInt10->cx = 0; + pVbe->pInt10->dx = 0; + pVbe->pInt10->es = SEG_ADDR(RealOff); + pVbe->pInt10->di = SEG_OFF(RealOff); + pVbe->pInt10->num = 0x10; + + xf86ExecX86int10(pVbe->pInt10); + + if ((pVbe->pInt10->ax & 0xff) != 0x4f) { + xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE PanelID invalid\n"); + goto error; + } + + switch (pVbe->pInt10->ax & 0xff00) { + case 0x0: + xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE PanelID read successfully\n"); + tmp = (unsigned char *)xnfalloc(32); + memcpy(tmp,page,32); + break; + case 0x100: + xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE PanelID read failed\n"); + break; + default: + xf86DrvMsgVerb(screen,X_INFO,3,"VESA VBE PanelID unknown failure %i\n", + pVbe->pInt10->ax & 0xff00); + break; + } + +error: + return tmp; +} diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h index 83b5a99b1..de9237c9d 100644 --- a/hw/xfree86/vbe/vbe.h +++ b/hw/xfree86/vbe/vbe.h @@ -328,4 +328,20 @@ VBEVesaSaveRestore(vbeInfoPtr pVbe, vbeSaveRestorePtr vbe_sr, int VBEGetPixelClock(vbeInfoPtr pVbe, int mode, int Clock); Bool VBEDPMSSet(vbeInfoPtr pVbe, int mode); +struct vbePanelID { + short hsize; + short vsize; + short fptype; + char redbpp; + char greenbpp; + char bluebpp; + char reservedbpp; + int reserved_offscreen_mem_size; + int reserved_offscreen_mem_pointer; + char reserved[14]; +}; + +void VBEInterpretPanelID(int scrnIndex, struct vbePanelID *data); +struct vbePanelID *VBEReadPanelID(vbeInfoPtr pVbe); + #endif diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c index c7c58d582..609376a57 100644 --- a/hw/xfree86/vgahw/vgaCmap.c +++ b/hw/xfree86/vgahw/vgaCmap.c @@ -20,7 +20,6 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium: vgaCmap.c /main/15 1996/10/28 05:13:44 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/x86emu/debug.c b/hw/xfree86/x86emu/debug.c index 6fd7f11cf..5eda90805 100644 --- a/hw/xfree86/x86emu/debug.c +++ b/hw/xfree86/x86emu/debug.c @@ -38,6 +38,8 @@ ****************************************************************************/ #include "x86emu/x86emui.h" +#include <stdio.h> +#include <string.h> #ifndef NO_SYS_HEADERS #include <stdarg.h> #include <stdlib.h> diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c index f6aacb85e..155daa4ee 100644 --- a/hw/xfree86/xaa/xaaROP.c +++ b/hw/xfree86/xaa/xaaROP.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/xaa/xaarop.h b/hw/xfree86/xaa/xaarop.h index 1c95727b3..548993c49 100644 --- a/hw/xfree86/xaa/xaarop.h +++ b/hw/xfree86/xaa/xaarop.h @@ -1,5 +1,3 @@ -/* $XFree86$ */ - /* int XAAHelpSolidROP(ScrnInfoPtr pScrn, int *fg, int pm, int *rop) diff --git a/hw/xfree86/xf1bpp/Makefile.am b/hw/xfree86/xf1bpp/Makefile.am index 6d510d1bd..ef3d08fb5 100644 --- a/hw/xfree86/xf1bpp/Makefile.am +++ b/hw/xfree86/xf1bpp/Makefile.am @@ -55,7 +55,7 @@ libxf1bppmfb_a_SOURCES = \ mfbwindow.c \ mfbzerarc.c -BUILT_SOURCES = $(libxf1bppgen_a_SOURCES) $(libxf1bppgen_a_SOURCES) +BUILT_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES) libxf1bpp_la_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES) \ mfbmodule.c @@ -173,10 +173,8 @@ mfbtileG.c: echo "#include \"$(top_srcdir)/mfb/mfbtile.c\"" >> $@ $(libxf1bppmfb_a_SOURCES): - for i in $(libxf1bppmfb_a_SOURCES) ; do \ - echo "#include \"mfbmap.h\"" > $$i ; \ - echo "#include \"$(top_srcdir)/mfb/$$i\"" >> $$i ; \ - done - + echo "#include \"mfbmap.h\"" > $@ + echo "#include \"$(top_srcdir)/mfb/$@\"" >> $@ EXTRA_DIST = mfbmap.sh mfbunmap.sh +DISTCLEANFILES = $(BUILT_SOURCES) diff --git a/hw/xfree86/xf4bpp/OScompiler.h b/hw/xfree86/xf4bpp/OScompiler.h index 65f002000..8a8bbb59c 100644 --- a/hw/xfree86/xf4bpp/OScompiler.h +++ b/hw/xfree86/xf4bpp/OScompiler.h @@ -20,7 +20,6 @@ * SOFTWARE. * */ -/* $XConsortium: OScompiler.h /main/4 1996/02/21 17:56:09 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/emulOpStip.c b/hw/xfree86/xf4bpp/emulOpStip.c index 22ba90c2b..542e9d394 100644 --- a/hw/xfree86/xf4bpp/emulOpStip.c +++ b/hw/xfree86/xf4bpp/emulOpStip.c @@ -20,7 +20,6 @@ * SOFTWARE. * */ -/* $XConsortium: emulOpStip.c /main/4 1996/02/21 17:56:12 kaleb $ */ /* ppc OpaqueStipple * diff --git a/hw/xfree86/xf4bpp/emulRepAre.c b/hw/xfree86/xf4bpp/emulRepAre.c index 235bf9bd0..20fff1e0c 100644 --- a/hw/xfree86/xf4bpp/emulRepAre.c +++ b/hw/xfree86/xf4bpp/emulRepAre.c @@ -20,7 +20,6 @@ * SOFTWARE. * */ -/* $XConsortium: emulRepAre.c /main/5 1996/02/21 17:56:16 kaleb $ */ /* ppc Replicate Area -- A Divide & Conquer Algorithm * a "ppc" Helper Function For Stipples And Tiling diff --git a/hw/xfree86/xf4bpp/emulTile.c b/hw/xfree86/xf4bpp/emulTile.c index ddce1dab0..2f2a758f2 100644 --- a/hw/xfree86/xf4bpp/emulTile.c +++ b/hw/xfree86/xf4bpp/emulTile.c @@ -20,7 +20,6 @@ * SOFTWARE. * */ -/* $XConsortium: emulTile.c /main/4 1996/02/21 17:56:23 kaleb $ */ /* ppc Tile * P. Shupak 11/87 diff --git a/hw/xfree86/xf4bpp/ibmTrace.h b/hw/xfree86/xf4bpp/ibmTrace.h index 1bed6759f..f1d88406d 100644 --- a/hw/xfree86/xf4bpp/ibmTrace.h +++ b/hw/xfree86/xf4bpp/ibmTrace.h @@ -1,9 +1 @@ - - - - - -/* $XConsortium: ibmTrace.h /main/3 1996/02/21 17:56:27 kaleb $ */ - #define TRACE(x) /* empty */ - diff --git a/hw/xfree86/xf4bpp/mfbbres.c b/hw/xfree86/xf4bpp/mfbbres.c index f0c3f7e7b..09d7ee288 100644 --- a/hw/xfree86/xf4bpp/mfbbres.c +++ b/hw/xfree86/xf4bpp/mfbbres.c @@ -47,7 +47,6 @@ SOFTWARE. ******************************************************************/ /* GJA -- modified this file for vga16 */ -/* $XConsortium: mfbbres.c /main/5 1996/02/21 17:56:30 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/mfbbresd.c b/hw/xfree86/xf4bpp/mfbbresd.c index ef800871e..318d4f5da 100644 --- a/hw/xfree86/xf4bpp/mfbbresd.c +++ b/hw/xfree86/xf4bpp/mfbbresd.c @@ -46,7 +46,6 @@ SOFTWARE. ******************************************************************/ /* GJA -- modified this file for vga16 */ -/* $XConsortium: mfbbresd.c /main/5 1996/02/21 17:56:34 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/mfbfillarc.c b/hw/xfree86/xf4bpp/mfbfillarc.c index 88d4f72d9..d5b5372f5 100644 --- a/hw/xfree86/xf4bpp/mfbfillarc.c +++ b/hw/xfree86/xf4bpp/mfbfillarc.c @@ -27,8 +27,6 @@ in this Software without prior written authorization from the X Consortium. /* GJA -- Took mfb code and modified it. */ -/* $XConsortium: mfbfillarc.c /main/4 1996/02/21 17:56:37 kaleb $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/xf4bpp/mfbhrzvert.c b/hw/xfree86/xf4bpp/mfbhrzvert.c index 82a205e1b..3444f48f5 100644 --- a/hw/xfree86/xf4bpp/mfbhrzvert.c +++ b/hw/xfree86/xf4bpp/mfbhrzvert.c @@ -47,7 +47,6 @@ SOFTWARE. ******************************************************************/ /* GJA -- modified this file for vga16 */ -/* $XConsortium: mfbhrzvert.c /main/3 1996/02/21 17:56:41 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/mfbimggblt.c b/hw/xfree86/xf4bpp/mfbimggblt.c index b1f0b9f72..bf53f4ce9 100644 --- a/hw/xfree86/xf4bpp/mfbimggblt.c +++ b/hw/xfree86/xf4bpp/mfbimggblt.c @@ -1,4 +1,3 @@ - /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: mfbimggblt.c /main/5 1996/02/21 17:56:44 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/mfbline.c b/hw/xfree86/xf4bpp/mfbline.c index 82d8bd1c5..d2d4e0b0e 100644 --- a/hw/xfree86/xf4bpp/mfbline.c +++ b/hw/xfree86/xf4bpp/mfbline.c @@ -46,7 +46,6 @@ SOFTWARE. ******************************************************************/ /* GJA -- modified this file for vga16 */ -/* $XConsortium: mfbline.c /main/4 1996/02/21 17:56:48 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/mfbzerarc.c b/hw/xfree86/xf4bpp/mfbzerarc.c index 921993196..c7a8c4d56 100644 --- a/hw/xfree86/xf4bpp/mfbzerarc.c +++ b/hw/xfree86/xf4bpp/mfbzerarc.c @@ -1,4 +1,3 @@ - /************************************************************ Copyright (c) 1989 X Consortium @@ -27,8 +26,6 @@ in this Software without prior written authorization from the X Consortium. ********************************************************/ /* GJA -- Took mfb code and modified it. */ -/* $XConsortium: mfbzerarc.c /main/4 1996/02/21 17:56:52 kaleb $ */ - /* Derived from: * "Algorithm for drawing ellipses or hyperbolae with a digital plotter" * by M. L. V. Pitteway diff --git a/hw/xfree86/xf4bpp/offscreen.c b/hw/xfree86/xf4bpp/offscreen.c index 654be829d..3160e7ef8 100644 --- a/hw/xfree86/xf4bpp/offscreen.c +++ b/hw/xfree86/xf4bpp/offscreen.c @@ -40,7 +40,6 @@ * SOFTWARE. * */ -/* $XConsortium: offscreen.c /main/4 1996/02/21 17:56:55 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/ppcArea.c b/hw/xfree86/xf4bpp/ppcArea.c index 9c693e836..e95696260 100644 --- a/hw/xfree86/xf4bpp/ppcArea.c +++ b/hw/xfree86/xf4bpp/ppcArea.c @@ -20,7 +20,6 @@ * SOFTWARE. * */ -/* $XConsortium: ppcArea.c /main/4 1996/02/21 17:57:02 kaleb $ */ /* * ppc solid area fill diff --git a/hw/xfree86/xf4bpp/ppcBStore.c b/hw/xfree86/xf4bpp/ppcBStore.c index 947602ef3..00c9446de 100644 --- a/hw/xfree86/xf4bpp/ppcBStore.c +++ b/hw/xfree86/xf4bpp/ppcBStore.c @@ -59,7 +59,6 @@ used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. */ -/* $XConsortium: ppcBStore.c /main/5 1996/02/21 17:57:06 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/ppcCReduce.c b/hw/xfree86/xf4bpp/ppcCReduce.c index ab46f85ab..c567e6fd1 100644 --- a/hw/xfree86/xf4bpp/ppcCReduce.c +++ b/hw/xfree86/xf4bpp/ppcCReduce.c @@ -21,8 +21,6 @@ * */ -/* $XConsortium: ppcCReduce.c /main/3 1996/02/21 17:57:17 kaleb $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/xf4bpp/ppcClip.c b/hw/xfree86/xf4bpp/ppcClip.c index acfd5bd00..899dba683 100644 --- a/hw/xfree86/xf4bpp/ppcClip.c +++ b/hw/xfree86/xf4bpp/ppcClip.c @@ -67,7 +67,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XConsortium: ppcClip.c /main/4 1996/02/21 17:57:21 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/ppcCpArea.c b/hw/xfree86/xf4bpp/ppcCpArea.c index 2242074c1..891ba4b89 100644 --- a/hw/xfree86/xf4bpp/ppcCpArea.c +++ b/hw/xfree86/xf4bpp/ppcCpArea.c @@ -21,8 +21,6 @@ * */ -/* $XConsortium: ppcCpArea.c /main/6 1996/02/21 17:57:24 kaleb $ */ - /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/hw/xfree86/xf4bpp/ppcDepth.c b/hw/xfree86/xf4bpp/ppcDepth.c index 26a53de86..2fa19ff80 100644 --- a/hw/xfree86/xf4bpp/ppcDepth.c +++ b/hw/xfree86/xf4bpp/ppcDepth.c @@ -21,8 +21,6 @@ * */ -/* $XConsortium: ppcDepth.c /main/3 1996/02/21 17:57:31 kaleb $ */ - /* Check to see if the alleged depth is acceptable for the Screen * * T. Paquin 9/87 diff --git a/hw/xfree86/xf4bpp/ppcFillRct.c b/hw/xfree86/xf4bpp/ppcFillRct.c index e501f65fb..4be732fb5 100644 --- a/hw/xfree86/xf4bpp/ppcFillRct.c +++ b/hw/xfree86/xf4bpp/ppcFillRct.c @@ -46,7 +46,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: ppcFillRct.c /main/5 1996/02/21 17:57:35 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/ppcGC.c b/hw/xfree86/xf4bpp/ppcGC.c index 81441efd7..b59dab312 100644 --- a/hw/xfree86/xf4bpp/ppcGC.c +++ b/hw/xfree86/xf4bpp/ppcGC.c @@ -68,8 +68,6 @@ SOFTWARE. */ -/* $XConsortium: ppcGC.c /main/6 1996/02/21 17:57:38 kaleb $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/xf4bpp/ppcGCstr.h b/hw/xfree86/xf4bpp/ppcGCstr.h index fd064d1c1..82d1f2df4 100644 --- a/hw/xfree86/xf4bpp/ppcGCstr.h +++ b/hw/xfree86/xf4bpp/ppcGCstr.h @@ -20,29 +20,6 @@ * SOFTWARE. * */ -/*********************************************************** - Copyright IBM Corporation 1988 - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of IBM not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -IBM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -IBM BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -******************************************************************/ -/* $XConsortium: ppcGCstr.h /main/3 1996/02/21 17:57:42 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/ppcGetSp.c b/hw/xfree86/xf4bpp/ppcGetSp.c index dc31741f3..d88abe02b 100644 --- a/hw/xfree86/xf4bpp/ppcGetSp.c +++ b/hw/xfree86/xf4bpp/ppcGetSp.c @@ -69,8 +69,6 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: ppcGetSp.c /main/5 1996/02/21 17:57:45 kaleb $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/xf4bpp/ppcIO.c b/hw/xfree86/xf4bpp/ppcIO.c index 0d5afafa5..72793cc6e 100644 --- a/hw/xfree86/xf4bpp/ppcIO.c +++ b/hw/xfree86/xf4bpp/ppcIO.c @@ -47,7 +47,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XConsortium: ppcIO.c /main/8 1996/02/21 17:57:49 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/ppcImg.c b/hw/xfree86/xf4bpp/ppcImg.c index 6ff7e8fef..3691587ae 100644 --- a/hw/xfree86/xf4bpp/ppcImg.c +++ b/hw/xfree86/xf4bpp/ppcImg.c @@ -21,8 +21,6 @@ * */ -/* $XConsortium: ppcImg.c /main/4 1996/02/21 17:57:53 kaleb $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/xf4bpp/ppcPixFS.c b/hw/xfree86/xf4bpp/ppcPixFS.c index 08b09e9c7..f24168bb0 100644 --- a/hw/xfree86/xf4bpp/ppcPixFS.c +++ b/hw/xfree86/xf4bpp/ppcPixFS.c @@ -43,7 +43,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: ppcPixFS.c /main/3 1996/02/21 17:57:57 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/ppcPixmap.c b/hw/xfree86/xf4bpp/ppcPixmap.c index 9b2defda1..ec181cfaf 100644 --- a/hw/xfree86/xf4bpp/ppcPixmap.c +++ b/hw/xfree86/xf4bpp/ppcPixmap.c @@ -68,7 +68,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: ppcPixmap.c /main/5 1996/02/21 17:58:00 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/ppcPntWin.c b/hw/xfree86/xf4bpp/ppcPntWin.c index 85ac22e6c..5d7a07e12 100644 --- a/hw/xfree86/xf4bpp/ppcPntWin.c +++ b/hw/xfree86/xf4bpp/ppcPntWin.c @@ -68,7 +68,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: ppcPntWin.c /main/5 1996/02/21 17:58:04 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/ppcPolyPnt.c b/hw/xfree86/xf4bpp/ppcPolyPnt.c index 399ba3bda..1d6905563 100644 --- a/hw/xfree86/xf4bpp/ppcPolyPnt.c +++ b/hw/xfree86/xf4bpp/ppcPolyPnt.c @@ -67,7 +67,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XConsortium: ppcPolyPnt.c /main/5 1996/02/21 17:58:07 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/ppcQuery.c b/hw/xfree86/xf4bpp/ppcQuery.c index 810b81f24..d42360da5 100644 --- a/hw/xfree86/xf4bpp/ppcQuery.c +++ b/hw/xfree86/xf4bpp/ppcQuery.c @@ -20,7 +20,6 @@ * SOFTWARE. * */ -/* $XConsortium: ppcQuery.c /main/3 1996/02/21 17:58:18 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/ppcRslvC.c b/hw/xfree86/xf4bpp/ppcRslvC.c index e4601e2af..0337feb62 100644 --- a/hw/xfree86/xf4bpp/ppcRslvC.c +++ b/hw/xfree86/xf4bpp/ppcRslvC.c @@ -50,8 +50,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium: ppcRslvC.c /main/7 1996/02/21 17:58:25 kaleb $ */ - /* Generic Color Resolution Scheme * P. Shupak 12/31/87 */ diff --git a/hw/xfree86/xf4bpp/ppcSetSp.c b/hw/xfree86/xf4bpp/ppcSetSp.c index 350cb9b14..7659384e7 100644 --- a/hw/xfree86/xf4bpp/ppcSetSp.c +++ b/hw/xfree86/xf4bpp/ppcSetSp.c @@ -68,7 +68,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: ppcSetSp.c /main/5 1996/02/21 17:58:32 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/ppcSpMcro.h b/hw/xfree86/xf4bpp/ppcSpMcro.h index 41245ceb3..2b7f951d4 100644 --- a/hw/xfree86/xf4bpp/ppcSpMcro.h +++ b/hw/xfree86/xf4bpp/ppcSpMcro.h @@ -20,7 +20,6 @@ * SOFTWARE. * */ -/* $XConsortium: ppcSpMcro.h /main/3 1996/02/21 17:58:36 kaleb $ */ /* This screwy macro is used in all the spans routines and you find it all over the place, so it is a macro just to tidy things up. diff --git a/hw/xfree86/xf4bpp/ppcWinFS.c b/hw/xfree86/xf4bpp/ppcWinFS.c index bd9b1289f..e19ce0d40 100644 --- a/hw/xfree86/xf4bpp/ppcWinFS.c +++ b/hw/xfree86/xf4bpp/ppcWinFS.c @@ -43,7 +43,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XConsortium: ppcWinFS.c /main/3 1996/02/21 17:58:39 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/ppcWindow.c b/hw/xfree86/xf4bpp/ppcWindow.c index 11c5e343e..01768d9ff 100644 --- a/hw/xfree86/xf4bpp/ppcWindow.c +++ b/hw/xfree86/xf4bpp/ppcWindow.c @@ -67,7 +67,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XConsortium: ppcWindow.c /main/5 1996/02/21 17:58:43 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/vgaBitBlt.c b/hw/xfree86/xf4bpp/vgaBitBlt.c index e51e0dc1a..2e89f43b7 100644 --- a/hw/xfree86/xf4bpp/vgaBitBlt.c +++ b/hw/xfree86/xf4bpp/vgaBitBlt.c @@ -1,9 +1,5 @@ /* GJA -- span move routines */ - - -/* $XConsortium: vgaBitBlt.c /main/8 1996/10/27 11:06:39 kaleb $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/xf4bpp/vgaGC.c b/hw/xfree86/xf4bpp/vgaGC.c index fd33727b9..5a8604090 100644 --- a/hw/xfree86/xf4bpp/vgaGC.c +++ b/hw/xfree86/xf4bpp/vgaGC.c @@ -68,8 +68,6 @@ SOFTWARE. */ -/* $XConsortium: vgaGC.c /main/6 1996/02/21 17:58:54 kaleb $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/xf4bpp/vgaImages.c b/hw/xfree86/xf4bpp/vgaImages.c index 22f8d8f8e..bea2d0a17 100644 --- a/hw/xfree86/xf4bpp/vgaImages.c +++ b/hw/xfree86/xf4bpp/vgaImages.c @@ -20,7 +20,6 @@ * SOFTWARE. * */ -/* $XConsortium: vgaImages.c /main/5 1996/02/21 17:58:58 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/vgaReg.h b/hw/xfree86/xf4bpp/vgaReg.h index c5165256c..32ec0daed 100644 --- a/hw/xfree86/xf4bpp/vgaReg.h +++ b/hw/xfree86/xf4bpp/vgaReg.h @@ -21,8 +21,6 @@ * */ -/* $XConsortium: vgaReg.h /main/4 1996/02/21 17:59:02 kaleb $ */ - #define SET_BYTE_REGISTER( ioport, value ) outb( ioport, value ) #define SET_INDEX_REGISTER( ioport, value ) SET_BYTE_REGISTER( ioport, value ) #define SET_DATA_REGISTER( ioport, value ) SET_BYTE_REGISTER( ioport, value ) diff --git a/hw/xfree86/xf4bpp/vgaSolid.c b/hw/xfree86/xf4bpp/vgaSolid.c index 562b1ebc4..501bd3db0 100644 --- a/hw/xfree86/xf4bpp/vgaSolid.c +++ b/hw/xfree86/xf4bpp/vgaSolid.c @@ -21,8 +21,6 @@ * */ -/* $XConsortium: vgaSolid.c /main/5 1996/02/21 17:59:06 kaleb $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/xf4bpp/vgaStipple.c b/hw/xfree86/xf4bpp/vgaStipple.c index b81305bd4..5ad53028c 100644 --- a/hw/xfree86/xf4bpp/vgaStipple.c +++ b/hw/xfree86/xf4bpp/vgaStipple.c @@ -20,7 +20,6 @@ * SOFTWARE. * */ -/* $XConsortium: vgaStipple.c /main/5 1996/02/21 17:59:10 kaleb $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf4bpp/vgaVideo.h b/hw/xfree86/xf4bpp/vgaVideo.h index 14e85ef79..60afa5bb6 100644 --- a/hw/xfree86/xf4bpp/vgaVideo.h +++ b/hw/xfree86/xf4bpp/vgaVideo.h @@ -21,8 +21,6 @@ * */ -/* $XConsortium: vgaVideo.h /main/4 1996/02/21 17:59:14 kaleb $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/xf4bpp/wm3.c b/hw/xfree86/xf4bpp/wm3.c index 24ecf3dd2..3a57221f2 100644 --- a/hw/xfree86/xf4bpp/wm3.c +++ b/hw/xfree86/xf4bpp/wm3.c @@ -1,10 +1,3 @@ - - - - - -/* $XConsortium: wm3.c /main/5 1996/02/21 17:59:21 kaleb $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/xf4bpp/wm3.h b/hw/xfree86/xf4bpp/wm3.h index 2d66557fc..113723283 100644 --- a/hw/xfree86/xf4bpp/wm3.h +++ b/hw/xfree86/xf4bpp/wm3.h @@ -1,10 +1,3 @@ - - - - - -/* $XConsortium: wm3.h /main/4 1996/02/21 17:59:24 kaleb $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/xf8_32bpp/cfbcpyplane.c b/hw/xfree86/xf8_32bpp/cfbcpyplane.c index 011b9e763..e10b52525 100644 --- a/hw/xfree86/xf8_32bpp/cfbcpyplane.c +++ b/hw/xfree86/xf8_32bpp/cfbcpyplane.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xfree86/xf8_32bpp/cfbgcmisc.c b/hw/xfree86/xf8_32bpp/cfbgcmisc.c index 3d1af095a..f009afc0c 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcmisc.c +++ b/hw/xfree86/xf8_32bpp/cfbgcmisc.c @@ -1,5 +1,3 @@ -/* $XFree86$ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif diff --git a/hw/xgl/egl/evdev.c b/hw/xgl/egl/evdev.c index ebfe265a3..fff4524d1 100644 --- a/hw/xgl/egl/evdev.c +++ b/hw/xgl/egl/evdev.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/hw/xgl/egl/kinput.c b/hw/xgl/egl/kinput.c index 5fd23f568..981cffcfa 100644 --- a/hw/xgl/egl/kinput.c +++ b/hw/xgl/egl/kinput.c @@ -1,6 +1,4 @@ /* - * Id: kinput.c,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/kinput.c,v 1.30 2002/11/13 16:37:39 keithp Exp $ */ #include <xgl-config.h> diff --git a/hw/xgl/egl/kkeymap.h b/hw/xgl/egl/kkeymap.h index 9a21d3597..920e807e5 100644 --- a/hw/xgl/egl/kkeymap.h +++ b/hw/xgl/egl/kkeymap.h @@ -1,6 +1,4 @@ /* - * Id: kkeymap.h,v 1.1 1999/11/02 03:54:46 keithp Exp $ - * * Copyright 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -21,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $RCSId: xc/programs/Xserver/hw/kdrive/kkeymap.h,v 1.1 1999/11/19 13:53:50 hohndel Exp $ */ /* * All global variables and functions pertaining to keyboard key mapping * live in this header file. diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c index c2e8b0db7..f061f9e80 100644 --- a/hw/xnest/Args.c +++ b/hw/xnest/Args.c @@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86$ */ #ifdef HAVE_XNEST_CONFIG_H #include <xnest-config.h> diff --git a/hw/xnest/Args.h b/hw/xnest/Args.h index 38090fd0e..c3002bfca 100644 --- a/hw/xnest/Args.h +++ b/hw/xnest/Args.h @@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86$ */ #ifndef XNESTARGC_H #define XNESTARGS_H diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c index 2dd60971f..5ba0bdbad 100644 --- a/hw/xnest/Color.c +++ b/hw/xnest/Color.c @@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86$ */ #ifdef HAVE_XNEST_CONFIG_H #include <xnest-config.h> diff --git a/hw/xnest/Color.h b/hw/xnest/Color.h index aec0a248c..f00bde47f 100644 --- a/hw/xnest/Color.h +++ b/hw/xnest/Color.h @@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86$ */ #ifndef XNESTCOLOR_H #define XNESTCOLOR_H diff --git a/hw/xnest/Drawable.h b/hw/xnest/Drawable.h index 61159c9ba..d94916ecd 100644 --- a/hw/xnest/Drawable.h +++ b/hw/xnest/Drawable.h @@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86$ */ #ifndef XNESTDRAWABLE_H #define XNESTDRAWABLE_H diff --git a/hw/xnest/Events.h b/hw/xnest/Events.h index cdad9f398..2441accd5 100644 --- a/hw/xnest/Events.h +++ b/hw/xnest/Events.h @@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86$ */ #ifndef XNESTEVENTS_H #define XNESTEVENTS_H diff --git a/hw/xnest/GCOps.h b/hw/xnest/GCOps.h index fce9d6cb3..ca4cf33f7 100644 --- a/hw/xnest/GCOps.h +++ b/hw/xnest/GCOps.h @@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86$ */ #ifndef XNESTGCOPS_H #define XNESTGCOPS_H diff --git a/hw/xnest/Handlers.h b/hw/xnest/Handlers.h index fe064213e..16228a0c1 100644 --- a/hw/xnest/Handlers.h +++ b/hw/xnest/Handlers.h @@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86$ */ #ifndef XNESTHANDLERS_H #define XNESTHANDLERS_H diff --git a/hw/xnest/Keyboard.h b/hw/xnest/Keyboard.h index d87866c73..546a1cbe4 100644 --- a/hw/xnest/Keyboard.h +++ b/hw/xnest/Keyboard.h @@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86$ */ #ifndef XNESTKEYBOARD_H #define XNESTKEYBOARD_H diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am index e958c0eee..99dba60bd 100644 --- a/hw/xnest/Makefile.am +++ b/hw/xnest/Makefile.am @@ -55,8 +55,7 @@ Xnest_LDADD = $(XORG_CORE_LIBS) \ $(XNESTMODULES_LIBS) \ libfbcmap.a -EXTRA_DIST = os2Stub.c \ - icon \ +EXTRA_DIST = icon \ screensaver \ Xnest.man.pre diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c index 912b6fa21..b0de13b5f 100644 --- a/hw/xnest/Pointer.c +++ b/hw/xnest/Pointer.c @@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86$ */ #ifdef HAVE_XNEST_CONFIG_H #include <xnest-config.h> diff --git a/hw/xnest/Pointer.h b/hw/xnest/Pointer.h index 2012db4c3..890726f55 100644 --- a/hw/xnest/Pointer.h +++ b/hw/xnest/Pointer.h @@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86$ */ #ifndef XNESTPOINTER_H #define XNESTPOINTER_H diff --git a/hw/xnest/Screen.h b/hw/xnest/Screen.h index db298e300..b113c6460 100644 --- a/hw/xnest/Screen.h +++ b/hw/xnest/Screen.h @@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86$ */ #ifndef XNESTSCREEN_H #define XNESTSCREEN_H diff --git a/hw/xnest/Visual.c b/hw/xnest/Visual.c index 628e22a7d..da1d63c10 100644 --- a/hw/xnest/Visual.c +++ b/hw/xnest/Visual.c @@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86$ */ #ifdef HAVE_XNEST_CONFIG_H #include <xnest-config.h> diff --git a/hw/xnest/Visual.h b/hw/xnest/Visual.h index c2d715a65..1bd203709 100644 --- a/hw/xnest/Visual.h +++ b/hw/xnest/Visual.h @@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86$ */ #ifndef XNESTVISUAL_H #define XNESTVISUAL_H diff --git a/hw/xnest/XNFont.h b/hw/xnest/XNFont.h index f7b9e38c0..92c112f36 100644 --- a/hw/xnest/XNFont.h +++ b/hw/xnest/XNFont.h @@ -11,8 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86$ */ - #ifndef XNESTFONT_H #define XNESTFONT_H diff --git a/hw/xnest/XNGC.h b/hw/xnest/XNGC.h index a59508739..d3ac3df0b 100644 --- a/hw/xnest/XNGC.h +++ b/hw/xnest/XNGC.h @@ -11,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86$ */ #ifndef XNESTGC_H #define XNESTGC_H diff --git a/hw/xnest/Xnest.h b/hw/xnest/Xnest.h index 8ed3f8902..827030c8f 100644 --- a/hw/xnest/Xnest.h +++ b/hw/xnest/Xnest.h @@ -27,7 +27,6 @@ other dealings in this Software without prior written authorization from the X Consortium. */ -/* $XFree86$ */ /* ** Machines with a 64 bit library interface and a 32 bit server require diff --git a/hw/xnest/os2Stub.c b/hw/xnest/os2Stub.c deleted file mode 100644 index 33675ec75..000000000 --- a/hw/xnest/os2Stub.c +++ /dev/null @@ -1,387 +0,0 @@ -/* - * (c) Copyright 1996 by Sebastien Marineau - * <marineau@genie.uottawa.ca> - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * HOLGER VEIT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF - * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * Except as contained in this notice, the name of Sebastien Marineau shall not be - * used in advertising or otherwise to promote the sale, use or other dealings - * in this Software without prior written authorization from Sebastien Marineau. - * - */ - - -/* This below implements select() for calls in xnest. It has been */ -/* somewhat optimized for improved performance, but assumes a few */ -/* things so it cannot be used as a general select. */ - -#define I_NEED_OS2_H -#include <X11/Xpoll.h> -#include <stdio.h> -#include <sys/select.h> -#include <sys/errno.h> -#include <sys/time.h> -#define INCL_DOSSEMAPHORES -#define INCL_DOSNPIPES -#define INCL_DOSMISC -#define INCL_DOSMODULEMGR -#undef BOOL -#undef BYTE -#include <os2.h> - -HEV hPipeSem; -HMODULE hmod_so32dll; -static int (*os2_tcp_select)(int*,int,int,int,long); -ULONG os2_get_sys_millis(); -extern int _files[]; - -#define MAX_TCP 256 -/* These lifted from sys/emx.h. Change if that changes there! */ -#define F_SOCKET 0x10000000 -#define F_PIPE 0x20000000 - -struct select_data -{ - fd_set read_copy; - fd_set write_copy; - BOOL have_read; - BOOL have_write; - int tcp_select_mask[MAX_TCP]; - int tcp_emx_handles[MAX_TCP]; - int tcp_select_copy[MAX_TCP]; - int socket_nread; - int socket_nwrite; - int socket_ntotal; - int pipe_ntotal; - int pipe_have_write; - int max_fds; -}; - -int os2PseudoSelect(int nfds, fd_set *readfds, fd_set *writefds, - fd_set *exceptfds, struct timeval *timeout) -{ -static BOOL FirstTime=TRUE; -static haveTCPIP=TRUE; -ULONG timeout_ms; -ULONG postCount, start_millis,now_millis; -char faildata[16]; -struct select_data sd; -BOOL any_ready; -int np,ns, i,ready_handles,n; -APIRET rc; - -sd.have_read=FALSE; sd.have_write=FALSE; -sd.socket_nread=0; sd.socket_nwrite=0; sd.socket_ntotal=0; -sd.max_fds=31; ready_handles=0; any_ready=FALSE; -sd.pipe_ntotal=0; sd.pipe_have_write=FALSE; - -if(FirstTime){ - /* First load the so32dll.dll module and get a pointer to the SELECT function */ - - if((rc=DosLoadModule(faildata,sizeof(faildata),"SO32DLL",&hmod_so32dll))!=0){ - fprintf(stderr, "Could not load module so32dll.dll, rc = %d. Error note %s\n",rc,faildata); - haveTCPIP=FALSE; - } - if((rc = DosQueryProcAddr(hmod_so32dll, 0, "SELECT", (PPFN)&os2_tcp_select))!=0){ - fprintf(stderr, "Could not query address of SELECT, rc = %d.\n",rc); - haveTCPIP=FALSE; - } - /* Call these a first time to set the semaphore */ - /* rc = DosCreateEventSem(NULL, &hPipeSem, DC_SEM_SHARED, FALSE); - if(rc) { - fprintf(stderr, "Could not create event semaphore, rc=%d\n",rc); - return(-1); - } - rc = DosResetEventSem(hPipeSem, &postCount); */ /* Done in xtrans code for servers*/ - - /*fprintf(stderr, "Client select() done first-time stuff, sem handle %d.\n",hPipeSem);*/ - - FirstTime = FALSE; -} - -/* Set up the time delay structs */ - - if(timeout!=NULL) { - timeout_ms=timeout->tv_sec*1000+timeout->tv_usec/1000; - } - else { timeout_ms=1000000; } /* This should be large enough... */ - if(timeout_ms>0) start_millis=os2_get_sys_millis(); - -/* Copy the masks */ - {FD_ZERO(&sd.read_copy);} - {FD_ZERO(&sd.write_copy);} - if(readfds!=NULL){ XFD_COPYSET(readfds,&sd.read_copy); sd.have_read=TRUE;} - if(writefds!=NULL) {XFD_COPYSET(writefds,&sd.write_copy);sd.have_write=TRUE;} - -/* And zero the original masks */ - if(sd.have_read){ FD_ZERO(readfds);} - if(sd.have_write) {FD_ZERO(writefds);} - if(exceptfds != NULL) {FD_ZERO(exceptfds);} - -/* Now we parse the fd_sets passed to select and separate pipe/sockets */ - n = os2_parse_select(&sd,nfds); - if(n == -1) { - errno = EBADF; - return (-1); - } - -/* Now we have three cases: either we have sockets, pipes, or both */ -/* We handle all three cases differently to optimize things */ - -/* Case 1: only pipes! */ - if((sd.pipe_ntotal >0) && (!sd.socket_ntotal)){ - np = os2_check_pipes(&sd,readfds,writefds); - if(np > 0){ - return (np); - } - else if (np == -1) { return(-1); } - while(!any_ready){ - rc = DosWaitEventSem(hPipeSem, 1L); - /* if(rc) fprintf(stderr,"Sem-wait timeout, rc = %d\n",rc); */ - if(rc == 640) { - return(0); - } - if((rc != 0) && (rc != 95)) {errno= EBADF; return(-1);} - np = os2_check_pipes(&sd,readfds,writefds); - if (np > 0){ - return(np); - } - else if (np < 0){ return(-1); } - } - } - -/* Case 2: only sockets. Just let the os/2 tcp select do the work */ - if((sd.socket_ntotal > 0) && (!sd.pipe_ntotal)){ - ns = os2_check_sockets(&sd, readfds, writefds, timeout_ms); - return (ns); - } - -/* Case 3: combination of both */ - if((sd.socket_ntotal > 0) && (sd.pipe_ntotal)){ - np = os2_check_pipes(&sd,readfds,writefds); - if(np > 0){ - any_ready=TRUE; - ready_handles += np; - } - else if (np == -1) { return(-1); } - - ns = os2_check_sockets(&sd,readfds,writefds, 0); - if(ns>0){ - ready_handles+=ns; - any_ready = TRUE; - } - else if (ns == -1) {return(-1);} - - while (!any_ready && timeout_ms){ - - rc = DosWaitEventSem(hPipeSem, 1L); - if (rc==640) return(0); - if(rc == 0){ - np = os2_check_pipes(&sd,readfds,writefds); - if(np > 0){ - ready_handles+=np; - any_ready = TRUE; - } - else if (np == -1) { - return(-1); } - } - - ns = os2_check_sockets(&sd,readfds,writefds,exceptfds, 0); - if(ns>0){ - ready_handles+=ns; - any_ready = TRUE; - } - else if (ns == -1) {return(-1);} - - if (i%8 == 0) { - now_millis = os2_get_sys_millis(); - if((now_millis-start_millis) > timeout_ms) timeout_ms = 0; - } - i++; - } - } - -return(ready_handles); -} - - -ULONG os2_get_sys_millis() -{ - APIRET rc; - ULONG milli; - - rc = DosQuerySysInfo(14, 14, &milli, sizeof(milli)); - if(rc) { - fprintf(stderr,"Bad return code querying the millisecond counter! rc=%d\n",rc); - return(0); - } - return(milli); -} - -int os2_parse_select(sd,nfds) -struct select_data *sd; -int nfds; -{ - int i; - APIRET rc; -/* First we determine up to which descriptor we need to check. */ -/* No need to check up to 256 if we don't have to (and usually we dont...)*/ -/* Note: stuff here is hardcoded for fd_sets which are int[8] as in EMX! */ - - if(nfds > sd->max_fds){ - for(i=0;i<((FD_SETSIZE+31)/32);i++){ - if(sd->read_copy.fds_bits[i] || - sd->write_copy.fds_bits[i]) - sd->max_fds=(i*32) +32; - } - } - else { sd->max_fds = nfds; } -/* Check if result is greater than specified in select() call */ - if(sd->max_fds > nfds) sd->max_fds = nfds; - - if (sd->have_read) - { - for (i = 0; i < sd->max_fds; ++i) { - if (FD_ISSET (i, &sd->read_copy)){ - if(_files[i] & F_SOCKET) - { - sd->tcp_select_mask[sd->socket_ntotal]=_getsockhandle(i); - sd->tcp_emx_handles[sd->socket_ntotal]=i; - sd->socket_ntotal++; sd->socket_nread++; - } - else if (_files[i] & F_PIPE) - { - sd -> pipe_ntotal++; - /* rc = DosSetNPipeSem((HPIPE)i, (HSEM) hPipeSem, i); - if(rc) { fprintf(stderr,"Error SETNPIPE rc = %d\n",rc); return -1;} */ - } - } - } - } - - if (sd->have_write) - { - for (i = 0; i < sd->max_fds; ++i) { - if (FD_ISSET (i, &sd->write_copy)){ - if(_files[i] & F_SOCKET) - { - sd->tcp_select_mask[sd->socket_ntotal]=_getsockhandle(i); - sd->tcp_emx_handles[sd->socket_ntotal]=i; - sd->socket_ntotal++; sd->socket_nwrite++; - } - else if (_files[i] & F_PIPE) - { - sd -> pipe_ntotal++; - /* rc = DosSetNPipeSem((HPIPE)i, (HSEM) hPipeSem, i); - if(rc) { fprintf(stderr,"Error SETNPIPE rc = %d\n",rc); return -1;} */ - sd -> pipe_have_write=TRUE; - } - } - } - } - - -return(sd->socket_ntotal); -} - - -int os2_check_sockets(sd,readfds,writefds) -struct select_data *sd; -fd_set *readfds,*writefds; -{ - int e,i; - int j,n; - memcpy(sd->tcp_select_copy,sd->tcp_select_mask, - sd->socket_ntotal*sizeof(int)); - - e = os2_tcp_select(sd->tcp_select_copy,sd->socket_nread, - sd->socket_nwrite, 0, 0); - - if(e == 0) return(e); -/* We have something ready? */ - if(e>0){ - j = 0; n = 0; - for (i = 0; i < sd->socket_nread; ++i, ++j) - if (sd->tcp_select_copy[j] != -1) - { - FD_SET (sd->tcp_emx_handles[j], readfds); - n ++; - } - for (i = 0; i < sd->socket_nwrite; ++i, ++j) - if (sd->tcp_select_copy[j] != -1) - { - FD_SET (sd->tcp_emx_handles[j], writefds); - n ++; - } - errno = 0; - - return n; - } - if(e<0){ - /*Error -- TODO. EBADF is a good choice for now. */ - fprintf(stderr,"Error in server select! e=%d\n",e); - errno = EBADF; - return (-1); - } - } - -/* Check to see if anything is ready on pipes */ - -int os2_check_pipes(sd,readfds,writefds) -struct select_data *sd; -fd_set *readfds,*writefds; -{ -int i,e; -ULONG ulPostCount; -PIPESEMSTATE pipeSemState[128]; -APIRET rc; - e = 0; - rc = DosResetEventSem(hPipeSem,&ulPostCount); - rc = DosQueryNPipeSemState((HSEM) hPipeSem, (PPIPESEMSTATE)&pipeSemState, - sizeof(pipeSemState)); - if(rc) fprintf(stderr,"SELECT: rc from QueryNPipeSem: %d\n",rc); - i=0; - while (pipeSemState[i].fStatus != 0) { - /*fprintf(stderr,"SELECT: sem entry, stat=%d, flag=%d, key=%d,avail=%d\n", - pipeSemState[i].fStatus,pipeSemState[i].fFlag,pipeSemState[i].usKey, - pipeSemState[i].usAvail); */ - if((pipeSemState[i].fStatus == 1) && - (FD_ISSET(pipeSemState[i].usKey,&sd->read_copy))){ - FD_SET(pipeSemState[i].usKey,readfds); - e++; - } - else if((pipeSemState[i].fStatus == 2) && - (FD_ISSET(pipeSemState[i].usKey,&sd->write_copy))){ - FD_SET(pipeSemState[i].usKey,writefds); - e++; - } - else if( (pipeSemState[i].fStatus == 3) && - ( (FD_ISSET(pipeSemState[i].usKey,&sd->read_copy)) || - (FD_ISSET(pipeSemState[i].usKey,&sd->write_copy)) )){ - errno = EBADF; - /* fprintf(stderr,"Pipe has closed down, fd=%d\n",pipeSemState[i].usKey); */ - return (-1); - } - i++; - } /* endwhile */ - /*fprintf(stderr,"Done listing pipe sem entries, total %d entries, total ready entries %d\n",i,e);*/ -errno = 0; -return(e); -} - diff --git a/hw/xprint/ValTree.c b/hw/xprint/ValTree.c index 60e340dc1..5f58de7ec 100644 --- a/hw/xprint/ValTree.c +++ b/hw/xprint/ValTree.c @@ -29,7 +29,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86$ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/attributes.c b/hw/xprint/attributes.c index a24c1076b..d8ee5adf8 100644 --- a/hw/xprint/attributes.c +++ b/hw/xprint/attributes.c @@ -1375,7 +1375,6 @@ ReplaceAllKeywords( defined(__CYGWIN__) || \ (defined(sun) && !defined(SVR4)) || \ (defined(SVR4) && !defined(sun) && !defined(__UNIXWARE__)) || \ - defined(__UNIXOS2__) || \ defined(ISC) || \ defined(Lynx) || \ defined(__QNX__) || \ diff --git a/hw/xprint/pcl/PclFonts.c b/hw/xprint/pcl/PclFonts.c index 716c48d6d..9e993f79c 100644 --- a/hw/xprint/pcl/PclFonts.c +++ b/hw/xprint/pcl/PclFonts.c @@ -12,7 +12,6 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86$ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/pcl/PclInit.c b/hw/xprint/pcl/PclInit.c index 734ec5f27..183225274 100644 --- a/hw/xprint/pcl/PclInit.c +++ b/hw/xprint/pcl/PclInit.c @@ -44,38 +44,6 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* -(c) Copyright 1996 Hewlett-Packard Company -(c) Copyright 1996 International Business Machines Corp. -(c) Copyright 1996 Sun Microsystems, Inc. -(c) Copyright 1996 Novell, Inc. -(c) Copyright 1996 Digital Equipment Corp. -(c) Copyright 1996 Fujitsu Limited -(c) Copyright 1996 Hitachi, Ltd. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the names of the copyright holders shall -not be used in advertising or otherwise to promote the sale, use or other -dealings in this Software without prior written authorization from said -copyright holders. -*/ - #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif diff --git a/hw/xprint/spooler.c b/hw/xprint/spooler.c index e3022b0c4..69b5eed0e 100644 --- a/hw/xprint/spooler.c +++ b/hw/xprint/spooler.c @@ -1,4 +1,3 @@ - /* Copyright (c) 2003-2004 Roland Mainz <roland.mainz@nrubsig.org> Copyright (c) 2004 Sun Microsystems, Inc. diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c index 52f837ede..6a850cd44 100644 --- a/hw/xwin/InitInput.c +++ b/hw/xwin/InitInput.c @@ -1,4 +1,3 @@ -/* $TOG: InitInput.c /main/12 1998/02/10 13:23:52 kaleb $ */ /* Copyright 1993, 1998 The Open Group diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 9457c9cc7..f966d4026 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -1,4 +1,3 @@ -/* $TOG: InitOutput.c /main/20 1998/02/10 13:23:56 kaleb $ */ /* Copyright 1993, 1998 The Open Group diff --git a/hw/xwin/ddraw.h b/hw/xwin/ddraw.h index 0bb7aef4f..2eb7c2674 100644 --- a/hw/xwin/ddraw.h +++ b/hw/xwin/ddraw.h @@ -1,5 +1,3 @@ -/* $Id$ */ - #ifndef __XWIN_DDRAW_H #define __XWIN_DDRAW_H diff --git a/hw/xwin/winconfig.h b/hw/xwin/winconfig.h index 8b7702501..8fd9841d7 100644 --- a/hw/xwin/winconfig.h +++ b/hw/xwin/winconfig.h @@ -29,7 +29,6 @@ * * Authors: Alexander Gottwald */ -/* $Id$ */ #include "win.h" #ifdef XWIN_XF86CONFIG diff --git a/hw/xwin/winkeymap.h b/hw/xwin/winkeymap.h index 0c633cdfc..3862f0379 100644 --- a/hw/xwin/winkeymap.h +++ b/hw/xwin/winkeymap.h @@ -3,7 +3,6 @@ * For Scancodes see notes in winkeynames.h !!!! * */ -/* $XConsortium: xf86Keymap.h /main/14 1996/02/21 17:38:47 kaleb $ */ static KeySym map[NUM_KEYCODES * GLYPHS_PER_KEY] = { /* 0x00 */ NoSymbol, NoSymbol, NoSymbol, NoSymbol, diff --git a/hw/xwin/winkeynames.h b/hw/xwin/winkeynames.h index 6d480a3f9..7c16337de 100644 --- a/hw/xwin/winkeynames.h +++ b/hw/xwin/winkeynames.h @@ -22,7 +22,6 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XConsortium: atKeynames.h /main/11 1996/03/09 11:17:41 kaleb $ */ #define XK_TECHNICAL #define XK_KATAKANA diff --git a/hw/xwin/winmsg.c b/hw/xwin/winmsg.c index 53974101e..d0464f71b 100644 --- a/hw/xwin/winmsg.c +++ b/hw/xwin/winmsg.c @@ -27,7 +27,6 @@ * * Authors: Alexander Gottwald */ -/* $XFree86$ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winmsg.h b/hw/xwin/winmsg.h index 367086c78..611dd6962 100644 --- a/hw/xwin/winmsg.h +++ b/hw/xwin/winmsg.h @@ -29,8 +29,6 @@ * * Authors: Alexander Gottwald */ -/* $XFree86$ */ - /* * Function prototypes diff --git a/hw/xwin/winmultiwindowclass.c b/hw/xwin/winmultiwindowclass.c index 57c434669..5b47c3976 100755 --- a/hw/xwin/winmultiwindowclass.c +++ b/hw/xwin/winmultiwindowclass.c @@ -27,7 +27,6 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86$ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winmultiwindowclass.h b/hw/xwin/winmultiwindowclass.h index 0b430f2f8..c635ab20b 100755 --- a/hw/xwin/winmultiwindowclass.h +++ b/hw/xwin/winmultiwindowclass.h @@ -29,8 +29,6 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86$ */ - /* * Structures diff --git a/hw/xwin/winprefs.c b/hw/xwin/winprefs.c index 0541f785f..30e587d4a 100644 --- a/hw/xwin/winprefs.c +++ b/hw/xwin/winprefs.c @@ -27,7 +27,6 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winprefs.h b/hw/xwin/winprefs.h index 2e58e5e9d..d9e09deea 100644 --- a/hw/xwin/winprefs.h +++ b/hw/xwin/winprefs.h @@ -29,7 +29,6 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: $ */ /* Need Bool */ #include <X11/Xdefs.h> diff --git a/hw/xwin/winrop.c b/hw/xwin/winrop.c index 110292989..f4818920a 100644 --- a/hw/xwin/winrop.c +++ b/hw/xwin/winrop.c @@ -27,7 +27,6 @@ * * Authors: Alan Hourihane <alanh@fairlite.demon.co.uk> */ -/* $XFree86$ */ /* * Raster operations used by Windows translated to X's 16 rop codes... diff --git a/hw/xwin/wintrayicon.c b/hw/xwin/wintrayicon.c index bf7305c9c..054a8e956 100755 --- a/hw/xwin/wintrayicon.c +++ b/hw/xwin/wintrayicon.c @@ -28,7 +28,6 @@ * Authors: Early Ehlinger * Harold L Hunt II */ -/* $XFree86: $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/include/Makefile.am b/include/Makefile.am index 82e71905e..ef39836be 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -49,6 +49,7 @@ sdk_HEADERS = \ validate.h \ window.h \ windowstr.h \ + xkbsrv.h \ xorg-server.h endif diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 41223bd58..bea713122 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -468,9 +468,15 @@ /* Define to 1 if modules should avoid the libcwrapper */ #undef NO_LIBCWRAPPER -/* Support D-BUS */ +/* Support D-Bus */ #undef HAVE_DBUS +/* Support the D-Bus hotplug API */ +#undef CONFIG_DBUS_API + +/* Support HAL for hotplug */ +#undef CONFIG_HAL + /* Use only built-in fonts */ #undef BUILTIN_FONTS diff --git a/include/dix.h b/include/dix.h index 41240b119..71f4c23fd 100644 --- a/include/dix.h +++ b/include/dix.h @@ -627,9 +627,6 @@ typedef struct { extern int xstrcasecmp(char *s1, char *s2); #endif -/* ffs.c */ -extern int ffs(int i); - /* * These are deprecated compatibility functions and will be removed soon! * Please use the noted replacements instead. diff --git a/include/hotplug.h b/include/hotplug.h index 0c304b15e..b4f1bb60d 100644 --- a/include/hotplug.h +++ b/include/hotplug.h @@ -1,31 +1,32 @@ /* - * Copyright © 2006 Daniel Stone + * Copyright © 2006-2007 Daniel Stone * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of the copyright holders and/or authors - * not be used in advertising or publicity pertaining to distribution of the - * software without specific, written prior permission. The copyright holders - * and/or authors make no representations about the suitability of this - * software for any purpose. It is provided "as is" without express or - * implied warranty. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * THE COPYRIGHT HOLDERS AND/OR AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD - * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS AND/OR AUTHORS BE LIABLE - * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Daniel Stone <daniel@fooishbar.org> */ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef HOTPLUG_H +#define HOTPLUG_H -void configInitialise(void); -void configFini(void); -void configDispatch(void); +void config_init(void); +void config_fini(void); -#endif /* CONFIG_H */ +#endif /* HOTPLUG_H */ diff --git a/include/inputstr.h b/include/inputstr.h index 8f4e9b9d1..3398949d4 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -326,6 +326,7 @@ typedef struct _DeviceIntRec { #else void *pad0; #endif + char *config_info; /* used by the hotplug layer */ DevUnion *devPrivates; int nPrivates; DeviceUnwrapProc unwrapProc; diff --git a/include/os.h b/include/os.h index 7399436fb..3d689478e 100644 --- a/include/os.h +++ b/include/os.h @@ -272,7 +272,7 @@ void OsBlockSignals (void); void OsReleaseSignals (void); -#if !defined(WIN32) && !defined(__UNIXOS2__) +#if !defined(WIN32) extern int System(char *); extern pointer Popen(char *, char *); extern int Pclose(pointer); diff --git a/include/pixmap.h b/include/pixmap.h index 19e682a50..5ff0b8c16 100644 --- a/include/pixmap.h +++ b/include/pixmap.h @@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86$ */ #ifndef PIXMAP_H #define PIXMAP_H diff --git a/include/pixmapstr.h b/include/pixmapstr.h index 93bd45db8..459488226 100644 --- a/include/pixmapstr.h +++ b/include/pixmapstr.h @@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86$ */ #ifndef PIXMAPSTRUCT_H #define PIXMAPSTRUCT_H diff --git a/include/servermd.h b/include/servermd.h index 4f32a9d2b..74b90b38a 100644 --- a/include/servermd.h +++ b/include/servermd.h @@ -447,8 +447,6 @@ SOFTWARE. #if (defined(SVR4) && defined(i386)) || \ defined(__alpha__) || defined(__alpha) || \ defined(__i386__) || defined(__i386) || \ - defined(__UNIXOS2__) || \ - defined(__OS2ELF__) || \ defined(__QNX__) || \ defined(__s390x__) || defined(__s390__) diff --git a/include/window.h b/include/window.h index cd8c5b283..312b75e88 100644 --- a/include/window.h +++ b/include/window.h @@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86$ */ #ifndef WINDOW_H #define WINDOW_H diff --git a/include/windowstr.h b/include/windowstr.h index 9fd6d768c..6d874ae9e 100644 --- a/include/windowstr.h +++ b/include/windowstr.h @@ -94,6 +94,33 @@ typedef struct _WindowOpt { #define BackgroundPixel 2L #define BackgroundPixmap 3L +/* + * The redirectDraw field can have one of three values: + * + * RedirectDrawNone + * A normal window; painted into the same pixmap as the parent + * and clipping parent and siblings to its geometry. These + * windows get a clip list equal to the intersection of their + * geometry with the parent geometry, minus the geometry + * of overlapping None and Clipped siblings. + * RedirectDrawAutomatic + * A redirected window which clips parent and sibling drawing. + * Contents for these windows are manage inside the server. + * These windows get an internal clip list equal to their + * geometry. + * RedirectDrawManual + * A redirected window which does not clip parent and sibling + * drawing; the window must be represented within the parent + * geometry by the client performing the redirection management. + * Contents for these windows are managed outside the server. + * These windows get an internal clip list equal to their + * geometry. + */ + +#define RedirectDrawNone 0 +#define RedirectDrawAutomatic 1 +#define RedirectDrawManual 2 + typedef struct _Window { DrawableRec drawable; WindowPtr parent; /* ancestor chain */ @@ -130,7 +157,7 @@ typedef struct _Window { unsigned dontPropagate:3;/* index into DontPropagateMasks */ unsigned forcedBS:1; /* system-supplied backingStore */ #ifdef COMPOSITE - unsigned redirectDraw:1; /* rendering is redirected from here */ + unsigned redirectDraw:2; /* rendering is redirected from here */ #endif DevUnion *devPrivates; } WindowRec; diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in index 7b2a4d193..3c2ff470c 100644 --- a/include/xorg-server.h.in +++ b/include/xorg-server.h.in @@ -233,6 +233,9 @@ /* System is BSD-like */ #undef CSRG_BASED +/* Solaris 8 or later? */ +#undef __SOL8__ + /* System has PC console */ #undef PCCONS_SUPPORT diff --git a/mfb/mfbwindow.c b/mfb/mfbwindow.c index f65f45ebd..b138d5805 100644 --- a/mfb/mfbwindow.c +++ b/mfb/mfbwindow.c @@ -45,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86$ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> @@ -105,7 +105,7 @@ mieqInit(void) void mieqEnqueue(DeviceIntPtr pDev, xEvent *e) { - HWEventQueueType oldtail = miEventQueue.tail, newtail; + unsigned int oldtail = miEventQueue.tail, newtail; int isMotion = 0; deviceValuator *v = (deviceValuator *) e; EventPtr laste = &miEventQueue.events[(oldtail - 1) % diff --git a/mi/mipoly.c b/mi/mipoly.c index ea0406f88..4c77fc268 100644 --- a/mi/mipoly.c +++ b/mi/mipoly.c @@ -1,4 +1,3 @@ -/* $XFree86$ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/mi/mistruct.h b/mi/mistruct.h index 9b9de8677..e9cfed5a4 100644 --- a/mi/mistruct.h +++ b/mi/mistruct.h @@ -44,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86$ */ #ifndef MISTRUCT_H #define MISTRUCT_H diff --git a/mi/mivalidate.h b/mi/mivalidate.h index 91858328a..ef258c0f8 100644 --- a/mi/mivalidate.h +++ b/mi/mivalidate.h @@ -25,8 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ - #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/mi/mivaltree.c b/mi/mivaltree.c index 92ea0a8a9..c999267e5 100644 --- a/mi/mivaltree.c +++ b/mi/mivaltree.c @@ -179,6 +179,17 @@ miRegisterRedirectBorderClipProc (SetRedirectBorderClipProcPtr setBorderClip, miGetRedirectBorderClipProc = getBorderClip; } +/* + * Manual redirected windows are treated as transparent; they do not obscure + * siblings or parent windows + */ + +#ifdef COMPOSITE +#define TreatAsTransparent(w) ((w)->redirectDraw == RedirectDrawManual) +#else +#define TreatAsTransparent(w) FALSE +#endif + #define HasParentRelativeBorder(w) (!(w)->borderIsPixel && \ HasBorder(w) && \ (w)->backgroundState == ParentRelative) @@ -241,7 +252,7 @@ miComputeClips ( /* * In redirected drawing case, reset universe to borderSize */ - if (pParent->redirectDraw) + if (pParent->redirectDraw != RedirectDrawNone) { if (miSetRedirectBorderClipProc) (*miSetRedirectBorderClipProc) (pParent, universe); @@ -432,7 +443,7 @@ miComputeClips ( { for (; pChild; pChild = pChild->nextSib) { - if (pChild->viewable) + if (pChild->viewable && !TreatAsTransparent(pChild)) REGION_APPEND( pScreen, &childUnion, &pChild->borderSize); } } @@ -440,7 +451,7 @@ miComputeClips ( { for (pChild = pParent->lastChild; pChild; pChild = pChild->prevSib) { - if (pChild->viewable) + if (pChild->viewable && !TreatAsTransparent(pChild)) REGION_APPEND( pScreen, &childUnion, &pChild->borderSize); } } @@ -472,7 +483,7 @@ miComputeClips ( * from the current universe, thus denying its space to any * other sibling. */ - if (overlap) + if (overlap && !TreatAsTransparent (pChild)) REGION_SUBTRACT( pScreen, universe, universe, &pChild->borderSize); } @@ -644,7 +655,7 @@ miValidateTree (pParent, pChild, kind) for (pWin = pParent->firstChild; pWin != pChild; pWin = pWin->nextSib) { - if (pWin->viewable) + if (pWin->viewable && !TreatAsTransparent (pWin)) REGION_SUBTRACT (pScreen, &totalClip, &totalClip, &pWin->borderSize); } for (pWin = pChild; pWin; pWin = pWin->nextSib) @@ -666,7 +677,7 @@ miValidateTree (pParent, pChild, kind) { RegionPtr pBorderClip = &pWin->borderClip; #ifdef COMPOSITE - if (pWin->redirectDraw && miGetRedirectBorderClipProc) + if (pWin->redirectDraw != RedirectDrawNone && miGetRedirectBorderClipProc) pBorderClip = (*miGetRedirectBorderClipProc)(pWin); #endif REGION_APPEND( pScreen, &totalClip, pBorderClip ); @@ -685,7 +696,7 @@ miValidateTree (pParent, pChild, kind) { RegionPtr pBorderClip = &pWin->borderClip; #ifdef COMPOSITE - if (pWin->redirectDraw && miGetRedirectBorderClipProc) + if (pWin->redirectDraw != RedirectDrawNone && miGetRedirectBorderClipProc) pBorderClip = (*miGetRedirectBorderClipProc)(pWin); #endif REGION_APPEND( pScreen, &totalClip, pBorderClip ); @@ -724,7 +735,7 @@ miValidateTree (pParent, pChild, kind) if (forward) { for (pWin = pChild; pWin; pWin = pWin->nextSib) - if (pWin->valdata && pWin->viewable) + if (pWin->valdata && pWin->viewable && !TreatAsTransparent (pWin)) REGION_APPEND( pScreen, &childUnion, &pWin->borderSize); } @@ -733,7 +744,7 @@ miValidateTree (pParent, pChild, kind) pWin = pParent->lastChild; while (1) { - if (pWin->valdata && pWin->viewable) + if (pWin->valdata && pWin->viewable && !TreatAsTransparent (pWin)) REGION_APPEND( pScreen, &childUnion, &pWin->borderSize); if (pWin == pChild) @@ -757,7 +768,7 @@ miValidateTree (pParent, pChild, kind) &totalClip, &pWin->borderSize); miComputeClips (pWin, pScreen, &childClip, kind, &exposed); - if (overlap) + if (overlap && !TreatAsTransparent (pWin)) { REGION_SUBTRACT( pScreen, &totalClip, &totalClip, diff --git a/miext/cw/cw.c b/miext/cw/cw.c index 69502711a..7ee013be1 100644 --- a/miext/cw/cw.c +++ b/miext/cw/cw.c @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/miext/cw/cw.h b/miext/cw/cw.h index 69abbbfed..0d57b9b9d 100644 --- a/miext/cw/cw.h +++ b/miext/cw/cw.h @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/miext/cw/cw_ops.c b/miext/cw/cw_ops.c index 82ec99999..9ae56cb6c 100644 --- a/miext/cw/cw_ops.c +++ b/miext/cw/cw_ops.c @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/miext/cw/cw_render.c b/miext/cw/cw_render.c index beb906081..35416beb7 100644 --- a/miext/cw/cw_render.c +++ b/miext/cw/cw_render.c @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $Header$ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/miext/damage/damage.c b/miext/damage/damage.c index d93074758..2acff11e8 100755 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/damage/damage.h b/miext/damage/damage.h index 36a06545f..4cfc8127d 100755 --- a/miext/damage/damage.h +++ b/miext/damage/damage.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/damage/damagestr.h b/miext/damage/damagestr.h index 83a202ba8..58ee2bb38 100755 --- a/miext/damage/damagestr.h +++ b/miext/damage/damagestr.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/shadow/shadow.c b/miext/shadow/shadow.c index b4a739ba4..f624216db 100644 --- a/miext/shadow/shadow.c +++ b/miext/shadow/shadow.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/shadow/shalloc.c b/miext/shadow/shalloc.c index 5c01f2aac..72aa28b14 100644 --- a/miext/shadow/shalloc.c +++ b/miext/shadow/shalloc.c @@ -1,6 +1,4 @@ /* - * $XFree86$ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/shadow/shrot16pack.c b/miext/shadow/shrot16pack.c index 2ec41bb07..0b7faca6a 100644 --- a/miext/shadow/shrot16pack.c +++ b/miext/shadow/shrot16pack.c @@ -1,6 +1,4 @@ /* - * $XFree86$ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/shadow/shrot16pack_180.c b/miext/shadow/shrot16pack_180.c index 06b1603ba..d8f2633e5 100644 --- a/miext/shadow/shrot16pack_180.c +++ b/miext/shadow/shrot16pack_180.c @@ -1,6 +1,4 @@ /* - * $XFree86$ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/shadow/shrot16pack_270.c b/miext/shadow/shrot16pack_270.c index 1ad952ec6..4aa471325 100644 --- a/miext/shadow/shrot16pack_270.c +++ b/miext/shadow/shrot16pack_270.c @@ -1,6 +1,4 @@ /* - * $XFree86$ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/shadow/shrot16pack_270YX.c b/miext/shadow/shrot16pack_270YX.c index 3a3dfa8a3..0df1fd51f 100644 --- a/miext/shadow/shrot16pack_270YX.c +++ b/miext/shadow/shrot16pack_270YX.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/shadow/shrot16pack_90.c b/miext/shadow/shrot16pack_90.c index cfef7785c..81e49151a 100644 --- a/miext/shadow/shrot16pack_90.c +++ b/miext/shadow/shrot16pack_90.c @@ -1,6 +1,4 @@ /* - * $XFree86$ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/shadow/shrot16pack_90YX.c b/miext/shadow/shrot16pack_90YX.c index 2eb721581..5fc3b236a 100644 --- a/miext/shadow/shrot16pack_90YX.c +++ b/miext/shadow/shrot16pack_90YX.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/shadow/shrot32pack.c b/miext/shadow/shrot32pack.c index 95c7c292c..4a9cbc0ff 100644 --- a/miext/shadow/shrot32pack.c +++ b/miext/shadow/shrot32pack.c @@ -1,6 +1,4 @@ /* - * $XFree86$ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/shadow/shrot32pack_180.c b/miext/shadow/shrot32pack_180.c index cbadba59d..8f5fb5760 100644 --- a/miext/shadow/shrot32pack_180.c +++ b/miext/shadow/shrot32pack_180.c @@ -1,6 +1,4 @@ /* - * $XFree86$ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/shadow/shrot32pack_270.c b/miext/shadow/shrot32pack_270.c index 8f434b08e..7d52fd2bf 100644 --- a/miext/shadow/shrot32pack_270.c +++ b/miext/shadow/shrot32pack_270.c @@ -1,6 +1,4 @@ /* - * $XFree86$ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/shadow/shrot32pack_90.c b/miext/shadow/shrot32pack_90.c index 98c22c37d..0abeb5cdd 100644 --- a/miext/shadow/shrot32pack_90.c +++ b/miext/shadow/shrot32pack_90.c @@ -1,6 +1,4 @@ /* - * $XFree86$ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/shadow/shrot8pack.c b/miext/shadow/shrot8pack.c index 9e77f43e8..552d838f3 100644 --- a/miext/shadow/shrot8pack.c +++ b/miext/shadow/shrot8pack.c @@ -1,6 +1,4 @@ /* - * $XFree86$ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/shadow/shrot8pack_180.c b/miext/shadow/shrot8pack_180.c index 6f4eca93e..526d8f15f 100644 --- a/miext/shadow/shrot8pack_180.c +++ b/miext/shadow/shrot8pack_180.c @@ -1,6 +1,4 @@ /* - * $XFree86$ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/shadow/shrot8pack_270.c b/miext/shadow/shrot8pack_270.c index d56a3366c..73f82a712 100644 --- a/miext/shadow/shrot8pack_270.c +++ b/miext/shadow/shrot8pack_270.c @@ -1,6 +1,4 @@ /* - * $XFree86$ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/shadow/shrot8pack_90.c b/miext/shadow/shrot8pack_90.c index 2fed8126d..73060cad1 100644 --- a/miext/shadow/shrot8pack_90.c +++ b/miext/shadow/shrot8pack_90.c @@ -1,6 +1,4 @@ /* - * $XFree86$ - * * Copyright © 2000 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/miext/shadow/shrotpackYX.h b/miext/shadow/shrotpackYX.h index f51da2f65..8ef70f167 100644 --- a/miext/shadow/shrotpackYX.h +++ b/miext/shadow/shrotpackYX.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Philip Blundell * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/os/Makefile.am b/os/Makefile.am index c5e7b0397..53b2d7f0c 100644 --- a/os/Makefile.am +++ b/os/Makefile.am @@ -59,5 +59,9 @@ noinst_PROGRAMS = os.O os.O: dtrace.o $(am_libos_la_OBJECTS) ld -r -o $@ dtrace.o .libs/*.o - endif + +os.c: + touch $@ + +CLEANFILES = os.c diff --git a/os/WaitFor.c b/os/WaitFor.c index 4a606ac7d..ec1592c01 100644 --- a/os/WaitFor.c +++ b/os/WaitFor.c @@ -67,9 +67,6 @@ SOFTWARE. #include <X11/X.h> #include "misc.h" -#ifdef __UNIXOS2__ -#define select(n,r,w,x,t) os2PseudoSelect(n,r,w,x,t) -#endif #include "osdep.h" #include <X11/Xpoll.h> #include "dixstruct.h" diff --git a/os/access.c b/os/access.c index 7281d967d..8d96e0420 100644 --- a/os/access.c +++ b/os/access.c @@ -1193,9 +1193,6 @@ ResetHosts (char *display) if (fnamelen > sizeof(fname)) FatalError("Display name `%s' is too long\n", display); sprintf(fname, ETC_HOST_PREFIX "%s" ETC_HOST_SUFFIX, display); -#ifdef __UNIXOS2__ - strcpy(fname, (char*)__XOS2RedirRoot(fname)); -#endif /* __UNIXOS2__ */ if ((fd = fopen (fname, "r")) != 0) { @@ -1206,10 +1203,6 @@ ResetHosts (char *display) continue; if ((ptr = strchr(ohostname, '\n')) != 0) *ptr = 0; -#ifdef __UNIXOS2__ - if ((ptr = strchr(ohostname, '\r')) != 0) - *ptr = 0; -#endif hostlen = strlen(ohostname) + 1; for (i = 0; i < hostlen; i++) lhostname[i] = tolower(ohostname[i]); @@ -1825,7 +1818,7 @@ ConvertAddr ( switch (saddr->sa_family) { case AF_UNSPEC: -#if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN) +#if defined(UNIXCONN) || defined(LOCALCONN) case AF_UNIX: #endif return FamilyLocal; diff --git a/os/connection.c b/os/connection.c index cb3443c5b..d975f87d2 100644 --- a/os/connection.c +++ b/os/connection.c @@ -107,11 +107,6 @@ SOFTWARE. #include <sys/ioctl.h> #endif -#ifdef __UNIXOS2__ -#define select(n,r,w,x,t) os2PseudoSelect(n,r,w,x,t) -extern __const__ int _nfiles; -#endif - #if defined(TCPCONN) || defined(STREAMSCONN) # include <netinet/in.h> # include <arpa/inet.h> @@ -124,21 +119,17 @@ extern __const__ int _nfiles; # ifdef CSRG_BASED # include <sys/param.h> # endif -# ifndef __UNIXOS2__ -# include <netinet/tcp.h> -# endif +# include <netinet/tcp.h> # endif # endif # include <arpa/inet.h> #endif -#if !defined(__UNIXOS2__) #ifndef Lynx #include <sys/uio.h> #else #include <uio.h> #endif -#endif #endif /* WIN32 */ #include "misc.h" /* for typedef of pointer */ #include "osdep.h" @@ -171,8 +162,10 @@ extern __const__ int _nfiles; #ifdef XSERVER_DTRACE # include <sys/types.h> typedef const char *string; +# ifndef HAS_GETPEERUCRED +# define zoneid_t int +# endif # include "../dix/Xserver-dtrace.h" -# include <ucred.h> #endif static int lastfdesc; /* maximum file descriptor */ @@ -192,9 +185,6 @@ Bool AnyClientsWriteBlocked; /* true if some client blocked on write */ static Bool RunFromSmartParent; /* send SIGUSR1 to parent process */ Bool PartialNetwork; /* continue even if unable to bind all addrs */ static Pid_t ParentProcess; -#ifdef __UNIXOS2__ -Pid_t GetPPID(Pid_t pid); -#endif static Bool debug_conns = FALSE; @@ -327,8 +317,6 @@ InitConnectionLimits(void) #ifndef __CYGWIN__ -#ifndef __UNIXOS2__ - #if !defined(XNO_SYSCONF) && defined(_SC_OPEN_MAX) lastfdesc = sysconf(_SC_OPEN_MAX) - 1; #endif @@ -343,10 +331,6 @@ InitConnectionLimits(void) lastfdesc = _NFILE - 1; #endif -#else /* __UNIXOS2__ */ - lastfdesc = _nfiles - 1; -#endif - #endif /* __CYGWIN__ */ /* This is the fallback */ @@ -462,15 +446,6 @@ CreateWellKnownSockets(void) RunFromSmartParent = TRUE; OsSignal(SIGUSR1, handler); ParentProcess = getppid (); -#ifdef __UNIXOS2__ - /* - * fg030505: under OS/2, xinit is not the parent process but - * the "grant parent" process of the server because execvpe() - * presents us an additional process number; - * GetPPID(pid) is part of libemxfix - */ - ParentProcess = GetPPID (ParentProcess); -#endif /* __UNIXOS2__ */ if (RunFromSmartParent) { if (ParentProcess > 1) { kill (ParentProcess, SIGUSR1); @@ -563,6 +538,8 @@ AuthAudit (ClientPtr client, Bool letin, char client_uid_string[64]; #ifdef HAS_GETPEERUCRED ucred_t *peercred = NULL; +#endif +#if defined(HAS_GETPEERUCRED) || defined(XSERVER_DTRACE) pid_t client_pid = -1; zoneid_t client_zid = -1; #endif @@ -573,7 +550,7 @@ AuthAudit (ClientPtr client, Bool letin, switch (saddr->sa_family) { case AF_UNSPEC: -#if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN) +#if defined(UNIXCONN) || defined(LOCALCONN) case AF_UNIX: #endif strcpy(out, "local host"); @@ -70,7 +70,7 @@ SOFTWARE. #include <X11/Xtrans/Xtrans.h> #include <X11/Xmd.h> #include <errno.h> -#if !defined(__UNIXOS2__) && !defined(WIN32) +#if !defined(WIN32) #ifndef Lynx #include <sys/uio.h> #else @@ -98,7 +98,6 @@ static void SkipRequests(xReqPtr req, ClientPtr client, int numskipped); /* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX * systems are broken and return EWOULDBLOCK when they should return EAGAIN */ -#ifndef __UNIXOS2__ #ifndef WIN32 #if defined(EAGAIN) && defined(EWOULDBLOCK) #define ETEST(err) (err == EAGAIN || err == EWOULDBLOCK) @@ -112,9 +111,6 @@ static void SkipRequests(xReqPtr req, ClientPtr client, int numskipped); #else /* WIN32 The socket errorcodes differ from the normal errors*/ #define ETEST(err) (err == EAGAIN || err == WSAEWOULDBLOCK) #endif -#else /* __UNIXOS2__ Writing to full pipes may return ENOSPC */ -#define ETEST(err) (err == EAGAIN || err == EWOULDBLOCK || err == ENOSPC) -#endif static Bool CriticalOutputPending; static int timesThisConnection = 0; @@ -182,9 +182,6 @@ LogInit(const char *fname, const char *backup) sprintf(suffix, backup, display); sprintf(oldLog, "%s%s", logFileName, suffix); free(suffix); -#ifdef __UNIXOS2__ - remove(oldLog); -#endif if (rename(logFileName, oldLog) == -1) { FatalError("Cannot move old log file (\"%s\" to \"%s\"\n", logFileName, oldLog); diff --git a/os/oscolor.c b/os/oscolor.c index d53e4d8ff..e1756926d 100644 --- a/os/oscolor.c +++ b/os/oscolor.c @@ -225,16 +225,9 @@ OsInitColors(void) if (!was_here) { -#ifndef __UNIXOS2__ path = (char*)ALLOCATE_LOCAL(strlen(rgbPath) +5); strcpy(path, rgbPath); strcat(path, ".txt"); -#else - char *tmp = (char*)__XOS2RedirRoot(rgbPath); - path = (char*)ALLOCATE_LOCAL(strlen(tmp) +5); - strcpy(path, tmp); - strcat(path, ".txt"); -#endif if (!(rgb = fopen(path, "r"))) { ErrorF( "Couldn't open RGB_DB '%s'\n", rgbPath ); @@ -245,11 +238,7 @@ OsInitColors(void) while(fgets(line, sizeof(line), rgb)) { lineno++; -#ifndef __UNIXOS2__ if (sscanf(line,"%d %d %d %[^\n]\n", &red, &green, &blue, name) == 4) -#else - if (sscanf(line,"%d %d %d %[^\n\r]\n", &red, &green, &blue, name) == 4) -#endif { if (red >= 0 && red <= 0xff && green >= 0 && green <= 0xff && diff --git a/os/osdep.h b/os/osdep.h index 04e88ea49..965436df5 100644 --- a/os/osdep.h +++ b/os/osdep.h @@ -91,7 +91,7 @@ SOFTWARE. #if defined(NOFILE) && !defined(NOFILES_MAX) #define OPEN_MAX NOFILE #else -#if !defined(__UNIXOS2__) && !defined(WIN32) +#if !defined(WIN32) #define OPEN_MAX NOFILES_MAX #else #define OPEN_MAX 256 diff --git a/os/osinit.c b/os/osinit.c index 9a1c1133a..1f09f068e 100644 --- a/os/osinit.c +++ b/os/osinit.c @@ -133,7 +133,7 @@ OsInit(void) dup2 (fileno (err), 2); fclose (err); } -#if defined(SYSV) || defined(SVR4) || defined(__UNIXOS2__) || defined(WIN32) || defined(__CYGWIN__) +#if defined(SYSV) || defined(SVR4) || defined(WIN32) || defined(__CYGWIN__) { static char buf[BUFSIZ]; setvbuf (stderr, buf, _IOLBF, BUFSIZ); diff --git a/os/strlcat.c b/os/strlcat.c index 28e2338f9..b57fcc563 100644 --- a/os/strlcat.c +++ b/os/strlcat.c @@ -1,5 +1,3 @@ -/* $OpenBSD: strlcat.c,v 1.10 2003/04/12 21:56:39 millert Exp $ */ - /* * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> * @@ -15,7 +13,6 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86$ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/os/strlcpy.c b/os/strlcpy.c index 42442cc30..989d0385e 100644 --- a/os/strlcpy.c +++ b/os/strlcpy.c @@ -1,5 +1,3 @@ -/* $OpenBSD: strlcpy.c,v 1.7 2003/04/12 21:56:39 millert Exp $ */ - /* * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> * @@ -15,7 +13,6 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86$ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/os/utils.c b/os/utils.c index dd5acd34b..3bb7dbeba 100644 --- a/os/utils.c +++ b/os/utils.c @@ -297,9 +297,7 @@ OsSignal(sig, handler) * server at a time. This keeps the servers from stomping on each other * if the user forgets to give them different display numbers. */ -#ifndef __UNIXOS2__ #define LOCK_DIR "/tmp" -#endif #define LOCK_TMP_PREFIX "/.tX" #define LOCK_PREFIX "/.X" #define LOCK_SUFFIX "-lock" @@ -309,10 +307,6 @@ OsSignal(sig, handler) #include <sys/param.h> #endif -#ifdef __UNIXOS2__ -#define link rename -#endif - #ifndef PATH_MAX #ifndef Lynx #include <sys/param.h> @@ -351,14 +345,7 @@ LockServer(void) /* * Path names */ -#ifndef __UNIXOS2__ tmppath = LOCK_DIR; -#else - /* OS/2 uses TMP directory, must also prepare for 8.3 names */ - tmppath = getenv("TMP"); - if (!tmppath) - FatalError("No TMP dir found\n"); -#endif sprintf(port, "%d", atoi(display)); len = strlen(LOCK_PREFIX) > strlen(LOCK_TMP_PREFIX) ? strlen(LOCK_PREFIX) : @@ -399,13 +386,11 @@ LockServer(void) FatalError("Could not create lock file in %s\n", tmp); (void) sprintf(pid_str, "%10ld\n", (long)getpid()); (void) write(lfd, pid_str, 11); -#ifndef __UNIXOS2__ #ifndef USE_CHMOD (void) fchmod(lfd, 0444); #else (void) chmod(tmp, 0444); #endif -#endif (void) close(lfd); /* @@ -484,9 +469,6 @@ UnlockServer(void) if (!StillLocking){ -#ifdef __UNIXOS2__ - (void) chmod(LockFile,S_IREAD|S_IWRITE); -#endif /* __UNIXOS2__ */ (void) unlink(LockFile); } } @@ -914,7 +896,7 @@ ProcessCommandLine(int argc, char *argv[]) #ifdef SERVER_LOCK else if ( strcmp ( argv[i], "-nolock") == 0) { -#if !defined(WIN32) && !defined(__UNIXOS2__) && !defined(__CYGWIN__) +#if !defined(WIN32) && !defined(__CYGWIN__) if (getuid() != 0) ErrorF("Warning: the -nolock option can only be used by root\n"); else @@ -1246,7 +1228,7 @@ ExpandCommandLine(int *pargc, char ***pargv) { int i; -#if !defined(WIN32) && !defined(__UNIXOS2__) && !defined(__CYGWIN__) +#if !defined(WIN32) && !defined(__CYGWIN__) if (getuid() != geteuid()) return; #endif @@ -1677,7 +1659,7 @@ OsReleaseSignals (void) #endif } -#if !defined(WIN32) && !defined(__UNIXOS2__) +#if !defined(WIN32) /* * "safer" versions of system(3), popen(3) and pclose(3) which give up * all privs before running a command. @@ -1952,7 +1934,7 @@ Fclose(pointer iop) #endif } -#endif /* !WIN32 && !__UNIXOS2__ */ +#endif /* !WIN32 */ /* diff --git a/randr/randrstr.h b/randr/randrstr.h index 4cc3a469e..bd19fe9d0 100644 --- a/randr/randrstr.h +++ b/randr/randrstr.h @@ -694,9 +694,6 @@ RROutputSetCrtcs (RROutputPtr output, RRCrtcPtr *crtcs, int numCrtcs); -void -RROutputSetCrtc (RROutputPtr output, RRCrtcPtr crtc); - Bool RROutputSetConnection (RROutputPtr output, CARD8 connection); @@ -802,7 +799,6 @@ Query state: 1.2: RRScreenSetSizeRange RROutputSetCrtcs - RROutputSetCrtc RRModeGet RROutputSetModes RROutputSetConnection @@ -822,7 +818,6 @@ Query state: RRCrtcCreate RROutputCreate RROutputSetCrtcs - RROutputSetCrtc RROutputSetConnection RROutputSetSubpixelOrder RROldModeAdd • This adds modes one-at-a-time diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c index c8c2be264..db5007e28 100644 --- a/randr/rrcrtc.c +++ b/randr/rrcrtc.c @@ -134,6 +134,7 @@ RRCrtcNotify (RRCrtcPtr crtc, break; if (j == crtc->numOutputs) { + outputs[i]->crtc = crtc; RROutputChanged (outputs[i], FALSE); RRCrtcChanged (crtc, FALSE); } @@ -149,6 +150,7 @@ RRCrtcNotify (RRCrtcPtr crtc, break; if (i == numOutputs) { + crtc->outputs[j]->crtc = NULL; RROutputChanged (crtc->outputs[j], FALSE); RRCrtcChanged (crtc, FALSE); } @@ -794,7 +796,7 @@ ProcRRSetCrtcConfig (ClientPtr client) int source_width = mode->mode.width; int source_height = mode->mode.height; - if (rotation == RR_Rotate_90 || rotation == RR_Rotate_270) + if ((rotation & 0xf) == RR_Rotate_90 || (rotation & 0xf) == RR_Rotate_270) { source_width = mode->mode.height; source_height = mode->mode.width; diff --git a/randr/rrinfo.c b/randr/rrinfo.c index 5ef1a6b83..bd5d5b1bb 100644 --- a/randr/rrinfo.c +++ b/randr/rrinfo.c @@ -98,7 +98,7 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations) if (!output) return; RROutputSetCrtcs (output, &crtc, 1); - RROutputSetCrtc (output, crtc); + output->crtc = crtc; RROutputSetConnection (output, RR_Connected); #ifdef RENDER RROutputSetSubpixelOrder (output, PictureGetSubpixelOrder (pScreen)); diff --git a/randr/rroutput.c b/randr/rroutput.c index e00116283..1e1cfa5a9 100644 --- a/randr/rroutput.c +++ b/randr/rroutput.c @@ -286,15 +286,6 @@ RROutputSetCrtcs (RROutputPtr output, return TRUE; } -void -RROutputSetCrtc (RROutputPtr output, RRCrtcPtr crtc) -{ - if (output->crtc == crtc) - return; - output->crtc = crtc; - RROutputChanged (output, FALSE); -} - Bool RROutputSetConnection (RROutputPtr output, CARD8 connection) diff --git a/randr/rrscreen.c b/randr/rrscreen.c index d92a0ffee..8798b4244 100644 --- a/randr/rrscreen.c +++ b/randr/rrscreen.c @@ -738,6 +738,7 @@ ProcRRSetScreenConfig (ClientPtr client) int rate; Bool has_rate; RROutputPtr output; + RRCrtcPtr crtc; RRModePtr mode; RR10DataPtr pData = NULL; RRScreenSizePtr pSize; @@ -783,7 +784,9 @@ ProcRRSetScreenConfig (ClientPtr client) rep.status = RRSetConfigFailed; goto sendReply; } - + + crtc = output->crtc; + /* * if the client's config timestamp is not the same as the last config * timestamp, then the config information isn't up-to-date and @@ -831,7 +834,7 @@ ProcRRSetScreenConfig (ClientPtr client) return BadValue; } - if ((~output->crtc->rotations) & rotation) + if ((~crtc->rotations) & rotation) { /* * requested rotation or reflection not supported by screen @@ -914,7 +917,7 @@ ProcRRSetScreenConfig (ClientPtr client) } } - if (!RRCrtcSet (output->crtc, mode, 0, 0, stuff->rotation, 1, &output)) + if (!RRCrtcSet (crtc, mode, 0, 0, stuff->rotation, 1, &output)) rep.status = RRSetConfigFailed; else rep.status = RRSetConfigSuccess; diff --git a/record/set.h b/record/set.h index f156bf8dc..3246a16ed 100644 --- a/record/set.h +++ b/record/set.h @@ -1,4 +1,3 @@ - /* Copyright 1995, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86$ */ /* A Set Abstract Data Type (ADT) for the RECORD Extension diff --git a/render/filter.c b/render/filter.c index 71375dae9..092313f6e 100644 --- a/render/filter.c +++ b/render/filter.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2002 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/render/picture.c b/render/picture.c index d0ae326cb..5ddd68ce3 100644 --- a/render/picture.c +++ b/render/picture.c @@ -1641,7 +1641,7 @@ FreePictFormat (pointer pPictFormat, * unnecessary. It may also avoid destination reads sometimes if apps aren't * being careful to avoid these cases. */ -static Bool +static CARD8 ReduceCompositeOp (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst) { Bool no_src_alpha, no_dst_alpha; diff --git a/render/picturestr.h b/render/picturestr.h index 06530e260..01572ec48 100644 --- a/render/picturestr.h +++ b/render/picturestr.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2000 SuSE, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/render/render.c b/render/render.c index 348d4c611..caaa2781c 100644 --- a/render/render.c +++ b/render/render.c @@ -2074,6 +2074,8 @@ SProcRenderSetPictureClipRectangles (ClientPtr client) REQUEST(xRenderSetPictureClipRectanglesReq); swaps(&stuff->length, n); swapl(&stuff->picture, n); + swaps(&stuff->xOrigin, n); + swaps(&stuff->yOrigin, n); SwapRestS(stuff); return (*ProcRenderVector[stuff->renderReqType]) (client); } diff --git a/render/renderedge.c b/render/renderedge.c index e92174f90..d0ee30716 100644 --- a/render/renderedge.c +++ b/render/renderedge.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/render/renderedge.h b/render/renderedge.h index 38f9f0914..644d9d9e5 100644 --- a/render/renderedge.h +++ b/render/renderedge.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2004 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/xfixes/cursor.c b/xfixes/cursor.c index 3cdacc0e4..401c403c8 100755 --- a/xfixes/cursor.c +++ b/xfixes/cursor.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2006 Sun Microsystems * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/xfixes/region.c b/xfixes/region.c index 91e9fc9c1..d4316be78 100755 --- a/xfixes/region.c +++ b/xfixes/region.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2003 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/xfixes/saveset.c b/xfixes/saveset.c index ab75619e8..8d66843d9 100755 --- a/xfixes/saveset.c +++ b/xfixes/saveset.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2002 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/xfixes/select.c b/xfixes/select.c index f0a9f2f4f..c0076801d 100755 --- a/xfixes/select.c +++ b/xfixes/select.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2002 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/xfixes/xfixes.h b/xfixes/xfixes.h index 0f1e3b070..81dd83daf 100755 --- a/xfixes/xfixes.h +++ b/xfixes/xfixes.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2002 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h index 7f3b119b7..48927ae0f 100755 --- a/xfixes/xfixesint.h +++ b/xfixes/xfixesint.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright © 2006 Sun Microsystems * * Permission to use, copy, modify, distribute, and sell this software and its diff --git a/xkb/ddxFakeBtn.c b/xkb/ddxFakeBtn.c index 77222236f..8144fd2c5 100644 --- a/xkb/ddxFakeBtn.c +++ b/xkb/ddxFakeBtn.c @@ -23,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86$ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/xkb/ddxInit.c b/xkb/ddxInit.c index 3bcf9d604..4c78a621b 100644 --- a/xkb/ddxInit.c +++ b/xkb/ddxInit.c @@ -23,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86$ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/xkb/ddxKeyClick.c b/xkb/ddxKeyClick.c index 685ae1b42..f48296dbc 100644 --- a/xkb/ddxKeyClick.c +++ b/xkb/ddxKeyClick.c @@ -23,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86$ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/xkb/ddxLEDs.c b/xkb/ddxLEDs.c index 22899d766..b4c8086f5 100644 --- a/xkb/ddxLEDs.c +++ b/xkb/ddxLEDs.c @@ -23,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86$ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index c24c56c1c..d79ae7a7b 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -77,7 +77,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define POST_ERROR_MSG1 "\"Errors from xkbcomp are not fatal to the X server\"" #define POST_ERROR_MSG2 "\"End of messages from xkbcomp\"" -#if defined(__UNIXOS2__) || defined(WIN32) +#if defined(WIN32) #define PATHSEPARATOR "\\" #else #define PATHSEPARATOR "/" @@ -239,20 +239,8 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile; OutputDirectory(xkm_output_dir, sizeof(xkm_output_dir)); if (XkbBaseDirectory!=NULL) { -#ifndef __UNIXOS2__ char *xkbbasedir = XkbBaseDirectory; char *xkbbindir = XkbBinDirectory; -#else - /* relocate the basedir and replace the slashes with backslashes */ - char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory); - char *xkbbindir = (char*)__XOS2RedirRoot(XkbBinDirectory); - int i; - - for (i=0; i<strlen(xkbbasedir); i++) - if (xkbbasedir[i]=='/') xkbbasedir[i]='\\'; - for (i=0; i<strlen(xkbbindir); i++) - if (xkbbindir[i]=='/') xkbbindir[i]='\\'; -#endif cmd = Xprintf("\"%s" PATHSEPARATOR "xkbcomp\" -w %d \"-R%s\" -xkm %s%s -em1 %s -emp %s -eml %s keymap/%s \"%s%s.xkm\"", xkbbindir, @@ -338,18 +326,8 @@ char tmpname[PATH_MAX]; for xkbcomp. xkbcomp does not read from stdin. */ char *xkmfile = tmpname; #endif -#ifndef __UNIXOS2__ char *xkbbasedir = XkbBaseDirectory; char *xkbbindir = XkbBinDirectory; -#else - int i; - char *xkbbasedir = (char*)__XOS2RedirRoot(XkbBaseDirectory); - char *xkbbindir = (char*)__XOS2RedirRoot(XkbBinDirectory); - for (i=0; i<strlen(xkbbasedir); i++) - if (xkbbasedir[i]=='/') xkbbasedir[i]='\\'; - for (i=0; i<strlen(xkbbindir); i++) - if (xkbbindir[i]=='/') xkbbindir[i]='\\'; -#endif buf = Xprintf( "\"%s" PATHSEPARATOR "xkbcomp\" -w %d \"-R%s\" -xkm \"%s\" -em1 %s -emp %s -eml %s \"%s%s.xkm\"", diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index 716bc26a5..c0867adf0 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -847,7 +847,7 @@ XkbProcessArguments(int argc,char *argv[],int i) } else if (strncmp(argv[i], "-xkbdir", 7) == 0) { if(++i < argc) { -#if !defined(WIN32) && !defined(__UNIXOS2__) && !defined(__CYGWIN__) +#if !defined(WIN32) && !defined(__CYGWIN__) if (getuid() != geteuid()) { LogMessage(X_WARNING, "-xkbdir is not available for setuid X servers\n"); return -1; diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c index f84e70995..a2ea0909a 100644 --- a/xkb/xkbPrOtherEv.c +++ b/xkb/xkbPrOtherEv.c @@ -23,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86$ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index bb6d8a0ae..c7f9a2681 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -1003,9 +1003,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies) if (!tmp) return FALSE; dst->map->types = tmp; - bzero(dst->map->types + - (dst->map->num_types * sizeof(XkbKeyTypeRec)), - (src->map->num_types - dst->map->size_types) * + bzero(dst->map->types + dst->map->num_types, + (src->map->num_types - dst->map->num_types) * sizeof(XkbKeyTypeRec)); } else { diff --git a/xkb/xkbout.c b/xkb/xkbout.c index bdec8e7d3..8905ef4d3 100644 --- a/xkb/xkbout.c +++ b/xkb/xkbout.c @@ -1,4 +1,3 @@ -/* $Xorg: xkbout.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.9 2001/10/28 03:32:47 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c index 3a5037150..4983e2b9e 100644 --- a/xkb/xkbtext.c +++ b/xkb/xkbtext.c @@ -1,4 +1,3 @@ -/* $Xorg: xkbtext.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.11 2002/12/21 18:49:02 paulo Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> |