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

Commit 041ad2ee authored by Jack Pham's avatar Jack Pham Committed by Matt Wagantall
Browse files

usb: gadget: Add snapshot of DIAG function driver 



Add function driver to support Qualcomm diagnostics port over USB.

This snapshot is taken as of msm-3.14 commit:
commit 3bc54cf86b (Merge "msm: camera: Add dummy sub module
in sensor pipeline")

Signed-off-by: default avatarJack Pham <jackp@codeaurora.org>
parent 73b05bf5

drivers/usb/gadget/android.c

+59 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "gadget_chips.h"



#include "u_fs.h"

#include "f_diag.c"

#include "f_mass_storage.c"

#include "f_mtp.c"

#include "f_accessory.c"
@@ -504,6 +505,63 @@ static struct android_usb_function acm_function = { 
	.attributes	= acm_function_attributes,

};



/* DIAG */

static char diag_clients[32];	    /*enabled DIAG clients- "diag[,diag_mdm]" */

static ssize_t clients_store(

		struct device *device, struct device_attribute *attr,

		const char *buff, size_t size)

{

	strlcpy(diag_clients, buff, sizeof(diag_clients));



	return size;

}



static DEVICE_ATTR(clients, S_IWUSR, NULL, clients_store);

static struct device_attribute *diag_function_attributes[] =

					 { &dev_attr_clients, NULL };



static int diag_function_init(struct android_usb_function *f,

				 struct usb_composite_dev *cdev)

{

	return diag_setup();

}



static void diag_function_cleanup(struct android_usb_function *f)

{

	diag_cleanup();

}



static int diag_function_bind_config(struct android_usb_function *f,

					struct usb_configuration *c)

{

	char *name;

	char buf[32], *b;

	int err = -1;

	int (*notify)(uint32_t, const char *);



	strlcpy(buf, diag_clients, sizeof(buf));

	b = strim(buf);



	while (b) {

		notify = NULL;

		name = strsep(&b, ",");

		if (name) {

			err = diag_function_add(c, name, notify);

			if (err)

				pr_err("diag: Cannot open channel '%s'", name);

		}

	}



	return err;

}



static struct android_usb_function diag_function = {

	.name		= "diag",

	.init		= diag_function_init,

	.cleanup	= diag_function_cleanup,

	.bind_config	= diag_function_bind_config,

	.attributes	= diag_function_attributes,

};



static int

mtp_function_init(struct android_usb_function *f,
@@ -948,6 +1006,7 @@ static struct android_usb_function audio_source_function = { 


static struct android_usb_function *supported_functions[] = {

	&ffs_function,

	&diag_function,

	&acm_function,

	&mtp_function,

	&ptp_function,

drivers/usb/gadget/function/f_diag.c

0 → 100644
+892 −0

File added.

Preview size limit exceeded, changes collapsed.

include/linux/usb/usbdiag.h

0 → 100644
+84 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2008-2010, 2012-2014, The Linux Foundation.

 * All rights reserved.

 *

 * All source code in this file is licensed under the following license except

 * where indicated.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published

 * by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

 *

 * See the GNU General Public License for more details.

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, you can find it at http://www.fsf.org

 */



#ifndef _DRIVERS_USB_DIAG_H_

#define _DRIVERS_USB_DIAG_H_



#include <linux/err.h>



#define DIAG_LEGACY		"diag"

#define DIAG_MDM		"diag_mdm"

#define DIAG_QSC		"diag_qsc"

#define DIAG_MDM2		"diag_mdm2"



#define USB_DIAG_CONNECT	0

#define USB_DIAG_DISCONNECT	1

#define USB_DIAG_WRITE_DONE	2

#define USB_DIAG_READ_DONE	3



struct diag_request {

	char *buf;

	int length;

	int actual;

	int status;

	void *context;

};



struct usb_diag_ch {

	const char *name;

	struct list_head list;

	void (*notify)(void *priv, unsigned event, struct diag_request *d_req);

	void *priv;

	void *priv_usb;

};



#ifdef CONFIG_USB_G_ANDROID

struct usb_diag_ch *usb_diag_open(const char *name, void *priv,

		void (*notify)(void *, unsigned, struct diag_request *));

void usb_diag_close(struct usb_diag_ch *ch);

int usb_diag_alloc_req(struct usb_diag_ch *ch, int n_write, int n_read);

int usb_diag_read(struct usb_diag_ch *ch, struct diag_request *d_req);

int usb_diag_write(struct usb_diag_ch *ch, struct diag_request *d_req);

#else

static inline struct usb_diag_ch *usb_diag_open(const char *name, void *priv,

		void (*notify)(void *, unsigned, struct diag_request *))

{

	return ERR_PTR(-ENODEV);

}

static inline void usb_diag_close(struct usb_diag_ch *ch)

{

}

static inline

int usb_diag_alloc_req(struct usb_diag_ch *ch, int n_write, int n_read)

{

	return -ENODEV;

}

static inline

int usb_diag_read(struct usb_diag_ch *ch, struct diag_request *d_req)

{

	return -ENODEV;

}

static inline

int usb_diag_write(struct usb_diag_ch *ch, struct diag_request *d_req)

{

	return -ENODEV;

}

#endif /* CONFIG_USB_G_ANDROID */

#endif /* _DRIVERS_USB_DIAG_H_ */