usbmgmt/usbmgr/usbman/server/SRC/CUsbSession.cpp
changeset 51 eaaed528d5fd
parent 36 1a2a19ee918d
equal deleted inserted replaced
46:613028a7da24 51:eaaed528d5fd
    93 
    93 
    94 	OstTrace1( TRACE_NORMAL, CUSBSESSION_CUSBSESSION, "CUsbSession::~CUsbSession;About to Device().DeRegisterObserver(%08x)", this );
    94 	OstTrace1( TRACE_NORMAL, CUSBSESSION_CUSBSESSION, "CUsbSession::~CUsbSession;About to Device().DeRegisterObserver(%08x)", this );
    95 	iUsbServer->Device().DeRegisterObserver(*this);
    95 	iUsbServer->Device().DeRegisterObserver(*this);
    96 
    96 
    97 #ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
    97 #ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
    98 #ifndef __OVER_DUMMYUSBDI__
       
    99 	OstTrace1( TRACE_NORMAL, CUSBSESSION_CUSBSESSION_DUP1, "CUsbSession::~CUsbSession;About to Otg().DeRegisterObserver(%08x)", this );
    98 	OstTrace1( TRACE_NORMAL, CUSBSESSION_CUSBSESSION_DUP1, "CUsbSession::~CUsbSession;About to Otg().DeRegisterObserver(%08x)", this );
   100 	iUsbServer->Otg().DeRegisterObserver(*this);
    99 	iUsbServer->Otg().DeRegisterObserver(*this);
   101 #endif
       
   102 
   100 
   103 	OstTrace1( TRACE_NORMAL, CUSBSESSION_CUSBSESSION_DUP2, "CUsbSession::~CUsbSession;About to Host().DeRegisterObserver(%08x)", this );
   101 	OstTrace1( TRACE_NORMAL, CUSBSESSION_CUSBSESSION_DUP2, "CUsbSession::~CUsbSession;About to Host().DeRegisterObserver(%08x)", this );
   104 	iUsbServer->Host().DeregisterObserver(*this);
   102 	iUsbServer->Host().DeregisterObserver(*this);
   105 
   103 
   106 	if ( iCtlSession && (iCtlSession == this) )
   104 	if ( iCtlSession && (iCtlSession == this) )
   145 
   143 
   146     OstTrace0( TRACE_NORMAL, CUSBSESSION_CREATEL, "CUsbSession::CreateL;Registering Device Observer" );
   144     OstTrace0( TRACE_NORMAL, CUSBSESSION_CREATEL, "CUsbSession::CreateL;Registering Device Observer" );
   147 	iUsbServer->Device().RegisterObserverL(*this);
   145 	iUsbServer->Device().RegisterObserverL(*this);
   148 
   146 
   149 #ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
   147 #ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
   150 #ifndef __OVER_DUMMYUSBDI__
       
   151 	OstTrace0( TRACE_NORMAL, CUSBSESSION_CREATEL_DUP1, "CUsbSession::CreateL;Registering OTG Observer" );
   148 	OstTrace0( TRACE_NORMAL, CUSBSESSION_CREATEL_DUP1, "CUsbSession::CreateL;Registering OTG Observer" );
   152 	iUsbServer->Otg().RegisterObserverL(*this);
   149 	iUsbServer->Otg().RegisterObserverL(*this);
   153 #endif
       
   154 
   150 
   155 	OstTrace0( TRACE_NORMAL, CUSBSESSION_CREATEL_DUP2, "CUsbSession::CreateL;Registering HOST Observer" );
   151 	OstTrace0( TRACE_NORMAL, CUSBSESSION_CREATEL_DUP2, "CUsbSession::CreateL;Registering HOST Observer" );
   156 	iUsbServer->Host().RegisterObserverL(*this);
   152 	iUsbServer->Host().RegisterObserverL(*this);
   157 #endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
   153 #endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV
   158 	OstTraceFunctionExit0( CUSBSESSION_CREATEL_EXIT );
   154 	OstTraceFunctionExit0( CUSBSESSION_CREATEL_EXIT );
   580 		ret = RegisterMsgObserver(aMessage, complete);
   576 		ret = RegisterMsgObserver(aMessage, complete);
   581 		break;
   577 		break;
   582 	case EUsbCancelMessageObserver:
   578 	case EUsbCancelMessageObserver:
   583 		ret = DeRegisterMsgObserver();
   579 		ret = DeRegisterMsgObserver();
   584 		break;
   580 		break;
   585 #ifndef __OVER_DUMMYUSBDI__
       
   586 	case EUsbBusRequest:
   581 	case EUsbBusRequest:
   587 		ret = BusRequest();
   582 		ret = BusRequest();
   588 		break;
   583 		break;
   589 	case EUsbBusRespondSrp:
   584 	case EUsbBusRespondSrp:
   590 		ret = BusRespondSrp();
   585 		ret = BusRespondSrp();
   593 		ret = BusClearError();
   588 		ret = BusClearError();
   594 		break;
   589 		break;
   595 	case EUsbBusDrop:
   590 	case EUsbBusDrop:
   596 		ret = BusDrop();
   591 		ret = BusDrop();
   597 		break;
   592 		break;
   598 #else
       
   599 	case EUsbBusRequest:
       
   600 	case EUsbBusRespondSrp:
       
   601 	case EUsbBusClearError:
       
   602 	case EUsbBusDrop:
       
   603 		ret = KErrNone;
       
   604 		break;
       
   605 #endif
       
   606 	case EUsbRegisterHostObserver:
   593 	case EUsbRegisterHostObserver:
   607 		ret = RegisterHostObserver(aMessage, complete);
   594 		ret = RegisterHostObserver(aMessage, complete);
   608 		break;
   595 		break;
   609 	case EUsbCancelHostObserver:
   596 	case EUsbCancelHostObserver:
   610 		ret = DeRegisterHostObserver();
   597 		ret = DeRegisterHostObserver();