added bar updates and initialization

[palacios.git] / palacios / include / devices / pci.h

diff --git a/palacios/include/devices/pci.h b/palacios/include/devices/pci.h
index 23f459c..3c6a08b 100644 (file)
--- a/palacios/include/devices/pci.h
+++ b/palacios/include/devices/pci.h
@@ -31,13 +31,17 @@
 #include <devices/pci_types.h>
 
 
-typedef enum {PCI_BAR_IO, PCI_BAR_MEM32, PCI_BAR_MEM64_LOW, PCI_BAR_MEM64_HIGH, PCI_BAR_NONE} pci_bar_type_t;
+typedef enum {PCI_BAR_IO, PCI_BAR_MEM16, PCI_BAR_MEM32, PCI_BAR_MEM64_LOW, PCI_BAR_MEM64_HIGH, PCI_BAR_NONE} pci_bar_type_t;
 
-struct bar_reg {
-    int updated;
+struct v3_bar_reg {
     pci_bar_type_t type;
-    int num_resources;
+    int mem_hook;
+    int num_pages;
     int (*bar_update)(struct pci_device * pci_dev, uint_t bar);
+
+    // Internal PCI data
+    int updated;
+    uint32_t mask;
 };
 
 struct pci_device {
@@ -52,7 +56,7 @@ struct pci_device {
 
 
 
-    struct bar_reg bar[6];
+    struct v3_bar_reg bar[6];
 
     uint_t bus_num;
     struct rb_node dev_tree_node;
@@ -64,6 +68,9 @@ struct pci_device {
 
     int (*config_update)(struct pci_device * pci_dev, uint_t reg_num, int length);
 
+    int (*cmd_update)(struct pci_dev *pci_dev, uchar_t io_enabled, uchar_t mem_enabled);
+    int (*ext_rom_update)(struct pci_dev *pci_dev);
+
 
     int ext_rom_update_flag;
     int bar_update_flag;