pcxhr - change firmware files

- compatibility issue : change firmware filenames
  the pcxhr driver version <= 1.0.18a does not work
  with new firmware > 1.0.17. Keep the old firmware files
  and add new firmware files with different names

Signed-off-by: Markus Bollinger <bollinger@digigram.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/pcxhrloader/Makefile.am b/pcxhrloader/Makefile.am
index 6d5bbe177e3f0aca81ea17b6c63e05bbf2c200ec..426f0888c393204ff7b3edcdbfe6ab3ed3b93a2e 100644 (file)
--- a/pcxhrloader/Makefile.am
+++ b/pcxhrloader/Makefile.am
@@ -1,6 +1,7 @@
 MYNAME = pcxhrloader
 
 cfg_files = \
+       pcxhr.conf      \
        pcxhr0.conf     \
        pcxhr1.conf     \
        pcxhr2.conf     \
@@ -10,21 +11,26 @@ cfg_files = \
 dsp_files = \
        xi_1_882.dat    \
        xc_1_882.dat    \
-       xc_882e.dat     \
        e321_512.e56    \
        b321_512.b56    \
-       b882e.b56       \
        d321_512.d56    \
-       xc_1222.dat     \
-       xc_1222e.dat    \
-       b1222.b56       \
-       b1222e.b56      \
-       d1222.d56       \
-       x1_222hr.dat    \
-       x1_924hr.dat    \
-       e924.e56        \
-       b924.b56        \
-       l_1_222.d56
+       xlxint.dat      \
+       xlxc882hr.dat   \
+       xlxc882e.dat    \
+       dspe882.e56     \
+       dspb882hr.b56   \
+       dspb882e.b56    \
+       dspd882.d56     \
+       xlxc1222hr.dat  \
+       xlxc1222e.dat   \
+       dspb1222hr.b56  \
+       dspb1222e.b56   \
+       dspd1222.d56    \
+       xlxc222.dat     \
+       xlxc924.dat     \
+       dspe924.e56     \
+       dspb924.b56     \
+       dspd222.d56
 
 EXTRA_DIST = $(cfg_files) $(dsp_files)
 

diff --git a/pcxhrloader/b321_512.b56 b/pcxhrloader/b321_512.b56
index edcac1ed2cb736ea9345d5c3fd898525e9b063c3..3e826882cd685bd1b74bda52e670abe4fce5e14d 100644 (file)
Binary files a/pcxhrloader/b321_512.b56 and b/pcxhrloader/b321_512.b56 differ

diff --git a/pcxhrloader/d321_512.d56 b/pcxhrloader/d321_512.d56
index 6d46f0fac4ed51c71b434a7dbb942af6b1a2e6b7..9531b2c9fc360f36be9b4ed8fd5a1db67e30a922 100644 (file)
Binary files a/pcxhrloader/d321_512.d56 and b/pcxhrloader/d321_512.d56 differ

diff --git a/pcxhrloader/b1222e.b56 b/pcxhrloader/dspb1222e.b56
similarity index 100%
rename from pcxhrloader/b1222e.b56
rename to pcxhrloader/dspb1222e.b56

diff --git a/pcxhrloader/b1222.b56 b/pcxhrloader/dspb1222hr.b56
similarity index 100%
rename from pcxhrloader/b1222.b56
rename to pcxhrloader/dspb1222hr.b56

diff --git a/pcxhrloader/b882e.b56 b/pcxhrloader/dspb882e.b56
similarity index 100%
rename from pcxhrloader/b882e.b56
rename to pcxhrloader/dspb882e.b56

diff --git a/pcxhrloader/dspb882hr.b56 b/pcxhrloader/dspb882hr.b56
new file mode 100644 (file)
index 0000000..edcac1e
Binary files /dev/null and b/pcxhrloader/dspb882hr.b56 differ

diff --git a/pcxhrloader/b924.b56 b/pcxhrloader/dspb924.b56
similarity index 100%
rename from pcxhrloader/b924.b56
rename to pcxhrloader/dspb924.b56

diff --git a/pcxhrloader/d1222.d56 b/pcxhrloader/dspd1222.d56
similarity index 100%
rename from pcxhrloader/d1222.d56
rename to pcxhrloader/dspd1222.d56

diff --git a/pcxhrloader/l_1_222.d56 b/pcxhrloader/dspd222.d56
similarity index 100%
rename from pcxhrloader/l_1_222.d56
rename to pcxhrloader/dspd222.d56

diff --git a/pcxhrloader/dspd882.d56 b/pcxhrloader/dspd882.d56
new file mode 100644 (file)
index 0000000..6d46f0f
Binary files /dev/null and b/pcxhrloader/dspd882.d56 differ

diff --git a/pcxhrloader/dspe882.e56 b/pcxhrloader/dspe882.e56
new file mode 100644 (file)
index 0000000..6289320
Binary files /dev/null and b/pcxhrloader/dspe882.e56 differ

diff --git a/pcxhrloader/e924.e56 b/pcxhrloader/dspe924.e56
similarity index 100%
rename from pcxhrloader/e924.e56
rename to pcxhrloader/dspe924.e56

diff --git a/pcxhrloader/e321_512.e56 b/pcxhrloader/e321_512.e56
index 6289320e548b553054678c1029eaa5e0df08ac9e..5a13498180de63bb3e0c81585eaacc5ba527728f 100644 (file)
Binary files a/pcxhrloader/e321_512.e56 and b/pcxhrloader/e321_512.e56 differ

diff --git a/pcxhrloader/pcxhr0.conf b/pcxhrloader/pcxhr0.conf
index 59de51841d3fbfb5df9eeb67cc2990595644a49a..ddff998c895ee9dfbd6b98c22bcdb3f9f2a757aa 100644 (file)
--- a/pcxhrloader/pcxhr0.conf
+++ b/pcxhrloader/pcxhr0.conf
@@ -1,8 +1,8 @@
 # boot firmwares for digigram pcxhr cards
 # VX882HR PCX882HR VX881HR PCX881HR
 
-dsp0   xi_1_882.dat
-dsp1   xc_1_882.dat
-dsp2   e321_512.e56
-dsp3   b321_512.b56
-dsp4   d321_512.d56
+dsp0   xlxint.dat
+dsp1   xlxc882hr.dat
+dsp2   dspe882.e56
+dsp3   dspb882hr.b56
+dsp4   dspd882.d56

diff --git a/pcxhrloader/pcxhr1.conf b/pcxhrloader/pcxhr1.conf
index 97205fdfeadbae27d720d6dbde37c51fe41ef595..2bbd5e061251be9c10b0c393b7ff84ae7a289eff 100644 (file)
--- a/pcxhrloader/pcxhr1.conf
+++ b/pcxhrloader/pcxhr1.conf
@@ -1,8 +1,8 @@
 # boot firmwares for digigram pcxhr cards
 # VX882e PCX882e VX881e PCX881e
 
-dsp0   xi_1_882.dat
-dsp1   xc_882e.dat
-dsp2   e321_512.e56
-dsp3   b882e.b56
-dsp4   d321_512.d56
+dsp0   xlxint.dat
+dsp1   xlxc882e.dat
+dsp2   dspe882.e56
+dsp3   dspb882e.b56
+dsp4   dspd882.d56

diff --git a/pcxhrloader/pcxhr2.conf b/pcxhrloader/pcxhr2.conf
index 0a16d23e5ac8c51257de64e40b2b0dadd0df5126..4e85c630d4d56ebc766216f5e0dd5b6c6f6ca46c 100644 (file)
--- a/pcxhrloader/pcxhr2.conf
+++ b/pcxhrloader/pcxhr2.conf
@@ -1,8 +1,8 @@
 # boot firmwares for digigram pcxhr cards
 # VX1222HR PCX1222HR VX1221HR PCX1221HR
 
-dsp0   xi_1_882.dat
-dsp1   xc_1222.dat
-dsp2   e321_512.e56
-dsp3   b1222.b56
-dsp4   d1222.d56
+dsp0   xlxint.dat
+dsp1   xlxc1222hr.dat
+dsp2   dspe882.e56
+dsp3   dspb1222hr.b56
+dsp4   dspd1222.d56

diff --git a/pcxhrloader/pcxhr3.conf b/pcxhrloader/pcxhr3.conf
index 001bb008705696fafe31dd0ef9966ec9b5157764..a6c56f4a71dd084583a6f9f78f8fe945015faa40 100644 (file)
--- a/pcxhrloader/pcxhr3.conf
+++ b/pcxhrloader/pcxhr3.conf
@@ -1,8 +1,8 @@
 # boot firmwares for digigram pcxhr cards
 # VX1222e PCX1222e VX1221e PCX1221e
 
-dsp0   xi_1_882.dat
-dsp1   xc_1222e.dat
-dsp2   e321_512.e56
-dsp3   b1222e.b56
-dsp4   d1222.d56
+dsp0   xlxint.dat
+dsp1   xlxc1222e.dat
+dsp2   dspe882.e56
+dsp3   dspb1222e.b56
+dsp4   dspd1222.d56

diff --git a/pcxhrloader/pcxhr4.conf b/pcxhrloader/pcxhr4.conf
index bf37d5ca9a1ec7d8f2c9cc2e7d8c2855324ed378..2b85750dfa5d6471bff56c7adda2f7064fe489b8 100644 (file)
--- a/pcxhrloader/pcxhr4.conf
+++ b/pcxhrloader/pcxhr4.conf
@@ -1,7 +1,7 @@
 # boot firmwares for digigram pcxhr cards
 # VX222HR VX222e PCX22HR PCX22e
 
-dsp1   x1_222hr.dat
-dsp2   e924.e56
-dsp3   b924.b56
-dsp4   l_1_222.d56
+dsp1   xlxc222.dat
+dsp2   dspe924.e56
+dsp3   dspb924.b56
+dsp4   dspd222.d56

diff --git a/pcxhrloader/pcxhr5.conf b/pcxhrloader/pcxhr5.conf
index 0550a770f3d8f7d5dda68330135507de7afb3ae4..0744520bb5d3174b13ff3a6983476f37560c604b 100644 (file)
--- a/pcxhrloader/pcxhr5.conf
+++ b/pcxhrloader/pcxhr5.conf
@@ -1,7 +1,7 @@
 # boot firmwares for digigram pcxhr cards
 # VX222HR-Mic VX222e-Mic PCX924HR PCX924e PCX924HR-Mic PCX924e-Mic
 
-dsp1   x1_924hr.dat
-dsp2   e924.e56
-dsp3   b924.b56
-dsp4   l_1_222.d56
+dsp1   xlxc924.dat
+dsp2   dspe924.e56
+dsp3   dspb924.b56
+dsp4   dspd222.d56

diff --git a/pcxhrloader/xc_1_882.dat b/pcxhrloader/xc_1_882.dat
index d59dfe0d8e7e643cedd99e4c86502096f87e092b..5ed6cd71930161e15c97c16d14442a9cfc24bd55 100644 (file)
Binary files a/pcxhrloader/xc_1_882.dat and b/pcxhrloader/xc_1_882.dat differ

diff --git a/pcxhrloader/xi_1_882.dat b/pcxhrloader/xi_1_882.dat
index d57d0cd32dd5839680bfd6208bdf5bb285525023..6329571bbfa1df80759917f2f86ff1324068761f 100644 (file)
Binary files a/pcxhrloader/xi_1_882.dat and b/pcxhrloader/xi_1_882.dat differ

diff --git a/pcxhrloader/xc_1222e.dat b/pcxhrloader/xlxc1222e.dat
similarity index 100%
rename from pcxhrloader/xc_1222e.dat
rename to pcxhrloader/xlxc1222e.dat

diff --git a/pcxhrloader/xc_1222.dat b/pcxhrloader/xlxc1222hr.dat
similarity index 100%
rename from pcxhrloader/xc_1222.dat
rename to pcxhrloader/xlxc1222hr.dat

diff --git a/pcxhrloader/x1_222hr.dat b/pcxhrloader/xlxc222.dat
similarity index 100%
rename from pcxhrloader/x1_222hr.dat
rename to pcxhrloader/xlxc222.dat

diff --git a/pcxhrloader/xc_882e.dat b/pcxhrloader/xlxc882e.dat
similarity index 100%
rename from pcxhrloader/xc_882e.dat
rename to pcxhrloader/xlxc882e.dat

diff --git a/pcxhrloader/xlxc882hr.dat b/pcxhrloader/xlxc882hr.dat
new file mode 100644 (file)
index 0000000..d59dfe0
Binary files /dev/null and b/pcxhrloader/xlxc882hr.dat differ

diff --git a/pcxhrloader/x1_924hr.dat b/pcxhrloader/xlxc924.dat
similarity index 100%
rename from pcxhrloader/x1_924hr.dat
rename to pcxhrloader/xlxc924.dat

diff --git a/pcxhrloader/xlxint.dat b/pcxhrloader/xlxint.dat
new file mode 100644 (file)
index 0000000..d57d0cd
Binary files /dev/null and b/pcxhrloader/xlxint.dat differ