summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-04-11 18:08:08 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-04-11 18:08:08 -0300
commitf87c0d6c0b3286715f8bed1b4194b0fc712cab57 (patch)
tree12c39e4c738d504dcf61697fd9f2c2831983e9ee /linux/drivers/media/video
parent5fee2a6c6c243cc56773187b78a0eafbd688b935 (diff)
downloadmediapointer-dvb-s2-f87c0d6c0b3286715f8bed1b4194b0fc712cab57.tar.gz
mediapointer-dvb-s2-f87c0d6c0b3286715f8bed1b4194b0fc712cab57.tar.bz2
A previous patch introduced a dot-comma at wrong places.
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/adv7170.c2
-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/stradis.c8
-rw-r--r--linux/drivers/media/video/w9966.c8
-rw-r--r--linux/drivers/media/video/zr36016.c2
9 files changed, 25 insertions, 25 deletions
diff --git a/linux/drivers/media/video/adv7170.c b/linux/drivers/media/video/adv7170.c
index cd0b4562a..984ca2a30 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 /* keep */;
+#if 0 /* keep */
/* This is just for testing!!! */
adv7170_write_block(client, init_common,
sizeof(init_common));
diff --git a/linux/drivers/media/video/bw-qcam.c b/linux/drivers/media/video/bw-qcam.c
index 62287e3d8..9941128b9 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 /* keep */;
+#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 4fa309398..2dbd848c4 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 /* keep */;
+#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 2e66820f1..99ee90628 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 /* keep */;
+#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 73749c740..774d9af5b 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 /* keep */;
+#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 1bf382115..564a88293 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 /* keep */;
+#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 /* keep */;
+#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 /* keep */;
+#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 /* keep */;
+#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 /* keep */;
+#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 /* keep */;
+#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 /* keep */;
+#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 /* keep */;
+#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 /* keep */;
+#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 /* keep */;
+#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 /* keep */;
+#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/stradis.c b/linux/drivers/media/video/stradis.c
index 8cfb32392..f4be8c6af 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 /* keep */;
+#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 /* keep */;
+#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 /* keep */;
+#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 /* keep */;
+#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/w9966.c b/linux/drivers/media/video/w9966.c
index fe368bfb7..d24d4ca3d 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 /* keep */;
+#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 /* keep */;
+#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 /* keep */;
+#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 /* keep */;
+#if 0 /* keep */
static int w9966_rReg_i2c(struct w9966_dev* cam, int reg)
{
int data;
diff --git a/linux/drivers/media/video/zr36016.c b/linux/drivers/media/video/zr36016.c
index 2a99e8d2e..e5dbb45f1 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 /* keep */;
+#if 0 /* keep */
static int zr36016_pushit (struct zr36016 *ptr,
u16 startreg,
u16 len,