summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/drivers/media/video/msp3400-driver.c4
-rw-r--r--linux/drivers/media/video/msp3400.c4
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-cards.c4
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-i2c.c4
-rw-r--r--linux/drivers/media/video/tuner-simple.c14
-rw-r--r--linux/drivers/media/video/video-buf-dvb.c6
-rw-r--r--v4l/ChangeLog12
-rw-r--r--v4l/lgdt3302.c35
8 files changed, 48 insertions, 35 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index 481ecbe65..3abb2a739 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -757,9 +757,9 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout)
if (current->flags & PF_FREEZE) {
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12)
refrigerator (PF_FREEZE);
-#else
+#else
refrigerator ();
-#endif
+#endif
}
remove_wait_queue(&msp->wq, &wait);
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index 481ecbe65..3abb2a739 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -757,9 +757,9 @@ static int msp34xx_sleep(struct msp3400c *msp, int timeout)
if (current->flags & PF_FREEZE) {
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12)
refrigerator (PF_FREEZE);
-#else
+#else
refrigerator ();
-#endif
+#endif
}
remove_wait_queue(&msp->wq, &wait);
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index a6a5d90e7..40564214d 100644
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-cards.c,v 1.79 2005/07/05 17:37:35 nsh Exp $
+ * $Id: saa7134-cards.c,v 1.80 2005/07/07 01:49:30 mkrufky Exp $
*
* device driver for philips saa7134 based TV cards
* card-specific stuff.
@@ -2536,7 +2536,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
saa7134_i2c_call_clients (dev, TUNER_SET_TYPE_ADDR, &tun_setup);
}
break;
- case SAA7134_BOARD_MD7134:
+ case SAA7134_BOARD_MD7134:
{
struct tuner_setup tun_setup;
u8 subaddr;
diff --git a/linux/drivers/media/video/saa7134/saa7134-i2c.c b/linux/drivers/media/video/saa7134/saa7134-i2c.c
index 3a71fa42a..ccfefaab7 100644
--- a/linux/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/linux/drivers/media/video/saa7134/saa7134-i2c.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-i2c.c,v 1.18 2005/07/05 17:37:35 nsh Exp $
+ * $Id: saa7134-i2c.c,v 1.19 2005/07/07 01:49:30 mkrufky Exp $
*
* device driver for philips saa7134 based TV cards
* i2c interface support
@@ -343,7 +343,7 @@ static int attach_inform(struct i2c_client *client)
return 0;
if (saa7134_boards[dev->board].radio_type != UNSET) {
-
+
tun_setup.type = saa7134_boards[dev->board].radio_type;
tun_setup.addr = saa7134_boards[dev->board].radio_addr;
diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c
index ee10dbad1..316483e5f 100644
--- a/linux/drivers/media/video/tuner-simple.c
+++ b/linux/drivers/media/video/tuner-simple.c
@@ -1,5 +1,5 @@
/*
- * $Id: tuner-simple.c,v 1.38 2005/07/06 21:46:25 nsh Exp $
+ * $Id: tuner-simple.c,v 1.39 2005/07/07 01:49:30 mkrufky Exp $
*
* i2c tv tuner chip device driver
* controls all those simple 4-control-bytes style tuners.
@@ -57,9 +57,9 @@
/* Control byte */
-#define TUNER_RATIO_MASK 0x06 /* Bit cb1:cb2 */
-#define TUNER_RATIO_SELECT_50 0x00
-#define TUNER_RATIO_SELECT_32 0x02
+#define TUNER_RATIO_MASK 0x06 /* Bit cb1:cb2 */
+#define TUNER_RATIO_SELECT_50 0x00
+#define TUNER_RATIO_SELECT_32 0x02
#define TUNER_RATIO_SELECT_166 0x04
#define TUNER_RATIO_SELECT_62 0x06
@@ -71,11 +71,11 @@
#define TUNER_FL 0x40
#define TUNER_MODE 0x38
#define TUNER_AFC 0x07
-#define TUNER_SIGNAL 0x07
-#define TUNER_STEREO 0x10
+#define TUNER_SIGNAL 0x07
+#define TUNER_STEREO 0x10
#define TUNER_PLL_LOCKED 0x40
-#define TUNER_STEREO_MK3 0x04
+#define TUNER_STEREO_MK3 0x04
/* ---------------------------------------------------------------------- */
diff --git a/linux/drivers/media/video/video-buf-dvb.c b/linux/drivers/media/video/video-buf-dvb.c
index 1474700d5..61e6b62b7 100644
--- a/linux/drivers/media/video/video-buf-dvb.c
+++ b/linux/drivers/media/video/video-buf-dvb.c
@@ -1,5 +1,5 @@
/*
- * $Id: video-buf-dvb.c,v 1.10 2005/07/06 16:21:25 nsh Exp $
+ * $Id: video-buf-dvb.c,v 1.11 2005/07/07 01:49:30 mkrufky Exp $
*
* some helper function for simple DVB cards which simply DMA the
* complete transport stream and let the computer sort everything else
@@ -65,9 +65,9 @@ static int videobuf_dvb_thread(void *data)
if (current->flags & PF_FREEZE) {
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12)
refrigerator (PF_FREEZE);
-#else
+#else
refrigerator ();
-#endif
+#endif
}
/* feed buffer data to demux */
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 526434fa1..202254079 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,15 @@
+2005-07-06 21:44 mkrufky
+ * lgdt3302.c:
+ - Fix bug in lgdt3302_read_status to return correct
+ FE_HAS_SIGNAL and FS_HAS_CARRIER status.
+
+ * msp3400.c, saa7134-cards.c, saa7134-i2c.c:
+ * tuner-simple.c, video-buf-dvb.c:
+ - Remove trailing whitespace.
+
+ Signed-off-by: Mac Michaels <wmichaels1@earthlink.net>
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-07-07 01:44 nshmyrev
* tuner-simple.c:
- Use 50 kHz step when tunning radio for most tuners.
diff --git a/v4l/lgdt3302.c b/v4l/lgdt3302.c
index 5b591e349..27c95be25 100644
--- a/v4l/lgdt3302.c
+++ b/v4l/lgdt3302.c
@@ -1,5 +1,5 @@
/*
- * $Id: lgdt3302.c,v 1.13 2005/07/06 06:03:18 mkrufky Exp $
+ * $Id: lgdt3302.c,v 1.14 2005/07/07 01:49:30 mkrufky Exp $
*
* Support for LGDT3302 (DViCO FustionHDTV 3 Gold) - VSB/QAM
*
@@ -347,11 +347,28 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
* This is done in SwReset();
*/
+ /* AGC status register */
+ i2c_selectreadbytes(state, AGC_STATUS, buf, 1);
+ dprintk("%s: AGC_STATUS = 0x%02x\n", __FUNCTION__, buf[0]);
+ if ((buf[0] & 0x0c) == 0x8){
+ /* Test signal does not exist flag */
+ /* as well as the AGC lock flag. */
+ *status |= FE_HAS_SIGNAL;
+ } else {
+ /* Without a signal all other status bits are meaningless */
+ return 0;
+ }
+
/* signal status */
i2c_selectreadbytes(state, TOP_CONTROL, buf, sizeof(buf));
dprintk("%s: TOP_CONTROL = 0x%02x, IRO_MASK = 0x%02x, IRQ_STATUS = 0x%02x\n", __FUNCTION__, buf[0], buf[1], buf[2]);
+
+#if 0
+ /* Alternative method to check for a signal */
+ /* using the SNR good/bad interrupts. */
if ((buf[2] & 0x30) == 0x10)
*status |= FE_HAS_SIGNAL;
+#endif
/* sync status */
if ((buf[2] & 0x03) == 0x01) {
@@ -364,17 +381,6 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
*status |= FE_HAS_VITERBI;
}
-#if 0
- /* Alternative method to check for a signal */
- /* AGC status register */
- i2c_selectreadbytes(state, AGC_STATUS, buf, 1);
- dprintk("%s: AGC_STATUS = 0x%02x\n", __FUNCTION__, buf[0]);
- if ((buf[0] & 0x0c) == 0x80) /* Test signal does not exist flag */
- /* Test AGC lock flag */
- *status |= FE_HAS_SIGNAL;
- else
- return 0;
-
/* Carrier Recovery Lock Status Register */
i2c_selectreadbytes(state, CARRIER_LOCK, buf, 1);
dprintk("%s: CARRIER_LOCK = 0x%02x\n", __FUNCTION__, buf[0]);
@@ -384,19 +390,14 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
/* Need to undestand why there are 3 lock levels here */
if ((buf[0] & 0x07) == 0x07)
*status |= FE_HAS_CARRIER;
- else
- return 0;
break;
case VSB_8:
if ((buf[0] & 0x80) == 0x80)
*status |= FE_HAS_CARRIER;
- else
- return 0;
break;
default:
printk("KERN_WARNING lgdt3302: %s: Modulation set to unsupported value\n", __FUNCTION__);
}
-#endif
return 0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-10 14:04:00 +0000