Merge "Remove our copy of the f_mtp.h kernel header, now that it is in bionic." (d1131401) · Commits · e / os / android_frameworks_base

media/mtp/MtpEventPacket.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		#include <fcntl.h>
		#include <sys/ioctl.h>

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

		#include "MtpEventPacket.h"

media/mtp/MtpServer.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@
		#include "MtpStorage.h"
		#include "MtpStringBuffer.h"

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

		namespace android {

media/mtp/f_mtp.h

deleted100644 → 0

+0 −53

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 __LINUX_USB_F_MTP_H
		#define __LINUX_USB_F_MTP_H

		/* Constants for MTP_SET_INTERFACE_MODE */
		#define MTP_INTERFACE_MODE_MTP 0
		#define MTP_INTERFACE_MODE_PTP 1


		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 */
		size_t length;
		};

		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)
		/* Sets the driver mode to either MTP or PTP */
		#define MTP_SET_INTERFACE_MODE _IOW('M', 2, int)
		/* Sends an event to the host via the interrupt endpoint */
		#define MTP_SEND_EVENT _IOW('M', 3, struct mtp_event)

		#endif /* __LINUX_USB_F_MTP_H */