svn merge ^/branches/released .

3 files changed, 5 insertions, 45 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86Configure.c b/xorg-server/hw/xfree86/common/xf86Configure.c
index 94398dff5..25d884934 100644
--- a/xorg-server/hw/xfree86/common/xf86Configure.c
+++ b/xorg-server/hw/xfree86/common/xf86Configure.c
@@ -107,8 +107,6 @@ bus_sbus_configure(void *busData)
 static void

 bus_pci_newdev_configure(void *busData, int i, int *chipset)

 {

-	const char *VendorName;

-	const char *CardName;

 	char busnum[8];

     struct pci_device * pVideo = NULL;

 

@@ -116,26 +114,6 @@ bus_pci_newdev_configure(void *busData, int i, int *chipset)
 

 	DevToConfig[i].pVideo = pVideo;

 

-	VendorName = pci_device_get_vendor_name( pVideo );

-	CardName = pci_device_get_device_name( pVideo );

-

-	if (!VendorName) {

-	    VendorName = xnfalloc(15);

-	    sprintf((char*)VendorName, "Unknown Vendor");

-	}

-

-	if (!CardName) {

-	    CardName = xnfalloc(14);

-	    sprintf((char*)CardName, "Unknown Board");

-	}

-

-	DevToConfig[i].GDev.identifier =

-	    xnfalloc(strlen(VendorName) + strlen(CardName) + 2);

-	sprintf(DevToConfig[i].GDev.identifier, "%s %s", VendorName, CardName);

-

-	DevToConfig[i].GDev.vendor = (char *)VendorName;

-	DevToConfig[i].GDev.board = (char *)CardName;

-

 	DevToConfig[i].GDev.busID = xnfalloc(16);

 	xf86FormatPciBusNumber(pVideo->bus, busnum);

 	sprintf(DevToConfig[i].GDev.busID, "PCI:%s:%d:%d",

@@ -357,9 +335,6 @@ configureDeviceSection (int screennum)
     /* Move device info to parser structure */

     sprintf(identifier, "Card%d", screennum);

     ptr->dev_identifier = strdup(identifier);

-/*    ptr->dev_identifier = DevToConfig[screennum].GDev.identifier;*/

-    ptr->dev_vendor = DevToConfig[screennum].GDev.vendor;

-    ptr->dev_board = DevToConfig[screennum].GDev.board;

     ptr->dev_chipset = DevToConfig[screennum].GDev.chipset;

     ptr->dev_busid = DevToConfig[screennum].GDev.busID;

     ptr->dev_driver = DevToConfig[screennum].GDev.driver;

diff --git a/xorg-server/hw/xfree86/common/xf86pciBus.c b/xorg-server/hw/xfree86/common/xf86pciBus.c
index 461c7c235..8729089cf 100644
--- a/xorg-server/hw/xfree86/common/xf86pciBus.c
+++ b/xorg-server/hw/xfree86/common/xf86pciBus.c
@@ -151,18 +151,13 @@ xf86PciProbe(void)
     

     /* Print a summary of the video devices found */

     for (k = 0; k < num; k++) {

-	const char *vendorname = NULL, *chipname = NULL;

 	const char *prim = " ";

 	Bool memdone = FALSE, iodone = FALSE;

 

 

 	info = xf86PciVideoInfo[k];

 

-	vendorname = pci_device_get_vendor_name( info );

-	chipname = pci_device_get_device_name( info );

-

-	if ((!vendorname || !chipname) &&

-	    !PCIALWAYSPRINTCLASSES(info->device_class))

+	if (!PCIALWAYSPRINTCLASSES(info->device_class))

 	    continue;

 

 	if (xf86IsPrimaryPci(info))

@@ -173,12 +168,6 @@ xf86PciProbe(void)
 		info->vendor_id, info->device_id,

 		info->subvendor_id, info->subdevice_id);

 

-	if (vendorname)

-	    xf86ErrorF("%s ", vendorname);

-

-	if (chipname)

-	    xf86ErrorF("%s ", chipname);

-

 	xf86ErrorF("rev %d", info->revision);

 

 	for (i = 0; i < 6; i++) {

diff --git a/xorg-server/hw/xfree86/ramdac/xf86Cursor.c b/xorg-server/hw/xfree86/ramdac/xf86Cursor.c
index 421e35b51..0e648ff49 100644
--- a/xorg-server/hw/xfree86/ramdac/xf86Cursor.c
+++ b/xorg-server/hw/xfree86/ramdac/xf86Cursor.c
@@ -245,8 +245,6 @@ xf86CursorSwitchMode(int index, DisplayModePtr mode, int flags)
     ScreenPtr pScreen = screenInfo.screens[index];

     xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(

 	&pScreen->devPrivates, xf86CursorScreenKey);

-    miPointerScreenPtr PointPriv = (miPointerScreenPtr)dixLookupPrivate(

-	&pScreen->devPrivates, miPointerScreenKey);

 

     if (ScreenPriv->isUp) {

 	xf86SetCursor(pScreen, NullCursor, ScreenPriv->x, ScreenPriv->y);

@@ -261,7 +259,7 @@ xf86CursorSwitchMode(int index, DisplayModePtr mode, int flags)
      * ensure the cursor is repainted by miPointerWarpCursor().

      */

     ScreenPriv->CursorToRestore = ScreenPriv->CurrentCursor;

-    PointPriv->waitForUpdate = FALSE;	/* Force cursor repaint */

+    miPointerSetWaitForUpdate(pScreen, FALSE);	/* Force cursor repaint */

 

     return ret;

 }

@@ -302,9 +300,6 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
     xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(

 	&pScreen->devPrivates, xf86CursorScreenKey);

     xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr;

-    miPointerScreenPtr PointPriv = (miPointerScreenPtr)dixLookupPrivate(

-    &pScreen->devPrivates, miPointerScreenKey);

-

 

     if (pCurs == NullCursor) {	/* means we're supposed to remove the cursor */

         if (ScreenPriv->SWCursor ||

@@ -355,11 +350,12 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
 	    xf86SetCursor(pScreen, pCurs, x, y);

 	    ScreenPriv->SWCursor = FALSE;

 	    ScreenPriv->isUp = TRUE;

-	    PointPriv->waitForUpdate = !infoPtr->pScrn->silkenMouse;

+

+	    miPointerSetWaitForUpdate(pScreen, !infoPtr->pScrn->silkenMouse);

 	    return;

 	}

 

-        PointPriv->waitForUpdate = TRUE;

+        miPointerSetWaitForUpdate(pScreen, TRUE);

 

         if (ScreenPriv->isUp) {

             /* Remove the HW cursor, or make it transparent */