aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/info.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/sound/info.h')
-rw-r--r--include/sound/info.h94
1 files changed, 46 insertions, 48 deletions
diff --git a/include/sound/info.h b/include/sound/info.h
index 1d76bf3cb05e..df03e6017547 100644
--- a/include/sound/info.h
+++ b/include/sound/info.h
@@ -34,8 +34,6 @@ struct snd_info_buffer {
34 int error; /* error code */ 34 int error; /* error code */
35}; 35};
36 36
37typedef struct snd_info_buffer snd_info_buffer_t;
38
39#define SNDRV_INFO_CONTENT_TEXT 0 37#define SNDRV_INFO_CONTENT_TEXT 0
40#define SNDRV_INFO_CONTENT_DATA 1 38#define SNDRV_INFO_CONTENT_DATA 1
41 39
@@ -44,28 +42,28 @@ struct snd_info_entry;
44struct snd_info_entry_text { 42struct snd_info_entry_text {
45 unsigned long read_size; 43 unsigned long read_size;
46 unsigned long write_size; 44 unsigned long write_size;
47 void (*read) (snd_info_entry_t *entry, snd_info_buffer_t * buffer); 45 void (*read) (struct snd_info_entry *entry, struct snd_info_buffer *buffer);
48 void (*write) (snd_info_entry_t *entry, snd_info_buffer_t * buffer); 46 void (*write) (struct snd_info_entry *entry, struct snd_info_buffer *buffer);
49}; 47};
50 48
51struct snd_info_entry_ops { 49struct snd_info_entry_ops {
52 int (*open) (snd_info_entry_t *entry, 50 int (*open) (struct snd_info_entry *entry,
53 unsigned short mode, void **file_private_data); 51 unsigned short mode, void **file_private_data);
54 int (*release) (snd_info_entry_t * entry, 52 int (*release) (struct snd_info_entry * entry,
55 unsigned short mode, void *file_private_data); 53 unsigned short mode, void *file_private_data);
56 long (*read) (snd_info_entry_t *entry, void *file_private_data, 54 long (*read) (struct snd_info_entry *entry, void *file_private_data,
57 struct file * file, char __user *buf, 55 struct file * file, char __user *buf,
58 unsigned long count, unsigned long pos); 56 unsigned long count, unsigned long pos);
59 long (*write) (snd_info_entry_t *entry, void *file_private_data, 57 long (*write) (struct snd_info_entry *entry, void *file_private_data,
60 struct file * file, const char __user *buf, 58 struct file * file, const char __user *buf,
61 unsigned long count, unsigned long pos); 59 unsigned long count, unsigned long pos);
62 long long (*llseek) (snd_info_entry_t *entry, void *file_private_data, 60 long long (*llseek) (struct snd_info_entry *entry, void *file_private_data,
63 struct file * file, long long offset, int orig); 61 struct file * file, long long offset, int orig);
64 unsigned int (*poll) (snd_info_entry_t *entry, void *file_private_data, 62 unsigned int (*poll) (struct snd_info_entry *entry, void *file_private_data,
65 struct file * file, poll_table * wait); 63 struct file * file, poll_table * wait);
66 int (*ioctl) (snd_info_entry_t *entry, void *file_private_data, 64 int (*ioctl) (struct snd_info_entry *entry, void *file_private_data,
67 struct file * file, unsigned int cmd, unsigned long arg); 65 struct file * file, unsigned int cmd, unsigned long arg);
68 int (*mmap) (snd_info_entry_t *entry, void *file_private_data, 66 int (*mmap) (struct snd_info_entry *entry, void *file_private_data,
69 struct inode * inode, struct file * file, 67 struct inode * inode, struct file * file,
70 struct vm_area_struct * vma); 68 struct vm_area_struct * vma);
71}; 69};
@@ -80,20 +78,20 @@ struct snd_info_entry {
80 struct snd_info_entry_text text; 78 struct snd_info_entry_text text;
81 struct snd_info_entry_ops *ops; 79 struct snd_info_entry_ops *ops;
82 } c; 80 } c;
83 snd_info_entry_t *parent; 81 struct snd_info_entry *parent;
84 snd_card_t *card; 82 struct snd_card *card;
85 struct module *module; 83 struct module *module;
86 void *private_data; 84 void *private_data;
87 void (*private_free)(snd_info_entry_t *entry); 85 void (*private_free)(struct snd_info_entry *entry);
88 struct proc_dir_entry *p; 86 struct proc_dir_entry *p;
89 struct semaphore access; 87 struct semaphore access;
90}; 88};
91 89
92extern int snd_info_check_reserved_words(const char *str); 90int snd_info_check_reserved_words(const char *str);
93 91
94#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS) 92#if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS)
95extern int snd_info_minor_register(void); 93int snd_info_minor_register(void);
96extern int snd_info_minor_unregister(void); 94int snd_info_minor_unregister(void);
97#else 95#else
98#define snd_info_minor_register() /* NOP */ 96#define snd_info_minor_register() /* NOP */
99#define snd_info_minor_unregister() /* NOP */ 97#define snd_info_minor_unregister() /* NOP */
@@ -102,42 +100,42 @@ extern int snd_info_minor_unregister(void);
102 100
103#ifdef CONFIG_PROC_FS 101#ifdef CONFIG_PROC_FS
104 102
105extern snd_info_entry_t *snd_seq_root; 103extern struct snd_info_entry *snd_seq_root;
106#ifdef CONFIG_SND_OSSEMUL 104#ifdef CONFIG_SND_OSSEMUL
107extern snd_info_entry_t *snd_oss_root; 105extern struct snd_info_entry *snd_oss_root;
108#else 106#else
109#define snd_oss_root NULL 107#define snd_oss_root NULL
110#endif 108#endif
111 109
112int snd_iprintf(snd_info_buffer_t * buffer, char *fmt,...) __attribute__ ((format (printf, 2, 3))); 110int snd_iprintf(struct snd_info_buffer * buffer, char *fmt,...) __attribute__ ((format (printf, 2, 3)));
113int snd_info_init(void); 111int snd_info_init(void);
114int snd_info_done(void); 112int snd_info_done(void);
115 113
116int snd_info_get_line(snd_info_buffer_t * buffer, char *line, int len); 114int snd_info_get_line(struct snd_info_buffer * buffer, char *line, int len);
117char *snd_info_get_str(char *dest, char *src, int len); 115char *snd_info_get_str(char *dest, char *src, int len);
118snd_info_entry_t *snd_info_create_module_entry(struct module * module, 116struct snd_info_entry *snd_info_create_module_entry(struct module * module,
119 const char *name, 117 const char *name,
120 snd_info_entry_t * parent); 118 struct snd_info_entry * parent);
121snd_info_entry_t *snd_info_create_card_entry(snd_card_t * card, 119struct snd_info_entry *snd_info_create_card_entry(struct snd_card * card,
122 const char *name, 120 const char *name,
123 snd_info_entry_t * parent); 121 struct snd_info_entry * parent);
124void snd_info_free_entry(snd_info_entry_t * entry); 122void snd_info_free_entry(struct snd_info_entry * entry);
125int snd_info_store_text(snd_info_entry_t * entry); 123int snd_info_store_text(struct snd_info_entry * entry);
126int snd_info_restore_text(snd_info_entry_t * entry); 124int snd_info_restore_text(struct snd_info_entry * entry);
127 125
128int snd_info_card_create(snd_card_t * card); 126int snd_info_card_create(struct snd_card * card);
129int snd_info_card_register(snd_card_t * card); 127int snd_info_card_register(struct snd_card * card);
130int snd_info_card_free(snd_card_t * card); 128int snd_info_card_free(struct snd_card * card);
131int snd_info_register(snd_info_entry_t * entry); 129int snd_info_register(struct snd_info_entry * entry);
132int snd_info_unregister(snd_info_entry_t * entry); 130int snd_info_unregister(struct snd_info_entry * entry);
133 131
134/* for card drivers */ 132/* for card drivers */
135int snd_card_proc_new(snd_card_t *card, const char *name, snd_info_entry_t **entryp); 133int snd_card_proc_new(struct snd_card *card, const char *name, struct snd_info_entry **entryp);
136 134
137static inline void snd_info_set_text_ops(snd_info_entry_t *entry, 135static inline void snd_info_set_text_ops(struct snd_info_entry *entry,
138 void *private_data, 136 void *private_data,
139 long read_size, 137 long read_size,
140 void (*read)(snd_info_entry_t *, snd_info_buffer_t *)) 138 void (*read)(struct snd_info_entry *, struct snd_info_buffer *))
141{ 139{
142 entry->private_data = private_data; 140 entry->private_data = private_data;
143 entry->c.text.read_size = read_size; 141 entry->c.text.read_size = read_size;
@@ -150,21 +148,21 @@ static inline void snd_info_set_text_ops(snd_info_entry_t *entry,
150#define snd_seq_root NULL 148#define snd_seq_root NULL
151#define snd_oss_root NULL 149#define snd_oss_root NULL
152 150
153static inline int snd_iprintf(snd_info_buffer_t * buffer, char *fmt,...) { return 0; } 151static inline int snd_iprintf(struct snd_info_buffer * buffer, char *fmt,...) { return 0; }
154static inline int snd_info_init(void) { return 0; } 152static inline int snd_info_init(void) { return 0; }
155static inline int snd_info_done(void) { return 0; } 153static inline int snd_info_done(void) { return 0; }
156 154
157static inline int snd_info_get_line(snd_info_buffer_t * buffer, char *line, int len) { return 0; } 155static inline int snd_info_get_line(struct snd_info_buffer * buffer, char *line, int len) { return 0; }
158static inline char *snd_info_get_str(char *dest, char *src, int len) { return NULL; } 156static inline char *snd_info_get_str(char *dest, char *src, int len) { return NULL; }
159static inline snd_info_entry_t *snd_info_create_module_entry(struct module * module, const char *name, snd_info_entry_t * parent) { return NULL; } 157static inline struct snd_info_entry *snd_info_create_module_entry(struct module * module, const char *name, struct snd_info_entry * parent) { return NULL; }
160static inline snd_info_entry_t *snd_info_create_card_entry(snd_card_t * card, const char *name, snd_info_entry_t * parent) { return NULL; } 158static inline struct snd_info_entry *snd_info_create_card_entry(struct snd_card * card, const char *name, struct snd_info_entry * parent) { return NULL; }
161static inline void snd_info_free_entry(snd_info_entry_t * entry) { ; } 159static inline void snd_info_free_entry(struct snd_info_entry * entry) { ; }
162 160
163static inline int snd_info_card_create(snd_card_t * card) { return 0; } 161static inline int snd_info_card_create(struct snd_card * card) { return 0; }
164static inline int snd_info_card_register(snd_card_t * card) { return 0; } 162static inline int snd_info_card_register(struct snd_card * card) { return 0; }
165static inline int snd_info_card_free(snd_card_t * card) { return 0; } 163static inline int snd_info_card_free(struct snd_card * card) { return 0; }
166static inline int snd_info_register(snd_info_entry_t * entry) { return 0; } 164static inline int snd_info_register(struct snd_info_entry * entry) { return 0; }
167static inline int snd_info_unregister(snd_info_entry_t * entry) { return 0; } 165static inline int snd_info_unregister(struct snd_info_entry * entry) { return 0; }
168 166
169#define snd_card_proc_new(card,name,entryp) 0 /* always success */ 167#define snd_card_proc_new(card,name,entryp) 0 /* always success */
170#define snd_info_set_text_ops(entry,private_data,read_size,read) /*NOP*/ 168#define snd_info_set_text_ops(entry,private_data,read_size,read) /*NOP*/
@@ -185,7 +183,7 @@ static inline int snd_info_unregister(snd_info_entry_t * entry) { return 0; }
185 183
186#define SNDRV_OSS_INFO_DEV_COUNT 6 184#define SNDRV_OSS_INFO_DEV_COUNT 6
187 185
188extern int snd_oss_info_register(int dev, int num, char *string); 186int snd_oss_info_register(int dev, int num, char *string);
189#define snd_oss_info_unregister(dev, num) snd_oss_info_register(dev, num, NULL) 187#define snd_oss_info_unregister(dev, num) snd_oss_info_register(dev, num, NULL)
190 188
191#endif /* CONFIG_SND_OSSEMUL && CONFIG_PROC_FS */ 189#endif /* CONFIG_SND_OSSEMUL && CONFIG_PROC_FS */