From patchwork Thu May 6 21:34:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 97448 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o46LZPEY016761 for ; Thu, 6 May 2010 21:35:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752832Ab0EFVfY (ORCPT ); Thu, 6 May 2010 17:35:24 -0400 Received: from fg-out-1718.google.com ([72.14.220.159]:11166 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751171Ab0EFVfX (ORCPT ); Thu, 6 May 2010 17:35:23 -0400 Received: by fg-out-1718.google.com with SMTP id d23so534889fga.1 for ; Thu, 06 May 2010 14:35:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=jL8AR7r6HFi2rcAuxtnPBrbo1XRKmteGDW8Bm1RPO44=; b=Onrbv92bvZIrzs0tOJnbmMd9U6ae80QUMZnfg96UCAMEvq5u3N/rjm8bZGQGtQwvIy k9NxzkgLdHh0FJE/ivBq5Elnl9xE68+h78XRf3kWjRrCtSxggRNSGHH962ioUJfc1o7B Pq/0217uxAih36S/TKsBxCJ2ag+tr8GsxxMos= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=MLRsu1/hMZyTrnk2lQqUAxa299xt95gk5t9xrTqQuDu9/jiDCfd8Kc/p7vWP4oX46t uRx0TXl+kRkriskOxZe0F5sKMED4wSo9BMLm9TI5WKidodTDResL0RmaDXIN9+EUmoXV qBs+WGAG2J55FjfePb230B09tjlNfAelVwotQ= Received: by 10.102.174.35 with SMTP id w35mr12599212mue.51.1273181722339; Thu, 06 May 2010 14:35:22 -0700 (PDT) Received: from localhost.localdomain (vasut.kolej.mff.cuni.cz [78.128.198.52]) by mx.google.com with ESMTPS id u26sm5799502mug.25.2010.05.06.14.35.21 (version=SSLv3 cipher=RC4-MD5); Thu, 06 May 2010 14:35:21 -0700 (PDT) From: Marek Vasut To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, dtor@mail.ru, Marek Vasut Subject: [PATCH 1/2] iforce: Add Gullemot Jet Leader Force Feedback Date: Thu, 6 May 2010 23:34:00 +0200 Message-Id: <1273181641-24546-1-git-send-email-marek.vasut@gmail.com> X-Mailer: git-send-email 1.7.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 06 May 2010 21:35:29 +0000 (UTC) diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c index b1edd77..987faea 100644 --- a/drivers/input/joystick/iforce/iforce-main.c +++ b/drivers/input/joystick/iforce/iforce-main.c @@ -54,6 +54,9 @@ static signed short btn_avb_wheel[] = static signed short abs_joystick[] = { ABS_X, ABS_Y, ABS_THROTTLE, ABS_HAT0X, ABS_HAT0Y, -1 }; +static signed short abs_joystick_rudder[] = +{ ABS_X, ABS_Y, ABS_THROTTLE, ABS_RUDDER, ABS_HAT0X, ABS_HAT0Y, -1 }; + static signed short abs_avb_pegasus[] = { ABS_X, ABS_Y, ABS_THROTTLE, ABS_RUDDER, ABS_HAT0X, ABS_HAT0Y, ABS_HAT1X, ABS_HAT1Y, -1 }; @@ -76,6 +79,7 @@ static struct iforce_device iforce_device[] = { { 0x061c, 0xc0a4, "ACT LABS Force RS", btn_wheel, abs_wheel, ff_iforce }, //? { 0x061c, 0xc084, "ACT LABS Force RS", btn_wheel, abs_wheel, ff_iforce }, { 0x06f8, 0x0001, "Guillemot Race Leader Force Feedback", btn_wheel, abs_wheel, ff_iforce }, //? + { 0x06f8, 0x0003, "Gullemot Jet Leader Force Feedback", btn_joystick, abs_joystick_rudder, ff_iforce }, { 0x06f8, 0x0004, "Guillemot Force Feedback Racing Wheel", btn_wheel, abs_wheel, ff_iforce }, //? { 0x06f8, 0x0004, "Gullemot Jet Leader 3D", btn_joystick, abs_joystick, ff_iforce }, //? { 0x06d6, 0x29bc, "Trust Force Feedback Race Master", btn_wheel, abs_wheel, ff_iforce }, diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c index b41303d..6c96631 100644 --- a/drivers/input/joystick/iforce/iforce-usb.c +++ b/drivers/input/joystick/iforce/iforce-usb.c @@ -212,6 +212,7 @@ static struct usb_device_id iforce_usb_ids [] = { { USB_DEVICE(0x061c, 0xc0a4) }, /* ACT LABS Force RS */ { USB_DEVICE(0x061c, 0xc084) }, /* ACT LABS Force RS */ { USB_DEVICE(0x06f8, 0x0001) }, /* Guillemot Race Leader Force Feedback */ + { USB_DEVICE(0x06f8, 0x0003) }, /* Guillemot Jet Leader Force Feedback */ { USB_DEVICE(0x06f8, 0x0004) }, /* Guillemot Force Feedback Racing Wheel */ { USB_DEVICE(0x06f8, 0xa302) }, /* Guillemot Jet Leader 3D */ { } /* Terminating entry */