diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-12 08:17:46 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-12 08:17:46 -0200 |
| commit | 404ee5d5dea9be4f51d5a436a2a33a00e47be1ed (patch) | |
| tree | 2deb0c37388e8388e1c4dba2173300ab64cde546 /linux/drivers/media/video/em28xx/em28xx.h | |
| parent | 6bb5aad0cf3ec4e211f6b3a3a09ece3488019548 (diff) | |
| parent | c6fd49ac8accb7a3252958a16ddf87fd216e694e (diff) | |
| download | mediapointer-dvb-s2-404ee5d5dea9be4f51d5a436a2a33a00e47be1ed.tar.gz mediapointer-dvb-s2-404ee5d5dea9be4f51d5a436a2a33a00e47be1ed.tar.bz2 | |
merge: http://linuxtv.org/hg/~dougsland/v4l2-em28xx
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx.h')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx.h b/linux/drivers/media/video/em28xx/em28xx.h index 46f738a8d..a0128819d 100644 --- a/linux/drivers/media/video/em28xx/em28xx.h +++ b/linux/drivers/media/video/em28xx/em28xx.h @@ -114,6 +114,10 @@ #define EM28XX_BOARD_NOT_VALIDATED 1 #define EM28XX_BOARD_VALIDATED 0 +/* Params for em28xx_cmd() audio */ +#define EM28XX_START_AUDIO 1 +#define EM28XX_STOP_AUDIO 0 + /* maximum number of em28xx boards */ #define EM28XX_MAXBOARDS 4 /*FIXME: should be bigger */ @@ -158,7 +162,8 @@ */ /* time to wait when stopping the isoc transfer */ -#define EM28XX_URB_TIMEOUT msecs_to_jiffies(EM28XX_NUM_BUFS * EM28XX_NUM_PACKETS) +#define EM28XX_URB_TIMEOUT \ + msecs_to_jiffies(EM28XX_NUM_BUFS * EM28XX_NUM_PACKETS) /* time in msecs to wait for i2c writes to finish */ #define EM2800_I2C_WRITE_TIMEOUT 20 @@ -432,7 +437,7 @@ struct em28xx_audio { struct snd_card *sndcard; #endif - int users, shutdown; + int users; enum em28xx_stream_state capture_stream; spinlock_t slock; }; @@ -535,7 +540,8 @@ struct em28xx { int num_alt; /* Number of alternative settings */ unsigned int *alt_max_pkt_size; /* array of wMaxPacketSize */ struct urb *urb[EM28XX_NUM_BUFS]; /* urb for isoc transfers */ - char *transfer_buffer[EM28XX_NUM_BUFS]; /* transfer buffers for isoc transfer */ + char *transfer_buffer[EM28XX_NUM_BUFS]; /* transfer buffers for isoc + transfer */ char urb_buf[URB_MAX_CTRL_SIZE]; /* urb control msg buffer */ /* helper funcs that call usb_control_msg */ |