X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fdevices%2Fpci.h;h=66841a808f9fac89e3bd4f2efde68d948b4c8ebb;hb=a0e1d8274aef54adcf50dce0b3843489f2a3cd21;hp=003096c7a52e3e654d28db82c5b15dbc6864630d;hpb=2137016ed7c531b573ef8aef0d0d545d75a01098;p=palacios.git

diff --git a/palacios/include/devices/pci.h b/palacios/include/devices/pci.h
index 003096c..66841a8 100644
--- a/palacios/include/devices/pci.h
+++ b/palacios/include/devices/pci.h
@@ -39,16 +39,35 @@ struct pci_device;
 
 struct v3_pci_bar {
     pci_bar_type_t type;
-    int mem_hook;
-    int num_pages;
-    int (*bar_update)(struct pci_device * pci_dev, uint_t bar);
+    
+    union {
+	struct {
+	    int num_pages;
+	    addr_t default_base_addr;
+	    int (*mem_read)(addr_t guest_addr, void * dst, uint_t length, void * private_data);
+	    int (*mem_write)(addr_t guest_addr, void * src, uint_t length, void * private_data);
+	};
+
+	struct {
+	    int num_ports;
+	    uint16_t default_base_port;
+	    int (*io_read)(ushort_t port, void * dst, uint_t length, struct vm_device * dev);
+	    int (*io_write)(ushort_t port, void * src, uint_t length, struct vm_device * dev);
+	};
+    };
 
     // Internal PCI data
+    uint32_t val;
     int updated;
     uint32_t mask;
 };
 
+
+#define PCI_IO_BASE(bar_val) (bar_val & 0xfffffffc)
+#define PCI_MEM32_BASE(bar_val) (bar_val & 0xfffffff0)
+
 struct pci_device {
+
     union {
 	uint8_t config_space[256];
 
@@ -58,14 +77,20 @@ struct pci_device {
 	} __attribute__((packed));
     } __attribute__((packed));
 
-
-
     struct v3_pci_bar bar[6];
 
-    uint_t bus_num;
     struct rb_node dev_tree_node;
 
-    int dev_num;
+    uint_t bus_num;
+
+    union {
+	uint8_t devfn;
+	struct {
+	    uint8_t fn_num       : 3;
+	    uint8_t dev_num      : 5;
+	} __attribute__((packed));
+    } __attribute__((packed));
+
     char name[64];
 
     struct vm_device * vm_dev;  //the corresponding virtual device
@@ -75,7 +100,6 @@ struct pci_device {
     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;
 
@@ -89,14 +113,15 @@ 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 bus_num,
 		       int dev_num,
+		       int fn_num,
+		       const char * name,
 		       struct v3_pci_bar * bars,
 		       int (*config_update)(struct pci_device * pci_dev, uint_t reg_num, int length),
 		       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);
+		       struct vm_device * dev);
 
 
 #endif