usbmgmt/usbmgr/device/classdrivers/ms/classcontroller/src/CUsbMsClassController.cpp
changeset 51 eaaed528d5fd
parent 36 1a2a19ee918d
equal deleted inserted replaced
46:613028a7da24 51:eaaed528d5fd
   120 
   120 
   121 	TRequestStatus* reportStatus = &aStatus;
   121 	TRequestStatus* reportStatus = &aStatus;
   122 
   122 
   123 	iState = EUsbServiceStarting;
   123 	iState = EUsbServiceStarting;
   124 
   124 
       
   125 #ifndef __OVER_DUMMYUSBLDD__
   125 	// Connect to USB Mass Storage server
   126 	// Connect to USB Mass Storage server
   126 	TInt err = iUsbMs.Connect();
   127 	TInt err = iUsbMs.Connect();
   127 
   128 #else
       
   129 	TInt err = KErrNone;
       
   130 #endif
   128 	if (err != KErrNone)
   131 	if (err != KErrNone)
   129 		{
   132 		{
   130 		iState = EUsbServiceIdle;
   133 		iState = EUsbServiceIdle;
   131 		User::RequestComplete(reportStatus, err);
   134 		User::RequestComplete(reportStatus, err);
   132 		OstTrace0( TRACE_NORMAL, CUSBMSCLASSCONTROLLER_START_DUP1, 
   135 		OstTrace0( TRACE_NORMAL, CUSBMSCLASSCONTROLLER_START_DUP1, 
   133 				"CUsbMsClassController::Start;Failed to connect to mass storage file server" );
   136 				"CUsbMsClassController::Start;Failed to connect to mass storage file server" );
   134 		OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_START_EXIT );
   137 		OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_START_EXIT );
   135 		return;
   138 		return;
   136 		}
   139 		}
   137 
   140 
       
   141 #ifndef __OVER_DUMMYUSBLDD__
   138 	// Start mass storage device
   142 	// Start mass storage device
   139 	err = iUsbMs.Start(iMsConfig);
   143 	err = iUsbMs.Start(iMsConfig);
       
   144 #else
       
   145 	err = KErrNone;
       
   146 #endif
   140 
   147 
   141 	if (err != KErrNone)
   148 	if (err != KErrNone)
   142 		{
   149 		{
   143 		iState = EUsbServiceIdle;
   150 		iState = EUsbServiceIdle;
   144 		// Connection was created successfully in last step
   151 		// Connection was created successfully in last step
   172 		OstTrace1( TRACE_FATAL, CUSBMSCLASSCONTROLLER_STOP, "CUsbMsClassController::Stop;iState=%d", (TInt)iState );
   179 		OstTrace1( TRACE_FATAL, CUSBMSCLASSCONTROLLER_STOP, "CUsbMsClassController::Stop;iState=%d", (TInt)iState );
   173 		__ASSERT_DEBUG( EFalse, User::Panic(KMsCcPanicCategory, EBadApiCall) );
   180 		__ASSERT_DEBUG( EFalse, User::Panic(KMsCcPanicCategory, EBadApiCall) );
   174 		}
   181 		}
   175 
   182 
   176 	TRequestStatus* reportStatus = &aStatus;
   183 	TRequestStatus* reportStatus = &aStatus;
       
   184 #ifndef __OVER_DUMMYUSBLDD__
   177 	TInt err = iUsbMs.Stop();
   185 	TInt err = iUsbMs.Stop();
   178 	
   186 	
   179 	if (err != KErrNone)
   187 	if (err != KErrNone)
   180 		{
   188 		{
   181 		iState = EUsbServiceStarted;
   189 		iState = EUsbServiceStarted;
   185 		OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_STOP_EXIT );
   193 		OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_STOP_EXIT );
   186 		return;
   194 		return;
   187 		}	
   195 		}	
   188 
   196 
   189 	iUsbMs.Close();
   197 	iUsbMs.Close();
       
   198 #else
       
   199 	iState = EUsbServiceIdle;
       
   200 #endif
   190 	User::RequestComplete(reportStatus, KErrNone);
   201 	User::RequestComplete(reportStatus, KErrNone);
   191 	OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_START_STOP_DUP1 );
   202 	OstTraceFunctionExit0( CUSBMSCLASSCONTROLLER_START_STOP_DUP1 );
   192 	}
   203 	}
   193 
   204 
   194 /**
   205 /**