Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965072AbVLNXbQ (ORCPT ); Wed, 14 Dec 2005 18:31:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S965082AbVLNXbQ (ORCPT ); Wed, 14 Dec 2005 18:31:16 -0500 Received: from hansmi.home.forkbomb.ch ([213.144.146.165]:49692 "EHLO hansmi.home.forkbomb.ch") by vger.kernel.org with ESMTP id S965072AbVLNXbP (ORCPT ); Wed, 14 Dec 2005 18:31:15 -0500 Date: Thu, 15 Dec 2005 00:31:08 +0100 From: Michael Hanselmann To: dtor_core@ameritech.net Cc: Johannes Berg , linux-kernel@vger.kernel.org, linux-input@atrey.karlin.mff.cuni.cz, linuxppc-dev@ozlabs.org, stelian@popies.net, kernel-stuff@comcast.net Subject: Re: [PATCH 2.6 1/2] usb/input: Add relayfs support to appletouch driver Message-ID: <20051214233108.GA20127@hansmi.ch> References: <20051213223659.GB20017@hansmi.ch> <1134568620.3875.6.camel@localhost> <20051214213923.GB17548@hansmi.ch> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5238 Lines: 176 This patch adds support for relayfs to the appletouch driver to make debugging easier. Signed-off-by: Michael Hanselmann Acked-by: Rene Nussbaumer Acked-by: Johannes Berg --- > Initializing with 0/NULL adds to the size of the image for no reason. Does gcc automatically initialize them to that value? > Haveing ifdefs in the middle of the code is not too nice. can we > please have something like this: > [...] > Also, would not it be better to initialize relayfs only when device is > opened because there won't be any data otehrwise? Sure, both is done in this patch: diff -rup linux-2.6.15-rc5.orig/Documentation/input/appletouch.txt b/Documentation/input/appletouch.txt --- linux-2.6.15-rc5.orig/Documentation/input/appletouch.txt 2005-12-13 00:09:24.000000000 +0100 +++ b/Documentation/input/appletouch.txt 2005-12-15 00:09:33.000000000 +0100 @@ -77,6 +77,8 @@ full tracing (each sample is being trace or echo "1" > /sys/module/appletouch/parameters/debug +To make debugging easier, the driver also supports the relayfs filesystem. + Links: ------ diff -rup linux-2.6.15-rc5.orig/drivers/usb/input/appletouch.c b/drivers/usb/input/appletouch.c --- linux-2.6.15-rc5.orig/drivers/usb/input/appletouch.c 2005-12-13 22:44:24.000000000 +0100 +++ b/drivers/usb/input/appletouch.c 2005-12-15 00:25:09.000000000 +0100 @@ -6,6 +6,8 @@ * Copyright (C) 2005 Stelian Pop (stelian@popies.net) * Copyright (C) 2005 Frank Arnold (frank@scirocco-5v-turbo.de) * Copyright (C) 2005 Peter Osterlund (petero2@telia.com) + * Copyright (C) 2005 Parag Warudkar (parag.warudkar@gmail.com) + * Copyright (C) 2005 Michael Hanselmann (linux-kernel@hansmi.ch) * * Thanks to Alex Harper for his inputs. * @@ -35,6 +37,10 @@ #include #include +#if defined(CONFIG_RELAYFS_FS) || defined(CONFIG_RELAYFS_FS_MODULE) +#include +#endif + /* Apple has powerbooks which have the keyboard with different Product IDs */ #define APPLE_VENDOR_ID 0x05AC @@ -73,6 +79,7 @@ MODULE_DEVICE_TABLE (usb, atp_table); /* maximum pressure this driver will report */ #define ATP_PRESSURE 300 + /* * multiplication factor for the X and Y coordinates. * We try to keep the touchpad aspect ratio while still doing only simple @@ -124,7 +131,7 @@ struct atp { if (debug) printk(format, ##a); \ } while (0) -MODULE_AUTHOR("Johannes Berg, Stelian Pop, Frank Arnold"); +MODULE_AUTHOR("Johannes Berg, Stelian Pop, Frank Arnold, Parag Warudkar, Michael Hanselmann"); MODULE_DESCRIPTION("Apple PowerBooks USB touchpad driver"); MODULE_LICENSE("GPL"); @@ -132,6 +139,68 @@ static int debug = 1; module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "Activate debugging output"); +#if defined(CONFIG_RELAYFS_FS) || defined(CONFIG_RELAYFS_FS_MODULE) +static int relayfs; +module_param(relayfs, int, 0444); +MODULE_PARM_DESC(relayfs, "Activate relayfs support"); + +struct rchan *rch; +struct rchan_callbacks *rcb; + +static inline void atp_relayfs_dump(struct atp *dev) +{ + /* "rch" is NULL if relayfs is disabled */ + if (rch && dev->data) { + relay_write(rch, dev->data, dev->urb->actual_length); + } +} + +static int appletouch_relayfs_init(void) +{ + // Make sure the variables aren't initialized to some bogus value when + // relayfs is disabled + rcb = NULL; + rch = NULL; + + if (relayfs) { + rcb = kmalloc(sizeof(struct rchan_callbacks), GFP_KERNEL); + if (!rcb) + return -ENOMEM; + + rcb->subbuf_start = NULL; + rcb->buf_mapped = NULL; + rcb->buf_unmapped = NULL; + + rch = relay_open("atpdata", NULL, 256, 256, NULL); + if (!rch) { + kfree(rcb); + return -ENOMEM; + } + + printk(KERN_INFO "appletouch: Relayfs enabled.\n"); + } + + return 0; +} + +static void appletouch_relayfs_exit(void) +{ + if (rch) { + printk(KERN_INFO "appletouch: Relayfs disabled\n"); + relay_close(rch); + rch = NULL; + } + if (rcb) { + kfree(rcb); + rcb = NULL; + } +} +#else +static inline void atp_relayfs_dump(struct atp *dev) { } +static int appletouch_relayfs_init(void) { return 0; } +static void appletouch_relayfs_exit(void) { } +#endif + static int atp_calculate_abs(int *xy_sensors, int nb_sensors, int fact, int *z, int *fingers) { @@ -194,6 +263,8 @@ static void atp_complete(struct urb* urb goto exit; } + atp_relayfs_dump(dev); + /* reorder the sensors values */ for (i = 0; i < 8; i++) { /* X values */ @@ -297,6 +368,11 @@ exit: static int atp_open(struct input_dev *input) { struct atp *dev = input->private; + int result; + + result = appletouch_relayfs_init(); + if (result < 0) + return result; if (usb_submit_urb(dev->urb, GFP_ATOMIC)) return -EIO; @@ -310,6 +386,8 @@ static void atp_close(struct input_dev * struct atp *dev = input->private; usb_kill_urb(dev->urb); + appletouch_relayfs_exit(); + dev->open = 0; } - 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/