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

Timestamp:

2011-09-02T16:54:18Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f480d7e

Parents:

7a72ce1a (diff), 224c0e7 (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 basic infrastructure for anticipated device removal from
lp:~jsvoboda/helenos/devrem

File:

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

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

@@ -215 +215 @@
 };
 
-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 +566 @@
         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 +572 @@
                 goto fail;
         }
+        fibril_mutex_initialize(&bus->conf_mutex);
+
         bus->dnode = dnode;
         dnode->driver_data = bus;
@@ -655 +639 @@
         
 fail:
-        if (bus != NULL)
-                pci_bus_delete(bus);
-        
         if (dnode->parent_sess)
                 async_hangup(dnode->parent_sess);