From patchwork Fri Jun 3 11:59:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Ospite X-Patchwork-Id: 846492 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p53BxBMQ003415 for ; Fri, 3 Jun 2011 11:59:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754503Ab1FCL7L (ORCPT ); Fri, 3 Jun 2011 07:59:11 -0400 Received: from smtp209.alice.it ([82.57.200.105]:58874 "EHLO smtp209.alice.it" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754497Ab1FCL7J (ORCPT ); Fri, 3 Jun 2011 07:59:09 -0400 Received: from jcn (87.6.141.50) by smtp209.alice.it (8.5.124.08) (authenticated as fospite@alice.it) id 4DE658F800214C92; Fri, 3 Jun 2011 13:59:06 +0200 Date: Fri, 3 Jun 2011 13:59:04 +0200 From: Antonio Ospite To: Bastien Nocera Cc: linux-bluetooth@vger.kernel.org, linux-input@vger.kernel.org, Jim Paris , Ranulf Doswell , "Pascal A . Brisset" , Marcin Tolysz , Christian Birchinger , Filipe Lopes , Alan Ott , Mikko Virkkila Subject: Re: [PATCH v2 3/3] Add sixaxis plugin: USB pairing and LEDs settings Message-Id: <20110603135904.096660bc.ospite@studenti.unina.it> In-Reply-To: <1304787442.2427.11.camel@novo.hadess.net> References: <1298628292-8842-1-git-send-email-ospite@studenti.unina.it> <1298628292-8842-4-git-send-email-ospite@studenti.unina.it> <1304644488.16101.28.camel@novo.hadess.net> <20110507011412.ba0ad1e9.ospite@studenti.unina.it> <1304787442.2427.11.camel@novo.hadess.net> X-Mailer: Sylpheed 3.1.1 (GTK+ 2.24.4; x86_64-pc-linux-gnu) X-Face: z*RaLf`X<@C75u6Ig9}{oW$H; 1_\2t5)({*|jhM/Vb; ]yA5\I~93>J<_`<4)A{':UrE Mime-Version: 1.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.6 (demeter2.kernel.org [140.211.167.43]); Fri, 03 Jun 2011 11:59:13 +0000 (UTC) On Sat, 07 May 2011 17:57:07 +0100 Bastien Nocera wrote: > On Sat, 2011-05-07 at 01:14 +0200, Antonio Ospite wrote: > > On Fri, 06 May 2011 02:14:38 +0100 > > Bastien Nocera wrote: > > > > > On Fri, 2011-02-25 at 11:04 +0100, Antonio Ospite wrote: > > > > + [AC_LANG_PROGRAM([[ > > > > + #include > > > > + #include > > > > + #if ! (defined(HIDIOCSFEATURE) && > > > > defined(HIDIOCGFEATURE)) > > > > + #error "HIDIOCSFEATURE and > > > > HIDIOCGFEATURE are required (linux-libc-dev >= 2.6.3x)" > > > > + #endif > > > > + ]], > > > > > > The only part of the patch I have a problem with is this one. > > > > > > I'd rather the code had: > > > #ifndef HIDIOCSFEATURE > > > #define HIDIOCSFEATURE bleh > > > #endif > > > [...] > Again, it's not compiling against older kernels. but compiling against > older kernel headers, which is a wildly different thing. > > I'd like the plugin to be enabled, even if building with older kernel > headers, as those have no relation to the capabilities of the running > kernel. > > It would also make the whole thing easier to test (just install a newer > kernel with the patches merged in, and voila, working sisaxis pairing). > Bastien, I'd fulfill your request on the lines of the following WIP patch, the intent is to make the plugin compile unconditionally still mentioning the soft dependency on 2.6.39-rc1. I could have set HAVE_HIDIOCxFEATURE in acinclude.m4 and checked for that in sixaxis.c in place of the explicit ifdefs, what is the common practice about that? I still have to take care of the runtime check when running on older kernels. Regards, Antonio diff --git a/acinclude.m4 b/acinclude.m4 index 901bb4d..e3e0fdd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -167,12 +167,12 @@ AC_DEFUN([AC_PATH_SIXAXIS], [ )],[ ac_cv_have_HIDIOCxFEATURE=yes ],[ - ac_cv_have_HIDIOCxFEATURE="no, get linux-libc-dev >= 2.6.39-rc1" + ac_cv_have_HIDIOCxFEATURE="no, emulating linux-libc-dev >= 2.6.39-rc1" ] )] ) - if ( test "${udev_found}" = "yes" && test "${ac_cv_have_HIDIOCxFEATURE}" = "yes" ); then + if ( test "${udev_found}" = "yes" ); then sixaxis_plugin_deps_found=yes fi ]) diff --git a/plugins/sixaxis.c b/plugins/sixaxis.c index 49aad25..fc12878 100644 --- a/plugins/sixaxis.c +++ b/plugins/sixaxis.c @@ -58,6 +58,16 @@ #include "storage.h" #include "sdp_lib.h" +/* Fallback definitions to compile with older headers */ +#ifndef HIDIOCGFEATURE +#define HIDIOCGFEATURE(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x07, len) +#endif + +#ifndef HIDIOCSFEATURE +#define HIDIOCSFEATURE(len) _IOC(_IOC_WRITE|_IOC_READ, 'H', 0x06, len) +#endif + + #define BDADDR_STR_SIZE 18 /* strlen("00:00:00:00:00:00") + 1 */ /* Vendor and product ID for the Sixaxis PS3 controller */