Changeset 92 for GPL/branches/alsa-resync1/alsa-kernel/drivers/dummy.c

Timestamp:

May 2, 2007, 9:13:43 AM (19 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/drivers/dummy.c (modified) (5 diffs)

GPL/branches/alsa-resync1/alsa-kernel/drivers/dummy.c

@@ -15 +15 @@
  *   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
  *
  */
 
-#define SNDRV_MAIN_OBJECT_FILE
 #include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/time.h>
+#include <linux/wait.h>
+#include <sound/core.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
@@ -26 +31 @@
 #define SNDRV_GET_ID
 #include <sound/initval.h>
+
+EXPORT_NO_SYMBOLS;
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
@@ -609 +616 @@
         if (snd_card_dummy_probe(dev) < 0) {
 #ifdef MODULE
-            snd_printk("Dummy soundcard #%i not found or device busy\n", dev + 1);
+                        printk(KERN_ERR "Dummy soundcard #%i not found or device busy\n", dev + 1);
 #endif
             break;
@@ -617 +624 @@
     if (!cards) {
 #ifdef MODULE
-        snd_printk("Dummy soundcard not found or device busy\n");
+                printk(KERN_ERR "Dummy soundcard not found or device busy\n");
 #endif
         return -ENODEV;
@@ -637 +644 @@
 #ifndef MODULE
 
-/* format is: snd-card-dummy=snd_enable,snd_index,snd_id,
+/* format is: snd-dummy=snd_enable,snd_index,snd_id,
  snd_pcm_devs,snd_pcm_substreams */