Changeset 132ab5d1 in mainline for kernel/generic/src/sysinfo/sysinfo.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• kernel/generic/src/sysinfo/sysinfo.c (modified) (5 diffs)

kernel/generic/src/sysinfo/sysinfo.c

@@ -53 +53 @@
 
 /** Sysinfo SLAB cache */
-static slab_cache_t *sysinfo_item_slab;
+static slab_cache_t *sysinfo_item_cache;
 
 /** Sysinfo lock */
@@ -71 +71 @@
         item->next = NULL;
         
-        return 0;
+        return EOK;
 }
 
@@ -98 +98 @@
 void sysinfo_init(void)
 {
-        sysinfo_item_slab = slab_cache_create("sysinfo_item_t",
+        sysinfo_item_cache = slab_cache_create("sysinfo_item_t",
             sizeof(sysinfo_item_t), 0, sysinfo_item_constructor,
             sysinfo_item_destructor, SLAB_CACHE_MAGDEFERRED);
@@ -204 +204 @@
                 
                 *psubtree =
-                    (sysinfo_item_t *) slab_alloc(sysinfo_item_slab, 0);
+                    (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, 0);
                 assert(*psubtree);
                 
@@ -268 +268 @@
                         
                         sysinfo_item_t *item =
-                            (sysinfo_item_t *) slab_alloc(sysinfo_item_slab, 0);
+                            (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, 0);
                         assert(item);