diff options
Diffstat (limited to 'include/sound/info.h')
-rw-r--r-- | include/sound/info.h | 94 |
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 | ||
37 | typedef 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; | |||
44 | struct snd_info_entry_text { | 42 | struct 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 | ||
51 | struct snd_info_entry_ops { | 49 | struct 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 | ||
92 | extern int snd_info_check_reserved_words(const char *str); | 90 | int 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) |
95 | extern int snd_info_minor_register(void); | 93 | int snd_info_minor_register(void); |
96 | extern int snd_info_minor_unregister(void); | 94 | int 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 | ||
105 | extern snd_info_entry_t *snd_seq_root; | 103 | extern struct snd_info_entry *snd_seq_root; |
106 | #ifdef CONFIG_SND_OSSEMUL | 104 | #ifdef CONFIG_SND_OSSEMUL |
107 | extern snd_info_entry_t *snd_oss_root; | 105 | extern 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 | ||
112 | int snd_iprintf(snd_info_buffer_t * buffer, char *fmt,...) __attribute__ ((format (printf, 2, 3))); | 110 | int snd_iprintf(struct snd_info_buffer * buffer, char *fmt,...) __attribute__ ((format (printf, 2, 3))); |
113 | int snd_info_init(void); | 111 | int snd_info_init(void); |
114 | int snd_info_done(void); | 112 | int snd_info_done(void); |
115 | 113 | ||
116 | int snd_info_get_line(snd_info_buffer_t * buffer, char *line, int len); | 114 | int snd_info_get_line(struct snd_info_buffer * buffer, char *line, int len); |
117 | char *snd_info_get_str(char *dest, char *src, int len); | 115 | char *snd_info_get_str(char *dest, char *src, int len); |
118 | snd_info_entry_t *snd_info_create_module_entry(struct module * module, | 116 | struct 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); |
121 | snd_info_entry_t *snd_info_create_card_entry(snd_card_t * card, | 119 | struct 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); |
124 | void snd_info_free_entry(snd_info_entry_t * entry); | 122 | void snd_info_free_entry(struct snd_info_entry * entry); |
125 | int snd_info_store_text(snd_info_entry_t * entry); | 123 | int snd_info_store_text(struct snd_info_entry * entry); |
126 | int snd_info_restore_text(snd_info_entry_t * entry); | 124 | int snd_info_restore_text(struct snd_info_entry * entry); |
127 | 125 | ||
128 | int snd_info_card_create(snd_card_t * card); | 126 | int snd_info_card_create(struct snd_card * card); |
129 | int snd_info_card_register(snd_card_t * card); | 127 | int snd_info_card_register(struct snd_card * card); |
130 | int snd_info_card_free(snd_card_t * card); | 128 | int snd_info_card_free(struct snd_card * card); |
131 | int snd_info_register(snd_info_entry_t * entry); | 129 | int snd_info_register(struct snd_info_entry * entry); |
132 | int snd_info_unregister(snd_info_entry_t * entry); | 130 | int snd_info_unregister(struct snd_info_entry * entry); |
133 | 131 | ||
134 | /* for card drivers */ | 132 | /* for card drivers */ |
135 | int snd_card_proc_new(snd_card_t *card, const char *name, snd_info_entry_t **entryp); | 133 | int snd_card_proc_new(struct snd_card *card, const char *name, struct snd_info_entry **entryp); |
136 | 134 | ||
137 | static inline void snd_info_set_text_ops(snd_info_entry_t *entry, | 135 | static 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 | ||
153 | static inline int snd_iprintf(snd_info_buffer_t * buffer, char *fmt,...) { return 0; } | 151 | static inline int snd_iprintf(struct snd_info_buffer * buffer, char *fmt,...) { return 0; } |
154 | static inline int snd_info_init(void) { return 0; } | 152 | static inline int snd_info_init(void) { return 0; } |
155 | static inline int snd_info_done(void) { return 0; } | 153 | static inline int snd_info_done(void) { return 0; } |
156 | 154 | ||
157 | static inline int snd_info_get_line(snd_info_buffer_t * buffer, char *line, int len) { return 0; } | 155 | static inline int snd_info_get_line(struct snd_info_buffer * buffer, char *line, int len) { return 0; } |
158 | static inline char *snd_info_get_str(char *dest, char *src, int len) { return NULL; } | 156 | static inline char *snd_info_get_str(char *dest, char *src, int len) { return NULL; } |
159 | static inline snd_info_entry_t *snd_info_create_module_entry(struct module * module, const char *name, snd_info_entry_t * parent) { return NULL; } | 157 | static inline struct snd_info_entry *snd_info_create_module_entry(struct module * module, const char *name, struct snd_info_entry * parent) { return NULL; } |
160 | static inline snd_info_entry_t *snd_info_create_card_entry(snd_card_t * card, const char *name, snd_info_entry_t * parent) { return NULL; } | 158 | static inline struct snd_info_entry *snd_info_create_card_entry(struct snd_card * card, const char *name, struct snd_info_entry * parent) { return NULL; } |
161 | static inline void snd_info_free_entry(snd_info_entry_t * entry) { ; } | 159 | static inline void snd_info_free_entry(struct snd_info_entry * entry) { ; } |
162 | 160 | ||
163 | static inline int snd_info_card_create(snd_card_t * card) { return 0; } | 161 | static inline int snd_info_card_create(struct snd_card * card) { return 0; } |
164 | static inline int snd_info_card_register(snd_card_t * card) { return 0; } | 162 | static inline int snd_info_card_register(struct snd_card * card) { return 0; } |
165 | static inline int snd_info_card_free(snd_card_t * card) { return 0; } | 163 | static inline int snd_info_card_free(struct snd_card * card) { return 0; } |
166 | static inline int snd_info_register(snd_info_entry_t * entry) { return 0; } | 164 | static inline int snd_info_register(struct snd_info_entry * entry) { return 0; } |
167 | static inline int snd_info_unregister(snd_info_entry_t * entry) { return 0; } | 165 | static 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 | ||
188 | extern int snd_oss_info_register(int dev, int num, char *string); | 186 | int 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 */ |