Changeset 90efa3b in mainline

Timestamp:

2018-11-09T22:03:24Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

deacd722

Parents:

c222816

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-08 02:44:44)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-09 22:03:24)

Message:

Remove flags from ipc_call_alloc()

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• src/ipc/event.c (modified) (1 diff)
• src/ipc/ipc.c (modified) (1 diff)
• src/ipc/ipcrsc.c (modified) (1 diff)
• src/ipc/irq.c (modified) (2 diffs)
• src/ipc/sysipc.c (modified) (3 diffs)

kernel/generic/include/ipc/ipc.h

@@ -174 +174 @@
 extern void ipc_init(void);
 
-extern call_t *ipc_call_alloc(unsigned int);
+extern call_t *ipc_call_alloc(void);
 
 extern errno_t ipc_call_sync(phone_t *, call_t *);

kernel/generic/src/ipc/event.c

@@ -147 +147 @@
         if (event->answerbox != NULL) {
                 if (!event->masked) {
-                        call_t *call = ipc_call_alloc(FRAME_ATOMIC);
+                        call_t *call = ipc_call_alloc();
 
                         if (call) {

kernel/generic/src/ipc/ipc.c

@@ -108 +108 @@
  * TASK->answerbox.
  *
- * @param flags Parameters for slab_alloc (e.g FRAME_ATOMIC).
- *
- * @return If flags permit it, return NULL, or initialized kernel
- *         call structure with one reference.
- *
- */
-call_t *ipc_call_alloc(unsigned int flags)
+ * @return Initialized kernel call structure with one reference, or NULL.
+ *
+ */
+call_t *ipc_call_alloc(void)
 {
         // TODO: Allocate call and kobject in single allocation
 
-        call_t *call = slab_alloc(call_cache, flags);
+        call_t *call = slab_alloc(call_cache, FRAME_ATOMIC);
         if (!call)
                 return NULL;
 
-        kobject_t *kobj;
-        if (flags & FRAME_ATOMIC)
-                kobj = (kobject_t *) malloc(sizeof(kobject_t));
-        else
-                kobj = (kobject_t *) nfmalloc(sizeof(kobject_t));
-
+        kobject_t *kobj = (kobject_t *) malloc(sizeof(kobject_t));
         if (!kobj) {
                 slab_free(call_cache, call);

kernel/generic/src/ipc/ipcrsc.c

@@ -81 +81 @@
                         return ENOMEM;
                 }
-                call_t *hcall = ipc_call_alloc(FRAME_ATOMIC);
+                call_t *hcall = ipc_call_alloc();
                 if (!hcall) {
                         cap_free(TASK, handle);

kernel/generic/src/ipc/irq.c

@@ -529 +529 @@
 
         if (irq->notif_cfg.answerbox) {
-                call_t *call = ipc_call_alloc(FRAME_ATOMIC);
+                call_t *call = ipc_call_alloc();
                 if (!call)
                         return;
@@ -565 +565 @@
 
         if (irq->notif_cfg.answerbox) {
-                call_t *call = ipc_call_alloc(FRAME_ATOMIC);
+                call_t *call = ipc_call_alloc();
                 if (!call) {
                         irq_spinlock_unlock(&irq->lock, true);

kernel/generic/src/ipc/sysipc.c

@@ -277 +277 @@
                 return ENOENT;
 
-        call_t *call = ipc_call_alloc(FRAME_ATOMIC);
+        call_t *call = ipc_call_alloc();
         if (!call) {
                 kobject_put(kobj);
@@ -379 +379 @@
         }
 
-        call_t *call = ipc_call_alloc(FRAME_ATOMIC);
+        call_t *call = ipc_call_alloc();
         if (!call) {
                 kobject_put(kobj);
@@ -431 +431 @@
         }
 
-        call_t *call = ipc_call_alloc(FRAME_ATOMIC);
+        call_t *call = ipc_call_alloc();
         if (!call) {
                 kobject_put(kobj);