From owner-p4-projects@FreeBSD.ORG Tue May 29 18:12:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3555B16A46F; Tue, 29 May 2007 18:12:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D962316A468 for ; Tue, 29 May 2007 18:12:36 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C865513C458 for ; Tue, 29 May 2007 18:12:36 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4TICaMo078682 for ; Tue, 29 May 2007 18:12:36 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4TICaAN078663 for perforce@freebsd.org; Tue, 29 May 2007 18:12:36 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 29 May 2007 18:12:36 GMT Message-Id: <200705291812.l4TICaAN078663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 May 2007 18:12:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=120573 Change 120573 by hselasky@hselasky_mini_itx on 2007/05/29 18:12:33 Updates to V4L v2.0 header files. Affected files ... .. //depot/projects/usb/src/sys/sys/videodev.h#3 edit .. //depot/projects/usb/src/sys/sys/videokern.h#2 edit Differences ... ==== //depot/projects/usb/src/sys/sys/videodev.h#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/sys/videokern.h#2 (text+ko) ==== @@ -74,6 +74,12 @@ typedef struct file v4l2_file_t; #endif +typedef int32_t (vidioc_enum_fmt_t) + (v4l2_file_t *file, void *fh, struct v4l2_fmtdesc *f); + +typedef int32_t (vidioc_xxx_fmt_t) + (v4l2_file_t *file, void *fh, struct v4l2_format *f); + struct video_device { /* Device info */ @@ -118,68 +124,40 @@ (v4l2_file_t *file, void *fh, enum v4l2_priority p); /* VIDIOC_ENUM_FMT handlers */ - int32_t (*vidioc_enum_fmt_cap) - (v4l2_file_t *file, void *fh, struct v4l2_fmtdesc *f); - int32_t (*vidioc_enum_fmt_overlay) - (v4l2_file_t *file, void *fh, struct v4l2_fmtdesc *f); - int32_t (*vidioc_enum_fmt_vbi) - (v4l2_file_t *file, void *fh, struct v4l2_fmtdesc *f); - int32_t (*vidioc_enum_fmt_vbi_capture) - (v4l2_file_t *file, void *fh, struct v4l2_fmtdesc *f); - int32_t (*vidioc_enum_fmt_video_output) - (v4l2_file_t *file, void *fh, struct v4l2_fmtdesc *f); - int32_t (*vidioc_enum_fmt_vbi_output) - (v4l2_file_t *file, void *fh, struct v4l2_fmtdesc *f); - int32_t (*vidioc_enum_fmt_type_private) - (v4l2_file_t *file, void *fh, struct v4l2_fmtdesc *f); + vidioc_enum_fmt_t *vidioc_enum_fmt_cap; + vidioc_enum_fmt_t *vidioc_enum_fmt_overlay; + vidioc_enum_fmt_t *vidioc_enum_fmt_vbi; + vidioc_enum_fmt_t *vidioc_enum_fmt_vbi_capture; + vidioc_enum_fmt_t *vidioc_enum_fmt_video_output; + vidioc_enum_fmt_t *vidioc_enum_fmt_vbi_output; + vidioc_enum_fmt_t *vidioc_enum_fmt_type_private; /* VIDIOC_G_FMT handlers */ - int32_t (*vidioc_g_fmt_cap) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_g_fmt_overlay) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_g_fmt_vbi) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_g_fmt_vbi_output) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_g_fmt_vbi_capture) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_g_fmt_video_output) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_g_fmt_type_private) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); + vidioc_xxx_fmt_t *vidioc_g_fmt_cap; + vidioc_xxx_fmt_t *vidioc_g_fmt_overlay; + vidioc_xxx_fmt_t *vidioc_g_fmt_vbi; + vidioc_xxx_fmt_t *vidioc_g_fmt_vbi_output; + vidioc_xxx_fmt_t *vidioc_g_fmt_vbi_capture; + vidioc_xxx_fmt_t *vidioc_g_fmt_video_output; + vidioc_xxx_fmt_t *vidioc_g_fmt_type_private; /* VIDIOC_S_FMT handlers */ - int32_t (*vidioc_s_fmt_cap) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_s_fmt_overlay) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_s_fmt_vbi) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_s_fmt_vbi_output) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_s_fmt_vbi_capture) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_s_fmt_video_output) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_s_fmt_type_private) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); + vidioc_xxx_fmt_t *vidioc_s_fmt_cap; + vidioc_xxx_fmt_t *vidioc_s_fmt_overlay; + vidioc_xxx_fmt_t *vidioc_s_fmt_vbi; + vidioc_xxx_fmt_t *vidioc_s_fmt_vbi_output; + vidioc_xxx_fmt_t *vidioc_s_fmt_vbi_capture; + vidioc_xxx_fmt_t *vidioc_s_fmt_video_output; + vidioc_xxx_fmt_t *vidioc_s_fmt_type_private; /* VIDIOC_TRY_FMT handlers */ - int32_t (*vidioc_try_fmt_cap) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_try_fmt_overlay) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_try_fmt_vbi) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_try_fmt_vbi_output) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_try_fmt_vbi_capture) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_try_fmt_video_output) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); - int32_t (*vidioc_try_fmt_type_private) - (v4l2_file_t *file, void *fh, struct v4l2_format *f); + vidioc_xxx_fmt_t *vidioc_try_fmt_cap; + vidioc_xxx_fmt_t *vidioc_try_fmt_overlay; + vidioc_xxx_fmt_t *vidioc_try_fmt_vbi; + vidioc_xxx_fmt_t *vidioc_try_fmt_vbi_output; + vidioc_xxx_fmt_t *vidioc_try_fmt_vbi_capture; + vidioc_xxx_fmt_t *vidioc_try_fmt_video_output; + vidioc_xxx_fmt_t *vidioc_try_fmt_type_private; /* Buffer handlers */ int32_t (*vidioc_reqbufs) @@ -312,7 +290,7 @@ int32_t (*vidioc_g_register) (v4l2_file_t *file, void *fh, struct v4l2_register *reg); int32_t (*vidioc_s_register)' - (v4l2_file_t *file, void *fh, struct v4l2_register *reg); + (v4l2_file_t *file, void *fh, struct v4l2_register *reg); #endif /* Internal use only variables: */