Input: uinput - fold header into the driver proper

[sfrench/cifs-2.6.git] / drivers / input / misc / uinput.c

diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index 06f3ac67dde14ef230ac2b1261bd9572021f5891..7b41aad7ec2771b9d6ccf81e32223c7bbcb57889 100644 (file)
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -31,6 +31,7 @@
  *     0.1     20/06/2002
  *             - first public version
  */
+#include <uapi/linux/uinput.h>
 #include <linux/poll.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
@@ -38,10 +39,47 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
-#include <linux/uinput.h>
 #include <linux/input/mt.h>
 #include "../input-compat.h"
 
+#define UINPUT_NAME            "uinput"
+#define UINPUT_BUFFER_SIZE     16
+#define UINPUT_NUM_REQUESTS    16
+
+enum uinput_state { UIST_NEW_DEVICE, UIST_SETUP_COMPLETE, UIST_CREATED };
+
+struct uinput_request {
+       unsigned int            id;
+       unsigned int            code;   /* UI_FF_UPLOAD, UI_FF_ERASE */
+
+       int                     retval;
+       struct completion       done;
+
+       union {
+               unsigned int    effect_id;
+               struct {
+                       struct ff_effect *effect;
+                       struct ff_effect *old;
+               } upload;
+       } u;
+};
+
+struct uinput_device {
+       struct input_dev        *dev;
+       struct mutex            mutex;
+       enum uinput_state       state;
+       wait_queue_head_t       waitq;
+       unsigned char           ready;
+       unsigned char           head;
+       unsigned char           tail;
+       struct input_event      buff[UINPUT_BUFFER_SIZE];
+       unsigned int            ff_effects_max;
+
+       struct uinput_request   *requests[UINPUT_NUM_REQUESTS];
+       wait_queue_head_t       requests_waitq;
+       spinlock_t              requests_lock;
+};
+
 static int uinput_dev_event(struct input_dev *dev,
                            unsigned int type, unsigned int code, int value)
 {