--- a/usbengines/usbwatcher/rom/mtp_symbian_temp.iby	Fri May 28 16:51:12 2010 +0300
+++ b/usbengines/usbwatcher/rom/mtp_symbian_temp.iby	Mon Jul 12 23:44:34 2010 +0300
@@ -22,7 +22,7 @@
 // mtp_framework.iby
 #ifndef MTP_FRAMEWORK_IBY
 #define MTP_FRAMEWORK_IBY
-#if !defined(SYMBIAN_EXCLUDE_MTP)
+#if defined(__MTP_PROTOCOL_SUPPORT)
 // MTP Framework cenrep file (temporary until this can be described in ConfML)
 //data=ZPRIVATE\10202be9\10282fcc.cre					private\10202be9\10282fcc.cre
 // MTP Data Types Library
@@ -53,31 +53,31 @@
 data=EPOCROOT##epoc32\data\Z\private\102827a2\backup_registration.xml  private\102827a2\backup_registration.xml
 //MTP device icon property file 
 data=EPOCROOT##epoc32\data\Z\private\102827a2\mtpdevice.ico  private\102827a2\mtpdevice.ico
-#endif // SYMBIAN_EXCLUDE_MTP
+#endif // __MTP_PROTOCOL_SUPPORT
 #endif // MTP_FRAMEWORK_IBY
 
 // mtp_filedp.iby
 #ifndef MTP_FILEDP_IBY
 #define MTP_FILEDP_IBY
-#if !defined(SYMBIAN_EXCLUDE_MTP)
+#if defined(__MTP_PROTOCOL_SUPPORT)
 // MTP Data Provider API
 ECOM_PLUGIN(mtpfiledp.dll, mtpfiledp.rsc)
 // MTP plugin registration resource file
 data=EPOCROOT##epoc32\data\Z\resource\mtp\102827B0.rsc  resource\mtp\102827B0.rsc 
-#endif // SYMBIAN_EXCLUDE_MTP
+#endif // __MTP_PROTOCOL_SUPPORT
 #endif // MTP_FILEDP_IBY
 
 // mtp_usbsic.iby
 #ifndef MTP_USBSIC_IBY
 #define MTP_USBSIC_IBY
-#if !defined (SYMBIAN_EXCLUDE_MTP) && !defined(SYMBIAN_EXCLUDE_USB)
+#if defined(__MTP_PROTOCOL_SUPPORT) && defined(__USB)
 //MTP USB Data Types Library
 file=ABI_DIR\BUILD_DIR\mtpusbdatatypes.dll				system\libs\mtpusbdatatypes.dll
 //MTP USB Still Image Class Controller
 ECOM_PLUGIN(mtpusbsiccc.dll, mtpusbsiccc.rsc)
 //MTP USB SIC transport plugin
 ECOM_PLUGIN(mtpusbsicimp.dll, mtpusbsicimp.rsc)
-#endif // SYMBIAN_EXCLUDE_MTP
+#endif // __MTP_PROTOCOL_SUPPORT
 #endif // MTP_USBSIC_IBY
 
 // mtppictbridgedp.iby
@@ -106,94 +106,94 @@
 // mtp_statusservice.iby
 #ifndef MTP_STATUSSERVICE_IBY
 #define MTP_STATUSSERVICE_IBY
-#if !defined(SYMBIAN_EXCLUDE_MTP)
+#if defined(__MTP_PROTOCOL_SUPPORT)
 // MTP Data Provider API
 ECOM_PLUGIN(mtpstatusservice.dll, mtpstatusservice.rsc)
 // MTP plugin registration resource file
 data=EPOCROOT##epoc32\data\Z\resource\mtp\2001a97f.rsc  resource\mtp\2001a97f.rsc 
-#endif // SYMBIAN_EXCLUDE_MTP
+#endif // __MTP_PROTOCOL_SUPPORT
 #endif // MTP_STATUSSERVICE_IBY
 
 // mtp_metadataservice.iby
 #ifndef MTP_METADATAERVICE_IBY
 #define MTP_METADATASERVICE_IBY
-#if !defined(SYMBIAN_EXCLUDE_MTP)
+#if defined(__MTP_PROTOCOL_SUPPORT)
 // MTP Data Provider API
 ECOM_PLUGIN(mtpmetadataservice.dll, mtpmetadataservice.rsc)
 // MTP plugin registration resource file
 data=EPOCROOT##epoc32\data\Z\resource\mtp\2001A9A3.rsc  resource\mtp\2001A9A3.rsc
-#endif // SYMBIAN_EXCLUDE_MTP
+#endif // __MTP_PROTOCOL_SUPPORT
 #endif // MTP_METADATASERVICE_IBY
 
 // mtp_wmpextndp.iby
 #ifndef MTP_WMPEXTNDP_IBY
 #define MTP_WMPEXTNDP_IBY
-#if !defined(SYMBIAN_EXCLUDE_MTP)
+#if defined(__MTP_PROTOCOL_SUPPORT)
 // MTP Data Provider API
 ECOM_PLUGIN(mtpwmpextndp.dll, mtpwmpextndp.rsc)
 // MTP plugin registration resource file
 data=EPOCROOT##epoc32\data\Z\resource\mtp\1028716c.rsc  resource\mtp\1028716c.rsc 
-#endif // SYMBIAN_EXCLUDE_MTP
+#endif // __MTP_PROTOCOL_SUPPORT
 #endif // MTP_WMPEXTNDP_IBY
 
 // devicedp
 #ifndef MTP_DEVICEDP_IBY
 #define MTP_DEVICEDP_IBY
-#if !defined(SYMBIAN_EXCLUDE_MTP)
+#if defined(__MTP_PROTOCOL_SUPPORT)
 // MTP Device Data Provider
 ECOM_PLUGIN(mtpdevicedp.dll, mtpdevicedp.rsc)
 // MTP plugin registration resource file
 data=EPOCROOT##epoc32\data\Z\resource\mtp\102827AF.rsc  resource\mtp\102827AF.rsc 
-#endif //SYMBIAN_EXCLUDE_MTP
+#endif //__MTP_PROTOCOL_SUPPORT
 #endif  //MTP_DEVICEDP_IBY
 
 // pimproxy
 #ifndef MTP_PIMPROXY_IBY
 #define MTP_PIMPROXY_IBY
-#if !defined(SYMBIAN_EXCLUDE_MTP)
+#if defined(__MTP_PROTOCOL_SUPPORT)
 // MTP PIM proxy
 file=ABI_DIR\BUILD_DIR\mtppimproxy.dll    system\libs\mtppimproxy.dll
-#endif // SYMBIAN_EXCLUDE_MTP
+#endif // __MTP_PROTOCOL_SUPPORT
 #endif // MTP_PIMPROXY_IBY
 
 // calendardp
 #ifndef MTP_CALENDARDP_IBY
 #define MTP_CALENDARDP_IBY
-#if !defined(SYMBIAN_EXCLUDE_MTP)
+#if defined(__MTP_PROTOCOL_SUPPORT)
 // MTP Data Provider API
 ECOM_PLUGIN(mtpcalendardp.dll, mtpcalendardp.rsc)
 // MTP plugin registration resource file
 data=EPOCROOT##epoc32\data\Z\resource\mtp\102871B8.rsc  resource\mtp\102871B8.rsc 
-#endif // SYMBIAN_EXCLUDE_MTP
+#endif // __MTP_PROTOCOL_SUPPORT
 #endif // MTP_CALENDARDP_IBY
 
 // taskdp
 #ifndef MTP_TASKDP_IBY
 #define MTP_TASKDP_IBY
-#if !defined(SYMBIAN_EXCLUDE_MTP)
+#if defined(__MTP_PROTOCOL_SUPPORT)
 // MTP Data Provider API
 ECOM_PLUGIN(mtptaskdp.dll, mtptaskdp.rsc)
 // MTP plugin registration resource file
 data=EPOCROOT##epoc32\data\Z\resource\mtp\10287013.rsc  resource\mtp\10287013.rsc 
-#endif // SYMBIAN_EXCLUDE_MTP
+#endif // __MTP_PROTOCOL_SUPPORT
 #endif // MTP_TASKDP_IBY
 
 // bluetooth
 #ifndef MTP_BT_IBY
 #define MTP_BT_IBY
-#if !defined (SYMBIAN_EXCLUDE_MTP) && !defined(SYMBIAN_EXCLUDE_USB)
+#if defined(__MTP_PROTOCOL_SUPPORT) && defined(__USB)
 //MTP over Bluetooth Data Types Library
 file=ABI_DIR\BUILD_DIR\mtpbtdatatypes.dll               system\libs\mtpbtdatatypes.dll
 //MTP over Bluetooth transport plugin
 ECOM_PLUGIN(mtpbt.dll, mtpbt.rsc)
-#endif // SYMBIAN_EXCLUDE_MTP
+#endif // __MTP_PROTOCOL_SUPPORT
 #endif// MTP_BT_IBY
 
 #ifndef MTP_CONTROLLER_IBY
 #define MTP_CONTROLLER_IBY
-#if !defined (SYMBIAN_EXCLUDE_MTP)
+#if defined(__MTP_PROTOCOL_SUPPORT)
 //MTP Controller LOCOD service plugin
 ECOM_PLUGIN(mtpcontroller.dll, mtpcontroller.rsc)
-#endif// SYMBIAN_EXCLUDE_MTP
+#endif// __MTP_PROTOCOL_SUPPORT
 #endif// MTP_CONTROLLER_IBY
 #endif // MTPSYMBIANTEMP_IBY__