summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/cx88')
-rw-r--r--linux/drivers/media/video/cx88/cx88-alsa.c46
1 files changed, 23 insertions, 23 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-alsa.c b/linux/drivers/media/video/cx88/cx88-alsa.c
index cd3fa72fc..80aef2421 100644
--- a/linux/drivers/media/video/cx88/cx88-alsa.c
+++ b/linux/drivers/media/video/cx88/cx88-alsa.c
@@ -65,7 +65,7 @@ struct cx88_audio_dev {
/* audio controls */
int irq;
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
snd_card_t *card;
#else
struct snd_card *card;
@@ -88,7 +88,7 @@ struct cx88_audio_dev {
struct cx88_buffer *buf;
long opened;
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
snd_pcm_substream_t *substream;
#else
struct snd_pcm_substream *substream;
@@ -109,7 +109,7 @@ typedef struct cx88_audio_dev snd_cx88_card_t;
static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 1};
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static snd_card_t *snd_cx88_cards[SNDRV_CARDS];
#else
static struct snd_card *snd_cx88_cards[SNDRV_CARDS];
@@ -346,7 +346,7 @@ static int dsp_buffer_free(snd_cx88_card_t *chip)
/*
* Digital hardware definition
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static snd_pcm_hardware_t snd_cx88_digital_hw = {
#else
static struct snd_pcm_hardware snd_cx88_digital_hw = {
@@ -372,7 +372,7 @@ static struct snd_pcm_hardware snd_cx88_digital_hw = {
/*
* audio pcm capture runtime free
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static void snd_card_cx88_runtime_free(snd_pcm_runtime_t *runtime)
#else
static void snd_card_cx88_runtime_free(struct snd_pcm_runtime *runtime)
@@ -382,14 +382,14 @@ static void snd_card_cx88_runtime_free(struct snd_pcm_runtime *runtime)
/*
* audio pcm capture open callback
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_cx88_pcm_open(snd_pcm_substream_t *substream)
#else
static int snd_cx88_pcm_open(struct snd_pcm_substream *substream)
#endif
{
snd_cx88_card_t *chip = snd_pcm_substream_chip(substream);
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
snd_pcm_runtime_t *runtime = substream->runtime;
#else
struct snd_pcm_runtime *runtime = substream->runtime;
@@ -422,7 +422,7 @@ _error:
/*
* audio close callback
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_cx88_close(snd_pcm_substream_t *substream)
#else
static int snd_cx88_close(struct snd_pcm_substream *substream)
@@ -439,7 +439,7 @@ static int snd_cx88_close(struct snd_pcm_substream *substream)
/*
* hw_params callback
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_cx88_hw_params(snd_pcm_substream_t * substream,
snd_pcm_hw_params_t * hw_params)
#else
@@ -504,7 +504,7 @@ static int snd_cx88_hw_params(struct snd_pcm_substream * substream,
/*
* hw free callback
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_cx88_hw_free(snd_pcm_substream_t * substream)
#else
static int snd_cx88_hw_free(struct snd_pcm_substream * substream)
@@ -524,7 +524,7 @@ static int snd_cx88_hw_free(struct snd_pcm_substream * substream)
/*
* prepare callback
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_cx88_prepare(snd_pcm_substream_t *substream)
#else
static int snd_cx88_prepare(struct snd_pcm_substream *substream)
@@ -537,7 +537,7 @@ static int snd_cx88_prepare(struct snd_pcm_substream *substream)
/*
* trigger callback
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_cx88_card_trigger(snd_pcm_substream_t *substream, int cmd)
#else
static int snd_cx88_card_trigger(struct snd_pcm_substream *substream, int cmd)
@@ -568,14 +568,14 @@ static int snd_cx88_card_trigger(struct snd_pcm_substream *substream, int cmd)
/*
* pointer callback
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static snd_pcm_uframes_t snd_cx88_pointer(snd_pcm_substream_t *substream)
#else
static snd_pcm_uframes_t snd_cx88_pointer(struct snd_pcm_substream *substream)
#endif
{
snd_cx88_card_t *chip = snd_pcm_substream_chip(substream);
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
snd_pcm_runtime_t *runtime = substream->runtime;
#else
struct snd_pcm_runtime *runtime = substream->runtime;
@@ -596,7 +596,7 @@ static snd_pcm_uframes_t snd_cx88_pointer(struct snd_pcm_substream *substream)
/*
* operators
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static snd_pcm_ops_t snd_cx88_pcm_ops = {
#else
static struct snd_pcm_ops snd_cx88_pcm_ops = {
@@ -617,7 +617,7 @@ static struct snd_pcm_ops snd_cx88_pcm_ops = {
static int __devinit snd_cx88_pcm(snd_cx88_card_t *chip, int device, char *name)
{
int err;
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
snd_pcm_t *pcm;
#else
struct snd_pcm *pcm;
@@ -636,7 +636,7 @@ static int __devinit snd_cx88_pcm(snd_cx88_card_t *chip, int device, char *name)
/****************************************************************************
CONTROL INTERFACE
****************************************************************************/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_cx88_capture_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *info)
#else
static int snd_cx88_capture_volume_info(struct snd_kcontrol *kcontrol,
@@ -652,7 +652,7 @@ static int snd_cx88_capture_volume_info(struct snd_kcontrol *kcontrol,
}
/* OK - TODO: test it */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_cx88_capture_volume_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *value)
#else
static int snd_cx88_capture_volume_get(struct snd_kcontrol *kcontrol,
@@ -668,7 +668,7 @@ static int snd_cx88_capture_volume_get(struct snd_kcontrol *kcontrol,
}
/* OK - TODO: test it */
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_cx88_capture_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *value)
#else
static int snd_cx88_capture_volume_put(struct snd_kcontrol *kcontrol,
@@ -689,7 +689,7 @@ static int snd_cx88_capture_volume_put(struct snd_kcontrol *kcontrol,
return v != old_control;
}
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static snd_kcontrol_new_t snd_cx88_capture_volume = {
#else
static struct snd_kcontrol_new snd_cx88_capture_volume = {
@@ -739,7 +739,7 @@ static int snd_cx88_free(snd_cx88_card_t *chip)
/*
* Component Destructor
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static void snd_cx88_dev_free(snd_card_t * card)
#else
static void snd_cx88_dev_free(struct snd_card * card)
@@ -756,7 +756,7 @@ static void snd_cx88_dev_free(struct snd_card * card)
*/
static int devno;
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int __devinit snd_cx88_create(snd_card_t *card, struct pci_dev *pci,
snd_cx88_card_t **rchip)
#else
@@ -834,7 +834,7 @@ static int __devinit snd_cx88_create(struct snd_card *card,
static int __devinit cx88_audio_initdev(struct pci_dev *pci,
const struct pci_device_id *pci_id)
{
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
snd_card_t *card;
#else
struct snd_card *card;
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-09 20:13:36 +0000