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

Timestamp:

2019-01-03T06:53:22Z (5 years ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

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

Children:

043d464f

Parents:

b4a4ad94 (diff), 7acd787 (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 upstream changes

File:

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

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

@@ -37 +37 @@
 #define PCI_H_
 
+#include <adt/list.h>
+#include <ddi.h>
 #include <ddf/driver.h>
-#include "pci_regs.h"
+#include <fibril_synch.h>
 
 #define PCI_MAX_HW_RES 10
@@ -50 +52 @@
         pio_window_t pio_win;
         fibril_mutex_t conf_mutex;
+        /** List of functions (of pci_fun_t) */
+        list_t funs;
 } pci_bus_t;
 
@@ -55 +59 @@
         pci_bus_t *busptr;
         ddf_fun_t *fnode;
+        /** Link to @c busptr->funs */
+        link_t lfuns;
 
         int bus;
@@ -71 +77 @@
 } pci_fun_t;
 
+extern pci_bus_t *pci_bus(ddf_dev_t *);
+
 extern void pci_fun_create_match_ids(pci_fun_t *);
+extern pci_fun_t *pci_fun_first(pci_bus_t *);
+extern pci_fun_t *pci_fun_next(pci_fun_t *);
 
 extern uint8_t pci_conf_read_8(pci_fun_t *, int);