From: Michal Malý <madcatxster@devoid-pointer.net>
Date: Sun, 20 Sep 2015 20:08:32 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/MadCatX/LinuxFF-KLGDFF
X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=06391bc21d13464017ab10962ea62ca875069b7b;p=KLGD_FF_plugin.git

Merge branch 'master' of https://github.com/MadCatX/LinuxFF-KLGDFF
---

06391bc21d13464017ab10962ea62ca875069b7b
diff --cc klgd_ff_plugin.h
index f110e8b,9a6cc49..ef82fbc
--- a/klgd_ff_plugin.h
+++ b/klgd_ff_plugin.h
@@@ -17,13 -17,9 +17,12 @@@
  					    Device must support FF_CONSTANT for this to work. */
  #define FFPL_MEMLESS_RAMP BIT(8)	 /* Device cannot process FF_RAMP by itself and requires KLGD-FF to calculate the overall force.
  					    Device must support FF_CONSTANT for this to work. */
 -#define FFPL_TIMING_CONDITION BIT(9)	 /* Let the plugin take care of starting and stopping of condition effects */
 +#define FFPL_MEMLESS_RUMBLE BIT(9)	 /* Device cannot process FF_RUMBLE by itself and requires KLGD-FF to calculate the overall force.
 +					    Device must support FF_RUMBLE for this to work. */
 +
 +#define FFPL_TIMING_CONDITION BIT(10)	 /* Let the plugin take care of starting and stopping of condition effects */
  
  #define FFPL_HAS_NATIVE_GAIN BIT(15)  /* Device can adjust the gain by itself */
- #define FFPL_HAS_AUTOCENTER BIT(16) /* Device supports autocentering */
  
  enum ffpl_control_command {
  	/* Force feedback state transitions */
diff --cc klgdff.c
index f282dcd,51b1260..cc5a142
--- a/klgdff.c
+++ b/klgdff.c
@@@ -354,10 -354,10 +354,11 @@@ static int __init klgdff_init(void
  	input_set_capability(dev, EV_KEY, BTN_TRIGGER);
  	input_set_abs_params(dev, ABS_X, -0x7fff, 0x7fff, 0, 0);
  	input_set_abs_params(dev, ABS_Y, -0x7fff, 0x7fff, 0, 0);
+ 	set_bit(FF_AUTOCENTER, &ffbits);
  
  	ret = ffpl_init_plugin(&ff_plugin, dev, EFFECT_COUNT, ffbits,
- 			       FFPL_HAS_EMP_TO_SRT | FFPL_REPLACE_STARTED | FFPL_HAS_AUTOCENTER |
 -			       FFPL_HAS_EMP_TO_SRT | FFPL_REPLACE_STARTED | FFPL_MEMLESS_RAMP | FFPL_TIMING_CONDITION,
++			       FFPL_HAS_EMP_TO_SRT | FFPL_REPLACE_STARTED |
 +			       FFPL_MEMLESS_CONSTANT | FFPL_MEMLESS_RUMBLE | FFPL_TIMING_CONDITION,
  			       klgdff_control, &test_user);
  	if (ret) {
  		printk(KERN_ERR "KLGDFF-TD: Cannot init plugin\n");