Update of /cvsroot/alsa/alsa-kernel/pci/emu10k1
In directory usw-pr-cvs1:/tmp/cvs-serv3306/pci/emu10k1
Modified Files:
emufx.c
Log Message:
Kernel sync with changes from David S. Miller <[EMAIL PROTECTED]>
- Driver for AMD7930 sound chips found on Sparcs
- Driver for CS4231 sound chips found on Sparcs
Index: emufx.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/emu10k1/emufx.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- emufx.c 17 Sep 2002 13:44:38 -0000 1.20
+++ emufx.c 30 Sep 2002 21:42:53 -0000 1.21
@@ -793,7 +793,7 @@
u32 op, u32 r, u32 a, u32 x, u32 y)
{
snd_assert(*ptr < 512, return);
- set_bit(*ptr, &icode->code_valid);
+ set_bit(*ptr, icode->code_valid);
icode->code[*ptr ][0] = ((x & 0x3ff) << 10) | (y & 0x3ff);
icode->code[(*ptr)++][1] = ((op & 0x0f) << 20) | ((r & 0x3ff) << 10) | (a &
0x3ff);
}
@@ -805,7 +805,7 @@
u32 op, u32 r, u32 a, u32 x, u32 y)
{
snd_assert(*ptr < 512, return);
- set_bit(*ptr, &icode->code_valid);
+ set_bit(*ptr, icode->code_valid);
icode->code[*ptr ][0] = ((x & 0x7ff) << 12) | (y & 0x7ff);
icode->code[(*ptr)++][1] = ((op & 0x0f) << 24) | ((r & 0x7ff) << 12) | (a &
0x7ff);
}
@@ -830,7 +830,7 @@
int gpr;
for (gpr = 0; gpr < 0x100; gpr++) {
- if (!test_bit(gpr, &icode->gpr_valid))
+ if (!test_bit(gpr, icode->gpr_valid))
continue;
snd_emu10k1_ptr_write(emu, emu->gpr_base + gpr, 0,
icode->gpr_map[gpr]);
}
@@ -841,7 +841,7 @@
int gpr;
for (gpr = 0; gpr < 0x100; gpr++) {
- set_bit(gpr, &icode->gpr_valid);
+ set_bit(gpr, icode->gpr_valid);
icode->gpr_map[gpr] = snd_emu10k1_ptr_read(emu, emu->gpr_base + gpr,
0);
}
}
@@ -851,7 +851,7 @@
int tram;
for (tram = 0; tram < 0xa0; tram++) {
- if (!test_bit(tram, &icode->tram_valid))
+ if (!test_bit(tram, icode->tram_valid))
continue;
snd_emu10k1_ptr_write(emu, TANKMEMDATAREGBASE + tram, 0,
icode->tram_data_map[tram]);
snd_emu10k1_ptr_write(emu, TANKMEMADDRREGBASE + tram, 0,
icode->tram_addr_map[tram]);
@@ -863,7 +863,7 @@
int tram;
for (tram = 0; tram < 0xa0; tram++) {
- set_bit(tram, &icode->tram_valid);
+ set_bit(tram, icode->tram_valid);
icode->tram_data_map[tram] = snd_emu10k1_ptr_read(emu,
TANKMEMDATAREGBASE + tram, 0);
icode->tram_addr_map[tram] = snd_emu10k1_ptr_read(emu,
TANKMEMADDRREGBASE + tram, 0);
}
@@ -874,7 +874,7 @@
u32 pc;
for (pc = 0; pc < 512; pc++) {
- if (!test_bit(pc, &icode->code_valid))
+ if (!test_bit(pc, icode->code_valid))
continue;
snd_emu10k1_efx_write(emu, pc * 2, icode->code[pc][0]);
snd_emu10k1_efx_write(emu, pc * 2 + 1, icode->code[pc][1]);
@@ -886,7 +886,7 @@
u32 pc;
for (pc = 0; pc < 512; pc++) {
- set_bit(pc, &icode->code_valid);
+ set_bit(pc, icode->code_valid);
icode->code[pc][0] = snd_emu10k1_efx_read(emu, pc * 2);
icode->code[pc][1] = snd_emu10k1_efx_read(emu, pc * 2 + 1);
}
@@ -1263,7 +1263,7 @@
/* clear free GPRs */
for (i = 0; i < 256; i++)
- set_bit(i, &icode->gpr_valid);
+ set_bit(i, icode->gpr_valid);
strcpy(icode->name, "Audigy DSP code for ALSA");
ptr = 0;
@@ -1537,11 +1537,11 @@
/* clear free GPRs */
for (i = 0; i < 256; i++)
- set_bit(i, &icode->gpr_valid);
+ set_bit(i, icode->gpr_valid);
/* clear TRAM data & address lines */
for (i = 0; i < 160; i++)
- set_bit(i, &icode->tram_valid);
+ set_bit(i, icode->tram_valid);
strcpy(icode->name, "SB Live! FX8010 code for ALSA v1.2 by Jaroslav Kysela");
ptr = 0; i = 0;
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
