Auto-update from upstream

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

diff --git a/include/sound/core.h b/include/sound/core.h
index f00b9c9b567f05e80b10a6585a18c49bf32821e0..90ac6132ea3bced84ced0246e9af8a274313036e 100644 (file)
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -183,11 +183,11 @@ static inline int snd_power_wait(struct snd_card *card, unsigned int state, stru
 #endif /* CONFIG_PM */
 
 struct snd_minor {
-       struct list_head list;          /* list of all minors per card */
-       int number;                     /* minor number */
+       int type;                       /* SNDRV_DEVICE_TYPE_XXX */
+       int card;                       /* card number */
        int device;                     /* device number */
-       const char *comment;            /* for /proc/asound/devices */
        struct file_operations *f_ops;  /* file operations */
+       void *private_data;             /* private data for f_ops->open */
        char name[0];                   /* device name (keep at the end of
                                                                structure) */
 };
@@ -199,12 +199,18 @@ extern int snd_ecards_limit;
 
 void snd_request_card(int card);
 
-int snd_register_device(int type, struct snd_card *card, int dev, struct snd_minor *reg, const char *name);
+int snd_register_device(int type, struct snd_card *card, int dev,
+                       struct file_operations *f_ops, void *private_data,
+                       const char *name);
 int snd_unregister_device(int type, struct snd_card *card, int dev);
+void *snd_lookup_minor_data(unsigned int minor, int type);
 
 #ifdef CONFIG_SND_OSSEMUL
-int snd_register_oss_device(int type, struct snd_card *card, int dev, struct snd_minor *reg, const char *name);
+int snd_register_oss_device(int type, struct snd_card *card, int dev,
+                           struct file_operations *f_ops, void *private_data,
+                           const char *name);
 int snd_unregister_oss_device(int type, struct snd_card *card, int dev);
+void *snd_lookup_oss_minor_data(unsigned int minor, int type);
 #endif
 
 int snd_minor_info_init(void);
@@ -215,11 +221,9 @@ int snd_minor_info_done(void);
 #ifdef CONFIG_SND_OSSEMUL
 int snd_minor_info_oss_init(void);
 int snd_minor_info_oss_done(void);
-int snd_oss_init_module(void);
 #else
 #define snd_minor_info_oss_init() /*NOP*/
 #define snd_minor_info_oss_done() /*NOP*/
-#define snd_oss_init_module() 0
 #endif
 
 /* memory.c */