[ALSA] virtuoso: move PCM1796 symbols to a header file

Move the PCM1796 register symbol definitions to their own header file.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

2 files changed, 59 insertions, 54 deletions

diff --git a/sound/pci/oxygen/pcm1796.h b/sound/pci/oxygen/pcm1796.h
new file mode 100644
index 000000000000..698bf46c710c
--- /dev/null
+++ b/sound/pci/oxygen/pcm1796.h
@@ -0,0 +1,58 @@
+#ifndef PCM1796_H_INCLUDED
+#define PCM1796_H_INCLUDED
+
+/* register 16 */
+#define PCM1796_ATL_MASK        0xff
+/* register 17 */
+#define PCM1796_ATR_MASK        0xff
+/* register 18 */
+#define PCM1796_MUTE            0x01
+#define PCM1796_DME             0x02
+#define PCM1796_DMF_MASK        0x0c
+#define PCM1796_DMF_DISABLED    0x00
+#define PCM1796_DMF_48          0x04
+#define PCM1796_DMF_441         0x08
+#define PCM1796_DMF_32          0x0c
+#define PCM1796_FMT_MASK        0x70
+#define PCM1796_FMT_16_RJUST    0x00
+#define PCM1796_FMT_20_RJUST    0x10
+#define PCM1796_FMT_24_RJUST    0x20
+#define PCM1796_FMT_24_LJUST    0x30
+#define PCM1796_FMT_16_I2S      0x40
+#define PCM1796_FMT_24_I2S      0x50
+#define PCM1796_ATLD            0x80
+/* register 19 */
+#define PCM1796_INZD            0x01
+#define PCM1796_FLT_MASK        0x02
+#define PCM1796_FLT_SHARP       0x00
+#define PCM1796_FLT_SLOW        0x02
+#define PCM1796_DFMS            0x04
+#define PCM1796_OPE             0x10
+#define PCM1796_ATS_MASK        0x60
+#define PCM1796_ATS_1           0x00
+#define PCM1796_ATS_2           0x20
+#define PCM1796_ATS_4           0x40
+#define PCM1796_ATS_8           0x60
+#define PCM1796_REV             0x80
+/* register 20 */
+#define PCM1796_OS_MASK         0x03
+#define PCM1796_OS_64           0x00
+#define PCM1796_OS_32           0x01
+#define PCM1796_OS_128          0x02
+#define PCM1796_CHSL_MASK       0x04
+#define PCM1796_CHSL_LEFT       0x00
+#define PCM1796_CHSL_RIGHT      0x04
+#define PCM1796_MONO            0x08
+#define PCM1796_DFTH            0x10
+#define PCM1796_DSD             0x20
+#define PCM1796_SRST            0x40
+/* register 21 */
+#define PCM1796_PCMZ            0x01
+#define PCM1796_DZ_MASK         0x06
+/* register 22 */
+#define PCM1796_ZFGL            0x01
+#define PCM1796_ZFGR            0x02
+/* register 23 */
+#define PCM1796_ID_MASK         0x1f
+
+#endif
diff --git a/sound/pci/oxygen/virtuoso.c b/sound/pci/oxygen/virtuoso.c
index e4e23789080a..127dd664fc16 100644
--- a/sound/pci/oxygen/virtuoso.c
+++ b/sound/pci/oxygen/virtuoso.c
@@ -47,6 +47,7 @@
 #include <sound/tlv.h>
 #include "oxygen.h"
 #include "cm9780.h"
+#include "pcm1796.h"
 
 MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
 MODULE_DESCRIPTION("Asus AV200 driver");
@@ -82,60 +83,6 @@ MODULE_DEVICE_TABLE(pci, xonar_ids);
 
 #define GPIO_LINE_MUTE          CM9780_GPO0
 
-/* register 16 */
-#define PCM1796_ATL_MASK        0xff
-/* register 17 */
-#define PCM1796_ATR_MASK        0xff
-/* register 18 */
-#define PCM1796_MUTE            0x01
-#define PCM1796_DME             0x02
-#define PCM1796_DMF_MASK        0x0c
-#define PCM1796_DMF_DISABLED    0x00
-#define PCM1796_DMF_48          0x04
-#define PCM1796_DMF_441         0x08
-#define PCM1796_DMF_32          0x0c
-#define PCM1796_FMT_MASK        0x70
-#define PCM1796_FMT_16_RJUST    0x00
-#define PCM1796_FMT_20_RJUST    0x10
-#define PCM1796_FMT_24_RJUST    0x20
-#define PCM1796_FMT_24_LJUST    0x30
-#define PCM1796_FMT_16_I2S      0x40
-#define PCM1796_FMT_24_I2S      0x50
-#define PCM1796_ATLD            0x80
-/* register 19 */
-#define PCM1796_INZD            0x01
-#define PCM1796_FLT_MASK        0x02
-#define PCM1796_FLT_SHARP       0x00
-#define PCM1796_FLT_SLOW        0x02
-#define PCM1796_DFMS            0x04
-#define PCM1796_OPE             0x10
-#define PCM1796_ATS_MASK        0x60
-#define PCM1796_ATS_1           0x00
-#define PCM1796_ATS_2           0x20
-#define PCM1796_ATS_4           0x40
-#define PCM1796_ATS_8           0x60
-#define PCM1796_REV             0x80
-/* register 20 */
-#define PCM1796_OS_MASK         0x03
-#define PCM1796_OS_64           0x00
-#define PCM1796_OS_32           0x01
-#define PCM1796_OS_128          0x02
-#define PCM1796_CHSL_MASK       0x04
-#define PCM1796_CHSL_LEFT       0x00
-#define PCM1796_CHSL_RIGHT      0x04
-#define PCM1796_MONO            0x08
-#define PCM1796_DFTH            0x10
-#define PCM1796_DSD             0x20
-#define PCM1796_SRST            0x40
-/* register 21 */
-#define PCM1796_PCMZ            0x01
-#define PCM1796_DZ_MASK         0x06
-/* register 22 */
-#define PCM1796_ZFGL            0x01
-#define PCM1796_ZFGR            0x02
-/* register 23 */
-#define PCM1796_ID_MASK         0x1f
-
 struct xonar_data {
         u8 is_d2x;
         u8 has_power;