diff options
author | Mike Lockwood <lockwood@android.com> | 2010-08-10 15:20:35 -0400 |
---|---|---|
committer | Mike Lockwood <lockwood@android.com> | 2010-08-25 18:42:22 -0400 |
commit | 828d19dd96b05fa99abdc517701e5366543c324f (patch) | |
tree | c0384fbd304235375dffc1b258fa65e36e14880d /media/mtp/MtpServer.h | |
parent | 9650f128b24ae339fedd697ef6525cda8c42ebd2 (diff) | |
download | frameworks_base-828d19dd96b05fa99abdc517701e5366543c324f.zip frameworks_base-828d19dd96b05fa99abdc517701e5366543c324f.tar.gz frameworks_base-828d19dd96b05fa99abdc517701e5366543c324f.tar.bz2 |
MTP: work in progress on expanded property support
GetObjectPropValue and SetObjectPropValue are disabled until I figure out
why Windows doesn't like what I have done.
Change-Id: I74e945ef3ea031f6d46f4ebaa8df815da0a5c3ed
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/mtp/MtpServer.h')
-rw-r--r-- | media/mtp/MtpServer.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/media/mtp/MtpServer.h b/media/mtp/MtpServer.h index 19ccf24..68a6564 100644 --- a/media/mtp/MtpServer.h +++ b/media/mtp/MtpServer.h @@ -28,7 +28,6 @@ namespace android { class MtpDatabase; -class MtpProperty; class MtpStorage; class MtpServer { @@ -57,9 +56,6 @@ private: MtpStorageList mStorages; - MtpPropertyList mObjectProperties; - MtpPropertyList mDeviceProperties; - // handle for new object, set by SendObjectInfo and used by SendObject MtpObjectHandle mSendObjectHandle; MtpObjectFormat mSendObjectFormat; @@ -76,15 +72,10 @@ public: MtpStorage* getStorage(MtpStorageID id); void run(); - MtpProperty* getObjectProperty(MtpPropertyCode propCode); - MtpProperty* getDeviceProperty(MtpPropertyCode propCode); - void sendObjectAdded(MtpObjectHandle handle); void sendObjectRemoved(MtpObjectHandle handle); private: - void initObjectProperties(); - bool handleRequest(); MtpResponseCode doGetDeviceInfo(); @@ -98,12 +89,17 @@ private: MtpResponseCode doGetObjectReferences(); MtpResponseCode doSetObjectReferences(); MtpResponseCode doGetObjectPropValue(); + MtpResponseCode doSetObjectPropValue(); + MtpResponseCode doGetDevicePropValue(); + MtpResponseCode doSetDevicePropValue(); + MtpResponseCode doResetDevicePropValue(); MtpResponseCode doGetObjectInfo(); MtpResponseCode doGetObject(); MtpResponseCode doSendObjectInfo(); MtpResponseCode doSendObject(); MtpResponseCode doDeleteObject(); MtpResponseCode doGetObjectPropDesc(); + MtpResponseCode doGetDevicePropDesc(); }; }; // namespace android |