diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-05-20 06:15:15 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-05-27 09:56:21 -0400 |
commit | 62cf872a8eec1f11aacbec0ac3fe3698bfa9b403 (patch) | |
tree | 16db27136a4394d8ea26d0b71421199b80a5d8b1 /sound/pci/pcxhr | |
parent | 6938d6b2a90d5e2ffaef037852652a1333502519 (diff) |
[ALSA] Replace CONFIG_SND_DEBUG_DETECT with CONFIG_SND_DEBUG_VERBOSE
Replace CONFIG_SND_DEBUG_DETECT with CONFIG_SND_DEBUG_VERBOSE to
represent its meaning more better. This config isn't provided only
for the detection but for more verbose debug prints in general.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/pcxhr')
-rw-r--r-- | sound/pci/pcxhr/pcxhr.c | 4 | ||||
-rw-r--r-- | sound/pci/pcxhr/pcxhr_core.c | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c index 7fdcdc8c6b64..2c7e25336795 100644 --- a/sound/pci/pcxhr/pcxhr.c +++ b/sound/pci/pcxhr/pcxhr.c | |||
@@ -516,7 +516,7 @@ static void pcxhr_trigger_tasklet(unsigned long arg) | |||
516 | int capture_mask = 0; | 516 | int capture_mask = 0; |
517 | int playback_mask = 0; | 517 | int playback_mask = 0; |
518 | 518 | ||
519 | #ifdef CONFIG_SND_DEBUG_DETECT | 519 | #ifdef CONFIG_SND_DEBUG_VERBOSE |
520 | struct timeval my_tv1, my_tv2; | 520 | struct timeval my_tv1, my_tv2; |
521 | do_gettimeofday(&my_tv1); | 521 | do_gettimeofday(&my_tv1); |
522 | #endif | 522 | #endif |
@@ -623,7 +623,7 @@ static void pcxhr_trigger_tasklet(unsigned long arg) | |||
623 | 623 | ||
624 | mutex_unlock(&mgr->setup_mutex); | 624 | mutex_unlock(&mgr->setup_mutex); |
625 | 625 | ||
626 | #ifdef CONFIG_SND_DEBUG_DETECT | 626 | #ifdef CONFIG_SND_DEBUG_VERBOSE |
627 | do_gettimeofday(&my_tv2); | 627 | do_gettimeofday(&my_tv2); |
628 | snd_printdd("***TRIGGER TASKLET*** TIME = %ld (err = %x)\n", | 628 | snd_printdd("***TRIGGER TASKLET*** TIME = %ld (err = %x)\n", |
629 | (long)(my_tv2.tv_usec - my_tv1.tv_usec), err); | 629 | (long)(my_tv2.tv_usec - my_tv1.tv_usec), err); |
diff --git a/sound/pci/pcxhr/pcxhr_core.c b/sound/pci/pcxhr/pcxhr_core.c index 78aa81feaa4a..abe5c59b72df 100644 --- a/sound/pci/pcxhr/pcxhr_core.c +++ b/sound/pci/pcxhr/pcxhr_core.c | |||
@@ -473,7 +473,7 @@ static struct pcxhr_cmd_info pcxhr_dsp_cmds[] = { | |||
473 | [CMD_AUDIO_LEVEL_ADJUST] = { 0xc22000, 0, RMH_SSIZE_FIXED }, | 473 | [CMD_AUDIO_LEVEL_ADJUST] = { 0xc22000, 0, RMH_SSIZE_FIXED }, |
474 | }; | 474 | }; |
475 | 475 | ||
476 | #ifdef CONFIG_SND_DEBUG_DETECT | 476 | #ifdef CONFIG_SND_DEBUG_VERBOSE |
477 | static char* cmd_names[] = { | 477 | static char* cmd_names[] = { |
478 | [CMD_VERSION] = "CMD_VERSION", | 478 | [CMD_VERSION] = "CMD_VERSION", |
479 | [CMD_SUPPORTED] = "CMD_SUPPORTED", | 479 | [CMD_SUPPORTED] = "CMD_SUPPORTED", |
@@ -549,7 +549,7 @@ static int pcxhr_read_rmh_status(struct pcxhr_mgr *mgr, struct pcxhr_rmh *rmh) | |||
549 | } | 549 | } |
550 | } | 550 | } |
551 | } | 551 | } |
552 | #ifdef CONFIG_SND_DEBUG_DETECT | 552 | #ifdef CONFIG_SND_DEBUG_VERBOSE |
553 | if (rmh->cmd_idx < CMD_LAST_INDEX) | 553 | if (rmh->cmd_idx < CMD_LAST_INDEX) |
554 | snd_printdd(" stat[%d]=%x\n", i, data); | 554 | snd_printdd(" stat[%d]=%x\n", i, data); |
555 | #endif | 555 | #endif |
@@ -597,7 +597,7 @@ static int pcxhr_send_msg_nolock(struct pcxhr_mgr *mgr, struct pcxhr_rmh *rmh) | |||
597 | data |= 0x008000; /* MASK_MORE_THAN_1_WORD_COMMAND */ | 597 | data |= 0x008000; /* MASK_MORE_THAN_1_WORD_COMMAND */ |
598 | else | 598 | else |
599 | data &= 0xff7fff; /* MASK_1_WORD_COMMAND */ | 599 | data &= 0xff7fff; /* MASK_1_WORD_COMMAND */ |
600 | #ifdef CONFIG_SND_DEBUG_DETECT | 600 | #ifdef CONFIG_SND_DEBUG_VERBOSE |
601 | if (rmh->cmd_idx < CMD_LAST_INDEX) | 601 | if (rmh->cmd_idx < CMD_LAST_INDEX) |
602 | snd_printdd("MSG cmd[0]=%x (%s)\n", data, cmd_names[rmh->cmd_idx]); | 602 | snd_printdd("MSG cmd[0]=%x (%s)\n", data, cmd_names[rmh->cmd_idx]); |
603 | #endif | 603 | #endif |
@@ -624,7 +624,7 @@ static int pcxhr_send_msg_nolock(struct pcxhr_mgr *mgr, struct pcxhr_rmh *rmh) | |||
624 | for (i=1; i < rmh->cmd_len; i++) { | 624 | for (i=1; i < rmh->cmd_len; i++) { |
625 | /* send other words */ | 625 | /* send other words */ |
626 | data = rmh->cmd[i]; | 626 | data = rmh->cmd[i]; |
627 | #ifdef CONFIG_SND_DEBUG_DETECT | 627 | #ifdef CONFIG_SND_DEBUG_VERBOSE |
628 | if (rmh->cmd_idx < CMD_LAST_INDEX) | 628 | if (rmh->cmd_idx < CMD_LAST_INDEX) |
629 | snd_printdd(" cmd[%d]=%x\n", i, data); | 629 | snd_printdd(" cmd[%d]=%x\n", i, data); |
630 | #endif | 630 | #endif |
@@ -847,7 +847,7 @@ int pcxhr_set_pipe_state(struct pcxhr_mgr *mgr, int playback_mask, int capture_m | |||
847 | int state, i, err; | 847 | int state, i, err; |
848 | int audio_mask; | 848 | int audio_mask; |
849 | 849 | ||
850 | #ifdef CONFIG_SND_DEBUG_DETECT | 850 | #ifdef CONFIG_SND_DEBUG_VERBOSE |
851 | struct timeval my_tv1, my_tv2; | 851 | struct timeval my_tv1, my_tv2; |
852 | do_gettimeofday(&my_tv1); | 852 | do_gettimeofday(&my_tv1); |
853 | #endif | 853 | #endif |
@@ -894,7 +894,7 @@ int pcxhr_set_pipe_state(struct pcxhr_mgr *mgr, int playback_mask, int capture_m | |||
894 | if (err) | 894 | if (err) |
895 | return err; | 895 | return err; |
896 | } | 896 | } |
897 | #ifdef CONFIG_SND_DEBUG_DETECT | 897 | #ifdef CONFIG_SND_DEBUG_VERBOSE |
898 | do_gettimeofday(&my_tv2); | 898 | do_gettimeofday(&my_tv2); |
899 | snd_printdd("***SET PIPE STATE*** TIME = %ld (err = %x)\n", | 899 | snd_printdd("***SET PIPE STATE*** TIME = %ld (err = %x)\n", |
900 | (long)(my_tv2.tv_usec - my_tv1.tv_usec), err); | 900 | (long)(my_tv2.tv_usec - my_tv1.tv_usec), err); |
@@ -951,7 +951,7 @@ static int pcxhr_handle_async_err(struct pcxhr_mgr *mgr, u32 err, | |||
951 | enum pcxhr_async_err_src err_src, int pipe, | 951 | enum pcxhr_async_err_src err_src, int pipe, |
952 | int is_capture) | 952 | int is_capture) |
953 | { | 953 | { |
954 | #ifdef CONFIG_SND_DEBUG_DETECT | 954 | #ifdef CONFIG_SND_DEBUG_VERBOSE |
955 | static char* err_src_name[] = { | 955 | static char* err_src_name[] = { |
956 | [PCXHR_ERR_PIPE] = "Pipe", | 956 | [PCXHR_ERR_PIPE] = "Pipe", |
957 | [PCXHR_ERR_STREAM] = "Stream", | 957 | [PCXHR_ERR_STREAM] = "Stream", |
@@ -1169,7 +1169,7 @@ irqreturn_t pcxhr_interrupt(int irq, void *dev_id) | |||
1169 | mgr->dsp_time_last, dsp_time_new); | 1169 | mgr->dsp_time_last, dsp_time_new); |
1170 | mgr->dsp_time_err++; | 1170 | mgr->dsp_time_err++; |
1171 | } | 1171 | } |
1172 | #ifdef CONFIG_SND_DEBUG_DETECT | 1172 | #ifdef CONFIG_SND_DEBUG_VERBOSE |
1173 | if (dsp_time_diff == 0) | 1173 | if (dsp_time_diff == 0) |
1174 | snd_printdd("ERROR DSP TIME NO DIFF time(%d)\n", dsp_time_new); | 1174 | snd_printdd("ERROR DSP TIME NO DIFF time(%d)\n", dsp_time_new); |
1175 | else if (dsp_time_diff >= (2*PCXHR_GRANULARITY)) | 1175 | else if (dsp_time_diff >= (2*PCXHR_GRANULARITY)) |
@@ -1208,7 +1208,7 @@ irqreturn_t pcxhr_interrupt(int irq, void *dev_id) | |||
1208 | mgr->src_it_dsp = reg; | 1208 | mgr->src_it_dsp = reg; |
1209 | tasklet_hi_schedule(&mgr->msg_taskq); | 1209 | tasklet_hi_schedule(&mgr->msg_taskq); |
1210 | } | 1210 | } |
1211 | #ifdef CONFIG_SND_DEBUG_DETECT | 1211 | #ifdef CONFIG_SND_DEBUG_VERBOSE |
1212 | if (reg & PCXHR_FATAL_DSP_ERR) | 1212 | if (reg & PCXHR_FATAL_DSP_ERR) |
1213 | snd_printdd("FATAL DSP ERROR : %x\n", reg); | 1213 | snd_printdd("FATAL DSP ERROR : %x\n", reg); |
1214 | #endif | 1214 | #endif |