diff --git a/reactos/drivers/bus/pci/pci.c b/reactos/drivers/bus/pci/pci.c
index d00012d7a3f..85970fb1e86 100644
--- a/reactos/drivers/bus/pci/pci.c
+++ b/reactos/drivers/bus/pci/pci.c
@@ -1,4 +1,4 @@
-/* $Id: pci.c,v 1.8 2004/08/16 09:13:00 ekohl Exp $
+/* $Id: pci.c,v 1.9 2004/08/20 13:33:51 ekohl Exp $
  *
  * PROJECT:         ReactOS PCI Bus driver
  * FILE:            pci.c
@@ -436,8 +436,22 @@ PciCreateDeviceDescriptionString(PUNICODE_STRING DeviceDescription,
 
   switch (Device->PciConfig.BaseClass)
   {
+    case PCI_CLASS_PRE_20:
+      switch (Device->PciConfig.SubClass)
+      {
+        case PCI_SUBCLASS_PRE_20_VGA:
+          Description = L"VGA device";
+          break;
+
+        default:
+        case PCI_SUBCLASS_PRE_20_NON_VGA:
+          Description = L"PCI device";
+          break;
+      }
+      break;
+
     case PCI_CLASS_MASS_STORAGE_CTLR:
-      switch (Device->PciConfig.BaseClass)
+      switch (Device->PciConfig.SubClass)
       {
         case PCI_SUBCLASS_MSC_SCSI_BUS_CTLR:
           Description = L"SCSI controller";
@@ -461,20 +475,217 @@ PciCreateDeviceDescriptionString(PUNICODE_STRING DeviceDescription,
 
         default:
           Description = L"Mass storage controller";
+          break;
       }
       break;
 
     case PCI_CLASS_NETWORK_CTLR:
-      switch (Device->PciConfig.BaseClass)
+      switch (Device->PciConfig.SubClass)
       {
+        case PCI_SUBCLASS_NET_ETHERNET_CTLR:
+          Description = L"Ethernet controller";
+          break;
+
+        case PCI_SUBCLASS_NET_TOKEN_RING_CTLR:
+          Description = L"Token-Ring controller";
+          break;
+
+        case PCI_SUBCLASS_NET_FDDI_CTLR:
+          Description = L"FDDI controller";
+          break;
+
+        case PCI_SUBCLASS_NET_ATM_CTLR:
+          Description = L"ATM controller";
+          break;
 
         default:
           Description = L"Network controller";
+          break;
+      }
+      break;
+
+    case PCI_CLASS_DISPLAY_CTLR:
+      switch (Device->PciConfig.SubClass)
+      {
+        case PCI_SUBCLASS_VID_VGA_CTLR:
+          Description = L"VGA display controller";
+          break;
+
+        case PCI_SUBCLASS_VID_XGA_CTLR:
+          Description = L"XGA display controller";
+          break;
+
+        case PCI_SUBLCASS_VID_3D_CTLR:
+          Description = L"Multimedia display controller";
+          break;
+
+        default:
+          Description = L"Other display controller";
+          break;
+      }
+      break;
+
+    case PCI_CLASS_MULTIMEDIA_DEV:
+      switch (Device->PciConfig.SubClass)
+      {
+        case PCI_SUBCLASS_MM_VIDEO_DEV:
+          Description = L"Multimedia video device";
+          break;
+
+        case PCI_SUBCLASS_MM_AUDIO_DEV:
+          Description = L"Multimedia audio device";
+          break;
+
+        case PCI_SUBCLASS_MM_TELEPHONY_DEV:
+          Description = L"Multimedia telephony device";
+          break;
+
+        default:
+          Description = L"Other multimedia device";
+          break;
+      }
+      break;
+
+    case PCI_CLASS_MEMORY_CTLR:
+      switch (Device->PciConfig.SubClass)
+      {
+        case PCI_SUBCLASS_MEM_RAM:
+          Description = L"PCI Memory";
+          break;
+
+        case PCI_SUBCLASS_MEM_FLASH:
+          Description = L"PCI Flash Memory";
+          break;
+
+        default:
+          Description = L"Other memory controller";
+          break;
+      }
+      break;
+
+    case PCI_CLASS_BRIDGE_DEV:
+      switch (Device->PciConfig.SubClass)
+      {
+        case PCI_SUBCLASS_BR_HOST:
+          Description = L"PCI-Host bridge";
+          break;
+
+        case PCI_SUBCLASS_BR_ISA:
+          Description = L"PCI-ISA bridge";
+          break;
+
+        case PCI_SUBCLASS_BR_EISA:
+          Description = L"PCI-EISA bridge";
+          break;
+
+        case PCI_SUBCLASS_BR_MCA:
+          Description = L"PCI-Micro Channel bridge";
+          break;
+
+        case PCI_SUBCLASS_BR_PCI_TO_PCI:
+          Description = L"PCI-PCI bridge";
+          break;
+
+        case PCI_SUBCLASS_BR_PCMCIA:
+          Description = L"PCI-PCMCIA bridge";
+          break;
+
+        case PCI_SUBCLASS_BR_NUBUS:
+          Description = L"PCI-NUBUS bridge";
+          break;
+
+        case PCI_SUBCLASS_BR_CARDBUS:
+          Description = L"PCI-CARDBUS bridge";
+          break;
+
+        default:
+          Description = L"Other bridge device";
+          break;
+      }
+      break;
+
+    case PCI_CLASS_SIMPLE_COMMS_CTLR:
+      switch (Device->PciConfig.SubClass)
+      {
+
+        default:
+          Description = L"Communication device";
+          break;
+      }
+      break;
+
+    case PCI_CLASS_BASE_SYSTEM_DEV:
+      switch (Device->PciConfig.SubClass)
+      {
+
+        default:
+          Description = L"System device";
+          break;
+      }
+      break;
+
+    case PCI_CLASS_INPUT_DEV:
+      switch (Device->PciConfig.SubClass)
+      {
+
+        default:
+          Description = L"Input device";
+          break;
+      }
+      break;
+
+    case PCI_CLASS_DOCKING_STATION:
+      switch (Device->PciConfig.SubClass)
+      {
+
+        default:
+          Description = L"Docking station";
+          break;
+      }
+      break;
+
+    case PCI_CLASS_PROCESSOR:
+      switch (Device->PciConfig.SubClass)
+      {
+
+        default:
+          Description = L"Processor";
+          break;
+      }
+      break;
+
+    case PCI_CLASS_SERIAL_BUS_CTLR:
+      switch (Device->PciConfig.SubClass)
+      {
+        case PCI_SUBCLASS_SB_IEEE1394:
+          Description = L"FireWire controller";
+          break;
+
+        case PCI_SUBCLASS_SB_ACCESS:
+          Description = L"ACCESS bus controller";
+          break;
+
+        case PCI_SUBCLASS_SB_SSA:
+          Description = L"SSA controller";
+          break;
+
+        case PCI_SUBCLASS_SB_USB:
+          Description = L"USB controller";
+          break;
+
+        case PCI_SUBCLASS_SB_FIBRE_CHANNEL:
+          Description = L"Fibre Channel controller";
+          break;
+
+        default:
+          Description = L"Other serial bus controller";
+          break;
       }
       break;
 
     default:
-      Description = L"PCI-Device";
+      Description = L"Other PCI Device";
+      break;
   }
 
   Length = (wcslen(Description) + 1) * sizeof(WCHAR);
diff --git a/reactos/drivers/bus/pci/pdo.c b/reactos/drivers/bus/pci/pdo.c
index 3d77d3bb87f..83de4ae4e10 100644
--- a/reactos/drivers/bus/pci/pdo.c
+++ b/reactos/drivers/bus/pci/pdo.c
@@ -1,4 +1,4 @@
-/* $Id: pdo.c,v 1.8 2004/08/18 22:11:15 ekohl Exp $
+/* $Id: pdo.c,v 1.9 2004/08/20 13:33:51 ekohl Exp $
  *
  * PROJECT:         ReactOS PCI bus driver
  * FILE:            pdo.c
@@ -39,7 +39,7 @@ PdoQueryDeviceText(
   {
     case DeviceTextDescription:
       DPRINT("DeviceTextDescription\n");
-      Irp->IoStatus.Information = (ULONG_PTR)DeviceExtension->DeviceLocation.Buffer;
+      Irp->IoStatus.Information = (ULONG_PTR)DeviceExtension->DeviceDescription.Buffer;
       break;
 
     case DeviceTextLocationInformation:
@@ -169,10 +169,10 @@ PdoQueryCapabilities(
   DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
   DeviceCapabilities = IrpSp->Parameters.DeviceCapabilities.Capabilities;
 
-  DeviceCapabilities->UniqueID = TRUE;
+  DeviceCapabilities->UniqueID = FALSE;
 
-  DeviceCapabilities->Address =
-  DeviceCapabilities->UINumber = DeviceExtension->SlotNumber.u.AsULONG;
+  DeviceCapabilities->Address = DeviceExtension->SlotNumber.u.AsULONG;
+  DeviceCapabilities->UINumber = (ULONG)-1; /* FIXME */
 
   return STATUS_SUCCESS;
 }
@@ -338,7 +338,7 @@ PdoQueryResourceRequirements(
 
   /* Count required resource descriptors */
   ResCount = 0;
-  if ((PciConfig.HeaderType & 0x7F) == 0)
+  if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_DEVICE_TYPE)
   {
     for (i = 0; i < PCI_TYPE0_ADDRESSES; i++)
     {
@@ -347,7 +347,7 @@ PdoQueryResourceRequirements(
 			     &Base,
 			     &Length,
 			     &Flags))
-        break;
+	break;
 
       ResCount += 2;
     }
@@ -357,7 +357,7 @@ PdoQueryResourceRequirements(
     if (PciConfig.u.type0.InterruptPin != 0)
       ResCount++;
   }
-  else if ((PciConfig.HeaderType & 0x7F) == 1)
+  else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_BRIDGE_TYPE)
   {
     for (i = 0; i < PCI_TYPE1_ADDRESSES; i++)
     {
@@ -366,14 +366,17 @@ PdoQueryResourceRequirements(
 			     &Base,
 			     &Length,
 			     &Flags))
-        break;
+	break;
 
       ResCount += 2;
     }
   }
+  else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_CARDBUS_BRIDGE_TYPE)
+  {
+  }
   else
   {
-    DPRINT1("Unsupported header type %u\n", PciConfig.HeaderType);
+    DPRINT1("Unsupported header type %u\n", PCI_CONFIGURATION_TYPE(&PciConfig));
   }
 
   if (ResCount == 0)
@@ -389,7 +392,7 @@ PdoQueryResourceRequirements(
     ListSize += ((ResCount - 1) * sizeof(IO_RESOURCE_DESCRIPTOR));
   }
 
-  DPRINT1("ListSize %lu (0x%lx)\n", ListSize, ListSize);
+  DPRINT("ListSize %lu (0x%lx)\n", ListSize, ListSize);
 
   /* Allocate the resource requirements list */
   ResourceList = ExAllocatePool(PagedPool,
@@ -409,7 +412,7 @@ PdoQueryResourceRequirements(
   ResourceList->List[0].Count = ResCount;
 
   Descriptor = &ResourceList->List[0].Descriptors[0];
-  if ((PciConfig.HeaderType & 0x7F) == 0)
+  if (PCI_CONFIGURATION_TYPE(&PciConfig) == 0)
   {
     for (i = 0; i < PCI_TYPE0_ADDRESSES; i++)
     {
@@ -498,7 +501,7 @@ PdoQueryResourceRequirements(
       Descriptor->u.Interrupt.MaximumVector = 0xFF;
     }
   }
-  else if ((PciConfig.HeaderType & 0x7F) == 1)
+  else if (PCI_CONFIGURATION_TYPE(&PciConfig) == 1)
   {
     for (i = 0; i < PCI_TYPE1_ADDRESSES; i++)
     {
@@ -575,6 +578,10 @@ PdoQueryResourceRequirements(
       Descriptor++;
     }
   }
+  else if (PCI_CONFIGURATION_TYPE(&PciConfig) == 2)
+  {
+    /* FIXME: Add Cardbus bridge resources */
+  }
 
   Irp->IoStatus.Information = (ULONG_PTR)ResourceList;
 
@@ -622,7 +629,7 @@ PdoQueryResources(
 
   /* Count required resource descriptors */
   ResCount = 0;
-  if ((PciConfig.HeaderType & 0x7F) == 0)
+  if (PCI_CONFIGURATION_TYPE(&PciConfig) == 0)
   {
     for (i = 0; i < PCI_TYPE0_ADDRESSES; i++)
     {
@@ -640,7 +647,7 @@ PdoQueryResources(
         (PciConfig.u.type0.InterruptLine != 0xFF))
       ResCount++;
   }
-  else if ((PciConfig.HeaderType & 0x7F) == 1)
+  else if (PCI_CONFIGURATION_TYPE(&PciConfig) == 1)
   {
     for (i = 0; i < PCI_TYPE1_ADDRESSES; i++)
     {
@@ -653,10 +660,14 @@ PdoQueryResources(
 
       ResCount++;
     }
+  }
+  else if (PCI_CONFIGURATION_TYPE(&PciConfig) == 2)
+  {
+
   }
   else
   {
-    DPRINT1("Unsupported header type %u\n", PciConfig.HeaderType);
+    DPRINT1("Unsupported header type %u\n", PCI_CONFIGURATION_TYPE(&PciConfig));
   }
 
   if (ResCount == 0)
@@ -688,7 +699,7 @@ PdoQueryResources(
   PartialList->Count = ResCount;
 
   Descriptor = &PartialList->PartialDescriptors[0];
-  if ((PciConfig.HeaderType & 0x7F) == 0)
+  if (PCI_CONFIGURATION_TYPE(&PciConfig) == 0)
   {
     for (i = 0; i < PCI_TYPE0_ADDRESSES; i++)
     {
@@ -742,7 +753,7 @@ PdoQueryResources(
       Descriptor->u.Interrupt.Affinity = 0xFFFFFFFF;
     }
   }
-  else if ((PciConfig.HeaderType & 0x7F) == 1)
+  else if (PCI_CONFIGURATION_TYPE(&PciConfig) == 1)
   {
     for (i = 0; i < PCI_TYPE1_ADDRESSES; i++)
     {
@@ -784,6 +795,10 @@ PdoQueryResources(
       Descriptor++;
     }
   }
+  else if (PCI_CONFIGURATION_TYPE(&PciConfig) == 2)
+  {
+    /* FIXME: Cardbus */
+  }
 
   Irp->IoStatus.Information = (ULONG_PTR)ResourceList;