diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 22:16:47 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 22:16:47 -0300 |
| commit | 6e3e1d3647a8df0faa85e8f74e42c0adfa97fb57 (patch) | |
| tree | 4727e713cc778c7c1f466ed0bfb5f2a6b20e9193 /linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h | |
| parent | e27b9707f11774d40fd1e1278b5a11d4683313d5 (diff) | |
| parent | 0217d884320494197ce193e3a7be37d2aadb298b (diff) | |
| download | mediapointer-dvb-s2-6e3e1d3647a8df0faa85e8f74e42c0adfa97fb57.tar.gz mediapointer-dvb-s2-6e3e1d3647a8df0faa85e8f74e42c0adfa97fb57.tar.bz2 | |
merge: http://linuxtv.org/hg/~mcisely/pvrusb2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h')
| -rw-r--r-- | linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h index ba70f5d48..310fe9d3d 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.h @@ -27,16 +27,6 @@ #include "pvrusb2-io.h" #include "pvrusb2-ctrl.h" -/* Private V4L2-compatible controls available in this driver, look these up - with pvr2_hdw_get_ctrl_v4l(). */ -#define V4L2_CID_PVR_SRATE (V4L2_CID_PRIVATE_BASE) -#define V4L2_CID_PVR_AUDIOBITRATE (V4L2_CID_PRIVATE_BASE+1) -#define V4L2_CID_PVR_AUDIOCRC (V4L2_CID_PRIVATE_BASE+2) -#define V4L2_CID_PVR_AUDIOEMPHASIS (V4L2_CID_PRIVATE_BASE+3) -#define V4L2_CID_PVR_VBR (V4L2_CID_PRIVATE_BASE+4) -#define V4L2_CID_PVR_VIDEOBITRATE (V4L2_CID_PRIVATE_BASE+5) -#define V4L2_CID_PVR_VIDEOPEAK (V4L2_CID_PRIVATE_BASE+6) -#define V4L2_CID_PVR_VIDEOSTANDARD (V4L2_CID_PRIVATE_BASE+7) /* Private internal control ids, look these up with pvr2_hdw_get_ctrl_by_id() - these are NOT visible in V4L */ @@ -48,7 +38,6 @@ #define PVR2_CID_FREQUENCY 6 #define PVR2_CID_HRES 7 #define PVR2_CID_VRES 8 -#define PVR2_CID_INTERLACE 9 /* Legal values for the INPUT state variable */ #define PVR2_CVAL_INPUT_TV 0 @@ -154,6 +143,10 @@ struct pvr2_ctrl *pvr2_hdw_get_ctrl_by_id(struct pvr2_hdw *,unsigned int); /* Retrieve a control handle given its V4L ID (if any) */ struct pvr2_ctrl *pvr2_hdw_get_ctrl_v4l(struct pvr2_hdw *,unsigned int ctl_id); +/* Retrieve a control handle given its immediate predecessor V4L ID (if any) */ +struct pvr2_ctrl *pvr2_hdw_get_ctrl_nextv4l(struct pvr2_hdw *, + unsigned int ctl_id); + /* Commit all control changes made up to this point */ int pvr2_hdw_commit_ctl(struct pvr2_hdw *); |