Changes in uspace/drv/bus/pci/pciintel/pci.c [2df6f6fe:54de4836] in mainline

File:

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

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

@@ -92 +92 @@
 static bool pciintel_enable_interrupt(ddf_fun_t *fnode)
 {
-        /* This is an old ugly way */
+        /* This is an old ugly way, copied from ne2000 driver */
         assert(fnode);
         pci_fun_t *dev_data = (pci_fun_t *) fnode->driver_data;
@@ -187 +187 @@
 
 static hw_res_ops_t pciintel_hw_res_ops = {
-        .get_resource_list = &pciintel_get_resources,
-        .enable_interrupt = &pciintel_enable_interrupt,
+        &pciintel_get_resources,
+        &pciintel_enable_interrupt
 };
 
@@ -205 +205 @@
 };
 
-static int pci_dev_add(ddf_dev_t *);
+static int pci_add_device(ddf_dev_t *);
 static int pci_fun_online(ddf_fun_t *);
 static int pci_fun_offline(ddf_fun_t *);
@@ -211 +211 @@
 /** PCI bus driver standard operations */
 static driver_ops_t pci_ops = {
-        .dev_add = &pci_dev_add,
+        .add_device = &pci_add_device,
         .fun_online = &pci_fun_online,
         .fun_offline = &pci_fun_offline,
@@ -610 +610 @@
 }
 
-static int pci_dev_add(ddf_dev_t *dnode)
+static int pci_add_device(ddf_dev_t *dnode)
 {
         pci_bus_t *bus = NULL;
@@ -617 +617 @@
         int rc;
         
-        ddf_msg(LVL_DEBUG, "pci_dev_add");
+        ddf_msg(LVL_DEBUG, "pci_add_device");
         dnode->parent_sess = NULL;
         
         bus = ddf_dev_data_alloc(dnode, sizeof(pci_bus_t));
         if (bus == NULL) {
-                ddf_msg(LVL_ERROR, "pci_dev_add allocation failed.");
+                ddf_msg(LVL_ERROR, "pci_add_device allocation failed.");
                 rc = ENOMEM;
                 goto fail;
@@ -634 +634 @@
             dnode->handle, IPC_FLAG_BLOCKING);
         if (!dnode->parent_sess) {
-                ddf_msg(LVL_ERROR, "pci_dev_add failed to connect to the "
+                ddf_msg(LVL_ERROR, "pci_add_device failed to connect to the "
                     "parent driver.");
                 rc = ENOENT;
@@ -644 +644 @@
         rc = hw_res_get_resource_list(dnode->parent_sess, &hw_resources);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "pci_dev_add failed to get hw resources "
+                ddf_msg(LVL_ERROR, "pci_add_device failed to get hw resources "
                     "for the device.");
                 goto fail;