1 From 0d3e92b4d3e2160873b610aabd46bbc4853ff82e Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Thu, 19 Sep 2013 01:50:59 +0200
4 Subject: [PATCH 57/57] uvc: add iPassion iP2970 support
6 Signed-off-by: John Crispin <blogic@openwrt.org>
8 drivers/media/usb/uvc/uvc_driver.c | 14 ++++
9 drivers/media/usb/uvc/uvc_status.c | 2 +
10 drivers/media/usb/uvc/uvc_video.c | 147 ++++++++++++++++++++++++++++++++++++
11 drivers/media/usb/uvc/uvcvideo.h | 3 +
12 4 files changed, 166 insertions(+)
14 diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
15 index c3bb250..c6612d4 100644
16 --- a/drivers/media/usb/uvc/uvc_driver.c
17 +++ b/drivers/media/usb/uvc/uvc_driver.c
18 @@ -2467,6 +2467,20 @@ static struct usb_device_id uvc_ids[] = {
19 .bInterfaceProtocol = 0,
20 .driver_info = UVC_QUIRK_PROBE_MINMAX
21 | UVC_QUIRK_IGNORE_SELECTOR_UNIT },
23 +/* iPassion iP2970 */
24 + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
25 + | USB_DEVICE_ID_MATCH_INT_INFO,
27 + .idProduct = 0x2970,
28 + .bInterfaceClass = USB_CLASS_VIDEO,
29 + .bInterfaceSubClass = 1,
30 + .bInterfaceProtocol = 0,
31 + .driver_info = UVC_QUIRK_PROBE_MINMAX
32 + | UVC_QUIRK_STREAM_NO_FID
34 + | UVC_QUIRK_SINGLE_ISO },
36 /* Generic USB Video Class */
37 { USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, 0) },
39 diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc_status.c
40 index f552ab9..7132ad4 100644
41 --- a/drivers/media/usb/uvc/uvc_status.c
42 +++ b/drivers/media/usb/uvc/uvc_status.c
43 @@ -139,6 +139,7 @@ static void uvc_status_complete(struct urb *urb)
44 switch (dev->status[0] & 0x0f) {
45 case UVC_STATUS_TYPE_CONTROL:
46 uvc_event_control(dev, dev->status, len);
50 case UVC_STATUS_TYPE_STREAMING:
51 @@ -182,6 +183,7 @@ int uvc_status_init(struct uvc_device *dev)
54 pipe = usb_rcvintpipe(dev->udev, ep->desc.bEndpointAddress);
57 /* For high-speed interrupt endpoints, the bInterval value is used as
58 * an exponent of two. Some developers forgot about it.
59 diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
60 index 898c208..2e06163 100644
61 --- a/drivers/media/usb/uvc/uvc_video.c
62 +++ b/drivers/media/usb/uvc/uvc_video.c
64 #include <linux/wait.h>
65 #include <linux/atomic.h>
66 #include <asm/unaligned.h>
67 +#include <linux/skbuff.h>
68 +#include <linux/kobject.h>
69 +#include <linux/netlink.h>
70 +#include <linux/kobject.h>
71 +#include <linux/workqueue.h>
73 #include <media/v4l2-common.h>
75 @@ -1075,9 +1080,149 @@ static void uvc_video_decode_data(struct uvc_streaming *stream,
85 + struct sk_buff *skb;
86 + struct work_struct work;
89 +#define BH_ERR(fmt, args...) printk(KERN_ERR "%s: " fmt, "webcam", ##args )
90 +#define BH_DBG(fmt, args...) do {} while (0)
91 +#define BH_SKB_SIZE 2048
93 +extern u64 uevent_next_seqnum(void);
96 +static int bh_event_add_var(struct bh_event *event, int argv,
97 + const char *format, ...)
99 + static char buf[128];
107 + va_start(args, format);
108 + len = vsnprintf(buf, sizeof(buf), format, args);
111 + if (len >= sizeof(buf)) {
112 + BH_ERR("buffer size too small\n");
117 + s = skb_put(event->skb, len + 1);
120 + BH_DBG("added variable '%s'\n", s);
125 +static int motion_hotplug_fill_event(struct bh_event *event)
133 + ret = bh_event_add_var(event, 0, "HOME=%s", "/");
137 + ret = bh_event_add_var(event, 0, "PATH=%s",
138 + "/sbin:/bin:/usr/sbin:/usr/bin");
142 + ret = bh_event_add_var(event, 0, "SUBSYSTEM=usb");
146 + ret = bh_event_add_var(event, 0, "ACTION=motion");
150 + ret = bh_event_add_var(event, 0, "SEEN=%d", s - seen);
155 + ret = bh_event_add_var(event, 0, "SEQNUM=%llu", uevent_next_seqnum());
160 +static void motion_hotplug_work(struct work_struct *work)
162 + struct bh_event *event = container_of(work, struct bh_event, work);
165 + event->skb = alloc_skb(BH_SKB_SIZE, GFP_KERNEL);
167 + goto out_free_event;
169 + ret = bh_event_add_var(event, 0, "%s@", "add");
173 + ret = motion_hotplug_fill_event(event);
177 + NETLINK_CB(event->skb).dst_group = 1;
178 + broadcast_uevent(event->skb, 0, 1, GFP_KERNEL);
182 + BH_ERR("work error %d\n", ret);
183 + kfree_skb(event->skb);
189 +static int motion_hotplug_create_event(void)
191 + struct bh_event *event;
193 + event = kzalloc(sizeof(*event), GFP_KERNEL);
197 + event->name = "motion";
199 + INIT_WORK(&event->work, (void *)(void *)motion_hotplug_work);
200 + schedule_work(&event->work);
205 +#define MOTION_FLAG_OFFSET 4
206 static void uvc_video_decode_end(struct uvc_streaming *stream,
207 struct uvc_buffer *buf, const __u8 *data, int len)
209 + if ((stream->dev->quirks & UVC_QUIRK_MOTION) &&
210 + (data[len - 2] == 0xff) && (data[len - 1] == 0xd9)) {
212 + buf->state = UVC_BUF_STATE_READY;
213 + mem = (u8 *) (buf->mem + MOTION_FLAG_OFFSET);
214 + if ( stream->dev->motion ) {
215 + stream->dev->motion = 0;
216 + motion_hotplug_create_event();
222 /* Mark the buffer as done if the EOF marker is set. */
223 if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) {
224 uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n");
225 @@ -1478,6 +1623,8 @@ static int uvc_init_video_isoc(struct uvc_streaming *stream,
229 + if (stream->dev->quirks & UVC_QUIRK_SINGLE_ISO)
231 size = npackets * psize;
233 for (i = 0; i < UVC_URBS; ++i) {
234 diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
235 index 9e35982..3cacdfd 100644
236 --- a/drivers/media/usb/uvc/uvcvideo.h
237 +++ b/drivers/media/usb/uvc/uvcvideo.h
239 #define UVC_QUIRK_FIX_BANDWIDTH 0x00000080
240 #define UVC_QUIRK_PROBE_DEF 0x00000100
241 #define UVC_QUIRK_RESTRICT_FRAME_RATE 0x00000200
242 +#define UVC_QUIRK_MOTION 0x00000400
243 +#define UVC_QUIRK_SINGLE_ISO 0x00000800
246 #define UVC_FMT_FLAG_COMPRESSED 0x00000001
247 @@ -539,6 +541,7 @@ struct uvc_device {
249 struct input_dev *input;
254 enum uvc_handle_state {