From b0f79596364666790d354baf233e4aa188911b63 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Mal=C3=BD?= Date: Wed, 1 Oct 2014 15:14:23 +0200 Subject: [PATCH] Set state change to TO_UPLOAD when effect is to be replaced --- klgd_ff_plugin.c | 6 ++++-- klgdff.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/klgd_ff_plugin.c b/klgd_ff_plugin.c index b12b9e4..9ad78a4 100644 --- a/klgd_ff_plugin.c +++ b/klgd_ff_plugin.c @@ -201,9 +201,10 @@ static int ffpl_upload_rq(struct input_dev *dev, struct ff_effect *effect, struc eff->latest = *effect; if (eff->state != FFPL_EMPTY) { - if (ffpl_needs_replacing(&eff->active, &eff->latest)) + if (ffpl_needs_replacing(&eff->active, &eff->latest)) { eff->replace = true; - else { + eff->change = FFPL_TO_UPLOAD; + } else { eff->replace = false; eff->change = FFPL_TO_UPDATE; } @@ -322,6 +323,7 @@ static struct klgd_command_stream * ffpl_get_commands(struct klgd_plugin *self, ret = ffpl_start_effect(priv, s, eff); break; } + break; case FFPL_DONT_TOUCH: printk(KERN_WARNING "Got FFPL_DONT_TOUCH change for effect that should be replaced - this should not happen!\n"); break; diff --git a/klgdff.c b/klgdff.c index 90719ec..63e0b33 100644 --- a/klgdff.c +++ b/klgdff.c @@ -248,7 +248,7 @@ static int __init klgdff_init(void) input_set_abs_params(dev, ABS_Y, -0x7fff, 0x7fff, 0, 0); ret = ffpl_init_plugin(&ff_plugin, dev, EFFECT_COUNT, ffbits, - FFPL_UPLOAD_WHEN_STARTED | FFPL_REPLACE_STARTED, + FFPL_HAS_EMP_TO_SRT | FFPL_REPLACE_STARTED, klgdff_control); if (ret) { printk(KERN_ERR "KLGDFF: Cannot init plugin\n"); -- 2.43.5