Changeset beb9336 in mainline for kernel/generic/include

Timestamp:

2012-08-24T14:07:52Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

041ab64

Parents:

bd29f9c9 (diff), db81577 (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 with mainline

Location:

kernel/generic/include

Files:

• interrupt.h (modified) (1 diff)
• ipc/ipc.h (modified) (3 diffs)
• ipc/sysipc.h (modified) (1 diff)
• print.h (modified) (1 diff)
• printf/verify.h (added)
• proc/task.h (modified) (1 diff)

kernel/generic/include/interrupt.h

@@ -59 +59 @@
 extern exc_table_t exc_table[];
 
-extern void fault_from_uspace(istate_t *, const char *, ...);
+extern void fault_from_uspace(istate_t *, const char *, ...)
+    PRINTF_ATTRIBUTE(2, 3);
 extern void fault_if_from_uspace(istate_t *, const char *, ...)
     PRINTF_ATTRIBUTE(2, 3);

kernel/generic/include/ipc/ipc.h

@@ -77 +77 @@
         waitq_t wq;
         
-        /** Linkage for the list of task's synchronous answerboxes. */
-        link_t sync_box_link;
-        
         /** Phones connected to this answerbox. */
         list_t connected_phones;
@@ -116 +113 @@
         struct task *sender;
         
-        /*
-         * The caller box is different from sender->answerbox
-         * for synchronous calls.
-         */
-        answerbox_t *callerbox;
-        
         /** Private data to internal IPC. */
         sysarg_t priv;
@@ -147 +138 @@
 
 extern int ipc_call(phone_t *, call_t *);
-extern int ipc_call_sync(phone_t *, call_t *);
 extern call_t *ipc_wait_for_call(answerbox_t *, uint32_t, unsigned int);
 extern int ipc_forward(call_t *, phone_t *, answerbox_t *, unsigned int);

kernel/generic/include/ipc/sysipc.h

@@ -40 +40 @@
 #include <typedefs.h>
 
-extern sysarg_t sys_ipc_call_sync_fast(sysarg_t, sysarg_t, sysarg_t,
-    sysarg_t, sysarg_t, ipc_data_t *);
-extern sysarg_t sys_ipc_call_sync_slow(sysarg_t, ipc_data_t *, ipc_data_t *);
 extern sysarg_t sys_ipc_call_async_fast(sysarg_t, sysarg_t, sysarg_t,
     sysarg_t, sysarg_t, sysarg_t);

kernel/generic/include/print.h

@@ -38 +38 @@
 #include <typedefs.h>
 #include <stdarg.h>
-
-#ifndef NVERIFY_PRINTF
-
-#define PRINTF_ATTRIBUTE(start, end) \
-        __attribute__((format(gnu_printf, start, end)))
-
-#else /* NVERIFY_PRINTF */
-
-#define PRINTF_ATTRIBUTE(start, end)
-
-#endif /* NVERIFY_PRINTF */
+#include <printf/verify.h>
 
 #define EOF  (-1)

kernel/generic/include/proc/task.h

@@ -94 +94 @@
         phone_t phones[IPC_MAX_PHONES];
         stats_ipc_t ipc_info;   /**< IPC statistics */
-        list_t sync_boxes;      /**< List of synchronous answerboxes. */
         event_t events[EVENT_TASK_END - EVENT_END];