Update of /cvsroot/alsa/alsa-kernel/pci/cs46xx
In directory usw-pr-cvs1:/tmp/cvs-serv21790/pci/cs46xx
Modified Files:
dsp_spos.c dsp_spos_scb_lib.c
Log Message:
Removal of save_flags/cli/restore_flags for 2.5
Index: dsp_spos.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs46xx/dsp_spos.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dsp_spos.c 30 Sep 2002 11:18:29 -0000 1.8
+++ dsp_spos.c 3 Oct 2002 10:35:18 -0000 1.9
@@ -1595,8 +1595,7 @@
ins->spdif_in_src,
SCB_ON_PARENT_SUBLIST_SCB);
- save_flags(flags);
- cli();
+ spin_lock_irq(&chip->reg_lock);
/* reset SPDIF input sample buffer pointer */
snd_cs46xx_poke (chip, (SPDIFI_SCB_INST + 0x0c) << 2,
@@ -1609,7 +1608,7 @@
/* restore SPDIF input volume */
snd_cs46xx_poke(chip, (ASYNCRX_SCB_ADDR + 0xE) << 2, ins->spdif_input_volume);
snd_cs46xx_poke(chip, (ASYNCRX_SCB_ADDR + 0xF) << 2, ins->spdif_input_volume);
- restore_flags(flags);
+ spin_unlock_irq(&chip->reg_lock);
/* set SPDIF input sample rate and unmute
NOTE: only 48khz support for SPDIF input this time */
Index: dsp_spos_scb_lib.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs46xx/dsp_spos_scb_lib.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dsp_spos_scb_lib.c 23 Aug 2002 15:51:18 -0000 1.8
+++ dsp_spos_scb_lib.c 3 Oct 2002 10:35:19 -0000 1.9
@@ -1426,14 +1426,10 @@
src->parent_scb_ptr = parent_scb;
/* update entry in DSP RAM */
- spin_lock_irqsave(&chip->reg_lock, flags);
snd_cs46xx_poke(chip,
(parent_scb->address + SCBsubListPtr) << 2,
(parent_scb->sub_list_ptr->address << 0x10) |
(parent_scb->next_scb_ptr->address));
-
-
- spin_unlock_irqrestore(&chip->reg_lock, flags);
return 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
