Changeset c05642d in mainline for uspace/drv/bus/pci/pciintel/pci.c

Timestamp:

2011-09-07T00:03:26Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

5081276

Parents:

bb74dabe (diff), 038b289 (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.c (modified) (6 diffs)

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

@@ -203 +203 @@
 
 static int pci_add_device(ddf_dev_t *);
+static int pci_fun_online(ddf_fun_t *);
+static int pci_fun_offline(ddf_fun_t *);
 
 /** PCI bus driver standard operations */
 static driver_ops_t pci_ops = {
-        .add_device = &pci_add_device
+        .add_device = &pci_add_device,
+        .fun_online = &pci_fun_online,
+        .fun_offline = &pci_fun_offline,
 };
 
@@ -214 +218 @@
         .driver_ops = &pci_ops
 };
-
-static pci_bus_t *pci_bus_new(void)
-{
-        pci_bus_t *bus;
-        
-        bus = (pci_bus_t *) calloc(1, sizeof(pci_bus_t));
-        if (bus == NULL)
-                return NULL;
-        
-        fibril_mutex_initialize(&bus->conf_mutex);
-        return bus;
-}
-
-static void pci_bus_delete(pci_bus_t *bus)
-{
-        assert(bus != NULL);
-        free(bus);
-}
 
 static void pci_conf_read(pci_fun_t *fun, int reg, uint8_t *buf, size_t len)
@@ -584 +570 @@
         dnode->parent_sess = NULL;
         
-        bus = pci_bus_new();
+        bus = ddf_dev_data_alloc(dnode, sizeof(pci_bus_t));
         if (bus == NULL) {
                 ddf_msg(LVL_ERROR, "pci_add_device allocation failed.");
@@ -590 +576 @@
                 goto fail;
         }
+        fibril_mutex_initialize(&bus->conf_mutex);
+
         bus->dnode = dnode;
         dnode->driver_data = bus;
@@ -655 +643 @@
         
 fail:
-        if (bus != NULL)
-                pci_bus_delete(bus);
-        
         if (dnode->parent_sess)
                 async_hangup(dnode->parent_sess);
@@ -668 +653 @@
         
         return rc;
+}
+
+static int pci_fun_online(ddf_fun_t *fun)
+{
+        ddf_msg(LVL_DEBUG, "pci_fun_online()");
+        return ddf_fun_online(fun);
+}
+
+static int pci_fun_offline(ddf_fun_t *fun)
+{
+        ddf_msg(LVL_DEBUG, "pci_fun_offline()");
+        return ddf_fun_offline(fun);
 }