Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/ebus/include/ebus.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ enum EBUS_EVENT {
EBUS_EVENT_ANY = 0,
EBUS_EVENT_TIMER,
EBUS_EVENT_KEY,
EBUS_EVENT_CUSTOM,
};

typedef struct _ebus_event {
Expand All @@ -41,6 +42,11 @@ typedef struct _ebus_event {
uint32_t keycode;
uint32_t scancode;
} key;
struct {
int id;
void * data;
size_t size;
} custom;
};
} ebus_event_t;

Expand Down
20 changes: 10 additions & 10 deletions src/kernel/src/kernel.c
Original file line number Diff line number Diff line change
Expand Up @@ -160,21 +160,21 @@ void kernel_main() {
KPANIC("Failed to open tar");
}

process_t foo_proc;
if (process_create(&foo_proc)) {
process_t * foo_proc = kmalloc(sizeof(process_t));
if (process_create(foo_proc)) {
KPANIC("Failed to create foo task");
}
process_set_entrypoint(&foo_proc, foo_task);
foo_proc.state = PROCESS_STATE_LOADED;
pm_add_proc(&__kernel.pm, &foo_proc);
process_set_entrypoint(foo_proc, foo_task);
foo_proc->state = PROCESS_STATE_LOADED;
pm_add_proc(&__kernel.pm, foo_proc);

process_t bar_proc;
if (process_create(&bar_proc)) {
process_t * bar_proc = kmalloc(sizeof(process_t));
if (process_create(bar_proc)) {
KPANIC("Failed to create bar task");
}
process_set_entrypoint(&bar_proc, bar_task);
bar_proc.state = PROCESS_STATE_LOADED;
pm_add_proc(&__kernel.pm, &bar_proc);
process_set_entrypoint(bar_proc, bar_task);
bar_proc->state = PROCESS_STATE_LOADED;
pm_add_proc(&__kernel.pm, bar_proc);

pm_resume_process(&__kernel.pm, __kernel.pm.idle_task->pid, 0);

Expand Down