summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-04-11 17:28:37 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-04-11 17:28:37 -0300
commitde23398fdb3acd84db447947bd6c2e347cdb7f6f (patch)
tree83ff9a5134132a1a6098e57f8dde9c88edcf2e16 /linux
parentc271ec73f1129f6e81861829f463dae7ce2315d5 (diff)
downloadmediapointer-dvb-s2-de23398fdb3acd84db447947bd6c2e347cdb7f6f.tar.gz
mediapointer-dvb-s2-de23398fdb3acd84db447947bd6c2e347cdb7f6f.tar.bz2
added /* keep */ to all #if 0 to avoid being removed by gentree.pl
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/adv7170.c2
-rw-r--r--linux/drivers/media/video/arv.c12
-rw-r--r--linux/drivers/media/video/bw-qcam.c2
-rw-r--r--linux/drivers/media/video/c-qcam.c2
-rw-r--r--linux/drivers/media/video/cpia.c2
-rw-r--r--linux/drivers/media/video/meye.c2
-rw-r--r--linux/drivers/media/video/ov511.c22
-rw-r--r--linux/drivers/media/video/planb.c6
-rw-r--r--linux/drivers/media/video/stradis.c8
-rw-r--r--linux/drivers/media/video/vino.c8
-rw-r--r--linux/drivers/media/video/w9966.c8
-rw-r--r--linux/drivers/media/video/zoran_driver.c2
-rw-r--r--linux/drivers/media/video/zr36016.c2
13 files changed, 39 insertions, 39 deletions
diff --git a/linux/drivers/media/video/adv7170.c b/linux/drivers/media/video/adv7170.c
index 48fe2344b..cd0b4562a 100644
--- a/linux/drivers/media/video/adv7170.c
+++ b/linux/drivers/media/video/adv7170.c
@@ -240,7 +240,7 @@ adv7170_command (struct i2c_client *client,
switch (cmd) {
case 0:
-#if 0
+#if 0 /* keep */;
/* This is just for testing!!! */
adv7170_write_block(client, init_common,
sizeof(init_common));
diff --git a/linux/drivers/media/video/arv.c b/linux/drivers/media/video/arv.c
index aec57f485..af3980d95 100644
--- a/linux/drivers/media/video/arv.c
+++ b/linux/drivers/media/video/arv.c
@@ -40,7 +40,7 @@
#include <asm/dma.h>
#include <asm/byteorder.h>
-#if 0
+#if 0 /* keep */;
#define DEBUG(n, args...) printk(args)
#define CHECK_LOST 1
#else
@@ -576,11 +576,11 @@ static void ar_interrupt(int irq, void *dev, struct pt_regs *regs)
* we have to start capture.
*/
disable_dma();
-#if 0
+#if 0 /* keep */;
ar_outl(ar->line_buff, M32R_DMA0CDA_PORTL); /* needless? */
#endif
memcpy(ar->frame[0], ar->line_buff, ar->line_bytes);
-#if 0
+#if 0 /* keep */;
ar_outl(0xa1861300, M32R_DMA0CR0_PORTL);
#endif
enable_dma();
@@ -606,7 +606,7 @@ static void ar_interrupt(int irq, void *dev, struct pt_regs *regs)
ar_outl(arvcr1, ARVCR1); /* disable */
wake_up_interruptible(&ar->wait);
} else {
-#if 0
+#if 0 /* keep */;
ar_outl(ar->line_buff, M32R_DMA0CDA_PORTL);
ar_outl(0xa1861300, M32R_DMA0CR0_PORTL);
#endif
@@ -690,7 +690,7 @@ static int ar_initialize(struct video_device *dev)
printk(".");
iic(2,0x78,0x8e,0x0c,0x00);
iic(2,0x78,0x8f,0x00,0x00);
-#if 0
+#if 0 /* keep */;
iic(2,0x78,0x90,0x00,0x00); /* AWB on=1 off=0 */
#endif
iic(2,0x78,0x93,0x01,0x00);
@@ -709,7 +709,7 @@ static int ar_initialize(struct video_device *dev)
iic(2,0x78,0x9e,0x2e,0x00);
iic(2,0x78,0xb8,0x78,0x00);
iic(2,0x78,0xba,0x05,0x00);
-#if 0
+#if 0 /* keep */;
iic(2,0x78,0x83,0x8c,0x00); /* brightness */
#endif
printk(".");
diff --git a/linux/drivers/media/video/bw-qcam.c b/linux/drivers/media/video/bw-qcam.c
index 25ce06421..62287e3d8 100644
--- a/linux/drivers/media/video/bw-qcam.c
+++ b/linux/drivers/media/video/bw-qcam.c
@@ -334,7 +334,7 @@ static int qc_detect(struct qcam_device *q)
}
-#if 0
+#if 0 /* keep */;
/* Force camera detection during testing. Sometimes the camera
won't be flashing these bits. Possibly unloading the module
in the middle of a grab? Or some timeout condition?
diff --git a/linux/drivers/media/video/c-qcam.c b/linux/drivers/media/video/c-qcam.c
index 5cfbb30e5..4fa309398 100644
--- a/linux/drivers/media/video/c-qcam.c
+++ b/linux/drivers/media/video/c-qcam.c
@@ -626,7 +626,7 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file,
qcam->mode = QC_DECIMATION_1;
}
qcam->mode |= QC_MILLIONS;
-#if 0
+#if 0 /* keep */;
if(vw->width>=640 && vw->height>=480)
{
qcam->width = 640;
diff --git a/linux/drivers/media/video/cpia.c b/linux/drivers/media/video/cpia.c
index d955004b7..2e66820f1 100644
--- a/linux/drivers/media/video/cpia.c
+++ b/linux/drivers/media/video/cpia.c
@@ -2430,7 +2430,7 @@ static void set_flicker(struct cam_params *params, volatile u32 *command_flags,
#define FIRMWARE_VERSION(x,y) (params->version.firmwareVersion == (x) && \
params->version.firmwareRevision == (y))
/* define for compgain calculation */
-#if 0
+#if 0 /* keep */;
#define COMPGAIN(base, curexp, newexp) \
(u8) ((((float) base - 128.0) * ((float) curexp / (float) newexp)) + 128.5)
#define EXP_FROM_COMP(basecomp, curcomp, curexp) \
diff --git a/linux/drivers/media/video/meye.c b/linux/drivers/media/video/meye.c
index dcd90f56b..73749c740 100644
--- a/linux/drivers/media/video/meye.c
+++ b/linux/drivers/media/video/meye.c
@@ -750,7 +750,7 @@ static int mchip_compress_frame(u8 *buf, int bufsize)
return len;
}
-#if 0
+#if 0 /* keep */;
/* uncompress one image into a buffer */
static int mchip_uncompress_frame(u8 *img, int imgsize, u8 *buf, int bufsize)
{
diff --git a/linux/drivers/media/video/ov511.c b/linux/drivers/media/video/ov511.c
index fdc8e3f13..1bf382115 100644
--- a/linux/drivers/media/video/ov511.c
+++ b/linux/drivers/media/video/ov511.c
@@ -638,7 +638,7 @@ ov511_i2c_write_internal(struct usb_ov511 *ov,
rc = 0;
break;
}
-#if 0
+#if 0 /* keep */;
/* I2C abort */
reg_w(ov, R511_I2C_CTL, 0x10);
#endif
@@ -1105,7 +1105,7 @@ ov51x_clear_snapshot(struct usb_ov511 *ov)
}
}
-#if 0
+#if 0 /* keep */;
/* Checks the status of the snapshot button. Returns 1 if it was pressed since
* it was last cleared, and zero in all other cases (including errors) */
static int
@@ -1673,7 +1673,7 @@ sensor_set_hue(struct usb_ov511 *ov, unsigned short val)
break;
case SEN_OV7620:
// Hue control is causing problems. I will enable it once it's fixed.
-#if 0
+#if 0 /* keep */;
rc = i2c_w(ov, 0x7a, (unsigned char)(val >> 8) + 0xb);
if (rc < 0)
goto out;
@@ -1804,7 +1804,7 @@ sensor_get_picture(struct usb_ov511 *ov, struct video_picture *p)
return 0;
}
-#if 0
+#if 0 /* keep */;
// FIXME: Exposure range is only 0x00-0x7f in interlace mode
/* Sets current exposure for sensor. This only has an effect if auto-exposure
* is off */
@@ -2171,7 +2171,7 @@ mode_init_ov_sensor_regs(struct usb_ov511 *ov, int width, int height,
case SEN_OV7610:
i2c_w(ov, 0x14, qvga?0x24:0x04);
// FIXME: Does this improve the image quality or frame rate?
-#if 0
+#if 0 /* keep */;
i2c_w_mask(ov, 0x28, qvga?0x00:0x20, 0x20);
i2c_w(ov, 0x24, 0x10);
i2c_w(ov, 0x25, qvga?0x40:0x8a);
@@ -2193,7 +2193,7 @@ mode_init_ov_sensor_regs(struct usb_ov511 *ov, int width, int height,
// i2c_w(ov, 0x2b, 0x00);
i2c_w(ov, 0x14, qvga?0xa4:0x84);
// FIXME: Enable this once 7620AE uses 7620 initial settings
-#if 0
+#if 0 /* keep */;
i2c_w_mask(ov, 0x28, qvga?0x00:0x20, 0x20);
i2c_w(ov, 0x24, qvga?0x20:0x3a);
i2c_w(ov, 0x25, qvga?0x30:0x60);
@@ -3435,7 +3435,7 @@ sof:
PDEBUG(4, "Starting capture on frame %d", frame->framenum);
// Snapshot not reverse-engineered yet.
-#if 0
+#if 0 /* keep */;
/* Check to see if it's a snapshot frame */
/* FIXME?? Should the snapshot reset go here? Performance? */
if (in[8] & 0x02) {
@@ -4193,7 +4193,7 @@ ov51x_v4l1_ioctl_internal(struct inode *inode, struct file *file,
PDEBUG(4, "VIDIOCSWIN: %dx%d", vw->width, vw->height);
-#if 0
+#if 0 /* keep */;
if (vw->flags)
return -EINVAL;
if (vw->clipcount)
@@ -4306,7 +4306,7 @@ ov51x_v4l1_ioctl_internal(struct inode *inode, struct file *file,
rc = mode_init_regs(ov, vm->width, vm->height,
vm->format, ov->sub_flag);
-#if 0
+#if 0 /* keep */;
if (rc < 0) {
PDEBUG(1, "Got error while initializing regs ");
return ret;
@@ -5068,7 +5068,7 @@ ks0127_configure(struct usb_ov511 *ov)
int rc;
// FIXME: I don't know how to sync or reset it yet
-#if 0
+#if 0 /* keep */;
if (ov51x_init_ks_sensor(ov) < 0) {
err("Failed to initialize the KS0127");
return -1;
@@ -5155,7 +5155,7 @@ saa7111a_configure(struct usb_ov511 *ov)
};
// FIXME: I don't know how to sync or reset it yet
-#if 0
+#if 0 /* keep */;
if (ov51x_init_saa_sensor(ov) < 0) {
err("Failed to initialize the SAA7111A");
return -1;
diff --git a/linux/drivers/media/video/planb.c b/linux/drivers/media/video/planb.c
index c3026d701..3cfdb504d 100644
--- a/linux/drivers/media/video/planb.c
+++ b/linux/drivers/media/video/planb.c
@@ -55,13 +55,13 @@
#include "saa7196.h"
/* Would you mind for some ugly debugging? */
-#if 0
+#if 0 /* keep */;
#define DEBUG(x...) printk(KERN_DEBUG ## x) /* Debug driver */
#else
#define DEBUG(x...) /* Don't debug driver */
#endif
-#if 0
+#if 0 /* keep */;
#define IDEBUG(x...) printk(KERN_DEBUG ## x) /* Debug interrupt part */
#else
#define IDEBUG(x...) /* Don't debug interrupt part */
@@ -2042,7 +2042,7 @@ static int init_planb(struct planb *pb)
pb->win.width=768; /* 640 */
pb->win.height=576; /* 480 */
pb->maxlines=576;
-#if 0
+#if 0 /* keep */;
btv->win.cropwidth=768; /* 640 */
btv->win.cropheight=576; /* 480 */
btv->win.cropx=0;
diff --git a/linux/drivers/media/video/stradis.c b/linux/drivers/media/video/stradis.c
index 9aad8d66d..8cfb32392 100644
--- a/linux/drivers/media/video/stradis.c
+++ b/linux/drivers/media/video/stradis.c
@@ -455,7 +455,7 @@ static irqreturn_t saa7146_irq(int irq, void *dev_id, struct pt_regs *regs)
saa->vidinfo.frame_count = 0;
saa->vidinfo.h_size = 704;
saa->vidinfo.v_size = 480;
-#if 0
+#if 0 /* keep */;
if (saa->endmarkhead != saa->endmarktail) {
saa->audhead =
saa->endmark[saa->endmarkhead];
@@ -940,7 +940,7 @@ send_fpga_stuff:
if (NewCard)
set_genlock_offset(saa, 0);
debiwrite(saa, debNormal, IBM_MP2_FRNT_ATTEN, 0, 2);
-#if 0
+#if 0 /* keep */;
/* enable genlock */
debiwrite(saa, debNormal, XILINX_CTL0, 0x8000, 2);
#else
@@ -1043,7 +1043,7 @@ static int initialize_ibmmpeg2(struct video_code *microcode)
if (i != 0xa55a) {
printk(KERN_INFO "stradis%d: %04x != 0xa55a\n",
saa->nr, i);
-#if 0
+#if 0 /* keep */;
return -1;
#endif
}
@@ -2048,7 +2048,7 @@ static int __devinit init_saa7146(struct pci_dev *pdev)
dev_err(&pdev->dev, "%d: debi kmalloc failed\n", saa->nr);
goto err;
}
-#if 0
+#if 0 /* keep */;
saa->pagedebi = saa->dmadebi + 32768; /* top 4k is for mmu */
saawrite(virt_to_bus(saa->pagedebi) /*|0x800 */ , SAA7146_DEBI_PAGE);
for (i = 0; i < 12; i++) /* setup mmu page table */
diff --git a/linux/drivers/media/video/vino.c b/linux/drivers/media/video/vino.c
index a8c101494..a739919ba 100644
--- a/linux/drivers/media/video/vino.c
+++ b/linux/drivers/media/video/vino.c
@@ -914,7 +914,7 @@ static int vino_allocate_buffer(struct vino_framebuffer *fb,
return ret;
}
-#if 0
+#if 0 /* keep */;
/* user buffers not fully implemented yet */
static int vino_prepare_user_buffer(struct vino_framebuffer *fb,
void *user,
@@ -1043,7 +1043,7 @@ static inline int vino_fifo_has_id(struct vino_framebuffer_fifo *f,
return 0;
}
-#if 0
+#if 0 /* keep */;
/* returns true/false */
static inline int vino_fifo_full(struct vino_framebuffer_fifo *f)
{
@@ -1399,7 +1399,7 @@ out:
return ret;
}
-#if 0
+#if 0 /* keep */;
static int vino_queue_get_total(struct vino_framebuffer_queue *q,
unsigned int *total)
{
@@ -2210,7 +2210,7 @@ out:
spin_unlock_irqrestore(&vcs->capture_lock, flags);
}
-#if 0
+#if 0 /* keep */;
static int vino_capture_failed(struct vino_channel_settings *vcs)
{
struct vino_framebuffer *fb;
diff --git a/linux/drivers/media/video/w9966.c b/linux/drivers/media/video/w9966.c
index 5aea29c69..fe368bfb7 100644
--- a/linux/drivers/media/video/w9966.c
+++ b/linux/drivers/media/video/w9966.c
@@ -158,7 +158,7 @@ static inline void w9966_pdev_release(struct w9966_dev *vdev);
static int w9966_rReg(struct w9966_dev* cam, int reg);
static int w9966_wReg(struct w9966_dev* cam, int reg, int data);
-#if 0
+#if 0 /* keep */;
static int w9966_rReg_i2c(struct w9966_dev* cam, int reg);
#endif
static int w9966_wReg_i2c(struct w9966_dev* cam, int reg, int data);
@@ -174,7 +174,7 @@ static inline int w9966_i2c_setscl(struct w9966_dev* cam, int state);
static inline int w9966_i2c_getsda(struct w9966_dev* cam);
static inline int w9966_i2c_getscl(struct w9966_dev* cam);
static int w9966_i2c_wbyte(struct w9966_dev* cam, int data);
-#if 0
+#if 0 /* keep */;
static int w9966_i2c_rbyte(struct w9966_dev* cam);
#endif
@@ -623,7 +623,7 @@ static int w9966_i2c_wbyte(struct w9966_dev* cam, int data)
// Read a data byte with ack from the i2c-bus
// Expects a claimed pdev. -1 on error
-#if 0
+#if 0 /* keep */;
static int w9966_i2c_rbyte(struct w9966_dev* cam)
{
unsigned char data = 0x00;
@@ -647,7 +647,7 @@ static int w9966_i2c_rbyte(struct w9966_dev* cam)
// Read a register from the i2c device.
// Expects claimed pdev. -1 on error
-#if 0
+#if 0 /* keep */;
static int w9966_rReg_i2c(struct w9966_dev* cam, int reg)
{
int data;
diff --git a/linux/drivers/media/video/zoran_driver.c b/linux/drivers/media/video/zoran_driver.c
index 5ced8b516..2f20c87fa 100644
--- a/linux/drivers/media/video/zoran_driver.c
+++ b/linux/drivers/media/video/zoran_driver.c
@@ -1519,7 +1519,7 @@ setup_fbuffer (struct file *file,
if (!bytesperline)
bytesperline = width * ((fmt->depth + 7) & ~7) / 8;
-#if 0
+#if 0 /* keep */;
if (zr->overlay_active) {
/* dzjee... stupid users... don't even bother to turn off
* overlay before changing the memory location...
diff --git a/linux/drivers/media/video/zr36016.c b/linux/drivers/media/video/zr36016.c
index 7f958d803..2a99e8d2e 100644
--- a/linux/drivers/media/video/zr36016.c
+++ b/linux/drivers/media/video/zr36016.c
@@ -229,7 +229,7 @@ zr36016_basic_test (struct zr36016 *ptr)
simple loop for pushing the init datasets - NO USE --
========================================================================= */
-#if 0
+#if 0 /* keep */;
static int zr36016_pushit (struct zr36016 *ptr,
u16 startreg,
u16 len,