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

Wallpapers in the gits and by default

Browse Source
This commit is contained in:
Kevin Lange 2011-11-17 19:01:14 -06:00
parent 6297ac68ee
commit 3c0b30b5ee
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -28,7 +28,7 @@ ERRORSS = >>/tmp/.build-errors || util/mk-error
BEGRM = util/mk-beg-rm BEGRM = util/mk-beg-rm
ENDRM = util/mk-end-rm ENDRM = util/mk-end-rm
EMUARGS = -kernel toaruos-kernel -initrd toaruos-initrd -append vid=qemu -serial stdio -vga std -hda toaruos-disk.img EMUARGS = -kernel toaruos-kernel -initrd toaruos-initrd -append "vid=qemu wallpaper" -serial stdio -vga std -hda toaruos-disk.img -hdb util/toaruos-wallpaper.bmp
EMUKVM = -enable-kvm EMUKVM = -enable-kvm
.PHONY: all check-toolchain system clean clean-once clean-hard clean-soft clean-docs clean-bin clean-aux clean-core clean-boot install run docs utils .PHONY: all check-toolchain system clean clean-once clean-hard clean-soft clean-docs clean-bin clean-aux clean-core clean-boot install run docs utils
@ -125,7 +125,7 @@ hdd:
toaruos-disk.img: hdd toaruos-disk.img: hdd
@${BEG} "hdd" "Generating a Hard Disk image..." @${BEG} "hdd" "Generating a Hard Disk image..."
@-rm -f toaruos-disk.img @-rm -f toaruos-disk.img
@${GENEXT} -d hdd -q -b 131072 toaruos-disk.img ${ERRORS} @${GENEXT} -d hdd -q -b 131072 -N 4096 toaruos-disk.img ${ERRORS}
@${END} "hdd" "Generated Hard Disk image" @${END} "hdd" "Generated Hard Disk image"
@${INFO} "--" "Hard disk image is ready!" @${INFO} "--" "Hard disk image is ready!"

2
kernel/core/args.c
View File

@ -43,6 +43,8 @@ parse_args(
/* Bochs / Qemu Video Device */ /* Bochs / Qemu Video Device */
graphics_install_bochs(); graphics_install_bochs();
ansi_init(&bochs_write, 128, 64); ansi_init(&bochs_write, 128, 64);
} if (!strcmp(argv[i],"wallpaper")) {
bochs_install_wallpaper();
} }
} }
} }

2
kernel/core/shell.c
View File

@ -173,8 +173,6 @@ start_shell() {
detect_cpu(); detect_cpu();
} else if (!strcmp(cmd, "multiboot")) { } else if (!strcmp(cmd, "multiboot")) {
dump_multiboot(mboot_ptr); dump_multiboot(mboot_ptr);
} else if (!strcmp(cmd, "wallpaper")) {
bochs_install_wallpaper();
} else if (!strcmp(cmd, "screenshot")) { } else if (!strcmp(cmd, "screenshot")) {
bochs_screenshot(); bochs_screenshot();
} else if (!strcmp(cmd, "read-sb")) { } else if (!strcmp(cmd, "read-sb")) {

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

@ -99,12 +99,11 @@ void
bochs_install_wallpaper() { bochs_install_wallpaper() {
char * bufferb = malloc(2359808); char * bufferb = malloc(2359808);
uint32_t _i = 0; uint32_t _i = 0;
kprintf("Reading..."); kprintf("Loading...");
while (_i < 4609) { while (_i < 4609) {
ide_read_sector(0x1F0, 1, _i, (uint8_t *)((uint32_t)bufferb + _i * 512)); ide_read_sector(0x1F0, 1, _i, (uint8_t *)((uint32_t)bufferb + _i * 512));
++_i; ++_i;
} }
kprintf(" Done.\n");
uint16_t x = 0; /* -> 212 */ uint16_t x = 0; /* -> 212 */
uint16_t y = 0; /* -> 68 */ uint16_t y = 0; /* -> 68 */
/* Get the width / height of the image */ /* Get the width / height of the image */

BIN
util/toaruos-wallpaper.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 MiB