diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-11-20 00:51:22 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-11-20 00:51:22 -0500 |
| commit | 29506415a0ff0152cc2928f8fcac724fbbf98651 (patch) | |
| tree | e1da48667c6b0499f2ea882b1d762758241da1e6 /include/linux | |
| parent | e753b650e10af8a040b1081e72088b826bdef72f (diff) | |
| download | blackbird-op-linux-29506415a0ff0152cc2928f8fcac724fbbf98651.tar.gz blackbird-op-linux-29506415a0ff0152cc2928f8fcac724fbbf98651.zip | |
Input: uinput - convert to dynalloc allocation
Also introduce proper locking when creating/deleting device.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/uinput.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/uinput.h b/include/linux/uinput.h index 84876077027f..6fd1a47acab2 100644 --- a/include/linux/uinput.h +++ b/include/linux/uinput.h @@ -34,8 +34,7 @@ #define UINPUT_BUFFER_SIZE 16 #define UINPUT_NUM_REQUESTS 16 -/* state flags => bit index for {set|clear|test}_bit ops */ -#define UIST_CREATED 0 +enum uinput_state { UIST_NEW_DEVICE, UIST_SETUP_COMPLETE, UIST_CREATED }; struct uinput_request { int id; @@ -52,11 +51,12 @@ struct uinput_request { struct uinput_device { struct input_dev *dev; - unsigned long state; + struct semaphore sem; + enum uinput_state state; wait_queue_head_t waitq; - unsigned char ready, - head, - tail; + unsigned char ready; + unsigned char head; + unsigned char tail; struct input_event buff[UINPUT_BUFFER_SIZE]; struct uinput_request *requests[UINPUT_NUM_REQUESTS]; |
