-Tinkered with formatting

[pintos-anon] / src / devices / pci.h

diff --git a/src/devices/pci.h b/src/devices/pci.h
index 9a7e4da99181a8c0d174b515473a5765d9dedc87..a66ac76f14718aaa8ac6bf954399509040e14492 100755 (executable)
--- a/src/devices/pci.h
+++ b/src/devices/pci.h
@@ -1,6 +1,34 @@
+#ifndef DEVICES_PCI_H
+#define DEVICES_PCI_H
+
+#include "devices/resource.h"
 #include "lib/kernel/list.h"
 
-struct pci_dev {
+#define PCI_BAD_DEVICE 0xffff
+
+/* PCI-to-PCI bridge related numbers */
+#define PCI_BRIDGE_BASE_CLASS 0x06
+#define PCI_BRIDGE_SUB_CLASS 0x04
+#define PCI_BRIDGE_REG_SBUS 0x19
+#define PCI_BRIDGE_HEADER_TYPE 0x01
+
+/* Locations of registers in the configuration space */
+#define PCI_REG_CLASS_INTERFACE 0x09
+#define PCI_REG_CLASS_SUB 0x0a
+#define PCI_REG_CLASS_BASE 0x0b
+#define PCI_REG_HEADER_TYPE 0x0e
+#define PCI_REGNUM_BASE_ADDRESS 4
+
+/* Base address related numbers */
+#define PCI_NUM_BARS 6
+#define PCI_BAR_TYPE_MASK 0x1
+#define PCI_BAR_TYPE_MEM 0x0
+#define PCI_BAR_TYPE_IO 0x1
+#define PCI_BAR_MASK_MEM 0xfffffff0
+#define PCI_BAR_MASK_IO 0xfffffffc
+
+struct pci_dev 
+{
   struct list_elem elem;
 
   /* <Bus, Device, Function> logically identify a unique PCI device */
@@ -15,21 +43,12 @@ struct pci_dev {
   uint8_t base_class;
   uint8_t sub_class;
   uint8_t interface;
-};
 
-#define PCI_BAD_DEVICE 0xffff
-
-/* PCI-to-PCI bridge related numbers */
-#define PCI_BRIDGE_BASE_CLASS 0x06
-#define PCI_BRIDGE_SUB_CLASS 0x04
-#define PCI_BRIDGE_REG_SBUS 0x19
-#define PCI_BRIDGE_HEADER_TYPE 0x01
-
-/* Locations of registers in the typical configuration space */
-#define PCI_REG_CLASS_INTERFACE 0x09
-#define PCI_REG_CLASS_SUB 0x0a
-#define PCI_REG_CLASS_BASE 0x0b
-#define PCI_REG_HEADER_TYPE 0x0e
+  /* Resource space */
+  struct resource resources[PCI_NUM_BARS];
+};
 
 void pci_init (void);
 void pci_dump (void);
+
+#endif /* devices/pci.h */