summaryrefslogtreecommitdiff
path: root/BaseTools
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2018-11-29 13:18:13 +0100
committerArd Biesheuvel <ard.biesheuvel@linaro.org>2018-12-05 09:03:23 +0100
commit6e2d15e3c4ab24ce94a36aab5e2b67715d42f958 (patch)
tree762d85bec6532e378c7bcdce0b26f9b082e09b59 /BaseTools
parent76e5f493d20cbe521dccb0c184012f0336ffd323 (diff)
downloadedk2-6e2d15e3c4ab24ce94a36aab5e2b67715d42f958.zip
edk2-6e2d15e3c4ab24ce94a36aab5e2b67715d42f958.tar.gz
edk2-6e2d15e3c4ab24ce94a36aab5e2b67715d42f958.tar.bz2
BaseTools/DevicePath: use explicit 64-bit number parsing routines
Replace invocations of StrHexToUintn() with StrHexToUint64(), so that we can drop the former. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-by: Jaben Carsey <jaben.carsey@intel.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
Diffstat (limited to 'BaseTools')
-rw-r--r--BaseTools/Source/C/DevicePath/DevicePathFromText.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/BaseTools/Source/C/DevicePath/DevicePathFromText.c b/BaseTools/Source/C/DevicePath/DevicePathFromText.c
index 555efa1..6151926 100644
--- a/BaseTools/Source/C/DevicePath/DevicePathFromText.c
+++ b/BaseTools/Source/C/DevicePath/DevicePathFromText.c
@@ -520,7 +520,7 @@ EisaIdFromText (
return (((Text[0] - 'A' + 1) & 0x1f) << 10)
+ (((Text[1] - 'A' + 1) & 0x1f) << 5)
+ (((Text[2] - 'A' + 1) & 0x1f) << 0)
- + (UINT32) (StrHexToUintn (&Text[3]) << 16)
+ + (UINT32) (StrHexToUint64 (&Text[3]) << 16)
;
}
@@ -1506,7 +1506,7 @@ DevPathFromTextNVMe (
Index = sizeof (Nvme->NamespaceUuid) / sizeof (UINT8);
while (Index-- != 0) {
- Uuid[Index] = (UINT8) StrHexToUintn (SplitStr (&NamespaceUuidStr, L'-'));
+ Uuid[Index] = (UINT8) StrHexToUint64 (SplitStr (&NamespaceUuidStr, L'-'));
}
return (EFI_DEVICE_PATH_PROTOCOL *) Nvme;