summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/ivtv/ivtv-driver.h
diff options
context:
space:
mode:
authorAndy Walls <awalls@md.metrocast.net>2012-09-02 19:13:14 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-18 13:26:50 -0300
commit269c11fbac4f7b4ed58e77f3049b64b55a342234 (patch)
tree53e01d0a8f9cd1cd488f2d3e2838a79edf1ccfe6 /drivers/media/pci/ivtv/ivtv-driver.h
parent6d60805fd2e8103fafa02fcf6448446229ebd511 (diff)
downloadop-kernel-dev-269c11fbac4f7b4ed58e77f3049b64b55a342234.zip
op-kernel-dev-269c11fbac4f7b4ed58e77f3049b64b55a342234.tar.gz
[media] ivtv, ivtv-alsa: Add initial ivtv-alsa interface driver for ivtv
This is a cut-and-paste port of the cx18-alsa driver to create an ivtv-alsa interface module for the ivtv driver. It is not actually hooked-up to the PCM stream DMA buffers from the ivtv driver yet. That will be done in a coming change, since that portion is so very different from the cx18 driver. This code has all or more of the bugs and shortcomings of the cx18-alsa interface driver: inconsistent use of itvsc->slock, ivtv-alsa-mixer.c is dead code, assumes 48 ksps regardless of the actual setting of the audio capture, problems with proper struct ivtv and struct ivtv_stream housekeeping, struct ivtv_open_id.v4l2_fh abuse, and $DIETY knows what else. Signed-off-by: Andy Walls <awalls@md.metrocast.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/ivtv/ivtv-driver.h')
-rw-r--r--drivers/media/pci/ivtv/ivtv-driver.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/media/pci/ivtv/ivtv-driver.h b/drivers/media/pci/ivtv/ivtv-driver.h
index a7e00f8..1918e73 100644
--- a/drivers/media/pci/ivtv/ivtv-driver.h
+++ b/drivers/media/pci/ivtv/ivtv-driver.h
@@ -669,6 +669,13 @@ struct ivtv {
atomic_t capturing; /* count number of active capture streams */
atomic_t decoding; /* count number of active decoding streams */
+ /* ALSA interface for PCM capture stream */
+ struct snd_ivtv_card *alsa;
+ void (*pcm_announce_callback)(struct snd_ivtv_card *card, u8 *pcm_data,
+ size_t num_bytes);
+
+ /* Used for ivtv-alsa module loading */
+ struct work_struct request_module_wk;
/* Interrupts & DMA */
u32 irqmask; /* active interrupts */
@@ -752,6 +759,9 @@ static inline struct ivtv *to_ivtv(struct v4l2_device *v4l2_dev)
return container_of(v4l2_dev, struct ivtv, v4l2_dev);
}
+/* ivtv extensions to be loaded */
+extern int (*ivtv_ext_init)(struct ivtv *);
+
/* Globals */
extern int ivtv_first_minor;
OpenPOWER on IntegriCloud