ALSA CVS update - Takashi Iwai <tiwai@suse.de>

MIXART driver
- replaced the debug messages with snd_printdd().

sound/pci/mixart/mixart.c

@@ -198,7 +198,7 @@ static int mixart_set_clock(mixart_mgr_t *mgr, mixart_pipe_t *pipe, unsigned int
 	clock_properties.nb_callers = 1; /* only one entry in uid_caller ! */
 	clock_properties.uid_caller[0] = pipe->group_uid;
 
-	snd_printk(KERN_DEBUG "mixart_set_clock to %d kHz\n", rate);
+	snd_printdd("mixart_set_clock to %d kHz\n", rate);
 
 	request.message_id = MSG_CLOCK_SET_PROPERTIES;
 	request.uid = mgr->uid_console_manager;
@@ -253,7 +253,7 @@ mixart_pipe_t* snd_mixart_add_ref_pipe( mixart_t *chip, int pcm_number, int capt
 		mixart_streaming_group_t streaming_group_resp;
 		mixart_streaming_group_req_t streaming_group_req;
 
-		snd_printk(KERN_DEBUG "add_ref_pipe audio chip(%d) pcm(%d)\n", chip->chip_idx, pcm_number);
+		snd_printdd("add_ref_pipe audio chip(%d) pcm(%d)\n", chip->chip_idx, pcm_number);
 
 		request.uid = (mixart_uid_t){0,0};      /* should be StreamManagerUID, but zero is OK if there is only one ! */
 		request.data = &streaming_group_req;
@@ -403,7 +403,7 @@ static int snd_mixart_trigger(snd_pcm_substream_t *subs, int cmd)
 	switch (cmd) {
 	case SNDRV_PCM_TRIGGER_START:
 
-		snd_printk(KERN_DEBUG "SNDRV_PCM_TRIGGER_START\n");
+		snd_printdd("SNDRV_PCM_TRIGGER_START\n");
 
 		// snd_printk(KERN_DEBUG "hw_avail = %d\n", snd_pcm_playback_hw_avail(subs->runtime));
 		/* START_STREAM */
@@ -422,19 +422,19 @@ static int snd_mixart_trigger(snd_pcm_substream_t *subs, int cmd)
 		/* TODO : mixart drains data transefered in advance -> mute stream ? */
 		stream->status = MIXART_STREAM_STATUS_OPEN;
 
-		snd_printk(KERN_DEBUG "SNDRV_PCM_TRIGGER_STOP\n");
+		snd_printdd("SNDRV_PCM_TRIGGER_STOP\n");
 
 		break;
 
 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
 		/* TODO */
 		stream->status = MIXART_STREAM_STATUS_PAUSE;
-		snd_printk(KERN_DEBUG "SNDRV_PCM_PAUSE_PUSH\n");
+		snd_printdd("SNDRV_PCM_PAUSE_PUSH\n");
 		break;
 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
 		/* TODO */
 		stream->status = MIXART_STREAM_STATUS_RUNNING;
-		snd_printk(KERN_DEBUG "SNDRV_PCM_PAUSE_RELEASE\n");
+		snd_printdd("SNDRV_PCM_PAUSE_RELEASE\n");
 		break;
 	default:
 		return -EINVAL;
@@ -452,7 +452,7 @@ static int snd_mixart_prepare(snd_pcm_substream_t *subs)
 
 	/* TODO de faon non bloquante, rappliquer les hw_params (rate, bits, codec) */
 
-	snd_printk(KERN_DEBUG "snd_mixart_prepare\n");
+	snd_printdd("snd_mixart_prepare\n");
 
 	/* only the first stream can choose the sample rate */
 	/* the further opened streams will be limited to its frequency (see open) */
@@ -523,7 +523,7 @@ static int mixart_set_format(mixart_stream_t *stream, snd_pcm_format_t format)
 		stream_param.sample_size = 16;
 	}
 
-	snd_printk(KERN_DEBUG "set SNDRV_PCM_FORMAT sample_type(%d) sample_size(%d) freq(%d) channels(%d)\n",
+	snd_printdd("set SNDRV_PCM_FORMAT sample_type(%d) sample_size(%d) freq(%d) channels(%d)\n",
 		   stream_param.sample_type, stream_param.sample_size, stream_param.sampling_freq, stream->channels);
 
 	/* TODO: what else to configure ? */
@@ -601,7 +601,7 @@ static int snd_mixart_hw_params(snd_pcm_substream_t *subs,
 		mgr->bufferinfo_array[i].available_length = subs->runtime->dma_bytes;
 		/* mgr->bufferinfo_array[i].buffer_id  is already defined */
 
-		snd_printk(KERN_DEBUG "snd_mixart_hw_params(pcm %d) : dma_addr(%x) dma_bytes(%x) subs-number(%d)\n", i, subs->runtime->dma_addr, subs->runtime->dma_bytes, subs->number);
+		snd_printdd("snd_mixart_hw_params(pcm %d) : dma_addr(%x) dma_bytes(%x) subs-number(%d)\n", i, subs->runtime->dma_addr, subs->runtime->dma_bytes, subs->number);
 	}
 	up(&mgr->setup_mutex);
 
@@ -683,7 +683,7 @@ static int snd_mixart_playback_open(snd_pcm_substream_t *subs)
 		pcm_number = MIXART_PCM_DIGITAL;
 		runtime->hw = snd_mixart_digital_caps;
 	}
-	snd_printk(KERN_DEBUG "snd_mixart_playback_open C%d/P%d/Sub%d\n", chip->chip_idx, pcm_number, subs->number);
+	snd_printdd("snd_mixart_playback_open C%d/P%d/Sub%d\n", chip->chip_idx, pcm_number, subs->number);
 
 	/* get stream info */
 	stream = &(chip->playback_stream[pcm_number][subs->number]);
@@ -761,7 +761,7 @@ static int snd_mixart_capture_open(snd_pcm_substream_t *subs)
 
 	runtime->hw.channels_min = 2; /* for instance, no mono */
 
-	snd_printk(KERN_DEBUG "snd_mixart_capture_open C%d/P%d/Sub%d\n", chip->chip_idx, pcm_number, subs->number);
+	snd_printdd("snd_mixart_capture_open C%d/P%d/Sub%d\n", chip->chip_idx, pcm_number, subs->number);
 
 	/* get stream info */
 	stream = &(chip->capture_stream[pcm_number]);
@@ -824,7 +824,7 @@ static int snd_mixart_close(snd_pcm_substream_t *subs)
 
 	down(&mgr->setup_mutex);
 
-	snd_printk(KERN_DEBUG "snd_mixart_close C%d/P%d/Sub%d\n", chip->chip_idx, stream->pcm_number, subs->number);
+	snd_printdd("snd_mixart_close C%d/P%d/Sub%d\n", chip->chip_idx, stream->pcm_number, subs->number);
 
 	/* sample rate released */
 	if(--mgr->ref_count_rate == 0) {
@@ -1045,7 +1045,7 @@ static int snd_mixart_free(mixart_mgr_t *mgr)
 	/* reset board if some firmware was loaded */
 	if(mgr->hwdep->dsp_loaded) {
 		snd_mixart_reset_board(mgr);
-		snd_printk(KERN_DEBUG "reset miXart !\n");
+		snd_printdd("reset miXart !\n");
 	}
 
 	/* release the i/o ports */

sound/pci/mixart/mixart_core.c

@@ -377,19 +377,19 @@ void snd_mixart_msg_tasklet( unsigned long arg)
 			case MSG_STREAM_STOP_INPUT_STAGE_PACKET:
 			case MSG_STREAM_STOP_OUTPUT_STAGE_PACKET:
 				if(mixart_msg_data[0])
-					snd_printk(KERN_DEBUG "tasklet : MSG_STREAM_ST***_***PUT_STAGE_PACKET txx_status(%x)\n", mixart_msg_data[0]);
+					snd_printdd("tasklet : MSG_STREAM_ST***_***PUT_STAGE_PACKET txx_status(%x)\n", mixart_msg_data[0]);
 				break;
 			case MSG_CLOCK_CHECK_PROPERTIES:
 			case MSG_CLOCK_SET_PROPERTIES:
 				if(mixart_msg_data[0])
-					snd_printk(KERN_DEBUG "tasklet : MSG_CLOCK_***_PROPERTIES txx_status(%x) clock_mode(%x)\n", mixart_msg_data[0], mixart_msg_data[1]);
+					snd_printdd("tasklet : MSG_CLOCK_***_PROPERTIES txx_status(%x) clock_mode(%x)\n", mixart_msg_data[0], mixart_msg_data[1]);
 				break;
 			case MSG_SYSTEM_WAIT_SYNCHRO_CMD:
 				if(mixart_msg_data[0])
-					snd_printk(KERN_DEBUG "tasklet : MSG_SYSTEM_WAIT_SYNCHRO_CMD txx_status(%x)\n", mixart_msg_data[0]);
+					snd_printdd("tasklet : MSG_SYSTEM_WAIT_SYNCHRO_CMD txx_status(%x)\n", mixart_msg_data[0]);
 				break;
 			default:
-				snd_printk(KERN_DEBUG "tasklet received mf(%x) : msg_id(%x) uid(%x, %x) size(%d)\n",
+				snd_printdd("tasklet received mf(%x) : msg_id(%x) uid(%x, %x) size(%d)\n",
 					   msg, resp.message_id, resp.uid.object_id, resp.uid.desc, resp.size);
 				break;
 			}
@@ -516,12 +516,12 @@ irqreturn_t snd_mixart_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 					}
 #endif
 					((char*)mixart_msg_data)[resp.size - 1] = 0;
-					printk(KERN_DEBUG "MIXART TRACE : %s\n", (char*)mixart_msg_data);
+					snd_printdd("MIXART TRACE : %s\n", (char*)mixart_msg_data);
 				}
 				break;
 			}
 
-			snd_printk(KERN_DEBUG "command %x not handled\n", resp.message_id);
+			snd_printdd("command %x not handled\n", resp.message_id);
 			break;
 
 		case MSG_TYPE_NOTIFY:
@@ -546,7 +546,7 @@ irqreturn_t snd_mixart_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 			break;
 		case MSG_TYPE_REQUEST:
 		default:
-			snd_printk(KERN_DEBUG "interrupt received request %x\n", msg);
+			snd_printdd("interrupt received request %x\n", msg);
 			/* TODO : are there things to do here ? */
 			break;
 		} /* switch on msg type */

sound/pci/mixart/mixart_hwdep.c

@@ -541,7 +541,7 @@ static int mixart_hwdep_dsp_load(snd_hwdep_t *hw, snd_hwdep_dsp_image_t *dsp)
 			return err;
 	};
 
-	printk( KERN_DEBUG "miXart firmware downloaded and successfully set up\n");
+	snd_printdd("miXart firmware downloaded and successfully set up\n");
 
 	return 0;
 }