ALSA: usb-audio: parse more format descriptors with structs

[safe/jmp/linux-2.6] / sound / oss / aedsp16.c

diff --git a/sound/oss/aedsp16.c b/sound/oss/aedsp16.c
index 51e1fde..35b5912 100644 (file)
--- a/sound/oss/aedsp16.c
+++ b/sound/oss/aedsp16.c
@@ -29,14 +29,6 @@
 #include "sound_config.h"
 
 /*
- * Sanity checks
- */
-
-#if defined(CONFIG_SOUND_AEDSP16_SBPRO) && defined(CONFIG_SOUND_AEDSP16_MSS)
-#error You have to enable only one of the MSS and SBPRO emulations.
-#endif
-
-/*
 
    READ THIS
 
@@ -165,7 +157,7 @@
 
    Started Fri Mar 17 16:13:18 MET 1995
 
-   v0.1 (ALPHA, was an user-level program called AudioExcelDSP16.c)
+   v0.1 (ALPHA, was a user-level program called AudioExcelDSP16.c)
    - Initial code.
    v0.2 (ALPHA)
    - Cleanups.
@@ -333,8 +325,9 @@
 /*
  * Size of character arrays that store name and version of sound card
  */
-#define CARDNAMELEN 15         /* Size of the card's name in chars     */
-#define CARDVERLEN  2          /* Size of the card's version in chars  */
+#define CARDNAMELEN    15      /* Size of the card's name in chars     */
+#define CARDVERLEN     10      /* Size of the card's version in chars  */
+#define CARDVERDIGITS  2       /* Number of digits in the version      */
 
 #if defined(CONFIG_SC6600)
 /*
@@ -418,7 +411,7 @@
 
 static int      soft_cfg __initdata = 0;       /* bitmapped config */
 static int      soft_cfg_mss __initdata = 0;   /* bitmapped mss config */
-static int      ver[CARDVERLEN] __initdata = {0, 0};   /* DSP Ver:
+static int      ver[CARDVERDIGITS] __initdata = {0, 0};        /* DSP Ver:
                                                   hi->ver[0] lo->ver[1] */
 
 #if defined(CONFIG_SC6600)
@@ -965,7 +958,7 @@ static int __init aedsp16_dsp_version(int port)
         * string is finished.
         */
                ver[len++] = ret;
-         } while (len < CARDVERLEN);
+         } while (len < CARDVERDIGITS);
        sprintf(DSPVersion, "%d.%d", ver[0], ver[1]);
 
        DBG(("success.\n"));