Attachment 14259 Details for Bug 14418 – call DIDR instead of CloseDevice when shutting down.

[patch] call DIDR instead of CloseDevice when shutting down.

0001-dix-Call-DeleteInputDeviceRequest-from-CloseDownDev.patch (text/plain), 1.96 KB, created by Peter Hutterer on 2008-02-10 00:24:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Hutterer

Created: 2008-02-10 00:24:41 UTC

Size: 1.96 KB

patch

obsolete

>From 0b83e6917cf7a6381dae7f87e1b4f56e2b785180 Mon Sep 17 00:00:00 2001
>From: Peter Hutterer <peter@cs.unisa.edu.au>
>Date: Sun, 10 Feb 2008 17:56:46 +1030
>Subject: [PATCH] dix: Call DeleteInputDeviceRequest from CloseDownDevices (#14418)
>
>The DDX (xfree86 anyway) maintains its own device list in addition to the one
>in the DIX. CloseDevice will only remove it from the DIX, not the DDX. If the
>server then restarts (last client disconnects), the DDX devices are still
>there, will be re-initialised, then the hal devices come in and are added too.
>This repeats until we run out of device ids.
>---
> dix/devices.c                  |    4 ++--
> hw/xfree86/common/xf86Xinput.c |   12 ++++++++++--
> 2 files changed, 12 insertions(+), 4 deletions(-)
>
>diff --git a/dix/devices.c b/dix/devices.c
>index 534a0b9..3a39148 100644
>--- a/dix/devices.c
>+++ b/dix/devices.c
>@@ -617,12 +617,12 @@ CloseDownDevices(void)
>     for (dev = inputInfo.devices; dev; dev = next)
>     {
> 	next = dev->next;
>-	CloseDevice(dev);
>+        DeleteInputDeviceRequest(dev);
>     }
>     for (dev = inputInfo.off_devices; dev; dev = next)
>     {
> 	next = dev->next;
>-	CloseDevice(dev);
>+        DeleteInputDeviceRequest(dev);
>     }
>     inputInfo.devices = NULL;
>     inputInfo.off_devices = NULL;
>diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
>index eafc0e9..d34238e 100644
>--- a/hw/xfree86/common/xf86Xinput.c
>+++ b/hw/xfree86/common/xf86Xinput.c
>@@ -446,11 +446,19 @@ void
> DeleteInputDeviceRequest(DeviceIntPtr pDev)
> {
>     LocalDevicePtr pInfo = (LocalDevicePtr) pDev->public.devicePrivate;
>-    InputDriverPtr drv = pInfo->drv;
>-    IDevRec *idev = pInfo->conf_idev;
>+    InputDriverPtr drv;
>+    IDevRec *idev;
> 
>+    if (pInfo) /* need to get these before RemoveDevice */
>+    {
>+        drv = pInfo->drv;
>+        idev = pInfo->conf_idev;
>+    }
>     RemoveDevice(pDev);
> 
>+    if (!pInfo) /* VCP and VCK */
>+        return;
>+
>     if(drv->UnInit)
>         drv->UnInit(drv, pInfo, 0);
>     else
>-- 
>1.5.3
>

Actions: View | Splinter Review

Attachments on bug 14418: 14212 | 14213 | 14259 | 14493 | 16115 | 16144

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.