aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2006-06-25 19:04:44 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-26 23:17:28 -0400
commita761f4311b3e31008c7d168c3a8c254a9c7e35ac (patch)
tree03817e0334a6e019251a3483dc8147a418caabb5 /drivers/media/video/pvrusb2/pvrusb2-v4l2.c
parent332139635a8c0431cc2eb67adf1e983eb96728e3 (diff)
V4L/DVB (4240): Various V4L control enhancements in pvrusb2
Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-v4l2.c')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-v4l2.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 72f28a8e1fe3..9fefcdf8ffab 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -520,12 +520,19 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
520 ret = 0; 520 ret = 0;
521 cptr = pvr2_hdw_get_ctrl_v4l(hdw,vc->id); 521 cptr = pvr2_hdw_get_ctrl_v4l(hdw,vc->id);
522 if (!cptr) { 522 if (!cptr) {
523 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
524 "QUERYCTRL id=0x%x not implemented here",
525 vc->id);
523 ret = -EINVAL; 526 ret = -EINVAL;
524 break; 527 break;
525 } 528 }
526 529
527 strlcpy(vc->name,pvr2_ctrl_get_name(cptr),sizeof(vc->name)); 530 pvr2_trace(PVR2_TRACE_V4LIOCTL,
528 vc->flags = 0; 531 "QUERYCTRL id=0x%x mapping name=%s (%s)",
532 vc->id,pvr2_ctrl_get_name(cptr),
533 pvr2_ctrl_get_desc(cptr));
534 strlcpy(vc->name,pvr2_ctrl_get_desc(cptr),sizeof(vc->name));
535 vc->flags = pvr2_ctrl_get_v4lflags(cptr);
529 vc->default_value = pvr2_ctrl_get_def(cptr); 536 vc->default_value = pvr2_ctrl_get_def(cptr);
530 switch (pvr2_ctrl_get_type(cptr)) { 537 switch (pvr2_ctrl_get_type(cptr)) {
531 case pvr2_ctl_enum: 538 case pvr2_ctl_enum:
@@ -547,6 +554,9 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file,
547 vc->step = 1; 554 vc->step = 1;
548 break; 555 break;
549 default: 556 default:
557 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
558 "QUERYCTRL id=0x%x name=%s not mappable",
559 vc->id,pvr2_ctrl_get_name(cptr));
550 ret = -EINVAL; 560 ret = -EINVAL;
551 break; 561 break;
552 } 562 }