diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpninterface.cpp
--- a/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpninterface.cpp	Wed Apr 21 14:29:55 2010 +0300
+++ b/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpninterface.cpp	Tue Oct 19 13:16:20 2010 +0300
@@ -154,12 +154,12 @@
 //
 void CUsbPnInterface::HandleDeviceStateChange( TUint aDeviceState )
     {
-    OstTrace1( TRACE_API, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_ENTRY, "CUsbPnInterface::HandleDeviceStateChange;aDeviceState=%u", aDeviceState );
+    OstTrace1( TRACE_BORDER, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_ENTRY, "CUsbPnInterface::HandleDeviceStateChange;aDeviceState=%u", aDeviceState );
     A_TRACE( ( _T( "CUsbPnInterface::HandleDeviceStateChange( aDeviceState:%d )"), aDeviceState ));
 
     if(aDeviceState & KUsbAlternateSetting)
         {
-        OstTrace0( TRACE_API, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE, "CUsbPnInterface::HandleDeviceStateChange - Change alternate setting" );
+        OstTrace0( TRACE_BORDER, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE, "CUsbPnInterface::HandleDeviceStateChange - Change alternate setting" );
         A_TRACE( ( _T( "CUsbPnInterface::HandleDeviceStateChange - Change alternate setting")));
         TUint altSetNbr( aDeviceState & ~KUsbAlternateSetting );
 
@@ -167,13 +167,13 @@
         }
     else
         {
-        OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_DUP1, "CUsbPnInterface::HandleDeviceStateChange - Normal state change" );
+        OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_DUP1, "CUsbPnInterface::HandleDeviceStateChange - Normal state change" );
         E_TRACE( ( _T( "CUsbPnInterface::HandleDeviceStateChange - Normal state change")));
         switch( aDeviceState )
             {
             case EUsbcDeviceStateUndefined:
                 {
-                OstTrace0( TRACE_API, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_DUP4, "CUsbPnInterface::HandleDeviceStateChange - EUsbcDeviceStateUndefined" );
+                OstTrace0( TRACE_BORDER, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_DUP4, "CUsbPnInterface::HandleDeviceStateChange - EUsbcDeviceStateUndefined" );
                 A_TRACE( ( _T( "CUsbPnInterface::HandleDeviceStateChange - EUsbcDeviceStateUndefined")));
                 // Cancel async USB operations
                 iUsbReceiver->SetEnumerated( EFalse );
@@ -182,7 +182,7 @@
                 }
             case EUsbcDeviceStateDefault:
                 {
-                OstTrace0( TRACE_API, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_DUP5, "CUsbPnInterface::HandleDeviceStateChange - EUsbcDeviceStateDefault" );
+                OstTrace0( TRACE_BORDER, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_DUP5, "CUsbPnInterface::HandleDeviceStateChange - EUsbcDeviceStateDefault" );
                 A_TRACE( ( _T( "CUsbPnInterface::HandleDeviceStateChange - EUsbcDeviceStateDefault")));
                 // Cancel async USB operations
                 iUsbReceiver->SetEnumerated( EFalse );
@@ -191,14 +191,14 @@
                 }
             default:
                 {
-                OstTrace0( TRACE_API, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_DUP6, "CUsbPnInterface::HandleDeviceStateChange - State of no interest" );
+                OstTrace0( TRACE_BORDER, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_DUP6, "CUsbPnInterface::HandleDeviceStateChange - State of no interest" );
                 A_TRACE( ( _T( "CUsbPnInterface::HandleDeviceStateChange - State of no interest")));
                 break;
                 }
             }
         }
 
-    OstTrace0( TRACE_API, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_EXIT, "CUsbPnInterface::HandleDeviceStateChange - return void" );
+    OstTrace0( TRACE_BORDER, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_EXIT, "CUsbPnInterface::HandleDeviceStateChange - return void" );
     A_TRACE( ( _T( "CUsbPnInterface::HandleDeviceStateChange() - return void")));
     }
 
@@ -210,7 +210,7 @@
 //
 void CUsbPnInterface::SetAltSetting( TUint aAltSetNumber )
     {
-    OstTrace1( TRACE_API, CUSBPNINTERFACE_SETALTSETTING_ENTRY, "CUsbPnInterface::SetAltSetting;aAltSetNumber=%u", aAltSetNumber );
+    OstTrace1( TRACE_BORDER, CUSBPNINTERFACE_SETALTSETTING_ENTRY, "CUsbPnInterface::SetAltSetting;aAltSetNumber=%u", aAltSetNumber );
     A_TRACE( ( _T( "CUsbPnInterface::SetAltSetting( aAltSetNumber:%d )" ), aAltSetNumber ) );
 
     if( aAltSetNumber )
@@ -230,7 +230,7 @@
         iUsbReceiver->Cancel();
         }
 
-    OstTrace0( TRACE_API, CUSBPNINTERFACE_SETALTSETTING_EXIT, "CUsbPnInterface::SetAltSetting - return void" );
+    OstTrace0( TRACE_BORDER, CUSBPNINTERFACE_SETALTSETTING_EXIT, "CUsbPnInterface::SetAltSetting - return void" );
     A_TRACE( ( _T( "CUsbPnInterface::SetAltSetting() - return void")));
     }
 
@@ -242,7 +242,7 @@
 //
 void CUsbPnInterface::InitialiseInterfaceL()
     {
-    OstTrace0( TRACE_API, CUSBPNINTERFACE_INITIALISEINTERFACEL_ENTRY, "CUsbPnInterface::InitialiseInterfaceL" );
+    OstTrace0( TRACE_BORDER, CUSBPNINTERFACE_INITIALISEINTERFACEL_ENTRY, "CUsbPnInterface::InitialiseInterfaceL" );
     A_TRACE( ( _T( "CUsbPnInterface::InitialiseInterfaceL()" ) ) );
 
     TInt ret = iCommLdd.Open(0);
@@ -252,7 +252,7 @@
         _LIT(KUsbLDDName, "eusbc");
         ret = User::LoadLogicalDevice( KUsbLDDName );
 
-        OstTrace1( TRACE_DETAILED, DUP100_CUSBPNINTERFACE_INITIALISEINTERFACEL, "CUsbPnInterface::InitialiseInterfaceL - Tried loading the device with status %d", ret );
+        OstTrace1( TRACE_INTERNALS, DUP100_CUSBPNINTERFACE_INITIALISEINTERFACEL, "CUsbPnInterface::InitialiseInterfaceL - Tried loading the device with status %d", ret );
         E_TRACE( ( _T("CUsbPnInterface::InitialiseInterfaceL - Tried loading the device with status %d"), ret ) );
 
         if (ret == KErrNone || ret == KErrAlreadyExists)
@@ -262,7 +262,7 @@
 
         if (ret != KErrNone)
             {
-            OstTrace1( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Cannot open Comm LDD %d", ret );
+            OstTrace1( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Cannot open Comm LDD %d", ret );
             E_TRACE( ( _T( "USBPN - Cannot open Comm LDD %d" ), ret ) );
             User::Leave( KErrNotReady );
             }
@@ -271,7 +271,7 @@
     ret = iPnDataLdd.Open(0);
     if (ret != KErrNone)
         {
-        OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP1, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Cannot open PnData LDD" );
+        OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP1, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Cannot open PnData LDD" );
         E_TRACE( ( _T( "USBPN - Cannot open PnData LDD" ) ) );
         User::Leave( KErrNotReady );
         }
@@ -281,7 +281,7 @@
 // Comm interface
 //////////////////////////////////////////////////////////////////////
 
-    OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP2, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Setup Comm interface" );
+    OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP2, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Setup Comm interface" );
     E_TRACE( ( _T( "USBPN - Setup Comm interface" ) ) );
 
     TUsbcInterfaceInfoBuf ifc;
@@ -292,7 +292,7 @@
     ifc().iClass.iSubClassNum = KCommInterfaceSubClass;
     ifc().iClass.iProtocolNum = KCommInterfaceProtocol;
 
-    OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP3, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Call SetInterface 0" );
+    OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP3, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Call SetInterface 0" );
     E_TRACE( ( _T( "USBPN - Call SetInterface 0" ) ) );
 
     ret = iCommLdd.SetInterface(0, ifc);
@@ -338,7 +338,7 @@
     desc.Append(KVendorDMADescriptorSubType);
     desc.Append(KDmaCapabilities);      // Is zero. Meaning interface is DMA incapable
 
-    OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP4, "CUsbPnInterface::InitialiseInterfaceL - USBPN - SetCSInterfaceDescriptorBlock" );
+    OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP4, "CUsbPnInterface::InitialiseInterfaceL - USBPN - SetCSInterfaceDescriptorBlock" );
     E_TRACE( ( _T( "USBPN - SetCSInterfaceDescriptorBlock" ) ) );
     ret = iCommLdd.SetCSInterfaceDescriptorBlock(0, desc);
 
@@ -355,7 +355,7 @@
 // PHONET data interface alt 0
 //////////////////////////////////////////////////////////////////////
 
-    OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP5, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Register PHONET Data IF (alt 0)" );
+    OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP5, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Register PHONET Data IF (alt 0)" );
     E_TRACE( ( _T( "USBPN - Register PHONET Data IF (alt 0)" ) ) );
     TUsbcInterfaceInfoBuf dataifc;
 
@@ -365,7 +365,7 @@
     dataifc().iClass.iProtocolNum = KDataInterfaceProtocol;
     dataifc().iTotalEndpointsUsed = 0;
 
-    OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP6, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Setup PHONET Data IF (alt 0)" );
+    OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP6, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Setup PHONET Data IF (alt 0)" );
     E_TRACE( ( _T( "USBPN - Setup PHONET Data IF (alt 0)" ) ) );
 
     ret = iPnDataLdd.SetInterface(0, dataifc);
@@ -381,7 +381,7 @@
 // data interface alt 1
 //////////////////////////////////////////////////////////////////////
 
-    OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP7, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Register PHONET Data IF (alt 1)" );
+    OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP7, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Register PHONET Data IF (alt 1)" );
     E_TRACE( ( _T( "USBPN - Register PHONET Data IF (alt 1)" ) ) );
     //Register Data Interface 1
     TUsbcInterfaceInfoBuf dataifc1;
@@ -394,7 +394,7 @@
 
     TUsbDeviceCaps dCaps1;
     ret = iPnDataLdd.DeviceCaps(dCaps1);
-    OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP8, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Checking result of DeviceCaps" );
+    OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP8, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Checking result of DeviceCaps" );
     E_TRACE( ( _T( "USBPN - Checking result of DeviceCaps" ) ) );
     if ( ret )
         {
@@ -403,7 +403,7 @@
         }
 
     const TUint totalEndpoints1 = static_cast<TUint>(dCaps1().iTotalEndpoints);
-    OstTrace1( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP9, "CUsbPnInterface::InitialiseInterfaceL - USBPN - TotalEndpoints1=%d", totalEndpoints1 );
+    OstTrace1( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP9, "CUsbPnInterface::InitialiseInterfaceL - USBPN - TotalEndpoints1=%d", totalEndpoints1 );
     E_TRACE( ( _T( "USBPN - TotalEndpoints1 %d" ), totalEndpoints1 ) );
     if (totalEndpoints1 < KUsbPnRequiredNumberOfEndpoints)
         {
@@ -415,7 +415,7 @@
     TUsbcEndpointData data1[KUsbcMaxEndpoints];
     TPtr8 dataptr1 = TPtr8(reinterpret_cast<TUint8*>(data1), sizeof(data1), sizeof(data1));
     ret = iPnDataLdd.EndpointCaps(dataptr1);
-    OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP10, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Checking result of EndpointCaps" );
+    OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP10, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Checking result of EndpointCaps" );
     E_TRACE( ( _T( "USBPN - Checking result of EndpointCaps" ) ) );
     if (ret)
         {
@@ -429,35 +429,35 @@
 
     for (TUint ii = 0 ; ii < totalEndpoints1; ii++)
         {
-        OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP11, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Set data interface 1" );
+        OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP11, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Set data interface 1" );
         E_TRACE( ( _T( "USBPN - Set data interface 1" ) ) );
         const TUsbcEndpointCaps* caps;
         caps = &data1[ii].iCaps;
 
-        OstTraceExt2( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP12, "CUsbPnInterface::InitialiseInterfaceL - USBPN - iTypesAndDir=%d, epSize=%d", caps->iTypesAndDir, caps->MaxPacketSize() );
+        OstTraceExt2( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP12, "CUsbPnInterface::InitialiseInterfaceL - USBPN - iTypesAndDir=%d, epSize=%d", caps->iTypesAndDir, caps->MaxPacketSize() );
         E_TRACE( ( _T( "USBPN - iTypesAndDir %d, epSize:%d" ), caps->iTypesAndDir, caps->MaxPacketSize() ) );
 
 #ifdef EXTENDED_TRACE_FLAG
         if(((caps->iTypesAndDir & (KUsbEpDirIn)) == (KUsbEpDirIn) ) )
             {
-            OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP13, "CUsbPnInterface::InitialiseInterfaceL - USBPN - IN" );
+            OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP13, "CUsbPnInterface::InitialiseInterfaceL - USBPN - IN" );
             E_TRACE( ( _T( "USBPN - IN" )));
             }
         if(((caps->iTypesAndDir & (KUsbEpDirOut)) == (KUsbEpDirOut) ) )
             {
-            OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP14, "CUsbPnInterface::InitialiseInterfaceL - USBPN - OUT" );
+            OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP14, "CUsbPnInterface::InitialiseInterfaceL - USBPN - OUT" );
             E_TRACE( ( _T( "USBPN - OUT" )));
             }
         if(((caps->iTypesAndDir & (KUsbEpTypeBulk)) == (KUsbEpTypeBulk)))
             {
-            OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP15, "CUsbPnInterface::InitialiseInterfaceL - USBPN - BULK" );
+            OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP15, "CUsbPnInterface::InitialiseInterfaceL - USBPN - BULK" );
             E_TRACE( ( _T( "USBPN - BULK" )));
             }
 #endif // EXTENDED_TRACE_FLAG
 
         if(data1[ii].iInUse)
             {
-            OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP16, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Ep in use. Next..." );
+            OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP16, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Ep in use. Next..." );
             E_TRACE( ( _T( "USBPN - Ep in use. Next...")));
             continue;
             }
@@ -466,7 +466,7 @@
         if (((caps->iTypesAndDir & (KUsbEpTypeBulk | KUsbEpDirIn)) ==
             (KUsbEpTypeBulk | KUsbEpDirIn)) && !inFound)
             {
-            OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP17, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Bulk IN found for EEndpoint1" );
+            OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP17, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Bulk IN found for EEndpoint1" );
             E_TRACE( ( _T( "USBPN - Bulk IN found for EEndpoint1" ) ) );
             // EEndpoint1 is bulk in endpoint
             dataifc1().iEndpointData[0].iType       = KUsbEpTypeBulk;
@@ -479,7 +479,7 @@
         else if (((caps->iTypesAndDir & (KUsbEpTypeBulk | KUsbEpDirOut)) ==
             (KUsbEpTypeBulk | KUsbEpDirOut)) && !outFound)
             {
-            OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP18, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Bulk OUT found for EEndpoint2" );
+            OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP18, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Bulk OUT found for EEndpoint2" );
             E_TRACE( ( _T( "USBPN - Bulk OUT found for EEndpoint2" ) ) );
             // EEndpoint2 is bulk out endpoint
             dataifc1().iEndpointData[1].iType       = KUsbEpTypeBulk;
@@ -495,7 +495,7 @@
             break;
             }
         } // end for ( ... )
-    OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP19, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Checking epFound" );
+    OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP19, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Checking epFound" );
     E_TRACE( ( _T( "USBPN - Checking epFound" ) ) );
     if (!outFound || !inFound )
         {
@@ -503,7 +503,7 @@
         User::Leave( KErrGeneral );
         }
 
-    OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP20, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Setting LCIF Data IF (alt 1)" );
+    OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP20, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Setting LCIF Data IF (alt 1)" );
     E_TRACE( ( _T( "USBPN - Setting LCIF Data IF (alt 1)" ) ) );
 
     ret = iPnDataLdd.SetInterface(1, dataifc1);
@@ -527,7 +527,7 @@
 //
 EXPORT_C void CUsbPnInterface::ReleaseInterface()
     {
-    OstTrace0( TRACE_API, CUSBPNINTERFACE_RELEASEINTERFACE_ENTRY, "CUsbPnInterface::ReleaseInterface" );
+    OstTrace0( TRACE_BORDER, CUSBPNINTERFACE_RELEASEINTERFACE_ENTRY, "CUsbPnInterface::ReleaseInterface" );
     A_TRACE( ( _T( "CUsbPnInterface::ReleaseInterface()" ) ) );
 
     iAlt->Cancel();