ChangeSet 1.2181.25.29, 2005/03/22 09:13:58+01:00, [EMAIL PROTECTED]
[ALSA] add HPET support
Timer Midlevel,ALSA Core
add a wrapper for the HPET driver
Signed-off-by: Clemens Ladisch <[EMAIL PROTECTED]>
include/sound/asound.h | 1 +
sound/core/timer.c | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff -Nru a/include/sound/asound.h b/include/sound/asound.h
--- a/include/sound/asound.h 2005-03-30 16:15:22 -08:00
+++ b/include/sound/asound.h 2005-03-30 16:15:22 -08:00
@@ -582,6 +582,7 @@
/* global timers (device member) */
#define SNDRV_TIMER_GLOBAL_SYSTEM 0
#define SNDRV_TIMER_GLOBAL_RTC 1
+#define SNDRV_TIMER_GLOBAL_HPET 2
/* info flags */
#define SNDRV_TIMER_FLG_SLAVE (1<<0) /* cannot be controlled */
diff -Nru a/sound/core/timer.c b/sound/core/timer.c
--- a/sound/core/timer.c 2005-03-30 16:15:22 -08:00
+++ b/sound/core/timer.c 2005-03-30 16:15:22 -08:00
@@ -37,10 +37,12 @@
#include <linux/kerneld.h>
#endif
-#if !defined(CONFIG_SND_RTCTIMER) && !defined(CONFIG_SND_RTCTIMER_MODULE)
-#define DEFAULT_TIMER_LIMIT 1
-#else
+#if defined(CONFIG_SND_HPET) || defined(CONFIG_SND_HPET_MODULE)
+#define DEFAULT_TIMER_LIMIT 3
+#elif defined(CONFIG_SND_RTCTIMER) || defined(CONFIG_SND_RTCTIMER_MODULE)
#define DEFAULT_TIMER_LIMIT 2
+#else
+#define DEFAULT_TIMER_LIMIT 1
#endif
static int timer_limit = DEFAULT_TIMER_LIMIT;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html