| /branches/dynload/uspace/app/init/init.c |
|---|
| 27,9 → 27,9 |
| */ |
| /** @addtogroup init Init |
| * @brief Init process for testing purposes. |
| * @brief Init process for user space environment configuration. |
| * @{ |
| */ |
| */ |
| /** |
| * @file |
| */ |
| 36,6 → 36,7 |
| #include <stdio.h> |
| #include <unistd.h> |
| #include <ipc/ipc.h> |
| #include <vfs/vfs.h> |
| #include <bool.h> |
| #include <errno.h> |
| 42,26 → 43,17 |
| #include <fcntl.h> |
| #include <task.h> |
| #include <malloc.h> |
| #include <macros.h> |
| #include "init.h" |
| #include "version.h" |
| #define BUF_SIZE 150000 |
| static char *buf; |
| static void console_wait(void) |
| { |
| while (get_cons_phone() < 0) |
| usleep(50000); // FIXME |
| } |
| static bool mount_fs(const char *fstype) |
| { |
| int rc = -1; |
| while (rc < 0) { |
| rc = mount(fstype, "/", "initrd"); |
| rc = mount(fstype, "/", "initrd", IPC_FLAG_BLOCKING); |
| switch (rc) { |
| case EOK: |
| printf(NAME ": Root filesystem mounted\n"); |
| 75,8 → 67,6 |
| case ENOENT: |
| printf(NAME ": Unknown filesystem type (%s)\n", fstype); |
| return false; |
| default: |
| sleep(5); // FIXME |
| } |
| } |
| 86,24 → 76,25 |
| static void spawn(char *fname) |
| { |
| char *argv[2]; |
| printf(NAME ": Spawning %s\n", fname); |
| argv[0] = fname; |
| argv[1] = NULL; |
| if (task_spawn(fname, argv) != 0) { |
| /* Success */ |
| sleep(1); |
| } |
| if (task_spawn(fname, argv)) |
| /* Add reasonable delay to avoid |
| intermixed klog output */ |
| usleep(10000); |
| else |
| printf(NAME ": Error spawning %s\n", fname); |
| } |
| int main(int argc, char *argv[]) |
| { |
| info_print(); |
| sleep(5); // FIXME |
| if (!mount_fs("tmpfs") && !mount_fs("fat")) { |
| if (!mount_fs(STRING(RDFMT))) { |
| printf(NAME ": Exiting\n"); |
| return -1; |
| } |
| 121,7 → 112,6 |
| spawn("/app/klog"); |
| spawn("/app/bdsh"); |
| free(buf); |
| return 0; |
| } |
| /branches/dynload/uspace/app/tester/devmap/devmap1.c |
|---|
| 132,12 → 132,10 |
| int phone; |
| ipcarg_t callback_phonehash; |
| phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, DEVMAP_DRIVER, 0); |
| while (phone < 0) { |
| usleep(100000); |
| phone = ipc_connect_me_to(PHONE_NS, SERVICE_DEVMAP, |
| DEVMAP_DRIVER, 0); |
| phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_DEVMAP, DEVMAP_DRIVER, 0); |
| if (phone < 0) { |
| printf("Failed to connect to device mapper\n"); |
| return -1; |
| } |
| req = async_send_2(phone, DEVMAP_DRIVER_REGISTER, 0, 0, &answer); |
| /branches/dynload/uspace/app/tester/vfs/vfs1.c |
|---|
| 45,7 → 45,7 |
| { |
| int rc; |
| rc = mount("tmpfs", "/", "nulldev0"); |
| rc = mount("tmpfs", "/", "nulldev0", 0); |
| switch (rc) { |
| case EOK: |
| if (!quiet) |
| /branches/dynload/uspace/app/tetris/input.c |
|---|
| 58,6 → 58,7 |
| #include <async.h> |
| #include <ipc/console.h> |
| #include <kbd/kbd.h> |
| /* return true iff the given timeval is positive */ |
| #define TV_POS(tv) \ |
| 111,8 → 112,9 |
| s = NULL; |
| if (!lastchar) { |
| again: |
| if (!getchar_inprog) { |
| cons_phone = get_cons_phone(); |
| cons_phone = get_console_phone(); |
| getchar_inprog = async_send_2(cons_phone, |
| CONSOLE_GETKEY, 0, 0, &charcall); |
| } |
| 127,6 → 129,9 |
| if (rc) { |
| stop("end of file, help"); |
| } |
| if (IPC_GET_ARG1(charcall) == KE_RELEASE) |
| goto again; |
| lastchar = IPC_GET_ARG4(charcall); |
| } |
| if (tvp) { |
| /branches/dynload/uspace/app/klog/klog.c |
|---|
| 27,9 → 27,9 |
| */ |
| /** @addtogroup klog KLog |
| * @brief HelenOS KLog |
| * @brief HelenOS KLog |
| * @{ |
| */ |
| */ |
| /** |
| * @file |
| */ |
| 50,12 → 50,6 |
| /* Pointer to klog area */ |
| static char *klog; |
| static void console_wait(void) |
| { |
| while (get_cons_phone() < 0) |
| usleep(50000); // FIXME |
| } |
| static void interrupt_received(ipc_callid_t callid, ipc_call_t *call) |
| { |
| async_serialize_start(); |