Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
media
/
pci
/
zoran
/
zoran.h
diff --git
a/kernel/drivers/media/pci/zoran/zoran.h
b/kernel/drivers/media/pci/zoran/zoran.h
index
5e04008
..
4e7db89
100644
(file)
--- a/
kernel/drivers/media/pci/zoran/zoran.h
+++ b/
kernel/drivers/media/pci/zoran/zoran.h
@@
-32,6
+32,8
@@
#define _BUZ_H_
#include <media/v4l2-device.h>
#define _BUZ_H_
#include <media/v4l2-device.h>
+#include <media/v4l2-ctrls.h>
+#include <media/v4l2-fh.h>
struct zoran_sync {
unsigned long frame; /* number of buffer that has been free'd */
struct zoran_sync {
unsigned long frame; /* number of buffer that has been free'd */
@@
-216,6
+218,7
@@
struct zoran;
/* zoran_fh contains per-open() settings */
struct zoran_fh {
/* zoran_fh contains per-open() settings */
struct zoran_fh {
+ struct v4l2_fh fh;
struct zoran *zr;
enum zoran_map_mode map_mode; /* Flag which bufferset will map by next mmap() */
struct zoran *zr;
enum zoran_map_mode map_mode; /* Flag which bufferset will map by next mmap() */
@@
-268,6
+271,7
@@
struct card_info {
struct zoran {
struct v4l2_device v4l2_dev;
struct zoran {
struct v4l2_device v4l2_dev;
+ struct v4l2_ctrl_handler hdl;
struct video_device *video_dev;
struct i2c_adapter i2c_adapter; /* */
struct video_device *video_dev;
struct i2c_adapter i2c_adapter; /* */
@@
-280,8
+284,7
@@
struct zoran {
struct videocodec *codec; /* video codec */
struct videocodec *vfe; /* video front end */
struct videocodec *codec; /* video codec */
struct videocodec *vfe; /* video front end */
- struct mutex resource_lock; /* prevent evil stuff */
- struct mutex other_lock; /* please merge with above */
+ struct mutex lock; /* file ops serialize lock */
u8 initialized; /* flag if zoran has been correctly initialized */
int user; /* number of current users */
u8 initialized; /* flag if zoran has been correctly initialized */
int user; /* number of current users */