IntelFrameworkModulePkg/Isa/IsaSerialDxe has defined the following ASCII
string:
 #define SERIAL_PORT_NAME  "ISA Serial Port # "
But it also used the UNICODE string later:
StrCpy (SerialPortName, L"ISA Serial Port # ")

This patch uses the ASCII-to-UNICODE conversion macro to remove the
duplicated hardcode string.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <[email protected]>
---
 IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/ComponentName.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/ComponentName.c 
b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/ComponentName.c
index 9e98973..3c7775c 100644
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/ComponentName.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/ComponentName.c
@@ -1,7 +1,7 @@
 /** @file
   UEFI Component Name and Name2 protocol for Isa serial driver.
 
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2015, 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
 which accompanies this distribution.  The full text of the license may be 
found at
@@ -244,7 +244,7 @@ AddName (
 {
   CHAR16  SerialPortName[sizeof (SERIAL_PORT_NAME)];
 
-  StrCpy (SerialPortName, L"ISA Serial Port # ");
+  StrCpy (SerialPortName, UNICODE_TEXT (SERIAL_PORT_NAME));
   SerialPortName[sizeof (SERIAL_PORT_NAME) - 2] = (CHAR16) (L'0' + (UINT8) 
IsaIo->ResourceList->Device.UID);
   AddUnicodeString2 (
     "eng",
-- 
1.9.5.msysgit.0



------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the 
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-devel

Reply via email to