Update of /cvsroot/alsa/alsa-driver/pci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19788/pci
Modified Files: .cvsignore Makefile intel8x0.patch Added Files: cs4281.c es1968.c maestro3.c Removed Files: cs4281.patch es1968.patch maestro3.patch Log Message: Clean up of power-management codes. - moved commonly used codes to the core layer. - using the unified suspend/resume callbacks for PCI and ISA - added snd_card_set_pm_callbacks() and snd_card_set_isa_pm_callbacks() as the registration functions. Index: .cvsignore =================================================================== RCS file: /cvsroot/alsa/alsa-driver/pci/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Nov 2003 17:32:40 -0000 1.3 +++ .cvsignore 8 Apr 2004 16:38:15 -0000 1.4 @@ -1,8 +1,5 @@ .depend -cs4281.c -es1968.c intel8x0.c -maestro3.c .*.cmd *.ko *.mod.c Index: Makefile =================================================================== RCS file: /cvsroot/alsa/alsa-driver/pci/Makefile,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- Makefile 17 Mar 2004 11:13:03 -0000 1.23 +++ Makefile 8 Apr 2004 16:38:15 -0000 1.24 @@ -9,7 +9,7 @@ # ALSA extra code # -clean-files := cs4281.c es1968.c intel8x0.c maestro3.c +clean-files := intel8x0.c obj-$(CONFIG_SND) += pdplus/ @@ -25,7 +25,4 @@ include $(SND_TOPDIR)/Rules.make -cs4281.c: cs4281.patch $(SND_TOPDIR)/alsa-kernel/pci/cs4281.c -es1968.c: es1968.patch $(SND_TOPDIR)/alsa-kernel/pci/es1968.c intel8x0.c: intel8x0.patch $(SND_TOPDIR)/alsa-kernel/pci/intel8x0.c -maestro3.c: maestro3.patch $(SND_TOPDIR)/alsa-kernel/pci/maestro3.c Index: intel8x0.patch =================================================================== RCS file: /cvsroot/alsa/alsa-driver/pci/intel8x0.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- intel8x0.patch 7 Apr 2004 17:53:40 -0000 1.4 +++ intel8x0.patch 8 Apr 2004 16:38:16 -0000 1.5 @@ -1,5 +1,5 @@ ---- intel8x0.c 2004-04-07 16:59:38.351259987 +0200 -+++ intel8x0.c 2004-04-07 18:32:11.698303544 +0200 +--- intel8x0.c 2004-04-08 15:21:31.571408477 +0200 ++++ intel8x0.c 2004-04-08 15:23:17.550321555 +0200 @@ -43,7 +43,9 @@ #include <sound/initval.h> /* for 440MX workaround */ @@ -10,7 +10,7 @@ MODULE_AUTHOR("Jaroslav Kysela <[EMAIL PROTECTED]>"); MODULE_DESCRIPTION("Intel 82801AA,82901AB,i810,i820,i830,i840,i845,MX440; SiS 7012; Ali 5455"); -@@ -751,7 +753,7 @@ +@@ -747,7 +749,7 @@ iputbyte(chip, port + ichdev->roff_sr, ICH_FIFOE | ICH_BCIS | ICH_LVBCI); } @@ -19,7 +19,7 @@ /* * Intel 82443MX running a 100MHz processor system bus has a hardware bug, * which aborts PCI busmaster for audio transfer. A workaround is to set -@@ -762,7 +764,9 @@ +@@ -758,7 +760,9 @@ { size = (size + PAGE_SIZE - 1) >> PAGE_SHIFT; change_page_attr(virt_to_page(buf), size, nocache ? PAGE_KERNEL_NOCACHE : PAGE_KERNEL); @@ -29,34 +29,7 @@ } #else #define fill_nocache(buf,size,nocache) -@@ -2235,6 +2239,7 @@ - snd_power_change_state(card, SNDRV_CTL_POWER_D0); - } - -+#ifndef PCI_OLD_SUSPEND - static int snd_intel8x0_suspend(struct pci_dev *dev, u32 state) - { - intel8x0_t *chip = snd_magic_cast(intel8x0_t, pci_get_drvdata(dev), return -ENXIO); -@@ -2247,6 +2252,18 @@ - intel8x0_resume(chip); - return 0; - } -+#else -+static void snd_intel8x0_suspend(struct pci_dev *dev) -+{ -+ intel8x0_t *chip = snd_magic_cast(intel8x0_t, pci_get_drvdata(dev), return); -+ intel8x0_suspend(chip); -+} -+static void snd_intel8x0_resume(struct pci_dev *dev) -+{ -+ intel8x0_t *chip = snd_magic_cast(intel8x0_t, pci_get_drvdata(dev), return); -+ intel8x0_resume(chip); -+} -+#endif - - /* callback */ - static int snd_intel8x0_set_power_state(snd_card_t *card, unsigned int power_state) -@@ -2863,3 +2880,5 @@ +@@ -2809,3 +2813,5 @@ module_init(alsa_card_intel8x0_init) module_exit(alsa_card_intel8x0_exit) --- cs4281.patch DELETED --- --- es1968.patch DELETED --- --- maestro3.patch DELETED --- ------------------------------------------------------- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog