aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers/mtpav.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-17 08:27:28 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-03 06:18:15 -0500
commit4a4d2cfd8cbca3076742547157ea135d0be77928 (patch)
tree44f859e10ebb6b6a03b18927ecf6dc1bbed9ec59 /sound/drivers/mtpav.c
parent03da312ac080b4f5c9359c233b8812cc93a035fe (diff)
[ALSA] Remove xxx_t typedefs: Generic drivers
Modules: Generic drivers Remove xxx_t typedefs from the generic drivers (dummy, mtpav, serial-u16550 and virmidi). Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/drivers/mtpav.c')
-rw-r--r--sound/drivers/mtpav.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c
index e9d52c668edc..d32d5f6eee39 100644
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
@@ -130,12 +130,12 @@ typedef struct mtpav_port {
130 u8 hwport; 130 u8 hwport;
131 u8 mode; 131 u8 mode;
132 u8 running_status; 132 u8 running_status;
133 snd_rawmidi_substream_t *input; 133 struct snd_rawmidi_substream *input;
134 snd_rawmidi_substream_t *output; 134 struct snd_rawmidi_substream *output;
135} mtpav_port_t; 135} mtpav_port_t;
136 136
137typedef struct mtpav { 137typedef struct mtpav {
138 snd_card_t *card; 138 struct snd_card *card;
139 unsigned long port; 139 unsigned long port;
140 struct resource *res_port; 140 struct resource *res_port;
141 int irq; /* interrupt (for inputs) */ 141 int irq; /* interrupt (for inputs) */
@@ -143,7 +143,7 @@ typedef struct mtpav {
143 int share_irq; /* number of accesses to input interrupts */ 143 int share_irq; /* number of accesses to input interrupts */
144 int istimer; /* number of accesses to timer interrupts */ 144 int istimer; /* number of accesses to timer interrupts */
145 struct timer_list timer; /* timer interrupts for outputs */ 145 struct timer_list timer; /* timer interrupts for outputs */
146 snd_rawmidi_t *rmidi; 146 struct snd_rawmidi *rmidi;
147 int num_ports; /* number of hw ports (1-8) */ 147 int num_ports; /* number of hw ports (1-8) */
148 mtpav_port_t ports[NUMPORTS]; /* all ports including computer, adat and bc */ 148 mtpav_port_t ports[NUMPORTS]; /* all ports including computer, adat and bc */
149 149
@@ -292,7 +292,7 @@ static void snd_mtpav_send_byte(mtpav_t *chip, u8 byte)
292 292
293/* call this with spin lock held */ 293/* call this with spin lock held */
294static void snd_mtpav_output_port_write(mtpav_port_t *port, 294static void snd_mtpav_output_port_write(mtpav_port_t *port,
295 snd_rawmidi_substream_t *substream) 295 struct snd_rawmidi_substream *substream)
296{ 296{
297 u8 outbyte; 297 u8 outbyte;
298 298
@@ -324,7 +324,7 @@ static void snd_mtpav_output_port_write(mtpav_port_t *port,
324 } while (snd_rawmidi_transmit(substream, &outbyte, 1) == 1); 324 } while (snd_rawmidi_transmit(substream, &outbyte, 1) == 1);
325} 325}
326 326
327static void snd_mtpav_output_write(snd_rawmidi_substream_t * substream) 327static void snd_mtpav_output_write(struct snd_rawmidi_substream *substream)
328{ 328{
329 mtpav_port_t *port = &mtp_card->ports[substream->number]; 329 mtpav_port_t *port = &mtp_card->ports[substream->number];
330 unsigned long flags; 330 unsigned long flags;
@@ -353,7 +353,7 @@ static void snd_mtpav_portscan(mtpav_t *chip) // put mtp into smart routing mode
353/* 353/*
354 */ 354 */
355 355
356static int snd_mtpav_input_open(snd_rawmidi_substream_t * substream) 356static int snd_mtpav_input_open(struct snd_rawmidi_substream *substream)
357{ 357{
358 unsigned long flags; 358 unsigned long flags;
359 mtpav_port_t *portp = &mtp_card->ports[substream->number]; 359 mtpav_port_t *portp = &mtp_card->ports[substream->number];
@@ -371,7 +371,7 @@ static int snd_mtpav_input_open(snd_rawmidi_substream_t * substream)
371/* 371/*
372 */ 372 */
373 373
374static int snd_mtpav_input_close(snd_rawmidi_substream_t *substream) 374static int snd_mtpav_input_close(struct snd_rawmidi_substream *substream)
375{ 375{
376 unsigned long flags; 376 unsigned long flags;
377 mtpav_port_t *portp = &mtp_card->ports[substream->number]; 377 mtpav_port_t *portp = &mtp_card->ports[substream->number];
@@ -392,7 +392,7 @@ static int snd_mtpav_input_close(snd_rawmidi_substream_t *substream)
392/* 392/*
393 */ 393 */
394 394
395static void snd_mtpav_input_trigger(snd_rawmidi_substream_t * substream, int up) 395static void snd_mtpav_input_trigger(struct snd_rawmidi_substream *substream, int up)
396{ 396{
397 unsigned long flags; 397 unsigned long flags;
398 mtpav_port_t *portp = &mtp_card->ports[substream->number]; 398 mtpav_port_t *portp = &mtp_card->ports[substream->number];
@@ -449,7 +449,7 @@ static void snd_mtpav_remove_output_timer(mtpav_t *chip)
449/* 449/*
450 */ 450 */
451 451
452static int snd_mtpav_output_open(snd_rawmidi_substream_t * substream) 452static int snd_mtpav_output_open(struct snd_rawmidi_substream *substream)
453{ 453{
454 unsigned long flags; 454 unsigned long flags;
455 mtpav_port_t *portp = &mtp_card->ports[substream->number]; 455 mtpav_port_t *portp = &mtp_card->ports[substream->number];
@@ -464,7 +464,7 @@ static int snd_mtpav_output_open(snd_rawmidi_substream_t * substream)
464/* 464/*
465 */ 465 */
466 466
467static int snd_mtpav_output_close(snd_rawmidi_substream_t * substream) 467static int snd_mtpav_output_close(struct snd_rawmidi_substream *substream)
468{ 468{
469 unsigned long flags; 469 unsigned long flags;
470 mtpav_port_t *portp = &mtp_card->ports[substream->number]; 470 mtpav_port_t *portp = &mtp_card->ports[substream->number];
@@ -479,7 +479,7 @@ static int snd_mtpav_output_close(snd_rawmidi_substream_t * substream)
479/* 479/*
480 */ 480 */
481 481
482static void snd_mtpav_output_trigger(snd_rawmidi_substream_t * substream, int up) 482static void snd_mtpav_output_trigger(struct snd_rawmidi_substream *substream, int up)
483{ 483{
484 unsigned long flags; 484 unsigned long flags;
485 mtpav_port_t *portp = &mtp_card->ports[substream->number]; 485 mtpav_port_t *portp = &mtp_card->ports[substream->number];
@@ -611,13 +611,13 @@ static int snd_mtpav_get_ISA(mtpav_t * mcard)
611/* 611/*
612 */ 612 */
613 613
614static snd_rawmidi_ops_t snd_mtpav_output = { 614static struct snd_rawmidi_ops snd_mtpav_output = {
615 .open = snd_mtpav_output_open, 615 .open = snd_mtpav_output_open,
616 .close = snd_mtpav_output_close, 616 .close = snd_mtpav_output_close,
617 .trigger = snd_mtpav_output_trigger, 617 .trigger = snd_mtpav_output_trigger,
618}; 618};
619 619
620static snd_rawmidi_ops_t snd_mtpav_input = { 620static struct snd_rawmidi_ops snd_mtpav_input = {
621 .open = snd_mtpav_input_open, 621 .open = snd_mtpav_input_open,
622 .close = snd_mtpav_input_close, 622 .close = snd_mtpav_input_close,
623 .trigger = snd_mtpav_input_trigger, 623 .trigger = snd_mtpav_input_trigger,
@@ -628,7 +628,7 @@ static snd_rawmidi_ops_t snd_mtpav_input = {
628 * get RAWMIDI resources 628 * get RAWMIDI resources
629 */ 629 */
630 630
631static void snd_mtpav_set_name(mtpav_t *chip, snd_rawmidi_substream_t *substream) 631static void snd_mtpav_set_name(mtpav_t *chip, struct snd_rawmidi_substream *substream)
632{ 632{
633 if (substream->number >= 0 && substream->number < chip->num_ports) 633 if (substream->number >= 0 && substream->number < chip->num_ports)
634 sprintf(substream->name, "MTP direct %d", (substream->number % chip->num_ports) + 1); 634 sprintf(substream->name, "MTP direct %d", (substream->number % chip->num_ports) + 1);
@@ -645,8 +645,8 @@ static void snd_mtpav_set_name(mtpav_t *chip, snd_rawmidi_substream_t *substream
645static int snd_mtpav_get_RAWMIDI(mtpav_t * mcard) 645static int snd_mtpav_get_RAWMIDI(mtpav_t * mcard)
646{ 646{
647 int rval = 0; 647 int rval = 0;
648 snd_rawmidi_t *rawmidi; 648 struct snd_rawmidi *rawmidi;
649 snd_rawmidi_substream_t *substream; 649 struct snd_rawmidi_substream *substream;
650 struct list_head *list; 650 struct list_head *list;
651 651
652 //printk("entering snd_mtpav_get_RAWMIDI\n"); 652 //printk("entering snd_mtpav_get_RAWMIDI\n");
@@ -666,12 +666,12 @@ static int snd_mtpav_get_RAWMIDI(mtpav_t * mcard)
666 rawmidi = mcard->rmidi; 666 rawmidi = mcard->rmidi;
667 667
668 list_for_each(list, &rawmidi->streams[SNDRV_RAWMIDI_STREAM_INPUT].substreams) { 668 list_for_each(list, &rawmidi->streams[SNDRV_RAWMIDI_STREAM_INPUT].substreams) {
669 substream = list_entry(list, snd_rawmidi_substream_t, list); 669 substream = list_entry(list, struct snd_rawmidi_substream, list);
670 snd_mtpav_set_name(mcard, substream); 670 snd_mtpav_set_name(mcard, substream);
671 substream->ops = &snd_mtpav_input; 671 substream->ops = &snd_mtpav_input;
672 } 672 }
673 list_for_each(list, &rawmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substreams) { 673 list_for_each(list, &rawmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substreams) {
674 substream = list_entry(list, snd_rawmidi_substream_t, list); 674 substream = list_entry(list, struct snd_rawmidi_substream, list);
675 snd_mtpav_set_name(mcard, substream); 675 snd_mtpav_set_name(mcard, substream);
676 substream->ops = &snd_mtpav_output; 676 substream->ops = &snd_mtpav_output;
677 mcard->ports[substream->number].hwport = translate_subdevice_to_hwport(mcard, substream->number); 677 mcard->ports[substream->number].hwport = translate_subdevice_to_hwport(mcard, substream->number);