diff options
author | darylm503 <darylm503@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-11-30 00:52:45 +0000 |
---|---|---|
committer | darylm503 <darylm503@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-11-30 00:52:45 +0000 |
commit | 0c1992fbccd139e9d3bb730c19a79847c6a5a246 (patch) | |
tree | 39ea4e848572274ead5dddc7095c14ca1898b9f2 /StdLib/LibC/Time | |
parent | 8f04ca1a8f3828da0041f96c5cb9f597b3d3e614 (diff) | |
download | edk2-platforms-0c1992fbccd139e9d3bb730c19a79847c6a5a246.tar.xz |
StdLib: Add isDirSep character classification macro and function. Implement several Posix functions and clean up EfiSysCall.h. Align file mode handling with UEFI file protocol flags.
Include/ctype.h: Function declaration and Macro definition of isDirSep
Include/unistd.h: Declarations added from EfiSysCall.h
Include/utime.h: New file. For the Posix utime() function.
Include/sys/_ctype.h: Update character class bit maps.
Include/sys/EfiSysCall.h: Move declarations to unistd.h
Include/sys/fcntl.h: Improve comments. Add UEFI-specific macros.
Include/sys/filio.h: Remove declarations for unsupported file ioctls.
Include/sys/stat.h: Fix flags. Add macros and declarations.
Include/sys/time.h: Add declarations for new functions Tm2Efi() and Time2Efi().
Include/sys/types.h: Use EFI-specific instead of BSD-specific definitions for typedefs.
Include/sys/unistd.h: Delete inappropriate content. Guard macro definitions.
LibC/Locale/setlocale.c
LibC/Stdio/{fdopen.c, findfp.c, fopen.c, freopen.c, gettemp.c, makebuf.c, mktemp.c,
remove.c, stdio.c, tempnam.c, tmpfile.c, tmpnam.c}
LibC/Time/{itimer.c, ZoneProc.c}
LibC/Uefi/SysCalls.c
LibC/Uefi/Devices/Console/daConsole.c
LibC/Uefi/Devices/UefiShell/daShell.c
PosixLib/Gen/readdir.c
Include unistd.h instead of EfiSysCall.h
LibC/Ctype/CClass.c: Character classification function implementation for isDirSep.
LibC/Ctype/iCtype.c: Update character classification and case conversion tables.
LibC/Time/TimeEfi.c: Improve comments. Implement new functions Tm2Efi() and Time2Efi().
LibC/Uefi/StubFunctions.c: Add missing include. Cosmetic changes to declarations.
LibC/Uefi/SysCalls.c: Add support function for utime().
LibC/Uefi/Uefi.inf: Add LibGen library class dependency.
LibC/Uefi/Xform.c: Enhance Omode2EFI().
LibC/Uefi/Devices/UefiShell/daShell.c: Enhance da_ShellMkdir. Implement da_ShellIoctl to set file times.
PosixLib/Gen/access.c: New file. Implement the access() function.
PosixLib/Gen/dirname.c: Enhance to use isDirSep and differentiate between the device, path, and filename components of UEFI Shell-style paths.
PosixLib/Gen/utime.c: New file. Implement the utime() function.
PosixLib/Gen/LibGen.inf: Change MODULE_TYPE. Add new files.
Signed-off-by: darylm503
Reviewed-by: geekboy15a
Reviewed-by: jljusten
Reviewed-by: Rahul Khana
Reviewed-by: leegrosenbaum
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12800 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'StdLib/LibC/Time')
-rw-r--r-- | StdLib/LibC/Time/TimeEfi.c | 72 | ||||
-rw-r--r-- | StdLib/LibC/Time/ZoneProc.c | 4 | ||||
-rw-r--r-- | StdLib/LibC/Time/itimer.c | 4 |
3 files changed, 72 insertions, 8 deletions
diff --git a/StdLib/LibC/Time/TimeEfi.c b/StdLib/LibC/Time/TimeEfi.c index 8c033fd7d9..50f2deec05 100644 --- a/StdLib/LibC/Time/TimeEfi.c +++ b/StdLib/LibC/Time/TimeEfi.c @@ -19,9 +19,16 @@ #include "tzfile.h"
#include <MainData.h>
-/* Convert an EFI_TIME structure into a C Standard tm structure. */
+/** Convert an EFI_TIME structure into a C Standard tm structure.
+
+ @param[in] ET Pointer to the EFI_TIME structure to convert.
+ @param[out] BT Pointer to the tm structure to receive the converted time.
+*/
void
-Efi2Tm( EFI_TIME *ET, struct tm *BT)
+Efi2Tm(
+ IN EFI_TIME *ET,
+ OUT struct tm *BT
+ )
{
// Convert EFI time to broken-down time.
BT->tm_year = ET->Year - TM_YEAR_BASE;
@@ -36,11 +43,68 @@ Efi2Tm( EFI_TIME *ET, struct tm *BT) BT->tm_Nano = ET->Nanosecond;
}
-/* Convert an EFI_TIME structure into a time_t value. */
+/** Convert an EFI_TIME structure into a time_t value.
+
+ @param[in] EfiBDtime Pointer to the EFI_TIME structure to convert.
+
+ @return The EFI_TIME converted into a time_t value.
+*/
time_t
-Efi2Time( EFI_TIME *EfiBDtime)
+Efi2Time(
+ IN EFI_TIME *EfiBDtime
+ )
{
Efi2Tm( EfiBDtime, &gMD->BDTime);
return mktime( &gMD->BDTime);
}
+
+/** Convert a C Standard tm structure into an EFI_TIME structure.
+
+ @param[in] BT Pointer to the tm structure to convert.
+ @param[out] ET Pointer to an EFI_TIME structure to receive the converted time.
+*/
+void
+Tm2Efi(
+ IN struct tm *BT,
+ OUT EFI_TIME *ET
+ )
+{
+ ET->Year = (UINT16)BT->tm_year + TM_YEAR_BASE;
+ ET->Month = (UINT8)BT->tm_mon + 1;
+ ET->Day = (UINT8)BT->tm_mday;
+ ET->Hour = (UINT8)BT->tm_hour;
+ ET->Minute = (UINT8)BT->tm_min;
+ ET->Second = (UINT8)BT->tm_sec;
+ ET->Nanosecond = (UINT32)BT->tm_Nano;
+ ET->TimeZone = (INT16)BT->tm_zoneoff;
+ ET->Daylight = (UINT8)BT->tm_daylight;
+}
+
+/** Convert a time_t value into an EFI_TIME structure.
+
+ @param[in] CalTime Calendar time as a time_t value.
+
+ @return Returns a newly malloced EFI_TIME structure containing
+ the converted calendar time.
+
+ @post It is the responsibility of the caller to free the
+ returned structure before the application exits.
+*/
+EFI_TIME*
+Time2Efi(
+ IN time_t CalTime
+ )
+{
+ struct tm *IT;
+ EFI_TIME *ET = NULL;
+
+ IT = gmtime(&CalTime);
+ if(IT != NULL) {
+ ET = malloc(sizeof(EFI_TIME));
+ if(ET != NULL) {
+ Tm2Efi(IT, ET);
+ }
+ }
+ return ET;
+}
diff --git a/StdLib/LibC/Time/ZoneProc.c b/StdLib/LibC/Time/ZoneProc.c index a7b589b7df..309d7b3527 100644 --- a/StdLib/LibC/Time/ZoneProc.c +++ b/StdLib/LibC/Time/ZoneProc.c @@ -1,7 +1,7 @@ /** @file
Time Zone processing.
- Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available under
the terms and conditions of the BSD License that accompanies this distribution.
The full text of the license may be found at
@@ -19,7 +19,6 @@ NetBSD: localtime.c,v 1.39 2006/03/22 14:01:30 christos Exp
**/
#include <LibConfig.h>
-#include <sys/EfiSysCall.h>
#include <ctype.h>
#include <fcntl.h>
@@ -27,6 +26,7 @@ #include <stdlib.h>
#include <string.h>
#include <time.h>
+#include <unistd.h>
#include "tzfile.h"
#include "TimeVals.h"
diff --git a/StdLib/LibC/Time/itimer.c b/StdLib/LibC/Time/itimer.c index d6f6ab44c0..00712b8247 100644 --- a/StdLib/LibC/Time/itimer.c +++ b/StdLib/LibC/Time/itimer.c @@ -11,12 +11,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#include <LibConfig.h>
-#include <sys/EfiSysCall.h>
#include <sys/time.h>
#include <time.h>
#include <errno.h>
#include <sys/signal.h>
#include <signal.h>
+#include <unistd.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/UefiLib.h>
@@ -274,4 +274,4 @@ int getitimer( }
return 0;
-}
\ No newline at end of file +}
|