mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 13:44:26 -04:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (505 commits) [media] af9015: Fix max I2C message size when used with tda18271 [media] IR: initialize ir_raw_event in few more drivers [media] Guard a divide in v4l1 compat layer [media] imon: fix nomouse modprobe option [media] imon: remove redundant change_protocol call [media] imon: fix my egregious brown paper bag w/rdev/idev split [media] cafe_ccic: Configure ov7670 correctly [media] ov7670: allow configuration of image size, clock speed, and I/O method [media] af9015: support for DigitalNow TinyTwin v3 [1f4d:9016] [media] af9015: map DigitalNow TinyTwin v2 remote [media] DigitalNow TinyTwin remote controller [media] af9015: RC fixes and improvements videodev2.h.xml: Update to reflect the latest changes at videodev2.h [media] v4l: document new Bayer and monochrome pixel formats [media] DocBook/v4l: Add missing formats used on gspca cpia1 and sn9c2028 [media] firedtv: add parameter to fake ca_system_ids in CA_INFO [media] tm6000: fix a macro coding style issue tm6000: Remove some ugly debug code [media] Nova-S-Plus audio line input [media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers ...
This commit is contained in:
Linus Torvalds
commit
0851668fdd
531 changed files with 41145 additions and 13099 deletions
|
|
@ -372,7 +372,6 @@ header-y += veth.h
|
|||
header-y += vhost.h
|
||||
header-y += videodev.h
|
||||
header-y += videodev2.h
|
||||
header-y += videotext.h
|
||||
header-y += virtio_9p.h
|
||||
header-y += virtio_balloon.h
|
||||
header-y += virtio_blk.h
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ struct viafb_dev {
|
|||
unsigned long fbmem_start;
|
||||
long fbmem_len;
|
||||
void __iomem *fbmem;
|
||||
#if defined(CONFIG_FB_VIA_CAMERA) || defined(CONFIG_FB_VIA_CAMERA_MODULE)
|
||||
#if defined(CONFIG_VIDEO_VIA_CAMERA) || defined(CONFIG_VIDEO_VIA_CAMERA_MODULE)
|
||||
long camera_fbmem_offset;
|
||||
long camera_fbmem_size;
|
||||
#endif
|
||||
|
|
@ -138,6 +138,7 @@ void viafb_irq_disable(u32 mask);
|
|||
#define VDE_I_LVDSSIEN 0x40000000 /* LVDS Sense enable */
|
||||
#define VDE_I_ENABLE 0x80000000 /* Global interrupt enable */
|
||||
|
||||
#if defined(CONFIG_VIDEO_VIA_CAMERA) || defined(CONFIG_VIDEO_VIA_CAMERA_MODULE)
|
||||
/*
|
||||
* DMA management.
|
||||
*/
|
||||
|
|
@ -172,6 +173,7 @@ int viafb_dma_copy_out_sg(unsigned int offset, struct scatterlist *sg, int nsg);
|
|||
*/
|
||||
#define VGA_WIDTH 640
|
||||
#define VGA_HEIGHT 480
|
||||
#endif /* CONFIG_VIDEO_VIA_CAMERA */
|
||||
|
||||
/*
|
||||
* Indexed port operations. Note that these are all multi-op
|
||||
|
|
|
|||
|
|
@ -363,6 +363,8 @@ struct v4l2_pix_format {
|
|||
#define V4L2_PIX_FMT_OV518 v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */
|
||||
#define V4L2_PIX_FMT_STV0680 v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */
|
||||
#define V4L2_PIX_FMT_TM6000 v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */
|
||||
#define V4L2_PIX_FMT_CIT_YYVYUY v4l2_fourcc('C', 'I', 'T', 'V') /* one line of Y then 1 line of VYUY */
|
||||
#define V4L2_PIX_FMT_KONICA420 v4l2_fourcc('K', 'O', 'N', 'I') /* YUV420 planar in blocks of 256 pixels */
|
||||
|
||||
/*
|
||||
* F O R M A T E N U M E R A T I O N
|
||||
|
|
@ -1045,8 +1047,11 @@ enum v4l2_colorfx {
|
|||
|
||||
#define V4L2_CID_CHROMA_GAIN (V4L2_CID_BASE+36)
|
||||
|
||||
#define V4L2_CID_ILLUMINATORS_1 (V4L2_CID_BASE+37)
|
||||
#define V4L2_CID_ILLUMINATORS_2 (V4L2_CID_BASE+38)
|
||||
|
||||
/* last CID + 1 */
|
||||
#define V4L2_CID_LASTP1 (V4L2_CID_BASE+37)
|
||||
#define V4L2_CID_LASTP1 (V4L2_CID_BASE+39)
|
||||
|
||||
/* MPEG-class control IDs defined by V4L2 */
|
||||
#define V4L2_CID_MPEG_BASE (V4L2_CTRL_CLASS_MPEG | 0x900)
|
||||
|
|
@ -1363,6 +1368,8 @@ struct v4l2_modulator {
|
|||
#define V4L2_TUNER_CAP_SAP 0x0020
|
||||
#define V4L2_TUNER_CAP_LANG1 0x0040
|
||||
#define V4L2_TUNER_CAP_RDS 0x0080
|
||||
#define V4L2_TUNER_CAP_RDS_BLOCK_IO 0x0100
|
||||
#define V4L2_TUNER_CAP_RDS_CONTROLS 0x0200
|
||||
|
||||
/* Flags for the 'rxsubchans' field */
|
||||
#define V4L2_TUNER_SUB_MONO 0x0001
|
||||
|
|
@ -1392,7 +1399,8 @@ struct v4l2_hw_freq_seek {
|
|||
enum v4l2_tuner_type type;
|
||||
__u32 seek_upward;
|
||||
__u32 wrap_around;
|
||||
__u32 reserved[8];
|
||||
__u32 spacing;
|
||||
__u32 reserved[7];
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,125 +0,0 @@
|
|||
#ifndef _VTX_H
|
||||
#define _VTX_H
|
||||
|
||||
/*
|
||||
* Teletext (=Videotext) hardware decoders using interface /dev/vtx
|
||||
* Do not confuse with drivers using /dev/vbi which decode videotext by software
|
||||
*
|
||||
* Videotext IOCTLs changed in order to use _IO() macros defined in <linux/ioctl.h>,
|
||||
* unused tuner IOCTLs cleaned up by
|
||||
* Michael Geng <linux@MichaelGeng.de>
|
||||
*
|
||||
* Copyright (c) 1994-97 Martin Buck <martin-2.buck@student.uni-ulm.de>
|
||||
* Read COPYING for more information
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
* Videotext ioctls
|
||||
*/
|
||||
#define VTXIOCGETINFO _IOR (0x81, 1, vtx_info_t)
|
||||
#define VTXIOCCLRPAGE _IOW (0x81, 2, vtx_pagereq_t)
|
||||
#define VTXIOCCLRFOUND _IOW (0x81, 3, vtx_pagereq_t)
|
||||
#define VTXIOCPAGEREQ _IOW (0x81, 4, vtx_pagereq_t)
|
||||
#define VTXIOCGETSTAT _IOW (0x81, 5, vtx_pagereq_t)
|
||||
#define VTXIOCGETPAGE _IOW (0x81, 6, vtx_pagereq_t)
|
||||
#define VTXIOCSTOPDAU _IOW (0x81, 7, vtx_pagereq_t)
|
||||
#define VTXIOCPUTPAGE _IO (0x81, 8)
|
||||
#define VTXIOCSETDISP _IO (0x81, 9)
|
||||
#define VTXIOCPUTSTAT _IO (0x81, 10)
|
||||
#define VTXIOCCLRCACHE _IO (0x81, 11)
|
||||
#define VTXIOCSETVIRT _IOW (0x81, 12, long)
|
||||
|
||||
/* for compatibility, will go away some day */
|
||||
#define VTXIOCGETINFO_OLD 0x7101 /* get version of driver & capabilities of vtx-chipset */
|
||||
#define VTXIOCCLRPAGE_OLD 0x7102 /* clear page-buffer */
|
||||
#define VTXIOCCLRFOUND_OLD 0x7103 /* clear bits indicating that page was found */
|
||||
#define VTXIOCPAGEREQ_OLD 0x7104 /* search for page */
|
||||
#define VTXIOCGETSTAT_OLD 0x7105 /* get status of page-buffer */
|
||||
#define VTXIOCGETPAGE_OLD 0x7106 /* get contents of page-buffer */
|
||||
#define VTXIOCSTOPDAU_OLD 0x7107 /* stop data acquisition unit */
|
||||
#define VTXIOCPUTPAGE_OLD 0x7108 /* display page on TV-screen */
|
||||
#define VTXIOCSETDISP_OLD 0x7109 /* set TV-mode */
|
||||
#define VTXIOCPUTSTAT_OLD 0x710a /* set status of TV-output-buffer */
|
||||
#define VTXIOCCLRCACHE_OLD 0x710b /* clear cache on VTX-interface (if avail.) */
|
||||
#define VTXIOCSETVIRT_OLD 0x710c /* turn on virtual mode (this disables TV-display) */
|
||||
|
||||
/*
|
||||
* Definitions for VTXIOCGETINFO
|
||||
*/
|
||||
|
||||
#define SAA5243 0
|
||||
#define SAA5246 1
|
||||
#define SAA5249 2
|
||||
#define SAA5248 3
|
||||
#define XSTV5346 4
|
||||
|
||||
typedef struct {
|
||||
int version_major, version_minor; /* version of driver; if version_major changes, driver */
|
||||
/* is not backward compatible!!! CHECK THIS!!! */
|
||||
int numpages; /* number of page-buffers of vtx-chipset */
|
||||
int cct_type; /* type of vtx-chipset (SAA5243, SAA5246, SAA5248 or
|
||||
* SAA5249) */
|
||||
}
|
||||
vtx_info_t;
|
||||
|
||||
|
||||
/*
|
||||
* Definitions for VTXIOC{CLRPAGE,CLRFOUND,PAGEREQ,GETSTAT,GETPAGE,STOPDAU,PUTPAGE,SETDISP}
|
||||
*/
|
||||
|
||||
#define MIN_UNIT (1<<0)
|
||||
#define MIN_TEN (1<<1)
|
||||
#define HR_UNIT (1<<2)
|
||||
#define HR_TEN (1<<3)
|
||||
#define PG_UNIT (1<<4)
|
||||
#define PG_TEN (1<<5)
|
||||
#define PG_HUND (1<<6)
|
||||
#define PGMASK_MAX (1<<7)
|
||||
#define PGMASK_PAGE (PG_HUND | PG_TEN | PG_UNIT)
|
||||
#define PGMASK_HOUR (HR_TEN | HR_UNIT)
|
||||
#define PGMASK_MINUTE (MIN_TEN | MIN_UNIT)
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int page; /* number of requested page (hexadecimal) */
|
||||
int hour; /* requested hour (hexadecimal) */
|
||||
int minute; /* requested minute (hexadecimal) */
|
||||
int pagemask; /* mask defining which values of the above are set */
|
||||
int pgbuf; /* buffer where page will be stored */
|
||||
int start; /* start of requested part of page */
|
||||
int end; /* end of requested part of page */
|
||||
void __user *buffer; /* pointer to beginning of destination buffer */
|
||||
}
|
||||
vtx_pagereq_t;
|
||||
|
||||
|
||||
/*
|
||||
* Definitions for VTXIOC{GETSTAT,PUTSTAT}
|
||||
*/
|
||||
|
||||
#define VTX_PAGESIZE (40 * 24)
|
||||
#define VTX_VIRTUALSIZE (40 * 49)
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int pagenum; /* number of page (hexadecimal) */
|
||||
int hour; /* hour (hexadecimal) */
|
||||
int minute; /* minute (hexadecimal) */
|
||||
int charset; /* national charset */
|
||||
unsigned delete : 1; /* delete page (C4) */
|
||||
unsigned headline : 1; /* insert headline (C5) */
|
||||
unsigned subtitle : 1; /* insert subtitle (C6) */
|
||||
unsigned supp_header : 1; /* suppress header (C7) */
|
||||
unsigned update : 1; /* update page (C8) */
|
||||
unsigned inter_seq : 1; /* interrupted sequence (C9) */
|
||||
unsigned dis_disp : 1; /* disable/suppress display (C10) */
|
||||
unsigned serial : 1; /* serial mode (C11) */
|
||||
unsigned notfound : 1; /* /FOUND */
|
||||
unsigned pblf : 1; /* PBLF */
|
||||
unsigned hamming : 1; /* hamming-error occurred */
|
||||
}
|
||||
vtx_pageinfo_t;
|
||||
|
||||
#endif /* _VTX_H */
|
||||
Loading…
Reference in a new issue