]> git.karo-electronics.de Git - linux-beck.git/blobdiff - drivers/media/video/uvc/uvc_driver.c
V4L/DVB (12185): uvcvideo: Prefix all UVC constants with UVC_
[linux-beck.git] / drivers / media / video / uvc / uvc_driver.c
index bebc187846fae4ddd2ff54b9b3c786c73de74f63..bd040113e9d1d7c96932cfa9ada0af74ea05cdad 100644 (file)
@@ -249,23 +249,23 @@ static struct uvc_entity *uvc_entity_by_reference(struct uvc_device *dev,
 
        list_for_each_entry_continue(entity, &dev->entities, list) {
                switch (UVC_ENTITY_TYPE(entity)) {
-               case TT_STREAMING:
+               case UVC_TT_STREAMING:
                        if (entity->output.bSourceID == id)
                                return entity;
                        break;
 
-               case VC_PROCESSING_UNIT:
+               case UVC_VC_PROCESSING_UNIT:
                        if (entity->processing.bSourceID == id)
                                return entity;
                        break;
 
-               case VC_SELECTOR_UNIT:
+               case UVC_VC_SELECTOR_UNIT:
                        for (i = 0; i < entity->selector.bNrInPins; ++i)
                                if (entity->selector.baSourceID[i] == id)
                                        return entity;
                        break;
 
-               case VC_EXTENSION_UNIT:
+               case UVC_VC_EXTENSION_UNIT:
                        for (i = 0; i < entity->extension.bNrInPins; ++i)
                                if (entity->extension.baSourceID[i] == id)
                                        return entity;
@@ -297,9 +297,9 @@ static int uvc_parse_format(struct uvc_device *dev,
        format->index = buffer[3];
 
        switch (buffer[2]) {
-       case VS_FORMAT_UNCOMPRESSED:
-       case VS_FORMAT_FRAME_BASED:
-               n = buffer[2] == VS_FORMAT_UNCOMPRESSED ? 27 : 28;
+       case UVC_VS_FORMAT_UNCOMPRESSED:
+       case UVC_VS_FORMAT_FRAME_BASED:
+               n = buffer[2] == UVC_VS_FORMAT_UNCOMPRESSED ? 27 : 28;
                if (buflen < n) {
                        uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming "
                               "interface %d FORMAT error\n",
@@ -325,16 +325,16 @@ static int uvc_parse_format(struct uvc_device *dev,
                }
 
                format->bpp = buffer[21];
-               if (buffer[2] == VS_FORMAT_UNCOMPRESSED) {
-                       ftype = VS_FRAME_UNCOMPRESSED;
+               if (buffer[2] == UVC_VS_FORMAT_UNCOMPRESSED) {
+                       ftype = UVC_VS_FRAME_UNCOMPRESSED;
                } else {
-                       ftype = VS_FRAME_FRAME_BASED;
+                       ftype = UVC_VS_FRAME_FRAME_BASED;
                        if (buffer[27])
                                format->flags = UVC_FMT_FLAG_COMPRESSED;
                }
                break;
 
-       case VS_FORMAT_MJPEG:
+       case UVC_VS_FORMAT_MJPEG:
                if (buflen < 11) {
                        uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming "
                               "interface %d FORMAT error\n",
@@ -347,10 +347,10 @@ static int uvc_parse_format(struct uvc_device *dev,
                format->fcc = V4L2_PIX_FMT_MJPEG;
                format->flags = UVC_FMT_FLAG_COMPRESSED;
                format->bpp = 0;
-               ftype = VS_FRAME_MJPEG;
+               ftype = UVC_VS_FRAME_MJPEG;
                break;
 
-       case VS_FORMAT_DV:
+       case UVC_VS_FORMAT_DV:
                if (buflen < 9) {
                        uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming "
                               "interface %d FORMAT error\n",
@@ -395,8 +395,8 @@ static int uvc_parse_format(struct uvc_device *dev,
                format->nframes = 1;
                break;
 
-       case VS_FORMAT_MPEG2TS:
-       case VS_FORMAT_STREAM_BASED:
+       case UVC_VS_FORMAT_MPEG2TS:
+       case UVC_VS_FORMAT_STREAM_BASED:
                /* Not supported yet. */
        default:
                uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming "
@@ -416,7 +416,7 @@ static int uvc_parse_format(struct uvc_device *dev,
         */
        while (buflen > 2 && buffer[2] == ftype) {
                frame = &format->frame[format->nframes];
-               if (ftype != VS_FRAME_FRAME_BASED)
+               if (ftype != UVC_VS_FRAME_FRAME_BASED)
                        n = buflen > 25 ? buffer[25] : 0;
                else
                        n = buflen > 21 ? buffer[21] : 0;
@@ -436,7 +436,7 @@ static int uvc_parse_format(struct uvc_device *dev,
                frame->wHeight = get_unaligned_le16(&buffer[7]);
                frame->dwMinBitRate = get_unaligned_le32(&buffer[9]);
                frame->dwMaxBitRate = get_unaligned_le32(&buffer[13]);
-               if (ftype != VS_FRAME_FRAME_BASED) {
+               if (ftype != UVC_VS_FRAME_FRAME_BASED) {
                        frame->dwMaxVideoFrameBufferSize =
                                get_unaligned_le32(&buffer[17]);
                        frame->dwDefaultFrameInterval =
@@ -491,12 +491,12 @@ static int uvc_parse_format(struct uvc_device *dev,
                buffer += buffer[0];
        }
 
-       if (buflen > 2 && buffer[2] == VS_STILL_IMAGE_FRAME) {
+       if (buflen > 2 && buffer[2] == UVC_VS_STILL_IMAGE_FRAME) {
                buflen -= buffer[0];
                buffer += buffer[0];
        }
 
-       if (buflen > 2 && buffer[2] == VS_COLORFORMAT) {
+       if (buflen > 2 && buffer[2] == UVC_VS_COLORFORMAT) {
                if (buflen < 6) {
                        uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming "
                               "interface %d COLORFORMAT error\n",
@@ -530,7 +530,7 @@ static int uvc_parse_streaming(struct uvc_device *dev,
        int ret = -EINVAL;
 
        if (intf->cur_altsetting->desc.bInterfaceSubClass
-               != SC_VIDEOSTREAMING) {
+               != UVC_SC_VIDEOSTREAMING) {
                uvc_trace(UVC_TRACE_DESCR, "device %d interface %d isn't a "
                        "video streaming interface\n", dev->udev->devnum,
                        intf->altsetting[0].desc.bInterfaceNumber);
@@ -589,12 +589,12 @@ static int uvc_parse_streaming(struct uvc_device *dev,
 
        /* Parse the header descriptor. */
        switch (buffer[2]) {
-       case VS_OUTPUT_HEADER:
+       case UVC_VS_OUTPUT_HEADER:
                streaming->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
                size = 9;
                break;
 
-       case VS_INPUT_HEADER:
+       case UVC_VS_INPUT_HEADER:
                streaming->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
                size = 13;
                break;
@@ -618,7 +618,7 @@ static int uvc_parse_streaming(struct uvc_device *dev,
 
        streaming->header.bNumFormats = p;
        streaming->header.bEndpointAddress = buffer[6];
-       if (buffer[2] == VS_INPUT_HEADER) {
+       if (buffer[2] == UVC_VS_INPUT_HEADER) {
                streaming->header.bmInfo = buffer[7];
                streaming->header.bTerminalLink = buffer[8];
                streaming->header.bStillCaptureMethod = buffer[9];
@@ -646,13 +646,13 @@ static int uvc_parse_streaming(struct uvc_device *dev,
        /* Count the format and frame descriptors. */
        while (_buflen > 2 && _buffer[1] == USB_DT_CS_INTERFACE) {
                switch (_buffer[2]) {
-               case VS_FORMAT_UNCOMPRESSED:
-               case VS_FORMAT_MJPEG:
-               case VS_FORMAT_FRAME_BASED:
+               case UVC_VS_FORMAT_UNCOMPRESSED:
+               case UVC_VS_FORMAT_MJPEG:
+               case UVC_VS_FORMAT_FRAME_BASED:
                        nformats++;
                        break;
 
-               case VS_FORMAT_DV:
+               case UVC_VS_FORMAT_DV:
                        /* DV format has no frame descriptor. We will create a
                         * dummy frame descriptor with a dummy frame interval.
                         */
@@ -661,22 +661,22 @@ static int uvc_parse_streaming(struct uvc_device *dev,
                        nintervals++;
                        break;
 
-               case VS_FORMAT_MPEG2TS:
-               case VS_FORMAT_STREAM_BASED:
+               case UVC_VS_FORMAT_MPEG2TS:
+               case UVC_VS_FORMAT_STREAM_BASED:
                        uvc_trace(UVC_TRACE_DESCR, "device %d videostreaming "
                                "interface %d FORMAT %u is not supported.\n",
                                dev->udev->devnum,
                                alts->desc.bInterfaceNumber, _buffer[2]);
                        break;
 
-               case VS_FRAME_UNCOMPRESSED:
-               case VS_FRAME_MJPEG:
+               case UVC_VS_FRAME_UNCOMPRESSED:
+               case UVC_VS_FRAME_MJPEG:
                        nframes++;
                        if (_buflen > 25)
                                nintervals += _buffer[25] ? _buffer[25] : 3;
                        break;
 
-               case VS_FRAME_FRAME_BASED:
+               case UVC_VS_FRAME_FRAME_BASED:
                        nframes++;
                        if (_buflen > 21)
                                nintervals += _buffer[21] ? _buffer[21] : 3;
@@ -711,10 +711,10 @@ static int uvc_parse_streaming(struct uvc_device *dev,
        /* Parse the format descriptors. */
        while (buflen > 2 && buffer[1] == USB_DT_CS_INTERFACE) {
                switch (buffer[2]) {
-               case VS_FORMAT_UNCOMPRESSED:
-               case VS_FORMAT_MJPEG:
-               case VS_FORMAT_DV:
-               case VS_FORMAT_FRAME_BASED:
+               case UVC_VS_FORMAT_UNCOMPRESSED:
+               case UVC_VS_FORMAT_MJPEG:
+               case UVC_VS_FORMAT_DV:
+               case UVC_VS_FORMAT_FRAME_BASED:
                        format->frame = frame;
                        ret = uvc_parse_format(dev, streaming, format,
                                &interval, buffer, buflen);
@@ -819,7 +819,7 @@ static int uvc_parse_vendor_control(struct uvc_device *dev,
                        return -ENOMEM;
 
                unit->id = buffer[3];
-               unit->type = VC_EXTENSION_UNIT;
+               unit->type = UVC_VC_EXTENSION_UNIT;
                memcpy(unit->extension.guidExtensionCode, &buffer[4], 16);
                unit->extension.bNumControls = buffer[20];
                unit->extension.bNrInPins = get_unaligned_le16(&buffer[21]);
@@ -856,7 +856,7 @@ static int uvc_parse_standard_control(struct uvc_device *dev,
        __u16 type;
 
        switch (buffer[2]) {
-       case VC_HEADER:
+       case UVC_VC_HEADER:
                n = buflen >= 12 ? buffer[11] : 0;
 
                if (buflen < 12 || buflen < 12 + n) {
@@ -883,7 +883,7 @@ static int uvc_parse_standard_control(struct uvc_device *dev,
                }
                break;
 
-       case VC_INPUT_TERMINAL:
+       case UVC_VC_INPUT_TERMINAL:
                if (buflen < 8) {
                        uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol "
                                "interface %d INPUT_TERMINAL error\n",
@@ -908,11 +908,11 @@ static int uvc_parse_standard_control(struct uvc_device *dev,
                p = 0;
                len = 8;
 
-               if (type == ITT_CAMERA) {
+               if (type == UVC_ITT_CAMERA) {
                        n = buflen >= 15 ? buffer[14] : 0;
                        len = 15;
 
-               } else if (type == ITT_MEDIA_TRANSPORT_INPUT) {
+               } else if (type == UVC_ITT_MEDIA_TRANSPORT_INPUT) {
                        n = buflen >= 9 ? buffer[8] : 0;
                        p = buflen >= 10 + n ? buffer[9+n] : 0;
                        len = 10;
@@ -932,7 +932,7 @@ static int uvc_parse_standard_control(struct uvc_device *dev,
                term->id = buffer[3];
                term->type = type | UVC_TERM_INPUT;
 
-               if (UVC_ENTITY_TYPE(term) == ITT_CAMERA) {
+               if (UVC_ENTITY_TYPE(term) == UVC_ITT_CAMERA) {
                        term->camera.bControlSize = n;
                        term->camera.bmControls = (__u8 *)term + sizeof *term;
                        term->camera.wObjectiveFocalLengthMin =
@@ -942,7 +942,8 @@ static int uvc_parse_standard_control(struct uvc_device *dev,
                        term->camera.wOcularFocalLength =
                                get_unaligned_le16(&buffer[12]);
                        memcpy(term->camera.bmControls, &buffer[15], n);
-               } else if (UVC_ENTITY_TYPE(term) == ITT_MEDIA_TRANSPORT_INPUT) {
+               } else if (UVC_ENTITY_TYPE(term) ==
+                          UVC_ITT_MEDIA_TRANSPORT_INPUT) {
                        term->media.bControlSize = n;
                        term->media.bmControls = (__u8 *)term + sizeof *term;
                        term->media.bTransportModeSize = p;
@@ -955,9 +956,9 @@ static int uvc_parse_standard_control(struct uvc_device *dev,
                if (buffer[7] != 0)
                        usb_string(udev, buffer[7], term->name,
                                   sizeof term->name);
-               else if (UVC_ENTITY_TYPE(term) == ITT_CAMERA)
+               else if (UVC_ENTITY_TYPE(term) == UVC_ITT_CAMERA)
                        sprintf(term->name, "Camera %u", buffer[3]);
-               else if (UVC_ENTITY_TYPE(term) == ITT_MEDIA_TRANSPORT_INPUT)
+               else if (UVC_ENTITY_TYPE(term) == UVC_ITT_MEDIA_TRANSPORT_INPUT)
                        sprintf(term->name, "Media %u", buffer[3]);
                else
                        sprintf(term->name, "Input %u", buffer[3]);
@@ -965,7 +966,7 @@ static int uvc_parse_standard_control(struct uvc_device *dev,
                list_add_tail(&term->list, &dev->entities);
                break;
 
-       case VC_OUTPUT_TERMINAL:
+       case UVC_VC_OUTPUT_TERMINAL:
                if (buflen < 9) {
                        uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol "
                                "interface %d OUTPUT_TERMINAL error\n",
@@ -1002,7 +1003,7 @@ static int uvc_parse_standard_control(struct uvc_device *dev,
                list_add_tail(&term->list, &dev->entities);
                break;
 
-       case VC_SELECTOR_UNIT:
+       case UVC_VC_SELECTOR_UNIT:
                p = buflen >= 5 ? buffer[4] : 0;
 
                if (buflen < 5 || buflen < 6 + p) {
@@ -1031,7 +1032,7 @@ static int uvc_parse_standard_control(struct uvc_device *dev,
                list_add_tail(&unit->list, &dev->entities);
                break;
 
-       case VC_PROCESSING_UNIT:
+       case UVC_VC_PROCESSING_UNIT:
                n = buflen >= 8 ? buffer[7] : 0;
                p = dev->uvc_version >= 0x0110 ? 10 : 9;
 
@@ -1066,7 +1067,7 @@ static int uvc_parse_standard_control(struct uvc_device *dev,
                list_add_tail(&unit->list, &dev->entities);
                break;
 
-       case VC_EXTENSION_UNIT:
+       case UVC_VC_EXTENSION_UNIT:
                p = buflen >= 22 ? buffer[21] : 0;
                n = buflen >= 24 + p ? buffer[22+p] : 0;
 
@@ -1194,7 +1195,7 @@ static int uvc_scan_chain_entity(struct uvc_video_device *video,
        struct uvc_entity *entity)
 {
        switch (UVC_ENTITY_TYPE(entity)) {
-       case VC_EXTENSION_UNIT:
+       case UVC_VC_EXTENSION_UNIT:
                if (uvc_trace_param & UVC_TRACE_PROBE)
                        printk(" <- XU %d", entity->id);
 
@@ -1207,7 +1208,7 @@ static int uvc_scan_chain_entity(struct uvc_video_device *video,
                list_add_tail(&entity->chain, &video->extensions);
                break;
 
-       case VC_PROCESSING_UNIT:
+       case UVC_VC_PROCESSING_UNIT:
                if (uvc_trace_param & UVC_TRACE_PROBE)
                        printk(" <- PU %d", entity->id);
 
@@ -1220,7 +1221,7 @@ static int uvc_scan_chain_entity(struct uvc_video_device *video,
                video->processing = entity;
                break;
 
-       case VC_SELECTOR_UNIT:
+       case UVC_VC_SELECTOR_UNIT:
                if (uvc_trace_param & UVC_TRACE_PROBE)
                        printk(" <- SU %d", entity->id);
 
@@ -1237,16 +1238,16 @@ static int uvc_scan_chain_entity(struct uvc_video_device *video,
                video->selector = entity;
                break;
 
-       case ITT_VENDOR_SPECIFIC:
-       case ITT_CAMERA:
-       case ITT_MEDIA_TRANSPORT_INPUT:
+       case UVC_ITT_VENDOR_SPECIFIC:
+       case UVC_ITT_CAMERA:
+       case UVC_ITT_MEDIA_TRANSPORT_INPUT:
                if (uvc_trace_param & UVC_TRACE_PROBE)
                        printk(" <- IT %d\n", entity->id);
 
                list_add_tail(&entity->chain, &video->iterms);
                break;
 
-       case TT_STREAMING:
+       case UVC_TT_STREAMING:
                if (uvc_trace_param & UVC_TRACE_PROBE)
                        printk(" <- IT %d\n", entity->id);
 
@@ -1291,7 +1292,7 @@ static int uvc_scan_chain_forward(struct uvc_video_device *video,
                if (forward == NULL)
                        break;
 
-               if (UVC_ENTITY_TYPE(forward) != VC_EXTENSION_UNIT ||
+               if (UVC_ENTITY_TYPE(forward) != UVC_VC_EXTENSION_UNIT ||
                    forward == prev)
                        continue;
 
@@ -1323,15 +1324,15 @@ static int uvc_scan_chain_backward(struct uvc_video_device *video,
        int id = -1, i;
 
        switch (UVC_ENTITY_TYPE(entity)) {
-       case VC_EXTENSION_UNIT:
+       case UVC_VC_EXTENSION_UNIT:
                id = entity->extension.baSourceID[0];
                break;
 
-       case VC_PROCESSING_UNIT:
+       case UVC_VC_PROCESSING_UNIT:
                id = entity->processing.bSourceID;
                break;
 
-       case VC_SELECTOR_UNIT:
+       case UVC_VC_SELECTOR_UNIT:
                /* Single-input selector units are ignored. */
                if (entity->selector.bNrInPins == 1) {
                        id = entity->selector.baSourceID[0];
@@ -1377,7 +1378,7 @@ static int uvc_scan_chain(struct uvc_video_device *video)
        entity = video->oterm;
        uvc_trace(UVC_TRACE_PROBE, "Scanning UVC chain: OT %d", entity->id);
 
-       if (UVC_ENTITY_TYPE(entity) == TT_STREAMING)
+       if (UVC_ENTITY_TYPE(entity) == UVC_TT_STREAMING)
                video->sterm = entity;
 
        id = entity->output.bSourceID;
@@ -1664,7 +1665,8 @@ static void uvc_disconnect(struct usb_interface *intf)
         */
        usb_set_intfdata(intf, NULL);
 
-       if (intf->cur_altsetting->desc.bInterfaceSubClass == SC_VIDEOSTREAMING)
+       if (intf->cur_altsetting->desc.bInterfaceSubClass ==
+           UVC_SC_VIDEOSTREAMING)
                return;
 
        /* uvc_v4l2_open() might race uvc_disconnect(). A static driver-wide
@@ -1692,7 +1694,8 @@ static int uvc_suspend(struct usb_interface *intf, pm_message_t message)
                intf->cur_altsetting->desc.bInterfaceNumber);
 
        /* Controls are cached on the fly so they don't need to be saved. */
-       if (intf->cur_altsetting->desc.bInterfaceSubClass == SC_VIDEOCONTROL)
+       if (intf->cur_altsetting->desc.bInterfaceSubClass ==
+           UVC_SC_VIDEOCONTROL)
                return uvc_status_suspend(dev);
 
        if (dev->video.streaming->intf != intf) {
@@ -1711,7 +1714,8 @@ static int __uvc_resume(struct usb_interface *intf, int reset)
        uvc_trace(UVC_TRACE_SUSPEND, "Resuming interface %u\n",
                intf->cur_altsetting->desc.bInterfaceNumber);
 
-       if (intf->cur_altsetting->desc.bInterfaceSubClass == SC_VIDEOCONTROL) {
+       if (intf->cur_altsetting->desc.bInterfaceSubClass ==
+           UVC_SC_VIDEOCONTROL) {
                if (reset) {
                        int ret = uvc_ctrl_resume_device(dev);