Skip to content

Commit 5b0a4d1

Browse files
committed
Remove some debug messages
1 parent 36d2aa0 commit 5b0a4d1

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

virtio-snd.c

+10-13
Original file line numberDiff line numberDiff line change
@@ -395,18 +395,21 @@ typedef struct {
395395
if (idx == 0) { /* the first descriptor */ \
396396
const virtio_snd_pcm_xfer_t *request = \
397397
(virtio_snd_pcm_xfer_t *) (base + addr); \
398+
fprintf(stderr, "sizeof request: %d\n", sizeof(*request)); \
398399
stream_id = request->stream_id; \
399400
if (stream_id >= VSND_DEV_CNT_MAX) { \
400-
fprintf(stderr, "invalid stream_id %" PRIu32 "\n", \
401-
stream_id); \
402401
bad_msg_err = 1; \
403402
} \
404403
goto early_continue; \
405404
} else if (idx == cnt - 1) { /* the last descriptor */ \
406405
virtio_snd_pcm_status_t *response = \
407406
(virtio_snd_pcm_status_t *) (base + addr); \
408-
response->status = \
409-
bad_msg_err ? VIRTIO_SND_S_BAD_MSG : VIRTIO_SND_S_OK; \
407+
response->status = IIF(WRITE) \
408+
(/* Normal error handling */ \
409+
bad_msg_err ? VIRTIO_SND_S_BAD_MSG : VIRTIO_SND_S_OK \
410+
, /* Merely inform driver */ \
411+
VIRTIO_SND_S_OK); \
412+
fprintf(stderr, #NAME_SUFFIX "response->status %" PRIu32 "\n", response->status);\
410413
response->latency_bytes = ret_len; \
411414
*plen = sizeof(*response); \
412415
goto early_continue; \
@@ -415,10 +418,6 @@ typedef struct {
415418
IIF(WRITE) \
416419
(/* enqueue frames */ \
417420
void *payload = (void *) (base + addr); \
418-
fprintf(stderr, \
419-
"=== hit " #NAME_SUFFIX " %" PRIu32 \
420-
" bas_msg_err %" PRIu8 "---\n", \
421-
stream_id, bad_msg_err); \
422421
if (bad_msg_err == 0) \
423422
__virtio_snd_frame_enqueue(payload, len, stream_id); \
424423
, /* flush queue */ \
@@ -599,7 +598,6 @@ static void virtio_snd_read_pcm_set_params(
599598
props->pp.padding = request->padding;
600599

601600
*plen = 0;
602-
fprintf(stderr, "*** hit set_params id %" PRIu32 "***\n", id);
603601
}
604602

605603
static void virtio_snd_read_pcm_prepare(const virtio_snd_pcm_hdr_t *query,
@@ -671,7 +669,7 @@ static void virtio_snd_read_pcm_start(const virtio_snd_pcm_hdr_t *query,
671669
if (code != VIRTIO_SND_R_PCM_PREPARE && code != VIRTIO_SND_R_PCM_STOP) {
672670
fprintf(
673671
stderr,
674-
"virtio_snd_read_pcm_start with previous invalide state %#08x\n",
672+
"virtio_snd_read_pcm_start with previous invalide stat %#08x\n",
675673
code);
676674
return;
677675
}
@@ -698,7 +696,7 @@ static void virtio_snd_read_pcm_stop(const virtio_snd_pcm_hdr_t *query,
698696
uint32_t code = vsnd_props[stream_id].pp.hdr.hdr.code;
699697
if (code != VIRTIO_SND_R_PCM_START) {
700698
fprintf(stderr,
701-
"virtio_snd_read_pcm_stop with previous invalide state %#08x\n",
699+
"virtio_snd_read_pcm_stop with previous invalid state %#08x\n",
702700
code);
703701
return;
704702
}
@@ -728,7 +726,7 @@ static void virtio_snd_read_pcm_release(const virtio_snd_pcm_hdr_t *query,
728726
if (code != VIRTIO_SND_R_PCM_PREPARE && code != VIRTIO_SND_R_PCM_STOP) {
729727
fprintf(
730728
stderr,
731-
"virtio_snd_read_pcm_release with previous invalide state %#08x\n",
729+
"virtio_snd_read_pcm_release with previous invalid state %#08x\n",
732730
code);
733731
return;
734732
}
@@ -816,7 +814,6 @@ static int virtio_snd_stream_cb(const void *input,
816814
PaStreamCallbackFlags status_flags,
817815
void *user_data)
818816
{
819-
fprintf(stderr, "=== hit virtio_snd_stream_cb ===\n");
820817
vsnd_stream_sel_t *v_ptr = (vsnd_stream_sel_t *) user_data;
821818
uint32_t id = v_ptr->stream_id;
822819
int channels = vsnd_props[id].pp.channels;

0 commit comments

Comments
 (0)