summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134/saa7134-alsa.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-alsa.c')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-alsa.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-alsa.c b/linux/drivers/media/video/saa7134/saa7134-alsa.c
index f670f4c8c..54fc877ba 100644
--- a/linux/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/linux/drivers/media/video/saa7134/saa7134-alsa.c
@@ -80,7 +80,7 @@ MODULE_PARM_DESC(enable, "Enable (or not) the SAA7134 capture interface(s).");
*/
typedef struct snd_card_saa7134 {
-#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;
@@ -111,14 +111,14 @@ typedef struct snd_card_saa7134_pcm {
spinlock_t lock;
-#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;
#endif
} snd_card_saa7134_pcm_t;
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static snd_card_t *snd_saa7134_cards[SNDRV_CARDS];
#else
static struct snd_card *snd_saa7134_cards[SNDRV_CARDS];
@@ -275,14 +275,14 @@ out:
*
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_card_saa7134_capture_trigger(snd_pcm_substream_t * substream,
#else
static int snd_card_saa7134_capture_trigger(struct snd_pcm_substream * substream,
#endif
int cmd)
{
-#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;
@@ -364,13 +364,13 @@ static int dsp_buffer_free(struct saa7134_dev *dev)
*
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_card_saa7134_capture_prepare(snd_pcm_substream_t * substream)
#else
static int snd_card_saa7134_capture_prepare(struct snd_pcm_substream * substream)
#endif
{
-#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;
@@ -461,14 +461,14 @@ static int snd_card_saa7134_capture_prepare(struct snd_pcm_substream * substream
*
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static snd_pcm_uframes_t snd_card_saa7134_capture_pointer(snd_pcm_substream_t * substream)
#else
static snd_pcm_uframes_t
snd_card_saa7134_capture_pointer(struct snd_pcm_substream * substream)
#endif
{
-#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;
@@ -490,7 +490,7 @@ snd_card_saa7134_capture_pointer(struct snd_pcm_substream * substream)
* ALSA hardware capabilities 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_card_saa7134_capture =
#else
static struct snd_pcm_hardware snd_card_saa7134_capture =
@@ -517,7 +517,7 @@ static struct snd_pcm_hardware snd_card_saa7134_capture =
.periods_max = 1024,
};
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static void snd_card_saa7134_runtime_free(snd_pcm_runtime_t *runtime)
#else
static void snd_card_saa7134_runtime_free(struct snd_pcm_runtime *runtime)
@@ -538,7 +538,7 @@ static void snd_card_saa7134_runtime_free(struct snd_pcm_runtime *runtime)
*
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_card_saa7134_hw_params(snd_pcm_substream_t * substream,
snd_pcm_hw_params_t * hw_params)
#else
@@ -623,7 +623,7 @@ static int snd_card_saa7134_hw_params(struct snd_pcm_substream * substream,
*
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_card_saa7134_hw_free(snd_pcm_substream_t * substream)
#else
static int snd_card_saa7134_hw_free(struct snd_pcm_substream * substream)
@@ -653,7 +653,7 @@ static int snd_card_saa7134_hw_free(struct snd_pcm_substream * substream)
*
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_card_saa7134_capture_close(snd_pcm_substream_t * substream)
#else
static int snd_card_saa7134_capture_close(struct snd_pcm_substream * substream)
@@ -672,13 +672,13 @@ static int snd_card_saa7134_capture_close(struct snd_pcm_substream * substream)
*
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_card_saa7134_capture_open(snd_pcm_substream_t * substream)
#else
static int snd_card_saa7134_capture_open(struct snd_pcm_substream * substream)
#endif
{
-#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;
@@ -718,7 +718,7 @@ static int snd_card_saa7134_capture_open(struct snd_pcm_substream * substream)
* ALSA capture callbacks definition
*/
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static snd_pcm_ops_t snd_card_saa7134_capture_ops = {
#else
static struct snd_pcm_ops snd_card_saa7134_capture_ops = {
@@ -743,7 +743,7 @@ static struct snd_pcm_ops snd_card_saa7134_capture_ops = {
static int snd_card_saa7134_pcm(snd_card_saa7134_t *saa7134, int device)
{
-#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;
@@ -765,7 +765,7 @@ static int snd_card_saa7134_pcm(snd_card_saa7134_t *saa7134, int device)
.get = snd_saa7134_volume_get, .put = snd_saa7134_volume_put, \
.private_value = addr }
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_saa7134_volume_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo)
#else
static int snd_saa7134_volume_info(struct snd_kcontrol * kcontrol,
@@ -779,7 +779,7 @@ static int snd_saa7134_volume_info(struct snd_kcontrol * kcontrol,
return 0;
}
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_saa7134_volume_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
#else
static int snd_saa7134_volume_get(struct snd_kcontrol * kcontrol,
@@ -794,7 +794,7 @@ static int snd_saa7134_volume_get(struct snd_kcontrol * kcontrol,
return 0;
}
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_saa7134_volume_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
#else
static int snd_saa7134_volume_put(struct snd_kcontrol * kcontrol,
@@ -830,7 +830,7 @@ static int snd_saa7134_volume_put(struct snd_kcontrol * kcontrol,
.get = snd_saa7134_capsrc_get, .put = snd_saa7134_capsrc_put, \
.private_value = addr }
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_saa7134_capsrc_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo)
#else
static int snd_saa7134_capsrc_info(struct snd_kcontrol * kcontrol,
@@ -844,7 +844,7 @@ static int snd_saa7134_capsrc_info(struct snd_kcontrol * kcontrol,
return 0;
}
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_saa7134_capsrc_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
#else
static int snd_saa7134_capsrc_get(struct snd_kcontrol * kcontrol,
@@ -862,7 +862,7 @@ static int snd_saa7134_capsrc_get(struct snd_kcontrol * kcontrol,
return 0;
}
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static int snd_saa7134_capsrc_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
#else
static int snd_saa7134_capsrc_put(struct snd_kcontrol * kcontrol,
@@ -944,7 +944,7 @@ static int snd_saa7134_capsrc_put(struct snd_kcontrol * kcontrol,
return change;
}
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static snd_kcontrol_new_t snd_saa7134_controls[] = {
#else
static struct snd_kcontrol_new snd_saa7134_controls[] = {
@@ -967,7 +967,7 @@ SAA713x_CAPSRC("Line Capture Switch", 2, MIXER_ADDR_LINE2),
static int snd_card_saa7134_new_mixer(snd_card_saa7134_t * chip)
{
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
snd_card_t *card = chip->card;
#else
struct snd_card *card = chip->card;
@@ -985,7 +985,7 @@ static int snd_card_saa7134_new_mixer(snd_card_saa7134_t * chip)
return 0;
}
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16)
static void snd_saa7134_free(snd_card_t * card)
#else
static void snd_saa7134_free(struct snd_card * card)
@@ -1016,7 +1016,7 @@ static void snd_saa7134_free(struct snd_card * card)
static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum)
{
-#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-04 09:47:02 +0000