Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[task] um, cooperative multi-tasking? that's good, right?

Browse Source
This commit is contained in:
Kevin Lange 2011-03-01 20:14:55 -06:00
parent ee04a7271d
commit 3ee67c75e3
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/core/irq.c
View File

@ -74,11 +74,11 @@ void
irq_handler(struct regs *r) { irq_handler(struct regs *r) {
void (*handler)(struct regs *r); void (*handler)(struct regs *r);
handler = irq_routines[r->int_no - 32]; handler = irq_routines[r->int_no - 32];
if (handler) {
handler(r);
}
if (r->int_no >= 40) { if (r->int_no >= 40) {
outportb(0xA0, 0x20); outportb(0xA0, 0x20);
} }
outportb(0x20, 0x20); outportb(0x20, 0x20);
if (handler) {
handler(r);
}
} }

2
kernel/core/timer.c
View File

@ -20,8 +20,8 @@ timer_handler(
++timer_ticks; ++timer_ticks;
if (timer_ticks % 18 == 0) { if (timer_ticks % 18 == 0) {
++ticker; ++ticker;
switch_task();
} }
//switch_task();
} }
void timer_install() { void timer_install() {

7
kernel/main.c
View File

@ -118,7 +118,7 @@ int main(struct multiboot *mboot_ptr, uint32_t mboot_mag, uintptr_t esp)
} }
__asm__ __volatile__ ("sti"); __asm__ __volatile__ ("sti");
start_shell(); //start_shell();
/* /*
* Aw man... * Aw man...
@ -126,15 +126,14 @@ int main(struct multiboot *mboot_ptr, uint32_t mboot_mag, uintptr_t esp)
uint32_t child = fork(); uint32_t child = fork();
uint32_t i = getpid();
while (1) { while (1) {
__asm__ __volatile__ ("cli"); uint32_t i = getpid();
if (i == 1) { if (i == 1) {
putch('A'); putch('A');
} else { } else {
putch('B'); putch('B');
} }
__asm__ __volatile__ ("sti"); switch_task();
} }
return 0; return 0;