Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ISAPNP] Store VendorId/ProdId in the usual form

Browse source
This commit is contained in:
Hervé Poussineau 2020-02-10 21:29:28 +01:00
parent 8eb3173896
commit bec0ceb82f
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/bus/isapnp/hardware.c
View file

@ -512,12 +512,14 @@ ProbeIsaPnpBus(PISAPNP_FDO_EXTENSION FdoExt)
WriteLogicalDeviceNumber(LogDev);
LogDevice->VendorId = LogDevId.VendorId;
LogDevice->ProdId = LogDevId.ProdId;
LogDevice->VendorId[0] = ((LogDevId.VendorId >> 2) & 0x1f) + 'A' - 1,
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->IoAddr = ReadIoBase(FdoExt->ReadDataPort, 0);
LogDevice->IrqNo = ReadIrqNo(FdoExt->ReadDataPort, 0);
DPRINT1("Detected ISA PnP device - VID: 0x%x PID: 0x%x IoBase: 0x%x IRQ:0x%x\n",
DPRINT1("Detected ISA PnP device - VID: '%3s' PID: 0x%x IoBase: 0x%x IRQ:0x%x\n",
LogDevice->VendorId, LogDevice->ProdId, LogDevice->IoAddr, LogDevice->IrqNo);
WaitForKey();

2
drivers/bus/isapnp/isapnp.h
View file

@ -32,7 +32,7 @@ typedef struct _ISAPNP_FDO_EXTENSION {
typedef struct _ISAPNP_LOGICAL_DEVICE {
ISAPNP_COMMON_EXTENSION Common;
USHORT VendorId;
UCHAR VendorId[3];
USHORT ProdId;
USHORT IoAddr;
UCHAR IrqNo;