diff options
author | Mike Lockwood <lockwood@android.com> | 2010-06-30 17:00:35 -0400 |
---|---|---|
committer | Mike Lockwood <lockwood@android.com> | 2010-06-30 17:02:07 -0400 |
commit | 21ef7d0e70c5ad599bc2602cb484f8cd647055ca (patch) | |
tree | 3e7af9cd07506b7bf52e2d3ad1ed9ada9f6b0dd6 /media/mtp/MtpProperty.cpp | |
parent | 05a53a389852a9e52b816c087465f4e0c5009613 (diff) | |
download | frameworks_av-21ef7d0e70c5ad599bc2602cb484f8cd647055ca.zip frameworks_av-21ef7d0e70c5ad599bc2602cb484f8cd647055ca.tar.gz frameworks_av-21ef7d0e70c5ad599bc2602cb484f8cd647055ca.tar.bz2 |
MTP: Implement GetObjectPropDesc
Change-Id: I283651257254fc9cd9d93eab4605c5e33d3db93e
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/mtp/MtpProperty.cpp')
-rw-r--r-- | media/mtp/MtpProperty.cpp | 134 |
1 files changed, 132 insertions, 2 deletions
diff --git a/media/mtp/MtpProperty.cpp b/media/mtp/MtpProperty.cpp index a114e83..8d639a5 100644 --- a/media/mtp/MtpProperty.cpp +++ b/media/mtp/MtpProperty.cpp @@ -41,6 +41,58 @@ MtpProperty::MtpProperty() mMaximumValue.str = NULL; } +MtpProperty::MtpProperty(MtpPropertyCode propCode, + MtpDataType type, + bool writeable, + int defaultValue) + : mCode(propCode), + mType(type), + mWriteable(writeable), + mDefaultArrayLength(0), + mDefaultArrayValues(NULL), + mCurrentArrayLength(0), + mCurrentArrayValues(NULL), + mFormFlag(kFormNone), + mEnumLength(0), + mEnumValues(NULL) +{ + memset(&mDefaultValue, 0, sizeof(mDefaultValue)); + memset(&mCurrentValue, 0, sizeof(mCurrentValue)); + memset(&mMinimumValue, 0, sizeof(mMinimumValue)); + memset(&mMaximumValue, 0, sizeof(mMaximumValue)); + + if (defaultValue) { + switch (type) { + case MTP_TYPE_INT8: + mDefaultValue.i8 = defaultValue; + break; + case MTP_TYPE_UINT8: + mDefaultValue.u8 = defaultValue; + break; + case MTP_TYPE_INT16: + mDefaultValue.i16 = defaultValue; + break; + case MTP_TYPE_UINT16: + mDefaultValue.u16 = defaultValue; + break; + case MTP_TYPE_INT32: + mDefaultValue.i32 = defaultValue; + break; + case MTP_TYPE_UINT32: + mDefaultValue.u32 = defaultValue; + break; + case MTP_TYPE_INT64: + mDefaultValue.i64 = defaultValue; + break; + case MTP_TYPE_UINT64: + mDefaultValue.u64 = defaultValue; + break; + default: + LOGE("unknown type %d in MtpProperty::MtpProperty", type); + } + } +} + MtpProperty::~MtpProperty() { if (mType == MTP_TYPE_STR) { // free all strings @@ -66,7 +118,7 @@ MtpProperty::~MtpProperty() { delete[] mEnumValues; } -void MtpProperty::read(MtpDataPacket& packet) { +void MtpProperty::read(MtpDataPacket& packet, bool deviceProp) { MtpStringBuffer string; mCode = packet.getUInt16(); @@ -88,7 +140,8 @@ void MtpProperty::read(MtpDataPacket& packet) { break; default: readValue(packet, mDefaultValue); - readValue(packet, mCurrentValue); + if (deviceProp) + readValue(packet, mCurrentValue); } mFormFlag = packet.getUInt8(); @@ -104,6 +157,40 @@ void MtpProperty::read(MtpDataPacket& packet) { } } +// FIXME - only works for object properties +void MtpProperty::write(MtpDataPacket& packet) { + packet.putUInt16(mCode); + packet.putUInt16(mType); + packet.putUInt8(mWriteable ? 1 : 0); + + switch (mType) { + case MTP_TYPE_AINT8: + case MTP_TYPE_AUINT8: + case MTP_TYPE_AINT16: + case MTP_TYPE_AUINT16: + case MTP_TYPE_AINT32: + case MTP_TYPE_AUINT32: + case MTP_TYPE_AINT64: + case MTP_TYPE_AUINT64: + case MTP_TYPE_AINT128: + case MTP_TYPE_AUINT128: + writeArrayValues(packet, mDefaultArrayValues, mDefaultArrayLength); + break; + default: + writeValue(packet, mDefaultValue); + } + packet.putUInt8(mFormFlag); + if (mFormFlag == kFormRange) { + writeValue(packet, mMinimumValue); + writeValue(packet, mMaximumValue); + writeValue(packet, mStepSize); + } else if (mFormFlag == kFormEnum) { + packet.putUInt16(mEnumLength); + for (int i = 0; i < mEnumLength; i++) + writeValue(packet, mEnumValues[i]); + } +} + void MtpProperty::print() { LOGD("MtpProperty %04X\n", mCode); LOGD(" type %04X\n", mType); @@ -147,6 +234,43 @@ void MtpProperty::readValue(MtpDataPacket& packet, MtpPropertyValue& value) { } } +void MtpProperty::writeValue(MtpDataPacket& packet, MtpPropertyValue& value) { + switch (mType) { + case MTP_TYPE_INT8: + packet.putInt8(value.i8); + break; + case MTP_TYPE_UINT8: + packet.putUInt8(value.u8); + break; + case MTP_TYPE_INT16: + packet.putInt16(value.i16); + break; + case MTP_TYPE_UINT16: + packet.putUInt16(value.u16); + break; + case MTP_TYPE_INT32: + packet.putInt32(value.i32); + break; + case MTP_TYPE_UINT32: + packet.putUInt32(value.u32); + break; + case MTP_TYPE_INT64: + packet.putInt64(value.i64); + break; + case MTP_TYPE_UINT64: + packet.putUInt64(value.u64); + break; + case MTP_TYPE_INT128: + packet.putInt128(value.i128); + break; + case MTP_TYPE_UINT128: + packet.putUInt128(value.u128); + break; + default: + LOGE("unknown type %d in MtpProperty::readValue", mType); + } +} + MtpPropertyValue* MtpProperty::readArrayValues(MtpDataPacket& packet, int& length) { length = packet.getUInt32(); if (length == 0) @@ -157,4 +281,10 @@ MtpPropertyValue* MtpProperty::readArrayValues(MtpDataPacket& packet, int& lengt return result; } +void MtpProperty::writeArrayValues(MtpDataPacket& packet, MtpPropertyValue* values, int length) { + packet.putUInt32(length); + for (int i = 0; i < length; i++) + writeValue(packet, values[i]); +} + } // namespace android |