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
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
media
/
video
/
meye.c
diff --git
a/drivers/media/video/meye.c
b/drivers/media/video/meye.c
index
bb6e40d
..
a586b1b
100644
(file)
--- a/
drivers/media/video/meye.c
+++ b/
drivers/media/video/meye.c
@@
-58,7
+58,7
@@
static int video_nr = -1;
static inline void meye_initq(struct meye_queue *queue) {
queue->head = queue->tail = 0;
queue->len = 0;
static inline void meye_initq(struct meye_queue *queue) {
queue->head = queue->tail = 0;
queue->len = 0;
- queue->s_lock =
(spinlock_t)
SPIN_LOCK_UNLOCKED;
+ queue->s_lock = SPIN_LOCK_UNLOCKED;
init_waitqueue_head(&queue->proc_list);
}
init_waitqueue_head(&queue->proc_list);
}
@@
-203,7
+203,7
@@
static int ptable_alloc(void) {
PAGE_SIZE,
meye.mchip_ptable_toc,
meye.mchip_dmahandle);
PAGE_SIZE,
meye.mchip_ptable_toc,
meye.mchip_dmahandle);
- meye.mchip_ptable_toc =
0
;
+ meye.mchip_ptable_toc =
NULL
;
meye.mchip_dmahandle = 0;
return -1;
}
meye.mchip_dmahandle = 0;
return -1;
}
@@
-232,7
+232,7
@@
static void ptable_free(void) {
meye.mchip_dmahandle);
memset(meye.mchip_ptable, 0, sizeof(meye.mchip_ptable));
meye.mchip_dmahandle);
memset(meye.mchip_ptable, 0, sizeof(meye.mchip_ptable));
- meye.mchip_ptable_toc =
0
;
+ meye.mchip_ptable_toc =
NULL
;
meye.mchip_dmahandle = 0;
}
meye.mchip_dmahandle = 0;
}
@@
-473,16
+473,6
@@
static u16 *jpeg_huffman_tables(int *size) {
/* MCHIP low-level functions */
/****************************************************************************/
/* MCHIP low-level functions */
/****************************************************************************/
-/* waits for the specified miliseconds */
-static inline void wait_ms(unsigned int ms) {
- if (!in_interrupt()) {
- set_current_state(TASK_UNINTERRUPTIBLE);
- schedule_timeout(1 + ms * HZ / 1000);
- }
- else
- mdelay(ms);
-}
-
/* returns the horizontal capture size */
static inline int mchip_hsize(void) {
return meye.params.subsample ? 320 : 640;
/* returns the horizontal capture size */
static inline int mchip_hsize(void) {
return meye.params.subsample ? 320 : 640;
@@
-640,12
+630,12
@@
static void mchip_hic_stop(void) {
for (j = 0; j < 100; ++j) {
if (mchip_delay(MCHIP_HIC_STATUS, MCHIP_HIC_STATUS_IDLE))
return;
for (j = 0; j < 100; ++j) {
if (mchip_delay(MCHIP_HIC_STATUS, MCHIP_HIC_STATUS_IDLE))
return;
-
wait_ms
(1);
+
msleep
(1);
}
printk(KERN_ERR "meye: need to reset HIC!\n");
mchip_set(MCHIP_HIC_CTL, MCHIP_HIC_CTL_SOFT_RESET);
}
printk(KERN_ERR "meye: need to reset HIC!\n");
mchip_set(MCHIP_HIC_CTL, MCHIP_HIC_CTL_SOFT_RESET);
-
wait_ms
(250);
+
msleep
(250);
}
printk(KERN_ERR "meye: resetting HIC hanged!\n");
}
}
printk(KERN_ERR "meye: resetting HIC hanged!\n");
}
@@
-741,7
+731,7
@@
static void mchip_take_picture(void) {
for (i = 0; i < 100; ++i) {
if (mchip_delay(MCHIP_HIC_STATUS, MCHIP_HIC_STATUS_IDLE))
break;
for (i = 0; i < 100; ++i) {
if (mchip_delay(MCHIP_HIC_STATUS, MCHIP_HIC_STATUS_IDLE))
break;
-
wait_ms
(1);
+
msleep
(1);
}
}
}
}
@@
-757,7
+747,7
@@
static void mchip_get_picture(u8 *buf, int bufsize) {
for (i = 0; i < 100; ++i) {
if (mchip_delay(MCHIP_HIC_STATUS, MCHIP_HIC_STATUS_IDLE))
break;
for (i = 0; i < 100; ++i) {
if (mchip_delay(MCHIP_HIC_STATUS, MCHIP_HIC_STATUS_IDLE))
break;
-
wait_ms
(1);
+
msleep
(1);
}
for (i = 0; i < 4 ; ++i) {
v = mchip_get_frame();
}
for (i = 0; i < 4 ; ++i) {
v = mchip_get_frame();
@@
-799,7
+789,7
@@
static int mchip_compress_frame(u8 *buf, int bufsize) {
for (i = 0; i < 100; ++i) {
if (mchip_delay(MCHIP_HIC_STATUS, MCHIP_HIC_STATUS_IDLE))
break;
for (i = 0; i < 100; ++i) {
if (mchip_delay(MCHIP_HIC_STATUS, MCHIP_HIC_STATUS_IDLE))
break;
-
wait_ms
(1);
+
msleep
(1);
}
for (i = 0; i < 4 ; ++i) {
}
for (i = 0; i < 4 ; ++i) {
@@
-1260,11
+1250,11
@@
static int meye_resume(struct pci_dev *pdev)
mchip_delay(MCHIP_HIC_CMD, 0);
mchip_delay(MCHIP_HIC_STATUS, MCHIP_HIC_STATUS_IDLE);
mchip_delay(MCHIP_HIC_CMD, 0);
mchip_delay(MCHIP_HIC_STATUS, MCHIP_HIC_STATUS_IDLE);
-
wait_ms
(1);
+
msleep
(1);
mchip_set(MCHIP_VRJ_SOFT_RESET, 1);
mchip_set(MCHIP_VRJ_SOFT_RESET, 1);
-
wait_ms
(1);
+
msleep
(1);
mchip_set(MCHIP_MM_PCI_MODE, 5);
mchip_set(MCHIP_MM_PCI_MODE, 5);
-
wait_ms
(1);
+
msleep
(1);
mchip_set(MCHIP_MM_INTA, MCHIP_MM_INTA_HIC_1_MASK);
switch (meye.pm_mchip_mode) {
mchip_set(MCHIP_MM_INTA, MCHIP_MM_INTA_HIC_1_MASK);
switch (meye.pm_mchip_mode) {
@@
-1349,13
+1339,13
@@
static int __devinit meye_probe(struct pci_dev *pcidev,
mchip_delay(MCHIP_HIC_CMD, 0);
mchip_delay(MCHIP_HIC_STATUS, MCHIP_HIC_STATUS_IDLE);
mchip_delay(MCHIP_HIC_CMD, 0);
mchip_delay(MCHIP_HIC_STATUS, MCHIP_HIC_STATUS_IDLE);
-
wait_ms
(1);
+
msleep
(1);
mchip_set(MCHIP_VRJ_SOFT_RESET, 1);
mchip_set(MCHIP_VRJ_SOFT_RESET, 1);
-
wait_ms
(1);
+
msleep
(1);
mchip_set(MCHIP_MM_PCI_MODE, 5);
mchip_set(MCHIP_MM_PCI_MODE, 5);
-
wait_ms
(1);
+
msleep
(1);
mchip_set(MCHIP_MM_INTA, MCHIP_MM_INTA_HIC_1_MASK);
if (video_register_device(meye.video_dev, VFL_TYPE_GRABBER, video_nr) < 0) {
mchip_set(MCHIP_MM_INTA, MCHIP_MM_INTA_HIC_1_MASK);
if (video_register_device(meye.video_dev, VFL_TYPE_GRABBER, video_nr) < 0) {