Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uggg

Browse Source
This commit is contained in:
Kevin Lange 2011-04-18 19:45:29 -05:00
parent 04873afb23
commit ab00c88b63
2 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/core/video/bochs.c
View File

@ -57,15 +57,10 @@ graphics_install_bochs() {
outports(0x1CE, 0x00);
uint16_t i = inports(0x1CF);
if (i < 0xB0C0 || i > 0xB0C6) {
kprintf("[bochs] You are not a Bochs VBE pseudo-card!\n");
kprintf("[bochs] 0x%x is totally wrong!\n", (unsigned int)i);
return;
}
kprintf("[bochs] Successfully detected a Bochs VBE setup!\n");
kprintf("[bochs] You are using QEMU or Bochs and I love you.\n");
outports(0x1CF, 0xB0C4);
i = inports(0x1CF);
kprintf("[bochs] Enabling 1024x768x32 graphics mode!\n");
/* Disable VBE */
outports(0x1CE, 0x04);
outports(0x1CF, 0x00);
@ -112,8 +107,6 @@ graphics_install_bochs() {
}
mem_found:
kprintf("[bochs] Video memory paged and located.\n");
bochs_resolution_x = PREFERRED_X;
bochs_resolution_y = PREFERRED_Y;
bochs_resolution_b = PREFERRED_B;

13
kernel/main.c
View File

@ -125,12 +125,7 @@ int main(struct multiboot *mboot, uint32_t mboot_mag, uintptr_t esp)
/* Initialize the standard VGA display */
ansi_init(&writech, 80, 25);
/* Kernel Version */
kprintf("[%s %s]\n", KERNEL_UNAME, KERNEL_VERSION_STRING);
if (boot_mode == multiboot) {
/* Print multiboot information */
dump_multiboot(mboot_ptr);
if (mboot_ptr->flags & (1 << 3)) {
/*
@ -145,14 +140,6 @@ int main(struct multiboot *mboot, uint32_t mboot_mag, uintptr_t esp)
parse_args((char *)mboot_ptr->cmdline);
}
/*
* All the output we just dumped went to the serial line.
* If you really want it that bad, feel free to remove
* the clear before the rest of the boot process starts.
*
* But really, the kernel shouldn't be outputting all
* sorts of random text on boot up. Only important stuff!
*/
cls();
start_shell();