summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_filter.c22
-rw-r--r--linux/drivers/media/dvb/frontends/lgdt330x.c6
-rw-r--r--linux/drivers/media/dvb/frontends/stv0297.c2
-rw-r--r--linux/drivers/media/dvb/frontends/tda80xx.c2
-rw-r--r--linux/drivers/media/dvb/ttpci/av7110.c2
-rw-r--r--linux/drivers/media/dvb/ttpci/ttpci-eeprom.c2
-rw-r--r--linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c2
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-input.c2
8 files changed, 20 insertions, 20 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_filter.c b/linux/drivers/media/dvb/dvb-core/dvb_filter.c
index 164018c7b..b710391a6 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_filter.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_filter.c
@@ -40,7 +40,7 @@ static void setup_ts2pes(ipack *pa, ipack *pv, u16 *pida, u16 *pidv,
}
#endif
-#if 0
+#if 0 /* keep */
static void ts_to_pes(ipack *p, u8 *buf) // don't need count (=188)
{
u8 off = 0;
@@ -65,7 +65,7 @@ static void ts_to_pes(ipack *p, u8 *buf) // don't need count (=188)
}
#endif
-#if 0
+#if 0 /* keep */
/* needs 5 byte input, returns picture coding type*/
static int read_picture_header(u8 *headr, struct mpg_picture *pic, int field, int pr)
{
@@ -111,7 +111,7 @@ static int read_picture_header(u8 *headr, struct mpg_picture *pic, int field, in
}
#endif
-#if 0
+#if 0 /* keep */
/* needs 4 byte input */
static int read_gop_header(u8 *headr, struct mpg_picture *pic, int pr)
{
@@ -142,7 +142,7 @@ static int read_gop_header(u8 *headr, struct mpg_picture *pic, int pr)
}
#endif
-#if 0
+#if 0 /* keep */
/* needs 8 byte input */
static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
{
@@ -257,7 +257,7 @@ static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr)
#endif
-#if 0
+#if 0 /* keep */
static int get_vinfo(u8 *mbuf, int count, struct dvb_video_info *vi, int pr)
{
u8 *headr;
@@ -286,7 +286,7 @@ static int get_vinfo(u8 *mbuf, int count, struct dvb_video_info *vi, int pr)
#endif
-#if 0
+#if 0 /* keep */
static int get_ainfo(u8 *mbuf, int count, struct dvb_audio_info *ai, int pr)
{
u8 *headr;
@@ -393,7 +393,7 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p
EXPORT_SYMBOL(dvb_filter_get_ac3info);
-#if 0
+#if 0 /* keep */
static u8 *skip_pes_header(u8 **bufp)
{
u8 *inbuf = *bufp;
@@ -431,7 +431,7 @@ static u8 *skip_pes_header(u8 **bufp)
}
#endif
-#if 0
+#if 0 /* keep */
static void initialize_quant_matrix( u32 *matrix )
{
int i;
@@ -458,7 +458,7 @@ static void initialize_quant_matrix( u32 *matrix )
}
#endif
-#if 0
+#if 0 /* keep */
static void initialize_mpg_picture(struct mpg_picture *pic)
{
int i;
@@ -485,7 +485,7 @@ static void initialize_mpg_picture(struct mpg_picture *pic)
}
#endif
-#if 0
+#if 0 /* keep */
static void mpg_set_picture_parameter( int32_t field_type, struct mpg_picture *pic )
{
int16_t last_h_offset;
@@ -523,7 +523,7 @@ static void mpg_set_picture_parameter( int32_t field_type, struct mpg_picture *p
}
#endif
-#if 0
+#if 0 /* keep */
static void init_mpg_picture( struct mpg_picture *pic, int chan, int32_t field_type)
{
pic->picture_header = 0;
diff --git a/linux/drivers/media/dvb/frontends/lgdt330x.c b/linux/drivers/media/dvb/frontends/lgdt330x.c
index a36cbbd0f..b77357c59 100644
--- a/linux/drivers/media/dvb/frontends/lgdt330x.c
+++ b/linux/drivers/media/dvb/frontends/lgdt330x.c
@@ -446,7 +446,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
i2c_read_demod_bytes(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 /* keep */
+#if 0
/* Alternative method to check for a signal */
/* using the SNR good/bad interrupts. */
if ((buf[2] & 0x30) == 0x10)
@@ -650,7 +650,7 @@ static int lgdt3302_read_snr(struct dvb_frontend* fe, u16* snr)
i2c_read_demod_bytes(state, EQPH_ERR0, buf, sizeof(buf));
if (state->current_modulation == VSB_8) {
-#if 0 /* keep */
+#if 0
/* Equalizer Mean-Square Error Register for VSB */
noise = ((buf[0] & 7) << 16) | (buf[1] << 8) | buf[2];
#else
@@ -682,7 +682,7 @@ static int lgdt3303_read_snr(struct dvb_frontend* fe, u16* snr)
if (state->current_modulation == VSB_8) {
-#if 0 /* keep */
+#if 0
/* Equalizer Mean-Square Error Register for VSB */
noise = ((buf[0] & 0x78) << 13) | (buf[1] << 8) | buf[2];
#else
diff --git a/linux/drivers/media/dvb/frontends/stv0297.c b/linux/drivers/media/dvb/frontends/stv0297.c
index 6122ba754..00bd2118b 100644
--- a/linux/drivers/media/dvb/frontends/stv0297.c
+++ b/linux/drivers/media/dvb/frontends/stv0297.c
@@ -39,7 +39,7 @@ struct stv0297_state {
unsigned long base_freq;
};
-#if 1
+#if 1 /* keep */
#define dprintk(x...) printk(x)
#else
#define dprintk(x...)
diff --git a/linux/drivers/media/dvb/frontends/tda80xx.c b/linux/drivers/media/dvb/frontends/tda80xx.c
index c47660bd1..635f693bd 100644
--- a/linux/drivers/media/dvb/frontends/tda80xx.c
+++ b/linux/drivers/media/dvb/frontends/tda80xx.c
@@ -412,7 +412,7 @@ static int tda8044_init(struct dvb_frontend* fe)
return ret;
tda80xx_writereg(state, 0x0f, 0x50);
-#if 1
+#if 1 /* keep */
tda80xx_writereg(state, 0x20, 0x8F); /* FIXME */
tda80xx_writereg(state, 0x20, state->config->volt18setting); /* FIXME */
//tda80xx_writereg(state, 0x00, 0x04);
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c
index 996ca39cb..482c3e019 100644
--- a/linux/drivers/media/dvb/ttpci/av7110.c
+++ b/linux/drivers/media/dvb/ttpci/av7110.c
@@ -1386,7 +1386,7 @@ int i2c_writereg(struct av7110 *av7110, u8 id, u8 reg, u8 val)
return i2c_transfer(&av7110->i2c_adap, &msgs, 1);
}
-#if 0
+#if 0 /* keep */
u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg)
{
u8 mm1[] = {0x00};
diff --git a/linux/drivers/media/dvb/ttpci/ttpci-eeprom.c b/linux/drivers/media/dvb/ttpci/ttpci-eeprom.c
index 1f31e9119..d6f43269e 100644
--- a/linux/drivers/media/dvb/ttpci/ttpci-eeprom.c
+++ b/linux/drivers/media/dvb/ttpci/ttpci-eeprom.c
@@ -39,7 +39,7 @@
#include "ttpci-eeprom.h"
-#if 1
+#if 1 /* keep */
#define dprintk(x...) do { printk(x); } while (0)
#else
#define dprintk(x...) do { } while (0)
diff --git a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index b9a531c61..0e813a4cf 100644
--- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1575,7 +1575,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
return -ENODEV;
}
-#if 0
+#if 0 /* keep */
ttusb->stc_devfs_handle =
devfs_register(ttusb->adapter->devfs_handle, TTUSB_BUDGET_NAME,
DEVFS_FL_DEFAULT, 0, 192,
diff --git a/linux/drivers/media/video/em28xx/em28xx-input.c b/linux/drivers/media/video/em28xx/em28xx-input.c
index ad71ac931..54b0a8f2d 100644
--- a/linux/drivers/media/video/em28xx/em28xx-input.c
+++ b/linux/drivers/media/video/em28xx/em28xx-input.c
@@ -121,7 +121,7 @@ static int get_key_em_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
if (buf[1]==0xff)
return 0;
-#if 0 /* Keep */
+#if 0
/* avoid reapeating keystrokes */
if (buf[1]==ir->old)
return 0;