Integrated libl4thread with libl4. Added device number to device caps.

A 16-bit device number or id further distinguishes a device on the
system in addition to the device type. This is meant to be used for
the very first identification of the device for further probing. Any
further info is available by userspace mapping and probing.

conts/libl4/include/l4lib/addr.h

@@ -0,0 +1,27 @@
+/*
+ * Address allocation pool.
+ *
+ * Copyright (C) 2007 Bahadir Balban
+ */
+#ifndef __ADDR_H__
+#define __ADDR_H__
+
+#include <l4lib/idpool.h>
+
+/* Address pool to allocate from a range of addresses */
+struct address_pool {
+	struct id_pool *idpool;
+	unsigned long start;
+	unsigned long end;
+};
+
+int address_pool_init_with_idpool(struct address_pool *pool,
+				  struct id_pool *idpool,
+				  unsigned long start, unsigned long end);
+int address_pool_init(struct address_pool *pool,
+			unsigned long start, unsigned long end,
+			int size);
+void *address_new(struct address_pool *pool, int nitems, int size);
+int address_del(struct address_pool *, void *addr, int nitems, int size);
+
+#endif /* __ADDR_H__ */

conts/libl4/include/l4lib/bit.h

@@ -0,0 +1,44 @@
+#ifndef __BIT_H__
+#define __BIT_H__
+
+#include <l4lib/types.h>
+
+unsigned int __clz(unsigned int bitvector);
+int find_and_set_first_free_bit(u32 *word, unsigned int lastbit);
+int find_and_set_first_free_contig_bits(u32 *word,  unsigned int limit,
+					int nbits);
+int check_and_clear_bit(u32 *word, int bit);
+int check_and_clear_contig_bits(u32 *word, int first, int nbits);
+
+int check_and_set_bit(u32 *word, int bit);
+
+/* Set */
+static inline void setbit(unsigned int *w, unsigned int flags)
+{
+	*w |= flags;
+}
+
+
+/* Clear */
+static inline void clrbit(unsigned int *w, unsigned int flags)
+{
+	*w &= ~flags;
+}
+
+/* Test */
+static inline int tstbit(unsigned int *w, unsigned int flags)
+{
+	return *w & flags;
+}
+
+/* Test and clear */
+static inline int tstclr(unsigned int *w, unsigned int flags)
+{
+	int res = tstbit(w, flags);
+
+	clrbit(w, flags);
+
+	return res;
+}
+
+#endif /* __BIT_H__ */

conts/libl4/include/l4lib/idpool.h

@@ -0,0 +1,31 @@
+#ifndef __IDPOOL_H__
+#define __IDPOOL_H__
+
+#include <l4lib/bit.h>
+#include <string.h>
+#include <l4/macros.h>
+#include INC_GLUE(memory.h)
+
+struct id_pool {
+	int nwords;
+	int bitlimit;
+	u32 bitmap[];
+};
+
+/* Copy one id pool to another by calculating its size */
+static inline void id_pool_copy(struct id_pool *to, struct id_pool *from, int totalbits)
+{
+	int nwords = BITWISE_GETWORD(totalbits);
+
+	memcpy(to, from, nwords * SZ_WORD + sizeof(struct id_pool));
+}
+
+struct id_pool *id_pool_new_init(int mapsize);
+int id_new(struct id_pool *pool);
+int id_del(struct id_pool *pool, int id);
+int id_get(struct id_pool *pool, int id);
+int id_is_empty(struct id_pool *pool);
+int ids_new_contiguous(struct id_pool *pool, int numids);
+int ids_del_contiguous(struct id_pool *pool, int first, int numids);
+
+#endif /* __IDPOOL_H__ */

conts/libl4/include/l4lib/stack.h

@@ -0,0 +1,19 @@
+/*
+ * Stack space helper routines.
+ *
+ * Copyright (C) 2009 B Labs Ltd.
+ */
+#ifndef __LIB_STACK_H__
+#define __LIB_STACK_H__
+
+/* Checks if l4_set_stack_params is called. */
+#define IS_STACK_SETUP()	(lib_stack_size)
+
+int stack_pool_init(unsigned long stack_start,
+			unsigned long stack_end,
+			unsigned long stack_size);
+
+void *get_stack_space(void);
+int delete_stack_space(void *stack_address);
+
+#endif /* __LIB_STACK_H__ */

conts/libl4/include/l4lib/tcb.h

@@ -0,0 +1,43 @@
+/*
+ * Thread control block.
+ *
+ * Copyright (C) 2009 B Labs Ltd.
+ */
+#ifndef __LIB_TCB_H__
+#define __LIB_TCB_H__
+
+#include <l4/lib/list.h>
+
+/* Keeps all the struct utcb_descs belonging to a thread group together. */
+struct utcb_head {
+	struct link list;
+};
+
+/* A simple thread control block for the thread library. */
+struct tcb {
+	/* Task list */
+	struct link list;
+
+	/* Task id */
+	int tid;
+
+	/* Chain of utcb descriptors */
+	struct utcb_head *utcb_head;
+
+	/* Stack and utcb address */
+	unsigned long utcb_addr;
+	unsigned long stack_addr;
+};
+
+/* All the threads handled by the thread lib are kept in this list. */
+struct global_list {
+	int total;
+	struct link list;
+};
+
+struct tcb *find_task(int tid);
+struct tcb *tcb_alloc_init(struct tcb *parent, unsigned int flags);
+void global_add_task(struct tcb *task);
+void global_remove_task(struct tcb *task);
+
+#endif /* __LIB_TCB_H__ */

conts/libl4/include/l4lib/thread.h

@@ -11,4 +11,22 @@ struct l4_thread_struct {
 	unsigned long stack_start;	/* Thread start of stack */
 };
 
+
+/* -- Bora start -- */
+
+/* A helper macro easing utcb space creation. */
+#define DECLARE_UTCB_SPACE(name, entries) \
+	char name[(entries + PAGE_SIZE / UTCB_SIZE) * UTCB_SIZE] ALIGN(PAGE_SIZE);
+
+int l4_set_stack_params(unsigned long stack_top,
+			unsigned long stack_bottom,
+			unsigned long stack_size);
+int l4_set_utcb_params(unsigned long utcb_start, unsigned long utcb_end);
+
+int l4_thread_create(struct task_ids *ids, unsigned int flags,
+			int (*func)(void *), void *arg);
+void l4_thread_exit(int retval);
+
+/* -- Bora start -- */
+
 #endif /* __L4_THREAD_H__ */

conts/libl4/include/l4lib/utcb-common.h

@@ -0,0 +1,25 @@
+/*
+ * UTCB handling common helper routines.
+ *
+ * Copyright (C) 2009 B Labs Ltd.
+ */
+#ifndef __UTCB_COMMON_H__
+#define __UTCB_COMMON_H__
+
+#include <l4/lib/list.h>
+
+struct utcb_desc {
+	struct link list;
+	unsigned long utcb_base;
+	struct id_pool *slots;
+};
+
+int utcb_pool_init(unsigned long utcb_start, unsigned long utcb_end);
+
+unsigned long utcb_new_slot(struct utcb_desc *desc);
+int utcb_delete_slot(struct utcb_desc *desc, unsigned long address);
+
+struct utcb_desc *utcb_new_desc(void);
+int utcb_delete_desc(struct utcb_desc *desc);
+
+#endif /* __UTCB_COMMON_H__ */

conts/libl4/include/l4lib/utcb.h

@@ -9,4 +9,14 @@
 
 int utcb_init(void);
 
+/* Bora start */
+#include <l4lib/tcb.h>
+
+/* Checks if l4_set_stack_params is called. */
+#define IS_UTCB_SETUP()	(lib_utcb_range_size)
+
+unsigned long get_utcb_addr(struct tcb *task);
+int delete_utcb_addr(struct tcb *task);
+/* Bora end */
+
 #endif /* __UTCB_H__ */