diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2005-10-24 11:02:03 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2005-11-04 07:19:58 -0500 |
commit | 3939e7142da722324ab07d244a9736b0fa59c362 (patch) | |
tree | 015ebd5763d11cfd62e79f0e429a99968d0b8ddb | |
parent | fc58422ad95a0f4936ead538e0b946aee5a4f98c (diff) |
[ALSA] clean up device types symbols
Modules: ALSA Core,ALSA Minor Numbers
Remove the unused and undefined symbols SNDRV_DEVICE_TYPE_{MIXER,
PCM_PLOOP,PCM_CLOOP}, and introduce a new symbol SNDRV_MINOR_GLOBAL
for non-card-specific devices like the sequencer or the timer.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
-rw-r--r-- | include/sound/minors.h | 8 | ||||
-rw-r--r-- | sound/core/sound.c | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/include/sound/minors.h b/include/sound/minors.h index b7b0d8309449..a17b5c9961bb 100644 --- a/include/sound/minors.h +++ b/include/sound/minors.h | |||
@@ -27,8 +27,9 @@ | |||
27 | #define SNDRV_MINOR(card, dev) (((card) << 5) | (dev)) | 27 | #define SNDRV_MINOR(card, dev) (((card) << 5) | (dev)) |
28 | 28 | ||
29 | #define SNDRV_MINOR_CONTROL 0 /* 0 - 0 */ | 29 | #define SNDRV_MINOR_CONTROL 0 /* 0 - 0 */ |
30 | #define SNDRV_MINOR_SEQUENCER 1 | 30 | #define SNDRV_MINOR_GLOBAL 1 /* 1 */ |
31 | #define SNDRV_MINOR_TIMER (1+32) | 31 | #define SNDRV_MINOR_SEQUENCER (SNDRV_MINOR_GLOBAL + 0 * 32) |
32 | #define SNDRV_MINOR_TIMER (SNDRV_MINOR_GLOBAL + 1 * 32) | ||
32 | #define SNDRV_MINOR_HWDEP 4 /* 4 - 7 */ | 33 | #define SNDRV_MINOR_HWDEP 4 /* 4 - 7 */ |
33 | #define SNDRV_MINOR_HWDEPS 4 | 34 | #define SNDRV_MINOR_HWDEPS 4 |
34 | #define SNDRV_MINOR_RAWMIDI 8 /* 8 - 15 */ | 35 | #define SNDRV_MINOR_RAWMIDI 8 /* 8 - 15 */ |
@@ -39,12 +40,9 @@ | |||
39 | 40 | ||
40 | #define SNDRV_DEVICE_TYPE_CONTROL SNDRV_MINOR_CONTROL | 41 | #define SNDRV_DEVICE_TYPE_CONTROL SNDRV_MINOR_CONTROL |
41 | #define SNDRV_DEVICE_TYPE_HWDEP SNDRV_MINOR_HWDEP | 42 | #define SNDRV_DEVICE_TYPE_HWDEP SNDRV_MINOR_HWDEP |
42 | #define SNDRV_DEVICE_TYPE_MIXER SNDRV_MINOR_MIXER | ||
43 | #define SNDRV_DEVICE_TYPE_RAWMIDI SNDRV_MINOR_RAWMIDI | 43 | #define SNDRV_DEVICE_TYPE_RAWMIDI SNDRV_MINOR_RAWMIDI |
44 | #define SNDRV_DEVICE_TYPE_PCM_PLAYBACK SNDRV_MINOR_PCM_PLAYBACK | 44 | #define SNDRV_DEVICE_TYPE_PCM_PLAYBACK SNDRV_MINOR_PCM_PLAYBACK |
45 | #define SNDRV_DEVICE_TYPE_PCM_PLOOP SNDRV_MINOR_PCM_PLOOP | ||
46 | #define SNDRV_DEVICE_TYPE_PCM_CAPTURE SNDRV_MINOR_PCM_CAPTURE | 45 | #define SNDRV_DEVICE_TYPE_PCM_CAPTURE SNDRV_MINOR_PCM_CAPTURE |
47 | #define SNDRV_DEVICE_TYPE_PCM_CLOOP SNDRV_MINOR_PCM_CLOOP | ||
48 | #define SNDRV_DEVICE_TYPE_SEQUENCER SNDRV_MINOR_SEQUENCER | 46 | #define SNDRV_DEVICE_TYPE_SEQUENCER SNDRV_MINOR_SEQUENCER |
49 | #define SNDRV_DEVICE_TYPE_TIMER SNDRV_MINOR_TIMER | 47 | #define SNDRV_DEVICE_TYPE_TIMER SNDRV_MINOR_TIMER |
50 | 48 | ||
diff --git a/sound/core/sound.c b/sound/core/sound.c index dee602245fe8..1139dd8ca8eb 100644 --- a/sound/core/sound.c +++ b/sound/core/sound.c | |||
@@ -130,7 +130,7 @@ static int snd_open(struct inode *inode, struct file *file) | |||
130 | struct file_operations *old_fops; | 130 | struct file_operations *old_fops; |
131 | int err = 0; | 131 | int err = 0; |
132 | 132 | ||
133 | if (dev != SNDRV_MINOR_SEQUENCER && dev != SNDRV_MINOR_TIMER) { | 133 | if (dev != SNDRV_MINOR_GLOBAL) { |
134 | if (snd_cards[card] == NULL) { | 134 | if (snd_cards[card] == NULL) { |
135 | #ifdef CONFIG_KMOD | 135 | #ifdef CONFIG_KMOD |
136 | snd_request_card(card); | 136 | snd_request_card(card); |
@@ -287,7 +287,7 @@ static void snd_minor_info_read(snd_info_entry_t *entry, snd_info_buffer_t * buf | |||
287 | for (card = 0; card < SNDRV_CARDS; card++) { | 287 | for (card = 0; card < SNDRV_CARDS; card++) { |
288 | list_for_each(list, &snd_minors_hash[card]) { | 288 | list_for_each(list, &snd_minors_hash[card]) { |
289 | mptr = list_entry(list, snd_minor_t, list); | 289 | mptr = list_entry(list, snd_minor_t, list); |
290 | if (SNDRV_MINOR_DEVICE(mptr->number) != SNDRV_MINOR_SEQUENCER) { | 290 | if (SNDRV_MINOR_DEVICE(mptr->number) != SNDRV_MINOR_GLOBAL) { |
291 | if ((device = mptr->device) >= 0) | 291 | if ((device = mptr->device) >= 0) |
292 | snd_iprintf(buffer, "%3i: [%i-%2i]: %s\n", mptr->number, card, device, mptr->comment); | 292 | snd_iprintf(buffer, "%3i: [%i-%2i]: %s\n", mptr->number, card, device, mptr->comment); |
293 | else | 293 | else |