UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

V4L/DVB (3373): Debug messages for ioctl improved 

Adds field and type name to debug message.
Also prints now format for type=capture.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Mauro Carvalho Chehab 2006-02-27 00:08:55 -03:00
parent 3ed33c31a7
commit 0bbb9c1752
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/media/video/v4l2-common.c
View File

@ -323,6 +323,16 @@ static const char *v4l2_int_ioctls[] = {
}; };
#define V4L2_INT_IOCTLS ARRAY_SIZE(v4l2_int_ioctls) #define V4L2_INT_IOCTLS ARRAY_SIZE(v4l2_int_ioctls)
static void v4l_print_pix_fmt (char *s, struct v4l2_pix_format *fmt)
{
printk ("%s: width=%d, height=%d, format=%d, field=%s, "
"bytesperline=%d sizeimage=%d, colorspace=%d\n", s,
fmt->width,fmt->height,fmt->pixelformat,
((fmt->field>=0)&&(fmt->field<ARRAY_SIZE(v4l2_field_names)))?
v4l2_field_names[fmt->field]:"unknown",
fmt->bytesperline,fmt->sizeimage,fmt->colorspace);
};
/* Common ioctl debug function. This function can be used by /* Common ioctl debug function. This function can be used by
external ioctl messages as well as internal V4L ioctl */ external ioctl messages as well as internal V4L ioctl */
void v4l_printk_ioctl(unsigned int cmd) void v4l_printk_ioctl(unsigned int cmd)
@ -449,15 +459,18 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
{ {
struct v4l2_buffer *p=arg; struct v4l2_buffer *p=arg;
struct v4l2_timecode *tc=&p->timecode; struct v4l2_timecode *tc=&p->timecode;
printk ("%s: %02ld:%02d:%02d.%08ld index=%d, type=%d, " printk ("%s: %02ld:%02d:%02d.%08ld index=%d, type=%s, "
"bytesused=%d, flags=0x%08d, " "bytesused=%d, flags=0x%08d, "
"field=%0d, sequence=%d, memory=%d, offset/userptr=0x%08lx,", "field=%0d, sequence=%d, memory=%d, offset/userptr=0x%08lx\n",
s, s,
(p->timestamp.tv_sec/3600), (p->timestamp.tv_sec/3600),
(int)(p->timestamp.tv_sec/60)%60, (int)(p->timestamp.tv_sec/60)%60,
(int)(p->timestamp.tv_sec%60), (int)(p->timestamp.tv_sec%60),
p->timestamp.tv_usec, p->timestamp.tv_usec,
p->index,p->type,p->bytesused,p->flags, p->index,
((p->type>=0)&&(p->type<ARRAY_SIZE(v4l2_type_names)))?
v4l2_type_names[p->type]:"unknown",
p->bytesused,p->flags,
p->field,p->sequence,p->memory,p->m.userptr); p->field,p->sequence,p->memory,p->m.userptr);
printk ("%s: timecode= %02d:%02d:%02d type=%d, " printk ("%s: timecode= %02d:%02d:%02d type=%d, "
"flags=0x%08d, frames=%d, userbits=0x%08x", "flags=0x%08d, frames=%d, userbits=0x%08x",
@ -522,17 +535,24 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
case VIDIOC_TRY_FMT: case VIDIOC_TRY_FMT:
{ {
struct v4l2_format *p=arg; struct v4l2_format *p=arg;
/* FIXME: Should be one dump per type*/ printk ("%s: type=%s\n", s,
printk ("%s: type=%d\n", s,p->type); ((p->type>=0)&&(p->type<ARRAY_SIZE(v4l2_type_names)))?
break; v4l2_type_names[p->type]:"unknown");
switch (p->type) {
case V4L2_BUF_TYPE_VIDEO_CAPTURE:
v4l_print_pix_fmt (s, &p->fmt.pix);
break;
default:
break;
}
} }
case VIDIOC_G_FBUF: case VIDIOC_G_FBUF:
case VIDIOC_S_FBUF: case VIDIOC_S_FBUF:
{ {
struct v4l2_framebuffer *p=arg; struct v4l2_framebuffer *p=arg;
/*FIXME: should show also struct v4l2_pix_format p->fmt field */
printk ("%s: capability=%d, flags=%d, base=0x%08lx\n", s, printk ("%s: capability=%d, flags=%d, base=0x%08lx\n", s,
p->capability,p->flags, (unsigned long)p->base); p->capability,p->flags, (unsigned long)p->base);
v4l_print_pix_fmt (s, &p->fmt);
break; break;
} }
case VIDIOC_G_FREQUENCY: case VIDIOC_G_FREQUENCY: