summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorGerd Knorr <devnull@localhost>2005-01-13 17:22:33 +0000
committerGerd Knorr <devnull@localhost>2005-01-13 17:22:33 +0000
commitbc5318acb6a825d4efc39704e8fbc5b25e7a69e2 (patch)
treeff76038c6ddc278f58d517d71c10e50adb96ece2 /linux/include
parent5e7e4300bdef43bbc9db1f4661e1867a18ab8aff (diff)
downloadmediapointer-dvb-s2-bc5318acb6a825d4efc39704e8fbc5b25e7a69e2.tar.gz
mediapointer-dvb-s2-bc5318acb6a825d4efc39704e8fbc5b25e7a69e2.tar.bz2
- card-specific and other fixes from various people.
- more pinnacle 300i work (still not functional :-/).
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/linux/videodev2.h1
-rw-r--r--linux/include/media/tuner.h6
2 files changed, 5 insertions, 2 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h
index 6c1daffd6..3f30d319f 100644
--- a/linux/include/linux/videodev2.h
+++ b/linux/include/linux/videodev2.h
@@ -78,6 +78,7 @@ enum v4l2_ctrl_type {
enum v4l2_tuner_type {
V4L2_TUNER_RADIO = 1,
V4L2_TUNER_ANALOG_TV = 2,
+ V4L2_TUNER_DIGITAL_TV = 3,
};
enum v4l2_memory {
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h
index 6f97e0478..3e9bac43d 100644
--- a/linux/include/media/tuner.h
+++ b/linux/include/media/tuner.h
@@ -110,10 +110,12 @@
#define TDA9887_SET_CONFIG _IOW('t',5,int)
/* tv card specific */
# define TDA9887_PRESENT (1<<0)
-# define TDA9887_PORT1 (1<<1)
-# define TDA9887_PORT2 (1<<2)
+# define TDA9887_PORT1_INACTIVE (1<<1)
+# define TDA9887_PORT2_INACTIVE (1<<2)
# define TDA9887_QSS (1<<3)
# define TDA9887_INTERCARRIER (1<<4)
+# define TDA9887_PORT1_ACTIVE (1<<5)
+# define TDA9887_PORT2_ACTIVE (1<<6)
/* config options */
# define TDA9887_DEEMPHASIS_MASK (3<<16)
# define TDA9887_DEEMPHASIS_NONE (1<<16)