diff options
| author | Hao Wu <hao.a.wu@intel.com> | 2017-05-27 10:22:33 +0800 |
|---|---|---|
| committer | Guo Mang <mang.guo@intel.com> | 2017-07-12 11:24:51 +0800 |
| commit | b3b23d7eef637034e41f5f4aaad3a1529e3a10a8 (patch) | |
| tree | e1cd04eb4aa50a41ab85ca0834d3b05b030bf458 /Core | |
| parent | f65d62d67c515712c5a04304d6b38fcc8e070a7f (diff) | |
| download | edk2-platforms-b3b23d7eef637034e41f5f4aaad3a1529e3a10a8.tar.xz | |
MdePkg/DevicePathLib: Reverse the byte order of BD_ADDR for Bluetooth
For the following two functions:
DevPathFromTextBluetooth()
DevPathToTextBluetooth()
The Bluetooth device address "UINT8 Address[6]" is displayed with the
order from Address[5] to Address[0]. This commit reverses the order.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
(cherry picked from commit 4fc8277133fb011d028b4e0a42444ab6f552d0b9)
Diffstat (limited to 'Core')
| -rw-r--r-- | Core/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c | 37 | ||||
| -rw-r--r-- | Core/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c | 12 |
2 files changed, 17 insertions, 32 deletions
diff --git a/Core/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c b/Core/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c index 4322b6c0f2..187c1cc4dc 100644 --- a/Core/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c +++ b/Core/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c @@ -2635,35 +2635,20 @@ DevPathFromTextBluetooth ( )
{
CHAR16 *BluetoothStr;
- CHAR16 *Walker;
- CHAR16 *TempNumBuffer;
- UINTN TempBufferSize;
- INT32 Index;
BLUETOOTH_DEVICE_PATH *BluetoothDp;
BluetoothStr = GetNextParamStr (&TextDeviceNode);
- BluetoothDp = (BLUETOOTH_DEVICE_PATH *) CreateDeviceNode (
- MESSAGING_DEVICE_PATH,
- MSG_BLUETOOTH_DP,
- (UINT16) sizeof (BLUETOOTH_DEVICE_PATH)
- );
-
- Index = sizeof (BLUETOOTH_ADDRESS) - 1;
- Walker = BluetoothStr;
- while (!IS_NULL(*Walker) && Index >= 0) {
- TempBufferSize = 2 * sizeof(CHAR16) + StrSize(L"0x");
- TempNumBuffer = AllocateZeroPool (TempBufferSize);
- if (TempNumBuffer == NULL) {
- break;
- }
- StrCpyS (TempNumBuffer, TempBufferSize / sizeof (CHAR16), L"0x");
- StrnCatS (TempNumBuffer, TempBufferSize / sizeof (CHAR16), Walker, 2);
- BluetoothDp->BD_ADDR.Address[Index] = (UINT8)Strtoi (TempNumBuffer);
- FreePool (TempNumBuffer);
- Walker += 2;
- Index--;
- }
-
+ BluetoothDp = (BLUETOOTH_DEVICE_PATH *) CreateDeviceNode (
+ MESSAGING_DEVICE_PATH,
+ MSG_BLUETOOTH_DP,
+ (UINT16) sizeof (BLUETOOTH_DEVICE_PATH)
+ );
+ StrHexToBytes (
+ BluetoothStr,
+ sizeof (BLUETOOTH_ADDRESS) * 2,
+ BluetoothDp->BD_ADDR.Address,
+ sizeof (BLUETOOTH_ADDRESS)
+ );
return (EFI_DEVICE_PATH_PROTOCOL *) BluetoothDp;
}
diff --git a/Core/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c b/Core/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c index 87eca23526..f45d3dd338 100644 --- a/Core/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c +++ b/Core/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c @@ -2,7 +2,7 @@ DevicePathToText protocol as defined in the UEFI 2.0 specification.
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
-Copyright (c) 2013 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2013 - 2017, 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
@@ -1618,12 +1618,12 @@ DevPathToTextBluetooth ( UefiDevicePathLibCatPrint (
Str,
L"Bluetooth(%02x%02x%02x%02x%02x%02x)",
- Bluetooth->BD_ADDR.Address[5],
- Bluetooth->BD_ADDR.Address[4],
- Bluetooth->BD_ADDR.Address[3],
- Bluetooth->BD_ADDR.Address[2],
+ Bluetooth->BD_ADDR.Address[0],
Bluetooth->BD_ADDR.Address[1],
- Bluetooth->BD_ADDR.Address[0]
+ Bluetooth->BD_ADDR.Address[2],
+ Bluetooth->BD_ADDR.Address[3],
+ Bluetooth->BD_ADDR.Address[4],
+ Bluetooth->BD_ADDR.Address[5]
);
}
|