1 From 975e76214cd2516eb6cfff4c3eec581872645e88 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 31/53] uvc: add iPassion iP2970 support
6 Signed-off-by: John Crispin <blogic@openwrt.org>
8 drivers/media/usb/uvc/uvc_driver.c | 12 +++
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 | 5 +-
12 4 files changed, 165 insertions(+), 1 deletion(-)
14 --- a/drivers/media/usb/uvc/uvc_driver.c
15 +++ b/drivers/media/usb/uvc/uvc_driver.c
16 @@ -2737,6 +2737,18 @@ static const struct usb_device_id uvc_id
17 .bInterfaceSubClass = 1,
18 .bInterfaceProtocol = 0,
19 .driver_info = UVC_QUIRK_FORCE_Y8 },
20 + /* iPassion iP2970 */
21 + { .match_flags = USB_DEVICE_ID_MATCH_DEVICE
22 + | USB_DEVICE_ID_MATCH_INT_INFO,
24 + .idProduct = 0x2970,
25 + .bInterfaceClass = USB_CLASS_VIDEO,
26 + .bInterfaceSubClass = 1,
27 + .bInterfaceProtocol = 0,
28 + .driver_info = UVC_QUIRK_PROBE_MINMAX
29 + | UVC_QUIRK_STREAM_NO_FID
31 + | UVC_QUIRK_SINGLE_ISO },
32 /* Generic USB Video Class */
33 { USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_UNDEFINED) },
34 { USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_15) },
35 --- a/drivers/media/usb/uvc/uvc_status.c
36 +++ b/drivers/media/usb/uvc/uvc_status.c
37 @@ -139,6 +139,7 @@ static void uvc_status_complete(struct u
38 switch (dev->status[0] & 0x0f) {
39 case UVC_STATUS_TYPE_CONTROL:
40 uvc_event_control(dev, dev->status, len);
44 case UVC_STATUS_TYPE_STREAMING:
45 @@ -182,6 +183,7 @@ int uvc_status_init(struct uvc_device *d
48 pipe = usb_rcvintpipe(dev->udev, ep->desc.bEndpointAddress);
51 /* For high-speed interrupt endpoints, the bInterval value is used as
52 * an exponent of two. Some developers forgot about it.
53 --- a/drivers/media/usb/uvc/uvc_video.c
54 +++ b/drivers/media/usb/uvc/uvc_video.c
56 #include <linux/wait.h>
57 #include <linux/atomic.h>
58 #include <asm/unaligned.h>
59 +#include <linux/skbuff.h>
60 +#include <linux/kobject.h>
61 +#include <linux/netlink.h>
62 +#include <linux/kobject.h>
63 +#include <linux/workqueue.h>
65 #include <media/v4l2-common.h>
67 @@ -1101,9 +1106,149 @@ static void uvc_video_decode_data(struct
77 + struct sk_buff *skb;
78 + struct work_struct work;
81 +#define BH_ERR(fmt, args...) printk(KERN_ERR "%s: " fmt, "webcam", ##args )
82 +#define BH_DBG(fmt, args...) do {} while (0)
83 +#define BH_SKB_SIZE 2048
85 +extern u64 uevent_next_seqnum(void);
88 +static int bh_event_add_var(struct bh_event *event, int argv,
89 + const char *format, ...)
91 + static char buf[128];
99 + va_start(args, format);
100 + len = vsnprintf(buf, sizeof(buf), format, args);
103 + if (len >= sizeof(buf)) {
104 + BH_ERR("buffer size too small\n");
109 + s = skb_put(event->skb, len + 1);
112 + BH_DBG("added variable '%s'\n", s);
117 +static int motion_hotplug_fill_event(struct bh_event *event)
125 + ret = bh_event_add_var(event, 0, "HOME=%s", "/");
129 + ret = bh_event_add_var(event, 0, "PATH=%s",
130 + "/sbin:/bin:/usr/sbin:/usr/bin");
134 + ret = bh_event_add_var(event, 0, "SUBSYSTEM=usb");
138 + ret = bh_event_add_var(event, 0, "ACTION=motion");
142 + ret = bh_event_add_var(event, 0, "SEEN=%d", s - seen);
147 + ret = bh_event_add_var(event, 0, "SEQNUM=%llu", uevent_next_seqnum());
152 +static void motion_hotplug_work(struct work_struct *work)
154 + struct bh_event *event = container_of(work, struct bh_event, work);
157 + event->skb = alloc_skb(BH_SKB_SIZE, GFP_KERNEL);
159 + goto out_free_event;
161 + ret = bh_event_add_var(event, 0, "%s@", "add");
165 + ret = motion_hotplug_fill_event(event);
169 + NETLINK_CB(event->skb).dst_group = 1;
170 + broadcast_uevent(event->skb, 0, 1, GFP_KERNEL);
174 + BH_ERR("work error %d\n", ret);
175 + kfree_skb(event->skb);
181 +static int motion_hotplug_create_event(void)
183 + struct bh_event *event;
185 + event = kzalloc(sizeof(*event), GFP_KERNEL);
189 + event->name = "motion";
191 + INIT_WORK(&event->work, (void *)(void *)motion_hotplug_work);
192 + schedule_work(&event->work);
197 +#define MOTION_FLAG_OFFSET 4
198 static void uvc_video_decode_end(struct uvc_streaming *stream,
199 struct uvc_buffer *buf, const __u8 *data, int len)
201 + if ((stream->dev->quirks & UVC_QUIRK_MOTION) &&
202 + (data[len - 2] == 0xff) && (data[len - 1] == 0xd9)) {
204 + buf->state = UVC_BUF_STATE_READY;
205 + mem = (u8 *) (buf->mem + MOTION_FLAG_OFFSET);
206 + if ( stream->dev->motion ) {
207 + stream->dev->motion = 0;
208 + motion_hotplug_create_event();
214 /* Mark the buffer as done if the EOF marker is set. */
215 if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) {
216 uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n");
217 @@ -1518,6 +1663,8 @@ static int uvc_init_video_isoc(struct uv
221 + if (stream->dev->quirks & UVC_QUIRK_SINGLE_ISO)
223 size = npackets * psize;
225 for (i = 0; i < UVC_URBS; ++i) {
226 --- a/drivers/media/usb/uvc/uvcvideo.h
227 +++ b/drivers/media/usb/uvc/uvcvideo.h
229 #define UVC_QUIRK_RESTRICT_FRAME_RATE 0x00000200
230 #define UVC_QUIRK_RESTORE_CTRLS_ON_INIT 0x00000400
231 #define UVC_QUIRK_FORCE_Y8 0x00000800
233 +#define UVC_QUIRK_MOTION 0x00001000
234 +#define UVC_QUIRK_SINGLE_ISO 0x00002000
237 #define UVC_FMT_FLAG_COMPRESSED 0x00000001
238 #define UVC_FMT_FLAG_STREAM 0x00000002
239 @@ -584,6 +586,7 @@ struct uvc_device {
241 struct input_dev *input;
246 enum uvc_handle_state {