summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/drivers/media/dvb/b2c2/flexcop-eeprom.c2
-rw-r--r--linux/drivers/media/dvb/b2c2/flexcop-sram.c2
-rw-r--r--linux/drivers/media/dvb/b2c2/flexcop-usb.c2
-rw-r--r--linux/drivers/media/dvb/b2c2/flexcop-usb.h2
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_filter.c4
-rw-r--r--linux/drivers/media/dvb/dvb-core/dvb_net.c2
-rw-r--r--linux/drivers/media/dvb/frontends/at76c651.c2
-rw-r--r--linux/drivers/media/dvb/frontends/bcm3510.c2
-rw-r--r--linux/drivers/media/dvb/frontends/lgdt330x.c6
-rw-r--r--linux/drivers/media/dvb/frontends/tda10021.c4
-rw-r--r--linux/drivers/media/dvb/frontends/tda80xx.c2
-rw-r--r--linux/drivers/media/dvb/ttpci/av7110.c4
-rw-r--r--linux/drivers/media/dvb/ttpci/av7110_hw.c4
-rw-r--r--linux/drivers/media/dvb/ttpci/budget-patch.c2
-rw-r--r--linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c8
-rw-r--r--v4l/ChangeLog25
16 files changed, 49 insertions, 24 deletions
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-eeprom.c b/linux/drivers/media/dvb/b2c2/flexcop-eeprom.c
index bbcf070a1..16015fedb 100644
--- a/linux/drivers/media/dvb/b2c2/flexcop-eeprom.c
+++ b/linux/drivers/media/dvb/b2c2/flexcop-eeprom.c
@@ -7,7 +7,7 @@
*/
#include "flexcop.h"
-#if 0
+#if 0 /* keep */
/*EEPROM (Skystar2 has one "24LC08B" chip on board) */
static int eeprom_write(struct adapter *adapter, u16 addr, u8 *buf, u16 len)
{
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-sram.c b/linux/drivers/media/dvb/b2c2/flexcop-sram.c
index 01570ec80..4d978c01e 100644
--- a/linux/drivers/media/dvb/b2c2/flexcop-sram.c
+++ b/linux/drivers/media/dvb/b2c2/flexcop-sram.c
@@ -73,7 +73,7 @@ void flexcop_sram_ctrl(struct flexcop_device *fc, int usb_wan, int sramdma, int
}
EXPORT_SYMBOL(flexcop_sram_ctrl);
-#if 0
+#if 0 /* keep */
static void flexcop_sram_write(struct adapter *adapter, u32 bank, u32 addr, u8 *buf, u32 len)
{
int i, retries;
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-usb.c b/linux/drivers/media/dvb/b2c2/flexcop-usb.c
index 0a78ba373..b5a590115 100644
--- a/linux/drivers/media/dvb/b2c2/flexcop-usb.c
+++ b/linux/drivers/media/dvb/b2c2/flexcop-usb.c
@@ -184,7 +184,7 @@ static int flexcop_usb_get_mac_addr(struct flexcop_device *fc, int extended)
V8_MEMORY_PAGE_FLASH,0x1f010,1,fc->dvb_adapter.proposed_mac,6);
}
-#if 0
+#if 0 /* keep */
static int flexcop_usb_utility_req(struct flexcop_usb *fc_usb, int set,
flexcop_usb_utility_function_t func, u8 extra, u16 wIndex,
u16 buflen, u8 *pvBuffer)
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-usb.h b/linux/drivers/media/dvb/b2c2/flexcop-usb.h
index 630e647a2..0e31b9881 100644
--- a/linux/drivers/media/dvb/b2c2/flexcop-usb.h
+++ b/linux/drivers/media/dvb/b2c2/flexcop-usb.h
@@ -26,7 +26,7 @@ struct flexcop_usb {
int tmp_buffer_length;
};
-#if 0
+#if 0 /* keep */
/* request types TODO What is its use?*/
typedef enum {
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_filter.c b/linux/drivers/media/dvb/dvb-core/dvb_filter.c
index 772003fb1..164018c7b 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_filter.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_filter.c
@@ -3,7 +3,7 @@
#include <linux/string.h>
#include "dvb_filter.h"
-#if 0
+#if 0 /* keep */
static unsigned int bitrates[3][16] =
{{0,32,64,96,128,160,192,224,256,288,320,352,384,416,448,0},
{0,32,48,56,64,80,96,112,128,160,192,224,256,320,384,0},
@@ -26,7 +26,7 @@ static u32 ac3_frames[3][32] =
-#if 0
+#if 0 /* keep */
static void setup_ts2pes(ipack *pa, ipack *pv, u16 *pida, u16 *pidv,
void (*pes_write)(u8 *buf, int count, void *data),
void *priv)
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c
index 86bba81e8..220a5ebd7 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c
@@ -736,7 +736,7 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len)
}
/* it seems some ISPs manage to screw up here, so we have to
* relax the error checks... */
-#if 0
+#if 0 /* keep */
if ((pkt[5] & 0xfd) != 0xc1) {
/* drop scrambled or broken packets */
#else
diff --git a/linux/drivers/media/dvb/frontends/at76c651.c b/linux/drivers/media/dvb/frontends/at76c651.c
index 8e0f4b3a1..28fac791d 100644
--- a/linux/drivers/media/dvb/frontends/at76c651.c
+++ b/linux/drivers/media/dvb/frontends/at76c651.c
@@ -214,7 +214,7 @@ static int at76c651_set_qam(struct at76c651_state *state, fe_modulation_t qam)
case QAM_256:
state->qam = 0x08;
break;
-#if 0
+#if 0 /* keep */
case QAM_512:
state->qam = 0x09;
break;
diff --git a/linux/drivers/media/dvb/frontends/bcm3510.c b/linux/drivers/media/dvb/frontends/bcm3510.c
index 8ceb9a33c..1395d91ea 100644
--- a/linux/drivers/media/dvb/frontends/bcm3510.c
+++ b/linux/drivers/media/dvb/frontends/bcm3510.c
@@ -230,7 +230,7 @@ error:
return ret;
}
-#if 0
+#if 0 /* keep */
/* not needed, we use a semaphore to prevent HAB races */
static int bcm3510_is_ap_ready(struct bcm3510_state *st)
{
diff --git a/linux/drivers/media/dvb/frontends/lgdt330x.c b/linux/drivers/media/dvb/frontends/lgdt330x.c
index b77357c59..a36cbbd0f 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
+#if 0 /* keep */
/* 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
+#if 0 /* keep */
/* 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
+#if 0 /* keep */
/* 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/tda10021.c b/linux/drivers/media/dvb/frontends/tda10021.c
index ee365797d..876519586 100644
--- a/linux/drivers/media/dvb/frontends/tda10021.c
+++ b/linux/drivers/media/dvb/frontends/tda10021.c
@@ -46,7 +46,7 @@ struct tda10021_state {
};
-#if 0
+#if 0 /* keep */
#define dprintk(x...) printk(x)
#else
#define dprintk(x...)
@@ -434,7 +434,7 @@ static struct dvb_frontend_ops tda10021_ops = {
.frequency_max = 858000000,
.symbol_rate_min = (XIN/2)/64, /* SACLK/64 == (XIN/2)/64 */
.symbol_rate_max = (XIN/2)/4, /* SACLK/4 */
- #if 0
+ #if 0 /* keep */
.frequency_tolerance = ???,
.symbol_rate_tolerance = ???, /* ppm */ /* == 8% (spec p. 5) */
#endif
diff --git a/linux/drivers/media/dvb/frontends/tda80xx.c b/linux/drivers/media/dvb/frontends/tda80xx.c
index 58a561b88..c47660bd1 100644
--- a/linux/drivers/media/dvb/frontends/tda80xx.c
+++ b/linux/drivers/media/dvb/frontends/tda80xx.c
@@ -302,7 +302,7 @@ static int tda80xx_set_clk(struct tda80xx_state* state)
return tda80xx_write(state, 0x17, buf, sizeof(buf));
}
-#if 0
+#if 0 /* keep */
static int tda80xx_set_scpc_freq_offset(struct tda80xx_state* state)
{
/* a constant value is nonsense here imho */
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c
index 93e87e607..996ca39cb 100644
--- a/linux/drivers/media/dvb/ttpci/av7110.c
+++ b/linux/drivers/media/dvb/ttpci/av7110.c
@@ -421,7 +421,7 @@ static void debiirq(unsigned long data)
case DATA_COMMON_INTERFACE:
CI_handle(av7110, (u8 *)av7110->debi_virt, av7110->debilen);
-#if 0
+#if 0 /* keep */
{
int i;
@@ -1225,7 +1225,7 @@ static void vpeirq(unsigned long data)
if (!budget->feeding1 || (newdma == olddma))
return;
-#if 0
+#if 0 /* keep */
/* track rps1 activity */
printk("vpeirq: %02x Event Counter 1 0x%04x\n",
mem[olddma],
diff --git a/linux/drivers/media/dvb/ttpci/av7110_hw.c b/linux/drivers/media/dvb/ttpci/av7110_hw.c
index 54279aaa4..3baf0e8a4 100644
--- a/linux/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/linux/drivers/media/dvb/ttpci/av7110_hw.c
@@ -106,7 +106,7 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, int count)
/* av7110 ARM core boot stuff */
-#if 0
+#if 0 /* keep */
void av7110_reset_arm(struct av7110 *av7110)
{
saa7146_setgpio(av7110->dev, RESET_LINE, SAA7146_GPIO_OUTLO);
@@ -516,7 +516,7 @@ int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...)
return ret;
}
-#if 0
+#if 0 /* keep */
int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len)
{
int i, ret;
diff --git a/linux/drivers/media/dvb/ttpci/budget-patch.c b/linux/drivers/media/dvb/ttpci/budget-patch.c
index fc416cf52..4f0fcc575 100644
--- a/linux/drivers/media/dvb/ttpci/budget-patch.c
+++ b/linux/drivers/media/dvb/ttpci/budget-patch.c
@@ -517,7 +517,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
// test if GPIO3 will generate vertical blank signal
// in budget patch GPIO3 is connected to VSYNC_B
count = 0;
-#if 0
+#if 0 /* keep */
WRITE_RPS1(cpu_to_le32(CMD_UPLOAD |
MASK_10 | MASK_09 | MASK_08 | MASK_06 | MASK_05 | MASK_04 | MASK_03 | MASK_02 ));
#endif
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 104df610d..b9a531c61 100644
--- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -125,7 +125,7 @@ struct ttusb {
int revision;
-#if 0
+#if 0 /* keep */
devfs_handle_t stc_devfs_handle;
#endif
@@ -548,7 +548,7 @@ static int ttusb_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
#endif
-#if 0
+#if 0 /* keep */
static void ttusb_set_led_freq(struct ttusb *ttusb, u8 freq)
{
u8 b[] = { 0xaa, ++ttusb->c, 0x19, 1, freq };
@@ -768,7 +768,7 @@ static void ttusb_iso_irq(struct urb *urb, struct pt_regs *ptregs)
if (!ttusb->iso_streaming)
return;
-#if 0
+#if 0 /* keep */
printk("%s: status %d, errcount == %d, length == %i\n",
__FUNCTION__,
urb->status, urb->error_count, urb->actual_length);
@@ -994,7 +994,7 @@ static int ttusb_setup_interfaces(struct ttusb *ttusb)
return 0;
}
-#if 0
+#if 0 /* keep */
static u8 stc_firmware[8192];
static int stc_open(struct inode *inode, struct file *file)
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 807d7ca01..ba672c6b3 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,28 @@
+2005-12-08 13:47 mchehab
+
+ * linux/drivers/media/dvb/b2c2/flexcop-eeprom.c:
+ * linux/drivers/media/dvb/b2c2/flexcop-sram.c:
+ * linux/drivers/media/dvb/b2c2/flexcop-usb.c:
+ * linux/drivers/media/dvb/b2c2/flexcop-usb.h:
+ * linux/drivers/media/dvb/dvb-core/dvb_filter.c:
+ * linux/drivers/media/dvb/dvb-core/dvb_net.c:
+ * linux/drivers/media/dvb/frontends/at76c651.c: (at76c651_set_qam):
+ * linux/drivers/media/dvb/frontends/bcm3510.c:
+ * linux/drivers/media/dvb/frontends/lgdt330x.c:
+ (lgdt3302_read_status), (lgdt3302_read_snr), (lgdt3303_read_snr):
+ * linux/drivers/media/dvb/frontends/tda10021.c:
+ * linux/drivers/media/dvb/frontends/tda80xx.c:
+ * linux/drivers/media/dvb/ttpci/av7110.c: (debiirq), (vpeirq):
+ * linux/drivers/media/dvb/ttpci/av7110_hw.c:
+ * linux/drivers/media/dvb/ttpci/budget-patch.c:
+ (budget_patch_attach):
+ * linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c:
+ (ttusb_iso_irq):
+
+ - keep #if 0 for existent code when genreating kernel patches
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-12-08 12:37 mkrufky
* v4l/compat.h:
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-04 12:05:54 +0000