diff options
| author | Andy Walls | 2008-11-06 05:15:41 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2008-12-30 12:38:02 +0100 |
| commit | 72c2d6d3ac91d1b9efb482ff4a8dd68e3d867965 (patch) | |
| tree | 0e80f865ac4763e30eb7777360fbf3d860b140f0 /drivers/media/video/cx18/cx18-driver.h | |
| parent | V4L/DVB (9592): cx18: Use default kernel work queue; fix streaming flag for w... (diff) | |
| download | kernel-qcow2-linux-72c2d6d3ac91d1b9efb482ff4a8dd68e3d867965.tar.gz kernel-qcow2-linux-72c2d6d3ac91d1b9efb482ff4a8dd68e3d867965.tar.xz kernel-qcow2-linux-72c2d6d3ac91d1b9efb482ff4a8dd68e3d867965.zip | |
V4L/DVB (9593): cx18: Add outgoing mailbox mutexes and check for ack via waitq vs poll
Add mutexes to ensure exclusive access for outgoing driver to CX23418 mailboxes.
Also wait on a waitq for mailbox acknowledgement from the CX23418 instead of
polling.
Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18/cx18-driver.h')
| -rw-r--r-- | drivers/media/video/cx18/cx18-driver.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h index 04f1c624da7c..e2ec15549783 100644 --- a/drivers/media/video/cx18/cx18-driver.h +++ b/drivers/media/video/cx18/cx18-driver.h @@ -378,7 +378,10 @@ struct cx18 { u32 v4l2_cap; /* V4L2 capabilities of card */ u32 hw_flags; /* Hardware description of the board */ unsigned mdl_offset; - struct cx18_scb __iomem *scb; /* pointer to SCB */ + struct cx18_scb __iomem *scb; /* pointer to SCB */ + struct mutex epu2apu_mb_lock; /* protect driver to chip mailbox in SCB*/ + struct mutex epu2cpu_mb_lock; /* protect driver to chip mailbox in SCB*/ + struct cx18_av_state av_state; @@ -428,8 +431,6 @@ struct cx18 { wait_queue_head_t mb_apu_waitq; wait_queue_head_t mb_cpu_waitq; - wait_queue_head_t mb_epu_waitq; - wait_queue_head_t mb_hpu_waitq; wait_queue_head_t cap_w; /* when the current DMA is finished this queue is woken up */ wait_queue_head_t dma_waitq; |