equal
deleted
inserted
replaced
180 { |
180 { |
181 FLOG( _L( "[USBOTGWATCHER]\tCUsbServiceControl::Stop" ) ); |
181 FLOG( _L( "[USBOTGWATCHER]\tCUsbServiceControl::Stop" ) ); |
182 |
182 |
183 TUsbServiceState serviceState; |
183 TUsbServiceState serviceState; |
184 TInt err = iUsb.GetServiceState(serviceState); |
184 TInt err = iUsb.GetServiceState(serviceState); |
|
185 FTRACE(FPrint(_L( "[USBOTGWATCHER]\tCUsbServiceControl::StopL = %d; Usb service state = %d" ), err, serviceState)); |
185 |
186 |
186 if (KErrNone != err) |
187 if (KErrNone != err) |
187 { |
188 { |
188 return err; |
189 return err; |
189 } |
190 } |
257 void CUsbServiceControl::RunL() |
258 void CUsbServiceControl::RunL() |
258 { |
259 { |
259 FTRACE(FPrint(_L( "[USBOTGWATCHER]\tCUsbServiceControl::RunL iStatus %d" ), iStatus.Int())); |
260 FTRACE(FPrint(_L( "[USBOTGWATCHER]\tCUsbServiceControl::RunL iStatus %d" ), iStatus.Int())); |
260 if (KErrNone != iStatus.Int()) |
261 if (KErrNone != iStatus.Int()) |
261 { |
262 { |
262 //User::Leave(iStatus.Int()); |
|
263 iObserver->UsbServiceControlReqCompletedL(iStatus.Int()); |
263 iObserver->UsbServiceControlReqCompletedL(iStatus.Int()); |
264 return; |
264 return; |
265 } |
265 } |
266 |
266 |
267 TUsbServiceState serviceState; |
267 TUsbServiceState serviceState; |
268 TInt err = iUsb.GetServiceState(serviceState); |
268 TInt err = iUsb.GetServiceState(serviceState); |
269 |
269 |
270 if (KErrNone != err) |
270 if (KErrNone != err) |
271 { |
271 { |
272 FTRACE(FPrint(_L( "[USBOTGWATCHER]\tCUsbServiceControl::RunL error while getting service state %d" ), err)); |
272 FTRACE(FPrint(_L( "[USBOTGWATCHER]\tCUsbServiceControl::RunL error while getting service state %d" ), err)); |
273 //User::Leave(err); |
|
274 iObserver->UsbServiceControlReqCompletedL(err); |
273 iObserver->UsbServiceControlReqCompletedL(err); |
275 return; |
274 return; |
276 } |
275 } |
277 |
276 |
278 switch (serviceState) |
277 switch (serviceState) |
306 TInt currentPersonality(0); |
305 TInt currentPersonality(0); |
307 err = iUsb.GetCurrentPersonalityId(currentPersonality); |
306 err = iUsb.GetCurrentPersonalityId(currentPersonality); |
308 if (KErrNone != err) |
307 if (KErrNone != err) |
309 { |
308 { |
310 FTRACE(FPrint(_L( "[USBOTGWATCHER]\tCUsbServiceControl::RunL error while getting PersonalityId err = %d" ), err)); |
309 FTRACE(FPrint(_L( "[USBOTGWATCHER]\tCUsbServiceControl::RunL error while getting PersonalityId err = %d" ), err)); |
311 //User::Leave(err); |
|
312 iObserver->UsbServiceControlReqCompletedL(err); |
310 iObserver->UsbServiceControlReqCompletedL(err); |
313 return; |
311 return; |
314 } |
312 } |
315 |
313 |
316 if (iPersonalityId == currentPersonality) // already done |
314 if (iPersonalityId == currentPersonality) // already done |
335 |
333 |
336 // otherwise, during service start, requested to start it with another personality |
334 // otherwise, during service start, requested to start it with another personality |
337 FTRACE(FPrint(_L( "[USBOTGWATCHER]\tCUsbServiceControl::RunL Requested to start personality %d. Starting it." ), iPersonalityId)); |
335 FTRACE(FPrint(_L( "[USBOTGWATCHER]\tCUsbServiceControl::RunL Requested to start personality %d. Starting it." ), iPersonalityId)); |
338 TInt personalityId = iPersonalityId; |
336 TInt personalityId = iPersonalityId; |
339 iPersonalityId = 0; // reset |
337 iPersonalityId = 0; // reset |
340 //User::LeaveIfError(Start(personalityId)); |
|
341 err = StartL(personalityId); |
338 err = StartL(personalityId); |
342 if(KErrNone != err) |
339 if(KErrNone != err) |
343 { |
340 { |
344 FTRACE(FPrint(_L( "[USBOTGWATCHER]\tCUsbServiceControl::RunL error while starting personality err = %d" ), err)); |
341 FTRACE(FPrint(_L( "[USBOTGWATCHER]\tCUsbServiceControl::RunL error while starting personality err = %d" ), err)); |
345 iObserver->UsbServiceControlReqCompletedL(err); |
342 iObserver->UsbServiceControlReqCompletedL(err); |
362 break; |
359 break; |
363 } |
360 } |
364 case EUsbServiceFatalError: |
361 case EUsbServiceFatalError: |
365 { |
362 { |
366 FLOG( _L( "[USBOTGWATCHER]\tCUsbServiceControl::Start UsbServiceState == EUsbServiceFatalError" ) ); |
363 FLOG( _L( "[USBOTGWATCHER]\tCUsbServiceControl::Start UsbServiceState == EUsbServiceFatalError" ) ); |
367 //User::Leave(KErrGeneral); |
|
368 iObserver->UsbServiceControlReqCompletedL(KErrGeneral); |
364 iObserver->UsbServiceControlReqCompletedL(KErrGeneral); |
369 break; |
365 break; |
370 } |
366 } |
371 default: |
367 default: |
372 { |
368 { |
381 // --------------------------------------------------------------------------- |
377 // --------------------------------------------------------------------------- |
382 // |
378 // |
383 TInt CUsbServiceControl::RunError(TInt aError) |
379 TInt CUsbServiceControl::RunError(TInt aError) |
384 { |
380 { |
385 FTRACE(FPrint(_L( "[USBOTGWATCHER]\tCUsbServiceControl::RunError aError %d" ), aError )); |
381 FTRACE(FPrint(_L( "[USBOTGWATCHER]\tCUsbServiceControl::RunError aError %d" ), aError )); |
386 //TRAP_IGNORE(iObserver->UsbServiceControlReqCompletedL(aError)); |
382 TRAP_IGNORE(iObserver->UsbServiceControlReqCompletedL(aError)); |
387 |
383 |
388 return KErrNone; |
384 return KErrNone; |
389 } |
385 } |
390 |
386 |
391 // --------------------------------------------------------------------------- |
387 // --------------------------------------------------------------------------- |