[02/20] ALSA: Add SNDRV_DEV_CARD type

Commit Message

Takashi Iwai Feb. 12, 2014, 10:52 a.m. UTC

Define the new SNDRV_DEV_CARD that is used for managing the top-level
card (chip) object.  So far, we used SNDRV_DEV_LOWLEVEL for this
purpose, but it doesn't fit properly; the "lowlevel" doesn't match
with the object it's assigned (where the card/chip object is rather a
top-level one).  And since the device register/free order will be more
strictly ordered in the later patch, we should place this object in
the right order position.

This patch alone just adds SNDRV_DEV_CARD as equivalent as
SNDRV_DEV_LOWLEVEL.  In the later patch, the value will be adjusted
appropriately.

Signed-off-by: Takashi Iwai <[e-mail]>
---
 Documentation/DocBook/writing-an-alsa-driver.tmpl | 10 +++++-----
 include/sound/core.h                              |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

Patch

diff --git a/Documentation/DocBook/writing-an-alsa-driver.tmpl b/Documentation/DocBook/writing-an-alsa-driver.tmpl
index d0056a4e9c53..c6119a30169b 100644
--- a/Documentation/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/DocBook/writing-an-alsa-driver.tmpl
@@ -462,7 +462,7 @@ 
            */
           ....
 
-          err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+          err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops);
           if (err < 0) {
                   snd_mychip_free(chip);
                   return err;
@@ -870,8 +870,8 @@ 
       callback pointers (<parameter>&amp;ops</parameter>). The
       device-level defines the type of components and the order of
       registration and de-registration.  For most components, the
-      device-level is already defined.  For a user-defined component,
-      you can use <constant>SNDRV_DEV_LOWLEVEL</constant>.
+      device-level is already defined.  For a user-defined card component,
+      you can use <constant>SNDRV_DEV_CARD</constant>.
       </para>
 
       <para>
@@ -1018,7 +1018,7 @@ 
           .dev_free =        snd_mychip_dev_free,
   };
   ....
-  snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+  snd_device_new(card, SNDRV_DEV_CARD, chip, &ops);
 ]]>
             </programlisting>
           </informalexample>
@@ -1171,7 +1171,7 @@ 
           /* (2) initialization of the chip hardware */
           .... /*   (not implemented in this document) */
 
-          err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+          err = snd_device_new(card, SNDRV_DEV_CARD, chip, &ops);
           if (err < 0) {
                   snd_mychip_free(chip);
                   return err;
diff --git a/include/sound/core.h b/include/sound/core.h
index 7c407b588697..127b908a2422 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -64,6 +64,7 @@  enum snd_device_type {
 	SNDRV_DEV_JACK,
 	SNDRV_DEV_COMPRESS,
 	SNDRV_DEV_LOWLEVEL	= 0x2000,
+	SNDRV_DEV_CARD = SNDRV_DEV_LOWLEVEL,
 };
 
 enum snd_device_state {