Merge branch 'topic/emu10k1' into for-linus (fe506d6b) · Commits · e / devices / android_kernel_xiaomi_markw

sound/pci/emu10k1/emu10k1_callback.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -103,7 +103,10 @@ snd_emu10k1_synth_get_voice(struct snd_emu10k1 *hw)
		int ch;
		vp = &emu->voices[best[i].voice];
		if ((ch = vp->ch) < 0) {
		//printk("synth_get_voice: ch < 0 (%d) ??", i);
		/*
		printk(KERN_WARNING
		"synth_get_voice: ch < 0 (%d) ??", i);
		*/
		continue;
		}
		vp->emu->num_voices--;
		@@ -335,7 +338,7 @@ start_voice(struct snd_emux_voice *vp)
		return -EINVAL;
		emem->map_locked++;
		if (snd_emu10k1_memblk_map(hw, emem) < 0) {
		// printk("emu: cannot map!\n");
		/* printk(KERN_ERR "emu: cannot map!\n"); */
		return -ENOMEM;
		}
		mapped_offset = snd_emu10k1_memblk_offset(emem) >> 1;

sound/pci/emu10k1/emu10k1_main.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -711,8 +711,7 @@ static int snd_emu1010_load_firmware(struct snd_emu10k1 emu, const char filena
		static int emu1010_firmware_thread(void *data)
		{
		struct snd_emu10k1 *emu = data;
		int tmp, tmp2;
		int reg;
		u32 tmp, tmp2, reg;
		int err;

		for (;;) {
		@@ -758,7 +757,8 @@ static int emu1010_firmware_thread(void *data)
		snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n");
		snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp);
		snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2);
		snd_printk("Audio Dock ver:%d.%d\n", tmp, tmp2);
		snd_printk(KERN_INFO "Audio Dock ver: %u.%u\n",
		tmp, tmp2);
		/* Sync clocking between 1010 and Dock */
		/* Allow DLL to settle */
		msleep(10);
		@@ -804,8 +804,7 @@ static int emu1010_firmware_thread(void *data)
		static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
		{
		unsigned int i;
		int tmp, tmp2;
		int reg;
		u32 tmp, tmp2, reg;
		int err;
		const char *filename = NULL;

		@@ -887,7 +886,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
		snd_printk(KERN_INFO "emu1010: Hana Firmware loaded\n");
		snd_emu1010_fpga_read(emu, EMU_HANA_MAJOR_REV, &tmp);
		snd_emu1010_fpga_read(emu, EMU_HANA_MINOR_REV, &tmp2);
		snd_printk("emu1010: Hana version: %d.%d\n", tmp, tmp2);
		snd_printk(KERN_INFO "emu1010: Hana version: %u.%u\n", tmp, tmp2);
		/* Enable 48Volt power to Audio Dock */
		snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, EMU_HANA_DOCK_PWR_ON);

sound/pci/emu10k1/emufx.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -1519,7 +1519,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
		/* A_PUT_STEREO_OUTPUT(A_EXTOUT_FRONT_L, A_EXTOUT_FRONT_R, playback + SND_EMU10K1_PLAYBACK_CHANNELS); */
		if (emu->card_capabilities->emu_model) {
		/* EMU1010 Outputs from PCM Front, Rear, Center, LFE, Side */
		snd_printk("EMU outputs on\n");
		snd_printk(KERN_INFO "EMU outputs on\n");
		for (z = 0; z < 8; z++) {
		if (emu->card_capabilities->ca0108_chip) {
		A_OP(icode, &ptr, iACC3, A3_EMU32OUT(z), A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + z), A_C_00000000, A_C_00000000);
		@@ -1567,7 +1567,7 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))

		if (emu->card_capabilities->emu_model) {
		if (emu->card_capabilities->ca0108_chip) {
		snd_printk("EMU2 inputs on\n");
		snd_printk(KERN_INFO "EMU2 inputs on\n");
		for (z = 0; z < 0x10; z++) {
		snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp,
		bit_shifter16,
		@@ -1575,10 +1575,13 @@ A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
		A_FXBUS2(z*2) );
		}
		} else {
		snd_printk("EMU inputs on\n");
		snd_printk(KERN_INFO "EMU inputs on\n");
		/* Capture 16 (originally 8) channels of S32_LE sound */

		/* printk("emufx.c: gpr=0x%x, tmp=0x%x\n",gpr, tmp); */
		/*
		printk(KERN_DEBUG "emufx.c: gpr=0x%x, tmp=0x%x\n",
		gpr, tmp);
		*/
		/* For the EMU1010: How to get 32bit values from the DSP. High 16bits into L, low 16bits into R. */
		/* A_P16VIN(0) is delayed by one sample,
		* so all other A_P16VIN channels will need to also be delayed

sound/pci/emu10k1/emupcm.c

+30 −7

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ static void snd_emu10k1_pcm_interrupt(struct snd_emu10k1 *emu,
		if (epcm->substream == NULL)
		return;
		#if 0
		printk("IRQ: position = 0x%x, period = 0x%x, size = 0x%x\n",
		printk(KERN_DEBUG "IRQ: position = 0x%x, period = 0x%x, size = 0x%x\n",
		epcm->substream->runtime->hw->pointer(emu, epcm->substream),
		snd_pcm_lib_period_bytes(epcm->substream),
		snd_pcm_lib_buffer_bytes(epcm->substream));
		@@ -146,7 +146,11 @@ static int snd_emu10k1_pcm_channel_alloc(struct snd_emu10k1_pcm * epcm, int voic
		1,
		&epcm->extra);
		if (err < 0) {
		/* printk("pcm_channel_alloc: failed extra: voices=%d, frame=%d\n", voices, frame); */
		/*
		printk(KERN_DEBUG "pcm_channel_alloc: "
		"failed extra: voices=%d, frame=%d\n",
		voices, frame);
		*/
		for (i = 0; i < voices; i++) {
		snd_emu10k1_voice_free(epcm->emu, epcm->voices[i]);
		epcm->voices[i] = NULL;
		@@ -737,7 +741,10 @@ static int snd_emu10k1_playback_trigger(struct snd_pcm_substream *substream,
		struct snd_emu10k1_pcm_mixer *mix;
		int result = 0;

		/* printk("trigger - emu10k1 = 0x%x, cmd = %i, pointer = %i\n", (int)emu, cmd, substream->ops->pointer(substream)); */
		/*
		printk(KERN_DEBUG "trigger - emu10k1 = 0x%x, cmd = %i, pointer = %i\n",
		(int)emu, cmd, substream->ops->pointer(substream))
		*/
		spin_lock(&emu->reg_lock);
		switch (cmd) {
		case SNDRV_PCM_TRIGGER_START:
		@@ -786,7 +793,10 @@ static int snd_emu10k1_capture_trigger(struct snd_pcm_substream *substream,
		/* hmm this should cause full and half full interrupt to be raised? */
		outl(epcm->capture_ipr, emu->port + IPR);
		snd_emu10k1_intr_enable(emu, epcm->capture_inte);
		/* printk("adccr = 0x%x, adcbs = 0x%x\n", epcm->adccr, epcm->adcbs); */
		/*
		printk(KERN_DEBUG "adccr = 0x%x, adcbs = 0x%x\n",
		epcm->adccr, epcm->adcbs);
		*/
		switch (epcm->type) {
		case CAPTURE_AC97ADC:
		snd_emu10k1_ptr_write(emu, ADCCR, 0, epcm->capture_cr_val);
		@@ -857,7 +867,11 @@ static snd_pcm_uframes_t snd_emu10k1_playback_pointer(struct snd_pcm_substream *
		ptr -= runtime->buffer_size;
		}
		#endif
		/* printk("ptr = 0x%x, buffer_size = 0x%x, period_size = 0x%x\n", ptr, runtime->buffer_size, runtime->period_size); */
		/*
		printk(KERN_DEBUG
		"ptr = 0x%x, buffer_size = 0x%x, period_size = 0x%x\n",
		ptr, runtime->buffer_size, runtime->period_size);
		*/
		return ptr;
		}

		@@ -1546,7 +1560,11 @@ static void snd_emu10k1_fx8010_playback_tram_poke1(unsigned short *dst_left,
		unsigned int count,
		unsigned int tram_shift)
		{
		/* printk("tram_poke1: dst_left = 0x%p, dst_right = 0x%p, src = 0x%p, count = 0x%x\n", dst_left, dst_right, src, count); */
		/*
		printk(KERN_DEBUG "tram_poke1: dst_left = 0x%p, dst_right = 0x%p, "
		"src = 0x%p, count = 0x%x\n",
		dst_left, dst_right, src, count);
		*/
		if ((tram_shift & 1) == 0) {
		while (count--) {
		dst_left-- = src++;
		@@ -1623,7 +1641,12 @@ static int snd_emu10k1_fx8010_playback_prepare(struct snd_pcm_substream *substre
		struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
		unsigned int i;

		/* printk("prepare: etram_pages = 0x%p, dma_area = 0x%x, buffer_size = 0x%x (0x%x)\n", emu->fx8010.etram_pages, runtime->dma_area, runtime->buffer_size, runtime->buffer_size << 2); */
		/*
		printk(KERN_DEBUG "prepare: etram_pages = 0x%p, dma_area = 0x%x, "
		"buffer_size = 0x%x (0x%x)\n",
		emu->fx8010.etram_pages, runtime->dma_area,
		runtime->buffer_size, runtime->buffer_size << 2);
		*/
		memset(&pcm->pcm_rec, 0, sizeof(pcm->pcm_rec));
		pcm->pcm_rec.hw_buffer_size = pcm->buffer_size * 2; /* byte size */
		pcm->pcm_rec.sw_buffer_size = snd_pcm_lib_buffer_bytes(substream);

sound/pci/emu10k1/io.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -226,7 +226,9 @@ int snd_emu10k1_i2c_write(struct snd_emu10k1 *emu,
		break;

		if (timeout > 1000) {
		snd_printk("emu10k1:I2C:timeout status=0x%x\n", status);
		snd_printk(KERN_WARNING
		"emu10k1:I2C:timeout status=0x%x\n",
		status);
		break;
		}
		}