size_t ram_pages;
/* Page directory with kernel mappings only. */
-uint32_t *base_page_dir;
+uint32_t *init_page_dir;
#ifdef FILESYS
/* -f: Format the file system? */
/* Populates the base page directory and page table with the
kernel virtual mapping, and then sets up the CPU to use the
- new page directory. Points base_page_dir to the page
+ new page directory. Points init_page_dir to the page
directory it creates.
At the time this function is called, the active page table
size_t page;
extern char _start, _end_kernel_text;
- pd = base_page_dir = palloc_get_page (PAL_ASSERT | PAL_ZERO);
+ pd = init_page_dir = palloc_get_page (PAL_ASSERT | PAL_ZERO);
pt = NULL;
for (page = 0; page < ram_pages; page++)
{
new page tables immediately. See [IA32-v2a] "MOV--Move
to/from Control Registers" and [IA32-v3a] 3.7.5 "Base Address
of the Page Directory". */
- asm volatile ("movl %0, %%cr3" : : "r" (vtop (base_page_dir)));
+ asm volatile ("movl %0, %%cr3" : : "r" (vtop (init_page_dir)));
}
/* Breaks the kernel command line into words and returns them as
power_off ();
}
+/* Keyboard control register port. */
+#define CONTROL_REG 0x64
-/* Reboots the machine we're running on. */
+/* Reboots the machine via the keyboard controller. */
void
reboot (void)
{
- int i;
-
- printf ("Rebooting...\n");
-
- /* based on reboot.c code by Osamu Tomita <tomita@cinet.co.jp>
- * See http://www.win.tue.nl/~aeb/linux/kbd/scancodes-11.html */
- for (i = 0; i < 100; i++) {
- int j;
-
- /* Poll keyboard controller's status byte until
- * 'input buffer empty' is reported, so it's ok to write */
- for (j = 0; j < 0x10000; j++)
- {
- if ((inb (0x64) & 0x02) == 0)
- break;
- timer_usleep (2);
- }
-
- timer_usleep (50);
-
- /* Pulse bit 0 of the output port P2 of the keyboard controller.
- * This will reset the CPU. */
- outb (0x64, 0xfe);
- timer_usleep (50);
+ int i;
+
+ printf ("Rebooting...\n");
+
+ /* See [kbd] for details on how to program the keyboard
+ * controller. */
+ for (i = 0; i < 100; i++)
+ {
+ int j;
+
+ /* Poll keyboard controller's status byte until
+ * 'input buffer empty' is reported. */
+ for (j = 0; j < 0x10000; j++)
+ {
+ if ((inb (CONTROL_REG) & 0x02) == 0)
+ break;
+ timer_udelay (2);
+ }
+
+ timer_udelay (50);
+
+ /* Pulse bit 0 of the output port P2 of the keyboard controller.
+ * This will reset the CPU. */
+ outb (CONTROL_REG, 0xfe);
+ timer_udelay (50);
}
}