#endif
/* Amount of physical memory, in 4 kB pages. */
-size_t ram_pages;
+size_t init_ram_pages;
/* Page directory with kernel mappings only. */
uint32_t *init_page_dir;
static bool format_filesys;
#endif
-/* -q: Power off after kernel tasks complete? */
-bool power_off_when_done;
-
-/* -r: Reboot after kernel tasks complete? */
-static bool reboot_when_done;
-
/* -ul: Maximum number of pages to put into palloc's user pool. */
static size_t user_page_limit = SIZE_MAX;
console_init ();
/* Greet user. */
- printf ("Pintos booting with %'zu kB RAM...\n", ram_pages * PGSIZE / 1024);
+ printf ("Pintos booting with %'zu kB RAM...\n",
+ init_ram_pages * PGSIZE / 1024);
/* Initialize memory system. */
palloc_init (user_page_limit);
run_actions (argv);
/* Finish up. */
- if (reboot_when_done)
- shutdown_reboot ();
-
- if (power_off_when_done)
- shutdown_power_off ();
+ shutdown ();
thread_exit ();
}
\f
memset (&_start_bss, 0, &_end_bss - &_start_bss);
/* Get RAM size from loader. See loader.S. */
- ram_pages = *(uint32_t *) ptov (LOADER_RAM_PGS);
+ init_ram_pages = *(uint32_t *) ptov (LOADER_RAM_PGS);
}
/* Populates the base page directory and page table with the
pd = init_page_dir = palloc_get_page (PAL_ASSERT | PAL_ZERO);
pt = NULL;
- for (page = 0; page < ram_pages; page++)
+ for (page = 0; page < init_ram_pages; page++)
{
uintptr_t paddr = page * PGSIZE;
char *vaddr = ptov (paddr);
if (!strcmp (name, "-h"))
usage ();
else if (!strcmp (name, "-q"))
- power_off_when_done = true;
+ shutdown_configure (SHUTDOWN_POWER_OFF);
else if (!strcmp (name, "-r"))
- reboot_when_done = true;
+ shutdown_configure (SHUTDOWN_REBOOT);
#ifdef FILESYS
else if (!strcmp (name, "-f"))
format_filesys = true;