aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/sound/snd_wavefront.h20
-rw-r--r--sound/isa/wavefront/wavefront.c38
-rw-r--r--sound/isa/wavefront/wavefront_fx.c8
-rw-r--r--sound/isa/wavefront/wavefront_midi.c22
-rw-r--r--sound/isa/wavefront/wavefront_synth.c24
5 files changed, 56 insertions, 56 deletions
diff --git a/include/sound/snd_wavefront.h b/include/sound/snd_wavefront.h
index 4b0b2b9370b9..0b9e5de94ff1 100644
--- a/include/sound/snd_wavefront.h
+++ b/include/sound/snd_wavefront.h
@@ -26,8 +26,8 @@ struct _snd_wavefront_midi {
26 snd_wavefront_mpu_id output_mpu; /* most-recently-used */ 26 snd_wavefront_mpu_id output_mpu; /* most-recently-used */
27 snd_wavefront_mpu_id input_mpu; /* most-recently-used */ 27 snd_wavefront_mpu_id input_mpu; /* most-recently-used */
28 unsigned int mode[2]; /* MPU401_MODE_XXX */ 28 unsigned int mode[2]; /* MPU401_MODE_XXX */
29 snd_rawmidi_substream_t *substream_output[2]; 29 struct snd_rawmidi_substream *substream_output[2];
30 snd_rawmidi_substream_t *substream_input[2]; 30 struct snd_rawmidi_substream *substream_input[2];
31 struct timer_list timer; 31 struct timer_list timer;
32 spinlock_t open; 32 spinlock_t open;
33 spinlock_t virtual; /* protects isvirtual */ 33 spinlock_t virtual; /* protects isvirtual */
@@ -38,8 +38,8 @@ struct _snd_wavefront_midi {
38#define MPU_ACK 0xFE 38#define MPU_ACK 0xFE
39#define UART_MODE_ON 0x3F 39#define UART_MODE_ON 0x3F
40 40
41extern snd_rawmidi_ops_t snd_wavefront_midi_output; 41extern struct snd_rawmidi_ops snd_wavefront_midi_output;
42extern snd_rawmidi_ops_t snd_wavefront_midi_input; 42extern struct snd_rawmidi_ops snd_wavefront_midi_input;
43 43
44extern void snd_wavefront_midi_enable_virtual (snd_wavefront_card_t *); 44extern void snd_wavefront_midi_enable_virtual (snd_wavefront_card_t *);
45extern void snd_wavefront_midi_disable_virtual (snd_wavefront_card_t *); 45extern void snd_wavefront_midi_disable_virtual (snd_wavefront_card_t *);
@@ -116,23 +116,23 @@ extern int snd_wavefront_config_midi (snd_wavefront_t *dev) ;
116extern int snd_wavefront_cmd (snd_wavefront_t *, int, unsigned char *, 116extern int snd_wavefront_cmd (snd_wavefront_t *, int, unsigned char *,
117 unsigned char *); 117 unsigned char *);
118 118
119extern int snd_wavefront_synth_ioctl (snd_hwdep_t *, 119extern int snd_wavefront_synth_ioctl (struct snd_hwdep *,
120 struct file *, 120 struct file *,
121 unsigned int cmd, 121 unsigned int cmd,
122 unsigned long arg); 122 unsigned long arg);
123extern int snd_wavefront_synth_open (snd_hwdep_t *, struct file *); 123extern int snd_wavefront_synth_open (struct snd_hwdep *, struct file *);
124extern int snd_wavefront_synth_release (snd_hwdep_t *, struct file *); 124extern int snd_wavefront_synth_release (struct snd_hwdep *, struct file *);
125 125
126/* FX processor - see also yss225.[ch] */ 126/* FX processor - see also yss225.[ch] */
127 127
128extern int snd_wavefront_fx_start (snd_wavefront_t *); 128extern int snd_wavefront_fx_start (snd_wavefront_t *);
129extern int snd_wavefront_fx_detect (snd_wavefront_t *); 129extern int snd_wavefront_fx_detect (snd_wavefront_t *);
130extern int snd_wavefront_fx_ioctl (snd_hwdep_t *, 130extern int snd_wavefront_fx_ioctl (struct snd_hwdep *,
131 struct file *, 131 struct file *,
132 unsigned int cmd, 132 unsigned int cmd,
133 unsigned long arg); 133 unsigned long arg);
134extern int snd_wavefront_fx_open (snd_hwdep_t *, struct file *); 134extern int snd_wavefront_fx_open (struct snd_hwdep *, struct file *);
135extern int snd_wavefront_fx_release (snd_hwdep_t *, struct file *); 135extern int snd_wavefront_fx_release (struct snd_hwdep *, struct file *);
136 136
137/* prefix in all snd_printk() delivered messages */ 137/* prefix in all snd_printk() delivered messages */
138 138
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index 1818f1013c3f..9e5b57163c0b 100644
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -81,7 +81,7 @@ MODULE_PARM_DESC(fm_port, "FM port #.");
81module_param_array(use_cs4232_midi, bool, NULL, 0444); 81module_param_array(use_cs4232_midi, bool, NULL, 0444);
82MODULE_PARM_DESC(use_cs4232_midi, "Use CS4232 MPU-401 interface (inaccessibly located inside your computer)"); 82MODULE_PARM_DESC(use_cs4232_midi, "Use CS4232 MPU-401 interface (inaccessibly located inside your computer)");
83 83
84static snd_card_t *snd_wavefront_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; 84static struct snd_card *snd_wavefront_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
85 85
86#ifdef CONFIG_PNP 86#ifdef CONFIG_PNP
87 87
@@ -279,12 +279,12 @@ static irqreturn_t snd_wavefront_ics2115_interrupt(int irq,
279 return IRQ_HANDLED; 279 return IRQ_HANDLED;
280} 280}
281 281
282static snd_hwdep_t * __devinit 282static struct snd_hwdep * __devinit
283snd_wavefront_new_synth (snd_card_t *card, 283snd_wavefront_new_synth (struct snd_card *card,
284 int hw_dev, 284 int hw_dev,
285 snd_wavefront_card_t *acard) 285 snd_wavefront_card_t *acard)
286{ 286{
287 snd_hwdep_t *wavefront_synth; 287 struct snd_hwdep *wavefront_synth;
288 288
289 if (snd_wavefront_detect (acard) < 0) { 289 if (snd_wavefront_detect (acard) < 0) {
290 return NULL; 290 return NULL;
@@ -305,14 +305,14 @@ snd_wavefront_new_synth (snd_card_t *card,
305 return wavefront_synth; 305 return wavefront_synth;
306} 306}
307 307
308static snd_hwdep_t * __devinit 308static struct snd_hwdep * __devinit
309snd_wavefront_new_fx (snd_card_t *card, 309snd_wavefront_new_fx (struct snd_card *card,
310 int hw_dev, 310 int hw_dev,
311 snd_wavefront_card_t *acard, 311 snd_wavefront_card_t *acard,
312 unsigned long port) 312 unsigned long port)
313 313
314{ 314{
315 snd_hwdep_t *fx_processor; 315 struct snd_hwdep *fx_processor;
316 316
317 if (snd_wavefront_fx_start (&acard->wavefront)) { 317 if (snd_wavefront_fx_start (&acard->wavefront)) {
318 snd_printk ("cannot initialize YSS225 FX processor"); 318 snd_printk ("cannot initialize YSS225 FX processor");
@@ -332,15 +332,15 @@ snd_wavefront_new_fx (snd_card_t *card,
332static snd_wavefront_mpu_id internal_id = internal_mpu; 332static snd_wavefront_mpu_id internal_id = internal_mpu;
333static snd_wavefront_mpu_id external_id = external_mpu; 333static snd_wavefront_mpu_id external_id = external_mpu;
334 334
335static snd_rawmidi_t * __devinit 335static struct snd_rawmidi *__devinit
336snd_wavefront_new_midi (snd_card_t *card, 336snd_wavefront_new_midi (struct snd_card *card,
337 int midi_dev, 337 int midi_dev,
338 snd_wavefront_card_t *acard, 338 snd_wavefront_card_t *acard,
339 unsigned long port, 339 unsigned long port,
340 snd_wavefront_mpu_id mpu) 340 snd_wavefront_mpu_id mpu)
341 341
342{ 342{
343 snd_rawmidi_t *rmidi; 343 struct snd_rawmidi *rmidi;
344 static int first = 1; 344 static int first = 1;
345 345
346 if (first) { 346 if (first) {
@@ -374,7 +374,7 @@ snd_wavefront_new_midi (snd_card_t *card,
374} 374}
375 375
376static void 376static void
377snd_wavefront_free(snd_card_t *card) 377snd_wavefront_free(struct snd_card *card)
378{ 378{
379 snd_wavefront_card_t *acard = (snd_wavefront_card_t *)card->private_data; 379 snd_wavefront_card_t *acard = (snd_wavefront_card_t *)card->private_data;
380 380
@@ -389,13 +389,13 @@ static int __devinit
389snd_wavefront_probe (int dev, struct pnp_card_link *pcard, 389snd_wavefront_probe (int dev, struct pnp_card_link *pcard,
390 const struct pnp_card_device_id *pid) 390 const struct pnp_card_device_id *pid)
391{ 391{
392 snd_card_t *card; 392 struct snd_card *card;
393 snd_wavefront_card_t *acard; 393 snd_wavefront_card_t *acard;
394 cs4231_t *chip; 394 struct snd_cs4231 *chip;
395 snd_hwdep_t *wavefront_synth; 395 struct snd_hwdep *wavefront_synth;
396 snd_rawmidi_t *ics2115_internal_rmidi = NULL; 396 struct snd_rawmidi *ics2115_internal_rmidi = NULL;
397 snd_rawmidi_t *ics2115_external_rmidi = NULL; 397 struct snd_rawmidi *ics2115_external_rmidi = NULL;
398 snd_hwdep_t *fx_processor; 398 struct snd_hwdep *fx_processor;
399 int hw_dev = 0, midi_dev = 0, err; 399 int hw_dev = 0, midi_dev = 0, err;
400 400
401#ifdef CONFIG_PNP 401#ifdef CONFIG_PNP
@@ -467,7 +467,7 @@ snd_wavefront_probe (int dev, struct pnp_card_link *pcard,
467 /* ---------- OPL3 synth --------- */ 467 /* ---------- OPL3 synth --------- */
468 468
469 if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) { 469 if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
470 opl3_t *opl3; 470 struct snd_opl3 *opl3;
471 471
472 if ((err = snd_opl3_create(card, 472 if ((err = snd_opl3_create(card,
473 fm_port[dev], 473 fm_port[dev],
@@ -658,7 +658,7 @@ static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *card,
658 658
659static void __devexit snd_wavefront_pnp_remove(struct pnp_card_link * pcard) 659static void __devexit snd_wavefront_pnp_remove(struct pnp_card_link * pcard)
660{ 660{
661 snd_card_t *card = (snd_card_t *) pnp_get_card_drvdata(pcard); 661 struct snd_card *card = (struct snd_card *) pnp_get_card_drvdata(pcard);
662 662
663 snd_card_disconnect(card); 663 snd_card_disconnect(card);
664 snd_card_free_in_thread(card); 664 snd_card_free_in_thread(card);
diff --git a/sound/isa/wavefront/wavefront_fx.c b/sound/isa/wavefront/wavefront_fx.c
index 32379688eed4..180661c5ffdc 100644
--- a/sound/isa/wavefront/wavefront_fx.c
+++ b/sound/isa/wavefront/wavefront_fx.c
@@ -460,7 +460,7 @@ snd_wavefront_fx_detect (snd_wavefront_t *dev)
460} 460}
461 461
462int 462int
463snd_wavefront_fx_open (snd_hwdep_t *hw, struct file *file) 463snd_wavefront_fx_open (struct snd_hwdep *hw, struct file *file)
464 464
465{ 465{
466 if (!try_module_get(hw->card->module)) 466 if (!try_module_get(hw->card->module))
@@ -470,7 +470,7 @@ snd_wavefront_fx_open (snd_hwdep_t *hw, struct file *file)
470} 470}
471 471
472int 472int
473snd_wavefront_fx_release (snd_hwdep_t *hw, struct file *file) 473snd_wavefront_fx_release (struct snd_hwdep *hw, struct file *file)
474 474
475{ 475{
476 module_put(hw->card->module); 476 module_put(hw->card->module);
@@ -478,11 +478,11 @@ snd_wavefront_fx_release (snd_hwdep_t *hw, struct file *file)
478} 478}
479 479
480int 480int
481snd_wavefront_fx_ioctl (snd_hwdep_t *sdev, struct file *file, 481snd_wavefront_fx_ioctl (struct snd_hwdep *sdev, struct file *file,
482 unsigned int cmd, unsigned long arg) 482 unsigned int cmd, unsigned long arg)
483 483
484{ 484{
485 snd_card_t *card; 485 struct snd_card *card;
486 snd_wavefront_card_t *acard; 486 snd_wavefront_card_t *acard;
487 snd_wavefront_t *dev; 487 snd_wavefront_t *dev;
488 wavefront_fx_info r; 488 wavefront_fx_info r;
diff --git a/sound/isa/wavefront/wavefront_midi.c b/sound/isa/wavefront/wavefront_midi.c
index 6f51d64fb565..15888ba2169b 100644
--- a/sound/isa/wavefront/wavefront_midi.c
+++ b/sound/isa/wavefront/wavefront_midi.c
@@ -91,10 +91,10 @@ write_data (snd_wavefront_midi_t *midi, unsigned char byte)
91} 91}
92 92
93static snd_wavefront_midi_t * 93static snd_wavefront_midi_t *
94get_wavefront_midi (snd_rawmidi_substream_t *substream) 94get_wavefront_midi (struct snd_rawmidi_substream *substream)
95 95
96{ 96{
97 snd_card_t *card; 97 struct snd_card *card;
98 snd_wavefront_card_t *acard; 98 snd_wavefront_card_t *acard;
99 99
100 if (substream == NULL || substream->rmidi == NULL) 100 if (substream == NULL || substream->rmidi == NULL)
@@ -230,7 +230,7 @@ static void snd_wavefront_midi_output_write(snd_wavefront_card_t *card)
230 } 230 }
231} 231}
232 232
233static int snd_wavefront_midi_input_open(snd_rawmidi_substream_t * substream) 233static int snd_wavefront_midi_input_open(struct snd_rawmidi_substream *substream)
234{ 234{
235 unsigned long flags; 235 unsigned long flags;
236 snd_wavefront_midi_t *midi; 236 snd_wavefront_midi_t *midi;
@@ -252,7 +252,7 @@ static int snd_wavefront_midi_input_open(snd_rawmidi_substream_t * substream)
252 return 0; 252 return 0;
253} 253}
254 254
255static int snd_wavefront_midi_output_open(snd_rawmidi_substream_t * substream) 255static int snd_wavefront_midi_output_open(struct snd_rawmidi_substream *substream)
256{ 256{
257 unsigned long flags; 257 unsigned long flags;
258 snd_wavefront_midi_t *midi; 258 snd_wavefront_midi_t *midi;
@@ -274,7 +274,7 @@ static int snd_wavefront_midi_output_open(snd_rawmidi_substream_t * substream)
274 return 0; 274 return 0;
275} 275}
276 276
277static int snd_wavefront_midi_input_close(snd_rawmidi_substream_t * substream) 277static int snd_wavefront_midi_input_close(struct snd_rawmidi_substream *substream)
278{ 278{
279 unsigned long flags; 279 unsigned long flags;
280 snd_wavefront_midi_t *midi; 280 snd_wavefront_midi_t *midi;
@@ -295,7 +295,7 @@ static int snd_wavefront_midi_input_close(snd_rawmidi_substream_t * substream)
295 return 0; 295 return 0;
296} 296}
297 297
298static int snd_wavefront_midi_output_close(snd_rawmidi_substream_t * substream) 298static int snd_wavefront_midi_output_close(struct snd_rawmidi_substream *substream)
299{ 299{
300 unsigned long flags; 300 unsigned long flags;
301 snd_wavefront_midi_t *midi; 301 snd_wavefront_midi_t *midi;
@@ -315,7 +315,7 @@ static int snd_wavefront_midi_output_close(snd_rawmidi_substream_t * substream)
315 return 0; 315 return 0;
316} 316}
317 317
318static void snd_wavefront_midi_input_trigger(snd_rawmidi_substream_t * substream, int up) 318static void snd_wavefront_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)
319{ 319{
320 unsigned long flags; 320 unsigned long flags;
321 snd_wavefront_midi_t *midi; 321 snd_wavefront_midi_t *midi;
@@ -355,7 +355,7 @@ static void snd_wavefront_midi_output_timer(unsigned long data)
355 snd_wavefront_midi_output_write(card); 355 snd_wavefront_midi_output_write(card);
356} 356}
357 357
358static void snd_wavefront_midi_output_trigger(snd_rawmidi_substream_t * substream, int up) 358static void snd_wavefront_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)
359{ 359{
360 unsigned long flags; 360 unsigned long flags;
361 snd_wavefront_midi_t *midi; 361 snd_wavefront_midi_t *midi;
@@ -401,7 +401,7 @@ snd_wavefront_midi_interrupt (snd_wavefront_card_t *card)
401{ 401{
402 unsigned long flags; 402 unsigned long flags;
403 snd_wavefront_midi_t *midi; 403 snd_wavefront_midi_t *midi;
404 static snd_rawmidi_substream_t *substream = NULL; 404 static struct snd_rawmidi_substream *substream = NULL;
405 static int mpu = external_mpu; 405 static int mpu = external_mpu;
406 int max = 128; 406 int max = 128;
407 unsigned char byte; 407 unsigned char byte;
@@ -554,14 +554,14 @@ snd_wavefront_midi_start (snd_wavefront_card_t *card)
554 return 0; 554 return 0;
555} 555}
556 556
557snd_rawmidi_ops_t snd_wavefront_midi_output = 557struct snd_rawmidi_ops snd_wavefront_midi_output =
558{ 558{
559 .open = snd_wavefront_midi_output_open, 559 .open = snd_wavefront_midi_output_open,
560 .close = snd_wavefront_midi_output_close, 560 .close = snd_wavefront_midi_output_close,
561 .trigger = snd_wavefront_midi_output_trigger, 561 .trigger = snd_wavefront_midi_output_trigger,
562}; 562};
563 563
564snd_rawmidi_ops_t snd_wavefront_midi_input = 564struct snd_rawmidi_ops snd_wavefront_midi_input =
565{ 565{
566 .open = snd_wavefront_midi_input_open, 566 .open = snd_wavefront_midi_input_open,
567 .close = snd_wavefront_midi_input_close, 567 .close = snd_wavefront_midi_input_close,
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c
index abd79b781412..679d0ae97e4f 100644
--- a/sound/isa/wavefront/wavefront_synth.c
+++ b/sound/isa/wavefront/wavefront_synth.c
@@ -144,13 +144,13 @@ MODULE_PARM_DESC(osrun_time, "how many seconds to wait for the ICS2115 OS");
144static int wavefront_delete_sample (snd_wavefront_t *, int sampnum); 144static int wavefront_delete_sample (snd_wavefront_t *, int sampnum);
145static int wavefront_find_free_sample (snd_wavefront_t *); 145static int wavefront_find_free_sample (snd_wavefront_t *);
146 146
147typedef struct { 147struct wavefront_command {
148 int cmd; 148 int cmd;
149 char *action; 149 char *action;
150 unsigned int read_cnt; 150 unsigned int read_cnt;
151 unsigned int write_cnt; 151 unsigned int write_cnt;
152 int need_ack; 152 int need_ack;
153} wavefront_command; 153};
154 154
155static struct { 155static struct {
156 int errno; 156 int errno;
@@ -170,7 +170,7 @@ static struct {
170 170
171#define NEEDS_ACK 1 171#define NEEDS_ACK 1
172 172
173static wavefront_command wavefront_commands[] = { 173static struct wavefront_command wavefront_commands[] = {
174 { WFC_SET_SYNTHVOL, "set synthesizer volume", 0, 1, NEEDS_ACK }, 174 { WFC_SET_SYNTHVOL, "set synthesizer volume", 0, 1, NEEDS_ACK },
175 { WFC_GET_SYNTHVOL, "get synthesizer volume", 1, 0, 0}, 175 { WFC_GET_SYNTHVOL, "get synthesizer volume", 1, 0, 0},
176 { WFC_SET_NVOICES, "set number of voices", 0, 1, NEEDS_ACK }, 176 { WFC_SET_NVOICES, "set number of voices", 0, 1, NEEDS_ACK },
@@ -249,7 +249,7 @@ wavefront_errorstr (int errnum)
249 return "Unknown WaveFront error"; 249 return "Unknown WaveFront error";
250} 250}
251 251
252static wavefront_command * 252static struct wavefront_command *
253wavefront_get_command (int cmd) 253wavefront_get_command (int cmd)
254 254
255{ 255{
@@ -261,7 +261,7 @@ wavefront_get_command (int cmd)
261 } 261 }
262 } 262 }
263 263
264 return (wavefront_command *) 0; 264 return NULL;
265} 265}
266 266
267static inline int 267static inline int
@@ -345,9 +345,9 @@ snd_wavefront_cmd (snd_wavefront_t *dev,
345 int ack; 345 int ack;
346 unsigned int i; 346 unsigned int i;
347 int c; 347 int c;
348 wavefront_command *wfcmd; 348 struct wavefront_command *wfcmd;
349 349
350 if ((wfcmd = wavefront_get_command (cmd)) == (wavefront_command *) 0) { 350 if ((wfcmd = wavefront_get_command (cmd)) == NULL) {
351 snd_printk ("command 0x%x not supported.\n", 351 snd_printk ("command 0x%x not supported.\n",
352 cmd); 352 cmd);
353 return 1; 353 return 1;
@@ -1625,7 +1625,7 @@ wavefront_synth_control (snd_wavefront_card_t *acard,
1625} 1625}
1626 1626
1627int 1627int
1628snd_wavefront_synth_open (snd_hwdep_t *hw, struct file *file) 1628snd_wavefront_synth_open (struct snd_hwdep *hw, struct file *file)
1629 1629
1630{ 1630{
1631 if (!try_module_get(hw->card->module)) 1631 if (!try_module_get(hw->card->module))
@@ -1635,7 +1635,7 @@ snd_wavefront_synth_open (snd_hwdep_t *hw, struct file *file)
1635} 1635}
1636 1636
1637int 1637int
1638snd_wavefront_synth_release (snd_hwdep_t *hw, struct file *file) 1638snd_wavefront_synth_release (struct snd_hwdep *hw, struct file *file)
1639 1639
1640{ 1640{
1641 module_put(hw->card->module); 1641 module_put(hw->card->module);
@@ -1643,18 +1643,18 @@ snd_wavefront_synth_release (snd_hwdep_t *hw, struct file *file)
1643} 1643}
1644 1644
1645int 1645int
1646snd_wavefront_synth_ioctl (snd_hwdep_t *hw, struct file *file, 1646snd_wavefront_synth_ioctl (struct snd_hwdep *hw, struct file *file,
1647 unsigned int cmd, unsigned long arg) 1647 unsigned int cmd, unsigned long arg)
1648 1648
1649{ 1649{
1650 snd_card_t *card; 1650 struct snd_card *card;
1651 snd_wavefront_t *dev; 1651 snd_wavefront_t *dev;
1652 snd_wavefront_card_t *acard; 1652 snd_wavefront_card_t *acard;
1653 wavefront_control *wc; 1653 wavefront_control *wc;
1654 void __user *argp = (void __user *)arg; 1654 void __user *argp = (void __user *)arg;
1655 int err; 1655 int err;
1656 1656
1657 card = (snd_card_t *) hw->card; 1657 card = (struct snd_card *) hw->card;
1658 1658
1659 snd_assert(card != NULL, return -ENODEV); 1659 snd_assert(card != NULL, return -ENODEV);
1660 1660