mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2026-01-19 09:10:23 +01:00
Merge branch 'server-1.2' into randr-1.2-for-server-1.2
This commit is contained in:
Keith Packard
commit
ceca97cb84
21 changed files with 3728 additions and 217 deletions
|
|
@ -59,6 +59,19 @@
|
|||
#include "indirect_table.h"
|
||||
#include "indirect_util.h"
|
||||
|
||||
_X_HIDDEN int
|
||||
glxCountBits(int word)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
while (word) {
|
||||
ret += (word & 1);
|
||||
word >>= 1;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/************************************************************************/
|
||||
|
||||
void
|
||||
|
|
@ -1660,6 +1673,7 @@ DoGetDrawableAttributes(__GLXclientState *cl, XID drawId)
|
|||
xGLXGetDrawableAttributesReply reply;
|
||||
CARD32 attributes[4];
|
||||
int numAttribs;
|
||||
PixmapPtr pixmap;
|
||||
|
||||
glxPixmap = (__GLXpixmap *)LookupIDByType(drawId, __glXPixmapRes);
|
||||
if (!glxPixmap) {
|
||||
|
|
@ -1674,10 +1688,19 @@ DoGetDrawableAttributes(__GLXclientState *cl, XID drawId)
|
|||
reply.numAttribs = numAttribs;
|
||||
|
||||
attributes[0] = GLX_TEXTURE_TARGET_EXT;
|
||||
attributes[1] = 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 (!(glxCountBits(pixmap->drawable.width) == 1 &&
|
||||
glxCountBits(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 {
|
||||
|
|
|
|||
|
|
@ -289,19 +289,6 @@ __glXDRIcontextForceCurrent(__GLXcontext *baseContext)
|
|||
&context->driContext);
|
||||
}
|
||||
|
||||
static int
|
||||
glxCountBits(int word)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
while (word) {
|
||||
ret += (word & 1);
|
||||
word >>= 1;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void
|
||||
glxFillAlphaChannel (PixmapPtr pixmap, int x, int y, int width, int height)
|
||||
{
|
||||
|
|
@ -864,6 +851,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
|
|||
int api_ver = COPY_SUB_BUFFER_INTERNAL_VERSION;
|
||||
drm_magic_t magic;
|
||||
drmVersionPtr version;
|
||||
int newlyopened;
|
||||
char *driverName;
|
||||
drm_handle_t hFB;
|
||||
int junk;
|
||||
|
|
@ -914,10 +902,10 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
|
|||
goto handle_error;
|
||||
}
|
||||
|
||||
fd = drmOpen(NULL, BusID);
|
||||
fd = drmOpenOnce(NULL, BusID, &newlyopened);
|
||||
|
||||
if (fd < 0) {
|
||||
LogMessage(X_ERROR, "AIGLX error: drmOpen failed (%s)\n",
|
||||
LogMessage(X_ERROR, "AIGLX error: drmOpenOnce failed (%s)\n",
|
||||
strerror(-fd));
|
||||
goto handle_error;
|
||||
}
|
||||
|
|
@ -940,7 +928,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
|
|||
drm_version.patch = -1;
|
||||
}
|
||||
|
||||
if (!DRIAuthConnection(pScreen, magic)) {
|
||||
if (newlyopened && !DRIAuthConnection(pScreen, magic)) {
|
||||
LogMessage(X_ERROR, "AIGLX error: DRIAuthConnection failed\n");
|
||||
goto handle_error;
|
||||
}
|
||||
|
|
@ -1082,7 +1070,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
|
|||
xfree(dev_priv);
|
||||
|
||||
if (fd >= 0)
|
||||
drmClose(fd);
|
||||
drmCloseOnce(fd);
|
||||
|
||||
DRICloseConnection(pScreen);
|
||||
|
||||
|
|
|
|||
|
|
@ -60,4 +60,6 @@ extern __GLXcontext *__glXLookupContextByTag(__GLXclientState*, GLXContextTag);
|
|||
extern void *__glXglDDXScreenInfo(void);
|
||||
extern void *__glXglDDXExtensionInfo(void);
|
||||
|
||||
extern int glxCountBits(int);
|
||||
|
||||
#endif /* _glxcmds_h_ */
|
||||
|
|
|
|||
|
|
@ -85,8 +85,6 @@ extern HIDDEN void __glXDisp_EvalCoord2fv(GLbyte * pc);
|
|||
extern HIDDEN void __glXDispSwap_EvalCoord2fv(GLbyte * pc);
|
||||
extern HIDDEN int __glXDisp_DestroyPixmap(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDispSwap_DestroyPixmap(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN void __glXDisp_ProgramEnvParameter4dvARB(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_ProgramEnvParameter4dvARB(GLbyte * pc);
|
||||
extern HIDDEN int __glXDisp_GetMapiv(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDispSwap_GetMapiv(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDisp_SwapBuffers(struct __GLXclientStateRec *, GLbyte *);
|
||||
|
|
@ -123,6 +121,8 @@ extern HIDDEN int __glXDisp_VendorPrivate(struct __GLXclientStateRec *, GLbyte *
|
|||
extern HIDDEN int __glXDispSwap_VendorPrivate(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDisp_CreateGLXPixmapWithConfigSGIX(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDispSwap_CreateGLXPixmapWithConfigSGIX(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN void __glXDisp_VertexAttrib1fvNV(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_VertexAttrib1fvNV(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_Vertex3iv(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_Vertex3iv(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_CopyConvolutionFilter1D(GLbyte * pc);
|
||||
|
|
@ -211,8 +211,6 @@ extern HIDDEN int __glXDisp_ReadPixels(struct __GLXclientStateRec *, GLbyte *);
|
|||
extern HIDDEN int __glXDispSwap_ReadPixels(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN void __glXDisp_EdgeFlagv(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_EdgeFlagv(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_Rotatef(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_Rotatef(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_TexParameterf(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_TexParameterf(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_TexParameteri(GLbyte * pc);
|
||||
|
|
@ -279,6 +277,8 @@ extern HIDDEN void __glXDisp_ClearStencil(GLbyte * pc);
|
|||
extern HIDDEN void __glXDispSwap_ClearStencil(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_VertexAttrib3dvARB(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_VertexAttrib3dvARB(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_VertexAttribs4ubvNV(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_VertexAttribs4ubvNV(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_ConvolutionParameteriv(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_ConvolutionParameteriv(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_RasterPos2fv(GLbyte * pc);
|
||||
|
|
@ -327,6 +327,8 @@ extern HIDDEN int __glXDisp_GetVertexAttribdvNV(struct __GLXclientStateRec *, GL
|
|||
extern HIDDEN int __glXDispSwap_GetVertexAttribdvNV(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN void __glXDisp_Normal3fv(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_Normal3fv(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_ProgramEnvParameter4dvARB(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_ProgramEnvParameter4dvARB(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_VertexAttrib4ivARB(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_VertexAttrib4ivARB(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_End(GLbyte * pc);
|
||||
|
|
@ -377,6 +379,8 @@ extern HIDDEN void __glXDisp_DepthMask(GLbyte * pc);
|
|||
extern HIDDEN void __glXDispSwap_DepthMask(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_Rotated(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_Rotated(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_Color4iv(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_Color4iv(GLbyte * pc);
|
||||
extern HIDDEN int __glXDisp_GetMaterialiv(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDispSwap_GetMaterialiv(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN void __glXDisp_StencilOp(GLbyte * pc);
|
||||
|
|
@ -457,8 +461,6 @@ extern HIDDEN void __glXDisp_BindFramebufferEXT(GLbyte * pc);
|
|||
extern HIDDEN void __glXDispSwap_BindFramebufferEXT(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_PushAttrib(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_PushAttrib(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_VertexAttrib4usvARB(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_VertexAttrib4usvARB(GLbyte * pc);
|
||||
extern HIDDEN int __glXDisp_DestroyPbuffer(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDispSwap_DestroyPbuffer(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN void __glXDisp_TexParameteriv(GLbyte * pc);
|
||||
|
|
@ -517,6 +519,8 @@ extern HIDDEN void __glXDisp_SecondaryColor3ivEXT(GLbyte * pc);
|
|||
extern HIDDEN void __glXDispSwap_SecondaryColor3ivEXT(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_TexCoord4iv(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_TexCoord4iv(GLbyte * pc);
|
||||
extern HIDDEN int __glXDisp_GetDrawableAttributesSGIX(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDispSwap_GetDrawableAttributesSGIX(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN void __glXDisp_SampleMaskSGIS(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_SampleMaskSGIS(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_ColorTableParameteriv(GLbyte * pc);
|
||||
|
|
@ -615,8 +619,8 @@ extern HIDDEN void __glXDisp_PrioritizeTextures(GLbyte * pc);
|
|||
extern HIDDEN void __glXDispSwap_PrioritizeTextures(GLbyte * pc);
|
||||
extern HIDDEN int __glXDisp_PixelStorei(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDispSwap_PixelStorei(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN void __glXDisp_Color4iv(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_Color4iv(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_VertexAttrib4usvARB(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_VertexAttrib4usvARB(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_EvalCoord2dv(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_EvalCoord2dv(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_VertexAttrib3svARB(GLbyte * pc);
|
||||
|
|
@ -783,8 +787,6 @@ extern HIDDEN void __glXDisp_VertexAttribs2fvNV(GLbyte * pc);
|
|||
extern HIDDEN void __glXDispSwap_VertexAttribs2fvNV(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_Rectiv(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_Rectiv(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_VertexAttrib1fvNV(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_VertexAttrib1fvNV(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_SecondaryColor3dvEXT(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_SecondaryColor3dvEXT(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_Vertex2fv(GLbyte * pc);
|
||||
|
|
@ -847,10 +849,8 @@ extern HIDDEN int __glXDisp_GetHistogramParameteriv(struct __GLXclientStateRec *
|
|||
extern HIDDEN int __glXDispSwap_GetHistogramParameteriv(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDisp_GetHistogramParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDispSwap_GetHistogramParameterivEXT(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDisp_GetConvolutionFilter(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDispSwap_GetConvolutionFilter(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDisp_GetConvolutionFilterEXT(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDispSwap_GetConvolutionFilterEXT(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN void __glXDisp_Rotatef(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_Rotatef(GLbyte * pc);
|
||||
extern HIDDEN int __glXDisp_GetProgramivARB(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDispSwap_GetProgramivARB(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN void __glXDisp_BlendFuncSeparateEXT(GLbyte * pc);
|
||||
|
|
@ -875,6 +875,10 @@ extern HIDDEN void __glXDisp_Map2f(GLbyte * pc);
|
|||
extern HIDDEN void __glXDispSwap_Map2f(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_ProgramStringARB(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_ProgramStringARB(GLbyte * pc);
|
||||
extern HIDDEN int __glXDisp_GetConvolutionFilter(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDispSwap_GetConvolutionFilter(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDisp_GetConvolutionFilterEXT(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDispSwap_GetConvolutionFilterEXT(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDisp_GetCompressedTexImageARB(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDispSwap_GetCompressedTexImageARB(struct __GLXclientStateRec *, GLbyte *);
|
||||
extern HIDDEN int __glXDisp_GetTexGenfv(struct __GLXclientStateRec *, GLbyte *);
|
||||
|
|
@ -919,8 +923,6 @@ extern HIDDEN void __glXDisp_DrawBuffersARB(GLbyte * pc);
|
|||
extern HIDDEN void __glXDispSwap_DrawBuffersARB(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_LoadName(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_LoadName(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_VertexAttribs4ubvNV(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_VertexAttribs4ubvNV(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_CopyTexSubImage1D(GLbyte * pc);
|
||||
extern HIDDEN void __glXDispSwap_CopyTexSubImage1D(GLbyte * pc);
|
||||
extern HIDDEN void __glXDisp_CullFace(GLbyte * pc);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
#include "indirect_size.h"
|
||||
#include "indirect_reqsize.h"
|
||||
|
||||
#if defined(linux)
|
||||
#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
|
||||
# include <byteswap.h>
|
||||
# define SWAP_32(v) do { (v) = bswap_32(v); } while(0)
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -645,7 +645,7 @@ static const void *Render_function_table[400][2] = {
|
|||
/* [ 302] = 4182 */ {__glXDisp_RequestResidentProgramsNV, __glXDispSwap_RequestResidentProgramsNV},
|
||||
/* [ 303] = 4183 */ {__glXDisp_LoadProgramNV, __glXDispSwap_LoadProgramNV},
|
||||
/* [ 304] = 4184 */ {__glXDisp_ProgramParameter4fvNV, __glXDispSwap_ProgramParameter4fvNV},
|
||||
/* [ 305] = 4185 */ {__glXDisp_ProgramParameter4dvNV, __glXDispSwap_ProgramParameter4dvNV},
|
||||
/* [ 305] = 4185 */ {__glXDisp_ProgramEnvParameter4dvARB, __glXDispSwap_ProgramEnvParameter4dvARB},
|
||||
/* [ 306] = 4186 */ {__glXDisp_ProgramParameters4fvNV, __glXDispSwap_ProgramParameters4fvNV},
|
||||
/* [ 307] = 4187 */ {__glXDisp_ProgramParameters4dvNV, __glXDispSwap_ProgramParameters4dvNV},
|
||||
/* [ 308] = 4188 */ {__glXDisp_TrackMatrixNV, __glXDispSwap_TrackMatrixNV},
|
||||
|
|
@ -886,10 +886,10 @@ static const int_fast16_t Render_size_table[400][2] = {
|
|||
/* [140] = 140 */ { 0, ~0},
|
||||
/* [141] = 141 */ { 4, ~0},
|
||||
/* [142] = 142 */ { 8, ~0},
|
||||
/* [143] = 143 */ { 40, 20},
|
||||
/* [144] = 144 */ { 28, 21},
|
||||
/* [145] = 145 */ { 64, 22},
|
||||
/* [146] = 146 */ { 44, 23},
|
||||
/* [143] = 143 */ { 28, 20},
|
||||
/* [144] = 144 */ { 20, 21},
|
||||
/* [145] = 145 */ { 48, 22},
|
||||
/* [146] = 146 */ { 32, 23},
|
||||
/* [147] = 147 */ { 24, ~0},
|
||||
/* [148] = 148 */ { 16, ~0},
|
||||
/* [149] = 149 */ { 44, ~0},
|
||||
|
|
@ -1231,8 +1231,8 @@ const struct __glXDispatchInfo Render_dispatch_info = {
|
|||
};
|
||||
|
||||
/*****************************************************************/
|
||||
/* tree depth = 13 */
|
||||
static const int_fast16_t VendorPriv_dispatch_tree[155] = {
|
||||
/* tree depth = 12 */
|
||||
static const int_fast16_t VendorPriv_dispatch_tree[152] = {
|
||||
/* [0] -> opcode range [0, 131072], node depth 1 */
|
||||
2,
|
||||
5,
|
||||
|
|
@ -1474,17 +1474,12 @@ static const int_fast16_t VendorPriv_dispatch_tree[155] = {
|
|||
|
||||
/* [149] -> opcode range [65536, 65568], node depth 12 */
|
||||
1,
|
||||
152,
|
||||
EMPTY_LEAF,
|
||||
|
||||
/* [152] -> opcode range [65536, 65552], node depth 13 */
|
||||
1,
|
||||
LEAF(88),
|
||||
EMPTY_LEAF,
|
||||
|
||||
};
|
||||
|
||||
static const void *VendorPriv_function_table[96][2] = {
|
||||
static const void *VendorPriv_function_table[104][2] = {
|
||||
/* [ 0] = 0 */ {NULL, NULL},
|
||||
/* [ 1] = 1 */ {__glXDisp_GetConvolutionFilterEXT, __glXDispSwap_GetConvolutionFilterEXT},
|
||||
/* [ 2] = 2 */ {__glXDisp_GetConvolutionParameterfvEXT, __glXDispSwap_GetConvolutionParameterfvEXT},
|
||||
|
|
@ -1581,6 +1576,14 @@ static const void *VendorPriv_function_table[96][2] = {
|
|||
/* [ 93] = 65541 */ {__glXDisp_CreateContextWithConfigSGIX, __glXDispSwap_CreateContextWithConfigSGIX},
|
||||
/* [ 94] = 65542 */ {__glXDisp_CreateGLXPixmapWithConfigSGIX, __glXDispSwap_CreateGLXPixmapWithConfigSGIX},
|
||||
/* [ 95] = 65543 */ {NULL, NULL},
|
||||
/* [ 96] = 65544 */ {NULL, NULL},
|
||||
/* [ 97] = 65545 */ {NULL, NULL},
|
||||
/* [ 98] = 65546 */ {__glXDisp_GetDrawableAttributesSGIX, __glXDispSwap_GetDrawableAttributesSGIX},
|
||||
/* [ 99] = 65547 */ {NULL, NULL},
|
||||
/* [ 100] = 65548 */ {NULL, NULL},
|
||||
/* [ 101] = 65549 */ {NULL, NULL},
|
||||
/* [ 102] = 65550 */ {NULL, NULL},
|
||||
/* [ 103] = 65551 */ {NULL, NULL},
|
||||
};
|
||||
|
||||
const struct __glXDispatchInfo VendorPriv_dispatch_info = {
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
#include <X11/Xmd.h>
|
||||
#include <GL/gl.h>
|
||||
#include <GL/glxproto.h>
|
||||
#ifdef __linux__
|
||||
#if defined(__linux__) || defined (__GLIBC__) || defined(__GNU__)
|
||||
#include <byteswap.h>
|
||||
#elif defined(__OpenBSD__)
|
||||
#include <sys/endian.h>
|
||||
|
|
|
|||
45
configure.ac
45
configure.ac
|
|
@ -25,7 +25,7 @@ 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.1.99.903, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
|
||||
AC_INIT([xorg-server], 1.2.0, [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
|
||||
|
|
@ -295,10 +295,10 @@ AC_DEFINE_UNQUOTED(OSNAME, "$OSNAME",
|
|||
DEFAULT_VENDOR_NAME="The X.Org Foundation"
|
||||
DEFAULT_VENDOR_NAME_SHORT="X.Org"
|
||||
DEFAULT_VERSION_MAJOR=7
|
||||
DEFAULT_VERSION_MINOR=1
|
||||
DEFAULT_VERSION_PATCH=99
|
||||
DEFAULT_VERSION_SNAP=903
|
||||
DEFAULT_RELEASE_DATE="1 December 2006"
|
||||
DEFAULT_VERSION_MINOR=2
|
||||
DEFAULT_VERSION_PATCH=0
|
||||
DEFAULT_VERSION_SNAP=0
|
||||
DEFAULT_RELEASE_DATE="22 January 2007"
|
||||
DEFAULT_VENDOR_WEB="http://wiki.x.org"
|
||||
|
||||
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
|
||||
|
|
@ -577,7 +577,7 @@ fi
|
|||
|
||||
if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
|
||||
PKG_CHECK_MODULES([XLIB], [x11])
|
||||
PKG_CHECK_MODULES([GL], [glproto >= 1.4.7])
|
||||
PKG_CHECK_MODULES([GL], [glproto >= 1.4.8])
|
||||
AC_SUBST(XLIB_CFLAGS)
|
||||
AC_DEFINE(GLXEXT, 1, [Build GLX extension])
|
||||
GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'
|
||||
|
|
@ -1129,10 +1129,6 @@ dnl has it in libc), or if libdl is needed to get it.
|
|||
# on kernels < 2.5.42 it's called 'rate' instead.
|
||||
AC_TRY_COMPILE([
|
||||
#include <linux/kd.h>
|
||||
#ifdef __sparc__
|
||||
#include <asm/param.h>
|
||||
#include <asm/kbio.h>
|
||||
#endif
|
||||
],[
|
||||
int main () {
|
||||
struct kbd_repeat k;
|
||||
|
|
@ -1528,7 +1524,12 @@ if test "$KDRIVE" = yes; then
|
|||
# $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'
|
||||
KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
|
||||
case $host_os in
|
||||
*linux*)
|
||||
KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.a'
|
||||
KDRIVELINUX=yes
|
||||
;;
|
||||
esac
|
||||
KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a'
|
||||
KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB $TSLIB_LIBS"
|
||||
|
||||
|
|
@ -1546,6 +1547,7 @@ AC_SUBST(KDRIVE_PURE_INCS)
|
|||
AC_SUBST(KDRIVE_CFLAGS)
|
||||
AC_SUBST(KDRIVE_PURE_LIBS)
|
||||
AC_SUBST(KDRIVE_LIBS)
|
||||
AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes])
|
||||
AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes])
|
||||
AM_CONDITIONAL(H3600_TS, false)
|
||||
AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
|
||||
|
|
@ -1597,20 +1599,13 @@ dnl and the rest of these are generic, so they're in config.h
|
|||
AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
|
||||
AC_DEFINE(XResExtension, 1, [Build XRes extension])
|
||||
|
||||
dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined
|
||||
dnl _*_SOURCE on Solaris restricts to the standards, and removes non-standard
|
||||
dnl functions which X uses
|
||||
case $host_os in
|
||||
cygwin*) ;;
|
||||
solaris*) ;;
|
||||
darwin*) ;;
|
||||
freebsd*|netbsd*|openbsd*) ;;
|
||||
*)
|
||||
AC_DEFINE(_POSIX_SOURCE, 1, [POSIX-compliant source])
|
||||
AC_DEFINE(_XOPEN_SOURCE, 500, [X/Open-compliant source])
|
||||
AC_DEFINE(_BSD_SOURCE, 1, [BSD-compliant source])
|
||||
;;
|
||||
esac
|
||||
AC_TRY_COMPILE([
|
||||
#include <features.h>
|
||||
#ifndef __GLIBC__
|
||||
#error not glibc
|
||||
#endif
|
||||
], [], [AC_DEFINE(_GNU_SOURCE, 1,
|
||||
[ Enable GNU and other extensions to the C environment for glibc])])
|
||||
|
||||
AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
|
||||
|
||||
|
|
|
|||
34
dbe/dbe.c
34
dbe/dbe.c
|
|
@ -39,6 +39,11 @@
|
|||
#endif
|
||||
|
||||
#include <string.h>
|
||||
#if HAVE_STDINT_H
|
||||
#include <stdint.h>
|
||||
#elif !defined(UINT32_MAX)
|
||||
#define UINT32_MAX 0xffffffffU
|
||||
#endif
|
||||
|
||||
#include <X11/X.h>
|
||||
#include <X11/Xproto.h>
|
||||
|
|
@ -713,11 +718,14 @@ ProcDbeSwapBuffers(ClientPtr client)
|
|||
return(Success);
|
||||
}
|
||||
|
||||
if (nStuff > UINT32_MAX / sizeof(DbeSwapInfoRec))
|
||||
return BadAlloc;
|
||||
|
||||
/* Get to the swap info appended to the end of the request. */
|
||||
dbeSwapInfo = (xDbeSwapInfo *)&stuff[1];
|
||||
|
||||
/* Allocate array to record swap information. */
|
||||
swapInfo = (DbeSwapInfoPtr)ALLOCATE_LOCAL(nStuff * sizeof(DbeSwapInfoRec));
|
||||
swapInfo = (DbeSwapInfoPtr)Xalloc(nStuff * sizeof(DbeSwapInfoRec));
|
||||
if (swapInfo == NULL)
|
||||
{
|
||||
return(BadAlloc);
|
||||
|
|
@ -732,14 +740,14 @@ ProcDbeSwapBuffers(ClientPtr client)
|
|||
if (!(pWin = SecurityLookupWindow(dbeSwapInfo[i].window, client,
|
||||
SecurityWriteAccess)))
|
||||
{
|
||||
DEALLOCATE_LOCAL(swapInfo);
|
||||
Xfree(swapInfo);
|
||||
return(BadWindow);
|
||||
}
|
||||
|
||||
/* Each window must be double-buffered - BadMatch. */
|
||||
if (DBE_WINDOW_PRIV(pWin) == NULL)
|
||||
{
|
||||
DEALLOCATE_LOCAL(swapInfo);
|
||||
Xfree(swapInfo);
|
||||
return(BadMatch);
|
||||
}
|
||||
|
||||
|
|
@ -748,7 +756,7 @@ ProcDbeSwapBuffers(ClientPtr client)
|
|||
{
|
||||
if (dbeSwapInfo[i].window == dbeSwapInfo[j].window)
|
||||
{
|
||||
DEALLOCATE_LOCAL(swapInfo);
|
||||
Xfree(swapInfo);
|
||||
return(BadMatch);
|
||||
}
|
||||
}
|
||||
|
|
@ -759,7 +767,7 @@ ProcDbeSwapBuffers(ClientPtr client)
|
|||
(dbeSwapInfo[i].swapAction != XdbeUntouched ) &&
|
||||
(dbeSwapInfo[i].swapAction != XdbeCopied ))
|
||||
{
|
||||
DEALLOCATE_LOCAL(swapInfo);
|
||||
Xfree(swapInfo);
|
||||
return(BadValue);
|
||||
}
|
||||
|
||||
|
|
@ -789,12 +797,12 @@ ProcDbeSwapBuffers(ClientPtr client)
|
|||
error = (*pDbeScreenPriv->SwapBuffers)(client, &nStuff, swapInfo);
|
||||
if (error != Success)
|
||||
{
|
||||
DEALLOCATE_LOCAL(swapInfo);
|
||||
Xfree(swapInfo);
|
||||
return(error);
|
||||
}
|
||||
}
|
||||
|
||||
DEALLOCATE_LOCAL(swapInfo);
|
||||
Xfree(swapInfo);
|
||||
return(Success);
|
||||
|
||||
} /* ProcDbeSwapBuffers() */
|
||||
|
|
@ -876,10 +884,12 @@ ProcDbeGetVisualInfo(ClientPtr client)
|
|||
|
||||
REQUEST_AT_LEAST_SIZE(xDbeGetVisualInfoReq);
|
||||
|
||||
if (stuff->n > UINT32_MAX / sizeof(DrawablePtr))
|
||||
return BadAlloc;
|
||||
/* Make sure any specified drawables are valid. */
|
||||
if (stuff->n != 0)
|
||||
{
|
||||
if (!(pDrawables = (DrawablePtr *)ALLOCATE_LOCAL(stuff->n *
|
||||
if (!(pDrawables = (DrawablePtr *)Xalloc(stuff->n *
|
||||
sizeof(DrawablePtr))))
|
||||
{
|
||||
return(BadAlloc);
|
||||
|
|
@ -892,7 +902,7 @@ ProcDbeGetVisualInfo(ClientPtr client)
|
|||
if (!(pDrawables[i] = (DrawablePtr)SecurityLookupDrawable(
|
||||
drawables[i], client, SecurityReadAccess)))
|
||||
{
|
||||
DEALLOCATE_LOCAL(pDrawables);
|
||||
Xfree(pDrawables);
|
||||
return(BadDrawable);
|
||||
}
|
||||
}
|
||||
|
|
@ -904,7 +914,7 @@ ProcDbeGetVisualInfo(ClientPtr client)
|
|||
{
|
||||
if (pDrawables)
|
||||
{
|
||||
DEALLOCATE_LOCAL(pDrawables);
|
||||
Xfree(pDrawables);
|
||||
}
|
||||
|
||||
return(BadAlloc);
|
||||
|
|
@ -931,7 +941,7 @@ ProcDbeGetVisualInfo(ClientPtr client)
|
|||
/* Free pDrawables if we needed to allocate it above. */
|
||||
if (pDrawables)
|
||||
{
|
||||
DEALLOCATE_LOCAL(pDrawables);
|
||||
Xfree(pDrawables);
|
||||
}
|
||||
|
||||
return(BadAlloc);
|
||||
|
|
@ -1012,7 +1022,7 @@ ProcDbeGetVisualInfo(ClientPtr client)
|
|||
|
||||
if (pDrawables)
|
||||
{
|
||||
DEALLOCATE_LOCAL(pDrawables);
|
||||
Xfree(pDrawables);
|
||||
}
|
||||
|
||||
return(client->noClientException);
|
||||
|
|
|
|||
|
|
@ -100,11 +100,6 @@ specifies a file which contains a collection of authorization records used
|
|||
to authenticate access. See also the \fIxdm\fP(1) and
|
||||
\fIXsecurity\fP(__miscmansuffix__) manual pages.
|
||||
.TP 8
|
||||
.B bc
|
||||
disables certain kinds of error checking, for bug compatibility with
|
||||
previous releases (e.g., to work around bugs in R2 and R3 xterms and toolkits).
|
||||
Deprecated.
|
||||
.TP 8
|
||||
.B \-bs
|
||||
disables backing store support on all screens.
|
||||
.TP 8
|
||||
|
|
@ -189,7 +184,7 @@ prints a usage message.
|
|||
causes all remaining command line arguments to be ignored.
|
||||
.TP 8
|
||||
.B \-maxbigreqsize \fIsize\fP
|
||||
sets the maxmium big request to
|
||||
sets the maximum big request to
|
||||
.I size
|
||||
MB.
|
||||
.TP 8
|
||||
|
|
@ -266,6 +261,10 @@ required by the X protocol, which allows the server to exceed the
|
|||
client's backing store expectations but does not provide a way to tell
|
||||
the client that it is doing so.
|
||||
.TP 8
|
||||
.B \-wr
|
||||
sets the default root window to solid white instead of the standard root weave
|
||||
pattern.
|
||||
.TP 8
|
||||
.B \-x \fIextension\fP
|
||||
loads the specified extension at init.
|
||||
This is a no-op for most implementations.
|
||||
|
|
@ -398,20 +397,14 @@ base directory for keyboard layout files. This option is not available
|
|||
for setuid X servers (i.e., when the X server's real and effective uids
|
||||
are different).
|
||||
.TP 8
|
||||
.B \-ar1 \fImilliseconds\fP
|
||||
.B \-ardelay \fImilliseconds\fP
|
||||
sets the autorepeat delay (length of time in milliseconds that a key must
|
||||
be depressed before autorepeat starts).
|
||||
.TP 8
|
||||
.B \-ar2 \fImilliseconds\fP
|
||||
.B \-arinterval \fImilliseconds\fP
|
||||
sets the autorepeat interval (length of time in milliseconds that should
|
||||
elapse between autorepeat-generated keystrokes).
|
||||
.TP 8
|
||||
.B \-noloadxkb
|
||||
disables loading of an XKB keymap description on server startup.
|
||||
.TP 8
|
||||
.B \-xkbdb \fIfilename\fP
|
||||
uses \fIfilename\fP for default keyboard keymaps.
|
||||
.TP 8
|
||||
.B \-xkbmap \fIfilename\fP
|
||||
loads keyboard description in \fIfilename\fP on server startup.
|
||||
.SH SECURITY EXTENSION OPTIONS
|
||||
|
|
@ -457,7 +450,7 @@ the text after the /; it is used to distinguish between instances of
|
|||
|
||||
<action> ::= a | i | e
|
||||
|
||||
<string> ::= <dbl quoted string> | <single quoted string> | <unqouted string>
|
||||
<string> ::= <dbl quoted string> | <single quoted string> | <unquoted string>
|
||||
|
||||
<dbl quoted string> ::= <space> " <not dqoute>* " <space>
|
||||
|
||||
|
|
|
|||
15
fb/fbpict.c
15
fb/fbpict.c
|
|
@ -891,9 +891,8 @@ fbComposite (CARD8 op,
|
|||
case PictOpOver:
|
||||
if (pMask)
|
||||
{
|
||||
if (srcRepeat &&
|
||||
pSrc->pDrawable->width == 1 &&
|
||||
pSrc->pDrawable->height == 1)
|
||||
if (fbCanGetSolid(pSrc) &&
|
||||
!maskRepeat)
|
||||
{
|
||||
srcRepeat = FALSE;
|
||||
if (PICT_FORMAT_COLOR(pSrc->format)) {
|
||||
|
|
@ -1005,7 +1004,7 @@ fbComposite (CARD8 op,
|
|||
{
|
||||
if (pSrc->pDrawable == pMask->pDrawable &&
|
||||
xSrc == xMask && ySrc == yMask &&
|
||||
!pMask->componentAlpha)
|
||||
!pMask->componentAlpha && !maskRepeat)
|
||||
{
|
||||
/* source == mask: non-premultiplied data */
|
||||
switch (pSrc->format) {
|
||||
|
|
@ -1069,9 +1068,7 @@ fbComposite (CARD8 op,
|
|||
else
|
||||
{
|
||||
/* non-repeating source, repeating mask => translucent window */
|
||||
if (maskRepeat &&
|
||||
pMask->pDrawable->width == 1 &&
|
||||
pMask->pDrawable->height == 1)
|
||||
if (fbCanGetSolid(pMask))
|
||||
{
|
||||
if (pSrc->format == PICT_x8r8g8b8 &&
|
||||
pDst->format == PICT_x8r8g8b8 &&
|
||||
|
|
@ -1088,9 +1085,7 @@ fbComposite (CARD8 op,
|
|||
}
|
||||
else /* no mask */
|
||||
{
|
||||
if (srcRepeat &&
|
||||
pSrc->pDrawable->width == 1 &&
|
||||
pSrc->pDrawable->height == 1)
|
||||
if (fbCanGetSolid(pSrc))
|
||||
{
|
||||
/* no mask and repeating source */
|
||||
switch (pSrc->format) {
|
||||
|
|
|
|||
47
fb/fbpict.h
47
fb/fbpict.h
|
|
@ -30,6 +30,13 @@
|
|||
|
||||
#include "renderedge.h"
|
||||
|
||||
|
||||
#if defined(__GNUC__)
|
||||
#define INLINE __inline__
|
||||
#else
|
||||
#define INLINE
|
||||
#endif
|
||||
|
||||
#define FbIntMult(a,b,t) ( (t) = (a) * (b) + 0x80, ( ( ( (t)>>8 ) + (t) )>>8 ) )
|
||||
#define FbIntDiv(a,b) (((CARD16) (a) * 255) / (b))
|
||||
|
||||
|
|
@ -67,6 +74,40 @@
|
|||
#define Green(x) (((x) >> 8) & 0xff)
|
||||
#define Blue(x) ((x) & 0xff)
|
||||
|
||||
/**
|
||||
* Returns TRUE if the fbComposeGetSolid can be used to get a single solid
|
||||
* color representing every source sampling location of the picture.
|
||||
*/
|
||||
static INLINE Bool
|
||||
fbCanGetSolid(PicturePtr pict)
|
||||
{
|
||||
if (pict->pDrawable == NULL ||
|
||||
pict->pDrawable->width != 1 ||
|
||||
pict->pDrawable->height != 1)
|
||||
{
|
||||
return FALSE;
|
||||
}
|
||||
if (pict->repeat != RepeatNormal)
|
||||
return FALSE;
|
||||
|
||||
switch (pict->format) {
|
||||
case PICT_a8r8g8b8:
|
||||
case PICT_x8r8g8b8:
|
||||
case PICT_a8b8g8r8:
|
||||
case PICT_x8b8g8r8:
|
||||
case PICT_r8g8b8:
|
||||
case PICT_b8g8r8:
|
||||
case PICT_r5g6b5:
|
||||
case PICT_b5g6r5:
|
||||
return TRUE;
|
||||
default:
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
#define fbCanGetSolid(pict) \
|
||||
(pict->pDrawable != NULL && pict->pDrawable->width == 1 && pict->pDrawable->height == 1)
|
||||
|
||||
#define fbComposeGetSolid(pict, bits, fmt) { \
|
||||
FbBits *__bits__; \
|
||||
FbStride __stride__; \
|
||||
|
|
@ -321,12 +362,6 @@
|
|||
#define FASTCALL
|
||||
#endif
|
||||
|
||||
#if defined(__GNUC__)
|
||||
#define INLINE __inline__
|
||||
#else
|
||||
#define INLINE
|
||||
#endif
|
||||
|
||||
typedef struct _FbComposeData {
|
||||
CARD8 op;
|
||||
PicturePtr src;
|
||||
|
|
|
|||
|
|
@ -15,9 +15,13 @@ if XEPHYR
|
|||
XEPHYR_SUBDIRS = ephyr
|
||||
endif
|
||||
|
||||
if KDRIVELINUX
|
||||
LINUX_SUBDIRS = linux
|
||||
endif
|
||||
|
||||
SUBDIRS = \
|
||||
src \
|
||||
linux \
|
||||
$(LINUX_SUBDIRS) \
|
||||
$(XSDL_SUBDIRS) \
|
||||
$(FBDEV_SUBDIRS) \
|
||||
$(VESA_SUBDIRS) \
|
||||
|
|
|
|||
|
|
@ -84,8 +84,8 @@ typedef enum {
|
|||
* mask is 0xFFFF0000.
|
||||
*/
|
||||
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 3)
|
||||
#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(1, 0)
|
||||
#define ABI_XINPUT_VERSION SET_ABI_VERSION(0, 6)
|
||||
#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(1, 1)
|
||||
#define ABI_XINPUT_VERSION SET_ABI_VERSION(0, 7)
|
||||
#define ABI_EXTENSION_VERSION SET_ABI_VERSION(0, 3)
|
||||
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 5)
|
||||
|
||||
|
|
|
|||
|
|
@ -113,6 +113,10 @@ DLFindSymbol(const char *name)
|
|||
DLModuleList *l;
|
||||
void *p;
|
||||
|
||||
p = dlsym(RTLD_DEFAULT, name);
|
||||
if (p != NULL)
|
||||
return p;
|
||||
|
||||
for (l = dlModuleList; l != NULL; l = l->next) {
|
||||
p = DLFindSymbolLocal(l->module, name);
|
||||
if (p)
|
||||
|
|
|
|||
|
|
@ -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 Wed 2006-12-06 02:05:02
|
||||
# Daily snapshot on Thu 2007-01-18 02:05:01
|
||||
#
|
||||
|
||||
# Vendors, devices and subsystems. Please keep sorted.
|
||||
|
|
@ -23,11 +23,28 @@
|
|||
|
||||
0000 Gammagraphx, Inc.
|
||||
001a Ascend Communications, Inc.
|
||||
001c PEAK-System Technik GmbH
|
||||
0001 PCAN-PCI CAN-Bus controller
|
||||
0033 Paradyne corp.
|
||||
003d Lockheed Martin-Marietta Corp
|
||||
# Real TJN ID is e159, but they got it wrong several times --mj
|
||||
0059 Tiger Jet Network Inc. (Wrong ID)
|
||||
0070 Hauppauge computer works Inc.
|
||||
0003 WinTV PVR-250
|
||||
0009 WinTV PVR-150
|
||||
0801 WinTV PVR-150
|
||||
0807 WinTV PVR-150
|
||||
4000 WinTV PVR-350
|
||||
4001 WinTV PVR-250 (v1)
|
||||
4009 WinTV PVR-250
|
||||
4800 WinTV PVR-350
|
||||
4801 WinTV PVR-250 MCE
|
||||
4803 WinTV PVR-250
|
||||
8003 WinTV PVR-150
|
||||
8801 WinTV PVR-150
|
||||
c801 WinTV PVR-150
|
||||
e807 WinTV PVR-500 MCE (1st tuner)
|
||||
e817 WinTV PVR-500 MCE (2nd tuner)
|
||||
0071 Nebula Electronics Ltd.
|
||||
0095 Silicon Image, Inc. (Wrong ID)
|
||||
0680 Ultra ATA/133 IDE RAID CONTROLLER CARD
|
||||
|
|
@ -51,6 +68,7 @@
|
|||
0315 SK-Electronics Co., Ltd.
|
||||
0357 TTTech AG
|
||||
000a TTP-Monitoring Card V2.0
|
||||
0403 Future Technology Devices International Ltd
|
||||
0432 SCM Microsystems, Inc.
|
||||
0001 Pluto2 DVB-T Receiver for PCMCIA [EasyWatch MobilSet]
|
||||
045e Microsoft
|
||||
|
|
@ -63,6 +81,7 @@
|
|||
001a FSD7000 802.11g PCI Wireless card
|
||||
0109 F5U409-CU USB/Serial Portable Adapter
|
||||
7050 F5D7050 802.11g Wireless USB Adapter
|
||||
705c F5D7050 v4
|
||||
05a9 OmniVision
|
||||
8519 OV519 series
|
||||
05e3 CyberDoor
|
||||
|
|
@ -78,23 +97,42 @@
|
|||
067b Prolific Technology, Inc.
|
||||
2303 PL-2303 USB-to-Serial Converter
|
||||
3507 PL-3507 Hi-Speed USB & IEEE 1394 Combo to IDE Bridge Controller
|
||||
069d Hughes Network Systems (HNS)
|
||||
0721 Sapphire, Inc.
|
||||
07ca AVerMedia Technologies Inc.
|
||||
b808 AVerTV DVB-T Volar (USB 2.0)
|
||||
07e2 ELMEG Communication Systems GmbH
|
||||
0842 NPG, Personal Grand Technology
|
||||
08ff AuthenTec
|
||||
afe4 [Anchor] AF-S2 FingerLoc Sensor Module
|
||||
# Wrong ID used in subsystem ID of VIA USB controllers.
|
||||
0925 VIA Technologies, Inc. (Wrong ID)
|
||||
093a PixArt Imaging Inc.
|
||||
010e Innovage Mini Digital Camera
|
||||
010f SDC-300 Webcam
|
||||
2468 CIF Single Chip
|
||||
2603 Philips Webcam SPC500NC
|
||||
2608 Maxell MaxCam RotaWeb
|
||||
09c1 Arris
|
||||
0704 CM 200E Cable Modem
|
||||
0a89 BREA Technologies Inc
|
||||
0ace ZyDAS
|
||||
1211 ZD1211 IEEE 802.11b+g USB Adapter
|
||||
0b0b Rhino Equiment Corp.
|
||||
0105 Rhino R1T1
|
||||
0205 Rhino R4FXO
|
||||
0206 RCB4FXO 4-channel FXO analog telphony card
|
||||
0305 Rhino R4T1
|
||||
0405 Rhino R8FXX
|
||||
0406 RCB8FXX 8-channel modular analog telphony card
|
||||
0505 Rhino R24FXX
|
||||
0506 Rhino R2T1
|
||||
0506 RCB24FXS 24-Channel FXS analog telphony card
|
||||
0605 Rhino R2T1
|
||||
0705 Rhino R24FXS
|
||||
0706 RCB24FXO 24-Channel FXO analog telphony card
|
||||
0905 R1T3 Single T3 Digital Telephony Card
|
||||
0906 RCB24FXX 24-channel modular analog telphony card
|
||||
0a06 RCB672FXX 672-channel modular analog telphony card
|
||||
0b49 ASCII Corporation
|
||||
064f Trance Vibrator
|
||||
0ccd TerraTec Electronic GmbH
|
||||
|
|
@ -288,16 +326,33 @@
|
|||
0041 53C1035ZC PCI-X Fusion-MPT Dual Ultra320 SCSI
|
||||
0050 SAS1064 PCI-X Fusion-MPT SAS
|
||||
0054 SAS1068 PCI-X Fusion-MPT SAS
|
||||
0055 SAS1068 PCI-X Fusion-MPT SAS
|
||||
1033 8336 SAS1068
|
||||
0056 SAS1064E PCI-Express Fusion-MPT SAS
|
||||
0058 SAS1068E PCI-Express Fusion-MPT SAS
|
||||
005a SAS1066E PCI-Express Fusion-MPT SAS
|
||||
005c SAS1064A PCI-X Fusion-MPT SAS
|
||||
005e SAS1066 PCI-X Fusion-MPT SAS
|
||||
0060 MegaRAID SAS 1078
|
||||
1000 1006 MegaRAID SAS 8888ELP
|
||||
1000 100a MegaRAID SAS 8708ELP
|
||||
1000 100e MegaRAID SAS 8884E
|
||||
1000 100f MegaRAID SAS 8708E
|
||||
1000 1010 MegaRAID SATA 350-8ELP
|
||||
1000 1011 MegaRAID SATA 350-4ELP
|
||||
1000 1012 MegaRAID SAS 8704ELP
|
||||
1014 0363 MegaRAID SAS PCI Express ROMB
|
||||
1014 0364 SystemX MegaRAID SAS 8808E
|
||||
1014 0365 SystemX MegaRAID SAS 8884E
|
||||
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 PERC 6/i Enhanced RAID Controller
|
||||
1028 1f0d CERC 6/i Adapter RAID Controller
|
||||
1028 1f11 CERC 6/i Adapter RAID Controller
|
||||
1043 824d MegaRAID SAS PCI Express ROMB
|
||||
1170 002f MegaRAID SAS PCI Express ROMB
|
||||
8086 34cc Integrated RAID Controller SROMBSAS28E
|
||||
8086 34cd Integrated RAID Controller SROMBSAS28E
|
||||
0062 SAS1078 PCI-Express Fusion-MPT SAS
|
||||
1000 0062 SAS1078 PCI-Express Fusion-MPT SAS
|
||||
008f 53c875J
|
||||
|
|
@ -317,6 +372,9 @@
|
|||
1025 004d MegaRAID ACER ROMB-2E RAID Controller
|
||||
1028 0001 PowerEdge RAID Controller PERC4e/SC
|
||||
1028 0002 PowerEdge RAID Controller PERC4e/DC
|
||||
1028 0012 PowerEdge RAID Controller RAC4
|
||||
1028 0015 PowerEdge RAID Controller PERC5
|
||||
1028 1f03 PowerEdge RAID Controller PERC5
|
||||
1734 1065 FSC MegaRAID PCI Express ROMB
|
||||
8086 0002 MegaRAID Intel RAID Controller SRCU42E
|
||||
0409 MegaRAID
|
||||
|
|
@ -330,6 +388,7 @@
|
|||
1000 1002 MegaRAID SAS 8480E
|
||||
1000 1003 MegaRAID SAS 8344ELP
|
||||
1000 1004 MegaRAID SAS 8308ELP
|
||||
1000 1008 MegaRAID SAS 84016E
|
||||
1000 100c MegaRAID SATA 300-12E
|
||||
1000 100d MegaRAID SATA 300-16E
|
||||
1000 2004 MegaRAID SATA 300-8ELP
|
||||
|
|
@ -338,8 +397,8 @@
|
|||
1054 3016 MegaRAID SAS RoMB Server
|
||||
1734 1081 MegaRAID SAS PCI Express ROMB
|
||||
1734 10a3 MegaRAID SAS PCI Express ROMB
|
||||
8086 1001 SRCSAS18E RAID Controller
|
||||
8086 1003 SRCSAS144E RAID Controller
|
||||
8086 1001 RAID Controller SRCSAS18E
|
||||
8086 1003 RAID Controller SRCSAS144E
|
||||
8086 3500 SROMBSAS18E RAID Controller
|
||||
8086 3501 SROMBSAS18E RAID Controller
|
||||
8086 3504 SROMBSAS18E RAID Controller
|
||||
|
|
@ -509,7 +568,11 @@
|
|||
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
|
||||
14f1 8800 Leadtek WinFast TV2000XP Expert
|
||||
437b SB450 HDA Audio
|
||||
1734 10b8 Realtek High Definition Audio
|
||||
4380 SB600 Non-Raid-5 SATA
|
||||
4381 SB600 Raid-5 SATA
|
||||
4382 SB600 AC97 Audio
|
||||
|
|
@ -584,6 +647,7 @@
|
|||
1734 007a Primergy RX300
|
||||
8086 3411 SDS2 Mainboard
|
||||
8086 3427 S875WP1-E mainboard
|
||||
8086 5744 S845WD1-E mainboard
|
||||
4753 Rage XC
|
||||
1002 4753 Rage XC
|
||||
4754 3D Rage I/II 215GT [Mach64 GT]
|
||||
|
|
@ -711,10 +775,12 @@
|
|||
1025 005a TravelMate 290
|
||||
103c 088c NC8000 laptop
|
||||
103c 0890 NC6000 laptop
|
||||
144d c00c P35 notebook
|
||||
1462 0311 MSI M510A
|
||||
1734 1055 Amilo M1420W
|
||||
4e51 M10 NQ [Radeon Mobility 9600]
|
||||
4e52 RV350 [Mobility Radeon 9600 M10]
|
||||
144d c00c P35 notebook
|
||||
4e53 M10 NS [Radeon Mobility 9600]
|
||||
4e54 M10 NT [FireGL Mobility T2]
|
||||
4e56 M11 NV [FireGL Mobility T2e]
|
||||
|
|
@ -900,7 +966,7 @@
|
|||
554d R430 [Radeon X800 XL] (PCIe)
|
||||
554f R430 [Radeon X800 (PCIE)]
|
||||
5550 R423 [Fire GL V7100]
|
||||
5551 R423 UQ [FireGL V7200 (PCIE)]
|
||||
5551 R423 [FireGL V5100 (PCIE)]
|
||||
5552 R423 UR [FireGL V5100 (PCIE)]
|
||||
5554 R423 UT [FireGL V7100 (PCIE)]
|
||||
5569 R423 UI [Radeon X800PRO (PCIE)] Secondary
|
||||
|
|
@ -936,6 +1002,7 @@
|
|||
1025 0080 Aspire 5024WLMMi
|
||||
103c 308b MX6125
|
||||
5951 ATI 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)
|
||||
|
|
@ -954,6 +1021,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
|
||||
1043 c006 ASUS Radeon 9200 SE / TD / 128M
|
||||
1458 4018 Radeon 9200 SE
|
||||
1458 4032 Radeon 9200 SE 128MB
|
||||
|
|
@ -966,11 +1034,12 @@
|
|||
18bc 0173 GC-R9200L(SE)-C3H [Radeon 9200 Game Buster]
|
||||
5969 ES1000
|
||||
5974 RS482 [Radeon Xpress 200]
|
||||
5975 RS482 [Radeon Xpress 200M]
|
||||
5975 RS485 [Radeon Xpress 1100 IGP]
|
||||
5a33 Radeon Xpress 200 Host Bridge
|
||||
5a34 RS480 PCI-X Root Port
|
||||
# Comes in pair with 5a3f
|
||||
5a36 RS480 PCI Bridge
|
||||
5a37 RS480 PCI Bridge
|
||||
5a38 RS480 PCI Bridge
|
||||
# Comes in pair with 5a38
|
||||
5a39 RS480 PCI Bridge
|
||||
|
|
@ -998,6 +1067,7 @@
|
|||
5c61 M9+ 5C61 [Radeon Mobility 9200 (AGP)]
|
||||
5c63 M9+ 5C63 [Radeon Mobility 9200 (AGP)]
|
||||
1002 5c63 Apple iBook G4 2004
|
||||
144d c00c P30 notebook
|
||||
5d44 RV280 [Radeon 9200 SE] (Secondary)
|
||||
1458 4019 Radeon 9200 SE (Secondary)
|
||||
1458 4032 Radeon 9200 SE 128MB
|
||||
|
|
@ -1052,11 +1122,13 @@
|
|||
1002 0323 All-in-Wonder X1800XL (Secondary)
|
||||
1002 0d03 Radeon X1800 CrossFire Edition (Secondary)
|
||||
7140 RV515 [Radeon X1600]
|
||||
7142 RV515 [Radeon X1300]
|
||||
7142 RV515 PRO [ATI 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]
|
||||
|
|
@ -1064,28 +1136,47 @@
|
|||
714d RV515 [Radeon X1300]
|
||||
714e RV515 [Radeon X1300]
|
||||
7152 RV515 GL ATI FireGL V3300 Primary
|
||||
7153 RV515GL [FireGL V3350]
|
||||
715e RV515 [Radeon X1300]
|
||||
7162 RV515 [Radeon X1300] (Secondary)
|
||||
715f RV505 CE [Radeon X1550 64-bit]
|
||||
7162 RV515 PRO [ATI 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
|
||||
7180 RV516 Radeon X1300 Series Primary
|
||||
7173 RV515GL [FireGL V3350 Secondary]
|
||||
7180 RV516 [ATI Radeon X1300/X1550 Series]
|
||||
7181 RV516 XT Radeon X1600 Series Primary
|
||||
71a0 RV516 Radeon X1300 Series Secondary
|
||||
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]
|
||||
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
|
||||
71c0 RV530 [Radeon X1600]
|
||||
71c2 RV530 [Radeon X1600]
|
||||
71c4 M56GL [ATI Mobility FireGL V5200]
|
||||
17aa 2007 ThinkPad T60p
|
||||
71c5 M56P [Radeon Mobility X1600]
|
||||
71c6 RV530LE [Radeon X1600]
|
||||
71c7 RV535 [Radeon X1650 Series]
|
||||
71ce RV530LE [Radeon X1600]
|
||||
71d5 M66-P ATI Mobility Radeon X1700
|
||||
71d6 M66-XT ATI Mobility Radeon X1700
|
||||
71de RV530LE [Radeon X1600]
|
||||
71e0 RV530 [Radeon X1600] (Secondary)
|
||||
71e2 RV530 [Radeon X1600] (Secondary)
|
||||
71e7 RV535 [Radeon X1650 Series]
|
||||
7210 M71 [ATI Mobility Radeon X2100]
|
||||
7211 M71 [ATI Mobility Radeon X2100 Secondary]
|
||||
7240 R580 [Radeon X1900]
|
||||
7241 R580 [Radeon X1900]
|
||||
7242 R580 [Radeon X1900]
|
||||
|
|
@ -1098,15 +1189,29 @@
|
|||
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
|
||||
724c R580 [Radeon X1900]
|
||||
724d R580 [Radeon X1900]
|
||||
724e R580 [FireGL V7300/V7350] Primary (PCIE)
|
||||
724e R580 [AMD Stream Processor]
|
||||
7269 R580 [Radeon X1900 XT] Secondary
|
||||
726e R580 [FireGL V7300/V7350] Secondary (PCIE)
|
||||
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)
|
||||
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
|
||||
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
|
||||
7c37 RV350 AQ [Radeon 9600 SE]
|
||||
cab0 AGP Bridge [IGP 320M]
|
||||
cab2 RS200/RS200M AGP Bridge [IGP 340M]
|
||||
|
|
@ -1556,6 +1661,8 @@
|
|||
2003 Am 1771 MBW [Alchemy]
|
||||
2020 53c974 [PCscsi]
|
||||
2040 79c974
|
||||
# CS5536 [Geode companion] Host Bridge
|
||||
2080 Conrad Kostecki
|
||||
2081 Geode LX Video
|
||||
2082 Geode LX AES Security Block
|
||||
208f CS5536 GeodeLink PCI South Bridge
|
||||
|
|
@ -1742,13 +1849,21 @@
|
|||
1028 0001 PowerEdge 2400
|
||||
0002 PowerEdge Expandable RAID Controller 3/Di
|
||||
1028 0002 PowerEdge 4400
|
||||
1028 00d1 PERC 3/DiV [Viper]
|
||||
1028 00d9 PERC 3/DiL [Lexus]
|
||||
0003 PowerEdge Expandable RAID Controller 3/Si
|
||||
1028 0003 PowerEdge 2450
|
||||
# PowerEdge Codename Iguana
|
||||
0004 PowerEdge Expandable RAID Controller 3/Di [Iguana]
|
||||
1028 0004 PERC 3/DiF [Iguana]
|
||||
0006 PowerEdge Expandable RAID Controller 3/Di
|
||||
0007 Remote Access Card III
|
||||
0008 Remote Access Card III
|
||||
0009 Remote Access Card III: BMC/SMIC device not present
|
||||
000a PowerEdge Expandable RAID Controller 3/Di
|
||||
1028 0106 PERC 3/DiJ [Jaguar]
|
||||
1028 011b PERC 3/DiD [Dagger]
|
||||
1028 0121 PERC 3/DiB [Boxster]
|
||||
000c Embedded Remote Access or ERA/O
|
||||
000d Embedded Remote Access: BMC/SMIC device
|
||||
000e PowerEdge Expandable RAID controller 4/Di
|
||||
|
|
@ -1764,6 +1879,9 @@
|
|||
1028 0170 PowerEdge Expandable RAID Controller 4e/Di
|
||||
0014 Remote Access Card 4 Daughter Card SMIC interface
|
||||
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
|
||||
1029 Siemens Nixdorf IS
|
||||
102a LSI Logic
|
||||
0000 HYDRA
|
||||
|
|
@ -1964,6 +2082,7 @@
|
|||
102f 00f8 ATM Meteor 155
|
||||
0030 TC35815CF PCI 10/100 Mbit Ethernet Controller
|
||||
0031 TC35815CF PCI 10/100 Mbit Ethernet Controller with WOL
|
||||
0032 TC35815CF PCI 10/100 Mbit Ethernet Controller on TX4939
|
||||
0105 TC86C001 [goku-s] IDE
|
||||
0106 TC86C001 [goku-s] USB 1.1 Host
|
||||
0107 TC86C001 [goku-s] USB Device Controller
|
||||
|
|
@ -2107,6 +2226,7 @@
|
|||
1019 0a14 K7S5A motherboard
|
||||
1039 0900 SiS900 10/100 Ethernet Adapter
|
||||
1043 8035 CUSI-FX motherboard
|
||||
1462 0900 MS-6701 motherboard
|
||||
0961 SiS961 [MuTIOL Media IO]
|
||||
0962 SiS962 [MuTIOL Media IO]
|
||||
0963 SiS963 [MuTIOL Media IO]
|
||||
|
|
@ -2129,6 +2249,7 @@
|
|||
1019 0970 P6STP-FL motherboard
|
||||
1039 5513 SiS5513 EIDE Controller (A,B step)
|
||||
1043 8035 CUSI-FX motherboard
|
||||
1462 7010 MS-6701 motherboard
|
||||
5517 5517
|
||||
5571 5571
|
||||
5581 5581 Pentium Chipset
|
||||
|
|
@ -2161,10 +2282,14 @@
|
|||
1019 0a14 K7S5A motherboard
|
||||
1039 7000 Onboard USB Controller
|
||||
1462 5470 K7SOM+ 5.2C Motherboard
|
||||
1462 7010 MS-6701 motherboard
|
||||
7002 USB 2.0 Controller
|
||||
1462 7010 MS-6701 motherboard
|
||||
1509 7002 Onboard USB Controller
|
||||
7007 FireWire Controller
|
||||
1462 701d MS-6701
|
||||
7012 AC'97 Sound Controller
|
||||
1462 7010 MS-6701 motherboard
|
||||
15bd 1001 DFI 661FX motherboard
|
||||
# There are may be different modem codecs here (Intel537 compatible and incompatible)
|
||||
7013 AC'97 Modem Controller
|
||||
|
|
@ -2252,10 +2377,13 @@
|
|||
12ee PCI-X 2.0 Local Bus Adapter
|
||||
12f8 Broadcom BCM4306 802.11b/g Wireless LAN
|
||||
12fa BCM4306 802.11b/g Wireless LAN Controller
|
||||
1302 RMP-3 Shared Memory Driver
|
||||
1303 RMP-3 (Remote Management Processor)
|
||||
2910 E2910A PCIBus Exerciser
|
||||
2925 E2925A 32 Bit, 33 MHzPCI Exerciser & Analyzer
|
||||
3080 Pavilion ze2028ea
|
||||
3085 Realtek RTL8139/8139C/8139C+
|
||||
30b5 Compaq Presario V3000Z
|
||||
3220 Smart Array P600
|
||||
103c 3225 3 Gb/s SAS RAID
|
||||
3230 Smart Array Controller
|
||||
|
|
@ -2292,8 +2420,10 @@
|
|||
80c5 nForce3 chipset motherboard [SK8N]
|
||||
80df v9520 Magic/T
|
||||
815a A8N-SLI Motherboard nForce4 SATA
|
||||
8168 Realtek PCI-E Gigabit Ethernet Controller (RTL8111B)
|
||||
8187 802.11a/b/g Wireless LAN Card
|
||||
8188 Tiger Hybrid TV Capture Device
|
||||
81f4 EN7300TC512/TD/128M/A(C262G) [Graphics Card EN7300TC512]
|
||||
1044 Adaptec (formerly DPT)
|
||||
1012 Domino RAID Engine
|
||||
a400 SmartCache/Raid I-IV Controller
|
||||
|
|
@ -2444,6 +2574,7 @@
|
|||
8023 TSB43AB22/A IEEE-1394a-2000 Controller (PHY/Link)
|
||||
103c 088c NC8000 laptop
|
||||
1043 808b K8N4-E Mainboard
|
||||
1043 815b P5W DH Deluxe Motherboard
|
||||
8024 TSB43AB23 IEEE-1394a-2000 Controller (PHY/Link)
|
||||
8025 TSB82AA2 IEEE-1394b Link Layer Controller
|
||||
1458 1000 GA-K8N Ultra-9 Mainboard
|
||||
|
|
@ -2483,14 +2614,17 @@
|
|||
8038 PCI6515 SmartCard Controller
|
||||
8039 PCIxx12 Cardbus Controller
|
||||
103c 309f nx9420
|
||||
103c 30a1 NC2400
|
||||
803a PCIxx12 OHCI Compliant IEEE 1394 Host Controller
|
||||
103c 309f nx9420
|
||||
103c 30a1 NC2400
|
||||
803b 5-in-1 Multimedia Card Reader (SD/MMC/MS/MS PRO/xD)
|
||||
103c 309f nx9420
|
||||
803c PCIxx12 SDA Standard Compliant SD Host Controller
|
||||
103c 309f nx9420
|
||||
803d PCIxx12 GemCore based SmartCard controller
|
||||
103c 309f nx9420
|
||||
103c 30a1 NC2400
|
||||
8201 PCI1620 Firmware Loading Function
|
||||
8204 PCI7410,7510,7610 PCI Firmware Loading Function
|
||||
1028 0139 Latitude D400
|
||||
|
|
@ -2548,6 +2682,7 @@
|
|||
ac42 PCI4451 PC card Cardbus Controller
|
||||
1028 00e6 PCI4451 PC card CardBus Controller (Inspiron 8100)
|
||||
ac44 PCI4510 PC card Cardbus Controller
|
||||
1028 0149 Inspiron 5100
|
||||
1028 0163 Latitude D505
|
||||
1028 0196 Inspiron 5160
|
||||
1071 8160 MIM2000
|
||||
|
|
@ -2560,7 +2695,7 @@
|
|||
1028 0139 Latitude D400
|
||||
1028 014e Latitude D800
|
||||
ac50 PCI1410 PC card Cardbus Controller
|
||||
ac51 PCI1420
|
||||
ac51 PCI1420 PC card Cardbus Controller
|
||||
0e11 004e Evo N600c
|
||||
1014 0148 ThinkPad A20m
|
||||
1014 023b ThinkPad T23 (2647-4MG)
|
||||
|
|
@ -2588,6 +2723,7 @@
|
|||
ac8d PCI 7620
|
||||
ac8e PCI7420 CardBus Controller
|
||||
ac8f PCI7420/7620 Combo CardBus, 1394a-2000 OHCI and SD/MS-Pro Controller
|
||||
1028 018d Inspiron 700m
|
||||
fe00 FireWire Host Controller
|
||||
fe03 12C01A FireWire Host Controller
|
||||
104d Sony Corporation
|
||||
|
|
@ -2673,6 +2809,7 @@
|
|||
ecc0 0072 Mona rev.2
|
||||
18c0 MPC8265A/8266/8272
|
||||
18c1 MPC8271/MPC8272
|
||||
3052 SM56 Data Fax Modem
|
||||
3055 SM56 Data Fax Modem
|
||||
3410 DSP56361 Digital Signal Processor
|
||||
ecc0 0050 Gina24 rev.0
|
||||
|
|
@ -2721,6 +2858,7 @@
|
|||
1059 Teknor Industrial Computers Inc
|
||||
105a Promise Technology, Inc.
|
||||
0d30 PDC20265 (FastTrak100 Lite/Ultra100)
|
||||
1043 8042 ASUS AV7266-E South Bridge Promise RAID
|
||||
105a 4d33 Ultra100
|
||||
0d38 20263
|
||||
105a 4d39 Fasttrak66
|
||||
|
|
@ -2749,6 +2887,7 @@
|
|||
4d30 PDC20267 (FastTrak100/Ultra100)
|
||||
105a 4d33 Ultra100
|
||||
105a 4d39 FastTrak100
|
||||
8086 5744 S845WD1-E mainboard
|
||||
4d33 20246
|
||||
105a 4d33 20246 IDE Controller
|
||||
4d38 PDC20262 (FastTrak66/Ultra66)
|
||||
|
|
@ -2777,7 +2916,12 @@
|
|||
7275 PDC20277 (SBFastTrak133 Lite)
|
||||
8002 SATAII150 SX8
|
||||
8350 80333 [SuperTrak EX8350/EX16350], 80331 [SuperTrak EX8300/EX16300]
|
||||
8650 IOP1348 [SuperTrak EX4650/EX8650/EX8654]
|
||||
105a 4600 SuperTrak EX4650
|
||||
105a 8601 SuperTrak EX8650
|
||||
105a 8602 SuperTrak EX8654
|
||||
c350 80333 [SuperTrak EX12350]
|
||||
e350 80333 [SuperTrak EX24350]
|
||||
105b Foxconn International, Inc.
|
||||
105c Wipro Infotech Limited
|
||||
105d Number 9 Computer Company
|
||||
|
|
@ -2990,6 +3134,7 @@
|
|||
0012 YMF-754 [DS-1E Audio Controller]
|
||||
1073 0012 DS-XG PCI Audio Codec
|
||||
0020 DS-1 Audio
|
||||
1000 SW1000XG [XG Factory]
|
||||
2000 DS2416 Digital Mixing Card
|
||||
1073 2000 DS2416 Digital Mixing Card
|
||||
1074 NexGen Microsystems
|
||||
|
|
@ -3021,7 +3166,7 @@
|
|||
103c 12dd 4Gb Fibre Channel [AB429A]
|
||||
2432 ISP2432-based 4Gb Fibre Channel to PCI Express HBA
|
||||
3022 ISP4022-based Ethernet NIC
|
||||
3032 ISP4032-based Ethernet NIC
|
||||
3032 ISP4032-based Ethernet IPv6 NIC
|
||||
4010 ISP4010-based iSCSI TOE HBA
|
||||
4022 ISP4022-based iSCSI TOE HBA
|
||||
4032 ISP4032-based iSCSI TOE IPv6 HBA
|
||||
|
|
@ -3329,6 +3474,7 @@
|
|||
13e9 0070 Win/TV (Audio Section)
|
||||
144f 3000 MagicTView CPH060 - Audio
|
||||
1461 0002 Avermedia PCTV98 Audio Capture
|
||||
1461 0003 UltraTV PCI 350
|
||||
1461 0004 AVerTV WDM Audio Capture
|
||||
1461 0761 AVerTV DVB-T
|
||||
1461 0771 AverMedia AVerTV DVB-T 771
|
||||
|
|
@ -3417,6 +3563,8 @@
|
|||
4002 TIO-CE PCI Express Port
|
||||
8001 O2 1394
|
||||
8002 G-net NT
|
||||
8010 Broadcom e-net [SGI IO9/IO10 BaseIO]
|
||||
8018 Broadcom e-net [SGI A330 Server BaseIO]
|
||||
10aa ACC Microelectronics
|
||||
0000 ACCM 2188
|
||||
10ab Digicom
|
||||
|
|
@ -3468,6 +3616,7 @@
|
|||
10b5 2978 SH ARC-PCIu SOHARD ARCNET card
|
||||
10b5 3025 Alpermann+Velte PCL PCI L (3V/5V): Timecode Reader Board
|
||||
10b5 3068 Alpermann+Velte PCL PCI HD (3V/5V): Timecode Reader Board
|
||||
12fe 0111 CPCI-ASIO4 (ESD 4-port Serial Interface Board)
|
||||
1397 3136 4xS0-ISDN PCI Adapter
|
||||
1397 3137 S2M-E1-ISDN PCI Adapter
|
||||
1518 0200 Kontron ThinkIO-C
|
||||
|
|
@ -3522,6 +3671,7 @@
|
|||
10b5 2844 Innes Corp TVS Encoder card
|
||||
12c7 4001 Intel Dialogic DM/V960-4T1 PCI
|
||||
12d9 0002 PCI Prosody Card rev 1.5
|
||||
14b4 d100 Dektec DTA-100
|
||||
16df 0011 PIKA PrimeNet MM PCI
|
||||
16df 0012 PIKA PrimeNet MM cPCI 8
|
||||
16df 0013 PIKA PrimeNet MM cPCI 8 (without CAS Signaling)
|
||||
|
|
@ -6060,6 +6210,7 @@
|
|||
0140 HT2100 PCI-Express Bridge
|
||||
0141 HT2100 PCI-Express Bridge
|
||||
0142 HT2100 PCI-Express Bridge
|
||||
0144 HT2100 PCI-Express Bridge
|
||||
0200 OSB4 South Bridge
|
||||
0201 CSB5 South Bridge
|
||||
4c53 1080 CT8 mainboard
|
||||
|
|
@ -10413,9 +10564,9 @@
|
|||
0962 80960RM [i960RM Bridge]
|
||||
0964 80960RP [i960 RP Microprocessor/Bridge]
|
||||
1000 82542 Gigabit Ethernet Controller
|
||||
0e11 b0df NC1632 Gigabit Ethernet Adapter (1000-SX)
|
||||
0e11 b0e0 NC1633 Gigabit Ethernet Adapter (1000-LX)
|
||||
0e11 b123 NC1634 Gigabit Ethernet Adapter (1000-SX)
|
||||
0e11 b0df NC6132 Gigabit Ethernet Adapter (1000-SX)
|
||||
0e11 b0e0 NC6133 Gigabit Ethernet Adapter (1000-LX)
|
||||
0e11 b123 NC6134 Gigabit Ethernet Adapter (1000-LX)
|
||||
1014 0119 Netfinity Gigabit Ethernet SX Adapter
|
||||
8086 1000 PRO/1000 Gigabit Server Adapter
|
||||
1001 82543GC Gigabit Ethernet Controller (Fiber)
|
||||
|
|
@ -10834,6 +10985,8 @@
|
|||
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 000a EtherExpress PRO/100+ Management Adapter
|
||||
8086 000b EtherExpress PRO/100+
|
||||
8086 000c EtherExpress PRO/100+ Management Adapter
|
||||
|
|
@ -10909,6 +11062,7 @@
|
|||
8086 3010 EtherExpress PRO/100 S Network Connection
|
||||
8086 3011 EtherExpress PRO/100 S Network Connection
|
||||
8086 3012 EtherExpress PRO/100 Network Connection
|
||||
8086 301a S845WD1-E mainboard
|
||||
8086 3411 SDS2 Mainboard
|
||||
122d 430FX - 82437FX TSC [Triton I]
|
||||
122e 82371FB PIIX ISA [Triton I]
|
||||
|
|
@ -10996,6 +11150,7 @@
|
|||
2426 82801AB AC'97 Modem
|
||||
2428 82801AB PCI Bridge
|
||||
2440 82801BA ISA Bridge (LPC)
|
||||
8086 5744 S845WD1-E
|
||||
2442 82801BA/BAM USB (Hub #1)
|
||||
1014 01c6 Netvista A40/A40p
|
||||
1025 1016 Travelmate 612 TX
|
||||
|
|
@ -11006,6 +11161,7 @@
|
|||
147b 0507 TH7II-RAID
|
||||
8086 4532 D815EEA2 mainboard
|
||||
8086 4557 D815EGEW Mainboard
|
||||
8086 5744 S845WD1-E mainboard
|
||||
2443 82801BA/BAM SMBus
|
||||
1014 01c6 Netvista A40/A40p
|
||||
1025 1016 Travelmate 612 TX
|
||||
|
|
@ -11016,6 +11172,7 @@
|
|||
147b 0507 TH7II-RAID
|
||||
8086 4532 D815EEA2 mainboard
|
||||
8086 4557 D815EGEW Mainboard
|
||||
8086 5744 S845WD1-E mainboard
|
||||
2444 82801BA/BAM USB (Hub #2)
|
||||
1025 1016 Travelmate 612 TX
|
||||
1028 00c7 Dimension 8100
|
||||
|
|
@ -11024,6 +11181,7 @@
|
|||
104d 80df Vaio PCG-FX403
|
||||
147b 0507 TH7II-RAID
|
||||
8086 4532 D815EEA2 mainboard
|
||||
8086 5744 S845WD1-E mainboard
|
||||
2445 82801BA/BAM AC'97 Audio
|
||||
0e11 000b Compaq Deskpro EN Audio
|
||||
0e11 0088 Evo D500
|
||||
|
|
@ -11082,6 +11240,7 @@
|
|||
147b 0507 TH7II-RAID
|
||||
8086 4532 D815EEA2 mainboard
|
||||
8086 4557 D815EGEW Mainboard
|
||||
8086 5744 S845WD1-E mainboard
|
||||
244c 82801BAM ISA Bridge (LPC)
|
||||
244e 82801 PCI Bridge
|
||||
1014 0267 NetVista A30p
|
||||
|
|
@ -11174,6 +11333,7 @@
|
|||
103c 0890 NC6000 laptop
|
||||
103c 08b0 tc1100 tablet
|
||||
1071 8160 MIM2000
|
||||
144d c00c P30/P35 notebook
|
||||
1458 24c2 GA-8PE667 Ultra
|
||||
1462 5800 845PE Max (MS-6580)
|
||||
1734 1004 D1451 Mainboard (SCENIC N300, i845GV)
|
||||
|
|
@ -11742,17 +11902,21 @@
|
|||
103c 099c NX6110/NC6120
|
||||
1043 1881 GMA 900 915GM Integrated Graphics
|
||||
27a0 Mobile 945GM/PM/GMS/940GML and 945GT Express Memory Controller Hub
|
||||
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
|
||||
103c 30a1 NC2400
|
||||
17aa 201a Thinkpad R60e model 0657
|
||||
27a6 Mobile 945GM/GMS/940GML Express Integrated Graphics Controller
|
||||
103c 30a1 NC2400
|
||||
17aa 201a Thinkpad R60e model 0657
|
||||
27b0 82801GH (ICH7DH) LPC Interface Bridge
|
||||
27b8 82801GB/GR (ICH7 Family) LPC Interface Bridge
|
||||
107b 5048 E4500
|
||||
8086 544e DeskTop Board D945GTP
|
||||
27b9 82801GBM (ICH7-M) LPC Interface Bridge
|
||||
103c 30a1 NC2400
|
||||
10f7 8338 Panasonic CF-Y5 laptop
|
||||
17aa 2009 ThinkPad T60/R60 series
|
||||
27bd 82801GHM (ICH7-M DH) LPC Interface Bridge
|
||||
|
|
@ -11766,22 +11930,27 @@
|
|||
17aa 200d Thinkpad R60e model 0657
|
||||
27c6 82801GHM (ICH7-M DH) Serial ATA Storage Controller RAID
|
||||
27c8 82801G (ICH7 Family) USB UHCI #1
|
||||
103c 30a1 NC2400
|
||||
107b 5048 E4500
|
||||
17aa 200a ThinkPad T60/R60 series
|
||||
8086 544e DeskTop Board D945GTP
|
||||
27c9 82801G (ICH7 Family) USB UHCI #2
|
||||
103c 30a1 NC2400
|
||||
107b 5048 E4500
|
||||
17aa 200a ThinkPad T60/R60 series
|
||||
8086 544e DeskTop Board D945GTP
|
||||
27ca 82801G (ICH7 Family) USB UHCI #3
|
||||
103c 30a1 NC2400
|
||||
107b 5048 E4500
|
||||
17aa 200a ThinkPad T60/R60 series
|
||||
8086 544e DeskTop Board D945GTP
|
||||
27cb 82801G (ICH7 Family) USB UHCI #4
|
||||
103c 30a1 NC2400
|
||||
107b 5048 E4500
|
||||
17aa 200a ThinkPad T60/R60 series
|
||||
8086 544e DeskTop Board D945GTP
|
||||
27cc 82801G (ICH7 Family) USB2 EHCI Controller
|
||||
103c 30a1 NC2400
|
||||
17aa 200b ThinkPad T60/R60 series
|
||||
8086 544e DeskTop Board D945GTP
|
||||
27d0 82801G (ICH7 Family) PCI Express Port 1
|
||||
|
|
@ -11789,10 +11958,12 @@
|
|||
27d4 82801G (ICH7 Family) PCI Express Port 3
|
||||
27d6 82801G (ICH7 Family) PCI Express Port 4
|
||||
27d8 82801G (ICH7 Family) High Definition Audio Controller
|
||||
103c 30a1 NC2400
|
||||
107b 5048 E4500
|
||||
10f7 8338 Panasonic CF-Y5 laptop
|
||||
1179 ff31 Toshiba America Information Systems:AC97 Data Fax SoftModem with SmartCP
|
||||
152d 0753 Softmodem
|
||||
1734 10ad Conexant softmodem SmartCP
|
||||
17aa 2010 ThinkPad T60/R60 series
|
||||
27da 82801G (ICH7 Family) SMBus Controller
|
||||
10f7 8338 Panasonic CF-Y5 laptop
|
||||
|
|
@ -11803,6 +11974,7 @@
|
|||
27dd 82801G (ICH7 Family) AC'97 Modem Controller
|
||||
27de 82801G (ICH7 Family) AC'97 Audio Controller
|
||||
27df 82801G (ICH7 Family) IDE Controller
|
||||
103c 30a1 NC2400
|
||||
107b 5048 E4500
|
||||
10f7 8338 Panasonic CF-Y5 laptop
|
||||
17aa 200c Thinkpad R60e model 0657
|
||||
|
|
@ -11846,6 +12018,34 @@
|
|||
284b 82801H (ICH8 Family) HD Audio Controller
|
||||
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
|
||||
2928 Mobile 2 port SATA IDE 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
|
||||
2970 82946GZ/PL/GL Memory Controller Hub
|
||||
2971 82946GZ/PL/GL PCI Express Root Port
|
||||
2972 82946GZ/GL Integrated Graphics Controller
|
||||
|
|
@ -11873,6 +12073,37 @@
|
|||
29a5 82P965/G965 HECI Controller
|
||||
29a6 82P965/G965 PT IDER Controller
|
||||
29a7 82P965/G965 KT Controller
|
||||
29b0 DRAM Controller
|
||||
29b1 PCI Express Root Port
|
||||
29b2 Integrated Graphics Controller
|
||||
29b3 Integrated Graphics Controller
|
||||
29b4 HECI Controller
|
||||
29b5 HECI 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
|
||||
29cf Virtual HECI Controller
|
||||
29e0 DRAM Controller
|
||||
29e1 Host-Primary PCI Express Bridge
|
||||
29e4 HECI Controller
|
||||
29e5 HECI 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
|
||||
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
|
||||
|
|
@ -11978,7 +12209,42 @@
|
|||
35b6 3100 Chipset PCI Express Port A
|
||||
35b7 3100 Chipset PCI Express Port A1
|
||||
35c8 3100 Extended Configuration Test Overflow Registers
|
||||
3600 Server Memory Controller Hub
|
||||
3604 Server PCI Express Port 1
|
||||
3605 Server PCI Express Port 2
|
||||
3606 Server PCI Express Port 3
|
||||
3607 Server PCI Express Port 4
|
||||
3608 Server PCI Express Port 5
|
||||
3609 Server PCI Express Port 6
|
||||
360a Server PCI Express Port 7
|
||||
360b Server IOAT DMA Controller
|
||||
360c Server FSB Registers
|
||||
360d Server Snoop Filter Registers
|
||||
360e Server Reserved Registers
|
||||
360f Server FBD Branch 0 Registers
|
||||
3610 Server FBD Branch 1 Registers
|
||||
4000 Memory Controller Hub
|
||||
4008 Memory Controller Hub
|
||||
4010 Memory Controller Hub
|
||||
4021 PCI Express Port 1
|
||||
4022 PCI Express Port 2
|
||||
4023 PCI Express Port 3
|
||||
4024 PCI Express Port 4
|
||||
4025 PCI Express Port 5
|
||||
4026 PCI Express Port 6
|
||||
4027 PCI Express Port 7
|
||||
4028 PCI Express Port 8
|
||||
4029 PCI Express Port 9
|
||||
402d IBIST Registers
|
||||
402e IBIST Registers
|
||||
402f DMA/DCA Engine
|
||||
4030 FSB Registers
|
||||
4032 I/OxAPIC
|
||||
4035 FBD Registers
|
||||
4036 FBD Registers
|
||||
4220 PRO/Wireless 2200BG Network Connection
|
||||
2731 8086 WLAN-Adapter
|
||||
8086 2731 Samsung P35 integrated WLAN
|
||||
4222 PRO/Wireless 3945ABG Network Connection
|
||||
8086 1005 PRO/Wireless 3945BG Network Connection
|
||||
8086 1034 PRO/Wireless 3945BG Network Connection
|
||||
|
|
@ -11994,6 +12260,23 @@
|
|||
5201 EtherExpress PRO/100 Intelligent Server
|
||||
8086 0001 EtherExpress PRO/100 Server Ethernet Adapter
|
||||
530d 80310 IOP [IO Processor]
|
||||
65c0 Memory Controller Hub
|
||||
65e2 PCI Express x4 Port 2
|
||||
65e3 PCI Express x4 Port 3
|
||||
65e4 PCI Express x4 Port 4
|
||||
65e5 PCI Express x4 Port 5
|
||||
65e6 PCI Express x4 Port 6
|
||||
65e7 PCI Express x4 Port 7
|
||||
65f0 FSB Registers
|
||||
65f1 Reserved Registers
|
||||
65f3 Reserved Registers
|
||||
65f5 DDR Channel 0 Registers
|
||||
65f6 DDR Channel 1 Registers
|
||||
65f7 PCI Express x8 Port 2-3
|
||||
65f8 PCI Express x8 Port 4-5
|
||||
65f9 PCI Express x8 Port 6-7
|
||||
65fa PCI Express x16 Port 4-7
|
||||
65ff DMA Engine
|
||||
7000 82371SB PIIX3 ISA [Natoma/Triton II]
|
||||
7010 82371SB PIIX3 IDE [Natoma/Triton II]
|
||||
7020 82371SB PIIX3 USB [Natoma/Triton II]
|
||||
|
|
@ -12092,6 +12375,7 @@
|
|||
9622 Integrated RAID
|
||||
9641 Integrated RAID
|
||||
96a1 Integrated RAID
|
||||
a620 6400/6402 Advanced Memory Buffer (AMB)
|
||||
b152 21152 PCI-to-PCI Bridge
|
||||
# observed, and documented in Intel revision note; new mask of 1011:0026
|
||||
b154 21154 PCI-to-PCI Bridge
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -2129,7 +2129,7 @@ static void x86emuOp2_bsf(u8 X86EMU_UNUSED(op2))
|
|||
uint srcoffset;
|
||||
|
||||
START_OF_INSTR();
|
||||
DECODE_PRINTF("BSF\n");
|
||||
DECODE_PRINTF("BSF\t");
|
||||
FETCH_DECODE_MODRM(mod, rh, rl);
|
||||
switch(mod) {
|
||||
case 0:
|
||||
|
|
@ -2209,25 +2209,25 @@ static void x86emuOp2_bsf(u8 X86EMU_UNUSED(op2))
|
|||
break;
|
||||
case 3: /* register to register */
|
||||
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
|
||||
u32 *srcreg, *dstreg;
|
||||
u32 srcval, *dstreg;
|
||||
|
||||
srcreg = DECODE_RM_LONG_REGISTER(rl);
|
||||
srcval = *DECODE_RM_LONG_REGISTER(rl);
|
||||
DECODE_PRINTF(",");
|
||||
dstreg = DECODE_RM_LONG_REGISTER(rh);
|
||||
TRACE_AND_STEP();
|
||||
CONDITIONAL_SET_FLAG(*srcreg == 0, F_ZF);
|
||||
CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
|
||||
for(*dstreg = 0; *dstreg < 32; (*dstreg)++)
|
||||
if ((*srcreg >> *dstreg) & 1) break;
|
||||
if ((srcval >> *dstreg) & 1) break;
|
||||
} else {
|
||||
u16 *srcreg, *dstreg;
|
||||
u16 srcval, *dstreg;
|
||||
|
||||
srcreg = DECODE_RM_WORD_REGISTER(rl);
|
||||
srcval = *DECODE_RM_WORD_REGISTER(rl);
|
||||
DECODE_PRINTF(",");
|
||||
dstreg = DECODE_RM_WORD_REGISTER(rh);
|
||||
TRACE_AND_STEP();
|
||||
CONDITIONAL_SET_FLAG(*srcreg == 0, F_ZF);
|
||||
CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
|
||||
for(*dstreg = 0; *dstreg < 16; (*dstreg)++)
|
||||
if ((*srcreg >> *dstreg) & 1) break;
|
||||
if ((srcval >> *dstreg) & 1) break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -2245,7 +2245,7 @@ static void x86emuOp2_bsr(u8 X86EMU_UNUSED(op2))
|
|||
uint srcoffset;
|
||||
|
||||
START_OF_INSTR();
|
||||
DECODE_PRINTF("BSF\n");
|
||||
DECODE_PRINTF("BSR\t");
|
||||
FETCH_DECODE_MODRM(mod, rh, rl);
|
||||
switch(mod) {
|
||||
case 0:
|
||||
|
|
@ -2325,25 +2325,25 @@ static void x86emuOp2_bsr(u8 X86EMU_UNUSED(op2))
|
|||
break;
|
||||
case 3: /* register to register */
|
||||
if (M.x86.mode & SYSMODE_PREFIX_DATA) {
|
||||
u32 *srcreg, *dstreg;
|
||||
u32 srcval, *dstreg;
|
||||
|
||||
srcreg = DECODE_RM_LONG_REGISTER(rl);
|
||||
srcval = *DECODE_RM_LONG_REGISTER(rl);
|
||||
DECODE_PRINTF(",");
|
||||
dstreg = DECODE_RM_LONG_REGISTER(rh);
|
||||
TRACE_AND_STEP();
|
||||
CONDITIONAL_SET_FLAG(*srcreg == 0, F_ZF);
|
||||
CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
|
||||
for(*dstreg = 31; *dstreg > 0; (*dstreg)--)
|
||||
if ((*srcreg >> *dstreg) & 1) break;
|
||||
if ((srcval >> *dstreg) & 1) break;
|
||||
} else {
|
||||
u16 *srcreg, *dstreg;
|
||||
u16 srcval, *dstreg;
|
||||
|
||||
srcreg = DECODE_RM_WORD_REGISTER(rl);
|
||||
srcval = *DECODE_RM_WORD_REGISTER(rl);
|
||||
DECODE_PRINTF(",");
|
||||
dstreg = DECODE_RM_WORD_REGISTER(rh);
|
||||
TRACE_AND_STEP();
|
||||
CONDITIONAL_SET_FLAG(*srcreg == 0, F_ZF);
|
||||
CONDITIONAL_SET_FLAG(srcval == 0, F_ZF);
|
||||
for(*dstreg = 15; *dstreg > 0; (*dstreg)--)
|
||||
if ((*srcreg >> *dstreg) & 1) break;
|
||||
if ((srcval >> *dstreg) & 1) break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -410,16 +410,8 @@
|
|||
/* Endian order */
|
||||
#undef X_BYTE_ORDER
|
||||
|
||||
/* BSD-compliant source */
|
||||
#undef _BSD_SOURCE
|
||||
|
||||
/* POSIX-compliant source */
|
||||
#undef _POSIX_SOURCE
|
||||
|
||||
#ifndef _XOPEN_SOURCE
|
||||
/* X/Open-compliant source */
|
||||
#undef _XOPEN_SOURCE
|
||||
#endif
|
||||
/* Enable GNU and other extensions to the C environment for GLIBC */
|
||||
#undef _GNU_SOURCE
|
||||
|
||||
/* Define to empty if `const' does not conform to ANSI C. */
|
||||
#undef const
|
||||
|
|
|
|||
18
os/utils.c
18
os/utils.c
|
|
@ -53,23 +53,6 @@ OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
/* The world's most shocking hack, to ensure we get clock_gettime() and
|
||||
* CLOCK_MONOTONIC. */
|
||||
#ifdef sun /* Needed to tell Solaris headers not to restrict to */
|
||||
#define __EXTENSIONS__ /* only the functions defined in POSIX 199309. */
|
||||
#endif
|
||||
|
||||
#ifdef _POSIX_C_SOURCE
|
||||
#define _SAVED_POSIX_C_SOURCE _POSIX_C_SOURCE
|
||||
#undef _POSIX_C_SOURCE
|
||||
#endif
|
||||
#define _POSIX_C_SOURCE 199309L
|
||||
#include <time.h>
|
||||
#undef _POSIX_C_SOURCE
|
||||
#ifdef _SAVED_POSIX_C_SOURCE
|
||||
#define _POSIX_C_SOURCE _SAVED_POSIX_C_SOURCE
|
||||
#endif
|
||||
|
||||
#ifdef __CYGWIN__
|
||||
#include <stdlib.h>
|
||||
#include <signal.h>
|
||||
|
|
@ -80,6 +63,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
|
|||
#endif
|
||||
#include <X11/Xos.h>
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
||||
#include "misc.h"
|
||||
#include <X11/X.h>
|
||||
#define XSERV_t
|
||||
|
|
|
|||
|
|
@ -47,6 +47,12 @@
|
|||
#include <X11/Xfuncproto.h>
|
||||
#include "cursorstr.h"
|
||||
|
||||
#if HAVE_STDINT_H
|
||||
#include <stdint.h>
|
||||
#elif !defined(UINT32_MAX)
|
||||
#define UINT32_MAX 0xffffffffU
|
||||
#endif
|
||||
|
||||
static int ProcRenderQueryVersion (ClientPtr pClient);
|
||||
static int ProcRenderQueryPictFormats (ClientPtr pClient);
|
||||
static int ProcRenderQueryPictIndexValues (ClientPtr pClient);
|
||||
|
|
@ -1103,11 +1109,14 @@ ProcRenderAddGlyphs (ClientPtr client)
|
|||
}
|
||||
|
||||
nglyphs = stuff->nglyphs;
|
||||
if (nglyphs > UINT32_MAX / sizeof(GlyphNewRec))
|
||||
return BadAlloc;
|
||||
|
||||
if (nglyphs <= NLOCALGLYPH)
|
||||
glyphsBase = glyphsLocal;
|
||||
else
|
||||
{
|
||||
glyphsBase = (GlyphNewPtr) ALLOCATE_LOCAL (nglyphs * sizeof (GlyphNewRec));
|
||||
glyphsBase = (GlyphNewPtr) Xalloc (nglyphs * sizeof (GlyphNewRec));
|
||||
if (!glyphsBase)
|
||||
return BadAlloc;
|
||||
}
|
||||
|
|
@ -1164,7 +1173,7 @@ ProcRenderAddGlyphs (ClientPtr client)
|
|||
}
|
||||
|
||||
if (glyphsBase != glyphsLocal)
|
||||
DEALLOCATE_LOCAL (glyphsBase);
|
||||
Xfree (glyphsBase);
|
||||
return client->noClientException;
|
||||
bail:
|
||||
while (glyphs != glyphsBase)
|
||||
|
|
@ -1173,7 +1182,7 @@ bail:
|
|||
xfree (glyphs->glyph);
|
||||
}
|
||||
if (glyphsBase != glyphsLocal)
|
||||
DEALLOCATE_LOCAL (glyphsBase);
|
||||
Xfree (glyphsBase);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue