Changeset 80649a91 in mainline for libc/include

Timestamp:

2006-05-21T19:28:37Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

a410beb

Parents:

1ee11f4

Message:

Merged libadt into libc.
Made lot of psthread and thread stuff thread-safe.
Added new driver framework for easy C connection programming.
Changed FB code to use new API.

Location:

libc/include

Files:

• ipc/ipc.h (modified) (3 diffs)
• libadt/fifo.h (moved) (moved from libadt/include/fifo.h )
• libadt/hash_table.h (moved) (moved from libadt/include/hash_table.h )
• libadt/list.h (moved) (moved from libadt/include/list.h )
• psthread.h (modified) (2 diffs)

libc/include/ipc/ipc.h

@@ -34 +34 @@
 #include <libc.h>
 #include <types.h>
+#include <kernel/synch/synch.h>
 
 typedef sysarg_t ipcarg_t;
@@ -54 +55 @@
 extern int ipc_call_sync(int phoneid, ipcarg_t method, ipcarg_t arg1,
                          ipcarg_t *result);
-extern ipc_callid_t ipc_wait_for_call(ipc_call_t *data);
+extern ipc_callid_t ipc_wait_cycle(ipc_call_t *call, uint32_t usec, int flags);
 extern ipc_callid_t ipc_wait_for_call_timeout(ipc_call_t *data, uint32_t usec);
+static inline ipc_callid_t ipc_wait_for_call(ipc_call_t *data)
+{
+        return ipc_wait_for_call_timeout(data, SYNCH_NO_TIMEOUT);
+}
 extern ipc_callid_t ipc_trywait_for_call(ipc_call_t *data);
 
@@ -72 +77 @@
 extern int ipc_unregister_irq(int irq);
 extern int ipc_forward_fast(ipc_callid_t callid, int phoneid, int method, ipcarg_t arg1);
-extern void _ipc_init(void);
 
 #endif

libc/include/psthread.h

@@ -41 +41 @@
 #endif /* context_set */
 
+typedef enum {
+        PS_TO_MANAGER,
+        PS_FROM_MANAGER,
+        PS_PREEMPT
+} pschange_type;
+
 typedef sysarg_t pstid_t;
 
@@ -62 +68 @@
 
 pstid_t psthread_create(int (*func)(void *), void *arg);
-int psthread_schedule_next(void);
 int psthread_join(pstid_t psthrid);
-psthread_data_t * psthread_setup(tcb_t *tcb);
+psthread_data_t * psthread_setup(void);
 void psthread_teardown(psthread_data_t *pt);
+int psthread_schedule_next_adv(pschange_type ctype);
+void psthread_add_ready(pstid_t ptid);
+void psthread_add_manager(pstid_t psthrid);
+void psthread_remove_manager(void);
+
+static inline int psthread_schedule_next() {
+        return psthread_schedule_next_adv(PS_PREEMPT);
+}