summaryrefslogtreecommitdiffstats
path: root/include/sound/minors.h
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2005-10-24 17:02:03 +0200
committerJaroslav Kysela <perex@suse.cz>2005-11-04 13:19:58 +0100
commit3939e7142da722324ab07d244a9736b0fa59c362 (patch)
tree015ebd5763d11cfd62e79f0e429a99968d0b8ddb /include/sound/minors.h
parentfc58422ad95a0f4936ead538e0b946aee5a4f98c (diff)
downloadlinux-3939e7142da722324ab07d244a9736b0fa59c362.tar.gz
linux-3939e7142da722324ab07d244a9736b0fa59c362.tar.bz2
linux-3939e7142da722324ab07d244a9736b0fa59c362.zip
[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>
Diffstat (limited to 'include/sound/minors.h')
-rw-r--r--include/sound/minors.h8
1 files changed, 3 insertions, 5 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 @@
#define SNDRV_MINOR(card, dev) (((card) << 5) | (dev))
#define SNDRV_MINOR_CONTROL 0 /* 0 - 0 */
-#define SNDRV_MINOR_SEQUENCER 1
-#define SNDRV_MINOR_TIMER (1+32)
+#define SNDRV_MINOR_GLOBAL 1 /* 1 */
+#define SNDRV_MINOR_SEQUENCER (SNDRV_MINOR_GLOBAL + 0 * 32)
+#define SNDRV_MINOR_TIMER (SNDRV_MINOR_GLOBAL + 1 * 32)
#define SNDRV_MINOR_HWDEP 4 /* 4 - 7 */
#define SNDRV_MINOR_HWDEPS 4
#define SNDRV_MINOR_RAWMIDI 8 /* 8 - 15 */
@@ -39,12 +40,9 @@
#define SNDRV_DEVICE_TYPE_CONTROL SNDRV_MINOR_CONTROL
#define SNDRV_DEVICE_TYPE_HWDEP SNDRV_MINOR_HWDEP
-#define SNDRV_DEVICE_TYPE_MIXER SNDRV_MINOR_MIXER
#define SNDRV_DEVICE_TYPE_RAWMIDI SNDRV_MINOR_RAWMIDI
#define SNDRV_DEVICE_TYPE_PCM_PLAYBACK SNDRV_MINOR_PCM_PLAYBACK
-#define SNDRV_DEVICE_TYPE_PCM_PLOOP SNDRV_MINOR_PCM_PLOOP
#define SNDRV_DEVICE_TYPE_PCM_CAPTURE SNDRV_MINOR_PCM_CAPTURE
-#define SNDRV_DEVICE_TYPE_PCM_CLOOP SNDRV_MINOR_PCM_CLOOP
#define SNDRV_DEVICE_TYPE_SEQUENCER SNDRV_MINOR_SEQUENCER
#define SNDRV_DEVICE_TYPE_TIMER SNDRV_MINOR_TIMER