msnd-pinnacle: replace mod_firmware_load() with request_firmware()

Since mod_firmware_load() depends on CONFIG_SOUND_PRIME, it cannot be
used any longer by ALSA drivers.  Replace it with request_firmware().

diff --git a/Makefile.am b/Makefile.am
index fc2c4cb20811bb4d92539ee95b3ecf320f04bc86..41e980047a2aeb42895e611785c97c67ad8662d6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = 1.3 foreign
 
 SUBDIRS = hdsploader mixartloader pcxhrloader usx2yloader vxloader echoaudio \
-         asihpi emi_26_62 emu korg1212 maestro3 sb16 wavefront ymfpci
+         asihpi emi_26_62 emu korg1212 maestro3 multisound sb16 wavefront ymfpci
 
 EXTRA_DIST = depcomp
 

diff --git a/configure.in b/configure.in
index eeaa98f73e1937c1f6e2fd4d5d57a10e786ff9a0..8c5139512ba2cb655d8ee251b7fba409683ecdff 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -63,6 +63,7 @@ AC_OUTPUT(Makefile \
          asihpi/Makefile \
          korg1212/Makefile \
          maestro3/Makefile \
+         multisound/Makefile \
          sb16/Makefile \
          wavefront/Makefile \
          ymfpci/Makefile)

diff --git a/multisound/Makefile.am b/multisound/Makefile.am
new file mode 100644 (file)
index 0000000..782ce90
--- /dev/null
+++ b/multisound/Makefile.am
@@ -0,0 +1,29 @@
+# # Process this file with automake to produce Makefile.in.
+
+if USE_HOTPLUG
+hotplugfwdir = @HOTPLUGFWDIR@/turtlebeach
+
+# Create links to the actual firmware files in /etc/sound
+install-data-hook:
+       $(INSTALL) -d $(DESTDIR)$(hotplugfwdir)
+       cd $(DESTDIR)$(hotplugfwdir) && \
+         rm -f msndinit.bin && \
+         $(LN_S) /etc/sound/msndinit.bin msndinit.bin
+       cd $(DESTDIR)$(hotplugfwdir) && \
+         rm -f msndperm.bin && \
+         $(LN_S) /etc/sound/msndperm.bin msndperm.bin
+       cd $(DESTDIR)$(hotplugfwdir) && \
+         rm -f pndspini.bin && \
+         $(LN_S) /etc/sound/pndspini.bin pndspini.bin
+       cd $(DESTDIR)$(hotplugfwdir) && \
+         rm -f pndsperm.bin && \
+         $(LN_S) /etc/sound/pndsperm.bin pndsperm.bin
+
+uninstall-hook:
+       rm -f $(DESTDIR)$(hotplugfwdir)/msndinit.bin
+       rm -f $(DESTDIR)$(hotplugfwdir)/msndperm.bin
+       rm -f $(DESTDIR)$(hotplugfwdir)/pndspini.bin
+       rm -f $(DESTDIR)$(hotplugfwdir)/pndsperm.bin
+
+endif
+