Changeset 4fe3b6d in mainline for uspace/lib/c/include/rtld/rtld.h

Timestamp:

2011-05-20T11:07:00Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

8bb61e6

Parents:

3476be8 (diff), 7941bd6 (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 development

File:

• uspace/lib/c/include/rtld/rtld.h (moved) (moved from uspace/drv/usbkbd/layout.h ) (2 diffs)

uspace/lib/c/include/rtld/rtld.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
- * Copyright (c) 2011 Lubos Slovak 
- * (copied from /uspace/srv/hid/kbd/include/layout.h)
+ * Copyright (c) 2008 Jiri Svoboda
  * All rights reserved.
  *
@@ -29 +27 @@
  */
 
-/** @addtogroup drvusbhid
+/** @addtogroup libc
  * @{
  */
 /** @file
- * Keyboard layout.
  */
 
-#ifndef USB_KBD_LAYOUT_H_
-#define USB_KBD_LAYOUT_H_
+#ifndef LIBC_RTLD_H_
+#define LIBC_RTLD_H_
 
 #include <sys/types.h>
-#include <io/console.h>
+#include <adt/list.h>
+
+#include <rtld/dynamic.h>
+#include <rtld/module.h>
 
 typedef struct {
-        void (*reset)(void);
-        wchar_t (*parse_ev)(console_event_t *);
-} layout_op_t;
+        elf_dyn_t *rtld_dynamic;
+        module_t rtld;
 
-extern layout_op_t us_qwerty_op;
-extern layout_op_t us_dvorak_op;
-extern layout_op_t cz_op;
+        module_t *program;
+
+        /** List of all loaded modules including rtld and the program */
+        link_t modules_head;
+
+        /** Temporary hack to place each module at different address. */
+        uintptr_t next_bias;
+} runtime_env_t;
+
+extern runtime_env_t *runtime_env;
+
+extern void rtld_init_static(void);
 
 #endif
 
-/**
- * @}
+/** @}
  */