patch-1.3.69 linux/drivers/sound/audio.c

• Lines: 37
• Date: Fri Feb 23 17:31:04 1996
• Orig file: v1.3.68/linux/drivers/sound/audio.c
• Orig date: Sat Feb 17 16:02:52 1996

diff -u --recursive --new-file v1.3.68/linux/drivers/sound/audio.c linux/drivers/sound/audio.c
@@ -67,7 +67,7 @@
 	else
 	  fmt = AFMT_U8;	/* This is always supported */
 
-      audio_format[dev] = DMAbuf_ioctl (dev, SNDCTL_DSP_SETFMT, (caddr_t) (long) fmt, 1);
+      audio_format[dev] = DMAbuf_ioctl (dev, SNDCTL_DSP_SETFMT, (caddr_t) fmt, 1);
     }
 
   if (local_conversion[dev])	/* This shadows the HW format */
@@ -145,6 +145,9 @@
   dev = dev >> 4;
   mode = file->mode & O_ACCMODE;
 
+  audio_devs[dev]->dmap_out->closing = 1;
+  audio_devs[dev]->dmap_in->closing = 1;
+
   sync_output (dev);
 
   if (audio_devs[dev]->coproc)
@@ -366,7 +369,7 @@
 	break;
 
       case SNDCTL_DSP_GETFMTS:
-	return snd_ioctl_return ((int *) arg, audio_devs[dev]->format_mask);
+	return snd_ioctl_return ((int *) arg, audio_devs[dev]->format_mask | AFMT_MU_LAW);
 	break;
 
       case SNDCTL_DSP_SETFMT:
@@ -429,6 +432,8 @@
 
 	  if (audio_devs[dev]->trigger)		/* Supports SETTRIGGER */
 	    info |= DSP_CAP_TRIGGER;
+
+	  info |= DSP_CAP_MMAP;
 
 	  memcpy_tofs ((&((char *) arg)[0]), (char *) &info, sizeof (info));
 	  return 0;