XFree86 4.3.99.902 (RC 2)

Xext/security.c

@@ -24,12 +24,13 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.16 2003/11/17 22:20:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.17 2003/12/04 16:59:35 tsi Exp $ */
 
 #include "dixstruct.h"
 #include "extnsionst.h"
 #include "windowstr.h"
 #include "inputstr.h"
+#include "scrnintstr.h"
 #include "gcstruct.h"
 #include "colormapst.h"
 #include "propertyst.h"

Xext/shm.c

@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.40 2003/11/17 22:20:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.42 2003/12/18 10:15:24 alanh Exp $ */
 /************************************************************
 
 Copyright 1989, 1998  The Open Group

Xprint/attributes.c

@@ -44,7 +44,7 @@ copyright holders.
 **    *********************************************************
 ** 
 ********************************************************************/
-/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.20 2003/10/29 22:11:54 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.21 2003/12/19 02:05:38 dawes Exp $ */
 
 #include <X11/Xproto.h>
 #include <string.h>
@@ -52,7 +52,7 @@ copyright holders.
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <pwd.h>
-#if defined(sun) && defined(SVR4)
+#if (defined(sun) && defined(SVR4)) || (defined(SCO))
 #include <wchar.h>
 #endif
 

dix/globals.c

@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.12 2003/11/10 18:21:46 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/globals.c,v 1.13 2003/12/03 17:11:29 tsi Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -147,5 +147,3 @@ int	argcGlobal;
 char	**argvGlobal;
 
 DDXPointRec dixScreenOrigins[MAXSCREENS];
-
-volatile ScreenPtr currentRegionScreen;

fb/fbcompose.c

@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17 2003/11/03 05:11:00 tsi Exp $
+ * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.18 2003/12/04 17:15:12 tsi Exp $
  *
  * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
  *
@@ -2424,6 +2424,8 @@ fbStore_external (FbCompositeOperand *op, CARD32 value)
     (*op[2].store) (&op[2], value & 0xff000000);
 }
 
+#define dummyScreen screenInfo.screens[0]
+
 CARD32
 fbFetch_transform (FbCompositeOperand *op)
 {
@@ -2445,7 +2447,7 @@ fbFetch_transform (FbCompositeOperand *op)
     case PictFilterNearest:
 	y = xFixedToInt (v.vector[1]) + op->u.transform.top_y;
 	x = xFixedToInt (v.vector[0]) + op->u.transform.left_x;
-	if (POINT_IN_REGION (0, op->clip, x, y, &box))
+	if (POINT_IN_REGION (dummyScreen, op->clip, x, y, &box))
 	{
 	    (*op[1].set) (&op[1], x, y);
 	    bits = (*op[1].fetch) (&op[1]);
@@ -2469,7 +2471,7 @@ fbFetch_transform (FbCompositeOperand *op)
 	    xerr = xFixed1 - xFixedFrac (v.vector[0]);
 	    for (x = minx; x <= maxx; x++)
 	    {
-		if (POINT_IN_REGION (0, op->clip, x, y, &box))
+		if (POINT_IN_REGION (dummyScreen, op->clip, x, y, &box))
 		{
 		    (*op[1].set) (&op[1], x, y);
 		    bits = (*op[1].fetch) (&op[1]);
@@ -2527,7 +2529,7 @@ fbFetcha_transform (FbCompositeOperand *op)
     case PictFilterNearest:
 	y = xFixedToInt (v.vector[1]) + op->u.transform.left_x;
 	x = xFixedToInt (v.vector[0]) + op->u.transform.top_y;
-	if (POINT_IN_REGION (0, op->clip, x, y, &box))
+	if (POINT_IN_REGION (dummyScreen, op->clip, x, y, &box))
 	{
 	    (*op[1].set) (&op[1], x, y);
 	    bits = (*op[1].fetcha) (&op[1]);
@@ -2551,7 +2553,7 @@ fbFetcha_transform (FbCompositeOperand *op)
 	    xerr = xFixed1 - xFixedFrac (v.vector[0]);
 	    for (x = minx; x <= maxx; x++)
 	    {
-		if (POINT_IN_REGION (0, op->clip, x, y, &box))
+		if (POINT_IN_REGION (dummyScreen, op->clip, x, y, &box))
 		{
 		    (*op[1].set) (&op[1], x, y);
 		    bits = (*op[1].fetcha) (&op[1]);

fb/fbgc.c

@@ -21,7 +21,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.12 2001/05/29 04:54:09 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.15 2003/12/18 15:25:41 alanh Exp $ */
 
 #include "fb.h"
 #ifdef IN_MODULE
@@ -253,17 +253,19 @@ fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
     }
     if (changes & GCStipple)
     {
-	if (pGC->stipple &&
+	pPriv->evenStipple = FALSE;
-	    (FbEvenStip (pGC->stipple->drawable.width,
+
-			 pDrawable->bitsPerPixel) ||
+	if (pGC->stipple) {
-	     fbCanEvenStipple (pGC->stipple, pDrawable->bitsPerPixel)))
+
-	{
+	    /* can we do an even stipple ?? */
+	    if (FbEvenStip (pGC->stipple->drawable.width,
+						pDrawable->bitsPerPixel) &&
+	       (fbCanEvenStipple (pGC->stipple, pDrawable->bitsPerPixel)))
 	   	pPriv->evenStipple = TRUE;
+
 	    if (pGC->stipple->drawable.width * pDrawable->bitsPerPixel < FB_UNIT)
 		fbPadPixmap (pGC->stipple);
 	}
-	else
-	    pPriv->evenStipple = FALSE;
     }
     /*
      * Recompute reduced rop values

fb/fbglyph.c

@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.12 2001/09/07 15:16:00 keithp Exp $
+ * $XFree86: xc/programs/Xserver/fb/fbglyph.c,v 1.13 2003/12/04 17:15:12 tsi Exp $
  *
  * Copyright © 1998 Keith Packard
  *
@@ -26,6 +26,8 @@
 #include	"fontstruct.h"
 #include	"dixfontstr.h"
 
+#define dummyScreen screenInfo.screens[0]
+      
 Bool
 fbGlyphIn (RegionPtr	pRegion,
 	   int		x,
@@ -34,7 +36,7 @@ fbGlyphIn (RegionPtr	pRegion,
 	   int		height)
 {
     BoxRec  box;
-    BoxPtr  pExtents = REGION_EXTENTS (0, pRegion);
+    BoxPtr  pExtents = REGION_EXTENTS (dummyScreen, pRegion);
 
     /*
      * Check extents by hand to avoid 16 bit overflows
@@ -51,7 +53,7 @@ fbGlyphIn (RegionPtr	pRegion,
     box.x2 = x + width;
     box.y1 = y;
     box.y2 = y + height;
-    return RECT_IN_REGION (0, pRegion, &box) == rgnIN;
+    return RECT_IN_REGION (dummyScreen, pRegion, &box) == rgnIN;
 }
 
 #ifdef FB_24BIT

hw/darwin/bundle/Dutch.lproj/Credits.rtf

@@ -1,11 +1,41 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5160\viewh4480\viewkind0
+\vieww9000\viewh9000\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\

hw/darwin/bundle/Dutch.lproj/MainMenu.nib/classes.nib

@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }

hw/darwin/bundle/English.lproj/Credits.rtf

@@ -2,7 +2,7 @@
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww9000\viewh9000\viewkind0
+\vieww5160\viewh6300\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
 \f0\b\fs24 \cf0 Contributors to XFree86 4.4:

hw/darwin/bundle/French.lproj/Credits.rtf

@@ -1,11 +1,40 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
 \vieww5160\viewh4480\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 Participants \'88 XonX pour XFree86 4.2 :
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+
+\f0\b \cf0 \
+Participants \'88 XonX pour XFree86 4.2 :
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\

hw/darwin/bundle/French.lproj/MainMenu.nib/classes.nib

@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }

hw/darwin/bundle/German.lproj/Credits.rtf

@@ -1,11 +1,41 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5160\viewh4480\viewkind0
+\vieww5160\viewh6300\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\

hw/darwin/bundle/German.lproj/MainMenu.nib/classes.nib

@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }

hw/darwin/bundle/Japanese.lproj/Credits.rtf

@@ -1,11 +1,43 @@
-{\rtf1\mac\ansicpg10001\cocoartf100
+{\rtf1\mac\ansicpg10001\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 \f3\fnil\fcharset78 HiraKakuPro-W3;}
 {\colortbl;\red255\green255\blue255;}
 \vieww13980\viewh11160\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper
+\f2\i \
+
+\f3\i0    \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'41\'83\'4e\'83\'5a\'83\'89\'83\'8c\'81\'5b\'83\'56\'83\'87\'83\'93 \'82\'a8\'82\'e6\'82\'d1 Apple-WM \'8a\'67\'92\'a3
+\f1 \
+Torrey T. Lyons\
+     
+\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b\
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f3 \'83\'7c\'83\'8b\'83\'67\'83\'4b\'83\'8b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
+\f1 \
+Michael Oland\
+     
+\f3 \'90\'56\'82\'b5\'82\'a2
+\f1 XDarwin 
+\f3 \'83\'41\'83\'43\'83\'52\'83\'93
+\f1 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\

hw/darwin/bundle/Japanese.lproj/MainMenu.nib/classes.nib

@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }

hw/darwin/bundle/Portuguese.lproj/Credits.rtf

@@ -1,20 +1,40 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5340\viewh4520\viewkind0
+\vieww5140\viewh4980\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 Contribuidores do XonX ao XFree86 4.2.99.x:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Contribuidores do XonX ao XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200
 \cf0 Fabr\'92cio Luis de Castro
 \f0\b \
-     
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0      
 \f2\i\b0 Localiza\'8d\'8bo para o Portugu\'90s\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 
-\f0\i0\b \cf0 \
+\f1\i0 \cf0 Michael Oland\
+     
+\f2\i New XDarwin icon
+\f0\i0\b \
+\
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 \cf0 Contribuidores do XonX ao XFree86 4.2:
 \f1\b0 \

hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/classes.nib

@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }

hw/darwin/bundle/Spanish.lproj/Credits.rtf

@@ -1,11 +1,41 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5160\viewh4480\viewkind0
+\vieww5160\viewh6300\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\

hw/darwin/bundle/Spanish.lproj/MainMenu.nib/classes.nib

@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }

hw/darwin/bundle/Swedish.lproj/Credits.rtf

@@ -1,11 +1,41 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5160\viewh4480\viewkind0
+\vieww5160\viewh6300\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\

hw/darwin/bundle/Swedish.lproj/MainMenu.nib/classes.nib

@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }

hw/darwin/bundle/ko.lproj/Credits.rtf

@@ -1,11 +1,41 @@
-{\rtf1\mac\ansicpg10000\cocoartf100
+{\rtf1\mac\ansicpg10000\cocoartf102
 {\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Oblique;
 }
 {\colortbl;\red255\green255\blue255;}
-\vieww5160\viewh4480\viewkind0
+\vieww5160\viewh6300\viewkind0
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
 
-\f0\b\fs24 \cf0 XonX Contributors to XFree86 4.2:
+\f0\b\fs24 \cf0 Contributors to XFree86 4.4:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 John Harper\
+     
+\f2\i Rootless acceleration and Apple-WM extension
+\f1\i0 \
+Torrey T. Lyons\
+     
+\f2\i Project Lead
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 Additional XonX Contributors to XFree86 4.3:
+\f1\b0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+\cf0 Fabr\'92cio Luis de Castro\
+     
+\f2\i Portuguese localization
+\f1\i0 \
+Michael Oland\
+     
+\f2\i New XDarwin icon
+\f1\i0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
+
+\f0\b \cf0 \
+\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
+\cf0 XonX Contributors to XFree86 4.2:
 \f1\b0 \
 \pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
 \cf0 Rob Braun\

hw/darwin/bundle/ko.lproj/MainMenu.nib/classes.nib

@@ -41,14 +41,20 @@
         }, 
         {
             ACTIONS = {
+                bringAllToFront = id; 
                 closeHelpAndShow = id; 
+                itemSelected = id; 
+                nextWindow = id; 
+                previousWindow = id; 
                 showAction = id; 
+                showSwitchPanel = id; 
                 startFullScreen = id; 
                 startRootless = id; 
             }; 
             CLASS = XServer; 
             LANGUAGE = ObjC; 
             OUTLETS = {
+                dockMenu = NSMenu; 
                 helpWindow = NSWindow; 
                 modeWindow = NSWindow; 
                 startFullScreenButton = NSButton; 
@@ -56,6 +62,8 @@
                 startupHelpButton = NSButton; 
                 startupModeButton = NSButton; 
                 switchWindow = NSPanel; 
+                windowMenu = NSMenu; 
+                windowSeparator = NSMenuItem; 
             }; 
             SUPERCLASS = NSObject; 
         }

hw/darwin/iokit/xfIOKit.c

@@ -33,7 +33,7 @@
  * 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: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2003/10/16 23:50:09 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.3 2003/12/09 04:42:36 torrey Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
@@ -516,8 +516,7 @@ static Bool SetupFBandHID(
     dfb->bitsPerComponent = pixelInfo.bitsPerComponent;
 
     // allocate shadow framebuffer
-    iokitScreen->shadowPtr = shadowAlloc(dfb->width, dfb->height,
+    iokitScreen->shadowPtr = xalloc(dfb->pitch * dfb->height);
-                                         dfb->bitsPerPixel);
     dfb->framebuffer = iokitScreen->shadowPtr;
 
     // Note: Darwin kIORGBDirectPixels = X TrueColor, not DirectColor

hw/darwin/quartz/XDarwin.pbproj/project.pbxproj

@@ -334,7 +334,7 @@
 	<key>CFBundleExecutable</key>
 	<string>XDarwin</string>
 	<key>CFBundleGetInfoString</key>
-	<string>XDarwin 1.3b4, ©2001-2003 XFree86 Project, Inc.</string>
+	<string>XDarwin 1.3.0, ©2001-2003 XFree86 Project, Inc.</string>
 	<key>CFBundleIconFile</key>
 	<string>XDarwin.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -346,7 +346,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>XDarwin 1.3b4</string>
+	<string>XDarwin 1.3.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

hw/darwin/quartz/cr/crFrame.m

@@ -27,7 +27,7 @@
  * 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: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.7 2003/11/27 01:53:39 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.8 2003/12/05 07:00:10 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "cr.h"
@@ -206,7 +206,7 @@ CRReshapeFrame(RootlessFrameID wid, RegionPtr pShape)
 
     if (pShape != NULL) {
         // Calculate the region outside the new shape.
-        REGION_INVERSE(NULL, pShape, pShape, &localBox);
+        miInverse(pShape, pShape, &localBox);
     }
 
     // If window is currently shaped we need to undo the previous shape.

hw/darwin/quartz/fullscreen/fullscreen.c

@@ -25,7 +25,7 @@
  * 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: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.3 2003/11/27 01:59:53 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.4 2003/12/09 04:41:27 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include "darwin.h"
@@ -461,8 +461,6 @@ static void FSShadowUpdate(
     int pitch = dfb->pitch;
     int bpp = dfb->bitsPerPixel/8;
 
-ErrorF("FSShadowUpdate: %i\n", quartzServerVisible);
-
     // Don't update if the X server is not visible
     if (!quartzServerVisible)
         return;
@@ -502,7 +500,6 @@ static Bool FSSetupScreen(
     FSScreenPtr fsDisplayInfo = FULLSCREEN_PRIV(pScreen);
     CGDirectDisplayID cgID = fsDisplayInfo->displayID;
 
-ErrorF("FSSetupScreen\n");
     // Initialize shadow framebuffer support
     if (! shadowInit(pScreen, FSShadowUpdate, NULL)) {
         ErrorF("Failed to initalize shadow framebuffer for screen %i.\n",

hw/xfree86/common/compiler.h

@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.104 2003/11/03 05:11:01 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.105 2003/12/18 21:56:37 dawes Exp $ */
 /*
  * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
  *
@@ -1613,7 +1613,17 @@ extern void outl(unsigned port, unsigned val);
 /* entry points for Mmio memory access routines */
 extern int (*xf86ReadMmio8)(void *, unsigned long);
 extern int (*xf86ReadMmio16)(void *, unsigned long);
+#  ifndef STANDALONE_MMIO
 extern int (*xf86ReadMmio32)(void *, unsigned long);
+#  else
+/* Some DRI 3D drivers need MMIO_IN32. */
+static __inline__ int
+xf86ReadMmio32(void *Base, unsigned long Offset)
+{
+	__asm__ __volatile__("mb"  : : : "memory");
+	return *(volatile CARD32*)((unsigned long)Base+(Offset));
+}
+#  endif
 extern void (*xf86WriteMmio8)(int, void *, unsigned long);
 extern void (*xf86WriteMmio16)(int, void *, unsigned long);
 extern void (*xf86WriteMmio32)(int, void *, unsigned long);
@@ -1629,7 +1639,11 @@ extern void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int);
 /* Changed to kill noise generated by gcc's -Wcast-align */
 #  define MMIO_IN8(base, offset) (*xf86ReadMmio8)(base, offset)
 #  define MMIO_IN16(base, offset) (*xf86ReadMmio16)(base, offset)
+#  ifndef STANDALONE_MMIO
 #   define MMIO_IN32(base, offset) (*xf86ReadMmio32)(base, offset)
+#  else
+#   define MMIO_IN32(base, offset) xf86ReadMmio32(base, offset)
+#  endif
 
 #  if defined (JENSEN_SUPPORT)
 #   define MMIO_OUT32(base, offset, val) \

hw/xfree86/common/xf86Date.h

@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.53 2003/12/03 05:02:25 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.54 2003/12/19 04:52:10 dawes Exp $ */
 /*
  * Copyright (c) 2003 by The XFree86 Project, Inc.
  *
@@ -28,6 +28,6 @@
 
 #ifndef XF86_DATE
 
-#define XF86_DATE	" 2 December 2003"
+#define XF86_DATE	"18 December 2003"
 
 #endif

hw/xfree86/common/xf86Version.h

@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.565 2003/12/03 05:06:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.566 2003/12/19 04:52:11 dawes Exp $ */
 
 /*
  * Copyright (c) 1994-2003 by The XFree86 Project, Inc.
@@ -32,7 +32,7 @@
 #define XF86_VERSION_MAJOR	4
 #define XF86_VERSION_MINOR	3
 #define XF86_VERSION_PATCH	99
-#define XF86_VERSION_SNAP	901
+#define XF86_VERSION_SNAP	902
 
 /* This has five arguments for compatibilty reasons */
 #define XF86_VERSION_NUMERIC(major,minor,patch,snap,dummy) \

hw/xfree86/doc/changelogs/CHANGELOG

@@ -1,4 +1,69 @@
-XFree86 4.3.99.902 (xx December 2003)
+XFree86 4.3.99.903 (xx December 2003)
+
+XFree86 4.3.99.902 (18 December 2003)
+ 672. Fixes for xterm (Thomas Dickey):
+      - Add a limit-check in selection to fix a bug in triple-clicking
+        (Bugzilla #981)
+      - add -v/-version/-h/-help options to uxterm (Debian #223926)
+ 671. Updates for SCO support (Bugzilla #994, Kean Johnston).
+ 670. Don't build the Aiptek driver unless HasLinuxInput is set
+      (Bugzilla #972, Andrew Aitchison).
+ 669. A new fixed version of the zh_CN.UTF-8 locale file (Bugzilla #991,
+      James Su).
+ 668. Fix locale.dir/locale.alias bugs that break the zh_CN.GB2312 locale
+      (Bugzilla #990, James Su).
+ 667. Fixes and updates for XKB keyboard maps:
+      - Add to 'us' keymap backslash key that can be rewritten in other layouts
+        (Bugzilla #976, Børre Gaup).
+      - Fix some keys in Georgian latin keymap (Bugzilla #985, Vano Beridze).
+      - Add Korean keymap (Jungshik Shin).
+      - Add French variant of 'dvorak' keymap (Josselin Mouette).
+      - Fix wrong key type in the 'keymap without special keys' (Ivan Pascal).
+ 666. Via driver updates:
+       - Fix pixmap caches and Xv. The blitter has a 2048 pixel limit so we
+         must constrain the pixmap cache.
+       - Rip out all the memory allocator garbage and put it in one place.
+       - Allow optional use of AlanH's new linear allocator (not yet heavily
+         tested).
+       - Fix allocation bugs that this clean up made visible.
+       - Add missing I2C symbols.
+       - Some small formatting/other cleanups.
+      (Alan Cox).
+ 665. Fix a problem with distinguishing unassigned characters in the FreeType
+      backend (Bugzilla #975, Roland Mainz, Chisato Yamauchi).
+ 664. Update Japanese localization of XDarwin GUI (Toshimitsu Tanaka).
+ 663. Fix setjmp-related build issues on Solaris 2.5.1/x86 (Lindsay Haigh).
+ 662. Xdm, xf86cfg, mkfontscale and fonttosfnt fixes for platforms without
+      snprintf() (Lindsay Haigh).
+ 661. Update Brazilian keyboard map (Ricardo Y. Igarashi).
+ 660. Fix a bug in the fbgc.c code that caused the even stipple code path to
+      be used instead of the odd stipple path. Basically causing glitches in
+      rendering or no rendering at all. (Alan Hourihane).
+ 659. Fix XDarwin crash in IOKit mode for certain screen resolutions
+      (Torrey T. Lyons).
+ 658. DRI update - update the SiS DRI driver from DRI trunk (Eric Anholt).
+ 657. Fix mouse wheel code again for PowerPC (#5990, Rene Rebe).
+ 656. Fix sparc asm glapi initialisation in libGL when using indirect rendering
+      (GLX) (Bugzilla #923, Ferris McCormick).
+ 655. Disable the OPTGX1SubsequentHorVertLine() function in the NSC Geode
+      GX1 driver to due problems falling back to the FillRectSolid function.
+      (Alan Hourihane, See Bugzilla #841 for reasons).
+ 654. Add sun.unicode.india-0.enc (Bugzilla #939, JungShik Shin, Roland Mainz).
+ 653. Fix an x86emu crash for a BIOS that references the FS (or GS) register
+      (Sergey Babkin).
+ 652. Install the DRM kernel module source under ProjectRoot/src (David Dawes).
+ 651. Update XKB registry file rules/xfree86.xml (Sergey Oudaltsov).
+ 650. Fix '-nolisten tcp' when building with IPv6 disabled (Bugzilla #651,
+      Andrew Bevitt).
+ 649. Add some missing dead-key compose sequences for Vietnamese (#5981,
+      Le Hong Boi).
+ 648. Fix a problem with the v4l driver not seeing all the tv-norms
+      available under the bttv driver with the Linux 2.6.0-test11 kernel
+      (#5976, Marco Antonio Alvarez).
+ 647. Build fix after recent REGION_* changes (Part of #5983, Oswald
+      Buddenhagen, and #5984, Alexander Stohr).
+ 646. Fix for XKB map 'altwin' to avoid one keysym to more than one modifier
+      mapping (Ivan Pascal).
  
 XFree86 4.3.99.901 ( 2 December 2003)
  645. Update xterm's checking of modifiers to match change 635, and handle
@@ -18326,7 +18391,7 @@ XFree86 3.0a (28 April 1994)
 XFree86 3.0 (26 April 1994)
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3014 2003/12/03 05:05:57 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3043 2003/12/19 04:52:08 dawes Exp $
 
 
 

hw/xfree86/loader/dixsym.c

@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.62 2003/11/25 05:26:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.63 2003/12/03 17:11:29 tsi Exp $ */
 
 /*
  * Copyright 1995-1998 by Metro Link, Inc.
@@ -205,7 +205,6 @@ LOOKUP dixLookupTab[] = {
     SYMVAR(DPMSEnabledSwitch)
     SYMVAR(DPMSDisabledSwitch)
     SYMVAR(defaultDPMSEnabled)
-    SYMVAR(currentRegionScreen)
     /* bigreq */
     SYMVAR(maxBigRequestSize)
 #ifdef XV

hw/xfree86/os-support/bus/zx1PCI.c

@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c,v 1.5 2003/11/06 18:38:14 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c,v 1.6 2003/12/11 17:11:39 tsi Exp $ */
 /*
  * Copyright (C) 2002-2003 The XFree86 Project, Inc.  All Rights Reserved.
  *
@@ -445,13 +445,13 @@ xf86PreScanZX1(void)
     resRange range;
     unsigned long mapSize = xf86getpagesize();
     unsigned long tmp, base, ioaaddr;
-    unsigned long flagsd = 0, based = 0, lastd = 0, maskd = 0, routed = 0;
+    unsigned long flagsd, based, lastd, maskd, routed;
-    unsigned long flags0 = 0, base0 = 0, last0 = 0, mask0 = 0, route0 = 0;
+    unsigned long flags0, base0, last0, mask0, route0;
-    unsigned long flags1 = 0, base1 = 0, last1 = 0, mask1 = 0, route1 = 0;
+    unsigned long flags1, base1, last1, mask1, route1;
-    unsigned long flags2 = 0, base2 = 0, last2 = 0, mask2 = 0, route2 = 0;
+    unsigned long flags2, base2, last2, mask2, route2;
-    unsigned long flags3 = 0, base3 = 0, last3 = 0, mask3 = 0, route3 = 0;
+    unsigned long flags3, base3, last3, mask3, route3;
-    unsigned long flagsg = 0, baseg = 0, lastg = 0, maskg = 0, routeg = 0;
+    unsigned long flagsg, baseg, lastg, maskg, routeg;
-    unsigned long flagsl = 0, basel = 0, lastl = 0;
+    unsigned long flagsl, basel, lastl;
     int i, rope;
 
     /* Map mio registers (minimum 8k) */
@@ -461,7 +461,7 @@ xf86PreScanZX1(void)
     if (!(pZX1mio = xf86MapVidMem(-1, VIDMEM_MMIO, MIO_BASE, mapSize)))
 	return FALSE;
 
-    /* Look for ZX1's SBA and IOC */
+    /* Look for ZX1's SBA and IOC */	/* XXX What about Dino? */
     if ((MIO_LONG(MIO_FUNCTION0 + PCI_ID_REG) !=
 	 DEVID(VENDOR_HP, CHIP_ZX1_SBA)) ||
 	(MIO_LONG(MIO_FUNCTION1 + PCI_ID_REG) !=
@@ -589,6 +589,14 @@ xf86PreScanZX1(void)
      * ones.
      */
 
+    flagsd = 0; based = 0; lastd = 0; maskd = 0; routed = 0;
+    flags0 = 0; base0 = 0; last0 = 0; mask0 = 0; route0 = 0;
+    flags1 = 0; base1 = 0; last1 = 0; mask1 = 0; route1 = 0;
+    flags2 = 0; base2 = 0; last2 = 0; mask2 = 0; route2 = 0;
+    flags3 = 0; base3 = 0; last3 = 0; mask3 = 0; route3 = 0;
+    flagsg = 0; baseg = 0; lastg = 0; maskg = 0; routeg = 0;
+    flagsl = 0; basel = 0; lastl = 0;
+
     if ((tmp = MIO_QUAD(IOS_DIST_BASE)) & RANGE_ENABLE) {
 	flagsd = RANGE_ENABLE;
 	maskd = MIO_QUAD(IOS_DIST_MASK);
@@ -909,9 +917,11 @@ xf86PostScanZX1(void)
     ppPCI = ppPCI2 = xf86scanpci(0);	/* Recursion is only apparent */
     while ((pPCI = *ppPCI2++)) {
 	switch (pPCI->pci_device_vendor) {
-	case DEVID(VENDOR_HP, CHIP_ZX1_SBA):
+	case DEVID(VENDOR_HP, CHIP_ELROY):
-	case DEVID(VENDOR_HP, CHIP_ZX1_IOC):
+	case DEVID(VENDOR_HP, CHIP_ZX1_SBA):	/* Pluto function 0 */
-	case DEVID(VENDOR_HP, CHIP_ZX1_LBA):
+	case DEVID(VENDOR_HP, CHIP_ZX1_IOC):	/* Pluto function 1 */
+	case DEVID(VENDOR_HP, CHIP_ZX1_LBA):	/* Mercury */
+	case DEVID(VENDOR_HP, CHIP_ZX1_AGP8):	/* QuickSilver */
 	    xfree(pPCI);		/* Remove it */
 	    continue;
 

hw/xfree86/os-support/xf86_libc.h

@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 3.62 2003/12/02 22:29:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 3.63 2003/12/08 21:46:55 alanh Exp $ */
 /*
  * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
  *
@@ -45,6 +45,7 @@
 #define XF86_LIBC_H 1
 
 #include "Xfuncs.h"
+#include <stddef.h>
 
 /*
  * The first set of definitions are required both for modules and

hw/xfree86/scanpci/extrapci.ids

@@ -14,7 +14,7 @@
 #	changes/additions that aren't XFree86-specific to the pciids
 #	project (http://pciids.sf.net/).
 #
-#	$XFree86: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.10 2003/10/30 15:29:32 tsi Exp $
+#	$XFree86: xc/programs/Xserver/hw/xfree86/etc/extrapci.ids,v 1.12 2003/12/18 16:29:18 dawes Exp $
 #
 
 # Vendors, devices and subsystems. Please keep sorted.
@@ -39,6 +39,23 @@
 	0002	"
 		C  0401
 
-126f	"
+# Some NVIDIA cards that are not in the master pci.ids file yet.
-	0730	SM731 Cougar3DR
+10de	"
+	0314	GeForce FX 5600SE
+	031a	GeForce FX Go5600
+	031b	GeForce FX Go5650
+	031c	Quadro FX Go700
+	0323	GeForce FX 5200SE
+	0324	GeForce FX Go5200
+	0325	GeForce FX Go5250
+	0328	GeForce FX Go5200 32M/64M
+	0329	GeForce FX 5200 (Mac)
+	032a	Quadro NVS 280 PCI
+	032c	GeForce FX Go5300
+	032d	GeForce FX Go5100
+	0332	GeForce FX 5900XT
+	0333	GeForce FX 5950 Ultra
+	0341	GeForce FX 5700 Ultra
+	0342	GeForce FX 5700
+	034e	Quadro FX 1100
 

hw/xfree86/scanpci/pci.ids

@@ -7,7 +7,7 @@
 #	so if you have anything to contribute, please visit the home page or
 #	send a diff -u against the most recent pci.ids to pci-ids@ucw.cz.
 #
-#	Daily snapshot on Wed 2003-05-14 10:00:04
+#	Daily snapshot on Thu 2003-12-18 11:00:05
 #
 
 # Vendors, devices and subsystems. Please keep sorted.
@@ -118,6 +118,8 @@
 		0e11 7004  Embedded Ultra Wide SCSI Controller
 		1092 8760  FirePort 40 Dual SCSI Controller
 		1de1 3904  DC390F Ultra Wide SCSI Controller
+		4c53 1000  CC7/CR7/CP7/VC7/VP7/VR7 mainboard
+		4c53 1050  CT7 mainboard
 	0010  53c895
 		0e11 4040  Integrated Array Controller
 		0e11 4048  Integrated Array Controller
@@ -126,6 +128,9 @@
 	0020  53c1010 Ultra3 SCSI Adapter
 		1de1 1020  DC-390U3W
 	0021  53c1010 66MHz  Ultra3 SCSI Adapter
+		4c53 1080  CT8 mainboard
+		4c53 1300  P017 mezzanine (32-bit PMC)
+		4c53 1310  P017 mezzanine (64-bit PMC)
 	0030  53c1030 PCI-X Fusion-MPT Dual Ultra320 SCSI
 		1028 1010  LSI U320 SCSI Controller
 	0040  53c1035
@@ -162,15 +167,12 @@
 	9100  INI-9100/9100W SCSI Host
 1002  ATI Technologies Inc
 	4136  Radeon IGP 320 M
-# New support forthcoming in XFree86 4.3.0
 	4144  Radeon R300 AD [Radeon 9500 Pro]
-# New support forthcoming in XFree86 4.3.0
 	4145  Radeon R300 AE [Radeon 9500 Pro]
-# New support forthcoming in XFree86 4.3.0
 	4146  Radeon R300 AF [Radeon 9500 Pro]
-# Update:  Oops, AF was a typo above for 4147, should be AG
 	4147  Radeon R300 AG [FireGL Z1/X1]
 	4158  68800AX [Mach32]
+	4164  Radeon R300 Secondary (DVI) output
 	4242  Radeon R200 BB [Radeon All in Wonder 8500DV]
 		1002 02aa  Radeon 8500 AIW DV Edition
 	4336  Radeon Mobility U1
@@ -225,6 +227,7 @@
 		1002 0008  Rage XL
 		1002 4752  Rage XL
 		1002 8008  Rage XL
+		1028 00ce  PowerEdge 1400
 		1028 00d1  PowerEdge 2550
 	4753  Rage XC
 		1002 4753  Rage XC
@@ -268,6 +271,7 @@
 	4c44  3D Rage LT Pro AGP-66
 	4c45  Rage Mobility M3 AGP
 	4c46  Rage Mobility M3 AGP 2x
+		1028 00b1  Latitude C600
 	4c47  3D Rage LT-G 215LG
 	4c49  3D Rage LT Pro
 		1002 0004  Rage LT Pro
@@ -276,8 +280,10 @@
 		1002 4c49  Rage LT Pro
 	4c4d  Rage Mobility P/M AGP 2x
 		0e11 b111  Armada M700
+		0e11 b160  Armada E500
 		1002 0084  Xpert 98 AGP 2X (Mobility)
 		1014 0154  ThinkPad A20m
+		1028 00aa  Latitude CPt
 	4c4e  Rage Mobility L AGP 2x
 	4c50  3D Rage LT Pro
 		1002 4c50  Rage LT Pro
@@ -289,32 +295,29 @@
 		1014 0517  ThinkPad T30
 		1028 00e6  Radeon Mobility M7 LW (Dell Inspiron 8100)
 		144d c006  Radeon Mobility M7 LW in vpr Matrix 170B4
-# Update:  More correct labelling for this FireGL chipset
 	4c58  Radeon RV200 LX [Mobility FireGL 7800 M7]
 	4c59  Radeon Mobility M6 LY
 		1014 0235  ThinkPad A30p (2653-64G)
 		1014 0239  ThinkPad X22/X23/X24
 		104d 80e7  VAIO PCG-GR214EP/GR214MP/GR215MP/GR314MP/GR315MP
 	4c5a  Radeon Mobility M6 LZ
-# Update:  Add M9 to product name
 	4c64  Radeon R250 Ld [Radeon Mobility 9000 M9]
-# Update:  Add M9 to product name
 	4c65  Radeon R250 Le [Radeon Mobility 9000 M9]
-# Update:  Add M9 to product name
 	4c66  Radeon R250 Lf [Radeon Mobility 9000 M9]
-# Update:  Add M9 to product name
 	4c67  Radeon R250 Lg [Radeon Mobility 9000 M9]
+# Secondary chip to the Lf
+	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]
 	4e45  Radeon R300 NE [Radeon 9500 Pro]
 		1002 0002  Radeon R300 NE [Radeon 9500 Pro]
 	4e46  Radeon R300 NF [Radeon 9700]
-# Update:  This is FireGL X1, not Radeon 9700
 	4e47  Radeon R300 NG [FireGL X1]
 	4e48  Radeon R350 [Radeon 9800]
 	4e64  Radeon R300 [Radeon 9700 Pro] (Secondary)
 	4e65  Radeon R300 [Radeon 9500 Pro] (Secondary)
+		1002 0003  Radeon R300 NE [Radeon 9500 Pro]
 	4e66  Radeon R300 [Radeon 9700] (Secondary)
 	4e67  Radeon R300 [FireGL X1] (Secondary)
 	4e68  Radeon R350 [Radeon 9800] (Secondary)
@@ -354,7 +357,6 @@
 	5056  Rage 128 PV/PRO TMDS
 	5057  Rage 128 PW/PRO AGP 2x TMDS
 	5058  Rage 128 PX/PRO AGP 4x TMDS
-# Update: This same chip is used in all 32Mb and 64Mb SDR/DDR orig Radeons, and is now known as 7200
 	5144  Radeon R100 QD [Radeon 7200]
 		1002 0008  Radeon 7000/Radeon VE
 		1002 0009  Radeon 7000/Radeon
@@ -385,11 +387,8 @@
 		1002 013a  Radeon 8500
 		148c 2026  R200 QL [Radeon 8500 Evil Master II Multi Display Edition]
 		174b 7149  Radeon R200 QL [Sapphire Radeon 8500 LE]
-# New: Radeon 9100 is basically a Radeon 8500LE branded as 9100 by Sapphire
 	514d  Radeon R200 QM [Radeon 9100]
-# New: Radeon 8500LE chip
 	514e  Radeon R200 QN [Radeon 8500LE]
-# New: Radeon 8500LE chip
 	514f  Radeon R200 QO [Radeon 8500LE]
 	5157  Radeon RV200 QW [Radeon 7500]
 		1002 013a  Radeon 7500
@@ -401,7 +400,6 @@
 		174b 7161  Radeon RV200 QW [Radeon 7500 LE]
 		17af 0202  RV200 QW [Excalibur Radeon 7500LE]
 	5158  Radeon RV200 QX [Radeon 7500]
-# Update: More correct name
 	5159  Radeon RV100 QY [Radeon 7000/VE]
 		1002 000a  Radeon 7000/Radeon VE
 		1002 000b  Radeon 7000
@@ -414,13 +412,12 @@
 		148c 2023  RV100 QY [Radeon 7000 Evil Master Multi-Display]
 		174b 7112  RV100 QY [Sapphire Radeon VE 7000]
 		1787 0202  RV100 QY [Excalibur Radeon 7000]
-# Update: More correct name
 	515a  Radeon RV100 QZ [Radeon 7000/VE]
 	5168  Radeon R200 Qh
 	5169  Radeon R200 Qi
 	516a  Radeon R200 Qj
 	516b  Radeon R200 Qk
-# new: This one is not in ATI documentation, but is in XFree86 source code
+# This one is not in ATI documentation, but is in XFree86 source code
 	516c  Radeon R200 Ql
 	5245  Rage 128 RE/SG
 		1002 0008  Xpert 128
@@ -472,8 +469,10 @@
 		1002 5654  Mach64VT Reference
 	5655  264VT3 [Mach64 VT3]
 	5656  264VT4 [Mach64 VT4]
+	5961  Radeon RV280 [Radeon 9200]
 	700f  PCI Bridge [IGP 320M]
 	7010  PCI Bridge [IGP 340M]
+	cab0  AGP Bridge [IGP 320M]
 	cab2  RS200/RS200M AGP Bridge [IGP 340M]
 1003  ULSI Systems
 	0201  US201
@@ -528,7 +527,14 @@
 	0011  NS87560 National PCI System I/O
 	0012  USB Controller
 	0020  DP83815 (MacPhyter) Ethernet Controller
+		1385 f311  FA311 / FA312 (FA311 with WoL HW)
 	0022  DP83820 10/100/1000 Ethernet Controller
+	0028  CS5535 Host bridge
+	002b  CS5535 ISA bridge
+	002d  CS5535 IDE
+	002e  CS5535 Audio
+	002f  CS5535 USB
+	0030  CS5535 Video
 	0500  SCx200 Bridge
 	0501  SCx200 SMI
 	0502  SCx200 IDE
@@ -630,7 +636,9 @@
 		0e11 4051  Integrated Smart Array
 		0e11 4058  Integrated Smart Array
 		103c 10c2  Hewlett-Packard NetRAID-4M
-		12d9 000a  VoIP PCI Gateway
+		12d9 000a  IP Telephony card
+		4c53 1050  CT7 mainboard
+		4c53 1051  CE7 mainboard
 		9005 0365  Adaptec 5400S
 		9005 1364  Dell PowerEdge RAID Controller 2
 		9005 1365  Dell PowerEdge RAID Controller 2
@@ -695,14 +703,17 @@
 	001b  GXT-150P
 	001c  Carrera
 	001d  82G2675
-	0020  MCA
+	0020  GXT1000 Graphics Adapter
 	0022  IBM27-82351
 	002d  Python
-	002e  ServeRAID Controller
+# [official name in AIX 5]
+	002e  SCSI RAID Adapter [ServeRAID]
 		1014 002e  ServeRAID-3x
 		1014 022e  ServeRAID-4H
+	0031  2 Port Serial Adapter
 	0036  Miami
 	003a  CPU to PCI Bridge
+	003c  GXT250P/GXT255P Graphics Adapter
 	003e  16/4 Token ring UTP/STP controller
 		1014 003e  Token-Ring Adapter
 		1014 00cd  Token-Ring Adapter + Wake-On-LAN
@@ -720,23 +731,30 @@
 	004f  ATM Controller (14104f00)
 	0050  ATM Controller (14105000)
 	0053  25 MBit ATM Controller
+	0054  GXT500P/GXT550P Graphics Adapter
 	0057  MPEG PCI Bridge
 	005c  i82557B 10/100
+	005e  GXT800P Graphics Adapter
 	007c  ATM Controller (14107c00)
 	007d  3780IDSP [MWave]
+	008e  GXT3000P Graphics Adapter
 	0090  GXT 3000P
 		1014 008e  GXT-3000P
+	0091  SSA Adapter
 	0095  20H2999 PCI Docking Bridge
 	0096  Chukar chipset SCSI controller
 		1014 0097  iSeries 2778 DASD IOA
 		1014 0098  iSeries 2763 DASD IOA
 		1014 0099  iSeries 2748 DASD IOA
+	009f  PCI 4758 Cryptographic Accelerator
 	00a5  ATM Controller (1410a500)
 	00a6  ATM 155MBPS MM Controller (1410a600)
 	00b7  256-bit Graphics Rasterizer [Fire GL1]
+	00b8  GXT2000P Graphics Adapter
 	00be  ATM 622MBPS Controller (1410be00)
 	00dc  Advanced Systems Management Adapter (ASMA)
 	00fc  CPC710 Dual Bridge and Memory Controller (PCI-64)
+	0104  Gigabit Ethernet-SX Adapter
 	0105  CPC710 Dual Bridge and Memory Controller (PCI-32)
 	010f  Remote Supervisor Adapter (RSA)
 	0142  Yotta Video Compositor Input
@@ -744,6 +762,14 @@
 	0144  Yotta Video Compositor Output
 		1014 0145  Yotta Output Controller (ytout)
 	0156  405GP PLB to PCI Bridge
+	015e  622Mbps ATM PCI Adapter
+	0160  64bit/66MHz PCI ATM 155 MMF
+	016e  GXT4000P Graphics Adapter
+	0170  GXT6000P Graphics Adapter
+	017d  GXT300P Graphics Adapter
+	0180  Snipe chipset SCSI controller
+		1014 0241  iSeries 2757 DASD IOA
+		1014 0264  Quad Channel PCI-X U320 SCSI RAID Adapter (2780)
 	01a7  PCI-X to PCI-X Bridge
 	01bd  ServeRAID Controller
 		1014 01be  ServeRAID-4M
@@ -753,6 +779,19 @@
 		1014 022e  ServeRAID-4H
 		1014 0258  ServeRAID-5i
 		1014 0259  ServeRAID-5i
+	01c1  64bit/66MHz PCI ATM 155 UTP
+	01e6  Cryptographic Accelerator
+	01ff  10/100 Mbps Ethernet
+	0219  Multiport Serial Adapter
+		1014 021a  Dual RVX
+		1014 0251  Internal Modem/RVX
+		1014 0252  Quad Internal Modem
+	021b  GXT6500P Graphics Adapter
+	021c  GXT4500P Graphics Adapter
+	0233  GXT135P Graphics Adapter
+	0266  PCI-X Dual Channel SCSI
+	0268  Gigabit Ethernet-SX Adapter (PCI-X)
+	0269  10/100/1000 Base-TX Ethernet Adapter (PCI-X)
 	0302  XA-32 chipset [Summit]
 	ffff  MPIC-2 interrupt controller
 1015  LSI Logic Corp of Canada
@@ -815,9 +854,16 @@
 		1259 2454  AT-2450v4 10Mb Ethernet Adapter
 		1259 2700  AT-2700TX 10/100 Fast Ethernet
 		1259 2701  AT-2700FX 100Mb Ethernet
+		4c53 1000  CC7/CR7/CP7/VC7/VP7/VR7 mainboard
+		4c53 1010  CP5/CR6 mainboard
+		4c53 1020  VR6 mainboard
+		4c53 1030  PC5 mainboard
+		4c53 1040  CL7 mainboard
+		4c53 1060  PC7 mainboard
 	2001  79c978 [HomePNA]
 		1092 0a78  Multimedia Home Network Adapter
 		1668 0299  ActionLink Home Network Adapter
+	2003  Am 1771 MBW [Alchemy]
 	2020  53c974 [PCscsi]
 	2040  79c974
 	3000  ELanSC520 Microcontroller
@@ -862,6 +908,7 @@
 	746b  AMD-8111 ACPI
 	746d  AMD-8111 AC97 Audio
 	746e  AMD-8111 MC97 Modem
+	756b  AMD-8111 ACPI
 1023  Trident Microsystems
 	0194  82C194
 	2000  4DWave DX
@@ -1130,6 +1177,12 @@
 	00b8  F64310
 	00c0  F69000 HiQVideo
 		102c 00c0  F69000 HiQVideo
+		4c53 1000  CC7/CR7/CP7/VC7/VP7/VR7 mainboard
+		4c53 1010  CP5/CR6 mainboard
+		4c53 1020  VR6 mainboard
+		4c53 1030  PC5 mainboard
+		4c53 1050  CT7 mainboard
+		4c53 1051  CE7 mainboard
 	00d0  F65545
 	00d8  F65545
 	00dc  F65548
@@ -1141,6 +1194,11 @@
 	00f4  F68554 HiQVision
 	00f5  F68555
 	0c30  F69030
+		4c53 1000  CC7/CR7/CP7/VC7/VP7/VR7 mainboard
+		4c53 1050  CT7 mainboard
+		4c53 1051  CE7 mainboard
+# C5C project cancelled
+		4c53 1080  CT8 mainboard
 102d  Wyse Technology Inc.
 	50dc  3328 Audio
 102e  Olivetti Advanced Technology
@@ -1156,6 +1214,7 @@
 	6057  MiroVideo DC10/DC30+
 1032  Compaq
 1033  NEC Corporation
+	0000  Vr4181A USB Host or Function Control Unit
 	0001  PCI to 486-like bus Bridge
 	0002  PCI to VL98 Bridge
 	0003  ATM Controller
@@ -1196,9 +1255,11 @@
 	00a6  VRC5477 AC97
 	00cd  IEEE 1394 [OrangeLink] Host Controller
 		12ee 8011  Root hub
+	00df  Vr4131
 	00e0  USB 2.0
 		12ee 7001  Root hub
 		1799 0002  Root Hub
+	00f3  uPD6113x Multimedia Decoder/Processor [EMMA2]
 1034  Framatome Connectors USA Inc.
 1035  Comp. & Comm. Research Lab
 1036  Future Domain Corp.
@@ -1243,9 +1304,11 @@
 	0735  735 Host
 	0740  740 Host
 	0745  745 Host
+	0746  746 Host
 	0755  SiS 755 Host Bridge
 	0900  SiS900 10/100 Ethernet
 		1039 0900  SiS900 10/100 Ethernet Adapter
+		1043 8035  CUSI-FX motherboard
 	0961  SiS961 [MuTIOL Media IO]
 	0962  SiS962 [MuTIOL Media IO]
 	3602  83C602
@@ -1257,6 +1320,7 @@
 	5513  5513 [IDE]
 		1019 0970  P6STP-FL motherboard
 		1039 5513  SiS5513 EIDE Controller (A,B step)
+		1043 8035  CUSI-FX motherboard
 	5517  5517
 	5571  5571
 	5581  5581 Pentium Chipset
@@ -1270,6 +1334,7 @@
 	6236  6236 3D-AGP
 	6300  SiS630 GUI Accelerator+3D
 		1019 0970  P6STP-FL motherboard
+		1043 8035  CUSI-FX motherboard
 	6306  SiS530 3D PCI/AGP
 		1039 6306  SiS530,620 GUI Accelerator+3D
 	6325  SiS650/651/M650/740 PCI/AGP VGA Display Adapter
@@ -1312,6 +1377,7 @@
 		15c5 0111  SiS PCI Audio Accelerator
 		270f a171  SiS PCI Audio Accelerator
 		a0a0 0022  SiS PCI Audio Accelerator
+	7019  SiS7019 Audio Accelerator
 103a  Seiko Epson Corporation
 103b  Tatung Co. of America
 103c  Hewlett-Packard Company
@@ -1372,6 +1438,7 @@
 1043  Asustek Computer, Inc.
 	0675  ISDNLink P-IN100-ST-D
 	4021  v7100 Combo Deluxe [GeForce2 MX + TV tuner]
+	4057  v8200 GeForce 3
 1044  Distributed Processing Technology
 	1012  Domino RAID Engine
 	a400  SmartCache/Raid I-IV Controller
@@ -1433,7 +1500,7 @@
 	c832  82C832
 	c861  82C861
 	c895  82C895
-	c935  EV1935 ECTIVA MachOne PCI Audio
+	c935  EV1935 ECTIVA MachOne PCIAudio
 	d568  82C825 [Firebridge 2]
 	d721  IDE [FireStar]
 1046  IPC Corporation, Ltd.
@@ -1443,16 +1510,24 @@
 	1000  QuickStep 1000
 	3000  QuickStep 3000
 1049  Fountain Technologies, Inc.
-104a  SGS Thomson Microelectronics
+# # nee SGS Thomson Microelectronics
+104a  STMicroelectronics
 	0008  STG 2000X
 	0009  STG 1764X
 	0010  STG4000 [3D Prophet Kyro Series]
+	0209  STPC Consumer/Industrial North- and Southbridge
+	020a  STPC Atlas/ConsumerS/Consumer IIA Northbridge
 # From <http://gatekeeper.dec.com/pub/BSD/FreeBSD/FreeBSD-stable/src/share/misc/pci_vendors>
 	0210  STPC Atlas ISA Bridge
+	021a  STPC Consumer S Southbridge
+	021b  STPC Consumer IIA Southbridge
+	0500  ST70137 [Unicorn] ADSL DMT Transceiver
+	0564  STPC Client Northbridge
 	0981  DEC-Tulip compatible 10/100 Ethernet
 	1746  STG 1764X
 	2774  DEC-Tulip compatible 10/100 Ethernet
 	3520  MPEG-II decoder card
+	55cc  STPC Client Southbridge
 104b  BusLogic
 	0140  BT-946C (old) [multimaster  01]
 	1040  BT-946C (BA80C30) [MultiMaster 10]
@@ -1505,7 +1580,11 @@
 	8026  TSB43AB21 IEEE-1394a-2000 Controller (PHY/Link)
 	8027  PCI4451 IEEE-1394 Controller
 		1028 00e6  PCI4451 IEEE-1394 Controller (Dell Inspiron 8100)
+	8029  PCI4510 IEEE-1394 Controller
 	8400  ACX 100 22Mbps Wireless Interface
+	8401  ACX 100 22Mbps Wireless Interface
+# OK, this info is almost useless as is, but at least it's known that it's a wireless card. More info requested from reporter (whi
+	9000  Wireless Interface (of unknown type)
 	a001  TDC1570
 	a100  TDC1561
 	a102  TNETA1575 HyperSAR Plus w/PCI Host i/f & UTOPIA i/f
@@ -1523,6 +1602,7 @@
 	ac1b  PCI1450
 		0e11 b113  Armada M700
 	ac1c  PCI1225
+		0e11 b121  Armada E500
 	ac1d  PCI1251A
 	ac1e  PCI1211
 	ac1f  PCI1251B
@@ -1536,9 +1616,11 @@
 	ac41  PCI4410 PC card Cardbus Controller
 	ac42  PCI4451 PC card Cardbus Controller
 		1028 00e6  PCI4451 PC card CardBus Controller (Dell Inspiron 8100)
+	ac44  PCI4510 PC card Cardbus Controller
 	ac50  PCI1410 PC card Cardbus Controller
 	ac51  PCI1420
 		1014 023b  ThinkPad T23 (2647-4MG)
+		1028 00b1  Latitude C600
 		10cf 1095  Lifebook C6155
 		e4bf 1000  CP2-2-HIPHOP
 	ac52  PCI1451 PC card Cardbus Controller
@@ -1627,6 +1709,7 @@
 	0d38  20263
 		105a 4d39  Fasttrak66
 	1275  20275
+	3318  PDC20318 (SATA150 TX4)
 	3376  PDC20376
 		1043 809e  A7V8X motherboard
 	4d30  20267
@@ -1649,6 +1732,7 @@
 	6269  PDC20271
 		105a 6269  FastTrak TX2/TX2000
 	6621  PDC20621 [SX4000] 4 Channel IDE RAID Controller
+	6629  PDC20619 FastTrak TX4000 RAID
 	7275  PDC20277
 105b  Foxconn International, Inc.
 105c  Wipro Infotech Limited
@@ -1735,6 +1819,7 @@
 	0002  DAC960PD
 	0010  DAC960PX
 	0050  AcceleRAID 352/170/160 support Device
+	b166  Gemstone chipset SCSI controller
 	ba55  eXtremeRAID 1100 support Device
 	ba56  eXtremeRAID 2000/3000 support Device
 106a  Aten Research Inc
@@ -1962,6 +2047,8 @@
 	1190  PCI-MIO-16E-4
 	1330  PCI-6031E
 	1350  PCI-6071E
+	17d0  PCI-6503
+	2410  PCI-6733
 	2a60  PCI-6023E
 	b001  IMAQ-PCI-1408
 	b011  IMAQ-PXI-1408
@@ -2229,6 +2316,7 @@
 		d84d 4078  EX-4078 2S(16C552) RS-232+1P
 	9054  PCI <-> IOBus Bridge
 		10b5 2455  Wessex Techology PHIL-PCI
+		10b5 2696  Innes Corp AM Radcap card
 		12d9 0002  PCI Prosody Card rev 1.5
 	9060  9060
 	906d  9060SD
@@ -2238,6 +2326,7 @@
 		10b5 9080  9080 [real subsystem ID not set]
 		129d 0002  Aculab PCI Prosidy card
 		12d9 0002  PCI Prosody Card
+	bb04  B&B 3PCIOSD1A Isolated PCI Serial
 10b6  Madge Networks
 	0001  Smart 16/4 PCI Ringnode
 	0002  Smart 16/4 PCI Ringnode Mk2
@@ -2269,6 +2358,7 @@
 	1006  MINI PCI type 3B Data Fax Modem
 	1007  Mini PCI 56k Winmodem
 		10b7 615c  Mini PCI 56K Modem
+	1700  3c940 1000Base?
 	3390  3c339 TokenLink Velocity
 	3590  3c359 TokenLink Velocity XL
 		10b7 3590  TokenLink Velocity XL Adapter (3C359/359B)
@@ -2301,6 +2391,7 @@
 		10b7 656b  3CCFEM656 10/100 LAN+56K Modem CardBus
 	6564  3CCFEM656 [id 6564] Cyclone CardBus
 	7646  3cSOHO100-TX Hurricane
+	7770  3CRWE777 PCI(PLX) Wireless Adaptor [Airconnect]
 	7940  3c803 FDDILink UTP Controller
 	7980  3c804 FDDILink SAS Controller
 	7990  3c805 FDDILink DAS Controller
@@ -2341,7 +2432,8 @@
 	9058  3c905B-Combo [Deluxe Etherlink XL 10/100]
 	905a  3c905B-FX [Fast Etherlink XL FX 10/100]
 	9200  3c905C-TX/TX-M [Tornado]
-		1028 0095  Integrated 3C905C-TX Fast Etherlink for PC Management NIC
+		1028 0095  3C920 Integrated Fast Ethernet Controller
+		1028 0097  3C920 Integrated Fast Ethernet Controller
 		10b7 1000  3C905C-TX Fast Etherlink for PC Management NIC
 		10b7 7000  10/100 Mini PCI Ethernet Adapter
 	9201  3C920B-EMB Integrated Fast Ethernet Controller
@@ -2524,7 +2616,10 @@
 10c9  Dataexpert Corporation
 10ca  Fujitsu Microelectr., Inc.
 10cb  Omron Corporation
-10cc  Mentor ARC Inc
+# nee Mentor ARC Inc
+10cc  Mai Logic Incorporated
+	0660  Articia S Host Bridge
+	0661  Articia S PCI Bridge
 10cd  Advanced System Products, Inc
 	1100  ASC1100
 	1200  ASC1200 [(abp940) Fast SCSI-II]
@@ -2533,9 +2628,9 @@
 	2300  ABP940-UW
 	2500  ABP940-U2W
 10ce  Radius
-10cf  Citicorp TTI
+# nee Citicorp TTI
+10cf  Fujitsu Limited.
 	2001  mb86605
-10d0  Fujitsu Limited
 10d1  FuturePlus Systems Corp.
 10d2  Molex Incorporated
 10d3  Jabil Circuit Inc
@@ -2644,9 +2739,21 @@
 		1043 0c11  A7N8X Mainboard
 	006a  nForce2 AC97 Audio Controler (MCP)
 	006b  nForce MultiMedia audio [Via VT82C686B]
+	006c  nForce2 External PCI Bridge
+	006d  nForce2 PCI Bridge
 	006e  nForce2 FireWire (IEEE 1394) Controller
 	00a0  NV5 [Aladdin TNT2]
 		14af 5810  Maxi Gamer Xentor
+	00d0  nForce3 LPC Bridge
+	00d1  nForce3 Host Bridge
+	00d2  nForce3 AGP Bridge
+	00d4  nForce3 SMBus
+	00d5  nForce3 IDE
+	00d6  nForce3 Ethernet
+	00d7  nForce3 USB 1.1
+	00d8  nForce3 USB 2.0
+	00da  nForce3 Audio
+	00dd  nForce3 PCI Bridge
 	0100  NV10 [GeForce 256 SDR]
 		1043 0200  AGP-V6600 SGRAM
 		1043 0201  AGP-V6600 SDRAM
@@ -2658,6 +2765,7 @@
 		1043 0202  AGP-V6800 DDR
 		1043 400a  AGP-V6800 DDR SGRAM
 		1043 400b  AGP-V6800 DDR SDRAM
+		107d 2822  WinFast GeForce 256
 		1102 102e  CT6971 GeForce 256 DDR
 		14af 5021  3D Prophet DDR-DVI
 	0103  NV10GL [Quadro]
@@ -2696,12 +2804,14 @@
 	017b  NV17GL [Quadro4 550 XGL]
 	017c  NV17GL [Quadro4 550 GoGL]
 	0181  NV18 [GeForce4 MX 440 AGP 8x]
+		1043 806f  V9180 Magic
+		1462 8880  MS-StarForce GeForce4 MX 440 with AGP8X
 	0182  NV18 [GeForce4 MX 440SE AGP 8x]
 	0183  NV18 [GeForce4 MX 420 AGP 8x]
 	0188  NV18GL [Quadro4 580 XGL]
-	018a  NV18GL [Quadro4 NVS]
+	018a  NV18GL [Quadro4 NVS AGP 8x]
 	018b  NV18GL [Quadro4 380 XGL]
-	01a0  NV15 [GeForce2 - nForce GPU]
+	01a0  NVCrush11 [GeForce2 MX Integrated Graphics]
 	01a4  nForce CPU bridge
 	01ab  nForce 420 Memory Controller (DDR)
 	01ac  nForce 220/420 Memory Controller
@@ -2715,7 +2825,14 @@
 	01c1  Intel 537 [nForce MC97 Modem]
 	01c2  nForce USB Controller
 	01c3  nForce Ethernet Controller
+	01e0  nForce2 AGP (different version?)
 	01e8  nForce2 AGP
+	01ea  nForce2 Memory Controller 0
+	01eb  nForce2 Memory Controller 1
+	01ec  nForce2 Memory Controller 2
+	01ed  nForce2 Memory Controller 3
+	01ee  nForce2 Memory Controller 4
+	01ef  nForce2 Memory Controller 5
 	01f0  NV18 [GeForce4 MX - nForce GPU]
 	0200  NV20 [GeForce3]
 		1043 402f  AGP-V8200 DDR
@@ -2736,6 +2853,7 @@
 	0280  NV28 [GeForce4 Ti 4800]
 	0281  NV28 [GeForce4 Ti 4200 AGP 8x]
 	0282  NV28 [GeForce4 Ti 4800 SE]
+	0286  NV28 [GeForce4 Ti 4200 Go AGP 8x]
 	0288  NV28GL [Quadro4 980 XGL]
 	0289  NV28GL [Quadro4 780 XGL]
 	0300  NV30 [GeForce FX]
@@ -2743,6 +2861,14 @@
 	0302  NV30 [GeForce FX 5800]
 	0308  NV30GL [Quadro FX 2000]
 	0309  NV30GL [Quadro FX 1000]
+	0311  NV31 [GeForce FX 5600 Ultra]
+	0312  NV31 [GeForce FX 5600]
+	0321  NV34 [GeForce FX 5200 Ultra]
+	0322  NV34 [GeForce FX 5200]
+	032b  NV34GL [Quadro FX 500]
+	0330  NV35 [GeForce FX 5900 Ultra]
+	0331  NV35 [GeForce FX 5900]
+	0338  NV35GL [Quadro FX 3000]
 10df  Emulex Corporation
 	1ae5  LP6000 Fibre Channel Host Adapter
 	f085  LP850 Fibre Channel Adapter
@@ -2789,6 +2915,7 @@
 	811a  PCI-IEEE1355-DS-DE Interface
 	8170  S5933 [Matchmaker] (Chipset Development Tool)
 	82db  AJA HDNTV HD SDI Framestore
+	8851  S5933 on Innes Corp FM Radio Capture card
 10e9  Alps Electric Co., Ltd.
 10ea  Intergraphics Systems
 	1680  IGA-1680
@@ -2848,6 +2975,7 @@
 	3fc3  RME Digi96/8 Pad
 	3fc4  RME Digi9652 (Hammerfall)
 	3fc5  RME Hammerfall DSP
+	8381  Ellips Santos Frame Grabber
 10ef  Racore Computer Products, Inc.
 	8154  M815x Token Ring Adapter
 10f0  Peritek Corporation
@@ -2946,6 +3074,7 @@
 		1043 808c  A7V8X motherboard
 		1106 0571  VT82C586/B/VT82C686/A/B/VT8233/A/C/VT8235 PIPC Bus Master IDE
 		1179 0001  Magnia Z310
+		1297 f641  FX41 motherboard
 		1458 5002  GA-7VAX Mainboard
 	0576  VT82C576 3V [Apollo Master]
 	0585  VT82C585VP [Apollo VP1/VPX]
@@ -2988,6 +3117,7 @@
 		1019 0985  P6VXA Motherboard
 		1043 808c  A7V8X motherboard
 		1179 0001  Magnia Z310
+		1458 5004  GA-7VAX Mainboard
 	3040  VT82C586B ACPI
 	3043  VT86C100A [Rhine]
 		10bd 0000  VT86C100A Fast Ethernet Adapter
@@ -3012,6 +3142,7 @@
 		15dd 7609  Onboard Audio
 	3059  VT8233/A/8235 AC97 Audio Controller
 		1043 8095  A7V8X Motherboard (Realtek ALC650 codec)
+		1297 c160  FX41 motherboard (Realtek ALC650 codec)
 		1458 a002  GA-7VAX Onboard Audio (Realtek ALC650)
 	3065  VT6102 [Rhine-II]
 		1106 0102  VT6102 [Rhine II] Embeded Ethernet Controller on VT8235
@@ -3030,11 +3161,13 @@
 	3103  VT8615 Host Bridge
 	3104  USB 2.0
 		1043 808c  A7V8X motherboard
+		1297 f641  FX41 motherboard
 		1458 5004  GA-7VAX Mainboard
 	3106  VT6105 [Rhine-III]
 	3109  VT8233C PCI to ISA Bridge
 	3112  VT8361 [KLE133] Host Bridge
 	3116  VT8375 [KM266/KL266] Host Bridge
+		1297 f641  FX41 motherboard
 # found on EPIA M6000/9000 mainboard
 	3122  VT8623 [Apollo CLE266] integrated CastleRock graphics
 # found on EPIA M6000/9000 mainboard
@@ -3047,6 +3180,7 @@
 	3168  VT8374 P4X400 Host Controller/AGP Bridge
 	3177  VT8235 ISA Bridge
 		1043 808c  A7V8X motherboard
+		1297 f641  FX41 motherboard
 		1458 5001  GA-7VAX Mainboard
 	3189  VT8377 [KT400 AGP] Host Bridge
 		1043 807f  A7V8X motherboard
@@ -3073,6 +3207,7 @@
 	b103  VT8615 AGP Bridge
 	b112  VT8361 [KLE133] AGP Bridge
 	b168  VT8235 PCI Bridge
+	b198  VT8237 PCI Bridge
 1107  Stratus Computers
 	0576  VIA VT82C570MV [Apollo] (Wrong vendor ID!)
 1108  Proteon, Inc.
@@ -3096,6 +3231,7 @@
 	007c  FSC Remote Service Controller, shared memory device
 	007d  FSC Remote Service Controller, SMIC device
 	2102  DSCC4 WAN adapter
+	4021  SIMATIC NET CP 5512 (Profibus and MPI Cardbus Adapter)
 	4942  FPGA I-Bus Tracer for MBD
 	6120  SZB6120
 110b  Chromatic Research Inc.
@@ -3265,7 +3401,9 @@
 	1562  USB 2.0 Host Controller
 	3400  SmartPCI56(UCB1500) 56K Modem
 	7130  SAA7130 Video Broadcast Decoder
+		5168 0138  LiveView FlyVideo 2000
 	7133  SAA7133 Audio+video broadcast decoder
+		5168 0138  LifeView FlyVideo 3000
 # PCI audio and video broadcast decoder (http://www.semiconductors.philips.com/pip/saa7134hl)
 	7134  SAA7134
 	7135  SAA7135 Audio+video broadcast decoder
@@ -3287,24 +3425,59 @@
 	b921  EiconCard P92
 	b922  EiconCard P92
 	b923  EiconCard P92
-	e001  DIVA 20PRO
+	e001  Diva Pro 2.0 S/T
-		1133 e001  DIVA Pro 2.0 S/T
+	e002  Diva 2.0 S/T PCI
-	e002  DIVA 20
+	e003  Diva Pro 2.0 U
-		1133 e002  DIVA 2.0 S/T
+	e004  Diva 2.0 U PCI
-	e003  DIVA 20PRO_U
+	e005  Diva 2.01 S/T PCI
-		1133 e003  DIVA Pro 2.0 U
+	e006  Diva CT S/T PCI
-	e004  DIVA 20_U
+	e007  Diva CT U PCI
-		1133 e004  DIVA 2.0 U
+	e008  Diva CT Lite S/T PCI
-	e005  DIVA LOW
+	e009  Diva CT Lite U PCI
-		1133 e005  DIVA 2.01 S/T
+	e00a  Diva ISDN+V.90 PCI
-	e00b  DIVA 2.02
+	e00b  Diva 2.02 PCI S/T
-	e010  DIVA Server BRI-2M
+	e00c  Diva 2.02 PCI U
-		1133 e010  DIVA Server BRI-2M
+	e00d  Diva ISDN Pro 3.0 PCI
-	e012  DIVA Server BRI-8M
+	e00e  Diva ISDN+CT S/T PCI Rev 2
-		1133 e012  DIVA Server BRI-8M
+	e010  Diva Server BRI-2M PCI
-	e014  DIVA Server PRI-30M
+		110a 0021  Fujitsu Siemens ISDN S0
-		1133 e014  DIVA Server PRI-30M
+		8001 0014  Diva Server BRI-2M PCI Cornet NQ
-	e018  DIVA Server BRI-2M/-2F
+	e011  Diva Server BRI S/T Rev 2
+	e012  Diva Server 4BRI-8M PCI
+		8001 0014  Diva Server 4BRI-8M PCI Cornet NQ
+	e013  Diva Server 4BRI-8M Rev 2
+		8001 0014  Diva Server 4BRI-8M Cornet NQ 2
+	e014  Diva Server PRI-30M PCI
+		0008 0100  Diva Server PRI-30M PCI
+		8001 0014  Diva Server PRI-30M PCI Cornet NQ
+	e015  DIVA Server PRI-30M 2.0
+		8001 0014  Diva Server PRI Cornet NQ 2
+	e016  Diva Server Voice 4BRI PCI
+		8001 0014  Diva Server PRI Cornet NQ
+	e017  Diva Server Voice 4BRI PCI Rev 2
+		8001 0014  Diva Server Voice 4BRI PCI Cornet NQ 2
+	e018  Diva Server BRI 2M Revision 2
+		8001 0014  Diva Server BRI 2M Cornet NQ 2
+	e019  Diva Server Voice PRI PCI Rev 2
+		8001 0014  Diva Server Voice PRI PCI Cornet NQ 2
+	e01a  Diva Server 2FX
+	e01b  Diva Server BRI-2M Voice Revision 2
+		8001 0014  Diva Server BRI-2M Voice Cornet NQ 2
+	e01c  Diva Server PRI Rev 3.0
+		1133 1c01  Diva Server PRI/E1/T1-8 Rev 3.0
+		1133 1c02  Diva Server PRI/T1-24 Rev 3.0
+		1133 1c03  Diva Server PRI/E1-30 Rev 3.0
+		1133 1c04  Diva Server V-PRI/E1/T1 Rev 3.0
+		1133 1c05  Diva Server V-PRI/T1-24 Rev 3.0
+		1133 1c06  Diva Server V-PRI/E1-30 Rev 3.0
+		1133 1c07  Diva Server PRI/E1/T1-8 Cornet NQ 3
+		1133 1c08  Diva Server PRI/T1-24 Cornet NQ 3
+		1133 1c09  Diva Server PRI/E1-30 Cornet NQ 3
+		1133 1c0a  Diva Server V-PRI/E1/T1 Cornet NQ 3
+		1133 1c0b  Diva Server V-PRI/T1-24 Cornet NQ 3
+		1133 1c0c  Diva Server V-PRI/E1-30 Cornet NQ 3
+	e01e  Diva Server 2PRI
+	e020  Diva Server 4PRI
 1134  Mercury Computer Systems
 	0001  Raceway Bridge
 1135  Fuji Xerox Co Ltd
@@ -3527,14 +3700,20 @@
 	0017  GCNB-LE Host Bridge
 	0200  OSB4 South Bridge
 	0201  CSB5 South Bridge
+		4c53 1080  CT8 mainboard
 	0203  CSB6 South Bridge
 	0211  OSB4 IDE Controller
 	0212  CSB5 IDE Controller
+		4c53 1080  CT8 mainboard
 	0213  CSB6 RAID/IDE Controller
 	0220  OSB4/CSB5 OHCI USB Controller
+		4c53 1080  CT8 mainboard
 	0221  CSB6 OHCI USB Controller
 	0225  GCLE Host Bridge
+# cancelled
+		4c53 1080  CT8 mainboard
 	0227  GCLE-2 Host Bridge
+		4c53 1080  CT8 mainboard
 1167  Mutoh Industries Inc
 1168  Thine Electronics Inc
 1169  Centre for Development of Advanced Computing
@@ -3816,6 +3995,7 @@
 	044e  LT WinModem
 	044f  V90 WildWire Modem
 	0450  LT WinModem
+		1033 80a8  Versa Note Vxi
 		144f 4005  Magnia SG20
 	0451  LT WinModem
 	0452  LT WinModem
@@ -4123,6 +4303,8 @@
 		1242 6562  FCX2-6562 Dual Channel PCI-X Fibre Channel Adapter
 		1242 656a  FCX-6562 PCI-X Fibre Channel Adapter
 	4643  FCI-1063 Fibre Channel Adapter
+	6562  FCX2-6562 Dual Channel PCI-X Fibre Channel Adapter
+	656a  FCX-6562 PCI-X Fibre Channel Adapter
 1243  Delphax
 1244  AVM Audiovisuelles MKTG & Computer System GmbH
 	0700  B1 ISDN
@@ -4183,7 +4365,7 @@
 		1014 0166  ES1969 SOLO-1 AudioDrive on IBM Aptiva Mainboard
 		125d 8888  Solo-1 Audio Adapter
 	1978  ES1978 Maestro 2E
-		0e11 b112  Armada M700
+		0e11 b112  Armada M700/E500
 		1033 803c  ES1978 Maestro-2E Audiodrive
 		1033 8058  ES1978 Maestro-2E Audiodrive
 		1092 4000  Monster Sound MX400
@@ -4194,6 +4376,7 @@
 	1989  ESS Modem
 		125d 1989  ESS Modem
 	1998  ES1983S Maestro-3i PCI Audio Accelerator
+		1028 00b1  Latitude C600
 		1028 00e6  ES1983S Maestro-3i (Dell Inspiron 8100)
 	1999  ES1983S Maestro-3i PCI Modem Accelerator
 	199a  ES1983S Maestro-3i PCI Audio Accelerator
@@ -4244,6 +4427,7 @@
 	0710  SM710 LynxEM
 	0712  SM712 LynxEM+
 	0720  SM720 Lynx3DM
+	0730  SM731 Cougar3DR
 	0810  SM810 LynxE
 	0811  SM811 LynxE
 	0820  SM820 Lynx3D
@@ -4532,7 +4716,7 @@
 12b6  Natural Microsystems
 12b7  Cognex Modular Vision Systems Div. - Acumen Inc.
 12b8  Korg
-12b9  US Robotics/3Com
+12b9  5610 56K FaxModem
 	1006  WinModem
 		12b9 005c  USR 56k Internal Voice WinModem (Model 3472)
 		12b9 005e  USR 56k Internal WinModem (Models 662975)
@@ -4628,6 +4812,7 @@
 12dc  Symicron Computer Communication Ltd.
 12dd  Management Graphics
 12de  Rainbow Technologies
+	0200  CryptoSwift CS200
 12df  SBS Technologies Inc
 12e0  Chase Research
 	0010  ST16C654 Quad UART
@@ -4826,6 +5011,10 @@
 132d  Integrated Silicon Solution, Inc.
 1330  MMC Networks
 1331  Radisys Corp.
+	8200  82600 Host Bridge
+	8201  82600 IDE
+	8202  82600 USB
+	8210  82600 PCI Bridge
 1332  Micro Memory
 	5415  MM-5415CN PCI Memory Module with Battery Backup
 	5425  MM-5425CN PCI 64/66 Memory Module with Battery Backup
@@ -4854,6 +5043,7 @@
 134c  Chori Joho System Co. Ltd
 134d  PCTel Inc
 	7890  HSP MicroModem 56
+		134d 0001  PCT789 adapter
 	7891  HSP MicroModem 56
 		134d 0001  HSP MicroModem 56
 	7892  HSP MicroModem 56
@@ -4913,6 +5103,7 @@
 1369  Digigram
 136a  High Soft Tech
 136b  Kawasaki Steel Corporation
+	ff01  KL5A72002 Motion JPEG
 136c  Adtek System Science Co Ltd
 136d  Gigalabs Inc
 136f  Applied Magic Inc
@@ -5025,7 +5216,10 @@
 13be  Miroku Jyoho Service Co. Ltd
 13bf  Sharewave Inc
 13c0  Microgate Corporation
-	0010  SyncLink WAN Adapter
+	0010  SyncLink Adapter v1
+	0020  SyncLink SCC Adapter
+	0030  SyncLink Multiport Adapter
+	0210  SyncLink Adapter v2
 13c1  3ware Inc
 	1000  3ware ATA-RAID
 	1001  3ware 7000-series ATA-RAID
@@ -5097,6 +5291,7 @@
 		13f6 0101  CMI8338-031 PCI Audio Device
 	0111  CM8738
 		1019 0970  P6STP-FL motherboard
+		1043 8035  CUSI-FX motherboard
 		1043 8077  CMI8738 6-channel audio controller
 		1043 80e2  CMI8738 6ch-MX
 		13f6 0111  CMI8738/C3DX PCI Audio Device
@@ -5171,6 +5366,8 @@
 141e  Fanuc Ltd
 141f  Visiontech Ltd
 1420  Psion Dacom plc
+	8002  Gold Card NetGlobal 56k+10/100Mb CardBus (Ethernet part)
+	8003  Gold Card NetGlobal 56k+10/100Mb CardBus (Modem part)
 1421  Ads Technologies Inc
 1422  Ygrec Systems Co Ltd
 1423  Custom Technology Corp.
@@ -5515,6 +5712,7 @@
 	4212  BCM4212 v.90 56k modem
 	4301  BCM4301 802.11b
 	4320  BCM94306 802.11g
+		1737 4320  WPC54G
 	4401  BCM4401 100Base-T
 		1043 80a8  A7V8X motherboard
 	4402  BCM4402 Integrated 10/100BaseT
@@ -5682,7 +5880,9 @@
 14f9  AG COMMUNICATIONS
 14fa  WANDEL & GOCHERMANN
 14fb  TRANSAS MARINE (UK) Ltd
-14fc  QUADRICS Supercomputers World
+14fc  Quadrics Ltd
+	0000  QsNet Elan3 Network Adapter
+	0001  QsNetII Elan4 Network Adapter
 14fd  JAPAN Computer Industry Inc
 14fe  ARCHTEK TELECOM Corp
 14ff  TWINHEAD INTERNATIONAL Corp
@@ -6110,7 +6310,11 @@
 3388  Hint Corp
 	0013  HiNT HC4 PCI to ISDN bridge, Multimedia audio controller
 	0014  HiNT HC4 PCI to ISDN bridge, Network controller
-	0021  HB1-SE33 PCI-PCI Bridge
+	0020  HB6 Universal PCI-PCI bridge (transparent mode)
+	0021  HB6 Universal PCI-PCI bridge (non-transparent mode)
+		4c53 1050  CT7 mainboard
+		4c53 1080  CT8 mainboard
+		4c53 3010  PPCI mezzanine (32-bit PMC)
 	101a  E.Band [AudioTrak Inca88]
 	101b  E.Band [AudioTrak Inca88]
 	8011  VXPro II Chipset

hw/xfree86/utils/xorgcfg/config.h

@@ -26,12 +26,13 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.17 2003/06/10 17:03:55 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.18 2003/12/19 02:05:38 dawes Exp $
  */
 
 #include <X11/IntrinsicP.h>
 #include <X11/StringDefs.h>
 #include <X11/Xmu/SysUtil.h>
+#include <X11/Xos.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <dirent.h>

hw/xfree86/utils/xorgcfg/loader.c

@@ -26,7 +26,7 @@
  *
  * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.19 2002/06/06 21:03:32 paulo Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.20 2003/12/17 17:45:33 dawes Exp $
  */
 
 #include "config.h"
@@ -35,12 +35,19 @@
 #include "loader.h"
 #include "stubs.h"
 #include <X11/Xresource.h>
+#include <X11/Xos.h>
 
 #ifdef USE_MODULES
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#if defined(X_POSIX_C_SOURCE)
+#define _POSIX_C_SOURCE X_POSIX_C_SOURCE
 #include <setjmp.h>
+#undef _POSIX_C_SOURCE
+#else
+#include <setjmp.h>
+#endif
 #include <signal.h>
 #include <ctype.h>
 

hw/xfree86/x86emu/decode.c

@@ -37,7 +37,7 @@
 *
 ****************************************************************************/
 
-/* $XFree86: xc/extras/x86emu/src/x86emu/decode.c,v 1.11 2002/07/23 20:20:43 tsi Exp $ */
+/* $XFree86: xc/extras/x86emu/src/x86emu/decode.c,v 1.12 2003/12/05 19:23:23 dawes Exp $ */
 
 #include "x86emu/x86emui.h"
 
@@ -699,7 +699,11 @@ u16* decode_rm_seg_register(
 		DECODE_PRINTF("DS");
 		return &M.x86.R_DS;
 	  case 4:
+		DECODE_PRINTF("FS");
+		return &M.x86.R_FS;
 	  case 5:
+		DECODE_PRINTF("GS");
+		return &M.x86.R_GS;
 	  case 6:
 	  case 7:
 		DECODE_PRINTF("ILLEGAL SEGREG");

include/regionstr.h

@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.12 2003/11/29 02:29:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/regionstr.h,v 1.13 2003/12/03 17:11:29 tsi Exp $ */
 
 #ifndef REGIONSTRUCT_H
 #define REGIONSTRUCT_H
@@ -167,18 +167,8 @@ extern RegDataRec miBrokenData;
 
 #else /* !NEED_SCREEN_REGIONS */
 
-/* Reference _pScreen macro argument and possibly check its type */
+/* Reference _pScreen macro argument and check its type */
-#undef REGION_SCREEN
+#define REGION_SCREEN(_pScreen_) (void)((_pScreen_)->myNum)
-extern volatile ScreenPtr currentRegionScreen;
-#if defined(NDEBUG) && !defined(DEBUG) && !defined(BUILDDEBUG)
-
-# define REGION_SCREEN(_pScreen_) (void)(_pScreen_)
-
-#else
-
-# define REGION_SCREEN(_pScreen_) (void)(currentRegionScreen = (_pScreen_))
-
-#endif
 
 #define REGION_CREATE(_pScreen, _rect, _size) \
     (REGION_SCREEN(_pScreen), miRegionCreate(_rect, _size))

mi/miarc.c

@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.14 2003/10/29 22:57:48 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/mi/miarc.c,v 3.15 2003/12/06 18:46:28 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -1702,6 +1702,8 @@ miGetArcPts(
 
     poly[cpt].x = (xc + x0);
     poly[cpt].y = (yc + y0);
+    poly[cpt + 1].x = (xc + x1);
+    poly[cpt + 1].y = (yc + y1);
 
     for(i = 2; i < count; i++)
     {