1.1 --- a/src/main.c	Sat May 28 08:06:47 2011 +0300
     1.2 +++ b/src/main.c	Tue Jun 14 01:19:07 2011 +0300
     1.3 @@ -5,6 +5,8 @@
     1.4  #include "asmops.h"
     1.5  #include "segm.h"
     1.6  #include "intr.h"
     1.7 +#include "rtc.h"
     1.8 +#include "timer.h"
     1.9  #include "mem.h"
    1.10  #include "vm.h"
    1.11  
    1.12 @@ -55,14 +57,16 @@
    1.13  	init_segm();
    1.14  	init_intr();
    1.15  
    1.16 -	/* silence the blasted timer interrupt */
    1.17 -	interrupt(32, do_nothing);
    1.18  
    1.19  	/* initialize the physical memory manager */
    1.20  	init_mem(mbinf);
    1.21  	/* initialize paging and the virtual memory manager */
    1.22  	init_vm();
    1.23  
    1.24 +	/* initialize the timer and RTC */
    1.25 +	init_timer();
    1.26 +	init_rtc();
    1.27 +
    1.28  	/* initialization complete, enable interrupts */
    1.29  	enable_intr();
    1.30  
    1.31 @@ -78,7 +82,3 @@
    1.32  		}
    1.33  	}
    1.34  }
    1.35 -
    1.36 -static void do_nothing()
    1.37 -{
    1.38 -}