diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-08-25 15:44:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-25 15:44:03 -0700 |
| commit | 252aaac4a8830e4b172ffc916f42f8cd91ad1e72 (patch) | |
| tree | 8511f16425b0a173524fc2ed3ddd6a2d6e3ab444 /media/mtp/MtpDataPacket.cpp | |
| parent | 53bfd693c45278bf71cb5e184ffd3e95d52e04d8 (diff) | |
| parent | 8277cec96ffa55082962591bca1c55abbeec8c26 (diff) | |
| download | frameworks_av-252aaac4a8830e4b172ffc916f42f8cd91ad1e72.zip frameworks_av-252aaac4a8830e4b172ffc916f42f8cd91ad1e72.tar.gz frameworks_av-252aaac4a8830e4b172ffc916f42f8cd91ad1e72.tar.bz2 | |
Merge "MTP: work in progress on expanded property support"
Diffstat (limited to 'media/mtp/MtpDataPacket.cpp')
| -rw-r--r-- | media/mtp/MtpDataPacket.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/media/mtp/MtpDataPacket.cpp b/media/mtp/MtpDataPacket.cpp index 27dc796..f3c7b9b 100644 --- a/media/mtp/MtpDataPacket.cpp +++ b/media/mtp/MtpDataPacket.cpp @@ -242,6 +242,16 @@ void MtpDataPacket::putUInt128(const uint128_t& value) { putUInt32(value[3]); } +void MtpDataPacket::putInt128(int64_t value) { + putInt64(value); + putUInt64(value < 0 ? 0xFFFFFFFFFFFFFFFF : 0); +} + +void MtpDataPacket::putUInt128(uint64_t value) { + putUInt64(value); + putUInt64(0); +} + void MtpDataPacket::putAInt8(const int8_t* values, int count) { putUInt32(count); for (int i = 0; i < count; i++) @@ -363,7 +373,7 @@ int MtpDataPacket::readDataHeader(int fd) { int MtpDataPacket::write(int fd) { MtpPacket::putUInt32(MTP_CONTAINER_LENGTH_OFFSET, mPacketSize); MtpPacket::putUInt16(MTP_CONTAINER_TYPE_OFFSET, MTP_CONTAINER_TYPE_DATA); - + dump(); // send header separately from data int ret = ::write(fd, mBuffer, MTP_CONTAINER_HEADER_SIZE); if (ret == MTP_CONTAINER_HEADER_SIZE) |