Mike Lockwood 97c8d9046e MTP: Fix reading and writing property descriptors
We were missing support for the group code, resulting in an off by 4 bytes problem.

Change-Id: I4a640c67b8d36e1bd658b6185178a71966d4b0b6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-09 14:49:28 -04:00

83 lines
2.4 KiB
C++

/*
* 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.
*/
#ifndef _MTP_PROPERTY_H
#define _MTP_PROPERTY_H
#include "MtpTypes.h"
namespace android {
class MtpDataPacket;
class MtpProperty {
public:
MtpPropertyCode mCode;
MtpDataType mType;
bool mWriteable;
MtpPropertyValue mDefaultValue;
MtpPropertyValue mCurrentValue;
// for array types
int mDefaultArrayLength;
MtpPropertyValue* mDefaultArrayValues;
int mCurrentArrayLength;
MtpPropertyValue* mCurrentArrayValues;
enum {
kFormNone = 0,
kFormRange = 1,
kFormEnum = 2,
};
uint32_t mGroupCode;
uint8_t mFormFlag;
// for range form
MtpPropertyValue mMinimumValue;
MtpPropertyValue mMaximumValue;
MtpPropertyValue mStepSize;
// for enum form
int mEnumLength;
MtpPropertyValue* mEnumValues;
public:
MtpProperty();
MtpProperty(MtpPropertyCode propCode,
MtpDataType type,
bool writeable = false,
int defaultValue = 0);
virtual ~MtpProperty();
inline MtpPropertyCode getPropertyCode() const { return mCode; }
void read(MtpDataPacket& packet, bool deviceProp);
void write(MtpDataPacket& packet);
void print();
private:
void readValue(MtpDataPacket& packet, MtpPropertyValue& value);
void writeValue(MtpDataPacket& packet, MtpPropertyValue& value);
MtpPropertyValue* readArrayValues(MtpDataPacket& packet, int& length);
void writeArrayValues(MtpDataPacket& packet, MtpPropertyValue* values, int length);
};
}; // namespace android
#endif // _MTP_PROPERTY_H