diff options
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/rc-map.h | 3 | ||||
-rw-r--r-- | include/media/soc_camera.h | 2 | ||||
-rw-r--r-- | include/media/v4l2-mediabus.h | 21 | ||||
-rw-r--r-- | include/media/v4l2-subdev.h | 2 |
4 files changed, 25 insertions, 3 deletions
diff --git a/include/media/rc-map.h b/include/media/rc-map.h index 5833966a7100..c78e99a435b6 100644 --- a/include/media/rc-map.h +++ b/include/media/rc-map.h | |||
@@ -55,7 +55,8 @@ void rc_map_init(void); | |||
55 | #define RC_MAP_AVERMEDIA_A16D "rc-avermedia-a16d" | 55 | #define RC_MAP_AVERMEDIA_A16D "rc-avermedia-a16d" |
56 | #define RC_MAP_AVERMEDIA_CARDBUS "rc-avermedia-cardbus" | 56 | #define RC_MAP_AVERMEDIA_CARDBUS "rc-avermedia-cardbus" |
57 | #define RC_MAP_AVERMEDIA_DVBT "rc-avermedia-dvbt" | 57 | #define RC_MAP_AVERMEDIA_DVBT "rc-avermedia-dvbt" |
58 | #define RC_MAP_AVERMEDIA_M135A_RM_JX "rc-avermedia-m135a-rm-jx" | 58 | #define RC_MAP_AVERMEDIA_M135A "rc-avermedia-m135a" |
59 | #define RC_MAP_AVERMEDIA_M733A_RM_K6 "rc-avermedia-m733a-rm-k6" | ||
59 | #define RC_MAP_AVERMEDIA "rc-avermedia" | 60 | #define RC_MAP_AVERMEDIA "rc-avermedia" |
60 | #define RC_MAP_AVERTV_303 "rc-avertv-303" | 61 | #define RC_MAP_AVERTV_303 "rc-avertv-303" |
61 | #define RC_MAP_BEHOLD_COLUMBUS "rc-behold-columbus" | 62 | #define RC_MAP_BEHOLD_COLUMBUS "rc-behold-columbus" |
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index c9a5bbfa6ab5..b8289c2f609b 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h | |||
@@ -66,7 +66,7 @@ struct soc_camera_host_ops { | |||
66 | * .get_formats() fail, .put_formats() will not be called at all, the | 66 | * .get_formats() fail, .put_formats() will not be called at all, the |
67 | * failing .get_formats() must then clean up internally. | 67 | * failing .get_formats() must then clean up internally. |
68 | */ | 68 | */ |
69 | int (*get_formats)(struct soc_camera_device *, int, | 69 | int (*get_formats)(struct soc_camera_device *, unsigned int, |
70 | struct soc_camera_format_xlate *); | 70 | struct soc_camera_format_xlate *); |
71 | void (*put_formats)(struct soc_camera_device *); | 71 | void (*put_formats)(struct soc_camera_device *); |
72 | int (*cropcap)(struct soc_camera_device *, struct v4l2_cropcap *); | 72 | int (*cropcap)(struct soc_camera_device *, struct v4l2_cropcap *); |
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h index 0dbe02ada259..865cda7cd611 100644 --- a/include/media/v4l2-mediabus.h +++ b/include/media/v4l2-mediabus.h | |||
@@ -40,6 +40,7 @@ enum v4l2_mbus_pixelcode { | |||
40 | V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE, | 40 | V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE, |
41 | V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE, | 41 | V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE, |
42 | V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE, | 42 | V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE, |
43 | V4L2_MBUS_FMT_SGRBG8_1X8, | ||
43 | }; | 44 | }; |
44 | 45 | ||
45 | /** | 46 | /** |
@@ -58,4 +59,24 @@ struct v4l2_mbus_framefmt { | |||
58 | enum v4l2_colorspace colorspace; | 59 | enum v4l2_colorspace colorspace; |
59 | }; | 60 | }; |
60 | 61 | ||
62 | static inline void v4l2_fill_pix_format(struct v4l2_pix_format *pix_fmt, | ||
63 | const struct v4l2_mbus_framefmt *mbus_fmt) | ||
64 | { | ||
65 | pix_fmt->width = mbus_fmt->width; | ||
66 | pix_fmt->height = mbus_fmt->height; | ||
67 | pix_fmt->field = mbus_fmt->field; | ||
68 | pix_fmt->colorspace = mbus_fmt->colorspace; | ||
69 | } | ||
70 | |||
71 | static inline void v4l2_fill_mbus_format(struct v4l2_mbus_framefmt *mbus_fmt, | ||
72 | const struct v4l2_pix_format *pix_fmt, | ||
73 | enum v4l2_mbus_pixelcode code) | ||
74 | { | ||
75 | mbus_fmt->width = pix_fmt->width; | ||
76 | mbus_fmt->height = pix_fmt->height; | ||
77 | mbus_fmt->field = pix_fmt->field; | ||
78 | mbus_fmt->colorspace = pix_fmt->colorspace; | ||
79 | mbus_fmt->code = code; | ||
80 | } | ||
81 | |||
61 | #endif | 82 | #endif |
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index a88889355ae0..02c6f4d11ed3 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h | |||
@@ -246,7 +246,7 @@ struct v4l2_subdev_video_ops { | |||
246 | struct v4l2_dv_timings *timings); | 246 | struct v4l2_dv_timings *timings); |
247 | int (*g_dv_timings)(struct v4l2_subdev *sd, | 247 | int (*g_dv_timings)(struct v4l2_subdev *sd, |
248 | struct v4l2_dv_timings *timings); | 248 | struct v4l2_dv_timings *timings); |
249 | int (*enum_mbus_fmt)(struct v4l2_subdev *sd, int index, | 249 | int (*enum_mbus_fmt)(struct v4l2_subdev *sd, unsigned int index, |
250 | enum v4l2_mbus_pixelcode *code); | 250 | enum v4l2_mbus_pixelcode *code); |
251 | int (*g_mbus_fmt)(struct v4l2_subdev *sd, | 251 | int (*g_mbus_fmt)(struct v4l2_subdev *sd, |
252 | struct v4l2_mbus_framefmt *fmt); | 252 | struct v4l2_mbus_framefmt *fmt); |