#include "vga.h"
#ifdef FILESYS
#include "filesys.h"
+#include "disk.h"
#endif
/* Size of kernel static code and data, in 4 kB pages. */
static void
main_thread (void *aux UNUSED)
{
- printk ("execute=%d\n", (int) thread_execute ("a.out"));
+ disk_init ();
+ thread_execute ("a.out");
}
int
/* Calculate how much RAM the kernel uses, and find out from
the bootloader how much RAM this machine has. */
kernel_pages = (&_end - &_text + 4095) / 4096;
- ram_pages = *(uint32_t *) (0x7e00 - 8);
+ ram_pages = *(uint32_t *) (0x7e00 - 6);
printk ("Initializing nachos-x86, %d kB RAM detected.\n",
ram_pages * 4);
#ifdef FILESYS
filesys_init (false);
- filesys_self_test ();
#endif
thread_init ();