aboutsummaryrefslogtreecommitdiff
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-01-29 15:53:35 +0100
committerTakashi Iwai <tiwai@suse.de>2014-02-25 12:12:51 +0100
commit289ca025ee1d78223e3368801fc2b984e5efbfc7 (patch)
tree0fbd1be93a83c459e7c053d4959fe149ec3f1785 /include/sound
parent71e2e1c147e653ee4e861b8b5dc0ae5c394870d2 (diff)
ALSA: Use priority list for managing device list
Basically, the device type specifies the priority of the device to be registered / freed, too. However, the priority value isn't well utilized but only it's checked as a group. This results in inconsistent register and free order (where each of them should be in reversed direction). This patch simplifies the device list management code by simply inserting a list entry at creation time in an incremental order for the priority value. Since we can just follow the link for register, disconnect and free calls, we don't have to specify the group; so the whole enum definitions are also simplified as well. The visible change to outside is that the priorities of some object types are revisited. For example, now the SNDRV_DEV_LOWLEVEL object is registered before others (control, PCM, etc) and, in return, released after others. Similarly, SNDRV_DEV_CODEC is in a lower priority than SNDRV_DEV_BUS for ensuring the dependency. Also, the unused SNDRV_DEV_TOPLEVEL, SNDRV_DEV_LOWLEVEL_PRE and SNDRV_DEV_LOWLEVEL_NORMAL are removed as a cleanup. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/core.h28
1 files changed, 10 insertions, 18 deletions
diff --git a/include/sound/core.h b/include/sound/core.h
index 9c118733419..f1e41f4b067 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -46,24 +46,22 @@ struct completion;
/* device allocation stuff */
-#define SNDRV_DEV_TYPE_RANGE_SIZE 0x1000
-
+/* type of the object used in snd_device_*()
+ * this also defines the calling order
+ */
enum snd_device_type {
- SNDRV_DEV_TOPLEVEL = 0,
- SNDRV_DEV_CONTROL = 1,
- SNDRV_DEV_LOWLEVEL_PRE = 2,
- SNDRV_DEV_LOWLEVEL_NORMAL = 0x1000,
+ SNDRV_DEV_LOWLEVEL,
+ SNDRV_DEV_CONTROL,
+ SNDRV_DEV_INFO,
+ SNDRV_DEV_BUS,
+ SNDRV_DEV_CODEC,
SNDRV_DEV_PCM,
+ SNDRV_DEV_COMPRESS,
SNDRV_DEV_RAWMIDI,
SNDRV_DEV_TIMER,
SNDRV_DEV_SEQUENCER,
SNDRV_DEV_HWDEP,
- SNDRV_DEV_INFO,
- SNDRV_DEV_BUS,
- SNDRV_DEV_CODEC,
SNDRV_DEV_JACK,
- SNDRV_DEV_COMPRESS,
- SNDRV_DEV_LOWLEVEL = 0x2000,
};
enum snd_device_state {
@@ -72,12 +70,6 @@ enum snd_device_state {
SNDRV_DEV_DISCONNECTED,
};
-enum snd_device_cmd {
- SNDRV_DEV_CMD_PRE,
- SNDRV_DEV_CMD_NORMAL,
- SNDRV_DEV_CMD_POST,
-};
-
struct snd_device;
struct snd_device_ops {
@@ -320,7 +312,7 @@ int snd_device_register_all(struct snd_card *card);
int snd_device_disconnect(struct snd_card *card, void *device_data);
int snd_device_disconnect_all(struct snd_card *card);
int snd_device_free(struct snd_card *card, void *device_data);
-int snd_device_free_all(struct snd_card *card, enum snd_device_cmd cmd);
+int snd_device_free_all(struct snd_card *card);
/* isadma.c */