xfree86: unexport xf86RemoveInputEventDrainCallback()

Not used by any external drivers, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

hw/xfree86/common/xf86Helper.c

@@ -126,15 +126,6 @@ xf86AddInputDriver(InputDriverPtr driver, void *module, int flags)
     xf86InputDriverList[xf86NumInputDrivers - 1]->module = module;
 }
 
-void
-xf86DeleteInputDriver(int drvIndex)
-{
-    if (xf86InputDriverList[drvIndex] && xf86InputDriverList[drvIndex]->module)
-        UnloadModule(xf86InputDriverList[drvIndex]->module);
-    free(xf86InputDriverList[drvIndex]);
-    xf86InputDriverList[drvIndex] = NULL;
-}
-
 InputDriverPtr
 xf86LookupInputDriver(const char *name)
 {
@@ -1052,9 +1043,14 @@ xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...)
     va_end(ap);
 }
 
+static void
+xf86VIDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb,
+                 const char *format, va_list args)
+    _X_ATTRIBUTE_PRINTF(4, 0);
+
 /* Print input driver messages in the standard format of
    (<type>) <driver>: <device name>: <message> */
-void
+static void
 xf86VIDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb,
                  const char *format, va_list args)
 {

hw/xfree86/common/xf86Xinput.c

@@ -1194,20 +1194,6 @@ xf86PostMotionEvent(DeviceIntPtr device,
     xf86PostMotionEventM(device, is_absolute, &mask);
 }
 
-void
-xf86PostMotionEventP(DeviceIntPtr device,
-                     int is_absolute,
-                     int first_valuator,
-                     int num_valuators, const int *valuators)
-{
-    ValuatorMask mask;
-
-    XI_VERIFY_VALUATORS(num_valuators);
-
-    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);
-    xf86PostMotionEventM(device, is_absolute, &mask);
-}
-
 static int
 xf86CheckMotionEvent4DGA(DeviceIntPtr device, int is_absolute,
                          const ValuatorMask *mask)
@@ -1334,20 +1320,6 @@ xf86PostProximityEvent(DeviceIntPtr device,
     xf86PostProximityEventM(device, is_in, &mask);
 }
 
-void
-xf86PostProximityEventP(DeviceIntPtr device,
-                        int is_in,
-                        int first_valuator,
-                        int num_valuators, const int *valuators)
-{
-    ValuatorMask mask;
-
-    XI_VERIFY_VALUATORS(num_valuators);
-
-    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);
-    xf86PostProximityEventM(device, is_in, &mask);
-}
-
 void
 xf86PostProximityEventM(DeviceIntPtr device,
                         int is_in, const ValuatorMask *mask)
@@ -1422,22 +1394,8 @@ xf86PostButtonEventM(DeviceIntPtr device,
                        flags, mask);
 }
 
-void
+static void
 xf86PostKeyEvent(DeviceIntPtr device, unsigned int key_code, int is_down)
-{
-    xf86PostKeyEventM(device, key_code, is_down);
-}
-
-void
-xf86PostKeyEventP(DeviceIntPtr device,
-                  unsigned int key_code,
-                  int is_down)
-{
-    xf86PostKeyEventM(device, key_code, is_down);
-}
-
-void
-xf86PostKeyEventM(DeviceIntPtr device, unsigned int key_code, int is_down)
 {
 #ifdef XFreeXDGA
     DeviceIntPtr pointer;
@@ -1462,7 +1420,7 @@ xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code, int is_down)
     ValuatorMask mask;
 
     valuator_mask_zero(&mask);
-    xf86PostKeyEventM(device, key_code, is_down);
+    xf86PostKeyEvent(device, key_code, is_down);
 }
 
 InputInfoPtr
@@ -1560,17 +1518,6 @@ xf86DisableDevice(DeviceIntPtr dev, Bool panic)
     }
 }
 
-/**
- * Reactivate a device. Call this function from the driver if you just found
- * out that the read error wasn't quite that bad after all.
- * Device will be re-activated, and an event sent to the client.
- */
-void
-xf86EnableDevice(DeviceIntPtr dev)
-{
-    EnableDevice(dev, TRUE);
-}
-
 /**
  * Post a touch event with optional valuators.  If this is the first touch in
  * the sequence, at least x & y valuators must be provided. The driver is

hw/xfree86/common/xf86Xinput.h

@@ -118,19 +118,11 @@ struct _InputInfoRec {
 extern _X_EXPORT void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute,
                                           int first_valuator, int num_valuators,
                                           ...);
-extern _X_EXPORT void xf86PostMotionEventP(DeviceIntPtr device, int is_absolute,
-                                           int first_valuator,
-                                           int num_valuators,
-                                           const int *valuators);
 extern _X_EXPORT void xf86PostMotionEventM(DeviceIntPtr device, int is_absolute,
                                            const ValuatorMask *mask);
 extern _X_EXPORT void xf86PostProximityEvent(DeviceIntPtr device, int is_in,
                                              int first_valuator,
                                              int num_valuators, ...);
-extern _X_EXPORT void xf86PostProximityEventP(DeviceIntPtr device, int is_in,
-                                              int first_valuator,
-                                              int num_valuators,
-                                              const int *valuators);
 extern _X_EXPORT void xf86PostProximityEventM(DeviceIntPtr device, int is_in,
                                               const ValuatorMask *mask);
 extern _X_EXPORT void xf86PostButtonEvent(DeviceIntPtr device, int is_absolute,
@@ -142,15 +134,6 @@ extern _X_EXPORT void xf86PostButtonEventP(DeviceIntPtr device, int is_absolute,
                                            int first_valuator,
                                            int num_valuators,
                                            const int *valuators);
-extern _X_EXPORT void xf86PostButtonEventM(DeviceIntPtr device, int is_absolute,
-                                           int button, int is_down,
-                                           const ValuatorMask *mask);
-extern _X_EXPORT void xf86PostKeyEvent(DeviceIntPtr device,
-                                       unsigned int key_code, int is_down);
-extern _X_EXPORT void xf86PostKeyEventM(DeviceIntPtr device,
-                                        unsigned int key_code, int is_down);
-extern _X_EXPORT void xf86PostKeyEventP(DeviceIntPtr device,
-                                        unsigned int key_code, int is_down);
 extern _X_EXPORT void xf86PostKeyboardEvent(DeviceIntPtr device,
                                             unsigned int key_code, int is_down);
 extern _X_EXPORT void xf86PostTouchEvent(DeviceIntPtr dev, uint32_t touchid,
@@ -184,15 +167,10 @@ extern _X_EXPORT void xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum);
 extern _X_EXPORT void xf86AddEnabledDevice(InputInfoPtr pInfo);
 extern _X_EXPORT void xf86RemoveEnabledDevice(InputInfoPtr pInfo);
 extern _X_EXPORT void xf86DisableDevice(DeviceIntPtr dev, Bool panic);
-extern _X_EXPORT void xf86EnableDevice(DeviceIntPtr dev);
-extern _X_EXPORT void xf86InputEnableVTProbe(void);
 
 /* xf86Helper.c */
 extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, void *module,
                                          int flags);
-extern _X_EXPORT void xf86DeleteInputDriver(int drvIndex);
-extern _X_EXPORT InputDriverPtr xf86LookupInputDriver(const char *name);
-extern _X_EXPORT InputInfoPtr xf86LookupInput(const char *name);
 extern _X_EXPORT void xf86DeleteInput(InputInfoPtr pInp, int flags);
 extern _X_EXPORT void xf86MotionHistoryAllocate(InputInfoPtr pInfo);
 extern _X_EXPORT void
@@ -202,15 +180,6 @@ _X_ATTRIBUTE_PRINTF(4, 5);
 extern _X_EXPORT void
 xf86IDrvMsg(InputInfoPtr dev, MessageType type, const char *format, ...)
 _X_ATTRIBUTE_PRINTF(3, 4);
-extern _X_EXPORT void
-xf86VIDrvMsgVerb(InputInfoPtr dev,
-                 MessageType type, int verb, const char *format, va_list args)
-_X_ATTRIBUTE_PRINTF(4, 0);
-
-extern _X_EXPORT void xf86AddInputEventDrainCallback(CallbackProcPtr callback,
-                                                     void *param);
-extern _X_EXPORT void xf86RemoveInputEventDrainCallback(CallbackProcPtr callback,
-                                                        void *param);
 
 /* xf86Option.c */
 extern _X_EXPORT void

hw/xfree86/common/xf86Xinput_priv.h

@@ -12,4 +12,17 @@ extern InputInfoPtr xf86InputDevs;
 int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);
 InputInfoPtr xf86AllocateInput(void);
 
+void xf86PostButtonEventM(DeviceIntPtr device, int is_absolute, int button,
+                          int is_down, const ValuatorMask *mask);
+
+void xf86InputEnableVTProbe(void);
+
+InputDriverPtr xf86LookupInputDriver(const char *name);
+
+InputInfoPtr xf86LookupInput(const char *name);
+
+void xf86AddInputEventDrainCallback(CallbackProcPtr callback, void *param);
+
+void xf86RemoveInputEventDrainCallback(CallbackProcPtr callback, void *param);
+
 #endif /* _XSERVER__XF86XINPUT_H */

hw/xfree86/drivers/inputtest/xf86-input-inputtest.c

@@ -33,7 +33,7 @@
 #include <input.h>
 #include <xkbsrv.h>
 #include <xf86.h>
-#include <xf86Xinput.h>
+#include <xf86Xinput_priv.h>
 #include "xorgVersion.h"
 #include <xserver-properties.h>
 #include <os.h>