From a7a8363d86ec8ad445fb73619b1ca5cac4e56a86 Mon Sep 17 00:00:00 2001 From: darylm503 Date: Fri, 15 Jun 2012 19:58:39 +0000 Subject: StdLib: Add multi-byte character support. The normal "narrow" character set is now UTF-8 instead of ASCII. Add library classes which are required by StdLib, but not commonly defined in Platform DSC files, to StdLib.inc. Modify MB_LEN_MAX to be 4, the maximum length of UTF-8 characters. Adjust size of internal buffers to be multiples of MB_LEN_MAX instead of assuming 1-byte characters. Make the XYoffset object public and move its declaration into EfiSysCall.h. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: daryl.mcdaniel@intel.com Reviewed-by: erik.c.bjorge@intel.com Reviewed-by: lee.g.rosenbaum@intel.com Reviewed-by: leroy.p.leahy@intel.com git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13457 6f19259b-4bc3-4df7-8a09-765794883524 --- StdLibPrivateInternalFiles/Include/Device/Console.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'StdLibPrivateInternalFiles') diff --git a/StdLibPrivateInternalFiles/Include/Device/Console.h b/StdLibPrivateInternalFiles/Include/Device/Console.h index e97ee3fd2..9b4eb52d7 100644 --- a/StdLibPrivateInternalFiles/Include/Device/Console.h +++ b/StdLibPrivateInternalFiles/Include/Device/Console.h @@ -1,7 +1,7 @@ /** @file Declarations and macros for the console abstraction. - Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2012, 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 @@ -18,16 +18,6 @@ #include #include -typedef struct { - UINT32 Column; - UINT32 Row; -} CursorXY; - -typedef union { - UINT64 Offset; - CursorXY XYpos; -} XYoffset; - /* The members Cookie through Abstraction, inclusive, are the same type and order for all instance structures. @@ -43,7 +33,7 @@ typedef struct { UINT64 NumRead; ///< Number of characters Read. UINT64 NumWritten; ///< Number of characters Written. EFI_INPUT_KEY UnGetKey; ///< One-key pushback, for poll(). - UINT32 Reserved_2; // Force the struct to be a multiple of 8-bytes long + __mbstate_t CharState; ///< Character state for the byte stream passing through this device } ConInstance; __BEGIN_DECLS -- cgit v1.2.3