X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fdevices%2Fpci.h;h=51d1d503705d45e707c073882bf1e6a60f2060a9;hb=fb7ae05e81eee43ecb4b1888b32d4d4a17b12f28;hp=01ce86a9c5d5ca4ce969bfc8ec8af1c66d45d013;hpb=643fbf6c339a64667edc263063de8f3345b82b3d;p=palacios.git

diff --git a/palacios/include/devices/pci.h b/palacios/include/devices/pci.h
index 01ce86a..51d1d50 100644
--- a/palacios/include/devices/pci.h
+++ b/palacios/include/devices/pci.h
@@ -31,13 +31,27 @@
 #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 v3_bar_reg {
-    int updated;
+typedef enum {PCI_STD_DEVICE, PCI_TO_PCI_BRIDGE, PCI_CARDBUS, PCI_MULTIFUNCTION} pci_device_type_t;
+
+struct pci_device;
+
+struct v3_pci_bar {
     pci_bar_type_t type;
-    int num_resources;
+    int mem_hook;
+    
+    union {
+	int num_pages;
+	int num_io_ports;
+    };
+
     int (*bar_update)(struct pci_device * pci_dev, uint_t bar);
+
+
+    // Internal PCI data
+    int updated;
+    uint32_t mask;
 };
 
 struct pci_device {
@@ -52,7 +66,7 @@ struct pci_device {
 
 
 
-    struct v3_bar_reg bar[6];
+    struct v3_pci_bar bar[6];
 
     uint_t bus_num;
     struct rb_node dev_tree_node;
@@ -64,9 +78,12 @@ 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 (*cmd_update)(struct pci_device *pci_dev, uchar_t io_enabled, uchar_t mem_enabled);
+    int (*ext_rom_update)(struct pci_device *pci_dev);
+
 
+    int ext_rom_update_flag;
+    int bar_update_flag;
 
     void * priv_data;
 };
@@ -77,11 +94,14 @@ struct vm_device * v3_create_pci();
 
 struct pci_device * 
 v3_pci_register_device(struct vm_device * pci,
+		       pci_device_type_t dev_type, 
 		       uint_t bus_num,
 		       const char * name,
 		       int dev_num,
+		       struct v3_pci_bar * bars,
 		       int (*config_update)(struct pci_device * pci_dev, uint_t reg_num, int length),
-		       int (*bar_update)(struct pci_device * pci_dev, uint_t bar),
+		       int (*cmd_update)(struct pci_device *pci_dev, uchar_t io_enabled, uchar_t mem_enabled),
+		       int (*ext_rom_update)(struct pci_device *pci_dev),
 		       void * private_data);