diff options
author | Mike Lockwood <lockwood@android.com> | 2010-05-11 17:16:59 -0400 |
---|---|---|
committer | Mike Lockwood <lockwood@android.com> | 2010-05-13 15:36:47 -0400 |
commit | 16864bae0f51c32c456da2c43adf7a057c0c4882 (patch) | |
tree | 87eb11d62168084c9e63cdd2bf5fd5d35a573df7 /media/mtp/MtpRequestPacket.cpp | |
parent | 328523627293790cbf485fa6095b38a5fdb2118e (diff) | |
download | frameworks_av-16864bae0f51c32c456da2c43adf7a057c0c4882.zip frameworks_av-16864bae0f51c32c456da2c43adf7a057c0c4882.tar.gz frameworks_av-16864bae0f51c32c456da2c43adf7a057c0c4882.tar.bz2 |
Checkpoint work on MTP and PTP investigation.
This change includes work in progress on a C++ library for both host and device
MTP and PTP support.
Currently the makefile builds two test programs:
mtptest - a command line test program that implements a small subset of device side MTP.
Requires a kernel driver that has not been checked in yet.
ptptest - a host tool to test USB host support for detecting and communicating with
digital cameras over PTP. Runs on Linux host.
Later this will be reformulated as a native library that will be used in the media process.
Change-Id: I81aab279975b600b59d99013ab97f9adf0b58da7
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/mtp/MtpRequestPacket.cpp')
-rw-r--r-- | media/mtp/MtpRequestPacket.cpp | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/media/mtp/MtpRequestPacket.cpp b/media/mtp/MtpRequestPacket.cpp new file mode 100644 index 0000000..ed4cc9d --- /dev/null +++ b/media/mtp/MtpRequestPacket.cpp @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <stdio.h> +#include <sys/types.h> +#include <fcntl.h> + +#include "MtpRequestPacket.h" + +MtpRequestPacket::MtpRequestPacket() + : MtpPacket(512) +{ +} + +MtpRequestPacket::~MtpRequestPacket() { +} + +#ifdef MTP_DEVICE +int MtpRequestPacket::read(int fd) { + int ret = ::read(fd, mBuffer, mBufferSize); + if (ret >= 0) + mPacketSize = ret; + else + mPacketSize = 0; + return ret; +} +#endif + +#ifdef MTP_HOST + // write our buffer to the given endpoint (host mode) +int MtpRequestPacket::write(struct usb_endpoint *ep) +{ + putUInt32(MTP_CONTAINER_LENGTH_OFFSET, mPacketSize); + putUInt16(MTP_CONTAINER_TYPE_OFFSET, MTP_CONTAINER_TYPE_COMMAND); + return transfer(ep, mBuffer, mPacketSize); +} +#endif |