diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2011-06-23 11:19:18 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-08-25 09:50:33 +1000 |
| commit | 495e0fe1b7afa9de04ee0341da1ade4d3d4f50b8 (patch) | |
| tree | a1098e9328da259a3d6df53e345cedd01be489cf | |
| parent | 2ebf984262d6bd471b4b5f1333785865e8d3c25f (diff) | |
Use CARD32 for timestamps
As GetTimeInMillis() returns a CARD32, switch every timestamp usage to
follow.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/synaptics.c | 6 | ||||
| -rw-r--r-- | src/synapticsstr.h | 2 | ||||
| -rw-r--r-- | src/synproto.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/synaptics.c b/src/synaptics.c index 3000d7b..e2756c3 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -1444,7 +1444,7 @@ SelectTapButton(SynapticsPrivate *priv, edge_type edge) } static void -SetTapState(SynapticsPrivate *priv, enum TapState tap_state, int millis) +SetTapState(SynapticsPrivate *priv, enum TapState tap_state, CARD32 millis) { SynapticsParameters *para = &priv->synpara; DBG(7, "SetTapState - %d -> %d (millis:%d)\n", priv->tap_state, tap_state, millis); @@ -1485,7 +1485,7 @@ SetTapState(SynapticsPrivate *priv, enum TapState tap_state, int millis) } static void -SetMovingState(SynapticsPrivate *priv, enum MovingState moving_state, int millis) +SetMovingState(SynapticsPrivate *priv, enum MovingState moving_state, CARD32 millis) { DBG(7, "SetMovingState - %d -> %d center at %d/%d (millis:%d)\n", priv->moving_state, moving_state,priv->hwState.x, priv->hwState.y, millis); @@ -1680,7 +1680,7 @@ HandleTapProcessing(SynapticsPrivate *priv, struct SynapticsHwState *hw, #define HIST_DELTA(a, b, e) ((HIST((a)).e) - (HIST((b)).e)) static void -store_history(SynapticsPrivate *priv, int x, int y, unsigned int millis) +store_history(SynapticsPrivate *priv, int x, int y, CARD32 millis) { int idx = (priv->hist_index + 1) % SYNAPTICS_MOVE_HISTORY; priv->move_hist[idx].x = x; diff --git a/src/synapticsstr.h b/src/synapticsstr.h index c69ba09..a32fc73 100644 --- a/src/synapticsstr.h +++ b/src/synapticsstr.h @@ -48,7 +48,7 @@ typedef struct _SynapticsMoveHist { int x, y; - int millis; + CARD32 millis; } SynapticsMoveHistRec; enum FingerState { /* Note! The order matters. Compared with < operator. */ diff --git a/src/synproto.h b/src/synproto.h index 75f90e4..f9af37c 100644 --- a/src/synproto.h +++ b/src/synproto.h @@ -36,7 +36,7 @@ * A structure to describe the state of the touchpad hardware (buttons and pad) */ struct SynapticsHwState { - int millis; /* Timestamp in milliseconds */ + CARD32 millis; /* Timestamp in milliseconds */ int x; /* X position of finger */ int y; /* Y position of finger */ int z; /* Finger pressure */ |