Update of /cvsroot/alsa/alsa-driver/pci/trident
In directory sc8-pr-cvs1:/tmp/cvs-serv4448/trident

Modified Files:
        .cvsignore Makefile 
Added Files:
        trident.patch 
Removed Files:
        trident.c 
Log Message:
clean up PM codes; moved the old part to patch

--- NEW FILE: trident.patch ---
--- trident.c   2003-06-10 15:25:34.000000000 +0200
+++ trident.c.old       2003-06-10 15:25:09.000000000 +0200
@@ -182,6 +182,7 @@
 }
 
 #ifdef CONFIG_PM
+#ifndef PCI_OLD_SUSPEND
 static int snd_card_trident_suspend(struct pci_dev *pci, u32 state)
 {
        trident_t *chip = snd_magic_cast(trident_t, pci_get_drvdata(pci), return 
-ENXIO);
@@ -194,6 +195,18 @@
        snd_trident_resume(chip);
        return 0;
 }
+#else
+static void snd_card_trident_suspend(struct pci_dev *pci)
+{
+       trident_t *chip = snd_magic_cast(trident_t, pci_get_drvdata(pci), return);
+       snd_trident_suspend(chip);
+}
+static void snd_card_trident_resume(struct pci_dev *pci)
+{
+       trident_t *chip = snd_magic_cast(trident_t, pci_get_drvdata(pci), return);
+       snd_trident_resume(chip);
+}
+#endif
 #endif
 
 static struct pci_driver driver = {

Index: .cvsignore
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/trident/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore  22 Dec 2001 20:46:15 -0000      1.1
+++ .cvsignore  18 Jun 2003 11:12:53 -0000      1.2
@@ -1 +1,2 @@
 .depend
+trident.c

Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/trident/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile    9 Feb 2003 18:35:58 -0000       1.3
+++ Makefile    18 Jun 2003 11:12:53 -0000      1.4
@@ -3,9 +3,13 @@
 include $(TOPDIR)/toplevel.config
 include $(TOPDIR)/Makefile.conf
 
+EXTRA_CLEAN = trident.c
+
 export-objs  := trident_main.o
 
 TOPDIR = $(MAINSRCDIR)
 include $(TOPDIR)/alsa-kernel/pci/trident/Makefile
 
 include $(TOPDIR)/Rules.make
+
+trident.c: trident.patch $(TOPDIR)/alsa-kernel/pci/trident/trident.c

--- trident.c DELETED ---



-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

Reply via email to