diff options
| author | Marvin Borner | 2021-04-17 22:59:57 +0200 |
|---|---|---|
| committer | Marvin Borner | 2021-04-17 22:59:57 +0200 |
| commit | cdf029471736f43776452930b7195a06ab143654 (patch) | |
| tree | f8ab7dee26c589ff3666194b814d9457482ec02c /apps | |
| parent | 89b5b9acf6037fc1a87f9e85c64831187a47ba94 (diff) | |
Added I/O bus implementation for efficient IPC
This was a nice coding session. See ya tomorrow!
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/init/init.c | 1 | ||||
| -rw-r--r-- | apps/wm/wm.c | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/apps/init/init.c b/apps/init/init.c index 6e06dbe..44cf461 100644 --- a/apps/init/init.c +++ b/apps/init/init.c @@ -10,7 +10,6 @@ int main(int argc, char **argv) UNUSED(argv); assert(exec("wm", NULL) == EOK); - /* assert(exec("chess", NULL) == EOK); */ return 0; } diff --git a/apps/wm/wm.c b/apps/wm/wm.c index 23b5879..8f3b21f 100644 --- a/apps/wm/wm.c +++ b/apps/wm/wm.c @@ -494,7 +494,7 @@ int main(int argc, char **argv) atexit(handle_exit); - assert(io_control(IO_FRAMEBUFFER, 0, &screen) == EOK); + assert(io_control(IO_FRAMEBUFFER, IOCTL_FB_GET, &screen) == EOK); log("WM loaded: %dx%d\n", screen.width, screen.height); wm_client = (struct client){ .pid = getpid() }; bypp = (screen.bpp >> 3); @@ -513,15 +513,17 @@ int main(int argc, char **argv) WF_NO_DRAG | WF_NO_FOCUS | WF_NO_RESIZE); /* gfx_write(&direct->ctx, vec2(0, 0), FONT_32, COLOR_FG, "Loading Melvix..."); */ - gfx_load_wallpaper(&wallpaper->ctx, "/res/wall.png"); + /* gfx_load_wallpaper(&wallpaper->ctx, "/res/wall.png"); */ memset(cursor->ctx.fb, 0, cursor->ctx.bytes); gfx_load_wallpaper(&cursor->ctx, "/res/cursor.png"); window_redraw(wallpaper); + assert(io_control(IO_BUS, IOCTL_BUS_REGISTER, "wm") == EOK); + u8 msg[1024] = { 0 }; struct event_keyboard event_keyboard = { 0 }; struct event_mouse event_mouse = { 0 }; - u32 listeners[] = { IO_KEYBOARD, IO_MOUSE, 0 }; + enum io_type listeners[] = { IO_KEYBOARD, IO_MOUSE, IO_BUS, 0 }; while (1) { res poll_ret = 0; @@ -538,7 +540,7 @@ int main(int argc, char **argv) continue; } } else if (poll_ret == IO_BUS) { - if (msg_receive(msg, sizeof(msg)) > 0) { + if (io_read(IO_BUS, msg, 0, sizeof(msg)) > 0) { handle_message(msg); continue; } |