aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/psmouse.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2018-03-17 10:58:05 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2018-03-17 10:58:05 -0700
commitba521f1bd202237d2c1dea95e4213169b8c6ba01 (patch)
tree2a0a1b5e158a2a2311221f05b873cbae6672643d /drivers/input/mouse/psmouse.h
parentInput: gpio-keys - add support for wakeup event action (diff)
parentInput: trackpoint - combine calls to ps2_command() (diff)
downloadlinux-dev-ba521f1bd202237d2c1dea95e4213169b8c6ba01.tar.xz
linux-dev-ba521f1bd202237d2c1dea95e4213169b8c6ba01.zip
Merge branch 'psmouse' into next
Merge various PS/2 handling improvements.
Diffstat (limited to 'drivers/input/mouse/psmouse.h')
-rw-r--r--drivers/input/mouse/psmouse.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
index 8cd453808cc7..71ac50082c8b 100644
--- a/drivers/input/mouse/psmouse.h
+++ b/drivers/input/mouse/psmouse.h
@@ -131,7 +131,6 @@ struct psmouse {
void psmouse_queue_work(struct psmouse *psmouse, struct delayed_work *work,
unsigned long delay);
-int psmouse_sliced_command(struct psmouse *psmouse, unsigned char command);
int psmouse_reset(struct psmouse *psmouse);
void psmouse_set_state(struct psmouse *psmouse, enum psmouse_state new_state);
void psmouse_set_resolution(struct psmouse *psmouse, unsigned int resolution);
@@ -140,6 +139,10 @@ int psmouse_activate(struct psmouse *psmouse);
int psmouse_deactivate(struct psmouse *psmouse);
bool psmouse_matches_pnp_id(struct psmouse *psmouse, const char * const ids[]);
+void psmouse_report_standard_buttons(struct input_dev *, u8 buttons);
+void psmouse_report_standard_motion(struct input_dev *, u8 *packet);
+void psmouse_report_standard_packet(struct input_dev *, u8 *packet);
+
struct psmouse_attribute {
struct device_attribute dattr;
void *data;