Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765412AbXEWKJ5 (ORCPT ); Wed, 23 May 2007 06:09:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758657AbXEWKJs (ORCPT ); Wed, 23 May 2007 06:09:48 -0400 Received: from ug-out-1314.google.com ([66.249.92.175]:3973 "EHLO ug-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756828AbXEWKJr (ORCPT ); Wed, 23 May 2007 06:09:47 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=kyFkUgyVHIqBS8QL2Z9vz8LEuR1grgiT37Fd01I0WnniAnZSFDFbmT5sL1W8K2GteP4RGNJHrrsx1pSJYv5TY+OTJKBzmGiyZVeHpHUXvfgkKLk7dy74q/T0WXUCahe2tYEkcpWX+Xc7+r80REk6zEvIJSfMBy3B+EbwUxujR1E= Message-ID: Date: Wed, 23 May 2007 11:09:46 +0100 From: "Renato Golin" To: "Jiri Kosina" Subject: Re: [PATCH] joydev.c automatic re-calibration Cc: linux-kernel@vger.kernel.org, "Dmitry Torokhov" In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline References: Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4572 Lines: 118 This small patch adds the automatic recalibration feature without spoiling previously calibrated devices. It's a fix for those joysticks that report faulty range, specially Saitek Cyborg Evo Force. File: drivers/input/joydev.c Fix: - extracted code from joydev_connect to method joydev_calculate_correction to be able to call it from both joydev_event upon recalibration and joydev_connect during first connection. - on joydev_connect check ranges and zero calibration if found out of range - on joydev_event, every time found out of range, update min/max and recalculate the correction PS: adding Signed-off-by line (is that it?) Signed-off-by: Renato Golin $ diff -u joydev.c.original joydev.c --- joydev.c.original 2007-05-22 22:23:43.000000000 +0100 +++ joydev.c 2007-05-23 01:24:04.000000000 +0100 @@ -53,6 +53,8 @@ __u8 absmap[ABS_MAX + 1]; __u8 abspam[ABS_MAX + 1]; __s16 abs[ABS_MAX + 1]; + __s16 absmin[ABS_MAX + 1]; + __s16 absmax[ABS_MAX + 1]; }; struct joydev_list { @@ -67,6 +69,19 @@ static struct joydev *joydev_table[JOYDEV_MINORS]; +static void joydev_calculate_correction(int min, int max, int axis, struct joydev *joydev) +{ + int t, j = joydev->abspam[axis]; + int flat = joydev->handle.dev->absflat[j]; + + joydev->corr[axis].coef[0] = (max + min) / 2 - flat; + joydev->corr[axis].coef[1] = (max + min) / 2 + flat; + if (!(t = ((max - min) / 2 - 2 * flat))) + return; + joydev->corr[axis].coef[2] = (1 << 29) / t; + joydev->corr[axis].coef[3] = (1 << 29) / t; +} + static int joydev_correct(int value, struct js_corr *corr) { switch (corr->type) { @@ -103,6 +118,14 @@ case EV_ABS: event.type = JS_EVENT_AXIS; event.number = joydev->absmap[code]; + /* recalibration if needed */ + if (value < joydev->absmin[code]) { + joydev->absmin[code] = value; + joydev_calculate_correction(value, joydev->absmax[code], code, joydev); + } else if (value > joydev->absmax[code]) { + joydev->absmax[code] = value; + joydev_calculate_correction(joydev->absmin[code], value, code, joydev); + } event.value = joydev_correct(value, joydev->corr + event.number); if (event.value == joydev->abs[event.number]) return; @@ -470,7 +493,7 @@ { struct joydev *joydev; struct class_device *cdev; - int i, j, t, minor; + int i, j, minor; for (minor = 0; minor < JOYDEV_MINORS && joydev_table[minor]; minor++); if (minor == JOYDEV_MINORS) { @@ -515,19 +538,21 @@ for (i = 0; i < joydev->nabs; i++) { j = joydev->abspam[i]; - if (dev->absmax[j] == dev->absmin[j]) { + joydev->absmin[i] = dev->absmin[j]; + joydev->absmax[i] = dev->absmax[j]; + if (joydev->absmax[i] == joydev->absmin[i]) { joydev->corr[i].type = JS_CORR_NONE; joydev->abs[i] = dev->abs[j]; continue; } joydev->corr[i].type = JS_CORR_BROKEN; joydev->corr[i].prec = dev->absfuzz[j]; - joydev->corr[i].coef[0] = (dev->absmax[j] + dev->absmin[j]) / 2 - dev->absflat[j]; - joydev->corr[i].coef[1] = (dev->absmax[j] + dev->absmin[j]) / 2 + dev->absflat[j]; - if (!(t = ((dev->absmax[j] - dev->absmin[j]) / 2 - 2 * dev->absflat[j]))) - continue; - joydev->corr[i].coef[2] = (1 << 29) / t; - joydev->corr[i].coef[3] = (1 << 29) / t; + + if (dev->abs[j] > joydev->absmax[i] || dev->abs[j] < joydev->absmin[i]) { + printk("Joydev: Bad axis range, recalibrating automatically\n"); + joydev_calculate_correction(0, 0, i, joydev); + } else + joydev_calculate_correction(joydev->absmin[i], joydev->absmax[i], i, joydev); joydev->abs[i] = joydev_correct(dev->abs[j], joydev->corr + i); } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/