vserver 1.9.5.x5

[linux-2.6.git] / include / sound / core.h

diff --git a/include/sound/core.h b/include/sound/core.h
index 8468522..c1e64ce 100644 (file)
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -49,6 +49,7 @@ struct sbus_dev;
 
 typedef enum {
        SNDRV_DEV_TOPLEVEL =            (0*SNDRV_DEV_TYPE_RANGE_SIZE),
+       SNDRV_DEV_CONTROL,
        SNDRV_DEV_LOWLEVEL_PRE,
        SNDRV_DEV_LOWLEVEL_NORMAL =     (1*SNDRV_DEV_TYPE_RANGE_SIZE),
        SNDRV_DEV_PCM,
@@ -57,6 +58,8 @@ typedef enum {
        SNDRV_DEV_SEQUENCER,
        SNDRV_DEV_HWDEP,
        SNDRV_DEV_INFO,
+       SNDRV_DEV_BUS,
+       SNDRV_DEV_CODEC,
        SNDRV_DEV_LOWLEVEL =            (2*SNDRV_DEV_TYPE_RANGE_SIZE)
 } snd_device_type_t;
 
@@ -147,6 +150,7 @@ struct _snd_card {
        struct rw_semaphore controls_rwsem;     /* controls list lock */
        rwlock_t ctl_files_rwlock;      /* ctl_files list lock */
        int controls_count;             /* count of all controls */
+       int user_ctl_count;             /* count of all user controls */
        struct list_head controls;      /* all controls for this card */
        struct list_head ctl_files;     /* active control files */
 
@@ -307,12 +311,11 @@ void snd_hidden_vfree(void *obj);
 #define vfree_nocheck(obj) vfree(obj)
 #endif
 char *snd_kmalloc_strdup(const char *string, int flags);
-int copy_to_user_fromio(void __user *dst, unsigned long src, size_t count);
-int copy_from_user_toio(unsigned long dst, const void __user *src, size_t count);
+int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size_t count);
+int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size_t count);
 
 /* init.c */
 
-extern int snd_cards_count;
 extern unsigned int snd_cards_lock;
 extern snd_card_t *snd_cards[SNDRV_CARDS];
 extern rwlock_t snd_card_rwlock;
@@ -417,7 +420,7 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...)
  */
 #define snd_assert(expr, args...) do {\
        if (unlikely(!(expr))) {                                \
-               snd_printk("BUG? (%s) (called from %p)\n", __ASTRING__(expr), __builtin_return_address(0));\
+               snd_printk(KERN_ERR "BUG? (%s) (called from %p)\n", __ASTRING__(expr), __builtin_return_address(0));\
                args;\
        }\
 } while (0)
@@ -433,7 +436,7 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...)
  */
 #define snd_runtime_check(expr, args...) do {\
        if (unlikely(!(expr))) {                                \
-               snd_printk("ERROR (%s) (called from %p)\n", __ASTRING__(expr), __builtin_return_address(0));\
+               snd_printk(KERN_ERR "ERROR (%s) (called from %p)\n", __ASTRING__(expr), __builtin_return_address(0));\
                args;\
        }\
 } while (0)