Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c913881e authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Felipe Balbi
Browse files

usb: gadget: webcam: convert webcam to new interface of f_uvc 



Use the new function interface of f_uvc.

Signed-off-by: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Tested-by: default avatarMichael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 6d11ed76

drivers/usb/gadget/legacy/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ config USB_G_WEBCAM 
	depends on VIDEO_DEV

	select USB_LIBCOMPOSITE

	select VIDEOBUF2_VMALLOC

	select USB_F_UVC

	help

	  The Webcam Gadget acts as a composite USB Audio and Video Class

	  device. It provides a userspace API to process UVC control requests

drivers/usb/gadget/legacy/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ g_multi-y := multi.o 
g_hid-y				:= hid.o

g_dbgp-y			:= dbgp.o

g_nokia-y			:= nokia.o

g_webcam-y			:= webcam.o ../function/uvc_queue.o ../function/uvc_v4l2.o ../function/uvc_video.o

g_webcam-y			:= webcam.o

g_ncm-y				:= ncm.o

g_acm_ms-y			:= acm_ms.o

g_tcm_usb_gadget-y		:= tcm_usb_gadget.o

drivers/usb/gadget/legacy/webcam.c

+38 −15
Original line number Diff line number Diff line
@@ -15,15 +15,7 @@ 
#include <linux/module.h>

#include <linux/usb/video.h>



/*

 * Kbuild is not very cooperative with respect to linking separately

 * compiled library objects into one module.  So for now we won't use

 * separate compilation ... ensuring init/exit sections work to shrink

 * the runtime footprint, and giving us at least some parts of what

 * a "gcc --combine ... part1.c part2.c part3.c ... " build would.

 */

#define USBF_UVC_INCLUDED

#include "f_uvc.c"

#include "u_uvc.h"



USB_GADGET_COMPOSITE_OPTIONS();
@@ -79,6 +71,9 @@ static struct usb_gadget_strings *webcam_device_strings[] = { 
	NULL,

};



static struct usb_function_instance *fi_uvc;

static struct usb_function *f_uvc;



static struct usb_device_descriptor webcam_device_descriptor = {

	.bLength		= USB_DT_DEVICE_SIZE,

	.bDescriptorType	= USB_DT_DEVICE,
@@ -342,11 +337,17 @@ static const struct uvc_descriptor_header * const uvc_ss_streaming_cls[] = { 
static int __init

webcam_config_bind(struct usb_configuration *c)

{

	return uvc_bind_config(c, uvc_fs_control_cls,

		uvc_ss_control_cls, uvc_fs_streaming_cls,

		uvc_hs_streaming_cls, uvc_ss_streaming_cls,

		streaming_interval, streaming_maxpacket,

		streaming_maxburst, trace);

	int status = 0;



	f_uvc = usb_get_function(fi_uvc);

	if (IS_ERR(f_uvc))

		return PTR_ERR(f_uvc);



	status = usb_add_function(c, f_uvc);

	if (status < 0)

		usb_put_function(f_uvc);



	return status;

}



static struct usb_configuration webcam_config_driver = {
@@ -360,14 +361,36 @@ static struct usb_configuration webcam_config_driver = { 
static int /* __init_or_exit */

webcam_unbind(struct usb_composite_dev *cdev)

{

	if (!IS_ERR_OR_NULL(f_uvc))

		usb_put_function(f_uvc);

	if (!IS_ERR_OR_NULL(fi_uvc))

		usb_put_function_instance(fi_uvc);

	return 0;

}



static int __init

webcam_bind(struct usb_composite_dev *cdev)

{

	struct f_uvc_opts *uvc_opts;

	int ret;



	fi_uvc = usb_get_function_instance("uvc");

	if (IS_ERR(fi_uvc))

		return PTR_ERR(fi_uvc);



	uvc_opts = container_of(fi_uvc, struct f_uvc_opts, func_inst);



	uvc_opts->streaming_interval = streaming_interval;

	uvc_opts->streaming_maxpacket = streaming_maxpacket;

	uvc_opts->streaming_maxburst = streaming_maxburst;

	uvc_set_trace_param(trace);



	uvc_opts->fs_control = uvc_fs_control_cls;

	uvc_opts->ss_control = uvc_ss_control_cls;

	uvc_opts->fs_streaming = uvc_fs_streaming_cls;

	uvc_opts->hs_streaming = uvc_hs_streaming_cls;

	uvc_opts->ss_streaming = uvc_ss_streaming_cls;



	/* Allocate string descriptor numbers ... note that string contents

	 * can be overridden by the composite_dev glue.

	 */
@@ -391,7 +414,7 @@ webcam_bind(struct usb_composite_dev *cdev) 
	return 0;



error:

	webcam_unbind(cdev);

	usb_put_function_instance(fi_uvc);

	return ret;

}