diff options
Diffstat (limited to 'sound/pci/au88x0/au88x0_a3d.c')
-rw-r--r-- | sound/pci/au88x0/au88x0_a3d.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sound/pci/au88x0/au88x0_a3d.c b/sound/pci/au88x0/au88x0_a3d.c index d5755db5141f..d215f393ea64 100644 --- a/sound/pci/au88x0/au88x0_a3d.c +++ b/sound/pci/au88x0/au88x0_a3d.c | |||
@@ -725,7 +725,7 @@ static void vortex_a3d_translate_filter(a3d_atmos_t filter, int *params) | |||
725 | /* ALSA control interface. */ | 725 | /* ALSA control interface. */ |
726 | 726 | ||
727 | static int | 727 | static int |
728 | snd_vortex_a3d_hrtf_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) | 728 | snd_vortex_a3d_hrtf_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
729 | { | 729 | { |
730 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; | 730 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; |
731 | uinfo->count = 6; | 731 | uinfo->count = 6; |
@@ -734,7 +734,7 @@ snd_vortex_a3d_hrtf_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) | |||
734 | return 0; | 734 | return 0; |
735 | } | 735 | } |
736 | static int | 736 | static int |
737 | snd_vortex_a3d_itd_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) | 737 | snd_vortex_a3d_itd_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
738 | { | 738 | { |
739 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; | 739 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; |
740 | uinfo->count = 2; | 740 | uinfo->count = 2; |
@@ -743,7 +743,7 @@ snd_vortex_a3d_itd_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) | |||
743 | return 0; | 743 | return 0; |
744 | } | 744 | } |
745 | static int | 745 | static int |
746 | snd_vortex_a3d_ild_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) | 746 | snd_vortex_a3d_ild_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
747 | { | 747 | { |
748 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; | 748 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; |
749 | uinfo->count = 2; | 749 | uinfo->count = 2; |
@@ -752,8 +752,8 @@ snd_vortex_a3d_ild_info(snd_kcontrol_t * kcontrol, snd_ctl_elem_info_t * uinfo) | |||
752 | return 0; | 752 | return 0; |
753 | } | 753 | } |
754 | static int | 754 | static int |
755 | snd_vortex_a3d_filter_info(snd_kcontrol_t * | 755 | snd_vortex_a3d_filter_info(struct snd_kcontrol *kcontrol, |
756 | kcontrol, snd_ctl_elem_info_t * uinfo) | 756 | struct snd_ctl_elem_info *uinfo) |
757 | { | 757 | { |
758 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; | 758 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; |
759 | uinfo->count = 4; | 759 | uinfo->count = 4; |
@@ -763,7 +763,7 @@ snd_vortex_a3d_filter_info(snd_kcontrol_t * | |||
763 | } | 763 | } |
764 | 764 | ||
765 | static int | 765 | static int |
766 | snd_vortex_a3d_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) | 766 | snd_vortex_a3d_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
767 | { | 767 | { |
768 | //a3dsrc_t *a = kcontrol->private_data; | 768 | //a3dsrc_t *a = kcontrol->private_data; |
769 | /* No read yet. Would this be really useable/needed ? */ | 769 | /* No read yet. Would this be really useable/needed ? */ |
@@ -772,8 +772,8 @@ snd_vortex_a3d_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) | |||
772 | } | 772 | } |
773 | 773 | ||
774 | static int | 774 | static int |
775 | snd_vortex_a3d_hrtf_put(snd_kcontrol_t * | 775 | snd_vortex_a3d_hrtf_put(struct snd_kcontrol *kcontrol, |
776 | kcontrol, snd_ctl_elem_value_t * ucontrol) | 776 | struct snd_ctl_elem_value *ucontrol) |
777 | { | 777 | { |
778 | a3dsrc_t *a = kcontrol->private_data; | 778 | a3dsrc_t *a = kcontrol->private_data; |
779 | int changed = 1, i; | 779 | int changed = 1, i; |
@@ -789,8 +789,8 @@ snd_vortex_a3d_hrtf_put(snd_kcontrol_t * | |||
789 | } | 789 | } |
790 | 790 | ||
791 | static int | 791 | static int |
792 | snd_vortex_a3d_itd_put(snd_kcontrol_t * | 792 | snd_vortex_a3d_itd_put(struct snd_kcontrol *kcontrol, |
793 | kcontrol, snd_ctl_elem_value_t * ucontrol) | 793 | struct snd_ctl_elem_value *ucontrol) |
794 | { | 794 | { |
795 | a3dsrc_t *a = kcontrol->private_data; | 795 | a3dsrc_t *a = kcontrol->private_data; |
796 | int coord[6]; | 796 | int coord[6]; |
@@ -808,8 +808,8 @@ snd_vortex_a3d_itd_put(snd_kcontrol_t * | |||
808 | } | 808 | } |
809 | 809 | ||
810 | static int | 810 | static int |
811 | snd_vortex_a3d_ild_put(snd_kcontrol_t * | 811 | snd_vortex_a3d_ild_put(struct snd_kcontrol *kcontrol, |
812 | kcontrol, snd_ctl_elem_value_t * ucontrol) | 812 | struct snd_ctl_elem_value *ucontrol) |
813 | { | 813 | { |
814 | a3dsrc_t *a = kcontrol->private_data; | 814 | a3dsrc_t *a = kcontrol->private_data; |
815 | int changed = 1; | 815 | int changed = 1; |
@@ -825,8 +825,8 @@ snd_vortex_a3d_ild_put(snd_kcontrol_t * | |||
825 | } | 825 | } |
826 | 826 | ||
827 | static int | 827 | static int |
828 | snd_vortex_a3d_filter_put(snd_kcontrol_t | 828 | snd_vortex_a3d_filter_put(struct snd_kcontrol *kcontrol, |
829 | * kcontrol, snd_ctl_elem_value_t * ucontrol) | 829 | struct snd_ctl_elem_value *ucontrol) |
830 | { | 830 | { |
831 | a3dsrc_t *a = kcontrol->private_data; | 831 | a3dsrc_t *a = kcontrol->private_data; |
832 | int i, changed = 1; | 832 | int i, changed = 1; |
@@ -845,7 +845,7 @@ snd_vortex_a3d_filter_put(snd_kcontrol_t | |||
845 | return changed; | 845 | return changed; |
846 | } | 846 | } |
847 | 847 | ||
848 | static snd_kcontrol_new_t vortex_a3d_kcontrol __devinitdata = { | 848 | static struct snd_kcontrol_new vortex_a3d_kcontrol __devinitdata = { |
849 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, | 849 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
850 | .name = "Playback PCM advanced processing", | 850 | .name = "Playback PCM advanced processing", |
851 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, | 851 | .access = SNDRV_CTL_ELEM_ACCESS_READWRITE, |
@@ -857,7 +857,7 @@ static snd_kcontrol_new_t vortex_a3d_kcontrol __devinitdata = { | |||
857 | /* Control (un)registration. */ | 857 | /* Control (un)registration. */ |
858 | static int vortex_a3d_register_controls(vortex_t * vortex) | 858 | static int vortex_a3d_register_controls(vortex_t * vortex) |
859 | { | 859 | { |
860 | snd_kcontrol_t *kcontrol; | 860 | struct snd_kcontrol *kcontrol; |
861 | int err, i; | 861 | int err, i; |
862 | /* HRTF controls. */ | 862 | /* HRTF controls. */ |
863 | for (i = 0; i < NR_A3D; i++) { | 863 | for (i = 0; i < NR_A3D; i++) { |