\r
--*/\r
\r
-#include "../cbi.h"\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-UsbCBI1DriverEntryPoint (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE *SystemTable\r
- );\r
+#include "cbi.h"\r
\r
//\r
// CBI Function prototypes\r
IN EFI_HANDLE *ChildHandleBuffer\r
);\r
\r
+STATIC\r
VOID\r
Cbi1ReportStatusCode (\r
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath,\r
);\r
\r
\r
-EFI_DRIVER_BINDING_PROTOCOL gCBI1DriverBinding = {\r
+EFI_DRIVER_BINDING_PROTOCOL gUsbCbi1DriverBinding = {\r
CBI1DriverBindingSupported,\r
CBI1DriverBindingStart,\r
CBI1DriverBindingStop,\r
- 0x10,\r
+ 0xa,\r
NULL,\r
NULL\r
};\r
//\r
if (EndpointDescriptor.Attributes == 0x02) {\r
if (EndpointDescriptor.EndpointAddress & 0x80) {\r
- CopyMem (&UsbCbiDev->BulkInEndpointDescriptor, &EndpointDescriptor, sizeof(EndpointDescriptor));\r
- //UsbCbiDev->BulkInEndpointDescriptor = EndpointDescriptor;\r
- } else {\r
- CopyMem (&UsbCbiDev->BulkOutEndpointDescriptor, &EndpointDescriptor, sizeof(EndpointDescriptor));\r
- //UsbCbiDev->BulkOutEndpointDescriptor = EndpointDescriptor;\r
- }\r
+ CopyMem (&UsbCbiDev->BulkInEndpointDescriptor, &EndpointDescriptor, sizeof (EndpointDescriptor));\r
+ } else {\r
+ CopyMem (&UsbCbiDev->BulkOutEndpointDescriptor, &EndpointDescriptor, sizeof (EndpointDescriptor));\r
+ }\r
\r
Found = TRUE;\r
}\r
// We parse interrupt endpoint\r
//\r
if (EndpointDescriptor.Attributes == 0x03) {\r
- CopyMem (&UsbCbiDev->InterruptEndpointDescriptor, &EndpointDescriptor, sizeof(EndpointDescriptor));\r
- //UsbCbiDev->InterruptEndpointDescriptor = EndpointDescriptor;\r
+ CopyMem (&UsbCbiDev->InterruptEndpointDescriptor, &EndpointDescriptor, sizeof (EndpointDescriptor));\r
Found = TRUE;\r
}\r
\r
goto ErrorExit;\r
}\r
\r
+ UsbCbiDev->ControllerNameTable = NULL;\r
+ AddUnicodeString (\r
+ "eng",\r
+ gUsbCbi1ComponentName.SupportedLanguages,\r
+ &UsbCbiDev->ControllerNameTable,\r
+ (CHAR16 *) L"Usb Cbi1 Mass Storage"\r
+ );\r
+\r
return EFI_SUCCESS;\r
\r
ErrorExit:\r
EFI_STATUS Status;\r
EFI_USB_ATAPI_PROTOCOL *CBI1AtapiProtocol;\r
USB_CBI_DEVICE *UsbCbiDev;\r
- EFI_USB_IO_PROTOCOL *UsbIo;\r
\r
//\r
// Get our context back.\r
\r
UsbCbiDev = USB_CBI_DEVICE_FROM_THIS (CBI1AtapiProtocol);\r
\r
- UsbIo = UsbCbiDev->UsbIo;\r
-\r
Cbi1ReportStatusCode (\r
UsbCbiDev->DevicePath,\r
EFI_PROGRESS_CODE,\r
--*/\r
{\r
UINT8 ResetCommand[12];\r
- EFI_STATUS Status;\r
EFI_USB_IO_PROTOCOL *UsbIo;\r
USB_CBI_DEVICE *UsbCbiDev;\r
UINT8 EndpointAddr;\r
ResetCommand[0] = 0x1d;\r
ResetCommand[1] = 0x04;\r
\r
- Status = CBI1CommandPhase (\r
- UsbCbiDev,\r
- ResetCommand,\r
- 12,\r
- &Result\r
- );\r
+ CBI1CommandPhase (\r
+ UsbCbiDev,\r
+ ResetCommand,\r
+ 12,\r
+ &Result\r
+ );\r
\r
//\r
// clear bulk in endpoint stall feature\r
return EFI_DEVICE_ERROR;\r
}\r
\r
+STATIC\r
VOID\r
Cbi1ReportStatusCode (\r
IN EFI_DEVICE_PATH_PROTOCOL *DevicePath,\r