MdePkg: Refine the device path text format for Bluetooth to follow spec.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18346 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Qiu Shumin 2015-08-28 02:59:20 +00:00 committed by shenshushi
parent a5fb1e05ff
commit 6252f2715a
2 changed files with 6 additions and 5 deletions

View File

@ -2795,17 +2795,18 @@ DevPathFromTextBluetooth (
); );
Index = sizeof (BLUETOOTH_ADDRESS) - 1; Index = sizeof (BLUETOOTH_ADDRESS) - 1;
while (!IS_NULL(BluetoothStr) && Index >= 0) { Walker = BluetoothStr;
Walker = SplitStr (&BluetoothStr, L':'); while (!IS_NULL(*Walker) && Index >= 0) {
TempBufferSize = StrSize (Walker) + StrLen (L"0x") * sizeof (CHAR16); TempBufferSize = 2 * sizeof(CHAR16) + StrSize(L"0x");
TempNumBuffer = AllocateZeroPool (TempBufferSize); TempNumBuffer = AllocateZeroPool (TempBufferSize);
if (TempNumBuffer == NULL) { if (TempNumBuffer == NULL) {
break; break;
} }
StrCpyS (TempNumBuffer, TempBufferSize / sizeof (CHAR16), L"0x"); StrCpyS (TempNumBuffer, TempBufferSize / sizeof (CHAR16), L"0x");
StrCatS (TempNumBuffer, TempBufferSize / sizeof (CHAR16), Walker); StrnCatS (TempNumBuffer, TempBufferSize / sizeof (CHAR16), Walker, 2);
BluetoothDp->BD_ADDR.Address[Index] = (UINT8)Strtoi (TempNumBuffer); BluetoothDp->BD_ADDR.Address[Index] = (UINT8)Strtoi (TempNumBuffer);
FreePool (TempNumBuffer); FreePool (TempNumBuffer);
Walker += 2;
Index--; Index--;
} }

View File

@ -1584,7 +1584,7 @@ DevPathToTextBluetooth (
Bluetooth = DevPath; Bluetooth = DevPath;
UefiDevicePathLibCatPrint ( UefiDevicePathLibCatPrint (
Str, Str,
L"Bluetooth(%02x:%02x:%02x:%02x:%02x:%02x)", L"Bluetooth(%02x%02x%02x%02x%02x%02x)",
Bluetooth->BD_ADDR.Address[5], Bluetooth->BD_ADDR.Address[5],
Bluetooth->BD_ADDR.Address[4], Bluetooth->BD_ADDR.Address[4],
Bluetooth->BD_ADDR.Address[3], Bluetooth->BD_ADDR.Address[3],