← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to drivers/media/video/uvc/uvcvideo.h

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/media/video/uvc/uvcvideo.h
13
13
#include <linux/videodev2.h>
14
14
#include <media/media-device.h>
15
15
#include <media/v4l2-device.h>
 
16
#include <media/v4l2-event.h>
 
17
#include <media/v4l2-fh.h>
16
18
#include <media/videobuf2-core.h>
17
19
 
18
20
/* --------------------------------------------------------------------------
153
155
 
154
156
struct uvc_control_mapping {
155
157
        struct list_head list;
156
 
 
157
 
        struct uvc_control_info *ctrl;
 
158
        struct list_head ev_subs;
158
159
 
159
160
        __u32 id;
160
161
        __u8 name[32];
169
170
        struct uvc_menu_info *menu_info;
170
171
        __u32 menu_count;
171
172
 
 
173
        __u32 master_id;
 
174
        __s32 master_manual;
 
175
        __u32 slave_ids[2];
 
176
 
172
177
        __s32 (*get) (struct uvc_control_mapping *mapping, __u8 query,
173
178
                      const __u8 *data);
174
179
        void (*set) (struct uvc_control_mapping *mapping, __s32 value,
524
529
};
525
530
 
526
531
struct uvc_fh {
 
532
        struct v4l2_fh vfh;
527
533
        struct uvc_video_chain *chain;
528
534
        struct uvc_streaming *stream;
529
535
        enum uvc_handle_state state;
643
649
extern int uvc_status_resume(struct uvc_device *dev);
644
650
 
645
651
/* Controls */
 
652
extern const struct v4l2_subscribed_event_ops uvc_ctrl_sub_ev_ops;
 
653
 
646
654
extern int uvc_query_v4l2_ctrl(struct uvc_video_chain *chain,
647
655
                struct v4l2_queryctrl *v4l2_ctrl);
648
656
extern int uvc_query_v4l2_menu(struct uvc_video_chain *chain,
655
663
extern int uvc_ctrl_resume_device(struct uvc_device *dev);
656
664
 
657
665
extern int uvc_ctrl_begin(struct uvc_video_chain *chain);
658
 
extern int __uvc_ctrl_commit(struct uvc_video_chain *chain, int rollback);
659
 
static inline int uvc_ctrl_commit(struct uvc_video_chain *chain)
 
666
extern int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback,
 
667
                        const struct v4l2_ext_control *xctrls,
 
668
                        unsigned int xctrls_count);
 
669
static inline int uvc_ctrl_commit(struct uvc_fh *handle,
 
670
                        const struct v4l2_ext_control *xctrls,
 
671
                        unsigned int xctrls_count)
660
672
{
661
 
        return __uvc_ctrl_commit(chain, 0);
 
673
        return __uvc_ctrl_commit(handle, 0, xctrls, xctrls_count);
662
674
}
663
 
static inline int uvc_ctrl_rollback(struct uvc_video_chain *chain)
 
675
static inline int uvc_ctrl_rollback(struct uvc_fh *handle)
664
676
{
665
 
        return __uvc_ctrl_commit(chain, 1);
 
677
        return __uvc_ctrl_commit(handle, 1, NULL, 0);
666
678
}
667
679
 
668
680
extern int uvc_ctrl_get(struct uvc_video_chain *chain,