equal
deleted
inserted
replaced
21 */ |
21 */ |
22 |
22 |
23 #include "msfdc.h" |
23 #include "msfdc.h" |
24 #include "utils.h" |
24 #include "utils.h" |
25 #include <d32usbc.h> |
25 #include <d32usbc.h> |
|
26 #ifndef __DUMMYFDF__ |
26 #include <usbhost/internal/fdcpluginobserver.h> |
27 #include <usbhost/internal/fdcpluginobserver.h> |
27 #include <d32usbdi.h> |
28 #include <d32usbdi.h> |
|
29 #else |
|
30 #include <dummyfdcpluginobserver.h> |
|
31 #include <dummyusbinterface.h> |
|
32 #endif |
28 #include <d32usbdescriptors.h> |
33 #include <d32usbdescriptors.h> |
29 #include "OstTraceDefinitions.h" |
34 #include "OstTraceDefinitions.h" |
30 #ifdef OST_TRACE_COMPILER_IN_USE |
35 #ifdef OST_TRACE_COMPILER_IN_USE |
31 #include "msfdcTraces.h" |
36 #include "msfdcTraces.h" |
32 #endif |
37 #endif |
221 OstTrace0( TRACE_NORMAL, CMSFDC_MFI1NEWFUNCTION_DUP13, |
226 OstTrace0( TRACE_NORMAL, CMSFDC_MFI1NEWFUNCTION_DUP13, |
222 "***** Mass Storage FDC Open interface handle OK" ); |
227 "***** Mass Storage FDC Open interface handle OK" ); |
223 } |
228 } |
224 |
229 |
225 error = interface_ep0.GetInterfaceDescriptor(ifDescriptor); |
230 error = interface_ep0.GetInterfaceDescriptor(ifDescriptor); |
226 interface_ep0.Close(); |
|
227 if (error) |
231 if (error) |
228 { |
232 { |
229 OstTrace0( TRACE_ERROR, CMSFDC_MFI1NEWFUNCTION_DUP14, |
233 OstTrace0( TRACE_ERROR, CMSFDC_MFI1NEWFUNCTION_DUP14, |
230 "***** Mass Storage FDC get interface descriptor Failed" ); |
234 "***** Mass Storage FDC get interface descriptor Failed" ); |
|
235 interface_ep0.Close(); |
231 delete data; |
236 delete data; |
232 OstTraceFunctionExit0( CMSFDC_MFI1NEWFUNCTION_EXIT_DUP7 ); |
237 OstTraceFunctionExit0( CMSFDC_MFI1NEWFUNCTION_EXIT_DUP7 ); |
233 return error; |
238 return error; |
234 } |
239 } |
235 else |
240 else |
259 //This OTG information may need to be changed when OTG descriptor becomes available. |
264 //This OTG information may need to be changed when OTG descriptor becomes available. |
260 data->iOtgInformation = aDeviceDescriptor.DeviceBcd(); |
265 data->iOtgInformation = aDeviceDescriptor.DeviceBcd(); |
261 |
266 |
262 error = iMsmmSession.AddFunction(*data, aInterfaces[0], token); |
267 error = iMsmmSession.AddFunction(*data, aInterfaces[0], token); |
263 |
268 |
|
269 interface_ep0.Close(); |
264 delete data; |
270 delete data; |
265 OstTraceFunctionExit0( CMSFDC_MFI1NEWFUNCTION_EXIT_DUP8 ); |
271 OstTraceFunctionExit0( CMSFDC_MFI1NEWFUNCTION_EXIT_DUP8 ); |
266 return error; |
272 return error; |
267 } |
273 } |
268 /** |
274 /** |