- use the generic hwdep DSP loader API.

- install the firmware to /usr/share/alsa/firmware.
- separate configuration file for each card type.

vxloader/firmware/Makefile.am

@@ -1,4 +1,4 @@
-cfg_files = index \
+cfg_files = vx222.conf vxboard.conf vxpocket.conf vxp440.conf \
 	bd56002.boot \
 	bd563s3.boot \
 	bd563v2.boot \
@@ -15,6 +15,6 @@ cfg_files = index \
 
 EXTRA_DIST = $(cfg_files)
 
-firmwaredir = $(datadir)/vxloader
+firmwaredir = $(datadir)/alsa/firmware
 firmware_DATA = $(cfg_files)
 

vxloader/firmware/index

@@ -1,24 +0,0 @@
-# boot firmwares for digigram VX cards
-
-# VX222 v2 / Mic
-vx222.xilinx	x1_2_v22.rbt
-vx222.dspboot	bd563v2.boot
-vx222.dspimage	l_1_v22.d56
-
-# old VX222
-board.xilinx	x1_1_vx2.rbt
-board.dspboot	bd56002.boot
-board.dspimage	l_1_vx2.d56
-
-# VXpocket
-vxpocket.boot	bx_1_vxp.b56
-vxpocket.xilinx	x1_1_vxp.rbt
-vxpocket.dspboot	bd563s3.boot
-vxpocket.dspimage	l_1_vxp.d56
-
-# VXpocket 440
-vxp440.boot	bx_1_vp4.b56
-vxp440.xilinx	x1_1_vp4.rbt
-vxp440.dspboot	bd563s3.boot
-vxp440.dspimage	l_1_vp4.d56
-

vxloader/firmware/vx222.conf

@@ -0,0 +1,6 @@
+# boot firmwares for digigram VX 222 v2/Mic cards
+
+dsp0	x1_2_v22.rbt
+dsp1	bd563v2.boot
+dsp2	l_1_v22.d56
+

vxloader/firmware/vxboard.conf

@@ -0,0 +1,6 @@
+# boot firmwares for digigram VX222 (old)
+
+dsp0	x1_1_vx2.rbt
+dsp1	bd56002.boot
+dsp2	l_1_vx2.d56
+

vxloader/firmware/vxp440.conf

@@ -0,0 +1,6 @@
+# boot firmwares for digigram VXpocket 440
+
+dsp0	bx_1_vp4.b56
+dsp1	x1_1_vp4.rbt
+dsp2	bd563s3.boot
+dsp3	l_1_vp4.d56

vxloader/firmware/vxpocket.conf

@@ -0,0 +1,6 @@
+# boot firmwares for digigram VXpocket
+
+dsp0	bx_1_vxp.b56
+dsp1	x1_1_vxp.rbt
+dsp2	bd563s3.boot
+dsp3	l_1_vxp.d56