All of lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: alsa-devel@alsa-project.org
Subject: [PATCH 02/20] ALSA: Add SNDRV_DEV_CARD type
Date: Wed, 12 Feb 2014 11:52:09 +0100	[thread overview]
Message-ID: <1392202347-11774-3-git-send-email-tiwai@suse.de> (raw)
In-Reply-To: <1392202347-11774-1-git-send-email-tiwai@suse.de>

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 <tiwai@suse.de>
---
 Documentation/DocBook/writing-an-alsa-driver.tmpl | 10 +++++-----
 include/sound/core.h                              |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

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 {
-- 
1.8.5.2

  parent reply	other threads:[~2014-02-12 10:52 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-12 10:52 [PATCH RFC 00/20] snd_device_* cleanups Takashi Iwai
2014-02-12 10:52 ` [PATCH 01/20] ALSA: Drop __bitwise and typedefs for snd_device attributes Takashi Iwai
2014-02-12 10:52 ` Takashi Iwai [this message]
2014-02-12 10:52 ` [PATCH 03/20] ALSA: pci: Use SNDRV_DEV_CARD for card objects Takashi Iwai
2014-02-12 10:52 ` [PATCH 04/20] ALSA: isa: " Takashi Iwai
2014-02-12 10:52 ` [PATCH 05/20] ALSA: drivers: " Takashi Iwai
2014-02-12 10:52 ` [PATCH 06/20] ALSA: pcmcia: " Takashi Iwai
2014-02-12 10:52 ` [PATCH 07/20] ALSA: usb-audio: Use proper SNDRV_DEV_* type Takashi Iwai
2014-02-12 10:52 ` [PATCH 08/20] ALSA: aoa: Use SNDRV_DEV_CODEC for AOA codec objects Takashi Iwai
2014-02-12 10:52 ` [PATCH 09/20] ALSA: mips: Use SNDRV_DEV_CARD for card objects Takashi Iwai
2014-02-12 10:52 ` [PATCH 10/20] ALSA: parisc: " Takashi Iwai
2014-02-12 10:52 ` [PATCH 11/20] ALSA: ppc: " Takashi Iwai
2014-02-12 10:52 ` [PATCH 12/20] ALSA: sh: " Takashi Iwai
2014-02-12 10:52 ` [PATCH 13/20] ALSA: sparc: " Takashi Iwai
2014-02-12 10:52 ` [PATCH 14/20] ALSA: i2c/ak413x: Use SNDRV_DEV_CODEC for ak413x codec objects Takashi Iwai
2014-02-12 10:52 ` [PATCH 15/20] ALSA: spi: Use SNDRV_DEV_CARD for card objects Takashi Iwai
2014-02-12 10:52 ` [PATCH 16/20] HID: prodikeys: " Takashi Iwai
2014-02-12 10:52 ` [PATCH 17/20] staging: " Takashi Iwai
2014-02-12 10:52 ` [PATCH 18/20] usb: gadget: " Takashi Iwai
2014-02-12 10:52 ` [PATCH 19/20] ALSA: Use priority list for managing device list Takashi Iwai
2014-02-12 10:52 ` [PATCH 20/20] ALSA: Clean up snd_device_*() codes Takashi Iwai
2014-02-14 11:59 ` [PATCH RFC 00/20] snd_device_* cleanups Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1392202347-11774-3-git-send-email-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=alsa-devel@alsa-project.org \
    --subject='Re: [PATCH 02/20] ALSA: Add SNDRV_DEV_CARD type' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.