From 1df7752571b936daff608ae2e00a0d9e95e0f85d Mon Sep 17 00:00:00 2001 From: "Frinzell, Aaron" Date: Fri, 3 Feb 2023 17:27:43 -0600 Subject: [PATCH] Type Hint and fstring updates to cpuid.py Signed-off-by: Frinzell, Aaron --- chipsec/hal/cpuid.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/chipsec/hal/cpuid.py b/chipsec/hal/cpuid.py index da8c27f3..fe9dd1d8 100644 --- a/chipsec/hal/cpuid.py +++ b/chipsec/hal/cpuid.py @@ -25,6 +25,7 @@ usage: >>> cpuid(0) """ +from typing import Tuple from chipsec.hal import hal_base from chipsec.logger import logger @@ -35,10 +36,8 @@ class CpuID(hal_base.HALBase): super(CpuID, self).__init__(cs) self.helper = cs.helper - def cpuid(self, eax, ecx): - if logger().HAL: - logger().log("[cpuid] in: EAX=0x{:08X}, ECX=0x{:08X}".format(eax, ecx)) + def cpuid(self, eax: int, ecx: int) -> Tuple[int, int, int, int]: + logger().log_hal(f'[cpuid] in: EAX=0x{eax:08X}, ECX=0x{ecx:08X}') (eax, ebx, ecx, edx) = self.helper.cpuid(eax, ecx) - if logger().HAL: - logger().log("[cpuid] out: EAX=0x{:08X}, EBX=0x{:08X}, ECX=0x{:08X}, EDX=0x{:08X}".format(eax, ebx, ecx, edx)) + logger().log_hal(f'[cpuid] out: EAX=0x{eax:08X}, EBX=0x{ebx:08X}, ECX=0x{ecx:08X}, EDX=0x{edx:08X}') return (eax, ebx, ecx, edx)