broken DMA that should be working

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

diff --git a/palacios/include/devices/pci.h b/palacios/include/devices/pci.h
index 51d1d50..6727e44 100644 (file)
--- a/palacios/include/devices/pci.h
+++ b/palacios/include/devices/pci.h
@@ -39,21 +39,33 @@ struct pci_device;
 
 struct v3_pci_bar {
     pci_bar_type_t type;
-    int mem_hook;
     
     union {
-       int num_pages;
-       int num_io_ports;
-    };
-
-    int (*bar_update)(struct pci_device * pci_dev, uint_t bar);
+       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];
@@ -102,7 +114,7 @@ v3_pci_register_device(struct vm_device * pci,
                       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