Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[~andy/linux] / sound / pci / ctxfi / ctatc.h

diff --git a/sound/pci/ctxfi/ctatc.h b/sound/pci/ctxfi/ctatc.h
index 7167c0185d5281cb2c2a77bc978ce4c3dbdbdb5f..3a0def656af05c6b7870ceb375c2fffa299d7248 100644 (file)
--- 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 */
@@ -115,12 +116,17 @@ struct ct_atc {
        int (*line_clfe_unmute)(struct ct_atc *atc, unsigned char state);
        int (*line_rear_unmute)(struct ct_atc *atc, unsigned char state);
        int (*line_in_unmute)(struct ct_atc *atc, unsigned char state);
+       int (*mic_unmute)(struct ct_atc *atc, unsigned char state);
        int (*spdif_out_unmute)(struct ct_atc *atc, unsigned char state);
        int (*spdif_in_unmute)(struct ct_atc *atc, unsigned char state);
        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);
+       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 (*mic_source_switch_get)(struct ct_atc *atc);
+       int (*mic_source_switch_put)(struct ct_atc *atc, int position);
 
        /* Don't touch! Used for internal object. */
        void *rsc_mgrs[NUM_RSCTYP]; /* chip resource managers */