This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / sound / pci / au88x0 / au88x0_eq.c

diff --git a/sound/pci/au88x0/au88x0_eq.c b/sound/pci/au88x0/au88x0_eq.c
index 9045a4b..f8f5263 100644 (file)
--- a/sound/pci/au88x0/au88x0_eq.c
+++ b/sound/pci/au88x0/au88x0_eq.c
@@ -52,33 +52,37 @@ static void vortex_EqHw_SetTimeConsts(vortex_t * vortex, u16 gain, u16 level)
        hwwrite(vortex->mmio, 0x2b3c8, level);
 }
 
-static inline short sign_invert(short a)
-{
-       /* -(-32768) -> -32768 so we do -(-32768) -> 32767 to make the result positive */
-       if (a == -32768)
-               return 32767;
-       else
-               return -a;
-}
-
 static void vortex_EqHw_SetLeftCoefs(vortex_t * vortex, u16 coefs[])
 {
        eqhw_t *eqhw = &(vortex->eq.this04);
-       int i = 0, n /*esp2c */;
+       int eax, i = 0, n /*esp2c */;
 
        for (n = 0; n < eqhw->this04; n++) {
                hwwrite(vortex->mmio, 0x2b000 + n * 0x30, coefs[i + 0]);
                hwwrite(vortex->mmio, 0x2b004 + n * 0x30, coefs[i + 1]);
 
                if (eqhw->this08 == 0) {
-                       hwwrite(vortex->mmio, 0x2b008 + n * 0x30, coefs[i + 2] & 0xffff);
-                       hwwrite(vortex->mmio, 0x2b00c + n * 0x30, coefs[i + 3] & 0xffff);
-                       hwwrite(vortex->mmio, 0x2b010 + n * 0x30, coefs[i + 4] & 0xffff);
+                       hwwrite(vortex->mmio, 0x2b008 + n * 0x30, coefs[i + 2]);
+                       hwwrite(vortex->mmio, 0x2b00c + n * 0x30, coefs[i + 3]);
+                       eax = coefs[i + 4];     //esp24;
                } else {
-                       hwwrite(vortex->mmio, 0x2b008 + n * 0x30, sign_invert(coefs[2 + i]) & 0xffff);
-                       hwwrite(vortex->mmio, 0x2b00c + n * 0x30, sign_invert(coefs[3 + i]) & 0xffff);
-                       hwwrite(vortex->mmio, 0x2b010 + n * 0x30, sign_invert(coefs[4 + i]) & 0xffff);
+                       if (coefs[2 + i] == 0x8000)
+                               eax = 0x7fff;
+                       else
+                               eax = ~coefs[2 + i];
+                       hwwrite(vortex->mmio, 0x2b008 + n * 0x30, eax & 0xffff);
+                       if (coefs[3 + i] == 0x8000)
+                               eax = 0x7fff;
+                       else
+                               eax = ~coefs[3 + i];
+                       hwwrite(vortex->mmio, 0x2b00c + n * 0x30, eax & 0xffff);
+                       if (coefs[4 + i] == 0x8000)
+                               eax = 0x7fff;
+                       else
+                               eax = ~coefs[4 + i];
                }
+               hwwrite(vortex->mmio, 0x2b010 + n * 0x30, eax);
+
                i += 5;
        }
 }
@@ -86,21 +90,33 @@ static void vortex_EqHw_SetLeftCoefs(vortex_t * vortex, u16 coefs[])
 static void vortex_EqHw_SetRightCoefs(vortex_t * vortex, u16 coefs[])
 {
        eqhw_t *eqhw = &(vortex->eq.this04);
-       int i = 0, n /*esp2c */;
+       int i = 0, n /*esp2c */, eax;
 
        for (n = 0; n < eqhw->this04; n++) {
                hwwrite(vortex->mmio, 0x2b1e0 + n * 0x30, coefs[0 + i]);
                hwwrite(vortex->mmio, 0x2b1e4 + n * 0x30, coefs[1 + i]);
 
                if (eqhw->this08 == 0) {
-                       hwwrite(vortex->mmio, 0x2b1e8 + n * 0x30, coefs[2 + i] & 0xffff);
-                       hwwrite(vortex->mmio, 0x2b1ec + n * 0x30, coefs[3 + i] & 0xffff);
-                       hwwrite(vortex->mmio, 0x2b1f0 + n * 0x30, coefs[4 + i] & 0xffff);
+                       hwwrite(vortex->mmio, 0x2b1e8 + n * 0x30, coefs[2 + i]);
+                       hwwrite(vortex->mmio, 0x2b1ec + n * 0x30, coefs[3 + i]);
+                       eax = coefs[4 + i];     //*esp24;
                } else {
-                       hwwrite(vortex->mmio, 0x2b1e8 + n * 0x30, sign_invert(coefs[2 + i]) & 0xffff);
-                       hwwrite(vortex->mmio, 0x2b1ec + n * 0x30, sign_invert(coefs[3 + i]) & 0xffff);
-                       hwwrite(vortex->mmio, 0x2b1f0 + n * 0x30, sign_invert(coefs[4 + i]) & 0xffff);
+                       if (coefs[2 + i] == 0x8000)
+                               eax = 0x7fff;
+                       else
+                               eax = ~(coefs[2 + i]);
+                       hwwrite(vortex->mmio, 0x2b1e8 + n * 0x30, eax & 0xffff);
+                       if (coefs[3 + i] == 0x8000)
+                               eax = 0x7fff;
+                       else
+                               eax = ~coefs[3 + i];
+                       hwwrite(vortex->mmio, 0x2b1ec + n * 0x30, eax & 0xffff);
+                       if (coefs[4 + i] == 0x8000)
+                               eax = 0x7fff;
+                       else
+                               eax = ~coefs[4 + i];
                }
+               hwwrite(vortex->mmio, 0x2b1f0 + n * 0x30, eax);
                i += 5;
        }
 
@@ -172,12 +188,22 @@ static void vortex_EqHw_GetRightStates(vortex_t * vortex, u16 * a, u16 b[])
 static void vortex_EqHw_SetBypassGain(vortex_t * vortex, u16 a, u16 b)
 {
        eqhw_t *eqhw = &(vortex->eq.this04);
+       int eax;
+
        if (eqhw->this08 == 0) {
                hwwrite(vortex->mmio, 0x2b3d4, a);
                hwwrite(vortex->mmio, 0x2b3ec, b);
        } else {
-               hwwrite(vortex->mmio, 0x2b3d4, sign_invert(a) & 0xffff);
-               hwwrite(vortex->mmio, 0x2b3ec, sign_invert(b) & 0xffff);
+               if (a == 0x8000)
+                       eax = 0x7fff;
+               else
+                       eax = ~a;
+               hwwrite(vortex->mmio, 0x2b3d4, eax & 0xffff);
+               if (b == 0x8000)
+                       eax = 0x7fff;
+               else
+                       eax = ~b;
+               hwwrite(vortex->mmio, 0x2b3ec, eax & 0xffff);
        }
 }