aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/davinci/vpif.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/davinci/vpif.h')
-rw-r--r--drivers/media/video/davinci/vpif.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/media/video/davinci/vpif.h b/drivers/media/video/davinci/vpif.h
index b6695bee3c59..10550bd93b06 100644
--- a/drivers/media/video/davinci/vpif.h
+++ b/drivers/media/video/davinci/vpif.h
@@ -577,11 +577,10 @@ struct vpif_channel_config_params {
577 char name[VPIF_MAX_NAME]; /* Name of the mode */ 577 char name[VPIF_MAX_NAME]; /* Name of the mode */
578 u16 width; /* Indicates width of the image */ 578 u16 width; /* Indicates width of the image */
579 u16 height; /* Indicates height of the image */ 579 u16 height; /* Indicates height of the image */
580 u8 frm_fmt; /* Indicates whether this is interlaced 580 u8 frm_fmt; /* Interlaced (0) or progressive (1) */
581 * or progressive format */ 581 u8 ycmux_mode; /* This mode requires one (0) or two (1)
582 u8 ycmux_mode; /* Indicates whether this mode requires 582 channels */
583 * single or two channels */ 583 u16 eav2sav; /* length of eav 2 sav */
584 u16 eav2sav; /* length of sav 2 eav */
585 u16 sav2eav; /* length of sav 2 eav */ 584 u16 sav2eav; /* length of sav 2 eav */
586 u16 l1, l3, l5, l7, l9, l11; /* Other parameter configurations */ 585 u16 l1, l3, l5, l7, l9, l11; /* Other parameter configurations */
587 u16 vsize; /* Vertical size of the image */ 586 u16 vsize; /* Vertical size of the image */
@@ -589,8 +588,8 @@ struct vpif_channel_config_params {
589 * is in BT or in CCD/CMOS */ 588 * is in BT or in CCD/CMOS */
590 u8 vbi_supported; /* Indicates whether this mode 589 u8 vbi_supported; /* Indicates whether this mode
591 * supports capturing vbi or not */ 590 * supports capturing vbi or not */
592 u8 hd_sd; 591 u8 hd_sd; /* HDTV (1) or SDTV (0) format */
593 v4l2_std_id stdid; 592 v4l2_std_id stdid; /* SDTV format */
594 u32 dv_preset; /* HDTV format */ 593 u32 dv_preset; /* HDTV format */
595}; 594};
596 595