tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass ICC build. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6311 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qwang12 2008-10-30 15:10:52 +00:00
parent d2ef2ab552
commit 3d6b07b6ec
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Nt32Pkg/WinNtBusDriverDxe/ComponentName.c
View File

@ -360,7 +360,7 @@ WinNtBusDriverComponentNameGetControllerName (
Status = gBS->OpenProtocol ( Status = gBS->OpenProtocol (
ChildHandle, ChildHandle,
&gEfiWinNtIoProtocolGuid, &gEfiWinNtIoProtocolGuid,
&WinNtIo, (VOID **) &WinNtIo,
gWinNtBusDriverBinding.DriverBindingHandle, gWinNtBusDriverBinding.DriverBindingHandle,
ChildHandle, ChildHandle,
EFI_OPEN_PROTOCOL_GET_PROTOCOL EFI_OPEN_PROTOCOL_GET_PROTOCOL

19
Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.c
View File

@ -262,7 +262,7 @@ Returns:
Status = gBS->OpenProtocol ( Status = gBS->OpenProtocol (
ControllerHandle, ControllerHandle,
&gEfiDevicePathProtocolGuid, &gEfiDevicePathProtocolGuid,
&ParentDevicePath, (VOID **) &ParentDevicePath,
This->DriverBindingHandle, This->DriverBindingHandle,
ControllerHandle, ControllerHandle,
EFI_OPEN_PROTOCOL_BY_DRIVER EFI_OPEN_PROTOCOL_BY_DRIVER
@ -285,7 +285,7 @@ Returns:
Status = gBS->OpenProtocol ( Status = gBS->OpenProtocol (
ControllerHandle, ControllerHandle,
&gEfiWinNtThunkProtocolGuid, &gEfiWinNtThunkProtocolGuid,
&WinNtThunk, (VOID **) &WinNtThunk,
This->DriverBindingHandle, This->DriverBindingHandle,
ControllerHandle, ControllerHandle,
EFI_OPEN_PROTOCOL_BY_DRIVER EFI_OPEN_PROTOCOL_BY_DRIVER
@ -345,7 +345,6 @@ Returns:
// TODO: EFI_SUCCESS - add return value to function comment // TODO: EFI_SUCCESS - add return value to function comment
{ {
EFI_STATUS Status; EFI_STATUS Status;
EFI_STATUS InstallStatus;
EFI_WIN_NT_THUNK_PROTOCOL *WinNtThunk; EFI_WIN_NT_THUNK_PROTOCOL *WinNtThunk;
EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath; EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath;
WIN_NT_BUS_DEVICE *WinNtBusDevice; WIN_NT_BUS_DEVICE *WinNtBusDevice;
@ -370,7 +369,7 @@ Returns:
Status = gBS->OpenProtocol ( Status = gBS->OpenProtocol (
ControllerHandle, ControllerHandle,
&gEfiDevicePathProtocolGuid, &gEfiDevicePathProtocolGuid,
&ParentDevicePath, (VOID **) &ParentDevicePath,
This->DriverBindingHandle, This->DriverBindingHandle,
ControllerHandle, ControllerHandle,
EFI_OPEN_PROTOCOL_BY_DRIVER EFI_OPEN_PROTOCOL_BY_DRIVER
@ -382,7 +381,7 @@ Returns:
Status = gBS->OpenProtocol ( Status = gBS->OpenProtocol (
ControllerHandle, ControllerHandle,
&gEfiWinNtThunkProtocolGuid, &gEfiWinNtThunkProtocolGuid,
&WinNtThunk, (VOID **) &WinNtThunk,
This->DriverBindingHandle, This->DriverBindingHandle,
ControllerHandle, ControllerHandle,
EFI_OPEN_PROTOCOL_BY_DRIVER EFI_OPEN_PROTOCOL_BY_DRIVER
@ -433,7 +432,6 @@ Returns:
// Loop on the Variable list. Parse each variable to produce a set of handles that // Loop on the Variable list. Parse each variable to produce a set of handles that
// represent virtual hardware devices. // represent virtual hardware devices.
// //
InstallStatus = EFI_NOT_FOUND;
for (Index = 0; Index < NT_PCD_ARRAY_SIZE; Index++) { for (Index = 0; Index < NT_PCD_ARRAY_SIZE; Index++) {
PcdTempStr = (VOID *)LibPcdGetPtr (mPcdEnvironment[Index].Token); PcdTempStr = (VOID *)LibPcdGetPtr (mPcdEnvironment[Index].Token);
ASSERT (PcdTempStr != NULL); ASSERT (PcdTempStr != NULL);
@ -563,14 +561,11 @@ Returns:
Status = gBS->OpenProtocol ( Status = gBS->OpenProtocol (
ControllerHandle, ControllerHandle,
&gEfiWinNtThunkProtocolGuid, &gEfiWinNtThunkProtocolGuid,
&WinNtThunk, (VOID **) &WinNtThunk,
This->DriverBindingHandle, This->DriverBindingHandle,
WinNtDevice->Handle, WinNtDevice->Handle,
EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER
); );
if (!EFI_ERROR (Status)) {
InstallStatus = EFI_SUCCESS;
}
} }
} }
@ -635,7 +630,7 @@ Returns:
Status = gBS->OpenProtocol ( Status = gBS->OpenProtocol (
ControllerHandle, ControllerHandle,
&gWinNtBusDriverGuid, &gWinNtBusDriverGuid,
&WinNtBusDevice, (VOID **) &WinNtBusDevice,
This->DriverBindingHandle, This->DriverBindingHandle,
ControllerHandle, ControllerHandle,
EFI_OPEN_PROTOCOL_GET_PROTOCOL EFI_OPEN_PROTOCOL_GET_PROTOCOL
@ -678,7 +673,7 @@ Returns:
Status = gBS->OpenProtocol ( Status = gBS->OpenProtocol (
ChildHandleBuffer[Index], ChildHandleBuffer[Index],
&gEfiWinNtIoProtocolGuid, &gEfiWinNtIoProtocolGuid,
&WinNtIo, (VOID **) &WinNtIo,
This->DriverBindingHandle, This->DriverBindingHandle,
ControllerHandle, ControllerHandle,
EFI_OPEN_PROTOCOL_GET_PROTOCOL EFI_OPEN_PROTOCOL_GET_PROTOCOL