public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Hao Wu <hao.a.wu@intel.com>
To: edk2-devel@lists.01.org
Cc: Hao Wu <hao.a.wu@intel.com>, Ruiyu Ni <ruiyu.ni@intel.com>,
	Michael D Kinney <michael.d.kinney@intel.com>,
	Liming Gao <liming.gao@intel.com>
Subject: [PATCH] MdePkg/DevicePathLib: Reverse the byte order of BD_ADDR for Bluetooth
Date: Sat, 27 May 2017 10:31:51 +0800	[thread overview]
Message-ID: <20170527023151.11912-1-hao.a.wu@intel.com> (raw)

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.

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
---
 MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c | 37 ++++++--------------
 MdePkg/Library/UefiDevicePathLib/DevicePathToText.c   | 12 +++----
 2 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c b/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c
index 4322b6c0f2..187c1cc4dc 100644
--- a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c
+++ b/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/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
index 87eca23526..f45d3dd338 100644
--- a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
+++ b/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]
     );
 }
 
-- 
2.12.0.windows.1



             reply	other threads:[~2017-05-27  2:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-27  2:31 Hao Wu [this message]
2017-05-27  4:30 ` [PATCH] MdePkg/DevicePathLib: Reverse the byte order of BD_ADDR for Bluetooth Ni, Ruiyu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170527023151.11912-1-hao.a.wu@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox