Merged via: PR - https://github.com/tianocore/edk2/pull/4102 Commit - https://github.com/tianocore/edk2/commit/46f51898ff716e53921b93e8d78af0fc7d06a2f9
Best Regards, Hao Wu > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Wu, Hao A > Sent: Monday, February 27, 2023 1:16 PM > To: Rebecca Cran <rebe...@bsdio.com>; devel@edk2.groups.io; Wang, Jian J > <jian.j.w...@intel.com>; Gao, Liming <gaolim...@byosoft.com.cn>; Ni, Ray > <ray...@intel.com> > Subject: Re: [edk2-devel] [PATCH v2 1/1] MdeModulePkg: Improve formatting > of DEBUG messages in UsbBusDxe > > Reviewed-by: Hao A Wu <hao.a...@intel.com>. > Will merge it after the upcoming stable tag announcement. > > Best Regards, > Hao Wu > > > -----Original Message----- > > From: Rebecca Cran <rebe...@bsdio.com> > > Sent: Friday, February 24, 2023 8:18 AM > > To: devel@edk2.groups.io; Wang, Jian J <jian.j.w...@intel.com>; Gao, > > Liming <gaolim...@byosoft.com.cn>; Wu, Hao A <hao.a...@intel.com>; Ni, > > Ray <ray...@intel.com> > > Cc: Rebecca Cran <rebe...@bsdio.com> > > Subject: [PATCH v2 1/1] MdeModulePkg: Improve formatting of DEBUG > > messages in UsbBusDxe > > > > Improve the formatting of DEBUG messages in UsbBusDxe by adding a > > hyphen to separate the EFI_STATUS code. > > > > Signed-off-by: Rebecca Cran <rebe...@bsdio.com> > > --- > > MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c | 12 ++++++------ > > MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c | 6 +++--- > > MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c | 2 +- > > MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c | 2 +- > > 4 files changed, 11 insertions(+), 11 deletions(-) > > > > diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c > > b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c > > index 6a3ac63c3aa0..c25f3cc2f279 100644 > > --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c > > +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c > > @@ -838,7 +838,7 @@ UsbIoPortReset ( > > if (EFI_ERROR (Status)) { > > DEBUG (( > > DEBUG_ERROR, > > - "UsbIoPortReset: failed to reset hub port %d@hub %d, %r \n", > > + "UsbIoPortReset: failed to reset hub port %d@hub %d - %r\n", > > Dev->ParentPort, > > Dev->ParentAddr, > > Status > > @@ -945,7 +945,7 @@ UsbBusBuildProtocol ( > > ); > > > > if (EFI_ERROR (Status)) { > > - DEBUG ((DEBUG_ERROR, "UsbBusStart: Failed to open device path %r\n", > > Status)); > > + DEBUG ((DEBUG_ERROR, "UsbBusStart: Failed to open device path - > > + %r\n", > > Status)); > > > > FreePool (UsbBus); > > return Status; > > @@ -978,7 +978,7 @@ UsbBusBuildProtocol ( > > ); > > > > if (EFI_ERROR (Status) && EFI_ERROR (Status2)) { > > - DEBUG ((DEBUG_ERROR, "UsbBusStart: Failed to open > > USB_HC/USB2_HC %r\n", Status)); > > + DEBUG ((DEBUG_ERROR, "UsbBusStart: Failed to open USB_HC/USB2_HC > > + - > > %r\n", Status)); > > > > Status = EFI_DEVICE_ERROR; > > goto CLOSE_HC; > > @@ -1006,7 +1006,7 @@ UsbBusBuildProtocol ( > > ); > > > > if (EFI_ERROR (Status)) { > > - DEBUG ((DEBUG_ERROR, "UsbBusStart: Failed to install bus protocol > > %r\n", > > Status)); > > + DEBUG ((DEBUG_ERROR, "UsbBusStart: Failed to install bus protocol > > + - %r\n", > > Status)); > > goto CLOSE_HC; > > } > > > > @@ -1054,7 +1054,7 @@ UsbBusBuildProtocol ( > > Status = mUsbRootHubApi.Init (RootIf); > > > > if (EFI_ERROR (Status)) { > > - DEBUG ((DEBUG_ERROR, "UsbBusStart: Failed to init root hub %r\n", > > Status)); > > + DEBUG ((DEBUG_ERROR, "UsbBusStart: Failed to init root hub - > > + %r\n", > > Status)); > > goto FREE_ROOTHUB; > > } > > > > @@ -1102,7 +1102,7 @@ UsbBusBuildProtocol ( > > ); > > FreePool (UsbBus); > > > > - DEBUG ((DEBUG_ERROR, "UsbBusStart: Failed to start bus driver > > %r\n", Status)); > > + DEBUG ((DEBUG_ERROR, "UsbBusStart: Failed to start bus driver - > > + %r\n", > > Status)); > > return Status; > > } > > > > diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c > > b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c > > index a620a670748c..8b078e7e4936 100644 > > --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c > > +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbDesc.c > > @@ -761,7 +761,7 @@ UsbGetOneConfig ( > > if (EFI_ERROR (Status)) { > > DEBUG (( > > DEBUG_ERROR, > > - "UsbGetOneConfig: failed to get descript length(%d) %r\n", > > + "UsbGetOneConfig: failed to get descript length(%d) - %r\n", > > Desc.TotalLength, > > Status > > )); > > @@ -787,7 +787,7 @@ UsbGetOneConfig ( > > Status = UsbCtrlGetDesc (UsbDev, USB_DESC_TYPE_CONFIG, Index, 0, > > Buf, Desc.TotalLength); > > > > if (EFI_ERROR (Status)) { > > - DEBUG ((DEBUG_ERROR, "UsbGetOneConfig: failed to get full > > descript %r\n", Status)); > > + DEBUG ((DEBUG_ERROR, "UsbGetOneConfig: failed to get full > > + descript - > > %r\n", Status)); > > > > FreePool (Buf); > > return NULL; > > @@ -891,7 +891,7 @@ UsbBuildDescTable ( > > Status = UsbBuildLangTable (UsbDev); > > > > if (EFI_ERROR (Status)) { > > - DEBUG ((DEBUG_INFO, "UsbBuildDescTable: get language ID table %r\n", > > Status)); > > + DEBUG ((DEBUG_INFO, "UsbBuildDescTable: get language ID table - > > + %r\n", > > Status)); > > } > > > > return EFI_SUCCESS; > > diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c > > b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c > > index aed34596f469..b3a40639f280 100644 > > --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c > > +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbEnumer.c > > @@ -440,7 +440,7 @@ UsbSelectConfig ( > > if (EFI_ERROR (Status)) { > > DEBUG (( > > DEBUG_WARN, > > - "UsbSelectConfig: failed to connect driver %r, ignored\n", > > + "UsbSelectConfig: failed to connect driver - %r, ignored\n", > > Status > > )); > > } > > diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c > > b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c > > index 0497a73f443c..1a473d099892 100644 > > --- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c > > +++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c > > @@ -609,7 +609,7 @@ UsbHubInit ( > > Status = UsbHubReadDesc (HubDev, HubDesc); > > > > if (EFI_ERROR (Status)) { > > - DEBUG ((DEBUG_ERROR, "UsbHubInit: failed to read HUB > descriptor %r\n", > > Status)); > > + DEBUG ((DEBUG_ERROR, "UsbHubInit: failed to read HUB descriptor - > > %r\n", Status)); > > return Status; > > } > > > > -- > > 2.37.1 (Apple Git-137.1) > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#100793): https://edk2.groups.io/g/devel/message/100793 Mute This Topic: https://groups.io/mt/97196506/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-