diff options
| author | Harry Butterworth <heb1001@gmail.com> | 2011-06-11 17:41:13 +0800 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-06-14 07:34:03 +0200 |
| commit | b028b81835d7503d68b230446cd5e39d14ff5b9f (patch) | |
| tree | 62873fdf6c3c8002eed541b1e637554514d1a826 /sound/pci/ctxfi/ctatc.h | |
| parent | 55309216baeb9d7f951520cf8e8bf2337cd17bad (diff) | |
ALSA: ctxfi: Implement a combined capabilities query method to replace multiple have_x query methods.
Signed-off-by: Harry Butterworth <heb1001@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ctxfi/ctatc.h')
| -rw-r--r-- | sound/pci/ctxfi/ctatc.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/pci/ctxfi/ctatc.h b/sound/pci/ctxfi/ctatc.h index 6bad27e06f4..3a0def656af 100644 --- a/sound/pci/ctxfi/ctatc.h +++ b/sound/pci/ctxfi/ctatc.h @@ -25,6 +25,7 @@ #include <sound/core.h> #include "ctvmem.h" +#include "cthardware.h" #include "ctresource.h" enum CTALSADEVS { /* Types of alsa devices */ @@ -121,12 +122,9 @@ struct ct_atc { int (*spdif_out_get_status)(struct ct_atc *atc, unsigned int *status); int (*spdif_out_set_status)(struct ct_atc *atc, unsigned int status); int (*spdif_out_passthru)(struct ct_atc *atc, unsigned char state); - int (*have_digit_io_switch)(struct ct_atc *atc); - int (*have_dedicated_mic)(struct ct_atc *atc); - int (*have_output_switch)(struct ct_atc *atc); + struct capabilities (*capabilities)(struct ct_atc *atc); int (*output_switch_get)(struct ct_atc *atc); int (*output_switch_put)(struct ct_atc *atc, int position); - int (*have_mic_source_switch)(struct ct_atc *atc); int (*mic_source_switch_get)(struct ct_atc *atc); int (*mic_source_switch_put)(struct ct_atc *atc, int position); |