From c642e8a44c3dece488f488481fb69eeebd2f3554 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Mon, 9 Aug 2010 14:17:52 -0400 Subject: MTP: Fix some typos Change-Id: Ib31708c3a925e3c0ab8eea6922ab09e02b740936 Signed-off-by: Mike Lockwood --- media/jni/android_media_MtpDatabase.cpp | 2 +- media/mtp/MtpServer.cpp | 2 +- media/mtp/mtp.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media/jni/android_media_MtpDatabase.cpp b/media/jni/android_media_MtpDatabase.cpp index d4539fe0f15e..bfdc872e9f97 100644 --- a/media/jni/android_media_MtpDatabase.cpp +++ b/media/jni/android_media_MtpDatabase.cpp @@ -333,7 +333,7 @@ struct PropertyTableEntry { static const PropertyTableEntry kPropertyTable[] = { { MTP_PROPERTY_PARENT_OBJECT, MTP_TYPE_UINT32 }, { MTP_PROPERTY_STORAGE_ID, MTP_TYPE_UINT32 }, - { MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT32 }, + { MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16 }, { MTP_PROPERTY_OBJECT_FILE_NAME, MTP_TYPE_STR }, { MTP_PROPERTY_OBJECT_SIZE, MTP_TYPE_UINT64 }, { MTP_PROPERTY_DATE_MODIFIED, MTP_TYPE_STR }, diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp index 5f5cadfd98ac..082d924122f6 100644 --- a/media/mtp/MtpServer.cpp +++ b/media/mtp/MtpServer.cpp @@ -268,7 +268,7 @@ void MtpServer::sendObjectRemoved(MtpObjectHandle handle) { } void MtpServer::initObjectProperties() { - mObjectProperties.push(new MtpProperty(MTP_PROPERTY_STORAGE_ID, MTP_TYPE_UINT16)); + mObjectProperties.push(new MtpProperty(MTP_PROPERTY_STORAGE_ID, MTP_TYPE_UINT32)); mObjectProperties.push(new MtpProperty(MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16)); mObjectProperties.push(new MtpProperty(MTP_PROPERTY_OBJECT_SIZE, MTP_TYPE_UINT64)); mObjectProperties.push(new MtpProperty(MTP_PROPERTY_OBJECT_FILE_NAME, MTP_TYPE_STR)); diff --git a/media/mtp/mtp.h b/media/mtp/mtp.h index 224cfb9c26ec..b7afa6639326 100644 --- a/media/mtp/mtp.h +++ b/media/mtp/mtp.h @@ -465,8 +465,8 @@ // Storage Access Capability #define MTP_STORAGE_READ_WRITE 0x0000 -#define MTP_STORAGE_READ_ONLY_WITHOUT_DELETE 0x0000 -#define MTP_STORAGE_READ_ONLY_WITH_DELETE 0x0000 +#define MTP_STORAGE_READ_ONLY_WITHOUT_DELETE 0x0001 +#define MTP_STORAGE_READ_ONLY_WITH_DELETE 0x0002 // Association Type #define MTP_ASSOCIATION_TYPE_UNDEFINED 0x0000 -- cgit v1.2.3-59-g8ed1b