Changeset 0c2d9bb in mainline for uspace/drv/bus/pci/pciintel/pci.h

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/drv/bus/pci/pciintel/pci.h (modified) (2 diffs)

uspace/drv/bus/pci/pciintel/pci.h

@@ -40 +40 @@
 #include "pci_regs.h"
 
-#define PCI_MAX_HW_RES 8
+#define PCI_MAX_HW_RES 10 
 
 typedef struct pciintel_bus {
         /** DDF device node */
         ddf_dev_t *dnode;
-        uint32_t conf_io_addr;
-        uint32_t conf_io_data;
-        void *conf_data_port;
-        void *conf_addr_port;
+        ioport32_t *conf_addr_reg;
+        ioport32_t *conf_data_reg;
+        pio_window_t pio_win;
         fibril_mutex_t conf_mutex;
 } pci_bus_t;
@@ -68 +67 @@
         hw_resource_list_t hw_resources;
         hw_resource_t resources[PCI_MAX_HW_RES];
+        pio_window_t pio_window;
 } pci_fun_t;