sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdePkg/DevicePathLib: Reverse the byte order of BD_ADDR for Bluetooth

Browse Source 
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>
This commit is contained in:
Hao Wu
2017-05-27 10:22:33 +08:00
parent b9036ebee9
commit 4fc8277133
2 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c
View File

@ -2635,35 +2635,20 @@ DevPathFromTextBluetooth (
) )
{ {
CHAR16 *BluetoothStr; CHAR16 *BluetoothStr;
CHAR16 *Walker;
CHAR16 *TempNumBuffer;
UINTN TempBufferSize;
INT32 Index;
BLUETOOTH_DEVICE_PATH *BluetoothDp; BLUETOOTH_DEVICE_PATH *BluetoothDp;
BluetoothStr = GetNextParamStr (&TextDeviceNode); BluetoothStr = GetNextParamStr (&TextDeviceNode);
BluetoothDp = (BLUETOOTH_DEVICE_PATH *) CreateDeviceNode ( BluetoothDp = (BLUETOOTH_DEVICE_PATH *) CreateDeviceNode (
MESSAGING_DEVICE_PATH, MESSAGING_DEVICE_PATH,
MSG_BLUETOOTH_DP, MSG_BLUETOOTH_DP,
(UINT16) sizeof (BLUETOOTH_DEVICE_PATH) (UINT16) sizeof (BLUETOOTH_DEVICE_PATH)
); );
StrHexToBytes (
Index = sizeof (BLUETOOTH_ADDRESS) - 1; BluetoothStr,
Walker = BluetoothStr; sizeof (BLUETOOTH_ADDRESS) * 2,
while (!IS_NULL(*Walker) && Index >= 0) { BluetoothDp->BD_ADDR.Address,
TempBufferSize = 2 * sizeof(CHAR16) + StrSize(L"0x"); sizeof (BLUETOOTH_ADDRESS)
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--;
}
return (EFI_DEVICE_PATH_PROTOCOL *) BluetoothDp; return (EFI_DEVICE_PATH_PROTOCOL *) BluetoothDp;
} }

12
MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
View File

@ -2,7 +2,7 @@
DevicePathToText protocol as defined in the UEFI 2.0 specification. DevicePathToText protocol as defined in the UEFI 2.0 specification.
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR> (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 This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -1618,12 +1618,12 @@ DevPathToTextBluetooth (
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[0],
Bluetooth->BD_ADDR.Address[4],
Bluetooth->BD_ADDR.Address[3],
Bluetooth->BD_ADDR.Address[2],
Bluetooth->BD_ADDR.Address[1], 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]
); );
} }