1. Fixed one bug in ConPlatform.c, add NULL judgment.

2. Fixed one type in UgaDraw.h.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3976 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 25 insertions, 25 deletions

diff --git a/MdePkg/Include/Protocol/UgaDraw.h b/MdePkg/Include/Protocol/UgaDraw.h
index b450cdc285..3532f8e288 100644
--- a/MdePkg/Include/Protocol/UgaDraw.h
+++ b/MdePkg/Include/Protocol/UgaDraw.h
@@ -3,14 +3,14 @@
 

   Abstraction of a very simple graphics device.

 

-  Copyright (c) 2006, Intel Corporation                                                         

-  All rights reserved. This program and the accompanying materials                          

-  are licensed and made available under the terms and conditions of the BSD License         

-  which accompanies this distribution.  The full text of the license may be found at        

-  http://opensource.org/licenses/bsd-license.php                                            

+  Copyright (c) 2006, Intel Corporation

+  All rights reserved. This program and the accompanying materials

+  are licensed and made available under the terms and conditions of the BSD License

+  which accompanies this distribution.  The full text of the license may be found at

+  http://opensource.org/licenses/bsd-license.php

 

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 **/

 

@@ -50,7 +50,7 @@ EFI_STATUS
 ;

 

 /**

-  Return the current video mode information.

+  Set the current video mode information.

 

   @param  This                 Protocol instance pointer.

   @param  HorizontalResolution Current video horizontal resolution in pixels

@@ -98,33 +98,33 @@ typedef enum {
 

     The following table defines actions for BltOperations:

 

-    <B>EfiUgaVideoFill</B> - Write data from the  BltBuffer pixel (SourceX, SourceY) 

-      directly to every pixel of the video display rectangle 

-      (DestinationX, DestinationY) (DestinationX + Width, DestinationY + Height). 

+    <B>EfiUgaVideoFill</B> - Write data from the  BltBuffer pixel (SourceX, SourceY)

+      directly to every pixel of the video display rectangle

+      (DestinationX, DestinationY) (DestinationX + Width, DestinationY + Height).

       Only one pixel will be used from the BltBuffer. Delta is NOT used.

 

-    <B>EfiUgaVideoToBltBuffer</B> - Read data from the video display rectangle 

-      (SourceX, SourceY) (SourceX + Width, SourceY + Height) and place it in 

-      the BltBuffer rectangle (DestinationX, DestinationY ) 

-      (DestinationX + Width, DestinationY + Height). If DestinationX or 

-      DestinationY is not zero then Delta must be set to the length in bytes 

+    <B>EfiUgaVideoToBltBuffer</B> - Read data from the video display rectangle

+      (SourceX, SourceY) (SourceX + Width, SourceY + Height) and place it in

+      the BltBuffer rectangle (DestinationX, DestinationY )

+      (DestinationX + Width, DestinationY + Height). If DestinationX or

+      DestinationY is not zero then Delta must be set to the length in bytes

       of a row in the BltBuffer.

 

-    <B>EfiUgaBltBufferToVideo</B> - Write data from the  BltBuffer rectangle 

-      (SourceX, SourceY) (SourceX + Width, SourceY + Height) directly to the 

-      video display rectangle (DestinationX, DestinationY) 

-      (DestinationX + Width, DestinationY + Height). If SourceX or SourceY is 

-      not zero then Delta must be set to the length in bytes of a row in the 

+    <B>EfiUgaBltBufferToVideo</B> - Write data from the  BltBuffer rectangle

+      (SourceX, SourceY) (SourceX + Width, SourceY + Height) directly to the

+      video display rectangle (DestinationX, DestinationY)

+      (DestinationX + Width, DestinationY + Height). If SourceX or SourceY is

+      not zero then Delta must be set to the length in bytes of a row in the

       BltBuffer.

 

     <B>EfiUgaVideoToVideo</B> - Copy from the video display rectangle (SourceX, SourceY)

-     (SourceX + Width, SourceY + Height) .to the video display rectangle 

-     (DestinationX, DestinationY) (DestinationX + Width, DestinationY + Height). 

+     (SourceX + Width, SourceY + Height) .to the video display rectangle

+     (DestinationX, DestinationY) (DestinationX + Width, DestinationY + Height).

      The BltBuffer and Delta  are not used in this mode.

 

 

     @param[in] This          - Protocol instance pointer.

-    @param[in] BltBuffer     - Buffer containing data to blit into video buffer. This 

+    @param[in] BltBuffer     - Buffer containing data to blit into video buffer. This

                                buffer has a size of Width*Height*sizeof(EFI_UGA_PIXEL)

     @param[in] BltOperation  - Operation to perform on BlitBuffer and video memory

     @param[in] SourceX       - X coordinate of source for the BltBuffer.

@@ -134,7 +134,7 @@ typedef enum {
     @param[in] Width         - Width of rectangle in BltBuffer in pixels.

     @param[in] Height        - Hight of rectangle in BltBuffer in pixels.

     @param[in] Delta         - OPTIONAL

-  

+

     @retval EFI_SUCCESS           - The Blt operation completed.

     @retval EFI_INVALID_PARAMETER - BltOperation is not valid.

     @retval EFI_DEVICE_ERROR      - A hardware error occured writting to the video buffer.