Update of /cvsroot/alsa/alsa-kernel/pci/mixart In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1872/mixart
Modified Files: mixart.c mixart_core.c mixart_hwdep.c Log Message: - replaced the debug messages with snd_printdd(). Index: mixart.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/mixart/mixart.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mixart.c 9 Feb 2004 17:40:48 -0000 1.1 +++ mixart.c 13 Feb 2004 10:53:17 -0000 1.2 @@ -198,7 +198,7 @@ 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_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 @@ 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 @@ /* 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 @@ /* TODO de façon non bloquante, réappliquer 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ /* 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 */ Index: mixart_core.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/mixart/mixart_core.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mixart_core.c 9 Feb 2004 17:40:48 -0000 1.1 +++ mixart_core.c 13 Feb 2004 10:53:18 -0000 1.2 @@ -377,19 +377,19 @@ 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 @@ } #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 @@ 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 */ Index: mixart_hwdep.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/mixart/mixart_hwdep.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mixart_hwdep.c 9 Feb 2004 17:40:48 -0000 1.1 +++ mixart_hwdep.c 13 Feb 2004 10:53:18 -0000 1.2 @@ -541,7 +541,7 @@ 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; } ------------------------------------------------------- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog