[alsa-cvslog] CVS: alsa-kernel/core hwdep.c,1.12,1.13 rawmidi.c,1.20,1.21

[Takashi Iwai]

Update of /cvsroot/alsa/alsa-kernel/core
In directory usw-pr-cvs1:/tmp/cvs-serv29022

Modified Files:
        hwdep.c rawmidi.c 
Log Message:
fixed the ifdef condition of OSS emulation.



Index: hwdep.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/hwdep.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- hwdep.c     13 Oct 2002 13:16:38 -0000      1.12
+++ hwdep.c     14 Oct 2002 09:42:34 -0000      1.13
@@ -327,7 +327,7 @@
                up(&register_mutex);
                return err;
        }
-#ifdef SNDRV_OSS_INFO_DEV_AUDIO
+#ifdef CONFIG_SND_OSSEMUL
        hwdep->ossreg = 0;
        if (hwdep->oss_type >= 0) {
                if ((hwdep->oss_type == SNDRV_OSS_DEVICE_TYPE_DMFM) && (hwdep->device 
!= 0)) {
@@ -359,7 +359,7 @@
                up(&register_mutex);
                return -EINVAL;
        }
-#ifdef SNDRV_OSS_INFO_DEV_AUDIO
+#ifdef CONFIG_SND_OSSEMUL
        if (hwdep->ossreg)
                snd_unregister_oss_device(hwdep->oss_type, hwdep->card, hwdep->device);
 #endif

Index: rawmidi.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/rawmidi.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rawmidi.c   13 Oct 2002 13:16:39 -0000      1.20
+++ rawmidi.c   14 Oct 2002 09:42:35 -0000      1.21
@@ -1417,7 +1417,7 @@
                up(&register_mutex);
                return err;
        }
-#ifdef SNDRV_OSS_INFO_DEV_AUDIO
+#ifdef CONFIG_SND_OSSEMUL
        rmidi->ossreg = 0;
        if (rmidi->device == snd_midi_map[rmidi->card->number]) {
                if (snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MIDI,
@@ -1425,7 +1425,9 @@
                        snd_printk(KERN_ERR "unable to register OSS rawmidi device 
%i:%i\n", rmidi->card->number, 0);
                } else {
                        rmidi->ossreg++;
+#ifdef SNDRV_OSS_INFO_DEV_MIDI
                        snd_oss_info_register(SNDRV_OSS_INFO_DEV_MIDI, 
rmidi->card->number, rmidi->name);
+#endif
                }
        }
        if (rmidi->device == snd_amidi_map[rmidi->card->number]) {
@@ -1436,7 +1438,7 @@
                        rmidi->ossreg++;
                }
        }
-#endif
+#endif /* CONFIG_SND_OSSEMUL */
        up(&register_mutex);
        sprintf(name, "midi%d", rmidi->device);
        entry = snd_info_create_card_entry(rmidi->card, name, rmidi->card->proc_root);
@@ -1480,17 +1482,19 @@
                snd_info_unregister(rmidi->proc_entry);
                rmidi->proc_entry = NULL;
        }
-#ifdef SNDRV_OSS_INFO_DEV_AUDIO
+#ifdef CONFIG_SND_OSSEMUL
        if (rmidi->ossreg) {
                if (rmidi->device == snd_midi_map[rmidi->card->number]) {
                        snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_MIDI, 
rmidi->card, 0);
+#ifdef SNDRV_OSS_INFO_DEV_MIDI
                        snd_oss_info_unregister(SNDRV_OSS_INFO_DEV_MIDI, 
rmidi->card->number);
+#endif
                }
                if (rmidi->device == snd_amidi_map[rmidi->card->number])
                        snd_unregister_oss_device(SNDRV_OSS_DEVICE_TYPE_MIDI, 
rmidi->card, 1);
                rmidi->ossreg = 0;
        }
-#endif
+#endif /* CONFIG_SND_OSSEMUL */
        if (rmidi->ops && rmidi->ops->dev_unregister)
                rmidi->ops->dev_unregister(rmidi);
        snd_unregister_device(SNDRV_DEVICE_TYPE_RAWMIDI, rmidi->card, rmidi->device);



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog