svn merge ^/branches/released .

4 files changed, 4 insertions, 19 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86Helper.c b/xorg-server/hw/xfree86/common/xf86Helper.c
index 51a503eb9..e4d07ec12 100644
--- a/xorg-server/hw/xfree86/common/xf86Helper.c
+++ b/xorg-server/hw/xfree86/common/xf86Helper.c
@@ -125,7 +125,6 @@ xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags)
 				xnfalloc(sizeof(InputDriverRec));

     *xf86InputDriverList[xf86NumInputDrivers - 1] = *driver;

     xf86InputDriverList[xf86NumInputDrivers - 1]->module = module;

-    xf86InputDriverList[xf86NumInputDrivers - 1]->refCount = 0;

 }

 

 void

@@ -284,7 +283,6 @@ xf86AllocateInput(InputDriverPtr drv, int flags)
 	return NULL;

 

     new->drv = drv;

-    drv->refCount++;

     new->module = DuplicateModule(drv->module, NULL);

 

     for (prev = &xf86InputDevs; *prev; prev = &(*prev)->next)

@@ -320,9 +318,6 @@ xf86DeleteInput(InputInfoPtr pInp, int flags)
     if (pInp->module)

 	UnloadModule(pInp->module);

 

-    if (pInp->drv)

-	pInp->drv->refCount--;

-

     /* This should *really* be handled in drv->UnInit(dev) call instead, but

      * if the driver forgets about it make sure we free it or at least crash

      * with flying colors */

@@ -776,6 +771,9 @@ xf86SetWeight(ScrnInfoPtr scrp, rgb weight, rgb mask)
 	    scrp->weight.red = scrp->weight.blue = 5;

 	    scrp->weight.green = 6;

 	    break;

+	case 18:

+	    scrp->weight.red = scrp->weight.green = scrp->weight.blue = 6;

+	    break;

 	case 24:

 	    scrp->weight.red = scrp->weight.green = scrp->weight.blue = 8;

 	    break;

@@ -1180,10 +1178,6 @@ xf86EnableDisableFBAccess(int scrnIndex, Bool enable)
     if (enable)

     {

 	/*

-	 * Restore the screen pixmap devPrivate field

-	 */

-	pspix->devPrivate = pScrnInfo->pixmapPrivate;

-	/*

 	 * Restore all of the clip lists on the screen

 	 */

 	if (!xf86Resetting)

@@ -1196,13 +1190,6 @@ xf86EnableDisableFBAccess(int scrnIndex, Bool enable)
 	 * Empty all of the clip lists on the screen

 	 */

 	xf86SetRootClip (pScreen, FALSE);

-	/*

-	 * save the screen pixmap devPrivate field and

-	 * replace it with NULL so accidental references

-	 * to the frame buffer are caught

-	 */

-	pScrnInfo->pixmapPrivate = pspix->devPrivate;

-	pspix->devPrivate.ptr = NULL;

     }

 }

 

diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h
index f85c54dc9..266a4dafe 100644
--- a/xorg-server/hw/xfree86/common/xf86Module.h
+++ b/xorg-server/hw/xfree86/common/xf86Module.h
@@ -82,7 +82,7 @@ typedef enum {
  * mask is 0xFFFF0000.

  */

 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)

-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(8, 0)

+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(9, 0)

 #define ABI_XINPUT_VERSION	SET_ABI_VERSION(11, 0)

 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(4, 0)

 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)

diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.h b/xorg-server/hw/xfree86/common/xf86Xinput.h
index d78c22333..1e5671574 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.h
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.h
@@ -103,7 +103,6 @@ typedef struct _InputDriverRec {
 				      struct _LocalDeviceRec *pInfo,

 				      int flags);

     pointer		    module;

-    int			    refCount;

 } InputDriverRec, *InputDriverPtr;

 

 /* This is to input devices what the ScrnInfoRec is to screens. */

diff --git a/xorg-server/hw/xfree86/common/xf86str.h b/xorg-server/hw/xfree86/common/xf86str.h
index 58438db76..9d52661a7 100644
--- a/xorg-server/hw/xfree86/common/xf86str.h
+++ b/xorg-server/hw/xfree86/common/xf86str.h
@@ -765,7 +765,6 @@ typedef struct _ScrnInfoRec {
 

     /* Allow screens to be enabled/disabled individually */

     Bool		vtSema;

-    DevUnion		pixmapPrivate;		/* saved devPrivate from pixmap */

 

     /* hw cursor moves at SIGIO time */

     Bool		silkenMouse;