From 21a13b61e0b34499187f3890a28062191fe1ba4b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Mal=C3=BD?= Date: Thu, 23 Jul 2015 22:15:33 +0200 Subject: [PATCH] Add support for effect repeating. --- klgd_ff_plugin.c | 36 ++++++++++++++++++++++++++---------- klgd_ff_plugin_p.h | 1 + 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/klgd_ff_plugin.c b/klgd_ff_plugin.c index 771d7eb..c88e214 100644 --- a/klgd_ff_plugin.c +++ b/klgd_ff_plugin.c @@ -329,6 +329,21 @@ static int ffpl_upload_effect(struct klgd_plugin_private *priv, struct klgd_comm return 0; } +static void ffpl_calculate_trip_times(struct ffpl_effect *eff, const unsigned long now) +{ + const struct ff_effect *ueff = &eff->latest; + + eff->start_at = now + msecs_to_jiffies(ueff->replay.delay); + + if (ueff->replay.delay) + printk(KERN_NOTICE "KLGDFF: Delayed effect will be started at %lu, now: %lu\n", eff->start_at, now); + + if (ueff->replay.length) { + eff->stop_at = eff->start_at + msecs_to_jiffies(ueff->replay.length); + printk(KERN_NOTICE "KLGDFF: Finite effect will be stopped at %lu, now: %lu\n", eff->stop_at, now); + } +} + /* Destroy request - input device is being destroyed */ static void ffpl_destroy_rq(struct ff_device *ff) { @@ -360,23 +375,14 @@ static int ffpl_playback_rq(struct input_dev *dev, int effect_id, int value) struct klgd_plugin *self = dev->ff->private; struct klgd_plugin_private *priv = self->private; struct ffpl_effect *eff = &priv->effects[effect_id]; - struct ff_effect *ueff = &eff->latest; const unsigned long now = jiffies; klgd_lock_plugins(self->plugins_lock); if (value) { eff->repeat = value; - eff->start_at = now + msecs_to_jiffies(ueff->replay.delay); + ffpl_calculate_trip_times(eff, now); eff->trigger = FFPL_TRIG_START; - - if (ueff->replay.delay) - printk(KERN_NOTICE "KLGDFF: Delayed effect will be started at %lu, now: %lu\n", eff->start_at, now); - - if (ueff->replay.length) { - eff->stop_at = eff->start_at + msecs_to_jiffies(ueff->replay.length); - printk(KERN_NOTICE "KLGDFF: Finite effect will be stopped at %lu, now: %lu\n", eff->stop_at, now); - } } else { eff->trigger = FFPL_TRIG_STOP; } @@ -656,6 +662,9 @@ static void ffpl_advance_trigger(struct ffpl_effect *eff, const unsigned long no else eff->trigger = FFPL_TRIG_NONE; break; + case FFPL_TRIG_RESTART: + eff->trigger = FFPL_TRIG_STOP; + break; case FFPL_TRIG_RECALC: if (ffpl_needs_recalculation(&eff->active, now - eff->start_at, eff->stop_at, now)) break; @@ -664,6 +673,10 @@ static void ffpl_advance_trigger(struct ffpl_effect *eff, const unsigned long no break; } case FFPL_TRIG_STOP: + if (eff->repeat > 0) { + eff->trigger = FFPL_TRIG_RESTART; + break; + } case FFPL_TRIG_NOW: eff->trigger = FFPL_TRIG_NONE; break; @@ -686,6 +699,8 @@ static bool ffpl_get_update_time(struct klgd_plugin *self, const unsigned long n case FFPL_TRIG_NOW: current_t = now; break; + case FFPL_TRIG_RESTART: + ffpl_calculate_trip_times(eff, now); case FFPL_TRIG_START: current_t = eff->start_at; eff->change = FFPL_TO_START; @@ -693,6 +708,7 @@ static bool ffpl_get_update_time(struct klgd_plugin *self, const unsigned long n case FFPL_TRIG_STOP: current_t = eff->stop_at; eff->change = FFPL_TO_STOP; + eff->repeat--; break; case FFPL_TRIG_RECALC: current_t = ffpl_get_recalculation_time(eff); diff --git a/klgd_ff_plugin_p.h b/klgd_ff_plugin_p.h index 7ed5f15..c5ae9be 100644 --- a/klgd_ff_plugin_p.h +++ b/klgd_ff_plugin_p.h @@ -22,6 +22,7 @@ enum ffpl_trigger { FFPL_TRIG_NONE, /* No timing event scheduled for and effect */ FFPL_TRIG_NOW, /* State change has been set elsewhere and is to be processed immediately */ FFPL_TRIG_START, /* Effect is to be started */ + FFPL_TRIG_RESTART,/* Effect is to be restarted */ FFPL_TRIG_STOP, /* Effect is to be stopped */ FFPL_TRIG_RECALC /* Effect needs to be recalculated */ }; -- 2.43.5