equal
deleted
inserted
replaced
22 |
22 |
23 #include <mtp/cmtptypestring.h> |
23 #include <mtp/cmtptypestring.h> |
24 #include "cmtpgetobjectpropdesc.h" |
24 #include "cmtpgetobjectpropdesc.h" |
25 #include "mtpdpconst.h" |
25 #include "mtpdpconst.h" |
26 #include "mtpdppanic.h" |
26 #include "mtpdppanic.h" |
|
27 #include "OstTraceDefinitions.h" |
|
28 #ifdef OST_TRACE_COMPILER_IN_USE |
|
29 #include "cmtpgetobjectpropdescTraces.h" |
|
30 #endif |
|
31 |
27 |
32 |
28 |
33 |
29 _LIT(KMtpObjDescObjFileName, "[a-zA-Z!#\\$%&'\\(\\)\\-0-9@\\^_\\`\\{\\}\\~][a-zA-Z!#\\$%&'\\(\\)\\-0-9@\\^_\\`\\{\\}\\~ ]{0, 7}\\.[[a-zA-Z!#\\$%&'\\(\\)\\-0-9@\\^_\\`\\{\\}\\~][a-zA-Z!#\\$%&'\\(\\)\\-0-9@\\^_\\`\\{\\}\\~ ]{0, 2}]?"); |
34 _LIT(KMtpObjDescObjFileName, "[a-zA-Z!#\\$%&'\\(\\)\\-0-9@\\^_\\`\\{\\}\\~][a-zA-Z!#\\$%&'\\(\\)\\-0-9@\\^_\\`\\{\\}\\~ ]{0, 7}\\.[[a-zA-Z!#\\$%&'\\(\\)\\-0-9@\\^_\\`\\{\\}\\~][a-zA-Z!#\\$%&'\\(\\)\\-0-9@\\^_\\`\\{\\}\\~ ]{0, 2}]?"); |
30 |
35 |
31 /** |
36 /** |
155 ServiceNameL(); |
160 ServiceNameL(); |
156 break; |
161 break; |
157 case EMTPObjectPropCodeNonConsumable: |
162 case EMTPObjectPropCodeNonConsumable: |
158 ServiceNonConsumableL(); |
163 ServiceNonConsumableL(); |
159 break; |
164 break; |
|
165 case EMTPObjectPropCodeHidden: |
|
166 ServiceHiddenL(); |
|
167 break; |
160 default: |
168 default: |
|
169 OstTrace1( TRACE_ERROR, CMTPGETOBJECTPROPDESC_SERVICEL, "invalid propCode %d!", propCode ); |
161 User::Leave( KErrNotSupported ); |
170 User::Leave( KErrNotSupported ); |
162 break; |
171 break; |
163 } |
172 } |
164 __ASSERT_DEBUG(iObjectProperty, Panic(EMTPDpObjectPropertyNull)); |
173 __ASSERT_DEBUG(iObjectProperty, Panic(EMTPDpObjectPropertyNull)); |
165 iObjectProperty->SetUint32L(CMTPTypeObjectPropDesc::EGroupCode,GetPropertyGroupNumber(propCode)); |
174 iObjectProperty->SetUint32L(CMTPTypeObjectPropDesc::EGroupCode,GetPropertyGroupNumber(propCode)); |
292 } |
301 } |
293 iObjectProperty = CMTPTypeObjectPropDesc::NewL(EMTPObjectPropCodeNonConsumable, *expectedForm); |
302 iObjectProperty = CMTPTypeObjectPropDesc::NewL(EMTPObjectPropCodeNonConsumable, *expectedForm); |
294 CleanupStack::PopAndDestroy(expectedForm); |
303 CleanupStack::PopAndDestroy(expectedForm); |
295 } |
304 } |
296 |
305 |
297 |
306 void CMTPGetObjectPropDesc::ServiceHiddenL() |
|
307 { |
|
308 CMTPTypeObjectPropDescEnumerationForm* expectedForm = CMTPTypeObjectPropDescEnumerationForm::NewL(EMTPTypeUINT16); |
|
309 CleanupStack::PushL(expectedForm); |
|
310 TUint16 values[] = {EMTPVisible,EMTPHidden}; |
|
311 TUint numValues((sizeof(values) / sizeof(values[0]))); |
|
312 for (TUint i = 0; i < numValues; i++) |
|
313 { |
|
314 TMTPTypeUint16 data(values[i]); |
|
315 expectedForm->AppendSupportedValueL(data); |
|
316 } |
|
317 iObjectProperty = CMTPTypeObjectPropDesc::NewL(EMTPObjectPropCodeHidden, *expectedForm); |
|
318 CleanupStack::PopAndDestroy(expectedForm); |
|
319 } |
298 |
320 |
299 TUint16 CMTPGetObjectPropDesc::GetPropertyGroupNumber(const TUint16 aPropCode) const |
321 TUint16 CMTPGetObjectPropDesc::GetPropertyGroupNumber(const TUint16 aPropCode) const |
300 { |
322 { |
301 |
323 |
302 // begin from group 1, since group 0 is not used |
324 // begin from group 1, since group 0 is not used |