ECC clean up.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7211 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
vanjeff
2009-01-08 08:21:40 +00:00
parent 0a6c0fd563
commit ed055f1b63
6 changed files with 145 additions and 144 deletions

View File

@ -75,12 +75,12 @@ EFI_STATUS
If Password is NULL or the Password is too big, then return an error. If the If Password is NULL or the Password is too big, then return an error. If the
Password is valid, then store the password, lock StdIn and arm the periodic timer. Password is valid, then store the password, lock StdIn and arm the periodic timer.
@param This Console Control protocol pointer. @param This Protocol instance pointer.
@param Password The password input. @param Password The password input.
@retval EFI_SUCCESS Lock the StdIn device @retval EFI_SUCCESS Lock the StdIn device.
@retval EFI_INVALID_PARAMETER Password is NULL @retval EFI_INVALID_PARAMETER Password is NULL.
@retval EFI_OUT_OF_RESOURCES Buffer allocation to store the password fails @retval EFI_OUT_OF_RESOURCES Buffer allocation to store the password fails.
**/ **/
typedef typedef

View File

@ -3418,7 +3418,7 @@ ConSpliterConsoleControlLockStdInEvent (
// //
if ((Key.UnicodeChar == CHAR_CARRIAGE_RETURN) && (Key.ScanCode == SCAN_NULL)) { if ((Key.UnicodeChar == CHAR_CARRIAGE_RETURN) && (Key.ScanCode == SCAN_NULL)) {
mConIn.PwdAttempt[mConIn.PwdIndex] = CHAR_NULL; mConIn.PwdAttempt[mConIn.PwdIndex] = CHAR_NULL;
if (StrCmp (mConIn.Password, mConIn.PwdAttempt)) { if (StrCmp (mConIn.Password, mConIn.PwdAttempt) != 0) {
// //
// Password not match // Password not match
// //
@ -3475,9 +3475,9 @@ ConSpliterConsoleControlLockStdInEvent (
@param This Console Control protocol pointer. @param This Console Control protocol pointer.
@param Password The password input. @param Password The password input.
@retval EFI_SUCCESS Lock the StdIn device @retval EFI_SUCCESS Lock the StdIn device.
@retval EFI_INVALID_PARAMETER Password is NULL @retval EFI_INVALID_PARAMETER Password is NULL.
@retval EFI_OUT_OF_RESOURCES Buffer allocation to store the password fails @retval EFI_OUT_OF_RESOURCES Buffer allocation to store the password fails.
**/ **/
EFI_STATUS EFI_STATUS
@ -3503,7 +3503,10 @@ ConSpliterConsoleControlLockStdIn (
StrCpy (mConIn.Password, Password); StrCpy (mConIn.Password, Password);
mConIn.PasswordEnabled = TRUE; mConIn.PasswordEnabled = TRUE;
mConIn.PwdIndex = 0; mConIn.PwdIndex = 0;
gBS->SetTimer (mConIn.LockEvent, TimerPeriodic, (10000 * 25)); //
// Timer Periodic is 25ms.
//
gBS->SetTimer (mConIn.LockEvent, TimerPeriodic, 10000 * 25);
return EFI_SUCCESS; return EFI_SUCCESS;
} }

View File

@ -325,9 +325,6 @@ ConSplitterTextOutConstructor (
TEXT_OUT_SPLITTER_PRIVATE_DATA *ConOutPrivate TEXT_OUT_SPLITTER_PRIVATE_DATA *ConOutPrivate
); );
//
// Driver Binding Functions
//
/** /**
Test to see if Console In Device could be supported on the Controller. Test to see if Console In Device could be supported on the Controller.
@ -1346,7 +1343,6 @@ ConSplitterTextInExDeleteDevice (
// Simple Text Input Ex protocol function prototypes // Simple Text Input Ex protocol function prototypes
// //
/** /**
Reset the input device and optionaly run diagnostics Reset the input device and optionaly run diagnostics
@ -1479,6 +1475,7 @@ ConSplitterTextInWaitForKey (
IN EFI_EVENT Event, IN EFI_EVENT Event,
IN VOID *Context IN VOID *Context
); );
/** /**
Return TRUE if StdIn is locked. The ConIn device on the virtual handle is Return TRUE if StdIn is locked. The ConIn device on the virtual handle is
the only device locked. the only device locked.
@ -1491,6 +1488,7 @@ BOOLEAN
ConSpliterConssoleControlStdInLocked ( ConSpliterConssoleControlStdInLocked (
VOID VOID
); );
/** /**
This timer event will fire when StdIn is locked. It will check the key This timer event will fire when StdIn is locked. It will check the key
sequence on StdIn to see if it matches the password. Any error in the sequence on StdIn to see if it matches the password. Any error in the

View File

@ -76,15 +76,15 @@ ConSpliterConsoleControlGetMode (
/** /**
Set the current mode to either text or graphics. Graphics is Set the current video mode to either text or graphics. Graphics is
for Quiet Boot. for Quiet Boot.
@param This Console Control Protocol instance pointer. @param This Console Control Protocol instance pointer.
@param Mode Mode to set. @param Mode Video mode is to be set.
@retval EFI_SUCCESS Mode information returned. @retval EFI_SUCCESS Mode is set successfully.
@retval EFI_INVALID_PARAMETER Invalid parameter. @retval EFI_INVALID_PARAMETER Mode is not the valid mode value.
@retval EFI_UNSUPPORTED Operation unsupported. @retval EFI_UNSUPPORTED Mode is unsupported by console device.
**/ **/
EFI_STATUS EFI_STATUS
@ -1261,7 +1261,7 @@ DevNullTextOutOutputString (
LastRow = Private->DevNullRows - 1; LastRow = Private->DevNullRows - 1;
MaxColumn = Private->DevNullColumns; MaxColumn = Private->DevNullColumns;
if (Mode->Attribute & EFI_WIDE_ATTRIBUTE) { if ((Mode->Attribute & EFI_WIDE_ATTRIBUTE) != 0) {
CurrentWidth = 2; CurrentWidth = 2;
} else { } else {
CurrentWidth = 1; CurrentWidth = 1;

View File

@ -429,14 +429,14 @@ EFIAPI
RegisterExceptionCallback ( RegisterExceptionCallback (
IN EFI_DEBUG_SUPPORT_PROTOCOL *This, IN EFI_DEBUG_SUPPORT_PROTOCOL *This,
IN UINTN ProcessorIndex, IN UINTN ProcessorIndex,
IN EFI_EXCEPTION_CALLBACK NewCallback, IN EFI_EXCEPTION_CALLBACK ExceptionCallback,
IN EFI_EXCEPTION_TYPE ExceptionType IN EFI_EXCEPTION_TYPE ExceptionType
) )
{ {
return ManageIvtEntryTable ( return ManageIvtEntryTable (
ExceptionType, ExceptionType,
(BUNDLE *) ((EFI_PLABEL *) HookStub)->EntryPoint, (BUNDLE *) ((EFI_PLABEL *) HookStub)->EntryPoint,
NewCallback ExceptionCallback
); );
} }

View File

@ -194,7 +194,7 @@ EFIAPI
RegisterExceptionCallback ( RegisterExceptionCallback (
IN EFI_DEBUG_SUPPORT_PROTOCOL *This, IN EFI_DEBUG_SUPPORT_PROTOCOL *This,
IN UINTN ProcessorIndex, IN UINTN ProcessorIndex,
IN EFI_EXCEPTION_CALLBACK NewCallback, IN EFI_EXCEPTION_CALLBACK ExceptionCallback,
IN EFI_EXCEPTION_TYPE ExceptionType IN EFI_EXCEPTION_TYPE ExceptionType
); );