--- a/usbmgmt/usbmgr/usbman/server/INC/CPersonality.inl Tue Aug 31 17:01:47 2010 +0300
+++ b/usbmgmt/usbmgr/usbman/server/INC/CPersonality.inl Wed Sep 01 12:35:00 2010 +0100
@@ -1,5 +1,5 @@
/**
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -28,6 +28,79 @@
/**
* @internalComponent
+ * @return personality id
+ */
+inline TInt CPersonality::PersonalityId() const
+ {
+ return iId;
+ }
+
+/**
+ * @internalComponent
+ * @return supported class uids
+ */
+inline const RArray<TUid>& CPersonality::SupportedClasses() const
+ {
+ return iClassUids;
+ }
+
+/**
+ * @internalComponent
+ * @return a const reference to device descriptor
+ */
+inline const CUsbDevice::TUsbDeviceDescriptor& CPersonality::DeviceDescriptor() const
+ {
+ return iDeviceDescriptor;
+ }
+
+/**
+ * @internalComponent
+ * @return a const reference to device descriptor
+ */
+inline CUsbDevice::TUsbDeviceDescriptor& CPersonality::DeviceDescriptor()
+ {
+ return iDeviceDescriptor;
+ }
+
+/**
+ * @internalComponent
+ * @return a const pointer to manufacturer string
+ */
+inline const TDesC* CPersonality::Manufacturer() const
+ {
+ return iManufacturer;
+ }
+
+/**
+ * @internalComponent
+ * @return a const pointer to product string
+ */
+inline const TDesC* CPersonality::Product() const
+ {
+ return iProduct;
+ }
+
+/**
+ * @internalComponent
+ * @return a const pointer to description string
+ */
+inline const TDesC* CPersonality::Description() const
+ {
+ return iDescription;
+ }
+
+/**
+ * @internalComponent
+ * @return a const pointer to detailed description string
+ */
+inline const TDesC* CPersonality::DetailedDescription() const
+ {
+ return iDetailedDescription;
+ }
+
+
+/**
+ * @internalComponent
* @return version
*/
inline TInt CPersonality::Version() const
@@ -43,106 +116,5 @@
{
return iProperty;
}
-
-/**
- * @internalComponent
- * @return the Device Class information
- */
-inline TUint8 CPersonality::DeviceClass() const
- {
- return iDeviceClass;
- }
-
-/**
- * @internalComponent
- * @return the Device Sub Class information
- */
-inline TUint8 CPersonality::DeviceSubClass() const
- {
- return iDeviceSubClass;
- }
-
-/**
- * @internalComponent
- * @return the Device Protocol information
- */
-inline TUint8 CPersonality::DeviceProtocol() const
- {
- return iDeviceProtocol;
- }
-
-/**
- * @internalComponent
- * @return the Configurations Number information
- */
-inline TUint8 CPersonality::NumConfigurations() const
- {
- return iNumConfigurations;
- }
-
-/**
- * @internalComponent
- * @return the Product Id information
- */
-inline TUint16 CPersonality::ProductId() const
- {
- return iProductId;
- }
-
-/**
- * @internalComponent
- * @return the Feature Id information
- */
-inline TInt CPersonality::FeatureId() const
- {
- return iFeatureId;
- }
-
-/**
- * @internalComponent
- * @return the Feature Id information
- */
-inline TUint16 CPersonality::BcdDevice() const
- {
- return iBcdDevice;
- }
-
-/**
- * @internalComponent
- * @return personality id
- */
-inline TInt CPersonality::PersonalityId() const
- {
- return iPersonalityId;
- }
-
-/**
- * @internalComponent
- * @return a const pointer to description string
- */
-inline const TDesC* CPersonality::Description() const
- {
- return iDescription;
- }
-
-/**
- * @internalComponent
- * @return a const pointer to Personality Configs
- */
-inline const RPointerArray<CPersonalityConfigurations>& CPersonality::PersonalityConfigs() const
- {
- return iPersonalityConfigs;
- }
-
-
-/**
- * @internalComponent
- * @return a const to Classes
- */
-inline const RArray<CPersonalityConfigurations::TUsbClasses> & CPersonalityConfigurations::Classes() const
- {
- return iClasses;
- }
-
#endif // __PERSONALITY_INL__