Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[safe/jmp/linux-2.6] / include / linux / libps2.h

diff --git a/include/linux/libps2.h b/include/linux/libps2.h
index f6f301e..b94534b 100644 (file)
--- a/include/linux/libps2.h
+++ b/include/linux/libps2.h
@@ -18,11 +18,13 @@
 #define PS2_RET_ID             0x00
 #define PS2_RET_ACK            0xfa
 #define PS2_RET_NAK            0xfe
+#define PS2_RET_ERR            0xfc
 
 #define PS2_FLAG_ACK           1       /* Waiting for ACK/NAK */
 #define PS2_FLAG_CMD           2       /* Waiting for command to finish */
 #define PS2_FLAG_CMD1          4       /* Waiting for the first byte of command response */
 #define PS2_FLAG_WAITID                8       /* Command execiting is GET ID */
+#define PS2_FLAG_NAK           16      /* Last transmission was NAKed */
 
 struct ps2dev {
        struct serio *serio;
@@ -43,7 +45,6 @@ void ps2_init(struct ps2dev *ps2dev, struct serio *serio);
 int ps2_sendbyte(struct ps2dev *ps2dev, unsigned char byte, int timeout);
 void ps2_drain(struct ps2dev *ps2dev, int maxbytes, int timeout);
 int ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command);
-int ps2_schedule_command(struct ps2dev *ps2dev, unsigned char *param, int command);
 int ps2_handle_ack(struct ps2dev *ps2dev, unsigned char data);
 int ps2_handle_response(struct ps2dev *ps2dev, unsigned char data);
 void ps2_cmd_aborted(struct ps2dev *ps2dev);