diff -r 000000000000 -r c9bc50fca66e usbmgmt/usbmgr/usbman/chargingplugin/src/otgstatewatcher.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usbmgmt/usbmgr/usbman/chargingplugin/src/otgstatewatcher.cpp	Tue Feb 02 02:02:59 2010 +0200
@@ -0,0 +1,83 @@
+/*
+* Copyright (c) 2008-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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Talks directly to the USB Logical Device Driver (LDD) and 
+* watches any state changes
+*
+*/
+
+/**
+ @file
+*/
+
+#include "otgstatewatcher.h"
+
+COtgStateWatcher* COtgStateWatcher::NewL(MOtgPropertiesObserver* aObserver)
+	{
+	COtgStateWatcher* self = new(ELeave) COtgStateWatcher(aObserver);
+	CleanupStack::PushL(self);
+	self->ConstructL();
+	CleanupStack::Pop(self);
+	return self;
+	}
+
+COtgStateWatcher::~COtgStateWatcher()
+	{
+	Cancel();
+	iOtgStateProp.Close();
+	}
+
+COtgStateWatcher::COtgStateWatcher(MOtgPropertiesObserver* aObserver)
+	: CActive(EPriorityStandard)
+	, iObserver(aObserver)
+	, iOtgState(EUsbOtgStateReset)
+	{
+	CActiveScheduler::Add(this);
+	}
+
+void COtgStateWatcher::ConstructL()
+	{
+	User::LeaveIfError(iOtgStateProp.Attach(KUidUsbManCategory, KUsbOtgStateProperty));
+	iOtgStateProp.Subscribe(iStatus);
+	SetActive();
+
+	TInt err = iOtgStateProp.Get((TInt&)iOtgState);
+	if (KErrNone != err)
+		{
+		iOtgState = EUsbOtgStateBPeripheral;
+		}
+	}
+
+void COtgStateWatcher::DoCancel()
+	{
+	iOtgStateProp.Cancel();
+	}
+
+void COtgStateWatcher::RunL()
+	{
+	iOtgStateProp.Subscribe(iStatus);
+	SetActive();
+
+	TInt err = iOtgStateProp.Get((TInt&)iOtgState);
+	if (KErrNone != err)
+		{
+		iOtgState = EUsbOtgStateBPeripheral;
+		}
+	iObserver->MpsoOtgStateChangedL(iOtgState);
+	}
+
+TUsbOtgState COtgStateWatcher::OtgState() const
+	{
+	return iOtgState;
+	}