Changeset 85c4cc45 in mainline

Timestamp:

2011-11-14T11:01:46Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1b93658

Parents:

a066c1b9

Message:

isa: One less malloc. Fix name memory leak.

File:

• uspace/drv/bus/isa/isa.c (modified) (5 diffs)

uspace/drv/bus/isa/isa.c

@@ -89 +89 @@
         fibril_mutex_t mutex;
         ddf_fun_t *fnode;
+        hw_resource_t resources[ISA_MAX_HW_RES];
         hw_resource_list_t hw_resources;
         link_t bus_link;
@@ -201 +202 @@
 
         fibril_mutex_initialize(&fun->mutex);
+        fun->hw_resources.resources = fun->resources;
+
         fun->fnode = fnode;
         return fun;
@@ -510 +513 @@
 }
 
-static void fun_hw_res_alloc(isa_fun_t *fun)
-{
-        fun->hw_resources.resources =
-            (hw_resource_t *)malloc(sizeof(hw_resource_t) * ISA_MAX_HW_RES);
-}
-
-static void fun_hw_res_free(isa_fun_t *fun)
-{
-        free(fun->hw_resources.resources);
-        fun->hw_resources.resources = NULL;
-}
-
 static char *isa_fun_read_info(char *fun_conf, isa_bus_t *isa)
 {
@@ -546 +537 @@
 
         isa_fun_t *fun = isa_fun_create(isa, fun_name);
+        free(fun_name);
         if (fun == NULL) {
-                free(fun_name);
                 return NULL;
         }
-
-        /* Allocate buffer for the list of hardware resources of the device. */
-        fun_hw_res_alloc(fun);
 
         /* Get properties of the device (match ids, irq and io range). */
@@ -669 +657 @@
                 list_remove(&fun->bus_link);
 
-                fun_hw_res_free(fun);
                 ddf_fun_destroy(fun->fnode);
         }