From 490e345f9d85a73263e96ba0b2918a9a2ca913ad Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 3 Mar 2011 15:27:20 +1000 Subject: Don't manually UnInit the devices for ABI 12 One of the changes going into ABI 12 were that the server calls Uninit even on driver-hotplugged devices. Signed-off-by: Peter Hutterer Acked-by: Ping Cheng --- src/wcmConfig.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/wcmConfig.c') diff --git a/src/wcmConfig.c b/src/wcmConfig.c index afb5e0a..7863167 100644 --- a/src/wcmConfig.c +++ b/src/wcmConfig.c @@ -249,6 +249,8 @@ static void wcmUninit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) DBG(1, priv, "\n"); + /* Server 1.10 will UnInit all devices for us */ +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 if (priv->isParent) { /* HAL removal sees the parent device removed first. */ @@ -273,6 +275,7 @@ static void wcmUninit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) free(pInfo->name); pInfo->name = NULL; } +#endif if (priv->tool) { -- cgit v1.2.1 From 69d3e9387105e0a92cae95f6f81a62e868506c06 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 3 Mar 2011 15:52:56 +1000 Subject: Add a fixme about tool handling. Signed-off-by: Peter Hutterer Acked-by: Ping Cheng --- src/wcmConfig.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/wcmConfig.c') diff --git a/src/wcmConfig.c b/src/wcmConfig.c index 7863167..bd37659 100644 --- a/src/wcmConfig.c +++ b/src/wcmConfig.c @@ -340,6 +340,11 @@ static Bool wcmMatchDevice(InputInfoPtr pLocal, WacomCommonPtr *common_return) { DBG(2, priv, "port share between %s and %s\n", pLocal->name, pMatch->name); + /* FIXME: we loose the common->wcmTool here but it + * gets re-added during wcmParseOptions. This is + * currently required by the code, adding the tool + * again here means we trigger the duplicate tool + * detection */ wcmFreeCommon(&priv->common); priv->common = wcmRefCommon(privMatch->common); priv->next = priv->common->wcmDevices; -- cgit v1.2.1