[ros-diffs] [reactos] 01/02: [ISAPNP] Fix reading of serial number

[Hervé Poussineau]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58e8be625874e9f267791…

commit 58e8be625874e9f2677919d823f81bbbfbec7cbd
Author:     Hervé Poussineau <hpoussin(a)reactos.org>
AuthorDate: Sat Mar 14 23:28:52 2020 +0100
Commit:     Hervé Poussineau <hpoussin(a)reactos.org>
CommitDate: Sat Mar 14 23:39:00 2020 +0100

    [ISAPNP] Fix reading of serial number
---
 drivers/bus/isapnp/hardware.c | 4 ++--
 drivers/bus/isapnp/pdo.c      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/bus/isapnp/hardware.c b/drivers/bus/isapnp/hardware.c
index fbf53eb8059..acabdd2d04c 100644
--- a/drivers/bus/isapnp/hardware.c
+++ b/drivers/bus/isapnp/hardware.c
@@ -516,11 +516,11 @@ ProbeIsaPnpBus(PISAPNP_FDO_EXTENSION FdoExt)
       LogDevice->VendorId[1] = (((LogDevId.VendorId & 0x3) << 3) |
((LogDevId.VendorId >> 13) & 0x7)) + 'A' - 1,
       LogDevice->VendorId[2] = ((LogDevId.VendorId >> 8) & 0x1f) +
'A' - 1,
       LogDevice->ProdId = RtlUshortByteSwap(LogDevId.ProdId);
-      LogDevice->SerialNumber = RtlUlongByteSwap(Identifier.Serial);
+      LogDevice->SerialNumber = Identifier.Serial;
       LogDevice->IoAddr = ReadIoBase(FdoExt->ReadDataPort, 0);
       LogDevice->IrqNo = ReadIrqNo(FdoExt->ReadDataPort, 0);
 
-      DPRINT1("Detected ISA PnP device - VID: '%3s' PID: 0x%x SN: 0x04x
IoBase: 0x%x IRQ:0x%x\n",
+      DPRINT1("Detected ISA PnP device - VID: '%3s' PID: 0x%x SN: 0x%08x
IoBase: 0x%x IRQ:0x%x\n",
                LogDevice->VendorId, LogDevice->ProdId, LogDevice->SerialNumber,
LogDevice->IoAddr, LogDevice->IrqNo);
 
       WaitForKey();
diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c
index 619d3fc4e06..450462f39d6 100644
--- a/drivers/bus/isapnp/pdo.c
+++ b/drivers/bus/isapnp/pdo.c
@@ -114,7 +114,7 @@ IsaPdoQueryId(
       Status = RtlStringCbPrintfExW(Temp, sizeof(Temp),
                                     &End,
                                     NULL, 0,
-                                    L"%u",
+                                    L"%X",
                                     LogDev->SerialNumber);
       if (!NT_SUCCESS(Status))
         return Status;