summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/davinci/vpif.h
diff options
context:
space:
mode:
authorMats Randgaard <mats.randgaard@cisco.com>2010-12-16 16:17:42 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-01-19 14:28:15 +0100
commitaa4444063505983c5971bc8fb832385dfba16b41 (patch)
tree6c9e1642c9350a6395d72755a290c475407aeeff /drivers/media/video/davinci/vpif.h
parent[media] vpif_cap/disp: Add debug functionality (diff)
downloadlinux-aa4444063505983c5971bc8fb832385dfba16b41.tar.xz
linux-aa4444063505983c5971bc8fb832385dfba16b41.zip
[media] vpif: Consolidate formats from capture and display
- The ch_params tables in vpif_capture.c and vpif_display.c are moved to a common table in vpif.c. Then it is easier to maintain the table. - The field "fps" is removed from the struct vpif_channel_config_params because it is not used. Signed-off-by: Mats Randgaard <mats.randgaard@cisco.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by : Murali Karicheri <mkaricheri@gmail.com> Acked-by: Manjunath Hadli <manjunath.hadli@ti.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/davinci/vpif.h')
-rw-r--r--drivers/media/video/davinci/vpif.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/davinci/vpif.h b/drivers/media/video/davinci/vpif.h
index ebd5c4338ebb..d14e36e5c90d 100644
--- a/drivers/media/video/davinci/vpif.h
+++ b/drivers/media/video/davinci/vpif.h
@@ -577,7 +577,6 @@ struct vpif_channel_config_params {
char name[VPIF_MAX_NAME]; /* Name of the mode */
u16 width; /* Indicates width of the image */
u16 height; /* Indicates height of the image */
- u8 fps;
u8 frm_fmt; /* Indicates whether this is interlaced
* or progressive format */
u8 ycmux_mode; /* Indicates whether this mode requires
@@ -594,6 +593,9 @@ struct vpif_channel_config_params {
v4l2_std_id stdid;
};
+extern const unsigned int vpif_ch_params_count;
+extern const struct vpif_channel_config_params ch_params[];
+
struct vpif_video_params;
struct vpif_params;
struct vpif_vbi_params;