Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / input / mouse / hgpk.h

diff --git a/drivers/input/mouse/hgpk.h b/drivers/input/mouse/hgpk.h
index d61cfd3ee9cb2f1e176ad0bc10db6330b1a16d3b..311c0e87fcbf42b464a0df641e5ff3579dcdce8b 100644 (file)
--- a/drivers/input/mouse/hgpk.h
+++ b/drivers/input/mouse/hgpk.h
@@ -5,6 +5,9 @@
 #ifndef _HGPK_H
 #define _HGPK_H
 
+#define HGPK_GS                0xff       /* The GlideSensor */
+#define HGPK_PT                0xcf       /* The PenTablet */
+
 enum hgpk_model_t {
        HGPK_MODEL_PREA = 0x0a, /* pre-B1s */
        HGPK_MODEL_A = 0x14,    /* found on B1s, PT disabled in hardware */
@@ -13,12 +16,34 @@ enum hgpk_model_t {
        HGPK_MODEL_D = 0x50,    /* C1, mass production */
 };
 
+enum hgpk_spew_flag {
+       NO_SPEW,
+       MAYBE_SPEWING,
+       SPEW_DETECTED,
+       RECALIBRATING,
+};
+
+#define SPEW_WATCH_COUNT 42  /* at 12ms/packet, this is 1/2 second */
+
+enum hgpk_mode {
+       HGPK_MODE_MOUSE,
+       HGPK_MODE_GLIDESENSOR,
+       HGPK_MODE_PENTABLET,
+       HGPK_MODE_INVALID
+};
+
 struct hgpk_data {
        struct psmouse *psmouse;
+       enum hgpk_mode mode;
        bool powered;
-       int count, x_tally, y_tally;    /* hardware workaround stuff */
+       enum hgpk_spew_flag spew_flag;
+       int spew_count, x_tally, y_tally;       /* spew detection */
        unsigned long recalib_window;
        struct delayed_work recalib_wq;
+       int abs_x, abs_y;
+       int dupe_count;
+       int xbigj, ybigj, xlast, ylast; /* jumpiness detection */
+       int xsaw_secondary, ysaw_secondary; /* jumpiness detection */
 };
 
 #define hgpk_dbg(psmouse, format, arg...)              \
@@ -33,9 +58,13 @@ struct hgpk_data {
        dev_notice(&(psmouse)->ps2dev.serio->dev, format, ## arg)
 
 #ifdef CONFIG_MOUSE_PS2_OLPC
+void hgpk_module_init(void);
 int hgpk_detect(struct psmouse *psmouse, bool set_properties);
 int hgpk_init(struct psmouse *psmouse);
 #else
+static inline void hgpk_module_init(void)
+{
+}
 static inline int hgpk_detect(struct psmouse *psmouse, bool set_properties)
 {
        return -ENODEV;