Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 54 insertions, 0 deletions

diff --git a/sound/usb/6fire/control.h b/sound/usb/6fire/control.h
new file mode 100644
index 000000000000..8f5aeead2e3d
--- /dev/null
+++ b/sound/usb/6fire/control.h
@@ -0,0 +1,54 @@
+/*
+ * Linux driver for TerraTec DMX 6Fire USB
+ *
+ * Author:      Torsten Schenk <torsten.schenk@zoho.com>
+ * Created:     Jan 01, 2011
+ * Version:     0.3.0
+ * Copyright:   (C) Torsten Schenk
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef USB6FIRE_CONTROL_H
+#define USB6FIRE_CONTROL_H
+
+#include "common.h"
+
+enum {
+        CONTROL_MAX_ELEMENTS = 32
+};
+
+enum {
+        CONTROL_RATE_44KHZ,
+        CONTROL_RATE_48KHZ,
+        CONTROL_RATE_88KHZ,
+        CONTROL_RATE_96KHZ,
+        CONTROL_RATE_176KHZ,
+        CONTROL_RATE_192KHZ,
+        CONTROL_N_RATES
+};
+
+struct control_runtime {
+        int (*update_streaming)(struct control_runtime *rt);
+        int (*set_rate)(struct control_runtime *rt, int rate);
+        int (*set_channels)(struct control_runtime *rt, int n_analog_out,
+                int n_analog_in, bool spdif_out, bool spdif_in);
+
+        struct sfire_chip *chip;
+
+        struct snd_kcontrol *element[CONTROL_MAX_ELEMENTS];
+        bool opt_coax_switch;
+        bool line_phono_switch;
+        bool digital_thru_switch;
+        bool usb_streaming;
+        u8 master_vol;
+};
+
+int __devinit usb6fire_control_init(struct sfire_chip *chip);
+void usb6fire_control_abort(struct sfire_chip *chip);
+void usb6fire_control_destroy(struct sfire_chip *chip);
+#endif /* USB6FIRE_CONTROL_H */
+