vserver 1.9.3

[linux-2.6.git] / drivers / input / mouse / psmouse.h

diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
index 47fbc48..20bbab4 100644 (file)
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
@@ -9,6 +9,7 @@
 #define PSMOUSE_CMD_GETID      0x02f2
 #define PSMOUSE_CMD_SETRATE    0x10f3
 #define PSMOUSE_CMD_ENABLE     0x00f4
+#define PSMOUSE_CMD_DISABLE    0x00f5
 #define PSMOUSE_CMD_RESET_DIS  0x00f6
 #define PSMOUSE_CMD_RESET_BAT  0x02ff
 
@@ -17,10 +18,17 @@
 #define PSMOUSE_RET_ACK                0xfa
 #define PSMOUSE_RET_NAK                0xfe
 
-/* psmouse states */
-#define PSMOUSE_CMD_MODE       0
-#define PSMOUSE_ACTIVATED      1
-#define PSMOUSE_IGNORE         2
+#define PSMOUSE_FLAG_ACK       0       /* Waiting for ACK/NAK */
+#define PSMOUSE_FLAG_CMD       1       /* Waiting for command to finish */
+#define PSMOUSE_FLAG_CMD1      2       /* Waiting for the first byte of command response */
+#define PSMOUSE_FLAG_WAITID    3       /* Command execiting is GET ID */
+
+enum psmouse_state {
+       PSMOUSE_IGNORE,
+       PSMOUSE_INITIALIZING,
+       PSMOUSE_CMD_MODE,
+       PSMOUSE_ACTIVATED,
+};
 
 /* psmouse protocol handler return codes */
 typedef enum {
@@ -29,20 +37,10 @@ typedef enum {
        PSMOUSE_FULL_PACKET
 } psmouse_ret_t;
 
-struct psmouse;
-
-struct psmouse_ptport {
-       struct serio serio;
-
-       void (*activate)(struct psmouse *parent);
-       void (*deactivate)(struct psmouse *parent);
-};
-
 struct psmouse {
        void *private;
        struct input_dev dev;
        struct serio *serio;
-       struct psmouse_ptport *ptport;
        char *vendor;
        char *name;
        unsigned char cmdbuf[8];
@@ -53,16 +51,22 @@ struct psmouse {
        unsigned char model;
        unsigned long last;
        unsigned long out_of_sync;
-       unsigned char state;
-       char acking;
-       volatile char ack;
+       enum psmouse_state state;
+       unsigned char nak;
        char error;
        char devname[64];
        char phys[32];
+       unsigned long flags;
 
-       psmouse_ret_t (*protocol_handler)(struct psmouse *psmouse, struct pt_regs *regs); 
+       /* Used to signal completion from interrupt handler */
+       wait_queue_head_t wait;
+
+       psmouse_ret_t (*protocol_handler)(struct psmouse *psmouse, struct pt_regs *regs);
        int (*reconnect)(struct psmouse *psmouse);
        void (*disconnect)(struct psmouse *psmouse);
+
+       void (*pt_activate)(struct psmouse *psmouse);
+       void (*pt_deactivate)(struct psmouse *psmouse);
 };
 
 #define PSMOUSE_PS2            1