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

Commit 473f306e authored by Colin Cross's avatar Colin Cross Committed by John Stultz
Browse files

usb: gadget: f_mtp: move userspace interface to uapi 



Move the most of linux/usb/f_mtp.h header to uapi.  Move the only
remaining structure definition into f_mtp.c, the only place that
uses it.

Change-Id: I952c1a9dc15c36bf295a0eb4d74b6b1ad912ed03
Signed-off-by: default avatarColin Cross <ccross@android.com>
parent 04efb428

drivers/usb/gadget/f_mtp.c

+11 −0
Original line number Diff line number Diff line
@@ -269,6 +269,17 @@ struct mtp_device_status { 
	__le16	wCode;

};



struct mtp_data_header {

	/* length of packet, including this header */

	__le32	length;

	/* container type (2 for data packet) */

	__le16	type;

	/* MTP command code */

	__le16	command;

	/* MTP transaction ID */

	__le32	transaction_id;

};



/* temporary variable used between mtp_open() and mtp_gadget_bind() */

static struct mtp_dev *_mtp_dev;

include/linux/usb/f_mtp.h

+1 −53
Original line number Diff line number Diff line
@@ -18,58 +18,6 @@ 
#ifndef __LINUX_USB_F_MTP_H

#define __LINUX_USB_F_MTP_H



#include <linux/ioctl.h>



#ifdef __KERNEL__



struct mtp_data_header {

	/* length of packet, including this header */

	uint32_t	length;

	/* container type (2 for data packet) */

	uint16_t	type;

	/* MTP command code */

	uint16_t    command;

	/* MTP transaction ID */

	uint32_t	transaction_id;

};



#endif /* __KERNEL__ */



struct mtp_file_range {

	/* file descriptor for file to transfer */

	int			fd;

	/* offset in file for start of transfer */

	loff_t		offset;

	/* number of bytes to transfer */

	int64_t		length;

	/* MTP command ID for data header,

	 * used only for MTP_SEND_FILE_WITH_HEADER

	 */

	uint16_t	command;

	/* MTP transaction ID for data header,

	 * used only for MTP_SEND_FILE_WITH_HEADER

	 */

	uint32_t	transaction_id;

};



struct mtp_event {

	/* size of the event */

	size_t		length;

	/* event data to send */

	void		*data;

};



/* Sends the specified file range to the host */

#define MTP_SEND_FILE              _IOW('M', 0, struct mtp_file_range)

/* Receives data from the host and writes it to a file.

 * The file is created if it does not exist.

 */

#define MTP_RECEIVE_FILE           _IOW('M', 1, struct mtp_file_range)

/* Sends an event to the host via the interrupt endpoint */

#define MTP_SEND_EVENT             _IOW('M', 3, struct mtp_event)

/* Sends the specified file range to the host,

 * with a 12 byte MTP data packet header at the beginning.

 */

#define MTP_SEND_FILE_WITH_HEADER  _IOW('M', 4, struct mtp_file_range)

#include <uapi/linux/usb/f_mtp.h>



#endif /* __LINUX_USB_F_MTP_H */

include/uapi/linux/usb/f_mtp.h

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

 * Gadget Function Driver for MTP

 *

 * Copyright (C) 2010 Google, Inc.

 * Author: Mike Lockwood <lockwood@android.com>

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * 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.

 *

 */



#ifndef _UAPI_LINUX_USB_F_MTP_H

#define _UAPI_LINUX_USB_F_MTP_H



#include <linux/ioctl.h>

#include <linux/types.h>



struct mtp_file_range {

	/* file descriptor for file to transfer */

	int			fd;

	/* offset in file for start of transfer */

	loff_t		offset;

	/* number of bytes to transfer */

	int64_t		length;

	/* MTP command ID for data header,

	 * used only for MTP_SEND_FILE_WITH_HEADER

	 */

	uint16_t	command;

	/* MTP transaction ID for data header,

	 * used only for MTP_SEND_FILE_WITH_HEADER

	 */

	uint32_t	transaction_id;

};



struct mtp_event {

	/* size of the event */

	size_t		length;

	/* event data to send */

	void		*data;

};



/* Sends the specified file range to the host */

#define MTP_SEND_FILE              _IOW('M', 0, struct mtp_file_range)

/* Receives data from the host and writes it to a file.

 * The file is created if it does not exist.

 */

#define MTP_RECEIVE_FILE           _IOW('M', 1, struct mtp_file_range)

/* Sends an event to the host via the interrupt endpoint */

#define MTP_SEND_EVENT             _IOW('M', 3, struct mtp_event)

/* Sends the specified file range to the host,

 * with a 12 byte MTP data packet header at the beginning.

 */

#define MTP_SEND_FILE_WITH_HEADER  _IOW('M', 4, struct mtp_file_range)



#endif /* _UAPI_LINUX_USB_F_MTP_H */