From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Subject: Re: [RFC, PATCH] gspca pac7302: add support for camera button Date: Sun, 15 Nov 2009 11:23:01 +0100 Message-ID: <4AFFD685.9060209@redhat.com> References: <4AFFC00F.6060704@freemail.hu> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-2; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mx1.redhat.com ([209.132.183.28]:15083 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752567AbZKOKQ2 (ORCPT ); Sun, 15 Nov 2009 05:16:28 -0500 In-Reply-To: <4AFFC00F.6060704@freemail.hu> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: =?ISO-8859-2?Q?N=E9meth_M=E1rton?= Cc: Jean-Francois Moine , V4L Mailing List , linux-input@vger.kernel.org Hi, Thanks for working on this! I think it would be great if we could get support for camera buttons in general into gspca. I've not looked closely at your code yet, have you looked at the camera button code in the gspca sn9c20x.c driver? Also I would real= ly like to see as much of the button handling code as possible go into the gspca core. AFAIK many many camera's use an usb interrupt ep for th= is, so I would like to see the setting up and cleanup of this interrupt ep be = in the core (as said before see the sn9c20x driver for another driver whic= h does such things). Regards, Hans On 11/15/2009 09:47 AM, N=E9meth M=E1rton wrote: > From: M=E1rton N=E9meth > > Add support for snapshot button found on Labtec Webcam 2200. > > Signed-off-by: M=E1rton N=E9meth > --- > Hi, > > this is the first trial to add support for the snapshot button. This > code is working only before the streaming is started. When the stream= ing > is started the alternate number of the interface 0 is changed and the > interrupt URB is no longer usable. I guess the interrupt URB is to > be reconstructed every time when the alternate number is changed. > > When I disconnect the device I get the following error: > > uhci_hcd 0000:00:1d.1: dma_pool_free buffer-32, f58ba168/358ba168 (ba= d dma) > > I guess something is wrong in this patch with the cleanup routine. > > Regards, > > M=E1rton N=E9meth > > --- > diff -r 09c1284de47d linux/drivers/media/video/gspca/gspca.h > --- a/linux/drivers/media/video/gspca/gspca.h Sat Nov 14 08:58:12 200= 9 +0100 > +++ b/linux/drivers/media/video/gspca/gspca.h Sun Nov 15 10:40:54 200= 9 +0100 > @@ -138,6 +138,7 @@ > struct module *module; /* subdriver handling the device */ > struct usb_device *dev; > struct file *capt_file; /* file doing video capture */ > + struct input_dev *input_dev; > > struct cam cam; /* device information */ > const struct sd_desc *sd_desc; /* subdriver description */ > @@ -147,6 +148,7 @@ > #define USB_BUF_SZ 64 > __u8 *usb_buf; /* buffer for USB exchanges */ > struct urb *urb[MAX_NURBS]; > + struct urb *int_urb; > > __u8 *frbuf; /* buffer for nframes */ > struct gspca_frame frame[GSPCA_MAX_FRAMES]; > diff -r 09c1284de47d linux/drivers/media/video/gspca/pac7302.c > --- a/linux/drivers/media/video/gspca/pac7302.c Sat Nov 14 08:58:12 2= 009 +0100 > +++ b/linux/drivers/media/video/gspca/pac7302.c Sun Nov 15 10:40:54 2= 009 +0100 > @@ -68,6 +68,7 @@ > > #define MODULE_NAME "pac7302" > > +#include > #include > #include "gspca.h" > > @@ -1220,6 +1221,50 @@ > } > #endif > > +#if LINUX_VERSION_CODE< KERNEL_VERSION(2, 6, 19) > +static void int_irq(struct urb *urb, struct pt_regs *regs) > +#else > +static void int_irq(struct urb *urb) > +#endif > +{ > + struct gspca_dev *gspca_dev =3D (struct gspca_dev *) urb->context; > + int ret; > + int i; > + __u8 data0, data1; > + > + printk(KERN_DEBUG "int_irq()\n"); > + printk(KERN_DEBUG "urb->status: %i\n", urb->status); > + if (urb->status =3D=3D 0) { > + printk(KERN_DEBUG "urb->actual_length: %u\n", urb->actual_length); > + for (i =3D 0; i< urb->actual_length; i++) { > + printk(KERN_DEBUG "urb->transfer_buffer[%i]=3D0x%x\n", > + i, ((__u8*)urb->transfer_buffer)[i]); > + } > + if (urb->actual_length =3D=3D 2) { > + data0 =3D ((__u8*)urb->transfer_buffer)[0]; > + data1 =3D ((__u8*)urb->transfer_buffer)[1]; > + if ((data0 =3D=3D 0x00&& data1 =3D=3D 0x11) || > + (data0 =3D=3D 0x22&& data1 =3D=3D 0x33) || > + (data0 =3D=3D 0x44&& data1 =3D=3D 0x55) || > + (data0 =3D=3D 0x66&& data1 =3D=3D 0x77) || > + (data0 =3D=3D 0x88&& data1 =3D=3D 0x99) || > + (data0 =3D=3D 0xaa&& data1 =3D=3D 0xbb) || > + (data0 =3D=3D 0xcc&& data1 =3D=3D 0xdd) || > + (data0 =3D=3D 0xee&& data1 =3D=3D 0xff)) { > + input_report_key(gspca_dev->input_dev, KEY_CAMERA, 1); > + input_sync(gspca_dev->input_dev); > + input_report_key(gspca_dev->input_dev, KEY_CAMERA, 0); > + input_sync(gspca_dev->input_dev); > + } else > + printk(KERN_DEBUG "Unknown packet received\n"); > + } > + ret =3D usb_submit_urb(urb, GFP_ATOMIC); > + printk(KERN_DEBUG "resubmit urb: %i\n", ret); > + } > + > +} > + > + > /* sub-driver description for pac7302 */ > static struct sd_desc sd_desc =3D { > .name =3D MODULE_NAME, > @@ -1254,19 +1299,132 @@ > }; > MODULE_DEVICE_TABLE(usb, device_table); > > +static int init_camera_input(struct gspca_dev *gspca_dev, const stru= ct usb_device_id *id) > +{ > + struct input_dev *input_dev; > + int err; > + > + printk(KERN_DEBUG "allocating input device\n"); > + input_dev =3D input_allocate_device(); > + if (!input_dev) > + return -ENOMEM; > + > + //input_dev->name =3D "Camera capture button"; > + //input_dev->phys =3D "camera"; > + input_dev->id.bustype =3D BUS_USB; > + input_dev->id.vendor =3D id->idVendor; > + input_dev->id.product =3D id->idProduct; > + input_dev->id.version =3D id->bcdDevice_hi; > + //input_dev->id.version =3D id->bcdDevice_lo; > + > + input_dev->evbit[0] =3D BIT_MASK(EV_KEY); > + input_dev->keybit[BIT_WORD(KEY_CAMERA)] =3D BIT_MASK(KEY_CAMERA); > + //input_dev->dev.parent =3D ; > + > + printk(KERN_DEBUG "registering input device\n"); > + err =3D input_register_device(input_dev); > + if (err) { > + input_dev->dev.parent =3D NULL; > + input_free_device(input_dev); > + } else { > + gspca_dev->input_dev =3D input_dev; > + } > + > + return err; > +} > + > /* -- device connect -- */ > static int sd_probe(struct usb_interface *intf, > const struct usb_device_id *id) > { > - return gspca_dev_probe(intf, id,&sd_desc, sizeof(struct sd), > + int ret; > + struct usb_host_interface *intf_desc; > + struct usb_endpoint_descriptor *ep; > + int i; > + > + struct urb *urb; > + void* buffer =3D NULL; > + unsigned int buffer_len; > + int interval; > + struct gspca_dev *gspca_dev; > + struct usb_device *dev; > + > + ret =3D gspca_dev_probe(intf, id,&sd_desc, sizeof(struct sd), > THIS_MODULE); > + if (0<=3D ret) { > + intf_desc =3D intf->cur_altsetting; > + for (i =3D 0; i< intf_desc->desc.bNumEndpoints; i++) { > + ep =3D&intf_desc->endpoint[i].desc; > + if ((ep->bEndpointAddress& USB_DIR_IN)&& > + ((ep->bmAttributes& USB_ENDPOINT_XFERTYPE_MASK) > + =3D=3D USB_ENDPOINT_XFER_INT)) { > + > + buffer_len =3D ep->wMaxPacketSize; > + interval =3D ep->bInterval; > + printk(KERN_DEBUG "found int in endpoint: 0x%x\n", ep->bEndpoint= Address); > + printk(KERN_DEBUG " - buffer_len =3D %u\n", buffer_len); > + printk(KERN_DEBUG " - interval =3D %u\n", interval); > + > + gspca_dev =3D usb_get_intfdata(intf); > + dev =3D gspca_dev->dev; > + gspca_dev->int_urb =3D NULL; > + gspca_dev->input_dev =3D NULL; > + > + buffer =3D kmalloc(ep->wMaxPacketSize, GFP_KERNEL); > + if (buffer) > + urb =3D usb_alloc_urb(0, GFP_KERNEL); > + else { > + kfree(buffer); > + urb =3D NULL; > + } > + if (buffer&& urb) { > + usb_fill_int_urb(urb, dev, > + usb_rcvintpipe(dev, ep->bEndpointAddress), > + buffer, buffer_len, > + int_irq, (void*)gspca_dev, interval); > + ret =3D init_camera_input(gspca_dev, id); > + if (0<=3D ret) { > + gspca_dev->int_urb =3D urb; > + ret =3D usb_submit_urb(urb, GFP_KERNEL); > + printk(KERN_DEBUG "usb_submit_urb() returns %i\n", ret); > + } > + } > + } > + > + } > + } > + return ret; > +} > + > +static void sd_disconnect(struct usb_interface *intf) > +{ > + struct gspca_dev *gspca_dev =3D usb_get_intfdata(intf); > + struct urb *urb; > + struct input_dev *input_dev; > + > + urb =3D gspca_dev->int_urb; > + if (urb !=3D NULL) { > + gspca_dev->int_urb =3D NULL; > + usb_kill_urb(urb); > + usb_buffer_free(gspca_dev->dev, > + urb->transfer_buffer_length, > + urb->transfer_buffer, > + urb->transfer_dma); > + usb_free_urb(urb); > + } > + input_dev =3D gspca_dev->input_dev; > + if (input_dev) { > + gspca_dev->input_dev =3D NULL; > + input_unregister_device(input_dev); > + } > + gspca_disconnect(intf); > } > > static struct usb_driver sd_driver =3D { > .name =3D MODULE_NAME, > .id_table =3D device_table, > .probe =3D sd_probe, > - .disconnect =3D gspca_disconnect, > + .disconnect =3D sd_disconnect, > #ifdef CONFIG_PM > .suspend =3D gspca_suspend, > .resume =3D gspca_resume, > -- > To unsubscribe from this list: send the line "unsubscribe linux-media= " in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-input" = in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html