summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-06-28 23:41:47 +0000
committerMichael Krufky <devnull@localhost>2005-06-28 23:41:47 +0000
commitb8bd2cf93e080fb276d420abd5984229ac1956df (patch)
tree1293b6ac69dce6c73ee31f14009b5723e57f76d4 /v4l
parent1ef3ff94294f739f71fdad2b1e41e089b09a0508 (diff)
downloadmediapointer-dvb-s2-b8bd2cf93e080fb276d420abd5984229ac1956df.tar.gz
mediapointer-dvb-s2-b8bd2cf93e080fb276d420abd5984229ac1956df.tar.bz2
* cx88-core.c, cx88-dvb.c, cx88-input.c:
* lgdt3302.c, lgdt3302_priv.h, or51132.c: * saa7134-cards.c, saa7134-core.c: * saa7134-dvb.c, saa7134-i2c.c, saa7134-oss.c: * saa7134-tvaudio.c, saa7134-video.c: * tda8290.c, tea5767.c, tuner-simple.c: - Clean up ALL whitespace using scripts/strip-trailing-whitespaces.sh Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/ChangeLog13
-rw-r--r--v4l/lgdt3302.c46
-rw-r--r--v4l/lgdt3302_priv.h8
-rw-r--r--v4l/or51132.c16
4 files changed, 48 insertions, 35 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 0b080a182..3e6214077 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,16 @@
+2005-06-28 19:35 mkrufky
+ * cx88-core.c, cx88-dvb.c, cx88-input.c:
+ * lgdt3302.c, lgdt3302_priv.h, or51132.c:
+ * saa7134-cards.c, saa7134-core.c:
+ * saa7134-dvb.c, saa7134-i2c.c, saa7134-oss.c:
+ * saa7134-tvaudio.c, saa7134-video.c:
+ * tda8290.c, tea5767.c, tuner-simple.c:
+
+ - Clean up ALL whitespace using
+ scripts/strip-trailing-whitespaces.sh
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-06-28 09:04 mkrufky
* lgdt3302.c:
- Revert previous changes:
diff --git a/v4l/lgdt3302.c b/v4l/lgdt3302.c
index ee602f6e6..a80e1dd41 100644
--- a/v4l/lgdt3302.c
+++ b/v4l/lgdt3302.c
@@ -1,5 +1,5 @@
/*
- * $Id: lgdt3302.c,v 1.11 2005/06/28 16:12:14 mkrufky Exp $
+ * $Id: lgdt3302.c,v 1.12 2005/06/28 23:41:47 mkrufky Exp $
*
* Support for LGDT3302 (DViCO FustionHDTV 3 Gold) - VSB/QAM
*
@@ -24,14 +24,14 @@
*
*/
-/*
+/*
* NOTES ABOUT THIS DRIVER
*
* This driver supports DViCO FusionHDTV 3 Gold under Linux.
*
* TODO:
* BER and signal strength always return 0.
- *
+ *
*/
#include <linux/version.h>
@@ -121,7 +121,7 @@ static int i2c_readbytes (struct lgdt3302_state* state,
}
/*
- * This routine writes the register (reg) to the demod bus
+ * This routine writes the register (reg) to the demod bus
* then reads the data returned for (len) bytes.
*/
@@ -155,7 +155,7 @@ int lgdt3302_SwReset(struct lgdt3302_state* state)
* bits 5-0 are 1 to mask interrupts */
};
- ret = i2c_writebytes(state,
+ ret = i2c_writebytes(state,
state->config->demod_address,
reset, sizeof(reset));
if (ret == 0) {
@@ -205,7 +205,7 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe,
struct dvb_frontend_parameters *param)
{
u8 buf[4];
- struct lgdt3302_state* state =
+ struct lgdt3302_state* state =
(struct lgdt3302_state*) fe->demodulator_priv;
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10)
@@ -238,7 +238,7 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe,
case QAM_256:
dprintk("%s: QAM_256 MODE\n", __FUNCTION__);
-
+
/* Select QAM_256 mode and serial MPEG interface */
top_ctrl_cfg[1] = 0x05;
break;
@@ -264,7 +264,7 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe,
i2c_writebytes(state, state->config->demod_address,
agc_ctrl_cfg, sizeof(agc_ctrl_cfg));
- /* Change the TPCLK pin polarity
+ /* Change the TPCLK pin polarity
data is valid on falling clock */
i2c_writebytes(state, state->config->demod_address,
demux_ctrl_cfg, sizeof(demux_ctrl_cfg));
@@ -275,7 +275,7 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe,
recovery center frequency register for VSB */
i2c_writebytes(state, state->config->demod_address,
vsb_freq_cfg, sizeof(vsb_freq_cfg));
- } else {
+ } else {
/* Initialization for QAM modes only */
/* Set the value of 'INLVTHD' register 0x2a/0x2c
to value from 'IFACC' register 0x39/0x3b -1 */
@@ -328,7 +328,7 @@ static int lgdt3302_set_parameters(struct dvb_frontend* fe,
static int lgdt3302_get_frontend(struct dvb_frontend* fe,
struct dvb_frontend_parameters* param)
{
- struct lgdt3302_state *state = fe->demodulator_priv;
+ struct lgdt3302_state *state = fe->demodulator_priv;
param->frequency = state->current_frequency;
return 0;
}
@@ -429,18 +429,18 @@ static int lgdt3302_read_snr(struct dvb_frontend* fe, u16* snr)
* starting at 43 or 45 is the SNR value in db. There are duplicate noise
* value entries at the beginning because the SNR varies more than
* 1 db for a change of 1 digit in noise at very small values of noise.
- *
+ *
* Examples from SNR_EQ table:
* noise SNR
- * 0 43
- * 1 42
- * 2 39
+ * 0 43
+ * 1 42
+ * 2 39
* 3 37
- * 4 36
- * 5 35
+ * 4 36
+ * 5 35
* 6 34
- * 7 33
- * 8 33
+ * 7 33
+ * 8 33
* 9 32
* 10 32
* 11 31
@@ -457,7 +457,7 @@ static int lgdt3302_read_snr(struct dvb_frontend* fe, u16* snr)
80978, 101945, 128341, 161571, 203406, 256073, 0x40000
};
- static const u32 SNR_PH[] =
+ static const u32 SNR_PH[] =
{ 1, 2, 2, 2, 3, 3, 4, 5, 6, 8,
10, 12, 15, 19, 23, 29, 37, 46, 58, 73,
91, 115, 144, 182, 229, 288, 362, 456, 574, 722,
@@ -471,15 +471,15 @@ static int lgdt3302_read_snr(struct dvb_frontend* fe, u16* snr)
static u32 snr_db; /* index into SNR_EQ[] */
struct lgdt3302_state* state = (struct lgdt3302_state*) fe->demodulator_priv;
- /* read both equalizer and pase tracker noise data */
+ /* read both equalizer and pase tracker noise data */
i2c_selectreadbytes(state, EQPH_ERR0, buf, sizeof(buf));
if (state->current_modulation == VSB_8) {
/* Equalizer Mean-Square Error Register for VSB */
noise = ((buf[0] & 7) << 16) | (buf[1] << 8) | buf[2];
- /*
- * Look up noise value in table.
+ /*
+ * Look up noise value in table.
* A better search algorithm could be used...
* watch out there are duplicate entries.
*/
@@ -509,7 +509,7 @@ static int lgdt3302_read_snr(struct dvb_frontend* fe, u16* snr)
/* read both equalizer and pase tracker noise data */
i2c_selectreadbytes(state, EQPH_ERR0, buf, sizeof(buf));
-
+
if (state->current_modulation == VSB_8) {
/* Equalizer Mean-Square Error Register for VSB */
noise = ((buf[0] & 7) << 16) | (buf[1] << 8) | buf[2];
diff --git a/v4l/lgdt3302_priv.h b/v4l/lgdt3302_priv.h
index 53663b1b1..cfbf23462 100644
--- a/v4l/lgdt3302_priv.h
+++ b/v4l/lgdt3302_priv.h
@@ -1,5 +1,5 @@
/*
- * $Id: lgdt3302_priv.h,v 1.3 2005/06/22 06:48:58 mkrufky Exp $
+ * $Id: lgdt3302_priv.h,v 1.4 2005/06/28 23:41:47 mkrufky Exp $
*
* Support for LGDT3302 (DViCO FustionHDTV 3 Gold) - VSB/QAM
*
@@ -48,9 +48,9 @@ enum I2C_REG {
AGC_FUNC_CTRL1= 0x32,
AGC_FUNC_CTRL2= 0x33,
AGC_FUNC_CTRL3= 0x34,
- AGC_RFIF_ACC0= 0x39,
- AGC_RFIF_ACC1= 0x3a,
- AGC_RFIF_ACC2= 0x3b,
+ AGC_RFIF_ACC0= 0x39,
+ AGC_RFIF_ACC1= 0x3a,
+ AGC_RFIF_ACC2= 0x3b,
AGC_STATUS= 0x3f,
SYNC_STATUS_VSB= 0x43,
EQPH_ERR0= 0x47,
diff --git a/v4l/or51132.c b/v4l/or51132.c
index 97b876149..794608f16 100644
--- a/v4l/or51132.c
+++ b/v4l/or51132.c
@@ -59,7 +59,7 @@ struct or51132_state
const struct or51132_config* config;
struct dvb_frontend frontend;
-
+
/* Demodulator private data */
fe_modulation_t current_modulation;
@@ -139,7 +139,7 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware
return ret;
}
- /* Wait at least 5 msec */
+ /* Wait at least 5 msec */
msleep(20); /* 10ms */
if ((ret = i2c_writebytes(state,state->config->demod_address,
@@ -191,7 +191,7 @@ static int or51132_load_firmware (struct dvb_frontend* fe, const struct firmware
get_ver_buf[4] = i+1;
if ((ret = i2c_readbytes(state,state->config->demod_address,
&rec_buf[i*2],2))) {
- printk(KERN_WARNING
+ printk(KERN_WARNING
"or51132: load_firmware error d - %d\n",i);
return ret;
}
@@ -332,7 +332,7 @@ static int or51132_set_parameters(struct dvb_frontend* fe,
dprintk("set_parameters VSB MODE\n");
printk("or51132: Waiting for firmware upload(%s)...\n",
OR51132_VSB_FIRMWARE);
- ret = request_firmware(&fw, OR51132_VSB_FIRMWARE,
+ ret = request_firmware(&fw, OR51132_VSB_FIRMWARE,
&state->i2c->dev);
if (ret){
printk(KERN_WARNING "or51132: No firmware up"
@@ -348,7 +348,7 @@ static int or51132_set_parameters(struct dvb_frontend* fe,
dprintk("set_parameters QAM MODE\n");
printk("or51132: Waiting for firmware upload(%s)...\n",
OR51132_QAM_FIRMWARE);
- ret = request_firmware(&fw, OR51132_QAM_FIRMWARE,
+ ret = request_firmware(&fw, OR51132_QAM_FIRMWARE,
&state->i2c->dev);
if (ret){
printk(KERN_WARNING "or51132: No firmware up"
@@ -388,10 +388,10 @@ static int or51132_set_parameters(struct dvb_frontend* fe,
if (i2c_writebytes(state, state->config->pll_address ,buf, 4))
printk(KERN_WARNING "or51132: set_parameters error "
"writing to tuner\n");
-
+
/* Set to current mode */
or51132_setmode(fe);
-
+
/* Update current frequency */
state->current_frequency = param->frequency;
}
@@ -479,7 +479,7 @@ static int or51132_read_signal_strength(struct dvb_frontend* fe, u16* strength)
u8 rcvr_stat;
u16 snr_equ;
int usK;
-
+
snd_buf[0]=0x04;
snd_buf[1]=0x02; /* SNR after Equalizer */
msleep(30); /* 30ms */