Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove our copy of the f_mtp.h kernel header, now that it is in bionic."

Browse Source
This commit is contained in:
Mike Lockwood
2010-07-15 10:41:17 -07:00
committed by Android (Google) Code Review
parent c0689d0b6c 9c7fdf521b
commit d1131401d1
3 changed files with 2 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/mtp/MtpEventPacket.cpp
View File

@@ -21,7 +21,7 @@
#include <fcntl.h>
#include <sys/ioctl.h>
#include <f_mtp.h>
#include <linux/usb/f_mtp.h>
#include "MtpEventPacket.h"

2
media/mtp/MtpServer.cpp
View File

@@ -31,7 +31,7 @@
#include "MtpStorage.h"
#include "MtpStringBuffer.h"
#include "f_mtp.h"
#include <linux/usb/f_mtp.h>
namespace android {

53
media/mtp/f_mtp.h
View File

@@ -1,53 +0,0 @@
/*
* 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 */