aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/wm.c24
-rw-r--r--kernel/features/fs.c8
-rw-r--r--kernel/features/proc.c38
-rw-r--r--kernel/inc/proc.h3
-rw-r--r--libgui/gfx.c6
-rw-r--r--libgui/gui.c8
-rw-r--r--libgui/inc/gfx.h5
7 files changed, 65 insertions, 27 deletions
diff --git a/apps/wm.c b/apps/wm.c
index e590d46..469e824 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -88,7 +88,7 @@ static void kill_focused()
{
if (!focused)
return;
- msg_send(focused->pid, GUI_KILL, NULL);
+ //msg_send(focused->pid, GUI_KILL, NULL);
remove_context(focused);
focused = context_at(mouse_x, mouse_y);
}
@@ -162,7 +162,7 @@ static void handle_keyboard(struct event_keyboard *event)
msg->press = event->press;
msg->scancode = event->scancode;
- msg_send(focused->pid, GUI_KEYBOARD, msg);
+ //msg_send(focused->pid, GUI_KEYBOARD, msg);
}
static int mouse_skip = 0;
@@ -237,7 +237,7 @@ static void handle_mouse(struct event_mouse *event)
focused = resized;
struct gui_event_resize *msg = malloc(sizeof(*msg));
msg->new_ctx = resized;
- msg_send(resized->pid, GUI_RESIZE, msg);
+ //msg_send(resized->pid, GUI_RESIZE, msg);
redraw_all();
}
}
@@ -255,7 +255,7 @@ static void handle_mouse(struct event_mouse *event)
msg->but1 = event->but1;
msg->but2 = event->but2;
msg->but3 = event->but3;
- msg_send(focused->pid, GUI_MOUSE, msg);
+ //msg_send(focused->pid, GUI_MOUSE, msg);
}
// TODO: Clean this god-function
@@ -285,15 +285,15 @@ int main(int argc, char **argv)
gfx_load_image(&cursor, "/res/cursor.png", 0, 0);
redraw_all();
- event_register(EVENT_MOUSE);
- event_register(EVENT_KEYBOARD);
+ /* event_register(EVENT_MOUSE); */
+ /* event_register(EVENT_KEYBOARD); */
struct message msg = { 0 };
while (1) {
- if (!msg_receive(&msg)) {
- yield();
- continue;
- }
+ //if (!msg_receive(&msg)) {
+ yield();
+ continue;
+ //}
switch (msg.type) {
case GFX_NEW_CONTEXT: {
@@ -308,13 +308,13 @@ int main(int argc, char **argv)
if (!(ctx->flags & WF_RELATIVE))
focused = ctx;
redraw_all();
- msg_send(msg.src, GFX_NEW_CONTEXT, ctx);
+ //msg_send(msg.src, GFX_NEW_CONTEXT, ctx);
// Send mouse position
struct gui_event_mouse *mouse = malloc(sizeof(msg));
mouse->x = mouse_x - focused->x;
mouse->y = mouse_y - focused->y;
- msg_send(focused->pid, GUI_MOUSE, mouse);
+ //msg_send(focused->pid, GUI_MOUSE, mouse);
break;
}
case GFX_REDRAW:
diff --git a/kernel/features/fs.c b/kernel/features/fs.c
index 14e6a9c..ab2e236 100644
--- a/kernel/features/fs.c
+++ b/kernel/features/fs.c
@@ -185,14 +185,12 @@ void device_install(void)
{
devices = list_new();
- struct vfs *vfs;
- struct device *dev;
-
- vfs = malloc(sizeof(*vfs));
+ struct vfs *vfs = malloc(sizeof(*vfs));
vfs->type = VFS_DEVFS;
vfs->read = devfs_read;
- dev = malloc(sizeof(*dev));
+ struct device *dev = malloc(sizeof(*dev));
dev->name = "dev";
+ dev->type = DEV_CHAR;
dev->vfs = vfs;
device_add(dev);
vfs_mount(dev, "/dev/");
diff --git a/kernel/features/proc.c b/kernel/features/proc.c
index 93e97f1..499be81 100644
--- a/kernel/features/proc.c
+++ b/kernel/features/proc.c
@@ -3,6 +3,7 @@
#include <assert.h>
#include <boot.h>
#include <cpu.h>
+#include <fs.h>
#include <interrupts.h>
#include <list.h>
#include <load.h>
@@ -129,6 +130,7 @@ struct proc *proc_make(void)
{
struct proc *proc = malloc(sizeof(*proc));
proc->pid = current_pid++;
+ proc->messages = list_new();
proc->state = PROC_RUNNING;
if (current)
@@ -137,6 +139,31 @@ struct proc *proc_make(void)
return proc;
}
+u32 procfs_read(const char *path, void *buf, u32 offset, u32 count, struct device *dev)
+{
+ while (*path == '/')
+ path++;
+
+ int pid = 0;
+ while (path[0] >= '0' && path[0] <= '9') {
+ pid = pid * 10 + (path[0] - '0');
+ path++;
+ }
+
+ if (pid) {
+ struct proc *p = proc_from_pid(pid);
+ if (!p)
+ return 0;
+
+ if (!memcmp(path, "/status", 8)) {
+ printf("STATUS!\n");
+ }
+ }
+
+ printf("%s - off: %d, cnt: %d, buf: %x, dev %x\n", path, offset, count, buf, dev);
+ return count;
+}
+
extern void proc_jump_userspace(void);
u32 _esp, _eip;
@@ -149,6 +176,17 @@ void proc_init(void)
scheduler_enable();
proc_list = list_new();
+ // Procfs
+ struct vfs *vfs = malloc(sizeof(*vfs));
+ vfs->type = VFS_PROCFS;
+ vfs->read = procfs_read;
+ struct device *dev = malloc(sizeof(*dev));
+ dev->name = "proc";
+ dev->type = DEV_CHAR;
+ dev->vfs = vfs;
+ device_add(dev);
+ vfs_mount(dev, "/proc/");
+
kernel_proc = proc_make();
struct node *new = list_add(proc_list, proc_make());
diff --git a/kernel/inc/proc.h b/kernel/inc/proc.h
index c8fb3e2..7a479be 100644
--- a/kernel/inc/proc.h
+++ b/kernel/inc/proc.h
@@ -8,7 +8,7 @@
#include <list.h>
#include <sys.h>
-#define PROC_QUANTUM 100 // Milliseconds or something // TODO
+#define PROC_QUANTUM 42 // Milliseconds or something // TODO
#define EFLAGS_ALWAYS 0x2 // Always one
#define EFLAGS_INTERRUPTS 0x200 // Enable interrupts
@@ -24,6 +24,7 @@ struct proc {
struct regs regs;
struct regs regs_backup;
enum proc_state state;
+ struct list *messages;
};
struct proc *kernel_proc;
diff --git a/libgui/gfx.c b/libgui/gfx.c
index b93ee62..986ecda 100644
--- a/libgui/gfx.c
+++ b/libgui/gfx.c
@@ -98,9 +98,9 @@ static void draw_rectangle(struct context *ctx, int x1, int y1, int x2, int y2,
struct context *gfx_new_ctx(struct context *ctx)
{
- struct message msg = { 0 };
- msg_send(2, GFX_NEW_CONTEXT, ctx);
- memcpy(ctx, msg_receive_loop(&msg)->data, sizeof(*ctx));
+ //struct message msg = { 0 };
+ //msg_send(2, GFX_NEW_CONTEXT, ctx);
+ //memcpy(ctx, msg_receive_loop(&msg)->data, sizeof(*ctx));
return ctx;
}
diff --git a/libgui/gui.c b/libgui/gui.c
index 8ab6260..9b49c2e 100644
--- a/libgui/gui.c
+++ b/libgui/gui.c
@@ -534,10 +534,10 @@ void gui_event_loop(struct element *container)
struct message msg = { 0 };
struct element *focused = NULL;
while (1) {
- if (!msg_receive(&msg)) {
- yield();
- continue;
- }
+ /* if (!msg_receive(&msg)) { */
+ yield();
+ continue;
+ /* } */
switch (msg.type) {
case GUI_KILL: {
diff --git a/libgui/inc/gfx.h b/libgui/inc/gfx.h
index d096005..718fd28 100644
--- a/libgui/inc/gfx.h
+++ b/libgui/inc/gfx.h
@@ -84,7 +84,8 @@ int gfx_font_width(enum font_type);
* Wrappers
*/
-#define gfx_redraw() (msg_send(2, GFX_REDRAW, NULL)) // TODO: Partial redraw (optimization)
-#define gfx_redraw_focused() (msg_send(2, GFX_REDRAW_FOCUSED, NULL))
+#define gfx_redraw() \
+ (void)42 //(msg_send(2, GFX_REDRAW, NULL)) // TODO: Partial redraw (optimization)
+#define gfx_redraw_focused() (void)42 //(msg_send(2, GFX_REDRAW_FOCUSED, NULL))
#endif