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

Timestamp:

2013-09-13T13:11:53Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1eaa3cf

Parents:

95027b5 (diff), 1c5f6f8 (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) (1 diff)

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

@@ -45 +45 @@
         /** 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;