diff options
Diffstat (limited to 'sound/pci/emu10k1/emu10k1_main.c')
-rw-r--r-- | sound/pci/emu10k1/emu10k1_main.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index a130472314c9..dbc805c33fc4 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c | |||
@@ -49,6 +49,13 @@ | |||
49 | #include "p17v.h" | 49 | #include "p17v.h" |
50 | 50 | ||
51 | 51 | ||
52 | #define HANA_FILENAME "emu/hana.fw" | ||
53 | #define DOCK_FILENAME "emu/audio_dock.fw" | ||
54 | |||
55 | MODULE_FIRMWARE(HANA_FILENAME); | ||
56 | MODULE_FIRMWARE(DOCK_FILENAME); | ||
57 | |||
58 | |||
52 | /************************************************************************* | 59 | /************************************************************************* |
53 | * EMU10K1 init / done | 60 | * EMU10K1 init / done |
54 | *************************************************************************/ | 61 | *************************************************************************/ |
@@ -693,8 +700,6 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu) | |||
693 | int tmp,tmp2; | 700 | int tmp,tmp2; |
694 | int reg; | 701 | int reg; |
695 | int err; | 702 | int err; |
696 | const char *hana_filename = "emu/hana.fw"; | ||
697 | const char *dock_filename = "emu/audio_dock.fw"; | ||
698 | 703 | ||
699 | snd_printk(KERN_INFO "emu1010: Special config.\n"); | 704 | snd_printk(KERN_INFO "emu1010: Special config.\n"); |
700 | /* AC97 2.1, Any 16Meg of 4Gig address, Auto-Mute, EMU32 Slave, | 705 | /* AC97 2.1, Any 16Meg of 4Gig address, Auto-Mute, EMU32 Slave, |
@@ -735,8 +740,8 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu) | |||
735 | return -ENODEV; | 740 | return -ENODEV; |
736 | } | 741 | } |
737 | snd_printk(KERN_INFO "emu1010: EMU_HANA_ID=0x%x\n",reg); | 742 | snd_printk(KERN_INFO "emu1010: EMU_HANA_ID=0x%x\n",reg); |
738 | if ((err = snd_emu1010_load_firmware(emu, hana_filename)) != 0) { | 743 | if ((err = snd_emu1010_load_firmware(emu, HANA_FILENAME)) != 0) { |
739 | snd_printk(KERN_INFO "emu1010: Loading Hana Firmware file %s failed\n", hana_filename); | 744 | snd_printk(KERN_INFO "emu1010: Loading Hana Firmware file %s failed\n", HANA_FILENAME); |
740 | return err; | 745 | return err; |
741 | } | 746 | } |
742 | 747 | ||
@@ -938,7 +943,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu) | |||
938 | /* Return to Audio Dock programming mode */ | 943 | /* Return to Audio Dock programming mode */ |
939 | snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware\n"); | 944 | snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware\n"); |
940 | snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, EMU_HANA_FPGA_CONFIG_AUDIODOCK ); | 945 | snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, EMU_HANA_FPGA_CONFIG_AUDIODOCK ); |
941 | if ((err = snd_emu1010_load_firmware(emu, dock_filename)) != 0) { | 946 | if ((err = snd_emu1010_load_firmware(emu, DOCK_FILENAME)) != 0) { |
942 | return err; | 947 | return err; |
943 | } | 948 | } |
944 | snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0 ); | 949 | snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0 ); |