diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 08:50:13 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:18:47 -0500 |
commit | eb4698f347ec908c365504c4edddadd1acd406ea (patch) | |
tree | 4962019c8bf4a52e35ab55137e17aa150edf9661 /sound/pci/emu10k1/emu10k1_main.c | |
parent | 3d19f804ef5f1d15fe001fc8d1ed58fac9d591fb (diff) |
[ALSA] Remove xxx_t typedefs: PCI emu10k1
Modules: EMU10K1/EMU10K2 driver
Remove xxx_t typedefs from the PCI emu10k1 driver.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/emu10k1/emu10k1_main.c')
-rw-r--r-- | sound/pci/emu10k1/emu10k1_main.c | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 2d1ebe8c6b41..f9855073a0a9 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c | |||
@@ -52,7 +52,7 @@ MODULE_LICENSE("GPL"); | |||
52 | * EMU10K1 init / done | 52 | * EMU10K1 init / done |
53 | *************************************************************************/ | 53 | *************************************************************************/ |
54 | 54 | ||
55 | void snd_emu10k1_voice_init(emu10k1_t * emu, int ch) | 55 | void snd_emu10k1_voice_init(struct snd_emu10k1 * emu, int ch) |
56 | { | 56 | { |
57 | snd_emu10k1_ptr_write(emu, DCYSUSV, ch, 0); | 57 | snd_emu10k1_ptr_write(emu, DCYSUSV, ch, 0); |
58 | snd_emu10k1_ptr_write(emu, IP, ch, 0); | 58 | snd_emu10k1_ptr_write(emu, IP, ch, 0); |
@@ -97,7 +97,7 @@ void snd_emu10k1_voice_init(emu10k1_t * emu, int ch) | |||
97 | } | 97 | } |
98 | } | 98 | } |
99 | 99 | ||
100 | static int __devinit snd_emu10k1_init(emu10k1_t * emu, int enable_ir) | 100 | static int __devinit snd_emu10k1_init(struct snd_emu10k1 * emu, int enable_ir) |
101 | { | 101 | { |
102 | int ch, idx, err; | 102 | int ch, idx, err; |
103 | unsigned int silent_page; | 103 | unsigned int silent_page; |
@@ -336,14 +336,14 @@ static int __devinit snd_emu10k1_init(emu10k1_t * emu, int enable_ir) | |||
336 | 336 | ||
337 | snd_emu10k1_intr_enable(emu, INTE_PCIERRORENABLE); | 337 | snd_emu10k1_intr_enable(emu, INTE_PCIERRORENABLE); |
338 | 338 | ||
339 | emu->reserved_page = (emu10k1_memblk_t *)snd_emu10k1_synth_alloc(emu, 4096); | 339 | emu->reserved_page = (struct snd_emu10k1_memblk *)snd_emu10k1_synth_alloc(emu, 4096); |
340 | if (emu->reserved_page) | 340 | if (emu->reserved_page) |
341 | emu->reserved_page->map_locked = 1; | 341 | emu->reserved_page->map_locked = 1; |
342 | 342 | ||
343 | return 0; | 343 | return 0; |
344 | } | 344 | } |
345 | 345 | ||
346 | static int snd_emu10k1_done(emu10k1_t * emu) | 346 | static int snd_emu10k1_done(struct snd_emu10k1 * emu) |
347 | { | 347 | { |
348 | int ch; | 348 | int ch; |
349 | 349 | ||
@@ -384,7 +384,7 @@ static int snd_emu10k1_done(emu10k1_t * emu) | |||
384 | 384 | ||
385 | /* remove reserved page */ | 385 | /* remove reserved page */ |
386 | if (emu->reserved_page != NULL) { | 386 | if (emu->reserved_page != NULL) { |
387 | snd_emu10k1_synth_free(emu, (snd_util_memblk_t *)emu->reserved_page); | 387 | snd_emu10k1_synth_free(emu, (struct snd_util_memblk *)emu->reserved_page); |
388 | emu->reserved_page = NULL; | 388 | emu->reserved_page = NULL; |
389 | } | 389 | } |
390 | 390 | ||
@@ -474,7 +474,7 @@ static int snd_emu10k1_done(emu10k1_t * emu) | |||
474 | * register. | 474 | * register. |
475 | */ | 475 | */ |
476 | 476 | ||
477 | static void snd_emu10k1_ecard_write(emu10k1_t * emu, unsigned int value) | 477 | static void snd_emu10k1_ecard_write(struct snd_emu10k1 * emu, unsigned int value) |
478 | { | 478 | { |
479 | unsigned short count; | 479 | unsigned short count; |
480 | unsigned int data; | 480 | unsigned int data; |
@@ -512,7 +512,7 @@ static void snd_emu10k1_ecard_write(emu10k1_t * emu, unsigned int value) | |||
512 | * channel. | 512 | * channel. |
513 | */ | 513 | */ |
514 | 514 | ||
515 | static void snd_emu10k1_ecard_setadcgain(emu10k1_t * emu, | 515 | static void snd_emu10k1_ecard_setadcgain(struct snd_emu10k1 * emu, |
516 | unsigned short gain) | 516 | unsigned short gain) |
517 | { | 517 | { |
518 | unsigned int bit; | 518 | unsigned int bit; |
@@ -540,7 +540,7 @@ static void snd_emu10k1_ecard_setadcgain(emu10k1_t * emu, | |||
540 | snd_emu10k1_ecard_write(emu, emu->ecard_ctrl); | 540 | snd_emu10k1_ecard_write(emu, emu->ecard_ctrl); |
541 | } | 541 | } |
542 | 542 | ||
543 | static int __devinit snd_emu10k1_ecard_init(emu10k1_t * emu) | 543 | static int __devinit snd_emu10k1_ecard_init(struct snd_emu10k1 * emu) |
544 | { | 544 | { |
545 | unsigned int hc_value; | 545 | unsigned int hc_value; |
546 | 546 | ||
@@ -580,7 +580,7 @@ static int __devinit snd_emu10k1_ecard_init(emu10k1_t * emu) | |||
580 | return 0; | 580 | return 0; |
581 | } | 581 | } |
582 | 582 | ||
583 | static int __devinit snd_emu10k1_cardbus_init(emu10k1_t * emu) | 583 | static int __devinit snd_emu10k1_cardbus_init(struct snd_emu10k1 * emu) |
584 | { | 584 | { |
585 | unsigned long special_port; | 585 | unsigned long special_port; |
586 | unsigned int value; | 586 | unsigned int value; |
@@ -609,7 +609,7 @@ static int __devinit snd_emu10k1_cardbus_init(emu10k1_t * emu) | |||
609 | * Create the EMU10K1 instance | 609 | * Create the EMU10K1 instance |
610 | */ | 610 | */ |
611 | 611 | ||
612 | static int snd_emu10k1_free(emu10k1_t *emu) | 612 | static int snd_emu10k1_free(struct snd_emu10k1 *emu) |
613 | { | 613 | { |
614 | if (emu->port) { /* avoid access to already used hardware */ | 614 | if (emu->port) { /* avoid access to already used hardware */ |
615 | snd_emu10k1_fx8010_tram_setup(emu, 0); | 615 | snd_emu10k1_fx8010_tram_setup(emu, 0); |
@@ -634,13 +634,13 @@ static int snd_emu10k1_free(emu10k1_t *emu) | |||
634 | return 0; | 634 | return 0; |
635 | } | 635 | } |
636 | 636 | ||
637 | static int snd_emu10k1_dev_free(snd_device_t *device) | 637 | static int snd_emu10k1_dev_free(struct snd_device *device) |
638 | { | 638 | { |
639 | emu10k1_t *emu = device->device_data; | 639 | struct snd_emu10k1 *emu = device->device_data; |
640 | return snd_emu10k1_free(emu); | 640 | return snd_emu10k1_free(emu); |
641 | } | 641 | } |
642 | 642 | ||
643 | static emu_chip_details_t emu_chip_details[] = { | 643 | static struct snd_emu_chip_details emu_chip_details[] = { |
644 | /* Audigy 2 Value AC3 out does not work yet. Need to find out how to turn off interpolators.*/ | 644 | /* Audigy 2 Value AC3 out does not work yet. Need to find out how to turn off interpolators.*/ |
645 | /* Tested by James@superbug.co.uk 3rd July 2005 */ | 645 | /* Tested by James@superbug.co.uk 3rd July 2005 */ |
646 | {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10011102, | 646 | {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10011102, |
@@ -890,21 +890,21 @@ static emu_chip_details_t emu_chip_details[] = { | |||
890 | { } /* terminator */ | 890 | { } /* terminator */ |
891 | }; | 891 | }; |
892 | 892 | ||
893 | int __devinit snd_emu10k1_create(snd_card_t * card, | 893 | int __devinit snd_emu10k1_create(struct snd_card *card, |
894 | struct pci_dev * pci, | 894 | struct pci_dev * pci, |
895 | unsigned short extin_mask, | 895 | unsigned short extin_mask, |
896 | unsigned short extout_mask, | 896 | unsigned short extout_mask, |
897 | long max_cache_bytes, | 897 | long max_cache_bytes, |
898 | int enable_ir, | 898 | int enable_ir, |
899 | uint subsystem, | 899 | uint subsystem, |
900 | emu10k1_t ** remu) | 900 | struct snd_emu10k1 ** remu) |
901 | { | 901 | { |
902 | emu10k1_t *emu; | 902 | struct snd_emu10k1 *emu; |
903 | int err; | 903 | int err; |
904 | int is_audigy; | 904 | int is_audigy; |
905 | unsigned char revision; | 905 | unsigned char revision; |
906 | const emu_chip_details_t *c; | 906 | const struct snd_emu_chip_details *c; |
907 | static snd_device_ops_t ops = { | 907 | static struct snd_device_ops ops = { |
908 | .dev_free = snd_emu10k1_dev_free, | 908 | .dev_free = snd_emu10k1_dev_free, |
909 | }; | 909 | }; |
910 | 910 | ||
@@ -1041,7 +1041,8 @@ int __devinit snd_emu10k1_create(snd_card_t * card, | |||
1041 | snd_emu10k1_free(emu); | 1041 | snd_emu10k1_free(emu); |
1042 | return -ENOMEM; | 1042 | return -ENOMEM; |
1043 | } | 1043 | } |
1044 | emu->memhdr->block_extra_size = sizeof(emu10k1_memblk_t) - sizeof(snd_util_memblk_t); | 1044 | emu->memhdr->block_extra_size = sizeof(struct snd_emu10k1_memblk) - |
1045 | sizeof(struct snd_util_memblk); | ||
1045 | 1046 | ||
1046 | pci_set_master(pci); | 1047 | pci_set_master(pci); |
1047 | 1048 | ||