From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from walk.intel-email.com (walk.intel-email.com [101.227.64.242]) by mx.groups.io with SMTP id smtpd.web09.2766.1659667869386255136 for ; Thu, 04 Aug 2022 19:51:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@byosoft.com.cn header.s=cloud-union header.b=S09PCIzd; spf=pass (domain: byosoft.com.cn, ip: 101.227.64.242, mailfrom: gaoliming@byosoft.com.cn) Received: from walk.intel-email.com (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id CBBDBCD1F72C for ; Fri, 5 Aug 2022 10:51:05 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=byosoft.com.cn; s=cloud-union; t=1659667865; bh=1SdCDMtwa0dShBPOvIyXnkfiFV1Uc+l7CLujBmECgjM=; h=From:To:Cc:References:In-Reply-To:Subject:Date; b=S09PCIzd+aGgiXrv77qqqMVU/U+XCnSr6colcLRwgfXzOvQ3XTNAOgkr249UDSRWx EW3H+cirpO7yHi3EmEOUy/Cd9u0maqgotTrEYVMu+UtWwGEzylwxfzfnZYwqbLzXh+ i7KD1p3Kd0QCMwMMi7nDtApm6vRbG48dVbx5GLq8= Received: from localhost (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id C37CDCD1F747 for ; Fri, 5 Aug 2022 10:51:05 +0800 (CST) X-Virus-Scanned: by SpamTitan at intel-email.com Received: from walk.intel-email.com (localhost [127.0.0.1]) by walk.intel-email.com (Postfix) with ESMTP id 8CAF0CD1F6D7 for ; Fri, 5 Aug 2022 10:51:05 +0800 (CST) Authentication-Results: walk.intel-email.com; none Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by walk.intel-email.com (Postfix) with SMTP id 29856CD1F72C for ; Fri, 5 Aug 2022 10:51:00 +0800 (CST) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Fri, 05 Aug 2022 10:50:57 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 58.246.60.130 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: , Cc: "'Dandan Bi'" , "'Guomin Jiang'" , "'Hao A Wu'" , "'Jian J Wang'" , "'Ray Ni'" References: <20220802180418.880-1-mikuback@linux.microsoft.com> <20220802180418.880-4-mikuback@linux.microsoft.com> In-Reply-To: <20220802180418.880-4-mikuback@linux.microsoft.com> Subject: =?UTF-8?B?5Zue5aSNOiBbUEFUQ0ggdjEgMy81XSBNZGVNb2R1bGVQa2c6IEZpeCBpbWJhbGFuY2VkIGRlYnVnIG1hY3Jvcw==?= Date: Fri, 5 Aug 2022 10:51:01 +0800 Message-ID: <02df01d8a876$326e3400$974a9c00$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQGq3GOhIYQejiwGYPSOvNxpf1yHvgI/LBnNrek6I0A= Sender: "gaoliming" Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Reviewed-by: Liming Gao > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > =B7=A2=BC=FE=C8=CB: mikuback@linux.microsoft.com = > =B7=A2=CB=CD=CA=B1=BC=E4: 2022=C4=EA8=D4=C23=C8=D5 2:04 > =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io > =B3=AD=CB=CD: Dandan Bi ; Guomin Jiang > ; Hao A Wu ; Jian J Wang > ; Liming Gao ; Ray Ni > > =D6=F7=CC=E2: [PATCH v1 3/5] MdeModulePkg: Fix imbalanced debug macros >=20 > From: Michael Kubacki >=20 > Updates debug macros in the package that have an imbalanced number > of print specifiers to arguments. These changes try to preserve > what was likely intended by the author. In cases information was > missing due to the bug, the specifier may be removed since it was > not previously accurately printing the expected value. >=20 > Cc: Dandan Bi > Cc: Guomin Jiang > Cc: Hao A Wu > Cc: Jian J Wang > Cc: Liming Gao > Cc: Liming Gao > Cc: Ray Ni > Signed-off-by: Michael Kubacki > --- > MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c > | 2 +- > MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c > | 8 ++++---- > MdeModulePkg/Core/Dxe/Image/Image.c > | 2 +- >=20 > MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdatePr > ogressLibGraphics.c | 2 +- > 4 files changed, 7 insertions(+), 7 deletions(-) >=20 > diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c > b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c > index 53b63ab52b93..dd45167a009e 100644 > --- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c > +++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c > @@ -64,7 +64,7 @@ DumpCapabilityReg ( > DEBUG ((DEBUG_INFO, " Driver Type D %a\n", > Capability->DriverTypeD ? "TRUE" : "FALSE")); > DEBUG ((DEBUG_INFO, " Driver Type 4 %a\n", > Capability->DriverType4 ? "TRUE" : "FALSE")); > if (Capability->TimerCount =3D=3D 0) { > - DEBUG ((DEBUG_INFO, " Retuning TimerCnt Disabled\n", 2 * > (Capability->TimerCount - 1))); > + DEBUG ((DEBUG_INFO, " Retuning TimerCnt Disabled\n")); > } else { > DEBUG ((DEBUG_INFO, " Retuning TimerCnt %dseconds\n", 2 * > (Capability->TimerCount - 1))); > } > diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c > b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c > index 5495b324b381..aed34596f469 100644 > --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c > +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c > @@ -941,7 +941,7 @@ UsbEnumeratePort ( > // which probably is caused by short circuit. It has to wait system > hardware > // to perform recovery. > // > - DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: Critical Over > Current\n", Port)); > + DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: Critical Over Current > (port %d)\n", Port)); > return EFI_DEVICE_ERROR; > } >=20 > @@ -951,7 +951,7 @@ UsbEnumeratePort ( > // over current. As a result, all ports are nearly power-off, = so > // it's necessary to detach and enumerate all ports again. > // > - DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: 2.0 device Recovery > Over Current\n", Port)); > + DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: 2.0 device Recovery > Over Current (port %d)\n", Port)); > } >=20 > if (USB_BIT_IS_SET (PortState.PortChangeStatus, > USB_PORT_STAT_C_ENABLE)) { > @@ -961,7 +961,7 @@ UsbEnumeratePort ( > // on 2.0 roothub does. When over-current has influence on 1.1 > device, the port > // would be disabled, so it's also necessary to detach and enumerate > again. > // > - DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: 1.1 device Recovery > Over Current\n", Port)); > + DEBUG ((DEBUG_ERROR, "UsbEnumeratePort: 1.1 device Recovery > Over Current (port %d)\n", Port)); > } >=20 > if (USB_BIT_IS_SET (PortState.PortChangeStatus, > USB_PORT_STAT_C_CONNECTION)) { > @@ -969,7 +969,7 @@ UsbEnumeratePort ( > // Case4: > // Device connected or disconnected normally. > // > - DEBUG ((DEBUG_INFO, "UsbEnumeratePort: Device > Connect/Disconnect Normally\n", Port)); > + DEBUG ((DEBUG_INFO, "UsbEnumeratePort: Device > Connect/Disconnect Normally (port %d)\n", Port)); > } >=20 > // > diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c > b/MdeModulePkg/Core/Dxe/Image/Image.c > index 68bde5c15c52..06cc6744b8c6 100644 > --- a/MdeModulePkg/Core/Dxe/Image/Image.c > +++ b/MdeModulePkg/Core/Dxe/Image/Image.c > @@ -1741,7 +1741,7 @@ CoreStartImage ( > if ((Image->ExitDataSize !=3D 0) || (Image->ExitData !=3D NULL)) { > DEBUG ((DEBUG_LOAD, "StartImage: ExitDataSize %d, ExitData %p", > (UINT32)Image->ExitDataSize, Image->ExitData)); > if (Image->ExitData !=3D NULL) { > - DEBUG ((DEBUG_LOAD, " (%hs)", Image->ExitData)); > + DEBUG ((DEBUG_LOAD, " (%s)", Image->ExitData)); > } >=20 > DEBUG ((DEBUG_LOAD, "\n")); > diff --git > a/MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdate > ProgressLibGraphics.c > b/MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdate > ProgressLibGraphics.c > index 83053464e06e..6b012fed35db 100644 > --- > a/MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdate > ProgressLibGraphics.c > +++ > b/MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdate > ProgressLibGraphics.c > @@ -148,7 +148,7 @@ FindDim ( > (VOID **)&BootLogo > ); > if ((BootLogo =3D=3D NULL) || (EFI_ERROR (Status))) { > - DEBUG ((DEBUG_ERROR, "Failed to locate = gEdkiiBootLogo2ProtocolGuid. > No Progress bar support. \n", Status)); > + DEBUG ((DEBUG_ERROR, "Failed to locate > gEdkiiBootLogo2ProtocolGuid Status =3D %r. No Progress bar support. = \n", > Status)); > return; > } >=20 > -- > 2.28.0.windows.1