Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix changing time daylight settings without changing the time. 

add extra output for daylight setting.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11449 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jcarsey 2011-03-29 19:59:37 +00:00
parent 980d554e3a
commit 0841f3af8c
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
View File

@ -298,13 +298,16 @@ CheckAndSetTime (
if (TimeString != NULL && !InternalIsTimeLikeString(TimeString, L':', 1, 2, FALSE)) { if (TimeString != NULL && !InternalIsTimeLikeString(TimeString, L':', 1, 2, FALSE)) {
return (SHELL_INVALID_PARAMETER); return (SHELL_INVALID_PARAMETER);
} }
if (((Daylight & (EFI_TIME_IN_DAYLIGHT|EFI_TIME_ADJUST_DAYLIGHT)) != Daylight)) {
return (SHELL_INVALID_PARAMETER);
}
Status = gRT->GetTime(&TheTime, NULL); Status = gRT->GetTime(&TheTime, NULL);
ASSERT_EFI_ERROR(Status); ASSERT_EFI_ERROR(Status);
TimeStringCopy = NULL;
TimeStringCopy = StrnCatGrow(&TimeStringCopy, NULL, TimeString, 0);
if (TimeString != NULL) { if (TimeString != NULL) {
TimeStringCopy = NULL;
TimeStringCopy = StrnCatGrow(&TimeStringCopy, NULL, TimeString, 0);
Walker1 = TimeStringCopy; Walker1 = TimeStringCopy;
TheTime.Hour = 0xFF; TheTime.Hour = 0xFF;
TheTime.Minute = 0xFF; TheTime.Minute = 0xFF;
@ -330,16 +333,16 @@ CheckAndSetTime (
TheTime.Second = (UINT8)ShellStrToUintn (Walker1); TheTime.Second = (UINT8)ShellStrToUintn (Walker1);
} }
} }
SHELL_FREE_NON_NULL(TimeStringCopy);
} }
FreePool(TimeStringCopy);
if ((Tz >= -1440 && Tz <= 1440)||(Tz == 0x7FF)) { if ((Tz >= -1440 && Tz <= 1440)||(Tz == 0x7FF)) {
TheTime.TimeZone = Tz; TheTime.TimeZone = Tz;
} }
if (Daylight <= 3 && Daylight != 2) {
TheTime.Daylight = Daylight; TheTime.Daylight = Daylight;
}
Status = gRT->SetTime(&TheTime); Status = gRT->SetTime(&TheTime);
if (!EFI_ERROR(Status)){ if (!EFI_ERROR(Status)){
@ -466,6 +469,9 @@ ShellCommandRunTime (
TzMinutes TzMinutes
); );
switch (TheTime.Daylight) { switch (TheTime.Daylight) {
case 0:
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_TIME_DST0), gShellLevel2HiiHandle);
break;
case EFI_TIME_ADJUST_DAYLIGHT: case EFI_TIME_ADJUST_DAYLIGHT:
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_TIME_DST1), gShellLevel2HiiHandle); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_TIME_DST1), gShellLevel2HiiHandle);
break; break;
@ -493,7 +499,7 @@ ShellCommandRunTime (
Tz = (INT16)ShellStrToUintn(TempLocation); Tz = (INT16)ShellStrToUintn(TempLocation);
} }
if (!(Tz >= -1440 && Tz <= 1440) && Tz != 2047) { if (!(Tz >= -1440 && Tz <= 1440) && Tz != 2047) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"-d"); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellLevel2HiiHandle, L"-tz");
ShellStatus = SHELL_INVALID_PARAMETER; ShellStatus = SHELL_INVALID_PARAMETER;
} }
} else { } else {
@ -506,7 +512,7 @@ ShellCommandRunTime (
if (TempLocation != NULL) { if (TempLocation != NULL) {
Daylight = (UINT8)ShellStrToUintn(TempLocation); Daylight = (UINT8)ShellStrToUintn(TempLocation);
if (Daylight != 0 && Daylight != 1 && Daylight != 3) { if (Daylight != 0 && Daylight != 1 && Daylight != 3) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"-d"); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellLevel2HiiHandle, L"-d");
ShellStatus = SHELL_INVALID_PARAMETER; ShellStatus = SHELL_INVALID_PARAMETER;
} }
} else { } else {

BIN
ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2CommandsLib.uni
View File

Binary file not shown.