equal
deleted
inserted
replaced
78 delete iUsbDevice; |
78 delete iUsbDevice; |
79 |
79 |
80 #ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV |
80 #ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV |
81 delete iUsbHost; |
81 delete iUsbHost; |
82 |
82 |
83 #ifndef __OVER_DUMMYUSBDI__ |
|
84 // Check that this is A-Device |
83 // Check that this is A-Device |
85 OstTrace0( TRACE_NORMAL, CUSBSERVER_CUSBSERVER, "CUsbServer::~CUsbServer; Checking Id-Pin state..." ); |
84 OstTrace0( TRACE_NORMAL, CUSBSERVER_CUSBSERVER, "CUsbServer::~CUsbServer; Checking Id-Pin state..." ); |
86 TInt value = 0; |
85 TInt value = 0; |
87 TInt err = RProperty::Get(KUidUsbManCategory, KUsbOtgIdPinPresentProperty,value); |
86 TInt err = RProperty::Get(KUidUsbManCategory, KUsbOtgIdPinPresentProperty,value); |
88 if (err == 0 && value == 1) |
87 if (err == 0 && value == 1) |
124 } |
123 } |
125 else |
124 else |
126 { |
125 { |
127 OstTraceExt2( TRACE_NORMAL, CUSBSERVER_CUSBSERVER_DUP7, "CUsbServer::~CUsbServer;No Id-Pin is found or an error occured: err = %d, value = %d", err, value ); |
126 OstTraceExt2( TRACE_NORMAL, CUSBSERVER_CUSBSERVER_DUP7, "CUsbServer::~CUsbServer;No Id-Pin is found or an error occured: err = %d, value = %d", err, value ); |
128 } |
127 } |
129 |
128 |
130 delete iUsbOtg; |
129 delete iUsbOtg; |
131 #endif |
|
132 #endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV |
130 #endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV |
133 |
|
134 OstTraceFunctionExit0( CUSBSERVER_CUSBSERVER_DES_EXIT ); |
131 OstTraceFunctionExit0( CUSBSERVER_CUSBSERVER_DES_EXIT ); |
135 } |
132 } |
136 |
133 |
137 |
134 |
138 /** |
135 /** |
160 |
157 |
161 iShutdownTimer = new(ELeave) CShutdownTimer; |
158 iShutdownTimer = new(ELeave) CShutdownTimer; |
162 iShutdownTimer->ConstructL(); |
159 iShutdownTimer->ConstructL(); |
163 |
160 |
164 #ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV |
161 #ifdef SYMBIAN_ENABLE_USB_OTG_HOST_PRIV |
165 #ifndef __OVER_DUMMYUSBDI__ |
|
166 iUsbOtg = CUsbOtg::NewL(); |
162 iUsbOtg = CUsbOtg::NewL(); |
167 iUsbOtg->StartL(); |
163 iUsbOtg->StartL(); |
168 #endif |
|
169 #endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV |
164 #endif // SYMBIAN_ENABLE_USB_OTG_HOST_PRIV |
170 |
165 |
171 iUsbDevice = CUsbDevice::NewL(*this); |
166 iUsbDevice = CUsbDevice::NewL(*this); |
172 OstTrace0( TRACE_NORMAL, CUSBSERVER_CONSTRUCTL, "CUsbServer::ConstructL; About to load USB classes" ); |
167 OstTrace0( TRACE_NORMAL, CUSBSERVER_CONSTRUCTL, "CUsbServer::ConstructL; About to load USB classes" ); |
173 iUsbDevice->EnumerateClassControllersL(); |
168 iUsbDevice->EnumerateClassControllersL(); |