aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/core/info_oss.c11
-rw-r--r--sound/core/sound_oss.c30
2 files changed, 22 insertions, 19 deletions
diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c
index 12107968d40..820f4772e44 100644
--- a/sound/core/info_oss.c
+++ b/sound/core/info_oss.c
@@ -37,7 +37,7 @@
37 37
38static DECLARE_MUTEX(strings); 38static DECLARE_MUTEX(strings);
39static char *snd_sndstat_strings[SNDRV_CARDS][SNDRV_OSS_INFO_DEV_COUNT]; 39static char *snd_sndstat_strings[SNDRV_CARDS][SNDRV_OSS_INFO_DEV_COUNT];
40static snd_info_entry_t *snd_sndstat_proc_entry; 40static struct snd_info_entry *snd_sndstat_proc_entry;
41 41
42int snd_oss_info_register(int dev, int num, char *string) 42int snd_oss_info_register(int dev, int num, char *string)
43{ 43{
@@ -63,9 +63,9 @@ int snd_oss_info_register(int dev, int num, char *string)
63 return 0; 63 return 0;
64} 64}
65 65
66extern void snd_card_info_read_oss(snd_info_buffer_t * buffer); 66extern void snd_card_info_read_oss(struct snd_info_buffer *buffer);
67 67
68static int snd_sndstat_show_strings(snd_info_buffer_t * buf, char *id, int dev) 68static int snd_sndstat_show_strings(struct snd_info_buffer *buf, char *id, int dev)
69{ 69{
70 int idx, ok = -1; 70 int idx, ok = -1;
71 char *str; 71 char *str;
@@ -88,7 +88,8 @@ static int snd_sndstat_show_strings(snd_info_buffer_t * buf, char *id, int dev)
88 return ok; 88 return ok;
89} 89}
90 90
91static void snd_sndstat_proc_read(snd_info_entry_t *entry, snd_info_buffer_t * buffer) 91static void snd_sndstat_proc_read(struct snd_info_entry *entry,
92 struct snd_info_buffer *buffer)
92{ 93{
93 snd_iprintf(buffer, "Sound Driver:3.8.1a-980706 (ALSA v" CONFIG_SND_VERSION " emulation code)\n"); 94 snd_iprintf(buffer, "Sound Driver:3.8.1a-980706 (ALSA v" CONFIG_SND_VERSION " emulation code)\n");
94 snd_iprintf(buffer, "Kernel: %s %s %s %s %s\n", 95 snd_iprintf(buffer, "Kernel: %s %s %s %s %s\n",
@@ -111,7 +112,7 @@ static void snd_sndstat_proc_read(snd_info_entry_t *entry, snd_info_buffer_t * b
111 112
112int snd_info_minor_register(void) 113int snd_info_minor_register(void)
113{ 114{
114 snd_info_entry_t *entry; 115 struct snd_info_entry *entry;
115 116
116 memset(snd_sndstat_strings, 0, sizeof(snd_sndstat_strings)); 117 memset(snd_sndstat_strings, 0, sizeof(snd_sndstat_strings));
117 if ((entry = snd_info_create_module_entry(THIS_MODULE, "sndstat", snd_oss_root)) != NULL) { 118 if ((entry = snd_info_create_module_entry(THIS_MODULE, "sndstat", snd_oss_root)) != NULL) {
diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c
index e401c670329..ec37604ffb6 100644
--- a/sound/core/sound_oss.c
+++ b/sound/core/sound_oss.c
@@ -41,20 +41,20 @@ static struct list_head snd_oss_minors_hash[SNDRV_CARDS];
41 41
42static DECLARE_MUTEX(sound_oss_mutex); 42static DECLARE_MUTEX(sound_oss_mutex);
43 43
44static snd_minor_t *snd_oss_minor_search(int minor) 44static struct snd_minor *snd_oss_minor_search(int minor)
45{ 45{
46 struct list_head *list; 46 struct list_head *list;
47 snd_minor_t *mptr; 47 struct snd_minor *mptr;
48 48
49 list_for_each(list, &snd_oss_minors_hash[SNDRV_MINOR_OSS_CARD(minor)]) { 49 list_for_each(list, &snd_oss_minors_hash[SNDRV_MINOR_OSS_CARD(minor)]) {
50 mptr = list_entry(list, snd_minor_t, list); 50 mptr = list_entry(list, struct snd_minor, list);
51 if (mptr->number == minor) 51 if (mptr->number == minor)
52 return mptr; 52 return mptr;
53 } 53 }
54 return NULL; 54 return NULL;
55} 55}
56 56
57static int snd_oss_kernel_minor(int type, snd_card_t * card, int dev) 57static int snd_oss_kernel_minor(int type, struct snd_card *card, int dev)
58{ 58{
59 int minor; 59 int minor;
60 60
@@ -90,11 +90,12 @@ static int snd_oss_kernel_minor(int type, snd_card_t * card, int dev)
90 return minor; 90 return minor;
91} 91}
92 92
93int snd_register_oss_device(int type, snd_card_t * card, int dev, snd_minor_t * reg, const char *name) 93int snd_register_oss_device(int type, struct snd_card *card, int dev,
94 struct snd_minor * reg, const char *name)
94{ 95{
95 int minor = snd_oss_kernel_minor(type, card, dev); 96 int minor = snd_oss_kernel_minor(type, card, dev);
96 int minor_unit; 97 int minor_unit;
97 snd_minor_t *preg; 98 struct snd_minor *preg;
98 int cidx = SNDRV_MINOR_OSS_CARD(minor); 99 int cidx = SNDRV_MINOR_OSS_CARD(minor);
99 int track2 = -1; 100 int track2 = -1;
100 int register1 = -1, register2 = -1; 101 int register1 = -1, register2 = -1;
@@ -102,7 +103,7 @@ int snd_register_oss_device(int type, snd_card_t * card, int dev, snd_minor_t *
102 103
103 if (minor < 0) 104 if (minor < 0)
104 return minor; 105 return minor;
105 preg = (snd_minor_t *)kmalloc(sizeof(snd_minor_t), GFP_KERNEL); 106 preg = (struct snd_minor *)kmalloc(sizeof(struct snd_minor), GFP_KERNEL);
106 if (preg == NULL) 107 if (preg == NULL)
107 return -ENOMEM; 108 return -ENOMEM;
108 *preg = *reg; 109 *preg = *reg;
@@ -146,12 +147,12 @@ int snd_register_oss_device(int type, snd_card_t * card, int dev, snd_minor_t *
146 return -EBUSY; 147 return -EBUSY;
147} 148}
148 149
149int snd_unregister_oss_device(int type, snd_card_t * card, int dev) 150int snd_unregister_oss_device(int type, struct snd_card *card, int dev)
150{ 151{
151 int minor = snd_oss_kernel_minor(type, card, dev); 152 int minor = snd_oss_kernel_minor(type, card, dev);
152 int cidx = SNDRV_MINOR_OSS_CARD(minor); 153 int cidx = SNDRV_MINOR_OSS_CARD(minor);
153 int track2 = -1; 154 int track2 = -1;
154 snd_minor_t *mptr; 155 struct snd_minor *mptr;
155 156
156 if (minor < 0) 157 if (minor < 0)
157 return minor; 158 return minor;
@@ -187,18 +188,19 @@ int snd_unregister_oss_device(int type, snd_card_t * card, int dev)
187 188
188#ifdef CONFIG_PROC_FS 189#ifdef CONFIG_PROC_FS
189 190
190static snd_info_entry_t *snd_minor_info_oss_entry = NULL; 191static struct snd_info_entry *snd_minor_info_oss_entry = NULL;
191 192
192static void snd_minor_info_oss_read(snd_info_entry_t *entry, snd_info_buffer_t * buffer) 193static void snd_minor_info_oss_read(struct snd_info_entry *entry,
194 struct snd_info_buffer *buffer)
193{ 195{
194 int card, dev; 196 int card, dev;
195 struct list_head *list; 197 struct list_head *list;
196 snd_minor_t *mptr; 198 struct snd_minor *mptr;
197 199
198 down(&sound_oss_mutex); 200 down(&sound_oss_mutex);
199 for (card = 0; card < SNDRV_CARDS; card++) { 201 for (card = 0; card < SNDRV_CARDS; card++) {
200 list_for_each(list, &snd_oss_minors_hash[card]) { 202 list_for_each(list, &snd_oss_minors_hash[card]) {
201 mptr = list_entry(list, snd_minor_t, list); 203 mptr = list_entry(list, struct snd_minor, list);
202 dev = SNDRV_MINOR_OSS_DEVICE(mptr->number); 204 dev = SNDRV_MINOR_OSS_DEVICE(mptr->number);
203 if (dev != SNDRV_MINOR_OSS_SNDSTAT && 205 if (dev != SNDRV_MINOR_OSS_SNDSTAT &&
204 dev != SNDRV_MINOR_OSS_SEQUENCER && 206 dev != SNDRV_MINOR_OSS_SEQUENCER &&
@@ -216,7 +218,7 @@ static void snd_minor_info_oss_read(snd_info_entry_t *entry, snd_info_buffer_t *
216int __init snd_minor_info_oss_init(void) 218int __init snd_minor_info_oss_init(void)
217{ 219{
218#ifdef CONFIG_PROC_FS 220#ifdef CONFIG_PROC_FS
219 snd_info_entry_t *entry; 221 struct snd_info_entry *entry;
220 222
221 entry = snd_info_create_module_entry(THIS_MODULE, "devices", snd_oss_root); 223 entry = snd_info_create_module_entry(THIS_MODULE, "devices", snd_oss_root);
222 if (entry) { 224 if (entry) {