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
/
zr36060.c
diff --git
a/drivers/media/video/zr36060.c
b/drivers/media/video/zr36060.c
index
b50dc40
..
97c8f9b
100644
(file)
--- a/
drivers/media/video/zr36060.c
+++ b/
drivers/media/video/zr36060.c
@@
-26,7
+26,6
@@
#define ZR060_VERSION "v0.7"
#define ZR060_VERSION "v0.7"
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
@@
-35,7
+34,7
@@
#include <linux/types.h>
#include <linux/wait.h>
#include <linux/types.h>
#include <linux/wait.h>
-/* includes for structures and defines regarding video
+/* includes for structures and defines regarding video
#include<linux/videodev.h> */
/* I/O commands, error codes */
#include<linux/videodev.h> */
/* I/O commands, error codes */
@@
-162,7
+161,7
@@
zr36060_wait_end (struct zr36060 *ptr)
while (zr36060_read_status(ptr) & ZR060_CFSR_Busy) {
udelay(1);
while (zr36060_read_status(ptr) & ZR060_CFSR_Busy) {
udelay(1);
- if (i++ > 200000) { // 200ms, there is for s
h
ure something wrong!!!
+ if (i++ > 200000) { // 200ms, there is for sure something wrong!!!
dprintk(1,
"%s: timout at wait_end (last status: 0x%02x)\n",
ptr->name, ptr->status);
dprintk(1,
"%s: timout at wait_end (last status: 0x%02x)\n",
ptr->name, ptr->status);
@@
-174,7
+173,7
@@
zr36060_wait_end (struct zr36060 *ptr)
/* =========================================================================
Local helper function:
/* =========================================================================
Local helper function:
- basic test of "connectivity", writes/reads to/from memory the SOF marker
+ basic test of "connectivity", writes/reads to/from memory the SOF marker
========================================================================= */
static int
========================================================================= */
static int
@@
-209,9
+208,9
@@
zr36060_basic_test (struct zr36060 *ptr)
static int
zr36060_pushit (struct zr36060 *ptr,
static int
zr36060_pushit (struct zr36060 *ptr,
- u16 startreg,
- u16 len,
- const char *data)
+ u16 startreg,
+ u16 len,
+ const char *data)
{
int i = 0;
{
int i = 0;
@@
-336,7
+335,7
@@
static const char zr36060_decimation_v[8] = { 1, 1, 1, 0, 0, 0, 0, 0 };
/* ------------------------------------------------------------------------- */
/* SOF (start of frame) segment depends on width, height and sampling ratio
/* ------------------------------------------------------------------------- */
/* SOF (start of frame) segment depends on width, height and sampling ratio
-
of each color component */
+ of each color component */
static int
zr36060_set_sof (struct zr36060 *ptr)
static int
zr36060_set_sof (struct zr36060 *ptr)
@@
-368,8
+367,8
@@
zr36060_set_sof (struct zr36060 *ptr)
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
-/* SOS (start of scan) segment depends on the used scan components
-
of each color component */
+/* SOS (start of scan) segment depends on the used scan components
+ of each color component */
static int
zr36060_set_sos (struct zr36060 *ptr)
static int
zr36060_set_sos (struct zr36060 *ptr)
@@
-386,7
+385,7
@@
zr36060_set_sos (struct zr36060 *ptr)
for (i = 0; i < NO_OF_COMPONENTS; i++) {
sos_data[5 + (i * 2)] = i; // index
sos_data[6 + (i * 2)] = (zr36060_td[i] << 4) |
for (i = 0; i < NO_OF_COMPONENTS; i++) {
sos_data[5 + (i * 2)] = i; // index
sos_data[6 + (i * 2)] = (zr36060_td[i] << 4) |
- zr36060_ta[i]; // AC/DC tbl.sel.
+ zr36060_ta[i]; // AC/DC tbl.sel.
}
sos_data[2 + 1 + (2 * NO_OF_COMPONENTS) + 2] = 00; // scan start
sos_data[2 + 1 + (2 * NO_OF_COMPONENTS) + 3] = 0x3f;
}
sos_data[2 + 1 + (2 * NO_OF_COMPONENTS) + 2] = 00; // scan start
sos_data[2 + 1 + (2 * NO_OF_COMPONENTS) + 3] = 0x3f;
@@
-920,12
+919,11
@@
zr36060_setup (struct videocodec *codec)
return -ENOSPC;
}
//mem structure init
return -ENOSPC;
}
//mem structure init
- codec->data = ptr = k
m
alloc(sizeof(struct zr36060), GFP_KERNEL);
+ codec->data = ptr = k
z
alloc(sizeof(struct zr36060), GFP_KERNEL);
if (NULL == ptr) {
dprintk(1, KERN_ERR "zr36060: Can't get enough memory!\n");
return -ENOMEM;
}
if (NULL == ptr) {
dprintk(1, KERN_ERR "zr36060: Can't get enough memory!\n");
return -ENOMEM;
}
- memset(ptr, 0, sizeof(struct zr36060));
snprintf(ptr->name, sizeof(ptr->name), "zr36060[%d]",
zr36060_codecs);
snprintf(ptr->name, sizeof(ptr->name), "zr36060[%d]",
zr36060_codecs);
@@
-1001,7
+999,7
@@
zr36060_cleanup_module (void)
dprintk(1,
"zr36060: something's wrong - %d codecs left somehow.\n",
zr36060_codecs);
dprintk(1,
"zr36060: something's wrong - %d codecs left somehow.\n",
zr36060_codecs);
- }
+ }
/* however, we can't just stay alive */
videocodec_unregister(&zr36060_codec);
/* however, we can't just stay alive */
videocodec_unregister(&zr36060_codec);