Changes in uspace/drv/bus/pci/pciintel/pci.c [7acd787:94ab1fe] in mainline

File:

• uspace/drv/bus/pci/pciintel/pci.c (modified) (8 diffs)

uspace/drv/bus/pci/pciintel/pci.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
  * Copyright (c) 2010 Lenka Trochtova
+ * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -58 +58 @@
 #include <pci_dev_iface.h>
 
-#include "ctl.h"
 #include "pci.h"
-#include "pci_regs.h"
 
 #define NAME "pciintel"
@@ -75 +73 @@
 
 /** Obtain PCI bus soft-state from DDF device node */
-pci_bus_t *pci_bus(ddf_dev_t *dnode)
+#if 0
+static pci_bus_t *pci_bus(ddf_dev_t *dnode)
 {
         return ddf_dev_data_get(dnode);
 }
+#endif
 
 /** Obtain PCI bus soft-state from function soft-state */
@@ -448 +448 @@
 
         /* TODO add subsys ids, but those exist only in header type 0 */
-}
-
-/** Get first PCI function.
- *
- * @param bus PCI bus
- * @return First PCI function on @a bus or @c NULL if there is none
- */
-pci_fun_t *pci_fun_first(pci_bus_t *bus)
-{
-        link_t *link;
-
-        link = list_first(&bus->funs);
-        if (link == NULL)
-                return NULL;
-
-        return list_get_instance(link, pci_fun_t, lfuns);
-}
-
-/** Get next PCI function.
- *
- * @param cur Current function
- * @return Next PCI function on the same bus or @c NULL if there is none
- */
-pci_fun_t *pci_fun_next(pci_fun_t *cur)
-{
-        link_t *link;
-
-        link = list_next(&cur->lfuns, &cur->busptr->funs);
-        if (link == NULL)
-                return NULL;
-
-        return list_get_instance(link, pci_fun_t, lfuns);
 }
 
@@ -723 +691 @@
                                 continue;
                         }
-
-                        list_append(&fun->lfuns, &bus->funs);
                 }
         }
@@ -752 +718 @@
                 goto fail;
         }
-
-        list_initialize(&bus->funs);
         fibril_mutex_initialize(&bus->conf_mutex);
 
@@ -838 +802 @@
         }
 
-        ddf_fun_set_conn_handler(ctl, pci_ctl_connection);
-
         /* Enumerate functions. */
         ddf_msg(LVL_DEBUG, "Enumerating the bus");
@@ -854 +816 @@
         }
 
-        rc = ddf_fun_add_to_category(ctl, "pci");
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding control function to category "
-                    "'pci'.");
-                goto fail;
-        }
-
         hw_res_clean_resource_list(&hw_resources);