Changeset 92 for GPL/branches/alsa-resync1/alsa-kernel/isa/cmi8330.c

Timestamp:

May 2, 2007, 9:13:43 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged 0.9.0beta6 to 0.9.0beta12. Fixed a few compilation errors.
Left include/sound/driver.h at beta9 until I figure out why it contains
so many modifications to sections that were removed in beta10.
Does not yet build. Needs more fixing.
Added a few new files that were in the copy Paul gave me to work from.

File:

• GPL/branches/alsa-resync1/alsa-kernel/isa/cmi8330.c (modified) (8 diffs)

GPL/branches/alsa-resync1/alsa-kernel/isa/cmi8330.c

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */
@@ -44 +44 @@
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
-
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
 #include <sound/ad1848.h>
 #include <sound/sb.h>
@@ -53 +54 @@
 
 EXPORT_NO_SYMBOLS;
+
+MODULE_AUTHOR("George Talusan <gstalusan@uwaterloo.ca>");
 MODULE_DESCRIPTION("C-Media CMI8330");
+MODULE_LICENSE("GPL");
 MODULE_CLASSES("{sound}");
 MODULE_DEVICES("{{C-Media,CMI8330,isapnp:{CMI0001,@@@0001,@X@0001}}}");
@@ -75 +79 @@
 static int snd_wssdma[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;
 
-MODULE_AUTHOR("George Talusan <gstalusan@uwaterloo.ca>");
 MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
 MODULE_PARM_DESC(snd_index, "Index value for CMI8330 soundcard.");
@@ -499 +502 @@
         if (!cards) {
 #ifdef MODULE
-                snd_printk("CMI8330 not found or device busy\n");
+                printk(KERN_ERR "CMI8330 not found or device busy\n");
 #endif
                 return -ENODEV;
@@ -511 +514 @@
 #ifndef MODULE
 
-/* format is: snd-card-cmi8330=snd_enable,snd_index,snd_id,snd_isapnp,
+/* format is: snd-cmi8330=snd_enable,snd_index,snd_id,snd_isapnp,
                                snd_sbport,snd_sbirq,
                                snd_sbdma8,snd_sbdma16,
@@ -532 +535 @@
                get_option(&str,&snd_sbdma8[nr_dev]) == 2 &&
                get_option(&str,&snd_sbdma16[nr_dev]) == 2 &&
-               get_option(&str,&snd_wssport[nr_dev]) == 2 &&
+               get_option(&str,(int *)&snd_wssport[nr_dev]) == 2 &&
                get_option(&str,&snd_wssirq[nr_dev]) == 2 &&
                get_option(&str,&snd_wssdma[nr_dev]) == 2);
@@ -543 +546 @@
 }
 
-__setup("snd-card-cmi8330=", alsa_card_cmi8330_setup);
+__setup("snd-cmi8330=", alsa_card_cmi8330_setup);
 
 #endif /* ifndef MODULE */