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

Timestamp:

2011-08-29T23:00:12Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

58cbb0c8

Parents:

c5be39b

Message:

Leave it up to DDF to free driver-specific data. This makes it possible
to ensure soft state is not freed during calls to driver entry points.

This requires some driver changes:

• minimum change is not to free() driver-data structures (ddf_fun_t.driver_data and ddf_dev_t.driver_data)
• ideally allocate using ddf_dev_data_alloc(), ddf_fun_data_alloc()

I tried fixing existing drivers accordingly (mostly the minimalistic
change variant), but could have missed something.

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);