summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/Documentation/video4linux/saa7134-lifeview.txt8
-rw-r--r--linux/drivers/media/video/bttv-driver.c4
-rw-r--r--linux/drivers/media/video/cx88/cx88-mpeg.c8
-rw-r--r--linux/drivers/media/video/cx88/cx88-tvaudio.c4
-rw-r--r--linux/drivers/media/video/cx88/cx88-video.c8
-rw-r--r--v4l/.bp/2.6/dvb-cx227022
-rw-r--r--v4l/.bp/2.6/dvb-frontends6
-rw-r--r--v4l/.bp/2.6/dvb-mt3522
-rw-r--r--v4l/.bp/2.6/dvb-or511322
-rw-r--r--v4l/.bp/2.6/dvb-pll2
-rw-r--r--v4l/compat.h1
11 files changed, 29 insertions, 18 deletions
diff --git a/linux/Documentation/video4linux/saa7134-lifeview.txt b/linux/Documentation/video4linux/saa7134-lifeview.txt
new file mode 100644
index 000000000..5f7e1761e
--- /dev/null
+++ b/linux/Documentation/video4linux/saa7134-lifeview.txt
@@ -0,0 +1,8 @@
+collecting data about the liveview models and the config coding on
+gpio pins 0-9 ...
+==================================================================
+
+LR50 rev. Q ("PARTS: 7031505116), Tuner wurde als Nr. 5 erkannt, Eingänge
+SVideo, TV, Composite, Audio, Remote. CP9..1=100001001 (1: 0-Ohm-Widerstand
+gegen GND unbestückt; 0: bestückt)
+
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index 2845649f6..5d981ee93 100644
--- a/linux/drivers/media/video/bttv-driver.c
+++ b/linux/drivers/media/video/bttv-driver.c
@@ -1,5 +1,5 @@
/*
- $Id: bttv-driver.c,v 1.35 2005/01/24 17:37:23 kraxel Exp $
+ $Id: bttv-driver.c,v 1.36 2005/02/15 10:51:53 kraxel Exp $
bttv - Bt848 frame grabber driver
@@ -3938,7 +3938,7 @@ static void __devexit bttv_remove(struct pci_dev *pci_dev)
return;
}
-static int bttv_suspend(struct pci_dev *pci_dev, u32 state)
+static int bttv_suspend(struct pci_dev *pci_dev, pm_message_t state)
{
struct bttv *btv = pci_get_drvdata(pci_dev);
struct bttv_buffer_set idle;
diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c
index bd09d16eb..0987d8a8f 100644
--- a/linux/drivers/media/video/cx88/cx88-mpeg.c
+++ b/linux/drivers/media/video/cx88/cx88-mpeg.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-mpeg.c,v 1.20 2005/02/10 10:38:05 kraxel Exp $
+ * $Id: cx88-mpeg.c,v 1.21 2005/02/15 10:51:53 kraxel Exp $
*
* Support for the mpeg transport stream transfers
* PCI function #2 of the cx2388x.
@@ -400,7 +400,7 @@ void cx8802_fini_common(struct cx8802_dev *dev)
/* ----------------------------------------------------------- */
-int cx8802_suspend_common(struct pci_dev *pci_dev, u32 state)
+int cx8802_suspend_common(struct pci_dev *pci_dev, pm_message_t state)
{
struct cx8802_dev *dev = pci_get_drvdata(pci_dev);
struct cx88_core *core = dev->core;
@@ -424,7 +424,7 @@ int cx8802_suspend_common(struct pci_dev *pci_dev, u32 state)
#else
pci_save_state(pci_dev);
#endif
- if (0 != pci_set_power_state(pci_dev, state)) {
+ if (0 != pci_set_power_state(pci_dev, pci_choose_state(pci_dev, state))) {
pci_disable_device(pci_dev);
dev->state.disabled = 1;
}
@@ -440,7 +440,7 @@ int cx8802_resume_common(struct pci_dev *pci_dev)
pci_enable_device(pci_dev);
dev->state.disabled = 0;
}
- pci_set_power_state(pci_dev, 0);
+ pci_set_power_state(pci_dev, PCI_D0);
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
pci_restore_state(pci_dev, dev->state.pci_cfg);
#else
diff --git a/linux/drivers/media/video/cx88/cx88-tvaudio.c b/linux/drivers/media/video/cx88/cx88-tvaudio.c
index a53db7a39..0fdfd7710 100644
--- a/linux/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/linux/drivers/media/video/cx88/cx88-tvaudio.c
@@ -1,5 +1,5 @@
/*
- $Id: cx88-tvaudio.c,v 1.31 2005/02/14 16:30:26 kraxel Exp $
+ $Id: cx88-tvaudio.c,v 1.32 2005/02/15 10:51:54 kraxel Exp $
cx88x-audio.c - Conexant CX23880/23881 audio downstream driver driver
@@ -851,7 +851,7 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
}
break;
case WW_SYSTEM_L_AM:
- if (0x0 == mode && (cx_read(AUD_INIT) & 0x04)) {
+ if (0x0 == mode && !(cx_read(AUD_INIT) & 0x04)) {
t->audmode = V4L2_TUNER_MODE_STEREO;
t->rxsubchans |= V4L2_TUNER_SUB_STEREO;
}
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c
index 690ca8990..f115d8564 100644
--- a/linux/drivers/media/video/cx88/cx88-video.c
+++ b/linux/drivers/media/video/cx88/cx88-video.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-video.c,v 1.55 2005/02/14 16:30:26 kraxel Exp $
+ * $Id: cx88-video.c,v 1.56 2005/02/15 10:51:54 kraxel Exp $
*
* device driver for Conexant 2388x based TV cards
* video4linux video interface
@@ -2168,7 +2168,7 @@ static void __devexit cx8800_finidev(struct pci_dev *pci_dev)
kfree(dev);
}
-static int cx8800_suspend(struct pci_dev *pci_dev, u32 state)
+static int cx8800_suspend(struct pci_dev *pci_dev, pm_message_t state)
{
struct cx8800_dev *dev = pci_get_drvdata(pci_dev);
struct cx88_core *core = dev->core;
@@ -2197,7 +2197,7 @@ static int cx8800_suspend(struct pci_dev *pci_dev, u32 state)
#else
pci_save_state(pci_dev);
#endif
- if (0 != pci_set_power_state(pci_dev, state)) {
+ if (0 != pci_set_power_state(pci_dev, pci_choose_state(pci_dev, state))) {
pci_disable_device(pci_dev);
dev->state.disabled = 1;
}
@@ -2213,7 +2213,7 @@ static int cx8800_resume(struct pci_dev *pci_dev)
pci_enable_device(pci_dev);
dev->state.disabled = 0;
}
- pci_set_power_state(pci_dev, 0);
+ pci_set_power_state(pci_dev, PCI_D0);
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
pci_restore_state(pci_dev, dev->state.pci_cfg);
#else
diff --git a/v4l/.bp/2.6/dvb-cx22702 b/v4l/.bp/2.6/dvb-cx22702
new file mode 100644
index 000000000..d24cc6d61
--- /dev/null
+++ b/v4l/.bp/2.6/dvb-cx22702
@@ -0,0 +1,2 @@
+srcdiff cx22702.h drivers/media/dvb/frontends/cx22702.h
+srcdiff cx22702.c drivers/media/dvb/frontends/cx22702.c
diff --git a/v4l/.bp/2.6/dvb-frontends b/v4l/.bp/2.6/dvb-frontends
deleted file mode 100644
index 397aa381c..000000000
--- a/v4l/.bp/2.6/dvb-frontends
+++ /dev/null
@@ -1,6 +0,0 @@
-srcdiff dvb-pll.h drivers/media/dvb/frontends/dvb-pll.h
-srcdiff dvb-pll.c drivers/media/dvb/frontends/dvb-pll.c
-srcdiff cx22702.h drivers/media/dvb/frontends/cx22702.h
-srcdiff cx22702.c drivers/media/dvb/frontends/cx22702.c
-srcdiff mt352.h drivers/media/dvb/frontends/mt352.h
-srcdiff mt352.c drivers/media/dvb/frontends/mt352.c
diff --git a/v4l/.bp/2.6/dvb-mt352 b/v4l/.bp/2.6/dvb-mt352
new file mode 100644
index 000000000..88966c7f6
--- /dev/null
+++ b/v4l/.bp/2.6/dvb-mt352
@@ -0,0 +1,2 @@
+srcdiff mt352.h drivers/media/dvb/frontends/mt352.h
+srcdiff mt352.c drivers/media/dvb/frontends/mt352.c
diff --git a/v4l/.bp/2.6/dvb-or51132 b/v4l/.bp/2.6/dvb-or51132
new file mode 100644
index 000000000..f5c5d8d57
--- /dev/null
+++ b/v4l/.bp/2.6/dvb-or51132
@@ -0,0 +1,2 @@
+srcdiff or51132.h drivers/media/dvb/frontends/or51132.h
+srcdiff or51132.c drivers/media/dvb/frontends/or51132.c
diff --git a/v4l/.bp/2.6/dvb-pll b/v4l/.bp/2.6/dvb-pll
new file mode 100644
index 000000000..6f773c019
--- /dev/null
+++ b/v4l/.bp/2.6/dvb-pll
@@ -0,0 +1,2 @@
+srcdiff dvb-pll.h drivers/media/dvb/frontends/dvb-pll.h
+srcdiff dvb-pll.c drivers/media/dvb/frontends/dvb-pll.c
diff --git a/v4l/compat.h b/v4l/compat.h
index 468053472..26ecf4c38 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -23,6 +23,7 @@
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
+# define pm_message_t u32
# define pci_choose_state(pci_dev, state) (state)
# define PCI_D0 (0)
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-06 13:58:18 +0000