From: Clemens Ladisch <clemens@ladisch.de>
Date: Mon, 12 Feb 2007 12:41:45 +0000 (+0100)
Subject: msnd-pinnacle: replace mod_firmware_load() with request_firmware()
X-Git-Tag: v1.0.14rc3~1
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=160c38bdd6a9c4b5b1e25897f0768c6e4fd31045;p=alsa-firmware.git

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 fc2c4cb..41e9800 100644
--- 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 eeaa98f..8c51395 100644
--- 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
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
+