input: Purge AddOtherInputDevices DDX hook.

This hook wasn't used by any DDX. Device addition and removal is handled by
the config backend, so we don't need to do anything special that during the
ListInputDevices request processing.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>

7 files changed, 0 insertions, 109 deletions

diff --git a/Xi/listdev.c b/Xi/listdev.c
index 3b2272bc3..3e5f3d9d2 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -356,9 +356,6 @@ ProcXListInputDevices(ClientPtr client)
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
 
-
-    AddOtherInputDevices();
-
     /* allocate space for saving skip value */
     skip = calloc(sizeof(Bool), inputInfo.numDevices);
     if (!skip)
diff --git a/Xi/stubs.c b/Xi/stubs.c
index 4c9795aba..d9e8eec72 100644
--- a/Xi/stubs.c
+++ b/Xi/stubs.c
@@ -66,49 +66,6 @@ SOFTWARE.
 #include "XIstubs.h"
 #include "xace.h"
 
-/***********************************************************************
- *
- * Caller:	ProcXListInputDevices
- *
- * This is the implementation-dependent routine to initialize an input
- * device to the point that information about it can be listed.
- * Some implementations open all input devices when the server is first
- * initialized, and never close them.  Other implementations open only
- * the X pointer and keyboard devices during server initialization,
- * and only open other input devices when some client makes an
- * XOpenDevice request.  If some other process has the device open, the
- * server may not be able to get information about the device to list it.
- *
- * This procedure should be used by implementations that do not initialize
- * all input devices at server startup.  It should do device-dependent
- * initialization for any devices not previously initialized, and call
- * AddInputDevice for each of those devices so that a DeviceIntRec will be
- * created for them.
- *
- * The default implementation is to do nothing (assume all input devices
- * are initialized during X server initialization and kept open).
- * The commented-out sample code shows what you might do if you don't want
- * the default.
- *
- */
-
-void
-AddOtherInputDevices(void)
-{
-    /**********************************************************************
-     for each uninitialized device, do something like:
-
-    DeviceIntPtr dev;
-    DeviceProc deviceProc;
-    pointer private;
-
-    dev = (DeviceIntPtr) AddInputDevice(deviceProc, TRUE);
-    dev->public.devicePrivate = private;
-    dev->inited = ((*dev->deviceProc)(dev, DEVICE_INIT) == Success);
-    ************************************************************************/
-
-}
-
 /****************************************************************************
  *
  * Caller:	ProcXSetDeviceMode
diff --git a/hw/dmx/input/dmxxinput.c b/hw/dmx/input/dmxxinput.c
index a5c28a99a..54381b2e0 100644
--- a/hw/dmx/input/dmxxinput.c
+++ b/hw/dmx/input/dmxxinput.c
@@ -51,11 +51,6 @@
 #include "dmxinputinit.h"
 #include "exevents.h"
 
-/** This is not required by the XINPUT model that DMX uses. */
-void AddOtherInputDevices(void)
-{
-}
-
 /** Set device mode to \a mode.  This is not implemented. */
 int SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode)
 {
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 2ab6dc2e3..61ee163d4 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -2176,13 +2176,6 @@ ProcessInputEvents (void)
     KdCheckLock ();
 }
 
-/* We initialise all input devices at startup. */
-void
-AddOtherInputDevices(void)
-{
-    return;
-}
-
 /* At the moment, absolute/relative is up to the client. */
 int
 SetDeviceMode(register ClientPtr client, DeviceIntPtr pDev, int mode)
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 4a6adbc17..f924ec853 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -412,11 +412,6 @@ ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)
   }
 }
 
-void
-AddOtherInputDevices(void)
-{
-}
-
 /*
  * Get the operating system name from uname and store it statically to avoid
  * repeating the system call each time MatchOS is checked.
diff --git a/hw/xquartz/darwinXinput.c b/hw/xquartz/darwinXinput.c
index 64d9b2365..15d9c5258 100644
--- a/hw/xquartz/darwinXinput.c
+++ b/hw/xquartz/darwinXinput.c
@@ -82,49 +82,6 @@ CloseInputDevice(DeviceIntPtr d, ClientPtr client)
   DEBUG_LOG("CloseInputDevice(%p, %p)\n", d, client);
 }
 
-/***********************************************************************
- *
- * Caller:	ProcXListInputDevices
- *
- * This is the implementation-dependent routine to initialize an input 
- * device to the point that information about it can be listed.
- * Some implementations open all input devices when the server is first
- * initialized, and never close them.  Other implementations open only
- * the X pointer and keyboard devices during server initialization,
- * and only open other input devices when some client makes an
- * XOpenDevice request.  If some other process has the device open, the
- * server may not be able to get information about the device to list it.
- *
- * This procedure should be used by implementations that do not initialize
- * all input devices at server startup.  It should do device-dependent
- * initialization for any devices not previously initialized, and call
- * AddInputDevice for each of those devices so that a DeviceIntRec will be 
- * created for them.
- *
- * The default implementation is to do nothing (assume all input devices
- * are initialized during X server initialization and kept open).
- * The commented-out sample code shows what you might do if you don't want 
- * the default.
- *
- */
-
-void
-AddOtherInputDevices(void)
-{
-    /**********************************************************************
-     for each uninitialized device, do something like: 
-
-    DeviceIntPtr dev;
-    DeviceProc deviceProc;
-    pointer private;
-
-    dev = (DeviceIntPtr) AddInputDevice(deviceProc, TRUE);
-    dev->public.devicePrivate = private;
-    dev->inited = ((*dev->deviceProc)(dev, DEVICE_INIT) == Success);
-    ************************************************************************/
-  DEBUG_LOG("AddOtherInputDevices\n");
-}
-
 /****************************************************************************
  *
  * Caller:	ProcXSetDeviceMode
diff --git a/include/XIstubs.h b/include/XIstubs.h
index 0bb773e38..6ab82dff9 100644
--- a/include/XIstubs.h
+++ b/include/XIstubs.h
@@ -26,9 +26,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifndef XI_STUBS_H
 #define XI_STUBS_H 1
 
-extern _X_EXPORT void
-AddOtherInputDevices (void);
-
 extern _X_EXPORT int
 SetDeviceMode (
 	ClientPtr              /* client */,