Update of /cvsroot/alsa/alsa-driver/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21578/pci

Modified Files:
        cs4281.patch es1968.patch intel8x0.patch maestro3.patch 
Log Message:
use the new module_param*() functions.
added wrapper functions for older kernels.









Index: cs4281.patch
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/cs4281.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cs4281.patch        18 Jun 2003 11:12:52 -0000      1.1
+++ cs4281.patch        7 Apr 2004 17:53:40 -0000       1.2
@@ -1,6 +1,6 @@
---- cs4281.c   2003-06-10 15:21:01.000000000 +0200
-+++ cs4281.c.old       2003-06-10 15:20:49.000000000 +0200
-@@ -2119,6 +2119,7 @@
+--- cs4281.c   2004-04-07 16:51:11.897147390 +0200
++++ cs4281.c   2004-04-07 18:33:11.039877468 +0200
+@@ -2117,6 +2117,7 @@
        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
  }
  
@@ -8,7 +8,7 @@
  static int snd_cs4281_suspend(struct pci_dev *dev, u32 state)
  {
        cs4281_t *chip = snd_magic_cast(cs4281_t, pci_get_drvdata(dev), return -ENXIO);
-@@ -2131,6 +2132,18 @@
+@@ -2129,6 +2130,18 @@
        cs4281_resume(chip);
        return 0;
  }
@@ -27,8 +27,9 @@
  
  /* callback */
  static int snd_cs4281_set_power_state(snd_card_t *card, unsigned int power_state)
-@@ -2206,3 +2219,4 @@
- __setup("snd-cs4281=", alsa_card_cs4281_setup);
+@@ -2183,3 +2196,5 @@
  
- #endif /* ifndef MODULE */
+ module_init(alsa_card_cs4281_init)
+ module_exit(alsa_card_cs4281_exit)
++
 +EXPORT_NO_SYMBOLS;

Index: es1968.patch
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/es1968.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- es1968.patch        18 Jun 2003 11:12:52 -0000      1.1
+++ es1968.patch        7 Apr 2004 17:53:40 -0000       1.2
@@ -1,6 +1,6 @@
---- es1968.c   2003-06-10 15:20:37.000000000 +0200
-+++ es1968.c.old       2003-06-10 15:20:22.000000000 +0200
-@@ -2468,6 +2468,7 @@
+--- es1968.c   2004-04-07 16:58:13.077604048 +0200
++++ es1968.c   2004-04-07 18:33:54.181116422 +0200
+@@ -2463,6 +2463,7 @@
        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
  }
  
@@ -8,7 +8,7 @@
  static int snd_es1968_suspend(struct pci_dev *dev, u32 state)
  {
        es1968_t *chip = snd_magic_cast(es1968_t, pci_get_drvdata(dev), return -ENXIO);
-@@ -2480,6 +2481,18 @@
+@@ -2475,6 +2476,18 @@
        es1968_resume(chip);
        return 0;
  }
@@ -27,8 +27,9 @@
  
  /* callback */
  static int snd_es1968_set_power_state(snd_card_t *card, unsigned int power_state)
-@@ -2868,3 +2881,4 @@
- __setup("snd-es1968=", alsa_card_es1968_setup);
+@@ -2811,3 +2824,5 @@
  
- #endif /* ifndef MODULE */
+ module_init(alsa_card_es1968_init)
+ module_exit(alsa_card_es1968_exit)
++
 +EXPORT_NO_SYMBOLS;

Index: intel8x0.patch
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/intel8x0.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- intel8x0.patch      27 Feb 2004 13:14:30 -0000      1.3
+++ intel8x0.patch      7 Apr 2004 17:53:40 -0000       1.4
@@ -1,5 +1,5 @@
---- intel8x0.c 2004-01-26 12:26:04.000000000 +0100
-+++ intel8x0.c 2004-01-26 12:26:35.000000000 +0100
+--- intel8x0.c 2004-04-07 16:59:38.351259987 +0200
++++ intel8x0.c 2004-04-07 18:32:11.698303544 +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");
-@@ -725,7 +727,7 @@
+@@ -751,7 +753,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
-@@ -736,7 +738,9 @@
+@@ -762,7 +764,9 @@
  {
        size = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
        change_page_attr(virt_to_page(buf), size, nocache ? PAGE_KERNEL_NOCACHE : 
PAGE_KERNEL);
@@ -29,7 +29,7 @@
  }
  #else
  #define fill_nocache(buf,size,nocache)
-@@ -2139,6 +2143,7 @@
+@@ -2235,6 +2239,7 @@
        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
  }
  
@@ -37,7 +37,7 @@
  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);
-@@ -2151,6 +2156,18 @@
+@@ -2247,6 +2252,18 @@
        intel8x0_resume(chip);
        return 0;
  }
@@ -56,8 +56,9 @@
  
  /* callback */
  static int snd_intel8x0_set_power_state(snd_card_t *card, unsigned int power_state)
-@@ -2789,3 +2806,4 @@
- __setup("snd-intel8x0=", alsa_card_intel8x0_setup);
+@@ -2863,3 +2880,5 @@
  
- #endif /* ifndef MODULE */
+ module_init(alsa_card_intel8x0_init)
+ module_exit(alsa_card_intel8x0_exit)
++
 +EXPORT_NO_SYMBOLS;

Index: maestro3.patch
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/maestro3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maestro3.patch      18 Jun 2003 11:12:52 -0000      1.1
+++ maestro3.patch      7 Apr 2004 17:53:40 -0000       1.2
@@ -1,6 +1,6 @@
---- maestro3.c 2003-06-10 15:23:49.000000000 +0200
-+++ maestro3.c.old     2003-06-10 15:23:56.000000000 +0200
-@@ -2458,6 +2458,7 @@
+--- maestro3.c 2004-04-07 16:58:50.933016666 +0200
++++ maestro3.c 2004-04-07 18:31:35.451504163 +0200
+@@ -2484,6 +2484,7 @@
        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
  }
  
@@ -8,7 +8,7 @@
  static int snd_m3_suspend(struct pci_dev *pci, u32 state)
  {
        m3_t *chip = snd_magic_cast(m3_t, pci_get_drvdata(pci), return -ENXIO);
-@@ -2470,6 +2471,18 @@
+@@ -2496,6 +2497,18 @@
        m3_resume(chip);
        return 0;
  }
@@ -27,8 +27,9 @@
  
  /* callback */
  static int snd_m3_set_power_state(snd_card_t *card, unsigned int power_state)
-@@ -2769,3 +2782,4 @@
- __setup("snd-maestro3=", alsa_card_maestro3_setup);
+@@ -2783,3 +2796,5 @@
  
- #endif /* ifndef MODULE */
+ module_init(alsa_card_m3_init)
+ module_exit(alsa_card_m3_exit)
++
 +EXPORT_NO_SYMBOLS;



-------------------------------------------------------
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

Reply via email to