FCL/sf/os/usb: comparison usbmgmt/usbmgr/usbman/server/SRC/CUsbDevice.cpp

equal deleted inserted replaced

-:4285b54b0d2c
+:4ddb65515edd
 	// Free any memory allocated to the list of observers. Note that
 	// we don't want to call ResetAndDestroy, because we don't own
 	// the observers themselves.
 	iObservers.Reset();
+#ifndef __OVER_DUMMYUSBDI__
 #ifndef __WINS__
 	LOGTEXT2(_L8("about to delete device state watcher @ %08x"), (TUint32) iDeviceStateWatcher);
 	delete iDeviceStateWatcher;
 	LOGTEXT(_L8("deleted device state watcher"));
 	//warning about err being unused in UREL builds.
 	if(err)
 		{
 		LOGTEXT2(_L8("     User::FreeLogicalDevice returned %d"),err);
 		}
+#endif
 #endif
 	delete iDefaultSerialNumber;
 	}
 	iEcom = &(REComSession::OpenL());
 	iUsbClassControllerIterator = new(ELeave) CUsbClassControllerIterator(iSupportedClasses);
+#ifndef __OVER_DUMMYUSBDI__
 #ifndef __WINS__
 	LOGTEXT(_L8("About to load LDD"));
 	TInt err = User::LoadLogicalDevice(KUsbLDDName);
 	if (err != KErrNone && err != KErrAlreadyExists)
 		LOGTEXT2(_L8("Got default serial number %S"), &narrowString);
 #endif //__FLOG_ACTIVE
 		}
 	LOGTEXT(_L8("UsbDevice::ConstructL() finished"));
+#endif
 #endif
 #ifndef __OVER_DUMMYUSBDI__
 	InstantiateExtensionPluginsL();
 #endif
 		return;
 		}
 	if (iDeviceState != state)
 		{
+#ifndef __OVER_DUMMYUSBDI__
 #ifndef __WINS__
 		if (iDeviceState == EUsbDeviceStateUndefined &&
 			iUdcSupportsCableDetectWhenUnpowered &&
 			iServiceState == EUsbServiceStarted)
 			{
 			// now be attached (if it wasn't before). If the UDC supports
 			// cable detection when unpowered, NOW is the right time to power
 			// it up (so long as usbman is fully started).
 			(void)PowerUpAndConnect(); // We don't care about any errors here.
 			}
-#endif // __WINS__
+#endif
+#endif // __OVER_DUMMYUSBDI__
 		// Change state straight away in case any of the clients check it
 		TUsbDeviceState oldState = iDeviceState;
 		iDeviceState = state;
 		TUint length = iObservers.Count();
 	switch (iServiceState)
 		{
 	case EUsbServiceStarting:
 		if (iUsbClassControllerIterator->Next() == KErrNotFound)
 			{
+#ifndef __OVER_DUMMYUSBDI__
 #ifndef __WINS__
 			if (!iUdcSupportsCableDetectWhenUnpowered || iDeviceState != EUsbDeviceStateUndefined)
 				{
 				// We've finished starting the classes. We can just power up the UDC
 				// now: there's no need to re-enumerate, because we soft disconnected
 				// It isn't an error if this call fails. This will happen, for example,
 				// in the case where there are no USB classes defined.
 				(void)PowerUpAndConnect();
 				}
 #endif
+#endif
 			// If we're not running on target, we can just go to "started".
 			SetServiceState(EUsbServiceStarted);
 			}
 		else
 			{
 	case EUsbServiceStopping:
 		if (iUsbClassControllerIterator->Previous() == KErrNotFound)
 			{
 			// if stopping classes, hide the USB interface from the host
+#ifndef __OVER_DUMMYUSBDI__
 #ifndef __WINS__
 			iLdd.DeviceDisconnectFromHost();
 			// Restore the default serial number
 			if (iDefaultSerialNumber)
 			else
 				{
 				TInt res = iLdd.RemoveSerialNumberStringDescriptor();
 				LOGTEXT2(_L8("Remove serial number res = %d"), res);
 				}
+#endif
 #endif
 			SetServiceState(EUsbServiceIdle);
 			}
 		else
 			{
 * Modifies the USB device descriptor.
 */
 	{
 	LOG_FUNC
-#ifndef __WINS__
+#if !defined(__OVER_DUMMYUSBDI__) && !defined(__WINS__)
 	TInt desSize = 0;
 	iLdd.GetDeviceDescriptorSize(desSize);
 	LOGTEXT2(_L8("UDeviceDescriptorSize = %d"), desSize);
 	HBufC8* deviceBuf = HBufC8::NewLC(desSize);
 	// Create an empty descriptor to allow the settings
 	// to be read in from the resource file
 	TUsbDeviceDescriptor descriptor;
 	TUsbDeviceDescriptor* deviceDescriptor = &descriptor;
-#endif // __WINS__
+#endif // __OVER_DUMMYUSBDI__ && _WINS_
 	if (iPersonalityCfged)
 		{
 		SetUsbDeviceSettingsFromPersonalityL(*deviceDescriptor);
 		}
 	else
 		{
 	SetUsbDeviceSettingsL(*deviceDescriptor);
 		}
+#ifndef __OVER_DUMMYUSBDI__
 #ifndef __WINS__
 	ret = iLdd.SetDeviceDescriptor(devicePtr);
 	if (ret != KErrNone)
 		{
 		LEAVEL(ret);
 		}
 	CleanupStack::PopAndDestroy(deviceBuf);
-#endif // __WINS__
+#endif
+#endif // __OVER_DUMMYUSBDI__
 	}
 void CUsbDevice::SetUsbDeviceSettingsDefaultsL(CUsbDevice::TUsbDeviceDescriptor& aDeviceDescriptor)
 /**
 * Set the device settings defaults, as per the non-resource
 	TPtrC manufacturerString = reader.ReadTPtrC();
 	TPtrC productString = reader.ReadTPtrC();
 	// If we succesfully read the manufacturer or device name from SysUtil API
 	// then set these results, otherwise use the values defined in resource file
+#ifndef __OVER_DUMMYUSBDI__
 #ifndef __WINS__
 	if (gotSysUtilManuName == KErrNone)
 		{
 		LEAVEIFERRORL(iLdd.SetManufacturerStringDescriptor(sysUtilManuName));
 		}
 		}
 	else
 		{
 		LEAVEIFERRORL(iLdd.SetProductStringDescriptor(productString));
 		}
-#endif // __WINS__
+#endif
+#endif // __OVER_DUMMYUSBDI__
 #ifdef __FLOG_ACTIVE
 	PrintDescriptor(aDeviceDescriptor);
 	TBuf8<KUsbStringDescStringMaxSize> narrowString;
 	narrowString.Copy(manufacturerString);
 	LOGTEXT2(_L8("Manufacturer is: '%S'"), &narrowString);
 	narrowString.Copy(productString);
 	LOGTEXT2(_L8("Product is: '%S'"), &narrowString);
 #endif // __FLOG_ACTIVE
+#ifndef __OVER_DUMMYUSBDI__
 #ifndef __WINS__
 	//Read the published serial number. The key is the UID KUidUsbmanServer = 0x101FE1DB
 	TBuf16<KUsbStringDescStringMaxSize> serNum;
 	TInt r = RProperty::Get(KUidSystemCategory,0x101FE1DB,serNum);
 	if(r==KErrNone)
 	else
 		{
 		LOGTEXT(_L8("SerialNumber has not been published"));
 		}
 #endif // __FLOG_ACTIVE
-#endif // __WINS__
+#endif
+#endif // __OVER_DUMMYUSBDI__
 	CleanupStack::PopAndDestroy(4, &fs); //  deviceInfo, id, resource, fs
 	}
 	aDeviceDescriptor.iIdProduct			= deviceDes.iIdProduct;
 	aDeviceDescriptor.iBcdDevice			= deviceDes.iBcdDevice;
 	aDeviceDescriptor.iSerialNumber			= deviceDes.iSerialNumber;
 	aDeviceDescriptor.iNumConfigurations	= deviceDes.iNumConfigurations;
+#ifndef __OVER_DUMMYUSBDI__
 #ifndef __WINS__
 	LEAVEIFERRORL(iLdd.SetManufacturerStringDescriptor(*(iCurrentPersonality->Manufacturer())));
 	LEAVEIFERRORL(iLdd.SetProductStringDescriptor(*(iCurrentPersonality->Product())));
 	//Read the published serial number. The key is the UID KUidUsbmanServer = 0x101FE1DB
 	else
 		{
 		LOGTEXT(_L8("SerialNumber has not been published"));
 		}
 #endif // __FLOG_ACTIVE
-#endif // __WINS__
+#endif
+#endif // __OVER_DUMMYUSBDI__
 #ifdef __FLOG_ACTIVE
 	PrintDescriptor(aDeviceDescriptor);
+#ifndef __OVER_DUMMYUSBDI__
 #ifndef __WINS__
 	TBuf16<KUsbStringDescStringMaxSize> wideString;
 	TBuf8<KUsbStringDescStringMaxSize> narrowString;
 	LEAVEIFERRORL(iLdd.GetConfigurationStringDescriptor(wideString));
 	narrowString.Copy(wideString);
 	LOGTEXT2(_L8("Configuration is: '%S'"), &narrowString);
-#endif // __WINS__
+#endif
+#endif // __OVER_DUMMYUSBDI__
 #endif // __FLOG_ACTIVE
 	}
 void CUsbDevice::TryStartL(TInt aPersonalityId)

changeset 25	4ddb65515edd
parent 0	c9bc50fca66e
child 26	f3a1ae528dee