From 8065e2056073808716db32136d7acfd50eeab924 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Thu, 15 Jul 2010 13:36:52 -0400 Subject: Remove our copy of the f_mtp.h kernel header, now that it is in bionic. Change-Id: I2b5e72bf25b3525ace4b919c6e8b6bd6750f6dfa Signed-off-by: Mike Lockwood --- media/mtp/MtpEventPacket.cpp | 2 +- media/mtp/MtpServer.cpp | 2 +- media/mtp/f_mtp.h | 53 -------------------------------------------- 3 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 media/mtp/f_mtp.h diff --git a/media/mtp/MtpEventPacket.cpp b/media/mtp/MtpEventPacket.cpp index 651761e..089278e 100644 --- a/media/mtp/MtpEventPacket.cpp +++ b/media/mtp/MtpEventPacket.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include "MtpEventPacket.h" diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp index fda5f8f..163c05b 100644 --- a/media/mtp/MtpServer.cpp +++ b/media/mtp/MtpServer.cpp @@ -31,7 +31,7 @@ #include "MtpStorage.h" #include "MtpStringBuffer.h" -#include "f_mtp.h" +#include namespace android { diff --git a/media/mtp/f_mtp.h b/media/mtp/f_mtp.h deleted file mode 100644 index 426c6b5..0000000 --- a/media/mtp/f_mtp.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Gadget Function Driver for MTP - * - * Copyright (C) 2010 Google, Inc. - * Author: Mike Lockwood - * - * 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 */ -- cgit v1.1