git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
media
/
video
/
vpx3220.c
diff --git
a/drivers/media/video/vpx3220.c
b/drivers/media/video/vpx3220.c
index
d0a1e72
..
8ef31ed
100644
(file)
--- a/
drivers/media/video/vpx3220.c
+++ b/
drivers/media/video/vpx3220.c
@@
-1,4
+1,4
@@
-/*
+/*
* vpx3220a, vpx3216b & vpx3214c video decoder driver version 0.0.1
*
* Copyright (C) 2001 Laurent Pinchart <lpinchart@freegates.be>
* vpx3220a, vpx3216b & vpx3214c video decoder driver version 0.0.1
*
* Copyright (C) 2001 Laurent Pinchart <lpinchart@freegates.be>
@@
-30,11
+30,11
@@
#include <asm/uaccess.h>
#include <linux/i2c.h>
#include <asm/uaccess.h>
#include <linux/i2c.h>
-#include <linux/i2c-dev.h>
#define I2C_NAME(x) (x)->name
#include <linux/videodev.h>
#define I2C_NAME(x) (x)->name
#include <linux/videodev.h>
+#include <media/v4l2-common.h>
#include <linux/video_decoder.h>
#define I2C_VPX3220 0x86
#include <linux/video_decoder.h>
#define I2C_VPX3220 0x86
@@
-177,8
+177,8
@@
vpx3220_write_block (struct i2c_client *client,
static int
vpx3220_write_fp_block (struct i2c_client *client,
static int
vpx3220_write_fp_block (struct i2c_client *client,
- const u16 *data,
- unsigned int len)
+ const u16 *data,
+ unsigned int len)
{
u8 reg;
int ret = 0;
{
u8 reg;
int ret = 0;
@@
-317,7
+317,7
@@
vpx3220_command (struct i2c_client *client,
vpx3220_write_fp_block(client, init_fp,
sizeof(init_fp) >> 1);
switch (decoder->norm) {
vpx3220_write_fp_block(client, init_fp,
sizeof(init_fp) >> 1);
switch (decoder->norm) {
-
+
case VIDEO_MODE_NTSC:
vpx3220_write_fp_block(client, init_ntsc,
sizeof(init_ntsc) >> 1);
case VIDEO_MODE_NTSC:
vpx3220_write_fp_block(client, init_ntsc,
sizeof(init_ntsc) >> 1);
@@
-325,7
+325,7
@@
vpx3220_command (struct i2c_client *client,
case VIDEO_MODE_PAL:
vpx3220_write_fp_block(client, init_pal,
case VIDEO_MODE_PAL:
vpx3220_write_fp_block(client, init_pal,
- sizeof(init_pal) >> 1);
+ sizeof(init_pal) >> 1);
break;
case VIDEO_MODE_SECAM:
vpx3220_write_fp_block(client, init_secam,
break;
case VIDEO_MODE_SECAM:
vpx3220_write_fp_block(client, init_secam,
@@
-333,10
+333,10
@@
vpx3220_command (struct i2c_client *client,
break;
default:
vpx3220_write_fp_block(client, init_pal,
break;
default:
vpx3220_write_fp_block(client, init_pal,
- sizeof(init_pal) >> 1);
+ sizeof(init_pal) >> 1);
break;
}
break;
}
- }
+ }
break;
case DECODER_DUMP:
break;
case DECODER_DUMP:
@@
-412,7
+412,7
@@
vpx3220_command (struct i2c_client *client,
/* Here we back up the input selection because it gets
overwritten when we fill the registers with the
/* Here we back up the input selection because it gets
overwritten when we fill the registers with the
-
choosen video norm */
+ choosen video norm */
temp_input = vpx3220_fp_read(client, 0xf2);
dprintk(1, KERN_DEBUG "%s: DECODER_SET_NORM %d\n",
temp_input = vpx3220_fp_read(client, 0xf2);
dprintk(1, KERN_DEBUG "%s: DECODER_SET_NORM %d\n",
@@
-579,7
+579,7
@@
static unsigned short normal_i2c[] =
};
static unsigned short ignore = I2C_CLIENT_END;
};
static unsigned short ignore = I2C_CLIENT_END;
-
+
static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_i2c,
.probe = &ignore,
static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_i2c,
.probe = &ignore,
@@
-662,7
+662,7
@@
vpx3220_detect_client (struct i2c_adapter *adapter,
break;
default:
dprintk(1,
break;
default:
dprintk(1,
- KERN_INFO
+ KERN_INFO
"%s: Wrong part number (0x%04x)\n",
__func__, pn);
kfree(client);
"%s: Wrong part number (0x%04x)\n",
__func__, pn);
kfree(client);
@@
-744,6
+744,6
@@
vpx3220_cleanup (void)
module_init(vpx3220_init);
module_exit(vpx3220_cleanup);
module_init(vpx3220_init);
module_exit(vpx3220_cleanup);
-MODULE_DESCRIPTION("vpx3220a/vpx3216b/vpx3214c video
en
coder driver");
+MODULE_DESCRIPTION("vpx3220a/vpx3216b/vpx3214c video
de
coder driver");
MODULE_AUTHOR("Laurent Pinchart");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Laurent Pinchart");
MODULE_LICENSE("GPL");