updated pci

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

diff --git a/palacios/include/devices/pci.h b/palacios/include/devices/pci.h
index 5d96168..79718a7 100644 (file)
--- a/palacios/include/devices/pci.h
+++ b/palacios/include/devices/pci.h
@@ -33,11 +33,28 @@
 
 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 {
+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 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
     int updated;
@@ -56,7 +73,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;
@@ -84,11 +101,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);