diff options
| author | Laurent Pinchart <laurent.pinchart@skynet.be> | 2009-06-26 16:30:09 +0200 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@skynet.be> | 2009-06-26 16:30:09 +0200 |
| commit | 64bbe9f77eea6c4b12ed4bcc1b561375594be6d8 (patch) | |
| tree | 1177158531fd7f583dabebcb1b3a44c25031c6af /linux/drivers/media | |
| parent | 1d58a0edec72a8112ebbe9b6b101edcdd5a9572b (diff) | |
| download | mediapointer-dvb-s2-64bbe9f77eea6c4b12ed4bcc1b561375594be6d8.tar.gz mediapointer-dvb-s2-64bbe9f77eea6c4b12ed4bcc1b561375594be6d8.tar.bz2 | |
uvcvideo: Use class-specific descriptor types from usb/ch9.h
From: Laurent Pinchart <laurent.pinchart@skynet.be>
uvcvideo.h redefines class-specific descriptor types already present in
usb/ch9.h. Remove the duplicated definitions and use the ones from usb/ch9.h.
Priority: normal
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/uvc/uvc_driver.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/uvc/uvcvideo.h | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/linux/drivers/media/video/uvc/uvc_driver.c b/linux/drivers/media/video/uvc/uvc_driver.c index 40df6828f..b64be45f7 100644 --- a/linux/drivers/media/video/uvc/uvc_driver.c +++ b/linux/drivers/media/video/uvc/uvc_driver.c @@ -644,7 +644,7 @@ static int uvc_parse_streaming(struct uvc_device *dev, _buflen = buflen; /* Count the format and frame descriptors. */ - while (_buflen > 2 && _buffer[1] == CS_INTERFACE) { + while (_buflen > 2 && _buffer[1] == USB_DT_CS_INTERFACE) { switch (_buffer[2]) { case VS_FORMAT_UNCOMPRESSED: case VS_FORMAT_MJPEG: @@ -709,7 +709,7 @@ static int uvc_parse_streaming(struct uvc_device *dev, streaming->nformats = nformats; /* Parse the format descriptors. */ - while (buflen > 2 && buffer[1] == CS_INTERFACE) { + while (buflen > 2 && buffer[1] == USB_DT_CS_INTERFACE) { switch (buffer[2]) { case VS_FORMAT_UNCOMPRESSED: case VS_FORMAT_MJPEG: diff --git a/linux/drivers/media/video/uvc/uvcvideo.h b/linux/drivers/media/video/uvc/uvcvideo.h index de13c86f2..347fb4d7d 100644 --- a/linux/drivers/media/video/uvc/uvcvideo.h +++ b/linux/drivers/media/video/uvc/uvcvideo.h @@ -80,13 +80,6 @@ struct uvc_xu_control { #define PC_PROTOCOL_UNDEFINED 0x00 -#define CS_UNDEFINED 0x20 -#define CS_DEVICE 0x21 -#define CS_CONFIGURATION 0x22 -#define CS_STRING 0x23 -#define CS_INTERFACE 0x24 -#define CS_ENDPOINT 0x25 - /* VideoControl class specific interface descriptor */ #define VC_DESCRIPTOR_UNDEFINED 0x00 #define VC_HEADER 0x01 |