1. Add the GLOBAL_REMOVE_IF_UNREFERENCED to globe variables which are used only in debug version;
2. Use ZeroMem to replace gBS->SetMem; 3. Remove marked code; 4. Add IsHub judgement in UsbPortReset function to following EFI1.1 spec; 5. Add brackets for macro definition git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1740 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -354,21 +354,18 @@ Cbi0DriverBindingStart (
|
||||
//
|
||||
if (EndpointDescriptor.Attributes == 0x02) {
|
||||
if (EndpointDescriptor.EndpointAddress & 0x80) {
|
||||
CopyMem (&UsbCbiDev->BulkInEndpointDescriptor, &EndpointDescriptor, sizeof(EndpointDescriptor));
|
||||
// UsbCbiDev->BulkInEndpointDescriptor = EndpointDescriptor;
|
||||
EndpointExistMask |= bit (0);
|
||||
CopyMem (&UsbCbiDev->BulkInEndpointDescriptor, &EndpointDescriptor, sizeof (EndpointDescriptor));
|
||||
EndpointExistMask |= bit (0);
|
||||
} else {
|
||||
CopyMem (&UsbCbiDev->BulkOutEndpointDescriptor, &EndpointDescriptor, sizeof(EndpointDescriptor));
|
||||
// UsbCbiDev->BulkOutEndpointDescriptor = EndpointDescriptor;
|
||||
EndpointExistMask |= bit (1);
|
||||
CopyMem (&UsbCbiDev->BulkOutEndpointDescriptor, &EndpointDescriptor, sizeof (EndpointDescriptor));
|
||||
EndpointExistMask |= bit (1);
|
||||
}
|
||||
}
|
||||
//
|
||||
// We parse interrupt endpoint
|
||||
//
|
||||
if (EndpointDescriptor.Attributes == 0x03) {
|
||||
CopyMem (&UsbCbiDev->InterruptEndpointDescriptor, &EndpointDescriptor, sizeof(EndpointDescriptor));
|
||||
// UsbCbiDev->InterruptEndpointDescriptor = EndpointDescriptor;
|
||||
CopyMem (&UsbCbiDev->InterruptEndpointDescriptor, &EndpointDescriptor, sizeof (EndpointDescriptor));
|
||||
EndpointExistMask |= bit (2);
|
||||
}
|
||||
|
||||
|
@@ -309,12 +309,10 @@ CBI1DriverBindingStart (
|
||||
//
|
||||
if (EndpointDescriptor.Attributes == 0x02) {
|
||||
if (EndpointDescriptor.EndpointAddress & 0x80) {
|
||||
CopyMem (&UsbCbiDev->BulkInEndpointDescriptor, &EndpointDescriptor, sizeof(EndpointDescriptor));
|
||||
//UsbCbiDev->BulkInEndpointDescriptor = EndpointDescriptor;
|
||||
} else {
|
||||
CopyMem (&UsbCbiDev->BulkOutEndpointDescriptor, &EndpointDescriptor, sizeof(EndpointDescriptor));
|
||||
//UsbCbiDev->BulkOutEndpointDescriptor = EndpointDescriptor;
|
||||
}
|
||||
CopyMem (&UsbCbiDev->BulkInEndpointDescriptor, &EndpointDescriptor, sizeof (EndpointDescriptor));
|
||||
} else {
|
||||
CopyMem (&UsbCbiDev->BulkOutEndpointDescriptor, &EndpointDescriptor, sizeof (EndpointDescriptor));
|
||||
}
|
||||
|
||||
Found = TRUE;
|
||||
}
|
||||
@@ -322,8 +320,7 @@ CBI1DriverBindingStart (
|
||||
// We parse interrupt endpoint
|
||||
//
|
||||
if (EndpointDescriptor.Attributes == 0x03) {
|
||||
CopyMem (&UsbCbiDev->InterruptEndpointDescriptor, &EndpointDescriptor, sizeof(EndpointDescriptor));
|
||||
//UsbCbiDev->InterruptEndpointDescriptor = EndpointDescriptor;
|
||||
CopyMem (&UsbCbiDev->InterruptEndpointDescriptor, &EndpointDescriptor, sizeof (EndpointDescriptor));
|
||||
Found = TRUE;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user