Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0d2054f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/misc' into for-linus

parents d807500a c468ac29

include/sound/pcm.h

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ struct snd_pcm_notify { 


extern const struct file_operations snd_pcm_f_ops[2];



int snd_pcm_new(struct snd_card *card, char *id, int device,

int snd_pcm_new(struct snd_card *card, const char *id, int device,

		int playback_count, int capture_count,

		struct snd_pcm **rpcm);

int snd_pcm_new_stream(struct snd_pcm *pcm, int stream, int substream_count);

include/sound/version.h

+1 −1
Original line number Diff line number Diff line 
/* include/version.h */

#define CONFIG_SND_VERSION "1.0.18a"

#define CONFIG_SND_VERSION "1.0.19"

#define CONFIG_SND_DATE ""

sound/core/oss/pcm_oss.c

+31 −18
Original line number Diff line number Diff line
@@ -1160,9 +1160,11 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, const 
		    runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {

#ifdef OSS_DEBUG

			if (runtime->status->state == SNDRV_PCM_STATE_XRUN)

				printk("pcm_oss: write: recovering from XRUN\n");

				printk(KERN_DEBUG "pcm_oss: write: "

				       "recovering from XRUN\n");

			else

				printk("pcm_oss: write: recovering from SUSPEND\n");

				printk(KERN_DEBUG "pcm_oss: write: "

				       "recovering from SUSPEND\n");

#endif

			ret = snd_pcm_oss_prepare(substream);

			if (ret < 0)
@@ -1196,9 +1198,11 @@ snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, char *p 
		    runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {

#ifdef OSS_DEBUG

			if (runtime->status->state == SNDRV_PCM_STATE_XRUN)

				printk("pcm_oss: read: recovering from XRUN\n");

				printk(KERN_DEBUG "pcm_oss: read: "

				       "recovering from XRUN\n");

			else

				printk("pcm_oss: read: recovering from SUSPEND\n");

				printk(KERN_DEBUG "pcm_oss: read: "

				       "recovering from SUSPEND\n");

#endif

			ret = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DRAIN, NULL);

			if (ret < 0)
@@ -1242,9 +1246,11 @@ snd_pcm_sframes_t snd_pcm_oss_writev3(struct snd_pcm_substream *substream, void 
		    runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {

#ifdef OSS_DEBUG

			if (runtime->status->state == SNDRV_PCM_STATE_XRUN)

				printk("pcm_oss: writev: recovering from XRUN\n");

				printk(KERN_DEBUG "pcm_oss: writev: "

				       "recovering from XRUN\n");

			else

				printk("pcm_oss: writev: recovering from SUSPEND\n");

				printk(KERN_DEBUG "pcm_oss: writev: "

				       "recovering from SUSPEND\n");

#endif

			ret = snd_pcm_oss_prepare(substream);

			if (ret < 0)
@@ -1278,9 +1284,11 @@ snd_pcm_sframes_t snd_pcm_oss_readv3(struct snd_pcm_substream *substream, void * 
		    runtime->status->state == SNDRV_PCM_STATE_SUSPENDED) {

#ifdef OSS_DEBUG

			if (runtime->status->state == SNDRV_PCM_STATE_XRUN)

				printk("pcm_oss: readv: recovering from XRUN\n");

				printk(KERN_DEBUG "pcm_oss: readv: "

				       "recovering from XRUN\n");

			else

				printk("pcm_oss: readv: recovering from SUSPEND\n");

				printk(KERN_DEBUG "pcm_oss: readv: "

				       "recovering from SUSPEND\n");

#endif

			ret = snd_pcm_kernel_ioctl(substream, SNDRV_PCM_IOCTL_DRAIN, NULL);

			if (ret < 0)
@@ -1533,7 +1541,7 @@ static int snd_pcm_oss_sync1(struct snd_pcm_substream *substream, size_t size) 
	init_waitqueue_entry(&wait, current);

	add_wait_queue(&runtime->sleep, &wait);

#ifdef OSS_DEBUG

	printk("sync1: size = %li\n", size);

	printk(KERN_DEBUG "sync1: size = %li\n", size);

#endif

	while (1) {

		result = snd_pcm_oss_write2(substream, runtime->oss.buffer, size, 1);
@@ -1590,7 +1598,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file) 
		mutex_lock(&runtime->oss.params_lock);

		if (runtime->oss.buffer_used > 0) {

#ifdef OSS_DEBUG

			printk("sync: buffer_used\n");

			printk(KERN_DEBUG "sync: buffer_used\n");

#endif

			size = (8 * (runtime->oss.period_bytes - runtime->oss.buffer_used) + 7) / width;

			snd_pcm_format_set_silence(format,
@@ -1603,7 +1611,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file) 
			}

		} else if (runtime->oss.period_ptr > 0) {

#ifdef OSS_DEBUG

			printk("sync: period_ptr\n");

			printk(KERN_DEBUG "sync: period_ptr\n");

#endif

			size = runtime->oss.period_bytes - runtime->oss.period_ptr;

			snd_pcm_format_set_silence(format,
@@ -1952,7 +1960,7 @@ static int snd_pcm_oss_set_trigger(struct snd_pcm_oss_file *pcm_oss_file, int tr 
	int err, cmd;



#ifdef OSS_DEBUG

	printk("pcm_oss: trigger = 0x%x\n", trigger);

	printk(KERN_DEBUG "pcm_oss: trigger = 0x%x\n", trigger);

#endif

	

	psubstream = pcm_oss_file->streams[SNDRV_PCM_STREAM_PLAYBACK];
@@ -2170,7 +2178,9 @@ static int snd_pcm_oss_get_space(struct snd_pcm_oss_file *pcm_oss_file, int stre 
	}



#ifdef OSS_DEBUG

	printk("pcm_oss: space: bytes = %i, fragments = %i, fragstotal = %i, fragsize = %i\n", info.bytes, info.fragments, info.fragstotal, info.fragsize);

	printk(KERN_DEBUG "pcm_oss: space: bytes = %i, fragments = %i, "

	       "fragstotal = %i, fragsize = %i\n",

	       info.bytes, info.fragments, info.fragstotal, info.fragsize);

#endif

	if (copy_to_user(_info, &info, sizeof(info)))

		return -EFAULT;
@@ -2473,7 +2483,7 @@ static long snd_pcm_oss_ioctl(struct file *file, unsigned int cmd, unsigned long 
	if (((cmd >> 8) & 0xff) != 'P')

		return -EINVAL;

#ifdef OSS_DEBUG

	printk("pcm_oss: ioctl = 0x%x\n", cmd);

	printk(KERN_DEBUG "pcm_oss: ioctl = 0x%x\n", cmd);

#endif

	switch (cmd) {

	case SNDCTL_DSP_RESET:
@@ -2627,7 +2637,8 @@ static ssize_t snd_pcm_oss_read(struct file *file, char __user *buf, size_t coun 
#else

	{

		ssize_t res = snd_pcm_oss_read1(substream, buf, count);

		printk("pcm_oss: read %li bytes (returned %li bytes)\n", (long)count, (long)res);

		printk(KERN_DEBUG "pcm_oss: read %li bytes "

		       "(returned %li bytes)\n", (long)count, (long)res);

		return res;

	}

#endif
@@ -2646,7 +2657,8 @@ static ssize_t snd_pcm_oss_write(struct file *file, const char __user *buf, size 
	substream->f_flags = file->f_flags & O_NONBLOCK;

	result = snd_pcm_oss_write1(substream, buf, count);

#ifdef OSS_DEBUG

	printk("pcm_oss: write %li bytes (wrote %li bytes)\n", (long)count, (long)result);

	printk(KERN_DEBUG "pcm_oss: write %li bytes (wrote %li bytes)\n",

	       (long)count, (long)result);

#endif

	return result;

}
@@ -2720,7 +2732,7 @@ static int snd_pcm_oss_mmap(struct file *file, struct vm_area_struct *area) 
	int err;



#ifdef OSS_DEBUG

	printk("pcm_oss: mmap begin\n");

	printk(KERN_DEBUG "pcm_oss: mmap begin\n");

#endif

	pcm_oss_file = file->private_data;

	switch ((area->vm_flags & (VM_READ | VM_WRITE))) {
@@ -2770,7 +2782,8 @@ static int snd_pcm_oss_mmap(struct file *file, struct vm_area_struct *area) 
	runtime->silence_threshold = 0;

	runtime->silence_size = 0;

#ifdef OSS_DEBUG

	printk("pcm_oss: mmap ok, bytes = 0x%x\n", runtime->oss.mmap_bytes);

	printk(KERN_DEBUG "pcm_oss: mmap ok, bytes = 0x%x\n",

	       runtime->oss.mmap_bytes);

#endif

	/* In mmap mode we never stop */

	runtime->stop_threshold = runtime->boundary;

sound/core/oss/pcm_plugin.h

+2 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static inline int snd_pcm_plug_slave_format(int format, struct snd_mask *format_ 
#endif



#ifdef PLUGIN_DEBUG

#define pdprintf( fmt, args... ) printk( "plugin: " fmt, ##args)

#define pdprintf(fmt, args...) printk(KERN_DEBUG "plugin: " fmt, ##args)

#else

#define pdprintf(fmt, args...)

#endif

sound/core/pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ EXPORT_SYMBOL(snd_pcm_new_stream); 
 *

 * Returns zero if successful, or a negative error code on failure.

 */

int snd_pcm_new(struct snd_card *card, char *id, int device,

int snd_pcm_new(struct snd_card *card, const char *id, int device,

		int playback_count, int capture_count,

	        struct snd_pcm ** rpcm)

{