MdePkg: Add bluetooth devicepath handling in device path library.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Yao Jiewen <jiewen.yao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17312 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 87 insertions, 4 deletions

diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c b/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c
index f688c1af74..dec084c313 100644
--- a/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c
+++ b/MdePkg/Library/UefiDevicePathLib/DevicePathFromText.c
@@ -1,7 +1,7 @@
 /** @file

   DevicePathFromText protocol as defined in the UEFI 2.0 specification.

 

-Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2013 - 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

@@ -2697,6 +2697,51 @@ DevPathFromTextVlan (
 }

 

 /**

+  Converts a text device path node to Bluetooth device path structure.

+

+  @param TextDeviceNode  The input Text device path node.

+

+  @return A pointer to the newly-created Bluetooth device path structure.

+

+**/

+EFI_DEVICE_PATH_PROTOCOL *

+DevPathFromTextBluetooth (

+  IN CHAR16 *TextDeviceNode

+  )

+{

+  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;

+  while (!IS_NULL(BluetoothStr) && Index >= 0) {

+    Walker = SplitStr (&BluetoothStr, L':');

+    TempBufferSize = StrSize (Walker) + StrLen (L"0x") * sizeof (CHAR16);

+    TempNumBuffer = AllocateZeroPool (TempBufferSize);

+    if (TempNumBuffer == NULL) {

+      break;

+    }

+    StrnCpy (TempNumBuffer, L"0x", TempBufferSize / sizeof (CHAR16));

+    StrnCat (TempNumBuffer + StrLen (L"0x"), Walker, TempBufferSize / sizeof (CHAR16) - StrLen (L"0x") );

+    BluetoothDp->BD_ADDR.Address[Index] = (UINT8)Strtoi (TempNumBuffer);

+    FreePool (TempNumBuffer);

+    Index--;

+  }

+  

+  return (EFI_DEVICE_PATH_PROTOCOL *) BluetoothDp;

+}

+

+/**

   Converts a media text device path node to media device path structure.

 

   @param TextDeviceNode  The input Text device path node.

@@ -3136,7 +3181,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED DEVICE_PATH_FROM_TEXT_TABLE mUefiDevicePathLibDevP
   {L"Unit",                    DevPathFromTextUnit                    },

   {L"iSCSI",                   DevPathFromTextiSCSI                   },

   {L"Vlan",                    DevPathFromTextVlan                    },

-

+  {L"Bluetooth",               DevPathFromTextBluetooth               },

   {L"MediaPath",               DevPathFromTextMediaPath               },

   {L"HD",                      DevPathFromTextHD                      },

   {L"CDROM",                   DevPathFromTextCDROM                   },

diff --git a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
index 2dbbddaf09..af1a6d675e 100644
--- a/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
+++ b/MdePkg/Library/UefiDevicePathLib/DevicePathToText.c
@@ -1,7 +1,7 @@
 /** @file

   DevicePathToText protocol as defined in the UEFI 2.0 specification.

 

-Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2013 - 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

@@ -1495,6 +1495,42 @@ DevPathToTextVlan (
 }

 

 /**

+  Converts a Bluetooth device path structure to its string representative.

+

+  @param Str             The string representative of input device.

+  @param DevPath         The input device path structure.

+  @param DisplayOnly     If DisplayOnly is TRUE, then the shorter text representation

+                         of the display node is used, where applicable. If DisplayOnly

+                         is FALSE, then the longer text representation of the display node

+                         is used.

+  @param AllowShortcuts  If AllowShortcuts is TRUE, then the shortcut forms of text

+                         representation for a device node can be used, where applicable.

+

+**/

+VOID

+DevPathToTextBluetooth (

+  IN OUT POOL_PRINT  *Str,

+  IN VOID            *DevPath,

+  IN BOOLEAN         DisplayOnly,

+  IN BOOLEAN         AllowShortcuts

+  )

+{

+  BLUETOOTH_DEVICE_PATH  *Bluetooth;

+

+  Bluetooth = DevPath;

+  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[1],

+    Bluetooth->BD_ADDR.Address[0]

+    );

+}

+

+/**

   Converts a Hard drive device path structure to its string representative.

 

   @param Str             The string representative of input device.

@@ -1912,6 +1948,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED const DEVICE_PATH_TO_TEXT_TABLE mUefiDevicePathLib
   {MESSAGING_DEVICE_PATH, MSG_VENDOR_DP,                    DevPathToTextVendor         },

   {MESSAGING_DEVICE_PATH, MSG_ISCSI_DP,                     DevPathToTextiSCSI          },

   {MESSAGING_DEVICE_PATH, MSG_VLAN_DP,                      DevPathToTextVlan           },

+  {MESSAGING_DEVICE_PATH, MSG_BLUETOOTH_DP,                 DevPathToTextBluetooth      },

   {MEDIA_DEVICE_PATH,     MEDIA_HARDDRIVE_DP,               DevPathToTextHardDrive      },

   {MEDIA_DEVICE_PATH,     MEDIA_CDROM_DP,                   DevPathToTextCDROM          },

   {MEDIA_DEVICE_PATH,     MEDIA_VENDOR_DP,                  DevPathToTextVendor         },

diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.h b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.h
index 233844cfcc..72587c6ebb 100644
--- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.h
+++ b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.h
@@ -1,7 +1,7 @@
 /** @file

   Definition for Device Path library.

 

-Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2013 - 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

@@ -28,6 +28,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/DevicePathLib.h>

 #include <Library/PcdLib.h>

+#include <IndustryStandard/Bluetooth.h>

 

 #define IS_COMMA(a)                ((a) == L',')

 #define IS_HYPHEN(a)               ((a) == L'-')