diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-01 10:39:46 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-10 06:05:30 -0500 |
commit | bf5dbed6b499787809c78710b209efc76939592b (patch) | |
tree | 83d74732fe5795f99a3c48a781a30f8c8c70561d /drivers/media | |
parent | 177aaaf826856cd8c82e790cf125186b5634f492 (diff) |
V4L/DVB (4901): Improve debug msgs to show fourcc and buffer length on video_ioctl2
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/videodev.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index 1be712757e4d..6a0e8ca72948 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c | |||
@@ -342,7 +342,7 @@ static void dbgbuf(unsigned int cmd, struct video_device *vfd, | |||
342 | 342 | ||
343 | dbgarg (cmd, "%02ld:%02d:%02d.%08ld index=%d, type=%s, " | 343 | dbgarg (cmd, "%02ld:%02d:%02d.%08ld index=%d, type=%s, " |
344 | "bytesused=%d, flags=0x%08d, " | 344 | "bytesused=%d, flags=0x%08d, " |
345 | "field=%0d, sequence=%d, memory=%s, offset/userptr=0x%08lx\n", | 345 | "field=%0d, sequence=%d, memory=%s, offset/userptr=0x%08lx, length=%d\n", |
346 | (p->timestamp.tv_sec/3600), | 346 | (p->timestamp.tv_sec/3600), |
347 | (int)(p->timestamp.tv_sec/60)%60, | 347 | (int)(p->timestamp.tv_sec/60)%60, |
348 | (int)(p->timestamp.tv_sec%60), | 348 | (int)(p->timestamp.tv_sec%60), |
@@ -352,7 +352,7 @@ static void dbgbuf(unsigned int cmd, struct video_device *vfd, | |||
352 | p->bytesused,p->flags, | 352 | p->bytesused,p->flags, |
353 | p->field,p->sequence, | 353 | p->field,p->sequence, |
354 | prt_names(p->memory,v4l2_memory_names), | 354 | prt_names(p->memory,v4l2_memory_names), |
355 | p->m.userptr); | 355 | p->m.userptr, p->length); |
356 | dbgarg2 ("timecode= %02d:%02d:%02d type=%d, " | 356 | dbgarg2 ("timecode= %02d:%02d:%02d type=%d, " |
357 | "flags=0x%08d, frames=%d, userbits=0x%08x\n", | 357 | "flags=0x%08d, frames=%d, userbits=0x%08x\n", |
358 | tc->hours,tc->minutes,tc->seconds, | 358 | tc->hours,tc->minutes,tc->seconds, |
@@ -369,9 +369,13 @@ static inline void dbgrect(struct video_device *vfd, char *s, | |||
369 | static inline void v4l_print_pix_fmt (struct video_device *vfd, | 369 | static inline void v4l_print_pix_fmt (struct video_device *vfd, |
370 | struct v4l2_pix_format *fmt) | 370 | struct v4l2_pix_format *fmt) |
371 | { | 371 | { |
372 | dbgarg2 ("width=%d, height=%d, format=0x%08x, field=%s, " | 372 | dbgarg2 ("width=%d, height=%d, format=%c%c%c%c, field=%s, " |
373 | "bytesperline=%d sizeimage=%d, colorspace=%d\n", | 373 | "bytesperline=%d sizeimage=%d, colorspace=%d\n", |
374 | fmt->width,fmt->height,fmt->pixelformat, | 374 | fmt->width,fmt->height, |
375 | (fmt->pixelformat & 0xff), | ||
376 | (fmt->pixelformat >> 8) & 0xff, | ||
377 | (fmt->pixelformat >> 16) & 0xff, | ||
378 | (fmt->pixelformat >> 24) & 0xff, | ||
375 | prt_names(fmt->field,v4l2_field_names_FIXME), | 379 | prt_names(fmt->field,v4l2_field_names_FIXME), |
376 | fmt->bytesperline,fmt->sizeimage,fmt->colorspace); | 380 | fmt->bytesperline,fmt->sizeimage,fmt->colorspace); |
377 | }; | 381 | }; |
@@ -530,12 +534,13 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, | |||
530 | } | 534 | } |
531 | if (!ret) | 535 | if (!ret) |
532 | dbgarg (cmd, "index=%d, type=%d, flags=%d, " | 536 | dbgarg (cmd, "index=%d, type=%d, flags=%d, " |
533 | "description=%s," | 537 | "pixelformat=%c%c%c%c, description='%s'\n", |
534 | " pixelformat=0x%8x\n", | ||
535 | f->index, f->type, f->flags, | 538 | f->index, f->type, f->flags, |
536 | f->description, | 539 | (f->pixelformat & 0xff), |
537 | f->pixelformat); | 540 | (f->pixelformat >> 8) & 0xff, |
538 | 541 | (f->pixelformat >> 16) & 0xff, | |
542 | (f->pixelformat >> 24) & 0xff, | ||
543 | f->description); | ||
539 | break; | 544 | break; |
540 | } | 545 | } |
541 | case VIDIOC_G_FMT: | 546 | case VIDIOC_G_FMT: |