| /branches/dynload/uspace/lib/libc/generic/kbd.c |
|---|
| 0,0 → 1,61 |
| /* |
| * Copyright (c) 2009 Jiri Svoboda |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup libc |
| * @{ |
| */ |
| /** @file |
| */ |
| #include <stdio.h> |
| #include <io/stream.h> |
| #include <kbd/kbd.h> |
| #include <ipc/ipc.h> |
| #include <ipc/console.h> |
| #include <async.h> |
| int kbd_get_event(kbd_event_t *ev) |
| { |
| int console_phone = get_cons_phone(); |
| ipcarg_t r0, r1, r2, r3; |
| int rc; |
| rc = async_req_0_4(console_phone, CONSOLE_GETKEY, &r0, &r1, &r2, &r3); |
| if (rc < 0) |
| return -1; |
| ev->type = r0; |
| ev->key = r1; |
| ev->mods = r2; |
| ev->c = r3; |
| return 0; |
| } |
| /** @} |
| */ |
| /branches/dynload/uspace/lib/libc/generic/task.c |
|---|
| 63,8 → 63,8 |
| task_id_t task_id; |
| int rc; |
| /* Spawn a program loader. */ |
| ldr = loader_spawn(path); |
| /* Connect to a program loader. */ |
| ldr = loader_connect(); |
| if (ldr == NULL) |
| return 0; |
| 89,7 → 89,6 |
| goto error; |
| /* Run it. */ |
| /* Load the program. */ |
| rc = loader_run(ldr); |
| if (rc != EOK) |
| goto error; |
| /branches/dynload/uspace/lib/libc/generic/loader.c |
|---|
| 34,6 → 34,7 |
| #include <ipc/ipc.h> |
| #include <ipc/loader.h> |
| #include <ipc/services.h> |
| #include <libc.h> |
| #include <task.h> |
| #include <string.h> |
| 50,33 → 51,27 |
| * @return Pointer to the loader connection structure (should be |
| * de-allocated using free() after use). |
| */ |
| loader_t *loader_spawn(const char *name) |
| int loader_spawn(const char *name) |
| { |
| int phone_id, rc; |
| return __SYSCALL2(SYS_PROGRAM_SPAWN_LOADER, |
| (sysarg_t) name, strlen(name)); |
| } |
| loader_t *loader_connect(void) |
| { |
| loader_t *ldr; |
| int phone_id; |
| /* |
| * Ask kernel to spawn a new loader task. |
| */ |
| rc = __SYSCALL3(SYS_PROGRAM_SPAWN_LOADER, (sysarg_t) &phone_id, |
| (sysarg_t) name, strlen(name)); |
| if (rc != 0) |
| phone_id = ipc_connect_me_to(PHONE_NS, SERVICE_LOAD, 0, 0); |
| if (phone_id < 0) |
| return NULL; |
| /* |
| * Say hello so that the loader knows the incoming connection's |
| * phone hash. |
| */ |
| rc = async_req_0_0(phone_id, LOADER_HELLO); |
| if (rc != EOK) |
| return NULL; |
| ldr = malloc(sizeof(loader_t)); |
| if (ldr == NULL) |
| return NULL; |
| ldr->phone_id = phone_id; |
| return ldr; |
| return ldr; |
| } |
| /** Get ID of the new task. |
| /branches/dynload/uspace/lib/libc/generic/io/stream.c |
|---|
| 43,6 → 43,7 |
| #include <ipc/fb.h> |
| #include <ipc/services.h> |
| #include <ipc/console.h> |
| #include <kbd/kbd.h> |
| #include <unistd.h> |
| #include <async.h> |
| #include <sys/types.h> |
| 58,13 → 59,17 |
| { |
| open_console(); |
| if (console_phone >= 0) { |
| ipcarg_t r0, r1; |
| kbd_event_t ev; |
| int rc; |
| size_t i = 0; |
| while (i < count) { |
| if (async_req_0_2(console_phone, CONSOLE_GETCHAR, &r0, &r1) < 0) |
| return -1; |
| ((char *) buf)[i++] = r0; |
| do { |
| rc = kbd_get_event(&ev); |
| if (rc < 0) return -1; |
| } while (ev.c == 0 || ev.type == KE_RELEASE); |
| ((char *) buf)[i++] = ev.c; |
| } |
| return i; |
| } else { |