kern

changeset 27:7795225808b3

moved enable_intr out of init_intr and after the kernel initialization is completed
author John Tsiombikas <nuclear@member.fsf.org>
date Sat, 09 Apr 2011 07:22:27 +0300
parents 387078ef5c0d
children bdd9bf70269d
files src/intr.c src/main.c
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line diff
     1.1 --- a/src/intr.c	Sat Apr 09 07:14:06 2011 +0300
     1.2 +++ b/src/intr.c	Sat Apr 09 07:22:27 2011 +0300
     1.3 @@ -95,9 +95,6 @@
     1.4  	 * setting up the maping of IRQs [0, 15] to interrupts [32, 47]
     1.5  	 */
     1.6  	init_pic(IRQ_OFFSET);
     1.7 -
     1.8 -	/* we're done setting up, enable interrupts before returning */
     1.9 -	enable_intr();
    1.10  }
    1.11  
    1.12  /* set an interrupt handler function for a particular interrupt */
     2.1 --- a/src/main.c	Sat Apr 09 07:14:06 2011 +0300
     2.2 +++ b/src/main.c	Sat Apr 09 07:22:27 2011 +0300
     2.3 @@ -5,6 +5,7 @@
     2.4  #include "asmops.h"
     2.5  #include "segm.h"
     2.6  #include "intr.h"
     2.7 +#include "mem.h"
     2.8  #include "vm.h"
     2.9  
    2.10  static void do_nothing();
    2.11 @@ -62,6 +63,9 @@
    2.12  	/* initialize paging and the virtual memory manager */
    2.13  	init_vm();
    2.14  
    2.15 +	/* initialization complete, enable interrupts */
    2.16 +	enable_intr();
    2.17 +
    2.18  	dbg_print_vm(MEM_USER);
    2.19  	dbg_print_vm(MEM_KERNEL);
    2.20