diff --git a/tools/pci.hpp b/tools/pci.hpp
index 96f1ea4..37cd736 100644
--- a/tools/pci.hpp
+++ b/tools/pci.hpp
@@ -18,11 +18,12 @@
  */
 struct PciDevice
 {
-    int vid;
-    int did;
-    int bus;
-    int dev;
-    int func;
+    std::uint16_t vid;
+    std::uint16_t did;
+    std::uint8_t bus;
+    std::uint8_t dev;
+    std::uint8_t func;
+    pciaddr_t bars[6];
 };
 
 /**
@@ -31,8 +32,8 @@
  */
 struct PciFilter
 {
-    int vid;
-    int did;
+    std::uint16_t vid;
+    std::uint16_t did;
 };
 
 class PciUtilInterface