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

Commit 56a32ab1 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: Move MBIM interface related IOCTLs definition to uapi directory"

parents e88334e0 a01b0eea

drivers/usb/gadget/function/f_gsi.h

+4 −8
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

 *

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

 * it under the terms of the GNU General Public License version 2 and
@@ -72,10 +72,6 @@ 
/* default pkt alignment factor */

#define DEFAULT_PKT_ALIGNMENT_FACTOR 4



#define GSI_MBIM_IOCTL_MAGIC 'o'

#define GSI_MBIM_GET_NTB_SIZE  _IOR(GSI_MBIM_IOCTL_MAGIC, 2, u32)

#define GSI_MBIM_GET_DATAGRAM_COUNT  _IOR(GSI_MBIM_IOCTL_MAGIC, 3, u16)

#define GSI_MBIM_EP_LOOKUP _IOR(GSI_MBIM_IOCTL_MAGIC, 4, struct ep_info)

#define GSI_MBIM_DATA_EP_TYPE_HSUSB 0x2

/* ID for Microsoft OS String */

#define GSI_MBIM_OS_STRING_ID 0xEE
@@ -148,9 +144,9 @@ struct event_queue { 
};



struct gsi_ntb_info {

	u32	ntb_input_size;

	u16	ntb_max_datagrams;

	u16	reserved;

	__u32	ntb_input_size;

	__u16	ntb_max_datagrams;

	__u16	reserved;

};



struct gsi_ctrl_pkt {

include/uapi/linux/usb/usb_ctrl_qti.h

+6 −0
Original line number Diff line number Diff line
@@ -14,6 +14,12 @@ 
#define QTI_CTRL_DATA_BUF_INFO \

	_IOR(QTI_CTRL_IOCTL_MAGIC, 6, struct data_buf_info)



#define GSI_MBIM_IOCTL_MAGIC 'o'

#define GSI_MBIM_GET_NTB_SIZE  _IOR(GSI_MBIM_IOCTL_MAGIC, 2, __u32)

#define GSI_MBIM_GET_DATAGRAM_COUNT  _IOR(GSI_MBIM_IOCTL_MAGIC, 3, __u16)

#define GSI_MBIM_EP_LOOKUP _IOR(GSI_MBIM_IOCTL_MAGIC, 4, struct ep_info)

#define GSI_MBIM_GPS_USB_STATUS _IOR(GSI_MBIM_IOCTL_MAGIC, 5, int)



enum peripheral_ep_type {

	DATA_EP_TYPE_RESERVED	= 0x0,

	DATA_EP_TYPE_HSIC	= 0x1,