diff -r 613028a7da24 -r eaaed528d5fd usbmgmt/usbmgr/usbman/server/public/rusb.h --- a/usbmgmt/usbmgr/usbman/server/public/rusb.h Thu Sep 02 22:23:37 2010 +0300 +++ b/usbmgmt/usbmgr/usbman/server/public/rusb.h Fri Sep 17 08:40:15 2010 +0300 @@ -35,10 +35,14 @@ const TInt KUsbMaxSupportedPersonalities = 64; // Max number of supported personalities -#ifndef __OVER_DUMMYUSBDI__ +#ifdef __OVER_DUMMYUSBDI__ +_LIT(KUsbServerName, "!usbman_over_dummyusbdi"); +#else +#ifdef __DUMMY_LDD__ +_LIT(KUsbServerName, "!usbman_over_dummyldd"); +#else _LIT(KUsbServerName, "!usbman"); -#else -_LIT(KUsbServerName, "!usbman_over_dummyusbdi"); +#endif #endif enum TUsbMessages @@ -109,11 +113,16 @@ #else -#ifndef __OVER_DUMMYUSBDI__ -_LIT(KUsbmanImg, "z:\\system\\programs\\usbsvr.exe"); +#ifdef __OVER_DUMMYUSBDI__ +_LIT(KUsbmanImg, "z:\\system\\programs\\usbsvr_over_dummyusbdi.exe"); #else -_LIT(KUsbmanImg, "z:\\system\\programs\\usbsvr_over_dummyusbdi.exe"); +#ifdef __DUMMY_LDD__ +_LIT(KUsbmanImg, "z:\\system\\programs\\usbsvr_over_dummyldd.exe"); +#else +_LIT(KUsbmanImg, "z:\\system\\programs\\usbsvr.exe"); #endif +#endif + #endif //__USBMAN_NO_PROCESSES__