diff options
| author | yz147069 <none@none> | 2007-10-22 20:28:48 -0700 |
|---|---|---|
| committer | yz147069 <none@none> | 2007-10-22 20:28:48 -0700 |
| commit | f6517e58b2a51b48b9bb30aa3be64f6df58a31fc (patch) | |
| tree | 9bb569f65b223b9f2f26301a466c174dd8eeacb7 | |
| parent | 217297b8896961c36e5b86841aabcdf727b428e5 (diff) | |
| download | illumos-gate-f6517e58b2a51b48b9bb30aa3be64f6df58a31fc.tar.gz | |
6608595 sys/videodev2.h needs to include sys/ioccom.h
6615538 usbvc sets an uncompressed format's bytesperline to bits per line
| -rw-r--r-- | usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/videodev2.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c b/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c index 30412ac2d3..9c12b9826a 100644 --- a/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c +++ b/usr/src/uts/common/io/usb/clients/video/usbvc/usbvc.c @@ -2478,7 +2478,7 @@ usbvc_parse_format_group(usbvc_state_t *usbvcp, usbvc_format_group_t *fmtgrp, altif_n_cvs); usbvc_parse_frames(usbvcp, fmtgrp, cvs_data, cvs_num, altif_n_cvs); - fmtgrp->v4l2_bpp = 16; + fmtgrp->v4l2_bpp = fmt->fmt.uncompressed.bBitsPerPixel / 8; fmtgrp->v4l2_pixelformat = usbvc_v4l2_guid2fcc( (uint8_t *)&fmt->fmt.uncompressed.guidFormat); diff --git a/usr/src/uts/common/sys/videodev2.h b/usr/src/uts/common/sys/videodev2.h index f0a6bf13c0..5d876eabca 100644 --- a/usr/src/uts/common/sys/videodev2.h +++ b/usr/src/uts/common/sys/videodev2.h @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -47,6 +47,8 @@ extern "C" { * et al. */ +#include <sys/ioccom.h> + /* * Common stuff for both V4L1 and V4L2 * Moved from videodev.h |