Rev 2880 | Rev 2883 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2880 | Rev 2882 | ||
|---|---|---|---|
| Line 16... | Line 16... | ||
| 16 | 16 | ||
| 17 | // Temporary: service and method names |
17 | // Temporary: service and method names |
| 18 | #include "proto.h" |
18 | #include "proto.h" |
| 19 | #include <ipc/services.h> |
19 | #include <ipc/services.h> |
| 20 | #include "../../srv/vfs/vfs.h" |
20 | #include "../../srv/vfs/vfs.h" |
| - | 21 | #include "../../srv/console/console.h" |
|
| 21 | 22 | ||
| 22 | #include "syscalls.h" |
23 | #include "syscalls.h" |
| 23 | #include "ipcp.h" |
24 | #include "ipcp.h" |
| 24 | #include "errors.h" |
25 | #include "errors.h" |
| 25 | #include "debug_api.h" |
26 | #include "debug_api.h" |
| Line 33... | Line 34... | ||
| 33 | int phoneid; |
34 | int phoneid; |
| 34 | int abort_trace; |
35 | int abort_trace; |
| 35 | 36 | ||
| 36 | void thread_trace_start(unsigned thread_hash); |
37 | void thread_trace_start(unsigned thread_hash); |
| 37 | 38 | ||
| - | 39 | static proto_t *proto_console; |
|
| 38 | 40 | ||
| 39 | int task_connect(int taskid) |
41 | int task_connect(int taskid) |
| 40 | { |
42 | { |
| 41 | int rc; |
43 | int rc; |
| 42 | 44 | ||
| Line 348... | Line 350... | ||
| 348 | } |
350 | } |
| 349 | 351 | ||
| 350 | printf("Connected to task %d\n", taskid); |
352 | printf("Connected to task %d\n", taskid); |
| 351 | 353 | ||
| 352 | ipcp_init(); |
354 | ipcp_init(); |
| - | 355 | ipcp_connection_set(1, 0, proto_console); |
|
| 353 | 356 | ||
| 354 | rc = get_thread_list(); |
357 | rc = get_thread_list(); |
| 355 | if (rc < 0) { |
358 | if (rc < 0) { |
| 356 | printf("Failed to get thread list (error %d)\n", rc); |
359 | printf("Failed to get thread list (error %d)\n", rc); |
| 357 | return; |
360 | return; |
| Line 390... | Line 393... | ||
| 390 | 393 | ||
| 391 | p = proto_new("vfs"); |
394 | p = proto_new("vfs"); |
| 392 | proto_add_oper(p, VFS_MOUNT, o); |
395 | proto_add_oper(p, VFS_MOUNT, o); |
| 393 | 396 | ||
| 394 | proto_register(SERVICE_VFS, p); |
397 | proto_register(SERVICE_VFS, p); |
| - | 398 | ||
| - | 399 | p = proto_new("console"); |
|
| - | 400 | o = malloc(sizeof(oper_t)); |
|
| - | 401 | o->name = "putchar"; |
|
| - | 402 | proto_add_oper(p, CONSOLE_PUTCHAR, o); |
|
| - | 403 | ||
| - | 404 | proto_console = p; |
|
| - | 405 | proto_register(SERVICE_CONSOLE, p); |
|
| 395 | } |
406 | } |
| 396 | 407 | ||
| 397 | int main(void) |
408 | int main(void) |
| 398 | { |
409 | { |
| 399 | main_init(); |
410 | main_init(); |