Changeset 4fe3b6d in mainline for uspace/lib/c/generic/dlfcn.c

Timestamp:

2011-05-20T11:07:00Z (14 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/generic/dlfcn.c (moved) (moved from uspace/drv/usbkbd/kbdrepeat.h ) (2 diffs)

uspace/lib/c/generic/dlfcn.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Lubos Slovak
+ * Copyright (c) 2008 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup drvusbhid
+/** @addtogroup rtld rtld
+ * @brief
  * @{
- */
-/** @file
- * USB HID keyboard autorepeat facilities
+ */ 
+/**
+ * @file
  */
 
-#ifndef USB_KBDREPEAT_H_
-#define USB_KBDREPEAT_H_
+#include <stdio.h>
+#include <stdlib.h>
+#include <dlfcn.h>
 
-struct usb_kbd_t;
+#include <rtld/module.h>
+#include <rtld/symbol.h>
 
-/*----------------------------------------------------------------------------*/
-/**
- * Structure for keeping information needed for auto-repeat of keys.
+void *dlopen(const char *path, int flag)
+{
+        module_t *m;
+
+        if (runtime_env == NULL) {
+                printf("Dynamic linker not set up -- initializing.\n");
+                rtld_init_static();
+        }
+
+        printf("dlopen(\"%s\", %d)\n", path, flag);
+
+        printf("module_find('%s')\n", path);
+        m = module_find(path);
+        if (m == NULL) {
+                printf("NULL. module_load('%s')\n", path);
+                m = module_load(path);
+                printf("module_load_deps(m)\n");
+                module_load_deps(m);
+                /* Now relocate. */
+                printf("module_process_relocs(m)\n");
+                module_process_relocs(m);
+        } else {
+                printf("not NULL\n");
+        }
+
+        return (void *) m;
+}
+
+/*
+ * @note Symbols with NULL values are not accounted for.
  */
-typedef struct {
-        /** Last pressed key. */
-        unsigned int key_new;
-        /** Key to be repeated. */
-        unsigned int key_repeated;
-        /** Delay before first repeat in microseconds. */
-        unsigned int delay_before;
-        /** Delay between repeats in microseconds. */
-        unsigned int delay_between;
-} usb_kbd_repeat_t;
+void *dlsym(void *mod, const char *sym_name)
+{
+        elf_symbol_t *sd;
+        module_t *sm;
 
-/*----------------------------------------------------------------------------*/
+        printf("dlsym(0x%lx, \"%s\")\n", (long)mod, sym_name);
+        sd = symbol_bfs_find(sym_name, (module_t *) mod, &sm);
+        if (sd != NULL) {
+                return symbol_get_addr(sd, sm);
+        }
 
-int usb_kbd_repeat_fibril(void *arg);
+        return NULL;
+}
 
-void usb_kbd_repeat_start(struct usb_kbd_t *kbd, unsigned int key);
-
-void usb_kbd_repeat_stop(struct usb_kbd_t *kbd, unsigned int key);
-
-#endif /* USB_KBDREPEAT_H_ */
-
-/**
- * @}
+/** @}
  */