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

Commit d57b0026 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: Add snapshot of USB DIAG function driver" into msm-next

parents a07b4b3e 0b744694

drivers/usb/gadget/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -227,6 +227,9 @@ config USB_F_AUDIO_SRC 
config USB_F_ACC

	tristate



config USB_F_DIAG

	tristate



# this first set of drivers all depend on bulk-capable hardware.



config USB_CONFIGFS
@@ -532,6 +535,14 @@ config USB_CONFIGFS_F_TCM 
	  Both protocols can work on USB2.0 and USB3.0.

	  UAS utilizes the USB 3.0 feature called streams support.



config USB_CONFIGFS_F_DIAG

	bool "USB Diag function"

	select USB_F_DIAG

	depends on USB_CONFIGFS

	help

	  Diag function driver enables support for Qualcomm diagnostics

	  port over USB.



choice

	tristate "USB Gadget precomposed configurations"

	default USB_ETH

drivers/usb/gadget/function/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -57,3 +57,5 @@ usb_f_audio_source-y := f_audio_source.o 
obj-$(CONFIG_USB_F_AUDIO_SRC)   += usb_f_audio_source.o

usb_f_accessory-y               := f_accessory.o

obj-$(CONFIG_USB_F_ACC)         += usb_f_accessory.o

usb_f_diag-y			:= f_diag.o

obj-$(CONFIG_USB_F_DIAG)	+= usb_f_diag.o

drivers/usb/gadget/function/f_diag.c

0 → 100644
+1139 −0

File added.

Preview size limit exceeded, changes collapsed.

include/linux/usb/usbdiag.h

0 → 100644
+86 −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 int event,

			struct diag_request *d_req);

	void *priv;

	void *priv_usb;

};



#if IS_ENABLED(CONFIG_USB_F_DIAG)

int usb_diag_request_size(struct usb_diag_ch *ch);

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

		void (*notify)(void *, unsigned int, 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 int, 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_F_DIAG */

#endif /* _DRIVERS_USB_DIAG_H_ */