X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fdevices%2Fpci.h;h=31e09ad4d42893b16a4390b76771cc018d9fa3e8;hb=4eb8163fe76127f9748caa43f8ffad1e4d739bb8;hp=d39eae387c8f409debe5e7d322052cac014b6428;hpb=59b6853965a3cd4b17d0466c3650feed594cd89e;p=palacios.git

diff --git a/palacios/include/devices/pci.h b/palacios/include/devices/pci.h
index d39eae3..31e09ad 100644
--- a/palacios/include/devices/pci.h
+++ b/palacios/include/devices/pci.h
@@ -24,17 +24,29 @@
 
 #ifdef __V3VEE__
 
-#include <palacios/vm_dev.h>
+
 #include <palacios/vmm_types.h>
 #include <palacios/vmm_rbtree.h>
 
 #include <devices/pci_types.h>
 
 
-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;
+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;
 
 typedef enum {PCI_STD_DEVICE, PCI_TO_PCI_BRIDGE, PCI_CARDBUS, PCI_MULTIFUNCTION} pci_device_type_t;
 
+
+
+// For the rest of the subclass codes see:
+// http://www.acm.uiuc.edu/sigops/roll_your_own/7.c.1.html
+
+#define PCI_AUTO_DEV_NUM (-1)
+
 struct pci_device;
 
 struct v3_pci_bar {
@@ -67,6 +79,7 @@ struct v3_pci_bar {
 #define PCI_MEM32_BASE(bar_val) (bar_val & 0xfffffff0)
 
 struct pci_device {
+
     union {
 	uint8_t config_space[256];
 
@@ -76,14 +89,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
@@ -93,7 +112,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;
 
@@ -101,20 +119,27 @@ struct pci_device {
 };
 
 
+int v3_pci_set_irq_bridge(struct vm_device * pci_bus, int bus_num,
+			  int (*raise_pci_irq)(struct vm_device * dev, struct pci_device * pci_dev), 
+			  int (*lower_pci_irq)(struct vm_device * dev, struct pci_device * pci_dev), 
+			  struct vm_device * bridge_dev);
+
 
-struct vm_device * v3_create_pci();
+int v3_pci_raise_irq(struct vm_device * pci_bus, int bus_num, struct pci_device * dev);
+int v3_pci_lower_irq(struct vm_device * pci_bus, int bus_num, struct pci_device * dev);
 
 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